From 95e39ae7aecd6e1016c71cf5ae70a680d8f569bb Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 29 四月 2025 10:48:30 +0800
Subject: [PATCH] 上传最新代码
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs | 226 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 213 insertions(+), 13 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs"
index 822d0f3..7208d9e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs"
@@ -19,6 +19,7 @@
using WIDESEA_External.Model;
using WIDESEA_Core.CodeConfigEnum;
using Microsoft.AspNetCore.Mvc;
+using WIDESEA_DTO.ERP;
namespace WIDESEA_TaskInfoService
{
@@ -82,16 +83,20 @@
/// <param name="ProOutNo">鍑哄簱璁㈠崟鍙�</param>
/// <param name="StationCode">绔欏彴鍦板潃</param>
/// <returns></returns>
- public WebResponseContent OutProductTask(int[] keys, string StationCode)
+ public async Task<WebResponseContent> OutProductTask(int[] keys, string StationCode)
{
WebResponseContent content = new WebResponseContent();
try
{
+ if (StationCode.IsNullOrEmpty())
+ {
+ return await Task.FromResult(content.Error("绾夸綋杈撳叆閿欒"));
+ }
//鑾峰彇鎴愬搧鍑哄簱璁㈠崟
- List<Dt_ProOutOrderDetail> _ProOutOrderDetails = _outboundRepository.ProOutOrderDetailRepository.QueryData(x => keys.Contains(x.Id));
+ List<Dt_ProOutOrderDetail> _ProOutOrderDetails = await _outboundRepository.ProOutOrderDetailRepository.QueryDataAsync(x => keys.Contains(x.Id));
if (_ProOutOrderDetails.Count<=0)
{
- return content.Error("鍕鹃�夎鍗曟槑缁嗕笉瀛樺湪");
+ return await Task.FromResult(content.Error("鍕鹃�夎鍗曟槑缁嗕笉瀛樺湪"));
}
List<Dt_Task> tasks = new List<Dt_Task>();
List<StockSelectViewDTO> stockSelectViews = new List<StockSelectViewDTO>();
@@ -127,7 +132,7 @@
tasks.AddRange(result.Item1);
}
//澶勭悊鍑哄簱鏁版嵁
- content = GenerateOutboundTaskDataUpdate(tasks, proStockInfos, proOutOrderDetails, outProStockInfos, locationInfos);
+ return await Task.FromResult(GenerateOutboundTaskDataUpdate(tasks, proStockInfos, proOutOrderDetails, outProStockInfos, locationInfos));
}
catch (Exception ex)
{
@@ -136,7 +141,200 @@
}
return content;
}
-
+ /// <summary>
+ /// 浜哄伐閫夊畾搴撳瓨鍑哄簱
+ /// </summary>
+ /// <returns></returns>
+ public WebResponseContent OutProductSelect(int orderDetailId,List<ProStockViewDTO> proStockViews)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ //鑾峰彇鍑哄簱鍗曟槑缁�
+ Dt_ProOutOrderDetail proOutOrderDetail = _outboundRepository.ProOutOrderDetailRepository.QueryFirst(x=>x.Id==orderDetailId);
+ if (proOutOrderDetail == null)
+ {
+ return content.Error("璁㈠崟鏄庣粏涓嶅瓨鍦�");
+ }
+ if (proOutOrderDetail.ProOrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt())
+ {
+ return content.Error("褰撳墠鐨勬槑缁嗗崟宸插畬鎴�");
+ }
+ //鑾峰彇鍑哄簱鍗曟嵁
+ Dt_ProOutOrder proOutOrder = _outboundRepository.ProOutOrderRepository.Db.Queryable<Dt_ProOutOrder>().Where(x=>x.Id==proOutOrderDetail.ProOrderId).Includes(x => x.Details).First();
+ if (proOutOrder==null)
+ {
+ return content.Error("鍑哄簱鍗曟嵁涓嶅瓨鍦�");
+ }
+ if (proOutOrder.ProOrderStatus>=OutOrderStatusEnum.鍑哄簱瀹屾垚.ObjToInt())
+ {
+ return content.Error($"{proOutOrder.ProOutOrderNo}鍑哄簱鍗曞凡瀹屾垚");
+ }
+ if ((proOutOrderDetail.QtyPcs-proOutOrderDetail.OverQtyPcs)> proStockViews.Sum(x=>x.SumStocks))
+ {
+ return content.Error($"闇�婊¤冻{proOutOrderDetail.QtyPcs - proOutOrderDetail.OverQtyPcs}鍑哄簱閲�");
+ }
+ //鑾峰彇鎵�鏈夊簱瀛�
+ List<Dt_ProStockInfo> proStockInfos = _stockRepository.ProStockInfoRepository.Db.Queryable<Dt_ProStockInfo>().Where(b => b.LocationCode == "鎴愬搧寰呭彂璐у尯" && b.StockStatus == StockStatusEmun.骞冲簱鍏ュ簱瀹屾垚.ObjToInt() && (b.ShipmentOrder == null || b.ShipmentOrder == "")).Includes(x => x.proStockInfoDetails).Where(x => x.proStockInfoDetails.Any(v => v.ProductCode == proOutOrderDetail.PCode)).ToList();
+ //鑾峰彇宸插畬鎴愭暟閲�
+ int OverCount = proOutOrder.Details.Where(x => x.ProOrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()).Count();
+ List<Dt_ProStockInfo> outStockInfos=new List<Dt_ProStockInfo>();
+ List<Dt_ProStockInfoDetail> outStockInfoDetails=new List<Dt_ProStockInfoDetail>();
+ List<StockOutItemsItem> stockOutItems = new List<StockOutItemsItem>();
+ foreach (var item in proStockViews.OrderBy(x => x.SumStocks))
+ {
+ //鑾峰彇褰撳墠搴撳瓨
+ Dt_ProStockInfo? proStockInfo = proStockInfos.FirstOrDefault(x => x.Id == item.ProStockId);
+ if (proStockInfo!=null && proStockInfo.proStockInfoDetails.Count>0)
+ {
+ proStockInfo.ShipmentOrder = proOutOrder.ProOutOrderNo;
+ proStockInfo.StockStatus = StockStatusEmun.骞冲簱寰呭彂璐�.ObjToInt();
+ //鍓╀綑鏁伴噺
+ float Amount = proOutOrderDetail.QtyPcs - proOutOrderDetail.LockQtyPcs;
+ if (Amount > item.SumStocks)
+ {
+ proOutOrderDetail.LockQtyPcs += item.SumStocks;
+ Dt_ProStockInfoDetail proStockInfoDetail = proStockInfo.proStockInfoDetails.FirstOrDefault();
+
+ proStockInfoDetail.OutboundQuantity = proStockInfoDetail.StockPcsQty;
+ proStockInfoDetail.OutSETQty = proStockInfoDetail.SETQty;
+ proStockInfoDetail.OutDetailSaleNo = proOutOrderDetail.SaleOrder;
+ outStockInfoDetails.Add(proStockInfoDetail);
+ }
+ else
+ {
+ Dt_ProStockInfoDetail proStockInfoDetail = proStockInfo.proStockInfoDetails.FirstOrDefault();
+ float intervalSet = proStockInfoDetail.StockPcsQty / proStockInfoDetail.SETQty;
+ proStockInfoDetail.OutboundQuantity += Amount;
+ proStockInfoDetail.OutSETQty += (Amount / intervalSet);
+ proOutOrderDetail.LockQtyPcs += Amount;
+ proStockInfoDetail.OutDetailSaleNo = proOutOrderDetail.SaleOrder;
+ outStockInfoDetails.Add(proStockInfoDetail);
+ }
+ if (proOutOrderDetail.QtyPcs==proOutOrderDetail.LockQtyPcs)
+ {
+ proOutOrderDetail.ProOrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
+ }
+ outStockInfos.Add(proStockInfo);
+ }
+ else
+ {
+ return content.Error("鏈壘鍒版垚鍝佸簱瀛�");
+ }
+ }
+ List<Dt_ProStockInfo> deleteStocks=new List<Dt_ProStockInfo>();
+ List<Dt_ProStockInfoDetail> deleteStockDetails = new List<Dt_ProStockInfoDetail>();
+ List<Dt_ProStockInfo> updateStocks = new List<Dt_ProStockInfo>();
+ List<Dt_ProStockInfoDetail> updateStockDetails = new List<Dt_ProStockInfoDetail>();
+ if (proOutOrderDetail.ProOrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt() && (OverCount+1)== proOutOrder.Details.Count)
+ {
+ proOutOrder.ProOrderStatus=OutOrderStatusEnum.鍑哄簱瀹屾垚.ObjToInt();
+ //鑾峰彇鎵�鏈夊凡鎵爜寰呭彂璐х殑搴撳瓨
+ List<Dt_ProStockInfo> AllOutStocks = _stockRepository.ProStockInfoRepository.Db.Queryable<Dt_ProStockInfo>()
+ .Where(x => x.ShipmentOrder == proOutOrder.ProOutOrderNo && x.StockStatus == StockStatusEmun.骞冲簱寰呭彂璐�.ObjToInt())
+ .Includes(x => x.proStockInfoDetails).ToList();
+ AllOutStocks.ForEach(x =>
+ {
+ outStockInfoDetails.AddRange(x.proStockInfoDetails);
+ });
+ outStockInfos.AddRange(AllOutStocks);
+ foreach (var item in outStockInfoDetails)
+ {
+ StockOutItemsItem outItemsItem = new StockOutItemsItem()
+ {
+ PartNum = item.ProductCode,
+ Rev = item.ProductVersion,
+ SoNumber = item.OutDetailSaleNo,
+ BatchNumber = item.BagNo,
+ QtyPcs = item.OutboundQuantity,
+ QtySet = item.OutSETQty
+ };
+ stockOutItems.Add(outItemsItem);
+ if (item.OutboundQuantity == item.StockPcsQty)
+ {
+ Dt_ProStockInfo proStockInfo = outStockInfos.FirstOrDefault(x => x.Id == item.ProStockId);
+ if (proStockInfo != null)
+ {
+ deleteStocks.Add(proStockInfo);
+ deleteStockDetails.Add(item);
+ }
+ else
+ {
+ return content.Error("鏈壘鍒颁笂鎶ョ殑搴撳瓨鏁版嵁");
+ }
+ }
+ if (item.OutboundQuantity < item.StockPcsQty)
+ {
+ Dt_ProStockInfo proStockInfo = outStockInfos.FirstOrDefault(x => x.Id == item.ProStockId);
+ if (proStockInfo != null)
+ {
+ proStockInfo.StockStatus = StockStatusEmun.骞冲簱鍏ュ簱瀹屾垚.ObjToInt();
+ proStockInfo.ShipmentOrder = "";
+ updateStocks.Add(proStockInfo);
+ item.StockPcsQty -= item.OutboundQuantity;
+ item.OutboundQuantity = 0;
+ item.OutSETQty = 0;
+ updateStockDetails.Add(item);
+ }
+ else
+ {
+ return content.Error("鏈壘鍒颁笂鎶ョ殑搴撳瓨鏁版嵁");
+ }
+ }
+ }
+ }
+ Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseId == proOutOrder.WarehouseId);
+ _unitOfWorkManage.BeginTran();
+ if (proOutOrder.ProOrderStatus == OutOrderStatusEnum.鍑哄簱瀹屾垚.ObjToInt())
+ {
+ //鎴愬搧搴撳瓨璁板綍鍙樺姩寰呭姞鍏�
+ ERPProOutOrderModel proOutOrderModel = new ERPProOutOrderModel()
+ {
+ Way = 1,
+ StockOutCode = _outboundService.OutboundOrderService.CreateCodeByRule(nameof(RuleCodeEnum.ProOutCOdeRule)),
+ ConfirmedUserNo = App.User.UserName,
+ AssignUserNo = App.User.UserName,
+ WarehouseCode = warehouse.WarehouseCode,
+ ShipDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+ DeliverplanCode = proOutOrder.ProOutOrderNo,
+ Remark = proOutOrder.Remark,
+ StockOutItems = stockOutItems
+ };
+ _stockRepository.ProStockInfoRepository.DeleteAndMoveIntoHty(deleteStocks, OperateTypeEnum.鑷姩瀹屾垚);
+ _stockRepository.ProStockInfoDetailRepository.DeleteAndMoveIntoHty(deleteStockDetails, OperateTypeEnum.鑷姩瀹屾垚);
+ if (updateStockDetails.Count>0)
+ {
+ _stockRepository.ProStockInfoRepository.UpdateData(updateStocks);
+ updateStockDetails.ForEach(x =>
+ {
+ x.OutDetailSaleNo = "";
+ });
+ _stockRepository.ProStockInfoDetailRepository.UpdateData(updateStockDetails);
+ }
+ string response = _invokeERPService.InvokeProOutApi(proOutOrderModel);
+ ErpRequestContent erpRequestContent = response.DeserializeObject<ErpRequestContent>();
+ if (erpRequestContent.res != 1)
+ {
+ throw new Exception("鍚屾ERP澶辫触,閿欒淇℃伅:" + erpRequestContent.Data);
+ }
+ }
+ else
+ {
+ _stockRepository.ProStockInfoRepository.UpdateData(outStockInfos);
+ _stockRepository.ProStockInfoDetailRepository.UpdateData(outStockInfoDetails);
+ _outboundRepository.ProOutOrderDetailRepository.UpdateData(proOutOrderDetail);
+ _outboundRepository.ProOutOrderRepository.UpdateData(proOutOrder);
+ }
+ _unitOfWorkManage.CommitTran();
+ content.OK("鎴愬姛");
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ content.Error(ex.Message);
+ }
+ return content;
+ }
/// <summary>
/// 澶勭悊鍑哄簱鏁版嵁
/// </summary>
@@ -146,6 +344,13 @@
{
_unitOfWorkManage.BeginTran();
+ //鑾峰彇鎴愬搧鍑哄簱鍗曚富琛�
+ Dt_ProOutOrder proOutOrder = _outboundRepository.ProOutOrderRepository.QueryFirst(x => x.Id == proOutOrderDetails.FirstOrDefault().ProOrderId);
+ if (proOutOrder!=null && proOutOrder.ProOrderStatus == OutOrderStatusEnum.鏈紑濮�.ObjToInt())
+ {
+ proOutOrder.ProOrderStatus = OutOrderStatusEnum.鍑哄簱涓�.ObjToInt();
+ _outboundRepository.ProOutOrderRepository.UpdateData(proOutOrder);
+ }
BaseDal.AddData(tasks);
if (proStockInfos != null && proStockInfos.Count > 0 && proOutOrderDetails != null && proOutOrderDetails.Count > 0 && outProStockInfos != null && outProStockInfos.Count > 0 && locationInfos != null && locationInfos.Count > 0)
{
@@ -163,13 +368,6 @@
}
else if (proOutOrderDetails != null && proOutOrderDetails.Count > 0)
{
- //鑾峰彇鎴愬搧鍑哄簱鍗曚富琛�
- Dt_ProOutOrder proOutOrder = _outboundRepository.ProOutOrderRepository.QueryFirst(x => x.Id == proOutOrderDetails.FirstOrDefault().ProOrderId);
- if (proOutOrder.ProOrderStatus == OutOrderStatusEnum.鏈紑濮�.ObjToInt())
- {
- proOutOrder.ProOrderStatus = OutOrderStatusEnum.鍑哄簱涓�.ObjToInt();
- _outboundRepository.ProOutOrderRepository.UpdateData(proOutOrder);
- }
proOutOrderDetails.ForEach(x =>
{
x.ProOrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
@@ -224,7 +422,9 @@
{
x.Status = OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt();
});
-
+ string groupId = DateTime.Now.ToString("yyyyMMddHHmmss");
+ tasks.ForEach(x => x.OrderNo = proOutOrder.ProOutOrderNo);
+ tasks.ForEach(x => x.GroupId = groupId);
proStockInfos = result.Item1;
proOutOrderDetails = result.Item2;
outProStockInfos = result.Item3;
--
Gitblit v1.9.3