From d1bf8c1bb1a234fa904551c172ee03b3660c3b63 Mon Sep 17 00:00:00 2001 From: chenwenkai <1084072318@qq.com> Date: Mon, 21 Oct 2024 17:01:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A7=94=E5=A4=96=E5=85=A5=E5=BA=93bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tnb.WarehouseMgr/WmsOutsourceDService.cs | 62 +++++++++---------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutsourceDService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutsourceDService.cs index 3a30528a..b126966b 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutsourceDService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutsourceDService.cs @@ -167,16 +167,16 @@ namespace Tnb.WarehouseMgr Dictionary erpRequestData = new Dictionary(); erpRequestData.Add("approver", erpCreateId); erpRequestData.Add("billmaker", erpCreateId); - erpRequestData.Add("cbiztype", wmsOutsourceH?.transaction_type ?? ""); + erpRequestData.Add("cbiztype", wmsOutsourceH?.transaction_type ?? null); erpRequestData.Add("bitinbill", false); erpRequestData.Add("cgeneralhid", null); - erpRequestData.Add("corpoid", erpOrg.corpoid); - erpRequestData.Add("corpvid", erpOrg.corpvid); + erpRequestData.Add("corpoid", erpOrg?.corpoid ?? null); + erpRequestData.Add("corpvid", erpOrg?.corpvid ?? null); 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("ctrantypeid", erpExtendFields.Find(x => x.table_id == tranTypeId)?.transaction_type_id ?? null); + erpRequestData.Add("cvendorid", erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_id ?? null); + erpRequestData.Add("cvendorvid", erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_vid ?? null); // 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"); @@ -186,53 +186,53 @@ namespace Tnb.WarehouseMgr 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", wmsOutsourceH.outsource_order); - erpRequestData.Add("vtrantypecode", tranType?.EnCode ?? ""); - erpRequestData.Add("csourcebillhid", wmsOutsourceH?.erp_arriveorder_pk ?? ""); - erpRequestData.Add("vdef3", wmsOutsourceH?.service_num ?? ""); + erpRequestData.Add("pk_org", erpOrg?.pk_org ?? null); + erpRequestData.Add("pk_org_v", erpOrg?.pk_org_v ?? null); + erpRequestData.Add("pk_group", erpOrg?.pk_group ?? null); + erpRequestData.Add("vbillcode", wmsOutsourceH?.outsource_order ?? null); + erpRequestData.Add("vtrantypecode", tranType?.EnCode ?? null); + erpRequestData.Add("csourcebillhid", wmsOutsourceH?.erp_arriveorder_pk ?? null); + erpRequestData.Add("vdef3", wmsOutsourceH?.service_num ?? null); 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 ?? "", + ["castunitid"] = erpExtendFields.Find(x => x.table_id == (unitDatas.Find(x => x.EnCode == item.unit_id)?.Id ?? ""))?.cunitid ?? null, + ["cbodytranstypecode"] = erpExtendFields.Find(x => x.table_id == tranTypeId)?.transaction_type_id ?? null, // ["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"] = wmsOutsourceD?.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, + ["cmaterialoid"] = erpExtendFields.Find(x => x.table_id == item.material_id)?.cmaterialoid ?? null, + ["cmaterialvid"] = erpExtendFields.Find(x => x.table_id == item.material_id)?.cmaterialvid ?? null, + ["corpoid"] = erpOrg?.corpoid ?? null, + ["corpvid"] = erpOrg?.corpvid ?? null, ["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 ?? "", + ["cunitid"] = erpExtendFields.Find(x => x.table_id == (unitDatas.Find(x => x.EnCode == item.unit_id)?.Id ?? ""))?.cunitid ?? null, + ["cvendorid"] = erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_id ?? null, + ["cvendorvid"] = erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_vid ?? null, ["dbizdate"] = wmsOutsourceH.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"] = "1001A11000000002OOGU", ["pk_creqwareid"] = wmsOutsourceD?.erp_wh_type ?? "1001A11000000002OOGU", - ["pk_group"] = erpOrg.pk_group, - ["pk_org"] = erpOrg.pk_org, - ["pk_org_v"] = erpOrg.pk_org_v, + ["pk_group"] = erpOrg?.pk_group ?? null, + ["pk_org"] = erpOrg?.pk_org ?? null, + ["pk_org_v"] = erpOrg?.pk_org_v ?? null, ["pseudocolumn"] = (allInstockDetails.FindIndex(x => x.id == item.id) + 1) * 10, ["vbatchcode"] = item.code_batch, - ["csourcebillhid"] = wmsOutsourceH?.erp_arriveorder_pk ?? "", - ["csourcebillbid"] = wmsOutsourceD?.erp_arriveorder_b_pk ?? "", - ["vsourcebillcode"] = wmsOutsourceH?.outsource_order ?? "", - ["lineno"] = wmsPurchaseOrderDs?.lineno ?? "", - ["vfree1"] = erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_id ?? "", + ["csourcebillhid"] = wmsOutsourceH?.erp_arriveorder_pk ?? null, + ["csourcebillbid"] = wmsOutsourceD?.erp_arriveorder_b_pk ?? null, + ["vsourcebillcode"] = wmsOutsourceH?.outsource_order ?? null, + ["lineno"] = wmsPurchaseOrderDs?.lineno ?? null, + ["vfree1"] = erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_id ?? null, //["flargess"] = wmsOutsourceD.gift==1, - ["ntaxprice"] = wmsOutsourceD.price, + ["ntaxprice"] = wmsOutsourceD.price ?? null, }); }