diff --git a/docs/databases/table_create_gf.sql b/docs/databases/table_create_gf.sql
index 8c8c06e..4cc8c58 100644
--- a/docs/databases/table_create_gf.sql
+++ b/docs/databases/table_create_gf.sql
@@ -11,7 +11,7 @@
  Target Server Version : 50741
  File Encoding         : 65001
 
- Date: 15/08/2023 16:38:06
+ Date: 07/09/2023 16:54:37
 */
 
 SET NAMES utf8mb4;
@@ -45,7 +45,7 @@ CREATE TABLE `in_stock`  (
   `source_type` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '来源类型',
   `time` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '查询数据时间',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 20 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '货物入库明细表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 1026 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '货物入库明细表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for inventory
@@ -67,7 +67,7 @@ CREATE TABLE `inventory`  (
   `storehouse_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '仓库名称',
   `time` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '添加时间',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 6049 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '库存记录表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 9809 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '库存记录表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for out_stock
@@ -97,7 +97,7 @@ CREATE TABLE `out_stock`  (
   `source_type` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '来源类型',
   `time` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '抓取时间',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 56 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '货物出库明细表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 1916 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '货物出库明细表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for push_in_stock_data
@@ -127,7 +127,7 @@ CREATE TABLE `push_in_stock_data`  (
   `source_type` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '来源类型',
   `time` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '查询数据时间',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '监管入库数据表(推送入库数据表)' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 767 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '监管入库数据表(推送入库数据表)' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for push_inventory_data
@@ -149,7 +149,7 @@ CREATE TABLE `push_inventory_data`  (
   `storehouse_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '仓库名称',
   `time` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '添加时间',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 991 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '监管库存数据表(推送库存)' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 1563 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '监管库存数据表(推送库存)' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for push_out_stock_data
@@ -179,7 +179,163 @@ CREATE TABLE `push_out_stock_data`  (
   `source_type` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '来源类型',
   `time` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '抓取时间',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 42 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '监管出库数据表(推送出库数据表)' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 1376 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '监管出库数据表(推送出库数据表)' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for sys_menu
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_menu`;
+CREATE TABLE `sys_menu`  (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `sid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'sid',
+  `lockVersion` int(11) NOT NULL DEFAULT 0 COMMENT '记录版本，锁',
+  `createTime` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '记录创建时间',
+  `modifyTime` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '记录最后修改时间',
+  `isEnable` int(11) NOT NULL DEFAULT 1 COMMENT '记录是否可用，1:可用，0:不可用',
+  `state` int(11) NULL DEFAULT 1 COMMENT '隐藏本部门:隐藏本部门开启后，本部门将不会显示在公司通讯录中',
+  `isDelete` int(11) NULL DEFAULT NULL COMMENT '记录是否被删除，0:未删除，1:已经删除',
+  `remarks` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注信息',
+  `createBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建者',
+  `updateBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新者',
+  `name` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '菜单名称',
+  `menuUrl` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '菜单路由路径(VUE)',
+  `pageUrl` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '菜单对应的前端页面路径',
+  `iconUrl` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '菜单图标地址',
+  `sourceSid` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '资源sid',
+  `isShow` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '1' COMMENT '是否显示,默认为1显示，0为不显示',
+  `sortNo` int(11) NULL DEFAULT NULL COMMENT '排序号',
+  `pSid` varchar(300) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '上级sid',
+  `pageUrlRedirect` int(11) NULL DEFAULT NULL COMMENT '前端页面路径重定向',
+  `pageName` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '前端页面名称（vue组件名）',
+  `pageAliasName` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '前端页面别名',
+  `menuType` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '菜单类型（0左侧当行菜单，1页面中功能）',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 264 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '菜单表' ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Table structure for sys_menu_role
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_menu_role`;
+CREATE TABLE `sys_menu_role`  (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `sid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'sid',
+  `lockVersion` int(11) NOT NULL DEFAULT 0 COMMENT '记录版本，锁',
+  `createTime` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '记录创建时间',
+  `modifyTime` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '记录最后修改时间',
+  `isEnable` int(11) NOT NULL DEFAULT 1 COMMENT '记录是否可用，1:可用，0:不可用',
+  `state` int(11) NULL DEFAULT 1 COMMENT '隐藏本部门:隐藏本部门开启后，本部门将不会显示在公司通讯录中',
+  `isDelete` int(11) NULL DEFAULT NULL COMMENT '记录是否被删除，0:未删除，1:已经删除',
+  `remarks` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注信息',
+  `createBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建者',
+  `updateBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新者',
+  `menuSid` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '菜单sid',
+  `roleSid` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '角色sid',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 14433 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '菜单与角色关联表' ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Table structure for sys_role
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_role`;
+CREATE TABLE `sys_role`  (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `sid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'sid',
+  `lockVersion` int(11) NOT NULL DEFAULT 0 COMMENT '记录版本，锁',
+  `createTime` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '记录创建时间',
+  `modifyTime` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '记录最后修改时间',
+  `isEnable` int(11) NOT NULL DEFAULT 1 COMMENT '记录是否可用，1:可用，0:不可用',
+  `state` int(11) NULL DEFAULT 1 COMMENT '隐藏本部门:隐藏本部门开启后，本部门将不会显示在公司通讯录中',
+  `isDelete` int(11) NULL DEFAULT NULL COMMENT '记录是否被删除，0:未删除，1:已经删除',
+  `remarks` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注信息',
+  `createBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建者',
+  `updateBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新者',
+  `name` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '角色名称',
+  `sort` int(11) NULL DEFAULT NULL COMMENT '排序',
+  `code` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '编码',
+  `type` int(11) NULL DEFAULT NULL COMMENT '1、系统管理员、2、普通角色',
+  `postSid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '岗位sid',
+  `roleType` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '角色组织层级',
+  `roleTypeValue` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '角色组织层级value',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '角色' ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Table structure for sys_source_menu
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_source_menu`;
+CREATE TABLE `sys_source_menu`  (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `sid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'sid',
+  `lockVersion` int(11) NOT NULL DEFAULT 0 COMMENT '记录版本，锁',
+  `createTime` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '记录创建时间',
+  `modifyTime` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '记录最后修改时间',
+  `isEnable` int(11) NOT NULL DEFAULT 1 COMMENT '记录是否可用，1:可用，0:不可用',
+  `state` int(11) NULL DEFAULT 1 COMMENT '隐藏本部门:隐藏本部门开启后，本部门将不会显示在公司通讯录中',
+  `isDelete` int(11) NULL DEFAULT NULL COMMENT '记录是否被删除，0:未删除，1:已经删除',
+  `remarks` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注信息',
+  `createBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建者',
+  `updateBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新者',
+  `sourceSid` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '资源sid',
+  `menuSid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '菜单sid',
+  `menuRootSid` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '菜单根目录sid',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 341 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '资源与菜单关联表' ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Table structure for sys_user
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_user`;
+CREATE TABLE `sys_user`  (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `sid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'sid',
+  `lockVersion` int(11) NOT NULL DEFAULT 0 COMMENT '记录版本，锁',
+  `createTime` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '记录创建时间',
+  `modifyTime` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '记录最后修改时间',
+  `isEnable` int(11) NOT NULL DEFAULT 1 COMMENT '记录是否可用，1:可用，0:不可用',
+  `state` int(11) NULL DEFAULT 1 COMMENT '隐藏本部门:隐藏本部门开启后，本部门将不会显示在公司通讯录中',
+  `isDelete` int(11) NULL DEFAULT NULL COMMENT '记录是否被删除，0:未删除，1:已经删除',
+  `remarks` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注信息',
+  `createBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建者',
+  `updateBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新者',
+  `userName` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '登录名，登录名不能相同',
+  `password` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '密码（加密或签名后）',
+  `pwdDayslimit` varchar(11) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '密码修改时限',
+  `pwdModifyTime` datetime(0) NULL DEFAULT NULL COMMENT '最后一次密码修改时间',
+  `onlineState` int(11) NULL DEFAULT NULL COMMENT '在线状态（0为离线、1为在线）',
+  `token` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户登录时随机生成身份验证字符串',
+  `isAdmin` varchar(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '是否是管理员：1管理员，2一般用户，0是超级管理员,3尚无单位人员',
+  `appId` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '手机登录唯一标识，手机与用户绑定字段',
+  `staffSid` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '关联的人员sid',
+  `mobile` varchar(11) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '手机号',
+  `userType` int(11) NULL DEFAULT NULL COMMENT '用户类型:1员工、2客户、3供应商',
+  `headImage` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户头像',
+  `roleSid` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '角色 ',
+  `orgSid` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '岗位',
+  `postSid` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '部门',
+  `name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '员工名',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 8 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Table structure for sys_user_role
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_user_role`;
+CREATE TABLE `sys_user_role`  (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `sid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'sid',
+  `lockVersion` int(11) NOT NULL DEFAULT 0 COMMENT '记录版本，锁',
+  `createTime` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '记录创建时间',
+  `modifyTime` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '记录最后修改时间',
+  `isEnable` int(11) NOT NULL DEFAULT 1 COMMENT '记录是否可用，1:可用，0:不可用',
+  `state` int(11) NULL DEFAULT 1 COMMENT '隐藏本部门:隐藏本部门开启后，本部门将不会显示在公司通讯录中',
+  `isDelete` int(11) NULL DEFAULT NULL COMMENT '记录是否被删除，0:未删除，1:已经删除',
+  `remarks` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注信息',
+  `createBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建者',
+  `updateBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新者',
+  `userSid` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户sid',
+  `roleSid` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '角色sid',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1231 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '用户与角色关联表' ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Table structure for warehouse information
diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/instock/InStockRest.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/instock/InStockRest.java
index c9078c8..9d24097 100644
--- a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/instock/InStockRest.java
+++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/instock/InStockRest.java
@@ -55,24 +55,26 @@ public class InStockRest {
     public ResultBean getInStockInfo(@PathVariable String id){
         ResultBean rb = ResultBean.fireFail();
         BaseResponse<InStockGetInfo> api$system$in_stock$get_info = ShRequester.getApi$system$in_stock$get_info(id);
-        String[] bill = api$system$in_stock$get_info.getData().getFile().getBill();
-        String[] ding = api$system$in_stock$get_info.getData().getFile().getDing();
-        String[] voucher = api$system$in_stock$get_info.getData().getFile().getVoucher();
-        String[] contract_pic = api$system$in_stock$get_info.getData().getFile().getContract_pic();
-        String[] billUrlImage = ShRequester.getUrlImage(bill);
-        String[] dingUrlImage = ShRequester.getUrlImage(ding);
-        String[] voucherUrlImage = ShRequester.getUrlImage(voucher);
-        String[] contractPicUrlImage = ShRequester.getUrlImage(contract_pic);
-        api$system$in_stock$get_info.getData().getFile().setBill(billUrlImage);
-        api$system$in_stock$get_info.getData().getFile().setDing(dingUrlImage);
-        api$system$in_stock$get_info.getData().getFile().setVoucher(voucherUrlImage);
-        api$system$in_stock$get_info.getData().getFile().setContract_pic(contractPicUrlImage);
+        if (api$system$in_stock$get_info.getData().getFile() != null){
+            String[] bill = api$system$in_stock$get_info.getData().getFile().getBill();
+            String[] ding = api$system$in_stock$get_info.getData().getFile().getDing();
+            String[] voucher = api$system$in_stock$get_info.getData().getFile().getVoucher();
+            String[] contract_pic = api$system$in_stock$get_info.getData().getFile().getContract_pic();
+            String[] billUrlImage = ShRequester.getUrlImage(bill);
+            String[] dingUrlImage = ShRequester.getUrlImage(ding);
+            String[] voucherUrlImage = ShRequester.getUrlImage(voucher);
+            String[] contractPicUrlImage = ShRequester.getUrlImage(contract_pic);
+            api$system$in_stock$get_info.getData().getFile().setBill(billUrlImage);
+            api$system$in_stock$get_info.getData().getFile().setDing(dingUrlImage);
+            api$system$in_stock$get_info.getData().getFile().setVoucher(voucherUrlImage);
+            api$system$in_stock$get_info.getData().getFile().setContract_pic(contractPicUrlImage);
+        }
         return rb.success().setData(api$system$in_stock$get_info);
     }
 
     @PostMapping("/getInStockMaterielList")
     @ApiOperation(value = "获取入库记录列表")
-    public ResultBean getInStockMaterielList(In_stockGetRecordMaterielList in_stockGetRecordMaterielList){
+    public ResultBean getInStockMaterielList(@RequestBody In_stockGetRecordMaterielList in_stockGetRecordMaterielList){
         ResultBean rb = ResultBean.fireFail();
         BaseResponse<BaseResponseListObj<InStockGetRecordMaterielList>> api$system$in_stock$get_record_materiel_list = ShRequester.getApi$system$in_stock$get_record_materiel_list(in_stockGetRecordMaterielList);
         return rb.success().setData(api$system$in_stock$get_record_materiel_list);
diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/instock/InStockService.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/instock/InStockService.java
index b9a4cae..fe1bce5 100644
--- a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/instock/InStockService.java
+++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/instock/InStockService.java
@@ -20,6 +20,7 @@ import com.yxt.supervise.gf.shanhai.req.In_stockGetRecordMaterielList;
 import com.yxt.supervise.gf.shanhai.resp.BaseResponse;
 import com.yxt.supervise.gf.shanhai.resp.BaseResponseListObj;
 import com.yxt.supervise.gf.shanhai.resp.InStockGetRecordMaterielList;
+import org.apache.commons.lang.ArrayUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -44,11 +45,14 @@ public class InStockService extends ServiceImpl<InStockMapper, InStock> {
 
     public ResultBean save(In_stockGetRecordMaterielList reqParams){
         ResultBean rb = ResultBean.fireFail();
-        String currDay = DateUtil.format(DateUtil.offsetDay(new Date(), -1), "yyyy-MM-dd");
-        reqParams.setStart_happen_time(currDay);
-        reqParams.setEnd_happen_time(currDay);
+//        String currDay = DateUtil.format(DateUtil.offsetDay(new Date(), -1), "yyyy-MM-dd");
+//        reqParams.setStart_happen_time(currDay);
+//        reqParams.setEnd_happen_time(currDay);
         BaseResponse<BaseResponseListObj<InStockGetRecordMaterielList>> api$system$in_stock$get_record_materiel_list = ShRequester.getApi$system$in_stock$get_record_materiel_list(reqParams);
         List<InStockGetRecordMaterielList> list = api$system$in_stock$get_record_materiel_list.getData().getList();
+        String end = reqParams.getEnd_happen_time() + " 23:59:59";
+        baseMapper.delete(new QueryWrapper<InStock>().ge("happen_time",reqParams.getStart_happen_time()).le("happen_time",end));
+        pushInStockDataService.remove(new QueryWrapper<PushInStockData>().ge("happen_time",reqParams.getStart_happen_time()).le("happen_time",end));
         for (InStockGetRecordMaterielList inStockGetRecordMaterielList : list) {
             InStock inStock = new InStock();
             BeanUtil.copyProperties(inStockGetRecordMaterielList,inStock);
@@ -74,6 +78,7 @@ public class InStockService extends ServiceImpl<InStockMapper, InStock> {
                 }
             }
         }
+        compareWa(map);
         try {
             outStockService.exportExcel(map,0);
         }catch (Exception e){
@@ -93,4 +98,23 @@ public class InStockService extends ServiceImpl<InStockMapper, InStock> {
         PagerVo<InStockVo> vo = PagerUtil.pageToVo(inStockIPage, null);
         return vo;
     }
+
+    public static void compareWa(Map<String,List<Object>> map){
+        List<String> km = new ArrayList();
+        km.add("江西余干库");
+        km.add("庄河荣名库");
+        km.add("安阳荣名库");
+        km.add("藁城荣名库");
+        km.add("曲阜荣名库");
+        for (String s : map.keySet()) {
+            if (km.contains(s)){
+                km.remove(s);
+            }
+        }
+        if (km != null){
+            for (String s : km) {
+                map.put(s,new ArrayList<>());
+            }
+        }
+    }
 }
diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/outstock/OutStockRest.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/outstock/OutStockRest.java
index 1cd5c4b..d684ffc 100644
--- a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/outstock/OutStockRest.java
+++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/outstock/OutStockRest.java
@@ -51,18 +51,20 @@ public class OutStockRest {
     public ResultBean getOutStockInfo(@PathVariable String id){
         ResultBean rb = ResultBean.fireFail();
         BaseResponse<OutStockGetInfo> api$system$out_stock$get_info = ShRequester.getApi$system$out_stock$get_info(id);
-        String[] bill = api$system$out_stock$get_info.getData().getFile().getBill();
-        String[] ding = api$system$out_stock$get_info.getData().getFile().getDing();
-        String[] voucher = api$system$out_stock$get_info.getData().getFile().getVoucher();
-        String[] contract_pic = api$system$out_stock$get_info.getData().getFile().getContract_pic();
-        String[] billUrlImage = ShRequester.getUrlImage(bill);
-        String[] dingUrlImage = ShRequester.getUrlImage(ding);
-        String[] voucherUrlImage = ShRequester.getUrlImage(voucher);
-        String[] contractPicUrlImage = ShRequester.getUrlImage(contract_pic);
-        api$system$out_stock$get_info.getData().getFile().setBill(billUrlImage);
-        api$system$out_stock$get_info.getData().getFile().setDing(dingUrlImage);
-        api$system$out_stock$get_info.getData().getFile().setVoucher(voucherUrlImage);
-        api$system$out_stock$get_info.getData().getFile().setContract_pic(contractPicUrlImage);
+        if (api$system$out_stock$get_info.getData().getFile() != null){
+            String[] bill = api$system$out_stock$get_info.getData().getFile().getBill();
+            String[] ding = api$system$out_stock$get_info.getData().getFile().getDing();
+            String[] voucher = api$system$out_stock$get_info.getData().getFile().getVoucher();
+            String[] contract_pic = api$system$out_stock$get_info.getData().getFile().getContract_pic();
+            String[] billUrlImage = ShRequester.getUrlImage(bill);
+            String[] dingUrlImage = ShRequester.getUrlImage(ding);
+            String[] voucherUrlImage = ShRequester.getUrlImage(voucher);
+            String[] contractPicUrlImage = ShRequester.getUrlImage(contract_pic);
+            api$system$out_stock$get_info.getData().getFile().setBill(billUrlImage);
+            api$system$out_stock$get_info.getData().getFile().setDing(dingUrlImage);
+            api$system$out_stock$get_info.getData().getFile().setVoucher(voucherUrlImage);
+            api$system$out_stock$get_info.getData().getFile().setContract_pic(contractPicUrlImage);
+        }
         return rb.success().setData(api$system$out_stock$get_info);
     }
 
diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/outstock/OutStockService.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/outstock/OutStockService.java
index 6d28f2d..a6f7887 100644
--- a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/outstock/OutStockService.java
+++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/outstock/OutStockService.java
@@ -14,6 +14,7 @@ import com.yxt.supervise.gf.api.outstock.OutStock;
 import com.yxt.supervise.gf.api.outstock.OutStockQuery;
 import com.yxt.supervise.gf.api.outstock.OutStockVo;
 import com.yxt.supervise.gf.api.pushoutstockdata.PushOutStockData;
+import com.yxt.supervise.gf.biz.instock.InStockService;
 import com.yxt.supervise.gf.biz.pushoutstockdata.PushOutStockDataService;
 import com.yxt.supervise.gf.shanhai.ShRequester;
 import com.yxt.supervise.gf.shanhai.req.Out_stockGetRecordMaterielList;
@@ -49,11 +50,14 @@ public class OutStockService extends ServiceImpl<OutStockMapper, OutStock> {
     public ResultBean save(Out_stockGetRecordMaterielList reqParams){
         ResultBean rb = ResultBean.fireFail();
         String date = DateUtil.format(new Date(), "yyyy-MM-dd");
-        String currDay = DateUtil.format(DateUtil.offsetDay(new Date(), -1), "yyyy-MM-dd");
-        reqParams.setStart_happen_time(currDay);
-        reqParams.setEnd_happen_time(currDay);
+//        String currDay = DateUtil.format(DateUtil.offsetDay(new Date(), -1), "yyyy-MM-dd");
+//        reqParams.setStart_happen_time(currDay);
+//        reqParams.setEnd_happen_time(currDay);
         BaseResponse<BaseResponseListObj<RecordMaterielList>> api$system$out_stock$get_record_materiel_list = ShRequester.getApi$system$out_stock$get_record_materiel_list(reqParams);
         List<RecordMaterielList> list = api$system$out_stock$get_record_materiel_list.getData().getList();
+        String end = reqParams.getEnd_happen_time() + " 23:59:59";
+        baseMapper.delete(new QueryWrapper<OutStock>().ge("happen_time",reqParams.getStart_happen_time()).le("happen_time",end));
+        pushOutStockDataService.remove(new QueryWrapper<PushOutStockData>().ge("happen_time",reqParams.getStart_happen_time()).le("happen_time",end));
         for (RecordMaterielList recordMaterielList : list) {
             OutStock outStock = new OutStock();
             BeanUtil.copyProperties(recordMaterielList,outStock);
@@ -79,6 +83,7 @@ public class OutStockService extends ServiceImpl<OutStockMapper, OutStock> {
                 }
             }
         }
+        InStockService.compareWa(map);
         try {
             exportExcel(map,1);
         }catch (Exception e){
@@ -208,6 +213,7 @@ public class OutStockService extends ServiceImpl<OutStockMapper, OutStock> {
         for (int i = 0; i < listMap1.size(); i++) {
             //创建list.size()行数据
             rowh = stuSheet1.createRow(i + 4);
+            rowh.setHeightInPoints(25);
             //把值一一写进单元格里
             //设置第一列为自动递增的序号
             cell2h = rowh.createCell(0);
@@ -228,6 +234,7 @@ public class OutStockService extends ServiceImpl<OutStockMapper, OutStock> {
         }
         font.setFontHeightInPoints((short) 14);
         Row row1h = stuSheet1.createRow(listMap1.size()+4);
+        row1h.setHeightInPoints(25);
         CellStyle style111 = wb.createCellStyle();
         style111.setVerticalAlignment(VerticalAlignment.CENTER);  //设置垂直对齐方式
         style111.setAlignment(HorizontalAlignment.CENTER);
@@ -255,7 +262,12 @@ public class OutStockService extends ServiceImpl<OutStockMapper, OutStock> {
 
         for (Map.Entry<String, List<Object>> stringListEntry : map1.entrySet()) {
             //标题行抽出字段
-            String[] head = {"质物名称","规格(型号)","生产厂家(产地)","数量","重量","质权人确认的单价","核算的价值","货位号","备注"};
+            String[] head;
+            if (state == 1){
+                head = new String[]{"序号","产品名称","规格","数量","单价/元","金额/元","产品厂家","仓库地点","到达地点","出库车牌号","时间","备注"};
+            }else {
+                head = new String[]{"序号","产品名称","规格","数量","单价/元","金额/元","产品厂家","仓库地点","入库车牌号","时间","备注"};
+            }
             //设置sheet名称，并创建新的sheet对象
             Sheet stuSheet = wb.createSheet(stringListEntry.getKey());
             //合并单元格 设置表头信息
@@ -328,40 +340,66 @@ public class OutStockService extends ServiceImpl<OutStockMapper, OutStock> {
                 }
                 //创建list.size()行数据
                 row = stuSheet.createRow(i + 4);
+                row.setHeightInPoints(25);
                 //把值一一写进单元格里
                 //设置第一列为自动递增的序号
                 cell2 = row.createCell(0);
-                cell2.setCellValue(recordMaterielList == null ? inStockGetRecordMaterielList.getMateriel_group_text() : recordMaterielList.getMateriel_group_text());
                 cell2.setCellStyle(dataStyle);
+                cell2.setCellValue(i+1);
                 cell2 = row.createCell(1);
-                cell2.setCellValue(recordMaterielList == null ? inStockGetRecordMaterielList.getMateriel_name() : recordMaterielList.getMateriel_name());
-                numCount+=Integer.parseInt(recordMaterielList == null ? inStockGetRecordMaterielList.getNum() : recordMaterielList.getNum());
+                cell2.setCellValue(recordMaterielList == null ? inStockGetRecordMaterielList.getMateriel_group_text() : recordMaterielList.getMateriel_group_text());
                 cell2.setCellStyle(dataStyle);
                 cell2 = row.createCell(2);
-                cell2.setCellValue(recordMaterielList == null ? inStockGetRecordMaterielList.getSource_name() : recordMaterielList.getSource_name());
+                cell2.setCellValue(recordMaterielList == null ? inStockGetRecordMaterielList.getMateriel_name() : recordMaterielList.getMateriel_name());
+                numCount+=Integer.parseInt(recordMaterielList == null ? inStockGetRecordMaterielList.getNum() : recordMaterielList.getNum());
                 cell2.setCellStyle(dataStyle);
                 cell2 = row.createCell(3);
                 cell2.setCellValue(recordMaterielList == null ? inStockGetRecordMaterielList.getNum() : recordMaterielList.getNum());
                 cell2.setCellStyle(dataStyle);
                 cell2 = row.createCell(4);
-                cell2.setCellValue("");
-                cell2.setCellStyle(dataStyle);
-                cell2 = row.createCell(5);
                 cell2.setCellValue(recordMaterielList == null ? inStockGetRecordMaterielList.getPrice() : recordMaterielList.getPrice());
                 cell2.setCellStyle(dataStyle);
-                cell2 = row.createCell(6);
                 Double price = Double.parseDouble(recordMaterielList == null ? inStockGetRecordMaterielList.getPrice() : recordMaterielList.getPrice()) * Integer.parseInt(recordMaterielList == null ? inStockGetRecordMaterielList.getNum() : recordMaterielList.getNum());
                 if (price == null){
                     price = 0.0;
                 }
+                cell2 = row.createCell(5);
                 cell2.setCellValue(price);
                 cell2.setCellStyle(dataStyle);
-                cell2 = row.createCell(7);
-                cell2.setCellValue("");
-                cell2.setCellStyle(dataStyle);
-                cell2 = row.createCell(8);
-                cell2.setCellValue("");
+                cell2 = row.createCell(6);
+                cell2.setCellValue(recordMaterielList == null ? inStockGetRecordMaterielList.getBrand_name() : recordMaterielList.getBrand_name());
                 cell2.setCellStyle(dataStyle);
+
+                if (state == 1){
+                    cell2 = row.createCell(7);
+                    cell2.setCellValue(recordMaterielList.getStorehouse_name());
+                    cell2.setCellStyle(dataStyle);
+                    cell2 = row.createCell(8);
+                    cell2.setCellValue(recordMaterielList.getSource_name());
+                    cell2.setCellStyle(dataStyle);
+                    cell2 = row.createCell(9);
+                    cell2.setCellValue("");
+                    cell2.setCellStyle(dataStyle);
+                    cell2 = row.createCell(10);
+                    cell2.setCellValue(recordMaterielList.getHappen_time());
+                    cell2.setCellStyle(dataStyle);
+                    cell2 = row.createCell(11);
+                    cell2.setCellValue("");
+                    cell2.setCellStyle(dataStyle);
+                }else {
+                    cell2 = row.createCell(7);
+                    cell2.setCellValue(inStockGetRecordMaterielList.getStorehouse_name());
+                    cell2.setCellStyle(dataStyle);
+                    cell2 = row.createCell(8);
+                    cell2.setCellValue("");
+                    cell2.setCellStyle(dataStyle);
+                    cell2 = row.createCell(9);
+                    cell2.setCellValue(inStockGetRecordMaterielList.getHappen_time());
+                    cell2.setCellStyle(dataStyle);
+                    cell2 = row.createCell(10);
+                    cell2.setCellValue("");
+                    cell2.setCellStyle(dataStyle);
+                }
                 count+=price;
             }
 
@@ -377,26 +415,58 @@ public class OutStockService extends ServiceImpl<OutStockMapper, OutStock> {
             style11.setBorderRight(BorderStyle.THIN);//右边框
             style11.setFont(fontq);
             Cell cell11a = row1.createCell(0);
+            row1.setHeightInPoints(25);
             cell11a.setCellStyle(style11);
             cell11a.setCellValue("合计");
-            cell11a = row1.createCell(3);
-            cell11a.setCellStyle(style11);
-            cell11a.setCellValue(numCount);
-            cell11a = row1.createCell(6);
-            cell11a.setCellStyle(style11);
-            cell11a.setCellValue(count);
-            cell11a = row1.createCell(1);
-            cell11a.setCellStyle(style11);
-            cell11a = row1.createCell(2);
-            cell11a.setCellStyle(style11);
-            cell11a = row1.createCell(4);
-            cell11a.setCellStyle(style11);
-            cell11a = row1.createCell(5);
-            cell11a.setCellStyle(style11);
-            cell11a = row1.createCell(7);
-            cell11a.setCellStyle(style11);
-            cell11a = row1.createCell(8);
-            cell11a.setCellStyle(style11);
+            if (state == 1){
+                cell11a = row1.createCell(3);
+                cell11a.setCellStyle(style11);
+                cell11a.setCellValue(numCount);
+                cell11a = row1.createCell(5);
+                cell11a.setCellStyle(style11);
+                cell11a.setCellValue(count);
+                cell11a = row1.createCell(1);
+                cell11a.setCellStyle(style11);
+                cell11a = row1.createCell(2);
+                cell11a.setCellStyle(style11);
+                cell11a = row1.createCell(4);
+                cell11a.setCellStyle(style11);
+                cell11a = row1.createCell(6);
+                cell11a.setCellStyle(style11);
+                cell11a = row1.createCell(7);
+                cell11a.setCellStyle(style11);
+                cell11a = row1.createCell(8);
+                cell11a.setCellStyle(style11);
+                cell11a = row1.createCell(9);
+                cell11a.setCellStyle(style11);
+                cell11a = row1.createCell(10);
+                cell11a.setCellStyle(style11);
+                cell11a = row1.createCell(11);
+                cell11a.setCellStyle(style11);
+            }else {
+                cell11a = row1.createCell(3);
+                cell11a.setCellStyle(style11);
+                cell11a.setCellValue(numCount);
+                cell11a = row1.createCell(5);
+                cell11a.setCellStyle(style11);
+                cell11a.setCellValue(count);
+                cell11a = row1.createCell(1);
+                cell11a.setCellStyle(style11);
+                cell11a = row1.createCell(2);
+                cell11a.setCellStyle(style11);
+                cell11a = row1.createCell(4);
+                cell11a.setCellStyle(style11);
+                cell11a = row1.createCell(6);
+                cell11a.setCellStyle(style11);
+                cell11a = row1.createCell(7);
+                cell11a.setCellStyle(style11);
+                cell11a = row1.createCell(8);
+                cell11a.setCellStyle(style11);
+                cell11a = row1.createCell(9);
+                cell11a.setCellStyle(style11);
+                cell11a = row1.createCell(10);
+                cell11a.setCellStyle(style11);
+            }
             //设置单元格宽度自适应，在此基础上把宽度调至1.5倍
             for (int i = 0; i < head.length; i++) {
                 stuSheet.autoSizeColumn(i, true);
@@ -410,9 +480,9 @@ public class OutStockService extends ServiceImpl<OutStockMapper, OutStock> {
         //设置文件名
         String fileName = null;
         if (state == 0) {
-            fileName = "货物入库质押表" + sdf.format(new Date()) + ".xlsx";
+            fileName = "8月货物入库质押表" + sdf.format(new Date()) + ".xlsx";
         }else {
-            fileName = "质物解除质押出库表" + sdf.format(new Date()) + ".xlsx";
+            fileName = "8月质物解除质押出库表" + sdf.format(new Date()) + ".xlsx";
         }
 
         String savePath = filePath + File.separator + fileName;
diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/ShRequester.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/ShRequester.java
index a4b6324..2db190a 100644
--- a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/ShRequester.java
+++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/ShRequester.java
@@ -263,10 +263,11 @@ public class ShRequester {
     public static BaseResponse<BaseResponseListObj<RecordMaterielList>> getApi$system$out_stock$get_record_materiel_list(Out_stockGetRecordMaterielList reqParams){
         BaseResponse<BaseResponseListObj<RecordMaterielList>> req = new BaseResponse<>();
         BaseResponseListObj<RecordMaterielList> reqObj = new BaseResponseListObj<>();
-        Map<String, Object> param = new HashMap<>();
+        Map<String, Object> param;
         if (reqParams.getPage() != null){
             param = BeanUtil.beanToMap(reqParams);
         }else {
+            param = BeanUtil.beanToMap(reqParams);
             param.put("page",1);
             param.put("limit",2000);
         }
@@ -377,10 +378,11 @@ public class ShRequester {
     public static BaseResponse<BaseResponseListObj<InStockGetRecordMaterielList>> getApi$system$in_stock$get_record_materiel_list(In_stockGetRecordMaterielList reqParams){
         BaseResponse<BaseResponseListObj<InStockGetRecordMaterielList>> req = new BaseResponse<>();
         BaseResponseListObj<InStockGetRecordMaterielList> reqObj = new BaseResponseListObj<>();
-        Map<String, Object> param = new HashMap<>();
+        Map<String, Object> param;
         if (reqParams.getPage() != null){
             param = BeanUtil.beanToMap(reqParams);
         }else {
+            param = BeanUtil.beanToMap(reqParams);
             param.put("page",1);
             param.put("limit",2000);
         }
diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/In_stockGetRecordMaterielList.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/In_stockGetRecordMaterielList.java
index 05d1c76..6e6ce57 100644
--- a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/In_stockGetRecordMaterielList.java
+++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/In_stockGetRecordMaterielList.java
@@ -17,7 +17,7 @@ public class In_stockGetRecordMaterielList {
     private String batch_number;
     @ApiModelProperty("开始时间")
     private String start_happen_time;
-    @ApiModelProperty("解决时间")
+    @ApiModelProperty("结束时间")
     private String end_happen_time;
     @ApiModelProperty("物料编码")
     private String materiel_no;