From c94a87065a12006c1b3251418a13a459b23aa7e4 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 27 九月 2023 10:15:42 +0800
Subject: [PATCH] #库龄、库存异常分离

---
 src/main/java/com/zy/asrs/controller/MobileController.java |   74 +++++++++++++++++++++++++++++++++++++
 1 files changed, 74 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 3c85513..bd592bb 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -1,6 +1,7 @@
 package com.zy.asrs.controller;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.core.annotations.ManagerAuth;
 import com.core.common.Cools;
 import com.core.common.R;
@@ -47,6 +48,8 @@
     private BasDevpService basDevpService;
     @Autowired
     private PackService packService;
+    @Autowired
+    private WaitPakinService waitPakinService;
 
     // 鎷ｆ枡妫�绱㈡墭鐩樹俊鎭�
     @RequestMapping("/piking/auth")
@@ -61,6 +64,25 @@
         }
         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();
     }
 
     // 鎷ｆ枡杞叏鏉�
@@ -89,6 +111,7 @@
             wrkDetl.setWrkNo(wrkMast.getWrkNo());
             wrkDetl.setModiTime(now);
             wrkDetl.setMatType(locDetl.getMatType());
+            wrkDetl.setOwner(locDetl.getOwner());
 
             wrkDetl.sync(locDetl);
             wrkDetlService.insert(wrkDetl);
@@ -380,4 +403,55 @@
         mobileService.adjustNew(combParam, Boolean.TRUE, getUserId());
         return R.ok("琛ヨ揣鎴愬姛");
     }
+
+    @RequestMapping("/pick/auth")
+    @ManagerAuth(memo = "鎷ｆ枡")
+    public synchronized R pickAuth(@RequestBody String barcode){
+        WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
+        List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
+        return R.ok().add(wrkDetls);
+    }
+
+    @RequestMapping("/order/search/orderNo/auth/v2")
+    @ManagerAuth
+    public R orderSearchByBarcodeV2(@RequestParam String orderNo){
+        if (Cools.isEmpty(orderNo)){
+            orderNo=null;
+        }
+        List<Order> orders = orderService.selectOrderNoL(orderNo);
+        if (Cools.isEmpty(orders)){
+            return R.ok();
+        }
+        LinkedList<CombParam> combParams = new LinkedList<>();
+        if (!Cools.isEmpty(orders)){
+            for (Order order:orders){
+                CombParam combParam=new CombParam();
+                if (order == null) {
+                    continue;
+                }
+                DocType docType = docTypeService.selectById(order.getDocType());
+                if (docType.getPakin() == null || docType.getPakin() != 1) {
+                    continue;
+                }
+                if (order.getSettle() > 2) {
+                    continue;
+                }
+                List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
+                if (!Cools.isEmpty(orderDetls)) {
+                    LinkedList<CombParam.CombMat> combMats = new LinkedList<>();
+                    for (OrderDetl orderDetl:orderDetls){
+                        CombParam.CombMat combMat = new CombParam.CombMat();
+                        combMat.setMatnr(orderDetl.getMatnr());
+                        combMat.setBatch(orderDetl.getBatch());
+                        combMat.setAnfme(orderDetl.getAnfme());
+                        combMats.add(combMat);
+                    }
+                    combParam.setCombMats(combMats);
+                }
+                combParam.setOrderNo(order.getOrderNo());
+                combParams.add(combParam);
+            }
+        }
+        return R.ok().add(combParams);
+    }
 }

--
Gitblit v1.9.1