lichunyang/beixin
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

家装公装、基材面材提交

Browse Source
This commit is contained in:
yujh_java 2025-09-24 10:34:09 +08:00
parent 9a6057114c
commit 58d3ae029e
3 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleCountDimensionImpl.java
View File

@ -485,9 +485,11 @@ public class SaleCountDimensionImpl implements DataSummaryService {
bo.set("XE", xe); bo.set("XE", xe);
// 匹配公装家装类别，如果未匹配到，则默认未其他 // 匹配公装家装类别，如果未匹配到，则默认未其他
String[] gzjzStrings = SaleUtil.matchSingleField(bkgs, map.getString("LB_1"), map.getString("LB_2"),map.getString("LB_3"), gzjzList, "其他", "其他","其他"); String[] gzjzStrings = SaleUtil.matchSingleField(bkgs, map.getString("LB_1"), map.getString("LB_2"),map.getString("LB_3"), gzjzList, "其他", "其他","其他");
bo.set("JZ_GZ", gzjzStrings[0]); bo.set("MC_JC", gzjzStrings[1]);//面材/基材
bo.set("MC_JC", gzjzStrings[1]); bo.set("JZ_GZ", gzjzStrings[0]);//家装/工装
bo.set("PROD_CAT", gzjzStrings[2]); bo.set("PROD_CAT", gzjzStrings[2]);//产品类型
bo.set("PBGNB", gzjzStrings[3]);//普板/功能板
bo.set("ISOEM", gzjzStrings[4]);//是否OEM板
// bo.set("SNTQXE", map.getString("sntqxe")); // bo.set("SNTQXE", map.getString("sntqxe"));
bo.set("BHSYYSR", ssjermb); bo.set("BHSYYSR", ssjermb);
bos.add(bo); bos.add(bo);

2
com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSummaryServiceImpl.java
View File

@ -229,6 +229,8 @@ public class SaleDataSummaryServiceImpl implements DataSummaryService {
priceBO.set("MC_JC", gzjzStrings[1]);//面材/基材 priceBO.set("MC_JC", gzjzStrings[1]);//面材/基材
priceBO.set("JZ_GZ", gzjzStrings[0]);//家装/工装 priceBO.set("JZ_GZ", gzjzStrings[0]);//家装/工装
priceBO.set("PROD_CAT", gzjzStrings[2]);//产品类型 priceBO.set("PROD_CAT", gzjzStrings[2]);//产品类型
priceBO.set("PBGNB", gzjzStrings[3]);//普板/功能板
priceBO.set("ISOEM", gzjzStrings[4]);//是否OEM板
String monthPeriod = SaleUtil.getMonthPeriod(dzrq); String monthPeriod = SaleUtil.getMonthPeriod(dzrq);
priceBO.set("XUN", monthPeriod);//月寻 priceBO.set("XUN", monthPeriod);//月寻
list.add(priceBO); list.add(priceBO);

41
com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/util/SaleUtil.java
View File

@ -13,33 +13,48 @@ public class SaleUtil {
* @param defaultJcmc 匹配失败时默认的 JCMC 值 * @param defaultJcmc 匹配失败时默认的 JCMC 值
* @return 匹配结果数组 [JZGZ, JCMC] * @return 匹配结果数组 [JZGZ, JCMC]
*/ */
public static String[] matchSingleField(String bbgsSource, String cpmcSource,String cppb_l2Source,String cppb_l3Source, public static String[] matchSingleField(String bbgsSource, String lb_1,String lb_2,String lb_3,
List<BO> boList, String defaultJzgz, String defaultJcmc,String defaultProdCat) { List<BO> boList, String defaultJzgz, String defaultJcmc,String defaultProdCat) {
if (boList == null || boList.isEmpty()) { if (boList == null || boList.isEmpty()) {
return new String[]{defaultJzgz, defaultJcmc,defaultProdCat}; return new String[]{defaultJzgz, defaultJcmc,defaultProdCat};
} }
//有个泰山特殊的，涉及到L3直接返回
if(bbgsSource.equals("泰山石膏") && cpmcSource.equals("石膏板") && cppb_l2Source.equals("泰山") && cppb_l3Source.equals("饰面板") ) {
return new String[]{"家装","面材","泰山"};
}
for (BO bo : boList) { for (BO bo : boList) {
String bbgs = bo.getString("BBGS"); String bbgs = bo.getString("BBGS");
String cpmc = bo.getString("CPMC"); String cpdl = bo.getString("CPDL");
String cppb_l2 = bo.getString("CPLB_L2"); String cppp = bo.getString("CPPP");
if(bbgs.equals(bbgsSource) && cpmcSource.contains(cpmc) && cppb_l2Source.contains(cppb_l2)) { String cpgn = bo.getString("CPGN");
return new String[]{bo.getString("JZGZ"), bo.getString("JCMC"), bo.getString("TYPE_PP")}; //梦牌特殊处理
if(bbgsSource.equals("梦牌") && lb_1.equals("石膏板") && lb_2.equals("梦牌") && !lb_3.equals("高强楔形")){
//检验产品名称
//先临时全部放家装了，暂时不处理了，后续处理
}
//泰山特殊处理
if(cpgn.equals("需要补全")){ //只比较到L2
if(bbgs.equals(bbgsSource) && lb_1.equals(cpdl) && lb_2.equals(cppp)) {
return new String[]{bo.getString("JZGZ"), bo.getString("JCMC"), bo.getString("TYPE_PP"),bo.getString("PBGNB"),bo.getString("ISOEM")};
}
}
//按照板块公司,L1,L2,L3匹配
if(bbgs.equals(bbgsSource) && lb_1.equals(cpdl) && lb_2.equals(cppp) && lb_3.equals(cpgn)) {
return new String[]{bo.getString("JZGZ"), bo.getString("JCMC"), bo.getString("TYPE_PP"),bo.getString("PBGNB"),bo.getString("ISOEM")};
} }
} }
if (bbgsSource.equals("泰山石膏") && cpmcSource.equals("石膏板")) { if (bbgsSource.equals("泰山石膏") && lb_2.equals("石膏板")) {
defaultJzgz = "公装";
defaultJcmc = "基材";
defaultProdCat = "非泰山"; defaultProdCat = "非泰山";
} }
if (bbgsSource.equals("龙牌") && cpmcSource.equals("石膏板")) { if (bbgsSource.equals("龙牌") && lb_2.equals("石膏板")) {
defaultJzgz = "公装";
defaultJcmc = "基材";
defaultProdCat = "非龙牌"; defaultProdCat = "非龙牌";
} }
if (bbgsSource.equals("梦牌") && cpmcSource.equals("石膏板")) { if (bbgsSource.equals("梦牌") && lb_2.equals("石膏板")) {
defaultJzgz = "公装";
defaultJcmc = "基材";
defaultProdCat = "非梦牌"; defaultProdCat = "非梦牌";
} }
return new String[]{defaultJzgz, defaultJcmc,defaultProdCat}; return new String[]{defaultJzgz, defaultJcmc,defaultProdCat,"其他","其他"};
} }
/** /**