Merge remote-tracking branch 'origin/uat-temp-nht-25027-chengdu' into dev

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/CustomFieldPrintStrategy.java

@@ -142,6 +142,8 @@ public class CustomFieldPrintStrategy implements IPrintTemplateStrategyService {
         result.put(MesPcnExtConstWords.PRINT_BAR_CODE, produceSn.getProductSn());
         result.put(MesPcnExtConstWords.PRINT_DATE, TimeTool.getNowTime(true));
         result.put(MesPcnExtConstWords.USER_NAME, produceSn.getCreateUser());
+        result.put(MesPcnExtConstWords.PRODUCT_DATE, TimeTool.getToday());
+        result.put(MesPcnExtConstWords.PRODUCT_TIME, TimeTool.getTimeShortWithColon());
         return result;
     }
 

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java

@@ -797,6 +797,10 @@ public class MesPcnExtConstWords {
     public static final String FG_PART_NO = "fgPartNo";
     // 打印日期
     public static final String PRINT_DATE = "printDate";
+    // 生产日期
+    public static final String PRODUCT_DATE = "productDate";
+    // 生产日期
+    public static final String PRODUCT_TIME = "productTime";
     // 打印时间
     public static final String PRINT_TIME = "printTime";
     //替换数