diff --git a/src/views/modules/label/print_shipment_box_label.js b/src/views/modules/label/print_shipment_box_label.js index d60c931..985c6b4 100644 --- a/src/views/modules/label/print_shipment_box_label.js +++ b/src/views/modules/label/print_shipment_box_label.js @@ -33,12 +33,12 @@ export function printShipmentBoxLabel(printList) { 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.ADD_PRINT_TEXT(103,2,150,25,`物料批次 (Batch) :*${printData.batchNo === ''?'BWM0':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},*M${printData.accpartNo},*V${printData.version},*Q${printData.boxQty},*${printData.batchNo === ''?'BWM0':printData.batchNo},*D${printData.productionDate},*C,*E,*L,*F,*FWM${printData.boxNo},*U${printData.uom},*T,*K,*O,*R,*I,*S`);// 二维码 - LODOP.ADD_PRINT_BARCODE(118, 2,120, 15, "Code39", `*${printData.batchNo}`) + LODOP.ADD_PRINT_BARCODE(118, 2,120, 15, "Code39", `*${printData.batchNo === ''?'BWM0':printData.batchNo}`) // LODOP.ADD_PRINT_BARCODE(168, 2,108, 25, "128A", `${printData.partNo}`) LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0); @@ -56,17 +56,17 @@ export function printShipmentBoxLabel(printList) { // LODOP.ADD_PRINT_BARCODE(168, 2,108, 25, "128A", `${printData.partNo}`) LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0); - LODOP.ADD_PRINT_TEXT(208,2,200,25,`物料版本 (Version) :*${printData.version}`); + LODOP.ADD_PRINT_TEXT(208,2,200,25,`物料版本 (Version) :*V${printData.version}`); LODOP.SET_PRINT_STYLEA(0,"FontSize",8); - LODOP.ADD_PRINT_BARCODE(223, 2,120, 15, "Code39", `*${printData.version}`) + LODOP.ADD_PRINT_BARCODE(223, 2,120, 15, "Code39", `*V${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.uom}`); + LODOP.ADD_PRINT_TEXT(243,2,200,25,`采购单位 (UOM) :*U${printData.uom}`); LODOP.SET_PRINT_STYLEA(0,"FontSize",8); - LODOP.ADD_PRINT_BARCODE(258, 2,120, 15, "Code39", `*${printData.uom}`) + LODOP.ADD_PRINT_BARCODE(258, 2,120, 15, "Code39", `*U${printData.uom}U`) // LODOP.ADD_PRINT_BARCODE(168, 2,108, 25, "128A", `${printData.partNo}`) LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0); @@ -78,7 +78,7 @@ export function printShipmentBoxLabel(printList) { 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.ADD_PRINT_TEXT(305,230,200,20,`箱号:${printData.boxNo}`); LODOP.SET_PRINT_STYLEA(0,"FontSize",8); LODOP.ADD_PRINT_TEXT(325,2,80,20,`档位(Level):`); @@ -151,12 +151,12 @@ export function printShipmentBoxLabel(printList) { 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.ADD_PRINT_TEXT(115,2,200,25,`物料批号 (Batch) :*${printData.batchNo === ''?'BWM0':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},*M${printData.accpartNo},*V${printData.version},*Q${printData.packQty},*T${printData.retrospectBatchNo},*${printData.batchNo === ''?'BWM0':printData.batchNo},*D${printData.productionDate},*U${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(135, 2,120, 15, "Code39", `*${printData.batchNo === ''?'BWM0':printData.batchNo}`) // LODOP.ADD_PRINT_BARCODE(168, 2,108, 25, "128A", `${printData.partNo}`) LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0); @@ -181,7 +181,7 @@ export function printShipmentBoxLabel(printList) { // 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.ADD_PRINT_TEXT(285,2,200,25,`物料版号 (Version) :*V${printData.version}`); LODOP.SET_PRINT_STYLEA(0,"FontSize",7); // 图标 diff --git a/src/views/modules/label/print_shipment_inner_label.js b/src/views/modules/label/print_shipment_inner_label.js index b8f69a8..6f83876 100644 --- a/src/views/modules/label/print_shipment_inner_label.js +++ b/src/views/modules/label/print_shipment_inner_label.js @@ -25,19 +25,19 @@ export function printShipmentInnerLabel(printList) { 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.accpartNo}`) + 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.ADD_PRINT_TEXT(115,2,200,25,`物料批号 (Batch) :*${printData.batchNo === ''?'BWM0':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},*M${printData.accpartNo},*V${printData.version},*Q${printData.packQty},*T${printData.retrospectBatchNo},*${printData.batchNo === ''?'BWM0':printData.batchNo},*D${printData.productionDate},*U${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(135, 2,120, 15, "Code39", `*${printData.batchNo === ''?'BWM0':printData.batchNo}`) // LODOP.ADD_PRINT_BARCODE(168, 2,108, 25, "128A", `${printData.partNo}`) LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0); @@ -62,7 +62,7 @@ export function printShipmentInnerLabel(printList) { // 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.ADD_PRINT_TEXT(285,2,200,25,`物料版号 (Version) :*V${printData.version}`); LODOP.SET_PRINT_STYLEA(0,"FontSize",7); // 图标 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 51aaa42..733bb32 100644 --- a/src/views/modules/label/print_shipment_packing_box_label.js +++ b/src/views/modules/label/print_shipment_packing_box_label.js @@ -35,12 +35,12 @@ export function printShipmentPackingBoxLabel(printList) { LODOP.ADD_PRINT_TEXT(108,145,360,25,`物料描述:${printData.partDesc}`); LODOP.SET_PRINT_STYLEA(0,"FontSize",8); - LODOP.ADD_PRINT_TEXT(128,145,200,25,`物料版本 (Version) :*${printData.version}`); + LODOP.ADD_PRINT_TEXT(128,145,200,25,`物料版本 (Version) :*V${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",`*M${printData.accpartNo},*V${printData.version},*Q${printData.qty},*D${printData.productionDate},*${printData.batchNo === ''?'BWM0':printData.batchNo},*H${printData.vendorCode},*P${printData.po},*N${printData.lineNo},*U${printData.uom},*I,*S`);// 二维码 - LODOP.ADD_PRINT_BARCODE(148, 145,120, 15, "Code39", `*${printData.version}`) + LODOP.ADD_PRINT_BARCODE(148, 145,120, 15, "Code39", `*V${printData.version}`) // LODOP.ADD_PRINT_BARCODE(168, 145,108, 25, "128A", `${printData.partNo}`) LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0); @@ -51,10 +51,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(203,145,200,25,`采购单位 (UOM) :*${printData.uom}`); + LODOP.ADD_PRINT_TEXT(203,145,200,25,`采购单位 (UOM) :*U${printData.uom}`); LODOP.SET_PRINT_STYLEA(0,"FontSize",8); - LODOP.ADD_PRINT_BARCODE(218, 145,120, 15, "Code39", `*${printData.uom}`) + LODOP.ADD_PRINT_BARCODE(218, 145,120, 15, "Code39", `*U${printData.uom}`) // LODOP.ADD_PRINT_BARCODE(168, 145,108, 25, "128A", `${printData.partNo}`) LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0); @@ -65,10 +65,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(283,145,150,25,`物料批号 (Batch) :*${printData.batchNo}`); + LODOP.ADD_PRINT_TEXT(283,145,150,25,`物料批号 (Batch) :*${printData.batchNo === ''?'BWM0':printData.batchNo}`); LODOP.SET_PRINT_STYLEA(0,"FontSize",8); - LODOP.ADD_PRINT_BARCODE(298, 145,120, 15, "Code39", `*${printData.batchNo}`) + LODOP.ADD_PRINT_BARCODE(298, 145,120, 15, "Code39", `*${printData.batchNo === ''?'BWM0':printData.batchNo}`) // LODOP.ADD_PRINT_BARCODE(168, 145,108, 25, "128A", `${printData.partNo}`) LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0);