From f9170089453fb3c9057b8fda472390acc179c7e2 Mon Sep 17 00:00:00 2001 From: zhou keda <1315948824@qq.com> Date: Thu, 19 Sep 2024 15:51:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B6=E5=AE=83=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs index 571e48dd..9a45f795 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs @@ -58,6 +58,7 @@ using Tnb.BasicData; using System.Reflection; using NPOI.SS.Format; using Aspose.Cells.Drawing; +using SQLitePCL; using Tnb.BasicData.Entities.Entity; namespace Tnb.WarehouseMgr @@ -3225,8 +3226,10 @@ namespace Tnb.WarehouseMgr .Select((x, y) => y) .ToListAsync(); + WmsMaterialTransferCarry wmsMaterialTransferCarry = await db.Queryable().Where(x=>x.bill_id==wmsMaterialTransfer.id).FirstAsync(); + string carryId = wmsMaterialTransferCarry?.carry_id ?? ""; List wmsCarryCodes = await db.Queryable() - .Where(a => a.carry_id == dt.carry_id) + .Where(a => a.carry_id == carryId) .ToListAsync(); List supplierIds = wmsCarryCodes.Select(x => x.auxprop_gys).Distinct().ToList(); @@ -3273,6 +3276,9 @@ namespace Tnb.WarehouseMgr List> erpRequestDataDetails = new List>(); foreach (WmsMaterialTransferD item in wmsMaterialTransferDs) { + WmsMaterialTransferCarry wmsMaterialTransferCarryItem = await db.Queryable().Where(x=>x.mat_bill_id==item.id).FirstAsync(); + string wmsMaterialTransferCarryItemCarryId = wmsMaterialTransferCarryItem?.carry_id ?? ""; + WmsCarryCode wmsCarryCode = await db.Queryable().Where(x => x.carry_id == wmsMaterialTransferCarryItemCarryId).FirstAsync(); erpRequestDataDetails.Add(new Dictionary() { ["cbodytranstypecode"] = "4A-02", @@ -3287,8 +3293,8 @@ namespace Tnb.WarehouseMgr // ["crowno"] = (wmsMaterialTransferDs.FindIndex(x => x.id == item.id) + 1) * 10, ["crowno"] = item.lineno, ["cunitid"] = erpExtendFields.Find(x => x.table_id == (unitDatas.Find(x => x.EnCode == item.unit_id)?.Id ?? ""))?.cunitid ?? "", - ["cvendorid"] = "", - ["cvendorvid"] = "", + ["cvendorid"] = erpExtendFields.Find(x => x.table_id == wmsCarryCode?.auxprop_gys)?.supplier_id ?? "", + ["cvendorvid"] = erpExtendFields.Find(x => x.table_id == wmsCarryCode?.auxprop_gys)?.supplier_vid ?? "", ["dbizdate"] = nowStr, ["nnum"] = item.qty, ["pk_group"] = erpOrg.pk_group, @@ -3297,7 +3303,7 @@ namespace Tnb.WarehouseMgr ["csourcebillbid"] = item.erp_line_pk, ["csourcebillhid"] = wmsMaterialTransfer.erp_pk, ["vbatchcode"] = item.code_batch, - ["vfree1"] = wmsCarryCodes[0].auxprop_xph, + ["vfree1"] = wmsCarryCode?.auxprop_xph ?? "", }); } erpRequestData.Add("dtls", erpRequestDataDetails);