杰生 退仓

hx-common/service-flow/src/main/java/com/fjhx/service/process/impl/ProcessTenantServiceImpl.java

@@ -50,7 +50,7 @@ public class ProcessTenantServiceImpl extends ServiceImpl<ProcessTenantMapper, P
                 .eq("pi.service_name", "serviceName")
                 .keyword("pi.module_name", "pt.name")
                 .getWrapper()
-                .eq("pt.current", StatusConstant.YES);
+                .eq("pt.current_version", StatusConstant.YES);
 
         return baseMapper.getPage(createPage(condition), wrapper);
     }

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

@@ -1,18 +1,16 @@
 package com.fjhx.entity.stock;
 
-import java.io.Serializable;
-import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.fjhx.base.BaseEntity;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author ${author}
@@ -47,7 +45,7 @@ public class StockBackPlan implements Serializable {
     /**
      * 工号
      */
-    private Long jobNo;
+    private String jobNo;
 
     /**
      * 创建时间

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

@@ -1,5 +1,6 @@
 package com.fjhx.entity.stock;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.util.Date;
@@ -18,9 +19,15 @@ import lombok.EqualsAndHashCode;
  * @since 2022-09-02
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
-public class StockBackPlanDetails extends BaseEntity {
+public class StockBackPlanDetails implements Serializable {
 
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private Long id;
 
     /**
      * 排班物料
@@ -33,14 +40,14 @@ public class StockBackPlanDetails extends BaseEntity {
     private Date planTime;
 
     /**
-     * 领料面积
+     * 排班面积
      */
     private BigDecimal quantity;
 
     /**
      * 工号
      */
-    private Long jobNo;
+    private String jobNo;
 
     /**
      * 修正面积

hx-service-api/storage-api/src/main/java/com/fjhx/params/stock/StatisticsResult.java

@@ -99,7 +99,23 @@ public class StatisticsResult {
      * 使用率
      */
     public BigDecimal getUseRate() {
-        return BigDecimalUtil.init(scheduleArea).multiply(100).divide(getActualUse(), 2).getValue();
+        return BigDecimalUtil.init(scheduleArea).multiply(100).divideTry(getActualUse(), 2).getValue();
+    }
+
+    public BigDecimal getScheduleArea() {
+        return BigDecimalUtil.keepDecimals(scheduleArea);
+    }
+
+    public BigDecimal getCorrectArea() {
+        return BigDecimalUtil.keepDecimals(correctArea);
+    }
+
+    public Integer getPickingNum() {
+        return pickingNum == null ? 0 : pickingNum;
+    }
+
+    public Integer getBackNum() {
+        return backNum == null ? 0 : backNum;
     }
 
     public BigDecimal getPickingMoney() {
@@ -125,4 +141,5 @@ public class StatisticsResult {
     public BigDecimal getBackArea() {
         return BigDecimalUtil.keepDecimals(backArea);
     }
+
 }

hx-service/storage-restructure/src/main/java/com/fjhx/controller/supplier/SupplierController.java

@@ -58,9 +58,27 @@ public class SupplierController {
      */
     @PostMapping("/getNameList")
     public R getNameList() {
-        List<?> nameList = supplierService.getDistinctList(Supplier::getName);
-        return R.data(nameList);
+        return R.success(supplierService.getDistinctList(Supplier::getName));
     }
 
+    /**
+     * 供应商账期
+     */
+    @PostMapping("/getAccountDate")
+    public R getAccountDate() {
+        List<Map<String, Object>> result = supplierService.getAccountDate();
+        return R.success(result);
+    }
+
+    /**
+     * 供应商采购周期
+     */
+    @PostMapping("/getSafetyWarnDayList")
+    public R getSafetyWarnDayList() {
+        List<Map<String, Object>> result = supplierService.getSafetyWarnDayList();
+        return R.success(result);
+    }
+
+
 }
 

hx-service/storage-restructure/src/main/java/com/fjhx/mapper/supplier/SupplierMapper.java

@@ -3,6 +3,9 @@ package com.fjhx.mapper.supplier;
 import com.fjhx.entity.supplier.Supplier;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 供应商 Mapper 接口
@@ -13,4 +16,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface SupplierMapper extends BaseMapper<Supplier> {
 
+    List<Map<String, Object>> getAccountDate();
+
+    List<Map<String, Object>> getSafetyWarnDayList();
+
 }

hx-service/storage-restructure/src/main/java/com/fjhx/mapper/supplier/SupplierMapper.xml

@@ -2,4 +2,32 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.mapper.supplier.SupplierMapper">
 
+    <select id="getAccountDate" resultType="java.util.Map">
+        select s.account_date        value,
+               count(s.account_date) count
+        from supplier s
+        where s.del_flag = 0
+        group by s.account_date
+        order by s.account_date
+    </select>
+
+    <select id="getSafetyWarnDayList" resultType="java.util.Map">
+        select count(0) count, t.value value
+        from (
+                 select distinct sp.supplier_id,
+                                 case
+                                     when m.safety_warn_day &lt; 6 then 1
+                                     when m.safety_warn_day &lt; 16 then 2
+                                     when m.safety_warn_day &lt; 31 then 3
+                                     when m.safety_warn_day &lt; 46 then 4
+                                     else 5
+                                     end value
+                 from supplier_price sp
+                          inner join material m on sp.material_id = m.id
+                 where sp.del_flag = 0
+             ) t
+        group by t.value
+        order by t.value
+    </select>
+
 </mapper>

hx-service/storage-restructure/src/main/java/com/fjhx/service/supplier/SupplierService.java

@@ -5,6 +5,7 @@ import com.fjhx.entity.supplier.Supplier;
 import com.fjhx.params.supplier.SupplierVo;
 import com.fjhx.base.StorageBaseService;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -25,4 +26,8 @@ public interface SupplierService extends StorageBaseService<Supplier> {
 
     void delete(SupplierVo supplierVo);
 
+    List<Map<String, Object>> getAccountDate();
+
+    List<Map<String, Object>> getSafetyWarnDayList();
+
 }

hx-service/storage-restructure/src/main/java/com/fjhx/service/supplier/impl/SupplierServiceImpl.java

@@ -172,4 +172,31 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
         commonFileService.delete(fileList);
     }
 
+    @Override
+    public List<Map<String, Object>> getAccountDate() {
+        List<Map<String, Object>> accountDate = baseMapper.getAccountDate();
+        accountDate.forEach(item -> item.put("label", item.get("value") + "天（" + item.get("count") + "）"));
+        return accountDate;
+    }
+
+    @Override
+    public List<Map<String, Object>> getSafetyWarnDayList() {
+        List<Map<String, Object>> safetyWarnDayList = baseMapper.getSafetyWarnDayList();
+
+        safetyWarnDayList.forEach(item -> {
+            Integer value = (Integer) item.get("value");
+            String label;
+
+//            switch (value) {
+//                case 1:
+//            }
+
+//            item.put("label", label);
+
+        });
+
+
+        return safetyWarnDayList;
+    }
+
 }

hx-service/storage/src/main/java/com/fjhx/stock/controller/StockBackController.java

@@ -98,7 +98,7 @@ public class StockBackController {
      */
     @PostMapping("/userStatistics")
     public R userStatistics(@RequestBody Map<String, String> condition) {
-        Map<Integer, List<Map<String, Object>>> result = stockBackService.userStatistics(condition);
+        Map<String, List<Map<String, Object>>> result = stockBackService.userStatistics(condition);
         return R.success(result);
     }
 

hx-service/storage/src/main/java/com/fjhx/stock/controller/StockWaterController.java

@@ -100,7 +100,6 @@ public class StockWaterController {
         return R.success(result);
     }
 
-
     /**
      * 今日剩余在库列表
      */
@@ -110,6 +109,15 @@ public class StockWaterController {
         return R.success(result);
     }
 
+    /**
+     * 入库序时浦
+     */
+    @PostMapping("receiptSequence")
+    public R receiptSequence(@RequestBody Map<String, String> condition) {
+        Page<Map<String, Object>> result = stockWaterService.receiptSequence(condition);
+        return R.success(result);
+    }
+
 
 }
 

hx-service/storage/src/main/java/com/fjhx/stock/mapper/StockBackMapper.java

@@ -67,8 +67,7 @@ public interface StockBackMapper extends BaseMapper<StockBack> {
     @InterceptorIgnore(tenantLine = "1")
     @TenantIgnore
     Page<StatisticsResult> selectPickingPage(@Param("page") Page<StockBack> page,
-                                             @Param("technologyType") String technologyType,
-                                             @Param("userId") String userId,
+                                             @Param("jobNo") String jobNo,
                                              @Param("beginTime") Date beginTime,
                                              @Param("endTime") Date endTime);
 

hx-service/storage/src/main/java/com/fjhx/stock/mapper/StockBackMapper.xml

@@ -23,13 +23,11 @@
     </select>
 
     <select id="userStatistics" resultType="java.util.Map">
-        select distinct m.TechnologyType technologyType,
-                        uu.ID            userId,
-                        uu.JobNo         jobNo,
-                        uu.RealName      realName
-        from stock_waterdetial swd
-                 left join material m on m.code = swd.materialCode
-                 left join u_user uu on swd.OperUserId = uu.ID
+        select distinct uu.ID           userId,
+                        uu.JobNo        jobNo,
+                        uu.RealName     realName,
+                        uu.DepartmentID departmentID
+        from u_user uu
             ${ew.customSqlSegment}
     </select>
     <select id="selectSchedule" resultType="java.lang.Double">
@@ -159,29 +157,32 @@
         uu.ID userId,
         uu.JobNo jobNo,
         uu.RealName userName,
-        m.id materialId,
-        m.Code materialCode,
-        m.Name materialName,
-        sum(m.Width * swd.ChangeNum / 100) pickingArea
-        from stock_waterdetial swd
-        left join material m on swd.MaterialCode = m.Code
-        left join u_user uu on uu.ID = swd.OperUserId
+        sbpd.plan_material materialName,
+        sum(sbpd.quantity) scheduleArea,
+        sum(sbpd.correct_area) correctArea,
+        sum(sbpd.picking_money) pickingMoney,
+        sum(sbpd.picking_num) pickingNum,
+        sum(sbpd.picking_meters) pickingMeters,
+        sum(sbpd.picking_area) pickingArea,
+        sum(sbpd.back_money) backMoney,
+        sum(sbpd.back_num) backNum,
+        sum(sbpd.back_meters) backMeters,
+        sum(sbpd.back_area) backArea
+        from stock_back_plan_details sbpd
+        left join u_user uu on uu.JobNo = sbpd.job_no
+
         where
-        swd.StockChangeType in (20,23)
-        and swd.CreatedTime between #{beginTime} and #{endTime}
-        <if test="userId neq null and userId neq ''">
-            and swd.OperUserId = #{userId}
-        </if>
+        sbpd.plan_time between #{beginTime} and #{endTime}
         and
         <choose>
-            <when test="technologyType neq null and technologyType neq ''">
-                m.TechnologyType = #{technologyType}
+            <when test="jobNo neq null and jobNo neq ''">
+                uu.JobNo = #{jobNo}
             </when>
             <otherwise>
-                m.TechnologyType in (0, 1, 2)
+                uu.departmentID in ('A007', 'A008', 'A012')
             </otherwise>
         </choose>
-        group by swd.OperUserId, swd.MaterialCode
+        group by uu.JobNo,sbpd.plan_material
     </select>
 
     <select id="selectScheduleArea" resultType="java.lang.Double">

hx-service/storage/src/main/java/com/fjhx/stock/mapper/StockWaterMapper.java

@@ -1,5 +1,6 @@
 package com.fjhx.stock.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -53,4 +54,7 @@ public interface StockWaterMapper extends BaseMapper<StockWater> {
     @TenantIgnore
     List<Map<String, Object>> remainingTodayList(@Param("ew") QueryWrapper<?> wrapper);
 
+    @InterceptorIgnore(tenantLine = "1")
+    @TenantIgnore
+    Page<Map<String, Object>> receiptSequence(@Param("page") Page<StockWater> page, @Param("condition") Map<String, String> condition);
 }

hx-service/storage/src/main/java/com/fjhx/stock/mapper/StockWaterMapper.xml

@@ -185,5 +185,71 @@
             ${ew.customSqlSegment}
     </select>
 
+    <select id="receiptSequence" resultType="java.util.LinkedHashMap">
+        (SELECT
+        m.Code materialCode,
+        m.`Name` materialName,
+        m.Spec spec,
+        pc.PurchaseBillNo purchaseBillNo,
+        s.`Name` supplierName,
+        m.StockUnitID stockUnitID,
+        sio.Quantity quantity,
+        swd.Price price,
+        swd.CreatedTime createTime,
+        sum(swd.ChangeNum) changeNum,
+        sum(swd.ChangeNum * swd.Price) amount
+        FROM stock_waterdetial swd
+        LEFT JOIN material m ON swd.MaterialCode = m.`Code`
+        LEFT JOIN stock_water sw ON swd.WaterId = sw.ID
+        LEFT JOIN stock_inoutbill sio ON sw.LinkId = sio.ID
+        LEFT JOIN purchase_contract pc ON sio.FromBillNo = pc.PurchaseBillNo
+        LEFT JOIN supplier s ON pc.SupplierId = s.ID
+        WHERE swd.IsDelete != 1
+        AND (swd.CreatedTime BETWEEN #{condition.beginTime} AND #{condition.endTime})
+        AND swd.StockChangeType IN (10)
+        AND swd.LinkId != ''
+        AND swd.LinkId IS NOT NULL
+        <if test="condition.keyword neq null and condition.keyword neq '' ">
+            and (
+            instr(m.Code, #{condition.keyword} )>0
+            or instr(m.`Name`, #{condition.keyword} )>0
+            or instr(s.`Name`, #{condition.keyword} )>0
+            or instr(pc.PurchaseBillNo, #{condition.keyword} )>0
+            )
+        </if>
+        GROUP BY pc.PurchaseBillNo)
+        union all
+        (SELECT
+        m.Code materialCode,
+        m.`Name` materialName,
+        m.Spec spec,
+        pc.PurchaseBillNo purchaseBillNo,
+        s.`Name` supplierName,
+        m.StockUnitID stockUnitID,
+        '' quantity,
+        pc.Price price,
+        asod.CreatedTime createTime,
+        sum(asod.Quantity) changeNum,
+        sum(asod.Amount) amount
+        FROM apply_stockoutdetail asod
+        LEFT JOIN material m ON asod.MaterialCode = m.`Code`
+        LEFT JOIN supplier s ON asod.SupplierId = s.ID
+        LEFT JOIN purchase_contract pc ON asod.BalancePurBillNo = pc.PurchaseBillNo
+        WHERE asod.IsDelete != 1
+        AND asod.BackMaterialType = 1
+        AND (asod.CreatedTime BETWEEN #{condition.beginTime} AND #{condition.endTime})
+        AND asod.BackMaterialProgress IN (4, 5, 10, 11)
+        <if test="condition.keyword neq null and condition.keyword neq '' ">
+            and (
+            instr(m.Code, #{condition.keyword} )>0
+            or instr(m.`Name`, #{condition.keyword} )>0
+            or instr(s.`Name`, #{condition.keyword} )>0
+            or instr(pc.PurchaseBillNo, #{condition.keyword} )>0
+            )
+        </if>
+        GROUP BY asod.MaterialCode,
+        asod.BalancePurBillNo)
+    </select>
+
 
 </mapper>

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

@@ -40,7 +40,7 @@ public interface StockBackService extends BaseService<StockBack> {
 
     List<StockBackDetails> submitCheckDetails(CheckDetailsVo checkDetailsVo);
 
-    Map<Integer, List<Map<String, Object>>> userStatistics(Map<String, String> condition);
+    Map<String, List<Map<String, Object>>> userStatistics(Map<String, String> condition);
 
     StatisticsResult statisticsDetails(Map<String, String> condition);
 

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

@@ -35,6 +35,6 @@ public interface StockWaterService extends BaseService<StockWater> {
 
     List<Map<String, Object>> inStockList(Map<String, String> condition);
 
-
+    Page<Map<String, Object>> receiptSequence(Map<String, String> condition);
 
 }

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

@@ -6,7 +6,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.entity.scheduling.Scheduling;
 import com.fjhx.entity.stock.StockBackPlan;
 import com.fjhx.entity.stock.StockBackPlanDetails;
 import com.fjhx.stock.mapper.StockBackPlanMapper;
@@ -66,9 +65,9 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
         // 循环领料信息
         items.forEach(item -> {
             // 喷印人员工号
-            long distributor = Long.parseLong(item.get("distributor").toString());
+            String distributor = item.get("distributor").toString();
             // 打纸人员工号
-            long paperMan = Long.parseLong(item.get("paperMan").toString());
+            String paperMan = item.get("paperMan").toString();
             // 排班面积
             BigDecimal plantotalsquare = new BigDecimal(item.get("plantotalsquare").toString());
             // 物料名称
@@ -80,22 +79,22 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
             addOrEditFlagMap(flagMap, distributor, plantotalsquare, planDate, material, newDate);
 
             // 打纸人员工号添加领料记录标记
-            if (paperMan > 0) {
+            if (ObjectUtil.isNotEmpty(paperMan) && !Objects.equals(paperMan, "0")) {
                 addOrEditFlagMap(flagMap, paperMan, plantotalsquare, planDate, "热转印纸", 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);
-        }
+//        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);
+//        }
 
         // 更新当天的出库单
         saveBatch(new ArrayList<>(flagMap.values()));
@@ -115,20 +114,10 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
         Map<String, StockBackPlanDetails> stockBackPlanMap = list.stream().collect(Collectors.toMap(
                 item -> item.getJobNo() + item.getPlanMaterial() + item.getPlanTime(),
                 item -> {
-                    StockBackPlanDetails stockBackPlanDetails = new StockBackPlanDetails();
-                    stockBackPlanDetails.setPlanMaterial(item.getPlanMaterial());
-                    stockBackPlanDetails.setPlanTime(item.getPlanTime());
+                    StockBackPlanDetails stockBackPlanDetails =
+                            createStockBackPlanDetails(item.getJobNo(), item.getPlanMaterial(), item.getPlanTime());
                     stockBackPlanDetails.setQuantity(item.getQuantity());
-                    stockBackPlanDetails.setJobNo(item.getJobNo());
-                    stockBackPlanDetails.setCorrectArea(BigDecimal.ZERO);
-                    stockBackPlanDetails.setPickingMoney(BigDecimal.ZERO);
-                    stockBackPlanDetails.setPickingNum(0);
-                    stockBackPlanDetails.setPickingMeters(BigDecimal.ZERO);
-                    stockBackPlanDetails.setPickingArea(BigDecimal.ZERO);
-                    stockBackPlanDetails.setBackMoney(BigDecimal.ZERO);
-                    stockBackPlanDetails.setBackNum(0);
-                    stockBackPlanDetails.setBackMeters(BigDecimal.ZERO);
-                    stockBackPlanDetails.setBackArea(BigDecimal.ZERO);
+
                     return stockBackPlanDetails;
                 }
         ));
@@ -138,13 +127,14 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
 
         // 领料统计
         QueryWrapper<Object> pickingWrapper = Wrappers.query()
-                .gt("swd.CreatedTime", DateUtil.format(beginDate, "yyyy-MM-dd 7:30:00"))
+                .ge("swd.CreatedTime", DateUtil.format(beginDate, "yyyy-MM-dd 7:30:00"))
                 .in("swd.StockChangeType", 20, 23)
+                .eq("uu.IsDelete", 0)
+                .in("uu.DepartmentID", "A007", "A008", "A012")
                 .isNotNull("uu.JobNo");
 
         // 查询出库
         List<Map<String, Object>> pickingList = baseMapper.getWater(pickingWrapper);
-
         for (Map<String, Object> map : pickingList) {
 
             // 出库时间
@@ -154,14 +144,14 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
             // 分
             int m = Integer.parseInt(DateUtil.format(createTime, "m"));
             // 小于7点30算前一日
-            if (h < 7 || (h == 7 && m < 30)) {
+            if (h < 7 || (h == 7 && m <= 30)) {
                 DateUtil.offsetDay(createTime, -1);
             }
 
             // 排班时间
             Date planDate = DateUtil.beginOfDay(createTime);
             // 工号
-            Long jobNo = Long.valueOf(map.get("jobNo").toString());
+            String jobNo = map.get("jobNo").toString();
             // 物料名称
             String materialName = map.get("materialName").toString().split("-")[0];
             // 数量
@@ -173,31 +163,31 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
 
             // 排班对象
             StockBackPlanDetails stockBackPlanDetails = stockBackPlanMap.get(jobNo + materialName + planDate);
-            if (stockBackPlanDetails != null) {
-
-                // 金额
-                stockBackPlanDetails.setPickingMoney(
-                        BigDecimalUtil.init(stockBackPlanDetails.getPickingMoney()).add(price.multiply(changeNum)).getValue(2));
+            if (stockBackPlanDetails == null) {
+                stockBackPlanDetails = createStockBackPlanDetails(jobNo, materialName, planDate);
+                stockBackPlanMap.put(jobNo + materialName + planDate, stockBackPlanDetails);
+            }
 
-                // 数量
-                stockBackPlanDetails.setPickingNum(stockBackPlanDetails.getPickingNum() + 1);
+            // 金额
+            stockBackPlanDetails.setPickingMoney(
+                    BigDecimalUtil.init(stockBackPlanDetails.getPickingMoney()).add(price.multiply(changeNum)).getValue(2));
 
-                // 米
-                stockBackPlanDetails.setPickingMeters(stockBackPlanDetails.getPickingMeters().add(changeNum));
+            // 数量
+            stockBackPlanDetails.setPickingNum(stockBackPlanDetails.getPickingNum() + 1);
 
-                // 面积
-                stockBackPlanDetails.setPickingArea(stockBackPlanDetails.getPickingArea().add(
-                        BigDecimalUtil.init(changeNum).multiply(width).divide(100, 2).getValue()));
+            // 米
+            stockBackPlanDetails.setPickingMeters(stockBackPlanDetails.getPickingMeters().add(changeNum));
 
-            }
+            // 面积
+            stockBackPlanDetails.setPickingArea(stockBackPlanDetails.getPickingArea().add(
+                    BigDecimalUtil.init(changeNum).multiply(width).divide(100, 2).getValue()));
         }
 
         // 回仓统计
         QueryWrapper<Object> backWrapper = Wrappers.query()
-                .gt("swd.CreatedTime", DateUtil.format(beginDate, "yyyy-MM-dd 8:00:00"))
+                .ge("swd.CreatedTime", DateUtil.format(beginDate, "yyyy-MM-dd 9:30:00"))
                 .eq("swd.StockChangeType", 16)
                 .isNotNull("uu.JobNo");
-
         // 查询回仓
         List<Map<String, Object>> backList = baseMapper.getWater(backWrapper);
 
@@ -206,15 +196,17 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
             // 出库时间
             Date createTime = (Date) map.get("createTime");
 
-            // 小于8点算前一日
-            if (Integer.parseInt(DateUtil.format(createTime, "H")) < 8) {
+            int h = Integer.parseInt(DateUtil.format(createTime, "H"));
+            int m = Integer.parseInt(DateUtil.format(createTime, "m"));
+            // 小于9点30算前一日
+            if (h < 9 || (h == 9 && m < 30)) {
                 DateUtil.offsetDay(createTime, -1);
             }
 
             // 排班时间
             Date planDate = DateUtil.beginOfDay(createTime);
             // 工号
-            Long jobNo = Long.valueOf(map.get("jobNo").toString());
+            String jobNo = map.get("jobNo").toString();
             // 物料名称
             String materialName = map.get("materialName").toString().split("-")[0];
             // 数量
@@ -226,47 +218,38 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
 
             // 排班对象
             StockBackPlanDetails stockBackPlanDetails = stockBackPlanMap.get(jobNo + materialName + planDate);
-            if (stockBackPlanDetails != null) {
-
-                // 金额
-                stockBackPlanDetails.setBackMoney(
-                        BigDecimalUtil.init(stockBackPlanDetails.getBackMoney()).add(price.multiply(changeNum)).getValue(2));
+            if (stockBackPlanDetails == null) {
+                stockBackPlanDetails = createStockBackPlanDetails(jobNo, materialName, planDate);
+                stockBackPlanMap.put(jobNo + materialName + planDate, stockBackPlanDetails);
+            }
 
-                // 数量
-                stockBackPlanDetails.setBackNum(stockBackPlanDetails.getBackNum() + 1);
+            // 金额
+            stockBackPlanDetails.setBackMoney(
+                    BigDecimalUtil.init(stockBackPlanDetails.getBackMoney()).add(price.multiply(changeNum)).getValue(2));
 
-                // 米
-                stockBackPlanDetails.setBackMeters(stockBackPlanDetails.getBackMeters().add(changeNum));
+            // 数量
+            stockBackPlanDetails.setBackNum(stockBackPlanDetails.getBackNum() + 1);
 
-                // 面积
-                stockBackPlanDetails.setBackArea(stockBackPlanDetails.getBackArea().add(
-                        BigDecimalUtil.init(changeNum).multiply(width).divide(100, 2).getValue()));
+            // 米
+            stockBackPlanDetails.setBackMeters(stockBackPlanDetails.getBackMeters().add(changeNum));
 
-            }
+            // 面积
+            stockBackPlanDetails.setBackArea(stockBackPlanDetails.getBackArea().add(
+                    BigDecimalUtil.init(changeNum).multiply(width).divide(100, 2).getValue()));
         }
 
         // 物料修正
-
         QueryWrapper<Object> correctWrapper = Wrappers.query()
-                .gt("swd", DateUtil.format(beginDate, "yyyy-MM-dd 8:00:00"))
+                .gt("sbc.correct_time", DateUtil.format(beginDate, "yyyy-MM-dd 00:00:00"))
                 .isNotNull("uu.JobNo");
-
-
         List<Map<String, Object>> correctList = baseMapper.getCorrect(correctWrapper);
         for (Map<String, Object> map : correctList) {
-
             // 出库时间
             Date createTime = (Date) map.get("createTime");
-
-            // 小于8点算前一日
-            if (Integer.parseInt(DateUtil.format(createTime, "H")) < 8) {
-                DateUtil.offsetDay(createTime, -1);
-            }
-
             // 排班时间
             Date planDate = DateUtil.beginOfDay(createTime);
             // 工号
-            Long jobNo = Long.valueOf(map.get("jobNo").toString());
+            String jobNo = map.get("jobNo").toString();
             // 物料名称
             String materialName = map.get("materialName").toString().split("-")[0];
             // 数量
@@ -274,16 +257,35 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
 
             // 排班对象
             StockBackPlanDetails stockBackPlanDetails = stockBackPlanMap.get(jobNo + materialName + planDate);
-            if (stockBackPlanDetails != null) {
-                // 金额
-                stockBackPlanDetails.setCorrectArea(stockBackPlanDetails.getCorrectArea().add(correctArea));
+            if (stockBackPlanDetails == null) {
+                stockBackPlanDetails = createStockBackPlanDetails(jobNo, materialName, planDate);
+                stockBackPlanMap.put(jobNo + materialName + planDate, stockBackPlanDetails);
             }
+
+            // 金额
+            stockBackPlanDetails.setCorrectArea(stockBackPlanDetails.getCorrectArea().add(correctArea));
         }
 
-        ArrayList<StockBackPlanDetails> stockBackPlanDetails = new ArrayList<>(stockBackPlanMap.values());
+        stockBackPlanDetailsService.saveBatch(new ArrayList<>(stockBackPlanMap.values()));
 
-        stockBackPlanDetailsService.saveBatch(stockBackPlanDetails);
+    }
 
+    private StockBackPlanDetails createStockBackPlanDetails(String jobNo, String materialName, Date planDate) {
+        StockBackPlanDetails stockBackPlanDetails = new StockBackPlanDetails();
+        stockBackPlanDetails.setPlanMaterial(materialName);
+        stockBackPlanDetails.setPlanTime(planDate);
+        stockBackPlanDetails.setQuantity(BigDecimal.ZERO);
+        stockBackPlanDetails.setJobNo(jobNo);
+        stockBackPlanDetails.setCorrectArea(BigDecimal.ZERO);
+        stockBackPlanDetails.setPickingMoney(BigDecimal.ZERO);
+        stockBackPlanDetails.setPickingNum(0);
+        stockBackPlanDetails.setPickingMeters(BigDecimal.ZERO);
+        stockBackPlanDetails.setPickingArea(BigDecimal.ZERO);
+        stockBackPlanDetails.setBackMoney(BigDecimal.ZERO);
+        stockBackPlanDetails.setBackNum(0);
+        stockBackPlanDetails.setBackMeters(BigDecimal.ZERO);
+        stockBackPlanDetails.setBackArea(BigDecimal.ZERO);
+        return stockBackPlanDetails;
     }
 
     /**
@@ -302,7 +304,7 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
     /**
      * 赋值排班数据
      */
-    private void addOrEditFlagMap(Map<String, StockBackPlan> flagMap, Long jobNo, BigDecimal plantotalsquare, String planDate, String material, Date date) {
+    private void addOrEditFlagMap(Map<String, StockBackPlan> flagMap, String jobNo, BigDecimal plantotalsquare, String planDate, String material, Date date) {
         String key = jobNo + material + planDate;
         StockBackPlan stockBackPlan = flagMap.get(key);
 

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

@@ -11,10 +11,12 @@ import com.fjhx.constants.StatusConstant;
 import com.fjhx.entity.material.Material;
 import com.fjhx.entity.stock.StockBack;
 import com.fjhx.entity.stock.StockBackDetails;
+import com.fjhx.entity.stock.StockBackPlanDetails;
 import com.fjhx.material.service.MaterialService;
 import com.fjhx.params.stock.*;
 import com.fjhx.stock.mapper.StockBackMapper;
 import com.fjhx.stock.service.StockBackDetailsService;
+import com.fjhx.stock.service.StockBackPlanDetailsService;
 import com.fjhx.stock.service.StockBackService;
 import com.fjhx.utils.Assert;
 import com.fjhx.utils.BigDecimalUtil;
@@ -47,6 +49,9 @@ public class StockBackServiceImpl extends ServiceImpl<StockBackMapper, StockBack
     @Autowired
     private MaterialService materialService;
 
+    @Autowired
+    private StockBackPlanDetailsService stockBackPlanDetailsService;
+
     @Override
     public Page<StockBack> getPage(Map<String, String> condition) {
 
@@ -218,7 +223,7 @@ public class StockBackServiceImpl extends ServiceImpl<StockBackMapper, StockBack
     }
 
     @Override
-    public Map<Integer, List<Map<String, Object>>> userStatistics(Map<String, String> condition) {
+    public Map<String, List<Map<String, Object>>> userStatistics(Map<String, String> condition) {
 
         String beginTimeStr = condition.get("beginTime");
         Assert.notEmpty(beginTimeStr, "开始时间不能为空");
@@ -229,50 +234,56 @@ public class StockBackServiceImpl extends ServiceImpl<StockBackMapper, StockBack
         Date endTime = DateUtil.endOfDay(DateUtil.parse(endTimeStr));
 
         QueryWrapper<Object> wrapper = Wrappers.query()
-                .between("swd.CreatedTime", beginTime, endTime)
-                .in("m.TechnologyType", 0, 1, 2)
+                .eq("uu.IsDelete", 0)
+                .in("uu.DepartmentID", "A007", "A008", "A012")
                 .isNotNull("uu.JobNo");
 
         List<Map<String, Object>> result = baseMapper.userStatistics(wrapper);
 
+        List<StockBackPlanDetails> planList = stockBackPlanDetailsService.list(Wrappers.<StockBackPlanDetails>lambdaQuery()
+                .between(StockBackPlanDetails::getPlanTime, beginTime, endTime));
+
+        Map<String, List<StockBackPlanDetails>> planGroupByJobNo = planList.stream().collect(Collectors.groupingBy(StockBackPlanDetails::getJobNo));
+
         for (Map<String, Object> map : result) {
 
             String jobNo = map.get("jobNo").toString();
-            String userId = map.get("userId").toString();
-            String technologyType = map.get("technologyType").toString();
 
-            // 排班
-            BigDecimal scheduleArea = BigDecimalUtil.keepDecimals(
-                    baseMapper.selectSchedule(null, technologyType, jobNo, beginTime, endTime));
+            List<StockBackPlanDetails> stockBackPlanDetails = planGroupByJobNo.get(jobNo);
 
-            // 领料
-            BigDecimal pickingArea = baseMapper.selectPicking(technologyType, userId, beginTime, endTime).getPickingArea();
+            if (stockBackPlanDetails != null && stockBackPlanDetails.size() > 0) {
+                BigDecimal scheduleArea = BigDecimal.ZERO;
+                BigDecimal pickingArea = BigDecimal.ZERO;
+                BigDecimal backArea = BigDecimal.ZERO;
+                BigDecimal correctArea = BigDecimal.ZERO;
 
-            // 退仓
-            BigDecimal backArea = baseMapper.selectBack(null, technologyType, userId, beginTime, endTime).getBackArea();
+                for (StockBackPlanDetails item : stockBackPlanDetails) {
+                    scheduleArea = scheduleArea.add(item.getQuantity());
+                    pickingArea = pickingArea.add(item.getPickingArea());
+                    backArea = backArea.add(item.getBackArea());
+                    correctArea = correctArea.add(item.getCorrectArea());
+                }
 
-            // 修正
-            BigDecimal correctArea = BigDecimalUtil.keepDecimals(
-                    baseMapper.selectCorrect(null, technologyType, userId, beginTime, endTime));
+                // 赋值使用率
+                BigDecimal value = BigDecimalUtil.init(scheduleArea).multiply(100).
+                        divideTry(pickingArea.subtract(backArea).subtract(correctArea), 2).getValue();
 
+                map.put("useRate", value);
+            } else {
+                map.put("useRate", BigDecimal.ZERO);
+            }
 
-            // 赋值使用率
-            BigDecimal value = BigDecimalUtil.init(scheduleArea).multiply(100).
-                    divideTry(pickingArea.subtract(backArea).subtract(correctArea), 2).getValue();
-            map.put("useRate", value);
         }
 
-        return result.stream().collect(Collectors.groupingBy(item -> (Integer) item.get("technologyType")));
+        return result.stream().collect(Collectors.groupingBy(item -> (String) item.get("departmentID")));
     }
 
     @Override
     public StatisticsResult statisticsDetails(Map<String, String> condition) {
 
-        StatisticsResult statisticsResult = new StatisticsResult();
+        StatisticsResult result = new StatisticsResult();
 
-        String technologyType = condition.get("technologyType");
         String jobNo = condition.get("jobNo");
-        String userId = condition.get("userId");
 
         String beginTimeStr = condition.get("beginTime");
         Assert.notEmpty(beginTimeStr, "开始时间不能为空");
@@ -282,58 +293,33 @@ public class StockBackServiceImpl extends ServiceImpl<StockBackMapper, StockBack
         Assert.notEmpty(endTimeStr, "结束时间不能为空");
         Date endTime = DateUtil.endOfDay(DateUtil.parse(endTimeStr));
 
-        // 查询排班
-        Thread selectScheduleThread = new Thread(() -> {
-            Double scheduleArea = baseMapper.selectSchedule(null, technologyType, jobNo, beginTime, endTime);
-            statisticsResult.setScheduleArea(BigDecimalUtil.keepDecimals(scheduleArea));
-        });
-        selectScheduleThread.start();
-
-        // 查询领料
-        Thread selectPickingThread = new Thread(() -> {
-            StatisticsResult itemStatisticsResult = baseMapper.selectPicking(technologyType, userId, beginTime, endTime);
-            statisticsResult.setPickingArea(itemStatisticsResult.getPickingArea());
-            statisticsResult.setPickingMeters(itemStatisticsResult.getPickingMeters());
-            statisticsResult.setPickingMoney(itemStatisticsResult.getPickingMoney());
-            statisticsResult.setPickingNum(itemStatisticsResult.getPickingNum());
-        });
-        selectPickingThread.start();
-
-        // 查询退料
-        Thread selectBackThread = new Thread(() -> {
-            StatisticsResult itemStatisticsResult = baseMapper.selectBack(null, technologyType, userId, beginTime, endTime);
-            statisticsResult.setBackArea(itemStatisticsResult.getBackArea());
-            statisticsResult.setBackMeters(itemStatisticsResult.getBackMeters());
-            statisticsResult.setBackMoney(itemStatisticsResult.getBackMoney());
-            statisticsResult.setBackNum(itemStatisticsResult.getBackNum());
-        });
-        selectBackThread.start();
 
-        // 修正
-        Thread selectCorrectThread = new Thread(() -> {
-            Double correctArea = baseMapper.selectCorrect(null, technologyType, userId, beginTime, endTime);
-            statisticsResult.setCorrectArea(BigDecimalUtil.keepDecimals(correctArea));
-        });
-        selectCorrectThread.start();
-
-        try {
-            selectScheduleThread.join();
-            selectPickingThread.join();
-            selectBackThread.join();
-            selectCorrectThread.join();
-        } catch (InterruptedException e) {
-            e.printStackTrace();
+        List<StockBackPlanDetails> list = stockBackPlanDetailsService.list(
+                Wrappers.<StockBackPlanDetails>lambdaQuery()
+                        .between(StockBackPlanDetails::getPlanTime, beginTime, endTime)
+                        .eq(ObjectUtil.isNotEmpty(jobNo), StockBackPlanDetails::getJobNo, jobNo));
+
+        for (StockBackPlanDetails item : list) {
+            result.setScheduleArea(result.getScheduleArea().add(item.getQuantity()));
+            result.setCorrectArea(result.getCorrectArea().add(item.getCorrectArea()));
+            result.setPickingMoney(result.getPickingMoney().add(item.getPickingMoney()));
+            result.setPickingNum(result.getPickingNum() + item.getPickingNum());
+            result.setPickingMeters(result.getPickingMeters().add(item.getPickingMeters()));
+            result.setPickingArea(result.getPickingArea().add(item.getPickingArea()));
+            result.setBackMoney(result.getBackMoney().add(item.getBackMoney()));
+            result.setBackNum(result.getBackNum() + item.getBackNum());
+            result.setBackMeters(result.getBackMeters().add(item.getBackMeters()));
+            result.setBackArea(result.getBackArea().add(item.getBackArea()));
         }
 
-        return statisticsResult;
+
+        return result;
     }
 
     @Override
     public Page<StatisticsResult> statisticsPage(Map<String, String> condition) {
 
-        String technologyType = condition.get("technologyType");
         String jobNo = condition.get("jobNo");
-        String userId = condition.get("userId");
 
         String beginTimeStr = condition.get("beginTime");
         Assert.notEmpty(beginTimeStr, "开始时间不能为空");
@@ -343,36 +329,8 @@ public class StockBackServiceImpl extends ServiceImpl<StockBackMapper, StockBack
         Assert.notEmpty(endTimeStr, "结束时间不能为空");
         Date endTime = DateUtil.endOfDay(DateUtil.parse(endTimeStr));
 
-        Page<StatisticsResult> result = baseMapper.selectPickingPage(createPage(condition), technologyType, userId, beginTime, endTime);
-
-        List<StatisticsResult> records = result.getRecords();
-
-        if (records.size() == 0) {
-            return result;
-        }
-
-        for (StatisticsResult record : records) {
-
-            String materialId = record.getMaterialId();
-            String materialCode = record.getMaterialCode();
-            String itemJobNo = record.getJobNo();
-            String itemUserId = record.getUserId();
 
-            // 排班面积
-            Double scheduleArea = baseMapper.selectSchedule(materialCode, technologyType, itemJobNo, beginTime, endTime);
-            record.setScheduleArea(BigDecimalUtil.keepDecimals(scheduleArea));
-
-            // 退仓
-            StatisticsResult itemStatisticsResult = baseMapper.selectBack(materialCode, technologyType, itemUserId, beginTime, endTime);
-            record.setBackArea(itemStatisticsResult.getBackArea());
-
-            // 修正
-            Double correctArea = baseMapper.selectCorrect(materialId, technologyType, itemUserId, beginTime, endTime);
-            record.setCorrectArea(BigDecimalUtil.keepDecimals(correctArea));
-
-        }
-
-        return result;
+        return baseMapper.selectPickingPage(createPage(condition), jobNo, beginTime, endTime);
     }
 
 

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

@@ -1,5 +1,6 @@
 package com.fjhx.stock.service.impl;
 
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -510,6 +511,18 @@ public class StockWaterServiceImpl extends ServiceImpl<StockWaterMapper, StockWa
         return list;
     }
 
+    @Override
+    public Page<Map<String, Object>> receiptSequence(Map<String, String> condition) {
+
+        String date = condition.get("date");
+        Assert.notEmpty(date, "时间不能为空");
+        DateTime parse = DateUtil.parse(date, "yyyy-MM");
+        condition.put("beginTime", DateUtil.beginOfMonth(parse).toString("yyyy-MM-dd HH:mm:ss"));
+        condition.put("endTime", DateUtil.endOfMonth(parse).toString("yyyy-MM-dd HH:mm:ss"));
+
+        return baseMapper.receiptSequence(createPage(condition), condition);
+    }
+
 
     private QueryWrapper<?> createRemainingTodayWrapper(Map<String, String> condition) {
         QueryWrapper<?> wrapper = WrapperUtil.init(condition)

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

@@ -55,11 +55,12 @@ public class ScheduleTaskController {
     /**
      * 统计排班数据
      */
-    @Scheduled(cron = "0 05 8,20 * * ?")
+    @Scheduled(cron = "0 30 9,21 * * ?")
+//    @Scheduled(cron = "0 * * * * ?")
     private void statisticsScheduleDateTask() {
-//        if (BladeApplication.isLocalDev()) {
-//            return;
-//        }
+        if (BladeApplication.isLocalDev()) {
+            return;
+        }
         stockBackPlanService.statisticsScheduleDateTask();
     }