From ca5ded8766de8cf6f897d4c988efc8f56949eefb Mon Sep 17 00:00:00 2001 From: zhou keda <1315948824@qq.com> Date: Tue, 24 Sep 2024 17:13:49 +0800 Subject: [PATCH] bug --- .../Tnb.WarehouseMgr/WareHouseService.cs | 2 +- .../Tnb.WarehouseMgr/WmsInStockService.cs | 252 ++++++++++-------- .../WmsMaterialSignHService.cs | 4 +- .../WmsMaterialTransferService.cs | 4 +- .../Tnb.WarehouseMgr/WmsPurchaseDService.cs | 9 +- .../WmsSterilizationInstockHService.cs | 2 +- .../WmsTransferInstockService.cs | 2 +- 7 files changed, 147 insertions(+), 128 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs index dbb2a4b1..d426cd5c 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs @@ -3323,7 +3323,7 @@ namespace Tnb.WarehouseMgr thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN + "uapws/rest/generalin/save"; thirdWebapiRecord.request_data = JsonConvert.SerializeObject(requestData); thirdWebapiRecord.create_time = DateTime.Now; - thirdWebapiRecord.remark = $"原材料转库单wms_material_transfer:{wmsMaterialTransfer.bill_code}"; + thirdWebapiRecord.remark = $"原材料转库单wms_material_transfer:{wmsMaterialTransfer.bill_code},erp转库单:{wmsMaterialTransfer.erp_bill_code}"; await db.Insertable(thirdWebapiRecord).ExecuteCommandAsync(); diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs index beba37b0..61acd0d3 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs @@ -29,6 +29,7 @@ using Tnb.ProductionMgr.Entities.Entity; using Tnb.BasicData; using Tnb.WarehouseMgr.Entities.Entity; using Microsoft.Extensions.Logging; +using Tnb.BasicData.Interfaces; namespace Tnb.WarehouseMgr { @@ -45,6 +46,7 @@ namespace Tnb.WarehouseMgr private readonly IWareHouseService _wareHouseService; private readonly IBillRullService _billRullService; private readonly IPrdInstockService _prdInstockService; + private readonly IThirdApiRecordService _thirdApiRecordService; private static Dictionary _dicBillCodes = new(); public WmsInStockService( ISqlSugarRepository repository, @@ -53,6 +55,7 @@ namespace Tnb.WarehouseMgr IBillRullService billRullService, IWareHouseService wareHouseService, IPrdInstockService prdInstockService, + IThirdApiRecordService thirdApiRecordService, IEventPublisher eventPublisher ) { @@ -61,6 +64,7 @@ namespace Tnb.WarehouseMgr _userManager = userManager; _billRullService = billRullService; _wareHouseService = wareHouseService; + _thirdApiRecordService = thirdApiRecordService; _prdInstockService = prdInstockService; } @@ -328,126 +332,138 @@ namespace Tnb.WarehouseMgr - // WmsTempCode wmsTempCode = await _db.Queryable() - // .LeftJoin((a, b) => a.barcode == b.barcode) - // .Where((a, b) => a.carry_id == input.wmsDistaskH.carry_id) - // .Select((a, b) => b) - // .FirstAsync(); - // - // string purchaseDId = wmsTempCode?.require_id ?? ""; - // WmsPurchaseD wmsPurchaseD = await _db.Queryable().SingleAsync(x => x.id == purchaseDId); - // string purchaseHId = wmsPurchaseD?.bill_id ?? ""; - // WmsPurchaseH wmsPurchaseH = await _db.Queryable().SingleAsync(x => x.id == purchaseHId); - // string wmsPurchaseOrderHId = wmsPurchaseH?.erp_bill_code ?? ""; - // WmsPurchaseOrderH wmsPurchaseOrderH = await _db.Queryable().SingleAsync(x => x.id == wmsPurchaseOrderHId); - // WmsPurchaseOrderD wmsPurchaseOrderDs = await _db.Queryable().FirstAsync(x => x.fk_wms_purchase_order_id == wmsPurchaseOrderHId); - // BasWarehouse basWarehouse = await _db.Queryable().SingleAsync(x=>x.id==instock.warehouse_id); - // - // List materialIds = allInstockDetails.Select(x => x.material_id).Distinct().ToList(); - // List unitCodes = allInstockDetails.Select(x => x.unit_id).Distinct().ToList(); - // List unitDatas = await _db.Queryable() - // .LeftJoin((x, y) => x.Id == y.DictionaryTypeId) - // .Where((x, y) => x.EnCode == DictConst.MeasurementUnit && unitCodes.Contains(y.EnCode)) - // .Select((x, y) => y) - // .ToListAsync(); - // List erpWarehouserelaHs = await _db.Queryable().Where(x=>x.id!=null).ToListAsync(); - // - // DictionaryDataEntity tranType = await _db.Queryable().Where(x=>x.DictionaryTypeId=="25043925951909" && x.EnCode==wmsPurchaseH.transaction_type).FirstAsync(); - // string tranTypeId = tranType?.Id ?? ""; - // string supplierId = wmsPurchaseOrderH?.supplier_id ?? ""; - // List tableIds = new List(); - // tableIds.Add(_userManager.UserId); - // tableIds.Add(WmsWareHouseConst.AdministratorOrgId); - // tableIds.Add(instock.warehouse_id); - // tableIds.AddRange(materialIds); - // tableIds.Add(supplierId); - // tableIds.Add(tranTypeId); - // tableIds.AddRange(unitDatas.Select(x => x.Id).ToList()); - // - // List erpExtendFields = await _db.Queryable().Where(x => tableIds.Contains(x.table_id)).ToListAsync(); + WmsTempCode wmsTempCode = await _db.Queryable() + .LeftJoin((a, b) => a.barcode == b.barcode) + .Where((a, b) => a.carry_id == input.wmsDistaskH.carry_id) + .Select((a, b) => b) + .FirstAsync(); + + string purchaseDId = wmsTempCode?.require_id ?? ""; + //WmsPurchaseD wmsPurchaseD = await _db.Queryable().SingleAsync(x => x.id == purchaseDId); + string purchaseHId = wmsPurchaseD?.bill_id ?? ""; + WmsPurchaseH wmsPurchaseH = await _db.Queryable().SingleAsync(x => x.id == purchaseHId); + string wmsPurchaseOrderHId = wmsPurchaseH?.erp_bill_code ?? ""; + WmsPurchaseOrderH wmsPurchaseOrderH = await _db.Queryable().SingleAsync(x => x.id == wmsPurchaseOrderHId); + WmsPurchaseOrderD wmsPurchaseOrderDs = await _db.Queryable().FirstAsync(x => x.fk_wms_purchase_order_id == wmsPurchaseOrderHId); + BasWarehouse basWarehouse = await _db.Queryable().SingleAsync(x=>x.id==instock.warehouse_id); + + List materialIds = allInstockDetails.Select(x => x.material_id).Distinct().ToList(); + List unitCodes = allInstockDetails.Select(x => x.unit_id).Distinct().ToList(); + List unitDatas = await _db.Queryable() + .LeftJoin((x, y) => x.Id == y.DictionaryTypeId) + .Where((x, y) => x.EnCode == DictConst.MeasurementUnit && unitCodes.Contains(y.EnCode)) + .Select((x, y) => y) + .ToListAsync(); + List erpWarehouserelaHs = await _db.Queryable().Where(x=>x.id!=null).ToListAsync(); + + DictionaryDataEntity tranType = await _db.Queryable().Where(x=>x.DictionaryTypeId=="25043925951909" && x.EnCode==wmsPurchaseH.transaction_type).FirstAsync(); + string tranTypeId = tranType?.Id ?? ""; + string supplierId = wmsPurchaseOrderH?.supplier_id ?? ""; + List tableIds = new List(); + tableIds.Add(_userManager.UserId); + tableIds.Add(WmsWareHouseConst.AdministratorOrgId); + tableIds.Add(instock.warehouse_id); + tableIds.AddRange(materialIds); + tableIds.Add(supplierId); + tableIds.Add(tranTypeId); + tableIds.AddRange(unitDatas.Select(x => x.Id).ToList()); + + List erpExtendFields = await _db.Queryable().Where(x => tableIds.Contains(x.table_id)).ToListAsync(); // string erpCreateId = erpExtendFields.Find(x => x.table_id == instock.create_id)?.user_id ?? ""; - // ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (WmsWareHouseConst.AdministratorOrgId)); - // string nowStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); - // - // List> requestData = new List>(); - // Dictionary erpRequestData = new Dictionary(); - // erpRequestData.Add("approver", erpCreateId); - // erpRequestData.Add("billmaker", erpCreateId); - // erpRequestData.Add("bitinbill", false); - // erpRequestData.Add("cgeneralhid", null); - // erpRequestData.Add("corpoid", erpOrg.corpoid); - // erpRequestData.Add("corpvid", erpOrg.corpvid); - // erpRequestData.Add("creationtime", nowStr); - // erpRequestData.Add("creator", erpCreateId); - // erpRequestData.Add("ctrantypeid", erpExtendFields.Find(x => x.table_id == tranTypeId)?.transaction_type_id ?? ""); - // erpRequestData.Add("cvendorid", erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_id ?? ""); - // erpRequestData.Add("cvendorvid", erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_vid ?? ""); - // // erpRequestData.Add("cwarehouseid", erpExtendFields.Find(x => x.table_id == instock.warehouse_id)?.cotherwhid ?? "");//类型视图里取 + string erpCreateId = WmsWareHouseConst.ERPUSERID; + ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (WmsWareHouseConst.AdministratorOrgId)); + string nowStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + + List> requestData = new List>(); + Dictionary erpRequestData = new Dictionary(); + erpRequestData.Add("approver", erpCreateId); + erpRequestData.Add("billmaker", erpCreateId); + erpRequestData.Add("bitinbill", false); + erpRequestData.Add("cgeneralhid", null); + erpRequestData.Add("corpoid", erpOrg.corpoid); + erpRequestData.Add("corpvid", erpOrg.corpvid); + erpRequestData.Add("creationtime", nowStr); + erpRequestData.Add("creator", erpCreateId); + erpRequestData.Add("ctrantypeid", erpExtendFields.Find(x => x.table_id == tranTypeId)?.transaction_type_id ?? ""); + erpRequestData.Add("cvendorid", erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_id ?? ""); + erpRequestData.Add("cvendorvid", erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_vid ?? ""); + // erpRequestData.Add("cwarehouseid", erpExtendFields.Find(x => x.table_id == instock.warehouse_id)?.cotherwhid ?? "");//类型视图里取 // erpRequestData.Add("cwarehouseid", erpWarehouserelaHs.Find(x => x.erp_warehousecode == wmsPurchaseD.erp_wh_type)?.erp_warehouseid ?? "");//类型视图里取 - // erpRequestData.Add("dbilldate", nowStr); - // erpRequestData.Add("dmakedate", nowStr); - // erpRequestData.Add("fbillflag", 2); - // erpRequestData.Add("fbuysellflag", 2); - // erpRequestData.Add("ntotalnum", allInstockDetails.Sum(x => x.qty)); - // erpRequestData.Add("pk_org", erpOrg.pk_org); - // erpRequestData.Add("pk_org_v", erpOrg.pk_org_v); - // erpRequestData.Add("pk_group", erpOrg.pk_group); - // erpRequestData.Add("vbillcode", instock.bill_code); - // erpRequestData.Add("vtrantypecode", tranType?.EnCode ?? ""); - // - // List> erpRequestDataDetails = new List>(); - // foreach (WmsInstockD item in allInstockDetails) - // { - // erpRequestDataDetails.Add(new Dictionary() - // { - // ["castunitid"] = erpExtendFields.Find(x => x.table_id == (unitDatas.Find(x => x.EnCode == item.unit_id)?.Id ?? ""))?.cunitid ?? "", - // ["cbodytranstypecode"] = erpExtendFields.Find(x => x.table_id == tranTypeId)?.transaction_type_id ?? "", - // ["cbodywarehouseid"] = erpExtendFields.Find(x => x.table_id == instock.warehouse_id)?.cotherwhid ?? "", - // ["cgeneralbid"] = "", - // ["cgeneralhid"] = "", - // ["cmaterialoid"] = erpExtendFields.Find(x => x.table_id == item.material_id)?.cmaterialoid ?? "", - // ["cmaterialvid"] = erpExtendFields.Find(x => x.table_id == item.material_id)?.cmaterialvid ?? "", - // ["corpoid"] = erpOrg.corpoid, - // ["corpvid"] = erpOrg.corpvid, - // ["crowno"] = (allInstockDetails.FindIndex(x => x.id == item.id) + 1) * 10, - // ["cunitid"] = erpExtendFields.Find(x => x.table_id == (unitDatas.Find(x => x.EnCode == item.unit_id)?.Id ?? ""))?.cunitid ?? "", - // ["cvendorid"] = erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_id ?? "", - // ["cvendorvid"] = erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_vid ?? "", - // ["dbizdate"] = instock.create_time.ToString("yyyy-MM-dd HH:mm:ss"), - // ["nnum"] = item.qty, - // ["nshouldnum"] = item.pr_qty, - // // ["pk_creqwareid"] = erpExtendFields.Find(x => x.table_id == instock.warehouse_id)?.cotherwhid ?? "", - // ["pk_creqwareid"] = erpWarehouserelaHs.Find(x => x.erp_warehousecode == basWarehouse.whcode)?.erp_warehouseid ?? "", - // ["pk_group"] = erpOrg.pk_group, - // ["pk_org"] = erpOrg.pk_org, - // ["pk_org_v"] = erpOrg.pk_org_v, - // ["pseudocolumn"] = (allInstockDetails.FindIndex(x => x.id == item.id) + 1) * 10, - // ["vbatchcode"] = item.code_batch, - // ["csourcebillhid"] = wmsPurchaseH?.erp_arriveorder_pk ?? "", - // ["csourcebillbid"] = wmsPurchaseD?.erp_arriveorder_b_pk ?? "", - // ["vsourcebillcode"] = wmsPurchaseH?.bill_code ?? "", - // ["lineno"] = wmsPurchaseOrderDs?.lineno ?? "", - // ["vfree1"] = erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_id ?? "", - // ["bpresent"] = wmsPurchaseD.gift==1, - // ["ntaxprice"] = wmsPurchaseD.price, - // - // }); - // } - // erpRequestData.Add("dtls", erpRequestDataDetails); - // requestData.Add(erpRequestData); - // BasFactoryConfig config = await _db.Queryable().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.BIPURL); - // - // ThirdWebapiRecord thirdWebapiRecord = new ThirdWebapiRecord(); - // thirdWebapiRecord.id = SnowflakeIdHelper.NextId(); - // thirdWebapiRecord.third_name = WmsWareHouseConst.BIP; - // thirdWebapiRecord.name = "采购入库"; - // thirdWebapiRecord.method = "POST"; - // // thirdWebapiRecord.url = config.value + "uapws/rest/purchaseIn/save"; - // thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN + "uapws/rest/purchaseIn/save"; - // thirdWebapiRecord.request_data = JsonConvert.SerializeObject(requestData); - // thirdWebapiRecord.create_time = DateTime.Now; - // thirdWebapiRecord.remark = "采购收货单号:" + (wmsPurchaseH?.bill_code ?? ""); - // await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync(); + // erpRequestData.Add("cwarehouseid", "1001A11000000002OOGU");//类型视图里取 + erpRequestData.Add("cwarehouseid", wmsPurchaseD?.erp_wh_type ?? "1001A11000000002OOGU"); + erpRequestData.Add("dbilldate", nowStr); + erpRequestData.Add("dmakedate", nowStr); + erpRequestData.Add("fbillflag", 2); + erpRequestData.Add("fbuysellflag", 2); + erpRequestData.Add("ntotalnum", allInstockDetails.Sum(x => x.qty)); + erpRequestData.Add("pk_org", erpOrg.pk_org); + erpRequestData.Add("pk_org_v", erpOrg.pk_org_v); + erpRequestData.Add("pk_group", erpOrg.pk_group); + erpRequestData.Add("vbillcode", instock.bill_code); + erpRequestData.Add("vtrantypecode", tranType?.EnCode ?? ""); + erpRequestData.Add("csourcebillhid", wmsPurchaseH?.erp_arriveorder_pk ?? ""); + + List> erpRequestDataDetails = new List>(); + foreach (WmsInstockD item in allInstockDetails) + { + erpRequestDataDetails.Add(new Dictionary() + { + ["castunitid"] = erpExtendFields.Find(x => x.table_id == (unitDatas.Find(x => x.EnCode == item.unit_id)?.Id ?? ""))?.cunitid ?? "", + ["cbodytranstypecode"] = erpExtendFields.Find(x => x.table_id == tranTypeId)?.transaction_type_id ?? "", + // ["cbodywarehouseid"] = erpExtendFields.Find(x => x.table_id == instock.warehouse_id)?.cotherwhid ?? "", + // ["cbodywarehouseid"] = "1001A11000000002OOGU", + ["cbodywarehouseid"] = wmsPurchaseD?.erp_wh_type ?? "1001A11000000002OOGU", + ["cgeneralbid"] = null, + ["cgeneralhid"] = null, + ["cmaterialoid"] = erpExtendFields.Find(x => x.table_id == item.material_id)?.cmaterialoid ?? "", + ["cmaterialvid"] = erpExtendFields.Find(x => x.table_id == item.material_id)?.cmaterialvid ?? "", + ["corpoid"] = erpOrg.corpoid, + ["corpvid"] = erpOrg.corpvid, + ["crowno"] = (allInstockDetails.FindIndex(x => x.id == item.id) + 1) * 10, + ["cunitid"] = erpExtendFields.Find(x => x.table_id == (unitDatas.Find(x => x.EnCode == item.unit_id)?.Id ?? ""))?.cunitid ?? "", + ["cvendorid"] = erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_id ?? "", + ["cvendorvid"] = erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_vid ?? "", + ["dbizdate"] = instock.create_time.ToString("yyyy-MM-dd HH:mm:ss"), + ["nnum"] = item.qty, + ["nshouldnum"] = item.pr_qty, + // ["pk_creqwareid"] = erpExtendFields.Find(x => x.table_id == instock.warehouse_id)?.cotherwhid ?? "", + // ["pk_creqwareid"] = erpWarehouserelaHs.Find(x => x.erp_warehousecode == basWarehouse.whcode)?.erp_warehouseid ?? "", + // ["pk_creqwareid"] = "1001A11000000002OOGU", + ["pk_creqwareid"] = wmsPurchaseD?.erp_wh_type ?? "1001A11000000002OOGU", + ["pk_group"] = erpOrg.pk_group, + ["pk_org"] = erpOrg.pk_org, + ["pk_org_v"] = erpOrg.pk_org_v, + ["pseudocolumn"] = (allInstockDetails.FindIndex(x => x.id == item.id) + 1) * 10, + ["vbatchcode"] = item.code_batch, + ["csourcebillhid"] = wmsPurchaseH?.erp_arriveorder_pk ?? "", + ["csourcebillbid"] = wmsPurchaseD?.erp_arriveorder_b_pk ?? "", + ["vsourcebillcode"] = wmsPurchaseH?.bill_code ?? "", + ["lineno"] = wmsPurchaseOrderDs?.lineno ?? "", + ["vfree1"] = erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_id ?? "", + ["bpresent"] = wmsPurchaseD.gift==1, + ["ntaxprice"] = wmsPurchaseD.price, + + }); + } + erpRequestData.Add("dtls", erpRequestDataDetails); + requestData.Add(erpRequestData); + BasFactoryConfig config = await _db.Queryable().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.BIPURL); + + ThirdWebapiRecord thirdWebapiRecord = new ThirdWebapiRecord(); + thirdWebapiRecord.id = SnowflakeIdHelper.NextId(); + thirdWebapiRecord.third_name = WmsWareHouseConst.BIP; + thirdWebapiRecord.name = "采购入库"; + thirdWebapiRecord.method = "POST"; + // thirdWebapiRecord.url = config.value + "uapws/rest/purchaseIn/save"; + thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN + "uapws/rest/purchaseIn/save"; + thirdWebapiRecord.request_data = JsonConvert.SerializeObject(requestData); + thirdWebapiRecord.create_time = DateTime.Now; + thirdWebapiRecord.remark = "采购收货单号:" + (wmsPurchaseH?.bill_code ?? "") + ",erp采购订单号:"+wmsPurchaseOrderH.erp_bill_code; + await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync(); + BasFactoryConfig callErp = await _db.Queryable().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.CALLERP); + if(callErp.value=="1"){ + await _thirdApiRecordService.Send(new List { thirdWebapiRecord }, "自动", _db); + } } // 委外入库 else if (instock.bill_type == WmsWareHouseConst.BILLTYPE_OUTSOURCEINSTOCK_ID) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs index 6700d380..7f02709d 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs @@ -555,7 +555,7 @@ namespace Tnb.WarehouseMgr thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN + "uapws/rest/generalout/save"; thirdWebapiRecord.request_data = JsonConvert.SerializeObject(requestData); thirdWebapiRecord.create_time = DateTime.Now; - thirdWebapiRecord.remark = $"原材料转库单wms_material_transfer:{wmsMaterialTransfer.bill_code}"; + thirdWebapiRecord.remark = $"原材料转库单wms_material_transfer:{wmsMaterialTransfer.bill_code},erp转库单:{wmsMaterialTransfer.erp_bill_code}"; await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync(); Logger.LogInformation("【WmsMaterialSignHService ModifyAsync】同步其它出库单到erp成功"); @@ -632,7 +632,7 @@ namespace Tnb.WarehouseMgr thirdWebapiRecord2.url = WmsWareHouseConst.BIP_DOMAIN + "uapws/rest/generalin/save"; thirdWebapiRecord2.request_data = JsonConvert.SerializeObject(requestData2); thirdWebapiRecord2.create_time = DateTime.Now; - thirdWebapiRecord2.remark = $"原材料转库单wms_material_transfer:{wmsMaterialTransfer.bill_code}"; + thirdWebapiRecord2.remark = $"原材料转库单wms_material_transfer:{wmsMaterialTransfer.bill_code},erp转库单:{wmsMaterialTransfer.erp_bill_code}"; await _db.Insertable(thirdWebapiRecord2).ExecuteCommandAsync(); Logger.LogInformation("【WmsMaterialSignHService ModifyAsync】同步其它入库单到erp成功"); diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs index 75d9e954..b79b185c 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs @@ -1166,7 +1166,7 @@ namespace Tnb.WarehouseMgr thirdWebapiRecord2.url = WmsWareHouseConst.BIP_DOMAIN + "uapws/rest/generalin/save"; thirdWebapiRecord2.request_data = JsonConvert.SerializeObject(requestData2); thirdWebapiRecord2.create_time = DateTime.Now; - thirdWebapiRecord2.remark = $"原材料转库单wms_material_transfer:{wmsMaterialTransfer.bill_code}"; + thirdWebapiRecord2.remark = $"原材料转库单wms_material_transfer:{wmsMaterialTransfer.bill_code},erp转库单:{wmsMaterialTransfer.erp_bill_code}"; await _db.Insertable(thirdWebapiRecord2).ExecuteCommandAsync(); @@ -1273,7 +1273,7 @@ namespace Tnb.WarehouseMgr thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN + "uapws/rest/generalout/save"; thirdWebapiRecord.request_data = JsonConvert.SerializeObject(requestData); thirdWebapiRecord.create_time = DateTime.Now; - thirdWebapiRecord.remark = $"原材料转库单wms_material_transfer:{wmsMaterialTransfer.bill_code}"; + thirdWebapiRecord.remark = $"原材料转库单wms_material_transfer:{wmsMaterialTransfer.bill_code},erp转库单:{wmsMaterialTransfer.erp_bill_code}"; await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync(); Logger.LogInformation("【WmsMaterialTransferService ModifyAsync】同步其它出库单到erp成功"); diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs index 69fb5cc5..17ed7c52 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs @@ -170,7 +170,8 @@ namespace Tnb.WarehouseMgr erpRequestData.Add("cvendorvid", erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_vid ?? ""); // erpRequestData.Add("cwarehouseid", erpExtendFields.Find(x => x.table_id == instock.warehouse_id)?.cotherwhid ?? "");//类型视图里取 // erpWarehouserelaHs.Find(x => x.erp_warehousecode == wmsPurchaseD.erp_wh_type)?.erp_warehouseid ?? "" - erpRequestData.Add("cwarehouseid", "1001A11000000002OOGU");//类型视图里取 + // erpRequestData.Add("cwarehouseid", "1001A11000000002OOGU"); + erpRequestData.Add("cwarehouseid", wmsPurchaseD?.erp_wh_type ?? "1001A11000000002OOGU"); erpRequestData.Add("dbilldate", nowStr); erpRequestData.Add("dmakedate", nowStr); erpRequestData.Add("fbillflag", 2); @@ -192,7 +193,8 @@ namespace Tnb.WarehouseMgr ["cbodytranstypecode"] = erpExtendFields.Find(x => x.table_id == tranTypeId)?.transaction_type_id ?? "", // ["cbodywarehouseid"] = erpExtendFields.Find(x => x.table_id == instock.warehouse_id)?.cotherwhid ?? "", //["cbodywarehouseid"] = erpWarehouserelaHs.Find(x => x.erp_warehousecode == basWarehouse.whcode)?.erp_warehouseid ?? "", - ["cbodywarehouseid"] = "1001A11000000002OOGU", + // ["cbodywarehouseid"] = "1001A11000000002OOGU", + ["cbodywarehouseid"] = wmsPurchaseD?.erp_wh_type ?? "1001A11000000002OOGU", ["cgeneralbid"] = null, ["cgeneralhid"] = null, ["cmaterialoid"] = erpExtendFields.Find(x => x.table_id == item.material_id)?.cmaterialoid ?? "", @@ -207,7 +209,8 @@ namespace Tnb.WarehouseMgr ["nnum"] = item.qty, ["nshouldnum"] = item.pr_qty, // ["pk_creqwareid"] = erpExtendFields.Find(x => x.table_id == instock.warehouse_id)?.cotherwhid ?? "", - ["pk_creqwareid"] = "1001A11000000002OOGU", + // ["pk_creqwareid"] = "1001A11000000002OOGU", + ["pk_creqwareid"] = wmsPurchaseD?.erp_wh_type ?? "1001A11000000002OOGU", ["pk_group"] = erpOrg.pk_group, ["pk_org"] = erpOrg.pk_org, ["pk_org_v"] = erpOrg.pk_org_v, diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsSterilizationInstockHService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsSterilizationInstockHService.cs index 5dd77d48..89aa941d 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsSterilizationInstockHService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsSterilizationInstockHService.cs @@ -204,7 +204,7 @@ namespace Tnb.WarehouseMgr thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN + "uapws/rest/whstrans/save"; thirdWebapiRecord.request_data = JsonConvert.SerializeObject(erpRequestData); thirdWebapiRecord.create_time = DateTime.Now; - thirdWebapiRecord.remark = $"任务号wms_distask_h:{input.wmsDistaskH.bill_code}"; + thirdWebapiRecord.remark = $"任务号wms_distask_h:{input.wmsDistaskH.bill_code},灭菌入库记录wms_sterilization_instock_h:{wmsRawmatTransferoutstockH.bill_code}"; await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync(); BasFactoryConfig callErp = await _db.Queryable().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.CALLERP); diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsTransferInstockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsTransferInstockService.cs index 6f699fdd..008d7054 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsTransferInstockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsTransferInstockService.cs @@ -145,7 +145,7 @@ namespace Tnb.WarehouseMgr List> erpRequestDataDetails = new List>(); foreach (WmsTransferInstockD item in allInstockDetails) { - string date = wmsTransferInstockH.create_time!=null ? wmsTransferInstockH.create_time.Value.ToString("yyyy-MM-dd HH:mm:ss") : wmsTransferInstockH.bill_date!=null ? wmsTransferInstockH.bill_date.Value.ToString("yyyy-MM-dd HH:mm:ss") : DateTime.Now.ToString(); + string date = wmsTransferInstockH.create_time!=null ? wmsTransferInstockH.create_time.Value.ToString("yyyy-MM-dd HH:mm:ss") : wmsTransferInstockH.bill_date!=null ? wmsTransferInstockH.bill_date.Value.ToString("yyyy-MM-dd HH:mm:ss") : DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); erpRequestDataDetails.Add(new Dictionary() { ["cbodytranstypecode"] = "4E-01",