From 517afb9079abcdecf99ec3ed4d71f90a4d479e7e Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期二, 04 十一月 2025 15:17:04 +0800
Subject: [PATCH] 11
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs | 905 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 659 insertions(+), 246 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 5e86027..0c1c506 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"
@@ -21,6 +21,7 @@
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
+using WIDESEA_DTO.Outbound;
using WIDESEA_DTO.SquareCabin;
using WIDESEA_IBasicService;
using WIDESEA_ISquareCabinServices;
@@ -35,17 +36,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) : 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;
@@ -53,7 +56,148 @@
_inventoryInfoService = inventoryInfoService;
_cabinOrderServices = cabinOrderServices;
_tacticsService = tacticsService;
+ _supplyTaskHtyService = supplyTaskHtyService;
+ _messageInfoService = messageInfoService;
+ _materielInfoService = materielInfoService;
+ _locationInfoService = locationInfoService;
}
+ public override WebResponseContent UpdateData(SaveModel saveModel)
+ {
+ try
+ {
+ int id = saveModel.MainData["id"].ObjToInt();
+ var warehouse_no = saveModel.MainData["warehouse_no"].ToString();
+ var out_no = saveModel.MainData["out_no"].ToString();
+ //OutboundOrderAddDTO outboundOrder = saveModel.MainData.DicToModel<OutboundOrderAddDTO>();
+ //Dt_DeliveryOrder deliveryOrder = BaseDal.QueryFirst(x => x.Id == id);
+ List<DeliveryOrderDetailAddDTO> orderDetailAddDTOs = saveModel.DetailData.DicToIEnumerable<DeliveryOrderDetailAddDTO>();
+ orderDetailAddDTOs = orderDetailAddDTOs.Where(x => x.id == 0).ToList();
+ if (orderDetailAddDTOs.Count < 1) return WebResponseContent.Instance.OK();
+ if (orderDetailAddDTOs.Where(x => string.IsNullOrEmpty(x.locationCode)).Any()) return WebResponseContent.Instance.Error("璐т綅鍙蜂负蹇呭～瀛楁!");
+ if (orderDetailAddDTOs.Where(x => string.IsNullOrEmpty(x.exp_date)).Any()) return WebResponseContent.Instance.Error("鏁堟湡涓哄繀濉瓧娈�!");
+ var LocationCodes = orderDetailAddDTOs.Select(x => x.locationCode);
+ List<Dt_LocationInfo> locationInfos = _locationInfoService.Repository.QueryData(x => x.WarehouseCode == warehouse_no && LocationCodes.Contains(x.LocationCode));
+ var diff = LocationCodes.Except(locationInfos.Select(x => x.LocationCode)).ToArray();
+ if (diff.Length > 0) return WebResponseContent.Instance.Error($"璐т綅缂栧彿銆恵string.Join(", ", diff)}銆戜笉灞炰簬褰撳墠搴撴埧");
+ var array1 = orderDetailAddDTOs.Select(x => x.goods_no);
+ var MaterielInfos = _materielInfoService.Repository.QueryData(x => array1.Contains(x.MaterielCode));
+ var array2 = MaterielInfos.Select(x => x.MaterielCode);
+ diff = array1.Except(array2).ToArray();
+ if (diff.Length > 0) return WebResponseContent.Instance.Error($"璇风淮鎶ょ墿鏂欑紪鍙枫�恵string.Join(", ", diff)}銆戠殑鐗╂枡淇℃伅");
+ if (warehouse_no == WarehouseEnum.绔嬪簱.ObjToInt().ToString("000"))
+ {
+ var MaterielInfos1 = MaterielInfos.Where(x => x.MaterielSourceType == MaterielSourceTypeEnum.PurchasePart).ToList();
+ if (MaterielInfos1.Count > 0)
+ {
+ return WebResponseContent.Instance.Error($"鐗╂枡缂栧彿銆恵string.Join(", ", MaterielInfos1.Select(x => x.MaterielCode))}銆戠殑鐗╂枡灞炴�у垎绫讳负澶т欢锛屼笉鍙叆绔嬪簱");
+ }
+ }
+ var InventoryInfos = _inventoryInfoService.Repository.QueryData(x => x.WarehouseCode == warehouse_no && array2.ToList().Contains(x.MaterielCode));
+ var Batchs = _inventory_BatchServices.Repository.QueryData(x => array2.Contains(x.MaterielCode));
+ List<Dt_DeliveryOrderDetail> deliveryOrderDetails = new List<Dt_DeliveryOrderDetail>();
+ List<Dt_SupplyTask> supplyTasks = new List<Dt_SupplyTask>();
+ List<Dt_InventoryInfo> inventoryInfos = new List<Dt_InventoryInfo>();
+ List<Dt_Inventory_Batch> inventory_Batches = new List<Dt_Inventory_Batch>();
+ foreach (var item in orderDetailAddDTOs)
+ {
+ if (InventoryInfos.Where(x => x.MaterielCode == item.goods_no && x.BatchNo == item.batch_num).Any())
+ return WebResponseContent.Instance.Error($"鐗╂枡缂栧彿銆恵item.goods_no}銆戠墿鏂欐壒娆°�恵item.batch_num}銆戝凡瀛樺湪搴撳瓨");
+ #region 娣诲姞鐩樼偣鍗曡鎯�
+ Dt_DeliveryOrderDetail dt_DeliveryOrde = new Dt_DeliveryOrderDetail()
+ {
+ DeliveryOrderId = id,
+ Reservoirarea = warehouse_no,
+ Status = 2,
+ Order_qty = 0,
+ Order_Outqty = item.order_Outqty,
+ Goods_no = item.goods_no,
+ OotDetailStatus = "鏂板缓",
+ Batch_num = item.batch_num,
+ Creater = App.User.UserName,
+ CreateDate = DateTime.Now,
+ };
+ deliveryOrderDetails.Add(dt_DeliveryOrde);
+ #endregion
+
+ #region 娣诲姞搴撳瓨銆佹壒娆′俊鎭�佺洏鐐逛换鍔�
+ var MaterielInfo = MaterielInfos.First(x => x.MaterielCode == item.goods_no);
+ Dt_InventoryInfo inventoryInfo = new Dt_InventoryInfo()
+ {
+ BatchNo = item.batch_num,
+ MaterielCode = MaterielInfo.MaterielCode,
+ AvailableQuantity = 0,
+ CreateDate = DateTime.Now,
+ Creater = App.User.UserName,
+ InDate = DateTime.Now,
+ LocationCode = item.locationCode,
+ MaterielName = MaterielInfo.MaterielName,
+ MaterielSpec = MaterielInfo.MaterielSpec,
+ OutboundQuantity = 0,
+ StockQuantity = 0,
+ StockStatus = StockStatusEmun.鐩樼偣閿佸畾.ObjToInt(),
+ SupplyQuantity = 0,
+ WarehouseCode = warehouse_no,
+ ValidityPeriod = item.exp_date
+ };
+ inventoryInfos.Add(inventoryInfo);
+ Dt_Inventory_Batch? inventory_Batch = Batchs.FirstOrDefault(x => x.BatchNo == item.batch_num && x.MaterielCode == item.goods_no);
+ if (inventory_Batch == null)
+ {
+ inventory_Batch = new Dt_Inventory_Batch()
+ {
+ BatchNo = inventoryInfo.BatchNo,
+ CreateDate = inventoryInfo.CreateDate,
+ Creater = inventoryInfo.Creater,
+ MaterielCode = inventoryInfo.MaterielCode,
+ ERPStockQuantity = 0,
+ MaterielName = inventoryInfo.MaterielName,
+ MaterielSpec = inventoryInfo.MaterielSpec,
+ OutboundQuantity = inventoryInfo.OutboundQuantity,
+ ProductionDate = inventoryInfo.ProductionDate,
+ Status = false,
+ StockQuantity = inventoryInfo.StockQuantity,
+ AvailableQuantity = inventoryInfo.AvailableQuantity,
+ ValidityPeriod = inventoryInfo.ValidityPeriod.ObjToDate(),
+ SupplyQuantity = inventoryInfo.SupplyQuantity,
+ };
+ inventory_Batches.Add(inventory_Batch);
+ }
+ Dt_SupplyTask supplyTask = new Dt_SupplyTask()
+ {
+ WarehouseCode = warehouse_no,
+ TaskStatus = SupplyStatusEnum.NewCheck.ObjToInt(),
+ BatchNo = inventoryInfo.BatchNo,
+ MaterielName = inventoryInfo.MaterielName,
+ MaterielCode = inventoryInfo.MaterielCode,
+ MaterielSpec = inventoryInfo.MaterielSpec,
+ TaskType = TaskTypeEnum.OutInventory.ObjToInt(),
+ CreateDate = DateTime.Now,
+ Creater = App.User.UserName,
+ LocationCode = inventoryInfo.LocationCode,
+ OrderNo = out_no,
+ StockQuantity = inventoryInfo.StockQuantity,
+ SupplyQuantity = 0,
+ Remark = "鐩樼偣"
+ };
+ supplyTasks.Add(supplyTask);
+ #endregion
+ }
+ _unitOfWorkManage.BeginTran();
+ _deliveryOrderDetailServices.AddData(deliveryOrderDetails);
+ _inventoryInfoService.AddData(inventoryInfos);
+ if (inventory_Batches.Count > 0) _inventory_BatchServices.AddData(inventory_Batches);
+ _supplyTaskService.AddData(supplyTasks);
+ _unitOfWorkManage.CommitTran();
+ return WebResponseContent.Instance.OK("鐩樼偣璇︽儏娣诲姞鎴愬姛,璇烽�氳繃ERP骞宠处锛�");
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
+
+ #region 鍒涘缓鍑哄簱鍗�
/// <summary>
/// 鍒涘缓鍑哄簱鍗�
/// </summary>
@@ -91,18 +235,22 @@
Status = 2, // pad骞冲簱锛屾棤闇�鍚屾
}).ToList()
};
- BaseDal.Db.InsertNav(entityOrder).Include(x => x.Details).ExecuteCommand();
#endregion
#region 澶勭悊搴撳瓨銆佸簱瀛樻壒娆°�佹坊鍔犲嚭搴撲换鍔�
List<Dt_SupplyTask> supplyTasks = new List<Dt_SupplyTask>();
+ List<Dt_Inventory_Batch> batchesUp = new List<Dt_Inventory_Batch>();
+ List<Dt_InventoryInfo> inventoryInfosUp = new List<Dt_InventoryInfo>();
+ var inventory_Batchs = _inventory_BatchServices.Repository.QueryData(x => entityOrder.Details.Select(e => e.Goods_no).Contains(x.MaterielCode));
+ var InventoryInfos = _inventoryInfoService.Repository.QueryData(x => entityOrder.Details.Select(e => e.Goods_no).Contains(x.MaterielCode) && x.StockStatus == StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt() && x.AvailableQuantity > 0 && x.WarehouseCode == outorder.warehouse_no);
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);
+ Dt_Inventory_Batch? inventory_Batch = inventory_Batchs.Where(x => x.MaterielCode == item.Goods_no && x.BatchNo == item.Batch_num).FirstOrDefault();
if (inventory_Batch == null) throw new Exception($"鏈壘鍒板嚭搴撳崟鍙枫�恵entityOrder.Out_no}銆戜腑鐗╂枡缂栧彿銆恵item.Goods_no}銆戠墿鏂欐壒娆°�恵item.Batch_num}銆戠殑搴撳瓨鎵规淇℃伅");
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.AvailableQuantity > 0 && x.WarehouseCode == item.Reservoirarea);
+ List<Dt_InventoryInfo> dt_InventoryInfos = InventoryInfos.Where(x => x.MaterielCode == item.Goods_no && x.BatchNo == item.Batch_num).ToList();
+ 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();
@@ -125,7 +273,7 @@
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,
@@ -149,7 +297,7 @@
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,
@@ -161,11 +309,16 @@
supplyTasks.Add(supplyTask);
Order_qty = 0;
}
+ inventoryInfosUp.Add(InventoryInfo);
}
- _inventory_BatchServices.Repository.UpdateData(inventory_Batch);
- _inventoryInfoService.Repository.UpdateData(dt_InventoryInfos);
+ batchesUp.Add(inventory_Batch);
}
+ _unitOfWorkManage.BeginTran();
_supplyTaskService.AddData(supplyTasks);
+ _inventory_BatchServices.UpdateData(batchesUp);
+ _inventoryInfoService.UpdateData(inventoryInfosUp);
+ BaseDal.Db.CopyNew().InsertNav(entityOrder).Include(x => x.Details).ExecuteCommand();
+ _unitOfWorkManage.CommitTran();
#endregion
}
#endregion
@@ -198,15 +351,22 @@
};
#endregion
#region 鏌ユ壘搴撳瓨
+ List<Dt_Inventory_Batch> batchesUp = new List<Dt_Inventory_Batch>();
+ List<Dt_InventoryInfo> inventoryInfosUp = new List<Dt_InventoryInfo>();
+ List<Dt_SupplyTask> supplyTasks = new List<Dt_SupplyTask>();
+ List<Dt_MaterielInfo> materielInfos = _materielInfoService.Repository.QueryData(x => outorder.details.Select(e => e.goods_no).Contains(x.MaterielCode));
+ var inventory_Batchs = _inventory_BatchServices.Repository.QueryData(x => outorder.details.Select(e => e.goods_no).Contains(x.MaterielCode));
+ var InventoryInfos = _inventoryInfoService.Repository.QueryData(x => outorder.details.Select(e => e.goods_no).Contains(x.MaterielCode) && x.StockStatus == StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt() && x.AvailableQuantity > 0 && (x.WarehouseCode == WareCodeDJ || x.WarehouseCode == WareCodeLK));
foreach (var detail in outorder.details)
{
#region 鏌ヨ搴撳瓨鎵规鍜屽簱瀛�
- Dt_Inventory_Batch inventory_Batch = _inventory_BatchServices.Repository.QueryFirst(x => x.MaterielCode == detail.goods_no && x.BatchNo == detail.batch_num);
+ Dt_Inventory_Batch? inventory_Batch = inventory_Batchs.Where(x => x.MaterielCode == detail.goods_no && x.BatchNo == detail.batch_num).FirstOrDefault();
if (inventory_Batch == null) throw new Exception($"鏈壘鍒板嚭搴撳崟鍙枫�恵outorder.order_no}銆戜腑鐗╂枡缂栧彿銆恵detail.goods_no}銆戠墿鏂欐壒娆°�恵detail.batch_num}銆戠殑搴撳瓨鎵规淇℃伅");
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.AvailableQuantity > 0 && (x.WarehouseCode == WareCodeDJ || x.WarehouseCode == WareCodeLK));
+ List<Dt_InventoryInfo> dt_InventoryInfos = InventoryInfos.Where(x => x.MaterielCode == inventory_Batch.MaterielCode && x.BatchNo == inventory_Batch.BatchNo).ToList();
+ 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())
@@ -216,11 +376,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 = materielInfos.Where(x => x.MaterielCode == detail.goods_no).FirstOrDefault();
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)//濡傛灉鐗╂枡鏄ぇ浠�
@@ -240,7 +399,6 @@
entityOrder.Details.Add(orderDetail);
#endregion
- List<Dt_SupplyTask> supplyTasks = new List<Dt_SupplyTask>();
#region 璁＄畻搴撳瓨銆佹坊鍔犲嚭搴撲换鍔�
foreach (var InventoryInfo in dt_InventoryInfos)
{
@@ -257,7 +415,7 @@
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,
@@ -281,7 +439,7 @@
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,
@@ -295,14 +453,16 @@
}
}
#endregion
- _inventory_BatchServices.Repository.UpdateData(inventory_Batch);
- _inventoryInfoService.Repository.UpdateData(dt_InventoryInfos);
- _supplyTaskService.AddData(supplyTasks);
+ inventoryInfosUp.AddRange(dt_InventoryInfos);
+ batchesUp.Add(inventory_Batch);
+ //_inventory_BatchServices.Repository.UpdateData(inventory_Batch);
+ //_inventoryInfoService.Repository.UpdateData(dt_InventoryInfos);
+ //_supplyTaskService.AddData(supplyTasks);
}
#endregion
else
{
- List<Dt_SupplyTask> supplyTasks = new List<Dt_SupplyTask>();
+ if (materielInfo.BoxQty < 1) throw new Exception($"璇疯缃嵂鍝佺紪鍙枫�恵detail.goods_no}銆戠殑绠辫鏁伴噺");
Dt_DeliveryOrderDetail orderDetail = null;
Dt_DeliveryOrderDetail orderDetailLK = null;
var ys = Order_qty % materielInfo.BoxQty; //涓嶈兘鏁撮櫎绠辫鐨勬暎浠舵暟
@@ -327,7 +487,7 @@
#region 鏁翠欢浼樺厛鍒嗛厤澶т欢搴�,璁″垝搴撳瓨,娣诲姞鍑哄簱浠诲姟
foreach (var item in dt_InventoryInfos.Where(x => x.WarehouseCode == WareCodeDJ))
{
- if (xs <= 0) break;
+ if (xs <= 0 || item.AvailableQuantity <= 0) break;
decimal outqty = 0;
while (item.AvailableQuantity > 0 && xs > 0)
{
@@ -365,7 +525,7 @@
MaterielCode = item.MaterielCode,
MaterielSpec = item.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 = item.LocationCode,
@@ -375,7 +535,8 @@
Remark = "鍑哄簱"
};
supplyTasks.Add(supplyTask);
- _inventoryInfoService.Repository.UpdateData(item);
+ inventoryInfosUp.Add(item);
+ //_inventoryInfoService.Repository.UpdateData(item);
}
#endregion
@@ -407,7 +568,9 @@
if (orderDetailLK != null)
{
#region 娣诲姞鍑哄簱浠诲姟銆佷慨鏀瑰簱瀛樹俊鎭�
- Dt_InventoryInfo inventoryInfo = dt_InventoryInfos.Where(x => x.WarehouseCode == WareCodeLK).First();
+ Dt_InventoryInfo? inventoryInfo = dt_InventoryInfos.FirstOrDefault(x => x.WarehouseCode == WareCodeLK);
+ if (inventoryInfo == null)
+ throw new Exception($"鍑哄簱鍗曘�恵outorder.order_no}銆戣鎯呭瓨鍦ㄦ暎浠�,鐗╂枡缂栧彿銆恵detail.goods_no}銆戠墿鏂欐壒娆°�恵detail.batch_num}銆戞墍闇�鏁伴噺銆恵Convert.ToInt32(orderDetailLK.Order_qty)}銆戣浜哄伐璋冩嫧琛ヨ揣鍏ョ珛搴�");
inventoryInfo.AvailableQuantity -= orderDetailLK.Order_qty;
inventoryInfo.OutboundQuantity += orderDetailLK.Order_qty;
Dt_SupplyTask supplyTask = new Dt_SupplyTask()
@@ -418,7 +581,7 @@
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,
@@ -429,133 +592,359 @@
};
supplyTasks.Add(supplyTask);
#endregion
- _inventoryInfoService.Repository.UpdateData(inventoryInfo);
+ //_inventoryInfoService.Repository.UpdateData(inventoryInfo);
+ inventoryInfosUp.Add(inventoryInfo);
entityOrderLK.Details.Add(orderDetailLK);
}
#endregion
if (orderDetail != null) entityOrder.Details.Add(orderDetail);
- _inventory_BatchServices.Repository.UpdateData(inventory_Batch);
- _supplyTaskService.AddData(supplyTasks);
+ batchesUp.Add(inventory_Batch);
+ //_inventory_BatchServices.Repository.UpdateData(inventory_Batch);
+ //_supplyTaskService.AddData(supplyTasks);
}
}
- if (entityOrder.Details.Count > 0)
- BaseDal.Db.InsertNav(entityOrder).Include(x => x.Details).ExecuteCommand();
- if (entityOrderLK.Details.Count > 0)
- BaseDal.Db.InsertNav(entityOrderLK).Include(x => x.Details).ExecuteCommand();
+ try
+ {
+ _unitOfWorkManage.BeginTran();
+ _supplyTaskService.AddData(supplyTasks);
+ _inventory_BatchServices.UpdateData(batchesUp);
+ _inventoryInfoService.UpdateData(inventoryInfosUp);
+ if (entityOrder.Details.Count > 0)
+ BaseDal.Db.CopyNew().InsertNav(entityOrder).Include(x => x.Details).ExecuteCommand();
+ if (entityOrderLK.Details.Count > 0)
+ BaseDal.Db.CopyNew().InsertNav(entityOrderLK).Include(x => x.Details).ExecuteCommand();
+ _unitOfWorkManage.CommitTran();
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ }
#endregion
}
+ webResponseContent.OK();
}
catch (Exception ex)
{
+ _messageInfoService.AddMessageInfo(MessageGroupByEnum.OutOrderAlarm, (outorder.order_type == "3" ? "鍏ュ簱閫�璐�" : "姝ｅ父鍑哄簱") + $"锛氬崟鍙枫�恵outorder.order_no}銆�", ex.Message);
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)
+ string WareCodeMJ = WarehouseEnum.楹荤簿搴�.ObjToInt().ToString("000");
+ string WareCodeLD = WarehouseEnum.鍐峰喕搴�.ObjToInt().ToString("000");
+ List<Dt_SupplyTask_Hty> supplyTask_Hties = new List<Dt_SupplyTask_Hty>();
+ List<Dt_Inventory_Batch> batchesUp = new List<Dt_Inventory_Batch>();
+ List<Dt_InventoryInfo> infosUp = new List<Dt_InventoryInfo>();
+ var codes = order.details.Select(x => x.goods_no).ToList();
+ #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
+ List<Dt_Inventory_Batch> inventory_Batchs = _inventory_BatchServices.Repository.QueryData(x => codes.Contains(x.MaterielCode));
+ List<Dt_InventoryInfo> _InventoryInfos = _inventoryInfoService.Repository.QueryData(x => codes.Contains(x.MaterielCode));
+ #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 = ""
+ //鎵惧簱瀛樻壒娆′俊鎭�
+ Dt_Inventory_Batch inventory_Batch = inventory_Batchs.Where(x => x.MaterielCode == item.goods_no && x.BatchNo == item.batch_num).First();
+ var Qty = Math.Abs(inventory_Batch.SupplyQuantity);
+ if (Qty != item.order_qty) throw new Exception($"鐩樹簭鍑哄簱鍗曘�恵order.order_no}銆戠墿鏂欑紪鍙枫�恵item.goods_no}銆戠墿鏂欐壒娆°�恵item.batch_num}銆戠殑鐩樹簭鏁伴噺鏈夎");
+ //鎵炬墍鏈夊簱瀛�
+ List<Dt_InventoryInfo> inventoryInfos = _InventoryInfos.Where(x => x.MaterielCode == inventory_Batch.MaterielCode && x.BatchNo == inventory_Batch.BatchNo).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.SupplyQuantity),
+ SupplyQuantity = 0,
+ Remark = "鐩樹簭鍏ュ簱"
+ };
+ //_supplyTaskHtyService.AddData(supplyTask_Hty);
+ supplyTask_Hties.Add(supplyTask_Hty);
+ }
+ #endregion
+ inventoryInfo.StockQuantity += inventoryInfo.SupplyQuantity;
+ inventoryInfo.AvailableQuantity = inventoryInfo.StockQuantity;
+ inventoryInfo.SupplyQuantity = 0;
+ inventoryInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
+ }
+ inventory_Batch.StockQuantity += inventory_Batch.SupplyQuantity;
+ inventory_Batch.AvailableQuantity = inventory_Batch.StockQuantity;
+ inventory_Batch.SupplyQuantity = 0;
+ infosUp.AddRange(inventoryInfos);
+ batchesUp.Add(inventory_Batch);
+ //_inventoryInfoService.UpdateData(inventoryInfos);
+ //_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,
+ Client_name = order.client_name,
+ OutStatus = "宸插畬鎴�",
+ Account_time = order.account_time,
+ Warehouse_no = order.warehouse_no,
+ 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 = order.warehouse_no,
+ OotDetailStatus = "宸插畬鎴�",
+ Status = 2,
+ }).ToList()
};
-
- supplyTasks.Add(supplyTask);
+ _unitOfWorkManage.BeginTran();
+ _supplyTaskHtyService.AddData(supplyTask_Hties);
+ _inventoryInfoService.UpdateData(infosUp);
+ _inventory_BatchServices.UpdateData(batchesUp);
+ BaseDal.Db.InsertNav(entityOrder).Include(it => it.Details).ExecuteCommand();
+ _unitOfWorkManage.CommitTran();
+ #endregion
}
-
- // 鎵归噺鎻掑叆渚涘簲浠诲姟
- if (supplyTasks.Any())
+ #endregion
+ else
{
- return BaseDal.Db.Insertable(supplyTasks).ExecuteCommand() > 0;
- }
+ List<Dt_DeliveryOrder> deliveryOrdersAdd = new List<Dt_DeliveryOrder>();
+ string WareCodeLK = WarehouseEnum.绔嬪簱.ObjToInt().ToString("000");
+ string WareCodeDJ = WarehouseEnum.澶т欢搴�.ObjToInt().ToString("000");
+ List<Dt_Inventory_Batch> inventory_Batchs = _inventory_BatchServices.Repository.QueryData(x => codes.Contains(x.MaterielCode));
+ List<Dt_InventoryInfo> _InventoryInfos = _inventoryInfoService.Repository.QueryData(x => codes.Contains(x.MaterielCode));
+ foreach (var item in order.details)
+ {
+ //鎵惧簱瀛樻壒娆′俊鎭�
+ Dt_Inventory_Batch inventory_Batch = inventory_Batchs.Where(x => x.MaterielCode == item.goods_no && x.BatchNo == item.batch_num).First();
+ var Qty = Math.Abs(inventory_Batch.SupplyQuantity);
+ if (Qty != item.order_qty) throw new Exception($"鐩樹簭鍑哄簱鍗曘�恵order.order_no}銆戠墿鏂欑紪鍙枫�恵item.goods_no}銆戠墿鏂欐壒娆°�恵item.batch_num}銆戠殑鐩樹簭鏁伴噺鏈夎");
+ //鎵炬墍鏈夊簱瀛�
+ List<Dt_InventoryInfo> inventoryInfos = _InventoryInfos.Where(x => x.MaterielCode == inventory_Batch.MaterielCode && x.BatchNo == inventory_Batch.BatchNo).ToList();
+ //鑾峰彇绔嬪簱鐩樼偣宸紓鏁�.銆傘�傘�傘�傘�傘�傘�傘�傘�傘�傘�傘��
+ var inventoryLK = inventoryInfos.Where(x => x.WarehouseCode == WareCodeLK).First();
+ //var LkQty = Math.Abs(inventoryLK.SupplyQuantity);
+ var LkQty = inventoryLK.SupplyQuantity;
+ //鑾峰彇澶т欢搴撶洏鐐瑰樊寮傛暟
+ var inventoryDJ = inventoryInfos.Where(x => x.WarehouseCode == WareCodeDJ).ToList();
+ //var DJQty = Math.Abs(inventoryDJ.Sum(x => x.SupplyQuantity));
+ var DJQty = inventoryDJ.Sum(x => x.SupplyQuantity);
+ var count = Math.Abs(LkQty + DJQty);
+ if (count != 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.SupplyQuantity),
+ SupplyQuantity = 0,
+ Remark = "鐩樹簭鍏ュ簱"
+ };
+ //_supplyTaskHtyService.AddData(supplyTask_Hty);
+ supplyTask_Hties.Add(supplyTask_Hty);
+ }
+ #endregion
+ inventoryInfo.StockQuantity += inventoryInfo.SupplyQuantity;
+ inventoryInfo.AvailableQuantity = inventoryInfo.StockQuantity;
+ inventoryInfo.SupplyQuantity = 0;
+ inventoryInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
+ }
+ //_inventoryInfoService.UpdateData(inventoryInfos);
+ inventory_Batch.StockQuantity += inventory_Batch.SupplyQuantity;
+ inventory_Batch.AvailableQuantity = inventory_Batch.StockQuantity;
+ inventory_Batch.SupplyQuantity = 0;
+ //_inventory_BatchServices.UpdateData(inventory_Batch);
+ infosUp.AddRange(inventoryInfos);
+ batchesUp.Add(inventory_Batch);
+ #endregion
- return false;
+ #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);
+ deliveryOrdersAdd.Add(entityOrder);
+ #endregion
+ }
+ else
+ {
+ #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.SupplyQuantity),
+ SupplyQuantity = 0,
+ Remark = "鐩樹簭鍑哄簱"
+ };
+ //_supplyTaskHtyService.AddData(supplyTask_Hty);
+ supplyTask_Hties.Add(supplyTask_Hty);
+ }
+ #endregion
+ inventoryInfo.StockQuantity += inventoryInfo.SupplyQuantity;
+ inventoryInfo.AvailableQuantity = inventoryInfo.StockQuantity;
+ inventoryInfo.SupplyQuantity = 0;
+ inventoryInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
+ }
+ //_inventoryInfoService.UpdateData(inventoryInfos);
+ infosUp.AddRange(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();
+ deliveryOrdersAdd.Add(cabinOrder);
+ }
+ #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 = Math.Abs(LkQty), //缁欎笅娓竁CS鐨勬槸瑕佹暣鏁�
+ 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);
+ deliveryOrdersAdd.Add(entityOrder);
+ #endregion
+ }
+ //return WebResponseContent.Instance.OK("鎴愬姛");
+ }
+ _unitOfWorkManage.BeginTran();
+ _supplyTaskHtyService.AddData(supplyTask_Hties);
+ _inventoryInfoService.UpdateData(infosUp);
+ _inventory_BatchServices.UpdateData(batchesUp);
+ BaseDal.Db.InsertNav(deliveryOrdersAdd).Include(it => it.Details).ExecuteCommand();
+ _unitOfWorkManage.CommitTran();
+ }
+ return WebResponseContent.Instance.OK("鎴愬姛");
}
catch (Exception ex)
{
- // 璁板綍鏃ュ織
- Console.WriteLine($"鍒涘缓渚涘簲浠诲姟澶辫触锛歿ex.Message}");
- return false;
+ _unitOfWorkManage.RollbackTran();
+ content.Error(ex.Message);
}
+ return content;
}
-
-
-
- /// <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;
- }
+ #endregion
//鐩樼偣 鎷挎暣涓壒娆′俊鎭〃鐨勫晢鍝佹壒鍙峰拰鍟嗗搧缂栧彿鏉ヨ繘琛岀洏鐐�
@@ -565,7 +954,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();
@@ -639,11 +1028,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);
@@ -668,15 +1057,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();
@@ -687,10 +1082,92 @@
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);
+ Dt_DeliveryOrder deliveryOrder = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == supplyTask.OrderNo && x.Warehouse_no == supplyTask.WarehouseCode).Includes(x => x.Details).First();
+ if (deliveryOrder == null) return WebResponseContent.Instance.OK($"鍑哄簱鍗曞凡瀹屾垚");
+ content = OutTaskFinish(supplyTask, deliveryOrder);
}
catch (Exception ex)
{
+ content.Error(ex.Message);
+ }
+ return content;
+ }
+
+ public WebResponseContent OutTaskFinish(Dt_SupplyTask supplyTask, Dt_DeliveryOrder deliveryOrder)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ Dt_DeliveryOrderDetail? cabinOrderDetail = deliveryOrder.Details.FirstOrDefault(x => x.Batch_num == supplyTask.BatchNo && x.Goods_no == supplyTask.MaterielCode);
+ if (cabinOrderDetail == null) throw new Exception($"鍑哄簱鍗曟槑缁嗘湭鎵惧埌");
+ Dt_MaterielInfo materielInfo = _materielInfoService.Repository.QueryFirst(x => x.MaterielCode == supplyTask.MaterielCode);
+ if (materielInfo == null) throw new Exception($"璇风淮鎶ょ墿鏂欑紪鍙枫�恵supplyTask.MaterielCode}銆戠殑鐗╂枡淇℃伅");
+ cabinOrderDetail.Order_Outqty += supplyTask.StockQuantity;
+ if (cabinOrderDetail.Order_Outqty > cabinOrderDetail.Order_qty) throw new Exception($"鍑哄簱鏁伴噺涓嶅彲瓒呭嚭鍗曟嵁鏁伴噺");
+ deliveryOrder.OutStatus = "寮�濮�";
+ cabinOrderDetail.OotDetailStatus = "寮�濮�";
+ if (cabinOrderDetail.Order_Outqty == cabinOrderDetail.Order_qty) cabinOrderDetail.OotDetailStatus = "宸插畬鎴�";
+
+ #region 搴撳瓨
+ Dt_InventoryInfo inventoryInfo = _inventoryInfoService.Repository.QueryFirst(x => x.BatchNo == cabinOrderDetail.Batch_num && x.MaterielCode == cabinOrderDetail.Goods_no && x.LocationCode == supplyTask.LocationCode);
+ if (inventoryInfo == null) throw new Exception($"鏈壘鍒拌揣浣嶃�恵supplyTask.LocationCode}銆戠殑搴撳瓨淇℃伅");
+ inventoryInfo.StockQuantity -= supplyTask.StockQuantity;
+ inventoryInfo.OutboundQuantity -= supplyTask.StockQuantity;
+ #endregion
+ Dt_LocationInfo location = _locationInfoService.Repository.QueryFirst(x => x.LocationCode == supplyTask.LocationCode);
+ #region 璐т綅
+ if (supplyTask.WarehouseCode != WarehouseEnum.绔嬪簱.ObjToInt().ToString("000"))
+ {
+ if (location == null)
+ return WebResponseContent.Instance.Error($"璇风淮鎶よ揣浣嶇紪鍙枫�恵supplyTask.LocationCode}銆戠殑璐т綅淇℃伅");
+ Dt_InventoryInfo inventoryInfo1 = _inventoryInfoService.Repository.QueryFirst(x => x.LocationCode == supplyTask.LocationCode);
+ if (inventoryInfo1 == null) location.LocationStatus = LocationStatusEnum.Free.ObjToInt();
+ }
+ #endregion
+
+ #region 搴撳瓨鎵规 濡傛灉浠诲姟绫诲瀷鏄皟鎷ㄥ嚭搴撲换鍔★紙8锛夊氨涓嶄慨鏀规壒娆″簱瀛�
+ Dt_Inventory_Batch inventory_Batch = _inventory_BatchServices.Repository.QueryFirst(x => x.BatchNo == inventoryInfo.BatchNo && x.MaterielCode ==
+ inventoryInfo.MaterielCode);
+ if (supplyTask.TaskType != TaskTypeEnum.AllocatOut.ObjToInt())
+ {
+ inventory_Batch.StockQuantity -= supplyTask.StockQuantity;
+ inventory_Batch.OutboundQuantity -= supplyTask.StockQuantity;
+ }
+ #endregion
+ supplyTask.TaskStatus = SupplyStatusEnum.OutFinish.ObjToInt();
+
+ _unitOfWorkManage.BeginTran();
+ if (inventory_Batch.StockQuantity <= 0)
+ _inventory_BatchServices.DeleteData(inventory_Batch);
+ else
+ _inventory_BatchServices.UpdateData(inventory_Batch);
+ _materielInfoService.UpdateData(materielInfo);
+ if (inventoryInfo.StockQuantity <= 0)
+ _inventoryInfoService.DeleteData(inventoryInfo);
+ else
+ _inventoryInfoService.UpdateData(inventoryInfo);
+ if (location != null) _locationInfoService.UpdateData(location);
+ _deliveryOrderDetailServices.UpdateData(cabinOrderDetail);
+ _supplyTaskService.Repository.DeleteAndMoveIntoHty(supplyTask, OperateTypeEnum.浜哄伐瀹屾垚);
+
+ #region 鍒ゆ柇璇︽儏鏄惁鍏ㄩ儴瀹屾垚
+ if (!_deliveryOrderDetailServices.Repository.QueryData(x => x.DeliveryOrderId == deliveryOrder.Id && x.OotDetailStatus != "宸插畬鎴�").Any())
+ deliveryOrder.OutStatus = "宸插畬鎴�";
+ BaseDal.UpdateData(deliveryOrder);
+ if (supplyTask.WarehouseCode == WarehouseEnum.绔嬪簱.ObjToInt().ToString("000"))
+ {
+ materielInfo.Business_qty -= supplyTask.StockQuantity;
+ if (materielInfo.Business_qty < materielInfo.MinQty)
+ CreateAllocatInOut(materielInfo);//鍒涘缓璋冩嫧浠诲姟
+ }
+ #endregion
+ _unitOfWorkManage.CommitTran();
+
+ content.OK();
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
content.Error(ex.Message);
}
return content;
@@ -701,13 +1178,12 @@
WebResponseContent content = new WebResponseContent();
try
{
+ 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.OK($"鍑哄簱鍗曞凡瀹屾垚");
- 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();
- 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();
- if (cabinOrderDetail == null) return WebResponseContent.Instance.Error($"鍑哄簱鍗曟槑缁嗗凡瀹屾垚");
- Dt_MaterielInfo materielInfo = _basicService.MaterielInfoService.Repository.QueryFirst(x => x.MaterielCode == cabinOrderDetail.Goods_no);
+ 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 = _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)
@@ -715,7 +1191,7 @@
#region 澶勭悊鍑哄簱鍗曪紝璐т綅锛屽簱瀛橈紝搴撳瓨鎵规淇℃伅,鍑哄簱浠诲姟
- _unitOfWorkManage.BeginTran();
+ //_unitOfWorkManage.BeginTran();
#region 鍑哄簱鍗�
cabinOrder.OutStatus = "寮�濮�";
@@ -726,7 +1202,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);
@@ -746,7 +1222,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())
@@ -755,7 +1231,7 @@
if (inventoryInfo1 == null)
{
location.LocationStatus = LocationStatusEnum.Free.ObjToInt();
- _basicService.LocationInfoService.UpdateData(location);
+ _locationInfoService.UpdateData(location);
}
}
#endregion
@@ -765,26 +1241,29 @@
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);//鍒涘缓璋冩嫧浠诲姟
}
- _unitOfWorkManage.CommitTran();
+ //_unitOfWorkManage.CommitTran();
#endregion
content.OK();
}
@@ -795,116 +1274,50 @@
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 澶勭悊鍑哄簱鍗曪紝璐т綅锛屽簱瀛橈紝搴撳瓨鎵规淇℃伅
- _unitOfWorkManage.BeginTran();
-
- #region 鍑哄簱鍗�
- cabinOrder.OutStatus = "寮�濮�";
- cabinOrderDetail.OotDetailStatus = "寮�濮�";
- if (cabinOrderDetail.Order_Outqty == cabinOrderDetail.Order_qty)
+ 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();//鎵惧嚭鎵�鏈夊嚭搴撳崟鍙风浉鍚岀殑鍑哄簱鍗�
+ List<Dt_DeliveryOrderDetail> deliveryOrderDetails = new List<Dt_DeliveryOrderDetail>();
+ foreach (var item in deliveryOrders)
{
- cabinOrderDetail.OotDetailStatus = "宸插畬鎴�";
- _deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(cabinOrderDetail, OperateTypeEnum.鑷姩瀹屾垚);
+ if (item.Details != null) deliveryOrderDetails.AddRange(item.Details);
+ item.Modifier = App.User.UserName;
+ item.ModifyDate = DateTime.Now;
+ item.Details = null;
+ }
+ if (deliveryOrder.Out_type == OutOrderTypeEnum.Allocate.ObjToInt().ToString())
+ {
+ _deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(deliveryOrderDetails, OperateTypeEnum.浜哄伐瀹屾垚);
+ BaseDal.DeleteAndMoveIntoHty(deliveryOrders, OperateTypeEnum.浜哄伐瀹屾垚);
}
else
{
- _deliveryOrderDetailServices.Repository.UpdateData(cabinOrderDetail);
+ var url = "http://121.37.118.63:80/GYZ2/95fck/outOrderOk";
+ if (deliveryOrder.Out_type == "3") url = "http://121.37.118.63:80/GYZ2/95fck/inOrderOk";
+ 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" && response.resultMsg != "鏈壘鍒板悎娉曞崟鎹�") throw new Exception(response.resultMsg);
+ _deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(deliveryOrderDetails, OperateTypeEnum.浜哄伐瀹屾垚);
+ BaseDal.DeleteAndMoveIntoHty(deliveryOrders, OperateTypeEnum.浜哄伐瀹屾垚);
}
- 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)
{
- _unitOfWorkManage.RollbackTran();
content.Error(ex.Message);
}
return content;
--
Gitblit v1.9.3