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 | 140 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 107 insertions(+), 33 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 5c62803..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"
@@ -35,18 +35,19 @@
public partial class DeliveryOrderServices : ServiceBase<Dt_DeliveryOrder, IRepository<Dt_DeliveryOrder>>, IDeliveryOrderServices
{
private readonly ICabinOrderServices _cabinOrderServices;
- private readonly IBasicService _basicService;
private readonly IUnitOfWorkManage _unitOfWorkManage;
private readonly IInventory_BatchServices _inventory_BatchServices;
+ private readonly ILocationInfoService _locationInfoService;
private readonly IInventoryInfoService _inventoryInfoService;
private readonly IDeliveryOrderDetailServices _deliveryOrderDetailServices;
private readonly ISupplyTaskService _supplyTaskService;
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, ISupplyTaskHtyService supplyTaskHtyService) : 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;
@@ -55,6 +56,9 @@
_cabinOrderServices = cabinOrderServices;
_tacticsService = tacticsService;
_supplyTaskHtyService = supplyTaskHtyService;
+ _messageInfoService = messageInfoService;
+ _materielInfoService = materielInfoService;
+ _locationInfoService = locationInfoService;
}
#region 鍒涘缓鍑哄簱鍗�
/// <summary>
@@ -67,6 +71,7 @@
WebResponseContent webResponseContent = new WebResponseContent();
try
{
+ _unitOfWorkManage.BeginTran();
Dt_Tactics tactics = _tacticsService.Repository.QueryFirst(x => x.TacticeName == "鍑哄簱绛栫暐");
#region 鐗规畩搴撴埧鍑哄簱
string WareCodeMJ = WarehouseEnum.楹荤簿搴�.ObjToInt().ToString("000");
@@ -94,7 +99,7 @@
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>();
@@ -221,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)//濡傛灉鐗╂枡鏄ぇ浠�
@@ -307,6 +311,7 @@
#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;
@@ -444,14 +449,17 @@
}
}
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;
@@ -464,6 +472,7 @@
WebResponseContent content = new WebResponseContent();
try
{
+ _unitOfWorkManage.BeginTran();
string WareCodeMJ = WarehouseEnum.楹荤簿搴�.ObjToInt().ToString("000");
string WareCodeLD = WarehouseEnum.鍐峰喕搴�.ObjToInt().ToString("000");
#region 鐗规畩搴撴埧
@@ -555,7 +564,7 @@
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);
//鑾峰彇澶т欢搴撶洏鐐瑰樊寮傛暟
@@ -624,7 +633,8 @@
Status = 2,
}).ToList()
};
- Repository.AddData(entityOrder);
+ Db.InsertNav(entityOrder).Include(it => it.Details).ExecuteCommand();
+ //Repository.AddData(entityOrder);
#endregion
}
else
@@ -653,7 +663,7 @@
OrderNo = order.order_no,
StockQuantity = Math.Abs(inventoryInfo.StockQuantity - inventoryInfo.SupplyQuantity),
SupplyQuantity = 0,
- Remark = "鐩樼泩鍏ュ簱"
+ Remark = "鐩樹簭鍑哄簱"
};
_supplyTaskHtyService.AddData(supplyTask_Hty);
}
@@ -689,7 +699,8 @@
Status = 2,
}).ToList()
};
- Repository.AddData(cabinOrder);
+ //Repository.AddData(cabinOrder);
+ Db.InsertNav(cabinOrder).Include(it => it.Details).ExecuteCommand();
}
#endregion
@@ -714,15 +725,20 @@
Status = 0,
}).ToList()
};
- Repository.AddData(entityOrder);
+ Db.InsertNav(entityOrder).Include(it => it.Details).ExecuteCommand();
+ //Repository.AddData(entityOrder);
#endregion
}
+ //return WebResponseContent.Instance.OK("鎴愬姛");
}
}
+ _unitOfWorkManage.CommitTran();
+ return WebResponseContent.Instance.OK("鎴愬姛");
}
- catch (Exception e)
+ catch (Exception ex)
{
- content.Error(e.Message);
+ _unitOfWorkManage.RollbackTran();
+ content.Error(ex.Message);
}
return content;
}
@@ -736,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();
@@ -848,6 +864,12 @@
return content;
}
+
+ /// <summary>
+ /// pad鍑哄簱瀹屾垚
+ /// </summary>
+ /// <param name="saveModel"></param>
+ /// <returns></returns>
public WebResponseContent OutFinish(SaveModel saveModel)
{
WebResponseContent content = new WebResponseContent();
@@ -872,12 +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).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)
@@ -896,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 != "20").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);
@@ -916,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())
@@ -925,7 +947,7 @@
if (inventoryInfo1 == null)
{
location.LocationStatus = LocationStatusEnum.Free.ObjToInt();
- _basicService.LocationInfoService.UpdateData(location);
+ _locationInfoService.UpdateData(location);
}
}
#endregion
@@ -935,24 +957,27 @@
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);
- //if (materielInfo.Business_qty < materielInfo.MinQty)
- // CreateAllocatInOut(materielInfo);//鍒涘缓璋冩嫧浠诲姟
+ _materielInfoService.UpdateData(materielInfo);
+ if (materielInfo.Business_qty < materielInfo.MinQty)
+ CreateAllocatInOut(materielInfo);//鍒涘缓璋冩嫧浠诲姟
}
_unitOfWorkManage.CommitTran();
#endregion
@@ -964,5 +989,54 @@
}
return content;
}
+
+ /// <summary>
+ /// 浜哄伐鍦ㄥ嚭搴撳崟涓偣鍑诲畬鎴愭寜閽疄鐜颁笂鎶�
+ /// </summary>
+ /// <param name="key">id</param>
+ /// <returns></returns>
+ public WebResponseContent FinishOutOrder(int key)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ 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();
+
+ foreach (var item in deliveryOrders)
+ {
+ 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
+ {
+ 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();
+ }
+ content.OK();
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ content.Error(ex.Message);
+ }
+ return content;
+ }
}
}
--
Gitblit v1.9.3