From 5a631cf41474048c961394589b959aa60d315a09 Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 26 Jun 2023 11:53:13 +0800 Subject: [PATCH] 1 --- .../Entity/WmsSetsortingH.part.cs | 2 +- WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs | 1 + .../Tnb.WarehouseMgr/WmsSetSortingService.cs | 12 ++++++------ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsSetsortingH.part.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsSetsortingH.part.cs index 80521163..0d34f784 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsSetsortingH.part.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsSetsortingH.part.cs @@ -16,5 +16,5 @@ public partial class WmsSetsortingH public string? carry_id { get; set; } [SugarColumn(IsIgnore = true)] - public string? carry_code { get; get; } + public string? carry_code { get; set; } } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs index 86751b41..bc14c2ee 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs @@ -83,6 +83,7 @@ namespace Tnb.WarehouseMgr { var carryCodesPart = await _db.Queryable().InnerJoin((a, b) => a.id == b.carry_id) .Where((a, b) => b.material_id == os.material_id && a.is_lock == 0 && !string.IsNullOrEmpty(a.location_id) && a.status == (int)EnumCarryStatus.占用) + .WhereIF(!string.IsNullOrEmpty(os.code_batch), (a, b) => b.code_batch == os.code_batch) .Select() .ToListAsync(); if (carryCodesPart?.Count > 0) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsSetSortingService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsSetSortingService.cs index 49bbb708..df287f5a 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsSetSortingService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsSetSortingService.cs @@ -160,16 +160,16 @@ namespace Tnb.WarehouseMgr preTask.carry_code = carry.carry_code; preTask.area_id = sPoint?.area_id!; preTask.area_code = it.Key; - preTask.require_id = input.data["ReturnIdentity"].ToString(); - preTask.require_code = input.data[nameof(preTask.bill_code)]?.ToString()!; + preTask.require_id = ""; + preTask.require_code = ""; preTask.create_id = _userManager.UserId; preTask.create_time = DateTime.Now; return preTask; }).ToList(); - if (loc.is_sign == 0) - { - curPreTasks[^1].is_sign = 0; // 修改最后一个元素的是否签收值 - } + //if (loc.is_sign == 0) + //{ + // curPreTasks[^1].is_sign = 0; // 修改最后一个元素的是否签收值 + //} preTasks.AddRange(curPreTasks); }