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

bug处理 料箱出7号线逻辑

Browse Source
This commit is contained in:
马健
2024-05-30 09:44:01 +08:00
parent c4aa174ff9
commit 7bcb2f63eb
11 changed files with 677 additions and 619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs
View File

@@ -8,11 +8,13 @@ using JNPF.Common.Core.Manager;
using JNPF.Common.Dtos.VisualDev;
using JNPF.Common.Enums;
using JNPF.FriendlyException;
using JNPF.Systems.Interfaces.System;
using JNPF.VisualDev;
using JNPF.VisualDev.Entitys;
using JNPF.VisualDev.Interfaces;
using Microsoft.Extensions.Logging;
using SqlSugar;
using Tnb.BasicData;
using Tnb.BasicData.Entities;
using Tnb.ProductionMgr.Entities;
using Tnb.WarehouseMgr.Entities;
@@ -31,14 +33,16 @@ namespace Tnb.WarehouseMgr
private readonly IRunService _runService;
private readonly IVisualDevService _visualDevService;
private readonly IWareHouseService _wareHouseService;
private readonly IBillRullService _billRullService;
public WmsPrdInstockHService(ISqlSugarRepository<WmsCarryH> repository, IRunService runService,
IVisualDevService visualDevService, IWareHouseService wareHouseService)
IVisualDevService visualDevService, IWareHouseService wareHouseService, IBillRullService billRullService)
{
_db = repository.AsSugarClient();
_runService = runService;
_visualDevService = visualDevService;
_wareHouseService = wareHouseService;
_billRullService = billRullService;
}
/// <summary>
@@ -58,16 +62,26 @@ namespace Tnb.WarehouseMgr
// 新建主表
if (prdInstockH == null)
{
VisualDevModelDataCrInput visualDevInput = new VisualDevModelDataCrInput();
visualDevInput.data = new Dictionary<string, object>();
visualDevInput.data.Add("bill_code", "");
string bill_code = await _billRullService.GetBillNumber(CodeTemplateConst.PRDOUTSTOCK_CODE);
visualDevInput.data.Add("status", WmsWareHouseConst.BILLSTATUS_ADD_ID);
WmsPrdInstockH wmsPrdInstockH = new ();
wmsPrdInstockH.create_id = "";
wmsPrdInstockH.create_time = DateTime.Now;
wmsPrdInstockH.prd_bill_code = input.prd_bill_code;
wmsPrdInstockH.bill_code = bill_code;
wmsPrdInstockH.material_id = input.material_id;
wmsPrdInstockH.material_code = input.material_code;
wmsPrdInstockH.material_name = input.material_name;
wmsPrdInstockH.material_spec = input.material_spec;
wmsPrdInstockH.planqty = input.planqty;
wmsPrdInstockH.pqty = input.pqty;
wmsPrdInstockH.rqty = input.rqty;
wmsPrdInstockH.type = input.type;
//wmsPrdInstockH.status = WmsWareHouseConst.BILLSTATUS_ADD_ID;
VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSPRDINSTOCK_ID, true);
await _runService.Create(templateEntity, visualDevInput);
await _db.Insertable(wmsPrdInstockH).ExecuteCommandAsync();
prd_instock_code_id = visualDevInput.data["ReturnIdentity"].ToString() ?? "";
prd_instock_code_id = wmsPrdInstockH.id;
}
else
{
@@ -77,7 +91,7 @@ namespace Tnb.WarehouseMgr
{
pqty = input.pqty,
rqty = input.rqty
}).ExecuteCommandAsync();
}).Where(r => r.id == prd_instock_code_id).ExecuteCommandAsync();
}
List<WmsPrdInstockD> WmsPrdInstockDs = new List<WmsPrdInstockD>();
@@ -154,10 +168,14 @@ namespace Tnb.WarehouseMgr
}
}
WmsCarryH wmsCarryH = await _db.Queryable<WmsCarryH>().Where(r => r.id == wmsPrdInstockD.carry_id).FirstAsync();
// 生成到输送线任务
CommonCreatePretaskInput commonCreatePretaskInput1 = new CommonCreatePretaskInput();
commonCreatePretaskInput1.startlocation_id = startLocation.id;
commonCreatePretaskInput1.endlocation_id = endlocation_ssx.id;
commonCreatePretaskInput1.carry_id = wmsCarryH.id;
commonCreatePretaskInput1.carry_code = wmsCarryH.carry_code;
commonCreatePretaskInput1.task_type = WmsWareHouseConst.WMS_PRETASK_INSTOCK_TYPE_ID;
commonCreatePretaskInput1.biz_type = "";
commonCreatePretaskInput1.require_id = wmsPrdInstockD.id;
@@ -168,10 +186,13 @@ namespace Tnb.WarehouseMgr
CommonCreatePretaskInput commonCreatePretaskInput2 = new CommonCreatePretaskInput();
commonCreatePretaskInput2.startlocation_id = startlocation_id_ssx;
commonCreatePretaskInput2.endlocation_id = endLocation.id;
commonCreatePretaskInput2.carry_id = wmsCarryH.id;
commonCreatePretaskInput2.carry_code = wmsCarryH.carry_code;
commonCreatePretaskInput2.task_type = WmsWareHouseConst.WMS_PRETASK_INSTOCK_TYPE_ID;
commonCreatePretaskInput2.biz_type = WmsWareHouseConst.BIZTYPE_WMSPRDINSTOCK_ID;
commonCreatePretaskInput2.require_id = wmsPrdInstockD.id;
commonCreatePretaskInput2.isExcuteMission = false;
commonCreatePretaskInput1.isChangeCarryLoc2StartLoc = false;
Entities.Dto.Outputs.Result res2 = await _wareHouseService.CommonCreatePretask(commonCreatePretaskInput2);
}