1.msd温湿度设置成-1时,页面不展示

2.重复分配库位问题修改

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

@@ -234,7 +234,7 @@ public class BaseDeviceHandler implements IDeviceHandler {
                 }
             }
 
-            ReelLockPosUtil.removeReelLockPosInfo(barcodeSave.getBarcode());
+            //ReelLockPosUtil.removeReelLockPosInfo(barcodeSave.getBarcode());
             return taskService.addPutInTaskToExecute(storage, barcodeSave, storagePos);
         }
     }
@@ -519,7 +519,6 @@ public class BaseDeviceHandler implements IDeviceHandler {
                 updatePosExecuteTime(task.getPosName(), executeTime);
             }
             log.info(task.getBarcode() + "入仓位[" + task.getPosName() + "]完成，执行时间[" + executeTime + "]秒");
-            ReelLockPosUtil.removeReelLockPosInfo(task.getBarcode());
             DataLog cancelTask = taskService.findFinishedPutInTask(cid, task.getPosName(), task.getBarcode());
             if (cancelTask != null && cancelTask.isCancel()) {
                 //将相同库位已经取消的任务从完成队列里删除
@@ -527,6 +526,7 @@ public class BaseDeviceHandler implements IDeviceHandler {
                 log.info("从已完成的任务列表中删除之前取消的任务:" + cancelTask.getPosName() + " ReelId:" + cancelTask.getBarcode());
             }
             updatePutInData(task);
+            ReelLockPosUtil.removeReelLockPosInfo(task.getBarcode());
         } else {
             //从已完成列表中找,如果还找不到就忽略
             task = taskService.findFinishedPutInTask(cid, posName, barcode);

src/main/java/com/neotel/smfcore/core/kanban/rest/BoxKanbanController.java

@@ -5,6 +5,7 @@ import com.google.common.base.Strings;
 import com.neotel.smfcore.common.bean.PageData;
 import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.exception.ValidateException;
+import com.neotel.smfcore.common.utils.Constants;
 import com.neotel.smfcore.common.utils.QueryHelp;
 import com.neotel.smfcore.common.utils.SecurityUtils;
 import com.neotel.smfcore.common.utils.StringUtils;
@@ -17,6 +18,7 @@ import com.neotel.smfcore.core.kanban.rest.bean.dto.*;
 import com.neotel.smfcore.core.kanban.rest.bean.mapstruct.BoxTaskMapper;
 import com.neotel.smfcore.core.kanban.rest.bean.query.BoxTaskQueryCriter;
 import com.neotel.smfcore.core.message.util.DeviceMessageUtil;
+import com.neotel.smfcore.core.msd.bean.MSDSettiings;
 import com.neotel.smfcore.core.solder.util.SolderBoxCache;
 import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager;
 import com.neotel.smfcore.core.storage.service.po.Storage;
@@ -445,9 +447,18 @@ public class BoxKanbanController {
                 for (BoxStatusBean boxStatus : bean.getBoxStatus().values()) {
                     String humidity = boxStatus.getHumidity();
                     String temperature = boxStatus.getTemperature();
-                    boxDto.setHumidity("-1".equals(humidity) ? "" + 0 : humidity);
+                    boxDto.setHumidity(humidity);
+                    boxDto.setTemperature(temperature);
+                    MSDSettiings settiings = dataCache.getCache(Constants.CACHE_msdSetting);
+                    if (settiings != null) {
+                        if (settiings.getMinHumidity() == -1f) {
+                            boxDto.setHumidity(0 + "");
+                        }
+                        if (settiings.getMinTemperature() == -1f) {
+                            boxDto.setTemperature(0 + "");
+                        }
+                    }
                     boxDto.setCodeAirTemp(boxStatus.getCodeAirTemp());
-                    boxDto.setTemperature("-1".equals(temperature) ? "" + 0 : temperature);
                     boxDto.setStatus(bean.getStatus());
                     boxDto.setMsg(bean.getShowMsg(locale));
                     boxDto.setBarcode(bean.getCode());