home 2 年之前
父节点
当前提交
8a9e49025c

+ 4 - 4
hx-service/storage/src/main/java/com/fjhx/stock/service/StockCheckrecordService.java

@@ -15,12 +15,12 @@ import com.fjhx.entity.stock.StockCheckrecord;
 public interface StockCheckrecordService extends BaseService<StockCheckrecord> {
 
     /**
-     * 开启盘点
+     * 盘点开始
      *
      * @param instructions 指令
      * @param stockHouseId 盘点仓库id
      */
-    void startCheck(String instructions, String stockHouseId);
+    void checkStart(String instructions, String stockHouseId);
 
     /**
      * 盘点回调
@@ -28,11 +28,11 @@ public interface StockCheckrecordService extends BaseService<StockCheckrecord> {
     void checkCallBack(JSONObject data);
 
     /**
-     * 关闭盘点
+     * 盘点结束
      *
      * @param instructions 指令
      * @param stockHouseId 盘点仓库id
      */
-    void closeCheck(String instructions, String stockHouseId);
+    void checkEnd(String instructions, String stockHouseId);
 
 }

+ 2 - 2
hx-service/storage/src/main/java/com/fjhx/stock/service/impl/StockCheckrecordServiceImpl.java

@@ -52,7 +52,7 @@ public class StockCheckrecordServiceImpl extends ServiceImpl<StockCheckrecordMap
     private StockCheckrecorddetailService stockCheckrecorddetailService;
 
     @Override
-    public void startCheck(String instructions, String stockHouseId) {
+    public void checkStart(String instructions, String stockHouseId) {
         JSONObject data = new JSONObject();
         // 盘点指令
         data.put("instructions", instructions);
@@ -81,7 +81,7 @@ public class StockCheckrecordServiceImpl extends ServiceImpl<StockCheckrecordMap
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void closeCheck(String instructions, String stockHouseId) {
+    public void checkEnd(String instructions, String stockHouseId) {
 
         JSONObject data = new JSONObject();
         // 盘点指令

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

@@ -4,7 +4,6 @@ import com.fjhx.stock.service.StockBackPlanService;
 import com.fjhx.stock.service.StockCheckrecordService;
 import com.fjhx.task.service.ScheduleTaskService;
 import org.springblade.core.launch.BladeApplication;
-import org.springblade.core.tool.utils.ThreadUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
@@ -72,20 +71,26 @@ public class ScheduleTaskController {
     /**
      * 盘点
      */
-//    @Scheduled(cron = "0 10 1 * * ?")
+//    @Scheduled(cron = "0 0 1 * * ?")
 //    @PostConstruct
-//    private void check() {
-//        if (BladeApplication.isLocalDev()) {
-//            return;
-//        }
-//
-//        stockCheckrecordService.startCheck("check1", "c185883dba22478cb593d33f6b66cc53");
-//        stockCheckrecordService.startCheck("check4", "0b8f584250bb4b40b72d641ce4849d15");
-//
-//        ThreadUtil.sleep(1000 * 60 * 10);
-//
-//        stockCheckrecordService.closeCheck("check1", "c185883dba22478cb593d33f6b66cc53");
-//        stockCheckrecordService.closeCheck("check4", "0b8f584250bb4b40b72d641ce4849d15");
-//    }
+    private void checkStart() {
+        if (BladeApplication.isLocalDev()) {
+            return;
+        }
+
+        stockCheckrecordService.checkStart("check1", "c185883dba22478cb593d33f6b66cc53");
+        stockCheckrecordService.checkStart("check4", "0b8f584250bb4b40b72d641ce4849d15");
+    }
+
+    //    @Scheduled(cron = "0 10 1 * * ?")
+    //    @PostConstruct
+    private void checkEnd() {
+        if (BladeApplication.isLocalDev()) {
+            return;
+        }
+
+        stockCheckrecordService.checkEnd("check1", "c185883dba22478cb593d33f6b66cc53");
+        stockCheckrecordService.checkEnd("check4", "0b8f584250bb4b40b72d641ce4849d15");
+    }
 
 }