汇总报表提交

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

@@ -335,7 +335,10 @@ public class DataInitManager {
         addNewFunctionMenu(145,meInnerMenuReport,"meInnerProLimitReport","禁限用","meInnerProLimitReport","report/inner/proLimitReport/index","proLimit",functionMenuMap);
 
 
-        addNewFunctionMenu(136,meMenuReport,"meInventory","汇总库存","meInventory","report/inventory/index","inventory",functionMenuMap);
+        addNewFunctionMenu(136,meMenuReport,"meInventory","库存","meInventory","report/inventory/index","inventory",functionMenuMap);
+        addNewFunctionMenu(137,meMenuReport,"meExpiredReport","过期","meExpiredReport","report/meExpireReport/index","oDReport",functionMenuMap);
+        addNewFunctionMenu(138,meMenuReport,"meChangeReport","事务","meChangeReport","report/meChangeReport/index","chageReport",functionMenuMap);
+        addNewFunctionMenu(139,meMenuReport,"meprohibitedReport","禁限用","meprohibitedReport","report/meprohibitedReport/index","proLimit",functionMenuMap);
 
         return functionMenuMap;
     }

src/main/java/com/neotel/smfcore/custom/lizhen/report/bacheng/BCReportController.java

@@ -376,7 +376,9 @@ public class BCReportController {
             BeanUtils.copyProperties(barcode, expire);
             expire.setPlant(BCPlant);
             expire.setFactory(BCFactory);
-            expire.setExpireDays(ExpireDateUtil.getExpireDays(expire.getExpireDate()));
+            if (expire.getExpireDate() != null) {
+                expire.setExpireDays(ExpireDateUtil.getExpireDays(expire.getExpireDate()));
+            }
             expire.setReelAmount(1);
             expire.setPosName(dataCache.getStorageById(storagePos.getStorageId()).getName() + "[" + storagePos.getPosName() + "]");
             expireList.add(expire);

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

+package com.neotel.smfcore.custom.lizhen.report.merge.bean.query;
+
+import com.neotel.smfcore.custom.lizhen.report.bacheng.bean.query.BcQuery;
+import lombok.Data;
+
+@Data
+public class MergeBcQuery extends BcQuery {
+    private int page;
+    private int size;
+    private String sort;
+}

src/main/resources/config/application.yml

@@ -58,6 +58,9 @@ forward:
   b15:
     name: B15
     url: http://10.42.176.209:8001/smf-core
+  f4:
+    name: 4F
+    url: http://127.0.0.1:8800
 
 #手动出库料箱
 manualcheckout:
@@ -99,6 +102,6 @@ app:
   type: ""
 
 menu:
-  show:
+  show: meInventory,meExpiredReport,meChangeReport,meprohibitedReport
   hide: