From a49cdaa669f18d92e8fef5d84da536c0465670db Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 17 十二月 2025 21:21:07 +0800
Subject: [PATCH] 1.新增组托入库生成AGV搬运任务，执行AGV搬运任务时判断堆垛机接驳站点是否有空料架，有的话需要进行搬离（没有出库任务的情况下） 2.完善配盘出库单agv目标地点，可能是区域也可能是站点 Q为区域；Z为站点 3.完善立库入库找规则方法
---
src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java b/src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java
index 966252a..67a4a26 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java
@@ -17,9 +17,27 @@
@Insert("insert into asr_wrk_detl_log select * from asr_wrk_detl where wrk_no=#{workNo}")
int save(Integer workNo);
- List<WrkDetlLog> selectWrkDetlLogs(@Param("wrkNo") Integer wrkNo, @Param("orderNo") String orderNo, @Param("modiTimeStart") Date modiTimeStart, @Param("modiTimeEnd") Date modiTimeEnd, @Param("pageNumber") Integer curr, @Param("pageSize") Integer limit);
+ List<WrkDetlLog> selectWrkDetlLogs(@Param("wrkNo") Integer wrkNo,
+ @Param("orderNo") String orderNo,
+ @Param("matnr") String matnr,
+ @Param("specs") String specs,
+ @Param("zpallet") String zpallet,
+ @Param("batch") String batch,
+ @Param("anfme") Double anfme,
+ @Param("modiTimeStart") Date modiTimeStart,
+ @Param("modiTimeEnd") Date modiTimeEnd,
+ @Param("pageNumber") Integer curr,
+ @Param("pageSize") Integer limit);
- Long selectWrkDetlLogsTotal(@Param("wrkNo") Integer wrkNo, @Param("orderNo") String orderNo, @Param("modiTimeStart") Date modiTimeStart, @Param("modiTimeEnd") Date modiTimeEnd);
+ Long selectWrkDetlLogsTotal(@Param("wrkNo") Integer wrkNo,
+ @Param("orderNo") String orderNo,
+ @Param("matnr") String matnr,
+ @Param("specs") String specs,
+ @Param("zpallet") String zpallet,
+ @Param("batch") String batch,
+ @Param("anfme") Double anfme,
+ @Param("modiTimeStart") Date modiTimeStart,
+ @Param("modiTimeEnd") Date modiTimeEnd);
}
--
Gitblit v1.9.1