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());