From c7ee9e7a9a0cb96d1c48bf8a8dff061f16e8a29b Mon Sep 17 00:00:00 2001
From: Administrator <56479841@QQ.COM>
Date: 星期一, 14 八月 2023 16:06:23 +0800
Subject: [PATCH] #补丁

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

diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 43b1323..edd7051 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -47,6 +47,85 @@
     private BasDevpService basDevpService;
     @Autowired
     private PackService packService;
+    @Autowired
+    private WaitPakinService waitPakinService;
+
+    // 鎷ｆ枡妫�绱㈡墭鐩樹俊鎭�
+    @RequestMapping("/piking/auth")
+    @ManagerAuth
+    public R pikingAuth(String barcode) {
+        WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
+        if (Cools.isEmpty(wrkMast)) {
+            throw new CoolException(barcode + "鏆傛棤宸ヤ綔妗�");
+        }
+        if (wrkMast.getIoType() != 103 && wrkMast.getIoType() != 107){
+            throw new CoolException(barcode + "涓嶄负鎷ｆ枡/鐩樼偣鍑哄簱");
+        }
+        List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+        return R.ok().add(wrkDetls);
+    }
+
+    // 缁勬墭鍓嶆煡璇㈡墭鐩樼爜鏄惁宸茬粡缁勬墭
+    @RequestMapping("/barcode/auth")
+    @ManagerAuth
+    public R pakinAuth(@RequestParam("barcode") String barcode) {
+        WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", barcode));
+        if (!Cools.isEmpty(waitPakin)) {
+            return R.error("鍏ュ簱閫氱煡妗ｅ凡瀛樺湪锛�");
+        }
+        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("barcode",barcode));
+        if (!Cools.isEmpty(locMast)) {
+            return R.error("搴撳瓨涓绘。涓凡瀛樺湪褰撳墠鏉＄爜锛�");
+        }
+        LocDetl locdetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("barcode", barcode));
+        if (!Cools.isEmpty(locdetl)){
+            return R.error("搴撳瓨鏄庣粏涓凡瀛樺湪褰撳墠鏉＄爜,璇锋鏌ュ簱瀛�");
+        }
+        return R.ok();
+    }
+
+    // 鎷ｆ枡杞叏鏉�
+    @RequestMapping("/piking/to/full")
+    @ManagerAuth
+    @Transactional
+    public R pikingToFull(String barcode) {
+        WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
+        if(Cools.isEmpty(wrkMast)){
+            throw new CoolException("宸ヤ綔妗ｄ笉鑳戒负绌�");
+        }
+        if (wrkMast.getIoType() != 103 && wrkMast.getIoType() != 107){
+            throw new CoolException(barcode + "涓嶄负鎷ｆ枡/鐩樼偣鍑哄簱");
+        }
+
+        Date now = new Date();
+        List<LocDetl> locDetls = locDetlService.selectByLocNo(wrkMast.getSourceLocNo());
+        wrkMast.setIoType(101);
+//        wrkMast.setSourceStaNo(wrkMast.getStaNo());
+//        wrkMast.setStaNo(200);
+        wrkMastService.updateById(wrkMast);
+
+        wrkDetlService.deleteByWrkNo(wrkMast.getWrkNo());
+        for(LocDetl locDetl : locDetls){
+            WrkDetl wrkDetl = new WrkDetl();
+            wrkDetl.setWrkNo(wrkMast.getWrkNo());
+            wrkDetl.setModiTime(now);
+            wrkDetl.setMatType(locDetl.getMatType());
+
+            wrkDetl.sync(locDetl);
+            wrkDetlService.insert(wrkDetl);
+        }
+
+        LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());
+        if (locMast.getLocSts().equals("P")) {
+            locMast.setLocSts("R");
+            locMast.setModiTime(now);
+            if (!locMastService.updateById(locMast)) {
+                throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
+            }
+        }
+        locMastService.updateById(locMast);
+        return R.ok("杞崲鎴愬姛");
+    }
 
     // 缁勬墭 ----------------------------------------------------------------------------------------------------
 
@@ -184,6 +263,7 @@
                 wrkDetl.setOrderNo(orderNo);
                 wrkDetl.setIoTime(wrkMast.getIoTime());
                 wrkDetl.setWrkNo(wrkNo);
+                wrkDetl.setMatType(locDetl.getMatType());
                 return R.ok().add(wrkDetl);
             }
         }
@@ -287,6 +367,20 @@
         return R.ok();
     }
 
+    @RequestMapping("/checkDetl/auth2")
+    @ManagerAuth
+    public R getCheckDetl2(String barcode) {
+        WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
+        if(Cools.isEmpty(wrkMast)){
+            throw new CoolException("姝ゆ墭鐩樼爜娌℃湁鐩樼偣浠诲姟");
+        }
+        if (wrkMast.getIoType() != 107){
+            throw new CoolException("姝ゆ墭鐩樼爜涓嶄负鐩樼偣鍑哄簱");
+        }
+        List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+        return R.ok().add(wrkDetls);
+    }
+
     @RequestMapping("/adjust/auth")
     @ManagerAuth(memo = "鐩樼偣")
     public R adjust(@RequestBody MobileAdjustParam combParam){
@@ -294,5 +388,17 @@
         return R.ok("鐩樼偣鎴愬姛");
     }
 
+    @RequestMapping("/adjustNew/auth")
+    @ManagerAuth(memo = "鐩樼偣")
+    public synchronized R adjustNew(@RequestBody MobileAdjustParam combParam){
+        mobileService.adjustNew(combParam, Boolean.FALSE, getUserId());
+        return R.ok("鐩樼偣鎴愬姛");
+    }
 
+    @RequestMapping("/adjustNew/v2/auth")
+    @ManagerAuth(memo = "琛ヨ揣")
+    public synchronized R adjustNewV2(@RequestBody MobileAdjustParam combParam){
+        mobileService.adjustNew(combParam, Boolean.TRUE, getUserId());
+        return R.ok("琛ヨ揣鎴愬姛");
+    }
 }

--
Gitblit v1.9.1