diff --git a/src/views/modules/production/dailyPlanReport.vue b/src/views/modules/production/dailyPlanReport.vue index 4689030..d4d4454 100644 --- a/src/views/modules/production/dailyPlanReport.vue +++ b/src/views/modules/production/dailyPlanReport.vue @@ -289,7 +289,7 @@ printPartCard(row){ let array=[]; let data={ - printerName:'大标签打印机', + // printerName:'大标签打印机', orderNo:'*', userId:this.$store.state.user.name, partNo:row.partNo, diff --git a/src/views/modules/production/print_part_label.js b/src/views/modules/production/print_part_label.js index 57d60f6..e004228 100644 --- a/src/views/modules/production/print_part_label.js +++ b/src/views/modules/production/print_part_label.js @@ -5,8 +5,8 @@ export function printPartLabel(printList) { const LODOP = getLodop() if (LODOP) { //LODOP.SET_LICENSES("", "AF8A5800B84BCC5218BCF67B92627BEA", "", ""); - LODOP.SET_LICENSES("", "AF8A5800B84BCC5218BCF67B92627BEA", "", ""); - LODOP.SET_PRINTER_INDEXA(printList[0].printerName); + LODOP.SET_LICENSES("", "AF8A5800B823CC8E18BCF67B925E7BF0", "", ""); + // LODOP.SET_PRINTER_INDEXA(printList[0].printerName); //循环调用打印机 for(let i = 0; i < printList.length; i++){ let printData = printList[i]; diff --git a/src/views/modules/production/print_seqNo_label.js b/src/views/modules/production/print_seqNo_label.js index 7c14749..dc1d6e9 100644 --- a/src/views/modules/production/print_seqNo_label.js +++ b/src/views/modules/production/print_seqNo_label.js @@ -5,7 +5,7 @@ export function printSeqNoLabel(printList) { const LODOP = getLodop() if (LODOP) { //LODOP.SET_LICENSES("", "AF8A5800B84BCC5218BCF67B92627BEA", "", ""); - LODOP.SET_LICENSES("", "AF8A5800B84BCC5218BCF67B92627BEA", "", ""); + LODOP.SET_LICENSES("", "AF8A5800B823CC8E18BCF67B925E7BF0", "", ""); // LODOP.SET_PRINTER_INDEXA("小标签打印机"); //循环调用打印机 for(let i = 0; i < printList.length; i++){ @@ -13,10 +13,10 @@ export function printSeqNoLabel(printList) { LODOP.NewPage(); LODOP.SET_PRINT_PAGESIZE(0,1000,700,""); LODOP.ADD_PRINT_BARCODE(43,244,208,140,"QRCode",printData.seqNo); - LODOP.ADD_PRINT_TEXT(90,8,108,25,"Part No:"); + LODOP.ADD_PRINT_TEXT(90,8,108,25,"Part:"); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.ADD_PRINT_TEXT(90,110,140,25,printData.partNo); + LODOP.ADD_PRINT_TEXT(90,65,175,25,printData.partDesc); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); LODOP.ADD_PRINT_TEXT(143,8,128,24,"Operator:"); @@ -46,7 +46,7 @@ export function printSeqNoLabel(printList) { LODOP.ADD_PRINT_TEXT(66,8,96,25,"Q.T.Y:"); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.ADD_PRINT_TEXT(66,110,138,24,printData.qtyRequired); + LODOP.ADD_PRINT_TEXT(66,110,138,24,printData.qtyRequired+' | '+printData.weight+'公斤'); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); LODOP.ADD_PRINT_TEXT(194,8,128,25,"MFG Date:"); @@ -65,7 +65,7 @@ export function printSeqNoLabel(printList) { LODOP.SET_PRINT_STYLEA(0,"FontSize",12); LODOP.SET_PRINT_STYLEA(0,"Alignment",2); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.ADD_PRINT_TEXT(138,245,110,35,"工厂编码:"+printData.site); + LODOP.ADD_PRINT_TEXT(194,266,110,25,"工厂编码:"+printData.site); LODOP.SET_PRINT_STYLEA(0,"FontSize",11); LODOP.SET_PRINT_STYLEA(0,"Bold",1); } diff --git a/src/views/modules/production/print_stock_label.js b/src/views/modules/production/print_stock_label.js index 345c673..c945a3a 100644 --- a/src/views/modules/production/print_stock_label.js +++ b/src/views/modules/production/print_stock_label.js @@ -5,7 +5,7 @@ export function printMaterialLabel(printList) { const LODOP = getLodop() if (LODOP) { //LODOP.SET_LICENSES("", "AF8A5800B84BCC5218BCF67B92627BEA", "", ""); - LODOP.SET_LICENSES("", "AF8A5800B84BCC5218BCF67B92627BEA", "", ""); + LODOP.SET_LICENSES("", "AF8A5800B823CC8E18BCF67B925E7BF0", "", ""); // LODOP.SET_PRINTER_INDEXA("小标签打印机"); //循环调用打印机 for(let i = 0; i < printList.length; i++){ @@ -31,10 +31,10 @@ export function printMaterialLabel(printList) { LODOP.ADD_PRINT_TEXT(116,110,139,25,printData.locationId); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.ADD_PRINT_TEXT(41,8,132,25,"Part No:"); + LODOP.ADD_PRINT_TEXT(41,8,132,25,"Part:"); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.ADD_PRINT_TEXT(41,110,136,25,printData.partNo); + LODOP.ADD_PRINT_TEXT(41,61,185,25,printData.partDesc); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); LODOP.ADD_PRINT_TEXT(168,8,82,25,"Order No:"); @@ -65,7 +65,7 @@ export function printMaterialLabel(printList) { LODOP.SET_PRINT_STYLEA(0,"FontSize",12); LODOP.SET_PRINT_STYLEA(0,"Alignment",2); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.ADD_PRINT_TEXT(138,245,110,35,"工厂编码:"+printData.site); + LODOP.ADD_PRINT_TEXT(194,266,110,25,"工厂编码:"+printData.site); LODOP.SET_PRINT_STYLEA(0,"FontSize",11); LODOP.SET_PRINT_STYLEA(0,"Bold",1); } diff --git a/src/views/modules/production/print_transNo_label.js b/src/views/modules/production/print_transNo_label.js index 80dab4e..79a92cf 100644 --- a/src/views/modules/production/print_transNo_label.js +++ b/src/views/modules/production/print_transNo_label.js @@ -5,7 +5,7 @@ export function printTransNoLabel(printList) { const LODOP = getLodop() if (LODOP) { //LODOP.SET_LICENSES("", "AF8A5800B84BCC5218BCF67B92627BEA", "", ""); - LODOP.SET_LICENSES("", "AF8A5800B84BCC5218BCF67B92627BEA", "", ""); + LODOP.SET_LICENSES("", "AF8A5800B823CC8E18BCF67B925E7BF0", "", ""); //LODOP.SET_PRINTER_INDEXA("小标签打印机"); //循环调用打印机 for(let i = 0; i < printList.length; i++){ @@ -13,10 +13,10 @@ export function printTransNoLabel(printList) { LODOP.NewPage(); LODOP.SET_PRINT_PAGESIZE(0,1000,700,""); LODOP.ADD_PRINT_BARCODE(43,244,208,140,"QRCode",printData.transNo); - LODOP.ADD_PRINT_TEXT(90,8,108,25,"Part No:"); + LODOP.ADD_PRINT_TEXT(90,8,108,25,"Part:"); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.ADD_PRINT_TEXT(90,110,140,25,printData.partNo); + LODOP.ADD_PRINT_TEXT(90,65,175,25,printData.partDesc); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); LODOP.ADD_PRINT_TEXT(143,8,77,24,"Job No:"); @@ -65,7 +65,7 @@ export function printTransNoLabel(printList) { LODOP.SET_PRINT_STYLEA(0,"FontSize",12); LODOP.SET_PRINT_STYLEA(0,"Alignment",2); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.ADD_PRINT_TEXT(138,245,110,35,"工厂编码:"+printData.site); + LODOP.ADD_PRINT_TEXT(194,266,110,25,"工厂编码:"+printData.site); LODOP.SET_PRINT_STYLEA(0,"FontSize",11); LODOP.SET_PRINT_STYLEA(0,"Bold",1); } diff --git a/src/views/modules/production/searchHunlianTask.vue b/src/views/modules/production/searchHunlianTask.vue index 7f927b9..860df68 100644 --- a/src/views/modules/production/searchHunlianTask.vue +++ b/src/views/modules/production/searchHunlianTask.vue @@ -259,7 +259,7 @@ printPartCard(row){ let array=[]; let data={ - printerName:'大标签打印机', + // printerName:'大标签打印机', orderNo:'*', userId:this.$store.state.user.name, partNo:row.partNo, diff --git a/src/views/modules/production/soscheduleRouting.vue b/src/views/modules/production/soscheduleRouting.vue index 75b5df4..9af5796 100644 --- a/src/views/modules/production/soscheduleRouting.vue +++ b/src/views/modules/production/soscheduleRouting.vue @@ -492,7 +492,7 @@ if (data && data.code === 0) { data.row.userId=this.$store.state.user.name; let array=[]; - data.row.printerName='大标签打印机'; + // data.row.printerName='大标签打印机'; array.push(data.row) printPartLabel(array) } diff --git a/src/views/modules/production/stockPrint.vue b/src/views/modules/production/stockPrint.vue index 23005d9..4a1972b 100644 --- a/src/views/modules/production/stockPrint.vue +++ b/src/views/modules/production/stockPrint.vue @@ -245,7 +245,7 @@ wareHouseId:row.wareHouseId, batchNo:row.batchNo, locationId:row.locationId, - partNo:row.partNo, + partDesc:row.partDesc, orderNo:row.orderNo, qty:row.qty, transDate:row.transDate