diff --git a/src/views/modules/finshProduct/outWarehouse/shipmentBox.vue b/src/views/modules/finshProduct/outWarehouse/shipmentBox.vue
index c1d97e6..d406007 100644
--- a/src/views/modules/finshProduct/outWarehouse/shipmentBox.vue
+++ b/src/views/modules/finshProduct/outWarehouse/shipmentBox.vue
@@ -278,13 +278,14 @@ export default {
         if (data && data.code === 0){
           console.log(data.rows)
           let arr = data.rows.map((item)=>{
+            item.printType = 'boxLabel'
             item.productionDate = `${dayjs(item.productionDate).format("YYYYMMDD")}`
             item.shipDate = `${dayjs(item.shipDate).format("YYYY-MM-DD")}`
-            item.boxNo = `${dayjs(row.createDate).format("YYYYMMDDHHmmss")}${(item.boxNo+'').padStart(3,'0')}`
+            item.boxNo = `${dayjs(row.createDate).format("YYMMDDHHmmss")}${(row.boxNo+'').padStart(3,'0')}`
             return item
           })
-          printShipmentBoxLabel(arr);
-          this.printRollLabel(row);
+          // printShipmentBoxLabel(arr);
+          this.printRollLabel(row,arr);
         }else {
           this.$message.warning(data.msg)
         }
@@ -292,15 +293,18 @@ export default {
         this.$message.error(error)
       })
     },
-    printRollLabel(row){
+    printRollLabel(row,packList){
       printShipmentRoll(row).then(({data})=>{
         if (data && data.code === 0){
-          let arr = data.rows.map(item=>{
+          let arr = [...packList];
+          let arrs = data.rows.map(item=>{
+            item.printType = 'innerBoxLabel'
             item.productionDate = `${dayjs(item.productionDate).format("YYYYMMDD")}`
-
             return item
           })
-          printShipmentInnerLabel(arr);
+          arr.push(arrs)
+          printShipmentBoxLabel(arr);
+          // printShipmentInnerLabel(arr);
         }else {
           this.$message.warning(data.msg)
         }
@@ -312,6 +316,7 @@ export default {
   watch:{
     "endForm.warehouseId"(newVal,oldVal){
       if (newVal && newVal !== oldVal){
+        this.locationId = '';
         this.getLocationListForSearch()
       }
     }
@@ -338,7 +343,7 @@ export default {
           <el-link v-if="scope.row.status==='已封箱'" @click="handleUpdateBoxStatus(scope.row,1)">解封箱</el-link>
           <el-link v-if="scope.row.status==='未封箱'" @click="handleRemoveBox(scope.row)">删除</el-link>
           <el-link @click="handleGetRollDataList(scope.row)">查看</el-link>
-          <el-link @click="handlePrint(scope.row)">补打</el-link>
+          <el-link v-if="scope.row.status==='已封箱'" @click="handlePrint(scope.row)">补打</el-link>
         </template>
       </el-table-column>
     </el-table>
@@ -366,7 +371,7 @@ export default {
           <el-col :span="24">
             <el-form-item label="已扫描列表">
               <el-table :data="rollDataList" border :height="200">
-                <el-table-column width="60" label="操作" align="center">
+                <el-table-column width="60" label="操作" align="center" v-if="!form.openDetail">
                   <template slot-scope="scope">
                     <el-link @click="handleRollRemove(scope.row)">删除</el-link>
                   </template>
diff --git a/src/views/modules/label/print_shipment_box_label.js b/src/views/modules/label/print_shipment_box_label.js
index 9a6065d..d60c931 100644
--- a/src/views/modules/label/print_shipment_box_label.js
+++ b/src/views/modules/label/print_shipment_box_label.js
@@ -10,123 +10,202 @@ export function printShipmentBoxLabel(printList) {
     //循环调用打印机
     for(let i = 0; i < printList.length; i++){
       let printData = printList[i];
-      LODOP.NewPage();
-      LODOP.SET_PRINT_PAGESIZE(0,1000,1500,"");
+      if (printData.printType === 'boxLabel'){
+        LODOP.NewPage();
+        LODOP.SET_PRINT_PAGESIZE(0,1000,1500,"");
 
-      LODOP.ADD_PRINT_TEXT(0,2,108,25,"箱包装标签");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+        LODOP.ADD_PRINT_TEXT(0,2,108,25,"箱包装标签");
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+        LODOP.SET_PRINT_STYLEA(0,"Bold",1);
 
-      LODOP.ADD_PRINT_TEXT(25,2,300,25,`供应商代码 (Vendor Code) :${printData.vendorCode}`);
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+        LODOP.ADD_PRINT_TEXT(25,2,300,25,`供应商代码 (Vendor Code) :${printData.vendorCode}`);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
 
-      LODOP.ADD_PRINT_LINE(50,0, 51, 400,0, 1);// 横线
+        LODOP.ADD_PRINT_LINE(50,0, 51, 400,0, 1);// 横线
 
-      LODOP.ADD_PRINT_TEXT(55,2,300,25,`AAC物料号码 (AAC PN#) :*M${printData.ACCPartNo}`);
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+        LODOP.ADD_PRINT_TEXT(55,2,300,25,`AAC物料号码 (AAC PN#) :*M${printData.accpartNo}`);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
 
-      LODOP.ADD_PRINT_BARCODE(70, 2,160, 15, "Code39", `*M${printData.partNo}`)
-      // LODOP.ADD_PRINT_BARCODE(168, 2,108, 25, "128A", `${printData.partNo}`)
-      LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0);
+        LODOP.ADD_PRINT_BARCODE(70, 2,160, 15, "Code39", `*M${printData.accpartNo}`)
+        // LODOP.ADD_PRINT_BARCODE(168, 2,108, 25, "128A", `${printData.partNo}`)
+        LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0);
 
-      LODOP.ADD_PRINT_TEXT(88,2,360,25,`物料描述:${printData.partDesc}`);
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+        LODOP.ADD_PRINT_TEXT(88,2,360,25,`物料描述:${printData.partDesc}`);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
 
-      LODOP.ADD_PRINT_TEXT(103,2,150,25,`物料批号 (Batch) :*${printData.batchNo}`);
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+        LODOP.ADD_PRINT_TEXT(103,2,150,25,`物料批次 (Batch) :*${printData.batchNo}`);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
 
-      LODOP.ADD_PRINT_BARCODE(135,218,160,160,"QRCode",`*H${printData.vendorCode},${printData.ACCPartNo},${printData.version},${printData.boxQty},${printData.batchNo},${printData.productionDate},*C,*E,*L,*F,${printData.boxNo},${printData.uom},*T,*K,*O,*R,*I,*S`);// 二维码
+        LODOP.ADD_PRINT_BARCODE(135,218,160,160,"QRCode",`*H${printData.vendorCode},${printData.accpartNo},${printData.version},${printData.boxQty},${printData.batchNo},${printData.productionDate},*C,*E,*L,*F,${printData.boxNo},${printData.uom},*T,*K,*O,*R,*I,*S`);// 二维码
 
-      LODOP.ADD_PRINT_BARCODE(118, 2,120, 15, "Code39", `*${printData.batchNo}`)
-      // LODOP.ADD_PRINT_BARCODE(168, 2,108, 25, "128A", `${printData.partNo}`)
-      LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0);
+        LODOP.ADD_PRINT_BARCODE(118, 2,120, 15, "Code39", `*${printData.batchNo}`)
+        // LODOP.ADD_PRINT_BARCODE(168, 2,108, 25, "128A", `${printData.partNo}`)
+        LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0);
 
-      LODOP.ADD_PRINT_TEXT(138,2,200,25,`生产日期 (Prd Date) :*D${printData.productionDate}`);
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+        LODOP.ADD_PRINT_TEXT(138,2,200,25,`生产日期 (Prd Date) :*D${printData.productionDate}`);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
 
-      LODOP.ADD_PRINT_BARCODE(153, 2,120, 15, "Code39", `*D${printData.productionDate}`)
-      // LODOP.ADD_PRINT_BARCODE(168, 2,108, 25, "128A", `${printData.partNo}`)
-      LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0);
+        LODOP.ADD_PRINT_BARCODE(153, 2,120, 15, "Code39", `*D${printData.productionDate}`)
+        // LODOP.ADD_PRINT_BARCODE(168, 2,108, 25, "128A", `${printData.partNo}`)
+        LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0);
 
-      LODOP.ADD_PRINT_TEXT(173,2,200,25,`数量 (QTY) :*Q${printData.qty}`);
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+        LODOP.ADD_PRINT_TEXT(173,2,200,25,`数量 (QTY) :*Q${printData.packQty}`);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
 
-      LODOP.ADD_PRINT_BARCODE(188, 2,120, 15, "Code39", `*Q${printData.qty}`)
-      // LODOP.ADD_PRINT_BARCODE(168, 2,108, 25, "128A", `${printData.partNo}`)
-      LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0);
+        LODOP.ADD_PRINT_BARCODE(188, 2,120, 15, "Code39", `*Q${printData.packQty}`)
+        // LODOP.ADD_PRINT_BARCODE(168, 2,108, 25, "128A", `${printData.partNo}`)
+        LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0);
 
-      LODOP.ADD_PRINT_TEXT(208,2,150,25,`物料版本 (Version) :*${printData.partVersion}`);
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+        LODOP.ADD_PRINT_TEXT(208,2,200,25,`物料版本 (Version) :*${printData.version}`);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
 
-      LODOP.ADD_PRINT_BARCODE(223, 2,120, 15, "Code39", `*${printData.partVersion}`)
-      // LODOP.ADD_PRINT_BARCODE(168, 2,108, 25, "128A", `${printData.partNo}`)
-      LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0);
+        LODOP.ADD_PRINT_BARCODE(223, 2,120, 15, "Code39", `*${printData.version}`)
+        // LODOP.ADD_PRINT_BARCODE(168, 2,108, 25, "128A", `${printData.partNo}`)
+        LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0);
 
-      LODOP.ADD_PRINT_TEXT(243,2,200,25,`采购单位 (UOM) :*${printData.traceBatchNo}`);
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+        LODOP.ADD_PRINT_TEXT(243,2,200,25,`采购单位 (UOM) :*${printData.uom}`);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
 
-      LODOP.ADD_PRINT_BARCODE(258, 2,120, 15, "Code39", `*${printData.traceBatchNo}`)
-      // LODOP.ADD_PRINT_BARCODE(168, 2,108, 25, "128A", `${printData.partNo}`)
-      LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0);
+        LODOP.ADD_PRINT_BARCODE(258, 2,120, 15, "Code39", `*${printData.uom}`)
+        // LODOP.ADD_PRINT_BARCODE(168, 2,108, 25, "128A", `${printData.partNo}`)
+        LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0);
 
-      LODOP.ADD_PRINT_TEXT(278,2,140,20,`模穴号(Tool):`);
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
-      // 图标
-      LODOP.ADD_PRINT_HTM(305,100,60,50,`<img style="object-fit: cover" src="${boxPrintIcon}" width="120px" height="50px"/>`)
+        LODOP.ADD_PRINT_TEXT(278,2,140,20,`模穴号(Tool):`);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+        // 图标
+        LODOP.ADD_PRINT_HTM(305,100,60,50,`<img style="object-fit: cover" src="${boxPrintIcon}" width="120px" height="50px"/>`)
 
-      LODOP.ADD_PRINT_TEXT(305,2,80,20,`BIN:`);
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+        LODOP.ADD_PRINT_TEXT(305,2,80,20,`BIN:`);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
 
-      LODOP.ADD_PRINT_TEXT(305,230,100,20,`箱号:${printData.boxNo}`);
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+        LODOP.ADD_PRINT_TEXT(305,230,100,20,`箱号:${printData.boxNo}`);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
 
-      LODOP.ADD_PRINT_TEXT(325,2,80,20,`档位(Level):`);
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+        LODOP.ADD_PRINT_TEXT(325,2,80,20,`档位(Level):`);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
 
-      LODOP.ADD_PRINT_TEXT(325,230,100,20,`阶段:${printData.phaseCode}`);
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+        LODOP.ADD_PRINT_TEXT(325,230,100,20,`阶段:${printData.phaseCode}`);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
 
-      LODOP.ADD_PRINT_TEXT(345,2,80,20,`config:`);
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+        LODOP.ADD_PRINT_TEXT(345,2,80,20,`config:`);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
 
-      LODOP.ADD_PRINT_TEXT(345,230,100,20,`MCO:${printData.MCO}`);
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+        LODOP.ADD_PRINT_TEXT(345,230,100,20,`MCO:${printData.mco}`);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
 
-      LODOP.ADD_PRINT_LINE(0,400, 370, 401,0, 1);// 横线
+        LODOP.ADD_PRINT_LINE(0,400, 370, 401,0, 1);// 横线
 
-      LODOP.ADD_PRINT_HTM(5,405,160,40,"<div style='text-align: center;font-weight: 700;font-size: 24px;line-height: 1.5'>1 of 1</div>");
+        LODOP.ADD_PRINT_HTM(5,405,160,40,"<div style='text-align: center;font-weight: 700;font-size: 24px;line-height: 1.5'>1 of 1</div>");
 
-      LODOP.ADD_PRINT_TEXT(55,405,160,30,`Customer:${printData.customerName}`)
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+        LODOP.ADD_PRINT_TEXT(55,405,160,30,`Customer:${printData.customerName}`)
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
 
-      LODOP.ADD_PRINT_TEXT(85,405,160,30,`Part No:${printData.partNo}`)
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+        LODOP.ADD_PRINT_TEXT(85,405,160,30,`Part No:${printData.partNo}`)
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
 
-      LODOP.ADD_PRINT_TEXT(115,405,160,60,`Desc:${printData.desc}`)
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+        LODOP.ADD_PRINT_TEXT(115,405,160,60,`Desc:${printData.desc}`)
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
 
-      LODOP.ADD_PRINT_TEXT(175,405,160,20,`Box Qty:${printData.boxQty}`)
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+        LODOP.ADD_PRINT_TEXT(175,405,160,20,`Box Qty:${printData.boxQty}`)
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
 
-      LODOP.ADD_PRINT_TEXT(190,405,160,20,`Total Qty:${printData.totalQty}`)
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+        LODOP.ADD_PRINT_TEXT(190,405,160,20,`Total Qty:${printData.totalQty}`)
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
 
-      // LODOP.ADD_PRINT_TEXT(205,405,160,40,`Material:${printData.material}`)
-      // LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+        // LODOP.ADD_PRINT_TEXT(205,405,160,40,`Material:${printData.material}`)
+        // LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
 
-      LODOP.ADD_PRINT_TEXT(245,405,160,20,`PO:${printData.po}`)
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+        LODOP.ADD_PRINT_TEXT(245,405,160,20,`PO:${printData.po}`)
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+
+        LODOP.ADD_PRINT_TEXT(260,405,160,20,`Ship Date:${printData.shipDate}`)
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+
+        LODOP.ADD_PRINT_TEXT(275,405,160,20,`Job No:${printData.jobNo}`)
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+        // 图标
+        LODOP.ADD_PRINT_HTM(305,425,80,50,`<img style="object-fit: cover" src="${boxPrintIconEnd}" width="80px" height="50px"/>`)
+        LODOP.ADD_PRINT_TEXT(335,515,160,22,`HF`)
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",13);
+        LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      }else if (printData.printType === 'innerBoxLabel'){
+        LODOP.NewPage();
+        LODOP.SET_PRINT_PAGESIZE(0,1000,1500,"");
+
+        LODOP.ADD_PRINT_TEXT(0,2,108,25,"内包装标签");
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+        LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+
+        LODOP.ADD_PRINT_TEXT(25,2,300,25,`供应商代码 (Vendor Code) :${printData.vendorCode}`);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
+
+        LODOP.ADD_PRINT_LINE(50,2, 51, 568,0, 1);// 横线
+
+        LODOP.ADD_PRINT_TEXT(55,2,300,25,`AAC物料号码 (AAC PN#) :*M${printData.accpartNo}`);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
+
+        LODOP.ADD_PRINT_BARCODE(70, 2,120, 15, "Code39", `*M${printData.partNo}`)
+        // LODOP.ADD_PRINT_BARCODE(168, 2,108, 25, "128A", `${printData.partNo}`)
+        LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0);
+
+        LODOP.ADD_PRINT_TEXT(95,2,360,25,`物料描述:${printData.partDesc}`);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
+
+        LODOP.ADD_PRINT_TEXT(115,2,200,25,`物料批号 (Batch) :*${printData.batchNo}`);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
+
+        LODOP.ADD_PRINT_BARCODE(115,385,200,200,"QRCode",`*H${printData.vendorCode},${printData.accpartNo},${printData.version},${printData.packQty},${printData.retrospectBatchNo},${printData.batchNo},${printData.productionDate},${printData.uom},*C,*E,*L,*K,*O,*R,*I,*S`);// 二维码
+
+        LODOP.ADD_PRINT_BARCODE(135, 2,120, 15, "Code39", `*${printData.batchNo}`)
+        // LODOP.ADD_PRINT_BARCODE(168, 2,108, 25, "128A", `${printData.partNo}`)
+        LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0);
+
+        LODOP.ADD_PRINT_TEXT(160,2,200,25,`追溯批号 :*T${printData.retrospectBatchNo}`);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
+
+        LODOP.ADD_PRINT_BARCODE(185, 2,120, 15, "Code39", `*T${printData.retrospectBatchNo}`)
+        // LODOP.ADD_PRINT_BARCODE(168, 2,108, 25, "128A", `${printData.partNo}`)
+        LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0);
+
+        LODOP.ADD_PRINT_TEXT(205,2,200,25,`包装数量 (QTY) :*Q${printData.packQty}`);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
+
+        LODOP.ADD_PRINT_BARCODE(225, 2,120, 15, "Code39", `*Q${printData.packQty}`)
+        // LODOP.ADD_PRINT_BARCODE(168, 2,108, 25, "128A", `${printData.partNo}`)
+        LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0);
+
+        LODOP.ADD_PRINT_TEXT(250,2,300,25,`生产日期 (Production Date) :*D${printData.productionDate}`);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
+
+        LODOP.ADD_PRINT_BARCODE(265, 2,120, 15, "Code39", `*D${printData.productionDate}`)
+        // LODOP.ADD_PRINT_BARCODE(168, 2,108, 25, "128A", `${printData.partNo}`)
+        LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0);
+
+        LODOP.ADD_PRINT_TEXT(285,2,200,25,`物料版号 (Version) :*${printData.version}`);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
+
+        // 图标
+        LODOP.ADD_PRINT_HTM(305,220,60,50,`<img style="object-fit: cover" src="${boxPrintIcon}" width="120px" height="50px"/>`)
+        LODOP.ADD_PRINT_TEXT(305,2,100,20,`BIN:`);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
+
+        LODOP.ADD_PRINT_TEXT(305,355,100,20,`模穴号(Tool):`);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
+
+        LODOP.ADD_PRINT_TEXT(325,2,100,20,`config:`);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
+
+        LODOP.ADD_PRINT_TEXT(325,355,100,20,`档位(Level):`);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
+
+        LODOP.ADD_PRINT_TEXT(345,2,100,20,`MCO:${printData.mco}`);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+
+        LODOP.ADD_PRINT_TEXT(345,355,100,20,`阶段:${printData.phaseCode}`);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
+      }
 
-      LODOP.ADD_PRINT_TEXT(260,405,160,20,`Ship Date:${printData.shipDate}`)
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
 
-      LODOP.ADD_PRINT_TEXT(275,405,160,20,`Job No:${printData.jobNo}`)
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
-      // 图标
-      LODOP.ADD_PRINT_HTM(305,425,80,50,`<img style="object-fit: cover" src="${boxPrintIconEnd}" width="80px" height="50px"/>`)
-      LODOP.ADD_PRINT_TEXT(335,515,160,22,`HF`)
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",13);
-      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
     }
     LODOP.PRINT_DESIGN();
     // LODOP.PREVIEW();
diff --git a/src/views/modules/label/print_shipment_inner_label.js b/src/views/modules/label/print_shipment_inner_label.js
index 41646ef..b8f69a8 100644
--- a/src/views/modules/label/print_shipment_inner_label.js
+++ b/src/views/modules/label/print_shipment_inner_label.js
@@ -22,10 +22,10 @@ export function printShipmentInnerLabel(printList) {
 
       LODOP.ADD_PRINT_LINE(50,2, 51, 568,0, 1);// 横线
 
-      LODOP.ADD_PRINT_TEXT(55,2,300,25,`AAC物料号码 (AAC PN#) :*M${printData.ACCPartNo}`);
+      LODOP.ADD_PRINT_TEXT(55,2,300,25,`AAC物料号码 (AAC PN#) :*M${printData.accpartNo}`);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
 
-      LODOP.ADD_PRINT_BARCODE(70, 2,120, 15, "Code39", `*M${printData.partNo}`)
+      LODOP.ADD_PRINT_BARCODE(70, 2,120, 15, "Code39", `*M${printData.accpartNo}`)
       // LODOP.ADD_PRINT_BARCODE(168, 2,108, 25, "128A", `${printData.partNo}`)
       LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0);
 
@@ -35,7 +35,7 @@ export function printShipmentInnerLabel(printList) {
       LODOP.ADD_PRINT_TEXT(115,2,200,25,`物料批号 (Batch) :*${printData.batchNo}`);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
 
-      LODOP.ADD_PRINT_BARCODE(115,385,200,200,"QRCode",`*H${printData.vendorCode},${printData.ACCPartNo},${printData.version},${printData.packQty},${printData.retrospectBatchNo},${printData.batchNo},${printData.productionDate},${printData.uom},*C,*E,*L,*K,*O,*R,*I,*S`);// 二维码
+      LODOP.ADD_PRINT_BARCODE(115,385,200,200,"QRCode",`*H${printData.vendorCode},${printData.accpartNo},${printData.version},${printData.packQty},${printData.retrospectBatchNo},${printData.batchNo},${printData.productionDate},${printData.uom},*C,*E,*L,*K,*O,*R,*I,*S`);// 二维码
 
       LODOP.ADD_PRINT_BARCODE(135, 2,120, 15, "Code39", `*${printData.batchNo}`)
       // LODOP.ADD_PRINT_BARCODE(168, 2,108, 25, "128A", `${printData.partNo}`)
@@ -79,7 +79,7 @@ export function printShipmentInnerLabel(printList) {
       LODOP.ADD_PRINT_TEXT(325,355,100,20,`档位(Level):`);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
 
-      LODOP.ADD_PRINT_TEXT(345,2,100,20,`MCO:${printData.MCO}`);
+      LODOP.ADD_PRINT_TEXT(345,2,100,20,`MCO:${printData.mco}`);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
 
       LODOP.ADD_PRINT_TEXT(345,355,100,20,`阶段:${printData.phaseCode}`);
diff --git a/src/views/modules/label/print_shipment_packing_box_label.js b/src/views/modules/label/print_shipment_packing_box_label.js
index 024f72b..51aaa42 100644
--- a/src/views/modules/label/print_shipment_packing_box_label.js
+++ b/src/views/modules/label/print_shipment_packing_box_label.js
@@ -25,10 +25,10 @@ export function printShipmentPackingBoxLabel(printList) {
       // LODOP.ADD_PRINT_BARCODE(168, 145,108, 25, "128A", `${printData.partNo}`)
       LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0);
 
-      LODOP.ADD_PRINT_TEXT(75,145,300,25,`AAC物料号码 (AAC PN#) :*M${printData.ACCPartNo}`);
+      LODOP.ADD_PRINT_TEXT(75,145,300,25,`AAC物料号码 (AAC PN#) :*M${printData.accpartNo}`);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
 
-      LODOP.ADD_PRINT_BARCODE(90, 145,160, 15, "Code39", `*M${printData.ACCPartNo}`)
+      LODOP.ADD_PRINT_BARCODE(90, 145,160, 15, "Code39", `*M${printData.accpartNo}`)
       // LODOP.ADD_PRINT_BARCODE(168, 145,108, 25, "128A", `${printData.partNo}`)
       LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0);
 
@@ -38,7 +38,7 @@ export function printShipmentPackingBoxLabel(printList) {
       LODOP.ADD_PRINT_TEXT(128,145,200,25,`物料版本 (Version) :*${printData.version}`);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
 
-      LODOP.ADD_PRINT_BARCODE(145,368,180,180,"QRCode",`${printData.ACCPartNo},${printData.version},${printData.qty},${printData.productionDate},${printData.batchNo},*H${printData.vendorCode},${printData.po},${printData.lineNo},${printData.uom},*I,*S`);// 二维码
+      LODOP.ADD_PRINT_BARCODE(145,368,180,180,"QRCode",`${printData.accpartNo},${printData.version},${printData.qty},${printData.productionDate},${printData.batchNo},*H${printData.vendorCode},${printData.po},${printData.lineNo},${printData.uom},*I,*S`);// 二维码
 
       LODOP.ADD_PRINT_BARCODE(148, 145,120, 15, "Code39", `*${printData.version}`)
       // LODOP.ADD_PRINT_BARCODE(168, 145,108, 25, "128A", `${printData.partNo}`)
@@ -75,7 +75,7 @@ export function printShipmentPackingBoxLabel(printList) {
       LODOP.ADD_PRINT_TEXT(325,145,100,20,`阶段:${printData.phaseCode}`);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
 
-      LODOP.ADD_PRINT_TEXT(345,145,100,20,`MCO:${printData.MCO}`);
+      LODOP.ADD_PRINT_TEXT(345,145,100,20,`MCO:${printData.mco}`);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
 
       LODOP.ADD_PRINT_LINE(0,141, 370, 142,0, 1);// 横线