diff --git a/src/api/production/generateReport.js b/src/api/production/generateReport.js
index 1d7f14a..de4c4a8 100644
--- a/src/api/production/generateReport.js
+++ b/src/api/production/generateReport.js
@@ -43,3 +43,6 @@ export const getPartCardPrintData= data => createAPI(`dailyPlan/getPartCardPrint
 export const getSfdcList= data => createAPI(`dailyPlan/getSfdcList`, 'post', data);
 
 export const cancelSfdc= data => createAPI(`dailyPlan/cancelSfdc`, 'post', data);
+
+export const getLiuHuaPrintData= data => createAPI(`dailyPlan/getLiuHuaPrintData`, 'post', data);
+
diff --git a/src/views/modules/print/print_hunlian_card.js b/src/views/modules/print/print_hunlian_card.js
index fac80e3..ef8c60c 100644
--- a/src/views/modules/print/print_hunlian_card.js
+++ b/src/views/modules/print/print_hunlian_card.js
@@ -11,7 +11,7 @@ export function printHunlianLabel(printList) {
     for(let i = 0; i < printList.length; i++){
       let printData = printList[i];
       LODOP.NewPage();
-      LODOP.SET_PRINT_PAGESIZE(0,1900,1000,"");
+      LODOP.SET_PRINT_PAGESIZE(0,1000,1900,"");
       LODOP.ADD_PRINT_LINE(61,0,60,718,0,1);
       LODOP.ADD_PRINT_LINE(85,0,84,718,0,1);
       LODOP.ADD_PRINT_LINE(109,0,108,718,0,1);
@@ -136,12 +136,31 @@ export function printHunlianLabel(printList) {
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
 
 
-
-
+      LODOP.ADD_PRINT_TEXT(39,152,120,20,printData.CreateDate.substring(0,10));
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(39,576,141,20,printData.TaskNo);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(66,63,125,20,printData.spec);
+      LODOP.ADD_PRINT_TEXT(67,259,110,25,printData.materialType1);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(67,603,95,25,printData.taskQty);
+      LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
+      LODOP.ADD_PRINT_TEXT(234,559,155,25,printData.duroa);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(263,554,160,25,printData.color);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(290,559,155,25,printData.materialType1);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(318,559,157,25,printData.materialType2);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(345,560,155,25,printData.chjlt);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_BARCODE(12,30,138,65,"QRCode",printData.TaskNo);
 
     }
-    LODOP.PRINT_DESIGN();
-    //LODOP.PREVIEW();
+    LODOP.SET_PRINT_STYLEA(1,"AngleOfPageInside",-90);
+    // LODOP.PRINT_DESIGN();
+    LODOP.PREVIEW();
     // LODOP.PRINT();
     console.log("操作成功！")
   }
diff --git a/src/views/modules/print/print_liuhua_card.js b/src/views/modules/print/print_liuhua_card.js
index d3ce09c..c866c16 100644
--- a/src/views/modules/print/print_liuhua_card.js
+++ b/src/views/modules/print/print_liuhua_card.js
@@ -219,11 +219,139 @@ export function printCardLabel(printList) {
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
 
 
+      LODOP.ADD_PRINT_TEXT(12,74,145,20,printData.ScheduleDate.substring(0,10));  //排产日期
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(38,81,120,25,printData.OrderNo); //生产工单号
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(39,284,100,25,printData.CustomerDesc);//客户
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(39,463,75,20,printData.S_ShiftNo);//班次
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      // LODOP.ADD_PRINT_TEXT(39,616,110,25,"11混炼胶批次号");//混炼胶批次号
+      // LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(62,83,100,20,printData.OperatorDesc);//操作员
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(63,284,100,24,printData.cpxh);//产品型号
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(63,462,85,20,printData.cpys);//产品颜色
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      // LODOP.ADD_PRINT_TEXT(63,615,105,25,"外购件批号");//外购件批号
+      // LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      // LODOP.ADD_PRINT_TEXT(86,82,120,20,"123原材料型号");//原材料型号
+      // LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(87,283,105,25,printData.hljyd);//混炼胶硬度
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(86,461,100,25,printData.mjks);//模具孔条数
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      // LODOP.ADD_PRINT_TEXT(86,615,105,25,"实际模具温度");//实际模具温度
+      // LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      // LODOP.ADD_PRINT_TEXT(110,153,100,20,"标准秤砣12");//标准秤砣
+      // LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      // LODOP.ADD_PRINT_TEXT(111,331,100,25,"电子秤编号12");//电子秤编号
+      // LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      // LODOP.ADD_PRINT_TEXT(111,509,100,25,"实测产品重量");//实测产品重量
+      // LODOP.ADD_PRINT_TEXT(110,656,65,20,"产品硬度");//产品硬度
+      // LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(135,86,105,20,printData.lhsb);//硫化设备
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(134,269,75,25,printData.lhwd);//硫化温度
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
+      LODOP.ADD_PRINT_TEXT(135,437,65,25,printData.lhsj);//硫化时间
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
+      LODOP.ADD_PRINT_TEXT(134,606,75,24,printData.lhyl);//硫化压力
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
+      LODOP.ADD_PRINT_TEXT(158,85,90,25,printData.zksj);//真空时间
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
+      LODOP.ADD_PRINT_TEXT(158,287,90,25,printData.pqcs);//排气次数
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(159,452,75,25,printData.bcpmz);//半成品毛重
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
+      LODOP.ADD_PRINT_TEXT(158,614,90,25,printData.tlzl);//投料重量
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
+      LODOP.ADD_PRINT_TEXT(182,83,115,20,printData.eclhwd);//二段温度标准
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(182,283,100,24,printData.eclhsj);//二段时间标准
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      // LODOP.ADD_PRINT_TEXT(183,461,90,25,"二段实际温度");//二段实际温度
+      // LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      // LODOP.ADD_PRINT_TEXT(182,616,105,20,"二段实际时间");//二段实际时间
+      // LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      // LODOP.ADD_PRINT_TEXT(207,83,75,25,"挤出总功率");//挤出总功率
+      // LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      // LODOP.ADD_PRINT_TEXT(206,243,85,20,"挤出机功率");//挤出机功率
+      // LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(206,422,90,25,printData.gdsd);//钢带速度
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(207,582,90,25,printData.qdgc);//前段尺寸公差
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(231,649,75,25,printData.hdgc);//后段尺寸
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(231,81,75,25,printData.gwlwd);//高温炉温度
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(232,243,80,25,printData.ydwd);//一段温度
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(231,422,90,25,printData.edwd);//二段温度
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(231,584,64,25,printData.sdwd);//三段温度
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(255,82,70,25,printData.fdwd);//四段温度
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(255,243,85,25,printData.wdwd);//五段温度
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(255,423,85,25,printData.ptll);//喷涂流量
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(256,585,65,20,printData.ptts);//喷涂头数
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(278,81,85,25,printData.dlzqs);//等离子枪数
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(278,243,85,25,printData.sjsj);//水煮时间
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      // LODOP.ADD_PRINT_TEXT(278,423,85,25,"底层胶水");//底层胶水
+      // LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      // LODOP.ADD_PRINT_TEXT(278,585,75,25,"表层胶水");//表层胶水
+      // LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(279,649,75,25,printData.bysj);//保压时间
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(301,155,85,25,printData.cjlwz);//储胶量位置
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(301,333,90,20,printData.dywz);//低压位置
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(302,512,80,25,printData.gywz);//高压位置
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(302,650,70,25,printData.scwz3);//射出位置3
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      // LODOP.ADD_PRINT_TEXT(325,115,100,25,"计划领取重量");//计划领取重量
+      // LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      // LODOP.ADD_PRINT_TEXT(327,269,90,25,"实际领取重量");//实际领取重量
+      // LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      // LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
+      LODOP.ADD_PRINT_TEXT(327,438,80,25,printData.scwz1);//射胶位置1
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
+      // LODOP.ADD_PRINT_TEXT(327,615,104,25,"储料位置");//储料位置
+      // LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(350,90,90,25,printData.qtyRequired);//计划生产任务
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
+      // LODOP.ADD_PRINT_TEXT(351,284,90,20,"实际生产模数");//实际生产模数
+      // LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      // LODOP.ADD_PRINT_TEXT(350,463,85,25,"合格品数量");//合格品数量
+      // LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      // LODOP.ADD_PRINT_TEXT(351,616,100,25,"不良品数");//不良品数
+      // LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+
 
 
     }
-    LODOP.PRINT_DESIGN();
-    //LODOP.PREVIEW();
+    LODOP.SET_PRINT_STYLEA(1,"AngleOfPageInside",-90);
+    // LODOP.PRINT_DESIGN();
+    LODOP.PREVIEW();
     // LODOP.PRINT();
     console.log("操作成功！")
   }
diff --git a/src/views/modules/production/dailyPlanReport.vue b/src/views/modules/production/dailyPlanReport.vue
index 5ab9022..899f5a2 100644
--- a/src/views/modules/production/dailyPlanReport.vue
+++ b/src/views/modules/production/dailyPlanReport.vue
@@ -321,8 +321,8 @@
               if(data.rows.length>0){
                 let array=[];
                 array.push(data.rows[0])
-                console.log(data.rows[0])
-                // printHunlianLabel(array)
+
+                printHunlianLabel(array)
               }
 
           }
diff --git a/src/views/modules/production/soscheduleRouting.vue b/src/views/modules/production/soscheduleRouting.vue
index 10250d6..8d0c5d8 100644
--- a/src/views/modules/production/soscheduleRouting.vue
+++ b/src/views/modules/production/soscheduleRouting.vue
@@ -105,9 +105,9 @@
         label="操作">
         <template slot-scope="scope" class="foo_container">
           <a type="text" size="small" @click="toPrint(scope.row)">打印</a>
-          <a v-if="scope.row.circulationSeqNo==null" type="text" size="small" @click="cancelJob(scope.row)">取消派工单</a>
           <a type="text" size="small" @click="printPartCard(scope.row)">物料标识卡</a>
           <a type="text" v-if="scope.row.scheduleType=='日计划派工单'" size="small" @click="printProductCard(scope.row)">生产指令单</a>
+          <a v-if="scope.row.circulationSeqNo==null" type="text" size="small" @click="cancelJob(scope.row)">取消派工单</a>
         </template>
       </el-table-column>
       <el-table-column
@@ -267,7 +267,7 @@
   import {
     getSOScheduleRoutingData
     , cancelJob,
-    getPartCardPrintData
+    getPartCardPrintData,getLiuHuaPrintData
   } from '@/api/production/generateReport.js'
   import Chooselist from '@/views/modules/common/Chooselist'
   import {
@@ -504,22 +504,23 @@
         })
       },
       printProductCard(row){
-        let search={
+        let indata={
           site:row.site,
-          seqNo:row.seqNo
+          seqNo:row.seqNo,
+          sScheduledDate:row.sScheduledDate,
+          partNo:row.partNo
         }
-        // getPartCardPrintData(search).then(({data}) => {
-        //   if (data && data.code === 0) {
-        //     data.row.userId=this.$store.state.user.name;
-        //     let array=[];
-        //     // data.row.printerName='大标签打印机';
-        //     array.push(data.row)
-        //     printPartLabel(array)
-        //   }
-        // })
-        let array=[];
-        array.push(row)
-        printCardLabel(array);
+        getLiuHuaPrintData(indata).then(({data}) => {
+          if (data && data.code === 0) {
+            if(data.rows.length>0){
+              let array=[];
+              array.push(data.rows[0])
+
+              printCardLabel(array)
+            }
+
+          }
+        })
       },
     },
     created () {