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

Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

Browse Source
This commit is contained in:
马健
2024-10-11 15:42:47 +08:00
parent c02f9216d5 ffc93851fe
commit 1fdb2c8861
4 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
View File

@@ -2491,6 +2491,8 @@ namespace Tnb.ProductionMgr
bindCarryCodeInput.material_id = prdMoTask.material_id;
bindCarryCodeInput.material_code = basMaterial.code;
bindCarryCodeInput.material_name = basMaterial.name;
bindCarryCodeInput.material_specification = basMaterial.material_specification;
bindCarryCodeInput.container_no = basMaterial.material_standard;
bindCarryCodeInput.location_id = location.id;
bindCarryCodeInput.location_code = location.location_code;
bindCarryCodeInput.code_batch = report.batch;

8
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/BindCarryCodeInput.cs
View File

@@ -15,6 +15,14 @@ namespace Tnb.WarehouseMgr.Entities.Dto.Inputs
public string material_id { get; set; }
public string material_code { get; set; }
public string material_name { get; set; }
/// <summary>
/// 规格型号
/// </summary>
public string? material_specification { get; set; }
/// <summary>
/// 箱号
/// </summary>
public string? container_no { get; set; }
public string location_id { get; set; } = "";
public string location_code { get; set; } = "";
public string code_batch { get; set; }

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

@@ -3137,6 +3137,8 @@ namespace Tnb.WarehouseMgr
Log.Information($"_userManager.LoginType={loginType}");
*/ //更新业务主表的单据状态
string carryStatus = ((int)EnumCarryStatus.空闲).ToString();
string isCheck = ((int)EnumCheckConclusion.待检).ToString();
foreach (WmsDistaskH? dt in disTasks)
{
AddOutinStockDetailInput addOutinStockDetailInput = new AddOutinStockDetailInput();
@@ -3193,10 +3195,16 @@ namespace Tnb.WarehouseMgr
}
await _db.Updateable<WmsCarryH>()
.SetColumns(x => x.carry_status == ((int)EnumCarryStatus.空闲).ToString())
.SetColumns(x => x.is_check == ((int)EnumCheckConclusion.待检).ToString())
.SetColumns(x => x.carry_status == carryStatus)
.Where(x => clearCarryIds.Contains(x.id))
.ExecuteCommandAsync();
Logger.Information($"【TaskComplate】 更新载具状态 {JsonConvert.SerializeObject(clearCarryIds)}成功");
await _db.Updateable<WmsCarryH>()
.SetColumns(x => x.is_check == isCheck)
.Where(x => clearCarryIds.Contains(x.id))
.ExecuteCommandAsync();
Logger.Information($"【TaskComplate】 更新载具检验 {JsonConvert.SerializeObject(clearCarryIds)}成功");
//await QTRK2BIP(dt, db);
// require_code是任务单

2
WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs
View File

@@ -326,6 +326,8 @@ namespace Tnb.WarehouseMgr
wmsCarryCode.material_id = input.material_id;
wmsCarryCode.material_code = input.material_code;
wmsCarryCode.material_name = input.material_name;
wmsCarryCode.material_specification = input.material_specification;
wmsCarryCode.container_no = input.container_no;
wmsCarryCode.location_id = input.location_id;
wmsCarryCode.location_code = input.location_code;
wmsCarryCode.code_batch = input.code_batch;