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 2ad5fd1d..420f7a4c 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 @@ -90,9 +90,9 @@ public class PoundlistController { Map materialCodeMap = new HashMap<>(); // entity.setMaterialCode(generaterSwapUtil.getPopupSelectValue("381037852907038533","item_code","item_code",entity.getMaterialCode(),materialCodeMap)); Map salesNameMap = new HashMap<>(); - entity.setSalesName(generaterSwapUtil.getPopupSelectValue("381038993740949317","contract_name","contract_name",entity.getSalesName(),salesNameMap)); + // entity.setSalesName(generaterSwapUtil.getPopupSelectValue("381038993740949317","contract_name","contract_name",entity.getSalesName(),salesNameMap)); Map licenseNoMap = new HashMap<>(); - entity.setLicenseNo(generaterSwapUtil.getPopupSelectValue("381432451370615173","ticketno","ticketno",entity.getLicenseNo(),licenseNoMap)); +// entity.setLicenseNo(generaterSwapUtil.getPopupSelectValue("381432451370615173","ticketno","ticketno",entity.getLicenseNo(),licenseNoMap)); entity.setPoundPictures(generaterSwapUtil.getFileNameInJson(entity.getPoundPictures())); entity.setVehiclePictures(generaterSwapUtil.getFileNameInJson(entity.getVehiclePictures())); Map purchaseNameMap = new HashMap<>(); @@ -168,9 +168,9 @@ public class PoundlistController { 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)); + // entity.setSalesName(generaterSwapUtil.swapRelationFormValue("selectField121",entity.getSalesName(),"294090217084722181",salesNameMap)); Map licenseNoMap = new HashMap<>(); - entity.setLicenseNo(generaterSwapUtil.swapRelationFormValue("selectField122",entity.getLicenseNo(),"294090217084722181",licenseNoMap)); +// entity.setLicenseNo(generaterSwapUtil.swapRelationFormValue("selectField122",entity.getLicenseNo(),"294090217084722181",licenseNoMap)); entity.setPoundPictures(generaterSwapUtil.getFileNameInJson(entity.getPoundPictures())); entity.setVehiclePictures(generaterSwapUtil.getFileNameInJson(entity.getVehiclePictures())); Map purchaseNameMap = new HashMap<>(); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java index 9be0e7a0..e877bffc 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java @@ -69,23 +69,25 @@ public class PoundlistEntity { @TableField("DEPARTMENT_ID") private String departmentId; - @TableField("LICENSE_NO") - private String licenseNo; +// @TableField("LICENSE_NO") +// private String licenseNo; +// @TableField("LICENSE_NO") +// private String licenseNo; - @TableField("CUSTOMER_CODE") - private String customerCode; +// @TableField("CUSTOMER_CODE") +// private String customerCode; - @TableField("CUSTOMER_NAME") - private String customerName; + @TableField("CUSTOMER_ID") + private String customerId; - @TableField("SALES_CODE") - private String salesCode; + @TableField("SALES_ID") + private String salesId; - @TableField("SALES_NAME") - private String salesName; +// @TableField("SALES_NAME") +// private String salesName; - @TableField("SUPPLIER_CODE") - private String supplierCode; + @TableField("SUPPLIER_ID") + private String supplierId; @TableField("SUPPLIER_NAME") private String supplierName; @@ -144,11 +146,11 @@ public class PoundlistEntity { @TableField("POUND_DATE") private Date poundDate; - @TableField("BUSINESS_CODE") - private String businessCode; + @TableField("BUSINESS_ID") + private String businessId; - @TableField("BUSINESS_NAME") - private String businessName; +// @TableField("BUSINESS_NAME") +// private String businessName; @TableField("POUND_PICTURES") private String poundPictures; @@ -156,8 +158,8 @@ public class PoundlistEntity { @TableField("VEHICLE_PICTURES") private String vehiclePictures; - @TableField("DRIVER_NAME") - private String driverName; +// @TableField("DRIVER_NAME") +// private String driverName; @TableField("POUND_TYPE") private String poundType; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java index a2b5214d..d40611b3 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java @@ -97,10 +97,10 @@ public class PoundlistServiceImpl extends ServiceImpl { // 拼接sql wq.like(PoundlistEntity::getSupplierName,poundlistPagination.getKeyword()) - .or() - .like(PoundlistEntity::getCustomerName,poundlistPagination.getKeyword()) - .or() - .like(PoundlistEntity::getLicenseNo,poundlistPagination.getKeyword()); + .or(); +// .like(PoundlistEntity::getCustomerName,poundlistPagination.getKeyword()) +// .or() +// .like(PoundlistEntity::getLicenseNo,poundlistPagination.getKeyword()); }); } if(AllIdList.size()>0){