From 5621e29bd415c85fd719e0e6366eae813b970ea2 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 30 十月 2025 20:16:11 +0800
Subject: [PATCH] 1
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/extend/Check.cs | 189 ++++++++++++++++++++++++++++++++--------------
1 files changed, 130 insertions(+), 59 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/extend/Check.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/extend/Check.cs"
index e574369..da9a188 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/extend/Check.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/extend/Check.cs"
@@ -4,7 +4,9 @@
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Common.OrderEnum;
+using WIDESEA_Common.StockEnum;
using WIDESEA_Common.TaskEnum;
+using WIDESEA_Common.WareHouseEnum;
using WIDESEA_Core;
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
@@ -16,7 +18,7 @@
public partial class DeliveryOrderServices
{
#region 鍒涘缓鐩樼偣鍗曘�佺洏鐐逛换鍔�
- /// <summary>
+ /// <summary> 鍦ㄥ簱瀛樻壒娆′俊鎭腑璋冪敤璇ユ帴鍙ｈ繘琛岀洏鐐�
/// 鍒涘缓鐩樼偣鍗�
/// </summary>
/// <param name="keys"></param>
@@ -27,10 +29,16 @@
try
{
List<Dt_DeliveryOrder> deliveryOrders = new List<Dt_DeliveryOrder>();
- List<Dt_SupplyTask> supplyTasks = new List<Dt_SupplyTask>();
+ //List<Dt_SupplyTask> supplyTasks = new List<Dt_SupplyTask>();
+ List<Dt_SupplyTask> supplyTasks1 = new List<Dt_SupplyTask>();
+ List<Dt_InventoryInfo> _InventoryInfos = new List<Dt_InventoryInfo>();
List<Dt_Inventory_Batch> inventory_Batches = _inventory_BatchServices.Repository.QueryData(x => keys.Contains(x.Id));
foreach (var item in inventory_Batches)
{
+ var supplyTasks = _supplyTaskService.Repository.QueryData(x => x.MaterielCode == item.MaterielCode && x.BatchNo == item.BatchNo && x.TaskStatus == SupplyStatusEnum.NewCheck.ObjToInt()).ToList();
+ if (supplyTasks.Count > 0) throw new Exception($"鐗╂枡缂栧彿銆恵item.MaterielCode}銆戞壒娆″彿銆恵item.BatchNo}銆戝凡瀛樺湪鐩樼偣浠诲姟锛岃鍏堝畬鎴愬綋鍓嶇洏鐐逛换鍔�");
+ supplyTasks = _supplyTaskService.Repository.QueryData(x => x.MaterielCode == item.MaterielCode && x.BatchNo == item.BatchNo && x.TaskStatus == SupplyStatusEnum.NewOut.ObjToInt()).ToList();
+ if (supplyTasks.Count > 0) throw new Exception($"鐗╂枡缂栧彿銆恵item.MaterielCode}銆戞壒娆″彿銆恵item.BatchNo}銆戝凡瀛樺湪鐩樼偣浠诲姟锛岃鍏堝畬鎴愬綋鍓嶇洏鐐逛换鍔�");
List<Dt_InventoryInfo> inventoryInfos = _inventoryInfoService.Repository.QueryData(x => item.MaterielCode == x.MaterielCode && x.BatchNo == item.BatchNo);
if (inventoryInfos.Count > 0)
{
@@ -39,7 +47,7 @@
Dt_DeliveryOrder deliveryOrder = new Dt_DeliveryOrder()
{
Out_no = item.MaterielCode + "_" + item.BatchNo,
- Out_type = "3",
+ Out_type = "20",
OutStatus = "鏂板缓",
Warehouse_no = items.Key,
Details = new List<Dt_DeliveryOrderDetail>()
@@ -60,36 +68,40 @@
deliveryOrder.Details.Add(deliveryOrderDetail);
deliveryOrders.Add(deliveryOrder);
#region 鍒涘缓鐩樼偣浠诲姟
- if (items.Key != "001")
+ foreach (var inventory in items)
{
- foreach (var inventory in items)
+ Dt_SupplyTask supplyTask = new Dt_SupplyTask()
{
- Dt_SupplyTask supplyTask = new Dt_SupplyTask()
- {
- WarehouseCode = inventory.WarehouseCode,
- TaskStatus = SupplyStatusEnum.NewCheck.ObjToInt(),
- BatchNo = inventory.BatchNo,
- MaterielName = inventory.MaterielName,
- MaterielCode = inventory.MaterielCode,
- MaterielSpec = inventory.MaterielSpec,
- TaskType = TaskTypeEnum.OutInventory.ObjToInt(),
- CreateDate = DateTime.Now,
- Creater = App.User.UserName,
- LocationCode = inventory.LocationCode,
- OrderNo = deliveryOrder.Out_no,
- StockQuantity = inventory.StockQuantity,
- SupplyQuantity = 0,
- Remark = "鐩樼偣"
- };
- supplyTasks.Add(supplyTask);
- }
+ WarehouseCode = inventory.WarehouseCode,
+ TaskStatus = SupplyStatusEnum.NewCheck.ObjToInt(),
+ BatchNo = inventory.BatchNo,
+ MaterielName = inventory.MaterielName,
+ MaterielCode = inventory.MaterielCode,
+ MaterielSpec = inventory.MaterielSpec,
+ TaskType = TaskTypeEnum.OutInventory.ObjToInt(),
+ CreateDate = DateTime.Now,
+ Creater = App.User.UserName,
+ LocationCode = inventory.LocationCode,
+ OrderNo = deliveryOrder.Out_no,
+ StockQuantity = inventory.StockQuantity,
+ SupplyQuantity = 0,
+ Remark = "鐩樼偣"
+ };
+ supplyTasks1.Add(supplyTask);
+ _InventoryInfos.Add(inventory);
}
+ //}
#endregion
}
}
}
+ _InventoryInfos.ForEach(x =>
+ {
+ x.StockStatus = StockStatusEmun.鐩樼偣閿佸畾.ObjToInt();
+ });
_unitOfWorkManage.BeginTran();
- _supplyTaskService.AddData(supplyTasks);
+ _inventoryInfoService.UpdateData(_InventoryInfos);
+ _supplyTaskService.AddData(supplyTasks1);
BaseDal.Db.InsertNav(deliveryOrders)
.Include(x => x.Details)
.ExecuteCommand();
@@ -104,9 +116,10 @@
return content;
}
#endregion
+
#region 鏌ヨ鐩樼偣鍗曚俊鎭�
/// <summary>
- /// 鏌ヨ鐩樼偣鍗�
+ /// 鏌ヨ鐩樼偣鍗� pad鏌ヨ鐩樺崟淇℃伅
/// </summary>
/// <param name="saveModel"></param>
/// <returns></returns>
@@ -121,11 +134,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);
@@ -138,6 +151,7 @@
return content;
}
#endregion
+
#region 鏌ユ壘鐩樼偣/鍑哄簱浠诲姟
/// <summary>
/// 鏌ユ壘鐩樼偣/鍑哄簱浠诲姟
@@ -172,7 +186,9 @@
}
return content;
}
+
#endregion
+
#region 瀹屾垚鐩樼偣浠诲姟
public WebResponseContent CheckFinish(SaveModel saveModel)
{
@@ -186,64 +202,119 @@
if (supplyTask == null) throw new Exception("褰撳墠鐩樼偣浠诲姟宸插畬鎴�");
if (supplyTask.LocationCode != LocationCode) throw new Exception($"褰撳墠鐩樼偣璐т綅銆恵LocationCode}銆戜笌浠诲姟鍒嗛厤璐т綅涓嶅尮閰�");
supplyTask.SupplyQuantity = qty;
+ content = CheckTaskFinish(supplyTask, LocationCode);
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ return content;
+ }
+ #endregion
+
+ #region 鐩樼偣浠诲姟瀹屾垚,骞冲簱鍜岀珛搴�
+ public WebResponseContent CheckTaskFinish(Dt_SupplyTask supplyTask, string LocationCode = null)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
supplyTask.TaskStatus = SupplyStatusEnum.CheckFinish.ObjToInt();
- Dt_DeliveryOrder cabinOrder = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == supplyTask.OrderNo && x.Warehouse_no == supplyTask.WarehouseCode && x.Out_type == "3").Includes(x => x.Details).First();
+ Dt_DeliveryOrder cabinOrder = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == supplyTask.OrderNo && x.Warehouse_no == supplyTask.WarehouseCode && x.Out_type == "20").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_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.SupplyQuantity;
- if (cabinOrderDetail.Order_Outqty > cabinOrderDetail.Order_qty)
- return WebResponseContent.Instance.Error($"瀹炵洏鏁伴噺涓嶅彲瓒呭嚭璐﹂潰鏁伴噺");
+ #region 骞冲簱鐩樼偣鍙兘鍑虹幇鏁寸宸紓
+ if (supplyTask.WarehouseCode == WarehouseEnum.澶т欢搴�.ObjToInt().ToString("000"))
+ {
+ var Qty = supplyTask.SupplyQuantity % materielInfo.BoxQty;
+ if (Qty != 0) return WebResponseContent.Instance.Error($"澶т欢搴撳簱瀛樹负鏁寸锛佺洏鐐规暟閲忎笉鑳藉瓨鍦ㄦ暎浠�");
+ }
+ #endregion
+ //if (cabinOrderDetail.Order_Outqty > cabinOrderDetail.Order_qty)
+ // return WebResponseContent.Instance.Error($"瀹炵洏鏁伴噺涓嶅彲瓒呭嚭璐﹂潰鏁伴噺");
#region 澶勭悊鍑哄簱鍗曪紝璐т綅锛屽簱瀛橈紝搴撳瓨鎵规淇℃伅
_unitOfWorkManage.BeginTran();
- #region 鍑哄簱鍗�
+ #region 淇敼鐩樼偣鍗�
cabinOrder.OutStatus = "寮�濮�";
cabinOrderDetail.OotDetailStatus = "寮�濮�";
- if (cabinOrderDetail.Order_Outqty == cabinOrderDetail.Order_qty)
- {
- cabinOrderDetail.OotDetailStatus = "宸插畬鎴�";
- _deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(cabinOrderDetail, OperateTypeEnum.鑷姩瀹屾垚);
- }
- else
- {
- _deliveryOrderDetailServices.Repository.UpdateData(cabinOrderDetail);
- }
- 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 = "宸插畬鎴�";
- if (cabinOrder.OutStatus == "宸插畬鎴�")
- Repository.DeleteAndMoveIntoHty(cabinOrder, OperateTypeEnum.鑷姩瀹屾垚);
- else
- Repository.UpdateData(cabinOrder);
+ Repository.UpdateData(cabinOrder);
+ _deliveryOrderDetailServices.Repository.UpdateData(cabinOrderDetail);
#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 = supplyTask.SupplyQuantity;
+ Dt_InventoryInfo inventoryInfo = new Dt_InventoryInfo();
+ if (supplyTask.WarehouseCode != WarehouseEnum.绔嬪簱.ObjToInt().ToString("000"))
+ {
+ inventoryInfo = _inventoryInfoService.Repository.QueryFirst(x => x.BatchNo == cabinOrderDetail.Batch_num && x.MaterielCode == cabinOrderDetail.Goods_no && x.WarehouseCode == supplyTask.WarehouseCode && x.LocationCode == supplyTask.LocationCode);
+ if (inventoryInfo == null) return WebResponseContent.Instance.Error($"鏈壘鍒拌揣浣嶃�恵LocationCode}銆戠殑搴撳瓨淇℃伅");
+ }
+ else
+ {
+ inventoryInfo = _inventoryInfoService.Repository.QueryFirst(x => x.BatchNo == cabinOrderDetail.Batch_num && x.MaterielCode == cabinOrderDetail.Goods_no && x.WarehouseCode == supplyTask.WarehouseCode);
+ }
+ inventoryInfo.SupplyQuantity = supplyTask.SupplyQuantity;
_inventoryInfoService.UpdateData(inventoryInfo);
#endregion
#region 浠诲姟璁板綍
- _supplyTaskService.UpdateData(supplyTask);
+ //_supplyTaskService.UpdateData(supplyTask);
+ _supplyTaskService.Repository.DeleteAndMoveIntoHty(supplyTask, OperateTypeEnum.鑷姩瀹屾垚);
#endregion
- #region 搴撳瓨鎵规
- Dt_Inventory_Batch inventory_Batch = _inventory_BatchServices.Repository.QueryFirst(x => x.BatchNo == inventoryInfo.BatchNo && x.MaterielCode == inventoryInfo.MaterielCode);
- if (inventory_Batch != null)
+ #region 鍒ゆ柇褰撳墠鐗╂枡鎵规鐨勭洏鐐逛换鍔℃槸鍚﹀叏閮ㄥ畬鎴�
+ List<Dt_SupplyTask> supplyTasks = _supplyTaskService.Repository.QueryData(x => x.MaterielCode == supplyTask.MaterielCode && x.BatchNo == supplyTask.BatchNo && x.TaskStatus == SupplyStatusEnum.NewCheck.ObjToInt() && x.WarehouseCode == supplyTask.WarehouseCode).ToList();
+ if (supplyTasks.Count < 1)
{
- inventory_Batch.SupplyQuantity += supplyTask.SupplyQuantity;
- _inventory_BatchServices.UpdateData(inventory_Batch);
+ #region 瀹屾垚鐩樼偣鍗�
+ cabinOrder.OutStatus = "宸插畬鎴�";
+ cabinOrder.Details.ForEach(x =>
+ {
+ x.OotDetailStatus = "宸插畬鎴�";
+ });
+ _deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(cabinOrder.Details, OperateTypeEnum.鑷姩瀹屾垚);
+ cabinOrder.Details = null;
+ Repository.DeleteAndMoveIntoHty(cabinOrder, OperateTypeEnum.鑷姩瀹屾垚);
+
+ #endregion
}
- #endregion
+ supplyTasks = _supplyTaskService.Repository.QueryData(x => x.MaterielCode == supplyTask.MaterielCode && x.BatchNo == supplyTask.BatchNo && x.TaskStatus == SupplyStatusEnum.NewCheck.ObjToInt()).ToList();
+ if (supplyTasks.Count < 1)
+ {
+ #region 鏌ユ壘搴撳瓨
+ var inventoryInfos = _inventoryInfoService.Repository.QueryData(x => x.BatchNo == cabinOrderDetail.Batch_num && x.MaterielCode == cabinOrderDetail.Goods_no);
+ var SupplyQuantitys = inventoryInfos.Sum(x => x.SupplyQuantity);
+ #endregion
+
+ #region 搴撳瓨鎵规
+ Dt_Inventory_Batch inventory_Batch = _inventory_BatchServices.Repository.QueryFirst(x => x.BatchNo == cabinOrderDetail.Batch_num && x.MaterielCode == cabinOrderDetail.Goods_no);
+ //濡傛灉鐩樼偣鏁板拰鎵规鎬绘暟瀵逛笂浜嗭紝鐩樼偣鏁拌祴鍊间负0锛岃祴鍊煎氨娣诲姞鐩樼偣鏁�
+ if (SupplyQuantitys == inventory_Batch.StockQuantity)
+ {
+ foreach (var item in inventoryInfos)
+ {
+ item.StockQuantity = item.SupplyQuantity;
+ item.SupplyQuantity = 0;
+ item.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
+ }
+ _inventoryInfoService.UpdateData(inventoryInfos);
+ }
+ else
+ {
+ inventory_Batch.SupplyQuantity = SupplyQuantitys;
+ _inventory_BatchServices.UpdateData(inventory_Batch);
+ }
+ #endregion
+ }
_unitOfWorkManage.CommitTran();
#endregion
-
content.OK();
+ #endregion
}
catch (Exception ex)
{
--
Gitblit v1.9.3