From 0ffd698f8e3a92e0f82f16ddad90c2c86f16bfdf Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期一, 15 七月 2024 13:29:39 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java
index bcfd042..cce82a4 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java
@@ -1,5 +1,6 @@
 package com.zy.asrs.service.impl;
 
+import com.zy.asrs.entity.WrkDetl;
 import com.zy.asrs.mapper.WrkDetlLogMapper;
 import com.zy.asrs.entity.WrkDetlLog;
 import com.zy.asrs.service.WrkDetlLogService;
@@ -18,12 +19,17 @@
     }
 
     @Override
-    public List<WrkDetlLog> selectWrkDetlLogs(Integer wrkNo, String orderNo, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit) {
-        return this.baseMapper.selectWrkDetlLogs(wrkNo, orderNo, modiTimeStart, modiTimeEnd, curr, limit);
+    public 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) {
+        return this.baseMapper.selectWrkDetlLogs(wrkNo, orderNo,matnr,specs,zpallet,batch,model,anfme, modiTimeStart, modiTimeEnd, curr, limit);
     }
 
     @Override
-    public Long selectWrkDetlLogsTotal(Integer wrkNo, String orderNo, Date modiTimeStart, Date modiTimeEnd) {
-        return this.baseMapper.selectWrkDetlLogsTotal(wrkNo, orderNo, modiTimeStart, modiTimeEnd);
+    public Long selectWrkDetlLogsTotal(Integer wrkNo, String orderNo,String matnr,String specs,String zpallet,String batch,String model,Double anfme, Date modiTimeStart, Date modiTimeEnd) {
+        return this.baseMapper.selectWrkDetlLogsTotal(wrkNo, orderNo,matnr,specs,zpallet,batch,model,anfme, modiTimeStart, modiTimeEnd);
+    }
+
+    @Override
+    public WrkDetlLog selectWrkDetlLogByOrderNoNotNull(String batch) {
+        return this.baseMapper.selectWrkDetlLogByOrderNoNotNull(batch);
     }
 }

--
Gitblit v1.9.1