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

委外入库bug修改

Browse Source
This commit is contained in:
陈文凯
2024-10-21 17:01:36 +08:00
parent 013c706b42
commit d1bf8c1bb1
1 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
WarehouseMgr/Tnb.WarehouseMgr/WmsOutsourceDService.cs
View File

@@ -167,16 +167,16 @@ namespace Tnb.WarehouseMgr
Dictionary<string, object> erpRequestData = new Dictionary<string, object>(); Dictionary<string, object> erpRequestData = new Dictionary<string, object>();
erpRequestData.Add("approver", erpCreateId); erpRequestData.Add("approver", erpCreateId);
erpRequestData.Add("billmaker", erpCreateId); erpRequestData.Add("billmaker", erpCreateId);
erpRequestData.Add("cbiztype", wmsOutsourceH?.transaction_type ?? ""); erpRequestData.Add("cbiztype", wmsOutsourceH?.transaction_type ?? null);
erpRequestData.Add("bitinbill", false); erpRequestData.Add("bitinbill", false);
erpRequestData.Add("cgeneralhid", null); erpRequestData.Add("cgeneralhid", null);
erpRequestData.Add("corpoid", erpOrg.corpoid); erpRequestData.Add("corpoid", erpOrg?.corpoid ?? null);
erpRequestData.Add("corpvid", erpOrg.corpvid); erpRequestData.Add("corpvid", erpOrg?.corpvid ?? null);
erpRequestData.Add("creationtime", nowStr); erpRequestData.Add("creationtime", nowStr);
erpRequestData.Add("creator", erpCreateId); erpRequestData.Add("creator", erpCreateId);
erpRequestData.Add("ctrantypeid", erpExtendFields.Find(x => x.table_id == tranTypeId)?.transaction_type_id ?? ""); 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 ?? ""); 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 ?? ""); 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 ?? "");//类型视图里取 // 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 ?? "" // erpWarehouserelaHs.Find(x => x.erp_warehousecode == wmsPurchaseD.erp_wh_type)?.erp_warehouseid ?? ""
// erpRequestData.Add("cwarehouseid", "1001A11000000002OOGU"); // erpRequestData.Add("cwarehouseid", "1001A11000000002OOGU");
@@ -186,53 +186,53 @@ namespace Tnb.WarehouseMgr
erpRequestData.Add("fbillflag", 2); erpRequestData.Add("fbillflag", 2);
erpRequestData.Add("fbuysellflag", 2); erpRequestData.Add("fbuysellflag", 2);
erpRequestData.Add("ntotalnum", allInstockDetails.Sum(x => x.qty)); erpRequestData.Add("ntotalnum", allInstockDetails.Sum(x => x.qty));
erpRequestData.Add("pk_org", erpOrg.pk_org); erpRequestData.Add("pk_org", erpOrg?.pk_org ?? null);
erpRequestData.Add("pk_org_v", erpOrg.pk_org_v); erpRequestData.Add("pk_org_v", erpOrg?.pk_org_v ?? null);
erpRequestData.Add("pk_group", erpOrg.pk_group); erpRequestData.Add("pk_group", erpOrg?.pk_group ?? null);
erpRequestData.Add("vbillcode", wmsOutsourceH.outsource_order); erpRequestData.Add("vbillcode", wmsOutsourceH?.outsource_order ?? null);
erpRequestData.Add("vtrantypecode", tranType?.EnCode ?? ""); erpRequestData.Add("vtrantypecode", tranType?.EnCode ?? null);
erpRequestData.Add("csourcebillhid", wmsOutsourceH?.erp_arriveorder_pk ?? ""); erpRequestData.Add("csourcebillhid", wmsOutsourceH?.erp_arriveorder_pk ?? null);
erpRequestData.Add("vdef3", wmsOutsourceH?.service_num ?? ""); erpRequestData.Add("vdef3", wmsOutsourceH?.service_num ?? null);
List<Dictionary<string, object>> erpRequestDataDetails = new List<Dictionary<string, object>>(); List<Dictionary<string, object>> erpRequestDataDetails = new List<Dictionary<string, object>>();
foreach (WmsInstockD item in allInstockDetails) foreach (WmsInstockD item in allInstockDetails)
{ {
erpRequestDataDetails.Add(new Dictionary<string, object>() erpRequestDataDetails.Add(new Dictionary<string, object>()
{ {
["castunitid"] = erpExtendFields.Find(x => x.table_id == (unitDatas.Find(x => x.EnCode == item.unit_id)?.Id ?? ""))?.cunitid ?? "", ["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 ?? "", ["cbodytranstypecode"] = erpExtendFields.Find(x => x.table_id == tranTypeId)?.transaction_type_id ?? null,
// ["cbodywarehouseid"] = erpExtendFields.Find(x => x.table_id == instock.warehouse_id)?.cotherwhid ?? "", // ["cbodywarehouseid"] = erpExtendFields.Find(x => x.table_id == instock.warehouse_id)?.cotherwhid ?? "",
//["cbodywarehouseid"] = erpWarehouserelaHs.Find(x => x.erp_warehousecode == basWarehouse.whcode)?.erp_warehouseid ?? "", //["cbodywarehouseid"] = erpWarehouserelaHs.Find(x => x.erp_warehousecode == basWarehouse.whcode)?.erp_warehouseid ?? "",
// ["cbodywarehouseid"] = "1001A11000000002OOGU", // ["cbodywarehouseid"] = "1001A11000000002OOGU",
["cbodywarehouseid"] = wmsOutsourceD?.erp_wh_type ?? "1001A11000000002OOGU", ["cbodywarehouseid"] = wmsOutsourceD?.erp_wh_type ?? "1001A11000000002OOGU",
["cgeneralbid"] = null, ["cgeneralbid"] = null,
["cgeneralhid"] = null, ["cgeneralhid"] = null,
["cmaterialoid"] = erpExtendFields.Find(x => x.table_id == item.material_id)?.cmaterialoid ?? "", ["cmaterialoid"] = erpExtendFields.Find(x => x.table_id == item.material_id)?.cmaterialoid ?? null,
["cmaterialvid"] = erpExtendFields.Find(x => x.table_id == item.material_id)?.cmaterialvid ?? "", ["cmaterialvid"] = erpExtendFields.Find(x => x.table_id == item.material_id)?.cmaterialvid ?? null,
["corpoid"] = erpOrg.corpoid, ["corpoid"] = erpOrg?.corpoid ?? null,
["corpvid"] = erpOrg.corpvid, ["corpvid"] = erpOrg?.corpvid ?? null,
["crowno"] = (allInstockDetails.FindIndex(x => x.id == item.id) + 1) * 10, ["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 ?? "", ["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 ?? "", ["cvendorid"] = erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_id ?? null,
["cvendorvid"] = erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_vid ?? "", ["cvendorvid"] = erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_vid ?? null,
["dbizdate"] = wmsOutsourceH.create_time.ToString("yyyy-MM-dd HH:mm:ss"), ["dbizdate"] = wmsOutsourceH.create_time.ToString("yyyy-MM-dd HH:mm:ss"),
["nnum"] = item.qty, ["nnum"] = item.qty,
["nshouldnum"] = item.pr_qty, ["nshouldnum"] = item.pr_qty,
// ["pk_creqwareid"] = erpExtendFields.Find(x => x.table_id == instock.warehouse_id)?.cotherwhid ?? "", // ["pk_creqwareid"] = erpExtendFields.Find(x => x.table_id == instock.warehouse_id)?.cotherwhid ?? "",
// ["pk_creqwareid"] = "1001A11000000002OOGU", // ["pk_creqwareid"] = "1001A11000000002OOGU",
["pk_creqwareid"] = wmsOutsourceD?.erp_wh_type ?? "1001A11000000002OOGU", ["pk_creqwareid"] = wmsOutsourceD?.erp_wh_type ?? "1001A11000000002OOGU",
["pk_group"] = erpOrg.pk_group, ["pk_group"] = erpOrg?.pk_group ?? null,
["pk_org"] = erpOrg.pk_org, ["pk_org"] = erpOrg?.pk_org ?? null,
["pk_org_v"] = erpOrg.pk_org_v, ["pk_org_v"] = erpOrg?.pk_org_v ?? null,
["pseudocolumn"] = (allInstockDetails.FindIndex(x => x.id == item.id) + 1) * 10, ["pseudocolumn"] = (allInstockDetails.FindIndex(x => x.id == item.id) + 1) * 10,
["vbatchcode"] = item.code_batch, ["vbatchcode"] = item.code_batch,
["csourcebillhid"] = wmsOutsourceH?.erp_arriveorder_pk ?? "", ["csourcebillhid"] = wmsOutsourceH?.erp_arriveorder_pk ?? null,
["csourcebillbid"] = wmsOutsourceD?.erp_arriveorder_b_pk ?? "", ["csourcebillbid"] = wmsOutsourceD?.erp_arriveorder_b_pk ?? null,
["vsourcebillcode"] = wmsOutsourceH?.outsource_order ?? "", ["vsourcebillcode"] = wmsOutsourceH?.outsource_order ?? null,
["lineno"] = wmsPurchaseOrderDs?.lineno ?? "", ["lineno"] = wmsPurchaseOrderDs?.lineno ?? null,
["vfree1"] = erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_id ?? "", ["vfree1"] = erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_id ?? null,
//["flargess"] = wmsOutsourceD.gift==1, //["flargess"] = wmsOutsourceD.gift==1,
["ntaxprice"] = wmsOutsourceD.price, ["ntaxprice"] = wmsOutsourceD.price ?? null,
}); });
} }