From 9819bc983126e8f54e03ea65a8a77e3cd8153a5b Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Thu, 8 Dec 2022 11:33:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=9D=A1=E7=A0=81=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E7=94=9F=E4=BA=A7=E6=97=A5=E6=9C=9F=E5=92=8C=E5=A4=B1?=
 =?UTF-8?q?=E6=95=88=E6=97=A5=E6=9C=9F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inout/StockQRCodeTextController.java      | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockQRCodeTextController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockQRCodeTextController.java
index ff56ae4..1adc9bb 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockQRCodeTextController.java
+++ b/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.CustomUtil;
-import com.glxp.sale.admin.util.FileUtils;
-import com.glxp.sale.admin.util.JasperUtils;
+import com.glxp.sale.admin.util.*;
 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++;