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 | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 101 insertions(+), 1 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 8b694c3..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
@@ -1,12 +1,29 @@
package com.zy.asrs.wms.apis.wcs.controller;
+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 {
@@ -23,13 +40,79 @@
return waveManagentService.getSowSeeds();
}
+
/**
- * 瀹℃牳鎾鐘舵�佷换鍔�
+ * 閫氳繃浠诲姟鍙锋媺鍙栦换鍔℃槑缁�
+ * @param taskNo
+ * @return
+ */
+ @GetMapping("/sow/task/detl/{taskNo}")
+ public R getTaskDetl(@PathVariable String taskNo) {
+ if (StringUtils.isNullOrEmpty(taskNo)) {
+ throw new CoolException("浠诲姟缂栫爜涓嶈兘涓虹┖锛侊紒");
+ }
+ return waveManagentService.getTaskDetl(taskNo);
+ }
+
+
+ /**
+ * 澶у睆鑾峰彇浠诲姟鏄庣粏
+ * 鑾峰彇褰撳墠鎾涓叿浣撲换鍔℃槑缁�
+ * @param param
+ * @return
+ */
+ @PostMapping("/task/detl/qutify")
+ public R getTaskDetlQutify(@RequestBody Map<String, Object> param) {
+ if (Objects.isNull(param)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(param.get("taskNo"))) {
+ throw new CoolException("璇锋眰鍙傛暟锛氫换鍔＄紪鐮佷笉鑳戒负绌猴紒锛�");
+ }
+ String taskNoStr = (String) param.get("taskNo");
+// Long matnr = Long.valueOf(taskNo.get("matnr").toString());
+
+ return waveManagentService.getTaskDetlQutify(taskNoStr);
+ }
+
+ /**
+ * 鑾峰彇褰撳墠鎾澧欏簱浣嶄俊鎭�
+ * @return
+ */
+ @GetMapping("/seed/locs")
+ public R getSeedLoc() {
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ return waveManagentService.AllSeedLocs(request);
+ }
+
+ /***
+ * 澶у睆鑾峰彇鍑哄簱鍒楄〃
+ * 鑾峰彇褰撳墠鎾涓墽琛屾暟鎹�
+ * @return
+ */
+ @GetMapping("/sow/tasks")
+ public R getTasks() {
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ return waveManagentService.getTask(request);
+ }
+
+ /**
+ * 娉㈡鎾
+ * 鎾鏄庣粏鏁伴噺淇敼
* @param reviewParam
* @return
*/
@PostMapping("/sow/review")
public R reviewSeeds(@RequestBody WaveSeedReviewParam reviewParam) {
+ if (Objects.isNull(reviewParam)) {
+ return R.error("鎾鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(reviewParam.getReviewNum())) {
+ return R.error("鎾鏁伴噺涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(reviewParam.getWaveSeedId())) {
+ return R.error("鎾鏄庣粏鏍囪瘑涓嶈兘涓虹┖锛侊紒");
+ }
return waveManagentService.reviewSeeds(reviewParam);
}
@@ -46,4 +129,21 @@
return R.error("鍒犻櫎澶辫触锛侊紒");
}
}
+
+ /**
+ * 澶у睆鑾峰彇娉㈡鎵�鏈夎鍗曚俊鎭�
+ * @param waveNo
+ * @return
+ */
+ @GetMapping("/orders/{waveNo}")
+ public R getWaveOrders(@PathVariable String waveNo) {
+ if (StringUtils.isNullOrEmpty(waveNo)) {
+ return R.error("娉㈡缂栫爜涓嶈兘涓虹┖锛侊紒锛�");
+ }
+ return waveManagentService.getAllOrders(waveNo);
+ }
+
+
+
+
}
--
Gitblit v1.9.1