调试问题修改

src/main/java/com/neotel/smfcore/core/device/util/DataCache.java

@@ -23,6 +23,8 @@ import com.neotel.smfcore.core.storage.bean.InventoryItem;
 import com.neotel.smfcore.core.storage.enums.CHECKOUT_TYPE;
 import com.neotel.smfcore.core.storage.enums.COMPATIBLE_TYPE;
 import com.neotel.smfcore.core.storage.enums.DeviceType;
+import com.neotel.smfcore.core.storage.rest.dto.InventoryItemDto;
+import com.neotel.smfcore.core.storage.rest.query.InventoryQueryCriteria;
 import com.neotel.smfcore.core.storage.service.po.StoragePos;
 import com.neotel.smfcore.core.system.bean.OrderSetting;
 import com.neotel.smfcore.core.system.service.dao.ICacheItemDao;
@@ -38,6 +40,7 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
@@ -47,6 +50,7 @@ import javax.annotation.PostConstruct;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 /**
  * 缓存
@@ -658,6 +662,20 @@ public class DataCache {
         return storageInventoryMap;
     }
 
+    public List<InventoryItem> getInventoryByPN(String pn) {
+        Map<String, InventoryItem> inventoryItemMap = getAllInventory(null, "");
+        List<InventoryItem> list = Lists.newArrayList(inventoryItemMap.values());
+
+        List<InventoryItem> resultList = new ArrayList<>();
+        for (InventoryItem item : list
+        ) {
+            if (item.getPartNumber().equals(pn)&&item.getStockCount()>0) {
+                resultList.add(item);
+            }
+        }
+        return resultList;
+    }
+
     /**
      * 手动修改数量的时候更新库存
      * @param cid

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

@@ -600,8 +600,7 @@ public class LiteOrderCache {
                 //剩余未出盘数
                 int remainReelCount = orderItem.getNeedReelCount() - orderItem.getTotalOutReelCount();
 
-                Collection<String> excludePosIds = excludeOutPosIds();
-                excludePosIds.addAll(findPosIds);
+
                 //此PN未完成
                 if (remainNum > 0 || remainReelCount > 0) {
                     if (outBom) {
@@ -612,6 +611,8 @@ public class LiteOrderCache {
                     int assignNum = 0;
                     int assignReelCount = 0;
                     while (assignNum < remainNum || assignReelCount < remainReelCount) {
+                        Collection<String> excludePosIds = excludeOutPosIds();
+                        excludePosIds.addAll(findPosIds);
                         String partNumber = orderItem.getPn();
                         String reelId = orderItem.getRi();
                         String mpn = orderItem.getMpn();

src/main/java/com/neotel/smfcore/custom/hanwha/handler/HanwhaApiHandler.java

@@ -185,7 +185,7 @@ public class HanwhaApiHandler extends BaseSmfApiListener {
     @Override
     public boolean deviceStatusChanges(String deviceStatusUrl, String[] cids, Integer[] statusList) {
         log.info("deviceStatusChanges ，设备状态变化[" + JsonUtil.toJsonStr(cids) + "],[" + JsonUtil.toJsonStr(statusList) + "]，通知TMS");
-//        UpdateStorageConnectionInfo(cids,statusList);
+        UpdateStorageConnectionInfo(cids,statusList);
         RequestSyncRackStatusInfo(cids, statusList);
 
         return true;
@@ -225,8 +225,10 @@ public class HanwhaApiHandler extends BaseSmfApiListener {
                 }
             }
 
+            boolean needSendRack=false;
             if(status==-1||status==0||status>=1){
                 if(status>=1){
+                    needSendRack=false;
                     needSyncDataList.add(storage);
                     log.info("设备"+cid+"状态改变，当前状态："+status+",需要通知韩华,并同步物料信息");
                 }else{
@@ -241,24 +243,29 @@ public class HanwhaApiHandler extends BaseSmfApiListener {
             if (status >= 1) {
                 flag = 2;
             }
-            List<StoragePos> allStorage = storagePosManager.findByStorage(storage.getId());
-            for (StoragePos pos : allStorage
-            ) {
-                TMSRackStatus st = new TMSRackStatus();
-                st.setPosName(pos.getPosName());
-                st.setRackID(storage.getCid());
-                st.setFlag(flag);
-                st.setOutdate("");
-                st.setIndate("");
-                if (flag == 2) {
-                    st.setIndate(dateString);
-                } else {
-                    st.setOutdate(dateString);
+            if(needSendRack) {
+                //只有上线需要发送rack
+                List<StoragePos> allStorage = storagePosManager.findByStorage(storage.getId());
+                for (StoragePos pos : allStorage
+                ) {
+                    TMSRackStatus st = new TMSRackStatus();
+                    st.setPosName(pos.getPosName());
+                    st.setRackID(storage.getCid());
+                    st.setFlag(flag);
+                    st.setOutdate("");
+                    st.setIndate("");
+                    if (flag == 2) {
+                        st.setIndate(dateString);
+                    } else {
+                        st.setOutdate(dateString);
+                    }
+                    SyncRackStatusDatas.add(st);
                 }
-                SyncRackStatusDatas.add(st);
             }
 
         }
+        //离线只发状态改变
+        //上线时只发状态改变，和reel同步，暂不发Rack
         if (storageIds.size() > 0) {
             tmsApis.RequestSyncRackStatusInfo(0, SyncRackStatusDatas);
         }
@@ -327,21 +334,24 @@ public class HanwhaApiHandler extends BaseSmfApiListener {
                     status = bean.getStatus();
                 }
             }
-            String conCode = TMS_Code.CODE_1020;
-
-            if (status <= 0) {
-                //初始化失败
-                conCode = TMS_Code.CODE_0002;
-            } else if (status == 1) {
-                conCode = TMS_Code.CODE_1020;
-            } else if (status <= 4) {
-                //报警
-                conCode = TMS_Code.CODE_1024;
-            } else if (status == 5) {
-                conCode = TMS_Code.CODE_1023;
-            } else {
-                //忙碌
-                conCode = TMS_Code.CODE_1010;
+            String conCode = "0";
+
+//            if (status <= 0) {
+//                //初始化失败
+//                conCode = TMS_Code.CODE_0002;
+//            } else if (status == 1) {
+//                conCode = TMS_Code.CODE_1020;
+//            } else if (status <= 4) {
+//                //报警
+//                conCode = TMS_Code.CODE_1024;
+//            } else if (status == 5) {
+//                conCode = TMS_Code.CODE_1023;
+//            } else {
+//                //忙碌
+//                conCode = TMS_Code.CODE_1010;
+//            }
+            if(status>=1){
+                conCode="2";
             }
             storageIds.add(storage.getCid());
             storageTypes.add(type);

src/main/java/com/neotel/smfcore/custom/hanwha/handler/TMS_Code.java

@@ -78,7 +78,7 @@ public class TMS_Code {
     public static final String CODE_1024 = "1024";
 
     /**
-     * 2001 Part not enough
+     * 2001 Part not enough 数量不足
      */
     public static final String CODE_2001 = "2001";