1

zkqy-custom-business/src/main/resources/mapper/business/ProductCodeListMapper.xml

@@ -451,7 +451,8 @@
         p.product_specifications AS productSpecifications,
         concat(ml.materie_encoding,ml.materie_color_number) AS productColor,
         p.id AS productId,
-        sc.direction_of_twist AS directionOfTwist
+        sc.direction_of_twist AS directionOfTwist,
+        p.product_no AS productNo
         FROM
         {DBNAME}.sale_products sp
         LEFT JOIN {DBNAME}.production p ON sp.product_no = p.product_no

zkqy-ui/src/utils/print/printUtils.js

@@ -40,6 +40,7 @@ function printEN(printRow) {
     productColor, //色泽
     lotNum, //批次
     boxNum, //箱号
+    productNo,
   } = printRow;
   let ENColor = removeChineseCharacters(productColor) || ''
   let res = []
@@ -50,6 +51,7 @@ function printEN(printRow) {
   res.push({ key1: 'NET WEIGHT:', key2: suttle || '', })
   res.push({ key1: 'GROSS WEIGHT:', key2: grossWeight || '', })
   res.push({ key1: 'CARTON NO:', key2: boxNum || '', })
+  res.push({ key1: 'PRODUCT NO:', key2: productNo || '', })
   return res
 }
 

zkqy-ui/src/views/orderMange/codeListManage/printIndex.vue

@@ -622,6 +622,10 @@ export default {
       batchTableData: [], //批号表格数据
       currentRow: {},
       columns: [
+        {
+          id: "productNo",
+          label: "编号",
+        },
         {
           id: "productName",
           label: "品名",
@@ -1078,6 +1082,7 @@ export default {
         lotNum,
         directionOfTwist,
         productId,
+        productNo,
       } = this.currentRow;
       let directionOfTwistLabel =
         this.dict.type.direction_of_twist.find(
@@ -1091,6 +1096,7 @@ export default {
         packaging, //包装方式 1:车丝 2:小包装  3:大包装
         qrCode: this.qrCode, //箱单号
         levels,
+        productNo,
         machineTool,
         boxWeight,
         canisterWeight,
@@ -1162,8 +1168,8 @@ export default {
       }
       console.log("二维码数据", temp);
       payload.qrCodeVal = temp;
-      payload.remark = remark || "注：不同批号，请勿混用";
-      console.log(printRow,"dddddd");
+      payload.remark = "产品编号："+printRow.productNo;//原注解字段更改为产品编号字段
+     // console.log(printRow,"dddddd");
       payload.mapList = getServerPrintData(printRow);
       switch (printFormat) {
         case "3": //英文码单