diff --git a/.env.production b/.env.production
index 15e46cb6..21ea9a52 100644
--- a/.env.production
+++ b/.env.production
@@ -25,13 +25,13 @@ ENV = 'production'
 # VUE_APP_BASE_API = 'http://192.168.0.54:9150/UDI_WMS_MC/'
 
 # 平潭正式
-VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
 
 # 吴总测试服务器
 # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'
 
 # 漳州中医院
-# VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/'
+VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/'
 
 
 # 应用访问路径 例如使用前缀 /admin/
diff --git a/src/api/basic/busType.js b/src/api/basic/busType.js
index d3d7af70..982a4d58 100644
--- a/src/api/basic/busType.js
+++ b/src/api/basic/busType.js
@@ -1,4 +1,5 @@
 import axios from "@/utils/request";
+
 //获取数据
 export function getBusTypeList(params) {
   return axios({
diff --git a/src/api/system/invSubWarehouse.js b/src/api/system/invSubWarehouse.js
index 8c970ae7..094f492e 100644
--- a/src/api/system/invSubWarehouse.js
+++ b/src/api/system/invSubWarehouse.js
@@ -19,6 +19,16 @@ export function findInvByUser(query) {
   });
 }
 
+
+export function filterGroupBySpuse(params) {
+  return axios({
+    url: "/spms/inv/warehouse/filterGroupBySpuse",
+    method: "get",
+    params: params
+  });
+}
+
+
 //获取除了自己所有其他仓库
 export function findByFrom(query) {
   return axios({
@@ -76,6 +86,7 @@ export function deleteSubWarehouse(data) {
     data: data
   });
 }
+
 //查询第三方系统和仓库数据关联信息
 export function getSubThrsysDetail(params) {
   return axios({
diff --git a/src/views/basic/business/stockOrder.vue b/src/views/basic/business/stockOrder.vue
index 838a4681..394f8f51 100644
--- a/src/views/basic/business/stockOrder.vue
+++ b/src/views/basic/business/stockOrder.vue
@@ -17,11 +17,6 @@
             </el-form-item>
           </el-col>
 
-          <!--          <el-col :span="8">-->
-          <!--            <el-form-item label="送货单位:">-->
-          <!--              <el-input v-model="query.corpName" style="width: 90%" placeholder="请输入送货单位" clearable></el-input>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
 
           <el-col :span="8">
             <el-form-item class="query-form-item" label="单据类型:">
@@ -227,7 +222,7 @@ export default {
         limit: 10,
         startTime: "",
         endTime: "",
-        inCodeStatus: 1,
+        inCodeStatus: 0,
       },
       detailQuery: {
         orderIdFk: "",
@@ -344,7 +339,7 @@ export default {
         limit: 10,
         startTime: "",
         endTime: "",
-        inCodeStatus: 1,
+        inCodeStatus: 0,
       };
       this.getList();
 
diff --git a/src/views/purchase/purApply/purApplyEditDiaolog.vue b/src/views/purchase/purApply/purApplyEditDiaolog.vue
index 98b30516..bf8ce623 100644
--- a/src/views/purchase/purApply/purApplyEditDiaolog.vue
+++ b/src/views/purchase/purApply/purApplyEditDiaolog.vue
@@ -61,7 +61,7 @@
         <el-row style="margin-top: -10px">
           <el-col :span="11">
             <el-form-item label="申购仓库：" prop="locStorageCode">
-              <el-select v-model="formData.targetInvCode" placeholder="请选择当前申购仓库" @change="setWarehouseName"
+              <el-select v-model="formData.targetInvCode" placeholder="请选择申购仓库" @change="setWarehouseName"
                          style="width: 90%" clearable>
                 <el-option
                   v-for="item in subInvList"
@@ -184,7 +184,7 @@ import {
   addApplyId,
   updateDetail
 } from "@/api/purchase/purApply";
-import {filterSubByInv} from "@/api/system/invSubWarehouse";
+import {filterGroupBySpuse, filterSubByInv} from "@/api/system/invSubWarehouse";
 import {addPlanId} from "@/api/purchase/purPlan";
 import SelectRecelveListDialog from "@/views/inout/receive/selectReveiceListDialog";
 import {parseTime} from "@/utils/coTools";
@@ -489,9 +489,10 @@ export default {
     findSubInvs() {
       this.subInvList = [];
       let query = {
-        filter: 3
+        filter: 3,
+        spUse: true,
       };
-      filterSubByInv(query)
+      filterGroupBySpuse(query)
         .then((response) => {
           this.subInvList = response.data || [];
           if (this.subInvList != null && this.subInvList.length == 1) {
diff --git a/src/views/purchase/purOrder/purOrder.vue b/src/views/purchase/purOrder/purOrder.vue
index 5909929c..56bc8cf3 100644
--- a/src/views/purchase/purOrder/purOrder.vue
+++ b/src/views/purchase/purOrder/purOrder.vue
@@ -84,6 +84,7 @@
         <el-table-column label="采购单号" prop="billNo"></el-table-column>
         <el-table-column label="采购部门" prop="deptName"></el-table-column>
         <el-table-column label="采购仓库" prop="invName"></el-table-column>
+        <el-table-column label="申购人" prop="applyCreateBy"></el-table-column>
         <el-table-column label="供应商" prop="supName"></el-table-column>
         <el-table-column label="紧急程度" prop="emergency">
           <template slot-scope="scope">
diff --git a/src/views/purchase/purOrder/purOrderAudit.vue b/src/views/purchase/purOrder/purOrderAudit.vue
index 5c2bf5b6..5cb5f835 100644
--- a/src/views/purchase/purOrder/purOrderAudit.vue
+++ b/src/views/purchase/purOrder/purOrderAudit.vue
@@ -83,6 +83,7 @@
         <el-table-column label="采购单号" prop="billNo"></el-table-column>
         <el-table-column label="采购部门" prop="deptName"></el-table-column>
         <el-table-column label="采购仓库" prop="invName"></el-table-column>
+        <el-table-column label="申购人" prop="applyCreateBy"></el-table-column>
         <el-table-column label="供应商" prop="supName"></el-table-column>
         <el-table-column label="紧急程度" prop="emergency">
           <template slot-scope="scope">
diff --git a/src/views/purchase/purOrder/purOrderSearch.vue b/src/views/purchase/purOrder/purOrderSearch.vue
index 0b316f38..71d51dd6 100644
--- a/src/views/purchase/purOrder/purOrderSearch.vue
+++ b/src/views/purchase/purOrder/purOrderSearch.vue
@@ -99,6 +99,7 @@
         <el-table-column label="采购单号" prop="billNo"></el-table-column>
         <el-table-column label="采购部门" prop="deptName"></el-table-column>
         <el-table-column label="采购仓库" prop="invName"></el-table-column>
+        <el-table-column label="申购人" prop="applyCreateBy"></el-table-column>
         <el-table-column label="供应商" prop="supName"></el-table-column>
         <el-table-column label="紧急程度" prop="emergency">
           <template slot-scope="scope">