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/controller/WaveManagentController.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java
index ce2cf7c..d59b241 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java
@@ -3,15 +3,27 @@
import com.mysql.cj.util.StringUtils;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.exception.CoolException;
+import com.zy.asrs.wms.apis.wcs.entity.request.RfidSingalRequest;
+import com.zy.asrs.wms.apis.wcs.entity.response.CommonReponse;
import com.zy.asrs.wms.apis.wcs.services.WaveManagentService;
import com.zy.asrs.wms.asrs.entity.param.WaveSeedReviewParam;
import com.zy.asrs.wms.system.controller.BaseController;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+import javax.servlet.http.HttpServletRequest;
import java.util.Map;
import java.util.Objects;
+import static com.zy.asrs.wms.utils.HttpUtils.getClientIpAddress;
+
+/**
+ * 澶у睆鎿嶄綔鍩烘湰鍔熻兘
+ */
+@Slf4j
@RestController
@RequestMapping("/wave")
public class WaveManagentController extends BaseController {
@@ -45,6 +57,7 @@
/**
* 澶у睆鑾峰彇浠诲姟鏄庣粏
+ * 鑾峰彇褰撳墠鎾涓叿浣撲换鍔℃槑缁�
* @param param
* @return
*/
@@ -68,20 +81,24 @@
*/
@GetMapping("/seed/locs")
public R getSeedLoc() {
- return waveManagentService.AllSeedLocs();
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ return waveManagentService.AllSeedLocs(request);
}
/***
* 澶у睆鑾峰彇鍑哄簱鍒楄〃
+ * 鑾峰彇褰撳墠鎾涓墽琛屾暟鎹�
* @return
*/
@GetMapping("/sow/tasks")
public R getTasks() {
- return waveManagentService.getTask();
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ return waveManagentService.getTask(request);
}
/**
- * 瀹℃牳鎾鐘舵�佷换鍔�
+ * 娉㈡鎾
+ * 鎾鏄庣粏鏁伴噺淇敼
* @param reviewParam
* @return
*/
@@ -126,4 +143,7 @@
return waveManagentService.getAllOrders(waveNo);
}
+
+
+
}
--
Gitblit v1.9.1