From 695571c6009ecbc12e7d4a4fb147df7967a1260e Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 07 七月 2025 20:21:19 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs"
index 5bbabf2..7c3db99 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs"
@@ -173,7 +173,9 @@
StockId = stockInfo.Id,
TaskNum = 0,
OrderQuantity = outboundOrderDetail.OrderQuantity,
- Unit = outboundOrderDetail.Unit
+ Unit = outboundOrderDetail.Unit,
+ ProductionDate = stockInfoDetail.ProductionDate,
+ EffectiveDate = stockInfoDetail.EffectiveDate
};
#region 淇敼鍑哄簱鍗�
@@ -266,7 +268,7 @@
Deptno = outboundOrder.DepartmentCode,
Deptname = outboundOrder.DepartmentName,
Createtime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
- Createuser = string.IsNullOrEmpty(Createuser) ? Createuser : "admin",
+ Createuser = Createuser,
Issitem = new List<ERPIssueItemModel>() { issueItemModel },
};
//鏇存柊鍙戞枡鍗曞彿
@@ -298,7 +300,11 @@
DelOutOrder(oldOutboundOrder);
return WebResponseContent.Instance.Error($"鏈壘鍒拌浠撳簱淇℃伅");
}
-
+ if (materielInfo.WarehouseId!= materielInfo.WarehouseId)
+ {
+ DelOutOrder(oldOutboundOrder);
+ return WebResponseContent.Instance.Error($"鐗╂枡{materielInfo}涓嶅睘浜巤warehouse.WarehouseName}");
+ }
if (model.Way == 1)
{
if (oldOutboundOrder != null)
--
Gitblit v1.9.3