From a296223898d61a9838bbd35ed75c87575e308a36 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期五, 07 十一月 2025 17:19:38 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 193 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 138 insertions(+), 55 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs"
index 5893c7e..6bf4fec 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs"
@@ -24,6 +24,7 @@
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.Const;
using WIDESEA_Core.Enums;
+using WIDESEA_DTO.Basic;
using WIDESEA_DTO.ERP;
using WIDESEA_DTO.Location;
using WIDESEA_DTO.Stock;
@@ -58,6 +59,7 @@
private readonly IDt_StationManagerRepository _stationManagerRepository;
private readonly ISys_ConfigService _configService;
private readonly IDt_OrderOutDetailsRepository _orderOutDetailsRepository;
+ private readonly IDt_WareAreaInfoRepository _wareAreaInfoRepository;
public Dt_TaskService(IDt_TaskRepository BaseDal,
IUnitOfWorkManage unitOfWorkManage,
@@ -72,7 +74,8 @@
IStockInfoDetailRepository stockInfoDetailRepository,
IDt_StationManagerRepository stationManagerRepository,
ISys_ConfigService configService,
- IDt_OrderOutDetailsRepository orderOutDetailsRepository) : base(BaseDal)
+ IDt_OrderOutDetailsRepository orderOutDetailsRepository,
+ IDt_WareAreaInfoRepository wareAreaInfoRepository) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
_stockInfoRepository = stockInfoRepository;
@@ -87,6 +90,7 @@
_stationManagerRepository = stationManagerRepository;
_configService = configService;
_orderOutDetailsRepository = orderOutDetailsRepository;
+ _wareAreaInfoRepository = wareAreaInfoRepository;
}
#region 澶栭儴鎺ュ彛鏂规硶
@@ -119,8 +123,6 @@
orderdetailshtys.Add(item.Adapt<Dt_OrderOutDetails_Hty>());
});
- var allocateOrderdetail = orderDetails.Where(x => x.OrderType == (int)OrderTypeEmun.璋冩嫧鍑哄簱鍗�).ToList();
-
await ERPAllocateOut(stock);
//璋冩嫧鍑哄簱
@@ -143,32 +145,38 @@
if (orderDetails.Count > 0)
{
content = await ERPProduction(orderDetails.Where(x => x.OrderType == (int)OrderTypeEmun.鐢熶骇棰嗘枡鍗�).ToList());
- }
+ }
}
- List<DtBoxingInfo> boxingInfos = new List<DtBoxingInfo>();
- foreach (var item in allocateOrderdetail)
+
+ var boxingInfo = await _boxingInfoRepository.QueryFirstNavAsync(x => x.PalletCode == stock.PalletCode);
+ if (boxingInfo != null)
{
- var boxingInfo = await _boxingInfoRepository.QueryFirstNavAsync(x => x.PalletCode == item.PalletCode);
- if (boxingInfo == null)
- {
- continue;
- }
- var boxingdetail = boxingInfo.BoxingInfoDetails.Where(x => x.MaterielCode == item.MaterielCode);
- if (boxingdetail.Count() > 0)
- {
- foreach (var detail in boxingdetail)
- {
- detail.Quantity = detail.Quantity - item.OutboundQuantity;
- detail.Warehouse = "WMS鍑哄簱缂撳瓨鍖�";
- detail.WareHouseId = "205";
- }
- }
- boxingInfos.Add(boxingInfo);
+ var mergedDetails = boxingInfo.BoxingInfoDetails
+ .GroupBy(x => new { x.MaterielCode, x.MaterielName })
+ .Select(g => new DtBoxingInfoDetail
+ {
+ MaterielCode = g.Key.MaterielCode,
+ MaterielName = g.Key.MaterielName,
+ DemandClassification = g.FirstOrDefault().DemandClassification,
+ Warehouse = "WMS鍑哄簱缂撳瓨鍖�",
+ WareHouseId = "205",
+ OrderNo = g.FirstOrDefault().OrderNo,
+ Unit = g.FirstOrDefault().Unit,
+ Specs = g.FirstOrDefault().Specs,
+ Weight = g.FirstOrDefault().Weight,
+ DrawingNumber = g.FirstOrDefault().DrawingNumber,
+ Date = g.FirstOrDefault().Date,
+ Remark = g.FirstOrDefault().Remark,
+ Quantity = g.Sum(item => item.Quantity),
+ })
+ .ToList();
+ boxingInfo.BoxingInfoDetails = mergedDetails;
}
+
await _unitOfWorkManage.UseTranAsync(async () =>
{
await DeleteStockInfoAsync(stock.Id);
- _boxingInfoRepository.UpdateDataNav(boxingInfos);
+ _boxingInfoRepository.UpdateDataNav(boxingInfo);
await DeleteStockInfoDetailsAsync(stock.StockInfoDetails);
await AddStockInfoHtyAsync(stockInfo_Hty);
await _locationStatusChangeRecordRepository.AddDataAsync(result1.Item1);
@@ -258,6 +266,7 @@
{
return content.Error("鏈壘鍒扮粍鐩樻暟鎹�");
}
+ await ERPAllocate(boxinfo);
var stock = CreateStock(boxinfo, task);
@@ -269,8 +278,6 @@
var result1 = UpdateLocationStatus(task.SourceAddress, LocationEnum.Free, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
var result2 = UpdateLocationStatus(task.TargetAddress, LocationEnum.InStock, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
-
- await ERPAllocate(stock);
await _unitOfWorkManage.UseTranAsync(async () =>
{
@@ -296,7 +303,31 @@
public DtStockInfo CreateStock(DtBoxingInfo boxingInfo,Dt_Task task)
{
var boxDetail = boxingInfo.BoxingInfoDetails.Adapt<List<DtStockInfoDetail>>();
- boxDetail.ForEach(x => { x.Status = (int)StockStateEmun.宸插叆搴�; });
+ boxDetail.ForEach(x =>
+ {
+ x.Status = (int)StockStateEmun.宸插叆搴�;
+ });
+ var mergedDetails = boxDetail
+ .GroupBy(x => new { x.MaterielCode, x.MaterielName })
+ .Select(g => new DtStockInfoDetail
+ {
+ MaterielCode = g.Key.MaterielCode,
+ MaterielName = g.Key.MaterielName,
+ DemandClassification = g.FirstOrDefault().DemandClassification,
+ Warehouse = "鏅鸿兘绔嬪簱",
+ WareHouseId = "107",
+ OrderNo = g.FirstOrDefault().OrderNo,
+ Unit = g.FirstOrDefault().Unit,
+ Specs = g.FirstOrDefault().Specs,
+ Weight = g.FirstOrDefault().Weight,
+ OutboundQuantity = g.FirstOrDefault().OutboundQuantity,
+ DrawingNumber = g.FirstOrDefault().DrawingNumber,
+ Date = g.FirstOrDefault().Date,
+ AllocateWarehouse = g.FirstOrDefault().AllocateWarehouse,
+ Remark = g.FirstOrDefault().Remark,
+ Quantity = g.Sum(item => item.Quantity),
+ })
+ .ToList();
return new DtStockInfo()
{
PalletCode = task.PalletCode,
@@ -304,7 +335,7 @@
CreateDate = DateTime.Now,
Creater = "system",
IsFullExit = boxingInfo.IsFullExit,
- StockInfoDetails = boxDetail,
+ StockInfoDetails = mergedDetails,
StockStatus = (int)StockStateEmun.宸插叆搴�
};
}
@@ -465,7 +496,7 @@
foreach (var item in boxingInfo.BoxingInfoDetails)
{
- var ERPStock = SqlSugarHelper.DBERP.Queryable<WMS_鐢ㄥ弸搴撳瓨涓�瑙堣〃_ST>().Where(x => x.浠撳簱鍚嶇О == item.Warehouse && x.鏂欏彿 == item.MaterielCode && x.鍝佸悕 == item.MaterielName).ToList().FirstOrDefault();
+ var ERPStock = SqlSugarHelper.DBERPtext.Queryable<鐢ㄥ弸鍗虫椂搴撳瓨_ST>().Where(x => x.瀛樺偍鍦扮偣鍚嶇О == item.Warehouse && x.鏂欏彿 == item.MaterielCode && x.鍝佸悕 == item.MaterielName && x.搴撳瓨鏁伴噺 >= item.Quantity).ToList().FirstOrDefault();
if (ERPStock == null)
{
return content.Error($"缁勭洏鏁版嵁鏈湪ERP搴撳瓨鏁版嵁涓紝璇蜂汉宸ョ‘璁ゆ暟鎹槸鍚︽纭�");
@@ -535,8 +566,8 @@
}
var taskDTO = CreateListTaskDTO(taskNew);
- var result1 = UpdateLocationStatus(StartAddress, LocationEnum.Lock, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
- var result2 = UpdateLocationStatus(Endlocation, LocationEnum.InStockDisable, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
+ var result1 = UpdateLocationStatus(StartAddress, LocationEnum.InStockDisable, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
+ var result2 = UpdateLocationStatus(Endlocation, LocationEnum.Lock, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
await _unitOfWorkManage.UseTranAsync(async () =>
{
@@ -686,7 +717,7 @@
/// </summary>
/// <param name="palletCode"></param>
/// <returns></returns>
- public async Task<WebResponseContent> OutBoundTaskAsync(string palletCode)
+ public async Task<WebResponseContent> OutBoundTaskAsync(string palletCode,string remark)
{
WebResponseContent content = new WebResponseContent();
try
@@ -762,6 +793,10 @@
List<Dt_OrderOutDetails> outDetails = new List<Dt_OrderOutDetails>();
details.Where(x => x.OutboundQuantity > 0).ForEach(x =>
{
+ if (x.Quantity < x.OutboundQuantity)
+ {
+ throw new Exception($"{x.MaterielName}{x.MaterielCode}鍑哄簱鏁伴噺涓嶅彲澶т簬搴撳瓨鏁伴噺");
+ }
outDetails.Add(new Dt_OrderOutDetails()
{
OrderNo = "",
@@ -793,7 +828,7 @@
}
catch (Exception ex)
{
- return content.Error();
+ return content.Error(ex.Message);
}
}
@@ -826,15 +861,23 @@
return content.Error("璇ユ墭鐩樺簱瀛樺凡鍦ㄥ嚭搴撶紦瀛樺尯");
}
- Dt_Task taskNew = await RequestOutboundTaskAsync(new RequestTaskDto { PalletCode = stock.PalletCode, AreaId = 2, Position = stock.LocationCode, TaskType = (int)TaskOutboundTypeEnum.OutOther });
+ Dt_Task taskNew = await RequestOutboundTaskAsync(new RequestTaskDto { PalletCode = stock.PalletCode, AreaId = 2, Position = stock.LocationCode, TaskType = (int)TaskOutboundTypeEnum.OutAllocate });
List<Dt_OrderOutDetails> outDetails = new List<Dt_OrderOutDetails>();
- details.Where(x => x.OutboundQuantity > 0).ForEach(x =>
+ details.Where(x=>x.OutboundQuantity>0).ForEach(x =>
{
- var areaName = _areaInfoRepository.QueryFirst(y => y.AreaName == x.Remark);
- if (areaName == null)
+ if (x.Quantity < x.OutboundQuantity)
{
- throw new Exception($"鏈壘鍒拌皟鎷ㄤ粨搴搟x.Remark}鏁版嵁");
+ throw new Exception($"{x.MaterielName}{x.MaterielCode}鍑哄簱鏁伴噺涓嶅彲澶т簬搴撳瓨鏁伴噺");
+ }
+ var wareinfo = _wareAreaInfoRepository.QueryFirst(y => y.WareAreaCode ==x.AllocateWarehouse);
+ if (wareinfo == null)
+ {
+ throw new Exception($"鏈壘鍒拌皟鎷ㄤ粨搴搟x.AllocateWarehouse}鏁版嵁");
+ }
+ if (wareinfo.WareAreaCode == "205")
+ {
+ throw new Exception($"涓嶅彲璋冩嫧鑷砏MS鍑哄簱缂撳瓨鍖簕x.AllocateWarehouse}鏁版嵁");
}
outDetails.Add(new Dt_OrderOutDetails()
{
@@ -844,10 +887,10 @@
ERPOrderId = "",
MaterielCode = x.MaterielCode,
MaterielName = x.MaterielName,
- AllocateWarehouse = x.Remark,
+ AllocateWarehouse = wareinfo.WareAreaName,
Warehouse = "鏅鸿兘绔嬪簱",
WareHouseId = "107",
- AllocateWarehouseId = areaName.AreaName,
+ AllocateWarehouseId = wareinfo.WareAreaCode ,
OutboundQuantity = x.OutboundQuantity,
});
});
@@ -868,7 +911,7 @@
}
catch (Exception ex)
{
- return content.Error();
+ return content.Error(ex.Message);
}
}
@@ -1374,6 +1417,37 @@
}
#endregion
+ #region 鑾峰彇浠诲姟鏁版嵁
+ public async Task<WebResponseContent> GetTaskData()
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var task = await BaseDal.QueryDataAsync(x => true);
+ var taskData = new List<TaskData>
+ {
+ new TaskData { Status = "宸插彇娑�", Count = task.Count+50 },
+ new TaskData { Status = "宸插畬鎴�", Count = 735 }
+ };
+
+ // 鏋勫缓绗﹀悎瑕佹眰鐨勬牸寮�
+ var result = taskData.Select(item => new
+ {
+ value = item.Count,
+ name = item.Status,
+ itemStyle = new { color = item.Status == "宸插彇娑�" ? "#FF0000" : "#00FF00" }
+ }).ToList();
+
+ return content.OK(data: result);
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+
+ #endregion
+
#endregion 澶栭儴鎺ュ彛鏂规硶
#region 璋冪敤WCS鎺ュ彛
@@ -1441,7 +1515,7 @@
{
PickListID = item.ERPOrderId,
//瀛樺偍鍦扮偣
- WhCode = item.WareHouseId,
+ WhCode = "205",
//棰嗘枡鏁伴噺
IssueQty = item.OutboundQuantity,
}).ToList()
@@ -1470,13 +1544,13 @@
/// <param name="palletCode"></param>
/// <returns></returns>
///
- public async Task ERPAllocate(DtStockInfo stock)
+ public async Task ERPAllocate(DtBoxingInfo boxing)
{
try
{
- if (stock == null)
+ if (boxing == null)
{
- throw new Exception("鏈壘鍒板簱瀛樹俊鎭�");
+ throw new Exception("鏈壘鍒扮粍鐩樹俊鎭�");
}
Allocate allocate = new Allocate
{
@@ -1491,7 +1565,7 @@
businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
isApproved = true,
- transferInList = stock.StockInfoDetails.Select(item => new transferInList
+ transferInList = boxing.BoxingInfoDetails.Select(item => new transferInList
{
//鐗╂枡缂栫爜
ItemCode = item.MaterielCode,
@@ -1546,11 +1620,11 @@
//鐗╂枡缂栫爜
ItemCode = item.MaterielCode,
//璋冨叆浠撳簱鍦板潃
- TransInWHCode = "107",
+ TransInWHCode = "205",
//璋冨叆鏁伴噺
TransInQty = item.Quantity,
// 璋冨嚭浠撳簱缂栫爜
- TransOutWHCode = "205",
+ TransOutWHCode = "107",
}).ToList()
};
var Allocate = GetERPIPAddress(SysConfigConst.ERPIPAddress, SysConfigConst.Allocate);
@@ -1580,20 +1654,28 @@
throw new Exception($"鏈壘鍒拌皟鎷ㄥ嚭搴撴暟鎹�");
}
List<transferInList> transferInList=new List<transferInList>();
- orderOutDetails.ForEach(x =>
+ foreach (var item in orderOutDetails)
{
+ if (item.AllocateWarehouseId == "205")
+ {
+ continue;
+ }
transferInList.Add(new transferInList
{
//鐗╂枡缂栫爜
- ItemCode = x.MaterielCode,
+ ItemCode = item.MaterielCode,
//璋冨叆浠撳簱鍦板潃
- TransInWHCode = x.AllocateWarehouseId,
+ TransInWHCode = item.AllocateWarehouseId,
//璋冨叆鏁伴噺
- TransInQty = x.OutboundQuantity,
+ TransInQty = item.OutboundQuantity,
// 璋冨嚭浠撳簱缂栫爜
- TransOutWHCode = x.WareHouseId,
+ TransOutWHCode = "205",
});
- });
+ }
+ if (transferInList.Count <= 0)
+ {
+ return;
+ }
Allocate allocate = new Allocate
{
context = new Context
@@ -1645,7 +1727,7 @@
OrgCode = "102",
UserCode = "MH0551"
},
- documentTypeCode = "TransIn002",
+ documentTypeCode = "MiscShip001",
businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
isApproved = true,
@@ -1654,9 +1736,10 @@
//鐗╂枡缂栫爜
ItemCode = item.MaterielCode,
//瀛樺偍鍦扮偣缂栧彿
- WhCode = item.WareHouseId,
+ WhCode = "205",
//鏉傚彂鏁伴噺
Qty = item.OutboundQuantity,
+
BenefitDeptCode = "0505",
}).ToList()
};
--
Gitblit v1.9.3