内仓出入库报表提交

src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java

@@ -566,7 +566,10 @@ public class LiteOrderCache {
                         task.setSubSourceId(orderItem.getId());
                         task.setSubSourceInfo(orderItem.getFeederInfo());
                         task.setType(OP.CHECKOUT);
-                        task.setExtendType(ExtendType.STORAGE_CHECKOUT); //智能仓储出库
+                        Storage storage = dataCache.getStorageById(pos.getStorageId());
+                        if (storage.isType(new DeviceType[]{DeviceType.SMD_XLR})) {
+                            task.setExtendType(ExtendType.STORAGE_CHECKOUT); //智能仓储出库
+                        }
                         task.setLightColor(nextColor.getRgb());
                         task.setStatus(OP_STATUS.WAIT.name());
                         task.setPartNumber(pos.getBarcode().getPartNumber()); //料号
@@ -801,13 +804,13 @@ public class LiteOrderCache {
 
         //料仓信息
         List<String> availableStorageIds = new ArrayList<>();
-        String virtualId = "";
+        //String virtualId = "";
         for (Storage storage : dataCache.getAllStorage().values()) {
-            if (storage.isVirtual()) {
+            /*if (storage.isVirtual()) {
                 virtualId = storage.getId();
-            } else {
+            } else {*/
                 availableStorageIds.add(storage.getId());
-            }
+            //}
         }
 
 
@@ -864,10 +867,11 @@ public class LiteOrderCache {
                 String brand = orderItem.getBrand(); //供应商
                 String pn = orderItem.getPn(); //料号
                 log.info("查询库位时间开始");
-                StoragePos pos = storagePosManager.findPartNumberInStorages(Arrays.asList(virtualId),pn, excludeIds, checkoutType, warehouseCode, brand,false);
+                /*StoragePos pos = storagePosManager.findPartNumberInStorages(Arrays.asList(virtualId),pn, excludeIds, checkoutType, warehouseCode, brand,false);
                 if (pos == null){
                     pos = storagePosManager.findPartNumberInStorages(availableStorageIds, pn, excludeIds, checkoutType, warehouseCode, brand,true);
-                }
+                }*/
+                StoragePos pos = storagePosManager.findPartNumberInStorages(availableStorageIds, pn, excludeIds, checkoutType, warehouseCode, brand,true);
                 if (pos == null){
                     pos = storagePosManager.findPartNumberInStorages(availableStorageIds, pn, excludeIds, checkoutType, warehouseCode, brand,false);
                 }

src/main/java/com/neotel/smfcore/core/storage/service/manager/impl/StoragePosManagerImpl.java

@@ -353,7 +353,7 @@ public class StoragePosManagerImpl implements IStoragePosManager {
             c.and("barcode.subCodeList.isOut").is(isOut);
         }
         //Sort sort = getSortByCheckOutType(checkOutType);
-        Sort sort = Sort.by(Sort.Direction.ASC, "barcode.subCodeList.createDate"/*,"canCheckOutTime", "barcode.usedCount"*/);
+        Sort sort = Sort.by(Sort.Direction.ASC, "barcode.subCodeList.createDate","createDate"/*,"canCheckOutTime", "barcode.usedCount"*/);
         Query q = new Query(c);
         q.with(sort);
         StoragePos pos = storagePosDao.findOne(q);

src/main/java/com/neotel/smfcore/custom/lizhen/innerBox/enums/ExtendType.java

@@ -38,4 +38,14 @@ public class ExtendType {
      * 清空库位
      */
     public final static int CLEAR_POS = 6;
+
+    /**
+     * 料架入库
+     */
+    public final static int NLSHELF_PUTIN = 7;
+
+    /**
+     * 料架出库
+     */
+    public final static int NLSHELF_CHECKOUT = 8;
 }

src/main/java/com/neotel/smfcore/custom/lizhen/report/inner/InnerReportController.java

@@ -545,7 +545,7 @@ public class InnerReportController {
     public ResultBean getInAndOutCount(ReportQueryCondition queryCondition) {
         Map<String, Object> resultMap = new HashMap<>();
         List<String> titleList = new ArrayList();
-        String[] title = {"全部入库", "全部出库", "智能仓入库", "智能仓出库", "虚拟仓入库", "虚拟仓出库", "手动清空库位", "手动喂料", "手动出库"};
+        String[] title = {"全部入库", "全部出库","智能仓入库", "智能仓出库", "虚拟仓入库", "虚拟仓出库", "手动清空库位", "手动喂料", "手动出库","料架入库","料架出库"};
         titleList.addAll(Arrays.asList(title));
 
         List<Integer> countList = new ArrayList();
@@ -608,6 +608,21 @@ public class InnerReportController {
         //手动出库
         int manualCheckOutCount = dataLogManager.getInOutData(startDate, endDate, OP.CHECKOUT, queryCondition.getPartNumber(), ExtendType.MANUAL_CHECKOUT,"");
         countList.add(manualCheckOutCount);
+
+        //料架入库
+        int nlShelfPutInCount =  inCount - storageInCount -  virtualInCount;
+        countList.add(nlShelfPutInCount);
+
+        log.info(inCount + "");
+        log.info((storageInCount + virtualInCount) + "");
+        log.info(outCount + "");
+        log.info((storageOutCount + virtualOutCount + clearCount + feedingCount + manualCheckOutCount) + "");
+
+        //料架出库
+        int nlShelfCheckOutCount = outCount - storageOutCount - virtualOutCount - clearCount - feedingCount - manualCheckOutCount;
+        countList.add(nlShelfCheckOutCount);
+
+
         //resultMap.put("manualCheckOutCount",manualCheckOutCount);
         resultMap.put("title",titleList);
         resultMap.put("count",countList);