From f3ce4485cd37eb7c3bcf16fde86a7f149974c4b6 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 20 三月 2026 09:51:50 +0800
Subject: [PATCH] #检查导出功能:  1.商品档案无异常  2.库存明细管理(异常)已修复  3.库存明细统计无异常  4.工作档查询维护无异常  5.工作档明细查询无异常  6.工作历史档查询无异常  7.工作明细历史档查询无异常  8.入库通知历史档无异常  9.库存移动流水记录(异常)已修复  10.机台工位绑定无异常  11.库存调整记录无异常  12.工作档维护日志(异常)已修复  13.操作日志无异常

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

diff --git a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
index 203edfa..882eb1c 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
@@ -10,6 +10,7 @@
 import com.core.common.Cools;
 import com.core.common.DateUtils;
 import com.core.common.R;
+import com.zy.asrs.entity.InventoryFlowDto;
 import com.zy.asrs.entity.WrkMastLog;
 import com.zy.asrs.service.WrkMastLogService;
 import com.zy.common.web.BaseController;
@@ -79,6 +80,26 @@
         return wrkMastLogService.inventoryFlowList(curr,limit,param);
     }
 
+    @RequestMapping(value = "/inventoryFlow/export/auth")
+    @ManagerAuth(memo = "搴撳瓨绉诲姩娴佹按璁板綍瀵煎嚭")
+    public R inventoryFlowExport(@RequestBody JSONObject param){
+        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+        Map<String, Object> map = excludeTrash(param.getJSONObject("inventoryFlow"));
+        if (Cools.isEmpty(map.get("io_time"))) {
+            map.put("startTime","");
+            map.put("endTime","");
+        } else {
+            String ioTime = (String) map.get("io_time");
+            if (ioTime.contains(RANGE_TIME_LINK)){
+                String[] dates = ioTime.split(RANGE_TIME_LINK);
+                map.put("startTime",dates[0]);
+                map.put("endTime",dates[1]);
+            }
+        }
+        List<InventoryFlowDto> list = wrkMastLogService.inventoryFlowAll(map);
+        return R.ok(exportSupport(list, fields));
+    }
+
     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