From 84ead25acd7a74ff53c1840b5834b97ae8e46ebd Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 21 九月 2023 16:51:24 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/MobileController.java |   85 +++++++++++++++++++++++++++++++++++-------
 1 files changed, 70 insertions(+), 15 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..1d05c39 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -47,6 +47,8 @@
     private BasDevpService basDevpService;
     @Autowired
     private PackService packService;
+    @Autowired
+    private ManLocDetlService manLocDetlService;
 
     // 缁勬墭 ----------------------------------------------------------------------------------------------------
 
@@ -57,28 +59,54 @@
     @RequestMapping("/order/search/orderNo/auth")
     @ManagerAuth
     public R orderSearchByBarcode(@RequestParam String orderNo){
-        Order order = orderService.selectByNo(orderNo);
-        if (order == null) {
+        if (Cools.isEmpty(orderNo)){
+            orderNo=null;
+        }
+        List<Order> orders = orderService.selectorderNoL(orderNo);
+        if (Cools.isEmpty(orders)){
             return R.ok();
         }
-        DocType docType = docTypeService.selectById(order.getDocType());
-        if (docType.getPakin() == null || docType.getPakin() != 1) {
-            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()-orderDetl.getQty());
+                        combMat.setMaktx(orderDetl.getMaktx());
+                        combMat.setSpecs(orderDetl.getSpecs());
+                        combMat.setCsocode(orderDetl.getColor());
+                        combMat.setIsoseq(orderDetl.getOrigin());
+                        combMats.add(combMat);
+                    }
+                    combParam.setCombMats(combMats);
+                }
+                combParam.setOrderNo(order.getOrderNo());
+                combParams.add(combParam);
+            }
         }
-        if (order.getSettle() > 2) {
-            return R.ok();
-        }
-        List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
-        if (Cools.isEmpty(orderDetls)) {
-            return R.ok();
-        }
-        return R.ok().add(orderDetls);
+        return R.ok().add(combParams);
     }
 
     @RequestMapping("/comb/auth")
-    @ManagerAuth(memo = "缁勬墭")
+//    @ManagerAuth(memo = "缁勬墭")
     public R comb(@RequestBody CombParam combParam){
-        mobileService.comb(combParam, getUserId());
+        mobileService.comb(combParam, 1l);
         return R.ok("缁勬墭鎴愬姛");
     }
 
@@ -294,5 +322,32 @@
         return R.ok("鐩樼偣鎴愬姛");
     }
 
+    /*
+    骞冲簱 搴撲綅鎺ㄨ崘
+     */
+    @RequestMapping("/node/recommend/loc")
+    @ManagerAuth(memo = "搴撲綅鎺ㄨ崘")
+    public R recommendNodeLoc(){
+
+
+        return R.ok();
+    }
+
+    /*
+    骞冲簱 璁㈠崟涓婃灦
+     */
+    @RequestMapping("/node/puttway")
+    @ManagerAuth(memo = "璁㈠崟涓婃灦")
+    public R putway(@RequestBody HashMap<String,String> params){
+        String zpallet = params.get("zpallet");
+        String locNo = params.get("locNo");
+
+        mobileService.nodePutway(zpallet,locNo,getUser());
+
+
+        return R.ok();
+    }
+
+
 
 }

--
Gitblit v1.9.1