From 867aba2636e34a1050b1c4c84bbe78cc9c39b553 Mon Sep 17 00:00:00 2001 From: wankeda <Administrator@DESKTOP-HAU3ST3> Date: 星期六, 22 三月 2025 15:11:11 +0800 Subject: [PATCH] 1 --- 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs | 13 +------------ 1 files changed, 1 insertions(+), 12 deletions(-) diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs" index a8c5962..e002b95 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs" @@ -73,7 +73,7 @@ { x.Status = 0; x.OrderNo = inboundOrder.OrderNo; - x.MaterielName = materielInfos.FirstOrDefault(v => v.MaterielCode == x.MaterielCode)?.MaterielName ?? ""; + //x.MaterielName = materielInfos.FirstOrDefault(v => v.MaterielCode == x.MaterielCode)?.MaterielName ?? ""; x.StockId = stockInfo.Id != 0 ? stockInfo.Id : 0; }); if (stockInfo.Id == 0) @@ -175,17 +175,6 @@ if (materielInfos.Count != materielCodes.Count) { return (false, "鏈夌墿鏂欎俊鎭湭褰曞叆锛岃褰曞叆鐗╂枡淇℃伅", materielGroupDTO); - } - - if (materielCodes.Count > 1 && materielInfos.FirstOrDefault(x => !x.IsMixMateriel) != null) - { - return (false, "鏈夌墿鏂欎笉鍙贩鏂欑粍鐩�", materielGroupDTO); - } - - List<string> batchs = matSerialNumberDTOs.GroupBy(x => x.BatchNo).Select(x => x.Key).ToList(); - if (batchs.Count > 1 && materielInfos.FirstOrDefault(x => !x.IsMixMateriel) != null) - { - return (false, "鏈夌墿鏂欎笉鍙贩鎵圭粍鐩�", materielGroupDTO); } if (inboundOrder == null) -- Gitblit v1.9.3