From 60dac40a2287b83fbe7e33d411d8bc85bf6aa990 Mon Sep 17 00:00:00 2001 From: zhou keda <1315948824@qq.com> Date: Fri, 20 Sep 2024 17:14:02 +0800 Subject: [PATCH 1/4] bug --- WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs index 7fcedd39..dc56d479 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs @@ -437,7 +437,7 @@ namespace Tnb.WarehouseMgr thirdWebapiRecord.name = "调拨出库"; thirdWebapiRecord.method = "POST"; //thirdWebapiRecord.url = config.value + "uapws/rest/transOut/save"; - thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN + "/uapws/rest/transOut/save"; + thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN + "uapws/rest/transOut/save"; thirdWebapiRecord.request_data = JsonConvert.SerializeObject(requestData); thirdWebapiRecord.create_time = DateTime.Now; thirdWebapiRecord.remark = $"原材料调拨出库wms_rawmat_transferoutstock_h:{wmsRawmatTransferoutstockH.bill_code}"; From cdb5a528600b747c4f07c5b74b79201372e16da9 Mon Sep 17 00:00:00 2001 From: zhou keda <1315948824@qq.com> Date: Fri, 20 Sep 2024 17:35:25 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=B0=83=E6=8B=A8=E5=87=BA=E5=BA=93bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs index dc56d479..27118e88 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs @@ -399,6 +399,9 @@ namespace Tnb.WarehouseMgr List> erpRequestDataDetails = new List>(); foreach(var item in wmsMaterialSignDs) { + WmsCarryCode wmsCarryCode = await _db.Queryable().Where(x=>x.barcode==item.barcode).FirstAsync(); + string gysid = wmsCarryCode?.auxprop_gys ?? ""; + ErpExtendField supplier = await _db.Queryable().Where(x=>x.supplier_id==gysid).FirstAsync(); // 出库数量wmsMaterialSignD.sign_qty erpRequestDataDetails.Add(new Dictionary() { @@ -414,8 +417,8 @@ namespace Tnb.WarehouseMgr ["vsourcebillcode"] = wmsTransferOrderH?.erp_bill_code ?? "", ["vsourcerowno"] = wmsRawmatTransferoutstockD?.lineno ?? "", ["cunitid"] = erpExtendFields.Find(x => x.table_id == wmsRawmatTransferoutstockD.unit_id)?.cunitid ?? "", - ["cvendorid"] = erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_id ?? "", - ["cvendorvid"] = erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_vid ?? "", + ["cvendorid"] = gysid, + ["cvendorvid"] = supplier?.supplier_vid ?? gysid, ["dbizdate"] = wmsTransferOrderH.create_time.Value.ToString("yyyy-MM-dd HH:mm:ss"), ["dplanarrivedate"] = nowStr, ["dplanoutdate"] = nowStr, From 0dd89aaeb0ef1e1b031b52189c078ead1a84a6f1 Mon Sep 17 00:00:00 2001 From: zhou keda <1315948824@qq.com> Date: Fri, 20 Sep 2024 17:36:37 +0800 Subject: [PATCH 3/4] 1 --- WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs index 27118e88..6878ab8c 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs @@ -428,7 +428,7 @@ namespace Tnb.WarehouseMgr ["pk_org"] = erpOrg.pk_org, ["pk_org_v"] = erpOrg.pk_org_v, ["vbatchcode"] = item.code_batch, - ["vfree1"] = item.code_batch, + ["vfree1"] = wmsCarryCode.auxprop_xph, }); } erpRequestData.Add("dtls", erpRequestDataDetails); From f4e2f261413635828ecbbd1799779d0d2d246502 Mon Sep 17 00:00:00 2001 From: zhou keda <1315948824@qq.com> Date: Fri, 20 Sep 2024 17:37:21 +0800 Subject: [PATCH 4/4] 1 --- WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs index 6878ab8c..71548d40 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs @@ -428,7 +428,7 @@ namespace Tnb.WarehouseMgr ["pk_org"] = erpOrg.pk_org, ["pk_org_v"] = erpOrg.pk_org_v, ["vbatchcode"] = item.code_batch, - ["vfree1"] = wmsCarryCode.auxprop_xph, + ["vfree1"] = wmsCarryCode?.auxprop_xph, }); } erpRequestData.Add("dtls", erpRequestDataDetails);