From 078d76d0e964be567927b1765986dffe8f2c170a Mon Sep 17 00:00:00 2001 From: lty <876263681@qq.com> Date: 星期四, 05 六月 2025 09:54:08 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/entity/param/CombParam.java | 4 ++ src/main/java/com/zy/third/erp/task/ERPItemService.java | 5 ++ src/main/webapp/static/js/locDetlStatis/locDetlStatis.js | 2 + src/main/webapp/views/locDetlStatis/locDetlStatis.html | 10 ++-- src/main/resources/mapper/LocDetlMapper.xml | 55 ++++++++++++++++----------- src/main/webapp/static/js/manLocDetl/manLocDetl.js | 1 src/main/webapp/static/js/saas/locDetl.js | 1 src/main/webapp/views/pakStore/locDetlQuery.html | 17 +++++--- src/main/webapp/static/js/locDetl/locDetl.js | 1 src/main/java/com/zy/asrs/entity/WaitPakin.java | 2 + src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 2 + src/main/java/com/zy/common/model/DetlDto.java | 11 +++++ src/main/webapp/static/js/common.js | 2 + 13 files changed, 78 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java index 4c69743..88bc1d7 100644 --- a/src/main/java/com/zy/asrs/entity/WaitPakin.java +++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java @@ -174,7 +174,9 @@ @TableField("temp1") private String temp1; + @TableField("temp2") + private String temp2; @TableField("packing") private String packing; 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 c1fea83..6cffdde 100644 --- a/src/main/java/com/zy/asrs/entity/param/CombParam.java +++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java @@ -35,6 +35,10 @@ // 鐗╂枡缂栧彿 private String matnr; + private String proType; + + private String temp2; + // 搴忓垪鐮� private String itemBatch; diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java index 20eb4de..9adb4fb 100644 --- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java @@ -128,6 +128,8 @@ } WaitPakin waitPakin = new WaitPakin(); waitPakin.sync(mat); + waitPakin.setProType(detlDto.getProType()); + waitPakin.setTemp2(detlDto.getTemp2()); waitPakin.setBatch(detlDto.getBatch()); waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮� waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵�� diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java index 650e884..2e3565c 100644 --- a/src/main/java/com/zy/common/model/DetlDto.java +++ b/src/main/java/com/zy/common/model/DetlDto.java @@ -21,6 +21,9 @@ private Double anfme; + private String temp2; + private String proType; + public DetlDto() { } @@ -40,6 +43,14 @@ this.anfme = anfme; } + public DetlDto(String matnr, String batch, Double anfme, String proType, String temp2) { + this.matnr = matnr; + this.batch = batch; + this.anfme = anfme; + this.proType = proType; + this.temp2 = temp2; + } + public DetlDto(String orderNo, String matnr, String batch, Double anfme) { this.orderNo = orderNo; this.matnr = matnr; diff --git a/src/main/java/com/zy/third/erp/task/ERPItemService.java b/src/main/java/com/zy/third/erp/task/ERPItemService.java index ab01e9f..a6c865f 100644 --- a/src/main/java/com/zy/third/erp/task/ERPItemService.java +++ b/src/main/java/com/zy/third/erp/task/ERPItemService.java @@ -86,7 +86,10 @@ mat.setTagId(priTag.getId()); } mat.setStatus(1); - mat.setLength(Double.parseDouble(itemTB.getTemp2())); + if(itemTB.getTemp2() != null){ + mat.setLength(Double.parseDouble(itemTB.getTemp2())); + } +// mat.setLength(Double.parseDouble(itemTB.getTemp2())); mat.setCreateTime(now); mat.setUpdateTime(now); if (!matService.insert(mat)) { diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml index 1f38471..1ea5ec3 100644 --- a/src/main/resources/mapper/LocDetlMapper.xml +++ b/src/main/resources/mapper/LocDetlMapper.xml @@ -115,14 +115,14 @@ </choose> </sql> -<!-- <select id="selectItem" resultMap="BaseResultMap">--> -<!-- select top 1 *--> -<!-- from asr_loc_detl--> -<!-- where 1=1--> -<!-- and loc_no = #{locNo}--> -<!-- and matnr = #{matnr}--> -<!-- <include refid="batchSeq"></include>--> -<!-- </select>--> + <!-- <select id="selectItem" resultMap="BaseResultMap">--> + <!-- select top 1 *--> + <!-- from asr_loc_detl--> + <!-- where 1=1--> + <!-- and loc_no = #{locNo}--> + <!-- and matnr = #{matnr}--> + <!-- <include refid="batchSeq"></include>--> + <!-- </select>--> <select id="selectItem2" resultMap="BaseResultMap"> select top 1 * @@ -220,7 +220,15 @@ <if test="specs!=null and specs!='' "> and a.specs like '%' + #{specs} + '%' </if> - + <if test="proType!=null and proType!='' "> + and a.pro_type like '%' + #{proType} + '%' + </if> + <if test="temp1!=null and temp1!='' "> + and a.temp1 like '%' + #{temp1} + '%' + </if> + <if test="temp2!=null and temp2!='' "> + and a.temp2 like '%' + #{temp2} + '%' + </if> <if test="sPgNO!=null and sPgNO!='' "> and a.pg_no like '%' + #{sPgNO} + '%' </if> @@ -235,14 +243,14 @@ <select id="getStockOutPage" resultMap="BaseResultMap"> select * from ( - select - ROW_NUMBER() over (order by a.appe_time,a.matnr,a.loc_no) as row, - a.* - from asr_loc_detl a - left join asr_loc_mast b on a.loc_no = b.loc_no - where 1=1 - and b.loc_sts = 'F' - <include refid="stockOutCondition"></include> + select + ROW_NUMBER() over (order by a.appe_time,a.matnr,a.loc_no) as row, + a.* + from asr_loc_detl a + left join asr_loc_mast b on a.loc_no = b.loc_no + where 1=1 + and b.loc_sts = 'F' + <include refid="stockOutCondition"></include> ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize}) </select> @@ -264,6 +272,7 @@ a.model, a.pro_type AS proType, a.out_order_no AS outOrderNo, + a.temp2 AS temp2, -- 闈炲垎缁勫瓧娈电敤鑱氬悎鍑芥暟鑾峰彇涓�涓唬琛ㄥ�硷紙渚嬪MAX鎴朚IN锛� MAX(a.matnr) AS matnr, MAX(a.specs) AS specs, @@ -273,7 +282,7 @@ FROM asr_loc_detl a WHERE 1=1 <include refid="stockOutConditionTwo"/> - GROUP BY a.model, a.pro_type, a.out_order_no + GROUP BY a.model, a.pro_type, a.out_order_no, a.temp2 ) t WHERE t.row BETWEEN ((#{pageNumber}-1)*#{pageSize}+1) AND (#{pageNumber}*#{pageSize}) </select> @@ -282,7 +291,7 @@ <select id="getStockStatisCount" parameterType="java.util.Map" resultType="java.lang.Integer"> - select count(1) as count from + select count(1) as count from ( select a.model @@ -290,7 +299,7 @@ where 1=1 <include refid="stockOutCondition"></include> group by a.model - ) b + ) b </select> <select id="getStockStatisExcel" resultType="com.zy.asrs.entity.LocDetl"> @@ -369,7 +378,7 @@ <!-- </if>--> <if test="matnr != null and matnr != ''"> and a.matnr = #{matnr} --- and (a.pg_no is null or LEN(LTRIM(RTRIM(pg_no))) = 0) + -- and (a.pg_no is null or LEN(LTRIM(RTRIM(pg_no))) = 0) </if> <if test="locNos != null and locNos.size > 0"> @@ -439,8 +448,8 @@ <select id="queryStockAnfme" resultType="java.lang.Double"> select sum(anfme) as count from man_loc_detl - where 1=1 - and matnr = #{matnr} + where 1=1 + and matnr = #{matnr} <if test="batch != null and batch != ''"> and batch = #{batch} </if> diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js index 67723c6..6b5854b 100644 --- a/src/main/webapp/static/js/common.js +++ b/src/main/webapp/static/js/common.js @@ -222,6 +222,7 @@ ,{field: 'proType', align: 'center',title: '灞炴��', hide: false} ,{field: 'temp1', align: 'center',title: '鍚嶇О鎬荤О', hide: false} ,{field: 'outOrderNo', align: 'center',title: '鍚堝悓鍙�', hide: true} + ,{field: 'temp2', align: 'center',title: '瀹㈡埛鍥惧彿', hide: false} ] @@ -264,6 +265,7 @@ ,{field: 'proType', align: 'center',title: '灞炴��', hide: false} ,{field: 'temp1', align: 'center',title: '鍚嶇О鎬荤О', hide: false} ,{field: 'outOrderNo', align: 'center',title: '鍚堝悓鍙�', hide: false} + ,{field: 'temp2', align: 'center',title: '瀹㈡埛鍥惧彿', hide: false} ] diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js index ca8e66f..7e4ba8c 100644 --- a/src/main/webapp/static/js/locDetl/locDetl.js +++ b/src/main/webapp/static/js/locDetl/locDetl.js @@ -39,6 +39,7 @@ ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true} ,{field: 'proType', align: 'center',title: '灞炴��', hide: false} ,{field: 'temp1', align: 'center',title: '鍚嶇О鎬荤О', hide: false} + ,{field: 'temp2', align: 'center',title: '瀹㈡埛鍥惧彿', hide: false} ]; diff --git a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js index caab684..80815a6 100644 --- a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js +++ b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js @@ -37,6 +37,8 @@ {field: 'temp1', title:'浜у搧鎬荤О', align: 'center'}, {field: 'outOrderNo', title:'鍚堝悓鍙�', align: 'center'}, {field: 'proType', title:'灞炴��', align: 'center'}, + {field: 'temp2', title:'瀹㈡埛鍥惧彿', align: 'center'}, + ]], request: { pageName: 'curr', diff --git a/src/main/webapp/static/js/manLocDetl/manLocDetl.js b/src/main/webapp/static/js/manLocDetl/manLocDetl.js index 9a72262..d2f7f22 100644 --- a/src/main/webapp/static/js/manLocDetl/manLocDetl.js +++ b/src/main/webapp/static/js/manLocDetl/manLocDetl.js @@ -37,6 +37,7 @@ ,{field: 'proType', align: 'center',title: '灞炴��', hide: false} ,{field: 'temp1', align: 'center',title: '鍚嶇О鎬荤О', hide: false} ,{field: 'outOrderNo', align: 'center',title: '鍚堝悓鍙�', hide: false} + ,{field: 'temp2', align: 'center',title: '瀹㈡埛鍥惧彿', hide: false} ]; diff --git a/src/main/webapp/static/js/saas/locDetl.js b/src/main/webapp/static/js/saas/locDetl.js index 15f5c7b..ab97ad3 100644 --- a/src/main/webapp/static/js/saas/locDetl.js +++ b/src/main/webapp/static/js/saas/locDetl.js @@ -37,6 +37,7 @@ ,{field: 'proType', align: 'center',title: '灞炴��', hide: false} ,{field: 'temp1', align: 'center',title: '鍚嶇О鎬荤О', hide: false} ,{field: 'outOrderNo', align: 'center',title: '鍚堝悓鍙�', hide: false} + ,{field: 'temp2', align: 'center',title: '瀹㈡埛鍥惧彿', hide: false} ]; diff --git a/src/main/webapp/views/locDetlStatis/locDetlStatis.html b/src/main/webapp/views/locDetlStatis/locDetlStatis.html index fccfa22..6690528 100644 --- a/src/main/webapp/views/locDetlStatis/locDetlStatis.html +++ b/src/main/webapp/views/locDetlStatis/locDetlStatis.html @@ -35,11 +35,11 @@ <input class="layui-input" type="text" name="specs" placeholder="浜у搧瑙勬牸" autocomplete="off"> </div> </div> -<!-- <div class="layui-inline">--> -<!-- <div class="layui-input-inline">--> -<!-- <input class="layui-input" type="text" name="outOrderNo" placeholder="娲惧伐鍗曞彿" autocomplete="off">--> -<!-- </div>--> -<!-- </div>--> + <div class="layui-inline"> + <div class="layui-input-inline"> + <input class="layui-input" type="text" name="temp2" placeholder="瀹㈡埛鍥惧彿" autocomplete="off"> + </div> + </div> <div class="layui-inline"> <div class="layui-input-inline"> <input class="layui-input" type="text" name="outOrderNo" placeholder="鍚堝悓鍙�" autocomplete="off"> diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html index a6b7c78..e3ae124 100644 --- a/src/main/webapp/views/pakStore/locDetlQuery.html +++ b/src/main/webapp/views/pakStore/locDetlQuery.html @@ -74,14 +74,19 @@ </div> <div class="layui-inline"> <div class="layui-input-inline"> - <input class="layui-input" type="text" name="maktx" placeholder="鐗╂枡鎻忚堪" autocomplete="off"> + <input class="layui-input" type="text" name="proType" placeholder="灞炴��" autocomplete="off"> </div> </div> -<!-- <div class="layui-inline">--> -<!-- <div class="layui-input-inline">--> -<!-- <input class="layui-input" type="text" name="sPgNO" placeholder="娲惧伐鍗曞彿" autocomplete="off">--> -<!-- </div>--> -<!-- </div>--> + <div class="layui-inline"> + <div class="layui-input-inline"> + <input class="layui-input" type="text" name="temp1" placeholder="鎬荤О" autocomplete="off"> + </div> + </div> + <div class="layui-inline"> + <div class="layui-input-inline"> + <input class="layui-input" type="text" name="temp2" placeholder="瀹㈡埛鍥惧彿" autocomplete="off"> + </div> + </div> <div class="layui-inline"> <div class="layui-input-inline"> <input class="layui-input" type="text" name="outOrderNo" placeholder="鍚堝悓鍙�" autocomplete="off"> -- Gitblit v1.9.1