1.禁用料地址修改

2.正在执行的任务取消,禁用库位

src/main/java/com/neotel/smfcore/core/storage/rest/StoragePosController.java

@@ -717,7 +717,7 @@ public class StoragePosController {
             throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"线体"});
             throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"线体"});
         }
         }
         String isSingleOutStr = checkOutDto.getSingleOut();
         String isSingleOutStr = checkOutDto.getSingleOut();
-        boolean isSingleOut = Boolean.valueOf(isSingleOutStr);
+        boolean isSingleOut = true;
 
 
         for (String pid : checkOutDto.getPids()) {
         for (String pid : checkOutDto.getPids()) {
             StoragePos pos = storagePosManager.get(pid);
             StoragePos pos = storagePosManager.get(pid);

src/main/java/com/neotel/smfcore/core/system/util/TaskService.java

@@ -324,7 +324,7 @@ public class TaskService {
             log.info("任务[" + task.getId() + "] posName[" + task.getPosName() + "] Reel Id[" + task.getBarcode() + "]取消成功");
             log.info("任务[" + task.getId() + "] posName[" + task.getPosName() + "] Reel Id[" + task.getBarcode() + "]取消成功");
 
 
             //同时进行库位屏蔽
             //同时进行库位屏蔽
-            if (!task.isFinished()) {
+            if (task.isExecuting()) {
                 String posName = task.getPosName();
                 String posName = task.getPosName();
                 StoragePos storagePos = storagePosManager.getByPosName(posName);
                 StoragePos storagePos = storagePosManager.getByPosName(posName);
                 //如果是入库任务,直接屏蔽库位
                 //如果是入库任务,直接屏蔽库位

src/main/resources/config/application.yml

@@ -3,7 +3,7 @@ server:
 
 
 api:
 api:
   name: Lizhen
   name: Lizhen
-  inCheckUrl: http://10.68.24.25:8001/Npm/WmsCheckReelfob
+  inCheckUrl: http://10.68.27.35:8001/Npm/WmsCheckReelfob
   batchCheckReel:
   batchCheckReel:
   outNotifyUrl: 1
   outNotifyUrl: 1
   outNotifyUrlPK: #http://172.30.170.148:8001/Sct/SaveReelInfo #PK发料保存(外仓配置)
   outNotifyUrlPK: #http://172.30.170.148:8001/Sct/SaveReelInfo #PK发料保存(外仓配置)
@@ -48,7 +48,7 @@ lizhen:
     url: http://172.30.97.63:8001/smf-core/api/Mes/machineCallMaterial
     url: http://172.30.97.63:8001/smf-core/api/Mes/machineCallMaterial
   F4:
   F4:
     name: 4F
     name: 4F
-    line: BG02T,BG02B,CG20B1,CG02B2,CG02T1,CG02T2,AS02T1,AS02T2,AS02T3,AS02B1,AS02B2,BG03T1,BG03T2,BG03B1,BG03B2,BG04B,BG04T,CG03T1,CG03T2,CG03B,CG04T,CG04B,BG05T,BG05B
+    line: BG02T,BG02B,CG20B1,CG02B2,CG02T1,CG02T2,AS02T1,AS02T2,AS02T3,AS02B1,AS02B2,BG03T1,BG03T2,BG03B1,BG03B2,BG04B,BG04T,CG03T1,CG03T2,CG03B,CG04T,CG04B,BG05T,BG05B,CG03B1,CG03B2
     url: http://172.25.254.49:8001/smf-core/api/Mes/machineCallMaterial
     url: http://172.25.254.49:8001/smf-core/api/Mes/machineCallMaterial