From 5833f3f3aa5313fa1170cd9ab0c5857f964ba96c Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 16 八月 2025 13:20:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghjtasrs' into ghjtasrs
---
src/main/java/com/zy/asrs/service/WrkMastService.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/WrkMastService.java b/src/main/java/com/zy/asrs/service/WrkMastService.java
index ff9c2ba..5b2b80c 100644
--- a/src/main/java/com/zy/asrs/service/WrkMastService.java
+++ b/src/main/java/com/zy/asrs/service/WrkMastService.java
@@ -10,8 +10,10 @@
int getWorkingMast(Integer devpNo);
List<WrkMast> selectToBeCompleteData();
+ List<WrkMast> selectToBeCompleteData202();
List<WrkMast> selectToBeHistoryData();
+ List<WrkMast> selectToBeHistoryData2();
WrkMast selectByBarcode(String barcode);
@@ -21,4 +23,6 @@
* @return
*/
int getStoreCount(Integer crnNo);
+
+ int saveWrkMastLog(Integer workNo);
}
--
Gitblit v1.9.1