From f2392d984123a1402d6c9bab9e5452c7becc8d22 Mon Sep 17 00:00:00 2001
From: 雷神教育集团 <2244205553@qq.com>
Date: 星期五, 06 三月 2026 09:10:48 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/LongDeLiLiKu
---
项目代码/WMS/WMSServices/WIDESEA_TaskInfoService/MesTaskService.cs | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/MesTaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/MesTaskService.cs"
index 5d2fb42..1135b03 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/MesTaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/MesTaskService.cs"
@@ -244,13 +244,9 @@
return content.Error($"鏈壘鍒版潯鐮亄returnMaterial.BarCode}鐗╂枡淇℃伅");
}
//鍒ゆ柇
- if (returnMaterial.Thickness <= 0 && materielInfo.WarehouseId==WarehouseEnum.LLDYL.ObjToInt())
+ if ((returnMaterial.Thickness <= 0 || returnMaterial.Wide <= 0)&& materielInfo.WarehouseId==WarehouseEnum.LLDYL.ObjToInt())
{
- return content.Error($"鐗╂枡{returnMaterial.MaterialCode}鏉＄爜{returnMaterial.BarCode}鐩村緞涓嶈兘灏忎簬0");
- }
- if (returnMaterial.Wide <= 0 && materielInfo.WarehouseId == WarehouseEnum.LLDYL.ObjToInt())
- {
- return content.Error($"鐗╂枡{returnMaterial.MaterialCode}鏉＄爜{returnMaterial.BarCode}鐩村緞涓嶈兘灏忎簬0");
+ return content.Error($"鐗╂枡{returnMaterial.MaterialCode}鏉＄爜{returnMaterial.BarCode}鐩村緞鎴栧箙瀹戒笉鑳藉皬浜�0");
}
Dt_StockInfo? stockInfoOld = stockInfosOld.FirstOrDefault(x => x.PalletCode == returnMaterial.BarCode);
if (stockInfoOld != null)
--
Gitblit v1.9.3