diff --git a/src/main/java/com/huaheng/pc/task/taskHeader/service/ReceiptTaskService.java b/src/main/java/com/huaheng/pc/task/taskHeader/service/ReceiptTaskService.java
index 3398771..693f2b9 100644
--- a/src/main/java/com/huaheng/pc/task/taskHeader/service/ReceiptTaskService.java
+++ b/src/main/java/com/huaheng/pc/task/taskHeader/service/ReceiptTaskService.java
@@ -145,6 +145,7 @@ public class ReceiptTaskService {
taskDetail.setMaterialName(item.getMaterialName());
taskDetail.setMaterialSpec(item.getMaterialSpec());
taskDetail.setMaterialUnit(item.getMaterialUnit());
+ taskDetail.setInventorySts(item.getInventorySts());
taskDetail.setBillCode(item.getReceiptCode());
taskDetail.setBillDetailId(item.getReceiptDetailId());
taskDetail.setQty(item.getQty());
diff --git a/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html b/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html
index 7cd3353..f963da2 100644
--- a/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html
+++ b/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html
@@ -65,7 +65,7 @@
批 号：<input type="text" name="lot"/>
</li>
- <li class="time" style="height:30px">
+ <li class="time2" style="height:30px">
<label>创建时间： </label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间"
name="createdBegin"/>
diff --git a/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html b/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html
index 3db9c9e..86c7b1c 100644
--- a/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html
+++ b/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html
@@ -36,7 +36,7 @@
<li>
更新用户：<input type="text" name="lastUpdatedBy"/>
</li>
- <li class="time">
+ <li class="time2">
<label>创建时间： </label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间"
name="createdBegin"/>
diff --git a/src/main/resources/templates/receipt/receiptContainerHeader/receiptContainerHeader.html b/src/main/resources/templates/receipt/receiptContainerHeader/receiptContainerHeader.html
index 30f5972..a11632d 100644
--- a/src/main/resources/templates/receipt/receiptContainerHeader/receiptContainerHeader.html
+++ b/src/main/resources/templates/receipt/receiptContainerHeader/receiptContainerHeader.html
@@ -323,16 +323,13 @@
$.modal.alertWarning("请至少选择一条记录");
return;
}
- $.modal.confirm("确认要生成选中的" + rows.length + "条组盘任务吗?", function() {
- var url = prefix + "/createTask";
- var ids = "";
- for(var i=0; i<rows.length; i++) {
- ids = ids + rows[i].id + ","
- }
- var data = { "ids": ids.substring(0, ids.length-1) };
- $.operate.post(url, data);
- // submit(url, "post", "json", data);
- });
+ var url = prefix + "/createTask";
+ var ids = "";
+ for(var i=0; i<rows.length; i++) {
+ ids = ids + rows[i].id + ","
+ }
+ var data = { "ids": ids.substring(0, ids.length-1) };
+ $.operate.post(url, data);
}
function position(id){
diff --git a/src/main/resources/templates/receipt/receiptDetail/receiptDetail.html b/src/main/resources/templates/receipt/receiptDetail/receiptDetail.html
index f8c8a9a..f99de9d 100644
--- a/src/main/resources/templates/receipt/receiptDetail/receiptDetail.html
+++ b/src/main/resources/templates/receipt/receiptDetail/receiptDetail.html
@@ -166,7 +166,6 @@
{
field : 'inventorySts',
title : '库存状态',
- visible : false
},
{
field : 'itemListPrice',
diff --git a/src/main/resources/templates/receipt/receiving/receiving.html b/src/main/resources/templates/receipt/receiving/receiving.html
index 0ed6b26..494b6a1 100644
--- a/src/main/resources/templates/receipt/receiving/receiving.html
+++ b/src/main/resources/templates/receipt/receiving/receiving.html
@@ -607,31 +607,29 @@
$.modal.alertWarning("请至少选择一条记录");
return;
}
- $.modal.confirm("确认要生成选中的" + rows.length + "条组盘任务吗?", function() {
- let url = ctx + "receipt/receiptContainerHeader/createTask";
- let ids = "";
- for(let i=0; i<rows.length; i++) {
- ids = ids + rows[i].receiptContainerId + ","
- }
- let data = { "ids": ids.substring(0, ids.length-1) };
- $.modal.loading("正在处理中，请稍后...");
- var config = {
- url: url,
- type: "post",
- dataType: "json",
- data: data,
- success: function(result) {
- if (result.code == web_status.SUCCESS) {
- $.modal.msgSuccess(result.msg);
- $.table.refresh("bootstrap-table1");
- } else {
- $.modal.alertError(result.msg);
- }
- $.modal.closeLoading();
- }
- };
- $.ajax(config)
- });
+ let url = ctx + "receipt/receiptContainerHeader/createTask";
+ let ids = "";
+ for(let i=0; i<rows.length; i++) {
+ ids = ids + rows[i].receiptContainerId + ","
+ }
+ let data = { "ids": ids.substring(0, ids.length-1) };
+ $.modal.loading("正在处理中，请稍后...");
+ var config = {
+ url: url,
+ type: "post",
+ dataType: "json",
+ data: data,
+ success: function(result) {
+ if (result.code == web_status.SUCCESS) {
+ $.modal.msgSuccess(result.msg);
+ $.table.refresh("bootstrap-table1");
+ } else {
+ $.modal.alertError(result.msg);
+ }
+ $.modal.closeLoading();
+ }
+ };
+ $.ajax(config)
}
</script>
diff --git a/src/main/resources/templates/shipment/shipmentDetail/add.html b/src/main/resources/templates/shipment/shipmentDetail/add.html
index bed521d..3705f0b 100644
--- a/src/main/resources/templates/shipment/shipmentDetail/add.html
+++ b/src/main/resources/templates/shipment/shipmentDetail/add.html
@@ -34,7 +34,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">库存状态：</label>
<div class="col-sm-8">
- <select id="inventoryStatus" class="form-control" th:with="inventoryStatus=${@dict.getType('inventorySts')}">
+ <select id="inventorySts" name="inventorySts" class="form-control" th:with="inventoryStatus=${@dict.getType('inventorySts')}">
<option th:each="dict : ${inventoryStatus}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>
</select>
</div>
@@ -144,6 +144,9 @@
required:true,
min:0
},
+ inventorySts:{
+ required:true,
+ },
price:{
required:false,
min:0
@@ -162,8 +165,9 @@
success : function(data) {
if (data.code == web_status.SUCCESS) {
layer.msg("保存成功,正在刷新数据请稍后……", {icon: $.modal.icon(modal_status.SUCCESS), time: 500, shade: [0.1, "#8F8F8F"]}, function () {
- window.parent.detail(shipment_id,shipment_code)
- })
+ window.parent.detail(shipment_id,shipment_code);
+ $.modal.close()
+ });
} else {
$.modal.alertError(data.msg)
}
diff --git a/src/main/resources/templates/shipment/shipmentDetail/shipmentDetail.html b/src/main/resources/templates/shipment/shipmentDetail/shipmentDetail.html
index 6a901c9..dd868ae 100644
--- a/src/main/resources/templates/shipment/shipmentDetail/shipmentDetail.html
+++ b/src/main/resources/templates/shipment/shipmentDetail/shipmentDetail.html
@@ -94,7 +94,7 @@
title : '入库日期'
},
{
- field : 'inventoryStatus',
+ field : 'inventorySts',
title : '库存状态'
},
{
diff --git a/src/main/resources/templates/shipment/shipmentHeader/add.html b/src/main/resources/templates/shipment/shipmentHeader/add.html
index 166c42d..644b4b9 100644
--- a/src/main/resources/templates/shipment/shipmentHeader/add.html
+++ b/src/main/resources/templates/shipment/shipmentHeader/add.html
@@ -129,6 +129,7 @@
},
success: function (data) {
$.operate.saveSuccess(data);
+
}
});
}