diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java index 93c4d7d7..5d4c92d8 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java @@ -87,11 +87,11 @@ public class PoundlistController { //处理id字段转名称,若无需转或者为空可删除 for(PoundlistEntity entity:list){ Map materialCodeMap = new HashMap<>(); - entity.setMaterialCode(generaterSwapUtil.swapRelationFormValue("selectField121",entity.getMaterialCode(),"294090217084722181",materialCodeMap)); - Map salesNameMap = new HashMap<>(); - entity.setSalesName(generaterSwapUtil.swapRelationFormValue("selectField121",entity.getSalesName(),"294090217084722181",salesNameMap)); - Map licenseNoMap = new HashMap<>(); - entity.setLicenseNo(generaterSwapUtil.swapRelationFormValue("selectField122",entity.getLicenseNo(),"294090217084722181",licenseNoMap)); + entity.setMaterialCode(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","item_code",entity.getMaterialCode(),materialCodeMap)); + Map salesNameMap = new HashMap<>(); + entity.setSalesName(generaterSwapUtil.getPopupSelectValue("381038993740949317","id","contract_name",entity.getSalesName(),salesNameMap)); + Map licenseNoMap = new HashMap<>(); + entity.setLicenseNo(generaterSwapUtil.getPopupSelectValue("381432451370615173","id","ticketno",entity.getLicenseNo(),licenseNoMap)); entity.setPoundPictures(generaterSwapUtil.getFileNameInJson(entity.getPoundPictures())); entity.setVehiclePictures(generaterSwapUtil.getFileNameInJson(entity.getVehiclePictures())); Map purchaseNameMap = new HashMap<>(); diff --git a/SC-web/src/views/scm/basicInformation/poundlist/Form.vue b/SC-web/src/views/scm/basicInformation/poundlist/Form.vue index f5441acf..463e9b28 100644 --- a/SC-web/src/views/scm/basicInformation/poundlist/Form.vue +++ b/SC-web/src/views/scm/basicInformation/poundlist/Form.vue @@ -7,11 +7,11 @@