维多利亚

hx-service-api/storage-api/src/main/java/com/fjhx/entity/stock/StockBackPlan.java

@@ -48,6 +48,11 @@ public class StockBackPlan implements Serializable {
     private String jobNo;
 
     /**
+     * tech
+     */
+    private String tech;
+
+    /**
      * 创建时间
      */
     private Date createTime;

hx-service-api/storage-api/src/main/java/com/fjhx/entity/stock/StockBackPlanDetails.java

@@ -33,6 +33,11 @@ public class StockBackPlanDetails implements Serializable {
     private String planMaterial;
 
     /**
+     * tech
+     */
+    private String tech;
+
+    /**
      * 排班日期
      */
     private Date planTime;

hx-service/storage-restructure/src/main/java/com/fjhx/controller/v3/V3PlanStatisticsController.java

@@ -47,11 +47,16 @@ public class V3PlanStatisticsController {
         return R.success(result);
     }
 
+    /**
+     * 面料使用率分页
+     */
     @PostMapping("/statisticsPage")
     public R statisticsPage(@RequestBody Condition condition){
         Page<V3PlanStatisticsEx> result = v3PlanStatisticsService.statisticsPage(condition);
         return R.success(result);
     }
 
+
+
 }
 

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

@@ -1,5 +1,6 @@
 package com.fjhx.stock.service.impl;
 
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
@@ -92,25 +93,27 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
                     return;
                 }
 
-                // 喷印人员工号添加领料记录标记
-                addOrEditFlagMap(flagMap, distributor, plantotalsquare, planDate, material, newDate);
+                String tech = Convert.toStr(item.get("tech"), "");
 
-                // 打纸人员工号添加领料记录标记
-                addOrEditFlagMap(flagMap, paperMan, plantotalsquare, planDate, "热转印纸", newDate);
+                switch (tech) {
+                    case "热转印":
+                    case "双面热转":
+                        tech = "热转";
+                        break;
+                    case "双面直喷":
+                        tech = "直喷";
+                        break;
+                }
 
-            });
+                if (!"胶印".equals(tech)) {
+                    // 喷印人员工号添加领料记录标记
+                    addOrEditFlagMap(flagMap, distributor, plantotalsquare, planDate, material, tech, newDate);
 
-//        List<Map<String, Object>> list = baseMapper.getList(Wrappers.<Scheduling>lambdaQuery()
-//                .between(Scheduling::getPlanDate, beginDate, endDate));
-//
-//        for (Map<String, Object> map : list) {
-//            Long jobNo = Long.valueOf(map.get("jobNo").toString());
-//            BigDecimal quantity = BigDecimalUtil.keepDecimals(map.get("quantity"));
-//            String planDate = DateUtil.format((Date) map.get("planDate"), "yyyy-MM-dd");
-//            String materialName = map.get("materialName").toString().split("-")[0];
-//
-//            addOrEditFlagMap(flagMap, jobNo, quantity, planDate, materialName, newDate);
-//        }
+                    // 打纸人员工号添加领料记录标记
+                    addOrEditFlagMap(flagMap, paperMan, plantotalsquare, planDate, "热转印纸", "打纸", newDate);
+                }
+
+            });
 
             // 更新当天的出库单
             saveBatch(new ArrayList<>(flagMap.values()));
@@ -141,6 +144,7 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
                         StockBackPlanDetails stockBackPlanDetails =
                                 createStockBackPlanDetails(item.getJobNo(), item.getPlanMaterial(), item.getPlanTime());
                         stockBackPlanDetails.setQuantity(item.getQuantity());
+                        stockBackPlanDetails.setTech(item.getTech());
                         return stockBackPlanDetails;
                     }
             ));
@@ -221,7 +225,7 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
     /**
      * 赋值排班数据
      */
-    private void addOrEditFlagMap(Map<String, StockBackPlan> flagMap, String jobNo, BigDecimal plantotalsquare, String planDate, String material, Date date) {
+    private void addOrEditFlagMap(Map<String, StockBackPlan> flagMap, String jobNo, BigDecimal plantotalsquare, String planDate, String material, String tech, Date date) {
         if (Objects.equals(jobNo, "0")) {
             return;
         }
@@ -235,6 +239,7 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
             stockBackPlan.setPlanMaterial(material.trim());
             stockBackPlan.setPlanTime(DateUtil.parse(planDate));
             stockBackPlan.setQuantity(plantotalsquare);
+            stockBackPlan.setTech(tech);
             stockBackPlan.setCreateTime(date);
 
             flagMap.put(key, stockBackPlan);

hx-service/storage/src/main/java/com/fjhx/task/controller/ScheduleTaskController.java

@@ -11,6 +11,8 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 
+import javax.annotation.PostConstruct;
+
 @Configuration
 @EnableScheduling
 @Slf4j
@@ -62,13 +64,13 @@ public class ScheduleTaskController {
     /**
      * 统计排班数据
      */
-    @Scheduled(cron = "30 0/5 * * * ?")
-//    @PostConstruct
+    // @Scheduled(cron = "30 0/5 * * * ?")
+   @PostConstruct
     private void statisticsScheduleDateTask() {
-        if (BladeApplication.isLocalDev()) {
-            return;
-        }
-        stockBackPlanService.statisticsScheduleDateTask(4);
+        // if (BladeApplication.isLocalDev()) {
+        //     return;
+        // }
+        stockBackPlanService.statisticsScheduleDateTask(15);
     }
 
     /**