From 47cc646b1c55e905e4a73c80ac78abc77e88aeb7 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期三, 23 三月 2022 10:57:10 +0800 Subject: [PATCH] #杰克缝纫机立库 【优化单据管理】 --- src/main/java/com/zy/asrs/controller/OrderController.java | 10 ++++ src/main/webapp/static/js/order/order.js | 54 ++++++++++++++------------- src/main/webapp/views/order/order.html | 6 +- 3 files changed, 40 insertions(+), 30 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java index 8f4ba73..29d3776 100644 --- a/src/main/java/com/zy/asrs/controller/OrderController.java +++ b/src/main/java/com/zy/asrs/controller/OrderController.java @@ -10,6 +10,8 @@ import com.core.common.DateUtils; import com.core.common.R; import com.zy.asrs.entity.Order; +import com.zy.asrs.entity.OrderDetl; +import com.zy.asrs.service.OrderDetlService; import com.zy.asrs.service.OrderService; import com.zy.common.web.BaseController; import org.springframework.beans.factory.annotation.Autowired; @@ -25,6 +27,8 @@ @Autowired private OrderService orderService; + @Autowired + private OrderDetlService orderDetlService; @RequestMapping(value = "/order/head/page/auth") @ManagerAuth @@ -43,7 +47,11 @@ - + @RequestMapping(value = "/order/detl/all/auth") + @ManagerAuth + public R head(@RequestParam Long orderId){ + return R.ok().add(orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_id", orderId))); + } diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js index a06f4a9..69c6a85 100644 --- a/src/main/webapp/static/js/order/order.js +++ b/src/main/webapp/static/js/order/order.js @@ -97,6 +97,7 @@ {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160}, {field: 'batch', title: '鎵瑰彿'}, {field: 'count', title: '鏁伴噺'}, + {field: 'unit', title: '鍗曚綅'}, // { // field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) { // return util.toDateString(d.createTime); @@ -143,13 +144,14 @@ success: function (layero, dIndex) { $(layero).children('.layui-layer-content').css('overflow', 'visible'); var isExpAdd = !expTpe; + console.log(expTpe) // 鍥炴樉鏁版嵁 form.val('editForm', expTpe); if (expTpe) { - $('#billNo').attr("disabled", "disabled"); + $('#orderNo').attr("disabled", "disabled"); } // 琛ㄥ崟鎻愪氦浜嬩欢 - form.on('submit(waitMatinEditSubmit)', function (data) { + form.on('submit(orderEditSubmit)', function (data) { // 缁勮鏁版嵁 if (xxDataList.length <= 0) { layer.tips('璇锋坊鍔犲崟鎹槑缁�', '#matAddBtnComment', {tips: [1, '#ff4c4c']}); @@ -219,16 +221,15 @@ height: '350px;', cellMinWidth: 100, cols: [[ - {type: 'numbers'}, - {field: 'matNo', title: '鐗╂枡缂栫爜'}, - {field: 'matName', title: '鐗╂枡鍚嶇О', width: 160}, - {field: 'specs', title: '瑙勬牸', width: 160}, - {field: 'color', title: '棰滆壊', width: 160}, - {field: 'size', title: '灏哄', width: 160}, - {field: 'qty', title: '淇敼鏁伴噺', style: 'color: blue;font-weight: bold', edit: true, minWidth: 100, width: 100}, - {field: 'inQty', title: '宸插叆搴撻噺', minWidth: 100, width: 100}, - {field: 'unit', title: '鍗曚綅', width: 160}, - {field: 'memo', title: '澶囨敞' , edit: true, width: 160}, + {type: 'numbers', title: '#'}, + {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160}, + {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200}, + {field: 'batch', title: '鎵瑰彿'}, + {field: 'specs', title: '瑙勬牸'}, + {field: 'count', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110}, + // {field: 'inQty', title: '宸插叆搴撻噺', minWidth: 100, width: 100}, + {field: 'unit', title: '鍗曚綅', width: 80}, + {field: 'memo', title: '澶囨敞' , edit: true}, {align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80, fixed: 'right'} ]], done: function (res) { @@ -243,7 +244,7 @@ }; if (!isExpAdd) { $.ajax({ - url: baseUrl+"/waitMatin/detl/list/auth?billNo=" + expTpe.billNo, + url: baseUrl+"/order/detl/all/auth?orderId=" + expTpe.id, headers: {'token': localStorage.getItem('token')}, method: 'GET', async: false, @@ -273,7 +274,7 @@ }, function (i) { layer.close(i); for (var j = 0; j < xxDataList.length; j++) { - if (xxDataList[j].matNo === data.matNo) { + if (xxDataList[j].matnr === data.matnr && xxDataList[j].batch === data.batch) { xxDataList.splice(j, 1); break; } @@ -282,30 +283,31 @@ }); } }); - // 鏁伴噺淇敼 + // 鏄庣粏鏁版嵁淇敼 table.on('edit(formSSXMTable)', function (obj) { - if (obj.field=='memo'){ - let vle = obj.value; - for (var i=0;i<xxDataList.length;i++) { - if (xxDataList[i]["matNo"] === obj.data.matNo) { - xxDataList[i]["memo"] = vle; + if (obj.field === 'memo'){ + for (let i=0;i<xxDataList.length;i++) { + if (xxDataList[i]["matnr"] === obj.data.matnr && xxDataList[i]["batch"] === obj.data.batch) { + xxDataList[i]["memo"] = obj.value; break; } } - }else if (obj.field=='qty'){ + } else if (obj.field==='count'){ let vle = Number(obj.value); if (isNaN(vle)) { - layer.msg("璇疯緭鍏ユ暟瀛�"); + layer.msg("璇疯緭鍏ユ暟瀛�", {icon: 2}); + return false; } else { if (vle > 0) { - for (var i=0;i<xxDataList.length;i++) { - if (xxDataList[i]["matNo"] === obj.data.matNo) { - xxDataList[i]["qty"] = vle; + for (let i=0;i<xxDataList.length;i++) { + if (xxDataList[i]["matnr"] === obj.data.matnr && xxDataList[i]["batch"] === obj.data.batch) { + xxDataList[i]["count"] = vle; break; } } } else { - layer.msg("鏁伴噺蹇呴』澶т簬闆�"); + layer.msg("鏁伴噺蹇呴』澶т簬闆�", {icon: 2}); + return false; } } } diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html index 391d8b2..bd2c62d 100644 --- a/src/main/webapp/views/order/order.html +++ b/src/main/webapp/views/order/order.html @@ -77,7 +77,7 @@ <label class="layui-form-label">鍗曟嵁绫诲瀷: </label> <div class="layui-input-block cool-auto-complete"> <input class="layui-input" name="docType" placeholder="璇疯緭鍏ュ崟鎹被鍨�" style="display: none"> - <input id="docType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ュ崟鎹被鍨�" onfocus=this.blur()> + <input id="docType$" name="docType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ュ崟鎹被鍨�" onfocus=this.blur()> <div class="cool-auto-complete-window"> <input class="cool-auto-complete-window-input" data-key="docTypeQueryBydocType" onkeyup="autoLoad(this.getAttribute('data-key'))"> <select class="cool-auto-complete-window-select" data-key="docTypeQueryBydocTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> @@ -88,7 +88,7 @@ <div class="layui-form-item"> <label class="layui-form-label">鍗曟嵁缂栧彿锛�</label> <div class="layui-input-block"> - <input id="billNo" name="billNo" placeholder="杈撳叆鍗曟嵁缂栧彿" type="text" class="layui-input" maxlength="20" lay-verType="tips" lay-verify="required"/> + <input id="orderNo" name="orderNo" placeholder="杈撳叆鍗曟嵁缂栧彿" type="text" class="layui-input" maxlength="20" lay-verType="tips" lay-verify="required"/> </div> </div> <div class="layui-form-item" style="position: relative;"> @@ -103,7 +103,7 @@ </div> <div class="layui-form-item text-right"> <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button> - <button class="layui-btn" lay-filter="waitMatinEditSubmit" lay-submit>淇濆瓨</button> + <button class="layui-btn" lay-filter="orderEditSubmit" lay-submit>淇濆瓨</button> </div> </form> </script> -- Gitblit v1.9.1