1、销售应收明细汇总修改
2、一体化保存产品单价日明细 3、采购明细汇总运费合并
This commit is contained in:
llllon
parent
f06f0a8a0b
commit
3fdce1dddd
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -438,11 +438,11 @@ public class DataLinkUpController {
|
||||
// 根据时间范围增加数据分页查询数据存储到BO_EU_BNBM_DATALINKUP_XS_XSL_HZ
|
||||
// 按时间范围分页迁移数据到汇总表
|
||||
long summarizeStartTime = System.currentTimeMillis();
|
||||
// if (tablename.equals("应收表")){
|
||||
// dataSyncService.summarizeScopeDataYs(targetTable, startDate, endDate, targetTimeField, hzb);
|
||||
// }else {
|
||||
if (tablename.equals("应收表")){
|
||||
dataSyncService.summarizeScopeDataYs(targetTable, startDate, endDate, targetTimeField, hzb);
|
||||
}else {
|
||||
dataSyncService.summarizeScopeData(targetTable, startDate, endDate, targetTimeField, hzb);
|
||||
// }
|
||||
}
|
||||
LOGGER.info("范围数据汇总完成，耗时：{}ms", System.currentTimeMillis() - summarizeStartTime);
|
||||
}
|
||||
LOGGER.info("【完成处理】配置项[{}]，板块：{}，总耗时：{}ms",
|
||||
|
||||
@ -176,11 +176,11 @@ public class PurchaseDataSummaryServiceImpl implements DataSummaryService {
|
||||
// 处理单价和金额，添加除零检查
|
||||
if ("泰山石膏".equals(bkgs)) {
|
||||
Double dhje = row.getDouble("DHJE");
|
||||
double rkdj = 0.0;
|
||||
if (dhje != null && dhje != 0 && rksl != null && rksl != 0) {
|
||||
rkdj = dhje / rksl;
|
||||
}
|
||||
detailBO.set("RKDJ", rkdj); // 入库单价
|
||||
// double rkdj = 0.0;
|
||||
// if (dhje != null && dhje != 0 && rksl != null && rksl != 0) {
|
||||
// rkdj = dhje / rksl;
|
||||
// }
|
||||
detailBO.set("RKDJ", row.getString("HSDJHYF")); // 入库单价
|
||||
detailBO.set("RKJE", dhje != null ? dhje : 0.0); // 入库单价
|
||||
} else {
|
||||
Double jshjhyf = row.getDouble("JSHJHYF");
|
||||
|
||||
@ -873,18 +873,6 @@ public class PurchaseDataSyncServiceImpl implements DataSyncService {
|
||||
bo.set("WLMC", wlmc);
|
||||
bo.set("OLDWLMC", wlmc);
|
||||
}
|
||||
// LOGGER.info("采购_入库单汇总,刷新物料名称------物料名称：{}，板块公司：{}，物料编码：{}，入库单位：{}，单价：{}，物料分类：{}", wlmc, bkgs, wlbm, jldw, djhyf, wlfl);
|
||||
// if ("泰山石膏".equals(bkgs)) {
|
||||
// 处理入库单金额 入库数量*含税单价
|
||||
Double rksl = bo.get("RKSL", Double.class);// 入库数量
|
||||
Double hsdjhyf = bo.get("HSDJHYF", Double.class);// 含税单价（含运费）
|
||||
// 处理可能为null的值，默认设为0.0
|
||||
double safeRksl = rksl != null ? rksl : 0.0;
|
||||
double safeHsdjhyf = hsdjhyf != null ? hsdjhyf : 0.0;
|
||||
BigDecimal multiply = BigDecimal.valueOf(safeRksl).multiply(BigDecimal.valueOf(safeHsdjhyf));
|
||||
bo.set("DHJE", multiply.doubleValue());
|
||||
// }
|
||||
|
||||
//乳液、包装桶、钛白粉、重钙 只包含 北新防水、北新嘉宝莉、北新涂料
|
||||
// 定义需要检查的物料名称集合
|
||||
Set<String> targetMaterials = new HashSet<>(Arrays.asList("乳液", "包装桶", "钛白粉", "重钙"));
|
||||
@ -906,6 +894,32 @@ public class PurchaseDataSyncServiceImpl implements DataSyncService {
|
||||
bo.set("RKSL",rkslDou2-thsl2);
|
||||
}
|
||||
}
|
||||
Double rksl = bo.get("RKSL", Double.class);// 入库数量
|
||||
Double hsdjhyf = bo.get("HSDJHYF", Double.class);// 含税单价（含运费）
|
||||
// 处理可能为null的值，默认设为0.0
|
||||
double safeRksl = rksl != null ? rksl : 0.0;
|
||||
double safeHsdjhyf = hsdjhyf != null ? hsdjhyf : 0.0;
|
||||
if (bkgs.equals("龙牌")){
|
||||
Double yfdjhs = bo.get("YFDJHS", Double.class);//运费单价（含税）
|
||||
double yfdjhs1 = yfdjhs!=null?yfdjhs:0.0;
|
||||
Double yfdjws = bo.get("YFDJWS", Double.class);//运费单价（未税）
|
||||
double yfdjws1 = yfdjws!=null?yfdjws:0.0;
|
||||
Double djhyf1 = bo.get("DJHYF", Double.class);
|
||||
double djhyfDou = djhyf1!=null?djhyf1:0.0;
|
||||
if (yfdjhs1!=0.0){
|
||||
safeHsdjhyf+=yfdjhs1;
|
||||
}else if (yfdjws1 != 0.0){
|
||||
djhyfDou+=yfdjws1;
|
||||
}
|
||||
BigDecimal multiply = BigDecimal.valueOf(safeRksl).multiply(BigDecimal.valueOf(safeHsdjhyf));
|
||||
bo.set("HSDJHYF", safeHsdjhyf);//含税单价含运费
|
||||
bo.set("DJHYF", djhyfDou);//单价含运费
|
||||
bo.set("JSHJHYF", multiply.doubleValue());//价税合计含运费
|
||||
}
|
||||
// 处理入库单金额 入库数量*含税单价
|
||||
BigDecimal multiply = BigDecimal.valueOf(safeRksl).multiply(BigDecimal.valueOf(safeHsdjhyf));
|
||||
bo.set("DHJE", multiply.doubleValue());//单行金额
|
||||
|
||||
}
|
||||
bos.add(bo);
|
||||
}
|
||||
|
||||
@ -189,7 +189,7 @@ public class SaleDataSummaryServiceImpl implements DataSummaryService {
|
||||
String sql = "SELECT DZRQ,LB_1,LB_2,LB_3,BKGS,SQ,CS,SUM(XSSL) AS tssales, SUM(ZSSL) AS lpsales,SUM(SSJERMB) AS revenue" +
|
||||
" FROM " +SALES_DETAIL_TABLE+
|
||||
" WHERE LB_1 IN ('石膏板', '轻钢龙骨', '涂料') AND ("+sfSql+")" +
|
||||
" GROUP BY DZRQ,LB_1,BKGS,CS ORDER BY DZRQ";
|
||||
" GROUP BY BKGS,LB_1,DZRQ,BKGS,SQ ORDER BY DZRQ";
|
||||
|
||||
List<RowMap> maps = DBSql.getMaps(sql);
|
||||
if (maps!=null){
|
||||
|
||||
Loading…
Reference in New Issue
Block a user