杰生迭代

hx-service/storage/src/main/java/com/fjhx/stock/service/impl/StockBackPlanServiceImpl.java

@@ -42,13 +42,6 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
 
     private static final Object obj = new Object();
 
-    // private static final List<String> materialNameList = Arrays.asList(
-    //         "黑色 170克100%精梳棉",
-    //         "灰色 170克100%精梳棉",
-    //         "空白鼠标垫+密锁边",
-    //         "法兰绒"
-    // );
-
     @Autowired
     private StockBackPlanDetailsService stockBackPlanDetailsService;
 
@@ -66,18 +59,21 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
             Integer defaultStatisticsDay = planConfigMap.get("defaultStatisticsDay").getDays();
             int offset = nextStatisticsDay - 1;
 
-
+            // 排除v3推送的物料
             List<String> materialNameList = Arrays.asList(planConfigMap.get("excludeMaterial").getOther().split(","));
 
             // 请求v3接口获取token
             String token = getToken();
 
-            // 请求v3接口获取所有人领料信息
-            Date date = new Date();
+            // 结束时间
+            Date endDate = new Date();
+            String endDateStr = DateUtil.format(endDate, "yyyy-MM-dd 23:59:59");
 
-            String beginDateStr = DateUtil.format(DateUtil.offsetDay(date, -offset), "yyyy-MM-dd 00:00:00");
-            String endDateStr = DateUtil.format(date, "yyyy-MM-dd 23:59:59");
+            // 开始时间
+            Date beginDate = DateUtil.beginOfDay(DateUtil.offsetDay(endDate, -offset));
+            String beginDateStr = DateUtil.format(DateUtil.offsetDay(endDate, -offset), "yyyy-MM-dd 00:00:00");
 
+            // 请求v3接口获取所有人领料信息
             String url = "http://mes.cfmfactory.com:8087/MesWeb/planPersonOutAction.do?action=list&beginDate="
                     + beginDateStr + "&endDate=" + endDateStr + "&access_token=" + token;
 
@@ -87,6 +83,7 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
             // 接收到的消息
             List<JSONObject> items = (List<JSONObject>) resultMap.get("items");
 
+            // 删除原统计数据
             remove(Wrappers.<StockBackPlan>lambdaQuery().between(StockBackPlan::getPlanTime, beginDateStr, endDateStr));
 
             Map<String, StockBackPlan> flagMap = new HashMap<>();
@@ -98,7 +95,7 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
                 // 打纸人员工号
                 String paperMan = item.getString("paperMan");
                 // 排班面积
-                BigDecimal plantotalsquare = new BigDecimal(item.getString("plantotalsquare"));
+                BigDecimal planTotalSquare = new BigDecimal(item.getString("plantotalsquare"));
                 // 物料名称
                 String material = item.getString("material");
                 // 排班时间
@@ -122,10 +119,9 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
 
                 if (!"胶印".equals(tech)) {
                     // 喷印人员工号添加领料记录标记
-                    addOrEditFlagMap(flagMap, distributor, plantotalsquare, planDate, material, tech, date);
-
+                    addOrEditFlagMap(flagMap, distributor, planTotalSquare, planDate, material, tech, endDate);
                     // 打纸人员工号添加领料记录标记
-                    addOrEditFlagMap(flagMap, paperMan, plantotalsquare, planDate, "热转印纸", "打纸", date);
+                    addOrEditFlagMap(flagMap, paperMan, planTotalSquare, planDate, "热转印纸", "打纸", endDate);
                 }
 
             });
@@ -136,12 +132,9 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
             // 更新当天的出库单
             saveBatch(stockBackPlanList);
 
-            // 开始时间
-            Date beginDate = DateUtil.beginOfDay(DateUtil.offsetDay(date, -offset));
-
             // 删除排班统计
             stockBackPlanDetailsService.remove(Wrappers.<StockBackPlanDetails>lambdaQuery()
-                    .between(StockBackPlanDetails::getPlanTime, beginDate, date));
+                    .between(StockBackPlanDetails::getPlanTime, beginDate, endDate));
 
             // 工号，物料名称，排班时间封装成key，对象为value
             Map<String, StockBackPlanDetails> stockBackPlanMap = stockBackPlanList.stream().collect(Collectors.toMap(
@@ -193,70 +186,12 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
             // 最近一次更新时间
             planConfigService.update(Wrappers.<PlanConfig>lambdaUpdate()
                     .eq(PlanConfig::getCode, "lastStatisticsTime")
-                    .set(PlanConfig::getOther, DateUtil.format(date, "yyyy-MM-dd HH:mm:ss"))
+                    .set(PlanConfig::getOther, DateUtil.format(endDate, "yyyy-MM-dd HH:mm:ss"))
             );
 
         }
     }
 
-    // @Transactional(rollbackFor = Exception.class)
-    // @Override
-    // public void statisticsScheduleDateTask(int offset) {
-    //
-    //     synchronized (obj) {
-    //
-    //         // 统计近 offset 天排班
-    //         Date endDate = new Date();
-    //         Date beginDate = DateUtil.beginOfDay(DateUtil.offsetDay(endDate, -offset));
-    //
-    //         List<StockBackPlan> list = list(Wrappers.<StockBackPlan>lambdaQuery()
-    //                 .between(StockBackPlan::getPlanTime, beginDate, endDate));
-    //
-    //         stockBackPlanDetailsService.remove(Wrappers.<StockBackPlanDetails>lambdaQuery()
-    //                 .between(StockBackPlanDetails::getPlanTime, beginDate, endDate));
-    //
-    //         // 工号，物料名称，排班时间封装成key，对象为value
-    //         Map<String, StockBackPlanDetails> stockBackPlanMap = list.stream().collect(Collectors.toMap(
-    //                 item -> item.getJobNo() + item.getPlanMaterial() + item.getPlanTime().getTime(),
-    //                 item -> {
-    //                     StockBackPlanDetails stockBackPlanDetails =
-    //                             createStockBackPlanDetails(item.getJobNo(), item.getPlanMaterial(), item.getPlanTime());
-    //                     stockBackPlanDetails.setQuantity(item.getQuantity());
-    //                     stockBackPlanDetails.setTech(item.getTech());
-    //                     return stockBackPlanDetails;
-    //                 }
-    //         ));
-    //
-    //         // 查询出库
-    //         issue(beginDate, stockBackPlanMap);
-    //
-    //         // 转印部门出库
-    //         issueA008(beginDate, stockBackPlanMap);
-    //
-    //         // 回仓
-    //         returnWarehouse(beginDate, stockBackPlanMap);
-    //
-    //         // 转印部门回仓
-    //         returnWarehouseA008(beginDate, stockBackPlanMap);
-    //
-    //         // 物料修正
-    //         correct(beginDate, stockBackPlanMap);
-    //
-    //         // 转入
-    //         transferIn(beginDate, stockBackPlanMap);
-    //
-    //         // 转出
-    //         transferOut(beginDate, stockBackPlanMap);
-    //
-    //         // 布头布尾修正
-    //         headTailCorrect(beginDate, stockBackPlanMap);
-    //
-    //         stockBackPlanDetailsService.saveBatch(new ArrayList<>(stockBackPlanMap.values()));
-    //
-    //     }
-    //
-    // }
-
 
     private StockBackPlanDetails createStockBackPlanDetails(String jobNo, String materialName, Date planDate) {
         StockBackPlanDetails stockBackPlanDetails = new StockBackPlanDetails();