diff --git a/klp-ui/src/components/CoilSelector/index.vue b/klp-ui/src/components/CoilSelector/index.vue
index ddde3b6b..fcfb86d1 100644
--- a/klp-ui/src/components/CoilSelector/index.vue
+++ b/klp-ui/src/components/CoilSelector/index.vue
@@ -95,6 +95,7 @@
         <el-table-column v-if="orderBy" label="品质" prop="qualityStatus"></el-table-column>
         <el-table-column v-if="orderBy" label="切边" prop="trimmingRequirement"></el-table-column>
         <el-table-column v-if="orderBy" label="包装" prop="packagingRequirement"></el-table-column>
+        <el-table-column v-if="orderBy" label="镀层质量" prop="zincLayer"></el-table-column>
       </el-table>
 
       <div v-else>
@@ -113,6 +114,7 @@
           <el-table-column v-if="orderBy" label="品质" prop="qualityStatus"></el-table-column>
           <el-table-column v-if="orderBy" label="切边" prop="trimmingRequirement"></el-table-column>
           <el-table-column v-if="orderBy" label="包装" prop="packagingRequirement"></el-table-column>
+          <el-table-column v-if="orderBy" label="镀层质量" prop="zincLayer"></el-table-column>
         </el-table>
       </div>
 
@@ -121,7 +123,7 @@
         <span>
           总净重：{{ coilTrimStatistics.total_net_weight || 0 }}t
         </span>
-        
+
         <pagination v-if="!rangeMode" v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize" @pagination="getList" />
       </div>
@@ -147,6 +149,7 @@
         <el-table-column v-if="orderBy" label="品质" prop="qualityStatus"></el-table-column>
         <el-table-column v-if="orderBy" label="切边" prop="trimmingRequirement"></el-table-column>
         <el-table-column v-if="orderBy" label="包装" prop="packagingRequirement"></el-table-column>
+        <el-table-column v-if="orderBy" label="镀层质量" prop="zincLayer"></el-table-column>
 
         <el-table-column label="操作" width="50">
           <template slot-scope="scope">
@@ -569,11 +572,24 @@ export default {
         this.$message.warning('您没有权限选择此钢卷');
         return; // 终止后续逻辑
       }
-      const disabledOList = ['O', 'C+', 'C', 'C-', 'D+', 'D', 'D-']
-      if (this.disableO && disabledOList.includes(row.qualityStatus)) {
-        this.$message.warning(`${row.qualityStatus}卷不能选择`);
-        return;
+      if (this.disableO) {
+        // 并且钢卷的warehouseId不是1988150210872930306
+        // 1988150380649967617
+        // 1988150800092950529
+        // 1988151027466170370其中之一，才不能选择
+        const warehouseIds = ['1988150210872930306', '1988150380649967617', '1988150800092950529', '1988151027466170370'];
+        // 如果没有判级就不能选择，除非是那分剪四个库区
+        if (!row.qualityStatus && !warehouseIds.includes(row.warehouseId)) {
+          this.$message.warning('未判级的钢卷不能选择');
+          return;
+        }
+        const disabledOList = ['O', 'C+', 'C', 'C-', 'D+', 'D', 'D-']
+        if (disabledOList.includes(row.qualityStatus)) {
+          this.$message.warning(`${row.qualityStatus}卷不能选择`);
+          return;
+        }
       }
+
       this.handleSelect(row);
     },
 
diff --git a/klp-ui/src/views/wms/delivery/components/wayBill.vue b/klp-ui/src/views/wms/delivery/components/wayBill.vue
index 38791f42..12328983 100644
--- a/klp-ui/src/views/wms/delivery/components/wayBill.vue
+++ b/klp-ui/src/views/wms/delivery/components/wayBill.vue
@@ -478,12 +478,13 @@ export default {
 
       const win = window.open(url, '_blank');
       if (!win) {
-        const a = document.createElement('a');
-        a.href = url;
-        a.download = `发货单_${this.waybill.waybillName || this.waybill.waybillNo || new Date().getTime()}.pdf`;
-        document.body.appendChild(a);
-        a.click();
-        document.body.removeChild(a);
+        this.$message.error('打印失败，请检查浏览器设置');
+        // const a = document.createElement('a');
+        // a.href = url;
+        // a.download = `发货单_${this.waybill.waybillName || this.waybill.waybillNo || new Date().getTime()}.pdf`;
+        // document.body.appendChild(a);
+        // a.click();
+        // document.body.removeChild(a);
       }
     },
     async exportExcelByXLSX() {
diff --git a/klp-ui/src/views/wms/delivery/components/wayBill2.vue b/klp-ui/src/views/wms/delivery/components/wayBill2.vue
index cb29572e..3afe63e4 100644
--- a/klp-ui/src/views/wms/delivery/components/wayBill2.vue
+++ b/klp-ui/src/views/wms/delivery/components/wayBill2.vue
@@ -478,12 +478,13 @@ export default {
 
       const win = window.open(url, '_blank');
       if (!win) {
-        const a = document.createElement('a');
-        a.href = url;
-        a.download = `发货单_${this.waybill.waybillName || this.waybill.waybillNo || new Date().getTime()}.pdf`;
-        document.body.appendChild(a);
-        a.click();
-        document.body.removeChild(a);
+        this.$message.error('打印失败，请检查浏览器设置');
+        // const a = document.createElement('a');
+        // a.href = url;
+        // a.download = `发货单_${this.waybill.waybillName || this.waybill.waybillNo || new Date().getTime()}.pdf`;
+        // document.body.appendChild(a);
+        // a.click();
+        // document.body.removeChild(a);
       }
     },
     async exportExcelByXLSX() {