diff --git a/hw-ui/src/views/board/fourthFloor/assemble.vue b/hw-ui/src/views/board/fourthFloor/assemble.vue
index a644679..d9196dc 100644
--- a/hw-ui/src/views/board/fourthFloor/assemble.vue
+++ b/hw-ui/src/views/board/fourthFloor/assemble.vue
@@ -252,6 +252,14 @@
           prop="materialName"
         >
         </el-table-column>
+        <el-table-column
+          label="安全库存"
+          prop="safeFlag"
+        >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.mes_safe_flag" :value="scope.row.safeFlag"/>
+          </template>
+        </el-table-column>
         <el-table-column
           label="可用库存数量"
           prop="availableAmount"
@@ -405,7 +413,7 @@ import {
 const vw = (document.documentElement.clientWidth || document.body.clientWidth) / 100
 export default {
   name: 'Board1',
-  dicts: ['mes_plan_detail_status','wms_raw_return_task_type'],
+  dicts: ['mes_plan_detail_status','wms_raw_return_task_type','mes_safe_flag'],
   components: {
     Chart,
     PrintPage
@@ -477,6 +485,7 @@ export default {
       this.tableData = e.rows
       this.totalNum1 = Math.ceil(e.total / 5)
       this.materialBomId = e.rows?.[0]?.materialBomId
+      this.saleOrderId = e.rows?.[0]?.saleOrderId
       getProductPlanDetails({pageNum: 1, pageSize: 5, planId: e.rows?.[0]?.planId}).then(res => {
         this.tableData1 = res.rows
         this.totalNum2 = Math.ceil(res.total / 5)
@@ -741,6 +750,7 @@ export default {
     getDetail(e) {
       this.planId = e.row.planId
       this.materialBomId = e.row.materialBomId
+      this.saleOrderId = e.row.saleOrderId
       this.nowNum2 = 1
       getProductPlanDetails({pageNum: 1, pageSize: 5, planId: e.row.planId}).then(res => {
         if (res.rows.length === 0) {
@@ -785,12 +795,13 @@ export default {
         planId: val.row.planId,
         planCode: val.row.planCode,
         planDetailCode: val.row.planDetailCode,
+        saleOrderId : this.saleOrderId,
         applyReason: '',
         taskType: '1',
         wmsRawOutstockDetailList: []
       }
       // 获取仓库信息
-      getWarehouses({"warehouseFloor": 1}).then(e => {
+      getWarehouses({"warehouseFloor": 4}).then(e => {
         this.warehouseList = e.data
         this.form.warehouseId = e.data[0]?.warehouseId
         this.searchMaterial("");
@@ -815,13 +826,16 @@ export default {
     searchMaterial(val) {
       getStockTotal({
         warehouseId: this.form.warehouseId,
+        saleOrderId: this.saleOrderId,
         materialName: val
       }).then(e => {
         this.form.wmsRawOutstockDetailList = e.data.map(r => {
           return {
+            stockTotalId: r.stockTotalId,
             materialId: r.materialId,
             materialCode: r.materialCode,
             materialName: r.materialName,
+            safeFlag: r.safeFlag,
             availableAmount: r.totalAmount - r.occupyAmount - r.frozenAmount,
             unavailableAmount: r.occupyAmount + r.frozenAmount,
             planAmount: r.planAmount