模板优化

src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java

@@ -153,7 +153,9 @@ public class BasicOrderPrintController {
                     bizData.put("productName", udiProductEntity.getCpms() == null ? ' ' : udiProductEntity.getCpms());
                     bizData.put("spmc", obj.getCoName() == null ? ' ' : obj.getCoName());
                     if (udiProductEntity.getProductsType() == 2){
-                        bizData.put("spec", udiProductEntity.getPrepnSpec() == null ? ' ' : udiProductEntity.getPrepnSpec());
+                        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());
@@ -171,8 +173,11 @@ public class BasicOrderPrintController {
                         ThrProductsEntity thrProductsEntity = thrProductsService.selectByCode(udiRelevanceEntity.getThirdId());
                         bizData.put("productName", thrProductsEntity.getName() == null ? ' ' : thrProductsEntity.getName());
                         bizData.put("spmc", thrProductsEntity.getName() == null ? ' ' : thrProductsEntity.getName());
-                        bizData.put("spec", thrProductsEntity.getSpec() == null ? ' ' : thrProductsEntity.getSpec());
-                        bizData.put("measname", thrProductsEntity.getMeasname() == null ? ' ' : thrProductsEntity.getMeasname());
+                        if (udiProductEntity.getProductsType() == 2){
+                            bizData.put("spec", udiProductEntity.getBzgg() == null ? ' ' : udiProductEntity.getBzgg());
+                        }else {
+                            bizData.put("spec", udiProductEntity.getGgxh() == null ? ' ' : udiProductEntity.getGgxh());
+                        }                        bizData.put("measname", thrProductsEntity.getMeasname() == null ? ' ' : thrProductsEntity.getMeasname());
                         bizData.put("manufactor", thrProductsEntity.getManufactory());
                         bizData.put("ylqxzcrbarmc", thrProductsEntity.getYlqxzcrbarmc() == null ? ' ' : thrProductsEntity.getYlqxzcrbarmc());
                     }
@@ -236,7 +241,11 @@ public class BasicOrderPrintController {
                     }
 
                     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", IntUtil.value(obj.getReCount()));
                     bizData.put("measname", ioOrderDetailBizEntity.getMeasname() == null ? ' ' : ioOrderDetailBizEntity.getMeasname());
                     bizData.put("price", ioOrderDetailBizEntity.getPrice() == null ? '0' : ioOrderDetailBizEntity.getPrice());