锡膏料仓修改

src/main/java/com/neotel/smfcore/core/humiture/rest/bean/query/HumitureQueryCriteria.java

@@ -23,6 +23,6 @@ public class HumitureQueryCriteria {
     private String humitureId;
     private String humitureId;
 
 
     @QueryCondition(type = QueryCondition.Type.BETWEEN, propName = "createDate")
     @QueryCondition(type = QueryCondition.Type.BETWEEN, propName = "createDate")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH")
     private BetweenData<Date> createDate;
     private BetweenData<Date> createDate;
 }
 }

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

@@ -413,7 +413,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", "", 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());
 
 
         //获取设备状态，设置状态和当前任务信息
         //获取设备状态，设置状态和当前任务信息
@@ -441,6 +441,7 @@ public class BoxKanbanController {
                     String humidity = boxStatus.getHumidity();
                     String humidity = boxStatus.getHumidity();
                     String temperature = boxStatus.getTemperature();
                     String temperature = boxStatus.getTemperature();
                     boxDto.setHumidity(humidity);
                     boxDto.setHumidity(humidity);
+                    boxDto.setCodeAirTemp(boxStatus.getCodeAirTemp());
                     boxDto.setTemperature(temperature);
                     boxDto.setTemperature(temperature);
                     boxDto.setStatus(bean.getStatus());
                     boxDto.setStatus(bean.getStatus());
                     boxDto.setMsg(bean.getShowMsg(locale));
                     boxDto.setMsg(bean.getShowMsg(locale));

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

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

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

@@ -12,6 +12,7 @@ import com.neotel.smfcore.core.barcode.enums.SOLDER_STATUS;
 import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager;
 import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.device.util.DataCache;
 import com.neotel.smfcore.core.device.util.DataCache;
+import com.neotel.smfcore.core.solder.rest.bean.dto.SpTaskDto;
 import com.neotel.smfcore.core.storage.rest.dto.CheckOutDto;
 import com.neotel.smfcore.core.storage.rest.dto.CheckOutDto;
 import com.neotel.smfcore.core.storage.rest.dto.InventoryItemDto;
 import com.neotel.smfcore.core.storage.rest.dto.InventoryItemDto;
 import com.neotel.smfcore.core.storage.rest.dto.StoragePosDto;
 import com.neotel.smfcore.core.storage.rest.dto.StoragePosDto;
@@ -20,7 +21,9 @@ import com.neotel.smfcore.core.storage.rest.query.StoragePosFindCriteria;
 import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager;
 import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager;
 import com.neotel.smfcore.core.storage.service.po.Storage;
 import com.neotel.smfcore.core.storage.service.po.Storage;
 import com.neotel.smfcore.core.storage.service.po.StoragePos;
 import com.neotel.smfcore.core.storage.service.po.StoragePos;
+import com.neotel.smfcore.core.system.rest.bean.query.TaskQueryCondition;
 import com.neotel.smfcore.core.system.util.TaskService;
 import com.neotel.smfcore.core.system.util.TaskService;
+import com.neotel.smfcore.security.annotation.AnonymousGetMapping;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
@@ -220,4 +223,32 @@ public class SpBoxController {
         q.with(Sort.by(Sort.Direction.ASC, "barcode.solderStatus").and(Sort.by(Sort.Direction.ASC, "barcode.putInTime")));
         q.with(Sort.by(Sort.Direction.ASC, "barcode.solderStatus").and(Sort.by(Sort.Direction.ASC, "barcode.putInTime")));
         return storagePosManager.findByQuery(q);
         return storagePosManager.findByQuery(q);
     }
     }
+
+    @ApiOperation("锡膏料仓任务列表")
+    @RequestMapping(value = "/tasks")
+    public  List<SpTaskDto>  filterTask(TaskQueryCondition criteria, HttpServletRequest request){
+
+        String storageId=criteria.getStorageId();
+        Storage storage = dataCache.getStorageById(storageId);
+        if(!storage.isSolderPaste()){
+            return new ArrayList<>();
+        }
+        Criteria c = Criteria.where("storageId").is(storageId)
+                .and("enabled").is(true)
+                .and("used").is(true)
+                .and("barcode.solderStatus").nin(SOLDER_STATUS.NONE.name(),SOLDER_STATUS.UNDER_REFRIGERATION.name(),SOLDER_STATUS.RETREAT_STORAGE.name());
+
+        List<StoragePos> taskPosList = storagePosManager.findByQuery(new Query(c));
+        List<SpTaskDto> spTaskDtos=new ArrayList<>();
+        for (StoragePos pos : taskPosList) {
+            try{
+            SpTaskDto spTaskDto=new SpTaskDto(pos.getId(),pos.getStorageId(),pos.getId(),pos.getPosName(),pos.getBarcode().getBarcode(),pos.getBarcode().getPartNumber(),
+                    pos.getBarcode().getAmount(),pos.getBarcode().getSolderStatus(),pos.getBarcode().getNeedOutDate());
+                spTaskDtos.add(spTaskDto);
+            }catch (Exception ex){
+
+            }
+        }
+        return spTaskDtos;
+    }
 }
 }

src/main/java/com/neotel/smfcore/core/solder/rest/bean/dto/SpTaskDto.java

+package com.neotel.smfcore.core.solder.rest.bean.dto;
+
+import com.neotel.smfcore.core.barcode.enums.SOLDER_STATUS;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class SpTaskDto implements Serializable {
+    @ApiModelProperty("ID")
+    private String id;
+
+    @ApiModelProperty("料仓 ID")
+    private String storageId;
+
+    @ApiModelProperty("料仓 ID")
+    private String posId;
+
+    @ApiModelProperty("仓位名称")
+    private String posName;
+
+    @ApiModelProperty("二维码(Reel ID)")
+    private String barcode;
+
+    @ApiModelProperty("物料编号")
+    private String partNumber;
+
+
+    @ApiModelProperty("重量")
+    private int amount;
+
+    @ApiModelProperty("锡膏状态")
+    private String solderStatus = SOLDER_STATUS.NONE.name();
+
+    @ApiModelProperty("锡膏指定时间出库")
+    private Date needOutDate;
+
+
+}