From aa4aa67abfdf69e30d5076451716e5aba11d5ec0 Mon Sep 17 00:00:00 2001
From: yangpeixing <yangpeixing@hnkhzn.com>
Date: 星期二, 14 四月 2026 16:12:40 +0800
Subject: [PATCH] 1
---
WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 1028 ++++++++++++++-------------------------------------------
1 files changed, 254 insertions(+), 774 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
index 2c6dab6..f40feae 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
@@ -171,6 +171,7 @@
public string ReceiveWMSTaskAllocatein = WIDESEA_Core.Helper.AppSettings.Configuration["ReceiveWMSTaskAllocatein"];
public string ReceiveERPTaskout = WIDESEA_Core.Helper.AppSettings.Configuration["ReceiveERPTaskout"];
public string InMaterialWarehousingCallback = WIDESEA_Core.Helper.AppSettings.Configuration["InMaterialWarehousingCallback"];
+ public string LEDAPI = WIDESEA_Core.Helper.AppSettings.Configuration["LEDAPI"];
/// <summary>
@@ -578,9 +579,9 @@
return WebResponseContent.Instance.Error("鏈壘鍒板叆搴撳崟淇℃伅");
}
var allBoxCodesForDetail = BaseDal.Db.Queryable<Dt_StockInfoDetailCP>()
- .Where(x => dt_StockInfo.Details.Select(d => d.Id).Contains(x.StockDetailId))
- .Select(x => x.BoxCode)
- .ToList();
+ .Where(x => dt_StockInfo.Details.Select(d => d.Id).Contains(x.StockDetailId))
+ .Select(x => x.BoxCode)
+ .ToList();
// 2. 鑾峰彇鎵樼洏涓嬬殑鎵�鏈夌鍙�
var boxCodes = new List<string>();
@@ -617,7 +618,7 @@
return WebResponseContent.Instance.Error($"鏈壘鍒板搴旂殑鍏ュ簱鍗曟槑缁�");
}
- // 鏇存柊鍏ュ簱鍗曟槑缁嗙姸鎬�
+ // 鏇存柊鍏ュ簱鍗曟槑缁嗙姸鎬�
foreach (var inboundOrderDetail in inboundOrderDetails)
{
// 妫�鏌ヨ鏄庣粏鏄惁宸插叏閮ㄥ叆搴�
@@ -808,10 +809,9 @@
// 鍒ゆ柇Success鐨勫��
if (!response.Success)
{
- WriteLog.Write_Log("API", "SMOM绔嬪簱鍥炰紶缁橶MS", "璇锋眰澶辫触", new { 璇锋眰鎶ユ枃 = houseInboundPassBack, 鎺ユ敹鎶ユ枃 = response });
throw new Exception($"鎿嶄綔澶辫触: {response.Message ?? "鏈彁渚涢敊璇俊鎭�"}");
}
- WriteLog.Write_Log("API", "SMOM绔嬪簱鍏ュ簱鍥炰紶WMS", "璇锋眰鎴愬姛", new { 璇锋眰鎶ユ枃 = houseInboundPassBack, 鎺ユ敹鎶ユ枃 = response });
+
}
}
@@ -887,11 +887,8 @@
var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskAllocatein, inventoryAllocate, "璋冩嫧鍏ュ簱鏁伴噺鍥炰紶WMS");
if (!response.Success)
{
- WriteLog.Write_Log("API", "SMOM璋冩嫧鍏ュ簱鏁伴噺鍥炰紶WMS", "璇锋眰澶辫触", new { 璇锋眰鎶ユ枃 = inventoryAllocate, 鎺ユ敹鎶ユ枃 = response });
throw new Exception($"鎿嶄綔澶辫触锛歿response.Message ?? "鏈彁渚涢敊璇俊鎭�"}");
}
- WriteLog.Write_Log("API", "SMOM璋冩嫧鍏ュ簱鏁伴噺鍥炰紶WMS", "璇锋眰鎴愬姛", new { 璇锋眰鎶ユ枃 = inventoryAllocate, 鎺ユ敹鎶ユ枃 = response });
-
}
}
else if (inboundOrder.OrderStatus == InboundStatusEnum.鍏ュ簱瀹屾垚.ObjToInt() && inboundOrder.OrderType == 5 && inboundOrder.System.Equals("SMOM"))
@@ -917,28 +914,33 @@
{
Value = new Parame.Syncretism
- {
- OrderNo = inboundOrder.OrderNo,
- Details = StockInfos.SelectMany(stockInfo =>
- stockInfo.Details.Select(g =>
- {
- //var InboundOrderde1=dt_InboundOrder.Details.FirstOrDefault;
+ {
+ OrderNo = inboundOrder.OrderNo,
+ Details = StockInfos.SelectMany(stockInfo =>
- return new Parame.Syncretism.details
- {
- MoveType = 0,
- WareHouseCode = warehouse.WarehouseCode,
- ItemCode = g.MaterielCode,
- MoveNumber = g.StockQuantity,
- LotNo = g.BatchNo,
- WipBatch = g.BatchNo,
- Lpn = g.StockDetails.FirstOrDefault().LPNNO,
- LocationName = g.StockDetails.FirstOrDefault().OrinalLocation,
- TargetLocName = stockInfo.LocationCode, // 娣诲姞null妫�鏌�
- TargetLpn = stockInfo.PalletCode, // 娣诲姞null妫�鏌�
- };
- })).ToList()
- }
+ stockInfo.Details.Select(g =>
+ {
+ //var InboundOrderde1=dt_InboundOrder.Details.FirstOrDefault;
+
+ return new Parame.Syncretism.details
+ {
+ MoveType = 0,
+ WareHouseCode = warehouse.WarehouseCode,
+ ItemCode = g.MaterielCode,
+ MoveNumber = g.StockQuantity,
+ LotNo = g.BatchNo,
+ WipBatch = g.BatchNo,
+ Lpn = g.StockDetails.FirstOrDefault().LPNNO,
+ LocationName = g.StockDetails.FirstOrDefault().OrinalLocation,
+ TargetLocName = stockInfo.LocationCode, // 娣诲姞null妫�鏌�
+ TargetLpn = stockInfo.PalletCode, // 娣诲姞null妫�鏌�
+ };
+
+
+ })).ToList()
+
+ }
+
}
}
};
@@ -947,19 +949,17 @@
if (authResult.IsSuccess)
{
houseSyncretism.Context = new Dictionary<string, string>
- {
- { "Ticket", authResult.Ticket },
- { "InvOrgId", authResult.InvOrgId }
+ {
+ { "Ticket", authResult.Ticket },
+ { "InvOrgId", authResult.InvOrgId }
- };
+ };
var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskin, houseSyncretism, "绔嬪簱鍏ュ簱鏁伴噺鍥炰紶WMS");
if (!response.Success)
{
- WriteLog.Write_Log("API", "SMOM绔嬪簱鍏ュ簱鏁伴噺鍥炰紶WMS", "璇锋眰澶辫触", new { 璇锋眰鎶ユ枃 = houseSyncretism, 鎺ユ敹鎶ユ枃 = response });
throw new Exception($"鎿嶄綔澶辫触: {response.Message ?? "鏈彁渚涢敊璇俊鎭�"}");
}
- WriteLog.Write_Log("API", "SMOM绔嬪簱鍏ュ簱鏁伴噺鍥炰紶WMS", "璇锋眰鎴愬姛", new { 璇锋眰鎶ユ枃 = houseSyncretism, 鎺ユ敹鎶ユ枃 = response });
}
@@ -1088,8 +1088,6 @@
if (inboundOrder.OrderStatus == InboundStatusEnum.鍏ュ簱瀹屾垚.ObjToInt() && inboundOrder.OrderType == 0 && inboundOrder.System.Equals("SMOM"))
{
//SendInboundInfoToWMS(task, inboundOrder, stockInfo);
- SendInboundInfoToWMS(task, inboundOrder, dt_StockInfo);
-
}
else if (inboundOrder.OrderStatus == InboundStatusEnum.鍏ュ簱瀹屾垚.ObjToInt() && inboundOrder.OrderType == 2 && inboundOrder.System.Equals("SMOM"))
{
@@ -1434,7 +1432,7 @@
_recordService.StockQuantityChangeRecordService.AddStockChangeRecord(
stockInfo, stockInfo.Details,
- stockInfo.Details.Sum(x => x.StockQuantity),
+ 0,
stockInfo.Details.Sum(x => x.StockQuantity),
StockChangeType.Inbound, task.TaskNum);
}
@@ -1509,13 +1507,11 @@
// 鍒ゆ柇Success鐨勫��
if (response.Success)
{
- WriteLog.Write_Log("API", "SMOM绔嬪簱鍏ュ簱鍥炰紶WMS", "璇锋眰鎴愬姛", new { 璇锋眰鎶ユ枃 = houseInboundPassBack, 鎺ユ敹鎶ユ枃 = response });
// 濡傛灉Success涓簍rue锛岃繑鍥為渶瑕佺殑鍊硷紙杩欓噷浠ヨ繑鍥炴暣涓搷搴斿璞′负渚嬶級
return WebResponseContent.Instance.OK();
}
else
{
- WriteLog.Write_Log("API", "SMOM绔嬪簱鍏ュ簱鍥炰紶WMS", "璇锋眰澶辫触", new { 璇锋眰鎶ユ枃 = houseInboundPassBack, 鎺ユ敹鎶ユ枃 = response });
// 濡傛灉Success涓篺alse锛屾姏鍑哄紓甯稿苟鍖呭惈閿欒淇℃伅
throw new Exception($"鎿嶄綔澶辫触: {response.Message ?? "鏈彁渚涢敊璇俊鎭�"}");
}
@@ -1536,9 +1532,9 @@
Parameters = new List<HouseBackboundPassBack.backdata>
{
new HouseBackboundPassBack.backdata
- {
+ {
Value= new List<backdata.backdata1>
- {
+ {
new backdata.backdata1
{
OrderType = returnOrder.OrderType,
@@ -1554,7 +1550,7 @@
WarehouseCode = returnOrder.WarehouseCode,
System = returnOrder.System,
}
- }
+ }
}
}
};
@@ -1570,16 +1566,11 @@
// 鍒ゆ柇Success鐨勫��
if (response.Success)
{
- WriteLog.Write_Log("API", "鍙栨秷鍙戣揣鍚庣珛搴撳弽鎷ｅ叆搴撳洖浼燱MS", "璇锋眰鎴愬姛", new { 璇锋眰鎶ユ枃 = houseReturnOrders, 鎺ユ敹鎶ユ枃 = response });
-
// 濡傛灉Success涓簍rue锛岃繑鍥為渶瑕佺殑鍊硷紙杩欓噷浠ヨ繑鍥炴暣涓搷搴斿璞′负渚嬶級
return WebResponseContent.Instance.OK();
-
}
else
{
- WriteLog.Write_Log("API", "鍙栨秷鍙戣揣鍚庣珛搴撳弽鎷ｅ叆搴撳洖浼燱MS", "璇锋眰澶辫触", new { 璇锋眰鎶ユ枃 = houseReturnOrders, 鎺ユ敹鎶ユ枃 = response });
-
// 濡傛灉Success涓篺alse锛屾姏鍑哄紓甯稿苟鍖呭惈閿欒淇℃伅
throw new Exception($"鎿嶄綔澶辫触: {response.Message ?? "鏈彁渚涢敊璇俊鎭�"}");
}
@@ -1644,33 +1635,33 @@
ApiType = "InventoryAllocateController",
Method = "AsrsFinishedStockCount",
Parameters = new List<InventoryAllocate.Allocate>
+ {
+ new InventoryAllocate.Allocate
+ {
+ Value = new List<Allocate.data1>
{
- new InventoryAllocate.Allocate
+ new Allocate.data1
+ {
+ No = inboundOrder.OrderNo,
+ //InWarehouse = task.Roadway,
+ TransactionCode = inboundOrder.TransactionCode,
+ InoutType = inboundOrder.OrderType,
+ OrderType = inboundOrder.InoutType,
+ // 閬嶅巻鎵�鏈夊簱瀛樻槑缁嗭紝娣诲姞鍒� DetailList
+ DetailList = StockInfos.Select(d => new Allocate.data1.Inventory
{
- Value = new List<Allocate.data1>
- {
- new Allocate.data1
- {
- No = inboundOrder.OrderNo,
- //InWarehouse = task.Roadway,
- TransactionCode = inboundOrder.TransactionCode,
- InoutType = inboundOrder.OrderType,
- OrderType = inboundOrder.InoutType,
- // 閬嶅巻鎵�鏈夊簱瀛樻槑缁嗭紝娣诲姞鍒� DetailList
- DetailList = StockInfos.Select(d => new Allocate.data1.Inventory
- {
- LinId = d.Details.FirstOrDefault()?.LinId?? "",
- MaterielCode = d.Details.FirstOrDefault()?.MaterielCode?? "",
- OrderQuantity = d.Details.FirstOrDefault().StockQuantity,
- BatchNo = d.BatchNo,
- LPNNo = d.PalletCode,
- FinishQty = d.Details.FirstOrDefault().StockQuantity,
- LocationName = d.LocationCode
- }).ToList()
- }
- }
- }
+ LinId = d.Details.FirstOrDefault()?.LinId?? "",
+ MaterielCode = d.Details.FirstOrDefault()?.MaterielCode?? "",
+ OrderQuantity = d.Details.FirstOrDefault().StockQuantity,
+ BatchNo = d.BatchNo,
+ LPNNo = d.PalletCode,
+ FinishQty = d.Details.FirstOrDefault().StockQuantity,
+ LocationName = d.LocationCode
+ }).ToList()
}
+ }
+ }
+ }
};
var authResult = AuthenticateWithWMS();
@@ -1683,8 +1674,6 @@
};
HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskAllocatein, inventoryAllocate, "璋冩嫧鍏ュ簱鏁伴噺鍥炰紶WMS");
- WriteLog.Write_Log("API", "璋冩嫧鍏ュ簱鏁伴噺鍥炰紶WMS", "璇锋眰", new { 璇锋眰鎶ユ枃 = inventoryAllocate, 鎺ユ敹鎶ユ枃 = inventoryAllocate });
-
}
}
@@ -1713,10 +1702,10 @@
{
ApiType = "AuthenticationController",
Parameters = new List<Parameter>
- {
- new Parameter { Value = "LK-Admin" },
- new Parameter { Value = "LK-Admin" }
- },
+ {
+ new Parameter { Value = "LK-Admin" },
+ new Parameter { Value = "LK-Admin" }
+ },
Method = "Login",
};
@@ -1891,7 +1880,6 @@
foreach (var orderDetail in outboundOrderDetails1.Where(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()))
{
FeedBackOutERP(outboundOrder.OrderNo, orderDetail.LinId);
-
}
// 濡傛灉鏈夊畬鎴愮殑鏄庣粏锛屼笅杞芥姤琛�
@@ -1918,33 +1906,33 @@
ApiType = "ShippingOrderController",
Method = "AsrsOutboundSO",
Parameters = new List<HouseoutboundPassBack.datas>
- {
- new HouseoutboundPassBack.datas
- {
- Value = new List<HouseoutboundPassBack.datas.data1>
+ {
+ new HouseoutboundPassBack.datas
+ {
+ Value = new List<HouseoutboundPassBack.datas.data1>
+ {
+ new HouseoutboundPassBack.datas.data1
+ {
+ No = outboundOrder.OrderNo,
+ OutWareHouse = task.Roadway,
+ TransactionCode = outboundOrder.TransactionCode,
+ InoutType = outboundOrder.OrderType,
+ OrderType = outboundOrder.InoutType,
+ DetailList = outStockLockInfoList.Select(d => new HouseoutboundPassBack.datas.data1.Inbound
{
- new HouseoutboundPassBack.datas.data1
- {
- No = outboundOrder.OrderNo,
- OutWareHouse = task.Roadway,
- TransactionCode = outboundOrder.TransactionCode,
- InoutType = outboundOrder.OrderType,
- OrderType = outboundOrder.InoutType,
- DetailList = outStockLockInfoList.Select(d => new HouseoutboundPassBack.datas.data1.Inbound
- {
- LinId = d.LinId?? "",
- LPN_No = d.PalletCode,
- MaterielCode = d.MaterielCode?? "",
- OrderQuantity = d.OrderQuantity,
- BatchNo = d.BatchNo,
- FinishQty = d.OrderQuantity,
- LocationName = d.LocationCode
- })
- .ToList()
- }
- }
- }
- }
+ LinId = d.LinId?? "",
+ LPN_No = d.PalletCode,
+ MaterielCode = d.MaterielCode?? "",
+ OrderQuantity = d.OrderQuantity,
+ BatchNo = d.BatchNo,
+ FinishQty = d.OrderQuantity,
+ LocationName = d.LocationCode
+ })
+ .ToList()
+ }
+ }
+ }
+ }
};
//璋冪敤SMOM鎺ュ彛...
@@ -1959,52 +1947,49 @@
var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskout, passBack, "绔嬪簱鍑哄簱鏁伴噺鍥炰紶WMS");
if (!response.Success)
{
- WriteLog.Write_Log("API", "SMOM绔嬪簱搴撴暟閲忓洖浼燱MS", "璇锋眰澶辫触", new { 璇锋眰鎶ユ枃 = passBack, 鎺ユ敹鎶ユ枃 = response });
-
throw new Exception($"鎿嶄綔澶辫触: {response.Message ?? "鏈彁渚涢敊璇俊鎭�"}");
}
- WriteLog.Write_Log("API", "SMOM绔嬪簱搴撴暟閲忓洖浼燱MS", "璇锋眰鎴愬姛", new { 璇锋眰鎶ユ枃 = passBack, 鎺ユ敹鎶ユ枃 = response });
}
}
// 璋冩嫧鍑哄簱
- if (outboundOrder.OrderType == 4)
+ if (outboundOrder.OrderType == 3)
{
var allocate = new InventoryAllocate
{
ApiType = "InventoryAllocateController",
Method = "AsrsFinishedStockCount",
Parameters = new List<Allocate>
- {
- new Allocate
- {
- Value = new List<Allocate.data1>
+ {
+ new Allocate
+ {
+ Value = new List<Allocate.data1>
+ {
+ new Allocate.data1
+ {
+ No = outboundOrder.OrderNo,
+ InWarehouse = task.Roadway,
+ TransactionCode = outboundOrder.TransactionCode,
+ InoutType = outboundOrder.OrderType,
+ OrderType = outboundOrder.InoutType,
+ ActiveType = 2,
+ DetailList = outStockLockInfoList.Select(item =>
{
- new Allocate.data1
+ return new Allocate.data1.Inventory
{
- No = outboundOrder.OrderNo,
- InWarehouse = task.Roadway,
- TransactionCode = outboundOrder.TransactionCode,
- InoutType = outboundOrder.OrderType,
- OrderType = outboundOrder.InoutType,
- ActiveType = 2,
- DetailList = outStockLockInfoList.Select(item =>
- {
- return new Allocate.data1.Inventory
- {
- LinId = item.LinId,
- LPNNo = item.PalletCode,
- MaterielCode = item.MaterielCode,
- OrderQuantity = item.OrderQuantity,
- BatchNo = item.BatchNo,
- FinishQty = item.OrderQuantity,
- LocationName = task.SourceAddress
- };
- }).ToList()
- }
- }
- }
- }
+ LinId = item.LinId,
+ LPNNo = item.PalletCode,
+ MaterielCode = item.MaterielCode,
+ OrderQuantity = item.OrderQuantity,
+ BatchNo = item.BatchNo,
+ FinishQty = item.OrderQuantity,
+ LocationName = task.SourceAddress
+ };
+ }).ToList()
+ }
+ }
+ }
+ }
};
// 璋冪敤SMOM鎺ュ彛...
@@ -2012,19 +1997,15 @@
if (authResult.IsSuccess)
{
allocate.Context = new Dictionary<string, string>
- {
- { "Ticket", authResult.Ticket },
- { "InvOrgId", authResult.InvOrgId }
- };
+ {
+ { "Ticket", authResult.Ticket },
+ { "InvOrgId", authResult.InvOrgId }
+ };
var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskin, allocate, "绔嬪簱鍏ュ簱鏁伴噺鍥炰紶WMS");
if (!response.Success)
{
- WriteLog.Write_Log("API", "SMOM绔嬪簱搴撴暟閲忓洖浼燱MS", "璇锋眰澶辫触", new { 璇锋眰鎶ユ枃 = allocate, 鎺ユ敹鎶ユ枃 = response });
-
throw new Exception($"鎿嶄綔澶辫触: {response.Message ?? "鏈彁渚涢敊璇俊鎭�"}");
}
- WriteLog.Write_Log("API", "SMOM绔嬪簱搴撴暟閲忓洖浼燱MS", "璇锋眰鎴愬姛", new { 璇锋眰鎶ユ枃 = allocate, 鎺ユ敹鎶ユ枃 = response });
-
}
}
}
@@ -2157,33 +2138,33 @@
ApiType = "ShippingOrderController",
Method = "AsrsOutboundSO",
Parameters = new List<HouseoutboundPassBack.datas>
- {
- new HouseoutboundPassBack.datas
- {
- Value = new List<HouseoutboundPassBack.datas.data1>
+ {
+ new HouseoutboundPassBack.datas
+ {
+ Value = new List<HouseoutboundPassBack.datas.data1>
+ {
+ new HouseoutboundPassBack.datas.data1
+ {
+ No = outboundOrder.OrderNo,
+ OutWareHouse = task.Roadway,
+ TransactionCode = outboundOrder.TransactionCode,
+ InoutType = outboundOrder.OrderType,
+ OrderType = outboundOrder.InoutType,
+ DetailList = outStockLockInfoList.Select(d => new HouseoutboundPassBack.datas.data1.Inbound
{
- new HouseoutboundPassBack.datas.data1
- {
- No = outboundOrder.OrderNo,
- OutWareHouse = task.Roadway,
- TransactionCode = outboundOrder.TransactionCode,
- InoutType = outboundOrder.OrderType,
- OrderType = outboundOrder.InoutType,
- DetailList = outStockLockInfoList.Select(d => new HouseoutboundPassBack.datas.data1.Inbound
- {
- LinId = d.LinId?? "",
- LPN_No = d.PalletCode,
- MaterielCode = d.MaterielCode?? "",
- OrderQuantity = d.OrderQuantity,
- BatchNo = d.BatchNo,
- FinishQty = d.OrderQuantity,
- LocationName = d.LocationCode
- })
- .ToList()
- }
- }
- }
- }
+ LinId = d.LinId?? "",
+ LPN_No = d.PalletCode,
+ MaterielCode = d.MaterielCode?? "",
+ OrderQuantity = d.OrderQuantity,
+ BatchNo = d.BatchNo,
+ FinishQty = d.OrderQuantity,
+ LocationName = d.LocationCode
+ })
+ .ToList()
+ }
+ }
+ }
+ }
};
//璋冪敤SMOM鎺ュ彛...
@@ -2198,53 +2179,49 @@
var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskout, passBack, "绔嬪簱鍑哄簱鏁伴噺鍥炰紶WMS");
if (!response.Success)
{
- WriteLog.Write_Log("API", "SMOM绔嬪簱搴撴暟閲忓洖浼燱MS", "璇锋眰澶辫触", new { 璇锋眰鎶ユ枃 = passBack, 鎺ユ敹鎶ユ枃 = response });
-
throw new Exception($"鎿嶄綔澶辫触: {response.Message ?? "鏈彁渚涢敊璇俊鎭�"}");
}
- WriteLog.Write_Log("API", "SMOM绔嬪簱搴撴暟閲忓洖浼燱MS", "璇锋眰鎴愬姛", new { 璇锋眰鎶ユ枃 = passBack, 鎺ユ敹鎶ユ枃 = response });
-
}
}
// 璋冩嫧鍑哄簱
- if (outboundOrder.OrderType == 4)
+ if (outboundOrder.OrderType == 3)
{
var allocate = new InventoryAllocate
{
ApiType = "InventoryAllocateController",
Method = "AsrsFinishedStockCount",
Parameters = new List<Allocate>
- {
- new Allocate
- {
- Value = new List<Allocate.data1>
+ {
+ new Allocate
+ {
+ Value = new List<Allocate.data1>
+ {
+ new Allocate.data1
+ {
+ No = outboundOrder.OrderNo,
+ InWarehouse = task.Roadway,
+ TransactionCode = outboundOrder.TransactionCode,
+ InoutType = outboundOrder.OrderType,
+ OrderType = outboundOrder.InoutType,
+ ActiveType = 2,
+ DetailList = outStockLockInfoList.Select(item =>
{
- new Allocate.data1
+ return new Allocate.data1.Inventory
{
- No = outboundOrder.OrderNo,
- InWarehouse = task.Roadway,
- TransactionCode = outboundOrder.TransactionCode,
- InoutType = outboundOrder.OrderType,
- OrderType = outboundOrder.InoutType,
- ActiveType = 2,
- DetailList = outStockLockInfoList.Select(item =>
- {
- return new Allocate.data1.Inventory
- {
- LinId = item.LinId,
- LPNNo = item.PalletCode,
- MaterielCode = item.MaterielCode,
- OrderQuantity = item.OrderQuantity,
- BatchNo = item.BatchNo,
- FinishQty = item.OrderQuantity,
- LocationName = task.SourceAddress
- };
- }).ToList()
- }
- }
- }
- }
+ LinId = item.LinId,
+ LPNNo = item.PalletCode,
+ MaterielCode = item.MaterielCode,
+ OrderQuantity = item.OrderQuantity,
+ BatchNo = item.BatchNo,
+ FinishQty = item.OrderQuantity,
+ LocationName = task.SourceAddress
+ };
+ }).ToList()
+ }
+ }
+ }
+ }
};
// 璋冪敤SMOM鎺ュ彛...
@@ -2259,12 +2236,8 @@
var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskin, allocate, "绔嬪簱鍏ュ簱鏁伴噺鍥炰紶WMS");
if (!response.Success)
{
- WriteLog.Write_Log("API", "SMOM绔嬪簱搴撴暟閲忓洖浼燱MS", "璇锋眰澶辫触", new { 璇锋眰鎶ユ枃 = allocate, 鎺ユ敹鎶ユ枃 = response });
-
throw new Exception($"鎿嶄綔澶辫触: {response.Message ?? "鏈彁渚涢敊璇俊鎭�"}");
}
- WriteLog.Write_Log("API", "SMOM绔嬪簱搴撴暟閲忓洖浼燱MS", "璇锋眰鎴愬姛", new { 璇锋眰鎶ユ枃 = allocate, 鎺ユ敹鎶ユ枃 = response });
-
}
}
}
@@ -2303,7 +2276,11 @@
{
Dt_OutboundOrderDetail outboundOrderDetail = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrderDetail>()
.Where(x => x.OrderId == inboundOrder.Id && x.BatchNo == detail.BatchNo).First();
- outboundOrderDetails.Add(outboundOrderDetail);
+ if (outboundOrderDetail != null)
+ {
+ outboundOrderDetails.Add(outboundOrderDetail);
+ }
+
}
for (var i = 0; i < outboundOrderDetails.Count; i++)
@@ -2494,7 +2471,7 @@
// 鏇存柊搴撳瓨鐘舵�� 鍥炲簱鍗�
if (locationInfo.RoadwayNo.Contains("DW") || locationInfo.RoadwayNo.Contains("YS"))
{
- AddDWANDYSRetrueOrder(stockInfo, inboundOrder);
+ AddDWANDYSRetrueOrder(task, stockInfo, inboundOrder);
}
// 鍖哄垎鍗曟嵁鏁版嵁鏉ユ簮鏇存柊璐т綅鐘舵��
@@ -2511,6 +2488,7 @@
// 娣诲姞鐘舵�佸彉鏇磋褰�
AddStatusChangeRecord(task, stockInfo, locationInfo);
+
// 鏍规嵁璁㈠崟绫诲瀷澶勭悊涓嶅悓閫昏緫
@@ -2587,12 +2565,11 @@
private void DWANDYSUpdateOutboundOrderDetails(Dt_StockInfo stockInfo, Dt_OutboundOrder inboundOrder, ref List<Dt_OutboundOrderDetail> inboundOrderDetails)
{
List<Dt_OutboundOrderDetail> newOutboundOrderDetails = inboundOrderDetails;
- int overCount = inboundOrder.Details.Count(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt());
+ int CompeletedNum = inboundOrder.Details.Where(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()).Count();
foreach (var newOutboundOrderDetail in newOutboundOrderDetails)
{
string BatchNo = newOutboundOrderDetail.BatchNo;
//inboundOrderDetail = inboundOrder.Details.FirstOrDefault(x => x.BatchNo == stockInfo.Details.FirstOrDefault()?.BatchNo&&x.LPNNo==stockInfo.PalletCode);
-
foreach (var item in stockInfo.Details)
{
if (newOutboundOrderDetail == null) continue;
@@ -2606,16 +2583,17 @@
if (newOutboundOrderDetail.OverOutQuantity == newOutboundOrderDetail.OrderQuantity)
{
newOutboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
- overCount++;
+ CompeletedNum++;
}
else if (newOutboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt())
{
newOutboundOrderDetail.OrderDetailStatus = OutboundStatusEnum.鍑哄簱涓�.ObjToInt();
+
inboundOrder.OrderStatus = OutboundStatusEnum.鍑哄簱涓�.ObjToInt();
}
}
}
- if (inboundOrder.Details.Count() == overCount)
+ if (inboundOrder.Details.Count == CompeletedNum)
{
inboundOrder.OrderStatus = OutboundStatusEnum.鍑哄簱瀹屾垚.ObjToInt();
}
@@ -2651,6 +2629,12 @@
StockChangeType.Outbound.ObjToInt(),
stockInfo.Details.FirstOrDefault()?.OrderNo ?? "",
task.TaskNum);
+
+ _recordService.StockQuantityChangeRecordService.NEWAddStockChangeRecord(
+ stockInfo, stockInfo.Details,
+ stockInfo.Details.Sum(x => x.StockQuantity),
+ stockInfo.Details.Sum(x => x.OutboundQuantity),
+ StockChangeType.Outbound, task.TaskNum);
}
private void ProcessNormalOutbound(Dt_Task task, Dt_StockInfo stockInfo,
@@ -2829,50 +2813,48 @@
ApiType = "InventoryAllocateController",
Method = "AsrsFinishedStockCount",
Parameters = new List<Allocate>
+ {
+ new Allocate
+ {
+ Value = new List<Allocate.data1>
{
- new Allocate
+ new Allocate.data1
{
- Value = new List<Allocate.data1>
+ No = outboundOrder.OrderNo,
+ InWarehouse = task.Roadway,
+ TransactionCode = outboundOrder.TransactionCode,
+ InoutType = outboundOrder.OrderType,
+ OrderType = outboundOrder.InoutType,
+ DetailList = outStockLockInfos.Select(item =>
{
- new Allocate.data1
+ //var detail = _stockService.StockInfoDetailService.Repository.QueryFirst(x => x.StockId == item.StockId);
+ return new Allocate.data1.Inventory
{
- No = outboundOrder.OrderNo,
- InWarehouse = task.Roadway,
- TransactionCode = outboundOrder.TransactionCode,
- InoutType = outboundOrder.OrderType,
- OrderType = outboundOrder.InoutType,
- DetailList = outStockLockInfos.Select(item =>
- {
- //var detail = _stockService.StockInfoDetailService.Repository.QueryFirst(x => x.StockId == item.StockId);
- return new Allocate.data1.Inventory
- {
- LinId = outDetail.LinId,
- LPNNo = item.PalletCode,
- MaterielCode = outDetail.MaterielCode,
- OrderQuantity = outDetail.OrderQuantity,
- BatchNo = outDetail.BatchNo,
- FinishQty = outDetail.OrderQuantity,
- LocationName = task.SourceAddress
- };
- }).ToList()
- }
- }
+ LinId = outDetail.LinId,
+ LPNNo = item.PalletCode,
+ MaterielCode = outDetail.MaterielCode,
+ OrderQuantity = outDetail.OrderQuantity,
+ BatchNo = outDetail.BatchNo,
+ FinishQty = outDetail.OrderQuantity,
+ LocationName = task.SourceAddress
+ };
+ }).ToList()
}
}
+ }
+ }
};
var authResult = AuthenticateWithWMS();
if (authResult.IsSuccess)
{
allocate.Context = new Dictionary<string, string>
- {
- { "Ticket", authResult.Ticket },
- { "InvOrgId", authResult.InvOrgId }
- };
+ {
+ { "Ticket", authResult.Ticket },
+ { "InvOrgId", authResult.InvOrgId }
+ };
- var response = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskin, allocate, "绔嬪簱鍏ュ簱鏁伴噺鍥炰紶WMS");
- WriteLog.Write_Log("API", "SMOM绔嬪簱鍏ュ簱鏁伴噺鍥炰紶WMS", "璇锋眰", new { 璇锋眰鎶ユ枃 = allocate, 鎺ユ敹鎶ユ枃 = response });
-
+ HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskin, allocate, "绔嬪簱鍏ュ簱鏁伴噺鍥炰紶WMS");
}
}
@@ -2952,7 +2934,7 @@
}
//浣庢俯銆佽嵂姘村洖搴撳崟
- private void AddDWANDYSRetrueOrder(Dt_StockInfo stockInfo, Dt_OutboundOrder outboundOrder)
+ private void AddDWANDYSRetrueOrder(Dt_Task task, Dt_StockInfo stockInfo, Dt_OutboundOrder outboundOrder)
{
List<Dt_StockInfoDetail> stockInfoDetails = _stockService.StockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
@@ -2981,6 +2963,22 @@
}
else
{
+ var postData = new
+ {
+ DeviceCode = task.NextAddress, // 灞忓箷缂栧彿
+ MaterialCode = outboundOrder.Details.FirstOrDefault()?.MaterielCode,//鐗╂枡绫诲瀷
+ BackNum = stockInfoDetail.StockQuantity - stockInfoDetail.OutboundQuantity,//鍥炲簱鏁�
+ SendNum = outboundOrder.Details.FirstOrDefault()?.OrderQuantity//鍙戞枡鏁�
+ };
+ string json = Newtonsoft.Json.JsonConvert.SerializeObject(postData);
+ using (var client = new HttpClient())
+ {
+ var content = new StringContent(json, Encoding.UTF8, "application/json");
+ var response = client.PostAsync(LEDAPI, content).Result;
+ string result = response.Content.ReadAsStringAsync().Result;
+ }
+
+
bool allowCompeted = stockInfo.Details.All(x => x.StockQuantity == x.OutboundQuantity);
if (allowCompeted)
{
@@ -3069,7 +3067,8 @@
var matchedStockDetail = stockInfoDetails.FirstOrDefault(x => x.MaterielCode == outDetail.MaterielCode && x.BatchNo == outDetail.BatchNo);
if (matchedStockDetail == null)
{
- matchedStockDetail = stockInfoDetails.FirstOrDefault(x =>x.MaterielCode == outDetail.MaterielCode);
+ matchedStockDetail = stockInfoDetails.FirstOrDefault(x =>
+ x.MaterielCode == outDetail.MaterielCode);
if (matchedStockDetail == null)
{
@@ -3293,8 +3292,6 @@
result = response.Content.ReadAsStringAsync()
.ConfigureAwait(false).GetAwaiter().GetResult();
- WriteLog.Write_Log("API", "鍗曟嵁鏄庣粏鍑哄簱瀹屾垚鍥炶皟ERP", "璇锋眰鎴愬姛", new { 璇锋眰鎶ユ枃 = postContent, 鎺ユ敹鎶ユ枃 = response });
-
}
// 鍋囪ERP杩斿洖鎴愬姛鏃惰繑鍥炴垚鍔熷搷搴�
@@ -3302,15 +3299,11 @@
}
catch (HttpRequestException ex)
{
- WriteLog.Write_Log("API", "鍗曟嵁鏄庣粏鍑哄簱瀹屾垚鍥炶皟ERP", "璇锋眰澶辫触", new { 璇锋眰鎶ユ枃 = postContent, 鎺ユ敹鎶ユ枃 = ex.Message });
-
// 澶勭悊HTTP璇锋眰鐩稿叧寮傚父
return WebResponseContent.Instance.Error($"HTTP璇锋眰閿欒: {ex.Message}");
}
catch (Exception ex)
{
- WriteLog.Write_Log("API", "鍗曟嵁鏄庣粏鍑哄簱瀹屾垚鍥炶皟ERP", "璇锋眰澶辫触", new { 璇锋眰鎶ユ枃 = postContent, 鎺ユ敹鎶ユ枃 = ex.Message });
-
// 澶勭悊鍏朵粬寮傚父
return WebResponseContent.Instance.Error($"澶勭悊澶辫触: {ex.Message}");
}
@@ -3338,15 +3331,11 @@
// 鍒ゆ柇Success鐨勫��
if (response.Code == 0)
{
- WriteLog.Write_Log("API", "浠诲姟鍥炰紶缁檈rp", "璇锋眰鎴愬姛", new { 璇锋眰鎶ユ枃 = feedbackInboundOrder, 鎺ユ敹鎶ユ枃 = response });
-
// 濡傛灉Success涓簍rue锛岃繑鍥為渶瑕佺殑鍊硷紙杩欓噷浠ヨ繑鍥炴暣涓搷搴斿璞′负渚嬶級
return WebResponseContent.Instance.OK();
}
else
{
- WriteLog.Write_Log("API", "浠诲姟鍥炰紶缁檈rp", "璇锋眰澶辫触", new { 璇锋眰鎶ユ枃 = feedbackInboundOrder, 鎺ユ敹鎶ユ枃 = response });
-
// 濡傛灉Success涓篺alse锛屾姏鍑哄紓甯稿苟鍖呭惈閿欒淇℃伅
throw new Exception($"鎿嶄綔澶辫触: {response.Message ?? "鏈彁渚涢敊璇俊鎭�"}");
}
@@ -3914,520 +3903,11 @@
#endregion
-
-
-
- #region
- //public WebResponseContent InboundTaskCompleted(int taskNum)
- //{
- // try
- // {
- // Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
- // if (task == null)
- // {
- // return WebResponseContent.Instance.Error($"鏈壘鍒拌浠诲姟");
- // }
- // if (task.TaskType != TaskTypeEnum.Inbound.ObjToInt())
- // {
- // return WebResponseContent.Instance.Error($"浠诲姟绫诲瀷閿欒");
- // }
- // Dt_StockInfo dt_StockInfo = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == task.PalletCode).Includes(x => x.Details).First();
- // if (dt_StockInfo == null)
- // {
- // return WebResponseContent.Instance.Error($"鏈壘鍒版墭鐩樺搴旂殑缁勭洏淇℃伅");
- // }
-
- // if (!string.IsNullOrEmpty(dt_StockInfo.LocationCode))
- // {
- // return WebResponseContent.Instance.Error($"璇ユ墭鐩樺凡缁戝畾璐т綅");
- // }
-
- // if (dt_StockInfo.Details == null || dt_StockInfo.Details.Count == 0)
- // {
- // return WebResponseContent.Instance.Error($"鏈壘鍒拌鎵樼洏搴撳瓨鏄庣粏淇℃伅");
- // }
- // Dt_LocationInfo dt_LocationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress);
- // if (dt_LocationInfo == null)
- // {
- // return WebResponseContent.Instance.Error($"鏈壘鍒扮洰鏍囪揣浣嶄俊鎭�");
- // }
-
- // if (dt_LocationInfo.LocationStatus == LocationStatusEnum.InStock.ObjToInt())
- // {
- // return WebResponseContent.Instance.Error($"璐т綅鐘舵�佷笉姝ｇ‘");
- // }
- // int lastStatus = dt_LocationInfo.LocationStatus;
- // dt_LocationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
- // Dt_Warehouse warehouse = _basicService.WarehouseService.Repository.QueryFirst(x => x.WarehouseId == task.WarehouseId);
-
- // dt_StockInfo.LocationCode = dt_LocationInfo.LocationCode;
-
-
- // Dt_InboundOrder? inboundOrder = _inboundService.InbounOrderService.Db.Queryable<Dt_InboundOrder>().Where(x => x.InboundOrderNo == dt_StockInfo.Details.FirstOrDefault().OrderNo).Includes(x => x.Details).First();
- // Dt_InboundOrderDetail? inboundOrderDetail = null;
- // //鍒ゆ柇鍗曟嵁绫诲瀷鏄叆搴撹繕鏄皟鎷ㄥ叆搴撱�傘�傘�傚叆搴�
- // if (inboundOrder.OrderType == 0 && inboundOrder != null && dt_StockInfo.StockStatus == StockStatusEmun.鍏ュ簱纭.ObjToInt())
- // {
- // #region //鍒ゆ柇鍏ュ簱鍗曟嵁鏄庣粏鍙湁鏈�鍚庝竴鏉″畬鎴愭椂鍒犻櫎鍏ュ簱鍗�
- // //鏌ヨ鍘熷畬鎴愮殑鍏ュ簱鏄庣粏鏁伴噺
- // int overCount = inboundOrder.Details.Where(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()).ToList().Count;
- // //鏄庣粏id鏌ヨ
- // inboundOrderDetail = inboundOrder.Details.FirstOrDefault(x => x.LinId == dt_StockInfo.Details.FirstOrDefault()?.LinId);
- // foreach (var item in dt_StockInfo.Details)
- // {
- // if (inboundOrderDetail == null)
- // {
- // continue;
- // }
- // inboundOrderDetail.OverInQuantity += item.StockQuantity;
- // if (inboundOrderDetail.OverInQuantity == inboundOrderDetail.OrderQuantity)
- // {
- // inboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
- // overCount += 1;
- // }
- // else if (inboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt())
- // {
- // inboundOrderDetail.OrderDetailStatus = InboundStatusEnum.鍏ュ簱涓�.ObjToInt();
- // }
- // }
- // dt_StockInfo.Details.ForEach(x =>
- // {
- // x.Status = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
- // });
-
- // _unitOfWorkManage.BeginTran();
- // task.TaskStatus = InTaskStatusEnum.InFinish.ObjToInt();
- // BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId > 0 ? OperateType.浜哄伐瀹屾垚 : OperateType.鑷姩瀹屾垚);
-
- // _basicService.LocationInfoService.Repository.UpdateData(dt_LocationInfo);
- // _stockRepository.StockInfoRepository.UpdateData(dt_StockInfo);
- // _stockRepository.StockInfoDetailRepository.UpdateData(dt_StockInfo.Details);
- // _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(dt_LocationInfo, lastStatus, StockChangeType.Inbound.ObjToInt(), "", task.TaskNum);
- // _recordService.StockQuantityChangeRecordService.AddStockChangeRecord(dt_StockInfo, dt_StockInfo.Details, dt_StockInfo.Details.Sum(x => x.StockQuantity), dt_StockInfo.Details.Sum(x => x.StockQuantity), StockChangeType.Inbound, task.TaskNum);
- // if (inboundOrder != null)
- // {
- // _inboundService.InbounOrderService.UpdateData(inboundOrder);
- // _inboundService.InboundOrderDetailService.UpdateData(inboundOrderDetail);
- // }
- // _unitOfWorkManage.CommitTran();
-
-
-
-
- // if (inboundOrder.Details.Count == 1)
- // {
- // var stockInfoDetail = dt_StockInfo.Details.FirstOrDefault();
-
- // #region//鍏ュ簱淇℃伅杩斿洖涓婁綅WMS銆傘�傜珛搴撳叆搴撴暟閲忓洖浼�
- // HouseInboundPassBack houseInboundPassBack = new HouseInboundPassBack();
- // houseInboundPassBack.ApiType = "AsnController";
- // houseInboundPassBack.Method = "AsrsGroudingAsn";
- // data data = new data();
- // data.data1 data1 = new data.data1();
- // data1.AsnNo = task.OrderNo;
- // data1.InWarehouse = task.Roadway;
- // data1.TransactionCode = inboundOrder.TransactionCode;
- // data1.InoutType = inboundOrder.OrderType;
- // data1.OrderType = inboundOrder.InoutType;
- // data.data1.Inbound inbound = new data.data1.Inbound
- // {
- // LinId = stockInfoDetail.LinId,
- // MaterielCode = stockInfoDetail.MaterielCode,
- // OrderQuantity = stockInfoDetail.StockQuantity,
- // BatchNo = stockInfoDetail.BatchNo,
- // FinishQty = stockInfoDetail.StockQuantity,
- // LocationName = task.TargetAddress
- // };
- // data.Value.Add(data1);
- // data1.DetailList.Add(inbound);
- // houseInboundPassBack.Parameters.Add(data);
- // Authentication authentication = new Authentication()
- // {
- // ApiType = "AuthenticationController",
- // Parameters = new List<Parameter>
- // {
- // new Parameter { Value = "LKAdmin"},
- // new Parameter { Value = "LKAdmin"},
- // },
- // Method = "Login",
- // };
- // var responses1 = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskAUT, authentication, "鐧诲綍WMS璐﹀彿");
- // var Ticket = responses1.Context["Ticket"].ToString();
- // var InvOrgId = responses1.Context["InvOrgId"].ToString();
- // if (Ticket != null)
- // {
- // houseInboundPassBack.Context = new Dictionary<string, string>();
- // houseInboundPassBack.Context.Add("Ticket", Ticket);
- // houseInboundPassBack.Context.Add("InvOrgId", InvOrgId);
- // var responses = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskin, houseInboundPassBack, "绔嬪簱鍏ュ簱鏁伴噺鍥炰紶WMS");
- // }
- // #endregion
- // }
- // }
- // else
- // {
- // #region //鍒ゆ柇璋冩嫧鍏ュ簱鍗曟嵁鏄庣粏鍙湁鏈�鍚庝竴鏉″畬鎴愭椂鍒犻櫎鍏ュ簱鍗曞苟涓�娆¤繑鍥炲叆搴撴槑缁嗕俊鎭�
- // if (inboundOrder.Details.Count == 1)
- // {
- // List<Dt_StockInfo> StockInfo = _stockService.StockInfoService.Repository.QueryData(x => x.BatchNo == inboundOrderDetail.BatchNo);
- // Dt_InboundOrder_Hty inboundOrder_Hty = new Dt_InboundOrder_Hty
- // {
- // OrderStatus = inboundOrder.OrderStatus,
- // CreateType = inboundOrder.CreateType,
- // //SourceId = oldOutboundOrder.SourceId,
- // UpperOrderNo = inboundOrder.UpperOrderNo,
- // OrderNo = inboundOrder.OrderNo,
- // //OutWareHouse = inboundOrder.OutWareHouse,
- // TransactionCode = inboundOrder.TransactionCode,
- // InoutType = inboundOrder.InoutType,
- // OrderType = inboundOrder.OrderType,
- // Creater = "WMS",
- // CreateDate = DateTime.Now,
- // };
- // _inboundOrder_HtyService.AddData(inboundOrder_Hty);
- // _inboundService.InbounOrderService.DeleteData(inboundOrder);
- // Dt_InboundOrderDetail_Hty dt_InboundOrderDetail_HtyS = new Dt_InboundOrderDetail_Hty
- // {
- // OrderId = inboundOrderDetail.OrderId,
- // MaterielCode = inboundOrderDetail.MaterielCode,
- // MaterielName = inboundOrderDetail.MaterielName,
- // BatchNo = inboundOrderDetail.BatchNo,
- // OrderQuantity = inboundOrderDetail.OrderQuantity,
- // ReceiptQuantity = inboundOrderDetail.ReceiptQuantity,
- // OverInQuantity = inboundOrderDetail.OverInQuantity,
- // OrderDetailStatus = inboundOrderDetail.OrderDetailStatus,
- // Creater = "WMS",
- // CreateDate = DateTime.Now,
- // };
- // _inboundOrderDetail_HtyService.AddData(dt_InboundOrderDetail_HtyS);
- // _inboundService.InboundOrderDetailService.DeleteData(inboundOrderDetail);
- // #endregion
- // #region//璋冩嫧浠诲姟鏁伴噺鍥炰紶WMS
- // InventoryAllocate inventoryAllocate = new InventoryAllocate();
- // inventoryAllocate.ApiType = "InventoryAllocateController";
- // inventoryAllocate.Method = "AsrsFinishedStockCount";
-
- // Allocate allocate = new Allocate();
-
- // Allocate.data1 data1 = new Allocate.data1();
- // data1.No = task.OrderNo;
- // data1.InWarehouse = task.Roadway;
- // data1.TransactionCode = inboundOrder.TransactionCode;
- // data1.InoutType = inboundOrder.OrderType;
- // data1.OrderType = inboundOrder.InoutType;
- // foreach (var item in StockInfo)
- // {
- // Dt_StockInfoDetail detail = _stockService.StockInfoDetailService.Repository.QueryFirst(x => x.StockId == item.Id);
- // Allocate.data1.Inventory inbound = new Allocate.data1.Inventory();
- // inbound.LinId = detail.LinId;
- // inbound.LPN_No = item.PalletCode;
- // inbound.MaterielCode = detail.MaterielCode;
- // inbound.OrderQuantity = detail.StockQuantity;
- // inbound.BatchNo = detail.BatchNo;
- // inbound.FinishQty = detail.StockQuantity;
- // inbound.LocationName = item.LocationCode;
- // data1.DetailList.Add(inbound);
- // }
- // allocate.Value.Add(data1);
- // inventoryAllocate.Parameters.Add(allocate);
- // Authentication authentication = new Authentication()
- // {
- // ApiType = "AuthenticationController",
- // Parameters = new List<Parameter>
- // {
- // new Parameter { Value = "LKAdmin"},
- // new Parameter { Value = "LKAdmin"},
- // },
- // Method = "Login",
- // };
- // var responses1 = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskAUT, authentication, "鐧诲綍WMS璐﹀彿");
- // var Ticket = responses1.Context["Ticket"].ToString();
- // var InvOrgId = responses1.Context["InvOrgId"].ToString();
- // if (Ticket != null)
- // {
- // inventoryAllocate.Context = new Dictionary<string, string>();
- // inventoryAllocate.Context.Add("Ticket", Ticket);
- // inventoryAllocate.Context.Add("InvOrgId", InvOrgId);
- // var responses = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskAllocatein, inventoryAllocate, "璋冩嫧鍏ュ簱鏁伴噺鍥炰紶WMS");
- // }
- // }
- // #endregion
- // Dt_InboundOrderDetail_Hty dt_InboundOrderDetail_Hty = new Dt_InboundOrderDetail_Hty
- // {
- // OrderId = inboundOrderDetail.OrderId,
- // MaterielCode = inboundOrderDetail.MaterielCode,
- // MaterielName = inboundOrderDetail.MaterielName,
- // BatchNo = inboundOrderDetail.BatchNo,
- // OrderQuantity = inboundOrderDetail.OrderQuantity,
- // ReceiptQuantity = inboundOrderDetail.ReceiptQuantity,
- // OverInQuantity = inboundOrderDetail.OverInQuantity,
- // OrderDetailStatus = inboundOrderDetail.OrderDetailStatus,
- // Creater = "WMS",
- // CreateDate = DateTime.Now,
- // };
- // _inboundOrderDetail_HtyService.AddData(dt_InboundOrderDetail_Hty);
- // _inboundService.InboundOrderDetailService.DeleteData(inboundOrderDetail);
- // }
- // return WebResponseContent.Instance.OK();
- // }
- // catch (Exception ex)
- // {
- // _unitOfWorkManage.RollbackTran();
- // return WebResponseContent.Instance.Error(ex.Message);
- // }
- //}
- #endregion
- #region
- //public WebResponseContent OutboundTaskCompleted(int taskNum)
- //{
- // try
- // {
- // Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
- // if (task == null)
- // {
- // return WebResponseContent.Instance.Error($"鏈壘鍒颁换鍔′俊鎭�");
- // }
-
- // Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.GetStockInfo(task.PalletCode);
-
- // Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.SourceAddress);
- // if (stockInfo == null)
- // {
- // return WebResponseContent.Instance.Error($"鏈壘鍒板簱瀛樹俊鎭�");
- // }
- // if (locationInfo == null)
- // {
- // return WebResponseContent.Instance.Error($"鏈壘鍒拌揣浣嶄俊鎭�");
- // }
-
- // List<Dt_OutStockLockInfo> outStockLockInfos = _outboundService.OutboundStockLockInfoService.Repository.QueryData(x => x.TaskNum == taskNum);
- // if (outStockLockInfos == null || outStockLockInfos.Count == 0)
- // {
- // return WebResponseContent.Instance.Error($"鏈壘鍒板嚭搴撹鎯呬俊鎭�");
- // }
-
- // List<Dt_OutboundOrderDetail> outboundOrderDetails = new List<Dt_OutboundOrderDetail>();
- // for (int i = 0; i < outStockLockInfos.Count; i++)
- // {
- // Dt_OutboundOrderDetail outboundOrderDetail = _outboundService.OutboundOrderDetailService.Repository.QueryFirst(x => x.Id == outStockLockInfos[i].OrderDetailId);
- // if (outboundOrderDetail != null)
- // {
- // outboundOrderDetail.OverOutQuantity = outboundOrderDetail.LockQuantity;
- // if (outboundOrderDetail.LockQuantity == outboundOrderDetail.OrderQuantity)
- // {
- // outboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
- // }
- // outboundOrderDetails.Add(outboundOrderDetail);
- // }
- // }
-
- // _unitOfWorkManage.BeginTran();
- // _outboundService.OutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);
-
- // stockInfo.LocationCode = locationInfo.LocationCode;
- // stockInfo.StockStatus = StockStatusEmun.鍑哄簱瀹屾垚.ObjToInt();
- // _stockService.StockInfoService.Repository.UpdateData(stockInfo);
-
- // int beforeStatus = locationInfo.LocationStatus;
- // locationInfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();
- // _basicService.LocationInfoService.Repository.UpdateData(locationInfo);
- // BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
-
- // _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockChangeType.Outbound.ObjToInt(), stockInfo.Details.FirstOrDefault()?.OrderNo ?? "", task.TaskNum);
- // _unitOfWorkManage.CommitTran();
- // Dt_StockInfoDetail stockInfoDetail = _stockRepository.StockInfoDetailRepository.Db.Queryable<Dt_StockInfoDetail>().Where(x => x.StockId == stockInfo.Id).First();
- // Dt_OutboundOrderDetail outDetail = _outboundService.OutboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>().Where(x => x.LPNNo == stockInfo.PalletCode).First();
- // Dt_OutboundOrder outboundOrder = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrder>().Where(x => x.Id == outDetail.OrderId).Includes(x => x.Details).First();
- // //鍒ゆ柇鍗曟嵁绫诲瀷鏄嚭搴撹繕鏄皟鎷ㄥ嚭搴撱�傘�傘�傚嚭搴�
- // if (outboundOrder.OrderType == 1)
- // {
- // #region //鍒ゆ柇鍑哄簱鍗曟嵁鏄庣粏鍙湁鏈�鍚庝竴鏉″畬鎴愭椂鍒犻櫎鍑哄簱鍗�
- // if (outboundOrder.Details.Count == 1)
- // {
- // Dt_OutboundOrder_Hty inboundOrder_Hty = new Dt_OutboundOrder_Hty
- // {
- // OrderStatus = outboundOrder.OrderStatus,
- // CreateType = outboundOrder.CreateType,
- // //SourceId = oldOutboundOrder.SourceId,
- // UpperOrderNo = outboundOrder.UpperOrderNo,
- // OrderNo = outboundOrder.OrderNo,
- // OutWareHouse = outboundOrder.OutWareHouse,
- // TransactionCode = outboundOrder.TransactionCode,
- // InoutType = outboundOrder.InoutType,
- // OrderType = outboundOrder.OrderType,
- // Creater = "WMS",
- // CreateDate = DateTime.Now,
- // };
- // _outboundOrder_HtyService.AddData(inboundOrder_Hty);
- // _outboundService.OutboundOrderService.DeleteData(outboundOrder);
- // }
- // Dt_OutboundOrderDetail_Hty dt_InboundOrderDetail_Hty = new Dt_OutboundOrderDetail_Hty
- // {
- // OrderId = outDetail.OrderId,
- // MaterielCode = outDetail.MaterielCode,
- // MaterielName = outDetail.MaterielName,
- // BatchNo = outDetail.BatchNo,
- // OrderQuantity = outDetail.OrderQuantity,
- // //ReceiptQuantity = outDetail.ReceiptQuantity,
- // //OverInQuantity = outDetail.OverInQuantity,
- // OrderDetailStatus = outDetail.OrderDetailStatus,
- // Creater = "WMS",
- // CreateDate = DateTime.Now,
- // };
- // _outboundOrderDetail_HtyService.AddData(dt_InboundOrderDetail_Hty);
- // _outboundService.OutboundOrderService.DeleteData(outDetail);
- // #endregion
- // #region//鍑哄簱淇℃伅杩斿洖涓婁綅WMS銆傘�傘�傜珛搴撳嚭搴撴暟閲忓洖浼�
- // HouseoutboundPassBack houseInboundPassBack = new HouseoutboundPassBack();
- // houseInboundPassBack.ApiType = "ShippingOrderController";
- // houseInboundPassBack.Method = "AsrsOutboundSO";
- // datas datas = new datas();
- // datas.data1 data1 = new datas.data1();
- // data1.No = outboundOrder.OrderNo;
- // data1.OutWareHouse = task.Roadway;
- // data1.TransactionCode = outboundOrder.TransactionCode;
- // data1.InoutType = outboundOrder.OrderType;
- // data1.OrderType = outboundOrder.InoutType;
-
- // datas.data1.Inbound inbound = new datas.data1.Inbound();
- // inbound.LinId = outDetail.LinId;
- // inbound.LPN_No = task.PalletCode;
- // inbound.MaterielCode = stockInfoDetail.MaterielCode;
- // inbound.OrderQuantity = stockInfoDetail.OutboundQuantity;
- // inbound.BatchNo = stockInfoDetail.BatchNo;
- // inbound.FinishQty = stockInfoDetail.OutboundQuantity;
- // inbound.LocationName = task.SourceAddress;
- // datas.Value.Add(data1);
- // data1.DetailList.Add(inbound);
- // houseInboundPassBack.Parameters.Add(datas);
- // Authentication authentication = new Authentication()
- // {
- // ApiType = "AuthenticationController",
- // Parameters = new List<Parameter>
- // {
- // new Parameter { Value = "LKAdmin"},
- // new Parameter { Value = "LKAdmin"},
- // },
- // Method = "Login",
- // };
- // var responses1 = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskAUT, authentication, "鐧诲綍WMS璐﹀彿");
- // var Ticket = responses1.Context["Ticket"].ToString();
- // var InvOrgId = responses1.Context["InvOrgId"].ToString();
- // if (Ticket != null)
- // {
- // houseInboundPassBack.Context = new Dictionary<string, string>();
- // houseInboundPassBack.Context.Add("Ticket", Ticket);
- // houseInboundPassBack.Context.Add("InvOrgId", InvOrgId);
- // var responses = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskout, houseInboundPassBack, "绔嬪簱鍑哄簱鏁伴噺鍥炰紶WMS");
- // }
- // #endregion
- // //鍒犻櫎搴撳瓨淇℃伅
- // _stockService.StockInfoService.Repository.DeleteAndMoveIntoHty(stockInfo, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
- // _stockService.StockInfoDetailService.Repository.DeleteAndMoveIntoHty(stockInfo.Details, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
- // }
- // else if (outboundOrder.OrderType == 240)
- // {
- // //鐩樼偣鍑哄簱浠诲姟瀹屾垚銆併�併�併�併�併�併�併�併�佷笉鑳藉垹闄ゅ簱瀛樼瓑閫昏緫
- // }
- // else
- // {
-
- // List<Dt_StockInfo> StockInfo = _stockService.StockInfoService.Repository.QueryData(x => x.BatchNo == outDetail.BatchNo);
- // if (outboundOrder.Details.Count == 1)
- // {
- // Dt_OutboundOrder_Hty inboundOrder_Hty = new Dt_OutboundOrder_Hty
- // {
- // OrderStatus = outboundOrder.OrderStatus,
- // CreateType = outboundOrder.CreateType,
- // //SourceId = oldOutboundOrder.SourceId,
- // UpperOrderNo = outboundOrder.UpperOrderNo,
- // OrderNo = outboundOrder.OrderNo,
- // OutWareHouse = outboundOrder.OutWareHouse,
- // TransactionCode = outboundOrder.TransactionCode,
- // InoutType = outboundOrder.InoutType,
- // OrderType = outboundOrder.OrderType,
- // Creater = "WMS",
- // CreateDate = DateTime.Now,
- // };
- // _outboundOrder_HtyService.AddData(inboundOrder_Hty);
- // _outboundService.OutboundOrderService.DeleteData(outboundOrder);
- // }
- // Dt_OutboundOrderDetail_Hty dt_InboundOrderDetail_Hty = new Dt_OutboundOrderDetail_Hty
- // {
- // OrderId = outDetail.OrderId,
- // MaterielCode = outDetail.MaterielCode,
- // MaterielName = outDetail.MaterielName,
- // BatchNo = outDetail.BatchNo,
- // OrderQuantity = outDetail.OrderQuantity,
- // //ReceiptQuantity = outDetail.ReceiptQuantity,
- // //OverInQuantity = outDetail.OverInQuantity,
- // OrderDetailStatus = outDetail.OrderDetailStatus,
- // Creater = "WMS",
- // CreateDate = DateTime.Now,
- // };
- // _outboundOrderDetail_HtyService.AddData(dt_InboundOrderDetail_Hty);
- // _outboundService.OutboundOrderService.DeleteData(outDetail);
-
- // InventoryAllocate inventoryAllocate = new InventoryAllocate();
- // inventoryAllocate.ApiType = "InventoryAllocateController";
- // inventoryAllocate.Method = "AsrsFinishedStockCount";
-
- // Allocate allocate = new Allocate();
-
- // Allocate.data1 data1 = new Allocate.data1();
- // data1.No = outboundOrder.OrderNo;
- // data1.InWarehouse = task.Roadway;
- // data1.TransactionCode = outboundOrder.TransactionCode;
- // data1.InoutType = outboundOrder.OrderType;
- // data1.OrderType = outboundOrder.InoutType;
-
- // foreach (var item in StockInfo)
- // {
- // Dt_StockInfoDetail detail = _stockService.StockInfoDetailService.Repository.QueryFirst(x => x.StockId == item.Id);
- // Allocate.data1.Inventory inbound = new Allocate.data1.Inventory();
- // inbound.LinId = outDetail.LinId;
- // inbound.LPN_No = item.PalletCode;
- // inbound.MaterielCode = detail.MaterielCode;
- // inbound.OrderQuantity = detail.OutboundQuantity;
- // inbound.BatchNo = detail.BatchNo;
- // inbound.FinishQty = detail.OutboundQuantity;
- // inbound.LocationName = task.SourceAddress;
- // data1.DetailList.Add(inbound);
- // }
-
-
- // allocate.Value.Add(data1);
- // inventoryAllocate.Parameters.Add(allocate);
- // Authentication authentication = new Authentication()
- // {
- // ApiType = "AuthenticationController",
- // Parameters = new List<Parameter>
- // {
- // new Parameter { Value = "LKAdmin"},
- // new Parameter { Value = "LKAdmin"},
- // },
- // Method = "Login",
- // };
- // var responses1 = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskAUT, authentication, "鐧诲綍WMS璐﹀彿");
- // var Ticket = responses1.Context["Ticket"].ToString();
- // var InvOrgId = responses1.Context["InvOrgId"].ToString();
- // if (Ticket != null)
- // {
- // inventoryAllocate.Context = new Dictionary<string, string>();
- // inventoryAllocate.Context.Add("Ticket", Ticket);
- // inventoryAllocate.Context.Add("InvOrgId", InvOrgId);
- // var responses = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskAllocatein, inventoryAllocate, "璋冩嫧鍑哄簱鏁伴噺鍥炰紶WMS");
- // }
- // _stockService.StockInfoService.Repository.DeleteAndMoveIntoHty(stockInfo, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
- // _stockService.StockInfoDetailService.Repository.DeleteAndMoveIntoHty(stockInfo.Details, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
- // }
- // return WebResponseContent.Instance.OK();
- // }
- // catch (Exception ex)
- // {
- // _unitOfWorkManage.RollbackTran();
- // return WebResponseContent.Instance.Error(ex.Message);
- // }
- //}
- #endregion
+ public class LEDDTO
+ {
+ public string DeviceCode { get; set; }
+ public string MaterialCode { get; set; }
+ public int BackNum { get; set; }
+ public int SendNum { get; set; }
+ }
}
--
Gitblit v1.9.3