From 72c93ed4c9725d5b5db4934e2927e388495c6084 Mon Sep 17 00:00:00 2001
From: tengxi <971623072@qq.com>
Date: Sat, 4 Feb 2023 10:44:43 +0800
Subject: [PATCH] .

---
 .../controller/InvoicesController.java         | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/invoices/controller/InvoicesController.java b/SC-boot/linkage-scm/src/main/java/jnpf/invoices/controller/InvoicesController.java
index 11ee0bdb..d53c1c39 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/invoices/controller/InvoicesController.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/invoices/controller/InvoicesController.java
@@ -178,11 +178,11 @@ public class InvoicesController {
         //处理id字段转名称，若无需转或者为空可删除
     for(InvoicesEntity entity:list){
 						Map<String,Object> purchaseorderIdMap = new HashMap<>();
-            entity.setPurchaseorderId(generaterSwapUtil.getPopupSelectValue("389393032501308101","pid","document",entity.getPurchaseorderId(),purchaseorderIdMap));
+            entity.setPurchaseorderId(generaterSwapUtil.getPopupSelectValue("389673535976550149","id","document_no",entity.getPurchaseorderId(),purchaseorderIdMap));
 						Map<String,Object> contractIdMap = new HashMap<>();
-            entity.setContractId(generaterSwapUtil.getPopupSelectValue("389393032501308101","cid","contract_name",entity.getContractId(),contractIdMap));
+            entity.setContractId(generaterSwapUtil.getPopupSelectValue("389673903103979269","id","contract_name",entity.getContractId(),contractIdMap));
 						Map<String,Object> supplierIdMap = new HashMap<>();
-            entity.setSupplierId(generaterSwapUtil.getPopupSelectValue("389393032501308101","sid","supplier_name",entity.getSupplierId(),supplierIdMap));
+            entity.setSupplierId(generaterSwapUtil.getPopupSelectValue("389674191453990661","id","supplier_name",entity.getSupplierId(),supplierIdMap));
     }
 	List<InvoicesListVO> listVO=JsonUtil.getJsonToList(list,InvoicesListVO.class);
     for(InvoicesListVO invoicesVO:listVO){
@@ -338,12 +338,12 @@ public class InvoicesController {
  //附表数据转换
 
 //添加到详情表单对象中
-						Map<String,Object> purchaseorderIdMap = new HashMap<>();
-            vo.setPurchaseorderId(generaterSwapUtil.getPopupSelectValue("389393032501308101","pid","document",vo.getPurchaseorderId(),purchaseorderIdMap));
-						Map<String,Object> contractIdMap = new HashMap<>();
-            vo.setContractId(generaterSwapUtil.getPopupSelectValue("389393032501308101","cid","contract_name",vo.getContractId(),contractIdMap));
-						Map<String,Object> supplierIdMap = new HashMap<>();
-            vo.setSupplierId(generaterSwapUtil.getPopupSelectValue("389393032501308101","sid","supplier_name",vo.getSupplierId(),supplierIdMap));
+        Map<String,Object> purchaseorderIdMap = new HashMap<>();
+        vo.setPurchaseorderId(generaterSwapUtil.getPopupSelectValue("389673535976550149","id","document_no",vo.getPurchaseorderId(),purchaseorderIdMap));
+        Map<String,Object> contractIdMap = new HashMap<>();
+        vo.setContractId(generaterSwapUtil.getPopupSelectValue("389673903103979269","id","contract_name",vo.getContractId(),contractIdMap));
+        Map<String,Object> supplierIdMap = new HashMap<>();
+        vo.setSupplierId(generaterSwapUtil.getPopupSelectValue("389674191453990661","id","supplier_name",vo.getSupplierId(),supplierIdMap));
 
         return ActionResult.success(vo);
 		}