diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ScrapApplyDetailsController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ScrapApplyDetailsController.java
index 64fbb315..2f3528f4 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ScrapApplyDetailsController.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ScrapApplyDetailsController.java
@@ -271,8 +271,8 @@ public class ScrapApplyDetailsController extends BaseController {
      * 查询预报废任务列表
      */
     @ApiOperation("查询预报废任务列表")
-    @PostMapping("/getScrapApplyList")
-    public TableDataInfo getScrapApplyList(@RequestBody ScrapApplyDetails scrapApplyDetails) {
+    @GetMapping("/getScrapApplyList")
+    public TableDataInfo getScrapApplyList( ScrapApplyDetails scrapApplyDetails) {
         Map<String, Object> params = scrapApplyDetails.getParams();
         if (!params.isEmpty()) {
             String beginTime = (String) params.get("beginTime");
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/InventoryAndWarehousingMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/InventoryAndWarehousingMapper.xml
index 868598d2..730cdc1a 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/InventoryAndWarehousingMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/InventoryAndWarehousingMapper.xml
@@ -199,7 +199,9 @@
         su.nick_name AS modelName,
         pisi.CREATE_DATE AS createDate,
         pisi.REMARKS AS remark,
-        ROW_NUMBER() OVER (PARTITION BY pisi.`CODE` ORDER BY pisi.CREATE_DATE DESC) AS row_num
+--         ROW_NUMBER() OVER (PARTITION BY pisi.`CODE` ORDER BY pisi.CREATE_DATE DESC) AS row_num
+        @row_num := IF(@prev_code = pisi.`CODE`, @row_num + 1, 1) AS row_num,
+        @prev_code := pisi.`CODE`
         FROM
         ma_type_put_in_storage_info pisi
         LEFT JOIN ma_type_put_in_storage_details pisd ON pisi.id = pisd.INFO
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml
index fc5be7f1..97ae4eaf 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml
@@ -650,12 +650,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             or locate(#{keyword}, mt.type_name) > 0
             or locate(#{keyword}, mt1.type_name) > 0)
         </if>
-        <if test="type != null and type != ''">
-            AND mt.type_id = #{type}
-        </if>
-        <if test="typeName != null and typeName != ''">
-            AND mt1.type_id = #{typeName}
+        <if test="type != null">
+            AND mt1.type_id = #{type}
         </if>
+<!--        <if test="typeName != null and typeName != ''">-->
+<!--            AND mt1.type_id = #{typeName}-->
+<!--        </if>-->
         <if test="status != null and status != ''">
             AND sad.status = #{status}
         </if>
@@ -826,7 +826,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
         tk.CODE scrapNum,
         tk.task_status taskStatus,
-        dic.NAME taskStatusName,
+        case tk.task_status
+        when '120' then
+        '待审核'
+        when '121' then
+        '审核中'
+        when '122' or '123' then
+        '已完成'
+        end taskStatusName,
         bui.unit_id unitId,
         bui.unit_name unitName,
         bpl.lot_id projectId,
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml
index f19f535c..54ecfee7 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml
@@ -270,7 +270,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="sltStatus != null  and sltStatus != ''">
             and saa.status = #{sltStatus}
         </if>
-        GROUP BY saa.id
+        GROUP BY saa.create_time desc
     </select>
     <select id="getRelations" resultType="com.bonus.sgzb.base.api.domain.SltAgreementRelation">
         select sar.id,
diff --git a/sgzb-ui/src/api/scrap/forecastWaste.js b/sgzb-ui/src/api/scrap/forecastWaste.js
index 5824c130..97f503b0 100644
--- a/sgzb-ui/src/api/scrap/forecastWaste.js
+++ b/sgzb-ui/src/api/scrap/forecastWaste.js
@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 /* 预报废审核列表 */
 export const getForecastWasteListApi = (data) => {
-    return request.post('/material/scrap/getScrapApplyList', data)
+    return request.get('/material/scrap/getScrapApplyList', { params: data })
 }
 
 /* 预报废审核页面 弹框数据查询 */
diff --git a/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn.vue b/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn.vue
index 819a3aa1..14d986dd 100644
--- a/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn.vue
@@ -134,7 +134,6 @@
                     icon="el-icon-plus"
                     size="mini"
                     @click="handleAdd"
-                    :loading="submitLoading"
                     >保存</el-button
                 >
             </el-col>
diff --git a/sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue b/sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue
index ba7b9f8d..e3a31dda 100644
--- a/sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue
@@ -302,7 +302,7 @@
                 label-width="100px"
             >
                 <el-form-item label="设备编码" prop="maCode">
-                    <el-input v-model="codeQuery.maCode" maxlength="20" />
+                    <el-input v-model="codeQuery.maCode" maxlength="25" />
                 </el-form-item>
                 <el-form-item>
                     <el-button
@@ -633,13 +633,14 @@
                     </el-table-column>
 
                     <!-- 6.17新增 报废原因等填写 -->
-                    <el-table-column label="报废信息" align="center">
+                    <el-table-column label="报废信息" align="center" v-if="!dialogIsView">
                         <template slot-scope="{ row }">
                             <el-button
                                 type="primary"
                                 size="mini"
                                 @click="editScrapInfo"
                                 :disabled="row.scrapNum <= 0"
+
                                 >编 辑</el-button
                             >
                         </template>
diff --git a/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/config.js b/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/config.js
index 455d2611..97a03eda 100644
--- a/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/config.js
+++ b/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/config.js
@@ -75,7 +75,7 @@ export const dialogConfig = {
     isSelShow: false,// 表格是否需要复选框
     isFormShow: true, // 是否显示表单查询组件
     formLabel: [
-        { f_label: '类型名称', f_model: 'keywords', f_type: 'sel', f_selList: [], selLabel: 'typeName', selValue: 'typeId' },
+        { f_label: '类型名称', f_model: 'type', f_type: 'sel', f_selList: [], selLabel: 'typeName', selValue: 'typeId' },
     ],
 
     columnsList: [