1.盘点未完成修改

2.料箱是否可以放走 修改

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

@@ -33,6 +33,12 @@ public class BoxUtil {
         this.inventoryDataManager = manager;
         this.inventoryDataManager = manager;
     }
     }
 
 
+    private static IBarcodeManager barcodeManager;
+    @Autowired
+    private void setBarcodeManager(IBarcodeManager manager){
+        this.barcodeManager = manager;
+    }
+
     /**
     /**
      * 盘点数据key
      * 盘点数据key
      */
      */
@@ -184,14 +190,31 @@ public class BoxUtil {
         if (StringUtils.isBlank(inventoryBatch) || "-1".equals(inventoryBatch)) {
         if (StringUtils.isBlank(inventoryBatch) || "-1".equals(inventoryBatch)) {
             return true;
             return true;
         }
         }
+
+        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)));
         List<InventoryData> dataList = inventoryDataManager.findByQuery(new Query(Criteria.where("inventoryBatch").is(inventoryBatch).and("box").is(boxStr)));
         if (dataList != null && !dataList.isEmpty()) {
         if (dataList != null && !dataList.isEmpty()) {
             for (InventoryData data : dataList) {
             for (InventoryData data : dataList) {
-                if (data.getReelCount() <= 0){
+                if (data.getReelCount() <= 0 || !hasSubBarcode){
+                    data.setStatus(InventoryStatus.FINISHED.name());
+                    inventoryDataManager.save(data);
+                }
+                if(data.getInventoryReelCount() >= data.getReelCount()){
                     data.setStatus(InventoryStatus.FINISHED.name());
                     data.setStatus(InventoryStatus.FINISHED.name());
                     inventoryDataManager.save(data);
                     inventoryDataManager.save(data);
                 }
                 }
             }
             }
+            if (!hasSubBarcode){
+                return true;
+            }
             for (InventoryData data : dataList) {
             for (InventoryData data : dataList) {
                 if (data.getReelCount() > 0){
                 if (data.getReelCount() > 0){
                     if (!data.getStatus().equals(InventoryStatus.FINISHED.name())) {
                     if (!data.getStatus().equals(InventoryStatus.FINISHED.name())) {

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

@@ -1589,6 +1589,10 @@ public class CDeviceController {
                 }
                 }
             }
             }
         }
         }
+        ResultBean resultBean = ResultBean.newOkResult(full);
+        if (!full){
+            resultBean.setCode(-1);
+        }
         return ResultBean.newOkResult(full);
         return ResultBean.newOkResult(full);
     }
     }