0412 新看板

src/api/board.js

@@ -10,7 +10,7 @@ export const soLiuhuaBoard= data => createAPI(`board/soLiuhuaBoard`,'post',data)
 export const transFerBoard= data => createAPI(`board/transFerBoard`,'post',data)
 export const SORoutingBoard= data => createAPI(`board/SORoutingBoard`,'post',data)
 
-export const getStockPrintList= data => createAPI(`board/getStockPrintList`,'post',data)
+export const getStockPrintList= data => createAPI(`board/getStockPrintList/${data}`,'get',data)
 export const getStockPrintListHunlian= data => createAPI(`board/getStockPrintListHunlian`,'post',data)
 export const updateStockPrintFlag= data => createAPI(`board/updateStockPrintFlag`,'post',data)
 export const SORoutingBoardForXiuBian= data => createAPI(`board/SORoutingBoardForXiuBian`,'post',data)

src/views/modules/autoPrint/autoPrintStock.vue

@@ -17,7 +17,7 @@
     name: 'autoPrintStock',
     data () {
       return {
-
+        ip:this.$route.query.ip
       }
     },
     mounted () {
@@ -30,7 +30,7 @@
         }, 3000)
       },
       printStock(){
-        getStockPrintList().then(({data}) => {
+        getStockPrintList(this.ip).then(({data}) => {
           if (data.code == 0) {
             let array=[];
             if(data.rows.length>0){

src/views/modules/autoPrint/autoPrintStockHunlian.vue

@@ -51,6 +51,15 @@
               }
 
             }
+            if(data.rows2.length>0){
+              let array2=[];
+              for (let i = 0; i < data.rows2.length; i++) {
+                for (let j = 0; j <data.rows2[i].printQty ; j++) {
+                  array2.push(data.rows2[i])
+                }
+              }
+              printMaterialLabel(array2);
+            }
           }
         })
       },

src/views/modules/print/print_hunlian_card.js

@@ -106,10 +106,10 @@ export function printHunlianLabel(printList) {
       LODOP.ADD_PRINT_BARCODE(12,30,138,65,"QRCode",printData.TaskNo);
       LODOP.ADD_PRINT_TEXT(67,88,100,25,"PartNo");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      // LODOP.ADD_PRINT_TEXT(66,333,385,25,"11合并公用产品型号");
-      // LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      // LODOP.ADD_PRINT_TEXT(90,333,386,25,"11合并硫化订单号");
-      // LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(66,333,385,25,printData.AllDesc);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(90,333,386,25,printData.AllOrderNo);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.ADD_PRINT_TEXT(114,107,116,20,printData.mlzksjx);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.ADD_PRINT_TEXT(114,335,135,20,printData.mlzksjd);

src/views/modules/print/print_part_label.js

@@ -132,9 +132,9 @@ export function printPartLabel(printList) {
       LODOP.ADD_PRINT_TEXT(72,564,152,274,printData.remark);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
     }
-    // LODOP.SET_PRINT_STYLEA(1,"AngleOfPageInside",-90);
-    LODOP.PRINT_DESIGN();
-    // LODOP.PREVIEW();
+    LODOP.SET_PRINT_STYLEA(1,"AngleOfPageInside",-90);
+    // LODOP.PRINT_DESIGN();
+    LODOP.PREVIEW();
     // LODOP.PRINT();
     console.log("操作成功！")
   }

src/views/modules/print/print_stock_label.js

@@ -68,10 +68,16 @@ export function printMaterialLabel(printList) {
       LODOP.ADD_PRINT_TEXT(194,266,110,25,"工厂编码:"+printData.site);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(176,216,100,20,"Valid Date:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(177,300,100,25,printData.expiredDate);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
     }
     // LODOP.PRINT_DESIGN();
-    //LODOP.PREVIEW();
-    LODOP.PRINT();
+    LODOP.PREVIEW();
+    // LODOP.PRINT();
     console.log("操作成功！")
   }
 }

src/views/modules/print/print_stock_label_preview.js

@@ -68,6 +68,12 @@ export function printMaterialLabel(printList) {
       LODOP.ADD_PRINT_TEXT(194,266,110,25,"工厂编码:"+printData.site);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(176,216,100,20,"Valid Date:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(177,300,100,25,printData.expiredDate);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
     }
     // LODOP.PRINT_DESIGN();
     LODOP.PREVIEW();

src/views/modules/production/dailyPlanReport.vue

@@ -362,7 +362,8 @@
           let inData={
             site:row.site,
             taskNo:row.taskNo,
-            userId:this.$store.state.user.name
+            userId:this.$store.state.user.name,
+            orderRef1:row.orderRef1,
           }
           cancelTask(inData).then(({data}) => {
             if (data && data.code === 0) {

src/views/modules/production/inspect.vue

@@ -473,7 +473,7 @@
             this.search ();
             let printData=data.row
             printData.userId=this.$store.state.user.name
-            if(printData.toTypeFlag=='混炼胶入库'){
+            if(printData.toTypeFlagDb!='I'){
               printData.seqNo=printData.orderNo
             }
             let array=[];
@@ -550,7 +550,7 @@
           if (data && data.code === 0) {
             let printData=data.row
             printData.userId=this.$store.state.user.name
-            if(printData.toTypeFlag=='混炼胶入库'){
+            if(printData.toTypeFlagDb!='I'){
               printData.seqNo=printData.orderNo
             }
             let array=[];

src/views/modules/production/stockPrint.vue

@@ -251,7 +251,8 @@
           orderNo:row.orderNo,
           qty:row.qty,
           umid:row.umid,
-          transDate:row.transDate
+          transDate:row.transDate,
+          expiredDate:row.expiredDate,
         }
         array.push(data)
         printMaterialLabel(array);