From 9086b238cd9fbb9fbeae7cab11d59576cd9d2853 Mon Sep 17 00:00:00 2001
From: liulijun <liulijun@hnkhzn.com>
Date: 星期一, 24 十一月 2025 10:27:01 +0800
Subject: [PATCH] 合并
---
项目代码/WMS/WMSServices/WIDESEA_InboundService/InboundOrderService.cs | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundService/InboundOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundService/InboundOrderService.cs"
index 07dfa8c..a615e70 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundService/InboundOrderService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundService/InboundOrderService.cs"
@@ -56,9 +56,10 @@
{
return content.Error($"鍏ュ簱鏉＄爜{nameof(inboundDetailItem.BarCode)}:{inboundDetailItem.BarCode}鐗╂枡:{inboundDetailItem.MaterialCode}涓嶅瓨鍦�");
}
- //鑾峰彇鎵�鏈夐噰璐俊鎭�
+ //鑾峰彇鎵�鏈夊叆搴撲俊鎭�
List<Dt_InboundOrder> inboundOrdersOld = BaseDal.Db.Queryable<Dt_InboundOrder>().Includes(x => x.Details).ToList();
-
+ //鑾峰彇鎵�鏈夊叆搴撴槑缁嗕俊鎭�
+ List<Dt_InboundOrderDetail> inboundOrderDetailsOld = inboundOrdersOld.SelectMany(x=>x.Details).ToList();
if (eRPInboundOrderDTO.OperateType == 1)
{
//鍒ゆ柇閲嶅鎻掑叆
@@ -76,6 +77,10 @@
{
throw new Exception($"鐗╂枡{x.MaterialCode}鏉＄爜{x.BarCode}鐩村緞闇�澶т簬0");
}
+ if (inboundOrderDetailsOld.FirstOrDefault(t=>t.BarCode==x.BarCode)!=null)
+ {
+ throw new Exception($"鍏ュ簱鍗晎inboundOrder.UpperOrderNo}{x.MaterialCode}鏉＄爜{x.BarCode}宸插瓨鍦�");
+ }
x.MaterialName = materielInfo?.MaterielName;
x.Unit = materielInfo?.MaterielUnit;
x.MaterialSpec = materielInfo.MaterielSpec;
--
Gitblit v1.9.3