diff --git a/src/api/factory/site.js b/src/api/factory/site.js
index c6a6323..d7cddae 100644
--- a/src/api/factory/site.js
+++ b/src/api/factory/site.js
@@ -51,3 +51,5 @@ export const searchBusinessInfo7 = data => createAPI(`/site/searchBusinessInfo7`
 
 export const getResponsibleDepartment = data => createAPI(`/site/getResponsibleDepartment`,'post',data)
 
+export const getEamWorkShop = data => createAPI(`/site/getEamWorkShop`,'post',data)
+
diff --git a/src/views/modules/orderIssure/soIssueNotify/newSoIssueNotify.vue b/src/views/modules/orderIssure/soIssueNotify/newSoIssueNotify.vue
index 467397e..8e1a53a 100644
--- a/src/views/modules/orderIssure/soIssueNotify/newSoIssueNotify.vue
+++ b/src/views/modules/orderIssure/soIssueNotify/newSoIssueNotify.vue
@@ -1329,6 +1329,24 @@
             fixed: '',
             columnWidth: 50,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701001002,
+            serialNumber: '701001002Table3StockQty',
+            tableId: "701001002Table3",
+            tableName: "领料申请BOM子表",
+            columnProp: 'stockQty',
+            headerAlign: "center",
+            align: "right",
+            columnLabel: 'ERP库存',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 50,
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 701001002,
@@ -1411,6 +1429,7 @@
       this.$nextTick(() => {
         this.height = window.innerHeight - 300
       })
+
     },
 
     created () {
diff --git a/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue b/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue
index 3d67ab8..529b164 100644
--- a/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue
+++ b/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue
@@ -29,6 +29,13 @@
             placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
+        <el-form-item label="状态" >
+          <el-select v-model="searchData.status" placeholder="请选择" style="width: 120px">
+            <el-option label="全部" value=""></el-option>
+            <el-option label="已下达" value="已下达"></el-option>
+            <el-option label="已关闭" value="已关闭"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="是否领料" >
           <el-select v-model="searchData.issueFlag" placeholder="请选择" style="width: 120px">
             <el-option label="全部" value=""></el-option>
@@ -43,6 +50,16 @@
             <el-option label="全部发料" value="全部发料"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item :label="'车间'">
+          <el-select v-model="searchData.workShopList" multiple style="width: 360px">
+            <el-option
+              v-for = "i in workShopList"
+              :key = "i.workShopId"
+              :label = "i.workShopName"
+              :value = "i.workShopId">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item :label="' '">
           <el-button type="primary" @click="searchTable()">查询</el-button>
           <download-excel
@@ -91,11 +108,10 @@
         header-align="center"
         align="center"
         width="80"
-        fixed="left"
         label="操作">
         <template slot-scope="scope">
-          <a type="text" size="small" v-if="scope.row.status==='已下达'" @click="closeNotify(scope.row)">结束</a>
-          <a type="text" size="small" v-if="scope.row.status==='已关闭'" @click="openNotify(scope.row)">打开</a>
+          <a type="text" size="small" v-if="scope.row.status==='已下达'" @click="closeNotify(scope.row)">关闭</a>
+          <a type="text" size="small" v-if="scope.row.status==='已关闭'" @click="openNotify(scope.row)">开启</a>
         </template>
       </el-table-column>
     </el-table>
@@ -281,6 +297,7 @@
     ,searchNotifyLog
   }from "@/api/orderIssure/soIssueNotify.js"
   import Chooselist from '@/views/modules/common/Chooselist'
+  import {getEamWorkShop} from "@/api/factory/site.js";
   export default {
     components: {
       Chooselist
@@ -302,12 +319,15 @@
           site:this.$store.state.user.site,
           userName: '',
           notifyNo: '',
+          status: '',
           issueFlag: '',
           issueResult: '',
+          workShopList: [],
           startDate: this.dayjs().format("YYYY-MM-DD"),
           endDate: this.dayjs().format("YYYY-MM-DD"),
           sql: " and a.status!='已计划' ",
         },
+        workShopList: [],
         exportList:[],
         pageIndex: 1,
         pageSize: 100,
@@ -333,6 +353,23 @@
             status: true,
             fixed: '',
             columnWidth: 100
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table1WorkShopName',
+            tableId: "701002Table1",
+            tableName: "领料申请主表",
+            columnProp: "workShopName",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "车间",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
           },{
             userId: this.$store.state.user.name,
             functionId: 701002,
@@ -1136,7 +1173,11 @@
     mounted () {
       this.$nextTick(() => {
         this.height = (window.innerHeight- 250) / 2
-
+        getEamWorkShop({}).then(({data}) => {
+          if (data && data.code === 0) {
+            this.workShopList=data.rows
+          }
+        })
       })
     },
 
diff --git a/src/views/modules/orderIssure/soIssueNotify/searchIssureNotifyForCK.vue b/src/views/modules/orderIssure/soIssueNotify/searchIssureNotifyForCK.vue
index 88c6b44..c13d5e4 100644
--- a/src/views/modules/orderIssure/soIssueNotify/searchIssureNotifyForCK.vue
+++ b/src/views/modules/orderIssure/soIssueNotify/searchIssureNotifyForCK.vue
@@ -29,6 +29,16 @@
             placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
+        <el-form-item :label="'车间'">
+          <el-select v-model="searchData.workShopList" multiple style="width: 360px">
+            <el-option
+              v-for = "i in workShopList"
+              :key = "i.workShopId"
+              :label = "i.workShopName"
+              :value = "i.workShopId">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item :label="' '">
           <el-button type="primary" @click="searchTable()">查询</el-button>
           <download-excel
@@ -233,6 +243,7 @@
     ,deleteNotifyMaterial
   }from "@/api/orderIssure/soIssueNotify.js"
   import Chooselist from '@/views/modules/common/Chooselist'
+  import {getEamWorkShop} from "@/api/factory/site.js";
   export default {
     components: {
       Chooselist
@@ -255,10 +266,12 @@
           notifyNo: '',
           issueFlag: '',
           issueResult: '',
+          workShopList: [],
           startDate: this.dayjs().format("YYYY-MM-DD"),
           endDate: this.dayjs().format("YYYY-MM-DD"),
           sql: " and a.status='已下达' and (issueFlag='N' or issueResult='部分发料' ) ",
         },
+        workShopList: [],
         exportList:[],
         pageIndex: 1,
         pageSize: 100,
@@ -284,6 +297,23 @@
             status: true,
             fixed: '',
             columnWidth: 100
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table1WorkShopName',
+            tableId: "701002Table1",
+            tableName: "领料申请主表",
+            columnProp: "workShopName",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "车间",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
           },{
             userId: this.$store.state.user.name,
             functionId: 701003,
@@ -924,6 +954,11 @@
       this.$nextTick(() => {
         this.height = (window.innerHeight- 260) / 2
         this.searchTable()
+        getEamWorkShop({}).then(({data}) => {
+          if (data && data.code === 0) {
+            this.workShopList=data.rows
+          }
+        })
       })
     },
 
diff --git a/src/views/modules/sys/user-add-or-update.vue b/src/views/modules/sys/user-add-or-update.vue
index fe23d53..fa31f15 100644
--- a/src/views/modules/sys/user-add-or-update.vue
+++ b/src/views/modules/sys/user-add-or-update.vue
@@ -35,6 +35,16 @@
             <span slot="label" style="" @click="getBaseList(93)"><a herf="#">{{buttons.site||'工厂'}}</a></span>
             <el-input v-model="dataForm.site" style="width: 150px;" placeholder="工厂"></el-input>
           </el-form-item>
+          <el-form-item label="车间">
+            <el-select v-model="dataForm.workShopId" placeholder="请选择"  >
+              <el-option
+                v-for = "i in workShopList"
+                :key = "i.workShopId"
+                :label = "i.workShopName"
+                :value = "i.workShopId">
+              </el-option>
+            </el-select>
+          </el-form-item>
         </el-form>
         <el-form>
           <el-form-item label="角色" size="mini" prop="roleIdList">
@@ -69,7 +79,7 @@
 
 <script>
   import Chooselist from '@/views/modules/common/Chooselist'
-import {getFactory} from "@/api/factory";
+import {getEamWorkShop} from "@/api/factory/site.js";
 import {searchSysLanguage} from "@/api/sysLanguage.js"
   import {
     searchFunctionButtonList,
@@ -97,7 +107,8 @@ export default {
         roleIdList: [],
         status: 1,
         site: '',
-        userDisplay: ''
+        userDisplay: '',
+        workShopId:'',
       },
       buttons: {
         add: '添加',
@@ -116,6 +127,7 @@ export default {
         site: '工厂',
         language: '语言',
       },
+      workShopList:[],
     }
   },
   methods: {
@@ -188,17 +200,23 @@ export default {
               this.dataForm.languageDefault = data.user.languageDefault
               this.dataForm.site = data.user.site.toString()
               this.dataForm.userDisplay = data.user.userDisplay
+              this.dataForm.workShopId = data.user.workShopId
             }
           })
         }
       })
+      getEamWorkShop({}).then(({data}) => {
+        if (data && data.code === 0) {
+          this.workShopList=data.rows
+        }
+      })
     },
     // 表单提交
     dataFormSubmit() {
-      // if(this.dataForm.site == null || this.dataForm.site == ''){
-      //   this.$message.success("工厂不能为空!");
-      //   return false;
-      // }
+      if(this.dataForm.workShopId == null || this.dataForm.workShopId == ''){
+        this.$message.error("车间不能为空!");
+        return false;
+      }
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           this.$http({
@@ -216,6 +234,7 @@ export default {
               'languageDefault': this.dataForm.languageDefault,
               'site': this.dataForm.site,
               'userDisplay': this.dataForm.userDisplay,
+              'workShopId': this.dataForm.workShopId,
             })
           }).then(({data}) => {
             if (data && data.code === 0) {
diff --git a/src/views/modules/sys/user.vue b/src/views/modules/sys/user.vue
index 0c2984b..7bacfde 100644
--- a/src/views/modules/sys/user.vue
+++ b/src/views/modules/sys/user.vue
@@ -76,6 +76,12 @@
         width="180"
         :label="buttons.createTime||'创建时间'">
       </el-table-column>
+      <el-table-column
+        prop="workShopName"
+        header-align="center"
+        align="center"
+        :label="'车间'">
+      </el-table-column>
       <el-table-column
         fixed="right"
         header-align="center"