From b0ed419ede8bd1829e670891ffe878630ba517e2 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期一, 03 十一月 2025 17:57:32 +0800
Subject: [PATCH] 优化
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/extend/Allocat.cs | 147 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 102 insertions(+), 45 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/extend/Allocat.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/extend/Allocat.cs"
index 51aa0b1..4dd3a3a 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/extend/Allocat.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/extend/Allocat.cs"
@@ -6,6 +6,7 @@
using System.Net.NetworkInformation;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common;
using WIDESEA_Common.OrderEnum;
using WIDESEA_Common.StockEnum;
using WIDESEA_Common.TaskEnum;
@@ -34,16 +35,26 @@
if (materielInfo.Business_qty >= materielInfo.MinQty) return response;
Dt_Tactics tactics = _tacticsService.Repository.QueryFirst(x => x.TacticeName == "鍑哄簱绛栫暐");
List<Dt_SupplyTask> supplyTasks = new List<Dt_SupplyTask>();
- List<Dt_InventoryInfo> dt_InventoryInfos = _inventoryInfoService.Repository.QueryData(x => x.MaterielCode == materielInfo.MaterielCode && x.StockStatus == StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt() && x.StockQuantity > x.OutboundQuantity && x.WarehouseCode == WareCode);
+ //// 鏌ヨ澶т欢搴撲腑鍙敤鐨勫簱瀛�
+ List<Dt_InventoryInfo> dt_InventoryInfos = _inventoryInfoService.Repository.QueryData(x => x.MaterielCode == materielInfo.MaterielCode && x.StockStatus == StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt() && x.AvailableQuantity > 0 && x.WarehouseCode == WareCode);
+ if (dt_InventoryInfos.Count < 1) throw new Exception($"鐗╂枡缂栧彿銆恵materielInfo.MaterielCode}銆戝ぇ浠跺簱鏃犲簱瀛橈紒璇峰強鏃惰ˉ鍏呭簱瀛橈紒");
if (tactics.SelectTactice == TacticsEnum.ComeOutonFirstTime.ObjToInt())
dt_InventoryInfos = dt_InventoryInfos.OrderBy(x => x.ValidityPeriod).ToList();
else
dt_InventoryInfos = dt_InventoryInfos.OrderBy(x => x.InDate).ToList();
- decimal Qty = 0;
+ Dt_DeliveryOrder deliveryOrder = new Dt_DeliveryOrder()
+ {
+ Out_no = DateTime.Now.ToString("yyMMddHHmmss"),
+ Warehouse_no = WareCode,
+ Out_type = OutOrderTypeEnum.Allocate.ObjToInt().ToString(),
+ OutStatus = "鏂板缓",
+ Details = new List<Dt_DeliveryOrderDetail>()
+ };
foreach (var item in dt_InventoryInfos)
{
+ decimal Qty = 0;
if (materielInfo.Business_qty >= materielInfo.MinQty) break;
- item.StockStatus = StockStatusEmun.鍑哄簱閿佸畾.ObjToInt();
+ //item.StockStatus = StockStatusEmun.鍑哄簱閿佸畾.ObjToInt();
while (item.StockQuantity > item.OutboundQuantity && materielInfo.Business_qty < materielInfo.MinQty)
{
Qty += materielInfo.BoxQty;
@@ -51,41 +62,31 @@
item.OutboundQuantity += materielInfo.BoxQty;
}
item.AvailableQuantity = item.StockQuantity - item.OutboundQuantity;
- }
- #region 澶т欢搴撹ˉ绔嬪簱鍚庣珛搴撲笟鍔″簱瀛樻暟杩樻槸灏忎簬绔嬪簱鏈�灏忓簱瀛樻暟锛屾坊鍔犳彁绀轰俊鎭�
-
- #endregion
- #region 娣诲姞璋冩嫧鍑哄簱鍗�
- Dt_DeliveryOrder deliveryOrder = new Dt_DeliveryOrder()
- {
- Out_no = DateTime.Now.ToString("yyMMddHHmmss"),
- Out_type = OutOrderTypeEnum.Allocate.ObjToInt().ToString(),
- OutStatus = "鏂板缓",
- Details = new List<Dt_DeliveryOrderDetail>()
- };
- dt_InventoryInfos = dt_InventoryInfos.Where(X => X.StockStatus == StockStatusEmun.鍑哄簱閿佸畾.ObjToInt()).ToList();
- foreach (var item in dt_InventoryInfos.GroupBy(x => x.BatchNo))
- {
- Dt_DeliveryOrderDetail deliveryOrderDetail = new Dt_DeliveryOrderDetail()
+ #region 娣诲姞璋冩嫧鍑哄簱鍗�
+ Dt_DeliveryOrderDetail? deliveryOrderDetail = deliveryOrder.Details.FirstOrDefault(x => x.Batch_num == item.BatchNo);
+ if (deliveryOrderDetail == null)
{
- Batch_num = item.Key,
- Order_Outqty = 0,
- Order_qty = item.Select(x => x.OutboundQuantity).Sum(),
- CreateDate = DateTime.Now,
- Creater = App.User.UserName ?? "System",
- Goods_no = item.First().MaterielCode,
- OotDetailStatus = "鏂板缓",
- Status = 2,
- Reservoirarea = item.First().WarehouseCode
- };
- deliveryOrder.Warehouse_no = item.First().WarehouseCode;
- deliveryOrder.Details.Add(deliveryOrderDetail);
- }
- #endregion
-
- #region 娣诲姞璋冩嫧鍑哄簱浠诲姟
- foreach (var item in dt_InventoryInfos)
- {
+ deliveryOrderDetail = new Dt_DeliveryOrderDetail()
+ {
+ Batch_num = item.BatchNo,
+ Order_Outqty = 0,
+ Order_qty = Qty,
+ CreateDate = DateTime.Now,
+ Creater = App.User.UserName ?? "System",
+ Goods_no = item.MaterielCode,
+ OotDetailStatus = "鏂板缓",
+ Status = 2,
+ Reservoirarea = WareCode
+ };
+ deliveryOrder.Details.Add(deliveryOrderDetail);
+ }
+ else
+ {
+ deliveryOrderDetail.Order_qty += Qty;
+ }
+ deliveryOrder.Details.Add(deliveryOrderDetail);
+ #endregion
+ #region 娣诲姞璋冩嫧鍑哄簱浠诲姟
Dt_SupplyTask supplyTask = new Dt_SupplyTask()
{
WarehouseCode = item.WarehouseCode,
@@ -99,12 +100,67 @@
Creater = App.User.UserName ?? "System",
LocationCode = item.LocationCode,
OrderNo = deliveryOrder.Out_no,
- StockQuantity = item.OutboundQuantity,
+ StockQuantity = Qty,
SupplyQuantity = 0,
Remark = "璋冩嫧鍑哄簱"
};
- supplyTasks.Add(supplyTask);
+ supplyTasks.Add(supplyTask);
+ #endregion
}
+ #region 澶т欢搴撹ˉ绔嬪簱鍚庣珛搴撲笟鍔″簱瀛樻暟杩樻槸灏忎簬绔嬪簱鏈�灏忓簱瀛樻暟锛屾坊鍔犳彁绀轰俊鎭�
+ //娣诲姞鎶ヨ淇℃伅
+ if (materielInfo.Business_qty < materielInfo.MinQty)
+ {
+ _messageInfoService.AddMessageInfo(MessageGroupByEnum.InventoryLowAlarm, $"鐗╂枡鍚嶇О:{materielInfo.MaterielName}", $"銆愮墿鏂欑紪鐮亄materielInfo.MaterielCode}宸茬敓鎴愯皟鎷ㄥ嚭鍏ュ簱鍗曪紝璇疯繘琛屽嚭鍏ュ簱娴佺▼銆傚ぇ浠跺簱搴撳瓨杩囦綆锛佽鍙婃椂琛ュ厖搴撳瓨锛併��");
+ }
+ else
+ {
+ _messageInfoService.AddMessageInfo(MessageGroupByEnum.InventoryLowAlarm, $"鐗╂枡鍚嶇О:{materielInfo.MaterielName}", $"銆愮墿鏂欑紪鐮亄materielInfo.MaterielCode}宸茬敓鎴愯皟鎷ㄥ嚭鍏ュ簱鍗曪紝璇疯繘琛屽嚭鍏ュ簱娴佺▼銆�");
+ }
+ #endregion
+ #region 娣诲姞璋冩嫧鍑哄簱鍗�
+ //dt_InventoryInfos = dt_InventoryInfos.Where(X => X.StockStatus == StockStatusEmun.鍑哄簱閿佸畾.ObjToInt()).ToList();
+ //foreach (var item in dt_InventoryInfos.GroupBy(x => x.BatchNo)) //杩欓噷鎸夋壒娆″垎缁勪簡
+ //{
+ // Dt_DeliveryOrderDetail deliveryOrderDetail = new Dt_DeliveryOrderDetail()
+ // {
+ // Batch_num = item.Key,
+ // Order_Outqty = 0,
+ // Order_qty = item.Select(x => x.OutboundQuantity).Sum(),
+ // CreateDate = DateTime.Now,
+ // Creater = App.User.UserName ?? "System",
+ // Goods_no = item.First().MaterielCode,
+ // OotDetailStatus = "鏂板缓",
+ // Status = 2,
+ // Reservoirarea = item.First().WarehouseCode
+ // };
+ // deliveryOrder.Warehouse_no = item.First().WarehouseCode;
+ // deliveryOrder.Details.Add(deliveryOrderDetail);
+ //}
+ #endregion
+
+ #region 娣诲姞璋冩嫧鍑哄簱浠诲姟
+ //foreach (var item in dt_InventoryInfos)
+ //{
+ // Dt_SupplyTask supplyTask = new Dt_SupplyTask()
+ // {
+ // WarehouseCode = item.WarehouseCode,
+ // BatchNo = item.BatchNo,
+ // MaterielName = item.MaterielName,
+ // MaterielCode = item.MaterielCode,
+ // MaterielSpec = item.MaterielSpec,
+ // TaskStatus = SupplyStatusEnum.NewOut.ObjToInt(),
+ // TaskType = TaskTypeEnum.AllocatOut.ObjToInt(),
+ // CreateDate = DateTime.Now,
+ // Creater = App.User.UserName ?? "System",
+ // LocationCode = item.LocationCode,
+ // OrderNo = deliveryOrder.Out_no,
+ // StockQuantity = item.OutboundQuantity,
+ // SupplyQuantity = 0,
+ // Remark = "璋冩嫧鍑哄簱"
+ // };
+ // supplyTasks.Add(supplyTask);
+ //}
#endregion
#region 娣诲姞璋冩嫧鍏ュ簱鍗�
@@ -131,17 +187,18 @@
}
#endregion
- _unitOfWorkManage.BeginTran();
- _basicService.MaterielInfoService.Repository.UpdateData(materielInfo);
+ //_unitOfWorkManage.BeginTran();
+ _materielInfoService.UpdateData(materielInfo);
_inventoryInfoService.Repository.UpdateData(dt_InventoryInfos);
_supplyTaskService.AddData(supplyTasks);
- BaseDal.Db.InsertNav(deliveryOrder).Include(x => x.Details).ExecuteCommand();
- _cabinOrderServices.Repository.Db.InsertNav(cabinOrder).Include(x => x.Details).ExecuteCommand();
- _unitOfWorkManage.CommitTran();
+ if (deliveryOrder.Details.Count > 0) BaseDal.Db.InsertNav(deliveryOrder).Include(x => x.Details).ExecuteCommand();
+ if (cabinOrder.Details.Count > 0) _cabinOrderServices.Repository.Db.InsertNav(cabinOrder).Include(x => x.Details).ExecuteCommand();
+ //_unitOfWorkManage.CommitTran();
}
catch (Exception ex)
{
- _unitOfWorkManage.RollbackTran();
+ //_unitOfWorkManage.RollbackTran();
+ _messageInfoService.AddMessageInfo(MessageGroupByEnum.InventoryLowAlarm, "澶т欢搴撹ˉ璐х珛搴�", ex.Message);
response.Error(ex.Message);
}
return response;
--
Gitblit v1.9.3