From c6c9b7d3baa822765768c110304d27623f946286 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 15 七月 2025 14:29:09 +0800
Subject: [PATCH] `1`

---
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java |   86 +++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 82 insertions(+), 4 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 ecc1633..6d62137 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,14 +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 {
@@ -33,30 +48,76 @@
      */
     @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) {
-        return waveManagentService.getTaskDetlQutify(param);
+        if (Objects.isNull(param)) {
+            throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+        }
+        if (Objects.isNull(param.get("taskNo"))) {
+            throw new CoolException("璇锋眰鍙傛暟锛氫换鍔＄紪鐮佷笉鑳戒负绌猴紒锛�");
+        }
+        String taskNoStr = (String) param.get("taskNo");
+        String waveNo = param.get("waveNo").toString();
+//        Long matnr = Long.valueOf(taskNo.get("matnr").toString());
+
+        return waveManagentService.getTaskDetlQutify(taskNoStr, waveNo);
+    }
+
+    /**
+     * 鑾峰彇褰撳墠鎾澧欏簱浣嶄俊鎭�
+     * @return
+     */
+    @GetMapping("/seed/locs")
+    public R getSeedLoc() {
+        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
      */
     @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("鎾鏄庣粏鏍囪瘑涓嶈兘涓虹┖锛侊紒");
+        }
+//        if (Objects.isNull(reviewParam.getSiteNo())) {
+//            return R.error("鎾绔欑偣涓嶈兘涓虹┖锛侊紒");
+//        }
+
         return waveManagentService.reviewSeeds(reviewParam);
     }
 
@@ -73,4 +134,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