资产负债半成品生产在库金额参与存货统计，半成品采购明细跑指定天数旧数据

data-base/base-sync-purchase-details/src/main/java/com/bailuntec/Application.java

@@ -27,6 +27,7 @@ public class Application {
         new JobScheduler(createRegistryCenter(), createJobConfiguration()).init();
         new JobScheduler(createRegistryCenter(), createJobConfiguration1()).init();
         new JobScheduler(createRegistryCenter(), createJobConfiguration2()).init();
+        new JobScheduler(createRegistryCenter(), createJobConfiguration3()).init();
     }
 
     private static CoordinatorRegistryCenter createRegistryCenter() {
@@ -56,6 +57,13 @@ public class Application {
         return simpleJobRootConfig;
     }
 
+    private static LiteJobConfiguration createJobConfiguration3() {
+        JobCoreConfiguration simpleCoreConfig = JobCoreConfiguration.newBuilder(propertiesUtil.getPropertyAsString("SEMI_OLD_JOB_NAME"), propertiesUtil.getPropertyAsString("SEMI_OLD_JOB_CRON"), propertiesUtil.getPropertyAsInt("SHARDING_TOTAL_COUNT")).build();
+        SimpleJobConfiguration simpleJobConfig = new SimpleJobConfiguration(simpleCoreConfig, SyncSemiPurchaseOldDetailsJob.class.getCanonicalName());
+        LiteJobConfiguration simpleJobRootConfig = LiteJobConfiguration.newBuilder(simpleJobConfig).build();
+        return simpleJobRootConfig;
+    }
+
     private static JobEventConfiguration createJobEventConfiguration() {
         JobEventConfiguration jobEventRdbConfig = new JobEventRdbConfiguration(setUpEventTraceDataSource());
         return jobEventRdbConfig;

data-base/base-sync-purchase-details/src/main/java/com/bailuntec/job/SyncSemiPurchaseOldDetailsJob.java

@@ -35,7 +35,7 @@ public class SyncSemiPurchaseOldDetailsJob extends PointJob {
     public void executeJob(ShardingContext shardingContext, JobPointLog jobPointLog) {
         MediaType mediaType = MediaType.parse("application/json");
         LinkedHashMap<String, Object> map = new LinkedHashMap<>(4);
-        map.put("start", DateTimeFormatter.ofPattern(CommonConstant.TIME_FORMAT).format(jobPointLog.getStartTime().minusDays(15L)));
+        map.put("start", DateTimeFormatter.ofPattern(CommonConstant.TIME_FORMAT).format(jobPointLog.getStartTime().minusDays(jobPointLog.getType())));
         map.put("end", DateTimeFormatter.ofPattern(CommonConstant.TIME_FORMAT).format(jobPointLog.getEndTime()));
         map.put("pagesize", jobPointLog.getPageSize());
         List<PurchaseDetailDTO> purchaseDetailDTOList = null;

data-base/base-sync-purchase-details/src/main/resources/job.properties

@@ -14,4 +14,6 @@ SEMI_JOB_NAME=semi-purchase-details-info
 SEMI_JOB_CRON=0/3 * * * * ? *
 AIMS_JOB_NAME=base-purchase-details-aims
 AIMS_JOB_CRON=0 0 12 * * ? *
+SEMI_OLD_JOB_NAME=semi-purchase-details-info
+SEMI_OLD_JOB_CRON=0 0 12 * * ? *
 SHARDING_TOTAL_COUNT=1
\ No newline at end of file

data-finance/finance-balance-sheet/src/main/java/com/bailuntec/balancesheet/service/BalanceSheetService.java

@@ -479,6 +479,7 @@ public class BalanceSheetService {
         BigDecimal semiHaNiInventoryAmountSum = dcSemiDailyStockMapper.getSemiHaNiDailyStockSum(date);
         if(semiHaNiInventoryAmountSum == null) semiHaNiInventoryAmountSum = BigDecimal.ZERO;
         dcBalanceSheet.setSemiHaNiInventoryAmount(semiHaNiInventoryAmountSum);
+        //半成品生产在库金额
         BigDecimal semiProdInventoryAmountSum = dcSemiDailyStockMapper.getSemiProdInventoryAmountSum(date);
         if(semiProdInventoryAmountSum == null) semiProdInventoryAmountSum = BigDecimal.ZERO;
         dcBalanceSheet.setSemiProdInventoryAmount(semiProdInventoryAmountSum);
@@ -495,9 +496,9 @@ public class BalanceSheetService {
         BigDecimal semiHaNiTransferAmountSum = dcSemiDailyTransferMapper.getSemiHaNiDailyTransferSum(date);
         if(semiHaNiTransferAmountSum == null) semiHaNiTransferAmountSum = BigDecimal.ZERO;
         dcBalanceSheet.setSemiHaNiTransferAmount(semiHaNiTransferAmountSum);
-        // 存货 金额   FBA在库金额+非FBA在库金额(不包含耗材仓)+FBA调拨在途金额(不包含调拨计划)+非FBA调拨在途金额(不包含调拨计划)+半成品在库金额
+        // 存货 金额   FBA在库金额+非FBA在库金额(不包含耗材仓)+FBA调拨在途金额(不包含调拨计划)+非FBA调拨在途金额(不包含调拨计划)+半成品在库金额+半成品生产在库金额
 //        BigDecimal inventoryBalanceSum = fbaInventoryAmountSum.add(notFbaInventoryAmountSum).add(fbaTransferAmountSum).add(notFbaTransferAmountSum).add(semiInventoryAmountSum).add(semiTransferAmountSum);
-        BigDecimal inventoryBalanceSum = fbaInventoryAmountSum.add(notFbaInventoryAmountSum).add(fbaTransferAllotAmountSum).add(notFbaTransferAllotAmountSum).add(semiBailunInventoryAmountSum);
+        BigDecimal inventoryBalanceSum = fbaInventoryAmountSum.add(notFbaInventoryAmountSum).add(fbaTransferAllotAmountSum).add(notFbaTransferAllotAmountSum).add(semiBailunInventoryAmountSum).add(semiProdInventoryAmountSum);
         dcBalanceSheet.setInventoryAmount(inventoryBalanceSum);
         dcBalanceSheet.setCompanyValue(0);
         dcBalanceSheet.setStatisticalTime(date);