diff --git a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/classes/java/main/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSyncServiceImpl.class b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/classes/java/main/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSyncServiceImpl.class index 6148b16..fed9347 100644 Binary files a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/classes/java/main/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSyncServiceImpl.class and b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/classes/java/main/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSyncServiceImpl.class differ diff --git a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/tmp/compileJava/previous-compilation-data.bin b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/tmp/compileJava/previous-compilation-data.bin index 7cb37cd..a99fe4f 100644 Binary files a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/tmp/compileJava/previous-compilation-data.bin and b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSyncServiceImpl.java b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSyncServiceImpl.java index f33ddb5..d975764 100644 --- a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSyncServiceImpl.java +++ b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSyncServiceImpl.java @@ -561,7 +561,6 @@ public class SaleDataSyncServiceImpl implements DataSyncService { */ public int processAndInsertData(List sourceData, List mappings, String targetTable) { - List gzjzList = SDK.getBOAPI().query("BO_EU_DATALINKUP_CPJZGZJCMC").desc().list(); String bkgs = ""; Set bkgsSet = null; if (sourceData.isEmpty()) { @@ -580,17 +579,6 @@ public class SaleDataSyncServiceImpl implements DataSyncService { try { // 字段映射转换 BO targetData = convertFields(record, mappings); - // 匹配公装家装类别,如果未匹配到,则默认未其他 - if ("BO_EU_BNBM_DATALINKUP_XS_XSL_JBL,BO_EU_BNBM_DATALINKUP_XS_XSL,BO_EU_TL_SALESDATA_SKD,BO_EU_SALESDATA_SKD,BO_EU_BNBM_DATALINKUP_XS_XSL_TS".contains(targetTable)) { - String[] gzjzStrings = SaleUtil.matchSingleField(targetData.getString("BKGS"), targetData.getString("LB_1"), - targetData.getString("LB_2"), targetData.getString("LB_3"), gzjzList, "其他", "其他", "其他"); - targetData.set("MC_JC", gzjzStrings[1]);//面材/基材 - targetData.set("JZ_GZ", gzjzStrings[0]);//家装/工装 - targetData.set("PROD_CAT", gzjzStrings[2]);//产品类型 - targetData.set("PBGNB", gzjzStrings[3]);//普板/功能板 - targetData.set("ISOEM", gzjzStrings[4]);//是否OEM板 -// bo.set("SNTQXE", map.getString("sntqxe")); - } batchList.add(targetData); @@ -929,6 +917,17 @@ public class SaleDataSyncServiceImpl implements DataSyncService { bo.set("QYGS", "其他"); // 循环结束后仍未找到则设為"其他" } } + // 匹配公装家装类别,如果未匹配到,则默认未其他 + if (hzb.equals("BO_EU_BNBM_DATALINKUP_XS_XSL_HZ")) { + List gzjzList = SDK.getBOAPI().query("BO_EU_DATALINKUP_CPJZGZJCMC").desc().list(); + String[] gzjzStrings = SaleUtil.matchSingleField(bo.getString("BKGS"), bo.getString("LB_1"), + bo.getString("LB_2"), bo.getString("LB_3"), gzjzList, "其他", "其他", "其他"); + bo.set("JCMC", gzjzStrings[1]);//面材/基材 + bo.set("JZGZ", gzjzStrings[0]);//家装/工装 + bo.set("TYPE_PP", gzjzStrings[2]);//产品类型 + bo.set("PBGNB", gzjzStrings[3]);//普板/功能板 + bo.set("ISOEM", gzjzStrings[4]);//是否OEM板 + } bos.add(bo); }