From af1caecbfc439487305f65208305b5b76696b1ac Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期一, 28 七月 2025 10:54:49 +0800
Subject: [PATCH] 修复工作明细历史搜索条件精确匹配，字段映射
---
src/main/java/com/zy/asrs/controller/WrkDetlLogController.java | 4 ++--
src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java | 4 ++--
src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java | 4 ++--
src/main/java/com/zy/asrs/service/WrkDetlLogService.java | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
index 5e75f68..314c3b6 100644
--- a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
@@ -84,7 +84,7 @@
String zpallet = null;
String maktx = null; // 鍟嗗搧鍚嶇О
String model = null; // 妗跺瀷
- Double volume = null; // 缃愯閲�
+ String volume = null; // 缃愯閲�
Date modiTimeStart = null, modiTimeEnd = null;
for (Map.Entry<String, Object> entry : param.entrySet()) {
String val = String.valueOf(entry.getValue());
@@ -106,7 +106,7 @@
} else if (entry.getKey().equals("model")) {
model = val;
} else if (entry.getKey().equals("volume")) {
- volume = Double.parseDouble(val);
+ volume = val;
} else if (entry.getKey().equals("io_type")) {
ioType = Integer.parseInt(val);
} else if (entry.getKey().equals("wrk_sts")) {
diff --git a/src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java b/src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java
index 8840086..713d413 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java
@@ -24,7 +24,7 @@
@Param("maktx") String maktx,
@Param("model") String model,
@Param("zpallet") String zpallet,
- @Param("volume") Double volume,
+ @Param("volume") String volume,
@Param("modiTimeStart") Date modiTimeStart,
@Param("modiTimeEnd") Date modiTimeEnd,
@Param("pageNumber") Integer curr,
@@ -37,7 +37,7 @@
@Param("maktx") String maktx,
@Param("model") String model,
@Param("zpallet") String zpallet,
- @Param("volume") Double volume,
+ @Param("volume") String volume,
@Param("modiTimeStart") Date modiTimeStart,
@Param("modiTimeEnd") Date modiTimeEnd);
diff --git a/src/main/java/com/zy/asrs/service/WrkDetlLogService.java b/src/main/java/com/zy/asrs/service/WrkDetlLogService.java
index e54e541..4f469dd 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 ioType,Integer wrkSts,Integer wrkNo, String orderNo,String maktx,String model,String zpallet,Double volume, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit);
+ List<WrkDetlLog> selectWrkDetlLogs(Integer ioType,Integer wrkSts,Integer wrkNo, String orderNo,String maktx,String model,String zpallet,String volume, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit);
- Long selectWrkDetlLogsTotal(Integer ioType,Integer wrkSts,Integer wrkNo, String orderNo,String maktx,String model,String zpallet,Double volume, Date modiTimeStart, Date modiTimeEnd);
+ Long selectWrkDetlLogsTotal(Integer ioType,Integer wrkSts,Integer wrkNo, String orderNo,String maktx,String model,String zpallet,String volume, Date modiTimeStart, Date modiTimeEnd);
}
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 d1d68ec..8a35905 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java
@@ -18,12 +18,12 @@
}
@Override
- public List<WrkDetlLog> selectWrkDetlLogs(Integer ioType,Integer wrkSts,Integer wrkNo, String orderNo,String maktx,String model,String zpallet,Double volume, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit) {
+ public List<WrkDetlLog> selectWrkDetlLogs(Integer ioType,Integer wrkSts,Integer wrkNo, String orderNo,String maktx,String model,String zpallet,String volume, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit) {
return this.baseMapper.selectWrkDetlLogs(ioType,wrkSts,wrkNo, orderNo,maktx,model,zpallet,volume, modiTimeStart, modiTimeEnd, curr, limit);
}
@Override
- public Long selectWrkDetlLogsTotal(Integer ioType,Integer wrkSts,Integer wrkNo, String orderNo,String maktx,String model,String zpallet,Double volume, Date modiTimeStart, Date modiTimeEnd) {
+ public Long selectWrkDetlLogsTotal(Integer ioType,Integer wrkSts,Integer wrkNo, String orderNo,String maktx,String model,String zpallet,String volume, Date modiTimeStart, Date modiTimeEnd) {
return this.baseMapper.selectWrkDetlLogsTotal(ioType,wrkSts,wrkNo, orderNo,maktx,model,zpallet,volume, modiTimeStart, modiTimeEnd);
}
}
--
Gitblit v1.9.1