1.设备互联bug处理

2.电子展优化

src/main/java/com/neotel/smfcore/core/equipment/rest/EquipViewController.java

@@ -89,8 +89,10 @@ public class EquipViewController {
                 StatusBean bean = DevicesStatusUtil.getStatusBean(storage.getCid());
                 StatusBean bean = DevicesStatusUtil.getStatusBean(storage.getCid());
                 if (bean == null || bean.timeOut()){
                 if (bean == null || bean.timeOut()){
                     dto.setOnLine(false);
                     dto.setOnLine(false);
+                    dto.setStatus(0);
                 } else {
                 } else {
                     dto.setOnLine(true);
                     dto.setOnLine(true);
+                    dto.setStatus(bean.getStatus());
                 }
                 }
                 resultList.add(dto);
                 resultList.add(dto);
             }
             }

src/main/java/com/neotel/smfcore/custom/exhibition/ElectronicExhibitionApi.java

@@ -26,7 +26,7 @@ public class ElectronicExhibitionApi extends BaseSmfApiListener {
         if (task.isFinished() || task.isEnd()) {
         if (task.isFinished() || task.isEnd()) {
             Map<String, Object> paramMap = new HashMap<>();
             Map<String, Object> paramMap = new HashMap<>();
             paramMap.put("funcname", "Indepot");
             paramMap.put("funcname", "Indepot");
-            paramMap.put("depotno", task.getPosName());
+            paramMap.put("depotno", "YLC");
 
 
             Map<String, Object> tableMap = new HashMap<>();
             Map<String, Object> tableMap = new HashMap<>();
             tableMap.put("id", task.getBarcode());
             tableMap.put("id", task.getBarcode());
@@ -53,7 +53,7 @@ public class ElectronicExhibitionApi extends BaseSmfApiListener {
         if (task.isFinished() || task.isEnd()){
         if (task.isFinished() || task.isEnd()){
             Map<String, Object> paramMap = new HashMap<>();
             Map<String, Object> paramMap = new HashMap<>();
             paramMap.put("funcname", "Outdepot");
             paramMap.put("funcname", "Outdepot");
-            paramMap.put("depotno", task.getPosName());
+            paramMap.put("depotno", "YLC");
 
 
             Map<String, Object> tableMap = new HashMap<>();
             Map<String, Object> tableMap = new HashMap<>();
             tableMap.put("id", task.getBarcode());
             tableMap.put("id", task.getBarcode());

src/main/java/com/neotel/smfcore/custom/exhibition/controller/ElectronicExhibitionController.java

@@ -60,6 +60,7 @@ public class ElectronicExhibitionController {
                 Collection<String> excludePosIds = liteOrderCache.excludeOutPosIds();
                 Collection<String> excludePosIds = liteOrderCache.excludeOutPosIds();
                 CHECKOUT_TYPE checkoutType = dataCache.getCheckOutType();
                 CHECKOUT_TYPE checkoutType = dataCache.getCheckOutType();
                 String compno = table.getCompno();
                 String compno = table.getCompno();
+                compno = compno.toUpperCase();
                 StoragePos storagePos = storagePosManager.findPartNumberInStorages(availableStorageIds, compno, excludePosIds, checkoutType);
                 StoragePos storagePos = storagePosManager.findPartNumberInStorages(availableStorageIds, compno, excludePosIds, checkoutType);
                 if (storagePos != null) {
                 if (storagePos != null) {
                     Storage storage = dataCache.getStorageById(storagePos.getStorageId());
                     Storage storage = dataCache.getStorageById(storagePos.getStorageId());