From 41abaf9879ba8031ce4d88cb1bb0d8ce678b9499 Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期五, 11 四月 2025 16:59:26 +0800 Subject: [PATCH] # --- src/main/webapp/static/js/orderDetlPakout/orderDetl.js | 3 + src/main/java/com/zy/asrs/entity/param/CombParam.java | 5 ++ src/main/resources/mapper/WrkDetlLogMapper.xml | 6 +++ src/main/webapp/static/js/orderDetlPakin/orderDetl.js | 3 + src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java | 8 ++-- src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java | 4 ++ src/main/webapp/static/js/manLocDetl/manLocDetl.js | 1 src/main/webapp/static/js/saas/locDetl.js | 1 src/main/webapp/static/js/wrkMast/wrkMast.js | 3 + src/main/webapp/static/js/orderDetl/orderDetl.js | 3 + src/main/java/com/zy/asrs/service/WrkDetlLogService.java | 4 +- src/main/webapp/static/js/orderPakin/out.js | 3 + src/main/webapp/static/js/locDetl/locDetl.js | 1 src/main/java/com/zy/asrs/controller/WrkDetlLogController.java | 10 ++++- src/main/webapp/views/wrkDetlLog/wrkDetlLog.html | 10 +++++ src/main/webapp/static/js/orderPakout/out.js | 3 + src/main/webapp/static/js/order/out.js | 3 + src/main/webapp/static/js/pakStore/turnOver.js | 2 + src/main/webapp/static/js/common.js | 3 + 19 files changed, 60 insertions(+), 16 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..89927a7 100644 --- a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java +++ b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java @@ -83,6 +83,8 @@ String specs = null; String zpallet = null; String batch = null; + String sku = null; + String memo = null; Double anfme = null; Date modiTimeStart = null, modiTimeEnd = null; for (Map.Entry<String, Object> entry : param.entrySet()) { @@ -108,11 +110,15 @@ anfme = Double.parseDouble(val); }else if (entry.getKey().equals("matnr")) { matnr = val; + }else if (entry.getKey().equals("sku")) { + sku = val; + }else if (entry.getKey().equals("memo")) { + memo = 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,sku,memo,anfme, 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,sku,memo,anfme, modiTimeStart, modiTimeEnd)); return R.ok(page1); } catch (Exception e) { return R.error("寮傚父" + e); diff --git a/src/main/java/com/zy/asrs/entity/param/CombParam.java b/src/main/java/com/zy/asrs/entity/param/CombParam.java index ac07e41..0988222 100644 --- a/src/main/java/com/zy/asrs/entity/param/CombParam.java +++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java @@ -49,6 +49,11 @@ // 瑙勬牸 private String specs; + // sku + private String sku; + //澶囨敞 + private String memo; + } } diff --git a/src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java b/src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java index 67a4a26..d7ae8d2 100644 --- a/src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java +++ b/src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java @@ -23,6 +23,8 @@ @Param("specs") String specs, @Param("zpallet") String zpallet, @Param("batch") String batch, + @Param("sku") String sku, + @Param("memo") String memo, @Param("anfme") Double anfme, @Param("modiTimeStart") Date modiTimeStart, @Param("modiTimeEnd") Date modiTimeEnd, @@ -35,6 +37,8 @@ @Param("specs") String specs, @Param("zpallet") String zpallet, @Param("batch") String batch, + @Param("sku") String sku, + @Param("memo") String memo, @Param("anfme") Double anfme, @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..75b5672 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 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,String sku,String memo,Double anfme, 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,String sku,String memo,Double anfme, 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..fc31b76 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 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,String sku,String memo,Double anfme, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit) { + return this.baseMapper.selectWrkDetlLogs(wrkNo, orderNo,matnr,specs,zpallet,batch,sku,memo,anfme, 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,String sku,String memo,Double anfme, Date modiTimeStart, Date modiTimeEnd) { + return this.baseMapper.selectWrkDetlLogsTotal(wrkNo, orderNo,matnr,specs,zpallet,batch,sku,memo,anfme, modiTimeStart, modiTimeEnd); } } diff --git a/src/main/resources/mapper/WrkDetlLogMapper.xml b/src/main/resources/mapper/WrkDetlLogMapper.xml index aed5134..ceb61b7 100644 --- a/src/main/resources/mapper/WrkDetlLogMapper.xml +++ b/src/main/resources/mapper/WrkDetlLogMapper.xml @@ -71,6 +71,12 @@ <if test="batch != null and batch != ''"> and a.batch like concat('%',#{batch},'%') </if> + <if test="sku != null and sku != ''"> + and a.sku like concat('%',#{sku},'%') + </if> + <if test="memo != null and memo != ''"> + and a.memo like concat('%',#{memo},'%') + </if> <if test="matnr != null and matnr != ''"> and a.matnr like concat('%',#{matnr},'%') </if> diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js index 7bfc288..c120fa8 100644 --- a/src/main/webapp/static/js/common.js +++ b/src/main/webapp/static/js/common.js @@ -218,7 +218,7 @@ // ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'} ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳', hide: true} ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿', hide: true} - ,{field: 'memo', align: 'center',title: '澶囨敞', hide: true} + ,{field: 'memo', align: 'center',title: '澶囨敞', hide: false} ] var detlCols = [ @@ -264,6 +264,7 @@ return '<span">' +d.frozen$ + '</span>'; } }} + ,{field: 'memo', align: 'center',title: '澶囨敞', hide: false} ] function getQueryVariable(variable) diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js index 415e79d..0446dcf 100644 --- a/src/main/webapp/static/js/locDetl/locDetl.js +++ b/src/main/webapp/static/js/locDetl/locDetl.js @@ -50,6 +50,7 @@ // cols.push.apply(cols, detlCols); cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',hide: true} ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'} + ,{field: 'memo', align: 'center',title: '澶囨敞', hide: false} ) return cols; } diff --git a/src/main/webapp/static/js/manLocDetl/manLocDetl.js b/src/main/webapp/static/js/manLocDetl/manLocDetl.js index d0ac480..d565195 100644 --- a/src/main/webapp/static/js/manLocDetl/manLocDetl.js +++ b/src/main/webapp/static/js/manLocDetl/manLocDetl.js @@ -40,6 +40,7 @@ // cols.push.apply(cols, detlCols); cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',hide: true} ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'} + ,{field: 'memo', align: 'center',title: '澶囨敞', hide: false} ) return cols; } diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js index be85831..897b349 100644 --- a/src/main/webapp/static/js/order/out.js +++ b/src/main/webapp/static/js/order/out.js @@ -36,6 +36,7 @@ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200} ,{field: 'batch', align: 'center',title: '搴忓垪鐮�'} ,{field: 'specs', align: 'center',title: '瑙勬牸'} + ,{field: 'sku', align: 'center',title: '宸ュ簭', hide: false} // ,{field: 'anfme', align: 'center',title: '鏁伴噺'} // ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'} ,{field: 'enableQty', align: 'center',title: '寰呭嚭鏁伴噺', style: 'font-weight: bold'} @@ -53,7 +54,7 @@ // ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'} // ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'} // ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'} - // ,{field: 'memo', align: 'center',title: '澶囨敞'} + ,{field: 'memo', align: 'center',title: '澶囨敞', hide: false} ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 160} ]], request: { diff --git a/src/main/webapp/static/js/orderDetl/orderDetl.js b/src/main/webapp/static/js/orderDetl/orderDetl.js index caef270..cb92b98 100644 --- a/src/main/webapp/static/js/orderDetl/orderDetl.js +++ b/src/main/webapp/static/js/orderDetl/orderDetl.js @@ -29,6 +29,7 @@ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'} ,{field: 'name', align: 'center',title: '鍚嶇О'} ,{field: 'specs', align: 'center',title: '瑙勬牸'} + ,{field: 'sku', align: 'center',title: '宸ュ簭', hide: false} ,{field: 'model', align: 'center',title: '鍨嬪彿'} ,{field: 'batch', align: 'center',title: '鎵瑰彿'} ,{field: 'unit', align: 'center',title: '鍗曚綅'} @@ -43,7 +44,7 @@ ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'} ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'} ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'} - ,{field: 'memo', align: 'center',title: '澶囨敞'} + ,{field: 'memo', align: 'center',title: '澶囨敞', hide: false} ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120} ]], diff --git a/src/main/webapp/static/js/orderDetlPakin/orderDetl.js b/src/main/webapp/static/js/orderDetlPakin/orderDetl.js index caef270..cb92b98 100644 --- a/src/main/webapp/static/js/orderDetlPakin/orderDetl.js +++ b/src/main/webapp/static/js/orderDetlPakin/orderDetl.js @@ -29,6 +29,7 @@ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'} ,{field: 'name', align: 'center',title: '鍚嶇О'} ,{field: 'specs', align: 'center',title: '瑙勬牸'} + ,{field: 'sku', align: 'center',title: '宸ュ簭', hide: false} ,{field: 'model', align: 'center',title: '鍨嬪彿'} ,{field: 'batch', align: 'center',title: '鎵瑰彿'} ,{field: 'unit', align: 'center',title: '鍗曚綅'} @@ -43,7 +44,7 @@ ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'} ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'} ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'} - ,{field: 'memo', align: 'center',title: '澶囨敞'} + ,{field: 'memo', align: 'center',title: '澶囨敞', hide: false} ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120} ]], diff --git a/src/main/webapp/static/js/orderDetlPakout/orderDetl.js b/src/main/webapp/static/js/orderDetlPakout/orderDetl.js index caef270..cb92b98 100644 --- a/src/main/webapp/static/js/orderDetlPakout/orderDetl.js +++ b/src/main/webapp/static/js/orderDetlPakout/orderDetl.js @@ -29,6 +29,7 @@ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'} ,{field: 'name', align: 'center',title: '鍚嶇О'} ,{field: 'specs', align: 'center',title: '瑙勬牸'} + ,{field: 'sku', align: 'center',title: '宸ュ簭', hide: false} ,{field: 'model', align: 'center',title: '鍨嬪彿'} ,{field: 'batch', align: 'center',title: '鎵瑰彿'} ,{field: 'unit', align: 'center',title: '鍗曚綅'} @@ -43,7 +44,7 @@ ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'} ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'} ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'} - ,{field: 'memo', align: 'center',title: '澶囨敞'} + ,{field: 'memo', align: 'center',title: '澶囨敞', hide: false} ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120} ]], diff --git a/src/main/webapp/static/js/orderPakin/out.js b/src/main/webapp/static/js/orderPakin/out.js index a4aaeb0..a85b28a 100644 --- a/src/main/webapp/static/js/orderPakin/out.js +++ b/src/main/webapp/static/js/orderPakin/out.js @@ -36,6 +36,7 @@ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200} ,{field: 'batch', align: 'center',title: '搴忓垪鐮�'} ,{field: 'specs', align: 'center',title: '瑙勬牸'} + ,{field: 'sku', align: 'center',title: '宸ュ簭', hide: false} // ,{field: 'anfme', align: 'center',title: '鏁伴噺'} // ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'} ,{field: 'enableQty', align: 'center',title: '寰呭嚭鏁伴噺', style: 'font-weight: bold'} @@ -53,7 +54,7 @@ // ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'} // ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'} // ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'} - // ,{field: 'memo', align: 'center',title: '澶囨敞'} + ,{field: 'memo', align: 'center',title: '澶囨敞', hide: false} ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 160} ]], request: { diff --git a/src/main/webapp/static/js/orderPakout/out.js b/src/main/webapp/static/js/orderPakout/out.js index a7ba719..4101a55 100644 --- a/src/main/webapp/static/js/orderPakout/out.js +++ b/src/main/webapp/static/js/orderPakout/out.js @@ -36,6 +36,7 @@ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200} ,{field: 'batch', align: 'center',title: '搴忓垪鐮�'} ,{field: 'specs', align: 'center',title: '瑙勬牸'} + ,{field: 'sku', align: 'center',title: '宸ュ簭', hide: false} // ,{field: 'anfme', align: 'center',title: '鏁伴噺'} // ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'} ,{field: 'enableQty', align: 'center',title: '寰呭嚭鏁伴噺', style: 'font-weight: bold'} @@ -53,7 +54,7 @@ // ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'} // ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'} // ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'} - // ,{field: 'memo', align: 'center',title: '澶囨敞'} + ,{field: 'memo', align: 'center',title: '澶囨敞', hide: false} ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 160} ]], request: { diff --git a/src/main/webapp/static/js/pakStore/turnOver.js b/src/main/webapp/static/js/pakStore/turnOver.js index 8d0e95a..9693198 100644 --- a/src/main/webapp/static/js/pakStore/turnOver.js +++ b/src/main/webapp/static/js/pakStore/turnOver.js @@ -41,6 +41,8 @@ ,{field: 'weight', align: 'center',title: '閲嶉噺', hide: false} ,{field: 'owner$', align: 'center',title: '璐т富', hide: false} ,{field: 'payment$', align: 'center',title: '璐х墿褰㈡��', hide: false} + ,{field: 'sku', align: 'center',title: '宸ュ簭', hide: false} + ,{field: 'memo', align: 'center',title: '澶囨敞', hide: false} ]], done: function(res, curr, count) { tableMerge.render(this); diff --git a/src/main/webapp/static/js/saas/locDetl.js b/src/main/webapp/static/js/saas/locDetl.js index 734262f..b5e1b73 100644 --- a/src/main/webapp/static/js/saas/locDetl.js +++ b/src/main/webapp/static/js/saas/locDetl.js @@ -34,6 +34,7 @@ ,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true} ,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true} ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true} + ,{field: 'memo', align: 'center',title: '澶囨敞', hide: false} ]; diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js index fe33064..54482e0 100644 --- a/src/main/webapp/static/js/wrkMast/wrkMast.js +++ b/src/main/webapp/static/js/wrkMast/wrkMast.js @@ -549,6 +549,7 @@ ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'} ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'} ,{field: 'matnr', align: 'center',title: '鐗╂枡'} + ,{field: 'sku', align: 'center',title: '宸ュ簭', hide: false} ,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�'} ,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'} ,{field: 'tbpos', align: 'center',title: '琛岄」鐩�'} @@ -559,7 +560,7 @@ ,{field: 'altme', align: 'center',title: '鍗曚綅'} ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉$爜'} ,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'} - ,{field: 'memo', align: 'center',title: '澶囨敞'} + ,{field: 'memo', align: 'center',title: '澶囨敞', hide: false} ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:50} ]], diff --git a/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html b/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html index d40678c..ea4a5ec 100644 --- a/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html +++ b/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html @@ -51,6 +51,16 @@ </div> <div class="layui-inline"> <div class="layui-input-inline"> + <input class="layui-input" type="text" name="sku" placeholder="宸ュ簭" autocomplete="off"> + </div> + </div> + <div class="layui-inline"> + <div class="layui-input-inline"> + <input class="layui-input" type="text" name="memo" 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> -- Gitblit v1.9.1