From b176072388747abb438990157bfa305b215b4b90 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 14 四月 2026 21:59:39 +0800
Subject: [PATCH] 我们现在讨论一下系统找库位方案, 如何实现,对现有找库位规则进行整改,数据库也要整改 1、要能方便的填写单伸堆垛机或双伸堆垛机的深浅库位配置 2、根据设备状态分配库位,离线设备不分配 3、库位分配要均衡到每一个设备  4、库位高度需要匹配到对应库位信息,低库位能向上兼容  5、空托盘优先放在locType2库位=1的库位,没有这种库位了,允许放到其他库位 6、给入库站点设置有限去那些堆垛机,其次去那些堆垛机,弄成页面可以配置入库站点 7、在系统配置新增优先放前几列的配置,当入库的货物是高频货物时放在前几列 8、组托中会标识该托盘是高频还是低频,如果是高频则从前往后找库位,如果是低频则从后往前找库位 9、找库位时locMast中whsType字段无用

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

diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index e10b4c3..8489065 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -13,6 +13,8 @@
 import com.zy.asrs.entity.result.MobileAdjustResult;
 import com.zy.asrs.mapper.ManLocDetlMapper;
 import com.zy.asrs.service.*;
+import com.zy.asrs.service.impl.OrderDetlPakinServiceImpl;
+import com.zy.asrs.service.impl.OrderPakinServiceImpl;
 import com.zy.asrs.utils.OrderInAndOutUtil;
 import com.zy.common.model.WrkDto;
 import com.zy.common.web.BaseController;
@@ -54,6 +56,10 @@
 
     @Resource
     private StaDescService staDescService;
+    @Autowired
+    private OrderPakinServiceImpl orderPakinService;
+    @Autowired
+    private OrderDetlPakinServiceImpl orderDetlPakinService;
 
     @RequestMapping("/pda/WarehouseOut/v1")
     @ManagerAuth(memo = "骞舵澘閫斾腑鎷f枡-鍙傝�冨康鍒�")
@@ -197,6 +203,40 @@
         return R.ok().add(combParams);
     }
 
+    @RequestMapping("/order/search/orderDetl/auth")
+    @ManagerAuth
+    public R orderDetlSearchByBarcode(@RequestBody OrderDetlByCode param){
+        if (Cools.isEmpty(param)){
+            return R.ok();
+        }
+        List<OrderDetlPakin> orderDetls = orderDetlPakinService.selectOrderDetls(param);
+        CombParam combParam = new CombParam();
+        if (!Cools.isEmpty(orderDetls)) {
+            LinkedList<CombParam.CombMat> combMats = new LinkedList<>();
+
+            for (OrderDetlPakin od : orderDetls) {
+                CombParam.CombMat mat = new CombParam.CombMat();
+                mat.setMatnr(od.getMatnr());
+                mat.setOrderNo(od.getOrderNo());
+                mat.setAnfme(od.getAnfme() - od.getWorkQty());
+                mat.setMaktx(od.getMaktx());
+                mat.setSku(od.getSku());
+                mat.setMemo(od.getMemo());
+                mat.setSupp(od.getSupp());
+                mat.setBoxType1(od.getBoxType1());
+                mat.setBoxType2(od.getBoxType2());
+                mat.setBoxType3(od.getBoxType3());
+                mat.setStandby1(od.getStandby1());
+                mat.setStandby2(od.getStandby2());
+                mat.setStandby3(od.getStandby3());
+                combMats.add(mat);
+            }
+            combParam.setCombMats(combMats);
+        }
+        return R.ok().add(combParam);
+    }
+
+
 
     @RequestMapping("/comb/auth")
     @ManagerAuth(memo = "缁勬墭")
@@ -211,14 +251,6 @@
     public R combAuto(@RequestBody CombParam combParam){
 //        mobileService.comb(combParam, getUserId());
         mobileService.comb(combParam, getUserId());
-        return R.ok("缁勬墭鎴愬姛");
-    }
-
-    @RequestMapping("/combAuto/wcs/auth")
-//    @ManagerAuth(memo = "缁勬墭")
-    public R combAutoWcs(@RequestBody CombParam combParam){
-//        mobileService.comb(combParam, getUserId());
-        mobileService.combAuto(combParam, 7777L);
         return R.ok("缁勬墭鎴愬姛");
     }
 

--
Gitblit v1.9.1