From 85d9ca4ec972ce4d020db046d930e8991709ae2d Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期一, 03 十一月 2025 17:14:49 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_OrderServices/Dt_AllocateOutboundOrderService.cs | 45 +++------------------------------------------
1 files changed, 3 insertions(+), 42 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_OrderServices/Dt_AllocateOutboundOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_OrderServices/Dt_AllocateOutboundOrderService.cs"
index ed6916f..87b0e5f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_OrderServices/Dt_AllocateOutboundOrderService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_OrderServices/Dt_AllocateOutboundOrderService.cs"
@@ -154,8 +154,8 @@
foreach (var orderId in requestOut.orderIds)
{
Dt_AreaInfo areaInfo = null;
- if (requestOut.AreaId != null)
- areaInfo = _areaInfoRepository.QueryFirst(x => x.AreaID == Convert.ToInt32(requestOut.AreaId));
+ if (requestOut.Warehouse != "")
+ areaInfo = _areaInfoRepository.QueryFirst(x => x.AreaCode == requestOut.Warehouse);
List<RequestTaskDto> taskDtos = new List<RequestTaskDto>();
@@ -188,7 +188,6 @@
taskDtos.Add(task);
item.StockInfoDetails.Where(x => x.MaterielCode == allocateoutboundOrderdetail.MaterielCode).FirstOrDefault().Status = (int)StockStateEmun.鍑哄簱閿佸畾;
item.StockStatus = (int)StockStateEmun.鍑哄簱閿佸畾;
- item.Remark = requestOut.Warehouse;
item.OrderNo = outboundOrder.UpperOrderNo;
item.StockInfoDetails.Where(x => x.OutboundQuantity > 0 && x.MaterielCode == allocateoutboundOrderdetail.MaterielCode).ForEach(x =>
@@ -205,46 +204,8 @@
AllocateWarehouseId = areaInfo == null ? item.StockInfoDetails.Where(x => x.MaterielCode == allocateoutboundOrderdetail.MaterielCode).FirstOrDefault().WareHouseId : areaInfo.AreaCode,
Warehouse = "鏅鸿兘绔嬪簱",
WareHouseId = "107",
- OutboundQuantity = item.StockInfoDetails.Where(x => x.MaterielCode == allocateoutboundOrderdetail.MaterielCode).Sum(x => x.Quantity),
+ OutboundQuantity = x.OutboundQuantity,
});
- });
-
- item.StockInfoDetails.Where(x => x.OutboundQuantity == 0 || (x.Quantity - x.OutboundQuantity) > 0).ForEach(x =>
- {
- if (x.MaterielCode == allocateoutboundOrderdetail.MaterielCode)
- {
- outDetails.Add(new Dt_OrderOutDetails()
- {
- OrderNo = "",
- PalletCode = item.PalletCode,
- OrderType = (int)OrderTypeEmun.璋冩嫧鍑哄簱鍗�,
- ERPOrderId = "",
- MaterielCode = x.MaterielCode,
- MaterielName = x.MaterielName,
- AllocateWarehouse = "WMS鍑哄簱缂撳瓨鍖�",
- Warehouse = "鏅鸿兘绔嬪簱",
- WareHouseId = "107",
- AllocateWarehouseId = "205",
- OutboundQuantity = x.Quantity - x.OutboundQuantity,
- });
- }
- else
- {
- outDetails.Add(new Dt_OrderOutDetails()
- {
- OrderNo = "",
- PalletCode = item.PalletCode,
- OrderType = (int)OrderTypeEmun.璋冩嫧鍑哄簱鍗�,
- ERPOrderId = "",
- MaterielCode = x.MaterielCode,
- MaterielName = x.MaterielName,
- AllocateWarehouse = "WMS鍑哄簱缂撳瓨鍖�",
- Warehouse = "鏅鸿兘绔嬪簱",
- WareHouseId = "107",
- AllocateWarehouseId = "205",
- OutboundQuantity = x.Quantity,
- });
- }
});
});
List<Dt_Task> taskNews = new List<Dt_Task>();
--
Gitblit v1.9.3