From 01fa93b5dd9f20286ef8f22515caf55307f76a9d Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 20 三月 2026 09:52:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxhcasrs' into jxhcasrs

---
 src/main/java/com/zy/asrs/service/WrkMastService.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/WrkMastService.java b/src/main/java/com/zy/asrs/service/WrkMastService.java
index 481b521..69bcbd1 100644
--- a/src/main/java/com/zy/asrs/service/WrkMastService.java
+++ b/src/main/java/com/zy/asrs/service/WrkMastService.java
@@ -2,7 +2,9 @@
 
 import com.baomidou.mybatisplus.service.IService;
 import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.result.FindLocNoAttributeVo;
 
+import java.util.Date;
 import java.util.List;
 
 public interface WrkMastService extends IService<WrkMast> {
@@ -24,6 +26,8 @@
 
     int selectWrkMastBareBoardStaNo(Integer ioType,Integer staNo);
 
-    List<WrkMast> selectWrkMastWrkDetlMatnrBatch(Integer ioType,String matnr , String batch ,String grade,Integer crnNo);
+    List<WrkMast> selectWrkMastWrkDetl(Integer ioType, FindLocNoAttributeVo findLocNoAttributeVo, Integer crnNo);
+
+    int updatePublishError(Integer wrkNo, String updMk, Date errorTime, String errorMemo);
 
 }

--
Gitblit v1.9.1