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/WrkMastLogController.java |   25 ++++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
index 669978a..2e9a168 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
@@ -51,11 +51,34 @@
             }
             wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
         }else {
-            wrapper.orderBy("modi_time", false).orderBy("wrk_no", false);
+            wrapper.orderBy("modi_time", false);
         }
         return R.ok(wrkMastLogService.selectPage(new Page<>(curr, limit), wrapper));
     }
 
+    @RequestMapping(value = "/inventoryFlow/list/auth")
+//    @ManagerAuth(memo = "搴撳瓨绉诲姩娴佹按璁板綍")
+    public R inventoryFlowList(@RequestParam(defaultValue = "1")Integer curr,
+                  @RequestParam(defaultValue = "10")Integer limit,
+                  @RequestParam(required = false)String orderByField,
+                  @RequestParam(required = false)String orderByType,
+                  @RequestParam(required = false)String condition,
+                  @RequestParam Map<String, Object> param){
+        excludeTrash(param);
+        if (Cools.isEmpty(param.get("io_time"))) {
+            param.put("startTime","");
+            param.put("endTime","");
+        } else {
+            String ioTime = (String) param.get("io_time");
+            if (ioTime.contains(RANGE_TIME_LINK)){
+                String[] dates = ioTime.split(RANGE_TIME_LINK);
+                param.put("startTime",dates[0]);
+                param.put("endTime",dates[1]);
+            }
+        }
+        return wrkMastLogService.inventoryFlowList(curr,limit,param);
+    }
+
     private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
         for (Map.Entry<String, Object> entry : map.entrySet()){
             String val = String.valueOf(entry.getValue());

--
Gitblit v1.9.1