From d5051e5293179c99df2e3489ad5f2f73f4061667 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期六, 25 十月 2025 11:53:38 +0800
Subject: [PATCH] 优化WCS与ERP交互逻辑
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs | 565 +++++++++++++++-----------------------------------------
1 files changed, 150 insertions(+), 415 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs"
index 28e25a5..5e86027 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs"
@@ -34,14 +34,13 @@
{
public partial class DeliveryOrderServices : ServiceBase<Dt_DeliveryOrder, IRepository<Dt_DeliveryOrder>>, IDeliveryOrderServices
{
-
+ private readonly ICabinOrderServices _cabinOrderServices;
private readonly IBasicService _basicService;
private readonly IUnitOfWorkManage _unitOfWorkManage;
private readonly IInventory_BatchServices _inventory_BatchServices;
private readonly IInventoryInfoService _inventoryInfoService;
private readonly IDeliveryOrderDetailServices _deliveryOrderDetailServices;
private readonly ISupplyTaskService _supplyTaskService;
- private readonly ICabinOrderServices _cabinOrderServices;
private readonly ITacticsService _tacticsService;
public IRepository<Dt_DeliveryOrder> Repository => BaseDal;
public DeliveryOrderServices(IRepository<Dt_DeliveryOrder> BaseDal, IBasicService basicService, IUnitOfWorkManage unitOfWorkManage, IInventory_BatchServices inventory_BatchServices, IInventoryInfoService inventoryInfoService, IDeliveryOrderDetailServices deliveryOrderDetailServices, ISupplyTaskService supplyTaskService, ICabinOrderServices cabinOrderServices, ITacticsService tacticsService) : base(BaseDal)
@@ -55,108 +54,6 @@
_cabinOrderServices = cabinOrderServices;
_tacticsService = tacticsService;
}
-
-
- static string SearchDate = "2025-09-10 00:00:00";
- public WebResponseContent GetUpstreamOutOrder()
- {
- var responseContent = new WebResponseContent();
- try
- {
- var url = "http://121.37.118.63:80/GYZ2/95fck/outOrder";
- //var url = "http://127.0.0.1:4523/m1/5660322-5340849-default/GYZ2/95fck/outOrder";
- if (string.IsNullOrEmpty(SearchDate)) SearchDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
- //// 璇锋眰鍙傛暟
- var requestData = new
- {
- searchDate = SearchDate
- //searchDate = "2022-10-10 20:45:16" // 姝ｇ‘鐨勬牸寮�
- };
- SearchDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd HH:mm:ss");
-
- var result = HttpHelper.Post(url, requestData.ToJsonString());
- var response = JsonConvert.DeserializeObject<UpstreamResponse<UpstramOutOrderInfo>>(result);
-
- if (response.resultCode != "0")
- {
- SendErrorToUpstream(3, "", response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触", "");
- return responseContent.Error(response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触");
- }
-
- if (response.data == null || !response.data.Any())
- {
- return responseContent.OK("鏃犳柊鍑哄簱鍗曟暟鎹�");
- }
-
- // 宸插瓨鍦ㄥ嚭搴撳崟鍙�
- var existingOutOrderNos = BaseDal.Db.Queryable<Dt_DeliveryOrder>()
- .Select(x => x.Out_no)
- .ToList();
-
- // 鏂板嚭搴撳崟
- var newOutOrders = response.data
- .Where(outorder => !existingOutOrderNos.Contains(outorder.order_no))
- .ToList();
-
- List<string> order_no = newOutOrders.Select(x => x.order_no).ToList();
-
- if (!newOutOrders.Any())
- {
- return responseContent.OK("鎵�鏈夊嚭搴撳崟宸插瓨鍦紝鏃犻渶鏂板");
- }
-
- Db.Ado.BeginTran();
- try
- {
- List<Dt_DeliveryOrder> _DeliveryOrders = new List<Dt_DeliveryOrder>();
- List<string> orderNos = new List<string>();
-
- foreach (var outorder in newOutOrders)
- {
- bool skipOrder = false; // 鏍囪鏄惁璺宠繃璇ュ嚭搴撳崟
-
- // 濡傛灉杩欎釜鍑哄簱鍗曠被鍨嬩笉绛変簬1锛屽睘浜庡嚭搴撻��璐э紙瑕佸叆璐т笂娓镐紶杩囨潵鐨勬暟閲忎负璐熸暟锛�
- if (outorder.order_type != "1")
- {
- // 鍒涘缓鍑哄簱閫�璐у崟 - 杩欓噷闇�瑕佹牴鎹笟鍔￠�昏緫瀹炵幇
- // 鏆傛椂璺宠繃鎴栧疄鐜伴��璐ч�昏緫
- continue;
- }
- else if (outorder.order_type == "1") // 姝ｅ父鍑哄簱鍗�
- {
- CreateOutboundOrder(outorder);//鍒涘缓鍑哄簱鍗曘�佸鐞嗗簱瀛樸�佹坊鍔犲嚭搴撲换鍔�
- }
- }
-
- // 鎵归噺鎻掑叆鍑哄簱鍗曞拰鏄庣粏
- if (_DeliveryOrders.Any())
- {
- BaseDal.Db.InsertNav(_DeliveryOrders).Include(x => x.Details).ExecuteCommand();
- }
- //涓嬪彂鍑哄簱鍗曚换鍔＄粰wcs
-
-
- Db.Ado.CommitTran();
- var tex = CreateSupplyTask(order_no);
- if (!tex)
- {
- return responseContent.Error("鍒涘缓渚涘簲浠诲姟澶辫触");
- }
- return responseContent.OK($"鍚屾鍑哄簱鍗曟垚鍔燂紝鍏眥_DeliveryOrders.Count}鏉�");
- }
- catch (Exception ex)
- {
- Db.Ado.RollbackTran();
- SendErrorToUpstream(3, "", ex.Message, "");
- return responseContent.Error("鍚屾澶辫触: " + ex.Message);
- }
- }
- catch (Exception ex)
- {
- SendErrorToUpstream(3, "", ex.Message, "");
- return responseContent.Error("鍚屾澶辫触: " + ex.Message);
- }
- }
/// <summary>
/// 鍒涘缓鍑哄簱鍗�
/// </summary>
@@ -168,7 +65,10 @@
try
{
Dt_Tactics tactics = _tacticsService.Repository.QueryFirst(x => x.TacticeName == "鍑哄簱绛栫暐");
- if (outorder.warehouse_no == WarehouseEnum.楹荤簿搴�.ObjToInt().ToString("000") || outorder.warehouse_no == WarehouseEnum.鍐峰喕搴�.ObjToInt().ToString("000"))
+ #region 鐗规畩搴撴埧鍑哄簱
+ string WareCodeMJ = WarehouseEnum.楹荤簿搴�.ObjToInt().ToString("000");
+ string WareCodeLD = WarehouseEnum.鍐峰喕搴�.ObjToInt().ToString("000");
+ if (outorder.warehouse_no == WareCodeMJ || outorder.warehouse_no == WareCodeLD)
{
#region 娣诲姞鍑哄簱鍗�
var entityOrder = new Dt_DeliveryOrder
@@ -194,6 +94,7 @@
BaseDal.Db.InsertNav(entityOrder).Include(x => x.Details).ExecuteCommand();
#endregion
#region 澶勭悊搴撳瓨銆佸簱瀛樻壒娆°�佹坊鍔犲嚭搴撲换鍔�
+ List<Dt_SupplyTask> supplyTasks = new List<Dt_SupplyTask>();
foreach (var item in entityOrder.Details)
{
Dt_Inventory_Batch inventory_Batch = _inventory_BatchServices.Repository.QueryFirst(x => x.MaterielCode == item.Goods_no && x.BatchNo == item.Batch_num);
@@ -201,7 +102,7 @@
if (inventory_Batch.AvailableQuantity < item.Order_qty) throw new Exception($"鍑哄簱鍗曞彿銆恵entityOrder.Out_no}銆戜腑鐗╂枡缂栧彿銆恵item.Goods_no}銆戠墿鏂欐壒娆°�恵item.Batch_num}銆戠殑搴撳瓨鎵规淇℃伅鍙敤鏁伴噺涓嶈冻");
inventory_Batch.AvailableQuantity -= item.Order_qty;
inventory_Batch.OutboundQuantity += item.Order_qty;
- List<Dt_InventoryInfo> dt_InventoryInfos = _inventoryInfoService.Repository.QueryData(x => x.MaterielCode == item.Goods_no && x.BatchNo == item.Batch_num && x.StockStatus == StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt() && x.StockQuantity > x.OutboundQuantity && x.WarehouseCode == item.Reservoirarea);
+ List<Dt_InventoryInfo> dt_InventoryInfos = _inventoryInfoService.Repository.QueryData(x => x.MaterielCode == item.Goods_no && x.BatchNo == item.Batch_num && x.StockStatus == StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt() && x.AvailableQuantity > 0 && x.WarehouseCode == item.Reservoirarea);
#region 鎸夊嚭搴撶瓥鐣ユ煡鎵惧簱瀛�
if (tactics.SelectTactice == TacticsEnum.ComeOutonFirstTime.ObjToInt())
dt_InventoryInfos = dt_InventoryInfos.OrderBy(x => x.ValidityPeriod).ToList();
@@ -212,52 +113,66 @@
foreach (var InventoryInfo in dt_InventoryInfos)
{
if (Order_qty <= 0) break;
- if (InventoryInfo.AvailableQuantity < Order_qty)
+ if (InventoryInfo.AvailableQuantity <= Order_qty)
{
- InventoryInfo.AvailableQuantity = 0;
Order_qty -= InventoryInfo.AvailableQuantity;
InventoryInfo.OutboundQuantity += InventoryInfo.AvailableQuantity;
- InventoryInfo.StockStatus = StockStatusEmun.鍑哄簱閿佸畾.ObjToInt();
+ Dt_SupplyTask supplyTask = new Dt_SupplyTask()
+ {
+ WarehouseCode = InventoryInfo.WarehouseCode,
+ BatchNo = InventoryInfo.BatchNo,
+ MaterielName = InventoryInfo.MaterielName,
+ MaterielCode = InventoryInfo.MaterielCode,
+ MaterielSpec = InventoryInfo.MaterielSpec,
+ TaskStatus = SupplyStatusEnum.NewOut.ObjToInt(),
+ TaskType = TaskTypeEnum.OutPick.ObjToInt(),
+ CreateDate = DateTime.Now,
+ Creater = App.User.UserName ?? "System",
+ LocationCode = InventoryInfo.LocationCode,
+ OrderNo = entityOrder.Out_no,
+ StockQuantity = InventoryInfo.AvailableQuantity,
+ SupplyQuantity = 0,
+ Remark = "鍑哄簱"
+ };
+ supplyTasks.Add(supplyTask);
+ InventoryInfo.AvailableQuantity = 0;
}
else
{
InventoryInfo.AvailableQuantity -= Order_qty;
- Order_qty = 0;
InventoryInfo.OutboundQuantity += Order_qty;
- InventoryInfo.StockStatus = StockStatusEmun.鍑哄簱閿佸畾.ObjToInt();
+ Dt_SupplyTask supplyTask = new Dt_SupplyTask()
+ {
+ WarehouseCode = InventoryInfo.WarehouseCode,
+ BatchNo = InventoryInfo.BatchNo,
+ MaterielName = InventoryInfo.MaterielName,
+ MaterielCode = InventoryInfo.MaterielCode,
+ MaterielSpec = InventoryInfo.MaterielSpec,
+ TaskStatus = SupplyStatusEnum.NewOut.ObjToInt(),
+ TaskType = TaskTypeEnum.OutPick.ObjToInt(),
+ CreateDate = DateTime.Now,
+ Creater = App.User.UserName ?? "System",
+ LocationCode = InventoryInfo.LocationCode,
+ OrderNo = entityOrder.Out_no,
+ StockQuantity = Order_qty,
+ SupplyQuantity = 0,
+ Remark = "鍑哄簱"
+ };
+ supplyTasks.Add(supplyTask);
+ Order_qty = 0;
}
- }
- dt_InventoryInfos = dt_InventoryInfos.Where(X => X.StockStatus == StockStatusEmun.鍑哄簱閿佸畾.ObjToInt()).ToList();
- List<Dt_SupplyTask> supplyTasks = new List<Dt_SupplyTask>();
- foreach (var inventoryInfo in dt_InventoryInfos)
- {
- Dt_SupplyTask supplyTask = new Dt_SupplyTask()
- {
- WarehouseCode = inventoryInfo.WarehouseCode,
- BatchNo = inventoryInfo.BatchNo,
- MaterielName = inventoryInfo.MaterielName,
- MaterielCode = inventoryInfo.MaterielCode,
- MaterielSpec = inventoryInfo.MaterielSpec,
- TaskStatus = SupplyStatusEnum.NewOut.ObjToInt(),
- TaskType = TaskTypeEnum.OutPick.ObjToInt(),
- CreateDate = DateTime.Now,
- Creater = App.User.UserName ?? "System",
- LocationCode = inventoryInfo.LocationCode,
- OrderNo = entityOrder.Out_no,
- StockQuantity = inventoryInfo.OutboundQuantity,
- SupplyQuantity = 0,
- Remark = "鍑哄簱"
- };
- supplyTasks.Add(supplyTask);
}
_inventory_BatchServices.Repository.UpdateData(inventory_Batch);
_inventoryInfoService.Repository.UpdateData(dt_InventoryInfos);
- _supplyTaskService.AddData(supplyTasks);
}
+ _supplyTaskService.AddData(supplyTasks);
#endregion
}
+ #endregion
else
{
+ string WareCodeDJ = WarehouseEnum.澶т欢搴�.ObjToInt().ToString("000");
+ string WareCodeLK = WarehouseEnum.绔嬪簱.ObjToInt().ToString("000");
#region 鍒涘缓澶т欢搴撱�佺珛搴撳嚭搴撳ご琛�
var entityOrder = new Dt_DeliveryOrder
{
@@ -267,7 +182,7 @@
Client_name = outorder.client_name,
Account_time = outorder.account_time,
Client_no = outorder.client_no,
- Warehouse_no = WarehouseEnum.澶т欢搴�.ObjToInt().ToString("000"),
+ Warehouse_no = WareCodeDJ,
Details = new List<Dt_DeliveryOrderDetail>()
};
var entityOrderLK = new Dt_DeliveryOrder
@@ -278,7 +193,7 @@
Client_name = outorder.client_name,
Account_time = outorder.account_time,
Client_no = outorder.client_no,
- Warehouse_no = WarehouseEnum.绔嬪簱.ObjToInt().ToString("000"),
+ Warehouse_no = WareCodeLK,
Details = new List<Dt_DeliveryOrderDetail>()
};
#endregion
@@ -291,7 +206,7 @@
if (inventory_Batch.AvailableQuantity < detail.order_qty) throw new Exception($"鍑哄簱鍗曞彿銆恵outorder.order_no}銆戜腑鐗╂枡缂栧彿銆恵detail.goods_no}銆戠墿鏂欐壒娆°�恵detail.batch_num}銆戠殑搴撳瓨鎵规淇℃伅鍙敤鏁伴噺涓嶈冻");
inventory_Batch.AvailableQuantity -= detail.order_qty;
inventory_Batch.OutboundQuantity += detail.order_qty;
- List<Dt_InventoryInfo> dt_InventoryInfos = _inventoryInfoService.Repository.QueryData(x => x.MaterielCode == inventory_Batch.MaterielCode && x.BatchNo == inventory_Batch.BatchNo && x.StockStatus == StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt() && x.StockQuantity > x.OutboundQuantity && (x.WarehouseCode == WarehouseEnum.澶т欢搴�.ObjToInt().ToString("000") || x.WarehouseCode == WarehouseEnum.绔嬪簱.ObjToInt().ToString("000")));
+ List<Dt_InventoryInfo> dt_InventoryInfos = _inventoryInfoService.Repository.QueryData(x => x.MaterielCode == inventory_Batch.MaterielCode && x.BatchNo == inventory_Batch.BatchNo && x.AvailableQuantity > 0 && (x.WarehouseCode == WareCodeDJ || x.WarehouseCode == WareCodeLK));
#endregion
#region 鎸夊嚭搴撶瓥鐣ユ煡鎵惧簱瀛�
if (tactics.SelectTactice == TacticsEnum.ComeOutonFirstTime.ObjToInt())
@@ -325,50 +240,59 @@
entityOrder.Details.Add(orderDetail);
#endregion
- #region 璁＄畻搴撳瓨
+ List<Dt_SupplyTask> supplyTasks = new List<Dt_SupplyTask>();
+ #region 璁＄畻搴撳瓨銆佹坊鍔犲嚭搴撲换鍔�
foreach (var InventoryInfo in dt_InventoryInfos)
{
if (Order_qty <= 0) break;
if (InventoryInfo.AvailableQuantity < Order_qty)
{
- InventoryInfo.AvailableQuantity = 0;
Order_qty -= InventoryInfo.AvailableQuantity;
InventoryInfo.OutboundQuantity += InventoryInfo.AvailableQuantity;
- InventoryInfo.StockStatus = StockStatusEmun.鍑哄簱閿佸畾.ObjToInt();
+ Dt_SupplyTask supplyTask = new Dt_SupplyTask()
+ {
+ WarehouseCode = InventoryInfo.WarehouseCode,
+ BatchNo = InventoryInfo.BatchNo,
+ MaterielName = InventoryInfo.MaterielName,
+ MaterielCode = InventoryInfo.MaterielCode,
+ MaterielSpec = InventoryInfo.MaterielSpec,
+ TaskStatus = SupplyStatusEnum.NewOut.ObjToInt(),
+ TaskType = TaskTypeEnum.OutPick.ObjToInt(),
+ CreateDate = DateTime.Now,
+ Creater = App.User.UserName ?? "System",
+ LocationCode = InventoryInfo.LocationCode,
+ OrderNo = entityOrder.Out_no,
+ StockQuantity = InventoryInfo.AvailableQuantity,
+ SupplyQuantity = 0,
+ Remark = "鍑哄簱"
+ };
+ supplyTasks.Add(supplyTask);
+ InventoryInfo.AvailableQuantity = 0;
}
else
{
InventoryInfo.AvailableQuantity -= Order_qty;
- Order_qty = 0;
InventoryInfo.OutboundQuantity += Order_qty;
- InventoryInfo.StockStatus = StockStatusEmun.鍑哄簱閿佸畾.ObjToInt();
+ Dt_SupplyTask supplyTask = new Dt_SupplyTask()
+ {
+ WarehouseCode = InventoryInfo.WarehouseCode,
+ BatchNo = InventoryInfo.BatchNo,
+ MaterielName = InventoryInfo.MaterielName,
+ MaterielCode = InventoryInfo.MaterielCode,
+ MaterielSpec = InventoryInfo.MaterielSpec,
+ TaskStatus = SupplyStatusEnum.NewOut.ObjToInt(),
+ TaskType = TaskTypeEnum.OutPick.ObjToInt(),
+ CreateDate = DateTime.Now,
+ Creater = App.User.UserName ?? "System",
+ LocationCode = InventoryInfo.LocationCode,
+ OrderNo = entityOrder.Out_no,
+ StockQuantity = Order_qty,
+ SupplyQuantity = 0,
+ Remark = "鍑哄簱"
+ };
+ supplyTasks.Add(supplyTask);
+ Order_qty = 0;
}
- }
- #endregion
-
- #region 鐢熸垚鍑哄簱浠诲姟
- dt_InventoryInfos = dt_InventoryInfos.Where(X => X.StockStatus == StockStatusEmun.鍑哄簱閿佸畾.ObjToInt()).ToList();
- List<Dt_SupplyTask> supplyTasks = new List<Dt_SupplyTask>();
- foreach (var inventoryInfo in dt_InventoryInfos)
- {
- Dt_SupplyTask supplyTask = new Dt_SupplyTask()
- {
- WarehouseCode = inventoryInfo.WarehouseCode,
- BatchNo = inventoryInfo.BatchNo,
- MaterielName = inventoryInfo.MaterielName,
- MaterielCode = inventoryInfo.MaterielCode,
- MaterielSpec = inventoryInfo.MaterielSpec,
- TaskStatus = SupplyStatusEnum.NewOut.ObjToInt(),
- TaskType = TaskTypeEnum.OutPick.ObjToInt(),
- CreateDate = DateTime.Now,
- Creater = App.User.UserName ?? "System",
- LocationCode = inventoryInfo.LocationCode,
- OrderNo = entityOrder.Out_no,
- StockQuantity = inventoryInfo.OutboundQuantity,
- SupplyQuantity = 0,
- Remark = "鍑哄簱"
- };
- supplyTasks.Add(supplyTask);
}
#endregion
_inventory_BatchServices.Repository.UpdateData(inventory_Batch);
@@ -378,6 +302,7 @@
#endregion
else
{
+ List<Dt_SupplyTask> supplyTasks = new List<Dt_SupplyTask>();
Dt_DeliveryOrderDetail orderDetail = null;
Dt_DeliveryOrderDetail orderDetailLK = null;
var ys = Order_qty % materielInfo.BoxQty; //涓嶈兘鏁撮櫎绠辫鐨勬暎浠舵暟
@@ -399,11 +324,11 @@
}
#endregion
- #region 鏁翠欢浼樺厛鍒嗛厤澶т欢搴�
- foreach (var item in dt_InventoryInfos.Where(x => x.WarehouseCode == WarehouseEnum.澶т欢搴�.ObjToInt().ToString("000")))
+ #region 鏁翠欢浼樺厛鍒嗛厤澶т欢搴�,璁″垝搴撳瓨,娣诲姞鍑哄簱浠诲姟
+ foreach (var item in dt_InventoryInfos.Where(x => x.WarehouseCode == WareCodeDJ))
{
if (xs <= 0) break;
- item.StockStatus = StockStatusEmun.鍑哄簱閿佸畾.ObjToInt();
+ decimal outqty = 0;
while (item.AvailableQuantity > 0 && xs > 0)
{
xs--;
@@ -418,50 +343,73 @@
Exp_date = detail.exp_date,
OotDetailStatus = "鏂板缓",
Order_Outqty = 0,
- Status = 0
+ Status = 2
};
item.AvailableQuantity -= materielInfo.BoxQty;
item.OutboundQuantity += materielInfo.BoxQty;
+ outqty += materielInfo.BoxQty;
}
else
{
orderDetail.Order_qty += materielInfo.BoxQty;
item.AvailableQuantity -= materielInfo.BoxQty;
item.OutboundQuantity += materielInfo.BoxQty;
+ outqty += materielInfo.BoxQty;
}
}
+ 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.OutPick.ObjToInt(),
+ CreateDate = DateTime.Now,
+ Creater = App.User.UserName ?? "System",
+ LocationCode = item.LocationCode,
+ OrderNo = entityOrder.Out_no,
+ StockQuantity = outqty,
+ SupplyQuantity = 0,
+ Remark = "鍑哄簱"
+ };
+ supplyTasks.Add(supplyTask);
+ _inventoryInfoService.Repository.UpdateData(item);
}
#endregion
#region 鍒嗛厤瀹屽ぇ浠跺簱濡傛灉杩樻湁绠辨暟锛屽啀閫夋嫨鍒嗛厤绔嬪簱
- if (orderDetailLK == null)
+ if (xs > 0)
{
- orderDetailLK = new Dt_DeliveryOrderDetail()
+ if (orderDetailLK == null)
{
- Reservoirarea = entityOrderLK.Warehouse_no,
- Goods_no = detail.goods_no,
- Order_qty = xs * materielInfo.BoxQty,
- Batch_num = detail.batch_num,
- Exp_date = detail.exp_date,
- OotDetailStatus = "鏂板缓",
- Order_Outqty = 0,
- Status = 0
- };
- }
- else
- {
- orderDetailLK.Order_qty += xs * materielInfo.BoxQty;
+ orderDetailLK = new Dt_DeliveryOrderDetail()
+ {
+ Reservoirarea = entityOrderLK.Warehouse_no,
+ Goods_no = detail.goods_no,
+ Order_qty = xs * materielInfo.BoxQty,
+ Batch_num = detail.batch_num,
+ Exp_date = detail.exp_date,
+ OotDetailStatus = "鏂板缓",
+ Order_Outqty = 0,
+ Status = 0
+ };
+ }
+ else
+ {
+ orderDetailLK.Order_qty += xs * materielInfo.BoxQty;
+ }
}
#endregion
- List<Dt_SupplyTask> supplyTasks = new List<Dt_SupplyTask>();
+
+ #region 绔嬪簱鍑哄簱鍗曪紝淇敼绔嬪簱搴撳瓨锛屾坊鍔犵珛搴撳嚭搴撲换鍔�
if (orderDetailLK != null)
{
#region 娣诲姞鍑哄簱浠诲姟銆佷慨鏀瑰簱瀛樹俊鎭�
- Dt_InventoryInfo inventoryInfo = dt_InventoryInfos.Where(x => x.WarehouseCode == WarehouseEnum.绔嬪簱.ObjToInt().ToString("000")).First();
+ Dt_InventoryInfo inventoryInfo = dt_InventoryInfos.Where(x => x.WarehouseCode == WareCodeLK).First();
inventoryInfo.AvailableQuantity -= orderDetailLK.Order_qty;
inventoryInfo.OutboundQuantity += orderDetailLK.Order_qty;
- inventoryInfo.StockStatus = StockStatusEmun.鍑哄簱閿佸畾.ObjToInt();
- _inventoryInfoService.Repository.UpdateData(inventoryInfo);
Dt_SupplyTask supplyTask = new Dt_SupplyTask()
{
WarehouseCode = inventoryInfo.WarehouseCode,
@@ -475,44 +423,18 @@
Creater = App.User.UserName ?? "System",
LocationCode = inventoryInfo.LocationCode,
OrderNo = entityOrder.Out_no,
- StockQuantity = inventoryInfo.OutboundQuantity,
+ StockQuantity = orderDetailLK.Order_qty,
SupplyQuantity = 0,
Remark = "鍑哄簱"
};
supplyTasks.Add(supplyTask);
#endregion
+ _inventoryInfoService.Repository.UpdateData(inventoryInfo);
entityOrderLK.Details.Add(orderDetailLK);
}
- if (orderDetail != null)
- {
- #region 娣诲姞鍑哄簱浠诲姟銆佷慨鏀瑰簱瀛樹俊鎭�
- dt_InventoryInfos = dt_InventoryInfos.Where(X => X.StockStatus == StockStatusEmun.鍑哄簱閿佸畾.ObjToInt()).ToList();
- foreach (var inventoryInfo in dt_InventoryInfos)
- {
- Dt_SupplyTask supplyTask = new Dt_SupplyTask()
- {
- WarehouseCode = inventoryInfo.WarehouseCode,
- BatchNo = inventoryInfo.BatchNo,
- MaterielName = inventoryInfo.MaterielName,
- MaterielCode = inventoryInfo.MaterielCode,
- MaterielSpec = inventoryInfo.MaterielSpec,
- TaskStatus = SupplyStatusEnum.NewOut.ObjToInt(),
- TaskType = TaskTypeEnum.OutPick.ObjToInt(),
- CreateDate = DateTime.Now,
- Creater = App.User.UserName ?? "System",
- LocationCode = inventoryInfo.LocationCode,
- OrderNo = entityOrder.Out_no,
- StockQuantity = inventoryInfo.OutboundQuantity,
- SupplyQuantity = 0,
- Remark = "鍑哄簱"
- };
- supplyTasks.Add(supplyTask);
- }
- #endregion
- entityOrder.Details.Add(orderDetail);
- }
+ #endregion
+ if (orderDetail != null) entityOrder.Details.Add(orderDetail);
_inventory_BatchServices.Repository.UpdateData(inventory_Batch);
- _inventoryInfoService.Repository.UpdateData(dt_InventoryInfos);
_supplyTaskService.AddData(supplyTasks);
}
}
@@ -636,116 +558,6 @@
}
- /// <summary>
- /// 鍑哄簱鍗曟帹閫佺粰 WCS
- /// </summary>
- /// <returns></returns>
- public WebResponseContent EdiOut()
- {
- var responseContent = new WebResponseContent();
- try
- {
- // 1. 鏌ヨ绗﹀悎鏉′欢鐨勮鍗曪紙琛ㄥご=鏂板缓 && 鍖呭惈鏈夋晥鏄庣粏锛�
- var outOrders = BaseDal.Db.CopyNew().Queryable<Dt_DeliveryOrder>()
- .Where(o => o.OutStatus == "鏂板缓" && o.Warehouse_no == WarehouseEnum.绔嬪簱.ObjToInt().ToString("000"))
- .Includes(o => o.Details, d => d.MedicineGoods)
- .ToList();
-
- // 2. 鍐嶈繃婊ゆ帀涓嶇鍚堟潯浠剁殑鏄庣粏锛堝彧淇濈暀 Status=0 锛�
- foreach (var order in outOrders)
- {
- order.Details = order.Details.Where(d => d.Status == 0).ToList();
- }
-
- if (outOrders == null || !outOrders.Any())
- {
- Console.WriteLine("娌℃湁绗﹀悎鏉′欢鐨勮鍗曢渶瑕佹帹閫�");
- return responseContent.Error("娌℃湁绗﹀悎鏉′欢鐨勮鍗曢渶瑕佹帹閫�");
- }
-
- foreach (var order in outOrders)
- {
- try
- {
- string materialCode = "YY";//榛樿鍊�
- //鑾峰彇褰撳墠璁㈠崟鐨勭涓�涓槑缁嗛」
- var firstDetail = order.Details.FirstOrDefault();
- if (firstDetail?.MedicineGoods != null && !string.IsNullOrEmpty(firstDetail.MedicineGoods.MaterielErpType))
- {
- //濡傛灉鏉′欢婊¤冻锛屽皢鐗╂枡浠ｇ爜璁剧疆涓虹涓�涓槑缁嗛」瀵瑰簲鐨勮嵂鍝佺墿鏂欎唬鐮�
- materialCode = firstDetail.MedicineGoods.MaterielErpType;
- }
- // 3. 缁勮 DTO
- var ediDto = new TowcsDto.ToediOutInfo
- {
- customerCode = "905",
- materialCode = materialCode,
- externalOrderNo = order.Out_no,
- outOrderType = order.Out_type == "1" ? "10" : order.Out_type == "3" ? "20" : "30",//鍑哄簱鍗曠被鍨嬫槸1灏辨槸姝ｅ父鐨勶紝3灏辨槸鐩樼偣
- priority = 1,
- Is_cancel = 0,
- details = order.Details.Select(d => new TowcsDto.ToeOutdiInDetail
- {
- batchNo = d.Batch_num,
- productCode = d.Goods_no,
- productName = d.MedicineGoods?.MaterielName,
- productSpecifications = d.MedicineGoods?.MaterielModel,
- quantity = (int)d.Order_qty,
- //stocktakingDetails = order.Out_type == "3"
- // ? new List<ToOutediInStock>
- // {
- // new ToOutediInStock { palletCode = "FC00001", quantity = d.Order_qty.ToString() }
- // }
- // : null
- }).ToList()
- };
-
- // 4. 璋冪敤鎺ュ彛
- var url = "http://172.16.1.2:9357/file-admin/api/out/ediOut";
- //var url = "http://127.0.0.1:4523/m2/5660322-5340849-default/363076920";
-
- var result = HttpHelper.Post(url, ediDto.ToJsonString());
- var resp = JsonConvert.DeserializeObject<TowcsDto.TowcsResponse<object>>(result);
-
- if (resp != null && resp.code == "0")
- {
- // 鏇存柊琛ㄥご鐘舵��
- BaseDal.Db.Updateable<Dt_DeliveryOrder>()
- .SetColumns(o => new Dt_DeliveryOrder { OutStatus = "寮�濮�" })
- .Where(o => o.Id == order.Id)
- .ExecuteCommand();
-
- // 鏇存柊鏄庣粏鐘舵��
- BaseDal.Db.Updateable<Dt_DeliveryOrderDetail>()
- .SetColumns(d => new Dt_DeliveryOrderDetail { Status = 1, OotDetailStatus = "寮�濮�" })
- .Where(d => d.DeliveryOrderId == order.Id && d.Status == 0)
- .ExecuteCommand();
- Console.WriteLine($"璁㈠崟 {order.Out_no} 鎺ㄩ�佹垚鍔�");
- }
- else
- {
- SendErrorToUpstream(3, order.Out_no, resp?.msg ?? "WCS 鎺ㄩ�佸け璐�", "");
- Console.WriteLine($"璁㈠崟 {order.Out_no} 鎺ㄩ�佸け璐ワ細{resp?.msg}");
- }
- //鍒犻櫎鍏ㄩ儴鐘朵负宸插畬鎴愮殑鏄庣粏鍜岃〃澶达紝绉诲叆鍘嗗彶琛�
- }
- catch (Exception ex)
- {
- SendErrorToUpstream(3, order.Out_no, ex.Message, "");
- Console.WriteLine($"璁㈠崟 {order.Out_no} 鎺ㄩ�佸紓甯革細{ex.Message}");
- }
- }
-
- return responseContent.OK("鍑哄簱璁㈠崟鎺ㄩ�佸畬鎴�");
- }
- catch (Exception ex)
- {
- Console.WriteLine("EdiOut 寮傚父锛�" + ex.Message);
- return responseContent.Error("鍑哄簱璁㈠崟鎺ㄩ�佸け璐ワ細" + ex.Message);
- }
- }
-
-
//鐩樼偣 鎷挎暣涓壒娆′俊鎭〃鐨勫晢鍝佹壒鍙峰拰鍟嗗搧缂栧彿鏉ヨ繘琛岀洏鐐�
public WebResponseContent InventoryGood(string batchNo, string goodsNo)
{
@@ -807,88 +619,6 @@
catch (Exception ex)
{
return response.Error("鐩樼偣澶辫触锛�" + ex.Message);
- }
- }
-
-
-
-
- /// <summary>
- /// 鍑哄簱鎶ュ畬鎴愭帴鍙�
- /// </summary>
- /// <param name="out_no">鍑哄簱鍗曞彿</param>
- /// <returns></returns>
- public WebResponseContent CompleteAllOutOrders()
- {
- var responseContent = new WebResponseContent();
- try
- {
- #region 鏌ユ壘鎵�鏈夊凡瀹屾垚鍑哄簱鍗�
- var outorders = BaseDal.QueryData(x => x.OutStatus == "宸插畬鎴�").Select(x => x.Out_no).Distinct().ToList();
- foreach (var outorder in outorders)
- {
- var Orders = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == outorder).Includes(x => x.Details).ToList();
- if (!Orders.Where(x => x.OutStatus != "宸插畬鎴�").Any())
- {
- BaseDal.Db.Ado.BeginTran();
- BaseDal.DeleteAndMoveIntoHty(Orders, OperateTypeEnum.鑷姩瀹屾垚);
- foreach (var item in Orders)
- {
- _deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.鑷姩瀹屾垚);
- }
- var url = "http://121.37.118.63:80/GYZ2/95fck/outOrderOk";
- var requestDate = new
- {
- order_no = outorder
- };
- var result = HttpHelper.Post(url, requestDate.ToJsonString());
- var response = JsonConvert.DeserializeObject<UpstreamOrderResponse>(result);
- if (response.resultCode == "0") BaseDal.Db.Ado.CommitTran();
- else
- {
- BaseDal.Db.Ado.RollbackTran();
- SendErrorToUpstream(4, "", $"涓婃父鎺ュ彛杩斿洖澶辫触: {response.resultMsg}", outorder);
- }
- }
- }
- #endregion
-
- return responseContent.OK();
- }
- catch (Exception ex)
- {
- BaseDal.Db.Ado.RollbackTran();
- return responseContent.Error("鎵归噺澶勭悊澶辫触锛�" + ex.Message);
- }
- }
-
-
-
-
- /// <summary>
- /// 鎺ㄩ�佸紓甯镐俊鎭粰涓婃父绯荤粺 1.鍏ュ簱鍗曟帴鍙ｏ紱2.鍏ュ簱鍗曟姤瀹屾垚鎺ュ彛锛�3.鍑哄簱鍗曟帴鍙ｏ紱4.鍑哄簱鎶ュ畬鎴愭帴鍙ｏ紱5.鑽搧鍩虹淇℃伅鍚屾鎺ュ彛锛�6.渚涘簲鍟嗕俊鎭帴鍙ｏ紱7.瀹㈡埛淇℃伅鎺ュ彛锛�8.搴撳瓨鏌ヨ鎺ュ彛
- /// </summary>
- public void SendErrorToUpstream(int type, string code, string message, string remark)
- {
- try
- {
- var url = "http://121.37.118.63:80/GYZ2/95fck/exceptionLog";
-
- var requestData = new
- {
- type = type.ToString(),
- code = code,
- message = message,
- remark = remark
- };
-
- var result = HttpHelper.Post(url, requestData.ToJsonString());
- // 鍙互鍙嶅簭鍒楀寲妫�鏌� resultCode 鏄惁涓�0
- }
- catch (Exception e)
- {
- // 杩欓噷涓嶈鍐嶆姏寮傚父浜嗭紝閬垮厤姝诲惊鐜�
- Console.WriteLine("寮傚父鎺ュ彛鎺ㄩ�佸け璐ワ細" + e.Message);
}
}
@@ -1048,7 +778,12 @@
}
#endregion
if (supplyTask.WarehouseCode == WarehouseEnum.绔嬪簱.ObjToInt().ToString("000"))
- CreateAllocatInOut(materielInfo);//鍒涘缓璋冩嫧浠诲姟
+ {
+ materielInfo.Business_qty -= supplyTask.StockQuantity;
+ _basicService.MaterielInfoService.Repository.UpdateData(materielInfo);
+ if (materielInfo.Business_qty < materielInfo.MinQty)
+ CreateAllocatInOut(materielInfo);//鍒涘缓璋冩嫧浠诲姟
+ }
_unitOfWorkManage.CommitTran();
#endregion
content.OK();
--
Gitblit v1.9.3