From 641f7bb8b2d2e23f1f5192fecf030a567151c7b5 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 15 七月 2025 17:50:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghjtasrs' into ghjtasrs
---
src/main/java/com/zy/asrs/service/WrkDetlLogService.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/WrkDetlLogService.java b/src/main/java/com/zy/asrs/service/WrkDetlLogService.java
index b154e7f..0f81bd0 100644
--- a/src/main/java/com/zy/asrs/service/WrkDetlLogService.java
+++ b/src/main/java/com/zy/asrs/service/WrkDetlLogService.java
@@ -10,8 +10,8 @@
boolean save(Integer workNo);
- List<WrkDetlLog> selectWrkDetlLogs(Integer wrkNo, String orderNo, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit);
+ List<WrkDetlLog> selectWrkDetlLogs(Integer wrkNo, String orderNo,String matnr,String specs,String zpallet,String batch,String model,Double anfme, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit);
- Long selectWrkDetlLogsTotal(Integer wrkNo, String orderNo, Date modiTimeStart, Date modiTimeEnd);
+ Long selectWrkDetlLogsTotal(Integer wrkNo, String orderNo,String matnr,String specs,String zpallet,String batch,String model,Double anfme, Date modiTimeStart, Date modiTimeEnd);
}
--
Gitblit v1.9.1