锡膏料仓增加禁用搅拌功能配置

src/main/java/com/neotel/smfcore/core/solder/util/SolderBoxCache.java

@@ -20,6 +20,7 @@ import com.neotel.smfcore.core.system.util.TaskService;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
@@ -39,6 +40,8 @@ public class SolderBoxCache {
 
     protected static final transient Logger log = LogManager.getLogger(SolderBoxCache.class);
 
+    @Value("${sp.disStirring:}")
+    private String disStirring="";
     @Autowired
     private DataCache dataCache;
     @Autowired
@@ -62,7 +65,7 @@ public class SolderBoxCache {
         executorService.execute(new Runnable() {
             @Override
             public void run() {
-                log.info("开启锡膏定时任务");
+                log.info("开启锡膏定时任务，disStirring="+disStirring);
                 while(true){
                     try{
                         TimeUnit.SECONDS.sleep(1);
@@ -130,7 +133,11 @@ public class SolderBoxCache {
                                 //回温中,看回温是否完成
                                 if(now - barcode.getStartWarmTime() >= barcode.getWarmTime() * 60 *1000){
                                     //回温完成,更改状态为待搅拌
-                                    if(barcode.getMixTime() <= 0){
+                                    if(disStirring.trim().equalsIgnoreCase("true")){
+                                        log.info(barcode.getBarcode() + "到达回温时间,当前已配置为禁用搅拌功能，修改状态为待出库");
+                                        barcode.setSolderStatus(SOLDER_STATUS.TO_BE_OUT.name());
+                                    }
+                                   else if(barcode.getMixTime() <= 0){
                                         log.info(barcode.getBarcode() + "到达回温时间,搅拌时间为0,修改状态为待出库");
                                         barcode.setSolderStatus(SOLDER_STATUS.TO_BE_OUT.name());
                                     }else{