From 834294889ab62bafaf034b1b87c2ead961c33476 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 05 十二月 2025 09:37:46 +0800
Subject: [PATCH] 更新最新代码
---
项目代码/WMS/WMSServices/WIDESEA_InboundService/InboundOrderService.cs | 15 +++++++++++++--
1 files changed, 13 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 f4cc385..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"
@@ -16,6 +16,7 @@
using WIDESEA_DTO.ERP;
using WIDESEA_Core.Helper;
using System.Security.Cryptography;
+using WIDESEA_Common.WareHouseEnum;
namespace WIDESEA_InboundService
{
@@ -55,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)
{
//鍒ゆ柇閲嶅鎻掑叆
@@ -71,8 +73,17 @@
inboundOrderDetails.ForEach(x =>
{
Dt_MaterielInfo? materielInfo = materielInfos.FirstOrDefault(t => t.MaterielCode == x.MaterialCode);
+ if (warehouse.WarehouseCode==WarehouseEnum.LLDYL.ToString() && x.MaterialThick<= 0)
+ {
+ 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;
});
inboundOrder.Details = inboundOrderDetails;
inboundOrder.WarehouseId = warehouse.WarehouseId;
--
Gitblit v1.9.3