From 5a007cdafb14fb4608e5498620ab3b246bb94e87 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Mon, 10 Mar 2025 20:54:57 +0800 Subject: [PATCH] =?UTF-8?q?3/7=20=20=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E4=BC=98=E5=8C=961.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/basic/BasicOrderPrintController.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) 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 804ad41fd..b233a95c0 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java @@ -140,7 +140,11 @@ public class BasicOrderPrintController { bizData.put("productName", udiProductEntity.getCpms() == null ? ' ' : udiProductEntity.getCpms()); bizData.put("ybbm", udiProductEntity.getYbbm() == null ? ' ' : udiProductEntity.getYbbm()); bizData.put("spmc", obj.getCoName() == null ? ' ' : obj.getCoName()); - bizData.put("spec", obj.getSpec() == null ? ' ' : obj.getSpec()); + if (udiProductEntity.getProductsType() == 2){ + bizData.put("spec", udiProductEntity.getBzgg() == null ? ' ' : udiProductEntity.getBzgg()); + }else { + bizData.put("spec", udiProductEntity.getGgxh() == null ? ' ' : udiProductEntity.getGgxh()); + } bizData.put("count", obj.getCount()); bizData.put("measname", obj.getMeasname() == null ? ' ' : obj.getMeasname()); bizData.put("price", obj.getPrice() == null ? '0' : obj.getPrice()); @@ -214,7 +218,11 @@ public class BasicOrderPrintController { bizData.put("ylqxzcrbarmc", udiProductEntity.getYlqxzcrbarmc() == null ? ' ' : udiProductEntity.getYlqxzcrbarmc()); } bizData.put("spmc", ioOrderDetailBizEntity.getCoName() == null ? ' ' : ioOrderDetailBizEntity.getCoName()); - bizData.put("spec", ioOrderDetailBizEntity.getSpec() == null ? ' ' : ioOrderDetailBizEntity.getSpec()); + if (udiProductEntity.getProductsType() == 2){ + bizData.put("spec", udiProductEntity.getBzgg() == null ? ' ' : udiProductEntity.getBzgg()); + }else { + bizData.put("spec", udiProductEntity.getGgxh() == null ? ' ' : udiProductEntity.getGgxh()); + } bizData.put("count", ioOrderDetailBizEntity.getCount()); bizData.put("measname", ioOrderDetailBizEntity.getMeasname() == null ? ' ' : ioOrderDetailBizEntity.getMeasname()); bizData.put("price", ioOrderDetailBizEntity.getPrice() == null ? '0' : ioOrderDetailBizEntity.getPrice());