工单bug修改

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

@@ -294,10 +294,7 @@ public class LiteOrderCache implements ITaskListener {
      */
      */
     public synchronized String checkOutLiteOrder(String orderNo, boolean outBom) {
     public synchronized String checkOutLiteOrder(String orderNo, boolean outBom) {
         LiteOrder cacheOrder = liteOrderMap.get(orderNo);
         LiteOrder cacheOrder = liteOrderMap.get(orderNo);
-        if (cacheOrder != null && !cacheOrder.isTaskFinished() && !cacheOrder.isNew()) {
-            log.info("工单[" + orderNo + "]正在执行");
-            return "smfcode.order.out.executing";
-        }
+
         if (cacheOrder == null) {
         if (cacheOrder == null) {
             cacheOrder = liteOrderManager.findByOrderNo(orderNo);
             cacheOrder = liteOrderManager.findByOrderNo(orderNo);
         }
         }
@@ -306,6 +303,14 @@ public class LiteOrderCache implements ITaskListener {
             return "smfcode.order.out.notFound";
             return "smfcode.order.out.notFound";
         }
         }
 
 
+        if (  !cacheOrder.isTaskFinished() && !cacheOrder.isNew()) {
+            log.info("工单[" + orderNo + "]正在执行");
+            return "smfcode.order.out.executing";
+        }
+        if(cacheOrder.isClosed()) {
+            log.info("工单[" + orderNo + "]已关闭，无法出库");
+            return "smfcode.order.hasClose";
+        }
 
 
         ORDER_COLOR nextColor = getNextColor();
         ORDER_COLOR nextColor = getNextColor();
         if (nextColor == null) {
         if (nextColor == null) {
@@ -348,7 +353,14 @@ public class LiteOrderCache implements ITaskListener {
                 while (assignNum < remainNum) {
                 while (assignNum < remainNum) {
                     Collection<String> excludePosIds =  excludePosIds();
                     Collection<String> excludePosIds =  excludePosIds();
                     String partNumber = orderItem.getPn();
                     String partNumber = orderItem.getPn();
-                    StoragePos pos = storagePosManager.findPartNumberInStorages(availableStorageIds, partNumber, excludePosIds, checkoutType);
+
+                    StoragePos pos = null;
+                    if(cacheOrder.getType()==2){
+                        //RI
+                        pos=storagePosManager.getByBarcode(orderItem.getRi());
+                    }else{
+                        pos=storagePosManager.findPartNumberInStorages(availableStorageIds, partNumber, excludePosIds, checkoutType);
+                    }
                     if (pos == null) {
                     if (pos == null) {
 //                        log.error("未找到可以出库的物料[" + partNumber + "]");
 //                        log.error("未找到可以出库的物料[" + partNumber + "]");
                         break;
                         break;
@@ -490,7 +502,13 @@ public class LiteOrderCache implements ITaskListener {
                 Collection<String> excludePosIds =  excludePosIds();
                 Collection<String> excludePosIds =  excludePosIds();
 
 
                 String partNumber = orderItem.getPn();
                 String partNumber = orderItem.getPn();
-                StoragePos pos = storagePosManager.findPartNumberInStorages(availableStorageIds, partNumber, excludePosIds, checkoutType);
+                StoragePos pos = null;
+                if(cacheOrder.getType()==2){
+                    //RI
+                    pos=storagePosManager.getByBarcode(orderItem.getRi());
+                }else {
+                    pos = storagePosManager.findPartNumberInStorages(availableStorageIds, partNumber, excludePosIds, checkoutType);
+                }
                 if (pos == null) {
                 if (pos == null) {
                     return "smfcode.order.supplementOutFail";
                     return "smfcode.order.supplementOutFail";
                 } else {
                 } else {

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

@@ -883,15 +883,7 @@ public class TaskService {
     public synchronized void tacticsCheckOut(Set<TacticsOutDto> tacticsOutDtos) {
     public synchronized void tacticsCheckOut(Set<TacticsOutDto> tacticsOutDtos) {
 
 
         CHECKOUT_TYPE checkoutType = dataCache.getCheckOutType();
         CHECKOUT_TYPE checkoutType = dataCache.getCheckOutType();
-        List<String> availableStorageIds = new ArrayList<>();
-        for (Storage storage : dataCache.getAllStorage().values()) {
-            //默认所有料仓可用
-//            StatusBean statusBean =dataCache. getStatus(storage.getCid());
-//            if (statusBean.isAvailable())
-            {
-                availableStorageIds.add(storage.getId());
-            }
-        }
+        List<String> availableStorageIds = dataCache.getAvailableStorageIds();
 
 
         Collection<String> excludePosIds = excludePosIds();
         Collection<String> excludePosIds = excludePosIds();