1.pk挑料 排除入库任务

2.barcode 在库问题修改

src/main/java/com/neotel/smfcore/core/barcode/service/po/Barcode.java

@@ -412,7 +412,7 @@ public class Barcode extends BasePo implements Serializable {
         }
         }
 
 
         this.putInDate = new Date(putInTime);
         this.putInDate = new Date(putInTime);
-        status = BARCODE_STATUS.IN_STORE;
+        //status = BARCODE_STATUS.IN_STORE;
 
 
         updateExpTime();
         updateExpTime();
 
 

src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java

@@ -699,6 +699,24 @@ public class LiteOrderCache {
         return operatingPosIds;
         return operatingPosIds;
     }
     }
 
 
+
+    public Collection<String> excludePosIds() {
+        //排除掉正在执行的仓位
+        List<DataLog> allTasks = taskService.getAllTasks();
+        Collection<String> operatingPosIds = new HashSet<>();
+        for (DataLog task : allTasks) {
+            //if(task.isCheckOutTask()){
+            if (!task.isFinished() && !task.isCancel()) {
+                String posId = task.getPosId();
+                if (!Strings.isNullOrEmpty(posId)) {
+                    operatingPosIds.add(task.getPosId());
+                }
+                //}
+            }
+        }
+        return operatingPosIds;
+    }
+
     private DataLog newTask(StoragePos pos) {
     private DataLog newTask(StoragePos pos) {
 
 
         Storage storage = dataCache.getStorageById(pos.getStorageId());
         Storage storage = dataCache.getStorageById(pos.getStorageId());
@@ -980,7 +998,7 @@ public class LiteOrderCache {
             //List<StoragePos> allStoragePosList = new ArrayList();
             //List<StoragePos> allStoragePosList = new ArrayList();
 
 
             //6.排除的仓位信息
             //6.排除的仓位信息
-            Collection excludeIdList = excludeOutPosIds();
+            Collection excludeIdList = excludePosIds();
 
 
             //7.判断是否指定的itemId
             //7.判断是否指定的itemId
             /*if (orderItemIds != null && !orderItemIds.isEmpty()) {
             /*if (orderItemIds != null && !orderItemIds.isEmpty()) {

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

@@ -10,6 +10,7 @@ import com.neotel.smfcore.common.utils.ReelLockPosUtil;
 import com.neotel.smfcore.common.utils.SecurityUtils;
 import com.neotel.smfcore.common.utils.SecurityUtils;
 import com.neotel.smfcore.common.utils.StringUtils;
 import com.neotel.smfcore.common.utils.StringUtils;
 import com.neotel.smfcore.core.api.SmfApi;
 import com.neotel.smfcore.core.api.SmfApi;
+import com.neotel.smfcore.core.barcode.enums.BARCODE_STATUS;
 import com.neotel.smfcore.core.barcode.enums.COMPONENT_TYPE;
 import com.neotel.smfcore.core.barcode.enums.COMPONENT_TYPE;
 import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager;
 import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
@@ -1083,6 +1084,7 @@ public class TaskService {
                 barcode.setInOpor(opUser);
                 barcode.setInOpor(opUser);
                 barcode.setCheckOutDate(null, "");
                 barcode.setCheckOutDate(null, "");
                 barcode.setPosName(task.getPosName());
                 barcode.setPosName(task.getPosName());
+                barcode.setStatus(BARCODE_STATUS.IN_STORE);
 
 
                 barcodeManager.save(barcode);
                 barcodeManager.save(barcode);
 
 

src/main/resources/config/application.yml

@@ -33,7 +33,7 @@ lizhen:
     url: #http://172.30.88.19:8001/smf-core/api/Mes/machineCallMaterial
     url: #http://172.30.88.19:8001/smf-core/api/Mes/machineCallMaterial
   F3:
   F3:
     name: 3F
     name: 3F
-    line: C03-3FSMT-13,C02-3FSMT-12,C02-3FSMT-18,C02-3FSMT-19,C03-1FSMT-12,C02-3FSMT-11,C03-1FSMT-11,C02-3FSMT-17,C02-3FSMT-14,C03-1FSMT-12,C02-3FSMT-13,C02-3FSMT-16,C02-3FSMT-15
+    line: C03-3FSMT-13,C02-3FSMT-12,C02-3FSMT-18,C02-3FSMT-19,C03-1FSMT-12,C02-3FSMT-11,C03-1FSMT-11,C02-3FSMT-17,C02-3FSMT-14,C03-1FSMT-12,C02-3FSMT-13,C02-3FSMT-16,C02-3FSMT-15,C02-3FSMT-19
     url: http://10.68.27.85/smf-core/wcs/machineCallMaterial
     url: http://10.68.27.85/smf-core/wcs/machineCallMaterial
   F5:
   F5:
     name: 3FCG
     name: 3FCG