From abb9b5c51d8a20be68b64e0c4a9620f6578d2e3a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 30 四月 2025 09:59:26 +0800
Subject: [PATCH] 手动导入订单和mes下发订单，增加客户名称和备注字段

---
 src/main/java/com/zy/asrs/controller/MobileController.java |   72 +++++++++++++++++++++++++++++++++--
 1 files changed, 67 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 2077292..96b3c97 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -11,6 +11,8 @@
 import com.zy.asrs.entity.param.*;
 import com.zy.asrs.entity.result.MobileAdjustResult;
 import com.zy.asrs.mapper.ManLocDetlMapper;
+import com.zy.asrs.mapper.OrderDetlMapper;
+import com.zy.asrs.mapper.OrderMapper;
 import com.zy.asrs.service.*;
 import com.zy.common.model.WrkDto;
 import com.zy.common.web.BaseController;
@@ -18,6 +20,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import java.util.*;
 
 /**
@@ -54,6 +57,12 @@
     private WrkDetlLogService wrkDetlLogService;
     @Autowired
     private RgvOneSignService rgvOneSignService;
+
+    @Resource
+    private OrderMapper orderMapper;
+
+    @Resource
+    private OrderDetlMapper orderDetlMapper;
 
 
     // 鍟嗗搧涓婃灦
@@ -545,22 +554,75 @@
 
     @PostMapping("/ckfh/auth")
     @ManagerAuth(memo = "鍑哄簱澶嶆牳纭")
-    public synchronized R pakoutFhqr(@RequestBody GhjtApiParam param) {
+    public synchronized R pakoutFhqr(@RequestBody PdckqrParam param) {
         // 鏍规嵁宸ヤ綔鍙风‘璁ゅ鏍�
-        if(Cools.isEmpty(param) || Cools.isEmpty(param.getWorkNo()) || Cools.isEmpty(param.getCheck())){
+        if(Cools.isEmpty(param) || Cools.isEmpty(param.getBarcode()) || Cools.isEmpty(param.getMaterials())){
             return R.parse(BaseRes.PARAM);
         }
-        mobileService.pakoutFhqr(param.getWorkNo(), param.getCheck());
-        return R.ok("澶嶆牳纭鎴愬姛");
+        return mobileService.pakoutFhqr(param);
     }
 
     @PostMapping("/pdckqr/auth")
     @ManagerAuth(memo = "鐩樼偣鍑哄簱纭")
     public synchronized R pdckqr(@RequestBody PdckqrParam param) {
         // 鏍规嵁宸ヤ綔鍙风‘璁ゅ鏍�
-        if(Cools.isEmpty(param) || Cools.isEmpty(param.getWorkNo()) ||  Cools.isEmpty(param.getMaterials())){
+        if(Cools.isEmpty(param) || Cools.isEmpty(param.getBarcode()) ||  Cools.isEmpty(param.getMaterials())){
             return R.parse(BaseRes.PARAM);
         }
         return mobileService.pdckqr(param);
     }
+
+    @PostMapping("/pdtz/auth")
+    @ManagerAuth(memo = "鐩樼偣寮傚父鎸夊疄鐗╄皟鏁村簱瀛樹俊鎭�")
+    public synchronized R pdtz(@RequestBody PdtzParam param) {
+        return mobileService.pdtz(param);
+    }
+
+    @PostMapping("/pdaWarehousingNow")
+    @ManagerAuth(memo = "pda缁勬墭绔嬪嵆鍏ュ簱")
+    public synchronized R pdaWarehousingNow(@RequestBody PdaWarehousingNowParam param) {
+
+        // 鏍规嵁宸ヤ綔鍙风‘璁ゅ鏍�
+        if(Cools.isEmpty(param) || Cools.isEmpty(param.getBarcode()) ||  Cools.isEmpty(param.getSourceStaNo())){
+            return R.parse(BaseRes.PARAM);
+        }
+        return mobileService.pdaWarehousingNow(param, getUserId());
+
+    }
+
+
+    @PostMapping("/pdaFxprk")
+    @ManagerAuth(memo = "pda鍙嶄慨鍝佸叆搴�")
+    public synchronized R pdaFxprk(@RequestBody GwmsGenerateInventoryDto param) {
+
+        return mobileService.pdaFxprk(param, getUserId());
+    }
+
+    @PostMapping("/pdaFhhd")
+    @ManagerAuth(memo = "pda鍙戣揣鏍稿")
+    public synchronized R pdaFhhd(@RequestBody PdaDhhdParam param) {
+
+        if (Cools.isEmpty(param)) {
+            return R.parse("鍙傛暟鏈夎锛岃妫�鏌ュ弬鏁�");
+        }
+
+        return mobileService.pdaFhhd(param, getUserId());
+    }
+
+    @GetMapping("/getOrderNoList/{orderNo}")
+    @ManagerAuth(memo = "鎸夊崟鎹紪鍙锋ā绯婃煡璇㈠崟鎹�")
+    public synchronized R getOrderByLikeOrderNo(@PathVariable("orderNo") String orderNo) {
+
+        return R.ok(orderMapper.selectOrderNosByOrderNoLike(orderNo));
+
+    }
+
+    @GetMapping("/getOrderDetlByOrderNo/{orderNo}")
+    @ManagerAuth(memo = "鎸夊崟鎹紪鍙锋煡璇㈠崟鎹槑缁�")
+    public synchronized R getOrderByOrderNo(@PathVariable("orderNo") String orderNo) {
+
+        return R.ok(orderDetlMapper.selectDetlList(orderNo));
+
+    }
+
 }

--
Gitblit v1.9.1