维多利亚

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

@@ -19,7 +19,7 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("stock_checkrecord_copy1")
+@TableName("stock_checkrecord")
 public class StockCheckrecord extends BasicEntity {
 
     /**

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

@@ -1,15 +1,15 @@
 package com.fjhx.entity.stock;
 
-import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableField;
-
+import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
-
 import com.fjhx.base.BasicEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
  * <p>
  * 盘点记录明细
@@ -20,7 +20,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("stock_checkrecorddetail_copy1")
+@TableName("stock_checkrecorddetail")
 public class StockCheckrecorddetail extends BasicEntity {
 
 

hx-service-api/syringe-production-api/src/main/java/com/fjhx/entity/data/DataPacker.java

@@ -1,8 +1,5 @@
 package com.fjhx.entity.data;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.fjhx.base.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -26,9 +23,8 @@ public class DataPacker extends BaseEntity {
     private String machineId;
 
     /**
-     * 灭菌柜数据
+     * 包装机数据
      */
     private String jsonData;
 
-
 }

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

@@ -74,23 +74,22 @@ public class ScheduleTaskController {
     /**
      * 盘点
      */
-////    @Scheduled(cron = "0 0 1 * * ?")
+//    @Scheduled(cron = "0 0 1 * * ?")
-//    @Scheduled(cron = "0 50 12 * * ?")
+    @Scheduled(cron = "0 50 12 * * ?")
-////    @PostConstruct
+//    @PostConstruct
-//    private void checkStart() {
+    private void checkStart() {
-////        if (BladeApplication.isLocalDev()) {
+        if (BladeApplication.isLocalDev()) {
-////            return;
+            return;
-////        }
+        }
-//        log.error("开始扫描");
+        log.error("开始扫描");
-//
-//        stockCheckrecordService.checkStart("check1", "c185883dba22478cb593d33f6b66cc53");
-//        stockCheckrecordService.checkStart("check4", "0b8f584250bb4b40b72d641ce4849d15");
-//
-//        ThreadUtil.sleep(1000 * 60 * 5);
-//
-//        stockCheckrecordService.checkEnd("check1", "c185883dba22478cb593d33f6b66cc53");
-//        stockCheckrecordService.checkEnd("check4", "0b8f584250bb4b40b72d641ce4849d15");
-//    }
 
+        stockCheckrecordService.checkStart("check1", "c185883dba22478cb593d33f6b66cc53");
+        stockCheckrecordService.checkStart("check4", "0b8f584250bb4b40b72d641ce4849d15");
+
+        ThreadUtil.sleep(1000 * 60 * 10);
+
+        stockCheckrecordService.checkEnd("check1", "c185883dba22478cb593d33f6b66cc53");
+        stockCheckrecordService.checkEnd("check4", "0b8f584250bb4b40b72d641ce4849d15");
+    }
 
 }