diff --git a/docs/databases/table_create_rms.sql b/docs/databases/table_create_rms.sql
index 7a69f8be..52a4746e 100644
--- a/docs/databases/table_create_rms.sql
+++ b/docs/databases/table_create_rms.sql
@@ -228,4 +228,24 @@ CREATE TABLE `push_information`  (
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 12 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '推送人员表' ROW_FORMAT = Dynamic;
 
+SET FOREIGN_KEY_CHECKS = 1;
+
+DROP TABLE IF EXISTS `risk_index`;
+CREATE TABLE `risk_index`  (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'id',
+  `sid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'sid',
+  `createTime` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '记录创建时间',
+  `remarks` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注信息',
+  `code` 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 '名称',
+  `content` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '指标说明',
+  `levelSid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '风险等级(程度)Sid',
+  `levelCode` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '风险等级(程度)代码',
+  `levelName` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '风险等级(程度)名称',
+  `typeSid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '风险类别Sid',
+  `typeCode` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '风险类别代码',
+  `typeName` varchar(100) 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;
+
 SET FOREIGN_KEY_CHECKS = 1;
\ No newline at end of file
diff --git a/supervise-customer-ui/src/layout/index.vue b/supervise-customer-ui/src/layout/index.vue
index 8b7511b3..83ac505f 100644
--- a/supervise-customer-ui/src/layout/index.vue
+++ b/supervise-customer-ui/src/layout/index.vue
@@ -11,7 +11,7 @@
     <div class="main-container">
       <div class="home-box">
         <a href="javascript:window.opener=null;window.open('','_self');window.close();" class="text-center">平台首页</a>
-        <a href="javascript:void(0);" class="text-center">客户中心</a>
+        <a href="javascript:void(0);" class="text-center">企业中心</a>
       </div>
       <sidebar class="sidebar-container" />
       <!--菜单-->
diff --git a/supervise-customer-ui/src/views/daydataupload/gdinventory/index.vue b/supervise-customer-ui/src/views/daydataupload/gdinventory/index.vue
index 75b192c7..974437da 100644
--- a/supervise-customer-ui/src/views/daydataupload/gdinventory/index.vue
+++ b/supervise-customer-ui/src/views/daydataupload/gdinventory/index.vue
@@ -20,7 +20,7 @@
       </div>
       <!-- Start 项目列表头部 -->
       <div class="listtop">
-        <div class="tit">库存信息导入日志列表</div>
+        <div class="tit"></div>
         <pageye v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
       </div>
       <!-- End 项目列表头部 -->
diff --git a/supervise-risk-ui/src/api/Risk/riskIndex.js b/supervise-risk-ui/src/api/Risk/riskIndex.js
new file mode 100644
index 00000000..5da6aee8
--- /dev/null
+++ b/supervise-risk-ui/src/api/Risk/riskIndex.js
@@ -0,0 +1,61 @@
+import request from '@/utils/request'
+// 汇总工单数据
+export default {
+
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+      url: '/v1/riskBlackList/listPage',
+      method: 'post',
+      data: params
+    })
+  },
+  // 保存新增记录
+  saveRiskBlackList: function(params) {
+    return request({
+      url: '/v1/riskBlackList/saveRiskBlackList  ',
+      method: 'post',
+      data: params
+    })
+  },
+ // 查询记录列表
+ riskAlarmTreatmentListPage: function(params) {
+   return request({
+     url: '/v1/riskAlarmTreatment/listPage',
+     method: 'post',
+     data: params
+   })
+ },
+   // 通过sid删除一条或多条记录
+   delBySids: function(sid) {
+    return request({
+        url: '/v1/riskBlackList/del/' + sid,
+        method: 'get',
+      })
+  },
+
+   // 保存新增监控指标
+   saveRiskIndicator: function(params) {
+    return request({
+      url: '/v1/riskIndex/saveRiskIndex',
+      method: 'post',
+      data: params
+    })
+  },
+   // 查询监控指标列表
+   riskIndexListPage: function(params) {
+    return request({
+      url: '/v1/riskIndex/listPage',
+      method: 'post',
+      data: params
+    })
+  },
+     // 通过sid删除一条或多条记录
+     riskIndexDel: function(sid) {
+        return request({
+            url: '/v1/riskIndex/del/' + sid,
+            method: 'get',
+          })
+      },
+    
+}
diff --git a/supervise-risk-ui/src/layout/components/Sidebar/index.vue b/supervise-risk-ui/src/layout/components/Sidebar/index.vue
index c6cd22c8..5bedc8f2 100644
--- a/supervise-risk-ui/src/layout/components/Sidebar/index.vue
+++ b/supervise-risk-ui/src/layout/components/Sidebar/index.vue
@@ -91,10 +91,30 @@
             component: "riskCljl",
             meta: {
               icon: "el-icon-menu",
-              title: "报警消息记录",
+              title: "报警处理记录",
             },
             name: "/riskCljl/index",
             path: "/riskCljl/index",
+          },
+          {
+            alwaysShow: true,
+            component: "riskBlack",
+            meta: {
+              icon: "el-icon-menu",
+              title: "异常企业",
+            },
+            name: "/addRiskBlack/index",
+            path: "/addRiskBlack/index",
+          },
+          {
+            alwaysShow: true,
+            component: "riskJkzb",
+            meta: {
+              icon: "el-icon-menu",
+              title: "监控指标",
+            },
+            name: "/riskJkzb/index",
+            path: "/riskJkzb/index",
           }
         ],
         params: {
diff --git a/supervise-risk-ui/src/router/modules/codemenu.js b/supervise-risk-ui/src/router/modules/codemenu.js
index 64080523..13bba240 100644
--- a/supervise-risk-ui/src/router/modules/codemenu.js
+++ b/supervise-risk-ui/src/router/modules/codemenu.js
@@ -125,14 +125,46 @@ const codemenu = [{
   component: Layout,
   redirect: '/riskCljl/index',
   meta: {
-    title: '报警消息记录'
+    title: '报警处理记录'
   },
   children: [{
     path: '/riskCljl/index',
     component: () => import('@/views/risk/riskCljl.vue'),
     name: 'riskCljl',
     meta: {
-      title: '报警消息记录',
+      title: '报警处理记录',
+      noCache: true
+    }
+  }]
+},{
+  path: '/riskBlack',
+  component: Layout,
+  redirect: '/addRiskBlack/index',
+  meta: {
+    title: '异常企业'
+  },
+  children: [{
+    path: '/addRiskBlack/index',
+    component: () => import('@/views/risk/addRiskBlack.vue'),
+    name: 'riskBlack',
+    meta: {
+      title: '异常企业',
+      noCache: true
+    }
+  }]
+},{
+  path: '/riskJkzb',
+  component: Layout,
+  redirect: '/riskJkzb/index',
+  meta: {
+    title: '监控指标'
+  },
+  children: [{
+    path: '/riskJkzb/index',
+    component: () => import('@/views/risk/RIskJkzb/riskJkzb.vue'),
+    name: 'riskJkzb',
+    meta: {
+      title: '监控指标',
       noCache: true
     }
   }]
diff --git a/supervise-risk-ui/src/views/risk/RIskJkzb/addJkzb.vue b/supervise-risk-ui/src/views/risk/RIskJkzb/addJkzb.vue
new file mode 100644
index 00000000..6cbcbec3
--- /dev/null
+++ b/supervise-risk-ui/src/views/risk/RIskJkzb/addJkzb.vue
@@ -0,0 +1,316 @@
+<template>
+	<div>
+		<!-- 标题按钮部分开始 -->
+		<div class="tab-header webtop">
+			<!-- 标题 -->
+			<div>{{ viewTitle }}</div>
+			<!-- start 添加修改按钮 -->
+			<div>
+				<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
+				<el-button type="info" size="small" @click="handleReturn()">返回</el-button>
+			</div>
+			<!-- end 添加修改按钮 -->
+			<!-- end 详情按钮 -->
+		</div>
+		<!-- 标题按钮部分结束 -->
+		<!-- Start 新增修改部分 -->
+		<div class="listconadd">
+			<el-form ref="form_obj">
+			<el-card class="box-card">
+			 <div class="wlInfo"><span>监控指标</span></div>
+             <div class="item">
+                <span class="item_text">编号：</span>
+				<el-input v-model="formobj.code" placeholder="类别编号" class="item_input" clearable />
+              </div>
+			  <div class="item">
+                <span class="item_text">指标名称：</span>
+                <el-input v-model="formobj.name" placeholder="指标名称" class="item_input" clearable />
+              </div>
+			  <div class="item"  >
+                <span class="item_text">风险程度：</span>
+                <el-select
+                    v-model="formobj.levelName"
+                    class="item_input"
+                    placeholder="请选择风险等级名称"
+					          @change="getType"
+                  >
+                    <el-option
+                      v-for="(item, i) in arrList"
+                      :key="i"
+                      :label="item.name"
+                      :value="item.sid"
+                    />
+                </el-select>
+              </div>
+			    <div class="item"  >
+                <span class="item_text">风险类别：</span>
+                <el-cascader ref="cascaderAddr" :options="options" :props="optionProps" v-model="selectedOptions" :show-all-levels="false" @change="handleChange3" class="item_input"></el-cascader>
+              </div>
+              <div class="item">
+                <span class="item_text">指标说明：</span>
+				     <el-input v-model="formobj.content" placeholder="分类说明" class="item_input" clearable />
+              </div>
+              <div class="item" style="height: 110px;">
+                <span class="item_text">备注信息：</span>
+                <el-input  type="textarea"
+                  :autosize="{ minRows: 4, maxRows: 6 }" v-model="formobj.remarks"  class="item_input" placeholder="备注信息" />
+              </div>
+			</el-card>
+		</el-form>
+		</div>
+		<!-- End 添加修改部分 -->
+	</div>
+</template>
+
+<script>
+import req from '@/api/Risk/index.js'
+import req2 from '@/api/Risk/riskIndex'
+export default {
+	name: 'DispatchStandardsAdd',
+	data() {
+		return {
+			submitdisabled: false,
+			viewTitle: '',
+			viewState: 1,
+			arrLists: [],
+			arrList: [],
+			rangeArr: [],
+			option: [],
+			options: [],
+			hierarchys: false,
+			formobj: {
+				name: '', 
+				code: '', 
+				content: '', 
+				levelSid: '', 
+                levelCode: '', 
+				levelName: '', 
+				typeCode:'',
+				typeName:'',
+				typeSid:'',
+                remarks:'',
+			},
+			rules: {
+				name: [{ required: true, message: '风险等级名称不能为空', trigger: 'blur' }],
+				code: [{ required: true, message: '风险等级代码不能为空', trigger: 'blur' }], 
+				content: [{ required: true, message: '分类说明不能为空', trigger: 'blur' }], 
+				reportTarget: [{ required: true, message: '报送单位不能为空', trigger: 'blur' }], 
+			},
+      optionProps: {
+				value: 'code',
+				label: 'name',
+				children: 'down',
+				expandTrigger: 'hover',
+			},
+       selectedOptions: [], //配送选择值
+		}
+	},
+	created() {
+        this.superior()
+        this.selectTypes()
+    },
+	methods: {
+		handleReturn(isreload) {
+			if (isreload === 'true') this.$emit('reloadlist')
+			this.formobj.sid = '' 
+			this.formobj.name= '', 
+			this.formobj.code= '', 
+			this.formobj.content= '', 
+			this.formobj.levelSid= '', 
+			this.formobj.levelCode= ''
+			this.formobj.levelName= ''
+			this.formobj.typeCode='',
+            this.formobj.typeName='',
+            this.formobj.typeSid='',
+            this.formobj.remarks='',
+            this.formobj.reportTarget='',
+            this.selectedOptions=[],
+			
+			this.$refs['form_obj'].resetFields()
+			this.$emit('doback')
+		},
+		showAdd() {
+			this.$nextTick(() => {
+				this.$refs['form_obj'].clearValidate()
+			})
+			this.viewTitle = '【新增】监控指标'
+			this.hierarchys= false
+		},
+		showEdit(row) {
+			this.$nextTick(() => {
+				this.$refs['form_obj'].clearValidate()
+			})
+			this.viewTitle = '【修改】监控指标'
+			this.hierarchys= true
+			const _this = this
+			const vdata = row
+			_this.formobj.id = vdata.id
+			_this.formobj.sid = vdata.sid 
+			_this.formobj.name = vdata.name 
+			_this.formobj.code = vdata.code 
+			_this.formobj.content = vdata.content 
+			_this.formobj.levelName = vdata.levelName 
+			_this.formobj.levelSid = vdata.levelSid 
+			_this.formobj.levelCode = vdata.levelCode 
+			_this.formobj.typeName = vdata.typeName
+			_this.formobj.typeSid = vdata.typeSid
+			_this.formobj.typeCode = vdata.typeCode 
+			_this.formobj.reportTarget = vdata.reportTarget 
+			_this.formobj.remarks = vdata.remarks
+		},
+    getParentsById(list, id) {
+      for (let i in list) {
+        if (list[i].no == id) {//这里的no根据你的需求可进行改变
+          //查询到就返回该数组对象的value
+          return [list[i].no];
+        }
+        if (list[i].children) {
+          let node = this.getParentsById(list[i].children, id);
+          if (node !== undefined) {
+            //查询到把父节把父节点加到数组前面
+            node.unshift(list[i].no);
+            return node;
+          }
+        }
+      }
+    },
+	saveOrUpdate() {
+      if(this.formobj.reportTarget==='监管公司'){
+        this.formobj.reportTarget===1
+      }else if(this.formobj.reportTarget==='贷款支行'){
+        this.formobj.reportTarget===2
+      }else{
+        this.formobj.reportTarget===3
+      }
+      req2
+			.saveRiskIndicator(this.formobj)
+				.then(resp => {
+					if (resp.success) {
+						this.$message({ showClose: true, type: 'success', message: resp.msg })
+						this.handleReturn('true')
+					} else {
+						// 根据resp.code进行异常情况处理
+					}
+				})
+				.catch(() => {
+			})
+		},
+    superior(){
+            req
+			.selectRiskLevel()
+				.then(resp => {
+          if(resp.code==200){
+            this.arrLists=resp.data					
+						for (var i = 0; i < this.arrLists.length; i++) {
+
+            let item = {
+              name: this.arrLists[i].name,
+              sid: this.arrLists[i].sid,
+            
+            }
+            this.arrList.push(item)
+            }
+           }
+			})
+        },
+        selectTypes(){
+            req
+			.selectType()
+				.then(resp => {
+          if(resp.code==200){
+          this.options=resp.data
+         }
+			})
+        },
+		getType(value) {
+        const choose = this.arrLists.filter((item) => item.sid === value)
+        this.formobj.levelSid = value
+        this.formobj.levelCode = choose[0].code
+        this.formobj.levelName = choose[0].name
+      },
+      handleChange3(value) {
+      var getSId = this.$refs.cascaderAddr.getCheckedNodes()[0].data.sid
+      this.formobj.typeSid=getSId
+			var thsAreaCode = this.$refs.cascaderAddr.getCheckedNodes()[0].pathLabels;  //注意2： 获取label值
+			var len=value.length-1;
+			var lens=thsAreaCode.length-1;
+			this.formobj.typeCode=value[len];//这是最终修改后的要提交的选中后的数据值
+			this.formobj.typeName=thsAreaCode[lens];//这是最终修改后的要提交的选中后的数据值
+			this.$refs.cascaderAddr.toggleDropDownVisible();// 选择之后将下拉界面收起
+	},
+	},
+    watch: {
+        selectedOptions() {
+          if (this.$refs.cascaderAddr) {
+            this.$refs.cascaderAddr.dropDownVisible = false;
+            console.log(this.$refs.cascaderAddr,'cascader')
+          }
+        }
+      },
+}
+</script>
+
+<style lang="scss">
+  .box-card {
+    margin-left: 60px;
+    margin-right: 60px;
+    min-width: 70%;
+    margin-top: 20px;
+    padding-bottom: 50px;
+
+    .item {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      margin-top: 15px;
+      height: 40px;
+      line-height: 40px;
+
+      .item_text {
+        flex: 0.8;
+        font-size: 18px;
+        text-align: right;
+      }
+
+      .item_input {
+        flex: 4;
+        font-size: 16px;
+        margin-left: 10px;
+        margin-right: 80px;
+      }
+
+      .item_left_input {
+        width: 20%;
+      }
+
+      .item_left_text {
+        height: 30px;
+        margin-left: 20px;
+        line-height: 30px;
+        color: #018AD2;
+        padding: 0px 15px;
+        border: 1.5px solid #018AD2;
+        border-radius: 5px;
+
+      }
+
+      .item_right {
+        flex: 1;
+        justify-items: center;
+
+        .item_right_list_text {
+          font-size: 16px;
+        }
+
+        .item_right_list_delect {
+          color: #5E94FF;
+          margin-left: 20px;
+          font-size: 16px;
+          text-decoration: underline;
+        }
+      }
+
+    }
+
+  }
+</style>
diff --git a/supervise-risk-ui/src/views/risk/RIskJkzb/riskJkzb.vue b/supervise-risk-ui/src/views/risk/RIskJkzb/riskJkzb.vue
new file mode 100644
index 00000000..90192597
--- /dev/null
+++ b/supervise-risk-ui/src/views/risk/RIskJkzb/riskJkzb.vue
@@ -0,0 +1,289 @@
+<template>
+	<div class="app-container">
+		<div v-show="viewState == 1">
+			<button-bar ref="btnbar" view-title="监控指标" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+			<div class="main-content">
+			<div class="searchcon">
+				<el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">{{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}</el-button>
+				<div v-show="isSearchShow" class="search">
+					<el-form ref="queryParams" :model="queryParams.params"  :inline="true" class="tab-header">
+						<el-form-item label="客户名称"><el-input v-model="queryParams.params.custname" placeholder="请输入客户名称" clearable /></el-form-item>
+						<el-form-item label="工单名称"><el-input v-model="queryParams.params.ordername" placeholder="请输入工单名称" clearable /></el-form-item>
+						<div class="btn" style="text-align: center;">
+							<el-button type="primary" size="small" icon="el-icon-search"  @click="dosearch">查询</el-button>
+							<el-button type="primary" size="small" icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
+						</div>
+					</el-form>
+				</div>
+			</div>
+			<!-- Start 项目列表头部 -->
+			<div class="listtop">
+				<div class="tit">监控指标列表</div>
+				<pageye v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
+			</div>
+			<!-- End 项目列表头部 -->
+
+			<!-- Start 项目列表 -->
+			<div>
+				<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" >
+					<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center" />
+					<el-table-column prop="name" label="指标名称" align="center" />
+					<el-table-column prop="code" label="指标编码" align="center" />
+					<el-table-column prop="levelName" label="风险等级" align="center" />
+					<el-table-column prop="bigTypeName" label="风险类别" align="center" />
+					<el-table-column prop="typeName" label="风险小类" align="center" />
+					<el-table-column prop="content" label="指标说明" align="center" />
+					<!-- <el-table-column prop="hierarchy" :formatter="formatorderdegree"  label="层级" align="center" /> -->
+          <el-table-column prop="remarks" label="备注信息" align="center" />
+					<el-table-column fixed="right" label="操作"  align="center">
+                        <template slot-scope="scope">
+						   <el-tooltip class="item" effect="dark" content="编辑" placement="top-end">
+								<i  class="el-icon-edit-outline"  @click="toEdit(scope.row)"></i>
+                           </el-tooltip>
+						   <el-tooltip class="item" effect="dark" content="删除" placement="top">
+							<i  class="el-icon-delete"  @click="doDel(scope.row)"></i>
+                           </el-tooltip>
+               </template>
+             </el-table-column>
+				</el-table>
+			</div>
+			<!-- End 项目列表 -->   
+			<div class="pages">
+				<div class="tit" />
+				<!--  翻页  -->
+				<pagination
+					v-show="dataList.length > 0"
+					:total="queryParams.total"
+					:page.sync="queryParams.current"
+					:limit.sync="queryParams.size"
+					class="pagination"
+					@pagination="loadList"
+				/>
+			</div>
+		</div>
+		</div>
+		<!-- End 查询和其列表部分 -->
+		<el-dialog
+          title="二级类别信息"
+          :visible.sync="drawer"
+          width="65%">
+		  <el-table v-loading="listLoading" :data="formobj" border style="width: 100%;"
+                :row-style="{height: '40px'}">
+                <!-- <el-table-column type="selection" align="center" width="50"/> -->
+                <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
+                <el-table-column label="类别名称" width="120" prop="name" align="center" />
+                <el-table-column label="类别编号" width="160" prop="code" align="center" />
+                <el-table-column label="分类说明"  prop="content" align="center" />
+                <el-table-column label="层级" width="70" :formatter="formatorderdegree" prop="hierarchy" align="center" />
+                <el-table-column label="备注信息" width="200" prop="remarks" align="center" />
+				<el-table-column label="操作" wid align="center" width="200">
+                  <template slot-scope="scope">
+                    <!-- <el-button type="primary" size="mini" @click="toPersonnelDetail(scope.row.sid)">查看</el-button> -->
+                    <el-button type="primary" size="mini" @click="toEdit(scope.row)">编辑</el-button>
+                    <el-button type="primary" size="mini" @click="doCommoditylDel(scope.row)">删除</el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+
+        </el-dialog>
+		<!-- 新增修改部分组件 -->
+		<div-add v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
+	</div>
+</template>
+
+<script>
+import req from '@/api/Risk/riskIndex'
+import ButtonBar from '@/components/ButtonBar'
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import divAdd from './addJkzb'
+
+export default {
+	name: 'DispatchOrderinfoIndex',
+	components: {
+		ButtonBar,
+		Pagination,
+		pageye,
+		divAdd,
+	},
+	data() {
+		return {
+			btndisabled: false,
+			viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+			isSearchShow: false,
+			tableLoading: false,
+			drawer: false,
+			listLoading: false,
+			dataList: [],
+			queryParams: {
+				current: 1,
+				size: 10,
+				total: 0,
+				params: {
+                    
+				}
+			},
+			multipleSelection: [],
+			btnList: [
+                 {
+                  type: 'primary',
+                  size: 'small',
+                  icon: 'plus',
+                  btnKey: 'toAdd',
+                  btnLabel: '新增'
+                },
+                {
+                  type: 'info',
+                  size: 'small',
+                  icon: 'cross',
+                  btnKey: 'doClose',
+                  btnLabel: '关闭'
+                }
+              ],
+			size:'',
+			TableList:[],
+			formobj:[]
+		}
+	},
+	mounted() {
+      // 初始化按钮
+      this.$refs['btnbar'].setButtonList(this.btnList)
+    },
+	created() {
+		this.loadList()
+	},
+	methods: {
+		resetState() {
+			this.viewState = 1
+		},
+		btnHandle(btnKey) {
+			switch (btnKey) {
+				case 'toAdd':
+					this.toAdd()
+					break
+			   case 'doClose': // 关闭
+         this.doClose()
+         break
+				default:
+					break
+			}
+		},
+		toAdd() {
+			this.viewState = 2
+			this.$refs['divadd'].showAdd()
+		},
+		toEdit(row) {
+			this.viewState = 3
+			this.$refs['divadd'].showEdit(row)
+			this.drawer=false
+		},
+		doDel(row) {
+			const sids = []
+		    sids.push(row.sid)
+			const tip = '请确认是否是否删除该条记录?'
+			this.$confirm(tip, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			})
+				.then(() => {
+					req
+						.riskIndexDel(sids)
+						.then(resp => {
+							if (resp.success) {
+								this.$message({ type: 'success', message: resp.msg, showClose: true })
+								this.loadList()
+							} else {
+								// 根据resp.code进行异常情况处理
+							}
+						})
+				})
+				.catch(() => {})
+		},
+		dosearch() {
+			this.queryParams.current = 1
+			this.loadList()
+		},
+		resetQuery() {
+			this.queryParams.params = {}
+			this.queryParams.params.sid = '' // sid
+			this.queryParams.params.name = '' // 登录名
+			this.dosearch()
+		},
+		loadList() {
+			const _this = this
+			this.tableLoading = true
+			req
+				.riskIndexListPage(this.queryParams)
+				.then(resp => {
+					_this.tableLoading = false
+					if (resp.success) { 
+						const data = resp.data
+						_this.queryParams.total = data.total
+						_this.dataList = data.records
+					} else {
+						// 根据resp.code进行异常情况处理
+					}
+				})
+				.catch(() => {
+					_this.tableLoading = false
+				})
+		},
+		// 序号
+		indexMethod(index) {
+			var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+			var pageindex = index + 1 + pagestart
+			return pageindex
+		},
+		doClose() {
+        this.$store.dispatch('tagsView/delView', this.$route)
+        this.$router.go(-1)
+        },
+		purchase(row){	
+			this.drawer=true
+			req
+				.selectRiskTypeSubordinate(row.sid)
+				.then(resp => {
+					this.listLoading = false
+					if (resp.code==200) { 
+						this.formobj=resp.data
+					} else {
+						// 根据resp.code进行异常情况处理
+					}
+				})
+				.catch(() => {
+					this.listLoading = false
+				})
+		},
+        formatorderdegree: function( row, column) {
+         if(row.hierarchy === 1){
+             return '一级'
+         }else if(row.hierarchy === 2) {
+			return '二级'
+		 }else{
+			return ''
+		 }
+        },
+		doCommoditylDel(row){
+			req
+				.delriskType(row.sid)
+				.then(resp => {
+					if (resp.code==200) {
+						this.$message({ type: 'success', message: resp.msg, showClose: true })
+						this.drawer=false
+					} else {
+						// 根据resp.code进行异常情况处理
+					}
+				})
+		},
+	}
+}
+</script>
+<style scoped>
+.margin-top {
+  border-bottom: 1px solid #ebebeb;
+}
+.item {
+   margin: 6px;
+ }
+</style>
diff --git a/supervise-risk-ui/src/views/risk/RiskManage/RiskAdd.vue b/supervise-risk-ui/src/views/risk/RiskManage/RiskAdd.vue
index bc4fd4f7..c0786088 100644
--- a/supervise-risk-ui/src/views/risk/RiskManage/RiskAdd.vue
+++ b/supervise-risk-ui/src/views/risk/RiskManage/RiskAdd.vue
@@ -103,7 +103,8 @@ export default {
 				typeName:'',
 				typeSid:'',
         remarks:'',
-        reportTarget:''
+        reportTarget:'',
+        list:[]
 			},
 			rules: {
 				name: [{ required: true, message: '风险等级名称不能为空', trigger: 'blur' }],
@@ -112,7 +113,7 @@ export default {
 				reportTarget: [{ required: true, message: '报送单位不能为空', trigger: 'blur' }], 
 			},
       optionProps: {
-				value: 'code',
+				value: 'name',
 				label: 'name',
 				children: 'down',
 				expandTrigger: 'hover',
@@ -149,14 +150,15 @@ export default {
 			this.$nextTick(() => {
 				this.$refs['form_obj'].clearValidate()
 			})
-			this.viewTitle = '【新增】风险等级'
+			this.viewTitle = '【新增】风险指标'
 			this.hierarchys= false
 		},
 		showEdit(row) {
+      console.log(row);
 			this.$nextTick(() => {
 				this.$refs['form_obj'].clearValidate()
 			})
-			this.viewTitle = '【修改】风险等级'
+			this.viewTitle = '【修改】风险指标'
 			this.hierarchys= true
 			const _this = this
 			const vdata = row
@@ -173,8 +175,7 @@ export default {
 			_this.formobj.typeCode = vdata.typeCode 
 			_this.formobj.reportTarget = vdata.reportTarget 
 			_this.formobj.remarks = vdata.remarks
-      
-      _this.selectedOptions = JSON.parse(vdata.typeName);
+			_this.selectedOptions= vdata.list
 		},
     getParentsById(list, id) {
       for (let i in list) {
@@ -193,9 +194,6 @@ export default {
       }
     },
 		saveOrUpdate() {
-      if(this.formobj.sid){
-        this.formobj.typeName = JSON.stringify(this.selectedOptions)
-      }
       if(this.formobj.reportTarget==='监管公司'){
         this.formobj.reportTarget===1
       }else if(this.formobj.reportTarget==='贷款支行'){
@@ -250,6 +248,8 @@ export default {
         this.formobj.levelName = choose[0].name
       },
       handleChange3(value) {
+      this.formobj.list.push(value)
+      console.log(this.formobj);
       var getSId = this.$refs.cascaderAddr.getCheckedNodes()[0].data.sid
       this.formobj.typeSid=getSId
 			var thsAreaCode = this.$refs.cascaderAddr.getCheckedNodes()[0].pathLabels;  //注意2： 获取label值
@@ -264,7 +264,6 @@ export default {
         selectedOptions() {
           if (this.$refs.cascaderAddr) {
             this.$refs.cascaderAddr.dropDownVisible = false;
-            console.log(this.$refs.cascaderAddr,'cascader')
           }
         }
       },
diff --git a/supervise-risk-ui/src/views/risk/RiskManage/RiskIndex.vue b/supervise-risk-ui/src/views/risk/RiskManage/RiskIndex.vue
index 22a3fbf1..cb4a8e03 100644
--- a/supervise-risk-ui/src/views/risk/RiskManage/RiskIndex.vue
+++ b/supervise-risk-ui/src/views/risk/RiskManage/RiskIndex.vue
@@ -7,8 +7,10 @@
 				<el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">{{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}</el-button>
 				<div v-show="isSearchShow" class="search">
 					<el-form ref="queryParams" :model="queryParams.params"  :inline="true" class="tab-header">
-						<el-form-item label="客户名称"><el-input v-model="queryParams.params.custname" placeholder="请输入客户名称" clearable /></el-form-item>
-						<el-form-item label="工单名称"><el-input v-model="queryParams.params.ordername" placeholder="请输入工单名称" clearable /></el-form-item>
+						<el-form-item label="指标名称"><el-input v-model="queryParams.params.name" placeholder="请输入指标名称" clearable /></el-form-item>
+						<el-form-item label="风险等级"><el-input v-model="queryParams.params.levelName" placeholder="请输入风险等级" clearable /></el-form-item>
+						<el-form-item label="风险类别"><el-input v-model="queryParams.params.bigTypeName" placeholder="请输入风险类别" clearable /></el-form-item>
+						<el-form-item label="风险小类"><el-input v-model="queryParams.params.typeName" placeholder="请输入风险小类" clearable /></el-form-item>
 						<div class="btn" style="text-align: center;">
 							<el-button type="primary" size="small" icon="el-icon-search"  @click="dosearch">查询</el-button>
 							<el-button type="primary" size="small" icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
@@ -120,7 +122,10 @@ export default {
 				size: 10,
 				total: 0,
 				params: {
-                    
+                    name:'',
+                    levelName:'',
+                    bigTypeName:'',
+                    typeName:'',
 				}
 			},
 			multipleSelection: [],
@@ -205,7 +210,12 @@ export default {
 			this.loadList()
 		},
 		resetQuery() {
-			this.queryParams.params = {}
+			this.queryParams.params = {
+				    name:'',
+                    levelName:'',
+                    bigTypeName:'',
+                    typeName:'',
+			}
 			this.queryParams.params.sid = '' // sid
 			this.queryParams.params.name = '' // 登录名
 			this.dosearch()
diff --git a/supervise-risk-ui/src/views/risk/RiskManage/categoryAdd.vue b/supervise-risk-ui/src/views/risk/RiskManage/categoryAdd.vue
index c0c0c8b9..7f0ff4ec 100644
--- a/supervise-risk-ui/src/views/risk/RiskManage/categoryAdd.vue
+++ b/supervise-risk-ui/src/views/risk/RiskManage/categoryAdd.vue
@@ -1,253 +1,347 @@
 <template>
-	<div>
-		<!-- 标题按钮部分开始 -->
-		<div class="tab-header webtop">
-			<!-- 标题 -->
-			<div>{{ viewTitle }}</div>
-			<!-- start 添加修改按钮 -->
-			<div>
-				<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
-				<el-button type="info" size="small" @click="handleReturn()">返回</el-button>
-			</div>
-			<!-- end 添加修改按钮 -->
-			<!-- end 详情按钮 -->
-		</div>
-		<!-- 标题按钮部分结束 -->
-		<!-- Start 新增修改部分 -->
-		<div class="listconadd">
-			<el-form ref="form_obj">
-			<el-card class="box-card">
-			 <div class="wlInfo"><span>风险类别</span></div>
-			  <div class="item">
-                <span class="item_text">类别名称：</span>
-                <el-input v-model="formobj.name" placeholder="类别名称" class="item_input" clearable />
-              </div>
-              <div class="item">
-                <span class="item_text">类别编号：</span>
-				<el-input v-model="formobj.code" placeholder="类别编号" class="item_input" clearable />
-              </div>
+  <div>
+    <!-- 标题按钮部分开始 -->
+    <div class="tab-header webtop">
+      <!-- 标题 -->
+      <div>{{ viewTitle }}</div>
+      <!-- start 添加修改按钮 -->
+      <div>
+        <el-button
+          type="primary"
+          size="small"
+          :disabled="submitdisabled"
+          @click="saveOrUpdate"
+          >保存</el-button
+        >
+        <el-button type="info" size="small" @click="handleReturn()"
+          >返回</el-button
+        >
+      </div>
+      <!-- end 添加修改按钮 -->
+      <!-- end 详情按钮 -->
+    </div>
+    <!-- 标题按钮部分结束 -->
+    <!-- Start 新增修改部分 -->
+    <div class="listconadd">
+      <el-form ref="form_obj">
+        <el-card class="box-card">
+          <div class="wlInfo"><span>风险类别</span></div>
+          <div class="item">
+            <span class="item_text">类别名称：</span>
+            <el-input
+              v-model="formobj.name"
+              placeholder="类别名称"
+              class="item_input"
+              clearable
+            />
+          </div>
+          <div class="item">
+            <span class="item_text">类别编号：</span>
+            <el-input
+              v-model="formobj.code"
+              placeholder="类别编号"
+              class="item_input"
+              clearable
+            />
+          </div>
 
-			  <div class="item">
-                <span class="item_text">分类说明：</span>
-				<el-input v-model="formobj.content" placeholder="分类说明" class="item_input" clearable />
-              </div>
-			  <div class="item">
-                <span class="item_text">层级：</span>
-                <el-input v-model="formobj.hierarchy" :disabled="hierarchys" placeholder="请输入层级(1/2)" @input="hierarchy($event)" class="item_input" clearable />
-              </div>
-			  <div class="item" v-show="viewState == 2" >
-                <span class="item_text">上级名称：</span>
-                <el-select
-                    v-model="formobj.parentName"
-                    class="item_input"
-                    placeholder="请选择上级名称"
-					@change="getType"
-                  >
-                    <el-option
-                      v-for="(item, i) in arrList"
-                      :key="i"
-                      :label="item.name"
-                      :value="item.sid"
-                    />
-                </el-select>
-              </div>
-              <div class="item" style="height: 110px;">
-                <span class="item_text">备注信息：</span>
-                <el-input  type="textarea"
-                  :autosize="{ minRows: 4, maxRows: 6 }" v-model="formobj.remarks"  class="item_input" placeholder="备注信息" />
-              </div>
-			</el-card>
-		</el-form>
-		</div>
-		<!-- End 添加修改部分 -->
-	</div>
+          <div class="item">
+            <span class="item_text">分类说明：</span>
+            <el-input
+              v-model="formobj.content"
+              placeholder="分类说明"
+              class="item_input"
+              clearable
+            />
+          </div>
+          <div class="item">
+            <span class="item_text">层级：</span>
+            <div class="info-sex">
+              <el-radio
+                v-model="formobj.hierarchy"
+                :disabled="hierarchys"
+                @input="hierarchy($event)"
+                :label="1"
+                >一级</el-radio
+              >
+              <el-radio
+                v-model="formobj.hierarchy"
+                :disabled="hierarchys"
+                @input="hierarchy($event)"
+                :label="2"
+                >二级</el-radio
+              >
+            </div>
+            <!-- <el-input v-model="formobj.hierarchy" :disabled="hierarchys" placeholder="请输入层级(1/2)" @input="hierarchy($event)" class="item_input" clearable /> -->
+          </div>
+          <div class="item" v-show="viewState == 2">
+            <span class="item_text">上级名称：</span>
+            <el-select
+              v-model="formobj.parentName"
+              class="item_input"
+              placeholder="请选择上级名称"
+              @change="getType"
+            >
+              <el-option
+                v-for="(item, i) in arrList"
+                :key="i"
+                :label="item.name"
+                :value="item.sid"
+              />
+            </el-select>
+          </div>
+          <div class="item" style="height: 110px">
+            <span class="item_text">备注信息：</span>
+            <el-input
+              type="textarea"
+              :autosize="{ minRows: 4, maxRows: 6 }"
+              v-model="formobj.remarks"
+              class="item_input"
+              placeholder="备注信息"
+            />
+          </div>
+        </el-card>
+      </el-form>
+    </div>
+    <!-- End 添加修改部分 -->
+  </div>
 </template>
 
 <script>
-import req from '@/api/Risk/index'
+import req from "@/api/Risk/index";
 export default {
-	name: 'DispatchStandardsAdd',
-	data() {
-		return {
-			submitdisabled: false,
-			viewTitle: '',
-			viewState: 1,
-			arrLists: [],
-			arrList: [],
-			hierarchys: false,
-			formobj: {
-				name: '', 
-				code: '', 
-				content: '', 
-				hierarchy: '', 
-				parentSid: '', 
-				parentName: '', 
-				remarks: '' ,
-				sid:''
-			},
-			rules: {
-				name: [{ required: true, message: '风险等级名称不能为空', trigger: 'blur' }],
-				code: [{ required: true, message: '风险等级代码不能为空', trigger: 'blur' }], 
-				content: [{ required: true, message: '分类说明不能为空', trigger: 'blur' }], 
-				reportTarget: [{ required: true, message: '报送单位不能为空', trigger: 'blur' }], 
-			},
-		}
-	},
-	created() {},
-	methods: {
-		handleReturn(isreload) {
-			if (isreload === 'true') this.$emit('reloadlist')
-			this.formobj.sid = '' 
-			this.formobj.name= '', 
-			this.formobj.code= '', 
-			this.formobj.content= '', 
-			this.formobj.hierarchy= '', 
-			this.formobj.parentSid= ''
-			this.formobj.parentName= ''
-			this.formobj.remarks= ''
-			
-			this.$refs['form_obj'].resetFields()
-			this.$emit('doback')
-		},
-		showAdd() {
-			this.$nextTick(() => {
-				this.$refs['form_obj'].clearValidate()
-			})
-			this.viewTitle = '【新增】风险等级'
-			this.hierarchys= false
-		},
-		showEdit(row) {
-			this.$nextTick(() => {
-				this.$refs['form_obj'].clearValidate()
-			})
-			this.viewTitle = '【修改】风险等级'
-			this.hierarchys= true
-			const _this = this
-			const vdata = row
-			_this.formobj.id = vdata.id
-			_this.formobj.sid = vdata.sid 
-			_this.formobj.name = vdata.name 
-			_this.formobj.code = vdata.code 
-			_this.formobj.content = vdata.content 
-			_this.formobj.hierarchy = vdata.hierarchy 
-			_this.formobj.parentName = vdata.parentName
-			_this.formobj.parentSid = vdata.parentSid
-			_this.formobj.remarks = vdata.remarks 
-		},
-		saveOrUpdate() {
-			req
-			.saveRiskType(this.formobj)
-				.then(resp => {
-					if (resp.success) {
-						this.$message({ showClose: true, type: 'success', message: resp.msg })
-						this.handleReturn('true')
-					} else {
-						// 根据resp.code进行异常情况处理
-					}
-				})
-				.catch(() => {
-			})
-		},
-        superior(){
-            req
-			.selectRiskTypeFirst()
-				.then(resp => {
-                    if(resp.code==200){
-                        this.arrLists=resp.data					
-						for (var i = 0; i < this.arrLists.length; i++) {
-
-                            let item = {
-                              name: this.arrLists[i].name,
-                              sid: this.arrLists[i].sid,
-                            
-                            }
-                            this.arrList.push(item)
-                            }
-                    }
-			})
-        },
-        hierarchy(e){
-           if(e==2){
-            this.viewState=2
-			this.superior()
-           }else{
-            this.viewState=1
-			this.sid=null
-			this.parentSid=null
-			this.parentName=null
-           }
-        },
-		getType(value) {
-        const choose = this.arrLists.filter((item) => item.sid === value)
-        this.formobj.parentName = choose[0].name
-        this.formobj.parentSid = value
-		console.log( this.formobj.parentSid);
+  name: "DispatchStandardsAdd",
+  data() {
+    return {
+      submitdisabled: false,
+      viewTitle: "",
+      viewState: 1,
+      arrLists: [],
+      arrList: [],
+      hierarchys: false,
+      formobj: {
+        name: "",
+        code: "",
+        content: "",
+        hierarchy: 1,
+        parentSid: "",
+        parentName: "",
+        remarks: "",
+        sid: "",
       },
-	}
-}
+      rules: {
+        name: [
+          { required: true, message: "风险等级名称不能为空", trigger: "blur" },
+        ],
+        code: [
+          { required: true, message: "风险等级代码不能为空", trigger: "blur" },
+        ],
+        content: [
+          { required: true, message: "分类说明不能为空", trigger: "blur" },
+        ],
+        reportTarget: [
+          { required: true, message: "报送单位不能为空", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  created() {},
+  methods: {
+    handleReturn(isreload) {
+      if (isreload === "true") this.$emit("reloadlist");
+      this.formobj.sid = "";
+      (this.formobj.name = ""),
+        (this.formobj.code = ""),
+        (this.formobj.content = ""),
+        (this.formobj.hierarchy = 1),
+        (this.formobj.parentSid = "");
+      this.formobj.parentName = "";
+      this.formobj.remarks = "";
+      this.viewState = 1;
+      this.$refs["form_obj"].resetFields();
+      this.$emit("doback");
+      this.arrList = [];
+    },
+    showAdd() {
+      this.$nextTick(() => {
+        this.$refs["form_obj"].clearValidate();
+      });
+      this.viewTitle = "【新增】风险等级";
+      this.hierarchys = false;
+      this.formobj.hierarchy = 1;
+    },
+    showEdit(row) {
+      this.$nextTick(() => {
+        this.$refs["form_obj"].clearValidate();
+      });
+      this.viewTitle = "【修改】风险等级";
+      const _this = this;
+      const vdata = row;
+      _this.hierarchys = true;
+      this.superior();
+      _this.formobj.id = vdata.id;
+      _this.formobj.sid = vdata.sid;
+      _this.formobj.name = vdata.name;
+      _this.formobj.code = vdata.code;
+      _this.formobj.content = vdata.content;
+      _this.formobj.hierarchy = vdata.hierarchy;
+      _this.formobj.parentName = vdata.parentName;
+      _this.formobj.parentSid = vdata.parentSid;
+      _this.formobj.remarks = vdata.remarks;
+      if (vdata.hierarchy == 1) {
+        _this.viewState = 1;
+      } else {
+        _this.viewState = 2;
+      }
+    },
+    saveOrUpdate() {
+      req
+        .saveRiskType(this.formobj)
+        .then((resp) => {
+          if (resp.success) {
+            this.$message({
+              showClose: true,
+              type: "success",
+              message: resp.msg,
+            });
+            this.handleReturn("true");
+          } else {
+            // 根据resp.code进行异常情况处理
+          }
+        })
+        .catch(() => {});
+    },
+    superior() {
+      req.selectRiskTypeFirst().then((resp) => {
+        if (resp.code == 200) {
+          this.arrLists = resp.data;
+          for (var i = 0; i < this.arrLists.length; i++) {
+            let item = {
+              name: this.arrLists[i].name,
+              sid: this.arrLists[i].sid,
+            };
+            this.arrList.push(item);
+          }
+        }
+      });
+    },
+    hierarchy(e) {
+      if (e == 2) {
+        this.viewState = 2;
+        this.arrList = [];
+        this.superior();
+      } else {
+        this.viewState = 1;
+        this.sid = null;
+        this.parentSid = null;
+        this.parentName = null;
+        this.arrList = [];
+      }
+    },
+    getType(value) {
+      const choose = this.arrLists.filter((item) => item.sid === value);
+      this.formobj.parentName = choose[0].name;
+      this.formobj.parentSid = value;
+      console.log(this.formobj.parentSid);
+    },
+  },
+};
 </script>
 
-<style lang="scss">
-  .box-card {
-    margin-left: 60px;
-    margin-right: 60px;
-    min-width: 70%;
-    margin-top: 20px;
-    padding-bottom: 50px;
-
-    .item {
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-      margin-top: 15px;
-      height: 40px;
-      line-height: 40px;
-
-      .item_text {
-        flex: 0.8;
-        font-size: 18px;
-        text-align: right;
-      }
+<style scoped  lang="scss">
+.box-card {
+  margin-left: 60px;
+  margin-right: 60px;
+  min-width: 70%;
+  margin-top: 20px;
+  padding-bottom: 50px;
 
-      .item_input {
-        flex: 4;
-        font-size: 16px;
-        margin-left: 10px;
-        margin-right: 80px;
-      }
+  .item {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    margin-top: 15px;
+    height: 40px;
+    line-height: 40px;
 
-      .item_left_input {
-        width: 20%;
-      }
+    .item_text {
+      flex: 0.8;
+      font-size: 18px;
+      text-align: right;
+    }
 
-      .item_left_text {
-        height: 30px;
-        margin-left: 20px;
-        line-height: 30px;
-        color: #018AD2;
-        padding: 0px 15px;
-        border: 1.5px solid #018AD2;
-        border-radius: 5px;
+    .item_input {
+      flex: 4;
+      font-size: 16px;
+      margin-left: 10px;
+      margin-right: 80px;
+    }
 
-      }
+    .item_left_input {
+      width: 20%;
+    }
 
-      .item_right {
-        flex: 1;
-        justify-items: center;
+    .item_left_text {
+      height: 30px;
+      margin-left: 20px;
+      line-height: 30px;
+      color: #018ad2;
+      padding: 0px 15px;
+      border: 1.5px solid #018ad2;
+      border-radius: 5px;
+    }
 
-        .item_right_list_text {
-          font-size: 16px;
-        }
+    .item_right {
+      flex: 1;
+      justify-items: center;
 
-        .item_right_list_delect {
-          color: #5E94FF;
-          margin-left: 20px;
-          font-size: 16px;
-          text-decoration: underline;
-        }
+      .item_right_list_text {
+        font-size: 16px;
       }
 
+      .item_right_list_delect {
+        color: #5e94ff;
+        margin-left: 20px;
+        font-size: 16px;
+        text-decoration: underline;
+      }
+    }
+    .info-sex {
+      flex: 4;
+      font-size: 16px;
+      margin-left: 10px;
+      margin-right: 80px;
+      ::v-deep.el-radio__input.is-checked .el-radio__inner {
+        border-color: #48d18a;
+        background-color: #fff;
+      }
+      ::v-deep.el-radio__input.is-checked + .el-radio__label {
+        color: #424346;
+      }
+      ::v-deep.el-radio__input.is-checked .el-radio__inner:after {
+        transform: rotate(45deg) scaleY(1);
+      }
+      ::v-deep.el-radio__label {
+        color: #80838a;
+      }
+      ::v-deep.el-radio__inner::after {
+        box-sizing: content-box;
+        content: "";
+        border: 1px solid #48d18a;
+        border-left: 0;
+        border-top: 0;
+        height: 7px;
+        left: 4px;
+        position: absolute;
+        top: 1px;
+        transform: rotate(45deg) scaleY(0);
+        width: 3px;
+        transition: transform 0.15s ease-in 0.05s;
+        transform-origin: center;
+        border-radius: unset;
+        background-color: transparent;
+      }
     }
-
   }
+}
 </style>
diff --git a/supervise-risk-ui/src/views/risk/addBlack.vue b/supervise-risk-ui/src/views/risk/addBlack.vue
new file mode 100644
index 00000000..95496fdc
--- /dev/null
+++ b/supervise-risk-ui/src/views/risk/addBlack.vue
@@ -0,0 +1,149 @@
+<template>
+	<div>
+		<!-- 标题按钮部分开始 -->
+		<div class="tab-header webtop">
+			<!-- 标题 -->
+			<div>{{ viewTitle }}</div>
+			<!-- start 添加修改按钮 -->
+			<div>
+				<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
+				<el-button type="info" size="small" @click="handleReturn()">返回</el-button>
+			</div>
+			<!-- end 添加修改按钮 -->
+			<!-- end 详情按钮 -->
+		</div>
+		<!-- 标题按钮部分结束 -->
+		<!-- Start 新增修改部分 -->
+		<div class="listconadd">
+			<el-form ref="form_obj">
+			<el-card class="box-card">
+			 <div class="wlInfo"><span>风险类别</span></div>
+			  <div class="item">
+                <span class="item_text">风险对象：</span>
+                <el-input v-model="formobj.objectSid" placeholder="类别名称" class="item_input" clearable />
+              </div>
+			  <div class="item" >
+                <span class="item_text">对象类型：</span>
+                <el-select
+                    v-model="formobj.objectType"
+                    class="item_input"
+                    placeholder="请选择风险对象类型"
+                  >
+                    <el-option
+                      v-for="(item, i) in arrList"
+                      :key="i"
+                      :label="item.type"
+                      :value="item.value"
+                    />
+                </el-select>
+              </div>
+              <div class="item" style="height: 110px;">
+                <span class="item_text">备注信息：</span>
+                <el-input  type="textarea"
+                  :autosize="{ minRows: 4, maxRows: 6 }" v-model="formobj.remarks"  class="item_input" placeholder="备注信息" />
+              </div>
+			</el-card>
+		</el-form>
+		</div>
+		<!-- End 添加修改部分 -->
+	</div>
+</template>
+
+<script>
+import req from '@/api/Risk/riskIndex.js'
+export default {
+	name: 'DispatchStandardsAdd',
+	data() {
+		return {
+			submitdisabled: false,
+			viewTitle: '',
+			arrList: [{value:1,type:'供应商'},{value:2,type:'仓库'},{value:3,type:'门店'}],
+			hierarchys: false,
+			formobj: {
+				objectSid:'',
+				objectType:'',
+				remarks: '' 
+			},
+		}
+	},
+	created() {},
+	methods: {
+		handleReturn(isreload) {
+			if (isreload === 'true') this.$emit('reloadlist')
+			this.formobj.sid = '' 
+			this.formobj.objectSid='',
+			this.formobj.objectType='',
+			this.formobj.remarks= ''
+			
+			this.$refs['form_obj'].resetFields()
+			this.$emit('doback')
+		},
+		showAdd() {
+			this.$nextTick(() => {
+				this.$refs['form_obj'].clearValidate()
+			})
+			this.viewTitle = '【新增】风险等级'
+		},
+		showEdit(row) {
+			this.$nextTick(() => {
+				this.$refs['form_obj'].clearValidate()
+			})
+			this.viewTitle = '【修改】风险等级'
+			const _this = this
+			const vdata = row
+			_this.formobj.objectSid = vdata.objectSid
+			_this.formobj.objectType = vdata.objectType
+			_this.formobj.remarks = vdata.remarks 
+		},
+		saveOrUpdate() {
+			req
+			.saveRiskBlackList(this.formobj)
+				.then(resp => {
+					if (resp.success) {
+						this.$message({ showClose: true, type: 'success', message: resp.msg })
+						this.handleReturn('true')
+					} else {
+						// 根据resp.code进行异常情况处理
+					}
+				})
+				.catch(() => {
+			})
+		},
+	}
+}
+</script>
+
+<style lang="scss">
+  .box-card {
+    margin-left: 60px;
+    margin-right: 60px;
+    min-width: 70%;
+    margin-top: 20px;
+    padding-bottom: 50px;
+
+    .item {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      margin-top: 15px;
+      height: 40px;
+      line-height: 40px;
+
+      .item_text {
+        flex: 0.8;
+        font-size: 18px;
+        text-align: right;
+      }
+
+      .item_input {
+        flex: 4;
+        font-size: 16px;
+        margin-left: 10px;
+        margin-right: 80px;
+      }
+
+
+    }
+
+  }
+</style>
diff --git a/supervise-risk-ui/src/views/risk/addRiskBlack.vue b/supervise-risk-ui/src/views/risk/addRiskBlack.vue
new file mode 100644
index 00000000..eb4634c7
--- /dev/null
+++ b/supervise-risk-ui/src/views/risk/addRiskBlack.vue
@@ -0,0 +1,229 @@
+<template>
+	<div class="app-container">
+		<div v-show="viewState == 1">
+			<button-bar ref="btnbar" view-title="风险类别" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+			<div class="main-content">
+			<div class="searchcon">
+				<el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">{{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}</el-button>
+				<div v-show="isSearchShow" class="search">
+					<el-form ref="queryParams" :model="queryParams.params"  :inline="true" class="tab-header">
+						<el-form-item label="客户名称"><el-input v-model="queryParams.params.custname" placeholder="请输入客户名称" clearable /></el-form-item>
+						<el-form-item label="工单名称"><el-input v-model="queryParams.params.ordername" placeholder="请输入工单名称" clearable /></el-form-item>
+						<div class="btn" style="text-align: center;">
+							<el-button type="primary" size="small" icon="el-icon-search"  @click="dosearch">查询</el-button>
+							<el-button type="primary" size="small" icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
+						</div>
+					</el-form>
+				</div>
+			</div>
+			<!-- Start 项目列表头部 -->
+			<div class="listtop">
+				<div class="tit">风险类别列表</div>
+				<pageye v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
+			</div>
+			<!-- End 项目列表头部 -->
+
+			<!-- Start 项目列表 -->
+			<div>
+				<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" >
+					<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center" />
+					<el-table-column prop="objectSid" label="风险对象名称" align="center" />
+					<el-table-column prop="objectType" :formatter="formatorderdegree" label="风险对象类型" align="center" />
+                    <el-table-column prop="remarks" label="备注信息" align="center" />
+					<el-table-column fixed="right" label="操作"  align="center">
+                        <template slot-scope="scope">
+						   <el-tooltip class="item" effect="dark" content="删除" placement="top">
+							<i  class="el-icon-delete"  @click="doDel(scope.row)"></i>
+                           </el-tooltip>
+                        </template>
+                      </el-table-column>
+				</el-table>
+			</div>
+			<!-- End 项目列表 -->
+			<div class="pages">
+				<div class="tit" />
+				<!--  翻页  -->
+				<pagination
+					v-show="dataList.length > 0"
+					:total="queryParams.total"
+					:page.sync="queryParams.current"
+					:limit.sync="queryParams.size"
+					class="pagination"
+					@pagination="loadList"
+				/>
+			</div>
+		</div>
+		</div>
+		<!-- 新增修改部分组件 -->
+		<div-add v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
+	</div>
+</template>
+
+<script>
+import req from '@/api/Risk/riskIndex'
+import ButtonBar from '@/components/ButtonBar'
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import divAdd from './addBlack'
+
+export default {
+	name: 'DispatchOrderinfoIndex',
+	components: {
+		ButtonBar,
+		Pagination,
+		pageye,
+		divAdd,
+	},
+	data() {
+		return {
+			btndisabled: false,
+			viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+			isSearchShow: false,
+			tableLoading: false,
+			drawer: false,
+			listLoading: false,
+			dataList: [],
+			queryParams: {
+				current: 1,
+				size: 10,
+				total: 0,
+				params: {
+                    
+				}
+			},
+			multipleSelection: [],
+			btnList: [
+                 {
+                  type: 'primary',
+                  size: 'small',
+                  icon: 'plus',
+                  btnKey: 'toAdd',
+                  btnLabel: '新增'
+                },
+                {
+                  type: 'info',
+                  size: 'small',
+                  icon: 'cross',
+                  btnKey: 'doClose',
+                  btnLabel: '关闭'
+                }
+              ],
+			size:'',
+			TableList:[],
+			formobj:[]
+		}
+	},
+	mounted() {
+      // 初始化按钮
+      this.$refs['btnbar'].setButtonList(this.btnList)
+    },
+	created() {
+		this.loadList()
+	},
+	methods: {
+		resetState() {
+			this.viewState = 1
+		},
+		btnHandle(btnKey) {
+			switch (btnKey) {
+				case 'toAdd':
+					this.toAdd()
+					break
+			   case 'doClose': // 关闭
+                    this.doClose()
+                    break
+				default:
+					break
+			}
+		},
+		toAdd() {
+			this.viewState = 2
+			this.$refs['divadd'].showAdd()
+		},
+		toEdit(row) {
+			this.viewState = 3
+			this.$refs['divadd'].showEdit(row)
+			this.drawer=false
+		},
+		doDel(row) {
+			const sids = []
+		    sids.push(row.sid)
+			const tip = '请确认是否是否删除该条记录?'
+			this.$confirm(tip, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			})
+				.then(() => {
+					req
+						.delBySids(sids)
+						.then(resp => {
+							if (resp.success) {
+								this.$message({ type: 'success', message: resp.msg, showClose: true })
+								this.loadList()
+							} else {
+								// 根据resp.code进行异常情况处理
+							}
+						})
+				})
+				.catch(() => {})
+		},
+		dosearch() {
+			this.queryParams.current = 1
+			this.loadList()
+		},
+		resetQuery() {
+			this.queryParams.params = {}
+			this.queryParams.params.sid = '' // sid
+			this.queryParams.params.name = '' // 登录名
+			this.dosearch()
+		},
+		loadList() {
+			const _this = this
+			this.tableLoading = true
+			req
+				.listPage(this.queryParams)
+				.then(resp => {
+					_this.tableLoading = false
+					if (resp.success) { 
+						const data = resp.data
+						_this.queryParams.total = data.total
+						_this.dataList = data.records
+					} else {
+						// 根据resp.code进行异常情况处理
+					}
+				})
+				.catch(() => {
+					_this.tableLoading = false
+				})
+		},
+		// 序号
+		indexMethod(index) {
+			var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+			var pageindex = index + 1 + pagestart
+			return pageindex
+		},
+		doClose() {
+        this.$store.dispatch('tagsView/delView', this.$route)
+        this.$router.go(-1)
+        },
+        formatorderdegree: function( row, column) {
+         if(row.objectType === 1){
+             return '供应商'
+         }else if(row.objectType === 2) {
+			return '仓库'
+		 }else if(row.objectType === 3){
+			return '门店'
+		 }
+        },
+	}
+}
+</script>
+<style scoped>
+.margin-top {
+  border-bottom: 1px solid #ebebeb;
+}
+.item {
+   margin: 6px;
+ }
+</style>
diff --git a/supervise-risk-ui/src/views/risk/bjzx.vue b/supervise-risk-ui/src/views/risk/bjzx.vue
index d3061025..9f6244fe 100644
--- a/supervise-risk-ui/src/views/risk/bjzx.vue
+++ b/supervise-risk-ui/src/views/risk/bjzx.vue
@@ -9,36 +9,9 @@
             </el-button>
             <div v-show="isSearchShow" class="search">
               <el-form ref="queryParams" :inline="true" :model="queryParams" class="tab-header">
-                <el-form-item label="审核状态">
-                  <el-input v-model="queryParams.params.createSid" placeholder="" clearable />
-                </el-form-item>
                 <el-form-item label="订单编号">
                   <el-input v-model="queryParams.params.modifySid" placeholder="" clearable />
                 </el-form-item>
-                <el-form-item label="填单人">
-                  <el-input v-model="queryParams.params.buyerName" placeholder="" clearable />
-                </el-form-item>
-                <el-form-item label="填单日期">
-                  <el-date-picker v-model="queryParams.params.applyStartDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期" />
-                  <span style="padding: 0 8px">至</span>
-                  <el-date-picker v-model="queryParams.params.applyStartDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期" />
-                </el-form-item>
-                <el-form-item label="供应商名称">
-                  <el-input v-model="queryParams.params.contacts" placeholder="" clearable />
-                </el-form-item>
-                <el-form-item label="要货单位">
-                  <el-input v-model="queryParams.params.telephone" placeholder="" clearable />
-                </el-form-item>
-                <el-form-item label="完成状态">
-                  <el-select v-model="queryParams.params.completionStatusKey" filterable placeholder="请选择" clearable>
-                    <el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey" />
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="到货日期">
-                  <el-date-picker v-model="queryParams.params.applyStartDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期" />
-                  <span style="padding: 0 8px">至</span>
-                  <el-date-picker v-model="queryParams.params.applyStartDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期" />
-                </el-form-item>
               </el-form>
               <div class="btn" style="text-align: center;">
                 <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
@@ -54,14 +27,19 @@
           <!-- End 项目列表头部 -->
           <!-- Start 项目列表 -->
           <div class="">
-            <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="handleSelectionChange">
-              <el-table-column fixed width="50" type="selection" align="center" />
+            <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
               <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
-              <el-table-column prop="indicatorName" label="指标名称" align="center"  />
+              <el-table-column prop="customerName" label="客户名称" align="center" width="150" />
+              <el-table-column prop="positionName" label="风险处于位置" align="center" width="180" />
+              <el-table-column prop="triggerTime" :formatter="formatDate" label="触发时间" align="center" width="180" />
+              <el-table-column prop="treatmentTime" :formatter="formatDate" label="处理时间" align="center" width="180" />
+              <el-table-column prop="treatmentContent" label="处理内容" align="center" width="150"  />
+              <el-table-column prop="eliminationStatus" label="风险消除程度" align="center" width="150" />
+              <el-table-column prop="indicatorName" label="指标名称" align="center" width="150" />
               <el-table-column prop="levelName" label="等级名称" align="center" width="150" />
               <el-table-column prop="bigTypeName" label="风险类别" align="center" width="120" />
               <el-table-column prop="typeName" label="风险小类" align="center" width="120" />
-              <el-table-column prop="treatmentStatus" label="处理状态" align="center" width="300" >
+              <el-table-column prop="treatmentStatus" label="处理状态" align="center" width="280" >
                <template slot-scope="scope">
                   <div class="info-sex">
                     <el-radio-group v-model="scope.row.treatmentStatus">
@@ -72,7 +50,7 @@
                  </div>
                  </template>
               </el-table-column>
-              <el-table-column  width="250" label="操作" align="center">
+              <el-table-column fixed="right"  width="180" label="操作" align="center">
                 <template slot-scope="scope">
                   <el-button type="primary" size="mini" @click="toEdit(scope.row)">处理</el-button>
                   <el-button type="primary" size="mini" @click="toInfo(scope.row)">上报</el-button>
@@ -288,6 +266,17 @@
       doClose() {
         this.$store.dispatch('tagsView/delView', this.$route)
         this.$router.go(-1)
+      },
+      formatDate(row,col,val) {
+        if (val == null || val == "") return "";
+        var date = new Date(val) 
+        var year = date.getFullYear()
+        var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
+        var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate() 
+        var hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours() 
+        var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes() 
+        var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
+        return year + '-' + month + '-' + day 
       }
     }
   }
diff --git a/supervise-risk-ui/src/views/risk/riskCljl.vue b/supervise-risk-ui/src/views/risk/riskCljl.vue
index 67fee549..6bc22fe3 100644
--- a/supervise-risk-ui/src/views/risk/riskCljl.vue
+++ b/supervise-risk-ui/src/views/risk/riskCljl.vue
@@ -58,13 +58,13 @@
               <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
               <el-table-column prop="treatmentContent" width="120" label="处理内容" align="center"  />
               <el-table-column prop="positionName" width="180" label="风险处理位置名称" align="center"  />
-              <el-table-column prop="triggerTime" width="160" label="风险触发时间" align="center"  />
+              <el-table-column prop="triggerTime" width="160" :formatter="formatDate" label="风险触发时间" align="center"  />
               <el-table-column prop="typeName" width="150" label="风险类别名称" align="center"  />
               <el-table-column prop="treatmentTime" width="150" :formatter="formatDate" label="处理时间" align="center"/>
               <el-table-column prop="userName" label="处理人姓名" width="120" align="center"  />
               <el-table-column prop="userPhone" label="处理人电话" align="center" width="150" />
               <el-table-column prop="remarks" label="处理说明" align="center" width="150" />
-              <el-table-column prop="treatmentStatus" label="处理状态" align="center" width="280"       fixed="right">
+              <el-table-column prop="treatmentStatus" label="处理状态" align="center" width="300"       fixed="right">
                <template slot-scope="scope">
                   <div class="info-sex">
                     <el-radio-group v-model="scope.row.treatmentStatus">
@@ -286,10 +286,9 @@
         this.$store.dispatch('tagsView/delView', this.$route)
         this.$router.go(-1)
       },
-      formatDate(cellValue) {
-        let treatmentTime=cellValue.treatmentTime
-        if (treatmentTime == null || treatmentTime == "") return "";
-        var date = new Date(treatmentTime) 
+      formatDate(row,col,val) {
+        if (val == null || val == "") return "";
+        var date = new Date(val) 
         var year = date.getFullYear()
         var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
         var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate() 
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/purchasenew/PurchasenewController.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/purchasenew/PurchasenewController.java
index d0ebb19e..740e0fb1 100644
--- a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/purchasenew/PurchasenewController.java
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/purchasenew/PurchasenewController.java
@@ -1,9 +1,6 @@
 package com.wh.controller.purchasenew;
 
-import com.wh.pojo.purchasenew.PurchasenewDetailsVo;
-import com.wh.pojo.purchasenew.PurchasenewDto;
-import com.wh.pojo.purchasenew.PurchasenewQuery;
-import com.wh.pojo.purchasenew.PurchasenewVo;
+import com.wh.pojo.purchasenew.*;
 import com.wh.service.purchasenew.PurchasenewService;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -12,6 +9,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @CrossOrigin
 @RequestMapping("/purchasenew")
@@ -26,6 +25,13 @@ public class PurchasenewController {
         PagerVo<PurchasenewVo> pv = purchasenewService.listPageVo(pq);
         return rb.success().setData(pv);
     }
+    @ApiOperation("获取所有的采购订单")
+    @PostMapping("/listAll")
+    public ResultBean<List<Purchasenew>> listAll(){
+        ResultBean rb = ResultBean.fireFail();
+        List<Purchasenew> list = purchasenewService.listForInput();
+        return rb.success().setData(list);
+    }
 
     @ApiOperation("新增或修改")
     @PostMapping("/save")
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/purchasenew/PurchasenewMapper.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/purchasenew/PurchasenewMapper.java
index 48925d0e..a30dde75 100644
--- a/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/purchasenew/PurchasenewMapper.java
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/purchasenew/PurchasenewMapper.java
@@ -71,4 +71,6 @@ public interface PurchasenewMapper extends BaseMapper<Purchasenew> {
 	 */
 	@Update("update purchasenew set status='2' where sid=#{sid}")
     int updatePutInStatus(@Param("sid") String sid);
+	@Select("select * from purchasenew where  state=1")
+	List<Purchasenew> listForInput();
 }
\ No newline at end of file
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/instorehouse/InStorehouseMainService.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/instorehouse/InStorehouseMainService.java
index 57670e97..86d30b1f 100644
--- a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/instorehouse/InStorehouseMainService.java
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/instorehouse/InStorehouseMainService.java
@@ -18,6 +18,7 @@ import com.wh.pojo.purchasenew.Purchasenew;
 import com.wh.pojo.purchasenew.PurchasenewDto;
 import com.wh.pojo.purchasenewproduct.PurchasenewProduct;
 import com.wh.pojo.purchasenewproduct.PurchasenewProductDto;
+import com.wh.pojo.purchasenewproduct.PurchasenewProductVo;
 import com.wh.service.api.prodstock.ProdStockService;
 import com.wh.service.purchasenew.PurchasenewService;
 import com.wh.service.purchasenewproduct.PurchasenewProductService;
@@ -53,7 +54,8 @@ public class InStorehouseMainService  extends MybatisBaseService<InStorehouseMai
     private PurchasenewService purchasenewService;
     @Autowired
     private PurchasenewProductService purchasenewProductService;
-    @Transactional
+    @Autowired
+    private InStorehouseMainService inStorehouseMainService;
     public ResultBean addInStorehouse(InStoreHouseMainDto inStoreHouseMainDto) {
         ResultBean<Object> r = ResultBean.fireFail();
         if(inStoreHouseMainDto==null){
@@ -62,21 +64,58 @@ public class InStorehouseMainService  extends MybatisBaseService<InStorehouseMai
         if(StringUtils.isBlank(inStoreHouseMainDto.getNo())){
             return r.setMsg("申请单编号不能为空");
         }
+
+        QueryWrapper<Purchasenew> purchasenewWrapper = new QueryWrapper<>();
+        purchasenewWrapper.eq("purchase_no",inStoreHouseMainDto.getNo());
+        List<Purchasenew> list1 = purchasenewService.list(purchasenewWrapper);
+        if(list1==null||list1.size()==0){
+            return  r.setMsg("申请单不存在");
+        }
+        Purchasenew purchasenew = list1.get(0);
+        PurchasenewDto dto =new PurchasenewDto();
+        BeanUtil.copyProperties(purchasenew,dto);
+        String purchaseSid=purchasenew.getSid();
         QueryWrapper<InStorehouseMain> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("no",inStoreHouseMainDto.getNo());
-        if(baseMapper.selectCount(queryWrapper) != 0){
-            return  r.setMsg("申请单编号已经存在");
+        queryWrapper.eq("purchase_sid",purchasenew.getSid());
+        List<InStorehouseMain> inStorehouseMains = baseMapper.selectList(queryWrapper);
+        if(inStorehouseMains!=null&&inStorehouseMains.size()>0){
+            return  r.setMsg("申请单编号已经入库");
+        }
+        List<PurchasenewProductVo> purchasenewProductVos =
+                purchasenewProductService.fetchDetailsVoByPurchaseSid(purchaseSid);
+        List<PurchasenewProductDto> products=new ArrayList<>();
+        for (PurchasenewProductVo purchasenewProductVo : purchasenewProductVos) {
+            PurchasenewProductDto d=new PurchasenewProductDto();
+            BeanUtil.copyProperties(purchasenewProductVo,d);
+            products.add(d);
         }
+        dto.setProducts(products);
+        saveOrUpdateByPurchaseSid(dto,purchaseSid);
+//        InStorehouseMain in=new InStorehouseMain();
+//        BeanUtils.copyProperties(inStoreHouseMainDto,in);
+//        List<InStorehouseListing> list = inStoreHouseMainDto.getList();
+//        if(list==null||list.size()==0){
+//            return  r.setMsg("商品不能为空");
+//        }
+//        //申请单主表信息
+//        baseMapper.insert(in);
+//        addListing(in, list);
+        return ResultBean.fireSuccess().setMsg("添加成功");
+    }
+    @Transactional
+    public ResultBean addInStorehouses(InStoreHouseMainDto inStoreHouseMainDto) {
+        ResultBean<Object> r = ResultBean.fireFail();
+
         InStorehouseMain in=new InStorehouseMain();
         BeanUtils.copyProperties(inStoreHouseMainDto,in);
         List<InStorehouseListing> list = inStoreHouseMainDto.getList();
-        if(list==null||list.size()==0){
-            return  r.setMsg("商品不能为空");
-        }
+
         //申请单主表信息
         baseMapper.insert(in);
         addListing(in, list);
+        purchasenewService.updateStateToInputBySid(in.getPurchaseSid());
         return ResultBean.fireSuccess().setMsg("添加成功");
+
     }
     public PagerVo<InStoreHouseMainVo> listPage(PagerQuery<InStorehouseMainQuery> pq) {
         InStorehouseMainQuery query = pq.getParams();
@@ -271,7 +310,7 @@ public class InStorehouseMainService  extends MybatisBaseService<InStorehouseMai
         });
         inStoreHouseMainDto.setList(list);
         inStoreHouseMainDto.setPurchaseSid(purchaseSid);//采购申请单的sid
-        addInStorehouse(inStoreHouseMainDto);
+        addInStorehouses(inStoreHouseMainDto);
         return r.success();
     }
 
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/instorehouse/PutInServiceImpl.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/instorehouse/PutInServiceImpl.java
index f647a453..23f26e95 100644
--- a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/instorehouse/PutInServiceImpl.java
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/instorehouse/PutInServiceImpl.java
@@ -75,7 +75,7 @@ public class PutInServiceImpl implements PutInService {
         List<Location> locationList = locationMapper.selectList(locationQueryWrapper);
 
         List<String> receivingIdList = new ArrayList<>();
-        List<String> locationIdList = new ArrayList<>();
+        List<Location> locationIdList = new ArrayList<>();
 
         for (Receiving receiving : receivingList){
             receivingIdList.add(receiving.getReceivingId());
@@ -83,7 +83,7 @@ public class PutInServiceImpl implements PutInService {
 
         if (locationList != null){
             for (Location location : locationList){
-                locationIdList.add(location.getLocationId());
+                locationIdList.add(location);
             }
         }
 
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/purchasenew/PurchasenewService.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/purchasenew/PurchasenewService.java
index e46b2b15..73bb3398 100644
--- a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/purchasenew/PurchasenewService.java
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/purchasenew/PurchasenewService.java
@@ -172,4 +172,14 @@ public class PurchasenewService extends MybatisBaseService<PurchasenewMapper, Pu
         int i=baseMapper.updatePutInStatus(sid);
         return rb.success();
     }
+
+    public List<Purchasenew> listForInput() {
+      return  baseMapper.listForInput();
+    }
+
+    public void updateStateToInputBySid(String purchaseSid) {
+        Purchasenew purchasenew = fetchBySid(purchaseSid);
+        purchasenew.setState(2);
+        baseMapper.updateById(purchasenew);
+    }
 }
diff --git a/warehousing-system/project/wh-manage/src/main/resources/mappers/PurchasenewMapper.xml b/warehousing-system/project/wh-manage/src/main/resources/mappers/PurchasenewMapper.xml
index 78c4effe..c287fbd6 100644
--- a/warehousing-system/project/wh-manage/src/main/resources/mappers/PurchasenewMapper.xml
+++ b/warehousing-system/project/wh-manage/src/main/resources/mappers/PurchasenewMapper.xml
@@ -4,7 +4,7 @@
 <!--    <where> ${ew.sqlSegment} </where>-->
 <!--    ${ew.customSqlSegment} -->
 	<select id="selectPageVo" resultType="com.wh.pojo.purchasenew.PurchasenewVo">
-		SELECT * FROM purchasenew <where> ${ew.sqlSegment} </where>
+		SELECT * FROM purchasenew <where> ${ew.sqlSegment} </where> order by id desc
 	</select>
 	
 	<select id="selectListAllVo" resultType="com.wh.pojo.purchasenew.PurchasenewVo">
diff --git a/warehousing-system/project_web/src/components/initial_value/storehouse.vue b/warehousing-system/project_web/src/components/initial_value/storehouse.vue
index a32e4602..6b205cdd 100644
--- a/warehousing-system/project_web/src/components/initial_value/storehouse.vue
+++ b/warehousing-system/project_web/src/components/initial_value/storehouse.vue
@@ -23,26 +23,32 @@
         </el-col>
       </el-row>
       <el-table
-        :data="
-          storehouseList.slice(
-            (queryInfo.current - 1) * queryInfo.size,
-            queryInfo.current * queryInfo.size
-          )
-        "
+        :data="storehouseList"
         style="width: 100%"
-        stripe
         border
-        fixed
         height="500"
       >
-        <el-table-column fixed="left" type="selection" width="55">
+      <el-table-column label="序号" type="index" width="60" :index="indexMethod" align="center" />
+        <el-table-column prop="custerName" label="客户名称" align="center"> </el-table-column>
+        <el-table-column prop="name" label="仓库名称" align="center"> </el-table-column>
+        <el-table-column prop="simpleName" label="仓库简称" width="100" align="center"> </el-table-column>
+        <el-table-column prop="code" label="仓库编码" align="center"> </el-table-column>
+        <el-table-column  label="所属地(省 - 市 - 县)" width="200" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.provinceName }}</span>
+                <span>-{{ scope.row.cityName }}-</span>
+                <span>{{ scope.row.countyName }}</span>
+              </template>
         </el-table-column>
-        <el-table-column prop="name" label="仓库名称"> </el-table-column>
-        <el-table-column prop="simpleName" label="仓库简称"> </el-table-column>
-        <el-table-column prop="custerName" label="客户名称"> </el-table-column>
-        <el-table-column prop="remarks" label="备    注"> </el-table-column>
-        <el-table-column fixed="right" prop="operate" label="操作" width="180">
+        <el-table-column fixed="right" prop="operate" label="操作" align="center" width="300">
           <template slot-scope="scope">
+            <el-button
+              type="primary"
+              icon="el-icon-zoom-in"
+              size="small"
+              @click="LookStorehousedialog(scope.row)"
+              >查看详情</el-button
+            >
             <el-button
               type="primary"
               icon="el-icon-edit"
@@ -333,7 +339,7 @@
           <el-col :span="3.2" class="tleftb">
             <span><span class="icon">*</span>附件：</span>
           </el-col>
-          <el-col :span="3" class="trightb">
+          <el-col :span="2" class="trightb">
             <el-form-item prop="picUrl">
               <el-upload
                 ref="upload"
@@ -344,8 +350,6 @@
                 :on-progress="handleProgress"
                 :on-success="handleSuccess"
                 :multiple="false"
-                :show-file-list="false"
-                :before-remove="beforeRemove"
                 :limit="1"
               >
                 <el-button size="small" type="primary">点击上传</el-button>
@@ -360,6 +364,188 @@
         <el-button type="primary" @click="operationStorehouse">确 定</el-button>
       </div>
     </el-dialog>
+    <el-dialog title="仓库详细信息" :visible.sync="addPurchaseDialogVisible" width="75%">
+
+      <div class="listconadd">
+        <el-form ref="dataForm" :model="temp" label-position="top" label-width="190px" class="formadd">
+          <div class="title" style="display: flex;align-items: center;justify-content: space-between;height:40px">
+            <div style="margin-left: 15px;">基本信息</div>
+          </div>
+          <el-row>
+            <el-col :span="4" class="trightbs">
+              <el-form-item class="trightbs_item">
+                <span slot="label">客户名称</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightbs_item">
+                <span>{{temp.custerName}}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="trightbs">
+              <el-form-item class="trightbs_item">
+                <span slot="label">仓库名称</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightbs_item">
+                <span>{{temp.name}}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="4" class="trightbs">
+              <el-form-item class="trightbs_item">
+                <span slot="label">仓库简称</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightbs_item">
+                <span>{{temp.simpleName}}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="trightbs">
+              <el-form-item class="trightbs_item">
+                <span slot="label">仓库编码</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightbs_item">
+                <span>{{temp.code}}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="4" class="trightbs">
+              <el-form-item class="trightbs_item">
+                <span slot="label">联系人</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightbs_item">
+                <span>{{temp.linkerName}}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="trightbs">
+              <el-form-item class="trightbs_item">
+                <span slot="label">联系电话</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightbs_item">
+                <span>{{temp.linkerPhone}}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="4" class="trightbs">
+              <el-form-item class="trightbs_item">
+                <span slot="label">省-市-县</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightbs_item">
+                <span>{{temp.provinceName}} - {{temp.cityName}} - {{temp.countyName}}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="trightbs">
+              <el-form-item class="trightbs_item">
+                <span slot="label">区域名称</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightbs_item">
+                <span>{{temp.regionName}}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="4" class="trightbs">
+              <el-form-item class="trightbs_item">
+                <span slot="label">详细地址</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="20">
+              <el-form-item class="trightbs_item">
+                <span>{{temp.address}}</span>
+              </el-form-item>
+            </el-col>
+
+          </el-row>
+
+          <el-row>
+            <el-col :span="4" class="trightbs">
+              <el-form-item class="trightbs_item">
+                <span slot="label">房源</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightbs_item">
+                <span>{{temp.housingResource}}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="trightbs">
+              <el-form-item class="trightbs_item">
+                <span slot="label">库房面积</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightbs_item">
+                <span>{{temp.acreage}}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="4" class="trightbs">
+              <el-form-item class="trightbs_item">
+                <span slot="label">库房高度</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightbs_item">
+                <span>{{temp.storeyHeight}}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="trightbs">
+              <el-form-item class="trightbs_item">
+                <span slot="label">月租金</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightbs_item">
+                <span>{{temp.monthlyPrice}}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="4" class="trightbs">
+              <el-form-item class="trightbs_item">
+                <span slot="label">库房性质名称</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightbs_item">
+                <span>{{temp.attributeNames}}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="trightbs">
+              <el-form-item class="trightbs_item">
+                <span slot="label">仓库信息表</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightbs_item">
+                <el-button v-if="temp.picUrl" type="text" @click="toDownload()">下载仓库信息表</el-button>
+              <div v-else>没有信息表文件</div>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+
+    </div>
+   </el-dialog>
   </div>
 </template>
 
@@ -369,8 +555,8 @@ export default {
     return {
       queryInfo: {
         total: 0,
-        size: 1,
-        current: 10,
+        size: 10,
+        current: 1,
         params: {},
       },
       total: 0,
@@ -384,6 +570,7 @@ export default {
       countyList: [],
       updateAction: "http://jianguan.yyundong.com/warehouseapi/v1/shstorehouse/upload",
       storehouseDialogVisible: false,
+      addPurchaseDialogVisible: false,
       // myHeaders: { Access-Control-Allow-Origin},
       title: "新增仓库",
       storehouseForm: {
@@ -423,11 +610,19 @@ export default {
       },
       CITY: [],
       XIAN: [],
+      temp: {},
       mapApiKey: "map",
       shouhuoArrive: {},
+      fullscreenloading: null,
     };
   },
   methods: {
+     // 序号
+     indexMethod(index) {
+     var pagestart = (this.queryInfo.current - 1) * this.queryInfo.size
+     var pageindex = index + 1 + pagestart
+     return pageindex
+      },
     handleSizeChange(val) {
       this.queryInfo.size = val;
       this.getStorehouseList();
@@ -436,15 +631,36 @@ export default {
       this.queryInfo.current = val;
       this.getStorehouseList();
     },
+    clearList(){
+      this.form={
+        name: "",
+        custerName: "",
+        provinceName: "",
+        cityName: "",
+        simpleName: "",
+        code: "",
+        countyName: "",
+        address: "",
+        acreage: "",
+        storeyHeight: "",
+        monthlyPrice: "",
+        attributeNames: "",
+        attributeCodes: "",
+        housingResource: "",
+        linkerName: "",
+        linkerPhone: "",
+        picUrl: "",
+      }
+    },
     async getStorehouseList() {
       const { data: result } = await this.$http.post(
         "/v1/shstorehouse/listPage",
         { params: this.queryInfo }
       );
-      if (result.code !== 200) return this.$message.error("获取列表失败");
+      if (result.code == 200) 
 
       this.total = result.data.total;
-      this.storehouseList = result.data.rows;
+      this.storehouseList = result.data.records;
     },
     addStorehouseDialog() {
       this.title = "新增仓库";
@@ -468,10 +684,7 @@ export default {
       this.form.code = choose[0].addr;
     },
     updataStorehousedialog(storehouse) {
-      this.storehouseForm.name = storehouse.name;
-      this.storehouseForm.simpleName = storehouse.simpleName;
-      this.storehouseForm.addr = storehouse.addr;
-      this.storehouseForm.remarks = storehouse.remarks;
+      this.form=storehouse
       this.title = "修改仓库";
       this.storehouseDialogVisible = true;
     },
@@ -480,17 +693,18 @@ export default {
         "/v1/shstorehouse/save",
         this.form
       );
-      if (result.code !== 200) return this.$message.error("添加仓库失败");
+      if (result.code == 200) 
       this.$message.success("成功添加仓库");
       this.getStorehouseList();
       this.storehouseDialogVisible = false;
+      this.clearList()
     },
     async updataStorehouse() {
-      const { data: result } = await this.$http.put(
-        "/storehouse/updataStorehouse",
-        this.storehouseForm
+      const { data: result } = await this.$http.post(
+        "/v1/shstorehouse/save",
+        this.form
       );
-      if (result.status !== 200) return this.$message.error("修改仓库失败");
+      if (result.code == 200) 
       this.$message.success("更新成功");
       this.getStorehouseList();
       this.storehouseDialogVisible = false;
@@ -502,6 +716,8 @@ export default {
       }
     },
     async deleteStorehouse(storehouse) {
+      const sids = []
+			sids.push(storehouse.sid)
       const result = await this.$confirm(
         "此操作将永久删除" + storehouse.name + ", 是否继续?",
         "提示",
@@ -512,10 +728,10 @@ export default {
         }
       ).catch((error) => error);
       if (result !== "confirm") return this.$message.info("用户取消操作");
-      const { data: resultDB } = await this.$http.delete(
-        `/storehouse/delete/${storehouse.name}`
+      const { data: resultDB } = await this.$http.post(
+        '/v1/shstorehouse/delBySids',sids
       );
-      if (resultDB.status !== 200) return this.$message.error("删除出库失败");
+      if (resultDB.code == 200)
       this.getStorehouseList();
       this.$message.success("仓库删除成功");
     },
@@ -609,25 +825,47 @@ export default {
       }
     },
     handleSuccess(resp, file, fileList) {
-      this.fileList = [];
-      if (resp.success) {
-        this.$message({
+      console.log('222', resp)
+        const rdata = resp.data
+        const _this = this
+        _this.form.picUrl=rdata
+        if (this.fullscreenloading) this.fullscreenloading.close()
+        this.fullscreenloading = null
+        _this.$message({
           showClose: true,
           type: "success",
           message: "导入成功",
         });
-      } else {
-        this.$message({
-          showClose: true,
-          type: "error",
-          message: resp.msg,
-        });
-      }
     },
-    handleProgress(event, file, fileList) {},
+    handleProgress(event, file, fileList) {
+      const _this = this
+        this.fullscreenloading = this.$loading({
+          lock: true,
+          text: '文件正在上传',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+        console.log('111', event.percent)
+        if (event.percent >= 100) {
+          _this.fullscreenloading.text = '上传完成，正在导入数据库'
+        }
+    },
     beforeRemove(file, fileList) {
       return this.$confirm(`确定移除 ${file.name}？`);
     },
+    async LookStorehousedialog(purchase){
+      this.addPurchaseDialogVisible=true
+      const _this = this
+      const { data: result } = await this.$http.get(`/v1/shstorehouse/fetchDetailsBySid/${purchase.sid}`)
+      if (result.code==200) {
+        _this.temp=result.data
+      }
+    },
+     toDownload() {
+        if (this.temp.picUrl) {
+          window.open(this.temp.picUrl, '_blank')
+        }
+      },
   },
   mounted() {
     this.getStorehouseList();
@@ -638,7 +876,19 @@ export default {
 };
 </script>
 
-<style>
+<style scoped>
+/deep/ .el-collapse-item__header {
+    height: 40px;
+    font-weight: bold;
+    font-size: 16px;
+    text-align: left;
+    color: #ffffff;
+    background-color: #0294d7;
+  }
+
+  /deep/ .el-collapse-item__content {
+    padding-bottom: 0;
+  }
 .tleftb {
   text-align: right;
   font-size: 14px;
@@ -660,4 +910,57 @@ export default {
   color: rgba(255, 0, 0, 0.553);
   margin-right: 3px;
 }
+  .trightbs {
+    display: flex;
+    align-items: center;
+    text-align: center;
+    justify-content: center;
+  }
+
+  .trightbs_item {
+    padding-top: 5px;
+  }
+
+  .span {
+    margin-left: 50px;
+    font-size: 15px;
+    font-weight: 400;
+  }
+  .formadd {
+    padding: 10px 40px 0 40px;
+    font-size: 16px;
+  }
+  .formadd .title {
+    font-weight: bold;
+    font-size: 16px;
+    background-color: #0294d7;
+    text-align: left;
+    color: #ffffff;
+  }
+  .first_row{
+    border-top: 1px solid #e0e3eb;
+  }
+  .formadd .el-row {
+    display: flex;
+    flex-wrap: wrap;
+    border-left: 1px solid #e0e3eb;
+  }
+  .formadd  .el-row .el-col {
+     border-right: 1px solid #e0e3eb;
+     border-bottom: 1px solid #e0e3eb;
+     padding: 0 15px;
+     min-height: 42px;
+     line-height: 1;
+  }
+  .formadd  .el-row .el-col .el-form-item {
+    margin-bottom: 0;
+    line-height: 42px;
+  }
+  .addinputw {
+    width: 80%;
+    line-height: 42px;
+  }
+ .el-input__inner {
+   height: 36px;
+  }
 </style>
diff --git a/warehousing-system/project_web/src/components/instorehouse/purchase.vue b/warehousing-system/project_web/src/components/instorehouse/purchase.vue
index fc934b92..2fc0da6c 100644
--- a/warehousing-system/project_web/src/components/instorehouse/purchase.vue
+++ b/warehousing-system/project_web/src/components/instorehouse/purchase.vue
@@ -147,10 +147,10 @@
               <el-form-item class="trightb_item">
                 <el-select v-model="purchaseForm.custName" placeholder="请选择"  >
                  <el-option
-                   v-for="custName in storehouseList"
-                   :key="custName.name"
-                   :label="custName.name"
-                   :value="custName.name">
+                   v-for="(custName,i) in custList"
+                   :key="i"
+                   :label="custName.enterpriseName"
+                   :value="custName.sid">
                  </el-option>
                </el-select>
               </el-form-item>
@@ -316,6 +316,7 @@ export default {
       productList2: [],
       supplierList: [],
       storehouseList: [],
+      custList: [],
       selectPurchaseList: [],
       purchaseForm: {
         purchaseId: '',
@@ -375,6 +376,12 @@ export default {
         // this.$message({ type: 'success', message: result.msg, showClose: true })
       }
     },
+    async getcustListList () {
+      const { data: result } = await this.$http.post('/crm/v1/enterpriseinformation/list')
+      if (result.code == 200){
+        this.custList = result.data
+      }
+    },
 
     addPurchase () {
       this.$refs.dataForm.validate(async validate => {
@@ -583,6 +590,7 @@ export default {
     this.getProductList()
     this.getSupplierList()
     this.getStorehouseList()
+    this.getcustListList()
   }
 }
 </script>
diff --git a/warehousing-system/project_web/src/components/instorehouse/putIn.vue b/warehousing-system/project_web/src/components/instorehouse/putIn.vue
index 1e76f7b6..76eed33c 100644
--- a/warehousing-system/project_web/src/components/instorehouse/putIn.vue
+++ b/warehousing-system/project_web/src/components/instorehouse/putIn.vue
@@ -2,120 +2,165 @@
   <el-card class="box-card">
     <div>入库</div>
     <el-divider></el-divider>
-   <div class="form">
-      <el-form  class="demo-ruleForm" label-width="220px" :rules="rules" ref="onPutInRuleForm" :model="inStorehouse">
-        <el-form-item label="订单编号:" prop="receivingId" >
-          <el-select v-model="inStorehouse.receivingId" placeholder="请选择" clearable @change="getOptions">
+    <div class="form">
+      <el-form
+        class="demo-ruleForm"
+        label-width="220px"
+        :rules="rules"
+        ref="onPutInRuleForm"
+        :model="inStorehouse"
+      >
+        <el-form-item label="订单编号:" prop="receivingId">
+          <el-select
+            v-model="inStorehouse.receivingId"
+            placeholder="请选择"
+            clearable
+            @change="getOptions"
+          >
             <el-option
-              v-for="item in queryInfo.receivingIdList"
-              :key="item"
-              :label="item"
-              :value="item"
-              >
+              v-for="(item,i) in dingdanId"
+              :key="i"
+              :label="item.purchaseNo"
+              :value="item.purchaseNo"
+            >
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="货位编号:" prop="locationId">
-            <el-select v-model="inStorehouse.locationId" placeholder="请选择入库区货位" clearable @change="getOptions">
-              <el-option
-                v-for="item in queryInfo.locationIdList"
-                :key="item"
-                :label="item"
-                :value="item"
-                >
-              </el-option>
-            </el-select>
+          <el-select
+            v-model="inStorehouse.locationId"
+            placeholder="请选择入库区货位"
+            clearable
+            @change="getOptions"
+          >
+            <el-option
+              v-for="(item,i) in huoweiId"
+              :key="i"
+              :label="item.name"
+              :value="item.locationId"
+            >
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="备注:" prop="remarks">
           <el-input
             type="textarea"
             autosize
             placeholder="请输入备注"
-            v-model="inStorehouse.remarks">
+            v-model="inStorehouse.remarks"
+          >
           </el-input>
         </el-form-item>
-
       </el-form>
-      <el-button type="primary" icon="el-icon-plus" class="btm" @click="addInStorehouse">入库</el-button>
-
+      <el-button
+        type="primary"
+        icon="el-icon-plus"
+        class="btm"
+        @click="addInStorehouse"
+        >入库</el-button
+      >
     </div>
   </el-card>
 </template>
 
 <script>
 export default {
-  data () {
+  data() {
     return {
-      user: '',
-      queryInfo: {
-        receivingIdList: '',
-        locationIdList: ''
-      },
+      user: "",
+      dingdanId: [],
+      huoweiId: [],
       inStorehouse: {
-        inStorehouseId: '',
-        receivingId: '',
-        locationId: '',
-        remarks: '',
-        createPerson: '',
-        checkPerson: '',
-        status: ''
+        inStorehouseId: "",
+        receivingId: "",
+        locationId: "",
+        remarks: "",
+        no:'',
+        storeHouseSid:"",
+        storeHouseName:"",
+        createPerson: "",
+        checkPerson: "",
+        status: "",
+      },
+      queryInfos: {
+        total: 0,
+        current: 1,
+        size: 100,
+        params: {
+          purchaseNo:''
+        }
+      },
+      queryPamas: {
+        query: '',
+        pageNum: 1,
+        pageSize: 10
       },
       rules: {
         receivingId: [
-          { required: true, message: '请输入条码', trigger: 'blur' }
+          { required: true, message: "请输入条码", trigger: "blur" },
         ],
         locationId: [
-          { required: true, message: '请输入源货位编码', trigger: 'blur' }
-        ]
-      }
-    }
+          { required: true, message: "请输入源货位编码", trigger: "blur" },
+        ],
+      },
+    };
   },
   methods: {
-    async getOptions () {
-      const { data: result } = await this.$http.get('/putIn/getQuery', { params: this.inStorehouse })
-      // if(result.status === 201) return this.$message.error("获取采购订单失败")
-      this.queryInfo.receivingIdList = result.data.receivingIdList
-      this.queryInfo.locationIdList = result.data.locationIdList
-      if (result.data.locationIdList.length === 0 & this.inStorehouse.receivingId.length !== 0) return this.$message.error('没有对应出库中的入库区货位')
+    async getOptions() {
+      const { data: result } = await this.$http.post('/purchasenew/listAll', { params: this.queryInfos })
+      const { data: datas } = await this.$http.get('/location/list', { params: this.queryPamas })
+      this.dingdanId = result.data;
+      this.huoweiId = datas.data.rows;
     },
 
-    addInStorehouse () {
-      this.$refs.onPutInRuleForm.validate(async validate => {
-        if (!validate) return this.$message.error('请输入必填项')
-        this.inStorehouse.status = '待审核'
-        this.inStorehouse.createPerson = this.user
-        const now = new Date()
-        this.inStorehouse.inStorehouseId = 'IN' + now.getTime()
-        const { data: result } = await this.$http.post('/putIn/addInStorehouse', this.inStorehouse)
-        if (result.status === 201) return this.$message.error('入库失败')
-        this.$message.success(result.data)
-        this.$refs.onPutInRuleForm.resetFields()
-      })
-    }
-
+    addInStorehouse() {
+      this.$refs.onPutInRuleForm.validate(async (validate) => {
+        if (!validate) return this.$message.error("请输入必填项");
+        this.inStorehouse.status = "待审核";
+        this.inStorehouse.createPerson = this.user;
+        const now = new Date();
+        this.inStorehouse.inStorehouseId = "IN" + now.getTime();
+        this.inStorehouse.no = this.inStorehouse.receivingId
+        this.inStorehouse.storeHouseSid = this.inStorehouse.locationId
+        let location =this.huoweiId.find((item)=>{
+          return item.locationId === this.inStorehouse.locationId;//筛选出匹配数据
+        })
+        this.inStorehouse.storeHouseName= location.name;
+        // const { data: result } = await this.$http.post('/putIn/addInStorehouse', this.inStorehouse)
+        const { data: result } = await this.$http.post(
+          "/input/addInStorehouse",
+          this.inStorehouse
+        );
+        if (result.code != 200){
+          this.$message.error(result.msg)
+          return ;
+        }
+        this.$message.success('操作成功')
+        this.$refs.onPutInRuleForm.resetFields();
+      });
+    },
   },
-  mounted () {
-    this.getOptions()
-    this.user = window.sessionStorage.getItem('token').substr(32)
-  }
-}
+  mounted() {
+    this.getOptions();
+    // this.user = window.sessionStorage.getItem("token").substr(32);
+  },
+};
 </script>
 
 <style>
-  .box-card{
-    height: 95%;
-    width: 95%;
-
-  }
-  .form{
-    position: absolute;
-    top: 40%;
-    left: 35%;
-    /* right: 20%; */
-  }
-  .btm{
-    /* align-items: center; */
-    position: absolute;
-    left: 60%;
-  }
+.box-card {
+  height: 95%;
+  width: 95%;
+}
+.form {
+  position: absolute;
+  top: 40%;
+  left: 35%;
+  /* right: 20%; */
+}
+.btm {
+  /* align-items: center; */
+  position: absolute;
+  left: 60%;
+}
 </style>
diff --git a/warehousing-system/project_web/src/components/stockManagement/stockList.vue b/warehousing-system/project_web/src/components/stockManagement/stockList.vue
index 721732c1..075cac3b 100644
--- a/warehousing-system/project_web/src/components/stockManagement/stockList.vue
+++ b/warehousing-system/project_web/src/components/stockManagement/stockList.vue
@@ -3,14 +3,15 @@
   <el-card class="box-card">
     <el-row :gutter="20">
       <el-col :span="9">
-        <el-input clearable v-model="queryInfo.query" placeholder="请输入商品名" prefix-icon="el-icon-search">
+        <el-input clearable v-model="queryInfo.params.proName" placeholder="请输入商品名" prefix-icon="el-icon-search">
           <el-button slot="append" icon="el-icon-search" @click="getStockList"></el-button>
         </el-input>
       </el-col>
     </el-row>
-    <el-table :data="stockList.slice((queryInfo.pageNum-1)*queryInfo.pageSize,queryInfo.pageNum*queryInfo.pageSize)"
-    style="width: 100%"
+    <el-table :data="stockList"
+    style="width: 100%" height="500"
     stripe border fixed>
+    <el-table-column label="序号" type="index" width="60" :index="indexMethod" fixed align="center" />
         <el-table-column
           align="center"
           prop="proName"
@@ -37,14 +38,14 @@
         </el-table-column>
         <el-table-column
           align="center"
-          prop="num"
-          label="数量"
+          prop="confirmedPrice"
+          label="单价"
           width="80">
         </el-table-column>
         <el-table-column
           align="center"
-          prop="weight"
-          label="重量"
+          prop="num"
+          label="数量"
           width="80">
         </el-table-column>
       <el-table-column
@@ -82,9 +83,9 @@
      <el-pagination
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
-            :current-page="queryInfo.pageNum"
+            :current-page="queryInfo.current"
             :page-sizes="[10, 20, 30, 40]"
-            :page-size="queryInfo.pageSize"
+            :page-size="queryInfo.size"
             layout="total, sizes, prev, pager, next, jumper"
             :total="total">
       </el-pagination>
@@ -100,9 +101,9 @@ export default {
   data () {
     return {
       queryInfo: {
-        query: '',
-        pageNum: 1,
-        pageSize: 10
+        params: {},
+        current: 1,
+        size: 10
       },
       total: 0,
       stockList: []
@@ -110,20 +111,24 @@ export default {
   },
   methods: {
     handleSizeChange (val) {
-      this.queryInfo.pageSize = val
+      this.queryInfo.size = val
       this.getStockList()
     },
-
+    indexMethod(index) {
+      var pagestart = (this.queryInfo.current - 1) * this.queryInfo.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
     handleCurrentChange (val) {
-      this.queryInfo.pageNum = val
+      this.queryInfo.current = val
       this.getStockList()
     },
-
     async getStockList () {
-      const { data: result } = await this.$http.post('/stock/listPage', { params: this.queryInfo })
+      const { data: result } = await this.$http.post('/stock/listPage',  this.queryInfo )
       if (result.code !== "200") return this.$message.error('获取列表失败')
       this.total = result.data.total
       this.stockList = result.data.records
+      console.log( this.stockList);
     }
 
   },
diff --git a/warehousing-system/project_web/src/main.js b/warehousing-system/project_web/src/main.js
index 09b6fc27..a8fc19d2 100644
--- a/warehousing-system/project_web/src/main.js
+++ b/warehousing-system/project_web/src/main.js
@@ -18,7 +18,6 @@ import axios from 'axios'
 /* 设定axios的请求根目录 */
 axios.defaults.baseURL = 'http://jianguan.yyundong.com/warehouseapi/'
 //axios.defaults.baseURL = 'http://127.0.0.1:9050/'
-// axios.defaults.baseURL = 'http://192.168.3.183:9050/'
 // axios.defaults.baseURL = 'http://manage.jt.com/'
 // axios.defaults.baseURL = 'http://yichuwh.com/'
 
diff --git a/warehousing-system/project_web/src/plugins/element.js b/warehousing-system/project_web/src/plugins/element.js
index f6f82ec2..a8595811 100644
--- a/warehousing-system/project_web/src/plugins/element.js
+++ b/warehousing-system/project_web/src/plugins/element.js
@@ -43,7 +43,8 @@ import {
   Footer,
   Collapse,
   CollapseItem,
-  DatePicker
+  DatePicker,
+  Loading
 } from 'element-ui'
 
 Vue.use(Button)
@@ -88,6 +89,7 @@ Vue.use(Footer)
 Vue.use(Collapse)
 Vue.use(CollapseItem)
 Vue.use(DatePicker)
+Vue.use(Loading)
 
 // 将弹框组件挂载到Vue对象中 用户可以使用this关键字调用
 Vue.prototype.$message = Message
diff --git a/yxt-portal-ui/src/views/Home/Home.vue b/yxt-portal-ui/src/views/Home/Home.vue
index a35b932f..02c69152 100644
--- a/yxt-portal-ui/src/views/Home/Home.vue
+++ b/yxt-portal-ui/src/views/Home/Home.vue
@@ -222,7 +222,7 @@
       return {
         menus: [{
             imgUrl: require('@/assets/home/bIcon5.png'),
-            title: '客户中心'
+            title: '企业中心'
           },
           {
             imgUrl: require('@/assets/home/bIcon6.png'),
@@ -440,8 +440,8 @@
         if (index === 11) {
           window.open('/#/index', '_blank')
         } else if (index === 0) {
-          window.open('http://127.0.0.1:9531/#/' + '?token=' + getStorage(), '_blank')
-          // window.open('http://jianguan.yyundong.com/customer/#/' + '?token=' + getStorage(), '_blank')
+          // window.open('http://127.0.0.1:9531/#/' + '?token=' + getStorage(), '_blank')
+          window.open('http://jianguan.yyundong.com/customer/#/' + '?token=' + getStorage(), '_blank')
         } else if (index === 1) {
           // window.open('http://192.168.3.8:9531#/' + '?token=' + getStorage(), '_blank')
           window.open('http://jianguan.yyundong.com/report/#/' + '?token=' + getStorage(), '_blank')
diff --git a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-ui/src/layout/components/Navbar.vue b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-ui/src/layout/components/Navbar.vue
index d7842b7c..c0acc8ab 100644
--- a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-ui/src/layout/components/Navbar.vue
+++ b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-ui/src/layout/components/Navbar.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="navbar">
-      <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png" style="width: 45px;height: 45px;margin-right: 10px;">汇融云仓贷后监管平台</p>
+      <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png" style="width: 45px;height: 45px;margin-right: 10px;">汇融云仓清分系统-中鸿记</p>
       <!-- <h3 class="breadcrumb-container">汇融银行供应链贷后监管平台</h3> -->
       <div class="right-menu">
         <!--        <p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p>-->
@@ -11,7 +11,7 @@
         <span class="backToHome" @click="logout"><i class="el-icon-back" />返回首页</span>
       </div>
     </div>
-    <el-footer class="footer" height="40px">Copyright © {{ year }} 汇融云仓贷后监管平台 All Rights Reserved</el-footer>
+    <el-footer class="footer" height="40px">Copyright © {{ year }} 汇融云仓清分系统-中鸿记 All Rights Reserved</el-footer>
   </div>
 </template>
 
diff --git a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-ui/src/settings.js b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-ui/src/settings.js
index 358411dc..658ad779 100644
--- a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-ui/src/settings.js
+++ b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-ui/src/settings.js
@@ -1,6 +1,6 @@
 module.exports = {
 
-  title: '汇融云眼仓后监管平台',
+  title: '汇融云仓清分系统-中鸿记',
 
   /**
    * @type {boolean} true | false
diff --git a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-ui/vue.config.js b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-ui/vue.config.js
index ccad0303..71c27d51 100644
--- a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-ui/vue.config.js
+++ b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-ui/vue.config.js
@@ -6,7 +6,7 @@ function resolve(dir) {
   return path.join(__dirname, dir)
 }
 
-const name = defaultSettings.title || '汇融云仓贷后监管平台' // page title
+const name = defaultSettings.title || '汇融云仓清分系统-中鸿记' // page title
 
 // 如果端口设置为80，
 // 使用管理员权限执行命令行。
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/pom.xml b/yxt_supervise/supervise-customer/supervise-customer-biz/pom.xml
index de18f2bc..5d576bc5 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/pom.xml
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/pom.xml
@@ -123,7 +123,13 @@
             <classifier>jdk15</classifier>
             <version>2.4</version>
         </dependency>
-<!--        <dependency>-->
+        <dependency>
+            <groupId>com.yxt.supervise</groupId>
+            <artifactId>supervise-report-api</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <!--        <dependency>-->
 <!--            <groupId>com.yxt.supervise</groupId>-->
 <!--            <artifactId>supervise-report-api</artifactId>-->
 <!--            <version>0.0.1-SNAPSHOT</version>-->
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventorylog/GdInventoryLogRest.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventorylog/GdInventoryLogRest.java
index bec4ef55..84762c9d 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventorylog/GdInventoryLogRest.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventorylog/GdInventoryLogRest.java
@@ -43,4 +43,5 @@ public class GdInventoryLogRest {
             return rb.setMsg("未得到上传日志");
         return rb.success().setData(log);
     }
+
 }
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchorderinfo/DispatchOrderinfoMapper.xml b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchorderinfo/DispatchOrderinfoMapper.xml
index 7e22a65d..7163cfb3 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchorderinfo/DispatchOrderinfoMapper.xml
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchorderinfo/DispatchOrderinfoMapper.xml
@@ -4,7 +4,7 @@
 <!--    <where> ${ew.sqlSegment} </where>-->
 <!--    ${ew.customSqlSegment} -->
 	<select id="selectPageVo" resultType="com.yxt.supervise.dispatchcenter.api.dispatchorderinfo.DispatchOrderinfoVo">
-		SELECT * FROM dispatch_orderinfo <where> ${ew.sqlSegment} </where>
+		SELECT * FROM dispatch_orderinfo <where> ${ew.sqlSegment} </where> order by  id desc
 	</select>
 	
 	<select id="selectListAllVo" resultType="com.yxt.supervise.dispatchcenter.api.dispatchorderinfo.DispatchOrderinfoVo">
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchorderinfo/DispatchOrderinfoService.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchorderinfo/DispatchOrderinfoService.java
index c47b554f..db5dfce5 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchorderinfo/DispatchOrderinfoService.java
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchorderinfo/DispatchOrderinfoService.java
@@ -28,7 +28,12 @@ package com.yxt.supervise.dispatchcenter.biz.dispatchorderinfo;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.supervise.dispatchcenter.api.dispatchopmalarm.DispatchOpmAlarm;
+import com.yxt.supervise.dispatchcenter.api.dispatchopmalarmhis.DispatchOpmAlarmHis;
+import com.yxt.supervise.dispatchcenter.api.dispatchopmalarmhis.DispatchOpmAlarmHisDto;
 import com.yxt.supervise.dispatchcenter.api.dispatchorderstandards.DispatchOrderStandardsDto;
+import com.yxt.supervise.dispatchcenter.biz.dispatchopmalarm.DispatchOpmAlarmService;
+import com.yxt.supervise.dispatchcenter.biz.dispatchopmalarmhis.DispatchOpmAlarmHisService;
 import com.yxt.supervise.dispatchcenter.biz.dispatchorderstandards.DispatchOrderStandardsService;
 import com.yxt.supervise.dispatchcenter.biz.dispatchworker.DispatchWorkerService;
 import org.apache.commons.lang3.StringUtils;
@@ -69,6 +74,10 @@ public class DispatchOrderinfoService extends MybatisBaseService<DispatchOrderin
 	private DispatchOrderStandardsService dispatchOrderStandardsService;
 	@Autowired
 	private DispatchWorkerService dispatchWorkerService;
+	@Autowired
+	private DispatchOpmAlarmService dispatchOpmAlarmService;
+	@Autowired
+	private DispatchOpmAlarmHisService dispatchOpmAlarmHisService;
 	private QueryWrapper<DispatchOrderinfo> createQueryWrapper(DispatchOrderinfoQuery query) {
 		// todo: 这里根据具体业务调整查询条件
 		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@@ -103,6 +112,7 @@ public class DispatchOrderinfoService extends MybatisBaseService<DispatchOrderin
 		if (StringUtils.isNotBlank(query.getPlanfinishtimeEnd())) {
 			qw.lt("planfinishtime", query.getPlanfinishtimeEnd());
 		}
+
 		return qw;
 	}
 	
@@ -135,6 +145,16 @@ public class DispatchOrderinfoService extends MybatisBaseService<DispatchOrderin
 		d.setTemplatesid(dto.getTemplatesid());
 		dispatchOrderStandardsService.insertByDto(d);
 		dispatchWorkerService.insertByDto(dto.getWorkers(),entity.getSid());
+		String alarmid = dto.getAlarmid();
+		if(StringUtils.isNotBlank(alarmid)){
+			DispatchOpmAlarm dispatchOpmAlarm = dispatchOpmAlarmService.fetchBySid(alarmid);
+			if(dispatchOpmAlarm!=null){
+				dispatchOpmAlarmService.deleteBySid(alarmid);
+				DispatchOpmAlarmHisDto dispatchOpmAlarmHisdto = new DispatchOpmAlarmHisDto();
+				BeanUtil.copyProperties(dispatchOpmAlarm,dispatchOpmAlarmHisdto);
+				dispatchOpmAlarmHisService.insertByDto(dispatchOpmAlarmHisdto);
+			}
+		}
 	}
 	@Transactional
 	public void updateByDto(DispatchOrderinfoDto dto){
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/.env.development b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/.env.development
index 2e16b6c9..ccf3e06f 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/.env.development
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/.env.development
@@ -5,6 +5,7 @@ ENV = 'development'
 VUE_APP_BASE_API = '/api'
 
 ## 配置测试和本地开发时的 接口地址
-VUE_APP_URL = "http://jianguan.yyundong.com/api/dispatch"
+VUE_APP_URL = "http://jianguan.yyundong.com"
+##VUE_APP_URL = "http://127.0.0.1:8112"
 #VUE_APP_URL = "http://192.168.1.177:7109"
 #VUE_APP_URL = "http://8.130.39.13:8112"
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/.env.production b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/.env.production
index f9657eff..5d45f122 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/.env.production
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/.env.production
@@ -5,4 +5,4 @@ ENV = 'production'
 VUE_APP_BASE_API = '/api'
 
 ## 配置 正式接口地址
-VUE_APP_URL = "http://120.46.131.15:8111"
+VUE_APP_URL = "http://jianguan.yyundong.com"
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchalarm.js b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchalarm.js
index 1deacdbc..3dcaa291 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchalarm.js
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchalarm.js
@@ -5,7 +5,7 @@ export default {
   // 查询分页列表
   listPage: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchopmalarm/listPage',
+      url: '/dispatch/v1/dispatchopmalarm/listPage',
       method: 'post',
       data: params
     })
@@ -13,7 +13,7 @@ export default {
   // 保存新增记录
   saveOrUpdate: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchopmalarm/save',
+      url: '/dispatch/v1/dispatchopmalarm/save',
       method: 'post',
       data: params
     })
@@ -21,7 +21,7 @@ export default {
   // 通过sid删除一条或多条记录
   delBySids: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchopmalarm/delBySids',
+      url: '/dispatch/v1/dispatchopmalarm/delBySids',
       method: 'post',
       data: params
     })
@@ -29,13 +29,13 @@ export default {
   // 通过sid查询一条记录
   fetchBySid: function(sid) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchopmalarm/fetchDetailsBySid/' + sid
+      url: '/dispatch/v1/dispatchopmalarm/fetchDetailsBySid/' + sid
     })
   },
   // 提交
   doSubmit: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchopmalarm/doSubmit',
+      url: '/dispatch/v1/dispatchopmalarm/doSubmit',
       method: 'post',
       data: params
     })
@@ -43,7 +43,7 @@ export default {
   // 导入
   importExcel: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchopmalarm/importExcel',
+      url: '/dispatch/v1/dispatchopmalarm/importExcel',
       method: 'post',
       data: params
     })
@@ -51,7 +51,7 @@ export default {
   // 导出
   exportExcel: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchopmalarm/exportExcel',
+      url: '/dispatch/v1/dispatchopmalarm/exportExcel',
       method: 'post',
       data: params
     })
@@ -59,7 +59,7 @@ export default {
   // 告警新增
     saveOrUpdates: function(params) {
       return request({
-        url: '/yxtdispatchcenter/v1/dispatchopmalarm/save',
+        url: '/dispatch/v1/dispatchopmalarm/save',
         method: 'post',
         data: params
       })
@@ -67,7 +67,7 @@ export default {
       // 查询分页列表
   listPages: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchopmalarm/listPage',
+      url: '/dispatch/v1/dispatchopmalarm/listPage',
       method: 'post',
       data: params
     })
@@ -75,7 +75,7 @@ export default {
       // 查询任务项列表信息
   listPageA: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchmodletemplate/listPage',
+      url: '/dispatch/v1/dispatchmodletemplate/listPage',
       method: 'post',
       data: params
     })
@@ -83,7 +83,7 @@ export default {
       // 查询运维人员信息
   listPageB: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchworker/listPage',
+      url: '/dispatch/v1/dispatchworker/listPage',
       method: 'post',
       data: params
     })
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchalarmhis.js b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchalarmhis.js
index fcb12b19..15522a75 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchalarmhis.js
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchalarmhis.js
@@ -5,7 +5,7 @@ export default {
   // 查询分页列表
   listPage: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchopmalarmhis/listPage',
+      url: '/dispatch/v1/dispatchopmalarmhis/listPage',
       method: 'post',
       data: params
     })
@@ -13,7 +13,7 @@ export default {
   // 保存新增记录
   saveOrUpdate: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchopmalarmhis/save',
+      url: '/dispatch/v1/dispatchopmalarmhis/save',
       method: 'post',
       data: params
     })
@@ -21,7 +21,7 @@ export default {
   // 通过sid删除一条或多条记录
   delBySids: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchopmalarmhis/delBySids',
+      url: '/dispatch/v1/dispatchopmalarmhis/delBySids',
       method: 'post',
       data: params
     })
@@ -29,13 +29,13 @@ export default {
   // 通过sid查询一条记录
   fetchBySid: function(sid) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchopmalarmhis/fetchDetailsBySid/' + sid
+      url: '/dispatch/v1/dispatchopmalarmhis/fetchDetailsBySid/' + sid
     })
   },
   // 提交
   doSubmit: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchopmalarmhis/doSubmit',
+      url: '/dispatch/v1/dispatchopmalarmhis/doSubmit',
       method: 'post',
       data: params
     })
@@ -43,7 +43,7 @@ export default {
   // 导入
   importExcel: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchopmalarmhis/importExcel',
+      url: '/dispatch/v1/dispatchopmalarmhis/importExcel',
       method: 'post',
       data: params
     })
@@ -51,7 +51,7 @@ export default {
   // 导出
   exportExcel: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchopmalarmhis/exportExcel',
+      url: '/dispatch/v1/dispatchopmalarmhis/exportExcel',
       method: 'post',
       data: params
     })
@@ -59,7 +59,7 @@ export default {
   // 告警新增
     saveOrUpdates: function(params) {
       return request({
-        url: '/yxtdispatchcenter/v1/dispatchopmalarmhis/save',
+        url: '/dispatch/v1/dispatchopmalarmhis/save',
         method: 'post',
         data: params
       })
@@ -67,7 +67,7 @@ export default {
       // 查询分页列表
   listPages: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchopmalarmhis/listPage',
+      url: '/dispatch/v1/dispatchopmalarmhis/listPage',
       method: 'post',
       data: params
     })
@@ -75,7 +75,7 @@ export default {
       // 查询任务项列表信息
   listPageA: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchmodletemplate/listPage',
+      url: '/dispatch/v1/dispatchmodletemplate/listPage',
       method: 'post',
       data: params
     })
@@ -83,7 +83,7 @@ export default {
       // 查询运维人员信息
   listPageB: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchworker/listPage',
+      url: '/dispatch/v1/dispatchworker/listPage',
       method: 'post',
       data: params
     })
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchmodletemplate.js b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchmodletemplate.js
index e0e9c85c..4c2d6004 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchmodletemplate.js
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchmodletemplate.js
@@ -5,7 +5,7 @@ export default {
   // 查询分页列表
   listPage: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchtemplate/listPage',
+      url: '/dispatch/v1/dispatchtemplate/listPage',
       method: 'post',
       data: params
     })
@@ -13,7 +13,7 @@ export default {
   // 保存新增记录
   saveOrUpdate: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchtemplate/save',
+      url: '/dispatch/v1/dispatchtemplate/save',
       method: 'post',
       data: params
     })
@@ -21,7 +21,7 @@ export default {
   // 通过sid删除一条或多条记录
   delBySids: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchtemplate/delBySids',
+      url: '/dispatch/v1/dispatchtemplate/delBySids',
       method: 'post',
       data: params
     })
@@ -29,13 +29,13 @@ export default {
   // 通过sid查询一条记录
   fetchBySid: function(sid) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchtemplate/fetchDetailsBySid/' + sid
+      url: '/dispatch/v1/dispatchtemplate/fetchDetailsBySid/' + sid
     })
   },
   // 提交
   doSubmit: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchtemplate/doSubmit',
+      url: '/dispatch/v1/dispatchtemplate/doSubmit',
       method: 'post',
       data: params
     })
@@ -43,7 +43,7 @@ export default {
   // 导入
   importExcel: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchmodletemplate/importExcel',
+      url: '/dispatch/v1/dispatchmodletemplate/importExcel',
       method: 'post',
       data: params
     })
@@ -51,7 +51,7 @@ export default {
   // 导出
   exportExcel: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchmodletemplate/exportExcel',
+      url: '/dispatch/v1/dispatchmodletemplate/exportExcel',
       method: 'post',
       data: params
     })
@@ -59,7 +59,7 @@ export default {
   // 关联
   save: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchmodletemplate/save',
+      url: '/dispatch/v1/dispatchmodletemplate/save',
       method: 'post',
       data: params
     })
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchorderinfo.js b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchorderinfo.js
index 006877d5..f4cc5be2 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchorderinfo.js
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchorderinfo.js
@@ -5,15 +5,21 @@ export default {
   // 查询分页列表
   listPage: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchorderinfo/listPage',
+      url: '/dispatch/v1/dispatchorderinfo/listPage',
       method: 'post',
       data: params
     })
   },
+  entlistPage: function(){
+    return request({
+      url: '/crm/v1/enterpriseinformation/list',
+      method: 'post'
+    })
+  },
   // 保存新增记录
   saveOrUpdate: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchorderinfo/save',
+      url: '/dispatch/v1/dispatchorderinfo/save',
       method: 'post',
       data: params
     })
@@ -21,7 +27,7 @@ export default {
   // 通过sid删除一条或多条记录
   delBySids: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchorderinfo/delBySids',
+      url: '/dispatch/v1/dispatchorderinfo/delBySids',
       method: 'post',
       data: params
     })
@@ -29,13 +35,13 @@ export default {
   // 通过sid查询一条记录
   fetchBySid: function(sid) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchorderinfo/fetchDetailsBySid/' + sid
+      url: '/dispatch/v1/dispatchorderinfo/fetchDetailsBySid/' + sid
     })
   },
   // 提交
   doSubmit: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchorderinfo/doSubmit',
+      url: '/dispatch/v1/dispatchorderinfo/doSubmit',
       method: 'post',
       data: params
     })
@@ -43,7 +49,7 @@ export default {
   // 导入
   importExcel: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchorderinfo/importExcel',
+      url: '/dispatch/v1/dispatchorderinfo/importExcel',
       method: 'post',
       data: params
     })
@@ -51,7 +57,7 @@ export default {
   // 导出
   exportExcel: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchorderinfo/exportExcel',
+      url: '/dispatch/v1/dispatchorderinfo/exportExcel',
       method: 'post',
       data: params
     })
@@ -59,7 +65,7 @@ export default {
   // 告警新增
     saveOrUpdates: function(params) {
       return request({
-        url: '/yxtdispatchcenter/v1/dispatchopmalarm/save',
+        url: '/dispatch/v1/dispatchopmalarm/save',
         method: 'post',
         data: params
       })
@@ -67,7 +73,7 @@ export default {
       // 查询分页列表
   listPages: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchopmalarm/listPage',
+      url: '/dispatch/v1/dispatchopmalarm/listPage',
       method: 'post',
       data: params
     })
@@ -75,7 +81,7 @@ export default {
       // 查询任务项列表信息
   listPageA: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchmodletemplate/listPage',
+      url: '/dispatch/v1/dispatchmodletemplate/listPage',
       method: 'post',
       data: params
     })
@@ -83,9 +89,10 @@ export default {
       // 查询运维人员信息
   listPageB: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchworker/listPage',
+      url: '/dispatch/v1/dispatchworker/listPage',
       method: 'post',
       data: params
     })
-  }
+  },
+
 }
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchpatrolmodle.js b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchpatrolmodle.js
index 2889cfb5..82bfd030 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchpatrolmodle.js
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchpatrolmodle.js
@@ -5,7 +5,7 @@ export default {
   // 查询分页列表
   listPage: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchpatrolmodle/listPage',
+      url: '/dispatch/v1/dispatchpatrolmodle/listPage',
       method: 'post',
       data: params
     })
@@ -13,7 +13,7 @@ export default {
   // 保存新增记录
   saveOrUpdate: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchpatrolmodle/save',
+      url: '/dispatch/v1/dispatchpatrolmodle/save',
       method: 'post',
       data: params
     })
@@ -21,7 +21,7 @@ export default {
   // 通过sid删除一条或多条记录
   delBySids: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchpatrolmodle/delBySids',
+      url: '/dispatch/v1/dispatchpatrolmodle/delBySids',
       method: 'post',
       data: params
     })
@@ -29,13 +29,13 @@ export default {
   // 通过sid查询一条记录
   fetchBySid: function(sid) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchpatrolmodle/fetchDetailsBySid/' + sid
+      url: '/dispatch/v1/dispatchpatrolmodle/fetchDetailsBySid/' + sid
     })
   },
   // 提交
   doSubmit: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchpatrolmodle/doSubmit',
+      url: '/dispatch/v1/dispatchpatrolmodle/doSubmit',
       method: 'post',
       data: params
     })
@@ -43,7 +43,7 @@ export default {
   // 导入
   importExcel: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchpatrolmodle/importExcel',
+      url: '/dispatch/v1/dispatchpatrolmodle/importExcel',
       method: 'post',
       data: params
     })
@@ -51,7 +51,7 @@ export default {
   // 导出
   exportExcel: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchpatrolmodle/exportExcel',
+      url: '/dispatch/v1/dispatchpatrolmodle/exportExcel',
       method: 'post',
       data: params
     })
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchpatrolplan.js b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchpatrolplan.js
index 5909727e..3358293d 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchpatrolplan.js
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchpatrolplan.js
@@ -5,15 +5,21 @@ export default {
   // 查询分页列表
   listPage: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchpatrolplan/listPage',
+      url: '/dispatch/v1/dispatchpatrolplan/listPage',
       method: 'post',
       data: params
     })
   },
+  entlistPage: function(){
+    return request({
+      url: '/crm/v1/enterpriseinformation/list',
+      method: 'post'
+    })
+  },
   // 保存新增记录
   saveOrUpdate: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchpatrolplan/save',
+      url: '/dispatch/v1/dispatchpatrolplan/save',
       method: 'post',
       data: params
     })
@@ -21,7 +27,7 @@ export default {
   // 通过sid删除一条或多条记录
   delBySids: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchpatrolplan/delBySids',
+      url: '/dispatch/v1/dispatchpatrolplan/delBySids',
       method: 'post',
       data: params
     })
@@ -29,13 +35,13 @@ export default {
   // 通过sid查询一条记录
   fetchBySid: function(sid) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchpatrolplan/fetchDetailsBySid/' + sid
+      url: '/dispatch/v1/dispatchpatrolplan/fetchDetailsBySid/' + sid
     })
   },
   // 提交
   doSubmit: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchpatrolplan/doSubmit',
+      url: '/dispatch/v1/dispatchpatrolplan/doSubmit',
       method: 'post',
       data: params
     })
@@ -43,7 +49,7 @@ export default {
   // 导入
   importExcel: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchpatrolplan/importExcel',
+      url: '/dispatch/v1/dispatchpatrolplan/importExcel',
       method: 'post',
       data: params
     })
@@ -51,7 +57,7 @@ export default {
   // 导出
   exportExcel: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchpatrolplan/exportExcel',
+      url: '/dispatch/v1/dispatchpatrolplan/exportExcel',
       method: 'post',
       data: params
     })
@@ -59,7 +65,7 @@ export default {
   // 查询任务项列表信息
   listPageA: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchmodletemplate/listPage',
+      url: '/dispatch/v1/dispatchmodletemplate/listPage',
       method: 'post',
       data: params
     })
@@ -67,7 +73,7 @@ export default {
   // 查询运维人员信息
   listPageB: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchplanworker/listPage',
+      url: '/dispatch/v1/dispatchplanworker/listPage',
       method: 'post',
       data: params
     })
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchstandards.js b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchstandards.js
index 62af7f8d..9952c270 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchstandards.js
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchstandards.js
@@ -5,7 +5,7 @@ export default {
   // 查询分页列表
   listPage: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchstandards/listPageForTemplate',
+      url: '/dispatch/v1/dispatchstandards/listPageForTemplate',
       method: 'post',
       data: params
     })
@@ -13,7 +13,7 @@ export default {
   // 保存新增记录
   saveOrUpdate: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchstandards/save',
+      url: '/dispatch/v1/dispatchstandards/save',
       method: 'post',
       data: params
     })
@@ -21,7 +21,7 @@ export default {
   // 通过sid删除一条或多条记录
   delBySids: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchstandards/delBySids',
+      url: '/dispatch/v1/dispatchstandards/delBySids',
       method: 'post',
       data: params
     })
@@ -29,13 +29,13 @@ export default {
   // 通过sid查询一条记录
   fetchBySid: function(sid) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchstandards/fetchDetailsBySid/' + sid
+      url: '/dispatch/v1/dispatchstandards/fetchDetailsBySid/' + sid
     })
   },
   // 提交
   doSubmit: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchstandards/doSubmit',
+      url: '/dispatch/v1/dispatchstandards/doSubmit',
       method: 'post',
       data: params
     })
@@ -43,7 +43,7 @@ export default {
   // 导入
   importExcel: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchstandards/importExcel',
+      url: '/dispatch/v1/dispatchstandards/importExcel',
       method: 'post',
       data: params
     })
@@ -51,7 +51,7 @@ export default {
   // 导出
   exportExcel: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchstandards/exportExcel',
+      url: '/dispatch/v1/dispatchstandards/exportExcel',
       method: 'post',
       data: params
     })
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchtemplate.js b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchtemplate.js
index d817c9d7..b8ffa2b4 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchtemplate.js
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchtemplate.js
@@ -5,7 +5,7 @@ export default {
   // 查询分页列表
   listPage: function (params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchtemplate/listPage',
+      url: '/dispatch/v1/dispatchtemplate/listPage',
       method: 'post',
       data: params
     })
@@ -13,7 +13,7 @@ export default {
   // 保存新增记录
   saveOrUpdate: function (params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchtemplate/save',
+      url: '/dispatch/v1/dispatchtemplate/save',
       method: 'post',
       data: params
     })
@@ -21,7 +21,7 @@ export default {
   // 通过sid删除一条或多条记录
   delBySids: function (params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchtemplate/delBySids',
+      url: '/dispatch/v1/dispatchtemplate/delBySids',
       method: 'post',
       data: params
     })
@@ -29,13 +29,13 @@ export default {
   // 通过sid查询一条记录
   fetchBySid: function (sid) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchtemplate/fetchDetailsBySid/' + sid
+      url: '/dispatch/v1/dispatchtemplate/fetchDetailsBySid/' + sid
     })
   },
   // 提交
   doSubmit: function (params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchtemplate/doSubmit',
+      url: '/dispatch/v1/dispatchtemplate/doSubmit',
       method: 'post',
       data: params
     })
@@ -43,7 +43,7 @@ export default {
   // 导入
   importExcel: function (params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchtemplate/importExcel',
+      url: '/dispatch/v1/dispatchtemplate/importExcel',
       method: 'post',
       data: params
     })
@@ -51,7 +51,7 @@ export default {
   // 导出
   exportExcel: function (params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchtemplate/exportExcel',
+      url: '/dispatch/v1/dispatchtemplate/exportExcel',
       method: 'post',
       data: params
     })
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchworker.js b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchworker.js
index 1c86c3cd..52510acb 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchworker.js
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchworker.js
@@ -5,7 +5,7 @@ export default {
   // 查询分页列表
   listPage: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchworker/listPage',
+      url: '/dispatch/v1/dispatchworker/listPage',
       method: 'post',
       data: params
     })
@@ -13,7 +13,7 @@ export default {
   // 保存新增记录
   saveOrUpdate: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchworker/save',
+      url: '/dispatch/v1/dispatchworker/save',
       method: 'post',
       data: params
     })
@@ -21,7 +21,7 @@ export default {
   // 通过sid删除一条或多条记录
   delBySids: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchworker/delBySids',
+      url: '/dispatch/v1/dispatchworker/delBySids',
       method: 'post',
       data: params
     })
@@ -29,13 +29,13 @@ export default {
   // 通过sid查询一条记录
   fetchBySid: function(sid) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchworker/fetchDetailsBySid/' + sid
+      url: '/dispatch/v1/dispatchworker/fetchDetailsBySid/' + sid
     })
   },
   // 提交
   doSubmit: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchworker/doSubmit',
+      url: '/dispatch/v1/dispatchworker/doSubmit',
       method: 'post',
       data: params
     })
@@ -43,7 +43,7 @@ export default {
   // 导入
   importExcel: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchworker/importExcel',
+      url: '/dispatch/v1/dispatchworker/importExcel',
       method: 'post',
       data: params
     })
@@ -51,7 +51,7 @@ export default {
   // 导出
   exportExcel: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchworker/exportExcel',
+      url: '/dispatch/v1/dispatchworker/exportExcel',
       method: 'post',
       data: params
     })
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/sysmenu.js b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/sysmenu.js
index aa382c0c..03e6794b 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/sysmenu.js
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/sysmenu.js
@@ -5,7 +5,7 @@ export default {
   // 查询分页列表
   listPage: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/sysmenu/listPage',
+      url: '/dispatch/v1/sysmenu/listPage',
       method: 'post',
       data: params
     })
@@ -13,7 +13,7 @@ export default {
   // 保存新增记录
   saveOrUpdate: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/sysmenu/save',
+      url: '/dispatch/v1/sysmenu/save',
       method: 'post',
       data: params
     })
@@ -21,7 +21,7 @@ export default {
   // 通过sid删除一条或多条记录
   delBySids: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/sysmenu/delBySids',
+      url: '/dispatch/v1/sysmenu/delBySids',
       method: 'post',
       data: params
     })
@@ -29,13 +29,13 @@ export default {
   // 通过sid查询一条记录
   fetchBySid: function(sid) {
     return request({
-      url: '/yxtdispatchcenter/v1/sysmenu/fetchDetailsBySid/' + sid
+      url: '/dispatch/v1/sysmenu/fetchDetailsBySid/' + sid
     })
   },
   // 提交
   doSubmit: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/sysmenu/doSubmit',
+      url: '/dispatch/v1/sysmenu/doSubmit',
       method: 'post',
       data: params
     })
@@ -43,7 +43,7 @@ export default {
   // 导入
   importExcel: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/sysmenu/importExcel',
+      url: '/dispatch/v1/sysmenu/importExcel',
       method: 'post',
       data: params
     })
@@ -51,7 +51,7 @@ export default {
   // 导出
   exportExcel: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/sysmenu/exportExcel',
+      url: '/dispatch/v1/sysmenu/exportExcel',
       method: 'post',
       data: params
     })
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/alarm/dispatchorderinfoAdd.vue b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/alarm/dispatchorderinfoAdd.vue
new file mode 100644
index 00000000..3b7b7d1f
--- /dev/null
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/alarm/dispatchorderinfoAdd.vue
@@ -0,0 +1,430 @@
+<template>
+	<div>
+		<!-- 标题按钮部分开始 -->
+		<div class="tab-header webtop">
+			<!-- 标题 -->
+			<div>{{ viewTitle }}</div>
+			<!-- start 添加修改按钮 -->
+			<div>
+				<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
+				<el-button type="info" size="small" @click="handleReturn()">返回</el-button>
+			</div>
+			<!-- end 添加修改按钮 -->
+			<!-- end 详情按钮 -->
+		</div>
+		<!-- 标题按钮部分结束 -->
+		<!-- Start 新增修改部分 -->
+		<div class="main-content">
+			<div class="searchcon">
+			  <el-form v-show="isSearchShow" ref="form_obj" :model="formobj" :rules="rules" label-position="right" class="demo-form-inline">
+				<div class="listtop">
+		           <div class="tit">巡视工单信息</div>
+		        </div>
+				<el-row>
+					<el-col :span="2" class="tleftb">
+						<span><span class="icon">*</span>客户名称：</span>
+					</el-col>
+					<el-col :span="3" class="trightb">
+						<el-form-item prop="custname">
+             <!--<el-input size="small" v-model="formobj.custname" placeholder="客户名称" class="addinputw" clearable />-->
+              <el-select
+                           v-model="formobj.custid"
+                           class="addinputw"
+                           placeholder="客户名称"
+                           size="small"
+                           @change="custnamechangeValue($event)"
+              >
+                <el-option
+                  v-for="(item, i) in custList"
+                  :key="i"
+                  :label="item.enterpriseName"
+                  :value="item.sid"
+                />
+              </el-select>
+            </el-form-item>
+					</el-col>
+					<el-col :span="2" class="tleftb">
+						<span><span class="icon">*</span>工单编号：</span>
+					</el-col>
+					<el-col :span="3" class="trightb">
+						<el-form-item prop="orderno"><el-input size="small"  v-model="formobj.orderno" placeholder="工单编号" class="addinputw" clearable /></el-form-item>
+					</el-col>
+					<el-col :span="2" class="tleftb">
+						<span><span class="icon">*</span>工单名称：</span>
+					</el-col>
+					<el-col :span="2" class="trightb">
+						<el-form-item prop="ordername"><el-input size="small" v-model="formobj.ordername" placeholder="工单名称" class="addinputw" clearable /></el-form-item>
+					</el-col>
+					<el-col :span="2" class="tleftb">
+						<span><span class="icon">*</span>工单内容：</span>
+					</el-col>
+					<el-col :span="3" class="trightb">
+						<el-form-item prop="ordercontent"><el-input size="small" v-model="formobj.ordercontent" placeholder="工单内容" class="addinputw" clearable /></el-form-item>
+					</el-col>
+					<el-col :span="2" class="tleftb">
+						<span><span class="icon">*</span>模板：</span>
+					</el-col>
+					<el-col :span="3" class="trightb">
+						<el-select   @change="changeValue($event)"
+                          v-model="formobj.templatesid"
+                          class="addinputw"
+                          placeholder="模板"
+						  size="small"
+                        >
+                          <el-option
+                            v-for="(item, i) in dataList"
+                            :key="i"
+                            :label="item.templatename"
+                            :value="item.sid"
+                          />
+                        </el-select>
+					</el-col>
+				</el-row>
+				<el-row>
+					<el-col :span="2" class="tleftb">
+						<span><span class="icon">*</span>现场联系人：</span>
+					</el-col>
+					<el-col :span="3" class="trightb">
+						<el-form-item prop="receiveperson"><el-input size="small" v-model="formobj.receiveperson" placeholder="现场联系人" class="addinputw" clearable /></el-form-item>
+					</el-col>
+					<el-col :span="3" class="tleftb">
+						<span><span class="icon">*</span>现场联系人电话：</span>
+					</el-col>
+					<el-col :span="3" class="trightb">
+						<el-form-item prop="receivetel"><el-input size="small" v-model="formobj.receivetel" placeholder="现场联系人电话" class="addinputw" clearable /></el-form-item>
+					</el-col>
+					<el-col :span="2" class="tleftb">
+						<span><span class="icon">*</span>巡视类型：</span>
+					</el-col>
+					<el-col :span="3" class="trightb">
+						<el-select
+                          v-model="formobj.ordertype"
+                          class="addinputw"
+                          placeholder="类型"
+						  size="small"
+                        >
+                          <el-option
+                            v-for="(item, i) in arr"
+                            :key="i"
+                            :label="item.type"
+                            :value="item.value"
+                          />
+                        </el-select>
+					</el-col>
+					<el-col :span="2" class="tleftb">
+						<span><span class="icon">*</span>等级：</span>
+					</el-col>
+					<el-col :span="3" class="trightb">
+						<el-select
+                          v-model="formobj.orderdegree"
+                          class="addinputw"
+                          placeholder="等级"
+						  size="small"
+                        >
+                          <el-option
+                            v-for="(item, i) in arrList"
+                            :key="i"
+                            :label="item.type"
+                            :value="item.type"
+                          />
+                        </el-select>
+					</el-col>
+				</el-row>
+			</el-form>
+		  </div>
+		  <div class="listtop">
+		  <div class="tit">巡视人员</div>
+		  <el-button class="span" type="primary" @click.stop="add()">新增</el-button>
+		</div>
+		  <div>
+            <el-table ref="table" tooltip-effect="dark" :data="TabList" border style="width: 100%" stripe >
+			>
+              <el-table-column fixed width="100" type="index" label="序号"  align="center" />
+			  <el-table-column label="操作" wid align="center" width="150">
+                  <template slot-scope="scope">
+                    <el-button type="primary" size="mini" @click="doCommoditylDel(scope.$index)">删除</el-button>
+                  </template>
+                </el-table-column>
+              <el-table-column prop="principalname" label="巡视人名称" align="center" >
+				<template slot-scope="scope">
+                    <el-input v-model="scope.row.principalname" placeholder="" clearable></el-input>
+                  </template>
+			  </el-table-column>
+              <el-table-column prop="principalcontact" label="联系方式"  align="center" >
+				<template slot-scope="scope">
+                    <el-input v-model="scope.row.principalcontact" placeholder="" clearable></el-input>
+                  </template>
+			  </el-table-column>
+              <el-table-column prop="workteam" label="班组组织" align="center" >
+				<template slot-scope="scope">
+                    <el-input v-model="scope.row.workteam" placeholder="" clearable></el-input>
+                  </template>
+			  </el-table-column>
+              <el-table-column prop="executorname" label="是否负责人" width="150px"  align="center" >
+				<template slot-scope="scope">
+                    <el-radio v-model="scope.row.executorname" label="是">是</el-radio>
+                    <el-radio v-model="scope.row.executorname" label="否">否</el-radio>
+                  </template>
+			  </el-table-column>
+            </el-table>
+        </div>
+		  <div class="listtop">
+		  <div class="tit">任务模板</div>
+		</div>
+		  <div>
+            <el-table  :data="list" border style="width: 100%;text-align: center;">
+              <el-table-column fixed width="100" type="index" label="序号"  align="center" />
+              <el-table-column prop="taskname" label="任务名称" width="200" align="center" />
+              <el-table-column prop="taskdesc" label="巡视内容" align="center" />
+            </el-table>
+        </div>
+	</div>
+	</div>
+</template>
+
+<script>
+import req from '@/api/yxtdispatchcenter/dispatchorderinfo'
+import req2 from '@/api/yxtdispatchcenter/dispatchmodletemplate'
+export default {
+	name: 'DispatchOrderinfoAdd',
+	data() {
+		return {
+			submitdisabled: false,
+			isSearchShow: true,
+			viewTitle: '',
+			searchxianshitit: '显示添加条件',
+			formobj: {
+				id: '',
+				sid: '',
+        alarmid: "",
+				custid: '', // 客户ID
+				custname: '', // 客户名称
+				supervisesid: '', // 监管公司id
+				orderno: '', // 工单编号
+				ordername: '', // 工单名称
+				templatesid: '', // 模板sid
+				orderdegree: '', // 描述：1-一般；2-重要； 3-紧急；4-督办。
+				ordertype: '', // 描述：1-计划巡视；
+				ordercontent: '', // 工单内容
+				receiveperson: '', // 现场联系人
+				receivetel: '', // 现场联系人电话
+				workers:[]
+			},
+      custList:[],
+			arr:[{value:1,type:'计划巡视'},{value:2,type:'专项巡视'},{value:3,type:'告警巡视'}],
+			arrList:[{value:1,type:'一般'},{value:2,type:'重要'},{value:3,type:'紧急'},{value:4,type:'督办'}],
+			TabList:[],
+			dataList:[],
+			list:[],
+			rules: {
+				custid: [{ required: true, message: '客户ID不能为空', trigger: 'blur' }], // 客户ID
+				custname: [{ required: true, message: '客户名称不能为空', trigger: 'blur' }], // 客户名称
+				supervisesid: [{ required: true, message: '监管公司id不能为空', trigger: 'blur' }], // 监管公司id
+				orderno: [{ required: true, message: '用法说明：工单编号规则。不能为空', trigger: 'blur' }], // 用法说明：工单编号规则。
+				ordername: [{ required: true, message: '工单名称不能为空', trigger: 'blur' }], // 工单名称
+				orderdegree: [{ required: true, message: '描述不能为空', trigger: 'blur' }], // 描述：1-一般；2-重要； 3-紧急；4-督办。
+				ordertype: [{ required: true, message: '描述不能为空', trigger: 'blur' }], // 描述：1-计划巡视；
+				ordercontent: [{ required: true, message: '工单内容不能为空', trigger: 'blur' }], // 工单内容
+				// arrivetime: [{ required: true, message: '到达现场时间不能为空', trigger: 'blur' }], // 到达现场时间
+				// planfinishtime: [{ required: true, message: '完成时间不能为空', trigger: 'blur' }], // 完成时间
+				operationcontent: [{ required: true, message: '处理情况不能为空', trigger: 'blur' }], // 处理情况
+				receiveperson: [{ required: true, message: '现场联系人不能为空', trigger: 'blur' }], // 现场联系人
+				receivetel: [{ required: true, message: '现场联系人电话不能为空', trigger: 'blur' }] // 现场联系人电话
+			},
+			queryParams: {
+				current: 1,
+				size: 100,
+				total: 0,
+				params: {
+				sids: [],
+				templateid: '',
+				taskid: ''
+				}
+			},
+			queryParamsA: {
+				current: 1,
+				size: 10,
+				total: 0,
+				params: {
+					orderid:'',
+          templateid:''
+				}
+			}
+		}
+	},
+	mounted(){
+    req2.listPage(this.queryParams).then(resp => {
+      if (resp.success) {
+        const data = resp.data
+        this.dataList = data.records
+      }
+    })
+    req.entlistPage().then(resp => {
+      if (resp.success) {
+        const data = resp.data
+        this.custList = data
+      }
+    })
+	},
+	created() {},
+	methods: {
+    changeValue(value){
+      this.queryParamsA.params.templateid= value;
+      this.ShowList();
+    },
+    custnamechangeValue(value){
+      let enterpriseName = this.custList.find((item) => {
+        return item.sid == value;
+      }).enterpriseName;
+      this.formobj.custname=enterpriseName;
+    },
+		handleReturn(isreload) {
+			if (isreload === 'true') this.$emit('reloadlist')
+			this.formobj.id = ''
+			this.formobj.sid = '' // SID
+			this.formobj.custid = '' // 客户ID
+			this.formobj.custname = '' // 客户名称
+			this.formobj.supervisesid = '' // 监管公司id
+			this.formobj.orderno = '' // 用法说明：工单编号规则。
+			this.formobj.ordername = '' // 工单名称
+			this.formobj.orderdegree = '' // 描述：1-一般；2-重要； 3-紧急；4-督办。
+			this.formobj.ordertype = '' // 描述：1-计划巡视；
+			this.formobj.templatesid = '' // 模板；
+			this.formobj.ordercontent = '' // 工单内容
+			this.formobj.arrivetime = '' // 到达现场时间
+			this.formobj.planfinishtime = '' // 完成时间
+			this.formobj.operationcontent = '' // 处理情况
+			this.formobj.receiveperson = '' // 现场联系人
+			this.formobj.receivetel = '' // 现场联系人电话
+			this.queryParamsA.params.orderid=''
+			this.$refs['form_obj'].resetFields()
+			this.$emit('doback')
+		},
+		// 搜索条件效果
+		 clicksearchShow() {
+          this.isSearchShow = !this.isSearchShow
+          if (this.isSearchShow) {
+            this.searchxianshitit = '隐藏添加条件'
+          } else {
+            this.searchxianshitit = '显示添加条件'
+          }
+        },
+		showAdd(row) {
+      this.formobj.alarmid=row.sid;
+			this.$nextTick(() => {
+				this.$refs['form_obj'].clearValidate()
+			})
+			this.viewTitle = '【新增】工单数据'
+			this.ShowList()
+		},
+		showEdit(row) {
+			this.$nextTick(() => {
+				this.$refs['form_obj'].clearValidate()
+			})
+			this.searchxianshitit = '显示添加条件'
+			this.isSearchShow = true
+			this.viewTitle = '【修改】工单数据'
+			const _this = this
+			req
+				.fetchBySid(row.sid)
+				.then(resp => {
+					if (resp.code==200) {
+						const vdata = resp.data
+						_this.formobj.id = vdata.id
+						_this.formobj.sid = vdata.sid // SID
+						_this.formobj.custid = vdata.custid // 客户ID
+						_this.formobj.custname = vdata.custname // 客户名称
+						_this.formobj.supervisesid = vdata.supervisesid // 监管公司id
+						_this.formobj.orderno = vdata.orderno // 工单编号
+						_this.formobj.ordername = vdata.ordername // 工单名称
+						_this.formobj.orderdegree = vdata.orderdegree // 描述：1-一般；2-重要； 3-紧急；4-督办。
+						_this.formobj.ordertype = vdata.ordertype // 描述：1-计划巡视；
+						_this.formobj.ordercontent = vdata.ordercontent // 工单内容
+						_this.formobj.receiveperson = vdata.receiveperson // 现场联系人
+						_this.formobj.receivetel = vdata.receivetel // 现场联系人电话
+            _this.formobj.templatesid = vdata.templatesid // 模板sid
+            this.queryParamsA.params.templateid= vdata.templatesid // 模板sid
+						// _this.formobj.workers = vdata.workers // 现场联系人电话
+					} else {
+						// 根据resp.code进行异常情况处理
+					}
+				})
+				.catch(e => {
+					this.formobj = row
+				})
+				this.queryParamsA.params.orderid= row.sid
+				this.ShowList()
+				this.ShowYunwei()
+		},
+		saveOrUpdate() {
+      this.formobj.workers=this.$refs.table.data;
+			const _this = this
+			this.$refs['form_obj'].validate(valid => {
+				if (valid) {
+					this.submitdisabled = true
+					req
+						.saveOrUpdate(this.formobj)
+						.then(resp => {
+							this.submitdisabled = false
+							if (resp.success) {
+								_this.$message({ showClose: true, type: 'success', message: resp.msg })
+								_this.handleReturn('true')
+								_this.queryParamsA.params.orderid=''
+							} else {
+								// 根据resp.code进行异常情况处理
+							}
+						})
+						.catch(() => {
+							this.submitdisabled = false
+						})
+				} else {
+					return false
+				}
+			})
+		},
+		handleSelectionChange(val) {
+         this.formobj.workers = val;
+    },
+	  handleSelection(selection){
+        if (selection.length > 1){
+          let del_row = selection.shift();
+              this.$refs.table.toggleRowSelection(del_row, false)
+          }
+	   },
+	   add() {
+        this.TabList.push({
+
+        })
+      },
+	  doCommoditylDel(index) {
+         const tip = '请确认是否删除所选记录?'
+         this.$confirm(tip, '提示', {
+           confirmButtonText: '确定',
+           cancelButtonText: '取消',
+           type: 'warning'
+         }).then(() => {
+           this.TabList.splice(index, 1);
+         })
+     },
+	 // 查询运维人员信息
+	 ShowYunwei(){
+		req.listPageB(this.queryParamsA).then((res)=>{
+      this.TabList= res.data.records
+		})
+	 },
+	 // 查询任务项列表信息
+	 ShowList(){
+
+     var templateid=this.queryParamsA.params.templateid;
+     if (templateid==''){
+        return;
+      }
+		req.listPageA(this.queryParamsA).then((res)=>{
+			this.list = res.data.records
+		})
+	 }
+    }
+}
+</script>
+
+<style scoped></style>
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/alarm/realalarm.vue b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/alarm/realalarm.vue
index 84c6f98b..da95ddaa 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/alarm/realalarm.vue
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/alarm/realalarm.vue
@@ -205,7 +205,7 @@ import ButtonBar from '@/components/ButtonBar'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import divInfo from './alarmInfo'
-import divAdd from '@/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfoAdd'
+import divAdd from '@/views/yxtdispatchcenter/alarm/dispatchorderinfoAdd'
 
 export default {
 	name: 'DispatchOrderinfoIndex',
@@ -433,10 +433,10 @@ export default {
 		 }
         },
 		purchase(row){
-      alert('功能开发中');
-      return;
-      this.viewState = 3
-      this.$refs['divadd'].showEdit(row)
+      // alert('功能开发中');
+      // return;
+      this.viewState = 2
+      this.$refs['divadd'].showAdd(row)
 		}
 	}
 }
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfo.vue b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfo.vue
index 79516e90..2594e028 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfo.vue
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfo.vue
@@ -298,8 +298,8 @@ export default {
 		purchase(row){
 			// this.drawer=true
       this.viewState = 4
-			this.TableList= row
-		},
+			this.TableList = row
+		}
 	}
 }
 </script>
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfoAdd.vue b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfoAdd.vue
index 2a074188..075f4ba5 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfoAdd.vue
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfoAdd.vue
@@ -25,7 +25,23 @@
 						<span><span class="icon">*</span>客户名称：</span>
 					</el-col>
 					<el-col :span="3" class="trightb">
-						<el-form-item prop="custname"><el-input size="small" v-model="formobj.custname" placeholder="客户名称" class="addinputw" clearable /></el-form-item>
+						<el-form-item prop="custname">
+             <!--<el-input size="small" v-model="formobj.custname" placeholder="客户名称" class="addinputw" clearable />-->
+              <el-select
+                           v-model="formobj.custid"
+                           class="addinputw"
+                           placeholder="客户名称"
+                           size="small"
+                           @change="custnamechangeValue($event)"
+              >
+                <el-option
+                  v-for="(item, i) in custList"
+                  :key="i"
+                  :label="item.enterpriseName"
+                  :value="item.sid"
+                />
+              </el-select>
+            </el-form-item>
 					</el-col>
 					<el-col :span="2" class="tleftb">
 						<span><span class="icon">*</span>工单编号：</span>
@@ -194,6 +210,7 @@ export default {
 				receivetel: '', // 现场联系人电话
 				workers:[]
 			},
+      custList:[],
 			arr:[{value:1,type:'计划巡视'},{value:2,type:'专项巡视'},{value:3,type:'告警巡视'}],
 			arrList:[{value:1,type:'一般'},{value:2,type:'重要'},{value:3,type:'紧急'},{value:4,type:'督办'}],
 			TabList:[],
@@ -236,18 +253,30 @@ export default {
 		}
 	},
 	mounted(){
-	  req2.listPage(this.queryParams).then(resp => {
-        if (resp.success) {
-          const data = resp.data
-          this.dataList = data.records
-        }
-	   })
+    req2.listPage(this.queryParams).then(resp => {
+      if (resp.success) {
+        const data = resp.data
+        this.dataList = data.records
+      }
+    })
+    req.entlistPage().then(resp => {
+      if (resp.success) {
+        const data = resp.data
+        this.custList = data
+      }
+    })
 	},
 	created() {},
 	methods: {
     changeValue(value){
       this.queryParamsA.params.templateid= value;
       this.ShowList();
+    },
+    custnamechangeValue(value){
+      let enterpriseName = this.custList.find((item) => {
+        return item.sid == value;
+      }).enterpriseName;
+      this.formobj.custname=enterpriseName;
     },
 		handleReturn(isreload) {
 			if (isreload === 'true') this.$emit('reloadlist')
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfoInfo.vue b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfoInfo.vue
index 3906dd5b..18cfd256 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfoInfo.vue
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfoInfo.vue
@@ -19,21 +19,23 @@
             <el-col :span="2" class="tleftb">
               <span><span class="icon">*</span>客户名称：</span>
             </el-col>
-            <el-col :span="3" class="trightb">
+            <el-col :span="6" class="trightb">
               <el-form-item prop="custname">{{formobj.custname}}</el-form-item>
             </el-col>
             <el-col :span="2" class="tleftb">
-              <span><span class="icon">*</span>工单编号：</span>
+              <span><span class="icon">*</span>工单名称：</span>
             </el-col>
-            <el-col :span="3" class="trightb">
-              <el-form-item prop="orderno">{{formobj.orderno}}</el-form-item>
+            <el-col :span="6" class="trightb">
+              <el-form-item prop="ordername">{{formobj.ordername}}</el-form-item>
             </el-col>
             <el-col :span="2" class="tleftb">
-              <span><span class="icon">*</span>工单名称：</span>
+              <span><span class="icon">*</span>工单编号：</span>
             </el-col>
-            <el-col :span="2" class="trightb">
-              <el-form-item prop="ordername">{{formobj.ordername}}</el-form-item>
+            <el-col :span="6" class="trightb">
+              <el-form-item prop="orderno">{{formobj.orderno}}</el-form-item>
             </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="2" class="tleftb">
               <span><span class="icon">*</span>工单内容：</span>
             </el-col>
@@ -58,20 +60,6 @@
                 />
               </el-select>
             </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="2" class="tleftb">
-              <span><span class="icon">*</span>现场联系人：</span>
-            </el-col>
-            <el-col :span="3" class="trightb">
-              <el-form-item prop="receiveperson">{{formobj.receiveperson}}</el-form-item>
-            </el-col>
-            <el-col :span="3" class="tleftb">
-              <span><span class="icon">*</span>现场联系人电话：</span>
-            </el-col>
-            <el-col :span="3" class="trightb">
-              <el-form-item prop="receivetel">{{formobj.receivetel}}</el-form-item>
-            </el-col>
             <el-col :span="2" class="tleftb">
               <span><span class="icon">*</span>巡视类型：</span>
             </el-col>
@@ -109,6 +97,21 @@
               </el-select>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="2" class="tleftb">
+              <span><span class="icon">*</span>现场联系人：</span>
+            </el-col>
+            <el-col :span="3" class="trightb">
+              <el-form-item prop="receiveperson">{{formobj.receiveperson}}</el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb">
+              <span><span class="icon">*</span>现场联系人电话：</span>
+            </el-col>
+            <el-col :span="3" class="trightb">
+              <el-form-item prop="receivetel">{{formobj.receivetel}}</el-form-item>
+            </el-col>
+
+          </el-row>
         </el-form>
       </div>
       <div class="listtop">
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchpatrolplanAdds.vue b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchpatrolplanAdds.vue
index ac078bf0..55235326 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchpatrolplanAdds.vue
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchpatrolplanAdds.vue
@@ -32,8 +32,29 @@
 						<span><span class="icon">*</span>客户名称：</span>
 					</el-col>
 					<el-col :span="3" class="trightb">
-						<el-form-item prop="custname"><el-input size="small" v-model="formobj.custname" placeholder="客户名称" class="addinputw" clearable /></el-form-item>
+						<el-form-item prop="custname">
+              <el-select
+                v-model="formobj.custid"
+                class="addinputw"
+                placeholder="客户名称"
+                size="small"
+                @change="custnamechangeValue($event)"
+              >
+                <el-option
+                  v-for="(item, i) in custList"
+                  :key="i"
+                  :label="item.enterpriseName"
+                  :value="item.sid"
+                />
+              </el-select>
+            </el-form-item>
 					</el-col>
+          <el-col :span="2" class="tleftb">
+            <span><span class="icon">*</span>计划编号：</span>
+          </el-col>
+          <el-col :span="3" class="trightb">
+            <el-form-item prop="planno"><el-input size="small" v-model="formobj.planno" placeholder="计划编号" class="addinputw" clearable /></el-form-item>
+          </el-col>
 					<el-col :span="2" class="tleftb">
 						<span><span class="icon">*</span>巡视类型：</span>
 					</el-col>
@@ -70,14 +91,16 @@
                           />
                         </el-select>
 					</el-col>
-					<el-col :span="2" class="tleftb">
-						<span><span class="icon">*</span>用户联系人：</span>
-					</el-col>
-					<el-col :span="3" class="trightb">
-						<el-form-item prop="contactperson"><el-input  size="small"  v-model="formobj.contactperson" placeholder="联系人" class="addinputw" clearable /></el-form-item>
-					</el-col>
+
+
 				</el-row>
 				<el-row>
+          <el-col :span="2" class="tleftb">
+            <span><span class="icon">*</span>用户联系人：</span>
+          </el-col>
+          <el-col :span="3" class="trightb">
+            <el-form-item prop="contactperson"><el-input  size="small"  v-model="formobj.contactperson" placeholder="联系人" class="addinputw" clearable /></el-form-item>
+          </el-col>
 					<el-col :span="3" class="tleftb">
 						<span><span class="icon">*</span>用户联系人电话：</span>
 					</el-col>
@@ -113,12 +136,7 @@
 					<el-col :span="2" class="trightb">
 						<el-form-item prop="cyclevalue"><el-input size="small" v-model="formobj.cyclevalue" placeholder="周期值" class="addinputw" clearable /></el-form-item>
 					</el-col>
-					<el-col :span="2" class="tleftb">
-						<span><span class="icon">*</span>计划编号：</span>
-					</el-col>
-					<el-col :span="3" class="trightb">
-						<el-form-item prop="planno"><el-input size="small" v-model="formobj.planno" placeholder="计划编号" class="addinputw" clearable /></el-form-item>
-					</el-col>
+
 				</el-row>
 				<el-row>
 					<el-col :span="3" class="tleftb">
@@ -223,6 +241,7 @@ export default {
 			dataList:[],
 			TabList:[],
 			list:[],
+      custList:[],
       arr:[{value:'1',type:'计划巡视'},{value:'2',type:'专项巡视'},{value:'3',type:'告警巡视'}],
       arrList:[{value:'1',type:'一般'},{value:'2',type:'重要'},{value:'3',type:'紧急'},{value:'4',type:'督办'}],
 			rules: {
@@ -264,17 +283,29 @@ export default {
 	},
 	mounted(){
 	  req2.listPage(this.queryParams).then(resp => {
-		if (resp.success) {
-			const data = resp.data
-			this.dataList = data.records
-		}
+      if (resp.success) {
+        const data = resp.data
+        this.dataList = data.records
+      }
 	   })
+    req.entlistPage().then(resp => {
+      if (resp.success) {
+        const data = resp.data
+        this.custList = data
+      }
+    })
 	},
 	created() {},
 	methods: {
     changeValue(value){
       this.queryParamsA.params.templateid= value;
       this.ShowList();
+    },
+    custnamechangeValue(value){
+      let enterpriseName = this.custList.find((item) => {
+        return item.sid == value;
+      }).enterpriseName;
+      this.formobj.custname=enterpriseName;
     },
 		handleReturn(isreload) {
 			if (isreload === 'true') this.$emit('reloadlist')
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchpatrolplanInfos.vue b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchpatrolplanInfos.vue
index 9a9d6fb8..1c6d20a2 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchpatrolplanInfos.vue
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchpatrolplanInfos.vue
@@ -28,6 +28,12 @@
             <el-col :span="3" class="trightb">
               <el-form-item prop="custname">{{formobj.custname}} </el-form-item>
             </el-col>
+            <el-col :span="2" class="tleftb">
+              <span><span class="icon">*</span>计划编号：</span>
+            </el-col>
+            <el-col :span="3" class="trightb">
+              <el-form-item prop="planno">{{formobj.planno}}</el-form-item>
+            </el-col>
             <el-col :span="2" class="tleftb">
               <span><span class="icon">*</span>巡视类型：</span>
             </el-col>
@@ -66,14 +72,15 @@
                 />
               </el-select>
             </el-col>
+
+          </el-row>
+          <el-row>
             <el-col :span="2" class="tleftb">
               <span><span class="icon">*</span>用户联系人：</span>
             </el-col>
             <el-col :span="3" class="trightb">
               <el-form-item prop="contactperson">{{formobj.contactperson}}</el-form-item>
             </el-col>
-          </el-row>
-          <el-row>
             <el-col :span="3" class="tleftb">
               <span><span class="icon">*</span>用户联系人电话：</span>
             </el-col>
@@ -111,12 +118,7 @@
             <el-col :span="2" class="trightb">
               <el-form-item prop="cyclevalue">{{formobj.cyclevalue}}</el-form-item>
             </el-col>
-            <el-col :span="2" class="tleftb">
-              <span><span class="icon">*</span>计划编号：</span>
-            </el-col>
-            <el-col :span="3" class="trightb">
-              <el-form-item prop="planno">{{formobj.planno}}</el-form-item>
-            </el-col>
+
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/vue.config.js b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/vue.config.js
index 39540a17..fda3724a 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/vue.config.js
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/vue.config.js
@@ -39,12 +39,12 @@ module.exports = {
       errors: true
     },
     proxy: {
-      '/api/yxtdispatchcenter': { // 匹配所有以 '/api'开头的请求路径
+      '/api': { // 匹配所有以 '/api'开头的请求路径
         // target: 'http://192.168.1.109:8111',
          target: process.env.VUE_APP_URL, // 代理目标的基础路径
         changeOrigin: true, // 支持跨域
         pathRewrite: { // 重写路径: 去掉路径中开头的'/api'
-          '^/api/yxtdispatchcenter': ''
+          '^/api': ''
         }
       },
       '/upload': { // 匹配所有以 '/api'开头的请求路径
diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGather.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGather.java
new file mode 100644
index 00000000..f18f8348
--- /dev/null
+++ b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGather.java
@@ -0,0 +1,41 @@
+package com.yxt.supervise.report.api.reportinventorydaygather;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.EntityWithId;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2023/6/26 14:39
+ */
+
+@ApiModel(value = "库存日报表-汇总", description = "库存日报表-汇总")
+@TableName("report_inventory_day_gather")
+@Data
+public class ReportInventoryDayGather extends EntityWithId {
+    //记录创建时间
+    private Date createTime;
+    //备注说明
+    private String remarks;
+    //单据日期
+    private String orderDate;
+    //编号
+    private String serialNumber;
+    //上报时间
+    private String reportTime;
+    //排序
+    private Integer sort;
+    //仓库类型
+    private String storeType;
+    //仓库数量
+    private Integer storeNumber;
+    //品种数量
+    private Integer productCountNumber;
+    //货值
+    private double productAmount;
+    //合计货值
+    private double countAmount;
+}
diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherDto.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherDto.java
new file mode 100644
index 00000000..cac1f6ac
--- /dev/null
+++ b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherDto.java
@@ -0,0 +1,37 @@
+package com.yxt.supervise.report.api.reportinventorydaygather;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2023/6/26 14:39
+ */
+@Data
+public class ReportInventoryDayGatherDto implements Dto {
+    private String id;
+    //记录创建时间
+    private Date createTime;
+    //备注说明
+    private String remarks;
+    //单据日期
+    private String orderDate;
+    //编号
+    private String serialNumber;
+    //上报时间
+    private String reportTime;
+    //排序
+    private Integer sort;
+    //仓库类型
+    private String storeType;
+    //仓库数量
+    private Integer storeNumber;
+    //品种数量
+    private Integer productCountNumber;
+    //货值
+    private double productAmount;
+    //合计货值
+    private double countAmount;
+}
diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherFeign.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherFeign.java
new file mode 100644
index 00000000..599710dd
--- /dev/null
+++ b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherFeign.java
@@ -0,0 +1,35 @@
+package com.yxt.supervise.report.api.reportinventorydaygather;
+
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.supervise.report.api.reportinventorydaystore.ReportInventoryDayStoreVo;
+import com.yxt.supervise.report.api.reportinventorydaytobaccostore.ReportInventoryDayTobaccoStoreVo;
+import io.swagger.annotations.Api;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.ArrayList;
+
+/**
+ * @author wangpengfei
+ * @date 2023/6/27 14:05
+ */
+@Api(tags = "信息")
+@FeignClient(
+        contextId = "supervise-report-reportinventorydaygather",
+        name = "supervise-report",
+        path = "reportinventory",
+        fallback = ReportInventoryDayGatherFeignFallback.class)
+public interface ReportInventoryDayGatherFeign {
+    //
+    @GetMapping("/getReportInventoryDayGathers")
+    @ResponseBody
+    public ResultBean<ReportInventoryDayGatherVo> getReportInventoryDayGathers(String orderDate);
+    @GetMapping("/getReportInventoryDayStores")
+    @ResponseBody
+    public ResultBean<ReportInventoryDayStoreVo> getReportInventoryDayStores(String orderDate);
+    @GetMapping("/getReportInventoryDayToStores")
+    @ResponseBody
+    public ResultBean<ReportInventoryDayTobaccoStoreVo> getReportInventoryDayToStores(String orderDate);
+}
diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherFeignFallback.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherFeignFallback.java
new file mode 100644
index 00000000..8449a66d
--- /dev/null
+++ b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherFeignFallback.java
@@ -0,0 +1,33 @@
+package com.yxt.supervise.report.api.reportinventorydaygather;
+
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.supervise.report.api.reportinventorydaystore.ReportInventoryDayStoreVo;
+import com.yxt.supervise.report.api.reportinventorydaytobaccostore.ReportInventoryDayTobaccoStoreVo;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+import java.util.ArrayList;
+
+/**
+ * @author wangpengfei
+ * @date 2023/6/27 14:06
+ */
+@Component
+public class ReportInventoryDayGatherFeignFallback implements ReportInventoryDayGatherFeign{
+
+    @Override
+    public ResultBean<ReportInventoryDayGatherVo> getReportInventoryDayGathers(String orderDate) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<ReportInventoryDayStoreVo> getReportInventoryDayStores(String orderDate) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<ReportInventoryDayTobaccoStoreVo> getReportInventoryDayToStores(String orderDate) {
+        return null;
+    }
+}
diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherQuery.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherQuery.java
new file mode 100644
index 00000000..4bcb301e
--- /dev/null
+++ b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherQuery.java
@@ -0,0 +1,37 @@
+package com.yxt.supervise.report.api.reportinventorydaygather;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2023/6/26 14:39
+ */
+@Data
+public class ReportInventoryDayGatherQuery implements Query {
+    private String id;
+    //记录创建时间
+    private Date createTime;
+    //备注说明
+    private String remarks;
+    //单据日期
+    private String orderDate;
+    //编号
+    private String serialNumber;
+    //上报时间
+    private String reportTime;
+    //排序
+    private Integer sort;
+    //仓库类型
+    private String storeType;
+    //仓库数量
+    private Integer storeNumber;
+    //品种数量
+    private Integer productCountNumber;
+    //货值
+    private double productAmount;
+    //合计货值
+    private double countAmount;
+}
diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherVo.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherVo.java
new file mode 100644
index 00000000..7eee72a8
--- /dev/null
+++ b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherVo.java
@@ -0,0 +1,40 @@
+package com.yxt.supervise.report.api.reportinventorydaygather;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/6/26 14:39
+ */
+@Data
+public class ReportInventoryDayGatherVo implements Vo {
+    private String id;
+    //记录创建时间
+    private Date createTime;
+    //备注说明
+    private String remarks;
+    //单据日期
+    private String orderDate;
+    //编号
+    private String serialNumber;
+    //上报时间
+    private String reportTime;
+    //排序
+    private Integer sort;
+    //仓库类型
+    private String storeType;
+    //仓库数量
+    private Integer storeNumber;
+    //品种数量
+    private Integer productCountNumber;
+    //货值
+    private BigDecimal productAmount;
+    //合计货值
+    private BigDecimal countAmount;
+    private List<ReportInventoryDayGatherVo> list;
+}
diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaystore/ReportInventoryDayStore.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaystore/ReportInventoryDayStore.java
new file mode 100644
index 00000000..abdc86f7
--- /dev/null
+++ b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaystore/ReportInventoryDayStore.java
@@ -0,0 +1,28 @@
+package com.yxt.supervise.report.api.reportinventorydaystore;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.EntityWithId;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/6/26 17:58
+ */
+@ApiModel(value = "仓库库存报表-汇总", description = "仓库库存报表-汇总")
+@TableName("report_inventory_day_store")
+@Data
+public class ReportInventoryDayStore extends EntityWithId {
+    private String createTime;
+    private String remarks;
+    private String orderDate;
+    private String serialNumber;
+    private String reportTime;
+    private String warehouseType;
+    private String storeCode;
+    private String storeCodeName;
+    private String productCountNumber;
+    private String productAmount;
+    private String countAmount;
+    private String countProductNumber;
+}
diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaystore/ReportInventoryDayStoreDto.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaystore/ReportInventoryDayStoreDto.java
new file mode 100644
index 00000000..2cca6b62
--- /dev/null
+++ b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaystore/ReportInventoryDayStoreDto.java
@@ -0,0 +1,25 @@
+package com.yxt.supervise.report.api.reportinventorydaystore;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/6/26 17:59
+ */
+@Data
+public class ReportInventoryDayStoreDto implements Dto {
+    private String id;
+    private String createTime;
+    private String remarks;
+    private String orderDate;
+    private String serialNumber;
+    private String reportTime;
+    private String warehouseType;
+    private String storeCode;
+    private String storeCodeName;
+    private String productCountNumber;
+    private String productAmount;
+    private String countAmount;
+    private String countProductNumber;
+}
diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaystore/ReportInventoryDayStoreQuery.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaystore/ReportInventoryDayStoreQuery.java
new file mode 100644
index 00000000..e792524e
--- /dev/null
+++ b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaystore/ReportInventoryDayStoreQuery.java
@@ -0,0 +1,25 @@
+package com.yxt.supervise.report.api.reportinventorydaystore;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/6/26 17:59
+ */
+@Data
+public class ReportInventoryDayStoreQuery implements Query {
+    private String id;
+    private String createTime;
+    private String remarks;
+    private String orderDate;
+    private String serialNumber;
+    private String reportTime;
+    private String warehouseType;
+    private String storeCode;
+    private String storeCodeName;
+    private String productCountNumber;
+    private String productAmount;
+    private String countAmount;
+    private String countProductNumber;
+}
diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaystore/ReportInventoryDayStoreVo.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaystore/ReportInventoryDayStoreVo.java
new file mode 100644
index 00000000..be8ccf88
--- /dev/null
+++ b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaystore/ReportInventoryDayStoreVo.java
@@ -0,0 +1,30 @@
+package com.yxt.supervise.report.api.reportinventorydaystore;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/6/26 17:59
+ */
+@Data
+public class ReportInventoryDayStoreVo implements Vo {
+
+    private String id;
+    private String createTime;
+    private String remarks;
+    private String orderDate;
+    private String serialNumber;
+    private String reportTime;
+    private String warehouseType;
+    private String storeCode;
+    private String storeCodeName;
+    private Integer productCountNumber;
+    private BigDecimal productAmount;
+    private BigDecimal countAmount;
+    private BigDecimal countProductNumber;
+    private List<ReportInventoryDayStoreVo> list;
+}
diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaytobaccostore/ReportInventoryDayTobaccoStore.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaytobaccostore/ReportInventoryDayTobaccoStore.java
new file mode 100644
index 00000000..340cb3b0
--- /dev/null
+++ b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaytobaccostore/ReportInventoryDayTobaccoStore.java
@@ -0,0 +1,40 @@
+package com.yxt.supervise.report.api.reportinventorydaytobaccostore;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.EntityWithId;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/6/27 8:48
+ */
+@ApiModel(value = "仓库库存报表-汇总", description = "仓库库存报表-汇总")
+@TableName("report_inventory_day_tobacco_store")
+@Data
+public class ReportInventoryDayTobaccoStore extends EntityWithId {    //记录创建时间
+    private String createTime;
+    //备注说明
+    private String remarks;
+    //单据日期
+    private String orderDate;
+    //编号
+    private String serialNumber;
+    //上报时间
+    private String reportTime;
+    //仓库类型
+    private String warehouseType;
+    //门店编号
+    private String storeCode;
+    //[门店编号]门店名称
+    private String storeCodeName;
+    //品种数量
+    private String productCountNumber;
+    //货值
+    private String productAmount;
+    //合计货值
+    private String countAmount;
+    //合计品种数量
+    private String countProductNumber;
+
+}
diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaytobaccostore/ReportInventoryDayTobaccoStoreDto.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaytobaccostore/ReportInventoryDayTobaccoStoreDto.java
new file mode 100644
index 00000000..99805b51
--- /dev/null
+++ b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaytobaccostore/ReportInventoryDayTobaccoStoreDto.java
@@ -0,0 +1,35 @@
+package com.yxt.supervise.report.api.reportinventorydaytobaccostore;
+
+import com.yxt.common.core.dto.Dto;
+
+/**
+ * @author wangpengfei
+ * @date 2023/6/27 8:48
+ */
+public class ReportInventoryDayTobaccoStoreDto implements Dto {
+    //记录创建时间
+    private String createTime;
+    //备注说明
+    private String remarks;
+    //单据日期
+    private String orderDate;
+    //编号
+    private String serialNumber;
+    //上报时间
+    private String reportTime;
+    //仓库类型
+    private String warehouseType;
+    //门店编号
+    private String storeCode;
+    //[门店编号]门店名称
+    private String storeCodeName;
+    //品种数量
+    private String productCountNumber;
+    //货值
+    private String productAmount;
+    //合计货值
+    private String countAmount;
+    //合计品种数量
+    private String countProductNumber;
+
+}
diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaytobaccostore/ReportInventoryDayTobaccoStoreQuery.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaytobaccostore/ReportInventoryDayTobaccoStoreQuery.java
new file mode 100644
index 00000000..67fae7de
--- /dev/null
+++ b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaytobaccostore/ReportInventoryDayTobaccoStoreQuery.java
@@ -0,0 +1,35 @@
+package com.yxt.supervise.report.api.reportinventorydaytobaccostore;
+
+import com.yxt.common.core.query.Query;
+
+/**
+ * @author wangpengfei
+ * @date 2023/6/27 8:49
+ */
+public class ReportInventoryDayTobaccoStoreQuery implements Query {
+    //记录创建时间
+    private String createTime;
+    //备注说明
+    private String remarks;
+    //单据日期
+    private String orderDate;
+    //编号
+    private String serialNumber;
+    //上报时间
+    private String reportTime;
+    //仓库类型
+    private String warehouseType;
+    //门店编号
+    private String storeCode;
+    //[门店编号]门店名称
+    private String storeCodeName;
+    //品种数量
+    private String productCountNumber;
+    //货值
+    private String productAmount;
+    //合计货值
+    private String countAmount;
+    //合计品种数量
+    private String countProductNumber;
+
+}
diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaytobaccostore/ReportInventoryDayTobaccoStoreVo.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaytobaccostore/ReportInventoryDayTobaccoStoreVo.java
new file mode 100644
index 00000000..3c77957b
--- /dev/null
+++ b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaytobaccostore/ReportInventoryDayTobaccoStoreVo.java
@@ -0,0 +1,41 @@
+package com.yxt.supervise.report.api.reportinventorydaytobaccostore;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/6/27 8:49
+ */
+@Data
+public class ReportInventoryDayTobaccoStoreVo implements Vo {
+    private String id;
+    //记录创建时间
+    private String createTime;
+    //备注说明
+    private String remarks;
+    //单据日期
+    private String orderDate;
+    //编号
+    private String serialNumber;
+    //上报时间
+    private String reportTime;
+    //仓库类型
+    private String warehouseType;
+    //门店编号
+    private String storeCode;
+    //[门店编号]门店名称
+    private String storeCodeName;
+    //品种数量
+    private Integer productCountNumber;
+    //货值
+    private BigDecimal productAmount;
+    //合计货值
+    private BigDecimal countAmount;
+    //合计品种数量
+    private BigDecimal countProductNumber;
+    private List<ReportInventoryDayTobaccoStoreVo> list;
+}
diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreport/CsmCashReportRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreport/CsmCashReportRest.java
index 35d0e1ce..142fe74e 100644
--- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreport/CsmCashReportRest.java
+++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreport/CsmCashReportRest.java
@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*;
  */
 @Api(tags = "回款报告")
 @RestController
-@RequestMapping("v1/csmcashreport")
+@RequestMapping("reportwxmpapi/v1/csmcashreport")
 public class CsmCashReportRest {
     @Autowired
     CsmCashReportService csmCashReportService;
diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreportcashedtoday/CsmCashReportCashedTodayRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreportcashedtoday/CsmCashReportCashedTodayRest.java
index 442aed79..28b5bae8 100644
--- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreportcashedtoday/CsmCashReportCashedTodayRest.java
+++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreportcashedtoday/CsmCashReportCashedTodayRest.java
@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.*;
  * @date 2023/6/21 10:56
  */
 @RestController
-@RequestMapping("v1/csmcashreportcashed")
+@RequestMapping("reportwxmpapi/v1/csmcashreportcashed")
 public class CsmCashReportCashedTodayRest {
     @Autowired
     CsmCashReportCashedTodayService csmCashReportCashedTodayService;
diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreportsalesyesterday/CsmCashReportSalesYesterdayRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreportsalesyesterday/CsmCashReportSalesYesterdayRest.java
index 77eb88f4..f8a5996e 100644
--- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreportsalesyesterday/CsmCashReportSalesYesterdayRest.java
+++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreportsalesyesterday/CsmCashReportSalesYesterdayRest.java
@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.*;
  * @date 2023/6/21 10:57
  */
 @RestController
-@RequestMapping("v1/csmcashreportsales")
+@RequestMapping("reportwxmpapi/v1/csmcashreportsales")
 public class CsmCashReportSalesYesterdayRest {
     @Autowired
     CsmCashReportSalesYesterdayService csmCashReportSalesYesterdayService;
diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayGatherMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayGatherMapper.java
index 7e5c8f20..52bfe128 100644
--- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayGatherMapper.java
+++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayGatherMapper.java
@@ -1,6 +1,9 @@
 package com.yxt.supervise.report.biz.reportinventory;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGatherVo;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -76,4 +79,8 @@ public interface ReportInventoryDayGatherMapper extends BaseMapper<ReportInvento
             " sum(prodValue)  " +
             "from gd_inventory_yc giy where warehouseType=2 ")
     double countProductAmountYc();
+    @Select("select * from report_inventory_day_gather where orderDate=#{orderDate}")
+    List<ReportInventoryDayGatherVo> getReportInventoryDayGathers(@Param("orderDate") String orderDate);
+    @Select("select * from report_inventory_day_gather where orderDate=#{orderDate} limit 1")
+    ReportInventoryDayGatherVo getReportInventoryDayGather(@Param("orderDate") String orderDate);
 }
diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayGatherService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayGatherService.java
index c8f51e69..e5a13133 100644
--- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayGatherService.java
+++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayGatherService.java
@@ -1,7 +1,13 @@
 package com.yxt.supervise.report.biz.reportinventory;
 
 import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGatherQuery;
+import com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGatherVo;
+import com.yxt.supervise.report.api.reportinventorydaystore.ReportInventoryDayStoreVo;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -75,4 +81,14 @@ public class ReportInventoryDayGatherService extends ServiceImpl<ReportInventory
 
         super.saveBatch(whInList);
     }
+    public ReportInventoryDayGatherVo getReportInventoryDayGather(String orderDate) {
+        QueryWrapper<com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGather> qw = new QueryWrapper<>();
+        ReportInventoryDayGatherVo vo=baseMapper.getReportInventoryDayGather(orderDate);
+        List<ReportInventoryDayGatherVo> pagging = baseMapper.getReportInventoryDayGathers(orderDate);
+        if(null==vo){
+            return vo;
+        }
+        vo.setList(pagging);
+        return vo;
+    }
 }
diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayStoreMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayStoreMapper.java
index 0d51094f..39ce8e9a 100644
--- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayStoreMapper.java
+++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayStoreMapper.java
@@ -1,6 +1,8 @@
 package com.yxt.supervise.report.biz.reportinventory;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGatherVo;
+import com.yxt.supervise.report.api.reportinventorydaystore.ReportInventoryDayStoreVo;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -22,4 +24,8 @@ public interface ReportInventoryDayStoreMapper extends BaseMapper<ReportInventor
             "from gd_inventory_ok gio where warehouseType=2 " +
             "group by warehouseCode ")
     List<ReportInventoryDayStore> listCountStore();
+    @Select("select * from report_inventory_day_store where orderDate=#{orderDate}")
+    List<ReportInventoryDayStoreVo> getReportInventoryDayStores(@Param("orderDate") String orderDate);
+    @Select("select countAmount,countProductNumber from report_inventory_day_store where orderDate=#{orderDate} limit 1")
+    ReportInventoryDayStoreVo getReportInventoryDayStore(@Param("orderDate") String orderDate);
 }
diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayStoreService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayStoreService.java
index 4f01dcf4..82a5919a 100644
--- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayStoreService.java
+++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayStoreService.java
@@ -1,6 +1,9 @@
 package com.yxt.supervise.report.biz.reportinventory;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGatherVo;
+import com.yxt.supervise.report.api.reportinventorydaystore.ReportInventoryDayStoreVo;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -28,4 +31,15 @@ public class ReportInventoryDayStoreService extends ServiceImpl<ReportInventoryD
         super.saveBatch(list);
 
     }
+    public ReportInventoryDayStoreVo getReportInventoryDayStore(String orderDate) {
+        QueryWrapper<com.yxt.supervise.report.api.reportinventorydaystore.ReportInventoryDayStore> qw = new QueryWrapper<>();
+        ReportInventoryDayStoreVo vo=baseMapper.getReportInventoryDayStore(orderDate);
+        List<ReportInventoryDayStoreVo> pagging = baseMapper.getReportInventoryDayStores(orderDate);
+        if(null==vo){
+            return vo;
+        }
+        vo.setList(pagging);
+        return vo;
+    }
+
 }
diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayTobaccoStoreMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayTobaccoStoreMapper.java
index 800b577e..50b7ec42 100644
--- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayTobaccoStoreMapper.java
+++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayTobaccoStoreMapper.java
@@ -1,6 +1,9 @@
 package com.yxt.supervise.report.biz.reportinventory;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGatherVo;
+import com.yxt.supervise.report.api.reportinventorydaystore.ReportInventoryDayStoreVo;
+import com.yxt.supervise.report.api.reportinventorydaytobaccostore.ReportInventoryDayTobaccoStoreVo;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -22,4 +25,8 @@ public interface ReportInventoryDayTobaccoStoreMapper extends BaseMapper<ReportI
             "from gd_inventory_yc giy where warehouseType=2  " +
             "group by warehouseCode ")
     List<ReportInventoryDayTobaccoStore> listCountStore();
+    @Select("select * from report_inventory_day_tobacco_store where orderDate=#{orderDate}")
+    List<ReportInventoryDayTobaccoStoreVo> getReportInventoryDayToStores(@Param("orderDate") String orderDate);
+    @Select("select countAmount,countProductNumber from report_inventory_day_tobacco_store where orderDate=#{orderDate} limit 1")
+    ReportInventoryDayTobaccoStoreVo getReportInventoryDayToStore(@Param("orderDate") String orderDate);
 }
diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayTobaccoStoreService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayTobaccoStoreService.java
index a2dc5b04..e3e44bde 100644
--- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayTobaccoStoreService.java
+++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayTobaccoStoreService.java
@@ -1,6 +1,10 @@
 package com.yxt.supervise.report.biz.reportinventory;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yxt.supervise.report.api.reportinventorydaystore.ReportInventoryDayStore;
+import com.yxt.supervise.report.api.reportinventorydaystore.ReportInventoryDayStoreVo;
+import com.yxt.supervise.report.api.reportinventorydaytobaccostore.ReportInventoryDayTobaccoStoreVo;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -28,4 +32,14 @@ public class ReportInventoryDayTobaccoStoreService extends ServiceImpl<ReportInv
 
         super.saveBatch(list);
     }
+    public ReportInventoryDayTobaccoStoreVo getReportInventoryDayToStore(String orderDate) {
+        QueryWrapper<com.yxt.supervise.report.api.reportinventorydaytobaccostore.ReportInventoryDayTobaccoStore> qw = new QueryWrapper<>();
+        ReportInventoryDayTobaccoStoreVo vo=baseMapper.getReportInventoryDayToStore(orderDate);
+        List<ReportInventoryDayTobaccoStoreVo> pagging = baseMapper.getReportInventoryDayToStores(orderDate);
+        if(null==vo){
+            return vo;
+        }
+        vo.setList(pagging);
+        return vo;
+    }
 }
diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryRest.java
index 49dbbd35..b9209fb3 100644
--- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryRest.java
+++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryRest.java
@@ -1,19 +1,30 @@
 package com.yxt.supervise.report.biz.reportinventory;
 
+import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGatherFeign;
+import com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGatherQuery;
+import com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGatherVo;
+import com.yxt.supervise.report.api.reportinventorydaystore.ReportInventoryDayStoreVo;
+import com.yxt.supervise.report.api.reportinventorydaytobaccostore.ReportInventoryDayTobaccoStoreVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
 
 @RestController("com.yxt.supervise.report.biz.reportinventory.reportInventoryRest")
 @RequestMapping("/reportinventory")
-public class ReportInventoryRest {
+public class ReportInventoryRest implements ReportInventoryDayGatherFeign {
 
     @Autowired
     private ReportInventoryService reportInventoryService;
+    @Autowired
+    private ReportInventoryDayGatherService reportInventoryDayGatherService;
+    @Autowired
+    private ReportInventoryDayStoreService reportInventoryDayStoreService;
+    @Autowired
+    private ReportInventoryDayTobaccoStoreService reportInventoryDayTobaccoStoreService;
 
     @GetMapping("/kcReport")
     public ResultBean kcReport(@RequestParam("orderDate") String orderDate) {
@@ -27,4 +38,67 @@ public class ReportInventoryRest {
         reportInventoryService.buildInventoryReportByDay(orderDate);
         return rb.success();
     }
+    //
+    @GetMapping("/getReportInventoryDayGather/{orderDate}")
+    public ResultBean<ReportInventoryDayGatherVo> getReportInventoryDayGather(@PathVariable("orderDate") String orderDate){
+        ResultBean rb = ResultBean.fireFail();
+        ReportInventoryDayGatherVo pv = reportInventoryDayGatherService.getReportInventoryDayGather(orderDate);
+        if(null==pv){
+            return rb.success().setData(new ArrayList<>());
+        }
+        return rb.success().setData(pv);
+    }
+    @GetMapping("/getReportInventoryDayStore/{orderDate}")
+    public ResultBean<ReportInventoryDayStoreVo> getReportInventoryDayStore(@PathVariable("orderDate") String orderDate){
+        ResultBean rb = ResultBean.fireFail();
+        ReportInventoryDayStoreVo pv = reportInventoryDayStoreService.getReportInventoryDayStore(orderDate);
+        if(null==pv){
+            return rb.success().setData(new ArrayList<>());
+        }
+        return rb.success().setData(pv);
+    }
+    @GetMapping("/getReportInventoryDayToStore/{orderDate}")
+    public ResultBean<ReportInventoryDayTobaccoStoreVo> getReportInventoryDayToStore(@PathVariable("orderDate") String orderDate){
+        ResultBean rb = ResultBean.fireFail();
+        ReportInventoryDayTobaccoStoreVo pv = reportInventoryDayTobaccoStoreService.getReportInventoryDayToStore(orderDate);
+        if(null==pv){
+            return rb.success().setData(new ArrayList<>());
+        }
+        return rb.success().setData(pv);
+    }
+    //
+    @GetMapping("/getReportInventoryDayGathers")
+    public ResultBean<ReportInventoryDayGatherVo> getReportInventoryDayGathers(String orderDate){
+        ResultBean rb = ResultBean.fireFail();
+        ReportInventoryDayGatherVo pv = reportInventoryDayGatherService.getReportInventoryDayGather(orderDate);
+        if(null==pv){
+            return rb.success().setData(new ArrayList<>());
+        }
+        return rb.success().setData(pv);
+    }
+    @GetMapping("/getReportInventoryDayStores")
+    public ResultBean<ReportInventoryDayStoreVo> getReportInventoryDayStores(String orderDate){
+        ResultBean rb = ResultBean.fireFail();
+        ReportInventoryDayStoreVo pv = reportInventoryDayStoreService.getReportInventoryDayStore(orderDate);
+        if(null==pv){
+            return rb.success().setData(new ArrayList<>());
+        }
+        return rb.success().setData(pv);
+    }
+    @GetMapping("/getReportInventoryDayToStores")
+    public ResultBean<ReportInventoryDayTobaccoStoreVo> getReportInventoryDayToStores(String orderDate){
+        ResultBean rb = ResultBean.fireFail();
+        ReportInventoryDayTobaccoStoreVo pv = reportInventoryDayTobaccoStoreService.getReportInventoryDayToStore(orderDate);
+        if(null==pv){
+            return rb.success().setData(new ArrayList<>());
+        }
+        return rb.success().setData(pv);
+    }
+    //下载excel
+    @GetMapping("/downloadExcel/{orderDate}")
+    public ResultBean<String> downloadExcel(@PathVariable("orderDate") String orderDate) {
+        ResultBean rb = ResultBean.fireFail();
+        String log = reportInventoryService.buildsExcelById(orderDate);
+        return rb.success().setData(log);
+    }
 }
diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryService.java
index 9759c3a7..19c81772 100644
--- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryService.java
+++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryService.java
@@ -22,4 +22,91 @@ public class ReportInventoryService {
         reportInventoryDayStoreService.clearAndBuildOfDay(orderDate);
         reportInventoryDayTobaccoStoreService.clearAndBuildOfDay(orderDate);
     }
+    public String buildsExcelById(String orderDate) {
+//        long millis = System.currentTimeMillis();
+//        GdInventoryLog gdInventoryLog = baseMapper.selectById(logsid);
+//        if (gdInventoryLog == null)
+//            return null;
+//        String orderDate = gdInventoryLog.getOrderDate();
+//
+//        String xlsxpath = xlsxtmplPath + "库存汇总表模板.xlsx";
+//        File srcFile = FileUtil.file(xlsxpath);
+//        String tfile = "kchzb/库存汇总表" + orderDate + ".xlsx";
+//
+//        String url = urlPrefix + tfile;
+//        String toFileName = uploadPath + tfile;
+//        File file = FileUtil.file(toFileName);
+//        FileUtil.copy(srcFile, file, true);
+//
+//        ExcelWriter writer = ExcelUtil.getWriter(file);
+//
+//        ReportInventoryDayGatherVo vo = ReportInventoryDayGatherFeign.getReportInventoryDayGathers(orderDate).getData();
+//        if (null!=vo) {
+//            //ReportInventoryDayGather gather = gatherList.get(0);
+//            // 库存汇总日报表
+//            writer.setSheet(0);
+//            writer.writeCellValue(0, 1, "编号：" + vo.getSerialNumber());
+//            writer.writeCellValue(3, 1, vo.getReportTime());
+//            int countRow = vo.getList().size() + 3;
+//            for (int y = 3; y < countRow; y++) {
+//                ReportInventoryDayGatherVo map = vo.getList().get(y - 3);
+//                writer.writeCellValue(0, y, map.getStoreType());
+//                writer.writeCellValue(1, y, map.getStoreNumber());
+//                writer.writeCellValue(2, y, map.getProductCountNumber());
+//                writer.writeCellValue(3, y, map.getProductAmount());
+//            }
+//            writer.writeCellValue(0, countRow, "合计");
+//            writer.writeCellValue(1, countRow, "");
+//            writer.writeCellValue(2, countRow, "");
+//            writer.writeCellValue(3, countRow, vo.getCountAmount());
+//        }
+//
+//        ReportInventoryDayStoreVo storeVo = ReportInventoryDayGatherFeign.getReportInventoryDayStores(orderDate).getData();
+//        if (null !=storeVo) {
+//            //ReportInventoryDayStore store = storeList.get(0);
+//            // 仓库库存明细表
+//            writer.setSheet(1);
+//            int countRow = storeVo.getList().size() + 1;
+//            for (int y = 1; y < countRow; y++) {
+//                ReportInventoryDayStoreVo map = storeVo.getList().get(y - 1);
+//                writer.writeCellValue(0, y, map.getStoreCodeName());
+//                writer.writeCellValue(1, y, map.getProductCountNumber());
+//                writer.writeCellValue(2, y, map.getProductAmount());
+//            }
+//            writer.writeCellValue(0, countRow, "总计");
+//            writer.writeCellValue(1, countRow, storeVo.getCountProductNumber());
+//            writer.writeCellValue(2, countRow, storeVo.getCountAmount());
+//        }
+//
+//        ReportInventoryDayTobaccoStoreVo ycVo = ReportInventoryDayGatherFeign.getReportInventoryDayToStores(orderDate).getData();
+//        if (null != ycVo) {
+//            //ReportInventoryDayTobaccoStore store = ycList.get(0);
+//            // 烟草仓库库存明细表
+//            writer.setSheet(2);
+//            int countRow = ycVo.getList().size() + 1;
+//            for (int y = 1; y < countRow; y++) {
+//                ReportInventoryDayTobaccoStoreVo map = ycVo.getList().get(y - 1);
+//                writer.writeCellValue(0, y, map.getStoreCodeName());
+//                writer.writeCellValue(1, y, map.getProductCountNumber());
+//                writer.writeCellValue(2, y, map.getProductAmount());
+//            }
+//            writer.writeCellValue(0, countRow, "总计");
+//            writer.writeCellValue(1, countRow, ycVo.getCountProductNumber());
+//            writer.writeCellValue(2, countRow, ycVo.getCountAmount());
+//        }
+//
+//        writer.flush();
+//        writer.close();
+//
+//        gdInventoryLog.setOutFilePath(tfile);
+//        gdInventoryLog.setFileUrl(url);
+//        gdInventoryLog.setState(4);
+//
+//        gdInventoryLog.setRemarks(gdInventoryLog.getRemarks() + "；创建Excel用时：" + (System.currentTimeMillis() - millis));
+//        baseMapper.updateById(gdInventoryLog);
+        //暂定直接拼url
+        String url="http://8.130.39.13:7003/upload/kchzb/库存汇总表"+orderDate+".xlsx";
+        return url;
+
+    }
 }
diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryWxRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryWxRest.java
new file mode 100644
index 00000000..f71a7422
--- /dev/null
+++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryWxRest.java
@@ -0,0 +1,64 @@
+package com.yxt.supervise.report.biz.reportinventory;
+
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGatherVo;
+import com.yxt.supervise.report.api.reportinventorydaystore.ReportInventoryDayStoreVo;
+import com.yxt.supervise.report.api.reportinventorydaytobaccostore.ReportInventoryDayTobaccoStoreVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/6/27 17:43
+ */
+@RestController("com.yxt.supervise.report.biz.reportinventory.reportInventoryWxRest")
+@RequestMapping("reportwxmpapi/reportinventory")
+public class ReportInventoryWxRest {
+    @Autowired
+    private ReportInventoryDayGatherService reportInventoryDayGatherService;
+    @Autowired
+    private ReportInventoryDayStoreService reportInventoryDayStoreService;
+    @Autowired
+    private ReportInventoryDayTobaccoStoreService reportInventoryDayTobaccoStoreService;
+
+    //
+    @GetMapping("/getReportInventoryDayGather/{orderDate}")
+    public ResultBean<ReportInventoryDayGatherVo> getReportInventoryDayGather(@PathVariable("orderDate") String orderDate){
+        ResultBean rb = ResultBean.fireFail();
+        ReportInventoryDayGatherVo gather = reportInventoryDayGatherService.getReportInventoryDayGather(orderDate);
+        ReportInventoryDayStoreVo store = reportInventoryDayStoreService.getReportInventoryDayStore(orderDate);
+        ReportInventoryDayTobaccoStoreVo tobaccoStore = reportInventoryDayTobaccoStoreService.getReportInventoryDayToStore(orderDate);
+        List<Object> list =new ArrayList<>();
+        list.add(gather);
+        list.add(store);
+        list.add(tobaccoStore);
+//        if(null==pv){
+//            return rb.success().setData(new ArrayList<>());
+//        }
+        return rb.success().setData(list);
+    }
+    @GetMapping("/getReportInventoryDayStore/{orderDate}")
+    public ResultBean<ReportInventoryDayStoreVo> getReportInventoryDayStore(@PathVariable("orderDate") String orderDate){
+        ResultBean rb = ResultBean.fireFail();
+        ReportInventoryDayStoreVo pv = reportInventoryDayStoreService.getReportInventoryDayStore(orderDate);
+        if(null==pv){
+            return rb.success().setData(new ArrayList<>());
+        }
+        return rb.success().setData(pv);
+    }
+    @GetMapping("/getReportInventoryDayToStore/{orderDate}")
+    public ResultBean<ReportInventoryDayTobaccoStoreVo> getReportInventoryDayToStore(@PathVariable("orderDate") String orderDate){
+        ResultBean rb = ResultBean.fireFail();
+        ReportInventoryDayTobaccoStoreVo pv = reportInventoryDayTobaccoStoreService.getReportInventoryDayToStore(orderDate);
+        if(null==pv){
+            return rb.success().setData(new ArrayList<>());
+        }
+        return rb.success().setData(pv);
+    }
+}
diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java
index f2fd88f5..6ed96907 100644
--- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java
+++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java
@@ -18,7 +18,9 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.RestTemplate;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -70,11 +72,11 @@ public class WechatRest {
         // openId代表一个唯一微信用户，即微信消息的接收人
 //        String openId="otnrM57kui-WCUmRtChhb1HguOgw";
         //郭
-        String openId="otnrM544hxIgkMOfaDU8VpJhj_6k";
+//        String openId="otnrM544hxIgkMOfaDU8VpJhj_6k";
         //刘
         //String openId  ="otnrM5ySvUo7ZZc4qafWzM9eyKBk";
         //聂总
-        //otnrM521f8KcCsRfL2Jj4Tk8np1g
+//        otnrM521f8KcCsRfL2Jj4Tk8np1g
         // 模板参数
         Map<String, Template> sendMag = new HashMap<String, Template>();
         // 公众号的模板id(也有相应的接口可以查询到)
@@ -82,22 +84,78 @@ public class WechatRest {
         //微信的基础accessToken
         String accessToken=getAccessToken(APP_ID,APPSECRET);
         String wxUrl = WX_URL_MESSAGE_SEND.replace("ACCESS_TOKEN", accessToken);
-        sendMag.put("thing3", new Template(csmCashReportVo.getCompanyName()));
-        sendMag.put("time4", new Template(csmCashReportVo.getReportDate()));
-        Map<String, String> miniprogram = new HashMap<>();
-        miniprogram.put("appid","wx11565021714ba796");
-        miniprogram.put("pagepath","pages/index/auditReport?companyName="+csmCashReportVo.getCompanyName()+"&dataDate="+csmCashReportVo.getDataDate());
-        RestTemplate restTemplate = new RestTemplate();
-        //拼接base参数
-        Map<String, Object> sendBody = new HashMap<>();
-        sendBody.put("miniprogram",miniprogram);
-        sendBody.put("touser", openId);               // openId
-        sendBody.put("url", "");         // 点击模板信息跳转地址
-        sendBody.put("topcolor", "#FF0000");          // 顶色
-        sendBody.put("data", sendMag);                   // 模板参数
-        sendBody.put("template_id", templateId);// 模板Id
-        ResponseEntity<String> forEntity = restTemplate.postForEntity(wxUrl, sendBody, String.class);
-        JSONObject jsonObject = JSONObject.parseObject(forEntity.getBody());
+        List<String> openIds=new ArrayList<>();
+        openIds.add("otnrM57kui-WCUmRtChhb1HguOgw");
+        openIds.add("otnrM521f8KcCsRfL2Jj4Tk8np1g");
+//        openIds.add("otnrM5ySvUo7ZZc4qafWzM9eyKBk");
+        JSONObject jsonObject=new JSONObject();
+        for(String openId:openIds){
+            sendMag.put("thing3", new Template(csmCashReportVo.getCompanyName()));
+            sendMag.put("time4", new Template(csmCashReportVo.getReportDate()));
+            Map<String, String> miniprogram = new HashMap<>();
+            miniprogram.put("appid","wx11565021714ba796");
+            miniprogram.put("pagepath","pages/index/auditReport?companyName="+csmCashReportVo.getCompanyName()+"&dataDate="+csmCashReportVo.getDataDate());
+            RestTemplate restTemplate = new RestTemplate();
+            //拼接base参数
+            Map<String, Object> sendBody = new HashMap<>();
+            sendBody.put("miniprogram",miniprogram);
+            sendBody.put("touser", openId);               // openId
+            sendBody.put("url", "");         // 点击模板信息跳转地址
+            sendBody.put("topcolor", "#FF0000");          // 顶色
+            sendBody.put("data", sendMag);                   // 模板参数
+            sendBody.put("template_id", templateId);// 模板Id
+            ResponseEntity<String> forEntity = restTemplate.postForEntity(wxUrl, sendBody, String.class);
+            jsonObject = JSONObject.parseObject(forEntity.getBody());
+        }
+        // 0
+        String messageCode = jsonObject.getString("errcode");
+        // 2431260672639467520
+        String msgId = jsonObject.getString("msgid");
+        System.out.println("messageCode : " + messageCode + ", msgId: " +msgId);
+        //return forEntity.getBody();
+    }
+    //仓库库存日报推送
+    @PostMapping("/inventorySendMessage")
+    public void inventorySendMessage(@RequestBody WeChatTemplateMsg data) throws Exception {
+        CsmCashReportVo csmCashReportVo=csmCashReportMapper.getCsmCashReport("2023-06-14");
+        // openId代表一个唯一微信用户，即微信消息的接收人
+//        String openId="otnrM57kui-WCUmRtChhb1HguOgw";
+        //郭
+//        String openId="otnrM544hxIgkMOfaDU8VpJhj_6k";
+        //刘
+        //String openId  ="otnrM5ySvUo7ZZc4qafWzM9eyKBk";
+        //聂总
+//        otnrM521f8KcCsRfL2Jj4Tk8np1g
+        // 模板参数
+        Map<String, Template> sendMag = new HashMap<String, Template>();
+        // 公众号的模板id(也有相应的接口可以查询到)
+        String templateId = "CIrhaIkH6vWI4guaPqhDmMjOJkC3dt0Wpxs1JAO86N8";
+        //微信的基础accessToken
+        String accessToken=getAccessToken(APP_ID,APPSECRET);
+        String wxUrl = WX_URL_MESSAGE_SEND.replace("ACCESS_TOKEN", accessToken);
+        List<String> openIds=new ArrayList<>();
+        openIds.add("otnrM57kui-WCUmRtChhb1HguOgw");
+        openIds.add("otnrM521f8KcCsRfL2Jj4Tk8np1g");
+//        openIds.add("otnrM5ySvUo7ZZc4qafWzM9eyKBk");
+        JSONObject jsonObject=new JSONObject();
+        for(String openId:openIds){
+            sendMag.put("thing3", new Template(csmCashReportVo.getCompanyName()));
+            sendMag.put("time4", new Template(csmCashReportVo.getReportDate()));
+            Map<String, String> miniprogram = new HashMap<>();
+            miniprogram.put("appid","wx11565021714ba796");
+            miniprogram.put("pagepath","pages/index/auditReport?companyName="+csmCashReportVo.getCompanyName()+"&dataDate="+csmCashReportVo.getDataDate());
+            RestTemplate restTemplate = new RestTemplate();
+            //拼接base参数
+            Map<String, Object> sendBody = new HashMap<>();
+            sendBody.put("miniprogram",miniprogram);
+            sendBody.put("touser", openId);               // openId
+            sendBody.put("url", "");         // 点击模板信息跳转地址
+            sendBody.put("topcolor", "#FF0000");          // 顶色
+            sendBody.put("data", sendMag);                   // 模板参数
+            sendBody.put("template_id", templateId);// 模板Id
+            ResponseEntity<String> forEntity = restTemplate.postForEntity(wxUrl, sendBody, String.class);
+            jsonObject = JSONObject.parseObject(forEntity.getBody());
+        }
         // 0
         String messageCode = jsonObject.getString("errcode");
         // 2431260672639467520
diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/businessriskdata/BusinessRiskDataQuery.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/businessriskdata/BusinessRiskDataQuery.java
index d1777ddf..21f4b8ca 100644
--- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/businessriskdata/BusinessRiskDataQuery.java
+++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/businessriskdata/BusinessRiskDataQuery.java
@@ -28,4 +28,5 @@ public class BusinessRiskDataQuery implements Query {
     private String buSid;
     //企业名称
     private String businessName;
+    private String executionTime;
 }
diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskblacklist/RiskBlacklistQuery.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskblacklist/RiskBlacklistQuery.java
new file mode 100644
index 00000000..7c92f36b
--- /dev/null
+++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskblacklist/RiskBlacklistQuery.java
@@ -0,0 +1,15 @@
+package com.supervise.rms.api.riskblacklist;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author feikefei
+ * @create 2023-06-26-11:17
+ */
+@Data
+public class RiskBlacklistQuery implements Query {
+    @ApiModelProperty("风险对象类型1.供应商2.仓库3.门店")
+    private Integer objectType;
+}
diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskblacklist/RiskBlacklistVo.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskblacklist/RiskBlacklistVo.java
new file mode 100644
index 00000000..64424fd9
--- /dev/null
+++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskblacklist/RiskBlacklistVo.java
@@ -0,0 +1,21 @@
+package com.supervise.rms.api.riskblacklist;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author feikefei
+ * @create 2023-06-26-11:18
+ */
+@Data
+public class RiskBlacklistVo implements Vo {
+    private Integer id;
+    private String sid;
+    @ApiModelProperty("备注信息")
+    private String remarks;
+    @ApiModelProperty("风险对象Sid")
+    private String objectSid;
+    @ApiModelProperty("风险对象类型1.供应商2.仓库3.门店")
+    private Integer objectType;
+}
diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindex/RiskIndex.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindex/RiskIndex.java
new file mode 100644
index 00000000..578b774f
--- /dev/null
+++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindex/RiskIndex.java
@@ -0,0 +1,47 @@
+package com.supervise.rms.api.riskindex;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.UUID;
+
+/**
+ * @author feikefei
+ * @create 2023-06-16-10:11
+ */
+@Data
+@ApiModel(value = "监控指标表", description = "监控指标表")
+@TableName("risk_index")
+public class RiskIndex {
+    @ApiModelProperty("ID，唯一编号")
+    private Integer id;
+    @ApiModelProperty("字符型编号")
+    private String sid = UUID.randomUUID().toString();
+    @ApiModelProperty("记录创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date createTime = new Date();
+    @ApiModelProperty("备注信息")
+    private String remarks;
+    @ApiModelProperty("代码")
+    private String code;
+    @ApiModelProperty("名称")
+    private String name;
+    @ApiModelProperty("指标说明")
+    private String content;
+    @ApiModelProperty("风险等级(程度)Sid")
+    private String levelSid;
+    @ApiModelProperty("风险等级(程度)代码")
+    private String levelCode;
+    @ApiModelProperty("风险等级(程度)名称")
+    private String levelName;
+    @ApiModelProperty("风险类别Sid")
+    private String typeSid;
+    @ApiModelProperty("风险类别代码")
+    private String typeCode;
+    @ApiModelProperty("风险类别名称")
+    private String typeName;
+}
diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindex/RiskIndexDto.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindex/RiskIndexDto.java
new file mode 100644
index 00000000..313a13cb
--- /dev/null
+++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindex/RiskIndexDto.java
@@ -0,0 +1,38 @@
+package com.supervise.rms.api.riskindex;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author feikefei
+ * @create 2023-06-16-10:11
+ */
+@Data
+public class RiskIndexDto implements Dto {
+    private Integer id;
+    private String sid;
+    private Date createTime;
+    @ApiModelProperty("备注信息")
+    private String remarks;
+    @ApiModelProperty("代码")
+    private String code;
+    @ApiModelProperty("名称")
+    private String name;
+    @ApiModelProperty("指标说明")
+    private String content;
+    @ApiModelProperty("风险等级(程度)Sid")
+    private String levelSid;
+    @ApiModelProperty("风险等级(程度)代码")
+    private String levelCode;
+    @ApiModelProperty("风险等级(程度)名称")
+    private String levelName;
+    @ApiModelProperty("风险类别Sid")
+    private String typeSid;
+    @ApiModelProperty("风险类别代码")
+    private String typeCode;
+    @ApiModelProperty("风险类别名称")
+    private String typeName;
+}
diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindex/RiskIndexQuery.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindex/RiskIndexQuery.java
new file mode 100644
index 00000000..2181b8d5
--- /dev/null
+++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindex/RiskIndexQuery.java
@@ -0,0 +1,28 @@
+package com.supervise.rms.api.riskindex;
+
+import com.yxt.common.core.dto.Dto;
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author feikefei
+ * @create 2023-06-16-10:11
+ */
+@Data
+public class RiskIndexQuery implements Query {
+    @ApiModelProperty("代码")
+    private String code;
+    @ApiModelProperty("名称")
+    private String name;
+    @ApiModelProperty("风险等级(程度)代码")
+    private String levelCode;
+    @ApiModelProperty("风险等级(程度)名称")
+    private String levelName;
+    @ApiModelProperty("风险类别代码")
+    private String typeCode;
+    @ApiModelProperty("风险类别名称")
+    private String typeName;
+}
diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindex/RiskIndexVo.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindex/RiskIndexVo.java
new file mode 100644
index 00000000..d028e203
--- /dev/null
+++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindex/RiskIndexVo.java
@@ -0,0 +1,40 @@
+package com.supervise.rms.api.riskindex;
+
+import com.yxt.common.core.dto.Dto;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author feikefei
+ * @create 2023-06-16-10:11
+ */
+@Data
+public class RiskIndexVo implements Vo {
+    private Integer id;
+    private String sid;
+    private Date createTime;
+    @ApiModelProperty("备注信息")
+    private String remarks;
+    @ApiModelProperty("代码")
+    private String code;
+    @ApiModelProperty("名称")
+    private String name;
+    @ApiModelProperty("指标说明")
+    private String content;
+    @ApiModelProperty("风险等级(程度)Sid")
+    private String levelSid;
+    @ApiModelProperty("风险等级(程度)代码")
+    private String levelCode;
+    @ApiModelProperty("风险等级(程度)名称")
+    private String levelName;
+    @ApiModelProperty("风险类别Sid")
+    private String typeSid;
+    @ApiModelProperty("风险类别代码")
+    private String typeCode;
+    @ApiModelProperty("风险类别名称")
+    private String typeName;
+    private String bigTypeName;
+}
diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicators/RiskIndicatorsQuery.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicators/RiskIndicatorsQuery.java
index 99c04223..2b985bcd 100644
--- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicators/RiskIndicatorsQuery.java
+++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicators/RiskIndicatorsQuery.java
@@ -32,4 +32,5 @@ public class RiskIndicatorsQuery implements Query {
     private String typeCode;
     @ApiModelProperty("风险类别名称")
     private String typeName;
+    private String bigTypeName;
 }
diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicators/RiskIndicatorsVo.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicators/RiskIndicatorsVo.java
index 3ae7379a..c26c8b9f 100644
--- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicators/RiskIndicatorsVo.java
+++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicators/RiskIndicatorsVo.java
@@ -4,6 +4,8 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author feikefei
  * @create 2023-06-16-10:16
@@ -35,4 +37,5 @@ public class RiskIndicatorsVo implements Vo {
     @ApiModelProperty("风险类别名称")
     private String typeName;
     private String bigTypeName;
+    private List list;
 }
diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdata/BusinessRiskDataService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdata/BusinessRiskDataService.java
index 17ed1c5b..18b5a5e3 100644
--- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdata/BusinessRiskDataService.java
+++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdata/BusinessRiskDataService.java
@@ -34,8 +34,8 @@ public class BusinessRiskDataService extends MybatisBaseService<BusinessRiskData
     public PagerVo<BusinessRiskDataVo> listPage(PagerQuery<BusinessRiskDataQuery> pq){
         BusinessRiskDataQuery params = pq.getParams();
         QueryWrapper<BusinessRiskData> wq = new QueryWrapper<>();
-        if (StringUtils.isNotNull(params.getBusinessName())){
-//            wq.eq("",params.getBusinessName());
+        if (StringUtils.isNotNull(params.getExecutionTime())){
+            wq.eq("e.executionTime",params.getExecutionTime());
         }
         IPage<BusinessRiskData> page = PagerUtil.queryToPage(pq);
         IPage<BusinessRiskDataVo> iPage = baseMapper.selectPageVo(page, wq);
diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskblacklist/RiskBlacklistMapper.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskblacklist/RiskBlacklistMapper.java
index 79583cfa..ba80a581 100644
--- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskblacklist/RiskBlacklistMapper.java
+++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskblacklist/RiskBlacklistMapper.java
@@ -1,8 +1,13 @@
 package com.supervise.rms.biz.riskblacklist;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.supervise.rms.api.riskblacklist.RiskBlacklist;
+import com.supervise.rms.api.riskblacklist.RiskBlacklistVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -13,5 +18,5 @@ import java.util.List;
 @Mapper
 public interface RiskBlacklistMapper extends BaseMapper<RiskBlacklist> {
 
-    List<RiskBlacklist> selectRiskBlackList();
+    IPage<RiskBlacklistVo> selectRiskBlackList(IPage<RiskBlacklist> page, @Param(Constants.WRAPPER) Wrapper<RiskBlacklist> qw);
 }
diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskblacklist/RiskBlacklistMapper.xml b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskblacklist/RiskBlacklistMapper.xml
index a69aa132..b1106f46 100644
--- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskblacklist/RiskBlacklistMapper.xml
+++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskblacklist/RiskBlacklistMapper.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.supervise.rms.biz.riskblacklist.RiskBlacklistMapper">
-    <select id="selectRiskBlackList" resultType="com.supervise.rms.api.riskblacklist.RiskBlacklist">
+    <select id="selectRiskBlackList" resultType="com.supervise.rms.api.riskblacklist.RiskBlacklistVo">
         select * from risk_blacklist
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 </mapper>
\ No newline at end of file
diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskblacklist/RiskBlacklistRest.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskblacklist/RiskBlacklistRest.java
index 8adf9211..c621d90f 100644
--- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskblacklist/RiskBlacklistRest.java
+++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskblacklist/RiskBlacklistRest.java
@@ -1,7 +1,11 @@
 package com.supervise.rms.biz.riskblacklist;
 
 import com.supervise.rms.api.riskblacklist.RiskBlacklistDto;
+import com.supervise.rms.api.riskblacklist.RiskBlacklistQuery;
+import com.supervise.rms.api.riskblacklist.RiskBlacklistVo;
+import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,9 +36,11 @@ public class RiskBlacklistRest {
     }
 
     @ApiOperation("查询风险黑名单列表")
-    @GetMapping("/select")
-    public ResultBean select(){
-        return riskBlacklistService.select();
+    @PostMapping("/listPage")
+    public ResultBean select(@RequestBody PagerQuery<RiskBlacklistQuery> pq){
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<RiskBlacklistVo> vo = riskBlacklistService.select(pq);
+        return rb.success().setData(vo);
     }
 
     @ApiOperation("根据sid查询")
diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskblacklist/RiskBlacklistService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskblacklist/RiskBlacklistService.java
index 971851db..4b03af20 100644
--- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskblacklist/RiskBlacklistService.java
+++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskblacklist/RiskBlacklistService.java
@@ -1,10 +1,18 @@
 package com.supervise.rms.biz.riskblacklist;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.supervise.rms.api.riskblacklist.RiskBlacklist;
 import com.supervise.rms.api.riskblacklist.RiskBlacklistDto;
+import com.supervise.rms.api.riskblacklist.RiskBlacklistQuery;
+import com.supervise.rms.api.riskblacklist.RiskBlacklistVo;
 import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.base.utils.StringUtils;
+import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -19,7 +27,7 @@ public class RiskBlacklistService extends MybatisBaseService<RiskBlacklistMapper
     public ResultBean saveRiskBlackList(RiskBlacklistDto dto){
         ResultBean rb = ResultBean.fireFail();
         RiskBlacklist riskBlacklist = new RiskBlacklist();
-        BeanUtil.copyProperties(dto,riskBlacklist);
+        BeanUtil.copyProperties(dto,riskBlacklist,"sid");
         baseMapper.insert(riskBlacklist);
         return rb.success().setMsg("添加成功");
     }
@@ -30,10 +38,16 @@ public class RiskBlacklistService extends MybatisBaseService<RiskBlacklistMapper
         return rb.success().setMsg("删除成功");
     }
 
-    public ResultBean select(){
-        ResultBean rb = ResultBean.fireFail();
-        List<RiskBlacklist> riskBlacklists = baseMapper.selectRiskBlackList();
-        return rb.success().setData(riskBlacklists);
+    public PagerVo<RiskBlacklistVo> select(PagerQuery<RiskBlacklistQuery> pq){
+        RiskBlacklistQuery params = pq.getParams();
+        QueryWrapper<RiskBlacklist> wq = new QueryWrapper<>();
+        if (StringUtils.isNotNull(params.getObjectType()) && !params.getObjectType().equals("")){
+            wq.eq("objectType",params.getObjectType());
+        }
+        IPage<RiskBlacklist> page = PagerUtil.queryToPage(pq);
+        IPage<RiskBlacklistVo> vos = baseMapper.selectRiskBlackList(page, wq);
+        PagerVo<RiskBlacklistVo> vo = PagerUtil.pageToVo(vos, null);
+        return vo;
     }
 
     public ResultBean selectRiskBlackListBySid(String sid){
diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindex/RiskIndexMapper.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindex/RiskIndexMapper.java
new file mode 100644
index 00000000..b54b6ca5
--- /dev/null
+++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindex/RiskIndexMapper.java
@@ -0,0 +1,19 @@
+package com.supervise.rms.biz.riskindex;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.supervise.rms.api.riskindex.RiskIndex;
+import com.supervise.rms.api.riskindex.RiskIndexVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @author feikefei
+ * @create 2023-06-16-10:19
+ */
+@Mapper
+public interface RiskIndexMapper extends BaseMapper<RiskIndex> {
+    IPage<RiskIndexVo> listPage(IPage<RiskIndex> page, @Param(Constants.WRAPPER) Wrapper<RiskIndex> qw);
+}
diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindex/RiskIndexMapper.xml b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindex/RiskIndexMapper.xml
new file mode 100644
index 00000000..c64ed38c
--- /dev/null
+++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindex/RiskIndexMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.supervise.rms.biz.riskindex.RiskIndexMapper">
+    <select id="listPage" resultType="com.supervise.rms.api.riskindex.RiskIndexVo">
+        select i.*,t.name bigTypeName from risk_index i
+        left join risk_type l on i.typeSid = l.sid
+        left join risk_type t on l.parentSid = t.sid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindex/RiskIndexRest.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindex/RiskIndexRest.java
new file mode 100644
index 00000000..7c58fdea
--- /dev/null
+++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindex/RiskIndexRest.java
@@ -0,0 +1,47 @@
+package com.supervise.rms.biz.riskindex;
+
+import com.supervise.rms.api.riskindex.RiskIndexDto;
+import com.supervise.rms.api.riskindex.RiskIndexQuery;
+import com.supervise.rms.api.riskindex.RiskIndexVo;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author feikefei
+ * @create 2023-06-16-10:18
+ */
+@Api(tags = "监控指标表")
+@RestController("com.supervise.rmc.biz.riskindex.RiskIndexRest")
+@RequestMapping("v1/riskIndex")
+public class RiskIndexRest {
+
+    @Autowired
+    private RiskIndexService riskIndicatorService;
+
+    @ApiOperation("保存监控指标")
+    @PostMapping("/saveRiskIndex")
+    public ResultBean saveRiskIndex(@RequestBody RiskIndexDto dto) {
+        return  riskIndicatorService.saveRiskIndex(dto);
+    }
+
+    @ApiOperation("查询监控指标分页列表")
+    @PostMapping("/listPage")
+    public ResultBean listPage(@RequestBody PagerQuery<RiskIndexQuery> pq){
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<RiskIndexVo> listPage = riskIndicatorService.listPage(pq);
+        return rb.success().setData(listPage);
+    }
+
+    @ApiOperation("删除监控指标")
+    @GetMapping("/del/{sid}")
+    public ResultBean del(@PathVariable String sid){
+        ResultBean rb = ResultBean.fireFail();
+        riskIndicatorService.deleteBySid(sid);
+        return rb.success().setMsg("删除成功");
+    }
+}
diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindex/RiskIndexService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindex/RiskIndexService.java
new file mode 100644
index 00000000..23b4ba35
--- /dev/null
+++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindex/RiskIndexService.java
@@ -0,0 +1,67 @@
+package com.supervise.rms.biz.riskindex;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.supervise.rms.api.riskindex.RiskIndex;
+import com.supervise.rms.api.riskindex.RiskIndexDto;
+import com.supervise.rms.api.riskindex.RiskIndexQuery;
+import com.supervise.rms.api.riskindex.RiskIndexVo;
+import com.supervise.rms.api.riskindicators.RiskIndicators;
+import com.supervise.rms.api.riskindicators.RiskIndicatorsDto;
+import com.supervise.rms.api.riskindicators.RiskIndicatorsQuery;
+import com.supervise.rms.api.riskindicators.RiskIndicatorsVo;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.base.utils.StringUtils;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author feikefei
+ * @create 2023-06-16-10:18
+ */
+@Service
+public class RiskIndexService extends MybatisBaseService<RiskIndexMapper, RiskIndex> {
+
+    public ResultBean saveRiskIndex(RiskIndexDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        String sid = dto.getSid();
+        if(StringUtils.isBlank(sid)){
+            //新增
+            RiskIndex riskIndex = new RiskIndex();
+            BeanUtils.copyProperties(dto, riskIndex,"sid");
+            boolean isSave = save(riskIndex);
+            if(!isSave){
+                return rb.setMsg("保存失败");
+            }
+            sid = riskIndex.getSid();
+        }else{
+            //更新
+            RiskIndex riskIndex = fetchBySid(dto.getSid());
+            if(riskIndex == null){
+                return rb.setMsg("该条记录不存在");
+            }
+            BeanUtils.copyProperties(dto, riskIndex);
+            boolean isUpdate = updateById(riskIndex);
+            if(!isUpdate){
+                return rb.setMsg("更新失败");
+            }
+        }
+        return rb.success().setData(sid).setMsg("保存成功");
+    }
+
+    public PagerVo<RiskIndexVo> listPage(PagerQuery<RiskIndexQuery> pq){
+        RiskIndexQuery params = pq.getParams();
+        QueryWrapper<RiskIndex> wq = new QueryWrapper<>();
+        if (StringUtils.isNotNull(params)){
+
+        }
+        IPage<RiskIndex> page = PagerUtil.queryToPage(pq);
+        IPage<RiskIndexVo> iPage = baseMapper.listPage(page, wq);
+        PagerVo<RiskIndexVo> pageToVo = PagerUtil.pageToVo(iPage, null);
+        return pageToVo;
+    }
+}
diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsService.java
index cd6c25c6..9dab41ce 100644
--- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsService.java
+++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsService.java
@@ -15,6 +15,9 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author feikefei
  * @create 2023-06-16-10:18
@@ -53,10 +56,26 @@ public class RiskIndicatorsService extends MybatisBaseService<RiskIndicatorsMapp
         RiskIndicatorsQuery params = pq.getParams();
         QueryWrapper<RiskIndicators> wq = new QueryWrapper<>();
         if (StringUtils.isNotNull(params)){
-
+            if (!StringUtils.isBlank(params.getName())){
+                wq.eq("i.name",params.getName());
+            }
+            if (!StringUtils.isBlank(params.getLevelName())){
+                wq.eq("i.levelName",params.getLevelName());
+            }
+            if (!StringUtils.isBlank(params.getTypeName())){
+                wq.eq("i.typeName",params.getTypeName());
+            }
+            if (!StringUtils.isBlank(params.getBigTypeName())){
+                wq.eq("t.name",params.getBigTypeName());
+            }
         }
         IPage<RiskIndicators> page = PagerUtil.queryToPage(pq);
         IPage<RiskIndicatorsVo> iPage = baseMapper.listPage(page, wq);
+        List<RiskIndicatorsVo> records = iPage.getRecords();
+        for (RiskIndicatorsVo record : records) {
+            List objects = new ArrayList<>();
+            record.setList(objects);
+        }
         PagerVo<RiskIndicatorsVo> pageToVo = PagerUtil.pageToVo(iPage, null);
         return pageToVo;
     }
diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risktype/RiskTypeService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risktype/RiskTypeService.java
index cfd8bff1..dabcb6ce 100644
--- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risktype/RiskTypeService.java
+++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risktype/RiskTypeService.java
@@ -74,7 +74,7 @@ public class RiskTypeService extends MybatisBaseService<RiskTypeMapper, RiskType
 
     public ResultBean del(String sid){
         ResultBean rb = ResultBean.fireFail();
-        RiskType riskType = fetchBySid(sid);
+        RiskType riskType = baseMapper.selectRiskTypeBySid(sid);
         deleteBySid(sid);
         //查询一级下是否有二级数据
         List<RiskType> riskTypes = baseMapper.selectRiskTypeSubordinate(riskType.getSid());