Merge remote-tracking branch 'origin/master'

src/main/java/com/neotel/smfcore/core/device/handler/impl/BaseDeviceHandler.java

@@ -919,6 +919,7 @@ public class BaseDeviceHandler implements IDeviceHandler {
             needSaveToMongo = statusBean.needSaveToMongo();
         }
         statusBean.setTime(System.currentTimeMillis());
+        statusBean.setOfflineTime(-1);
         Map<String, BoxStatusBean> statusOfBoxes = statusBeanToSave.getBoxStatus();
 
         statusBean.setBoxStatus(statusOfBoxes);

src/main/java/com/neotel/smfcore/core/device/handler/impl/MimoG3BoxHandler.java

@@ -167,6 +167,6 @@ public class MimoG3BoxHandler extends BaseDeviceHandler{
 
     @Override
     public DeviceType getDeviceType() {
-        return DeviceType.SMD_MIMO_G2;
+        return DeviceType.SMD_MIMO_G3;
     }
 }

src/main/java/com/neotel/smfcore/core/device/handler/impl/NLShelfHandler.java

@@ -335,13 +335,18 @@ public class NLShelfHandler extends BaseDeviceHandler {
                 return ResultBean.newOkResult("smfcore.shelf.msg.tipScanReel", "库位[" + pos.getPosName() + "]操作成功,请扫描要放入的物料", new String[]{pos.getPosName()},pos.getPosName());
             }
         } else {
-            //先判断库存中有没有此条码
-            ResultBean resultBean = outProcess(storageId,code,sourceId, loginUser,request);
-            if(resultBean != null){
-                return resultBean;
+            ResultBean resultBean;
+            try {
+                //先判断库存中有没有此条码
+                resultBean = outProcess(storageId, code, sourceId, loginUser, request);
+                if(resultBean!=null) {
+                    return resultBean;
+                }
+            } catch (Exception exa) {
+                log.error(exa.toString());
             }
             resultBean = putInProcess(groupId, storageId, code, token, loginUser);
-            if(resultBean != null){
+            if (resultBean != null) {
                 return resultBean;
             }
         }

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/equipment/util/EquipmentCache.java

@@ -36,7 +36,9 @@ public class EquipmentCache {
                             map.put(equipment.getCid(), equipment);
                         }
                         allEquipment = map;
-                        log.info("加载所有设备["+all.size()+"]信息到缓存");
+                        if(all.size()>0) {
+                            log.info("加载所有设备[" + all.size() + "]信息到缓存");
+                        }
                     }
                 }
             }

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/core/storage/service/po/Storage.java

@@ -102,7 +102,8 @@ public class Storage extends BasePo implements Serializable {
      * @return
      */
     public boolean isMimoG2(){
-        return DeviceType.SMD_MIMO_G2.name().equals(type);
+        //MIMOG2和G3统一处理
+        return (DeviceType.SMD_MIMO_G2.name().equals(type))||(DeviceType.SMD_MIMO_G3.name().equals(type));
     }
     /**
      * 是否是单台自动仓

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

@@ -204,6 +204,7 @@ public class DevicesStatusUtil {
         StatusBean statusBean = new StatusBean();
         statusBean.setCid(cid);
         statusBean.setTime(System.currentTimeMillis());
+        statusBean.setOfflineTime(-1);
         statusBean.setMsgList(msgs);
         clientMsgs.put(cid, statusBean);
         return statusBean;

src/main/java/com/neotel/smfcore/custom/hanwha/client/MyWebSocketClient.java

@@ -12,16 +12,17 @@ import java.util.TimerTask;
 @Slf4j
 public class MyWebSocketClient extends WebSocketClient {
 
+    private String url="";
     private WsMsgReceivedListener msgReceivedListener; // 消息接收监听器
     public MyWebSocketClient(URI serverUri, WsMsgReceivedListener listener) {
         super(serverUri);
+        url=serverUri.toString();
         this.msgReceivedListener =listener;
     }
 
     @Override
     public void onOpen(ServerHandshake serverHandshake) {
-        log.info("onOpen ");
-        log.info((new Date().toString()) + "connect webSServer ok  ");
+        log.info(url+":" +(new Date().toString()) + "connect webSServer ok  ");
         cancelReconnect();
         if(msgReceivedListener!=null) {
             msgReceivedListener.onOpen();
@@ -41,20 +42,20 @@ public class MyWebSocketClient extends WebSocketClient {
     @Override
     public void onClose(int i, String s, boolean b) {
 
-        log.info("onClose: code:{} reason:{} {}", i, s, b);
+        log.info(url+":" +"onClose: code:{} reason:{} {}", i, s, b);
         startReconnect();
     }
 
     @Override
     public void onError(Exception e) {
-        log.error("web socket client onerror :"+e.toString());
+        log.error(url+":" +"web socket client onerror :"+e.toString());
 
         //关闭后重新连接
         try {
             close();
         }catch (Exception ex){
 
-            log.error("web socket client onerror close error:"+e.toString());
+            log.error(url+":" +"web socket client onerror close error:"+e.toString());
         }
         startReconnect();
     }

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

@@ -45,6 +45,9 @@ public class TMSApis  {
                     item.setReelCode(getMapValue(map, "ReelCode"));
                     item.setResponseCount((Integer)getMapValue(map, "Count"));
                     item.setRequestCount((Integer)getMapValue(map, "Count"));
+                    item.setProductionDate(getMapValue(map,"ProductionDate"));
+                    item.setExpiryDate(getMapValue(map,"ExpiryDate"));
+                    item.setWarehousingDate(getMapValue(map,"WarehousingDate"));
 
 
                     list.add(item);

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";
 

src/main/java/com/neotel/smfcore/custom/hanwha/handler/bean/TMSPart.java

@@ -24,6 +24,14 @@ public class TMSPart extends TMSPos implements Serializable {
     private int responseCount = 0;
 
     private String resultCode = "";
+
+
+    public String ProductionDate ="";
+
+    public String ExpiryDate = "";
+
+    public String WarehousingDate = "";
+
     public static TMSPart newBean(int index, String pn,String barcode,int requestCount,int responseCount,String resultCode,String cid,String posName  ) {
         TMSPart bean = new TMSPart();
         bean.setIndex(index);