From 0f98f7ff7f127fb9cc7b76ee6c2dbcff5beb3fa8 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Mon, 21 Oct 2024 11:22:15 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=89=93=E5=8D=B0=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/controller/basic/BasicOrderPrintController.java | 2 ++ src/main/java/com/glxp/api/res/inout/IoOrderResponse.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java index a1b924e0..ac86df8b 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java @@ -159,6 +159,7 @@ public class BasicOrderPrintController { bizData.put("serialNo", udiProductEntity.getSerialNo() == null ? ' ' : udiProductEntity.getSerialNo()); bizData.put("productDate", obj.getProductDate()); bizData.put("expireDate", obj.getExpireDate()); + bizData.put("confirmTime", ioOrderResponse.getConfirmTime()); bizData.put("manufactor", obj.getManufacturer()); bizData.put("zczbhhzbapzbh", obj.getCertCode() == null ? ' ' : obj.getCertCode()); bizData.put("ylqxzcrbarmc", udiProductEntity.getYlqxzcrbarmc() == null ? ' ' : udiProductEntity.getYlqxzcrbarmc()); @@ -253,6 +254,7 @@ public class BasicOrderPrintController { bizData.put("manufactor", ioOrderDetailBizEntity.getManufacturer()); bizData.put("zczbhhzbapzbh", ioOrderDetailBizEntity.getCertCode() == null ? ' ' : ioOrderDetailBizEntity.getCertCode()); bizData.put("orderRemark", ioOrderResponse.getRemark() == null ? ' ' : ioOrderResponse.getRemark()); + bizData.put("confirmTime", ioOrderResponse.getConfirmTime()); if (IntUtil.value(printThird) == 1) { UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(obj.getRelId()); diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java index 096ebe09..be51b275 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java @@ -267,4 +267,6 @@ public class IoOrderResponse { return fromName; } + + private Date confirmTime; }