From e8042fe43a178ca26fe4fe4f8cf5dedbfc9910fd Mon Sep 17 00:00:00 2001 From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com> Date: 星期四, 03 七月 2025 10:50:24 +0800 Subject: [PATCH] 更新任务查询逻辑以包含条形码在CommonConveyorLineJob.cs和 CommonConveyorLine_GWJob.cs文件中,修改了多个任务查询方法,现支持使用任务号、子设备代码和条形码进行查询。这一改动旨在提高任务查询的准确性。同时,移除了不再需要的注释代码行。 --- Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Boxing/BoxingInfoService.cs | 34 ++++++++++++---------------------- 1 files changed, 12 insertions(+), 22 deletions(-) diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Boxing/BoxingInfoService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Boxing/BoxingInfoService.cs index 2ec48b9..79d8610 100644 --- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Boxing/BoxingInfoService.cs +++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Boxing/BoxingInfoService.cs @@ -12,38 +12,28 @@ public async Task<WebResponseContent> AddBoxingInfoAsync(DtBoxingInfo boxingInfo) { WebResponseContent content = new WebResponseContent(); - // 楠岃瘉妯″瀷閲岄潰鏁版嵁鏄惁鍚堟硶锛屽鏋滀笉鍚堟硶鎶涘嚭寮傚父 - var errors = ValidateModel(boxingInfo); - if (errors.Count > 0) + var info = await BaseDal.QueryFirstAsync(x => x.PalletCode == boxingInfo.PalletCode); + if (!info.IsNullOrEmpty()) { - foreach (var error in errors) - { - Console.WriteLine(error.ErrorMessage); - - } - string errorMessage = string.Join(",", errors.Select(e => e.ErrorMessage)); - content.Error(errorMessage); + content.Error("璇ユ墭鐩樺凡瀛樺湪缁勭洏"); } else { - var info = await BaseDal.QueryFirstAsync(x=>x.PalletCode == boxingInfo.PalletCode); - if (!info.IsNullOrEmpty()) + // 娣诲姞缁勭洏淇℃伅 + var result = await BaseDal.AddDataNavAsync(boxingInfo); + if (result) { - content.Error("璇ユ墭鐩樺凡瀛樺湪缁勭洏"); - } - else - { - // 娣诲姞缁勭洏淇℃伅 - var result = await BaseDal.AddDataNavAsync(boxingInfo); - if (result) - { - content.OK("娣诲姞鎴愬姛", boxingInfo); - } + content.OK("娣诲姞鎴愬姛", boxingInfo); } } return content; } + public override PageGridData<DtBoxingInfo> GetPageData(PageDataOptions options) + { + return base.GetPageData(options); + } + // 楠岃瘉妯″瀷 public static List<ValidationResult> ValidateModel(object model) { -- Gitblit v1.9.3