wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
alex
2023-06-26 11:53:13 +08:00
parent d7c43a8c51
commit 5a631cf414
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsSetsortingH.part.cs
View File

@@ -16,5 +16,5 @@ public partial class WmsSetsortingH
public string? carry_id { get; set; } public string? carry_id { get; set; }
[SugarColumn(IsIgnore = true)] [SugarColumn(IsIgnore = true)]
public string? carry_code { get; get; } public string? carry_code { get; set; }
} }

1
WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs
View File

@@ -83,6 +83,7 @@ namespace Tnb.WarehouseMgr
{ {
var carryCodesPart = await _db.Queryable<WmsCarryH>().InnerJoin<WmsCarryCode>((a, b) => a.id == b.carry_id) var carryCodesPart = await _db.Queryable<WmsCarryH>().InnerJoin<WmsCarryCode>((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.占用) .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<WmsCarryCode>() .Select<WmsCarryCode>()
.ToListAsync(); .ToListAsync();
if (carryCodesPart?.Count > 0) if (carryCodesPart?.Count > 0)

12
WarehouseMgr/Tnb.WarehouseMgr/WmsSetSortingService.cs
View File

@@ -160,16 +160,16 @@ namespace Tnb.WarehouseMgr
preTask.carry_code = carry.carry_code; preTask.carry_code = carry.carry_code;
preTask.area_id = sPoint?.area_id!; preTask.area_id = sPoint?.area_id!;
preTask.area_code = it.Key; preTask.area_code = it.Key;
preTask.require_id = input.data["ReturnIdentity"].ToString(); preTask.require_id = "";
preTask.require_code = input.data[nameof(preTask.bill_code)]?.ToString()!; preTask.require_code = "";
preTask.create_id = _userManager.UserId; preTask.create_id = _userManager.UserId;
preTask.create_time = DateTime.Now; preTask.create_time = DateTime.Now;
return preTask; return preTask;
}).ToList(); }).ToList();
if (loc.is_sign == 0) //if (loc.is_sign == 0)
{ //{
curPreTasks[^1].is_sign = 0; // 修改最后一个元素的是否签收值 // curPreTasks[^1].is_sign = 0; // 修改最后一个元素的是否签收值
} //}
preTasks.AddRange(curPreTasks); preTasks.AddRange(curPreTasks);
} }