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

现场问题处理 erp添加unicode

Browse Source
This commit is contained in:
马健
2024-10-28 10:45:24 +08:00
parent fad3f116aa
commit 44128eb79b
5 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/ErpInputs/TransferOutstockInput.cs
View File

@@ -119,5 +119,6 @@ namespace Tnb.WarehouseMgr.Entities.Dto.ErpInputs
/// 辅助属性
/// </summary>
public string auxprop_xph { get; set; }
public string udi_code { get; set; }
}
}

1
WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTransferInstockD .cs
View File

@@ -135,5 +135,6 @@ public partial class WmsTransferInstockD : BaseEntity<string>
/// 辅助属性 小批号
/// </summary>
public string auxprop_xph { get; set; }
public string udi_code { get; set; }
}

3
WarehouseMgr/Tnb.WarehouseMgr/ErpToWmsService.cs
View File

@@ -1686,7 +1686,8 @@ namespace Tnb.WarehouseMgr
throw new AppFriendlyException($@"表体明细中组织{detail.auxprop_gys}在wms系统中未找到！", 500);
}
wmsTransferInstockD.auxprop_xph = detail.auxprop_xph;
wmsTransferInstockD.udi_code = detail.udi_code;
wmsTransferInstockDs.Add(wmsTransferInstockD);
}

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

@@ -3159,17 +3159,19 @@ namespace Tnb.WarehouseMgr
carry.carrystd_id == WmsWareHouseConst.CARRY_ZYLJSTD_ID)
{
}
else
else if (carry.carrystd_id == WmsWareHouseConst.CARRY_LJSTD_ID)
{
memberCarryIds = await db.Queryable<WmsCarryD>().Where(x=>x.carry_id==carry.id).Select(x=>x.membercarry_id).ToListAsync();
clearCarryIds.AddRange(memberCarryIds);
await db.Updateable<WmsCarryH>()
.SetColumns(x => x.carry_status == carryStatus)
.SetColumns(x => x.is_check == isCheck)
.Where(x => clearCarryIds.Contains(x.id))
.ExecuteCommandAsync();
}
await db.Updateable<WmsCarryH>()
.SetColumns(x => x.carry_status == carryStatus)
.SetColumns(x => x.is_check == isCheck)
.Where(x => clearCarryIds.Contains(x.id))
.ExecuteCommandAsync();
}
else if (dt.biz_type == "erp_qtrk")
{

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

@@ -95,7 +95,7 @@ namespace Tnb.WarehouseMgr
}
if (wmsCarryH.carry_status != "1")
{
throw new AppFriendlyException($"【ArtificialInstock】载具{input.carry_code}未绑定物料", 500);
throw new AppFriendlyException($"【ArtificialInstock】载具{input.carry_code}未绑定物料，托盘状态不是占用状态", 500);
}
BasLocation carryLoc = await _db.Queryable<BasLocation>().Where(r => r.id == wmsCarryH.location_id).FirstAsync();