单据条码打印生产日期和失效日期问题

api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockQRCodeTextController.java

@@ -42,10 +42,7 @@ import com.glxp.sale.admin.service.param.SystemPDFTemplateRelevanceService;
 import com.glxp.sale.admin.service.param.SystemPDFTemplateService;
 import com.glxp.sale.admin.service.param.SystemParamConfigService;
 import com.glxp.sale.admin.thread.JaspaperService;
-import com.glxp.sale.admin.util.Constant;
+import com.glxp.sale.admin.util.*;
-import com.glxp.sale.admin.util.CustomUtil;
-import com.glxp.sale.admin.util.FileUtils;
-import com.glxp.sale.admin.util.JasperUtils;
 import com.glxp.sale.common.enums.ResultEnum;
 import com.glxp.sale.common.res.BaseResponse;
 import com.glxp.sale.common.util.ResultVOUtils;
@@ -413,6 +410,14 @@ public class StockQRCodeTextController {
                     stockOrderPrintEntity.setRemark1(systemPDFModuleEntity.getRemark1());
                     stockOrderPrintEntity.setRemark2(systemPDFModuleEntity.getRemark2());
                     stockOrderPrintEntity.setRemark3(systemPDFModuleEntity.getRemark3());
+
+                    if (StrUtil.isNotEmpty(stockOrderPrintEntity.getProductDate())) {
+                        stockOrderPrintEntity.setProductDate(DateUtil.formatExpireTime("20" + stockOrderPrintEntity.getProductDate()));
+                    }
+                    if (StrUtil.isNotEmpty(stockOrderPrintEntity.getExpireDate())) {
+                        stockOrderPrintEntity.setExpireDate(DateUtil.formatExpireTime("20" + stockOrderPrintEntity.getExpireDate()));
+                    }
+
                     if (orderEntity != null)
                         stockOrderPrintEntity.setBillRemark(orderEntity.getPrintRemark());
                     if (systemParamConfigEntity.getParamValue().equals("1")) {
@@ -462,6 +467,13 @@ public class StockQRCodeTextController {
                     if (stockOrderDetailEntity != null) {
                         stockOrderPrintEntity.setPrice(stockOrderDetailEntity.getPrice());
                         stockOrderPrintEntity.setZczbhhzbapzbh(stockOrderDetailEntity.getZczbhhzbapzbh());
+                        if (StrUtil.isNotEmpty(stockOrderDetailEntity.getProductDate())) {
+                            stockOrderPrintEntity.setProductDate(DateUtil.formatExpireTime("20" + stockOrderDetailEntity.getProductDate()));
+                        }
+                        if (StrUtil.isNotEmpty(stockOrderDetailEntity.getExpireDate())) {
+                            stockOrderPrintEntity.setExpireDate(DateUtil.formatExpireTime("20" + stockOrderDetailEntity.getExpireDate()));
+                        }
+
                     }
                     index++;