From 0868d9d032f3bfb5f9af870e3f9fbb63e9cb3b8c Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期二, 03 九月 2024 12:29:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs' into xgmFlasrs
---
src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 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..1cccd65 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.WrkDetlLog;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.WrkDetlLog;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -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("model") String model,
+ @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("model") String model,
+ @Param("modiTimeStart") Date modiTimeStart,
+ @Param("modiTimeEnd") Date modiTimeEnd);
}
--
Gitblit v1.9.1