仓库报表

platform-dao/src/main/java/com/platform/dao/vo/query/store/StoreWorkBenchVO.java

@@ -30,23 +30,23 @@ public class StoreWorkBenchVO extends BaseVO implements Serializable {
     /**
      * 待调拨出库数量
      */
-    private Integer DBOutNum;
+    private Integer outDBNum;
     /**
      * 待入库总数
      */
-    private Integer InTotalNum;
+    private Integer inTotalNum;
     /**
      * 待出库总数
      */
-    private Integer OutTotalNum;
+    private Integer outTotalNum;
     /**
      * 待领用出库数量
      */
-    private Integer LYNum;
+    private Integer lyNum;
     /**
      * 待报废出库数量
      */
-    private Integer BFNum;
+    private Integer bfNum;
     /**
      * 其他待出库数量
      */
@@ -54,7 +54,7 @@ public class StoreWorkBenchVO extends BaseVO implements Serializable {
     /**
      * 盘点待出库数量
      */
-    private Integer PDOutNum;
+    private Integer OutPDNum;
     /**
      *
      */
@@ -67,7 +67,7 @@ public class StoreWorkBenchVO extends BaseVO implements Serializable {
     /**
      * 待调拨入库数量
      */
-    private Integer dbApplyNum;
+    private Integer applyDBNum;
     /**
      * 其他待入库数量
      */
@@ -80,14 +80,7 @@ public class StoreWorkBenchVO extends BaseVO implements Serializable {
      * 采购已入库数量(近一周内)
      */
     private Integer purchasedNum;
-    /**
-     * 申请退库入库数量
-     */
-    private Integer spareBackApplyNum;
-    /**
-     * 已退库入库数量(近一周内)
-     */
-    private Integer spareBackedNum;
+
     /**
      * 申请领用出库数量
      */
@@ -112,6 +105,10 @@ public class StoreWorkBenchVO extends BaseVO implements Serializable {
      * 备件仓库
      */
     private List<SpareStoreVO> spareStoreVOS;
+    /**
+     * 闲置入库
+     */
+    private Integer spareBackApplyNum;
 
 
 }

platform-service/src/main/java/com/platform/service/store/impl/InStoreFormServiceImpl.java

@@ -204,12 +204,12 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
         storeWorkBenchVO.setPurchaseApplyNum(purchaseNum);
         storeWorkBenchVO.setSpareBackApplyNum(xzNum);
         storeWorkBenchVO.setOtherNum(otherNum);
-        storeWorkBenchVO.setDbApplyNum(dbNum);
-        storeWorkBenchVO.setBFNum(bfNum);
-        storeWorkBenchVO.setLYNum(lyNum);
-        storeWorkBenchVO.setDBOutNum(dbNum2);
+        storeWorkBenchVO.setApplyDBNum(dbNum);
+        storeWorkBenchVO.setBfNum(bfNum);
+        storeWorkBenchVO.setLyNum(lyNum);
+        storeWorkBenchVO.setOutDBNum(dbNum2);
         storeWorkBenchVO.setOtherOutNum(otherNum2);
-        storeWorkBenchVO.setPDOutNum(pdNum);
+        storeWorkBenchVO.setOutPDNum(pdNum);
         storeWorkBenchVO.setOutTotalNum(num1);
         storeWorkBenchVO.setTotalNum(totalNum);
         return storeWorkBenchVO;