20241119

src/printFormat/logisticLabel.js

@@ -31,7 +31,7 @@ export const printLogisticLabel = (printList, printerName) => {
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.ADD_PRINT_TEXT(42,126,40,20,"QTY");
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",14);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.ADD_PRINT_TEXT(63,126,50,20,"DESC");
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
@@ -61,15 +61,25 @@ export const printLogisticLabel = (printList, printerName) => {
       LODOP.ADD_PRINT_LINE(100,-2,99,406,0,1);
       LODOP.ADD_PRINT_LINE(146,-2,145,406,0,1);
 
-      LODOP.ADD_PRINT_TEXT(113,126,40,20,"PO")
+      LODOP.ADD_PRINT_TEXT(105,126,40,20,"PO")
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
 
-      LODOP.ADD_PRINT_TEXT(110,175,200,20,row.poNo)
+      LODOP.ADD_PRINT_TEXT(102,175,200,20,row.poNo)
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",14);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
 
+      if (row.invoiceNo){
+        LODOP.ADD_PRINT_TEXT(123,80,80,20,"Invoice No.")
+        LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+
+        LODOP.ADD_PRINT_TEXT(125,175,200,20,row.invoiceNo)
+        LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      }
+
       LODOP.PRINT();
     }
     //LODOP.PREVIEW();

src/views/modules/label/logisticLabelRecord.vue

@@ -50,7 +50,7 @@ export default {
           sortLv: 10,
           status: true,
           fixed: '',
-          columnWidth: 120
+          columnWidth: 80
         },
         {
           userId: this.$store.state.user.name,
@@ -70,6 +70,24 @@ export default {
           fixed: '',
           columnWidth: 120
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 30007,
+          serialNumber: '30007TableInvoiceNo',
+          tableId: '30007Table',
+          tableName: 'Logistic Label Record',
+          columnProp: 'invoiceNo',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: 'Invoice No',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 10,
+          status: true,
+          fixed: '',
+          columnWidth: 120
+        },
         {
           userId: this.$store.state.user.name,
           functionId: 30007,

src/views/modules/label/printer.vue

@@ -96,6 +96,7 @@ export default {
         manufacturerTime: [{required: true, message: 'Please input Manufacturer Date', trigger: ['blur','change']}],
         orderNo: [{required: true, message: 'Please input PO', trigger: ['blur','change']}],
         poNo: [{required: true, message: 'Please input PO No', trigger: ['blur','change']}],
+        invoiceNo: [{required: true, message: 'Please input Invoice No', trigger: ['blur','change']}],
         unitQtyPerPallet: [{required: true, message: 'Please input Unit Qty Per Pallet', trigger: ['blur','change']}],
         countOfPallets: [{required: true, message: 'Please input Count Of Pallets', trigger: ['blur','change']}],
       },
@@ -549,6 +550,7 @@ export default {
         countOfPallets:1,
         umName:'',
         customerNo:'',
+        invoiceNo:'',
       },
       logisticVisible:false,
       templateList:[],
@@ -642,6 +644,7 @@ export default {
         countOfPallets:1,
         umName: this.currentPart.umName,
         customerNo:this.currentPart.customerNo,
+        invoiceNo:'',
       }
       this.logisticVisible = true;
     },
@@ -1126,6 +1129,7 @@ export default {
               poNo:this.currentPartLogistic.poNo,
               qty:this.currentPartLogistic.unitQtyPerPallet,
               umName:this.currentPartLogistic.umName,
+              invoiceNo:this.currentPartLogistic.invoiceNo,
             }
             let qrCodeList = this.$refs.qrCode.init([row.qrCode])
             row.qrCode = qrCodeList[0]
@@ -1396,14 +1400,19 @@ export default {
             <el-input v-model="currentPartLogistic.partNo" disabled></el-input>
           </el-form-item>
         </el-col>
+        <el-col :span="24">
+          <el-form-item label="Part Description" :show-message="false">
+            <el-input v-model="currentPartLogistic.partDesc" disabled></el-input>
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item label="PO No" prop="poNo" :show-message="false">
             <el-input v-model="currentPartLogistic.poNo"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
-          <el-form-item label="Part Description" :show-message="false">
-            <el-input v-model="currentPartLogistic.partDesc" disabled></el-input>
+        <el-col :span="12">
+          <el-form-item label="Invoice No" :show-message="false">
+            <el-input v-model="currentPartLogistic.invoiceNo"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">