1.增加氮气浓度显示

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

@@ -351,7 +351,7 @@ public class SmdBoxMimoController {
         int allCount = inTask + outTask;
         int allCount = inTask + outTask;
         BoxStatusDto boxDto = new BoxStatusDto(storage.getId(), storage.getName(), storage.getCid(), false, 0,
         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(),"","","","","","");
+                0, "", "", "", "", "",storage.getType(),storage.getUsageMap(),new HashMap<>(),storage.getInListName(),"","","","","","","");
 
 
         //获取设备状态，设置状态和当前任务信息
         //获取设备状态，设置状态和当前任务信息
         StatusBean bean = DevicesStatusUtil.getStatusBean(storage.getCid());
         StatusBean bean = DevicesStatusUtil.getStatusBean(storage.getCid());

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

@@ -91,6 +91,11 @@ public class BoxStatusBean {
      */
      */
     public String wHum ;
     public String wHum ;
 
 
+    /**
+     * 氮气浓度
+     */
+    public String n2Value;
+
 
 
     public int getBoxId() {
     public int getBoxId() {
         return boxId;
         return boxId;

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

@@ -424,7 +424,7 @@ public class BoxKanbanController {
         int allCount = inTask + outTask;
         int allCount = inTask + outTask;
         BoxStatusDto boxDto = new BoxStatusDto(storage.getId(), storage.getName(), storage.getCid(), false, 0,
         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(),"","","","","","");
+                0, "", "", "", "", "", storage.getType(), storage.getUsageMap(), new HashMap<>(), storage.getInListName(),"","","","","","","");
 
 
         //获取设备状态，设置状态和当前任务信息
         //获取设备状态，设置状态和当前任务信息
         StatusBean bean = DevicesStatusUtil.getStatusBean(storage.getCid());
         StatusBean bean = DevicesStatusUtil.getStatusBean(storage.getCid());

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

@@ -100,6 +100,9 @@ public class BoxStatusDto {
     @ApiModelProperty("回温区湿度")
     @ApiModelProperty("回温区湿度")
     public String wHum ;
     public String wHum ;
 
 
+    @ApiModelProperty("氮气浓度")
+    public String n2Value;
+
     public void UpdateTemp(BoxStatusBean boxStatus) {
     public void UpdateTemp(BoxStatusBean boxStatus) {
         String humidity = boxStatus.getHumidity();
         String humidity = boxStatus.getHumidity();
         String temperature = boxStatus.getTemperature();
         String temperature = boxStatus.getTemperature();
@@ -115,5 +118,6 @@ public class BoxStatusDto {
 
 
         setTemperature3(boxStatus.getTemperature3());
         setTemperature3(boxStatus.getTemperature3());
         setHumidity3(boxStatus.getHumidity3());
         setHumidity3(boxStatus.getHumidity3());
+        setN2Value(boxStatus.getN2Value());
     }
     }
 }
 }

src/main/java/com/neotel/smfcore/core/storage/rest/MaterialBoxController.java

@@ -218,6 +218,7 @@ public class MaterialBoxController {
                     }
                     }
                     subBarcode.setHostBarcodeId(barcode.getId());
                     subBarcode.setHostBarcodeId(barcode.getId());
                     subBarcode.setAmount(newCount);
                     subBarcode.setAmount(newCount);
+                    subBarcode.setPutInTime(System.currentTimeMillis());
                     barcodeManager.saveBarcode(subBarcode);
                     barcodeManager.saveBarcode(subBarcode);
                     finishTask(barcode, opQty, currentTask, subBarcode, subBarcode.getAmount());
                     finishTask(barcode, opQty, currentTask, subBarcode, subBarcode.getAmount());
                     log.info("条码" + subBarcode.getBarcode() + "[" + subBarcode.getPartNumber() + "]入库到料盒[" + barcode.getBarcode() + "]数量:" + barcode.getAmount());
                     log.info("条码" + subBarcode.getBarcode() + "[" + subBarcode.getPartNumber() + "]入库到料盒[" + barcode.getBarcode() + "]数量:" + barcode.getAmount());
@@ -417,6 +418,7 @@ public class MaterialBoxController {
 
 
                         subBarcode.setHostBarcodeId(barcode.getId());
                         subBarcode.setHostBarcodeId(barcode.getId());
                         subBarcode.setAmount(oldAmount + opQty);
                         subBarcode.setAmount(oldAmount + opQty);
+                        subBarcode.setPutInTime(System.currentTimeMillis());
                         subBarcode = barcodeManager.save(subBarcode);
                         subBarcode = barcodeManager.save(subBarcode);
 
 
                         finishTask(barcode, opType, currentTask, subBarcode, opQty);
                         finishTask(barcode, opType, currentTask, subBarcode, opQty);