|
|
|
@ -11,13 +11,18 @@ import com.ms.api.common.SPIBaseService;
|
|
|
|
|
import com.ms.api.dto.move.GetMoveHistoryProductListRequestDTO;
|
|
|
|
|
import com.ms.api.dto.move.SearchMoveProductItemRequestDTO;
|
|
|
|
|
import com.ms.api.service.MicroMoveProductItemService;
|
|
|
|
|
import com.ms.api.service.MoveCollectTaskDetailService;
|
|
|
|
|
import com.ms.api.service.MoveCollectTaskService;
|
|
|
|
|
import com.ms.api.tool.DsJsonRequestTemplate;
|
|
|
|
|
import com.ms.dal.entity.MicroMoveProductItem;
|
|
|
|
|
import com.ms.dal.entity.MoveCollectTask;
|
|
|
|
|
import com.ms.dal.entity.MoveCollectTaskDetail;
|
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
|
|
|
|
|
import java.util.HashMap;
|
|
|
|
|
import java.util.Map;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 铺货日志、搬家历史、复制历史
|
|
|
|
|
* 复制历史的搜索接口,根据状态,返回不同状态下的复制历史
|
|
|
|
@ -26,7 +31,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
@Slf4j
|
|
|
|
|
public class GetMoveHistoryProductListService extends SPIBaseService implements ExtensionServiceHandler<GetMoveHistoryProductListRequestDTO, Ret> {
|
|
|
|
|
@Autowired
|
|
|
|
|
private MoveCollectTaskService moveCollectTaskService;
|
|
|
|
|
private MoveCollectTaskDetailService moveCollectTaskDetailService;
|
|
|
|
|
@Override
|
|
|
|
|
public BaseResponse<Ret> handle(BaseRequest<GetMoveHistoryProductListRequestDTO> req) {
|
|
|
|
|
initHandle(req);
|
|
|
|
@ -40,9 +45,14 @@ public class GetMoveHistoryProductListService extends SPIBaseService implements
|
|
|
|
|
condition.setPage(fields.getPage());
|
|
|
|
|
condition.setPageSize(fields.getPageSize());
|
|
|
|
|
condition.setShopId(shopId);
|
|
|
|
|
Pager<MoveCollectTask> moveCollectTaskPager = moveCollectTaskService.getMoveCollectTaskList(condition);
|
|
|
|
|
Pager<MoveCollectTaskDetail> moveCollectTaskPager = moveCollectTaskDetailService.getMoveCollectTaskList(condition);
|
|
|
|
|
|
|
|
|
|
Map<String, Object> result = new HashMap<>();
|
|
|
|
|
result.put("taskDetailList", moveCollectTaskPager.getData());
|
|
|
|
|
result.put("taskTotal", moveCollectTaskPager.getTotal());
|
|
|
|
|
result.put("page", moveCollectTaskPager.getPage());
|
|
|
|
|
result.put("pageSize", moveCollectTaskPager.getPageSize());
|
|
|
|
|
// ----结果返回----
|
|
|
|
|
return R.ok(Ret.success(moveCollectTaskPager.toMap()));
|
|
|
|
|
return R.ok(Ret.success(result));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|