锡膏料仓调试修改

src/main/java/com/neotel/smfcore/core/dashboard/mimo/SmdBoxMimoController.java

@@ -350,7 +350,7 @@ public class SmdBoxMimoController {
 //        }
         int allCount = inTask + outTask;
         BoxStatusDto boxDto = new BoxStatusDto(storage.getId(), storage.getName(), storage.getCid(), false, 0,
-                "0", "0","0", "", allCount, inTask, outTask,
+                "0", "0","0","", "", allCount, inTask, outTask,
                 0, "", "", "", "", "",storage.getType(),storage.getUsageMap(),new HashMap<>(),storage.getInListName());
 
         //获取设备状态，设置状态和当前任务信息
@@ -389,6 +389,7 @@ public class SmdBoxMimoController {
                         }
                     }
                     boxDto.setCodeAirTemp(boxStatus.getCodeAirTemp());
+                    boxDto.setCodeAirTemp2(boxStatus.getCodeAirTemp2());
                     boxDto.setStatus(bean.getStatus());
                     boxDto.setMsg(bean.getShowMsg(locale));
                     boxDto.setBarcode(bean.getCode());

src/main/java/com/neotel/smfcore/core/device/bean/BoxStatusBean.java

@@ -55,9 +55,13 @@ public class BoxStatusBean {
     public String humidity;
 
     /**
-     * 冷气机温度
+     * 冷藏区温度1
      */
     public String codeAirTemp;
+    /**
+     * 冷藏区温度2
+     */
+    public String codeAirTemp2;
 
     public int getBoxId() {
         return boxId;
@@ -198,4 +202,12 @@ public class BoxStatusBean {
     public void setCodeAirTemp(String codeAirTemp) {
         this.codeAirTemp = codeAirTemp;
     }
+
+    public String getCodeAirTemp2() {
+        return codeAirTemp2;
+    }
+
+    public void setCodeAirTemp2(String codeAirTemp2) {
+        this.codeAirTemp2 = codeAirTemp2;
+    }
 }

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

@@ -953,10 +953,14 @@ public class BaseDeviceHandler implements IDeviceHandler {
                     String humidity = boxStatus.getHumidity();
                     String temperature = boxStatus.getTemperature();
                     String codeAirTemp = boxStatus.getCodeAirTemp();
+                    String codeAirTemp2=boxStatus.getCodeAirTemp2();
                     if (!Strings.isNullOrEmpty(humidity) && !Strings.isNullOrEmpty(temperature)) {
                         humiture.setHumidity(humidity);
                         humiture.setTemperature(temperature);
                         humiture.setCodeAirTemp(codeAirTemp);
+                        if(ObjectUtil.isNotEmpty(codeAirTemp2)){
+                            humiture.setCodeAirTemp2(codeAirTemp2);
+                        }
                         try {
                             humitureManager.save(humiture);
                             statusBean.setLastSaveTime(System.currentTimeMillis());

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

@@ -423,7 +423,7 @@ public class BoxKanbanController {
 //        }
         int allCount = inTask + outTask;
         BoxStatusDto boxDto = new BoxStatusDto(storage.getId(), storage.getName(), storage.getCid(), false, 0,
-                "0", "0", "0", "", allCount, inTask, outTask,
+                "0", "0", "0","", "", allCount, inTask, outTask,
                 0, "", "", "", "", "", storage.getType(), storage.getUsageMap(), new HashMap<>(), storage.getInListName());
 
         //获取设备状态，设置状态和当前任务信息
@@ -462,6 +462,7 @@ public class BoxKanbanController {
                         }
                     }
                     boxDto.setCodeAirTemp(boxStatus.getCodeAirTemp());
+                    boxDto.setCodeAirTemp2(boxStatus.getCodeAirTemp2());
                     boxDto.setStatus(bean.getStatus());
                     boxDto.setMsg(bean.getShowMsg(locale));
                     boxDto.setBarcode(bean.getCode());

src/main/java/com/neotel/smfcore/core/kanban/rest/bean/dto/BoxStatusDto.java

@@ -37,6 +37,8 @@ public class BoxStatusDto {
     private String humidity;
     @ApiModelProperty("冷气机温度")
     private String  codeAirTemp;
+    @ApiModelProperty("冷气机温度2")
+    private String  codeAirTemp2;
     @ApiModelProperty("文字显示")
     private String msg = "";
 

src/main/java/com/neotel/smfcore/core/solder/rest/SpBoxController.java

@@ -381,6 +381,9 @@ public class SpBoxController {
         //入库验证
         try {
             Barcode barcodeSave = smfApi.canPutInBeforeResolve(params);
+            if(barcodeSave == null){
+                barcodeSave = barcode;
+            }
             if (barcodeSave == null) {
                 log.info("库位【" + storagePos.getPosName() + "】" + barcode.getBarcode() + " 回库验证失败：条码为空，直接出库");
                 outMsg= MessageUtils.getText("smfcore.spbox.backFail",MessageUtils.getDefaultLocal(),"回库验证失败");

src/main/java/com/neotel/smfcore/core/system/service/po/Humiture.java

@@ -26,6 +26,11 @@ public class Humiture extends BasePo implements Serializable {
      * 温度2,用于锡膏料仓冷藏温度保存
      */
     private String codeAirTemp;
+
+    /**
+     * 冷藏区温度2（锡膏料仓）
+     */
+    private String codeAirTemp2;
     /**
      * 湿度
      */