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

增加PC载具物料绑定记录表（载具绑定）、erp调拨订单、报表bug

Browse Source
This commit is contained in:
马健
2024-08-15 16:21:24 +08:00
parent e9795f4cb9
commit 454b39d8f9
8 changed files with 431 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
WarehouseMgr/Tnb.WarehouseMgr/WmsCarryBindService.cs
View File

@@ -308,7 +308,6 @@ namespace Tnb.WarehouseMgr
db = dbConn;
try
{
WmsCarryH? carry = await db.Queryable<WmsCarryH>().SingleAsync(it => it.carry_code == input.carrycode);
if (carry == null)
{
@@ -316,6 +315,18 @@ namespace Tnb.WarehouseMgr
}
List<WmsCarryCode> WmsCarryCodes = new List<WmsCarryCode>();
WmsCarrybindH wmsCarrybindH = new WmsCarrybindH();
wmsCarrybindH.carry_id = carry.id;
wmsCarrybindH.carry_code = carry.carry_code;
wmsCarrybindH.create_id = input.create_id;
wmsCarrybindH.create_time = DateTime.Now;
wmsCarrybindH.org_id = WmsWareHouseConst.AdministratorOrgId;
wmsCarrybindH.location_id = carry.location_id;
wmsCarrybindH.location_code = carry.location_code;
List<WmsCarrybindCode> wmsCarrybindCodes = new List<WmsCarrybindCode>();
foreach (var detail in input.details)
{
var WmsCarryCode = detail.Adapt<WmsCarryCode>();
@@ -325,10 +336,18 @@ namespace Tnb.WarehouseMgr
WmsCarryCode.create_id = input.create_id;
WmsCarryCode.create_time = DateTime.Now;
WmsCarryCodes.Add(WmsCarryCode);
var wmsCarrybindCode = detail.Adapt<WmsCarrybindCode>();
wmsCarrybindCode.carrybind_id = wmsCarrybindH.id;
wmsCarrybindCodes.Add(wmsCarrybindCode);
}
int rows = 0;
if (WmsCarryCodes.Count > 0)
{
rows = await db.Insertable(WmsCarryCodes).ExecuteCommandAsync();
await _db.Insertable(wmsCarrybindH).ExecuteCommandAsync();
await _db.Insertable(wmsCarrybindCodes).ExecuteCommandAsync();
}
if (rows == 0)
{
throw new Exception($"物料列表为空，不能提交绑定,可能的原因;1.需要检查扫码设置(新PDA) 2.未扫到有效的二维码 详细信息:接收到{input.details.Count}个条码 但是成功绑定的条码数量为0个！");
@@ -378,18 +397,33 @@ namespace Tnb.WarehouseMgr
if (carry != null && subCarry != null)
{
// 插入子载具绑定记录
//VisualDevModelDataCrInput visualDevModelCrInput = new() { data = new Dictionary<string, object>() };
//visualDevModelCrInput.data[nameof(WmsCarrybindH.carry_id)] = input.carry_id;
//visualDevModelCrInput.data[nameof(WmsCarrybindH.carry_code)] = input.carry_code;
//visualDevModelCrInput.data[nameof(WmsCarrybindH.membercarry_id)] = input.membercarry_id;
//visualDevModelCrInput.data[nameof(WmsCarrybindH.membercarry_code)] = input.membercarry_code;
//visualDevModelCrInput.data[nameof(WmsCarrybindH.type)] = 0;
//visualDevModelCrInput.data[nameof(WmsCarrybindH.carrystd_id)] = carry.carrystd_id;
////visualDevModelCrInput.data[nameof(WmsCarrybindH.create_id)] = input.create_id;
//visualDevModelCrInput.data[nameof(WmsCarrybindH.create_time)] = DateTime.Now;
//visualDevModelCrInput.data[nameof(WmsCarrybindH.loc)] = 1;
//VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCARRYBIND_ID, true);
//await _runService.Create(templateEntity, visualDevModelCrInput);
WmsCarrybindH wmsCarrybindH = new WmsCarrybindH();
wmsCarrybindH.carry_id = carry.id;
wmsCarrybindH.carry_code = carry.carry_code;
wmsCarrybindH.membercarry_id = input.membercarry_id;
wmsCarrybindH.membercarry_code = input.membercarry_code;
wmsCarrybindH.create_id = input.create_id;
wmsCarrybindH.create_time = DateTime.Now;
wmsCarrybindH.org_id = WmsWareHouseConst.AdministratorOrgId;
wmsCarrybindH.location_id = carry.location_id;
wmsCarrybindH.location_code = carry.location_code;
List<WmsCarrybindCode> wmsCarrybindCodes = new List<WmsCarrybindCode>();
List<WmsCarryCode> WmsCarryCodes = db.Queryable<WmsCarryCode>().Where(r => r.carry_id == input.membercarry_id).ToList();
foreach (var detail in WmsCarryCodes)
{
var wmsCarrybindCode = detail.Adapt<WmsCarrybindCode>();
wmsCarrybindCode.membercarry_id = input.membercarry_id;
wmsCarrybindCode.membercarry_code = input.membercarry_code;
wmsCarrybindCode.carrybind_id = wmsCarrybindH.id;
wmsCarrybindCode.org_id = WmsWareHouseConst.AdministratorOrgId;
wmsCarrybindCodes.Add(wmsCarrybindCode);
}
await db.Insertable(wmsCarrybindH).ExecuteCommandAsync();
await db.Insertable(wmsCarrybindCodes).ExecuteCommandAsync();
WmsCarryD wmsCarryD = new()
{