diff --git a/fe/PC/src/filters/excelOrReportsOption.js b/fe/PC/src/filters/excelOrReportsOption.js
index e4e6168e7..65e27a717 100644
--- a/fe/PC/src/filters/excelOrReportsOption.js
+++ b/fe/PC/src/filters/excelOrReportsOption.js
@@ -91,6 +91,7 @@ export const reportsAddress = {
     depositDetailsReport:reportsUrl + 'depositDetailsReport',//缴库明细报表 depositDetailsReport
     interfaceError:reportsUrl + 'interfaceError',//接口错误报表 interfaceError
     InventoryBalanceEnRoute:reportsUrl + 'InventoryBalanceEnRoute',//库存余额报表按在途库 InventoryBalanceEnRoute
+    SupplierAndOrderSummary:reportsUrl + 'SupplierAndOrderSummary',//供应商发货订单汇总报表
     
     // InventoryBookDetail:reportsUrl + '202212162111466911.rdlx',//库存流水帐明细
     // InventoryBookSummary:reportsUrl + '202212162112124488.rdlx',//库存流水帐汇总
diff --git a/fe/PC/src/router/index.js b/fe/PC/src/router/index.js
index 04b1494d5..cfc144e48 100644
--- a/fe/PC/src/router/index.js
+++ b/fe/PC/src/router/index.js
@@ -172,22 +172,6 @@ export const constantRoutes = [
       }
     }]
   }, 
-  {
-    path: '/',
-    component: Layout,
-    redirect: '/isPadForTransferLibJob_pc',
-    hidden: true,
-    children: [{
-      path: 'isPadForTransferLibJob_pc',
-      component: () => import('@/views/padManage/isPadForTransferLibJob_pc'),
-      name: 'isPadForTransferLibJob_pc',
-      meta: {
-        keepAlive : true, 
-        title: '业务库移(pc版本)',
-        icon: '系统首页',
-      }
-    }]
-  }, 
   // 【平板】 Kitting组包
   {
     path: '/',
@@ -205,7 +189,7 @@ export const constantRoutes = [
       }
     }]
   }, 
-  // 下架指导牵引车
+  // 【平板】下架指导牵引车
   {
     path: '/',
     component: Layout,
@@ -222,7 +206,7 @@ export const constantRoutes = [
       }
     }]
   }, 
-  // 出库任务完成
+  // 【平板】出库任务完成
   {
     path: '/',
     component: Layout,
@@ -239,7 +223,7 @@ export const constantRoutes = [
       }
     }]
   }, 
-  // 回库器具或空器具AGV搬运
+  // 【平板】回库器具或空器具AGV搬运
   {
     path: '/',
     component: Layout,
diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index 16defff4d..f9fe049e6 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -1841,6 +1841,7 @@ export const FISDeliverRequest =  [
   { label: "客户代码", prop: "customerCode" },
   { label: "客户地址", prop: 'customerAddressCode' },
   { label: "操作员", prop: 'worker' },
+  { label: "发货类型", prop: "deliverRequestType", type: "filter", filters: "deliverRequestType",showProp:true },
   { label: "发货时间", prop: "deliverTime", type: "dateTime" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "创建时间", prop: "creationTime",type: "dateTime" },
diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js
index dcfea2f14..2a2ff003d 100644
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/fe/PC/src/utils/tabsDesTions/index.js
@@ -1182,6 +1182,7 @@ export const FISDeliverRequest = [
   { label: "客户代码", prop: "customerCode" },
   { label: "客户地址", prop: 'customerAddressCode' },
   { label: "操作员", prop: 'worker' },
+  { label: "发货类型", prop: "deliverRequestType", type: "filter", filters: "deliverRequestType",showProp:true },
   { label: "发货时间", prop: "deliverTime", type: "dateTime" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "创建时间", prop: "creationTime",type: "dateTime" },
diff --git a/fe/PC/src/views/activeReportManage/reportForm/SupplierAndOrderSummary.vue b/fe/PC/src/views/activeReportManage/reportForm/SupplierAndOrderSummary.vue
new file mode 100644
index 000000000..58ac17ec8
--- /dev/null
+++ b/fe/PC/src/views/activeReportManage/reportForm/SupplierAndOrderSummary.vue
@@ -0,0 +1,21 @@
+<template>
+  <!-- 供应商发货订单汇总报表 -->
+  <popUpPage :openHandle="openHandle"></popUpPage>
+</template>
+<script>
+import popUpPage from "../popUpPage/index.vue"
+import { reportsAddress } from "@/filters/excelOrReportsOption";
+import { createNewTabs } from '@/utils/index'
+export default {
+  name:"SupplierAndOrderSummary",
+  components:{popUpPage},
+  mounted () {
+    this.openHandle()
+  },
+  methods:{
+    openHandle(){
+      createNewTabs(reportsAddress.SupplierAndOrderSummary + '?title=' + this.$route.meta.title)
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue b/fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue
index b913067ff..bf6e778bd 100644
--- a/fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue
+++ b/fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue
@@ -66,9 +66,7 @@ export default {
       //常用按钮数据
       currenButtonData: [
         //导出
-        this.defaultExportBtn({
-          url:"wms/store/deliver-note/export-for-fis"
-        }),
+        this.defaultExportBtn(),
         this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选
diff --git a/fe/PC/src/views/finishedProductManage/deliver/FISDeliverRequest.vue b/fe/PC/src/views/finishedProductManage/deliver/FISDeliverRequest.vue
index b5efa77eb..fdce44ac4 100644
--- a/fe/PC/src/views/finishedProductManage/deliver/FISDeliverRequest.vue
+++ b/fe/PC/src/views/finishedProductManage/deliver/FISDeliverRequest.vue
@@ -21,7 +21,7 @@
       @quicklySearchClick="quicklySearchClick"
       @quicklySearchClear="quicklySearchClear"
       :primarySearchOption="primarySearchOption"
-      @overallSearchFormClick="overallSearchFormClick"
+      @overallSearchFormClick="(options)=>{overallSearchFormClick(options,overallSearchFormCallback)}"
       :httpOverallSearchData="httpOverallSearchData"
       :tableSelection="true"
     >
@@ -56,6 +56,22 @@
       @importClick="postImportMergeClick(arguments)"
       @postImportDown="importDown('wms/store/deliver-request')"
     ></importFile>
+    <!-- 批量生成发货单弹窗 -->
+    <el-dialog 
+      title="批量生成发货单" 
+      :visible="creatDeliverShow"
+      :append-to-body="true"
+    >
+      <el-form :model="creatDeliverForm" :rules="creatDeliverRules" ref="creatDeliverRef">
+        <el-form-item label="车牌号" prop="truckNumber">
+          <el-input v-model="creatDeliverForm.truckNumber"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer">
+        <el-button @click="creatDeliverClose()">取 消</el-button>
+        <el-button type="primary" @click="creatDeliverSure()">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -82,6 +98,18 @@ export default {
     mixins,
   ],
   computed: {
+    // 头部按钮显隐控制(普通发货)
+    hideButton_normalSta: function () {
+      return function (val) {
+        return this.showFilterSta_normal == val
+      }
+    },
+    // 头部按钮显隐控制(FIS发货)
+    hideButton_FISSta: function () {
+      return function (val) {
+        return this.showFilterSta_fis == val
+      }
+    },
     // 按钮显示
     hideButton: function () {
       return function (val) {
@@ -109,6 +137,34 @@ export default {
           name: "creatDeliver",
           size: "mini",
         },
+        {
+          type: "primary",
+          label: "筛选[普通发货]",
+          name: "normalSta",
+          size: "mini",
+          hide: () => { return this.hideButton_normalSta(true) },
+        },
+        {
+          type: "danger",
+          label: "重置[普通发货]",
+          name: "normalSta-reset",
+          size: "mini",
+          hide: () => { return this.hideButton_normalSta(false) },
+        },
+        {
+          type: "warning",
+          label: "筛选[FIS发货]",
+          name: "FISSta",
+          size: "mini",
+          hide: () => { return this.hideButton_FISSta(true) },
+        },
+        {
+          type: "danger",
+          label: "重置[FIS发货]",
+          name: "normalSta-reset",
+          size: "mini",
+          hide: () => { return this.hideButton_FISSta(false) },
+        },
         this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选
@@ -116,13 +172,47 @@ export default {
       DrawerButtonData: [
         // ...requestData(this)
       ],
+      showFilterSta_normal:false,//查看普通发货
+      showFilterSta_fis:false,//查看fis发货
+      // 批量生成发货单弹窗
+      creatDeliverShow:false,
+      creatDeliverForm:{
+        truckNumber:""
+      },
+      creatDeliverRules:{
+        truckNumber: [{ required: true, trigger: "blur", message: "不可为空" }]
+      }
     };
   },
   mounted () {
     this.paging();
   },
   methods:{
+    overallSearchFormCallback(){
+      this.showFilterSta_normal = false
+      this.showFilterSta_fis = false
+    },
+    // 查看普通发货、fis发货
+    fasterSearchHandle(type){
+      this.PageListParams.condition.filters = [{
+        logic: "And",
+        column: "deliverRequestType",
+        action: "==",
+        value: String(type)
+      }]
+      this.paging()
+      this.httpOverallSearchData = null
+    },
+    // 重置普通发货、fis发货
+    resetSearchHandle(){
+      this.showFilterSta_normal = false
+      this.showFilterSta_fis = false
+      this.PageListParams.condition.filters = []
+      this.paging()
+      this.httpOverallSearchData = null
+    },
     topbuttonHandle(val,item){
+      // 批量生成发货单
       if(val == "creatDeliver"){
         if(!this.multipleSelection || this.multipleSelection.length <= 0){
           this.$warningMsg("至少选择一条数据")
@@ -138,26 +228,25 @@ export default {
           this.$errorMsg("所选数据的客户代码必须一致！")
           return
         }
-        let _ids = []
-        this.multipleSelection.forEach(select=>{ _ids.push(select.id) })
-        this.$confirm('是否确定批量生成发货单?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.Loading.appMainLoading = true
-          deliverRequestHandleList(_ids)
-          .then(res => {
-            this.Loading.appMainLoading = false
-            this.$refs.FISDeliverRequestTable_Ref.clearSelection()
-            this.paging()
-          }).catch(err => {
-            this.Loading.appMainLoading = false
-          })
-        }).catch(() => {
-
-        });
-      }else{
+        this.creatDeliverShow = true
+      }
+      // 查看普通发货
+      else if(val == 'normalSta'){
+        this.showFilterSta_normal = true
+        this.showFilterSta_fis = false
+        this.fasterSearchHandle('1')
+      }
+      // 查看fis发货
+      else if(val == 'FISSta'){
+        this.showFilterSta_fis = true
+        this.showFilterSta_normal = false
+        this.fasterSearchHandle('2')
+      } 
+      // 重置状态
+      else if(val == 'normalSta-reset' || val == 'FISSta-reset'){
+        this.resetSearchHandle()
+      } 
+      else{
         this.topbutton(val,item)
       }
     },
@@ -219,6 +308,44 @@ export default {
       }else{
         this.drawerbutton(val)
       }
+    },
+    // 批量操作弹窗-关闭
+    creatDeliverClose(){
+      this.creatDeliverForm.truckNumber = ""
+      this.creatDeliverShow = false
+    },
+    // 批量操作弹窗-确定
+    creatDeliverSure(){
+      this.$refs.creatDeliverRef.validate((valid) => {
+        if (valid) {
+          this.Loading.appMainLoading = true
+          let _params = {truckNumber:String(this.creatDeliverForm.truckNumber)}
+          this.creatDeliverClose()
+          let _ids = []
+          this.multipleSelection.forEach(select=>{ _ids.push(select.id) })
+          deliverRequestHandleList(_ids,_params)
+          .then(res => {
+            this.Loading.appMainLoading = false
+            this.$refs.FISDeliverRequestTable_Ref.clearSelection()
+            this.paging()
+            this.$successMsg('操作成功！')
+          }).catch(err => {
+            this.Loading.appMainLoading = false
+          })
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+      // this.$confirm('是否确定批量生成发货单?', '提示', {
+      //   confirmButtonText: '确定',
+      //   cancelButtonText: '取消',
+      //   type: 'warning'
+      // }).then(() => {
+        
+      // }).catch(() => {
+
+      // });
     }
   }
 }
diff --git a/fe/PC/src/views/rawMaterialManage/quality/unqualifiedToQualified.vue b/fe/PC/src/views/rawMaterialManage/quality/unqualifiedToQualified.vue
index b4af61c0e..29c1abbd4 100644
--- a/fe/PC/src/views/rawMaterialManage/quality/unqualifiedToQualified.vue
+++ b/fe/PC/src/views/rawMaterialManage/quality/unqualifiedToQualified.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="page-box" v-loading="Loading.appMainLoading">
     <tablePagination
+      ref="tablePagination_Ref"
       :currenButtonData="currenButtonData"
       :tableData="tableData"
       :tableLoading="Loading.tableLoading"
@@ -49,14 +50,16 @@
       :visible="convertReasonShow"
       :append-to-body="true"
     >
-      <el-form :model="convertReasonForm" v-if="convertReasonShow">
-        <el-form-item>
-          <el-input v-model="convertReasonForm.reason" :rows="3" type="textarea"></el-input>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="convertClose">取 消</el-button>
-        <el-button type="primary" @click="convertList()">确 定</el-button>
+      <div v-loading="convertReasonLoading">
+        <el-form :model="convertReasonForm" v-if="convertReasonShow">
+          <el-form-item>
+            <el-input v-model="convertReasonForm.reason" :rows="3" type="textarea"></el-input>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer" style="text-align:right">
+          <el-button @click="convertClose">取 消</el-button>
+          <el-button type="primary" @click="convertList()">确 定</el-button>
+        </div>
       </div>
     </el-dialog>
   </div>
@@ -102,6 +105,7 @@ export default {
       ],
       convertReasonShow:false,//批量原因弹窗
       convertReasonForm:{reason:null},
+      convertReasonLoading:false,
     };
   },
   mounted () {
@@ -137,7 +141,8 @@ export default {
     },
     // 批量转合格
     convertList() {
-      this.Loading.appMainLoading = true
+      if(this.convertReasonLoading)return
+      this.convertReasonLoading = true
       let params = {
         tenantId: null,
         remark: this.convertReasonForm.reason,
@@ -207,9 +212,10 @@ export default {
         this.$message.success('已成功转为合格')
         this.paging()
         this.convertClose()
-        this.Loading.appMainLoading = false
+        this.$refs.tablePagination_Ref.clearSelection()
+        this.convertReasonLoading = false
       }).catch(err => {
-        this.Loading.appMainLoading = false
+        this.convertReasonLoading = false
         console.log(err)
       })
       // return this.convertList