1.库存报表增加在库天数

2.空箱子也要扫码确认后CTU背上架

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

@@ -781,6 +781,9 @@ public class InventoryController {
                 if (extraDataMap != null && !extraDataMap.isEmpty()){
                     data.setNeedInventory(true);
                 } else {
+                    if (StringUtils.isEmpty(partition)){
+                        partition = boxPar;
+                    }
                     if (partition.equals(boxPar)){
                         data.setNeedInventory(true);
                     } else {

src/main/java/com/neotel/smfcore/custom/lizhen/agvBox/util/BoxUtil.java

@@ -180,6 +180,38 @@ public class BoxUtil {
         return infoList;
     }
 
+
+    public static void finishInventoryData(String boxStr) {
+        String inventoryBatch = dataCache.getCache(INVENTORY_DATA) + "";
+        if (StringUtils.isBlank(inventoryBatch) || "-1".equals(inventoryBatch)) {
+            return;
+        }
+        boolean hasSubBarcode = false;
+        Barcode barcode = barcodeManager.findByBarcode(boxStr);
+        if (barcode != null) {
+            List<Barcode> subCodeList = barcode.getSubCodeList();
+            if (subCodeList != null && !subCodeList.isEmpty()) {
+                hasSubBarcode = true;
+            }
+        }
+
+        List<InventoryData> dataList = inventoryDataManager.findByQuery(new Query(
+                Criteria.where("inventoryBatch").is(inventoryBatch).and("box").is(boxStr)));
+        if (dataList != null && !dataList.isEmpty()) {
+            for (InventoryData data : dataList) {
+                if (data.getReelCount() <= 0 || !hasSubBarcode) {
+                    data.setStatus(InventoryStatus.FINISHED.name());
+                    inventoryDataManager.save(data);
+                }
+                if (data.getInventoryReelCount() >= data.getReelCount()) {
+                    data.setStatus(InventoryStatus.FINISHED.name());
+                    inventoryDataManager.save(data);
+                }
+            }
+        }
+    }
+
+
     /**
      * 判断是否盘点完成
      * @param boxStr
@@ -191,18 +223,18 @@ public class BoxUtil {
             return true;
         }
 
-        boolean hasSubBarcode = false;
+        /*boolean hasSubBarcode = false;
         Barcode barcode = barcodeManager.findByBarcode(boxStr);
         if(barcode != null){
             List<Barcode> subCodeList = barcode.getSubCodeList();
             if (subCodeList != null && !subCodeList.isEmpty()){
                 hasSubBarcode = true;
             }
-        }
+        }*/
 
         List<InventoryData> dataList = inventoryDataManager.findByQuery(new Query(Criteria.where("inventoryBatch").is(inventoryBatch).and("box").is(boxStr)));
         if (dataList != null && !dataList.isEmpty()) {
-            for (InventoryData data : dataList) {
+            /*for (InventoryData data : dataList) {
                 if (data.getReelCount() <= 0 || !hasSubBarcode){
                     data.setStatus(InventoryStatus.FINISHED.name());
                     inventoryDataManager.save(data);
@@ -214,13 +246,13 @@ public class BoxUtil {
             }
             if (!hasSubBarcode){
                 return true;
-            }
+            }*/
             for (InventoryData data : dataList) {
-                if (data.getReelCount() > 0){
+                //if (data.getReelCount() > 0){
                     if (!data.getStatus().equals(InventoryStatus.FINISHED.name())) {
                         return false;
                     }
-                }
+                //}
             }
         }
         return true;

src/main/java/com/neotel/smfcore/custom/lizhen/report/bean/dto/InventoryDto.java

@@ -117,4 +117,6 @@ public class InventoryDto {
      * 来源
      */
     private String source;
+
+    private long inStockDays = 0;
 }

src/main/java/com/neotel/smfcore/custom/lizhen/report/outer/OuterReportController.java

@@ -558,6 +558,10 @@ public class OuterReportController {
                 dto.setPutInDate(barcode.getPutInDate());
                 dto.setCreator(barcode.getCreator());
                 dto.setBarcode(barcode.getBarcode());
+
+                long inStockDays = DateUtil.betweenDay(barcode.getPutInDate(), new Date(), false);
+                dto.setInStockDays(inStockDays);
+
                 dtos.add(dto);
             }
         }
@@ -600,6 +604,7 @@ public class OuterReportController {
                     header.add(Lists.newArrayList("禁用信息"));
                     header.add(Lists.newArrayList("首次入库时间"));
                     header.add(Lists.newArrayList("当前入库时间"));
+                    header.add(Lists.newArrayList("在库天数"));
                     header.add(Lists.newArrayList("工号"));
                     header.add(Lists.newArrayList("姓名"));
                     header.add(Lists.newArrayList("来源"));
@@ -635,6 +640,7 @@ public class OuterReportController {
                             result.add(dto.getDisableMsg());
                             result.add(dto.getFirstPutInDate());
                             result.add(dto.getPutInDate());
+                            result.add(dto.getInStockDays());
                             result.add(dto.getCreator());
                             result.add("");
                             result.add(dto.getSource());

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/manual/ManualGrPutInController.java

@@ -364,6 +364,8 @@ public class ManualGrPutInController {
             return ResultBean.newErrorResult(-1, "smfcore.error.barcode.invalid", "条码无效");
         }
 
+        BoxUtil.finishInventoryData(boxStr);
+
         //判断盘点是否完成
         boolean finished = BoxUtil.isInventoryFinished(boxStr);
         if (!finished) {