From 28e67084df6e36f7b3ac3b914d97fa51acb21f8f Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期五, 06 二月 2026 18:22:31 +0800
Subject: [PATCH] 1
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs | 147 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 107 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 1d2c31f..965212f 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"
@@ -103,8 +103,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($"鏈壘鍒板嚭搴撳崟淇℃伅");
@@ -113,21 +115,17 @@
{
return WebResponseContent.Instance.Error($"鏈壘鍒板嚭搴撳崟鏄庣粏淇℃伅");
}
- if (outboundOrder.OrderStatus != (int)OutOrderStatusEnum.鏈紑濮�)
- {
- return WebResponseContent.Instance.Error($"璇ヨ鍗曠姸鎬佷笉鍏佽淇敼");
- }
List<Dt_OutboundOrderDetail> outboundOrderDetails = new List<Dt_OutboundOrderDetail>();
List<Dt_OutboundOrderDetail> updateoutboundOrderDetails = new List<Dt_OutboundOrderDetail>();
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)
{
@@ -147,46 +145,73 @@
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;
-
- if (materielInfos.Any())
- {
- outboundOrderDetail.MaterielName = materielInfos.FirstOrDefault(x => x.MaterielCode == item.MaterielCode)?.MaterielName ?? "";
- }
-
- outboundOrderDetails.Add(outboundOrderDetail);
- }
- else
- {
- 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())
+
+ outboundOrderDetail.MaterielName = materielInfos.FirstOrDefault(x => x.MaterielCode == item.MaterielCode)?.MaterielName ?? "";
+ outboundOrderDetails.Add(outboundOrderDetail);
+ }
+ else
+ {
+ #region 閿佸畾鐘舵�佷笅闈炴暟閲忓瓧娈典竴鑷存�ф牎楠�
+ if (outboundOrderDetail.LockQuantity != 0)
{
- outboundOrderDetail.MaterielName = materielInfos.FirstOrDefault(x => x.MaterielCode == item.MaterielCode)?.MaterielName ?? "";
+ var isFieldChanged = !string.Equals(outboundOrderDetail.MaterielCode, item.MaterielCode)
+ || !string.Equals(outboundOrderDetail.SupplyCode, item.SupplyCode)
+ || !string.Equals(outboundOrderDetail.BatchNo, item.BatchNo)
+ || !string.Equals(outboundOrderDetail.Unit, item.Unit)
+ || !string.Equals(outboundOrderDetail.WarehouseCode, item.WarehouseCode)
+ || !string.Equals(outboundOrderDetail.lineNo, item.lineNo)
+ || outboundOrderDetail.MoveQty != item.MoveQty;
+
+ if (isFieldChanged)
+ {
+ return WebResponseContent.Instance.Error($"琛屽彿{item.lineNo}宸查攣瀹氬嚭搴擄紙閿佸畾鏁伴噺锛歿outboundOrderDetail.LockQuantity}锛夛紝浠呭厑璁镐慨鏀硅鍗曟暟閲忥紝绂佹淇敼鐗╂枡/鎵规/浠撳簱绛夊叾浠栦俊鎭�");
+ }
}
+ #endregion
+
+ #region 鍘熸湁鏁伴噺鏍￠獙閫昏緫淇濈暀
+ if (item.OrderQuantity < outboundOrderDetail.LockQuantity + outboundOrderDetail.MoveQty)
+ {
+ return WebResponseContent.Instance.Error($"淇敼鐨勮鍙穥item.lineNo}鏁伴噺瓒呰繃浜嗘櫤浠撳嚭搴撻攣瀹氭暟閲忓姞涓婃尓鏂欐暟閲忥紝涓嶅厑璁镐慨鏀�");
+ }
+ #endregion
+
+ #region 瀛楁璧嬪�奸�昏緫锛氶攣瀹氱姸鎬佷粎鏀规暟閲忥紝鏈攣瀹氬垯鍏ㄩ噺鏇存柊
+ if (outboundOrderDetail.LockQuantity == 0)
+ {
+ 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;
+
+ 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;
+ }
+ 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,14 +223,22 @@
_unitOfWorkManage.BeginTran();
foreach (var item in deletePurchaseOrderDetails)
{
- // _outboundOrderDetailRepository.DeleteAndMoveIntoHty(item, OperateTypeEnum.鑷姩鍒犻櫎);
+ if (item.LockQuantity > 0)
+ {
+ return WebResponseContent.Instance.Error($"鍘熷崟鎹鍙穥item.lineNo}宸茬粡閿佸畾鍑哄簱锛屼笉鍏佽鍒犻櫎锛岃閲嶆柊鏇存敼鏁版嵁鎺ㄩ��");
+ }
_outboundOrderDetailRepository.DeleteData(item);
}
_outboundOrderDetailRepository.UpdateData(updateoutboundOrderDetails);
_outboundOrderDetailRepository.AddData(outboundOrderDetails);
+ if (outboundOrder.Details.All(x => x.OverOutQuantity >= x.OrderQuantity - x.MoveQty))
+ {
+ outboundOrder.OrderStatus = (int)OutOrderStatusEnum.鍑哄簱瀹屾垚;
+ }
BaseDal.UpdateData(outboundOrder);
+
_unitOfWorkManage.CommitTran();
return WebResponseContent.Instance.OK();
@@ -389,7 +422,41 @@
if (returnToMESStatusParam != null && !string.IsNullOrEmpty(returnToMESStatusParam.Value?.ToString()))
{
string returnToMESStatus = returnToMESStatusParam.Value.ToString().Trim();
- sugarQueryable1 = sugarQueryable1.Where(x => x.OrderStatus.Equals(returnToMESStatus));
+ sugarQueryable1 = sugarQueryable1.Where(x => x.ReturnToMESStatus.Equals(returnToMESStatus));
+ }
+
+ var createDateParams = searchParametersList
+ .Where(x => x.Name.Equals("createDate", StringComparison.OrdinalIgnoreCase)
+ && !string.IsNullOrEmpty(x.Value?.ToString()))
+ .ToList();
+
+ DateTime? minCreateDate = null;
+ DateTime? maxCreateDate = null;
+
+ foreach (var dateParam in createDateParams)
+ {
+ if (DateTime.TryParse(dateParam.Value.ToString(), out DateTime dateValue))
+ {
+ LinqExpressionType expressionType = dateParam.DisplayType.GetLinqCondition();
+ switch (expressionType)
+ {
+ case LinqExpressionType.ThanOrEqual:
+ minCreateDate = dateValue;
+ break;
+ case LinqExpressionType.LessThanOrEqual:
+ maxCreateDate = dateValue;
+ break;
+ }
+ }
+ }
+
+ if (minCreateDate.HasValue)
+ {
+ sugarQueryable1 = sugarQueryable1.Where(x => x.CreateDate >= minCreateDate.Value);
+ }
+ if (maxCreateDate.HasValue)
+ {
+ sugarQueryable1 = sugarQueryable1.Where(x => x.CreateDate <= maxCreateDate.Value);
}
}
}
--
Gitblit v1.9.3