From bc43fe34a67fa68bcfb3a51b79308fad0be11c08 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 31 十月 2025 09:18:11 +0800
Subject: [PATCH] 优化定时器时长
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs | 1128 +++++++++++++++++++++++++----------------------------------
1 files changed, 481 insertions(+), 647 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 37919a3..9883488 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,19 +34,20 @@
{
public partial class DeliveryOrderServices : ServiceBase<Dt_DeliveryOrder, IRepository<Dt_DeliveryOrder>>, IDeliveryOrderServices
{
-
- private readonly IBasicService _basicService;
+ private readonly ICabinOrderServices _cabinOrderServices;
private readonly IUnitOfWorkManage _unitOfWorkManage;
private readonly IInventory_BatchServices _inventory_BatchServices;
+ private readonly ILocationInfoService _locationInfoService;
private readonly IInventoryInfoService _inventoryInfoService;
private readonly IDeliveryOrderDetailServices _deliveryOrderDetailServices;
private readonly ISupplyTaskService _supplyTaskService;
- private readonly ICabinOrderServices _cabinOrderServices;
+ private readonly ISupplyTaskHtyService _supplyTaskHtyService;
private readonly ITacticsService _tacticsService;
+ private readonly IMaterielInfoService _materielInfoService;
+ private readonly IMessageInfoService _messageInfoService;
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)
+ public DeliveryOrderServices(IRepository<Dt_DeliveryOrder> BaseDal, IUnitOfWorkManage unitOfWorkManage, IInventory_BatchServices inventory_BatchServices, IInventoryInfoService inventoryInfoService, IDeliveryOrderDetailServices deliveryOrderDetailServices, ISupplyTaskService supplyTaskService, ICabinOrderServices cabinOrderServices, ITacticsService tacticsService, ISupplyTaskHtyService supplyTaskHtyService, IMessageInfoService messageInfoService, IMaterielInfoService materielInfoService, ILocationInfoService locationInfoService) : base(BaseDal)
{
- _basicService = basicService;
_unitOfWorkManage = unitOfWorkManage;
_deliveryOrderDetailServices = deliveryOrderDetailServices;
_supplyTaskService = supplyTaskService;
@@ -54,134 +55,12 @@
_inventoryInfoService = inventoryInfoService;
_cabinOrderServices = cabinOrderServices;
_tacticsService = tacticsService;
+ _supplyTaskHtyService = supplyTaskHtyService;
+ _messageInfoService = messageInfoService;
+ _materielInfoService = materielInfoService;
+ _locationInfoService = locationInfoService;
}
-
-
- 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)
- {
- if (outorder.order_type == "1") // 姝ｅ父鍑哄簱鍗�
- {
- CreateOutboundOrder(outorder);//鍒涘缓鍑哄簱鍗曘�佸鐞嗗簱瀛樸�佹坊鍔犲嚭搴撲换鍔�
- }
- else if (outorder.order_type == "2")//鍑哄簱閫�璐�
- {
- // 鍒涘缓鍑哄簱閫�璐у崟 - 杩欓噷闇�瑕佹牴鎹笟鍔￠�昏緫瀹炵幇
- // 鏆傛椂璺宠繃鎴栧疄鐜伴��璐ч�昏緫
- //continue;
- #region 杞崲鎴愬叆搴撳崟
- UpstreamOrderInfo order = new UpstreamOrderInfo()
- {
- order_no = outorder.order_no,
- order_type = outorder.order_type,
- warehouse_no = outorder.warehouse_no,
- details = new List<UpstreamOrderDetail>()
- };
- foreach (var item in outorder.details)
- {
- UpstreamOrderDetail detail = new UpstreamOrderDetail()
- {
- batch_num = item.batch_num,
- goods_no = item.goods_no,
- order_qty = item.order_qty,
- exp_date = item.exp_date,
- };
- order.details.Add(detail);
- }
- responseContent = _cabinOrderServices.CreateInboundOrder(order);
- List<Dt_CabinOrder>? dt_CabinOrders = responseContent.Data as List<Dt_CabinOrder>;
- if (dt_CabinOrders != null && dt_CabinOrders.Count > 0)
- BaseDal.Db.InsertNav(dt_CabinOrders).Include(x => x.Details).ExecuteCommand();
- #endregion
- }
- else if (outorder.order_type == "3")//鎶ユ崯鍑哄簱
- {
-
- }
- }
-
- // 鎵归噺鎻掑叆鍑哄簱鍗曞拰鏄庣粏
- //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);
- }
- }
+ #region 鍒涘缓鍑哄簱鍗�
/// <summary>
/// 鍒涘缓鍑哄簱鍗�
/// </summary>
@@ -192,8 +71,12 @@
WebResponseContent webResponseContent = new WebResponseContent();
try
{
+ _unitOfWorkManage.BeginTran();
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
@@ -216,9 +99,10 @@
Status = 2, // pad骞冲簱锛屾棤闇�鍚屾
}).ToList()
};
- BaseDal.Db.InsertNav(entityOrder).Include(x => x.Details).ExecuteCommand();
+ BaseDal.Db.CopyNew().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);
@@ -226,7 +110,8 @@
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);
+ if (dt_InventoryInfos.Count < 1) throw new Exception($"鍑哄簱鍗曞彿銆恵entityOrder.Out_no}銆戜腑鐗╂枡缂栧彿銆恵item.Goods_no}銆戠墿鏂欐壒娆°�恵item.Batch_num}銆戠殑搴撳瓨褰撳墠鐘舵�佷笉鍙嚭搴�");
#region 鎸夊嚭搴撶瓥鐣ユ煡鎵惧簱瀛�
if (tactics.SelectTactice == TacticsEnum.ComeOutonFirstTime.ObjToInt())
dt_InventoryInfos = dt_InventoryInfos.OrderBy(x => x.ValidityPeriod).ToList();
@@ -237,52 +122,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 = outorder.order_type == "1" ? TaskTypeEnum.Out.ObjToInt() : TaskTypeEnum.InReturn.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 = outorder.order_type == "1" ? TaskTypeEnum.Out.ObjToInt() : TaskTypeEnum.InReturn.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
{
@@ -292,7 +191,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
@@ -303,7 +202,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
@@ -316,7 +215,8 @@
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));
+ if (dt_InventoryInfos.Count < 1) throw new Exception($"鍑哄簱鍗曞彿銆恵outorder.order_no}銆戜腑鐗╂枡缂栧彿銆恵detail.goods_no}銆戠墿鏂欐壒娆°�恵detail.batch_num}銆戠殑搴撳瓨褰撳墠鐘舵�佷笉鍙嚭搴�");
#endregion
#region 鎸夊嚭搴撶瓥鐣ユ煡鎵惧簱瀛�
if (tactics.SelectTactice == TacticsEnum.ComeOutonFirstTime.ObjToInt())
@@ -326,11 +226,10 @@
#endregion
var Order_qty = Math.Abs(detail.order_qty);//鍑哄簱鍗曟暟閲�
#region 鏍规嵁鐗╂枡缂栫爜鏌ヨ鐗╂枡淇℃伅
- Dt_MaterielInfo materielInfo = _basicService.MaterielInfoService.Repository.QueryFirst(x => x.MaterielCode == detail.goods_no);
+ Dt_MaterielInfo materielInfo = _materielInfoService.Repository.QueryFirst(x => x.MaterielCode == detail.goods_no);
if (materielInfo == null) throw new Exception($"鏈壘鍒拌嵂鍝佺紪鐮併�恵detail.goods_no}銆戠殑淇℃伅");
if (!Enum.IsDefined(typeof(MaterielSourceTypeEnum), materielInfo.MaterielSourceType))
throw new Exception($"璇疯缃嵂鍝佺紪鍙枫�恵detail.goods_no}銆戠殑灞炴�у垎绫�");
- if (materielInfo.BoxQty < 1) throw new Exception($"璇疯缃嵂鍝佺紪鍙枫�恵detail.goods_no}銆戠殑绠辫鏁伴噺");
#endregion
#region 澶т欢
if (materielInfo.MaterielSourceType == MaterielSourceTypeEnum.PurchasePart)//濡傛灉鐗╂枡鏄ぇ浠�
@@ -350,50 +249,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 = outorder.order_type == "1" ? TaskTypeEnum.Out.ObjToInt() : TaskTypeEnum.InReturn.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 = outorder.order_type == "1" ? TaskTypeEnum.Out.ObjToInt() : TaskTypeEnum.InReturn.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);
@@ -403,6 +311,8 @@
#endregion
else
{
+ if (materielInfo.BoxQty < 1) throw new Exception($"璇疯缃嵂鍝佺紪鍙枫�恵detail.goods_no}銆戠殑绠辫鏁伴噺");
+ List<Dt_SupplyTask> supplyTasks = new List<Dt_SupplyTask>();
Dt_DeliveryOrderDetail orderDetail = null;
Dt_DeliveryOrderDetail orderDetailLK = null;
var ys = Order_qty % materielInfo.BoxQty; //涓嶈兘鏁撮櫎绠辫鐨勬暎浠舵暟
@@ -424,11 +334,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--;
@@ -443,50 +353,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 = outorder.order_type == "1" ? TaskTypeEnum.Out.ObjToInt() : TaskTypeEnum.InReturn.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,
@@ -495,280 +428,321 @@
MaterielCode = inventoryInfo.MaterielCode,
MaterielSpec = inventoryInfo.MaterielSpec,
TaskStatus = SupplyStatusEnum.NewOut.ObjToInt(),
- TaskType = TaskTypeEnum.OutPick.ObjToInt(),
+ TaskType = outorder.order_type == "1" ? TaskTypeEnum.Out.ObjToInt() : TaskTypeEnum.InReturn.ObjToInt(),
CreateDate = DateTime.Now,
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);
}
}
if (entityOrder.Details.Count > 0)
- BaseDal.Db.InsertNav(entityOrder).Include(x => x.Details).ExecuteCommand();
+ BaseDal.Db.CopyNew().InsertNav(entityOrder).Include(x => x.Details).ExecuteCommand();
if (entityOrderLK.Details.Count > 0)
- BaseDal.Db.InsertNav(entityOrderLK).Include(x => x.Details).ExecuteCommand();
+ BaseDal.Db.CopyNew().InsertNav(entityOrderLK).Include(x => x.Details).ExecuteCommand();
#endregion
}
+ _unitOfWorkManage.CommitTran();
+ webResponseContent.OK();
}
catch (Exception ex)
{
+ _unitOfWorkManage.RollbackTran();
webResponseContent.Error(ex.Message);
}
return webResponseContent;
}
- /// <summary>
- /// 鐢熸垚鍑哄簱鍗曚换鍔�
- /// </summary>
- /// <param name="order_no">鍑哄簱鍗曞彿</param>
- /// <returns></returns>
- private bool CreateSupplyTask(List<string> order_no)
+ #endregion
+
+ #region 鍒涘缓鐩樹簭鍑哄簱鍗�
+ public WebResponseContent CreateCheckOutOrder(UpstramOutOrderInfo order)
{
+ WebResponseContent content = new WebResponseContent();
try
{
- // 鍏堣幏鍙栫鍚堟潯浠剁殑涓昏〃鏁版嵁
- var mainOrders = BaseDal.Db.Queryable<Dt_DeliveryOrder>()
- .Where(x => order_no.Contains(x.Out_no))
- .ToList();
-
- // 鑾峰彇鎵�鏈変富琛↖D
- var mainOrderIds = mainOrders.Select(x => x.Id).ToList();
-
- // 鐩存帴鏌ヨ瀛愯〃鏁版嵁
- List<Dt_DeliveryOrderDetail> filteredDetails = BaseDal.Db.Queryable<Dt_DeliveryOrderDetail>()
- .Where(d => mainOrderIds.Contains(d.DeliveryOrderId) && d.OotDetailStatus == "鏂板缓")
- .ToList();
-
- // 鑾峰彇鎵�鏈夐渶瑕佹煡璇㈢殑鐗╂枡缂栫爜
- var materielCodes = filteredDetails.Select(x => x.Goods_no).Distinct().ToList();
-
- // 鎵归噺鏌ヨ鐗╂枡淇℃伅
- var materielList = BaseDal.Db.Queryable<Dt_MaterielInfo>()
- .Where(x => materielCodes.Contains(x.MaterielCode))
- .ToList();
-
- List<Dt_SupplyTask> supplyTasks = new List<Dt_SupplyTask>();
-
- foreach (var item in filteredDetails)
+ _unitOfWorkManage.BeginTran();
+ string WareCodeMJ = WarehouseEnum.楹荤簿搴�.ObjToInt().ToString("000");
+ string WareCodeLD = WarehouseEnum.鍐峰喕搴�.ObjToInt().ToString("000");
+ #region 鐗规畩搴撴埧
+ if (order.warehouse_no == WareCodeMJ || order.warehouse_no == WareCodeLD)
{
- // 鏍规嵁瀛愯〃鐗╂枡缂栫爜鏌ヨ鐗╂枡淇℃伅
- var medication = materielList.FirstOrDefault(x => x.MaterielCode == item.Goods_no);
-
- // 鏌ユ壘瀵瑰簲鐨勪富琛ㄤ俊鎭�
- var mainOrder = mainOrders.FirstOrDefault(x => x.Id == item.DeliveryOrderId);
- //闅忔満鐢熸垚浠诲姟缂栧彿鍔犳椂闂存埑
-
-
- if (mainOrder == null) continue;
-
- var location = Db.Queryable<Dt_InventoryInfo>()
- .Where(x => x.MaterielCode == ""//materielCode
- && x.BatchNo == ""//batchNo
- && x.StockQuantity > 0)
- .OrderBy(x => x.InDate) // 鎸夊叆搴撴椂闂存帓搴�
- .First();
-
- var supplyTask = new Dt_SupplyTask
+ #region 搴撳瓨銆佸簱瀛樻壒娆″钩璐�
+ foreach (var item in order.details)
{
- TaskNum = GenerateTaskNumber(),
- PalletCode = "0",
- BatchNo = item.Batch_num,
- MaterielCode = item.Goods_no,
- MaterielName = medication?.MaterielName, // 濡傛灉鐗╂枡淇℃伅涓嶅瓨鍦紝浣跨敤瀛愯〃鐨勭墿鏂欏悕绉�
- MaterielSpec = medication?.MaterielSpec, // 濡傛灉鐗╂枡淇℃伅涓嶅瓨鍦紝浣跨敤瀛愯〃鐨勭墿鏂欒鏍�
- TaskType = 0,
- TaskStatus = item.Status == 0 ? 0 : 1,
- WarehouseCode = mainOrder.Warehouse_no,
- LocationCode = item.Status == 0 ? "绔嬪簱" : "骞冲簱",
- StockQuantity = item.Order_qty, // 鍋囪瀛愯〃鏈塓uantity瀛楁
- SupplyQuantity = 0,
- OrderNo = mainOrder.Out_no,
- Dispatchertime = DateTime.Now,
- Remark = ""
- };
-
- supplyTasks.Add(supplyTask);
- }
-
- // 鎵归噺鎻掑叆渚涘簲浠诲姟
- if (supplyTasks.Any())
- {
- return BaseDal.Db.Insertable(supplyTasks).ExecuteCommand() > 0;
- }
-
- return false;
- }
- catch (Exception ex)
- {
- // 璁板綍鏃ュ織
- Console.WriteLine($"鍒涘缓渚涘簲浠诲姟澶辫触锛歿ex.Message}");
- return false;
- }
- }
-
-
-
- /// <summary>
- /// 鐢熸垚闅忔満浠诲姟缂栧彿锛堥殢鏈烘暟 + 鏃堕棿鎴筹級
- /// </summary>
- /// <returns>浠诲姟缂栧彿</returns>
- private int GenerateTaskNumber()
- {
- // 鐢熸垚4浣嶉殢鏈烘暟
- Random random = new Random(Guid.NewGuid().GetHashCode());
- int randomNum = random.Next(1000, 9999); // 1000-9999涔嬮棿鐨勯殢鏈烘暟
-
-
- // 缁勫悎鎴愪换鍔＄紪鍙凤細TASK + 鏃堕棿鎴� + 闅忔満鏁�
- return randomNum;
- }
-
-
- /// <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))
+ //鎵惧簱瀛樻壒娆′俊鎭�
+ Dt_Inventory_Batch inventory_Batch = _inventory_BatchServices.Repository.QueryFirst(x => x.MaterielCode == item.goods_no && x.BatchNo == item.batch_num);
+ var Qty = Math.Abs(inventory_Batch.StockQuantity - inventory_Batch.SupplyQuantity);
+ if (Qty != item.order_qty) throw new Exception($"鐩樹簭鍑哄簱鍗曘�恵order.order_no}銆戠墿鏂欑紪鍙枫�恵item.goods_no}銆戠墿鏂欐壒娆°�恵item.batch_num}銆戠殑鐩樹簭鏁伴噺鏈夎");
+ //鎵炬墍鏈夊簱瀛�
+ List<Dt_InventoryInfo> inventoryInfos = _inventoryInfoService.Repository.QueryData(x => x.MaterielCode == inventory_Batch.MaterielCode && x.BatchNo == inventory_Batch.BatchNo);
+ foreach (var inventoryInfo in inventoryInfos)
{
- //濡傛灉鏉′欢婊¤冻锛屽皢鐗╂枡浠ｇ爜璁剧疆涓虹涓�涓槑缁嗛」瀵瑰簲鐨勮嵂鍝佺墿鏂欎唬鐮�
- 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
+ #region 娣诲姞鐩樹簭鍑哄簱浠诲姟
+ if (inventoryInfo.StockQuantity != inventoryInfo.SupplyQuantity)
{
- 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()
- };
+ Dt_SupplyTask_Hty supplyTask_Hty = new Dt_SupplyTask_Hty()
+ {
+ WarehouseCode = inventoryInfo.WarehouseCode,
+ OperateType = OperateTypeEnum.鑷姩瀹屾垚.ToString(),
+ InsertTime = DateTime.Now,
+ TaskStatus = SupplyStatusEnum.OutFinish.ObjToInt(),
+ BatchNo = inventoryInfo.BatchNo,
+ MaterielName = inventoryInfo.MaterielName,
+ MaterielCode = inventoryInfo.MaterielCode,
+ MaterielSpec = inventoryInfo.MaterielSpec,
+ TaskType = TaskTypeEnum.ChenckOut.ObjToInt(),
+ CreateDate = DateTime.Now,
+ Creater = App.User.UserName,
+ LocationCode = inventoryInfo.LocationCode,
+ OrderNo = order.order_no,
+ StockQuantity = Math.Abs(inventoryInfo.StockQuantity - inventoryInfo.SupplyQuantity),
+ SupplyQuantity = 0,
+ Remark = "鐩樹簭鍏ュ簱"
+ };
+ _supplyTaskHtyService.AddData(supplyTask_Hty);
+ }
+ #endregion
+ inventoryInfo.StockQuantity = inventoryInfo.SupplyQuantity;
+ inventoryInfo.SupplyQuantity = 0;
+ inventoryInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
+ }
+ inventory_Batch.StockQuantity = inventory_Batch.SupplyQuantity;
+ inventory_Batch.SupplyQuantity = 0;
+ _inventoryInfoService.UpdateData(inventoryInfos);
+ _inventory_BatchServices.UpdateData(inventory_Batch);
+ }
+ #endregion
- // 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")
+ #region 鍒涘缓鐩樼偣鍗�
+ var entityOrder = new Dt_DeliveryOrder
+ {
+ Out_no = order.order_no,
+ Out_type = order.order_type,
+ Client_no = order.client_no,
+ Client_name = order.client_name,
+ OutStatus = "宸插畬鎴�",
+ Account_time = order.account_time,
+ Warehouse_no = order.warehouse_no,
+ Details = order.details.Select(d => new Dt_DeliveryOrderDetail
{
- // 鏇存柊琛ㄥご鐘舵��
- BaseDal.Db.Updateable<Dt_DeliveryOrder>()
- .SetColumns(o => new Dt_DeliveryOrder { OutStatus = "寮�濮�" })
- .Where(o => o.Id == order.Id)
- .ExecuteCommand();
+ Goods_no = d.goods_no,
+ Order_qty = Math.Abs(d.order_qty),
+ Order_Outqty = Math.Abs(d.order_qty),
+ Batch_num = d.batch_num,
+ Exp_date = d.exp_date,
+ Reservoirarea = order.warehouse_no,
+ OotDetailStatus = "宸插畬鎴�",
+ Status = 2,
+ }).ToList()
+ };
+ Repository.AddData(entityOrder);
+ #endregion
+ }
+ #endregion
+ else
+ {
+ string WareCodeLK = WarehouseEnum.绔嬪簱.ObjToInt().ToString("000");
+ string WareCodeDJ = WarehouseEnum.澶т欢搴�.ObjToInt().ToString("000");
- // 鏇存柊鏄庣粏鐘舵��
- 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} 鎺ㄩ�佹垚鍔�");
+ foreach (var item in order.details)
+ {
+ //鎵惧簱瀛樻壒娆′俊鎭�
+ Dt_Inventory_Batch inventory_Batch = _inventory_BatchServices.Repository.QueryFirst(x => x.MaterielCode == item.goods_no && x.BatchNo == item.batch_num);
+ var Qty = Math.Abs(inventory_Batch.StockQuantity - inventory_Batch.SupplyQuantity);
+ if (Qty != item.order_qty) throw new Exception($"鐩樼泩鍏ュ簱鍗曘�恵order.order_no}銆戠墿鏂欑紪鍙枫�恵item.goods_no}銆戠墿鏂欐壒娆°�恵item.batch_num}銆戠殑鐩樼泩鏁伴噺鏈夎");
+ //鎵炬墍鏈夊簱瀛�
+ List<Dt_InventoryInfo> inventoryInfos = _inventoryInfoService.Repository.QueryData(x => x.MaterielCode == inventory_Batch.MaterielCode && x.BatchNo == inventory_Batch.BatchNo);
+ //鑾峰彇绔嬪簱鐩樼偣宸紓鏁�.銆傘�傘�傘�傘�傘�傘�傘�傘�傘�傘�傘��
+ var inventoryLK = inventoryInfos.Where(x => x.WarehouseCode == WareCodeLK).First();
+ var LkQty = Math.Abs(inventoryLK.StockQuantity - inventoryLK.SupplyQuantity);
+ //鑾峰彇澶т欢搴撶洏鐐瑰樊寮傛暟
+ var inventoryDJ = inventoryInfos.Where(x => x.WarehouseCode == WareCodeDJ).ToList();
+ var DJQty = Math.Abs(inventoryDJ.Sum(x => x.StockQuantity) - inventoryDJ.Sum(x => x.SupplyQuantity));
+ if (LkQty + DJQty != Qty) throw new Exception($"銆恵order.order_no}銆戠墿鏂欑紪鍙枫�恵item.goods_no}銆戠墿鏂欐壒娆°�恵item.batch_num}銆戠殑鐗╂枡淇℃伅涓庣墿鏂欐壒娆′俊鎭洏鐩堟暟閲忎笉绗�");
+ if (LkQty == 0)//绔嬪簱鏃犲樊寮�
+ {
+ #region 搴撳瓨銆佸簱瀛樻壒娆″钩璐�
+ foreach (var inventoryInfo in inventoryInfos)
+ {
+ #region 娣诲姞鐩樹簭鍑哄簱浠诲姟
+ if (inventoryInfo.StockQuantity != inventoryInfo.SupplyQuantity)
+ {
+ Dt_SupplyTask_Hty supplyTask_Hty = new Dt_SupplyTask_Hty()
+ {
+ WarehouseCode = inventoryInfo.WarehouseCode,
+ OperateType = OperateTypeEnum.鑷姩瀹屾垚.ToString(),
+ InsertTime = DateTime.Now,
+ TaskStatus = SupplyStatusEnum.OutFinish.ObjToInt(),
+ BatchNo = inventoryInfo.BatchNo,
+ MaterielName = inventoryInfo.MaterielName,
+ MaterielCode = inventoryInfo.MaterielCode,
+ MaterielSpec = inventoryInfo.MaterielSpec,
+ TaskType = TaskTypeEnum.ChenckOut.ObjToInt(),
+ CreateDate = DateTime.Now,
+ Creater = App.User.UserName,
+ LocationCode = inventoryInfo.LocationCode,
+ OrderNo = order.order_no,
+ StockQuantity = Math.Abs(inventoryInfo.StockQuantity - inventoryInfo.SupplyQuantity),
+ SupplyQuantity = 0,
+ Remark = "鐩樹簭鍏ュ簱"
+ };
+ _supplyTaskHtyService.AddData(supplyTask_Hty);
+ }
+ #endregion
+ inventoryInfo.StockQuantity = inventoryInfo.SupplyQuantity;
+ inventoryInfo.SupplyQuantity = 0;
+ inventoryInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
+ }
+ _inventoryInfoService.UpdateData(inventoryInfos);
+ inventory_Batch.StockQuantity = inventory_Batch.SupplyQuantity;
+ inventory_Batch.SupplyQuantity = 0;
+ _inventory_BatchServices.UpdateData(inventory_Batch);
+ #endregion
+
+ #region 鍒涘缓澶т欢搴撶洏鐐瑰崟
+ var entityOrder = new Dt_DeliveryOrder
+ {
+ Out_no = order.order_no,
+ Out_type = order.order_type,
+ Client_no = order.client_no,
+ Account_time = order.account_time,
+ OutStatus = "宸插畬鎴�",
+ Client_name = order.client_name,
+ Warehouse_no = WareCodeDJ,
+ Details = order.details.Select(d => new Dt_DeliveryOrderDetail
+ {
+ Goods_no = d.goods_no,
+ Order_qty = Math.Abs(d.order_qty),
+ Order_Outqty = Math.Abs(d.order_qty),
+ Batch_num = d.batch_num,
+ Exp_date = d.exp_date,
+ Reservoirarea = WareCodeDJ,
+ OotDetailStatus = "宸插畬鎴�",
+ Status = 2,
+ }).ToList()
+ };
+ Db.InsertNav(entityOrder).Include(it => it.Details).ExecuteCommand();
+ //Repository.AddData(entityOrder);
+ #endregion
}
else
{
- SendErrorToUpstream(3, order.Out_no, resp?.msg ?? "WCS 鎺ㄩ�佸け璐�", "");
- Console.WriteLine($"璁㈠崟 {order.Out_no} 鎺ㄩ�佸け璐ワ細{resp?.msg}");
+ #region 澶т欢搴撳簱瀛樺钩璐�
+ inventoryInfos = inventoryInfos.Where(x => x.WarehouseCode == WareCodeDJ).ToList();
+ foreach (var inventoryInfo in inventoryInfos)
+ {
+ #region 娣诲姞鐩樹簭鍑哄簱浠诲姟
+ if (inventoryInfo.StockQuantity != inventoryInfo.SupplyQuantity)
+ {
+ Dt_SupplyTask_Hty supplyTask_Hty = new Dt_SupplyTask_Hty()
+ {
+ WarehouseCode = inventoryInfo.WarehouseCode,
+ OperateType = OperateTypeEnum.鑷姩瀹屾垚.ToString(),
+ InsertTime = DateTime.Now,
+ TaskStatus = SupplyStatusEnum.OutFinish.ObjToInt(),
+ BatchNo = inventoryInfo.BatchNo,
+ MaterielName = inventoryInfo.MaterielName,
+ MaterielCode = inventoryInfo.MaterielCode,
+ MaterielSpec = inventoryInfo.MaterielSpec,
+ TaskType = TaskTypeEnum.ChenckOut.ObjToInt(),
+ CreateDate = DateTime.Now,
+ Creater = App.User.UserName,
+ LocationCode = inventoryInfo.LocationCode,
+ OrderNo = order.order_no,
+ StockQuantity = Math.Abs(inventoryInfo.StockQuantity - inventoryInfo.SupplyQuantity),
+ SupplyQuantity = 0,
+ Remark = "鐩樹簭鍑哄簱"
+ };
+ _supplyTaskHtyService.AddData(supplyTask_Hty);
+ }
+ #endregion
+ inventoryInfo.StockQuantity = inventoryInfo.SupplyQuantity;
+ inventoryInfo.SupplyQuantity = 0;
+ inventoryInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
+ }
+ _inventoryInfoService.UpdateData(inventoryInfos);
+ #endregion
+
+ #region 鍒涘缓澶т欢搴撶洏鐐瑰崟
+ if (DJQty != 0)
+ {
+ var cabinOrder = new Dt_DeliveryOrder
+ {
+ Out_no = order.order_no,
+ Out_type = order.order_type,
+ Client_name = order.client_name,
+ Account_time = order.account_time,
+ OutStatus = "宸插畬鎴�",
+ Client_no = order.client_no,
+ Warehouse_no = WareCodeDJ,
+ Details = order.details.Select(d => new Dt_DeliveryOrderDetail
+ {
+ Goods_no = d.goods_no,
+ Order_qty = DJQty,
+ Order_Outqty = DJQty,
+ Batch_num = d.batch_num,
+ Exp_date = d.exp_date,
+ Reservoirarea = WareCodeDJ,
+ OotDetailStatus = "宸插畬鎴�",
+ Status = 2,
+ }).ToList()
+ };
+ //Repository.AddData(cabinOrder);
+ Db.InsertNav(cabinOrder).Include(it => it.Details).ExecuteCommand();
+ }
+ #endregion
+
+ #region 鍒涘缓绔嬪簱鐩樼偣鍗�
+ var entityOrder = new Dt_DeliveryOrder
+ {
+ Out_no = order.order_no,
+ Out_type = order.order_type,
+ Client_no = order.client_no,
+ Account_time = order.account_time,
+ OutStatus = "鏂板缓",
+ Client_name = order.client_name,
+ Warehouse_no = WareCodeLK,
+ Details = order.details.Select(d => new Dt_DeliveryOrderDetail
+ {
+ Goods_no = d.goods_no,
+ Order_qty = LkQty,
+ Batch_num = d.batch_num,
+ Exp_date = d.exp_date,
+ Reservoirarea = WareCodeLK,
+ OotDetailStatus = "鏂板缓",
+ Status = 0,
+ }).ToList()
+ };
+ Db.InsertNav(entityOrder).Include(it => it.Details).ExecuteCommand();
+ //Repository.AddData(entityOrder);
+ #endregion
}
- //鍒犻櫎鍏ㄩ儴鐘朵负宸插畬鎴愮殑鏄庣粏鍜岃〃澶达紝绉诲叆鍘嗗彶琛�
- }
- catch (Exception ex)
- {
- SendErrorToUpstream(3, order.Out_no, ex.Message, "");
- Console.WriteLine($"璁㈠崟 {order.Out_no} 鎺ㄩ�佸紓甯革細{ex.Message}");
+ //return WebResponseContent.Instance.OK("鎴愬姛");
}
}
-
- return responseContent.OK("鍑哄簱璁㈠崟鎺ㄩ�佸畬鎴�");
+ _unitOfWorkManage.CommitTran();
+ return WebResponseContent.Instance.OK("鎴愬姛");
}
catch (Exception ex)
{
- Console.WriteLine("EdiOut 寮傚父锛�" + ex.Message);
- return responseContent.Error("鍑哄簱璁㈠崟鎺ㄩ�佸け璐ワ細" + ex.Message);
+ _unitOfWorkManage.RollbackTran();
+ content.Error(ex.Message);
}
+ return content;
}
+ #endregion
//鐩樼偣 鎷挎暣涓壒娆′俊鎭〃鐨勫晢鍝佹壒鍙峰拰鍟嗗搧缂栧彿鏉ヨ繘琛岀洏鐐�
@@ -778,7 +752,7 @@
try
{
// 1锔忊儯 鏌ユ壘鎸囧畾鎵规涓庣墿鏂欑殑搴撳瓨淇℃伅
- var batchInfo = BaseDal.Db.Queryable<Dt_Inventory_Batch>()
+ var batchInfo = BaseDal.Db.CopyNew().Queryable<Dt_Inventory_Batch>()
.Where(x => x.BatchNo == batchNo && x.MaterielCode == goodsNo)
.First();
@@ -836,88 +810,6 @@
}
-
-
- /// <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);
- }
- }
-
-
/// <summary>
/// 鏌ヨ鍑哄簱鍗曞垪琛�
/// </summary>
@@ -934,11 +826,11 @@
List<Dt_DeliveryOrder> dt_ReceiveOrders = new List<Dt_DeliveryOrder>();
if (string.IsNullOrEmpty(orderNo))
{
- dt_ReceiveOrders = Db.Queryable<Dt_DeliveryOrder>().Where(x => (x.OutStatus == "鏂板缓" || x.OutStatus == "寮�濮�") && x.Warehouse_no == warehouseCode && x.Out_type != "3").Includes(x => x.Details).OrderByDescending(x => x.CreateDate).ToPageList(pageNo, 5);
+ dt_ReceiveOrders = Db.Queryable<Dt_DeliveryOrder>().Where(x => (x.OutStatus == "鏂板缓" || x.OutStatus == "寮�濮�") && x.Warehouse_no == warehouseCode && x.Out_type != "20").Includes(x => x.Details).OrderByDescending(x => x.CreateDate).ToPageList(pageNo, 5);
}
else
{
- dt_ReceiveOrders = Db.Queryable<Dt_DeliveryOrder>().Where(x => (x.Out_no.Contains(orderNo) || x.Client_no.Contains(orderNo)) && (x.OutStatus == "鏂板缓" || x.OutStatus == "寮�濮�") && x.Out_type != "3" && x.Warehouse_no == warehouseCode).OrderByDescending(x => x.CreateDate).Includes(x => x.Details).ToPageList(pageNo, 5);
+ dt_ReceiveOrders = Db.Queryable<Dt_DeliveryOrder>().Where(x => (x.Out_no.Contains(orderNo) || x.Client_no.Contains(orderNo)) && (x.OutStatus == "鏂板缓" || x.OutStatus == "寮�濮�") && x.Out_type != "20" && x.Warehouse_no == warehouseCode).OrderByDescending(x => x.CreateDate).Includes(x => x.Details).ToPageList(pageNo, 5);
}
content.OK(data: dt_ReceiveOrders);
@@ -963,15 +855,21 @@
WebResponseContent content = new WebResponseContent();
Dt_DeliveryOrder cabinOrder = new Dt_DeliveryOrder();
if (isPick)
- cabinOrder = Db.Queryable<Dt_DeliveryOrder>().Includes(x => x.Details).First(x => x.Out_no == orderNo && x.Out_type == "3");
+ cabinOrder = Db.Queryable<Dt_DeliveryOrder>().Includes(x => x.Details).First(x => x.Out_no == orderNo && x.Out_type == "20");
else
- cabinOrder = Db.Queryable<Dt_DeliveryOrder>().Includes(x => x.Details).First(x => x.Out_no == orderNo && x.Out_type != "3");
+ cabinOrder = Db.Queryable<Dt_DeliveryOrder>().Includes(x => x.Details).First(x => x.Out_no == orderNo && x.Out_type != "20");
//List<Dt_DeliveryOrderDetail>? cabinOrderDetails = cabinOrder.Details?.Where(x => x.Reservoirarea == pageNo.ToString()).ToList();
List<Dt_DeliveryOrderDetail>? cabinOrderDetails = cabinOrder.Details?.Where(x => x.Status == 2).ToList();
content.OK(data: cabinOrderDetails);
return content;
}
+
+ /// <summary>
+ /// pad鍑哄簱瀹屾垚
+ /// </summary>
+ /// <param name="saveModel"></param>
+ /// <returns></returns>
public WebResponseContent OutFinish(SaveModel saveModel)
{
WebResponseContent content = new WebResponseContent();
@@ -982,7 +880,7 @@
Dt_SupplyTask supplyTask = _supplyTaskService.Repository.QueryFirst(x => x.TaskId == TaskId && x.TaskStatus == SupplyStatusEnum.NewOut.ObjToInt());
if (supplyTask == null) throw new Exception("褰撳墠鍑哄簱浠诲姟宸插畬鎴�");
if (supplyTask.LocationCode != LocationCode) throw new Exception($"褰撳墠鍑哄簱璐т綅銆恵LocationCode}銆戜笌浠诲姟鍒嗛厤璐т綅涓嶅尮閰�");
- OutTaskFinish(supplyTask);
+ content = OutTaskFinish(supplyTask);
}
catch (Exception ex)
{
@@ -996,13 +894,12 @@
WebResponseContent content = new WebResponseContent();
try
{
-
- Dt_DeliveryOrder cabinOrder = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == supplyTask.OrderNo && x.Warehouse_no == supplyTask.WarehouseCode).Includes(x => x.Details).First();
+ Dt_DeliveryOrder? cabinOrder = BaseDal.Db.CopyNew().Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == supplyTask.OrderNo && x.Warehouse_no == supplyTask.WarehouseCode).Includes(x => x.Details).First();
if (cabinOrder == null) return WebResponseContent.Instance.Error($"鍑哄簱鍗曞凡瀹屾垚");
- Dt_DeliveryOrderDetail cabinOrderDetail = cabinOrder.Details.Where(x => x.Batch_num == supplyTask.BatchNo && x.Reservoirarea == supplyTask.WarehouseCode && x.Goods_no == supplyTask.MaterielCode).First();
+ Dt_DeliveryOrderDetail? cabinOrderDetail = cabinOrder.Details.Where(x => x.Batch_num == supplyTask.BatchNo && x.Reservoirarea == supplyTask.WarehouseCode && x.Goods_no == supplyTask.MaterielCode).FirstOrDefault();
if (cabinOrderDetail == null) return WebResponseContent.Instance.Error($"鍑哄簱鍗曟槑缁嗗凡瀹屾垚");
- Dt_MaterielInfo materielInfo = _basicService.MaterielInfoService.Repository.QueryFirst(x => x.MaterielCode == cabinOrderDetail.Goods_no);
+ Dt_MaterielInfo materielInfo = _materielInfoService.Repository.QueryFirst(x => x.MaterielCode == cabinOrderDetail.Goods_no);
if (materielInfo == null) return WebResponseContent.Instance.Error($"璇风淮鎶ょ墿鏂欑紪鍙枫�恵cabinOrderDetail.Goods_no}銆戠殑鐗╂枡淇℃伅");
cabinOrderDetail.Order_Outqty += supplyTask.StockQuantity;
if (cabinOrderDetail.Order_Outqty > cabinOrderDetail.Order_qty)
@@ -1021,7 +918,7 @@
//_deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(cabinOrderDetail, OperateTypeEnum.鑷姩瀹屾垚);
}
_deliveryOrderDetailServices.Repository.UpdateData(cabinOrderDetail);
- var cabinOrder1 = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == cabinOrder.Out_no && x.Warehouse_no == supplyTask.WarehouseCode && x.Out_type != "3").Includes(x => x.Details).First();
+ var cabinOrder1 = BaseDal.Db.CopyNew().Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == cabinOrder.Out_no && x.Warehouse_no == supplyTask.WarehouseCode && x.Out_type != "20").Includes(x => x.Details).First();
if (!cabinOrder1.Details.Where(x => x.OotDetailStatus != "宸插畬鎴�").Any())
cabinOrder.OutStatus = "宸插畬鎴�";
Repository.UpdateData(cabinOrder);
@@ -1041,7 +938,7 @@
#region 璐т綅
if (supplyTask.WarehouseCode != WarehouseEnum.绔嬪簱.ObjToInt().ToString("000"))
{
- var location = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == supplyTask.LocationCode);
+ var location = _locationInfoService.Repository.QueryFirst(x => x.LocationCode == supplyTask.LocationCode);
if (location == null)
return WebResponseContent.Instance.Error($"璇风淮鎶よ揣浣嶇紪鍙枫�恵supplyTask.LocationCode}銆戠殑璐т綅淇℃伅");
//if (location.EnableStatus == EnableStatusEnum.Disable.ObjToInt())
@@ -1050,7 +947,7 @@
if (inventoryInfo1 == null)
{
location.LocationStatus = LocationStatusEnum.Free.ObjToInt();
- _basicService.LocationInfoService.UpdateData(location);
+ _locationInfoService.UpdateData(location);
}
}
#endregion
@@ -1060,22 +957,25 @@
supplyTask.TaskStatus = SupplyStatusEnum.OutFinish.ObjToInt();
_supplyTaskService.Repository.DeleteAndMoveIntoHty(supplyTask, OperateTypeEnum.浜哄伐瀹屾垚);
- #region 搴撳瓨鎵规
- Dt_Inventory_Batch inventory_Batch = _inventory_BatchServices.Repository.QueryFirst(x => x.BatchNo == inventoryInfo.BatchNo && x.MaterielCode == inventoryInfo.MaterielCode);
- if (inventory_Batch != null)
+ #region 搴撳瓨鎵规 濡傛灉浠诲姟绫诲瀷鏄皟鎷ㄥ嚭搴撲换鍔★紙8锛夊氨涓嶄慨鏀规壒娆″簱瀛�
+ if (supplyTask.TaskType != TaskTypeEnum.AllocatOut.ObjToInt())
{
- inventory_Batch.StockQuantity -= supplyTask.StockQuantity;
- inventory_Batch.OutboundQuantity -= supplyTask.StockQuantity;
- if (inventory_Batch.StockQuantity <= 0)
- _inventory_BatchServices.DeleteData(inventory_Batch);
- else
- _inventory_BatchServices.UpdateData(inventory_Batch);
+ Dt_Inventory_Batch inventory_Batch = _inventory_BatchServices.Repository.QueryFirst(x => x.BatchNo == inventoryInfo.BatchNo && x.MaterielCode == inventoryInfo.MaterielCode);
+ if (inventory_Batch != null)
+ {
+ inventory_Batch.StockQuantity -= supplyTask.StockQuantity;
+ inventory_Batch.OutboundQuantity -= supplyTask.StockQuantity;
+ if (inventory_Batch.StockQuantity <= 0)
+ _inventory_BatchServices.DeleteData(inventory_Batch);
+ else
+ _inventory_BatchServices.UpdateData(inventory_Batch);
+ }
}
#endregion
if (supplyTask.WarehouseCode == WarehouseEnum.绔嬪簱.ObjToInt().ToString("000"))
{
materielInfo.Business_qty -= supplyTask.StockQuantity;
- _basicService.MaterielInfoService.Repository.UpdateData(materielInfo);
+ _materielInfoService.UpdateData(materielInfo);
if (materielInfo.Business_qty < materielInfo.MinQty)
CreateAllocatInOut(materielInfo);//鍒涘缓璋冩嫧浠诲姟
}
@@ -1090,112 +990,46 @@
return content;
}
-
/// <summary>
- /// 骞冲簱浜哄伐鎷ｆ枡鍑哄簱澶勭悊锛堝嵆浜哄伐鎵爜鍑哄簱鏃惰皟鐢級
+ /// 浜哄伐鍦ㄥ嚭搴撳崟涓偣鍑诲畬鎴愭寜閽疄鐜颁笂鎶�
/// </summary>
- /// <param name="saveModel"></param>
+ /// <param name="key">id</param>
/// <returns></returns>
- public WebResponseContent MatPicking(SaveModel saveModel)
+ public WebResponseContent FinishOutOrder(int key)
{
WebResponseContent content = new WebResponseContent();
try
{
- var LocationCode = saveModel.MainData["LocationCode"].ToString();
- var orderNo = saveModel.MainData["orderNo"].ToString();
- var batchNo = saveModel.MainData["batchNo"].ToString();
- var Inqty = saveModel.MainData["Inqty"].ObjToInt();
- var warehouseCode = saveModel.MainData["warehouseCode"].ToString();
- Dt_DeliveryOrder cabinOrder = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == orderNo && x.Warehouse_no == warehouseCode && x.Out_type != "3").Includes(x => x.Details).First();
- if (cabinOrder == null) return WebResponseContent.Instance.Error($"鍑哄簱鍗曞凡瀹屾垚");
- Dt_DeliveryOrderDetail cabinOrderDetail = cabinOrder.Details.Where(x => x.Batch_num == batchNo && x.Reservoirarea == warehouseCode).First();
- if (cabinOrderDetail == null) return WebResponseContent.Instance.Error($"鍑哄簱鍗曟槑缁嗗凡瀹屾垚");
- Dt_MaterielInfo materielInfo = _basicService.MaterielInfoService.Repository.QueryFirst(x => x.MaterielCode == cabinOrderDetail.Goods_no);
- if (materielInfo == null) return WebResponseContent.Instance.Error($"璇风淮鎶ょ墿鏂欑紪鍙枫�恵cabinOrderDetail.Goods_no}銆戠殑鐗╂枡淇℃伅");
- cabinOrderDetail.Order_Outqty += Inqty;
- if (cabinOrderDetail.Order_Outqty > cabinOrderDetail.Order_qty)
- return WebResponseContent.Instance.Error($"鍑哄簱鏁伴噺涓嶅彲瓒呭嚭鍗曟嵁鏁伴噺");
-
- #region 澶勭悊鍑哄簱鍗曪紝璐т綅锛屽簱瀛橈紝搴撳瓨鎵规淇℃伅
+ Dt_DeliveryOrder deliveryOrder = BaseDal.QueryFirst(x => x.Id == key);
+ List<Dt_DeliveryOrder> deliveryOrders = Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == deliveryOrder.Out_no).Includes(x => x.Details).ToList();//鎵惧嚭鎵�鏈夊嚭搴撳崟鍙风浉鍚岀殑鍑哄簱鍗�
_unitOfWorkManage.BeginTran();
- #region 鍑哄簱鍗�
- cabinOrder.OutStatus = "寮�濮�";
- cabinOrderDetail.OotDetailStatus = "寮�濮�";
- if (cabinOrderDetail.Order_Outqty == cabinOrderDetail.Order_qty)
+ foreach (var item in deliveryOrders)
{
- cabinOrderDetail.OotDetailStatus = "宸插畬鎴�";
- _deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(cabinOrderDetail, OperateTypeEnum.鑷姩瀹屾垚);
+ if (item.Details != null)
+ _deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.浜哄伐瀹屾垚);
+ item.Modifier = App.User.UserName;
+ item.ModifyDate = DateTime.Now;
+ item.Details = null;
}
+ BaseDal.DeleteAndMoveIntoHty(deliveryOrders, OperateTypeEnum.浜哄伐瀹屾垚);
+ if (deliveryOrder.Out_type == OutOrderTypeEnum.Allocate.ObjToInt().ToString())
+ _unitOfWorkManage.CommitTran();
else
{
- _deliveryOrderDetailServices.Repository.UpdateData(cabinOrderDetail);
+ var url = "http://121.37.118.63:80/GYZ2/95fck/outOrderOk";
+
+ var requestDate = new
+ {
+ order_no = deliveryOrder.Out_no
+ };
+ var result = HttpHelper.Post(url, requestDate.ToJsonString());
+ var response = JsonConvert.DeserializeObject<UpstreamOrderResponse>(result);
+ if (response == null) throw new Exception("涓婃姤ERP鍑哄簱鍗曞畬鎴愬け璐ワ紒");
+ if (response.resultCode != "0") throw new Exception(response.resultMsg);
+ _unitOfWorkManage.CommitTran();
}
- var cabinOrder1 = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == cabinOrder.Out_no && x.Out_type != "3").Includes(x => x.Details).First();
- if (cabinOrder1.Details == null || cabinOrder1.Details.Count < 1) cabinOrder.OutStatus = "宸插畬鎴�";
- Repository.UpdateData(cabinOrder);
- #endregion
-
- #region 搴撳瓨
- Dt_InventoryInfo inventoryInfo = _inventoryInfoService.Repository.QueryFirst(x => x.BatchNo == cabinOrderDetail.Batch_num && x.MaterielCode == cabinOrderDetail.Goods_no && x.LocationCode == LocationCode);
- if (inventoryInfo == null) return WebResponseContent.Instance.Error($"鏈壘鍒拌揣浣嶃�恵LocationCode}銆戠殑搴撳瓨淇℃伅");
- inventoryInfo.StockQuantity -= Inqty;
- if (inventoryInfo.StockQuantity <= 0)
- _inventoryInfoService.DeleteData(inventoryInfo);
- else
- _inventoryInfoService.UpdateData(inventoryInfo);
- #endregion
-
- #region 璐т綅
- var location = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == LocationCode);
- if (location == null) return WebResponseContent.Instance.Error($"璇风淮鎶よ揣浣嶇紪鍙枫�恵LocationCode}銆戠殑璐т綅淇℃伅");
- if (location.EnableStatus == EnableStatusEnum.Disable.ObjToInt())
- return WebResponseContent.Instance.Error($"璐т綅缂栧彿銆恵LocationCode}銆戝凡绂佺敤锛岃鎭㈠姝ｅ父鍐嶄娇鐢�");
- Dt_InventoryInfo inventoryInfo1 = _inventoryInfoService.Repository.QueryFirst(x => x.LocationCode == LocationCode);
- if (inventoryInfo1 == null)
- {
- location.LocationStatus = LocationStatusEnum.Free.ObjToInt();
- _basicService.LocationInfoService.UpdateData(location);
- }
- #endregion
-
- #region 浠诲姟璁板綍
- Dt_SupplyTask supplyTask = new Dt_SupplyTask()
- {
- WarehouseCode = cabinOrderDetail.Reservoirarea,
- BatchNo = inventoryInfo.BatchNo,
- MaterielName = inventoryInfo.MaterielName,
- MaterielCode = inventoryInfo.MaterielCode,
- MaterielSpec = inventoryInfo.MaterielSpec,
- TaskStatus = SupplyStatusEnum.OutFinish.ObjToInt(),
- TaskType = TaskTypeEnum.OutPick.ObjToInt(),
- CreateDate = DateTime.Now,
- Creater = App.User.UserName,
- LocationCode = location.LocationCode,
- OrderNo = cabinOrder.Out_no,
- StockQuantity = Inqty,
- SupplyQuantity = 0,
- Remark = "鍑哄簱"
- };
- _supplyTaskService.AddData(supplyTask);
- #endregion
-
- #region 搴撳瓨鎵规
- Dt_Inventory_Batch inventory_Batch = _inventory_BatchServices.Repository.QueryFirst(x => x.BatchNo == inventoryInfo.BatchNo && x.MaterielCode == inventoryInfo.MaterielCode);
- if (inventory_Batch != null)
- {
- inventory_Batch.StockQuantity -= Inqty;
- if (inventory_Batch.StockQuantity <= 0)
- _inventory_BatchServices.DeleteData(inventory_Batch);
- else
- _inventory_BatchServices.UpdateData(inventory_Batch);
- }
- #endregion
-
- _unitOfWorkManage.CommitTran();
- #endregion
-
- content.OK(cabinOrderDetail.Order_Outqty.ToString());
+ content.OK();
}
catch (Exception ex)
{
--
Gitblit v1.9.3