盘点优化

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

 package com.neotel.smfcore.custom.lizhen.agvBox.util;
 package com.neotel.smfcore.custom.lizhen.agvBox.util;
 
 
+import com.neotel.smfcore.common.utils.StringUtils;
 import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager;
 import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.device.util.DataCache;
 import com.neotel.smfcore.core.device.util.DataCache;
@@ -172,8 +173,8 @@ public class BoxUtil {
      * @return
      * @return
      */
      */
     public static boolean isInventoryFinished(String boxStr) {
     public static boolean isInventoryFinished(String boxStr) {
-        Long inventoryBatch = dataCache.getCache(INVENTORY_DATA);
-        if (inventoryBatch == null) {
+        String inventoryBatch = dataCache.getCache(INVENTORY_DATA) +"";
+        if (StringUtils.isBlank(inventoryBatch) || "-1".equals(inventoryBatch)) {
             return true;
             return 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)));

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

@@ -741,6 +741,7 @@ public class OuterReportController {
                 map.put("隔口", data.getBoxPartition());
                 map.put("隔口", data.getBoxPartition());
                 map.put("料号", data.getPartNumber());
                 map.put("料号", data.getPartNumber());
                 map.put("描述", "");
                 map.put("描述", "");
+                //map.put("原储位",data.getOriPosName());
                 map.put("储位", data.getPosName());
                 map.put("储位", data.getPosName());
                 map.put("卷数", data.getReelCount());
                 map.put("卷数", data.getReelCount());
                 map.put("数量", data.getAmout());
                 map.put("数量", data.getAmout());
@@ -750,6 +751,8 @@ public class OuterReportController {
                 map.put("盘点人", data.getCreator());
                 map.put("盘点人", data.getCreator());
                 map.put("盘点状态", InventoryStatus.getValue(data.getStatus()));
                 map.put("盘点状态", InventoryStatus.getValue(data.getStatus()));
                 map.put("盘点批次", data.getInventoryBatch());
                 map.put("盘点批次", data.getInventoryBatch());
+                map.put("人工是否确认", data.isNeedInventory() ? "是" : "否");
+                map.put("创建时间",data.getCreateDate());
                 results.add(map);
                 results.add(map);
             }
             }
             try {
             try {