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

1、销售数据去除查询去年同期

Browse Source 
2、增加乳液等分类只有北新防水、嘉宝莉、涂料
This commit is contained in:
llllon 2025-09-11 08:49:06 +08:00
parent f85d62d394
commit 519debea73
7 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/classes/java/main/com/awspaas/user/apps/bnbm/datalinkup/service/impl/PurchaseDataSyncServiceImpl.class
View File

Binary file not shown.

BIN
com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/classes/java/main/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleCountDimensionImpl.class
View File

Binary file not shown.

BIN
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
View File

Binary file not shown.

BIN
com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/tmp/compileJava/previous-compilation-data.bin
View File

Binary file not shown.

11
com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/PurchaseDataSyncServiceImpl.java
View File

@ -884,6 +884,17 @@ public class PurchaseDataSyncServiceImpl implements DataSyncService {
BigDecimal multiply = BigDecimal.valueOf(safeRksl).multiply(BigDecimal.valueOf(safeHsdjhyf)); BigDecimal multiply = BigDecimal.valueOf(safeRksl).multiply(BigDecimal.valueOf(safeHsdjhyf));
bo.set("DHJE", multiply.doubleValue()); bo.set("DHJE", multiply.doubleValue());
} }
//乳液、包装桶、钛白粉、重钙 只包含 北新防水、北新嘉宝莉、北新涂料
// 定义需要检查的物料名称集合
Set<String> targetMaterials = new HashSet<>(Arrays.asList("乳液", "包装桶", "钛白粉", "重钙"));
// 定义允许的供应商集合
Set<String> allowedSuppliers = new HashSet<>(Arrays.asList("北新防水", "北新嘉宝莉", "北新涂料"));
// 检查条件
if (targetMaterials.contains(bo.getString("WLMC"))
&& !allowedSuppliers.contains(bkgs)) {
continue;
}
} }
bos.add(bo); bos.add(bo);
} }

6
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

@ -453,9 +453,9 @@ public class SaleCountDimensionImpl implements DataSummaryService {
// bo.set("SNTQXL", map1.getString("XL")); // bo.set("SNTQXL", map1.getString("XL"));
// } // }
} }
Double ssjermb = map.getDouble("SSJERMB"); Double ssjermb = map.getDouble("XE");
Double xe = map.getDouble("XE"); Double xe = map.getDouble("NMNY");
bo.set("XE", ssjermb!=null?ssjermb:xe!=null?(xe*0.13):0.00); bo.set("XE", xe);
// bo.set("SNTQXE", map1.getString("XE")); // bo.set("SNTQXE", map1.getString("XE"));
// 匹配公装家装类别，如果未匹配到，则默认未其他 // 匹配公装家装类别，如果未匹配到，则默认未其他
String[] gzjzStrings = SaleUtil.matchSingleField(bkgs, map.getString("LB_1"), map.getString("LB_2"), gzjzList, "其他", "其他","其他"); String[] gzjzStrings = SaleUtil.matchSingleField(bkgs, map.getString("LB_1"), map.getString("LB_2"), gzjzList, "其他", "其他","其他");

13
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
View File

@ -810,12 +810,13 @@ public class SaleDataSyncServiceImpl implements DataSyncService {
} }
} }
//修改产量类型1 //修改产量类型1
if ("龙牌".equals(map.getString("BKGS")) // if ("龙牌".equals(map.getString("BKGS"))
&& ("装饰石膏板".equals(map.getString("LB_1")) || "鲁班装饰万能板".equals(map.getString("LB_1")))){ // && ("装饰石膏板".equals(map.getString("LB_1")) || "鲁班装饰万能板".equals(map.getString("LB_1")))){
bo.set("LB_1","石膏板"); // bo.set("LB_1","石膏板");
} else if ("泰山石膏".equals(map.getString("BKGS")) && ("装饰板".equals(map.getString("LB_1")))) { // } else if ("泰山石膏".equals(map.getString("BKGS")) && ("装饰板".equals(map.getString("LB_1")))) {
bo.set("LB_1","石膏板"); // bo.set("LB_1","石膏板");
} // }
LOGGER.info("泰山应收的数据：{}",bo.toJSONObject());
bos.add(bo); bos.add(bo);
} }