From 070b9f3ea747fc763f999e4cc6b86b202f48a237 Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期四, 12 三月 2026 18:07:51 +0800
Subject: [PATCH] 1
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 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 abb0346..630dd2c 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"
@@ -166,11 +166,19 @@
|| !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}锛夛紝浠呭厑璁镐慨鏀硅鍗曟暟閲忥紝绂佹淇敼鐗╂枡/鎵规/浠撳簱绛夊叾浠栦俊鎭�");
+ }
+ else
+ {
+ if(item.MoveQty > (outboundOrderDetail.OrderQuantity - outboundOrderDetail.LockQuantity))
+ {
+ return WebResponseContent.Instance.Error($"琛屽彿{item.lineNo}鎸枡鏁伴噺涓嶈兘瓒呰繃鍓╀笅鐨勮鍗曟暟閲弡outboundOrderDetail.OrderQuantity - outboundOrderDetail.LockQuantity}");
+ }
+ outboundOrderDetail.MoveQty = item.MoveQty;
}
}
#endregion
@@ -238,6 +246,7 @@
if (outboundOrder.Details.All(x => x.OverOutQuantity >= x.OrderQuantity - x.MoveQty))
{
outboundOrder.OrderStatus = (int)OutOrderStatusEnum.鍑哄簱瀹屾垚;
+ outboundOrder.ReturnToMESStatus = 1;
}
BaseDal.UpdateData(outboundOrder);
@@ -440,6 +449,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()))
--
Gitblit v1.9.3