From b9f8212946fde1af1216b972996c32b8c8ed6363 Mon Sep 17 00:00:00 2001 From: hutongqing <hutongqing@hnkhzn.com> Date: 星期三, 27 十一月 2024 10:07:34 +0800 Subject: [PATCH] Revert "Stop tracking D:\widesea\尖山立库\JianShanLiKu\代码管理\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoRepository\bin" --- 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs" index b38e66e..233f8ff 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs" @@ -53,7 +53,7 @@ public override WebResponseContent AddData(SaveModel saveModel) { InboundOrderAddDTO orderAddDTO = saveModel.MainData.DicToModel<InboundOrderAddDTO>(); - orderAddDTO.Details = saveModel.DetailData.DicToIEnumerable<InboundOrderDetailAddDTO>(); + //orderAddDTO.Details = saveModel.DetailData.DicToIEnumerable<InboundOrderDetailAddDTO>(); return AddInboundOrder(orderAddDTO); } @@ -95,7 +95,7 @@ /// <returns></returns> private (bool, string, object?) CheckInboundOrderAddData(InboundOrderAddDTO inboundOrderAddDTO) { - (bool, string, object?) result1 = ModelValidate.ValidateModelData(inboundOrderAddDTO); + /*(bool, string, object?) result1 = ModelValidate.ValidateModelData(inboundOrderAddDTO); if (!result1.Item1) return result1; (bool, string, object?) result2 = ModelValidate.ValidateModelData(inboundOrderAddDTO.Details); @@ -105,15 +105,15 @@ if (!inOrderTypes.Contains(inboundOrderAddDTO.OrderType)) { return (false, "鏈壘鍒拌鍗曟嵁绫诲瀷", inboundOrderAddDTO); - } + }*/ - List<string> materielCodes = inboundOrderAddDTO.Details.Select(x => x.MaterielCode).ToList(); + /*List<string> materielCodes = inboundOrderAddDTO.Details.Select(x => x.MaterielCode).ToList(); if (!_basicService.MaterielInfoService.ExsitMateriels(materielCodes)) { return (false, "鏈夌墿鏂欎俊鎭湭褰曞叆锛岃褰曞叆鐗╂枡淇℃伅", inboundOrderAddDTO); - } + }*/ - if (BaseDal.QueryFirst(x => x.UpperOrderNo == inboundOrderAddDTO.UpperOrderNo && !string.IsNullOrEmpty(x.UpperOrderNo)) != null) + if (BaseDal.QueryFirst(x => x.OrderName == inboundOrderAddDTO.orderName && !string.IsNullOrEmpty(x.OrderName)) != null) { return (false, "鍗曟嵁宸插瓨鍦�", inboundOrderAddDTO); } -- Gitblit v1.9.3