锡膏管理设置增加：安全库存盘数设置

src/main/java/com/neotel/smfcore/core/barcode/rest/bean/dto/ComponentDto.java

@@ -161,4 +161,7 @@ public class ComponentDto implements Serializable {
 
     @ApiModelProperty("呆滞天数，默认0无需处理")
     private int sluggishDay = 0;
+
+    @ApiModelProperty("安全库存盘数")
+    private int safetyReelNum=0;
 }

src/main/java/com/neotel/smfcore/core/barcode/service/po/Component.java

@@ -141,7 +141,10 @@ public class Component extends BasePo implements Serializable {
      */
     private int sluggishDay = 0;
 
-
+    /**
+     * 安全库存盘数
+     */
+    private int safetyReelNum=0;
     /**
      * 出库时是否需要授权
      */

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

@@ -10,7 +10,9 @@ import com.neotel.smfcore.common.utils.QueryHelp;
 import com.neotel.smfcore.core.barcode.enums.COMPONENT_TYPE;
 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.IComponentManager;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
+import com.neotel.smfcore.core.barcode.service.po.Component;
 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;
@@ -60,6 +62,8 @@ public class SpBoxController {
 
     @Autowired
     protected DataCache dataCache;
+    @Autowired
+    private IComponentManager componentManager;
 
 
     @ApiOperation("锡膏UID出库")
@@ -82,7 +86,7 @@ public class SpBoxController {
         return ResultBean.newOkResult("");
     }
 
-    @ApiOperation("锡膏PN出库")
+    @ApiOperation("锡膏管理->库存")
     @GetMapping("/pnList")
     @PreAuthorize("@el.check('checkOut')")
     public Collection<InventoryItemDto> pnList(HttpServletRequest request) {
@@ -94,6 +98,13 @@ public class SpBoxController {
                 allNotEmptyPos.addAll(storageList);
             }
         }
+        Query query=new Query(Criteria.where("safetyReelNum").gt(0));
+        List<Component> componentList=componentManager.findByQuery(query);
+        Map<String,Integer> comMap=new HashMap<>();
+        for (Component com :
+                componentList) {
+            comMap.put(com.getPartNumber(), com.getSafetyReelNum());
+        }
         List<String> notLockStatus = new ArrayList<>();
         notLockStatus.add(SOLDER_STATUS.NONE.name());
         notLockStatus.add(SOLDER_STATUS.UNDER_REFRIGERATION.name());
@@ -111,6 +122,8 @@ public class SpBoxController {
             if (!notLockStatus.contains(solderStatus)) {
                 inventoryItemDto.setLockReel(inventoryItemDto.getLockReel() + 1);
             }
+            int safetyReelNum=comMap.getOrDefault(pn,0);
+            inventoryItemDto.setSafetyReelNum(safetyReelNum);
             inventoryItemMap.put(pn, inventoryItemDto);
         }
         return inventoryItemMap.values();

src/main/java/com/neotel/smfcore/core/storage/rest/dto/InventoryItemDto.java

@@ -38,4 +38,6 @@ public class InventoryItemDto implements Serializable {
     private int plateNumber=1;
 
 
+    @ApiModelProperty("安全库存盘数")
+    private int safetyReelNum=0;
 }