From fc3347a225114a8dbd37b451981109c8170b9dd4 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期一, 19 八月 2024 08:29:14 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/WrkDetlLogController.java | 9 ++++++---
src/main/webapp/views/wrkDetlLog/wrkDetlLog.html | 16 ++++++++--------
src/main/resources/mapper/WrkDetlLogMapper.xml | 3 +++
src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java | 14 +++++++-------
src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java | 6 +++---
src/main/java/com/zy/asrs/service/WrkDetlLogService.java | 6 +++---
6 files changed, 30 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
index dd97c89..30e49bd 100644
--- a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
@@ -83,6 +83,7 @@
String specs = null;
String zpallet = null;
String batch = null;
+ String model = null;
Double anfme = null;
Date modiTimeStart = null, modiTimeEnd = null;
for (Map.Entry<String, Object> entry : param.entrySet()) {
@@ -106,13 +107,15 @@
batch = val;
} else if (entry.getKey().equals("anfme")) {
anfme = Double.parseDouble(val);
- }else if (entry.getKey().equals("matnr")) {
+ } else if (entry.getKey().equals("matnr")) {
matnr = val;
+ } else if (entry.getKey().equals("model")) {
+ model = val;
}
}
- List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(wrkNo, orderNo,matnr,specs,zpallet,batch,anfme, modiTimeStart, modiTimeEnd, curr, limit);
+ List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(wrkNo, orderNo, matnr, specs, zpallet, batch, anfme, model, modiTimeStart, modiTimeEnd, curr, limit);
Page<WrkDetlLog> page1 = new Page<WrkDetlLog>(curr, limit).setRecords(wrkDetlLogs);
- page1.setTotal(wrkDetlLogService.selectWrkDetlLogsTotal(wrkNo, orderNo,matnr,specs,zpallet,batch,anfme, modiTimeStart, modiTimeEnd));
+ page1.setTotal(wrkDetlLogService.selectWrkDetlLogsTotal(wrkNo, orderNo, matnr, specs, zpallet, batch, anfme, model, modiTimeStart, modiTimeEnd));
return R.ok(page1);
} catch (Exception e) {
return R.error("寮傚父" + e);
diff --git a/src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java b/src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java
index 67a4a26..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;
@@ -23,7 +23,7 @@
@Param("specs") String specs,
@Param("zpallet") String zpallet,
@Param("batch") String batch,
- @Param("anfme") Double anfme,
+ @Param("anfme") Double anfme, @Param("model") String model,
@Param("modiTimeStart") Date modiTimeStart,
@Param("modiTimeEnd") Date modiTimeEnd,
@Param("pageNumber") Integer curr,
@@ -35,7 +35,7 @@
@Param("specs") String specs,
@Param("zpallet") String zpallet,
@Param("batch") String batch,
- @Param("anfme") Double anfme,
+ @Param("anfme") Double anfme, @Param("model") String model,
@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 687da0e..8270656 100644
--- a/src/main/java/com/zy/asrs/service/WrkDetlLogService.java
+++ b/src/main/java/com/zy/asrs/service/WrkDetlLogService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.WrkDetlLog;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.WrkDetlLog;
import java.util.Date;
import java.util.List;
@@ -10,8 +10,8 @@
boolean save(Integer workNo);
- List<WrkDetlLog> selectWrkDetlLogs(Integer wrkNo, String orderNo,String matnr,String specs,String zpallet,String batch,Double anfme, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit);
+ List<WrkDetlLog> selectWrkDetlLogs(Integer wrkNo, String orderNo, String matnr, String specs, String zpallet, String batch, Double anfme, String model, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit);
- Long selectWrkDetlLogsTotal(Integer wrkNo, String orderNo,String matnr,String specs,String zpallet,String batch,Double anfme, Date modiTimeStart, Date modiTimeEnd);
+ Long selectWrkDetlLogsTotal(Integer wrkNo, String orderNo, String matnr, String specs, String zpallet, String batch, Double anfme, String model, 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 69f5ead..a771317 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java
@@ -1,9 +1,9 @@
package com.zy.asrs.service.impl;
-import com.zy.asrs.mapper.WrkDetlLogMapper;
-import com.zy.asrs.entity.WrkDetlLog;
-import com.zy.asrs.service.WrkDetlLogService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.entity.WrkDetlLog;
+import com.zy.asrs.mapper.WrkDetlLogMapper;
+import com.zy.asrs.service.WrkDetlLogService;
import org.springframework.stereotype.Service;
import java.util.Date;
@@ -18,12 +18,12 @@
}
@Override
- public List<WrkDetlLog> selectWrkDetlLogs(Integer wrkNo, String orderNo,String matnr,String specs,String zpallet,String batch,Double anfme, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit) {
- return this.baseMapper.selectWrkDetlLogs(wrkNo, orderNo,matnr,specs,zpallet,batch,anfme, modiTimeStart, modiTimeEnd, curr, limit);
+ public List<WrkDetlLog> selectWrkDetlLogs(Integer wrkNo, String orderNo, String matnr, String specs, String zpallet, String batch, Double anfme, String model, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit) {
+ return this.baseMapper.selectWrkDetlLogs(wrkNo, orderNo, matnr, specs, zpallet, batch, anfme, model, modiTimeStart, modiTimeEnd, curr, limit);
}
@Override
- public Long selectWrkDetlLogsTotal(Integer wrkNo, String orderNo,String matnr,String specs,String zpallet,String batch,Double anfme, Date modiTimeStart, Date modiTimeEnd) {
- return this.baseMapper.selectWrkDetlLogsTotal(wrkNo, orderNo,matnr,specs,zpallet,batch,anfme, modiTimeStart, modiTimeEnd);
+ public Long selectWrkDetlLogsTotal(Integer wrkNo, String orderNo, String matnr, String specs, String zpallet, String batch, Double anfme, String model, Date modiTimeStart, Date modiTimeEnd) {
+ return this.baseMapper.selectWrkDetlLogsTotal(wrkNo, orderNo, matnr, specs, zpallet, batch, anfme, model, modiTimeStart, modiTimeEnd);
}
}
diff --git a/src/main/resources/mapper/WrkDetlLogMapper.xml b/src/main/resources/mapper/WrkDetlLogMapper.xml
index 27654cd..95e96d1 100644
--- a/src/main/resources/mapper/WrkDetlLogMapper.xml
+++ b/src/main/resources/mapper/WrkDetlLogMapper.xml
@@ -87,6 +87,9 @@
<if test="specs != null and specs != ''">
and a.specs like concat('%',#{specs},'%')
</if>
+ <if test="model != null and model != ''">
+ and a.model like concat('%',#{model},'%')
+ </if>
</sql>
<select id="selectWrkDetlLogs" resultMap="BaseResultMap">
diff --git a/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html b/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html
index d40678c..8daf985 100644
--- a/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html
+++ b/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html
@@ -31,12 +31,12 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="鍝佸彿" autocomplete="off">
+ <input class="layui-input" type="text" name="matnr" placeholder="鐗╂枡缂栫爜" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="specs" placeholder="瑙勬牸" autocomplete="off">
+ <input class="layui-input" type="text" name="model" placeholder="浜у搧浠ｇ爜" autocomplete="off">
</div>
</div>
<div class="layui-inline">
@@ -46,14 +46,14 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="batch" placeholder="璐у搧鐗瑰緛" autocomplete="off">
+ <input class="layui-input" type="text" name="batch" placeholder="鎵规" autocomplete="off">
</div>
</div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="anfme" placeholder="鏁伴噺" autocomplete="off">
- </div>
- </div>
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" type="text" name="anfme" placeholder="鏁伴噺" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
<!-- 寰呮坊鍔� -->
<div id="data-search-btn" class="layui-btn-container layui-form-item">
<button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
--
Gitblit v1.9.1