杰生迭代

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/constants/HouseConstant.java

@@ -1,16 +1,16 @@
 package com.fjhx.constants;
 
-public class HouseConstant {
+public interface HouseConstant {
 
     /**
      * 一楼仓库id
      */
-    Long groundFloorId = 1555475505304203271L;
+    Long GROUND_FLOOR_ID = 1555475505304203271L;
 
 
     /**
      * 四楼仓库id
      */
-    Long fourthFloorId = 1555475505304203272L;
+    Long FOURTH_FLOOR_ID = 1555475505304203272L;
 
 }

hx-service/storage-restructure/src/main/java/com/fjhx/service/check/impl/CheckServiceImpl.java

@@ -4,13 +4,19 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.constants.HouseConstant;
+import com.fjhx.constants.StatusConstant;
 import com.fjhx.entity.check.Check;
+import com.fjhx.entity.water.WaterTag;
 import com.fjhx.mapper.check.CheckMapper;
 import com.fjhx.params.check.CheckVo;
 import com.fjhx.service.check.CheckService;
+import com.fjhx.service.water.WaterTagService;
 import com.fjhx.utils.WrapperUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -24,6 +30,9 @@ import java.util.Map;
 @Service
 public class CheckServiceImpl extends ServiceImpl<CheckMapper, Check> implements CheckService {
 
+    @Autowired
+    private WaterTagService waterTagService;
+
     @Override
     public Page<Check> getPage(Map<String, String> condition) {
 
@@ -54,7 +63,15 @@ public class CheckServiceImpl extends ServiceImpl<CheckMapper, Check> implements
     @Override
     public void automaticCheck() {
 
-        
+        List<WaterTag> list = waterTagService.list(Wrappers.<WaterTag>lambdaQuery()
+                .eq(WaterTag::getStockHouseId, HouseConstant.FOURTH_FLOOR_ID)
+                .eq(WaterTag::getInHouse, StatusConstant.YES)
+                .eq(WaterTag::getUseStatus, StatusConstant.YES)
+        );
+
+
+
+
 
     }
 

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

@@ -238,7 +238,7 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
      */
     private void issue(Date beginDate, Map<String, StockBackPlanDetails> stockBackPlanMap) {
         List<Map<String, Object>> pickingList = baseMapper.getWater(Wrappers.query()
-                .ge("swd.CreatedTime", DateUtil.format(beginDate, "yyyy-MM-dd 7:30:00"))
+                .ge("swd.CreatedTime", DateUtil.format(beginDate, "yyyy-MM-dd 7:00:00"))
                 .in("swd.StockChangeType", 20, 23)
                 .eq("uu.IsDelete", 0)
                 .in("uu.DepartmentID", "A007", "A012")
@@ -252,9 +252,9 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
             // 时
             int h = Integer.parseInt(DateUtil.format(createTime, "H"));
             // 分
-            int m = Integer.parseInt(DateUtil.format(createTime, "m"));
+//            int m = Integer.parseInt(DateUtil.format(createTime, "m"));
             // 小于7点30算前一日
-            if (h < 7 || (h == 7 && m <= 30)) {
+            if (h < 7 ) {
                 createTime = DateUtil.offsetDay(createTime, -1);
             }
 
@@ -297,7 +297,7 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
     private void issueA008(Date beginDate, Map<String, StockBackPlanDetails> stockBackPlanMap) {
 
         List<Map<String, Object>> pickingList = baseMapper.getWater(Wrappers.query()
-                .ge("swd.CreatedTime", DateUtil.format(beginDate, "yyyy-MM-dd 8:00:00"))
+                .ge("swd.CreatedTime", DateUtil.format(beginDate, "yyyy-MM-dd 8:30:00"))
                 .in("swd.StockChangeType", 20, 23)
                 .eq("uu.IsDelete", 0)
                 .eq("uu.DepartmentID", "A008")
@@ -311,10 +311,10 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
             // 时
             int h = Integer.parseInt(DateUtil.format(createTime, "H"));
             // 分
-//            int m = Integer.parseInt(DateUtil.format(createTime, "m"));
+            int m = Integer.parseInt(DateUtil.format(createTime, "m"));
             // 小于7点30算前一日
-//            if (h < 7 || (h == 7 && m <= 30)) {
-            if (h < 8) {
+            if (h < 8 || (h == 8 && m <= 30)) {
+//            if (h < 8) {
                 createTime = DateUtil.offsetDay(createTime, -1);
             }