From b55d324f4b7465f9a7dc50e999346697f5cc35a2 Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期五, 07 三月 2025 15:17:19 +0800
Subject: [PATCH] 1
---
WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
index f21de1c..781a06f 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
@@ -209,8 +209,10 @@
Dt_StockInfoDetail stockInfoDetail = _stockRepository.StockInfoDetailRepository.Db.Queryable<Dt_StockInfoDetail>().Where(x => x.StockId == dt_StockInfo.Id).First();
Dt_InboundOrder inboundOrder = _inboundService.InbounOrderService.Db.Queryable<Dt_InboundOrder>().Where(x => x.OrderNo == stockInfoDetail.OrderNo).Includes(x => x.Details).First();
Dt_InboundOrderDetail inboundOrderDetail = _inboundService.InboundOrderDetailService.Repository.QueryFirst(x => x.OrderId == inboundOrder.Id);
+ //鍒ゆ柇鍗曟嵁绫诲瀷鏄叆搴撹繕鏄皟鎷ㄥ叆搴撱�傘�傘�傚叆搴�
if (inboundOrder.OrderType == 0)
{
+ #region //鍒ゆ柇鍏ュ簱鍗曟嵁鏄庣粏鍙湁鏈�鍚庝竴鏉″畬鎴愭椂鍒犻櫎鍏ュ簱鍗�
if (inboundOrder.Details.Count == 1)
{
Dt_InboundOrder_Hty inboundOrder_Hty = new Dt_InboundOrder_Hty
@@ -220,7 +222,7 @@
//SourceId = oldOutboundOrder.SourceId,
UpperOrderNo = inboundOrder.UpperOrderNo,
OrderNo = inboundOrder.OrderNo,
- OutWareHouse = inboundOrder.OutWareHouse,
+ //OutWareHouse = inboundOrder.OutWareHouse,
TransactionCode = inboundOrder.TransactionCode,
InoutType = inboundOrder.InoutType,
OrderType = inboundOrder.OrderType,
@@ -245,11 +247,11 @@
};
_inboundOrderDetail_HtyService.AddData(dt_InboundOrderDetail_Hty);
_inboundService.InboundOrderDetailService.DeleteData(inboundOrderDetail);
-
+ #endregion
+ #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;
@@ -289,10 +291,11 @@
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);
@@ -303,7 +306,7 @@
//SourceId = oldOutboundOrder.SourceId,
UpperOrderNo = inboundOrder.UpperOrderNo,
OrderNo = inboundOrder.OrderNo,
- OutWareHouse = inboundOrder.OutWareHouse,
+ //OutWareHouse = inboundOrder.OutWareHouse,
TransactionCode = inboundOrder.TransactionCode,
InoutType = inboundOrder.InoutType,
OrderType = inboundOrder.OrderType,
@@ -327,7 +330,8 @@
};
_inboundOrderDetail_HtyService.AddData(dt_InboundOrderDetail_HtyS);
_inboundService.InboundOrderDetailService.DeleteData(inboundOrderDetail);
-
+ #endregion
+ #region//璋冩嫧浠诲姟鏁伴噺鍥炰紶WMS
InventoryAllocate inventoryAllocate = new InventoryAllocate();
inventoryAllocate.ApiType = "InventoryAllocateController";
inventoryAllocate.Method = "AsrsFinishedStockCount";
@@ -376,6 +380,7 @@
var responses = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskAllocatein, inventoryAllocate, "璋冩嫧鍏ュ簱鏁伴噺鍥炰紶WMS");
}
}
+ #endregion
Dt_InboundOrderDetail_Hty dt_InboundOrderDetail_Hty = new Dt_InboundOrderDetail_Hty
{
OrderId = inboundOrderDetail.OrderId,
@@ -461,9 +466,10 @@
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
@@ -498,7 +504,8 @@
};
_outboundOrderDetail_HtyService.AddData(dt_InboundOrderDetail_Hty);
_outboundService.OutboundOrderService.DeleteData(outDetail);
-
+ #endregion
+ #region//鍑哄簱淇℃伅杩斿洖涓婁綅WMS銆傘�傘�傜珛搴撳嚭搴撴暟閲忓洖浼�
HouseoutboundPassBack houseInboundPassBack = new HouseoutboundPassBack();
houseInboundPassBack.ApiType = "ShippingOrderController";
houseInboundPassBack.Method = "AsrsOutboundSO";
@@ -541,15 +548,18 @@
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)
{
--
Gitblit v1.9.3