diff --git a/src/views/business-asn/asn/index.vue b/src/views/business-asn/asn/index.vue
index 0c5b7cd..35d254a 100644
--- a/src/views/business-asn/asn/index.vue
+++ b/src/views/business-asn/asn/index.vue
@@ -508,13 +508,13 @@ export default {
     },
     asnDetailRouter(datas) {
       this.$refs.viewAsnDetail.asnFrom = datas
+      console.log(this.asnFrom.status)
       this.$refs.viewAsnDetail.queryAsnDetail(datas.id)
       this.$refs.viewAsnDetail.dialogInsertAsn = true
       //this.$router.push({path:'/business-asn/viewAsnDetail',query: {ids:datas.id}})
     },
     //入库批量确认
     invVerifyS(data) {
-      console.log(data)
       let ids = [];
       for (const idsKey of data) {
         ids.push(idsKey.id);
diff --git a/src/views/business-asn/asn/viewAsnDetail.vue b/src/views/business-asn/asn/viewAsnDetail.vue
index 3871b36..fa7f09e 100644
--- a/src/views/business-asn/asn/viewAsnDetail.vue
+++ b/src/views/business-asn/asn/viewAsnDetail.vue
@@ -66,7 +66,7 @@
                     placeholder="请输入备注"
           />
         </el-form-item>
-        <el-button type="primary" size="small" @click="submitFromAsn(asnFrom)">提交
+        <el-button type="primary" size="small" :disabled="this.asnFrom.status!='OPEN'" @click="submitFromAsn(asnFrom)">提交
         </el-button>
       </el-form>
       <el-tabs v-model="activeName" @tab-click="handleClick">
@@ -78,7 +78,7 @@
               class="filter-item"
               type="primary"
               size="mini"
-              :disabled="this.asnFrom.id == null||!this.asnFrom.status=='OPEN'"
+              :disabled="this.asnFrom.id<=0 || this.asnFrom.id==undefined || this.asnFrom.status!='OPEN' "
               @click="insertAsnDetail"
               :loading="logining1"
             >
@@ -89,7 +89,7 @@
               class="filter-item"
               type="primary"
               size="mini"
-              :disabled="!(crud.selections.length === 1)"
+              :disabled="!(crud.selections.length === 1) || (!crud.selections[0] || crud.selections[0].orderQty === crud.selections[0].receivedQty)  "
               @click="asnDetailZl(crud.selections)"
               :loading="logining1"
             >
@@ -175,11 +175,7 @@
                 <div>{{ scope.row == null ? '' : scope.row.receivedQty }}</div>
               </template>
             </el-table-column>
-            <el-table-column :show-overflow-tooltip="true" prop="point.code" label="库位">
-              <template slot-scope="scope">
-                <div>{{ scope.row.point == null ? '' : scope.row.point.code }}</div>
-              </template>
-            </el-table-column>
+
             <el-table-column prop="propC1" label="批次号">
               <template slot-scope="scope">
                 <div>{{ scope.row.propC1 }}</div>
@@ -201,6 +197,7 @@
             >
               <template slot-scope="scope">
                 <el-button
+                  :disabled="scope.row.receivedQty>0"
                   style="float: left"
                   size="mini" type="primary" icon="el-icon-edit" @click="toEditAsnDetail(scope.row)"/>
                 <udOperation
@@ -274,7 +271,7 @@
 
       >
 
-        <el-form-item label="物料" prop="item" >
+        <el-form-item label="物料" prop="item">
           <el-select v-model="form.item" value-key="id" filterable placeholder="请选择料号" style="width: 270px;"
                      @change="getPointList(form.item,$event.code,asn)"
                      clearable
@@ -292,29 +289,28 @@
         </el-form-item>
 
 
-
-        <el-form-item label="订单数量" prop="orderQty" >
-          <el-input v-model.number="form.orderQty" />
+        <el-form-item label="订单数量" prop="orderQty">
+          <el-input v-model.number="form.orderQty"/>
         </el-form-item>
         <el-form-item label="Loc">
-          <el-input  v-model="form.propC4"></el-input>
+          <el-input v-model="form.propC4"></el-input>
         </el-form-item>
         <el-form-item label="工厂">
-          <el-input  v-model="form.propC3"></el-input>
+          <el-input v-model="form.propC3"></el-input>
         </el-form-item>
         <el-form-item label="特殊标记">
-          <el-input  v-model="form.propC5"></el-input>
+          <el-input v-model="form.propC5"></el-input>
         </el-form-item>
         <el-form-item label="供应商">
-          <el-input  v-model="form.propC6"></el-input>
+          <el-input v-model="form.propC6"></el-input>
         </el-form-item>
-        <el-form-item v-if="form.item==null?false:form.item.isBatch" label="批次号" prop="propC1" >
-          <el-input v-model="form.propC1" />
+        <el-form-item v-if="form.item==null?false:form.item.isBatch" label="批次号" prop="propC1">
+          <el-input v-model="form.propC1"/>
         </el-form-item>
-        <el-form-item v-if="form.item==null?false:form.item.isSerial" label="序列号" prop="propC2" >
-          <el-input v-model="form.propC2" />
+        <el-form-item v-if="form.item==null?false:form.item.isSerial" label="序列号" prop="propC2">
+          <el-input v-model="form.propC2"/>
         </el-form-item>
-        <el-form-item v-if="form.item==null?false:form.item.isValidPeriod" label="生产日期" prop="propD1" >
+        <el-form-item v-if="form.item==null?false:form.item.isValidPeriod" label="生产日期" prop="propD1">
           <el-date-picker
             style="width: 270px;"
             v-model="form.propD1"
@@ -323,7 +319,7 @@
           </el-date-picker>
         </el-form-item>
 
-        <el-form-item label="备注" prop="remark" >
+        <el-form-item label="备注" prop="remark">
           <el-input type="textarea" :rows="2" v-model="form.remark" style="width: 270px;"/>
         </el-form-item>
       </el-form>
@@ -339,6 +335,7 @@
       :visible.sync="zlDialogVisible"
       width="30%"
       top="0.5vh"
+      :close-on-click-modal="false"
       :before-close="handleZlClose">
       <el-form :model="zlForm" :rules="zlRules" ref="zlForm" label-width="100px" class="demo-ruleForm">
         <el-form-item label="料号">
@@ -348,13 +345,13 @@
           <el-input disabled v-model="zlForm.item.name"></el-input>
         </el-form-item>
 
-        <el-form-item v-if="zlForm.item.isBatch"  label="批次号" prop="propC1">
-          <el-input v-model="zlForm.propC1" disabled />
+        <el-form-item v-if="zlForm.item.isBatch" label="批次号" prop="propC1">
+          <el-input v-model="zlForm.propC1" disabled/>
         </el-form-item>
-        <el-form-item v-if="zlForm.item.isSerial"  label="序列号" prop="propC2" >
-          <el-input v-model="zlForm.propC2" disabled />
+        <el-form-item v-if="zlForm.item.isSerial" label="序列号" prop="propC2">
+          <el-input v-model="zlForm.propC2" disabled/>
         </el-form-item>
-        <el-form-item v-if="zlForm.item.isValidPeriod"  label="生产日期" prop="propD1">
+        <el-form-item v-if="zlForm.item.isValidPeriod" label="生产日期" prop="propD1">
           <el-date-picker
             disabled
             style="width: 370px"
@@ -365,7 +362,7 @@
         </el-form-item>
 
         <el-form-item label="待收数量">
-          <el-input disabled v-model.number="zlForm.orderQty"></el-input>
+          <el-input disabled v-model.number="this.zlForm.orderQty-this.zlForm.receivedQty"></el-input>
         </el-form-item>
 
         <el-form-item label="订单日期">
@@ -411,7 +408,7 @@
             <el-option
               v-for="points in pointOptions"
               :key="points.id"
-              :label="points.name"
+              :label="points.code"
               :value="points"
               v-if="points.type!='SHZC'"
             />
@@ -439,8 +436,8 @@
 
         </el-form-item>
 
-        <el-form-item label="收货数量">
-          <el-input v-model.number="zlForm.receivedQty"></el-input>
+        <el-form-item label="整理数量">
+          <el-input v-model.number="zlForm.zlQty" ></el-input>
         </el-form-item>
 
 
@@ -662,9 +659,10 @@ export default {
         point: {},
         propC1: null,
         propC2: null,
-        propD1:null,
+        propD1: null,
         orderQty: 0,
-        shQty: 0
+        receivedQty: 0,
+        zlQty: 0
       },
       showStockSelect: false, // 控制容器选择框是否显示
       showPointSelect: false, // 控制库位选择框是否显示
@@ -698,6 +696,7 @@ export default {
     queryAsnDetail(ansId) {
       this.form.asnId = ansId
       this.asnFrom.id = ansId
+      console.log(this.asnFrom)
       this.crud.query = {asnId: ansId}
       this.crud.toQuery()
     },
@@ -705,13 +704,22 @@ export default {
     },
     handleClose(done) {
       // 清空表单数据
-      this.asnFrom = {};
+/*      this.asnFrom.billType = null;
+      this.asnFrom.orderDate = null;
+      this.asnFrom.code = null;
+      this.asnFrom.orderQuantity=0;
+      this.asnFrom.description=null;*/
+      this.asnFrom={};
+      this.asnFrom.status = 'OPEN';
+      console.log(this.asnFrom.id)
       // 清空表格数据
       this.crud.data = [];
       //还原默认值
       this.fullscreen = false
       // 执行关闭操作
       done();
+      //刷新父组件
+      this.$parent.crud.toQuery();
     },
     queryStock() {
       crudStock.queryKyStockList({}).then(res => {
@@ -735,7 +743,7 @@ export default {
     ,
     //查询库位
     getPointList(itObj, code, data) {
-      queryPointList({}).then(res => {
+      queryPointList({status: 'FREE'}).then(res => {
         this.pointOptions = res
       })
 
@@ -794,7 +802,7 @@ export default {
           this.asnFrom = res
           asnQuery.asnId = res.id
           //查询点位数据
-          this.pointTF = res.area.bexb
+
           // if (res.area.besh){
           //   this.getPointList(res)
           // }
@@ -815,6 +823,7 @@ export default {
             //加载数据
             this.asnTF()
             this.crud.notify('添加成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+            this.queryAsnDetail(this.asnId)
             this.crud.toQuery()
           })
         } else {
@@ -953,13 +962,14 @@ export default {
       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)
+      if (this.zlForm.zlQty > this.zlForm.orderQty-this.zlForm.receivedQty ) {
+        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.zhengliCel()
           this.zlDialogVisible = false;
         } else {
           this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.ERROR)
@@ -970,7 +980,7 @@ export default {
       this.zlForm.area = {};
       this.zlForm.stock = {};
       this.zlForm.point = {};
-      this.zlForm.receivedQty = 0;
+      this.zlForm.shQty = 0;
       this.showStockSelect = false;
       this.showPointSelect = false;
       this.disableStockSelect = false;
@@ -980,6 +990,7 @@ export default {
       done();
     },
     loadStocksByPoint() {
+      console.log(this.zlForm.point)
       if (this.zlForm.point && this.zlForm.point.stock) {
         this.stockOptions = [this.zlForm.point.stock];  // 清空原有选项并添加新的容器选项
         this.zlForm.stock = this.zlForm.point.stock;  // 设置当前选中的容器
diff --git a/src/views/business-inv/inventory/index.vue b/src/views/business-inv/inventory/index.vue
index 272f2e3..c9b1bc9 100644
--- a/src/views/business-inv/inventory/index.vue
+++ b/src/views/business-inv/inventory/index.vue
@@ -167,14 +167,13 @@
         <el-table-column type="selection" width="50"/>
         <el-table-column prop="id" label="序号"  align="center"/>
         <el-table-column prop="area.name" label="区域"/>
+        <el-table-column prop="stock.code" label="容器号"  align="center"/>
         <el-table-column prop="point.code" label="库位号"  align="center"/>
-        <el-table-column prop="itemKey.item.code" label="品番"/>
-        <el-table-column prop="itemKey.item.name" label="品番名称"/>
+        <el-table-column prop="itemKey.item.code" label="料号"/>
+        <el-table-column prop="itemKey.item.name" label="物料描述"/>
         <el-table-column prop="quantity" label="数量"/>
         <el-table-column prop="queuedQty" label="占用数"/>
         <el-table-column prop="itemKey.propC1" label="批次号"/>
-        <el-table-column prop="zzkw.code" label="制造库位" align="center"/>
-        <el-table-column prop="area.pointCode" label="缓存库位" align="center"/>
         <el-table-column  v-if="checkPer(['admin','fileManagement:edit','fileManagement:del'])" label="操作"
                          width="150px" align="center" fixed="right"
         >