From ecbb38cc99fc0cd69295f91b7b3c19fe4da486a2 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期五, 25 三月 2022 14:37:10 +0800 Subject: [PATCH] #杰克缝纫机立库 【wms单据明细添加作业数量】 --- src/main/resources/mapper/OrderDetlMapper.xml | 1 src/main/java/com/zy/asrs/controller/OrderController.java | 2 /dev/null | 335 ----------------------------------------------- src/main/java/com/zy/asrs/service/OrderService.java | 5 src/main/java/com/zy/asrs/entity/OrderDetl.java | 6 src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 8 + src/main/webapp/static/js/order/order.js | 3 src/main/java/com/zy/asrs/controller/MobileController.java | 34 +++- 8 files changed, 48 insertions(+), 346 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java index 5ba3f32..bd21a57 100644 --- a/src/main/java/com/zy/asrs/controller/MobileController.java +++ b/src/main/java/com/zy/asrs/controller/MobileController.java @@ -7,10 +7,13 @@ import com.core.common.R; import com.zy.asrs.entity.LocDetl; import com.zy.asrs.entity.LocMast; +import com.zy.asrs.entity.Order; +import com.zy.asrs.entity.OrderDetl; import com.zy.asrs.entity.param.CombParam; import com.zy.asrs.service.LocDetlService; import com.zy.asrs.service.LocMastService; import com.zy.asrs.service.MobileService; +import com.zy.asrs.service.OrderService; import com.zy.common.model.MobileLocDetlVo; import com.zy.common.web.BaseController; import org.springframework.beans.factory.annotation.Autowired; @@ -36,6 +39,27 @@ private LocMastService locMastService; @Autowired private LocDetlService locDetlService; + @Autowired + private OrderService orderService; + + /** + * 鏍规嵁鍗曞彿妫�绱㈠崟鎹暟鎹� + */ + @RequestMapping("/order/serach/orderNo/auth") + @ManagerAuth + public R orderSearchByBarcode(@RequestParam String orderNo){ + Order order = orderService.selectByNo(orderNo); + if (order.getSettle() > 2) { + return R.ok(); + } + List<OrderDetl> orderDetls = orderService.selectWorkingDetls(orderNo); + if (Cools.isEmpty(orderDetls)) { + return R.ok(); + } + return R.ok().add(orderDetls); + } + + /** * 缁勬墭 @@ -47,16 +71,6 @@ return R.ok(); } - - /** - * 缁勬墭 - */ - @RequestMapping("/comb/form") - @ManagerAuth(memo = "缁勬墭") - public R combForm(@RequestParam CombParam combParam){ - mobileService.comb(combParam, getUserId()); - return R.ok(); - } /** * 鏍规嵁搴撲綅鍙锋煡鎵惧簱瀛樻槑缁� diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java index 1d557aa..6a0f070 100644 --- a/src/main/java/com/zy/asrs/controller/OrderController.java +++ b/src/main/java/com/zy/asrs/controller/OrderController.java @@ -107,6 +107,7 @@ orderDetl.setUpdateBy(getUserId()); orderDetl.setUpdateTime(now); orderDetl.setStatus(1); + orderDetl.setQty(0.0D); if (!orderDetlService.insert(orderDetl)) { throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗eけ璐�"); } @@ -151,6 +152,7 @@ detl.setUpdateTime(now); detl.setUpdateBy(userId); detl.setStatus(1); + detl.setQty(0.0D); // 淇敼 } else { detl.setAnfme(orderDetl.getAnfme()); // 淇敼鏁伴噺 diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java index 78f8266..8a3ef4c 100644 --- a/src/main/java/com/zy/asrs/entity/OrderDetl.java +++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java @@ -44,6 +44,12 @@ private Double anfme; /** + * 浣滀笟鏁伴噺 + */ + @ApiModelProperty(value= "浣滀笟鏁伴噺") + private Double qty; + + /** * 鍟嗗搧缂栫爜 */ @ApiModelProperty(value= "鍟嗗搧缂栫爜") diff --git a/src/main/java/com/zy/asrs/service/OrderService.java b/src/main/java/com/zy/asrs/service/OrderService.java index 1ddf955..b2c15f9 100644 --- a/src/main/java/com/zy/asrs/service/OrderService.java +++ b/src/main/java/com/zy/asrs/service/OrderService.java @@ -2,9 +2,14 @@ import com.zy.asrs.entity.Order; import com.baomidou.mybatisplus.service.IService; +import com.zy.asrs.entity.OrderDetl; + +import java.util.List; public interface OrderService extends IService<Order> { Order selectByNo(String orderNo); + List<OrderDetl> selectWorkingDetls(String orderNo); + } diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java index 09c4e0a..c3d1327 100644 --- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.core.common.Cools; +import com.zy.asrs.entity.OrderDetl; import com.zy.asrs.mapper.OrderMapper; import com.zy.asrs.entity.Order; import com.zy.asrs.service.OrderService; @@ -21,4 +22,11 @@ } return orderList.get(0); } + + @Override + public List<OrderDetl> selectWorkingDetls(String orderNo) { + + return null; + } + } diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml index dc2d3f2..beef24a 100644 --- a/src/main/resources/mapper/OrderDetlMapper.xml +++ b/src/main/resources/mapper/OrderDetlMapper.xml @@ -7,6 +7,7 @@ <id column="id" property="id" /> <result column="order_id" property="orderId" /> <result column="anfme" property="anfme" /> + <result column="qty" property="qty" /> <result column="matnr" property="matnr" /> <result column="maktx" property="maktx" /> <result column="name" property="name" /> diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js index 3e57a88..c0b408b 100644 --- a/src/main/webapp/static/js/order/order.js +++ b/src/main/webapp/static/js/order/order.js @@ -77,7 +77,7 @@ layer.open({ type: 1, title: false, - area: '750px', + area: '800px', offset: [top + 'px', (left - 530 + $a.outerWidth()) + 'px'], shade: .01, shadeClose: true, @@ -99,6 +99,7 @@ {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160}, {field: 'batch', title: '鎵瑰彿'}, {field: 'anfme', title: '鏁伴噺'}, + {field: 'qty', title: '浣滀笟鏁伴噺', style: 'font-weight: bold'}, {field: 'unit', title: '鍗曚綅'}, // { // field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) { diff --git a/src/main/webapp/views/order/order0.html b/src/main/webapp/views/order/order0.html deleted file mode 100644 index 4a3d9e5..0000000 --- a/src/main/webapp/views/order/order0.html +++ /dev/null @@ -1,335 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> - <title></title> - <meta name="renderer" content="webkit"> - <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> - <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> - <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all"> - <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all"> - <link rel="stylesheet" href="../../static/css/cool.css" media="all"> -</head> -<body> - -<div class="layui-fluid"> - <div class="layui-card"> - <div class="layui-card-body"> - <div class="layui-form toolbar" id="search-box"> - <div class="layui-form-item"> - <div class="layui-inline"> - <label class="layui-form-label">缂栧彿:</label> - <div class="layui-input-inline"> - <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off"> - </div> - </div> - <div class="layui-inline">  - <button class="layui-btn icon-btn" lay-filter="search" lay-submit> - <i class="layui-icon"></i>鎼滅储 - </button> - <button class="layui-btn icon-btn" lay-filter="reset" lay-submit> - <i class="layui-icon"></i>閲嶇疆 - </button> - </div> - </div> - </div> - <table class="layui-hide" id="order" lay-filter="order"></table> - </div> - </div> -</div> - -<script type="text/html" id="toolbar"> - <div class="layui-btn-container"> - <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button> - <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button> - <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button> - </div> -</script> - -<script type="text/html" id="operate"> - <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a> - <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a> -</script> - -<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script> -<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script> -<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script> -<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script> -<script type="text/javascript" src="../../static/js/order/order.js" charset="utf-8"></script> -</body> -<!-- 琛ㄥ崟寮圭獥 --> -<script type="text/html" id="editDialog"> - <form id="detail" lay-filter="detail" class="layui-form admin-form model-form"> - <input name="id" type="hidden"> - <div class="layui-row"> - <div class="layui-col-md12"> - <div class="layui-form-item"> - <label class="layui-form-label layui-form-required">缂栧彿: </label> - <div class="layui-input-block"> - <input class="layui-input" name="uuid" placeholder="璇疯緭鍏ョ紪鍙�" lay-vertype="tips" lay-verify="required"> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label">璁㈠崟缂栧彿: </label> - <div class="layui-input-block"> - <input class="layui-input" name="orderNo" placeholder="璇疯緭鍏ヨ鍗曠紪鍙�"> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label">鍗曟嵁鏃ユ湡: </label> - <div class="layui-input-block"> - <input class="layui-input" name="orderTime" placeholder="璇疯緭鍏ュ崟鎹棩鏈�"> - </div> - </div> - <div class="layui-form-item"> - <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()> - <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"> - </select> - </div> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label">椤圭洰缂栧彿: </label> - <div class="layui-input-block cool-auto-complete"> - <input class="layui-input" name="itemId" placeholder="璇疯緭鍏ラ」鐩紪鍙�" style="display: none"> - <input id="itemId$" 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="itemQueryByitemId" onkeyup="autoLoad(this.getAttribute('data-key'))"> - <select class="cool-auto-complete-window-select" data-key="itemQueryByitemIdSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> - </select> - </div> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label">: </label> - <div class="layui-input-block"> - <input class="layui-input" name="itemName" placeholder="璇疯緭鍏�"> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label">璋冩嫧椤圭洰缂栧彿: </label> - <div class="layui-input-block cool-auto-complete"> - <input class="layui-input" name="allotItemId" placeholder="璇疯緭鍏ヨ皟鎷ㄩ」鐩紪鍙�" style="display: none"> - <input id="allotItemId$" 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="itemQueryByallotItemId" onkeyup="autoLoad(this.getAttribute('data-key'))"> - <select class="cool-auto-complete-window-select" data-key="itemQueryByallotItemIdSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> - </select> - </div> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label">鍒濆绁ㄦ嵁鍙�: </label> - <div class="layui-input-block"> - <input class="layui-input" name="defNumber" placeholder="璇疯緭鍏ュ垵濮嬬エ鎹彿"> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label">绁ㄦ嵁鍙�: </label> - <div class="layui-input-block"> - <input class="layui-input" name="number" placeholder="璇疯緭鍏ョエ鎹彿"> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label">瀹㈡埛缂栧彿: </label> - <div class="layui-input-block cool-auto-complete"> - <input class="layui-input" name="cstmr" placeholder="璇疯緭鍏ュ鎴风紪鍙�" style="display: none"> - <input id="cstmr$" 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="cstmrQueryBycstmr" onkeyup="autoLoad(this.getAttribute('data-key'))"> - <select class="cool-auto-complete-window-select" data-key="cstmrQueryBycstmrSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> - </select> - </div> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label">瀹㈡埛: </label> - <div class="layui-input-block"> - <input class="layui-input" name="cstmrName" placeholder="璇疯緭鍏ュ鎴�"> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label">鑱旂郴鏂瑰紡: </label> - <div class="layui-input-block"> - <input class="layui-input" name="tel" placeholder="璇疯緭鍏ヨ仈绯绘柟寮�"> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label">鎿嶄綔浜哄憳: </label> - <div class="layui-input-block"> - <input class="layui-input" name="operMemb" placeholder="璇疯緭鍏ユ搷浣滀汉鍛�"> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label">鍚堣閲戦: </label> - <div class="layui-input-block"> - <input class="layui-input" name="totalFee" placeholder="璇疯緭鍏ュ悎璁¢噾棰�"> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label">浼樻儬鐜�: </label> - <div class="layui-input-block"> - <input class="layui-input" name="discount" placeholder="璇疯緭鍏ヤ紭鎯犵巼"> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label">浼樻儬閲戦: </label> - <div class="layui-input-block"> - <input class="layui-input" name="discountFee" placeholder="璇疯緭鍏ヤ紭鎯犻噾棰�"> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label">閿�鍞垨閲囪喘璐圭敤鍚堣: </label> - <div class="layui-input-block"> - <input class="layui-input" name="otherFee" placeholder="璇疯緭鍏ラ攢鍞垨閲囪喘璐圭敤鍚堣"> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label">瀹炰粯閲戦: </label> - <div class="layui-input-block"> - <input class="layui-input" name="actFee" placeholder="璇疯緭鍏ュ疄浠橀噾棰�"> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label">浠樻绫诲瀷: </label> - <div class="layui-input-block"> - <select name="payType"> - <option value="">璇烽�夋嫨浠樻绫诲瀷</option> - <option value="1">鐜伴噾</option> - <option value="2">璁拌处</option> - </select> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label">涓氬姟鍛�: </label> - <div class="layui-input-block"> - <input class="layui-input" name="salesman" placeholder="璇疯緭鍏ヤ笟鍔″憳"> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label">缁撶畻澶╂暟: </label> - <div class="layui-input-block"> - <input class="layui-input" name="accountDay" placeholder="璇疯緭鍏ョ粨绠楀ぉ鏁�"> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label">閭垂鏀粯绫诲瀷: </label> - <div class="layui-input-block"> - <select name="postFeeType"> - <option value="">璇烽�夋嫨閭垂鏀粯绫诲瀷</option> - <option value="1">鍦ㄧ嚎鏀粯</option> - <option value="2">璐у埌浠樻</option> - </select> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label">閭垂: </label> - <div class="layui-input-block"> - <input class="layui-input" name="postFee" placeholder="璇疯緭鍏ラ偖璐�"> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label">浠樻鏃堕棿: </label> - <div class="layui-input-block"> - <input class="layui-input" name="payTime" id="payTime$" placeholder="璇疯緭鍏ヤ粯娆炬椂闂�"> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label">鍙戣揣鏃堕棿: </label> - <div class="layui-input-block"> - <input class="layui-input" name="sendTime" id="sendTime$" placeholder="璇疯緭鍏ュ彂璐ф椂闂�"> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label">鐗╂祦鍚嶇О: </label> - <div class="layui-input-block"> - <input class="layui-input" name="shipName" placeholder="璇疯緭鍏ョ墿娴佸悕绉�"> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label">鐗╂祦鍗曞彿: </label> - <div class="layui-input-block"> - <input class="layui-input" name="shipCode" placeholder="璇疯緭鍏ョ墿娴佸崟鍙�"> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label">璁㈠崟鐘舵��: </label> - <div class="layui-input-block cool-auto-complete"> - <input class="layui-input" name="settle" placeholder="璇疯緭鍏ヨ鍗曠姸鎬�" style="display: none"> - <input id="settle$" 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="orderSettleQueryBysettle" onkeyup="autoLoad(this.getAttribute('data-key'))"> - <select class="cool-auto-complete-window-select" data-key="orderSettleQueryBysettleSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> - </select> - </div> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label">鐘舵��: </label> - <div class="layui-input-block"> - <select name="status"> - <option value="">璇烽�夋嫨鐘舵��</option> - <option value="1">姝e父</option> - <option value="0">绂佺敤</option> - </select> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label">娣诲姞浜哄憳: </label> - <div class="layui-input-block cool-auto-complete"> - <input class="layui-input" name="createBy" placeholder="璇疯緭鍏ユ坊鍔犱汉鍛�" style="display: none"> - <input id="createBy$" 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="userQueryBycreateBy" onkeyup="autoLoad(this.getAttribute('data-key'))"> - <select class="cool-auto-complete-window-select" data-key="userQueryBycreateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> - </select> - </div> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label">娣诲姞鏃堕棿: </label> - <div class="layui-input-block"> - <input class="layui-input" name="createTime" id="createTime$" placeholder="璇疯緭鍏ユ坊鍔犳椂闂�"> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label">淇敼浜哄憳: </label> - <div class="layui-input-block cool-auto-complete"> - <input class="layui-input" name="updateBy" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" style="display: none"> - <input id="updateBy$" 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="userQueryByupdateBy" onkeyup="autoLoad(this.getAttribute('data-key'))"> - <select class="cool-auto-complete-window-select" data-key="userQueryByupdateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> - </select> - </div> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label">淇敼鏃堕棿: </label> - <div class="layui-input-block"> - <input class="layui-input" name="updateTime" id="updateTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�"> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label">澶囨敞: </label> - <div class="layui-input-block"> - <input class="layui-input" name="memo" placeholder="璇疯緭鍏ュ娉�"> - </div> - </div> - - </div> - </div> - <hr class="layui-bg-gray"> - <div class="layui-form-item text-right"> - <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button> - <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button> - </div> - </form> -</script> -</html> - -- Gitblit v1.9.1