From 190365c72223af167ddfc68af61bc9d9208fd71a Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 17 四月 2024 08:56:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ManPakOutController.java | 33 +++++++++++++++++++++++++++++++--
src/main/webapp/static/js/picking/picking.js | 2 +-
src/main/resources/mapper/ManPakOutMapper.xml | 3 +++
src/main/java/com/zy/asrs/service/impl/ManPakOutServiceImpl.java | 8 ++++----
src/main/java/com/zy/asrs/service/ManPakOutService.java | 4 ++--
src/main/java/com/zy/asrs/mapper/ManPakOutMapper.java | 4 ++--
src/main/webapp/views/picking/picking.html | 6 ++++++
7 files changed, 49 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ManPakOutController.java b/src/main/java/com/zy/asrs/controller/ManPakOutController.java
index fe998e3..10eafa2 100644
--- a/src/main/java/com/zy/asrs/controller/ManPakOutController.java
+++ b/src/main/java/com/zy/asrs/controller/ManPakOutController.java
@@ -58,6 +58,20 @@
return R.ok(manPakOutService.selectPage(new Page<>(curr, limit), wrapper));
}
+ @RequestMapping(value = "/ManPakOut/list/auth1")
+ @ManagerAuth
+ public R list1(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<ManPakOut> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert1(param, wrapper);
+
+ return R.ok(manPakOutService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
@RequestMapping(value = "/ManPakOut/detailed/auth")
@ManagerAuth
public R detailed(@RequestParam(defaultValue = "1")Integer curr,
@@ -86,7 +100,9 @@
userId = null;
}
- List<PakOutDTO> pakOutDTOS = manPakOutService.selectPakOut(docnum, stime, etime, curr, limit,userId);
+ String custName = Cools.isEmpty(param.get("cust_name")) ? "" : param.get("cust_name").toString();
+
+ List<PakOutDTO> pakOutDTOS = manPakOutService.selectPakOut(docnum, stime, etime, curr, limit,userId,custName);
for (PakOutDTO pakOutDTO:pakOutDTOS){
List<ManPakOut> manPakOuts = manPakOutService.selectList(new EntityWrapper<ManPakOut>().eq("doc_num", pakOutDTO.getDoc_num()));
for (ManPakOut manPakOut:manPakOuts){
@@ -101,7 +117,7 @@
}
- int count = manPakOutService.selectPakOutCount(docnum, stime, etime,curr, limit,userId);
+ int count = manPakOutService.selectPakOutCount(docnum, stime, etime,curr, limit,userId,custName);
Page<PakOutDTO> page = new Page<>();
// 鏈�鍚庢寜鐘舵�佹湭鍑哄簱->宸插嚭搴撴帓搴�
// page.setRecords(pakOutDTOS.stream().sorted(Comparator.comparingInt(PakOutDTO::getStatus)).collect(Collectors.toList()));
@@ -123,6 +139,19 @@
}
}
+ private <T> void convert1(Map<String, Object> map, EntityWrapper<T> wrapper){
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else {
+ wrapper.eq(entry.getKey(), val);
+ }
+ }
+ }
+
@RequestMapping(value = "/ManPakOut/add/auth")
@ManagerAuth(memo = "鐢熸垚鎷ｈ揣鍗�")
@Transactional
diff --git a/src/main/java/com/zy/asrs/mapper/ManPakOutMapper.java b/src/main/java/com/zy/asrs/mapper/ManPakOutMapper.java
index d38427a..c2172ba 100644
--- a/src/main/java/com/zy/asrs/mapper/ManPakOutMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ManPakOutMapper.java
@@ -16,7 +16,7 @@
- List<PakOutDTO> selectPakOut(@Param("docnum") String docnum,@Param("stime") Date stime, @Param("etime") Date etime, @Param("curr") Integer curr, @Param("limit") Integer limit, @Param("userId") Long userId);
+ List<PakOutDTO> selectPakOut(@Param("docnum") String docnum,@Param("stime") Date stime, @Param("etime") Date etime, @Param("curr") Integer curr, @Param("limit") Integer limit, @Param("userId") Long userId, @Param("custName") String custName);
- int selectPakOutCount(@Param("docnum") String docnum,@Param("stime") Date stime, @Param("etime") Date etime,@Param("curr") Integer curr,@Param("limit") Integer limit, @Param("userId") Long userId);
+ int selectPakOutCount(@Param("docnum") String docnum,@Param("stime") Date stime, @Param("etime") Date etime,@Param("curr") Integer curr,@Param("limit") Integer limit, @Param("userId") Long userId, @Param("custName") String custName);
}
diff --git a/src/main/java/com/zy/asrs/service/ManPakOutService.java b/src/main/java/com/zy/asrs/service/ManPakOutService.java
index 45743fa..5f3bfa9 100644
--- a/src/main/java/com/zy/asrs/service/ManPakOutService.java
+++ b/src/main/java/com/zy/asrs/service/ManPakOutService.java
@@ -8,7 +8,7 @@
import java.util.List;
public interface ManPakOutService extends IService<ManPakOut> {
- List<PakOutDTO> selectPakOut(String docnum, Date stime, Date etime, Integer curr, Integer limit, Long userId);
+ List<PakOutDTO> selectPakOut(String docnum, Date stime, Date etime, Integer curr, Integer limit, Long userId,String custName);
- int selectPakOutCount(String docnum, Date stime, Date etime,Integer curr, Integer limit, Long userId);
+ int selectPakOutCount(String docnum, Date stime, Date etime,Integer curr, Integer limit, Long userId,String custName);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/ManPakOutServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ManPakOutServiceImpl.java
index dc45a5a..6817a86 100644
--- a/src/main/java/com/zy/asrs/service/impl/ManPakOutServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ManPakOutServiceImpl.java
@@ -17,12 +17,12 @@
@Override
- public List<PakOutDTO> selectPakOut(String docnum, Date stime, Date etime, Integer curr, Integer limit, Long userId) {
- return this.baseMapper.selectPakOut(docnum,stime,etime,curr,limit,userId);
+ public List<PakOutDTO> selectPakOut(String docnum, Date stime, Date etime, Integer curr, Integer limit, Long userId,String custName) {
+ return this.baseMapper.selectPakOut(docnum,stime,etime,curr,limit,userId,custName);
}
@Override
- public int selectPakOutCount(String docnum, Date stime, Date etime,Integer curr, Integer limit, Long userId) {
- return this.baseMapper.selectPakOutCount(docnum,stime, etime,curr,limit,userId);
+ public int selectPakOutCount(String docnum, Date stime, Date etime,Integer curr, Integer limit, Long userId,String custName) {
+ return this.baseMapper.selectPakOutCount(docnum,stime, etime,curr,limit,userId,custName);
}
}
diff --git a/src/main/resources/mapper/ManPakOutMapper.xml b/src/main/resources/mapper/ManPakOutMapper.xml
index 9f26a65..c89b305 100644
--- a/src/main/resources/mapper/ManPakOutMapper.xml
+++ b/src/main/resources/mapper/ManPakOutMapper.xml
@@ -6,6 +6,9 @@
<if test="docnum != null and docnum != '' ">
and doc_num like '%' + #{docnum} + '%'
</if>
+ <if test="custName != null and custName != ''">
+ and cust_name like '%' + #{custName} + '%'
+ </if>
<if test="stime != null">
and create_time >= #{stime}
</if>
diff --git a/src/main/webapp/static/js/picking/picking.js b/src/main/webapp/static/js/picking/picking.js
index f0f0b3c..8650d74 100644
--- a/src/main/webapp/static/js/picking/picking.js
+++ b/src/main/webapp/static/js/picking/picking.js
@@ -124,7 +124,7 @@
id:'lookSSXMTable',
elem: '#lookSSXMTable',
headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/ManPakOut/list/auth',
+ url: baseUrl+'/ManPakOut/list/auth1',
where: {
doc_num: data.doc_num,
uuid: data.uuid
diff --git a/src/main/webapp/views/picking/picking.html b/src/main/webapp/views/picking/picking.html
index 1ffdf6b..acb1649 100644
--- a/src/main/webapp/views/picking/picking.html
+++ b/src/main/webapp/views/picking/picking.html
@@ -38,6 +38,12 @@
<input class="layui-input" type="text" name="doc_num" placeholder="鎷ｈ揣鍗曞彿" autocomplete="off">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">瀹㈡埛鍚嶇О:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="cust_name" placeholder="鎷ｈ揣鍗曞彿" autocomplete="off">
+ </div>
+ </div>
<div class="layui-inline" style="width: 300px">
<div class="layui-input-inline">
<input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
--
Gitblit v1.9.1