diff --git a/HHWMS.Web/Areas/Receipt/Controllers/SimpleReceiptInController.Shipment.cs b/HHWMS.Web/Areas/Receipt/Controllers/SimpleReceiptInController.Shipment.cs
index e74c175..a3a4fc7 100644
--- a/HHWMS.Web/Areas/Receipt/Controllers/SimpleReceiptInController.Shipment.cs
+++ b/HHWMS.Web/Areas/Receipt/Controllers/SimpleReceiptInController.Shipment.cs
@@ -82,7 +82,7 @@ namespace HHWMS.Web.Controllers
CompletedQty = shipmentDetail?.CompletedQty ?? 0,
AllocatedQty = taskDetail.Qty ?? 0,
Qty = inventory?.Qty ?? 0,
- ActualQty = taskDetail.Qty ?? 0
+ ActualQty = (decimal?)null
};
}).ToList();
return true;
diff --git a/HHWMS.Web/Areas/Receipt/Views/SimpleReceiptIn/Index.cshtml b/HHWMS.Web/Areas/Receipt/Views/SimpleReceiptIn/Index.cshtml
index 715eb4e..eea9418 100644
--- a/HHWMS.Web/Areas/Receipt/Views/SimpleReceiptIn/Index.cshtml
+++ b/HHWMS.Web/Areas/Receipt/Views/SimpleReceiptIn/Index.cshtml
@@ -1,3 +1,17 @@
+
@@ -10,7 +24,7 @@
@@blur="validateContainer"
ref="containerInput"/>
-
+
-
+
-
+
/>
-
+
-
+
-
+
-
+
- 绑定
- 入库
- 空托入库
- 呼叫出库
+ 绑定
+ 入库
+ 空托入库
+ 呼叫出库
确认发货
@@ -82,7 +96,8 @@
当前托盘来自ERP发货任务。请逐条填写实际出库数量(可以为0),确认后系统一次完成库存扣减、释放分配并回传ERP。
-
@@ -94,7 +109,7 @@
{{ Math.floor(record.Qty) }}
-
+
@@ -241,7 +256,7 @@
{
title: '实际出库',
dataIndex: 'ActualQty',
- slotName: 'actualQty',
+ slotName: 'actualqty',
shipmentOnly: true,
width: 150
},
diff --git a/HHWMS.Web/Areas/Shipment/Controllers/ShipmentHeaderController.Erp.cs b/HHWMS.Web/Areas/Shipment/Controllers/ShipmentHeaderController.Erp.cs
index 286e6af..083b7e7 100644
--- a/HHWMS.Web/Areas/Shipment/Controllers/ShipmentHeaderController.Erp.cs
+++ b/HHWMS.Web/Areas/Shipment/Controllers/ShipmentHeaderController.Erp.cs
@@ -342,6 +342,7 @@ namespace HHWMS.Web.Controllers
x.InventoryId.HasValue
&& inventoryIds.Contains(x.InventoryId.Value)
&& x.Status != TaskStatusEnum.完成)
+ .AsNoTracking()
.ToList()
.GroupBy(x => x.InventoryId.Value)
.ToDictionary(x => x.Key, x => x.Sum(y => y.Qty ?? 0));
diff --git a/HHWMS.Web/Areas/Shipment/Views/ShipmentHeader/Allocate.cshtml b/HHWMS.Web/Areas/Shipment/Views/ShipmentHeader/Allocate.cshtml
index 94b9507..ae0a208 100644
--- a/HHWMS.Web/Areas/Shipment/Views/ShipmentHeader/Allocate.cshtml
+++ b/HHWMS.Web/Areas/Shipment/Views/ShipmentHeader/Allocate.cshtml
@@ -38,6 +38,7 @@
托盘:{{ task.ContainerCode }};状态:{{ task.Status }}
{{ port.Label }}
@@ -68,7 +69,8 @@
+ width="1000px" :ok-loading="saving" :style="{ zIndex: inventoryModalZIndex }"
+ @@before-ok="saveAllocation">
本明细剩余可分配 {{ currentDetail.RemainingQty || 0 }}。同一库存可以分给多个明细,但累计不能超过库存数量。
@@ -112,7 +114,8 @@
inventoryVisible: false,
inventories: [],
currentDetail: {},
- saving: false
+ saving: false,
+ inventoryModalZIndex: 2000
};
},
mounted() {
@@ -120,7 +123,21 @@
},
methods: {
notifyError(message) {
+ const zIndex = this.getInventoryModalZIndex() + 2;
this.$notification.error({ content: message || '操作失败', duration: 5000, closable: true });
+ this.$nextTick(() => {
+ document.querySelectorAll('.arco-notification-list').forEach(element => {
+ element.style.zIndex = String(zIndex);
+ });
+ });
+ },
+ getInventoryModalZIndex() {
+ const root = document.getElementById(`shipment-allocate-${this.headerId}`);
+ const hostLayer = root ? root.closest('.layui-layer') : null;
+ const hostZIndex = hostLayer
+ ? Number.parseInt(window.getComputedStyle(hostLayer).zIndex, 10)
+ : 0;
+ return hostZIndex > 0 ? hostZIndex + 2 : 2000;
},
loadData() {
axios.get('/shipment/ShipmentHeader/GetAllocationData', { params: { headerId: this.headerId } })
@@ -155,6 +172,7 @@
Selected: false,
AllocationQty: 0
}));
+ this.inventoryModalZIndex = this.getInventoryModalZIndex();
this.inventoryVisible = true;
})
.catch(error => this.notifyError(error.message));
diff --git a/HHWMS.Web/appsettings.json b/HHWMS.Web/appsettings.json
index 9f0639d..5a274f1 100644
--- a/HHWMS.Web/appsettings.json
+++ b/HHWMS.Web/appsettings.json
@@ -24,12 +24,12 @@
"Connections": [
{
"Key": "default",
- "Value": "Server=127.0.0.1;Port=3306;Database=WMS2;Uid=root;Password=abc123*;Character Set=utf8mb4;",
+ "Value": "Server=127.0.0.1;Port=3306;Database=wms_yongfeng_cp;Uid=root;Password=abc123*;Character Set=utf8mb4;",
"DBType": "mysql"
},
{
"Key": "cp",
- "Value": "Server=127.0.0.1;Port=3306;Database=wms3;Uid=root;Password=abc123*;Character Set=utf8mb4;",
+ "Value": "Server=127.0.0.1;Port=3306;Database=wms_yongfeng_cp;Uid=root;Password=abc123*;Character Set=utf8mb4;",
"DBType": "mysql"
}
],
@@ -100,6 +100,9 @@
"WCS": {
"Address": "http://192.168.30.220:65533/api/WCS/"
},
+ "WCSCP": {
+ "Address": "http://127.0.0.1:65534/api/WCS/"
+ },
"ERP": {
"Address": "http://127.0.0.1:4523/m1/1364541-1434451-default/"
}