Commit 279a7c363c8053aef4e70b09fdb9196c22fd60fb
Merge branch 'develop' of http://www.huahengrobot.com:90/wms/wms2 into develop
Showing
9 changed files
with
42 additions
and
42 deletions
src/main/java/com/huaheng/pc/task/taskHeader/service/ReceiptTaskService.java
| ... | ... | @@ -145,6 +145,7 @@ public class ReceiptTaskService { |
| 145 | 145 | taskDetail.setMaterialName(item.getMaterialName()); |
| 146 | 146 | taskDetail.setMaterialSpec(item.getMaterialSpec()); |
| 147 | 147 | taskDetail.setMaterialUnit(item.getMaterialUnit()); |
| 148 | + taskDetail.setInventorySts(item.getInventorySts()); | |
| 148 | 149 | taskDetail.setBillCode(item.getReceiptCode()); |
| 149 | 150 | taskDetail.setBillDetailId(item.getReceiptDetailId()); |
| 150 | 151 | taskDetail.setQty(item.getQty()); |
| ... | ... |
src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html
| ... | ... | @@ -65,7 +65,7 @@ |
| 65 | 65 | 批 号：<input type="text" name="lot"/> |
| 66 | 66 | </li> |
| 67 | 67 | |
| 68 | - <li class="time" style="height:30px"> | |
| 68 | + <li class="time2" style="height:30px"> | |
| 69 | 69 | <label>创建时间： </label> |
| 70 | 70 | <input type="text" class="time-input" id="startTime" placeholder="开始时间" |
| 71 | 71 | name="createdBegin"/> |
| ... | ... |
src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html
src/main/resources/templates/receipt/receiptContainerHeader/receiptContainerHeader.html
| ... | ... | @@ -323,16 +323,13 @@ |
| 323 | 323 | $.modal.alertWarning("请至少选择一条记录"); |
| 324 | 324 | return; |
| 325 | 325 | } |
| 326 | - $.modal.confirm("确认要生成选中的" + rows.length + "条组盘任务吗?", function() { | |
| 327 | - var url = prefix + "/createTask"; | |
| 328 | - var ids = ""; | |
| 329 | - for(var i=0; i<rows.length; i++) { | |
| 330 | - ids = ids + rows[i].id + "," | |
| 331 | - } | |
| 332 | - var data = { "ids": ids.substring(0, ids.length-1) }; | |
| 333 | - $.operate.post(url, data); | |
| 334 | - // submit(url, "post", "json", data); | |
| 335 | - }); | |
| 326 | + var url = prefix + "/createTask"; | |
| 327 | + var ids = ""; | |
| 328 | + for(var i=0; i<rows.length; i++) { | |
| 329 | + ids = ids + rows[i].id + "," | |
| 330 | + } | |
| 331 | + var data = { "ids": ids.substring(0, ids.length-1) }; | |
| 332 | + $.operate.post(url, data); | |
| 336 | 333 | } |
| 337 | 334 | |
| 338 | 335 | function position(id){ |
| ... | ... |
src/main/resources/templates/receipt/receiptDetail/receiptDetail.html
src/main/resources/templates/receipt/receiving/receiving.html
| ... | ... | @@ -607,31 +607,29 @@ |
| 607 | 607 | $.modal.alertWarning("请至少选择一条记录"); |
| 608 | 608 | return; |
| 609 | 609 | } |
| 610 | - $.modal.confirm("确认要生成选中的" + rows.length + "条组盘任务吗?", function() { | |
| 611 | - let url = ctx + "receipt/receiptContainerHeader/createTask"; | |
| 612 | - let ids = ""; | |
| 613 | - for(let i=0; i<rows.length; i++) { | |
| 614 | - ids = ids + rows[i].receiptContainerId + "," | |
| 615 | - } | |
| 616 | - let data = { "ids": ids.substring(0, ids.length-1) }; | |
| 617 | - $.modal.loading("正在处理中，请稍后..."); | |
| 618 | - var config = { | |
| 619 | - url: url, | |
| 620 | - type: "post", | |
| 621 | - dataType: "json", | |
| 622 | - data: data, | |
| 623 | - success: function(result) { | |
| 624 | - if (result.code == web_status.SUCCESS) { | |
| 625 | - $.modal.msgSuccess(result.msg); | |
| 626 | - $.table.refresh("bootstrap-table1"); | |
| 627 | - } else { | |
| 628 | - $.modal.alertError(result.msg); | |
| 629 | - } | |
| 630 | - $.modal.closeLoading(); | |
| 631 | - } | |
| 632 | - }; | |
| 633 | - $.ajax(config) | |
| 634 | - }); | |
| 610 | + let url = ctx + "receipt/receiptContainerHeader/createTask"; | |
| 611 | + let ids = ""; | |
| 612 | + for(let i=0; i<rows.length; i++) { | |
| 613 | + ids = ids + rows[i].receiptContainerId + "," | |
| 614 | + } | |
| 615 | + let data = { "ids": ids.substring(0, ids.length-1) }; | |
| 616 | + $.modal.loading("正在处理中，请稍后..."); | |
| 617 | + var config = { | |
| 618 | + url: url, | |
| 619 | + type: "post", | |
| 620 | + dataType: "json", | |
| 621 | + data: data, | |
| 622 | + success: function(result) { | |
| 623 | + if (result.code == web_status.SUCCESS) { | |
| 624 | + $.modal.msgSuccess(result.msg); | |
| 625 | + $.table.refresh("bootstrap-table1"); | |
| 626 | + } else { | |
| 627 | + $.modal.alertError(result.msg); | |
| 628 | + } | |
| 629 | + $.modal.closeLoading(); | |
| 630 | + } | |
| 631 | + }; | |
| 632 | + $.ajax(config) | |
| 635 | 633 | |
| 636 | 634 | } |
| 637 | 635 | </script> |
| ... | ... |
src/main/resources/templates/shipment/shipmentDetail/add.html
| ... | ... | @@ -34,7 +34,7 @@ |
| 34 | 34 | <div class="form-group"> |
| 35 | 35 | <label class="col-sm-3 control-label">库存状态：</label> |
| 36 | 36 | <div class="col-sm-8"> |
| 37 | - <select id="inventoryStatus" class="form-control" th:with="inventoryStatus=${@dict.getType('inventorySts')}"> | |
| 37 | + <select id="inventorySts" name="inventorySts" class="form-control" th:with="inventoryStatus=${@dict.getType('inventorySts')}"> | |
| 38 | 38 | <option th:each="dict : ${inventoryStatus}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option> |
| 39 | 39 | </select> |
| 40 | 40 | </div> |
| ... | ... | @@ -144,6 +144,9 @@ |
| 144 | 144 | required:true, |
| 145 | 145 | min:0 |
| 146 | 146 | }, |
| 147 | + inventorySts:{ | |
| 148 | + required:true, | |
| 149 | + }, | |
| 147 | 150 | price:{ |
| 148 | 151 | required:false, |
| 149 | 152 | min:0 |
| ... | ... | @@ -162,8 +165,9 @@ |
| 162 | 165 | success : function(data) { |
| 163 | 166 | if (data.code == web_status.SUCCESS) { |
| 164 | 167 | layer.msg("保存成功,正在刷新数据请稍后……", {icon: $.modal.icon(modal_status.SUCCESS), time: 500, shade: [0.1, "#8F8F8F"]}, function () { |
| 165 | - window.parent.detail(shipment_id,shipment_code) | |
| 166 | - }) | |
| 168 | + window.parent.detail(shipment_id,shipment_code); | |
| 169 | + $.modal.close() | |
| 170 | + }); | |
| 167 | 171 | } else { |
| 168 | 172 | $.modal.alertError(data.msg) |
| 169 | 173 | } |
| ... | ... |
src/main/resources/templates/shipment/shipmentDetail/shipmentDetail.html