From d497d66f3cfb2a2d0672c499b3a19d006548aa2a Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 07 十二月 2023 10:47:14 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/MobileController.java |   85 +++++++++++++++++++++++++++++++++++++++---
 1 files changed, 78 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index cd6085b..8683a42 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -9,9 +9,7 @@
 import com.core.common.R;
 import com.core.exception.CoolException;
 import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.CombParam;
-import com.zy.asrs.entity.param.MobileAdjustParam;
-import com.zy.asrs.entity.param.OffSaleParam;
+import com.zy.asrs.entity.param.*;
 import com.zy.asrs.entity.result.MobileAdjustResult;
 import com.zy.asrs.mapper.ManLocDetlMapper;
 import com.zy.asrs.service.*;
@@ -54,6 +52,8 @@
     private PackService packService;
     @Autowired
     private ManLocDetlMapper manLocDetlMapper;
+    @Autowired
+    private WrkDetlLogService wrkDetlLogService;
 
 
     // 鍟嗗搧涓婃灦
@@ -77,7 +77,7 @@
 
     /**
      * 鏍规嵁鍗曞彿妫�绱㈠崟鎹暟鎹�
-     * http://localhost:8081/jkwms/mobile/order/serach/orderNo/auth?orderNo=123123
+     * http://localhost:8081/jtwms/mobile/order/serach/orderNo/auth?orderNo=123123
      */
 //    @RequestMapping("/order/search/orderNo/auth")
 //    @ManagerAuth
@@ -118,10 +118,10 @@
                 }
                 DocType docType = docTypeService.selectById(order.getDocType());
                 if (docType.getPakin() == null || docType.getPakin() != 1) {
-                    return R.ok();
+                    continue;
                 }
                 if (order.getSettle() > 2) {
-                    return R.ok();
+                    continue;
                 }
                 List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
                 if (!Cools.isEmpty(orderDetls)) {
@@ -130,7 +130,9 @@
                         CombParam.CombMat combMat = new CombParam.CombMat();
                         combMat.setMatnr(orderDetl.getMatnr());
                         combMat.setBatch(orderDetl.getBatch());
-                        combMat.setAnfme(orderDetl.getAnfme());
+                        combMat.setAnfme(orderDetl.getAnfme()-orderDetl.getWorkQty());
+                        combMat.setMaktx(orderDetl.getMaktx());
+                        combMat.setSpecs(orderDetl.getSpecs());
                         combMats.add(combMat);
                     }
                     combParam.setCombMats(combMats);
@@ -142,6 +144,75 @@
         return R.ok().add(combParams);
     }
 
+    @RequestMapping("/wrkDetl/search/batch/auth")
+    @ManagerAuth(memo = "鍑哄簱纭鑾峰彇淇℃伅")
+    public R wrkDetlSearchByBatch(@RequestBody String batch){
+        if (Cools.isEmpty(batch)){
+            return R.error("鍙傛暟涓虹┖");
+        }
+//        List<Order> orders = orderService.selectorderNoL(batch);
+        WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", batch));
+        if (Cools.isEmpty(wrkDetl)){
+            WrkDetlLog wrkDetlLog = wrkDetlLogService.selectOne(new EntityWrapper<WrkDetlLog>().eq("batch", batch));
+            if (Cools.isEmpty(wrkDetlLog)){
+                return R.error("鏈煡鍒版暟鎹�");
+            }
+            wrkDetl = new WrkDetl();
+            wrkDetl.sync(wrkDetlLog);
+            wrkDetl.setBatch(wrkDetlLog.getBatch());
+            wrkDetl.setBarcode(wrkDetlLog.getBarcode());
+            wrkDetl.setDeadTime(wrkDetlLog.getDeadTime());
+        }
+        if (Cools.isEmpty(wrkDetl)){
+            return R.error("鏈煡鍒版暟鎹�");
+        }
+        return R.ok().add(wrkDetl);
+    }
+
+    @RequestMapping("/order/search/batch/auth")
+    @ManagerAuth(memo = "鍑哄簱纭")
+    public R orderSearchByBatch(@RequestBody String batch){
+        if (Cools.isEmpty(batch)){
+            return R.error("鍙傛暟涓虹┖");
+        }
+        String orderNo = "";
+        WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", batch));
+        if (Cools.isEmpty(wrkDetl)) {
+            WrkDetlLog wrkDetlLog = wrkDetlLogService.selectOne(new EntityWrapper<WrkDetlLog>().eq("batch", batch));
+            if (Cools.isEmpty(wrkDetlLog)) {
+                return R.error("鏈煡鍒版暟鎹�");
+            }
+            orderNo=wrkDetlLog.getOrderNo();
+        }else {
+            orderNo=wrkDetl.getOrderNo();
+        }
+//        List<Order> orders = orderService.selectorderNoL(batch);
+        OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("batch", batch).eq("order_no",orderNo));
+        if (Cools.isEmpty(orderDetl)){
+            return R.error("鏈煡鍒版暟鎹�");
+        }
+        if (!orderDetl.getQty$().equals("宸插畬鎴�")){
+            return R.error("浠诲姟鏈畬鎴�");
+        }
+        orderDetl.setSource(1);
+        orderDetlService.updateById(orderDetl);
+        return R.ok();
+    }
+
+    @RequestMapping("/truss/auth")
+    @ManagerAuth(memo = "閫�搴擄紝1妤兼鏋堕��搴�")
+    public R trussComb(@RequestBody TrussCombParam combParam){
+        mobileService.trussComb(combParam, getUserId());
+        return R.ok("缁勬墭鎴愬姛");
+    }
+
+    @RequestMapping("/truss/comd/auth")
+    @ManagerAuth(memo = "鎵嬪姩鍏ュ簱锛�2妤兼棤闇�妗佹灦鎵嬪姩鍏ュ簱")
+    public R trussComb2(@RequestBody PalletizingCompleteParam combParam){
+        mobileService.trussComb2(combParam, getUserId());
+        return R.ok("缁勬墭鎴愬姛");
+    }
+
     @RequestMapping("/comb/auth")
     @ManagerAuth(memo = "缁勬墭")
     public R comb(@RequestBody CombParam combParam){

--
Gitblit v1.9.1