src/main/java/zy/cloud/wms/manager/controller/WorkController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/webapp/static/js/ioWorks/matQuery.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/webapp/views/order/matQuery.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -12,14 +12,9 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import zy.cloud.wms.common.web.BaseController; import zy.cloud.wms.manager.entity.CustOrder; import zy.cloud.wms.manager.entity.Pakout; import zy.cloud.wms.manager.entity.WrkSts; import zy.cloud.wms.manager.entity.*; import zy.cloud.wms.manager.entity.param.*; import zy.cloud.wms.manager.service.CustOrderService; import zy.cloud.wms.manager.service.PakoutService; import zy.cloud.wms.manager.service.WorkService; import zy.cloud.wms.manager.service.WrkStsService; import zy.cloud.wms.manager.service.*; import java.util.List; @@ -162,4 +157,38 @@ return workService.stockCheckAuditing(checkId, getUserId()); } /******************************************************************************************************/ @Autowired private DocTypeService docTypeService; @Autowired private CstmrService cstmrService; @Autowired private ItemService itemService; // 获取所有单据类型 @RequestMapping("/docType/all/get") @ManagerAuth public R getDocTypeData() { List<DocType> docTypes = docTypeService.selectList(new EntityWrapper<DocType>().eq("status", 1).orderBy("create_time", false)); return R.ok().add(docTypes); } // 获取所有客户 @RequestMapping("/cstmr/all/get") @ManagerAuth public R getCstmrData() { List<Cstmr> cstmrs = cstmrService.selectList(new EntityWrapper<Cstmr>().eq("status", 1).orderBy("create_time", false)); return R.ok().add(cstmrs); } // 获取所有项目 @RequestMapping("/item/all/get") @ManagerAuth public R getItemData() { List<Item> items = itemService.selectList(new EntityWrapper<Item>().eq("status", 1).orderBy("create_time", false)); return R.ok().add(items); } } src/main/webapp/static/js/ioWorks/matQuery.js
@@ -19,6 +19,7 @@ var layer = layui.layer; var form = layui.form; var notice = layui.notice; var layDate = layui.laydate; tableIns = table.render({ elem: '#chooseData', @@ -61,16 +62,79 @@ return false; } } var index = layer.load(1, {shade: [0.1,'#000']}); // 单据类型 var docTypeData; $.ajax({ url: baseUrl+"/work/docType/all/get", headers: {'token': localStorage.getItem('token')}, method: 'POST', async: false, success: function (res) { if (res.code === 200){ docTypeData = res; } else { layer.msg(res.msg, {icon: 2}) } } }); var tpl1 = $('#docTypeSelectTpl').html(); var template1 = Handlebars.compile(tpl1); var html1 = template1(docTypeData); $("#docType").html(html1); // 客户 var cstmrData; $.ajax({ url: baseUrl+"/work/cstmr/all/get", headers: {'token': localStorage.getItem('token')}, method: 'POST', async: false, success: function (res) { if (res.code === 200){ cstmrData = res; } else { layer.msg(res.msg, {icon: 2}) } } }); var tpl2 = $('#cstmrSelectTpl').html(); var template2 = Handlebars.compile(tpl2); var html2 = template2(cstmrData); $("#cstmr").html(html2); // 项目 var itemData; $.ajax({ url: baseUrl+"/work/item/all/get", headers: {'token': localStorage.getItem('token')}, method: 'POST', async: false, success: function (res) { if (res.code === 200){ itemData = res; } else { layer.msg(res.msg, {icon: 2}) } } }); var tpl3 = $('#itemSelectTpl').html(); var template3 = Handlebars.compile(tpl3); var html3 = template3(itemData); $("#item").html(html3); layer.close(index); if (success) { layer.open({ type: 1, title: '定义采购退货单编号', title: '单据填充', offset: '100px', area: ['360px'], shade: 0.1, content: $('#getOrderNo'), success: function(layero, index){ layer.iframeAuto(index) layer.iframeAuto(index); layui.form.render('select'); }, cancel: function () { $('#orderNo').val(''); @@ -172,6 +236,12 @@ }}); } layDate.render({ elem: '#orderTime', trigger: 'click', type: 'date' }); }) // 提取物料 src/main/webapp/views/order/matQuery.html
@@ -152,33 +152,36 @@ <!-- 订单编号、单据日期、单据类型、项目编号、客户编号、 --> <div class="layui-form"> <div class="layui-form-item"> <label class="layui-form-label layui-form-required">单据类型:</label> <div class="layui-input-block"> <select id="docType" name="docType" lay-verType="tips" lay-verify="required" required> </select> </div> </div> <div class="layui-form-item"> <label class="layui-form-label layui-form-required">单据编号:</label> <div class="layui-input-block"> <input id="orderNo" name="orderNo" placeholder="请输入单据编号" class="layui-input" lay-verify="required" autocomplete="off"> </div> </div> <div class="layui-form-item"> <label class="layui-form-label layui-form-required">客户编号:</label> <label class="layui-form-label layui-form-required">单据日期:</label> <div class="layui-input-block"> <input id="customerTypeId" name="customerTypeId" placeholder="请输入客户编号" class="layui-input" lay-verify="required" autocomplete="off"> <input id="orderTime" name="orderTime" placeholder="请输入客户编号" class="layui-input" lay-verify="required" autocomplete="off"> </div> </div> <div class="layui-form-item"> <label class="layui-form-label layui-form-required">项目编号:</label> <div class="layui-input-block"> <select id="item" name="item" lay-verType="tips" lay-verify="required" required lay-search=""> </select> </div> </div> <div class="layui-form-item"> <label class="layui-form-label layui-form-required">客户编号:</label> <div class="layui-input-block"> <input id="customerTypeId" name="customerTypeId" placeholder="请输入客户编号" class="layui-input" lay-verify="required" autocomplete="off"> </div> </div> <div class="layui-form-item"> <label class="layui-form-label layui-form-required">客户编号:</label> <div class="layui-input-block"> <input id="customerTypeId" name="customerTypeId" placeholder="请输入客户编号" class="layui-input" lay-verify="required" autocomplete="off"> </div> </div> <div class="layui-form-item"> <label class="layui-form-label layui-form-required">客户编号:</label> <div class="layui-input-block"> <input id="customerTypeId" name="customerTypeId" placeholder="请输入客户编号" class="layui-input" lay-verify="required" autocomplete="off"> <select id="cstmr" name="cstmr" lay-verType="tips" lay-verify="required" required lay-search=""> </select> </div> </div> <div class="layui-form-item cool-button-contain"> @@ -188,5 +191,23 @@ </div> </div> </body> <script type="text/html" id="docTypeSelectTpl"> <option value="">请选择单据类型</option> {{#each data}} <option value="{{this.docId}}">{{this.docName}}</option> {{/each}} </script> <script type="text/html" id="itemSelectTpl"> <option value="">请选择项目</option> {{#each data}} <option value="{{this.id}}">{{this.name}}</option> {{/each}} </script> <script type="text/html" id="cstmrSelectTpl"> <option value="">请选择客户</option> {{#each data}} <option value="{{this.id}}">{{this.name}}</option> {{/each}} </script> </html>