From d780ce5e45bf41278f554288bb4b0ac6c37b2c4a Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 08 十一月 2025 16:06:13 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/controller/OpenController.java |   32 +++++++-------------------------
 1 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index d0061c3..174e6b9 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -13,6 +13,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -311,27 +312,14 @@
      * 娣诲姞鍑哄簱鍗曘�佹甯搁��搴撹嚦浜屾ゼ鍖呰
      */
     @PostMapping("/order/normalTransferToTheSecond-floorPackagingArea/v1")
-    @AppAuth(memo = "姝e父閫�搴撹嚦浜屾ゼ鍖呰")
+    @AppAuth(memo = "鎷嗗寘瑁呮鍑哄簱")
     public synchronized R packagingAreaOrderCreate(@RequestHeader(required = false) String appkey,
-                                            @RequestBody QualityInspectionParam param,
+                                            @RequestBody @Valid OrderCargoBookingNoteParam param,
                                             HttpServletRequest request) {
         auth(appkey, param, request);
         if (Cools.isEmpty(param)) {
             return R.parse(BaseRes.PARAM);
         }
-        //鍒ゆ柇param鍙傛暟
-        if (Cools.isEmpty(param.getBoxNo())){
-            throw new CoolException("鍙傛暟锛氱鍙� boxNo涓虹┖");
-        }
-        //鍒ゆ柇param鍙傛暟
-        if (Cools.isEmpty(param.getModel())){
-            throw new CoolException("鍙傛暟锛氬嵎鍙� Model涓虹┖");
-        }
-        //鍒ゆ柇param鍙傛暟
-        if (Cools.isEmpty(param.getMemo())){
-            throw new CoolException("鍙傛暟锛氬娉� Memo涓虹┖");
-        }
-
         return openService.packagingAreaOrderCreate(param);
     }
 
@@ -343,23 +331,17 @@
     @PostMapping("/order/cargo/booking/note/v1")
     @AppAuth(memo = "璁″垝缁勮揣鍗�")
     public synchronized R cargoBookingNote(@RequestHeader(required = false) String appkey,
-                                                   @RequestBody OrderCargoBookingNoteParam param,
+                                                   @RequestBody @Valid OrderCargoBookingNoteParam param,
                                                    HttpServletRequest request) {
         auth(appkey, param, request);
         if (Cools.isEmpty(param)) {
             return R.parse(BaseRes.PARAM);
         }
-        //鍒ゆ柇param鍙傛暟
         if (Cools.isEmpty(param.getGroupGoodsNo())){
-            throw new CoolException("鍙傛暟锛氱粍璐у崟鍙� groupGoodsNo涓虹┖");
+            return new R(401,"缁勮揣鍗曞彿涓虹┖锛�");
         }
-        //鍒ゆ柇param鍙傛暟
-        if (Cools.isEmpty(param.getModelList()) || param.getBoxNoList().isEmpty()){
-            throw new CoolException("鍙傛暟锛氬嵎鍙� modelList涓虹┖");
-        }
-        //鍒ゆ柇param鍙傛暟
-        if (Cools.isEmpty(param.getBoxNoList()) || param.getModelList().isEmpty()){
-            throw new CoolException("鍙傛暟锛氱鍙烽泦鍚� boxNoList涓虹┖");
+        if (Cools.isEmpty(param.getCstmrName())){
+            return new R(401,"瀹㈡埛鍚嶇О涓虹┖锛�");
         }
 
         return openService.cargoBookingNote(param);

--
Gitblit v1.9.1