呼叫空箱 功能提交

src/main/java/com/neotel/smfcore/core/device/util/DataCache.java

@@ -148,7 +148,11 @@ public class DataCache {
      */
      */
     public void updateCache(String cacheKey, Object value){
     public void updateCache(String cacheKey, Object value){
         cacheItemDao.updateCacheItem(cacheKey,value);
         cacheItemDao.updateCacheItem(cacheKey,value);
-        cacheMap.put(cacheKey,value);
+        if(value == null){
+            cacheMap.remove(cacheKey);
+        } else {
+            cacheMap.put(cacheKey, value);
+        }
         if(cacheKey.equals(Constants.CACHE_CodeRule)){
         if(cacheKey.equals(Constants.CACHE_CodeRule)){
             List<String> ruleList=(List<String>)value;
             List<String> ruleList=(List<String>)value;
             codeResolve.updateBarcodeRuleList(ruleList);
             codeResolve.updateBarcodeRuleList(ruleList);

src/main/java/com/neotel/smfcore/custom/lizhen/agvBox/bean/dto/WareHouseCodeDto.java

@@ -24,4 +24,6 @@ public class WareHouseCodeDto implements Serializable {
 
 
     @ApiModelProperty("描述")
     @ApiModelProperty("描述")
     private String description;
     private String description;
+
+    private boolean choose = false;
 }
 }

src/main/java/com/neotel/smfcore/custom/lizhen/agvBox/rest/CodeController.java

@@ -112,6 +112,9 @@ public class CodeController {
         for (WareHouseCode code : codes) {
         for (WareHouseCode code : codes) {
             WareHouseCodeDto codeDto = codeMapper.toDto(code);
             WareHouseCodeDto codeDto = codeMapper.toDto(code);
             codeDto.setId(code.getId());
             codeDto.setId(code.getId());
+            if ("W10B".equals(code.getWareHouseCode())){
+                codeDto.setChoose(true);
+            }
             codeDtos.add(codeDto);
             codeDtos.add(codeDto);
         }
         }
         return new PageData(codeDtos,codePageData.getTotalElements());
         return new PageData(codeDtos,codePageData.getTotalElements());

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/bean/CallEmpty.java

+package com.neotel.smfcore.custom.luxsan.factory_c.rawstor.bean;
+
+import lombok.Data;
+
+@Data
+public class CallEmpty {
+
+    private String warehouseCode;
+
+    private String size;
+
+    private int needCount;
+
+}