From b1a419c2886666934da6499ee552516d0769562e Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期四, 16 四月 2026 13:40:56 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs | 168 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 128 insertions(+), 40 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs"
index 4319e11..94bcead 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs"
@@ -29,7 +29,9 @@
private readonly ILogger<OutboundOrderService> _logger;
private readonly IRepository<Dt_OutboundOrderDetail> _outboundOrderDetailRepository;
private readonly IMaterialUnitService _materialUnitService;
- public OutboundOrderService(IRepository<Dt_OutboundOrder> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IRepository<Dt_OutboundOrderDetail> outboundOrderDetailRepository, ILogger<OutboundOrderService> logger, IMaterialUnitService materialUnitService, IMaterielInfoService materielInfoService) : base(BaseDal)
+ private readonly IRepository<Dt_OutStockLockInfo> _outStockLockInfoRepository;
+ private readonly IFeedbackMesService _feedbackMesService;
+ public OutboundOrderService(IRepository<Dt_OutboundOrder> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IRepository<Dt_OutboundOrderDetail> outboundOrderDetailRepository, ILogger<OutboundOrderService> logger, IMaterialUnitService materialUnitService, IMaterielInfoService materielInfoService, IRepository<Dt_OutStockLockInfo> outStockLockInfoRepository, IFeedbackMesService feedbackMesService) : base(BaseDal)
{
_mapper = mapper;
_unitOfWorkManage = unitOfWorkManage;
@@ -37,6 +39,8 @@
_logger = logger;
_materialUnitService = materialUnitService;
_materielInfoService = materielInfoService;
+ _outStockLockInfoRepository = outStockLockInfoRepository;
+ _feedbackMesService = feedbackMesService;
}
private int[] OrderTypes = new int[] { (int)InOrderTypeEnum.AllocatOutbound, (int)InOrderTypeEnum.InternalAllocat, (int)InOrderTypeEnum.ReCheck };
@@ -103,8 +107,10 @@
{
try
{
-
- var outboundOrder = Db.Queryable<Dt_OutboundOrder>().Where(x => x.UpperOrderNo == model.UpperOrderNo).Includes(x => x.Details).First();
+ var outboundOrder = Db.Queryable<Dt_OutboundOrder>()
+ .Where(x => x.UpperOrderNo == model.UpperOrderNo)
+ .Includes(x => x.Details)
+ .First();
if (outboundOrder == null)
{
return WebResponseContent.Instance.Error($"鏈壘鍒板嚭搴撳崟淇℃伅");
@@ -118,12 +124,12 @@
List<int> detailIds = new List<int>();
var materielCodes = model.Details.Select(x => x.MaterielCode).Distinct().ToList();
- var materielInfos = _materielInfoService.Db.Queryable<Dt_MaterielInfo>().Where(x => materielCodes.Contains(x.MaterielCode)).ToList();
-
+ var materielInfos = _materielInfoService.Db.Queryable<Dt_MaterielInfo>()
+ .Where(x => materielCodes.Contains(x.MaterielCode))
+ .ToList();
foreach (var item in model.Details)
{
-
var outboundOrderDetail = outboundOrder.Details.FirstOrDefault(x => x.lineNo == item.lineNo);
if (outboundOrderDetail == null)
{
@@ -142,51 +148,79 @@
BarcodeQty = item.OrderQuantity,
BarcodeUnit = item.Unit,
};
- var issueoStockResult = await _materialUnitService.ConvertFromToStockAsync(item.MaterielCode, item.BarcodeUnit, item.BarcodeQty);
- item.Unit = issueoStockResult.Unit;
- item.OrderQuantity = issueoStockResult.Quantity;
- var moveissueoStockResult = await _materialUnitService.ConvertFromToStockAsync(item.MaterielCode, item.BarcodeUnit, item.BarcodeMoveQty);
- item.MoveQty = moveissueoStockResult.Quantity;
+ var unitConvertResult = await ConvertUnitAsync(item.MaterielCode, item.BarcodeUnit, item.BarcodeQty, item.BarcodeMoveQty);
+ outboundOrderDetail.Unit = unitConvertResult.Unit;
+ outboundOrderDetail.OrderQuantity = unitConvertResult.OrderQuantity;
+ outboundOrderDetail.MoveQty = unitConvertResult.MoveQty;
- if (materielInfos.Any())
- {
- outboundOrderDetail.MaterielName = materielInfos.FirstOrDefault(x => x.MaterielCode == item.MaterielCode)?.MaterielName ?? "";
- }
-
+ outboundOrderDetail.MaterielName = materielInfos.FirstOrDefault(x => x.MaterielCode == item.MaterielCode)?.MaterielName ?? "";
outboundOrderDetails.Add(outboundOrderDetail);
}
else
{
- if(item.OrderQuantity < outboundOrderDetail.LockQuantity + outboundOrderDetail.MoveQty)
+ var unitConvertResult = await ConvertUnitAsync(item.MaterielCode, item.BarcodeUnit, item.BarcodeQty, item.BarcodeMoveQty);
+ #region 閿佸畾鐘舵�佷笅闈炴暟閲忓瓧娈典竴鑷存�ф牎楠�
+ if (outboundOrderDetail.LockQuantity != 0)
+ {
+ var isFieldChanged = !string.Equals(outboundOrderDetail.MaterielCode, item.MaterielCode)
+ || !string.Equals(outboundOrderDetail.SupplyCode??"", item.SupplyCode??"")
+ || !string.Equals(outboundOrderDetail.BatchNo??"", item.BatchNo??"")
+ || !string.Equals(outboundOrderDetail.Unit, unitConvertResult.Unit)
+ || !string.Equals(outboundOrderDetail.WarehouseCode, item.WarehouseCode)
+ || !string.Equals(outboundOrderDetail.lineNo, item.lineNo)
+ ;
+
+ if (isFieldChanged)
+ {
+ return WebResponseContent.Instance.Error($"琛屽彿{item.lineNo}宸查攣瀹氬嚭搴擄紙閿佸畾鏁伴噺锛歿outboundOrderDetail.LockQuantity}锛夛紝浠呭厑璁镐慨鏀硅鍗曟暟閲忥紝绂佹淇敼鐗╂枡/鎵规/浠撳簱绛夊叾浠栦俊鎭�");
+ }
+ else
+ {
+ if(item.MoveQty > (outboundOrderDetail.OrderQuantity - outboundOrderDetail.LockQuantity))
+ {
+ return WebResponseContent.Instance.Error($"琛屽彿{item.lineNo}鎸枡鏁伴噺涓嶈兘瓒呰繃鍓╀笅鐨勮鍗曟暟閲弡outboundOrderDetail.OrderQuantity - outboundOrderDetail.LockQuantity}");
+ }
+ outboundOrderDetail.MoveQty = item.MoveQty;
+ }
+ }
+ #endregion
+
+ #region 鍘熸湁鏁伴噺鏍￠獙閫昏緫淇濈暀
+ if (item.OrderQuantity < outboundOrderDetail.LockQuantity + outboundOrderDetail.MoveQty)
{
return WebResponseContent.Instance.Error($"淇敼鐨勮鍙穥item.lineNo}鏁伴噺瓒呰繃浜嗘櫤浠撳嚭搴撻攣瀹氭暟閲忓姞涓婃尓鏂欐暟閲忥紝涓嶅厑璁镐慨鏀�");
}
- outboundOrderDetail.lineNo = item.lineNo;
- outboundOrderDetail.MaterielCode = item.MaterielCode;
- outboundOrderDetail.SupplyCode = item.SupplyCode;
- outboundOrderDetail.BatchNo = item.BatchNo;
- outboundOrderDetail.Unit = item.Unit;
- outboundOrderDetail.WarehouseCode = item.WarehouseCode;
- outboundOrderDetail.MoveQty = item.MoveQty;
- outboundOrderDetail.OrderQuantity = item.OrderQuantity;
- outboundOrderDetail.BarcodeMoveQty = item.MoveQty;
- outboundOrderDetail.BarcodeQty = item.OrderQuantity;
- outboundOrderDetail.BarcodeUnit = item.Unit;
- var issueoStockResult = await _materialUnitService.ConvertFromToStockAsync(item.MaterielCode, item.BarcodeUnit, item.BarcodeQty);
- outboundOrderDetail.Unit = issueoStockResult.Unit;
- outboundOrderDetail.OrderQuantity = issueoStockResult.Quantity;
- var moveissueoStockResult = await _materialUnitService.ConvertFromToStockAsync(item.MaterielCode, item.BarcodeUnit, item.BarcodeMoveQty);
- outboundOrderDetail.MoveQty = moveissueoStockResult.Quantity;
- if (materielInfos.Any())
+ #endregion
+
+ #region 瀛楁璧嬪�奸�昏緫锛氶攣瀹氱姸鎬佷粎鏀规暟閲忥紝鏈攣瀹氬垯鍏ㄩ噺鏇存柊
+ if (outboundOrderDetail.LockQuantity == 0)
{
- outboundOrderDetail.MaterielName = materielInfos.FirstOrDefault(x => x.MaterielCode == item.MaterielCode)?.MaterielName ?? "";
+ outboundOrderDetail.lineNo = item.lineNo;
+ outboundOrderDetail.MaterielCode = item.MaterielCode;
+ outboundOrderDetail.SupplyCode = item.SupplyCode;
+ outboundOrderDetail.BatchNo = item.BatchNo;
+ outboundOrderDetail.Unit = item.Unit;
+ outboundOrderDetail.WarehouseCode = item.WarehouseCode;
+ outboundOrderDetail.MoveQty = item.MoveQty;
+ outboundOrderDetail.BarcodeMoveQty = item.MoveQty;
+ outboundOrderDetail.BarcodeQty = item.OrderQuantity;
+ outboundOrderDetail.BarcodeUnit = item.Unit;
+ outboundOrderDetail.Unit = unitConvertResult.Unit;
+ outboundOrderDetail.OrderQuantity = unitConvertResult.OrderQuantity;
+ outboundOrderDetail.MoveQty = unitConvertResult.MoveQty;
}
+ else
+ {
+ outboundOrderDetail.OrderQuantity = item.OrderQuantity;
+ }
+ #endregion
+
+ outboundOrderDetail.MaterielName = materielInfos.FirstOrDefault(x => x.MaterielCode == item.MaterielCode)?.MaterielName ?? "";
updateoutboundOrderDetails.Add(outboundOrderDetail);
detailIds.Add(outboundOrderDetail.Id);
}
}
-
outboundOrder.UpperOrderNo = model.UpperOrderNo;
outboundOrder.BusinessType = model.BusinessType;
@@ -198,22 +232,25 @@
_unitOfWorkManage.BeginTran();
foreach (var item in deletePurchaseOrderDetails)
{
- if(item.LockQuantity > 0)
+ if (item.LockQuantity > 0)
{
return WebResponseContent.Instance.Error($"鍘熷崟鎹鍙穥item.lineNo}宸茬粡閿佸畾鍑哄簱锛屼笉鍏佽鍒犻櫎锛岃閲嶆柊鏇存敼鏁版嵁鎺ㄩ��");
}
- // _outboundOrderDetailRepository.DeleteAndMoveIntoHty(item, OperateTypeEnum.鑷姩鍒犻櫎);
_outboundOrderDetailRepository.DeleteData(item);
}
_outboundOrderDetailRepository.UpdateData(updateoutboundOrderDetails);
_outboundOrderDetailRepository.AddData(outboundOrderDetails);
- if(outboundOrder.Details.All(x => x.OverOutQuantity >= x.OrderQuantity - x.MoveQty))
+ var realLatestDetails = Db.Queryable<Dt_OutboundOrderDetail>().Where(x => x.OrderId == outboundOrder.Id).ToList();
+
+ if (realLatestDetails.All(x => x.OverOutQuantity >= x.OrderQuantity - x.MoveQty))
{
outboundOrder.OrderStatus = (int)OutOrderStatusEnum.鍑哄簱瀹屾垚;
+ BaseDal.UpdateData(outboundOrder);
+ _feedbackMesService.OutboundFeedback(outboundOrder.OrderNo);
}
- BaseDal.UpdateData(outboundOrder);
+
_unitOfWorkManage.CommitTran();
return WebResponseContent.Instance.OK();
@@ -275,6 +312,19 @@
return WebResponseContent.Instance.OK(null, order);
}
+
+ /// <summary>
+ /// 鏍规嵁鎵樼洏鍙疯幏鍙栧崟鎹紪鍙�
+ /// </summary>
+ public WebResponseContent GetOrderNoByPalletCode(string palletCode)
+ {
+ var orderNo = _outStockLockInfoRepository.QueryData(x => x.PalletCode == palletCode).Select(x=>x.OrderNo).FirstOrDefault();
+ if(string.IsNullOrWhiteSpace(orderNo))
+ {
+ return WebResponseContent.Instance.Error($"璇ユ墭鐩榹palletCode}宸叉嫞閫夊畬");
+ }
+ return WebResponseContent.Instance.OK(data: orderNo);
+ }
static object lock_code = new object();
public string CreateCodeByRule(string ruleCode)
@@ -400,6 +450,23 @@
sugarQueryable1 = sugarQueryable1.Where(x => x.ReturnToMESStatus.Equals(returnToMESStatus));
}
+ var businessTypeParam = searchParametersList.FirstOrDefault(x =>
+ x.Name.Equals(nameof(Dt_OutboundOrder.BusinessType).FirstLetterToLower(), StringComparison.OrdinalIgnoreCase));
+ if (businessTypeParam != null && !string.IsNullOrEmpty(businessTypeParam.Value?.ToString()))
+ {
+ string businessType = businessTypeParam.Value.ToString().Trim();
+ sugarQueryable1 = sugarQueryable1.Where(x => x.BusinessType.Equals(businessType));
+ }
+
+ var departmentNameParam = searchParametersList.FirstOrDefault(x =>
+ x.Name.Equals("departmentName", StringComparison.OrdinalIgnoreCase));
+ if (departmentNameParam != null && !string.IsNullOrEmpty(departmentNameParam.Value?.ToString()))
+ {
+ string departmentName = departmentNameParam.Value.ToString().Trim();
+ sugarQueryable1 = sugarQueryable1.Where(x =>
+ x.DepartmentName.Contains(departmentName));
+ }
+
var createDateParams = searchParametersList
.Where(x => x.Name.Equals("createDate", StringComparison.OrdinalIgnoreCase)
&& !string.IsNullOrEmpty(x.Value?.ToString()))
@@ -444,5 +511,26 @@
return new PageGridData<Dt_OutboundOrder>(totalCount, data);
}
+
+
+ private async Task<UnitConvertResult> ConvertUnitAsync(string materielCode, string barcodeUnit, decimal barcodeQty, decimal barcodeMoveQty)
+ {
+ var issueoStockResult = await _materialUnitService.ConvertFromToStockAsync(materielCode, barcodeUnit, barcodeQty);
+ var moveissueoStockResult = await _materialUnitService.ConvertFromToStockAsync(materielCode, barcodeUnit, barcodeMoveQty);
+
+ return new UnitConvertResult
+ {
+ Unit = issueoStockResult.Unit,
+ OrderQuantity = issueoStockResult.Quantity,
+ MoveQty = moveissueoStockResult.Quantity
+ };
+ }
+
+ private class UnitConvertResult
+ {
+ public string Unit { get; set; }
+ public decimal OrderQuantity { get; set; }
+ public decimal MoveQty { get; set; }
+ }
}
}
--
Gitblit v1.9.3