diff --git a/src/api/asnDetail.js b/src/api/asnDetail.js
index 78bedb3..7221ad7 100644
--- a/src/api/asnDetail.js
+++ b/src/api/asnDetail.js
@@ -100,8 +100,16 @@ export function collectMOCreate(data) {
   })
 }
 
+export function zhengli(data) {
+  return request({
+    url: 'api/asnDetail/zhengli',
+    method: 'post',
+    data
+  })
+}
 
 
 
 
-export default { add, del,edit,doCheckAsn,collectMOCreate,updateContainer,queryAsnDetailAll,putawayConfirm,rkAndQxButtonQX,cancelPut}
+
+export default { add, del,edit,doCheckAsn,collectMOCreate,updateContainer,queryAsnDetailAll,putawayConfirm,rkAndQxButtonQX,cancelPut,zhengli}
diff --git a/src/views/base-data/item/index.vue b/src/views/base-data/item/index.vue
index cec0ac4..40f0ab5 100644
--- a/src/views/base-data/item/index.vue
+++ b/src/views/base-data/item/index.vue
@@ -173,6 +173,10 @@
                 <el-checkbox label="SAP料号" style="font-weight :bold" v-model="form.isSapMaterial"></el-checkbox>
               </el-col>
 
+              <el-col :span="8">
+                <el-checkbox label="质检" style="font-weight :bold" v-model="form.isInspection"></el-checkbox>
+              </el-col>
+
             </el-row>
           </el-form-item>
 
diff --git a/src/views/base-data/point/index.vue b/src/views/base-data/point/index.vue
index 52ed840..8441f2b 100644
--- a/src/views/base-data/point/index.vue
+++ b/src/views/base-data/point/index.vue
@@ -109,6 +109,25 @@
             </el-select>
           </el-form-item>
 
+          <el-form-item label="容器"  prop="stock">
+            <el-select v-model="form.stock"
+                       value-key="id"
+                       @focus="queryStock()"
+                       placeholder="请选择容器"
+                       clearable
+                       filterable
+                       style="width: 100%"
+            >
+              <el-option
+                v-for="stocks in stockOptions"
+                :key="stocks.id"
+                :label="stocks.code"
+                :value="stocks"
+              />
+            </el-select>
+
+          </el-form-item>
+
 
 
           <el-form-item label="描述">
@@ -198,7 +217,8 @@ const defaultForm = {
   name: null,
   description: null,
   area: null,
-  point: null
+  point: null,
+  stock:null
 }
 export default {
   name: 'Point',
@@ -235,6 +255,7 @@ export default {
       from1: [],
       fromBack: [],
       pointListData: [],
+      stockOptions:[],
       headers: { 'Authorization': getToken() },
       queryTypeOptions: [
         { key: 'code', display_name: '代码' },
@@ -329,6 +350,11 @@ export default {
         //   })
       })
     },
+    queryStock() {
+      crudStock.queryKyStockList({}).then(res => {
+        this.stockOptions = res
+      })
+    },
     //呼叫空车
     callEmpty() {
       this.callStock.pointCode = this.from1.pointCode
diff --git a/src/views/business-asn/asn/viewAsnDetail.vue b/src/views/business-asn/asn/viewAsnDetail.vue
index 8deae21..951a5fd 100644
--- a/src/views/business-asn/asn/viewAsnDetail.vue
+++ b/src/views/business-asn/asn/viewAsnDetail.vue
@@ -6,7 +6,6 @@
                top="0.5vh"
                :fullscreen="fullscreen"
                width="85%"
-               :modal="false"
                :close-on-click-modal="false"
                :before-close="handleClose"
     >
@@ -318,21 +317,23 @@
       title="明细整理"
       :visible.sync="zlDialogVisible"
       width="30%"
+      top="0.5vh"
       :before-close="handleZlClose">
       <el-form :model="zlForm" :rules="zlRules" ref="zlForm" label-width="100px" class="demo-ruleForm">
         <el-form-item label="料号">
-          <el-input v-model="zlForm.item.code"></el-input>
+          <el-input disabled v-model="zlForm.item.code"></el-input>
         </el-form-item>
         <el-form-item label="物料描述">
-          <el-input v-model="zlForm.item.name"></el-input>
+          <el-input disabled v-model="zlForm.item.name"></el-input>
         </el-form-item>
 
         <el-form-item label="待收数量">
-          <el-input v-model.number="zlForm.orderQty"></el-input>
+          <el-input disabled v-model.number="zlForm.orderQty"></el-input>
         </el-form-item>
 
         <el-form-item label="订单日期">
           <el-date-picker
+            disabled
             style="width: 370px"
             v-model="zlForm.asn.orderDate"
             type="date"
@@ -341,8 +342,13 @@
         </el-form-item>
 
         <el-form-item label="库区" prop="area">
-          <el-select v-model="zlForm.area" value-key="id"
-                     placeholder="请选择库区" clearable filterable style="width: 100%"
+          <el-select v-model="zlForm.area"
+                     value-key="id"
+                     placeholder="请选择库区"
+                     clearable
+                     filterable
+                     style="width: 100%"
+                     @change="handleAreaChange"
           >
             <el-option
               v-for="areas in areaOptions"
@@ -354,16 +360,43 @@
 
         </el-form-item>
 
-        <el-form-item label="库位" prop="loc">
-          <el-select v-model="zlForm.loc" value-key="id"
+
+        <el-form-item label="库位" v-if="showPointSelect" prop="point">
+          <el-select v-model="zlForm.point"
+                     value-key="id"
                      @focus="getPointList(null,null,null)"
-                     placeholder="请选择库位" clearable filterable style="width: 100%"
+                     @change="loadStocksByPoint"
+                     placeholder="请选择库位"
+                     clearable
+                     filterable
+                     style="width: 100%"
           >
             <el-option
               v-for="points in pointOptions"
               :key="points.id"
               :label="points.name"
               :value="points"
+              v-if="points.type!='SHZC'"
+            />
+          </el-select>
+
+        </el-form-item>
+
+        <el-form-item label="容器" v-if="showStockSelect" prop="stock">
+          <el-select v-model="zlForm.stock"
+                     value-key="id"
+                     @focus="queryStock()"
+                     placeholder="请选择容器"
+                     clearable
+                     filterable
+                     style="width: 100%"
+                     :disabled="disableStockSelect"
+          >
+            <el-option
+              v-for="stocks in stockOptions"
+              :key="stocks.id"
+              :label="stocks.code"
+              :value="stocks"
             />
           </el-select>
 
@@ -373,21 +406,6 @@
           <el-input v-model.number="zlForm.receivedQty"></el-input>
         </el-form-item>
 
-        <el-form-item label="容器" prop="stock">
-          <el-select v-model="zlForm.stock" value-key="id"
-                     @focus="queryStock()"
-                     placeholder="请选择容器" clearable filterable style="width: 100%"
-          >
-            <el-option
-              v-for="stocks in stockOptions"
-              :key="stocks.id"
-              :label="stocks.name"
-              :value="stocks"
-            />
-          </el-select>
-
-        </el-form-item>
-
 
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -553,7 +571,7 @@ export default {
       areaOptions: [],
       //下拉类型
       billTypeOptions: [],
-      stockOptions:[],
+      stockOptions: [],
       // 新增主表
       asnFrom: {
         id: null,
@@ -606,18 +624,21 @@ export default {
       zlForm: {
         item: {},
         asn: {},
-        orderQty: 0,
         area: {},
-        loc:{},
-        receivedQty:0
-      }
+        point: {},
+        orderQty: 0,
+        shQty: 0
+      },
+      showStockSelect: false, // 控制容器选择框是否显示
+      showPointSelect: false, // 控制库位选择框是否显示
+      disableStockSelect: false, // 控制容器选择框是否只读
     }
   },
   // beforeDestroy() {    //页面关闭时清除定时器
   //   clearInterval(this.clearTimeSet);
   // },
   mounted() {
-
+    this.queryStock()
     //查询公用的下拉数据
     this.getOnceOptionAll()
     //判断是否是新增主表和是查看明细新政附表
@@ -655,7 +676,7 @@ export default {
       // 执行关闭操作
       done();
     },
-    queryStock(){
+    queryStock() {
       crudStock.queryKyStockList({}).then(res => {
         this.stockOptions = res
       })
@@ -901,14 +922,47 @@ export default {
       this.zlForm = datas[0];
       this.zlDialogVisible = true;
     },
+    handleAreaChange() {
+      //选择库区使 控制容器、库位的显示隐藏的显示隐藏
+      this.showStockSelect = this.zlForm.area.id === 78 ? true : true;
+      this.showPointSelect = this.zlForm.area.id === 78 ? true : false;
+      this.disableStockSelect = this.zlForm.area.id === 78 ? true : false;
+    },
     zhengli() {
-
+      if (this.zlForm.receivedQty > this.zlForm.orderQty) {
+        return this.crud.notify('收货数量不能超过待收数量', CRUD.NOTIFICATION_TYPE.ERROR)
+      }
+      crudAsnDetail.zhengli(this.zlForm).then(res => {
+        if (res.status == 200) {
+          this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.SUCCESS)
+          this.crud.toQuery()
+          this.zlDialogVisible = false;
+        } else {
+          this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.ERROR)
+        }
+      })
     },
     zhengliCel() {
+      this.zlForm.area = {};
+      this.zlForm.stock = {};
+      this.zlForm.point = {};
+      this.zlForm.receivedQty = 0;
+      this.showStockSelect = false;
+      this.showPointSelect = false;
+      this.disableStockSelect = false;
       this.zlDialogVisible = false;
     },
     handleZlClose(done) {
       done();
+    },
+    loadStocksByPoint() {
+      if (this.zlForm.point && this.zlForm.point.stock) {
+        this.stockOptions = [this.zlForm.point.stock];  // 清空原有选项并添加新的容器选项
+        this.zlForm.stock = this.zlForm.point.stock;  // 设置当前选中的容器
+      } else {
+        this.stockOptions = [];  // 如果没有容器信息，则清空选项
+        this.zlForm.stock = null;  // 重置当前选中的容器
+      }
     }
   }
 }