盘点报表修改

src/main/java/com/neotel/smfcore/common/init/DataInitManager.java

@@ -224,6 +224,7 @@ public class DataInitManager {
         addNewFunctionMenu(80, pMenuReport,"inventoryReport", "库存", "inventoryReport", "neolight/inventoryReport/index", "BOM",functionMenuMap);
         addNewFunctionMenu(81, pMenuReport,"materialShortageReport", "缺料", "materialShortageReport", "neolight/materialShortageReport/index", "mShortageReport",functionMenuMap);
         addNewFunctionMenu(82,pMenuReport,"pkSearch","PK查询","pkSearch","neolight/pkSearch/index","findOut",functionMenuMap);
+        addNewFunctionMenu(83,pMenuReport,"sysInReport","盘点","sysInReport","neolight/sysInReport/index","mIDList",functionMenuMap);
 
 
         //内仓

src/main/java/com/neotel/smfcore/custom/lizhen/agvBox/bean/enums/InventoryStatus.java

@@ -7,13 +7,28 @@ public enum InventoryStatus {
     /**
      * 新建
      */
-    NEW,
+    NEW("新建"),
     /**
      * 正在执行中
      */
-    EXECUTING,
+    EXECUTING("正在执行"),
     /**
      * 完成
      */
-    FINISHED
+    FINISHED("已完成");
+
+    private String value;
+
+    InventoryStatus(String value) {
+        this.value = value;
+    }
+
+    public static String getValue(String name){
+        for (InventoryStatus status : InventoryStatus.values()) {
+            if (name.equals(status.name())){
+                return status.value;
+            }
+        }
+        return "";
+    }
 }

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

@@ -84,6 +84,20 @@ public class InventoryController {
 
 
     /**
+     * 获取盘点状态
+     * @return
+     */
+    @RequestMapping("/getInventoryStatus")
+    @AnonymousAccess
+    public Map<String, String> getInventoryStatus() {
+        Map<String, String> resultMap = new LinkedHashMap<>();
+        for (InventoryStatus status : InventoryStatus.values()) {
+            resultMap.put(status.getValue(status.name()), status.name());
+        }
+        return resultMap;
+    }
+
+    /**
      * 获取盘点信息
      *
      * @return

src/main/java/com/neotel/smfcore/custom/lizhen/report/bean/query/ReportQueryCondition.java

@@ -87,4 +87,20 @@ public class ReportQueryCondition {
     @ApiModelProperty("储位")
     @QueryCondition(blurry = "posName")
     private String storagePosName;
+
+    @ApiModelProperty("隔口")
+    @QueryCondition(blurry = "boxPartition")
+    private String boxPartition;
+
+    @ApiModelProperty("是否匹配")
+    @QueryCondition(type = QueryCondition.Type.EQ, propName = "isMatch")
+    private Boolean match;
+
+    @ApiModelProperty("状态")
+    @QueryCondition(blurry = "status")
+    private String status;
+
+    @ApiModelProperty("盘点批次")
+    @QueryCondition(type = QueryCondition.Type.EQ, propName = "inventoryBatch")
+    private Long inventoryBatch;
 }

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

@@ -27,6 +27,7 @@ import com.neotel.smfcore.core.storage.service.po.StoragePos;
 import com.neotel.smfcore.core.system.service.manager.IDataLogManager;
 import com.neotel.smfcore.core.system.service.po.DataLog;
 import com.neotel.smfcore.custom.lizhen.agvBox.bean.InventoryData;
+import com.neotel.smfcore.custom.lizhen.agvBox.bean.enums.InventoryStatus;
 import com.neotel.smfcore.custom.lizhen.agvBox.service.manager.InventoryDataManager;
 import com.neotel.smfcore.custom.lizhen.report.bean.dto.InventoryDto;
 import com.neotel.smfcore.custom.lizhen.report.bean.query.ReportQueryCondition;
@@ -747,7 +748,7 @@ public class OuterReportController {
                 map.put("已盘点数量", data.getInventoryAmout());
                 map.put("是否匹配", data.isMatch() ? "是" : "否");
                 map.put("盘点人", data.getCreator());
-                map.put("盘点状态", data.getStatus());
+                map.put("盘点状态", InventoryStatus.getValue(data.getStatus()));
                 map.put("盘点批次", data.getInventoryBatch());
                 results.add(map);
             }