diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsRawmatTransferinstockH.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsRawmatTransferinstockH.cs index 1ad0d656..6db08618 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsRawmatTransferinstockH.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsRawmatTransferinstockH.cs @@ -30,12 +30,12 @@ public partial class WmsRawmatTransferinstockH : BaseEntity public string? tel { get; set; } /// - /// 出库组织id + /// bip出库组织vid /// public string? outstockorg_id { get; set; } /// - /// 出库组织编号 + /// bip出库组织id /// public string? outstockorg_code { get; set; } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsRawmatTransferoutstockH.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsRawmatTransferoutstockH.cs index 1b9fab5a..ccf9132c 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsRawmatTransferoutstockH.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsRawmatTransferoutstockH.cs @@ -125,12 +125,12 @@ public partial class WmsRawmatTransferoutstockH : BaseEntity public string? transfer_order_id { get; set; } /// - /// 入库组织id + /// bip入库组织vid /// public string? instockorg_id { get; set; } /// - /// 入库组织编号 + /// bip入库组织id /// public string? instockorg_code { get; set; } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTransferOrderH.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTransferOrderH.cs index 7a208c38..5e2ef47f 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTransferOrderH.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTransferOrderH.cs @@ -90,12 +90,12 @@ public partial class WmsTransferOrderH : BaseEntity public string erp_wh_type { get; set; } /// - /// 入库组织id + /// bip入库组织vid /// public string? instockorg_id { get; set; } /// - /// 入库组织编号 + /// bip入库组织id /// public string? instockorg_code { get; set; } } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTransferOutstockH.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTransferOutstockH.cs index 0fd1eeb2..a31640f7 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTransferOutstockH.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTransferOutstockH.cs @@ -110,12 +110,12 @@ public partial class WmsTransferOutstockH : BaseEntity public string? transfer_order_id { get; set; } /// - /// 入库组织id + /// bip入库组织vid /// public string? instockorg_id { get; set; } /// - /// 入库组织编号 + /// bip入库组织id /// public string? instockorg_code { get; set; } } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/ErpToWmsService.cs b/WarehouseMgr/Tnb.WarehouseMgr/ErpToWmsService.cs index 16e836bb..17610636 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/ErpToWmsService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/ErpToWmsService.cs @@ -1288,6 +1288,17 @@ namespace Tnb.WarehouseMgr wmsTransferOrderH.create_id = WmsWareHouseConst.ErpUserId; wmsTransferOrderH.create_time = DateTime.Now; wmsTransferOrderH.org_id = WmsWareHouseConst.AdministratorOrgId; + var org_erpExtendField = await db.Queryable().Where(a => a.pk_org == input.instockorg_code).FirstAsync(); + if (org_erpExtendField != null) + { + wmsTransferOrderH.instockorg_id = org_erpExtendField.pk_org_v; + wmsTransferOrderH.instockorg_code = org_erpExtendField.pk_org; + } + else + { + _LoggerErp2Mes.LogWarning($@"【TransferOutstock】表头明细中组织{input.instockorg_code}在wms系统中未找到!"); + throw new AppFriendlyException($@"表头明细中组织{input.instockorg_code}在wms系统中未找到!", 500); + } var _erpExtendField = await db.Queryable().InnerJoin((a, b) => a.table_id == b.Id) .Where((a, b) => a.transaction_type_id == input.transaction_type).Select((a, b) => b).FirstAsync(); @@ -1387,6 +1398,8 @@ namespace Tnb.WarehouseMgr wmsRawmatTransferoutstockH.issuance_status = "0"; wmsRawmatTransferoutstockH.transaction_type = _erpExtendField.EnCode; wmsRawmatTransferoutstockH.org_id = WmsWareHouseConst.AdministratorOrgId; + wmsRawmatTransferoutstockH.instockorg_id = org_erpExtendField.pk_org_v; + wmsRawmatTransferoutstockH.instockorg_code = org_erpExtendField.pk_org; List wmsRawmatTransferoutstockDs = new List (); foreach (var detail in details_WAREHOUSE_YCL_ID) { @@ -1441,6 +1454,8 @@ namespace Tnb.WarehouseMgr wmsTransferOutstockH.issuance_status = "0"; wmsTransferOutstockH.transaction_type = _erpExtendField.EnCode; wmsTransferOutstockH.org_id = WmsWareHouseConst.AdministratorOrgId; + wmsTransferOutstockH.instockorg_id = org_erpExtendField.pk_org_v; + wmsTransferOutstockH.instockorg_code = org_erpExtendField.pk_org; List wmsTransferOutstockDs = new List(); foreach (var detail in details_WAREHOUSE_CP_ID) { diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatTransferinstockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatTransferinstockService.cs index e1c8931b..a93db798 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatTransferinstockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatTransferinstockService.cs @@ -70,6 +70,10 @@ namespace Tnb.WarehouseMgr throw new ArgumentNullException(nameof(input)); } + List wmsCarryCodes = await _db.Queryable().Where(r => r.carry_id == input.carryIds[0]).ToListAsync(); + await _db.Updateable().SetColumns(it => new WmsRawmatTransferinstockD { actual_qty = it.actual_qty + wmsCarryCodes.Sum(r => r.codeqty) }) + .Where(it => it.id == input.wmsDistaskH.require_id).ExecuteCommandHasChangeAsync(); + Logger.Information($"进入原材料调拨入库单上传BIP逻辑"); WmsInstockH instock = await _db.Queryable().SingleAsync(x => x.id == input.requireId); List allInstockDetails = await _db.Queryable().Where(it => it.bill_id == input.requireId).ToListAsync();