From 01f39fcb06b8713901975153d0a893e86eca6a88 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 07 七月 2025 19:42:26 +0800
Subject: [PATCH] 33.订单历史管理里面增加单据类型选项按钮、单据类型选项按钮 34.单据管理里面增加单据状态选项按钮 35.入库订单全部都入好了，单据状态还是作业中，现在作业中的单据是可以删除的，我不小心把这个单据删除了，怎么恢复？ 36.每个界面点下一页都没反应，点第二页是有变化的，之后点任何页面都没反应 37.订单明细点开后的界面改大一点 38.新增出库订单的时候可以输入客户信息（客户名称、收件人、地址、电话等），现在拣货完成后连发给谁都不知道 39.大屏播种界面对应的数量和开单数量不一致
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java | 64 +++++++++++++++++++------------
1 files changed, 39 insertions(+), 25 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java
index 1a502b0..68306a7 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java
@@ -7,27 +7,26 @@
import com.zy.asrs.wms.apis.wcs.entity.domain.WaveTaskDetl;
import com.zy.asrs.wms.apis.wcs.entity.response.SowSeeds;
import com.zy.asrs.wms.apis.wcs.services.WaveManagentService;
-import com.zy.asrs.wms.asrs.entity.CacheSite;
-import com.zy.asrs.wms.asrs.entity.Order;
-import com.zy.asrs.wms.asrs.entity.OrderDetl;
-import com.zy.asrs.wms.asrs.entity.Task;
+import com.zy.asrs.wms.apis.wcs.utils.HttpEssUtils;
+import com.zy.asrs.wms.asrs.entity.*;
import com.zy.asrs.wms.asrs.entity.dto.LargeScreenTaskDto;
+import com.zy.asrs.wms.asrs.entity.enums.OrderPickStatus;
import com.zy.asrs.wms.asrs.entity.enums.TaskStsType;
import com.zy.asrs.wms.asrs.entity.param.WaveSeedReviewParam;
-import com.zy.asrs.wms.asrs.mapper.CacheSiteMapper;
-import com.zy.asrs.wms.asrs.mapper.OrderDetlMapper;
-import com.zy.asrs.wms.asrs.mapper.OrderMapper;
-import com.zy.asrs.wms.asrs.mapper.TaskMapper;
+import com.zy.asrs.wms.asrs.mapper.*;
import com.zy.asrs.wms.asrs.service.TaskService;
import com.zy.asrs.wms.asrs.service.WaveSeedService;
-import org.aspectj.weaver.ast.Or;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;
-import java.util.stream.Collectors;
+import static com.zy.asrs.wms.utils.HttpUtils.getClientIpAddress;
+
+@Slf4j
@Service
public class WaveManagentServiceImpl implements WaveManagentService {
@Autowired
@@ -37,6 +36,9 @@
private TaskService taskService;
@Autowired
private TaskMapper taskMapper;
+
+ @Autowired
+ private TaskTypeMapper taskTypeMapper;
@Autowired
private OrderMapper orderMapper;
@Autowired
@@ -66,9 +68,22 @@
}
@Override
- public R getTask() {
- List<LargeScreenTaskDto> taskDtos = taskMapper.getTaskIntegrateByTaskNo(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, TaskStsType.WAVE_SEED.id));
- return R.ok(taskDtos);
+ public R getTask(HttpServletRequest request) {
+ log.info("ip鍦板潃====>锛� {}", getClientIpAddress(request));
+ String locIp = getClientIpAddress(request);
+ List<LargeScreenTaskDto> taskDtos;
+ if (locIp.equals(HttpEssUtils.S2_SITE_NO)) {
+ taskDtos = taskMapper.getTaskIntegrateByTaskNo(new LambdaQueryWrapper<Task>()
+ .eq(Task::getTaskSts, TaskStsType.WAVE_SEED.id)
+ .eq(Task::getTargetSite, "S2")
+ .orderByAsc(Task::getUpdateTime).last("limit 1"));
+ } else {
+ taskDtos = taskMapper.getTaskIntegrateByTaskNo(new LambdaQueryWrapper<Task>()
+ .eq(Task::getTaskSts, TaskStsType.WAVE_SEED.id)
+ .eq(Task::getTargetSite, "S1")
+ .orderByAsc(Task::getUpdateTime).last("limit 1"));
+ }
+ return R.ok(taskDtos);
}
@Override
@@ -104,17 +119,9 @@
}
orders.forEach(order -> {
- List<OrderDetl> detls = orderDetlMapper.selectList(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderId, order.getId()));
- if (detls.isEmpty()) {
- throw new CoolException("璁㈠崟锛�" + order.getOrderNo() + " 娌℃湁鏄庣粏,璇疯仈绯荤鐞嗗憳锛侊紒");
- }
- List<OrderDetl> orderDetls = detls.stream().filter(orderDetl -> {
- return orderDetl.getAnfme() == (orderDetl.getWorkQty() + orderDetl.getQty());
- }).collect(Collectors.toList());
-
- if (!orderDetls.isEmpty() && orderDetls.size() == detls.size()) {
+ if (order.getPickStatus() == OrderPickStatus.ORDER_PICK_STATUS_DONE.val) {
order.setOrderStatus("宸插畬鎴�");//宸插畬鎴�
- } else if (orderDetls.size() < detls.size() && orderDetls.size() != 0) {//閮ㄥ垎瀹屾垚
+ } else if (order.getPickStatus() == OrderPickStatus.ORDER_PICK_STATUS_SECTION.val) {//閮ㄥ垎瀹屾垚
order.setOrderStatus("閮ㄥ垎瀹屾垚");
} else {//鏈畬鎴�
order.setOrderStatus("鏈畬鎴�");
@@ -129,8 +136,15 @@
* @return
*/
@Override
- public R AllSeedLocs() {
- List<CacheSite> cacheSites = cacheSiteMapper.selectList(new LambdaQueryWrapper<CacheSite>());
+ public R AllSeedLocs(HttpServletRequest request) {
+ log.info("ip鍦板潃====>锛� {}", getClientIpAddress(request));
+ String locIp = getClientIpAddress(request);
+ List<CacheSite> cacheSites;
+ if (locIp.equals(HttpEssUtils.S2_SITE_NO)) {
+ cacheSites = cacheSiteMapper.selectList(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getChannel, "S2"));
+ } else {
+ cacheSites = cacheSiteMapper.selectList(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getChannel, "S1"));
+ }
if (cacheSites.isEmpty()) {
return R.error("褰撳墠鎾澧欎俊鎭湭璁剧疆锛侊紒");
}
--
Gitblit v1.9.1