diff --git a/oms_web/oms_vue/src/router/index.js b/oms_web/oms_vue/src/router/index.js
index 6f986687..e122847c 100644
--- a/oms_web/oms_vue/src/router/index.js
+++ b/oms_web/oms_vue/src/router/index.js
@@ -74,6 +74,28 @@ export const constantRoutes = [
       }
     ]
   },
+  {
+    path: '/purchase',
+    component: Layout,
+    children: [
+      {
+        path: 'approved',
+        component: () => import('@/views/approve/purchaase/approved/index'),
+        hidden: true
+      },
+    ]
+  },
+  {
+    path: '/approve',
+    component: Layout,
+    children: [
+      {
+        path: 'orderLog',
+        component: () => import('@/views/approve/approved_order/index'),
+        hidden: true
+      },
+    ]
+  },
   {
     path: '/user',
     component: Layout,
diff --git a/oms_web/oms_vue/src/views/approve/approved_order/index.vue b/oms_web/oms_vue/src/views/approve/approved_order/index.vue
index 4cb5bb91..12ab63f3 100644
--- a/oms_web/oms_vue/src/views/approve/approved_order/index.vue
+++ b/oms_web/oms_vue/src/views/approve/approved_order/index.vue
@@ -56,6 +56,14 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          size="mini"
+          @click="()=>{this.$router.back()}"
+        >返回</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
diff --git a/oms_web/oms_vue/src/views/approve/order/index.vue b/oms_web/oms_vue/src/views/approve/order/index.vue
index 7e35960f..635c5f8d 100644
--- a/oms_web/oms_vue/src/views/approve/order/index.vue
+++ b/oms_web/oms_vue/src/views/approve/order/index.vue
@@ -58,7 +58,18 @@
     <el-row :gutter="10" class="mb8">
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          size="mini"
+          @click="toApproved()"
+        >审批历史</el-button>
+      </el-col>
 
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
     <el-table v-loading="loading" :data="orderList">
       <el-table-column label="合同编号" align="center" prop="orderCode" />
       <el-table-column label="项目名称" align="center" prop="projectName" />
@@ -155,6 +166,11 @@ export default {
     this.getList();
   },
   methods: {
+    toApproved(){
+      this.$router.push({
+        path: '/approve/orderLog',
+      });
+    },
     /** 查询订单列表 */
     getList() {
       this.loading = true;
diff --git a/oms_web/oms_vue/src/views/approve/purchaase/approve/index.vue b/oms_web/oms_vue/src/views/approve/purchaase/approve/index.vue
index 2008e917..34222b36 100644
--- a/oms_web/oms_vue/src/views/approve/purchaase/approve/index.vue
+++ b/oms_web/oms_vue/src/views/approve/purchaase/approve/index.vue
@@ -29,7 +29,18 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          size="mini"
+          @click="toApproved()"
+        >审批历史</el-button>
+      </el-col>
 
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
     <el-table v-loading="loading" :data="purchaseorderList">
       <!-- 表格列定义 -->
       <el-table-column label="序号" type="index" width="50" align="center" />
@@ -122,6 +133,7 @@ export default {
       loading: true,
       showSearch: true,
       total: 0,
+      confirmDialogTitle:'',
       purchaseorderList: [],
       queryParams: {
         pageNum: 1,
@@ -168,6 +180,9 @@ export default {
     });
   },
   methods: {
+    toApproved(){
+      this.$router.push( '/purchase/approved' )
+    },
     // 列表页方法
     getList() {
       this.loading = true;
diff --git a/oms_web/oms_vue/src/views/approve/purchaase/approved/index.vue b/oms_web/oms_vue/src/views/approve/purchaase/approved/index.vue
index fcf92d16..6152af0b 100644
--- a/oms_web/oms_vue/src/views/approve/purchaase/approved/index.vue
+++ b/oms_web/oms_vue/src/views/approve/purchaase/approved/index.vue
@@ -29,7 +29,18 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          size="mini"
+          @click="()=>{this.$router.back()}"
+        >返回</el-button>
+      </el-col>
 
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
     <el-table v-loading="loading" :data="purchaseorderList">
       <!-- 表格列定义 -->
       <el-table-column label="序号" type="index" width="50" align="center" />
diff --git a/oms_web/oms_vue/src/views/inventory/outer/components/GenerateDeliveryForm.vue b/oms_web/oms_vue/src/views/inventory/outer/components/GenerateDeliveryForm.vue
index b618deb5..2b2a0b85 100644
--- a/oms_web/oms_vue/src/views/inventory/outer/components/GenerateDeliveryForm.vue
+++ b/oms_web/oms_vue/src/views/inventory/outer/components/GenerateDeliveryForm.vue
@@ -177,7 +177,7 @@ export default {
       });
     },
     handleSelectPurchaseBeforeImport() {
-      if ((this.productData.orderType || '1') === '1') {
+      if (((this.productData.orderType || '1') === '1' ) || !(this.outerData.vendorName.startsWith('新华三') && this.productData.productType==='2')) {
         this.purchaseOrderSelectVisible = true;
       }else{
         this.handleImport()
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/InventoryOuterDetail.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/InventoryOuterDetail.java
index 1a75d210..67a30bbc 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/InventoryOuterDetail.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/InventoryOuterDetail.java
@@ -42,5 +42,6 @@ public class InventoryOuterDetail extends BaseEntity
     private String productCode;
     private String model;
     private String productName;
+    private String productType;
 
 }
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryOuterServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryOuterServiceImpl.java
index e56e4e5c..b7e2934e 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryOuterServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryOuterServiceImpl.java
@@ -271,6 +271,7 @@ public class InventoryOuterServiceImpl implements IInventoryOuterService
             vo.setId(item.getId());
             vo.setProductCode(item.getProductCode());
             vo.setModel(item.getModel());
+            vo.setProductType(item.getProductType());
             vo.setQuantity(item.getQuantity());
             vo.setWarehouseId(item.getWarehouseId());
             vo.setWarehouseName(item.getWarehouseName());
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsInventoryInnerServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsInventoryInnerServiceImpl.java
index 1fd14df0..9c1f6e4e 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsInventoryInnerServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsInventoryInnerServiceImpl.java
@@ -272,7 +272,7 @@ public class OmsInventoryInnerServiceImpl implements IOmsInventoryInnerService {
             throw new ServiceException("产品编码对应产品未找到");
         }
         Map<String, OmsWarehouseInfo> warehouseInfoMap=Collections.emptyMap();
-        if ("2".equalsIgnoreCase(orderType)){
+        if ("2".equalsIgnoreCase(orderType)|| ("2".equalsIgnoreCase(productInfos.get(0).getType()) || productInfos.get(0).getVendorName().startsWith("新华三")) ){
                     List<String> warehouseNameList = inventoryInfoExcelDtoList.stream().map(InventoryInfoExcelDto::getWarehouseName).distinct().collect(Collectors.toList());
         if (warehouseNameList.size() > 1){
             throw new ServiceException("导入清单只能有一个仓库");
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/vo/OuterDeliveryProductVo.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/vo/OuterDeliveryProductVo.java
index 31b07907..cdb7a800 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/vo/OuterDeliveryProductVo.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/vo/OuterDeliveryProductVo.java
@@ -28,5 +28,6 @@ public class OuterDeliveryProductVo {
     private String warehouseName;
     private String orderType;
     private Long warehouseId;
+    private String productType;
 
 }
diff --git a/ruoyi-sip/src/main/resources/mapper/inventory/InventoryOuterDetailMapper.xml b/ruoyi-sip/src/main/resources/mapper/inventory/InventoryOuterDetailMapper.xml
index 1efd2441..a9365aa4 100644
--- a/ruoyi-sip/src/main/resources/mapper/inventory/InventoryOuterDetailMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/inventory/InventoryOuterDetailMapper.xml
@@ -21,7 +21,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                t2.warehouse_name,
                t4.product_code,
                t4.model,
-               t4.available_count
+               t4.available_count,
+               t4.type as product_type
         from oms_inventory_outer_detail t1
         left join oms_warehouse_info t2 on t1.warehouse_id=t2.id
             left join oms_inventory_outer t3 on t1.outer_code=t3.outer_code