diff --git a/src/views/modules/pad/padCODelNotify.vue b/src/views/modules/pad/padCODelNotify.vue
index 7a4cf11..a6fbf9e 100644
--- a/src/views/modules/pad/padCODelNotify.vue
+++ b/src/views/modules/pad/padCODelNotify.vue
@@ -54,7 +54,7 @@
         </el-col>
         <el-col :span="3">
           <el-form-item :label="' '">
-            <el-checkbox v-model="searchData.shipFlag">筛选未发货清单</el-checkbox>
+            <el-checkbox v-model="searchData.shipFlag">仅显示未完全发货清单</el-checkbox>
           </el-form-item>
         </el-col>
         <el-col :span="2">
@@ -374,7 +374,7 @@
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer" style="text-align: center">
-        <el-button type="primary" @click="updateDelNotifyDetailBtn('Y')">合 格</el-button>
+        <el-button type="primary" :disabled="!delNotifyDetail.shipQty || delNotifyDetail.shipQty === 0" @click="updateDelNotifyDetailBtn('Y')">合 格</el-button>
         <el-button @click="updateDelNotifyDetailBtn('N')">不 合 格</el-button>
       </span>
     </el-dialog>
diff --git a/src/views/modules/production/scanForm.vue b/src/views/modules/production/scanForm.vue
index 200180b..0d9b738 100644
--- a/src/views/modules/production/scanForm.vue
+++ b/src/views/modules/production/scanForm.vue
@@ -134,7 +134,23 @@ export default {
         return;
       }
       let arr = this.model.label.split(";");
-      if (arr.length < 3){
+      if (arr.length < 4){
+        if (!arr[3]){
+          this.$message.warning("标签jobNo为空")
+          return;
+        }
+        if (!arr[2] || arr[2] === '0'){
+          this.$message.warning("数量不存在或是0")
+          return;
+        }
+        if (!arr[1]){
+          this.$message.warning("产品编码为空")
+          return;
+        }
+        if (!arr[0]){
+          this.$message.warning("site编码为空")
+          return;
+        }
         this.$message.warning("标签格式错误")
         return
       }
@@ -142,8 +158,8 @@ export default {
         this.$message.warning(`产品不匹配或每袋/每卷数量未维护`)
         return;
       }
-      if (this.partValue===0 && this.model.flag !== 'Y'){
-        this.$message.warning(`产品不匹配或每袋/每卷数量未维护`)
+      if (this.partValue===0){
+        this.$message.warning(`每袋/每卷数量未维护`)
         return;
       }
       // if (this.model.flag !== 'Y' && this.partValue != arr[2]){
@@ -153,15 +169,15 @@ export default {
       if (new Decimal(this.total).add(new Decimal(arr[2])).toNumber()> this.notifyQty){
         this.$message.warning("扫描累计数量不允许超过要求发货数量")
         return;
-      }
-      // 保存数据 通知单数量:this.detail.notifyQty
+      }// 保存数据 通知单数量:this.detail.notifyQty
       let params={
         site:this.detail.site,
         delNotifyNo: this.detail.delNotifyNo,
         delNotifyItemNo: this.detail.delNotifyItemNo,
         scanQty:arr[2],
-        scanType:arr[2] !== this.partValue?'零数量':'标准数量',
-        createBy:this.$store.state.user.userDisplay,
+        scanType:parseInt(arr[2]) !== this.partValue?'零散数量':'标准数量',
+        seqNo:arr[3],
+        createBy:this.$store.state.user.name,
         createData:dayjs().format("YYYY-MM-DD")
       }
       saveScanLabel(params).then(({data})=>{
@@ -279,6 +295,7 @@ export default {
           </el-table-column>
           <el-table-column label="数量" header-align="center" align="center" show-overflow-tooltip prop="scanQty"/>
           <el-table-column label="类型" header-align="center" align="left" show-overflow-tooltip prop="scanType"/>
+          <el-table-column label="jobNo" header-align="center" align="left" show-overflow-tooltip prop="seqNo"/>
           <el-table-column label="操作员" header-align="center" align="left" show-overflow-tooltip prop="createBy"/>
           <el-table-column label="扫描时间" header-align="center" align="center" show-overflow-tooltip prop="createData"/>
         </el-table>
diff --git a/src/views/modules/production/shippingScan.vue b/src/views/modules/production/shippingScan.vue
index b6d7232..4633fa0 100644
--- a/src/views/modules/production/shippingScan.vue
+++ b/src/views/modules/production/shippingScan.vue
@@ -60,7 +60,7 @@ export default {
       params.no = this.no;
       params.size = this.size;
       if (this.searchData.shipFlag){
-        params.shipFlag = "N";
+        params.shipFlag = "Y";
       }else {
         params.shipFlag = null;
       }
@@ -96,7 +96,8 @@ export default {
     rowClickDelNotifyHeaderTable(row){
       // 缓存对象
       this.delNotifyHeader = row
-      this.delNotifyDetailList = this.delNotifyHeader.delNotifyDetailVoList;
+      // this.delNotifyDetailList = this.delNotifyHeader.delNotifyDetailVoList;
+      this.searchDelNotifyDetail();
     },
     updateDelNotifyDetailBtn(status){
       this.delNotifyDetail.approveResultFlag = status;
@@ -129,7 +130,23 @@ export default {
     },
     changeAllNum(val){
       this.allNum = val;
-      this.delNotifyDetail.allNum = val;
+      // this.delNotifyDetail.allNum = val;
+      this.searchDelNotifyDetail();
+    },
+    searchDelNotifyDetail(){
+      let params = {
+        site:this.delNotifyHeader.site,
+        delNotifyNo:this.delNotifyHeader.delNotifyNo,
+      }
+      searchDelNotifyDetail(params).then(({data})=>{
+        if (data && data.code === 0){
+          this.delNotifyDetailList = data.data;
+        }else {
+          this.$message.warning(data.msg)
+        }
+      }).catch((error)=>{
+        this.$message.error(error)
+      })
     }
   },
   created() {
@@ -194,7 +211,7 @@ export default {
         </el-col>
         <el-col :span="3">
           <el-form-item :label="' '">
-            <el-checkbox v-model="searchData.shipFlag">筛选未发货清单</el-checkbox>
+            <el-checkbox v-model="searchData.shipFlag">仅显示未完全发货清单</el-checkbox>
           </el-form-item>
         </el-col>
         <el-col :span="2">
@@ -323,7 +340,7 @@ export default {
         <el-table-column label="操作" width="150px" header-align="center" fixed align="center">
           <template slot-scope="{row,$index}">
             <el-link style="cursor: pointer" v-if="row.approveFlag === 'N'" @click="checkoutDelNotifyDetailBtn(row)">检验</el-link>
-            <el-link style="cursor: pointer" v-if="row.shipQty < row.notifyQty && row.allNum < row.notifyQty" @click="clickScan(row)">标签扫描</el-link>
+            <el-link style="cursor: pointer" v-if="row.shipQty < row.notifyQty && row.allNum < row.notifyQty && delNotifyHeader.shipResult !== '全部发货'" @click="clickScan(row)">标签扫描</el-link>
           </template>
         </el-table-column>
         <el-table-column
@@ -493,9 +510,9 @@ export default {
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="发货数量">
+            <el-form-item label="扫码数量">
               <div class="right">
-                <el-input disabled v-model="delNotifyDetail.shipQty" type="number" readonly></el-input>
+                <el-input disabled v-model="delNotifyDetail.allNum" type="number" readonly></el-input>
               </div>
             </el-form-item>
           </el-col>
@@ -522,7 +539,7 @@ export default {
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer" style="text-align: center">
-        <el-button type="primary" @click="updateDelNotifyDetailBtn('Y')">合 格</el-button>
+        <el-button type="primary" :disabled="!delNotifyDetail.allNum || delNotifyDetail.allNum === 0" @click="updateDelNotifyDetailBtn('Y')">合 格</el-button>
         <el-button @click="updateDelNotifyDetailBtn('N')">不 合 格</el-button>
       </span>
     </el-dialog>