锡膏料仓 data增加useMix ,warmPosUseCount , coldingPosUseCount

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

@@ -2,7 +2,6 @@ package com.neotel.smfcore.core.kanban.rest;
 
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.google.common.base.Strings;
 import com.google.common.base.Strings;
-import com.google.common.collect.Lists;
 import com.neotel.smfcore.common.bean.PageData;
 import com.neotel.smfcore.common.bean.PageData;
 import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.exception.ValidateException;
@@ -23,20 +22,16 @@ 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.service.manager.impl.DataLogManagerImpl;
 import com.neotel.smfcore.core.system.service.manager.impl.DataLogManagerImpl;
 import com.neotel.smfcore.core.system.service.po.DataLog;
 import com.neotel.smfcore.core.system.service.po.DataLog;
-import com.neotel.smfcore.core.system.service.po.Humiture;
 import com.neotel.smfcore.core.system.util.DevicesStatusUtil;
 import com.neotel.smfcore.core.system.util.DevicesStatusUtil;
 import com.neotel.smfcore.core.system.util.TaskService;
 import com.neotel.smfcore.core.system.util.TaskService;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import com.neotel.smfcore.security.annotation.AnonymousPutMapping;
 import com.neotel.smfcore.security.annotation.AnonymousPutMapping;
 import com.neotel.smfcore.security.service.manager.IGroupManager;
 import com.neotel.smfcore.security.service.manager.IGroupManager;
-import com.neotel.smfcore.security.service.manager.impl.GroupManagerImpl;
 import com.neotel.smfcore.security.service.manager.impl.UserManagerImpl;
 import com.neotel.smfcore.security.service.manager.impl.UserManagerImpl;
 import com.neotel.smfcore.security.service.po.Group;
 import com.neotel.smfcore.security.service.po.Group;
 import com.neotel.smfcore.security.service.po.User;
 import com.neotel.smfcore.security.service.po.User;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import javafx.concurrent.Task;
-import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,7 +39,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
@@ -470,6 +464,13 @@ public class BoxKanbanController {
                 }
                 }
             }
             }
         }
         }
+        //如果是锡膏料仓，需要把回温区物料数量，冷藏区物料数量显示
+        if(storage.isSolderPaste()){
+            Integer warmUseCount=dataCache.getSpUsePosCount(storage.getCid(),DataCache.warmPosUseCount);
+            Integer coldingUseCount=dataCache.getSpUsePosCount(storage.getCid(),DataCache.coldingPosUseCount);
+            boxDto.getData().put(DataCache.warmPosUseCount,warmUseCount.toString());
+            boxDto.getData().put(DataCache.warmPosUseCount,coldingUseCount.toString());
+        }
         return boxDto;
         return boxDto;
     }
     }
 
 

src/main/java/com/neotel/smfcore/custom/micron20031/bean/OrderInfoDto.java → src/main/java/com/neotel/smfcore/custom/micron20031/bean/dto/OrderInfoDto.java

-package com.neotel.smfcore.custom.micron20031.bean;
+package com.neotel.smfcore.custom.micron20031.bean.dto;
 
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/neotel/smfcore/custom/micron20031/bean/PosInfoDto.java → src/main/java/com/neotel/smfcore/custom/micron20031/bean/dto/PosInfoDto.java

-package com.neotel.smfcore.custom.micron20031.bean;
+package com.neotel.smfcore.custom.micron20031.bean.dto;
 
 
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;

src/main/java/com/neotel/smfcore/custom/micron20031/bean/PosRowDto.java → src/main/java/com/neotel/smfcore/custom/micron20031/bean/dto/PosRowDto.java

-package com.neotel.smfcore.custom.micron20031.bean;
+package com.neotel.smfcore.custom.micron20031.bean.dto;
 
 
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.Data;

src/main/java/com/neotel/smfcore/custom/micron20031/bean/PosValueInfo.java → src/main/java/com/neotel/smfcore/custom/micron20031/bean/dto/PosValueInfo.java

-package com.neotel.smfcore.custom.micron20031.bean;
+package com.neotel.smfcore.custom.micron20031.bean.dto;
 
 
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.Data;

src/main/java/com/neotel/smfcore/custom/micron20031/bean/dto/SpUnloadDto.java

+package com.neotel.smfcore.custom.micron20031.bean.dto;
+
+import com.neotel.smfcore.core.barcode.rest.bean.dto.BarcodeDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class SpUnloadDto {
+    @ApiModelProperty("库位ID")
+    private String id;
+
+    @ApiModelProperty("料仓ID")
+    private String storageId;
+
+    @ApiModelProperty("库位号")
+    private String posName;
+
+    @ApiModelProperty("条码")
+    private String barcode;
+
+    @ApiModelProperty("物料编号")
+    private String partNumber;
+
+    @ApiModelProperty("数量")
+    private int num;
+
+    @ApiModelProperty("出库结果，默认1=成功，0=失败")
+    private int unloadState = 1;
+}