Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/action/DepartmentAppTemplateAction.java =================================================================== diff -u -r28966 -r28967 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/action/DepartmentAppTemplateAction.java (.../DepartmentAppTemplateAction.java) (revision 28966) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/action/DepartmentAppTemplateAction.java (.../DepartmentAppTemplateAction.java) (revision 28967) @@ -553,11 +553,13 @@ } Integer minApplyAmount = dg.getApplicationDiposableGoods().getMinApplyAmount(); Integer maxApplyAmount = dg.getApplicationDiposableGoods().getMaxApplyAmount(); + String packageSpec = dg.getApplicationDiposableGoods().getPackageSpec(); + String unitForDisplay = dg.getApplicationDiposableGoods().getUnitForDisplay(); //id,名称,包装规格,单位,数量,序号,最小申请数量(页面不显示用于判断数量是否正确),最大申请数量(页面不显示用于判断数量是否正确) sb.append("['").append(dg.getApplicationDiposableGoods().getId()).append("','") .append(dgName) - .append("','"+dg.getApplicationDiposableGoods().getPackageSpec()+"'") - .append(",'"+dg.getApplicationDiposableGoods().getUnitForDisplay()+"'") + .append("','"+ packageSpec == null ? "" : packageSpec + "'") + .append(",'"+ unitForDisplay == null ? "" : unitForDisplay + "'") .append(",'"+ (dg.getAmount() == null ? "" : dg.getAmount()) +"'") .append(",'"+dg.getSortNumber()+"'") .append(",'"+ (minApplyAmount == null ? "" : minApplyAmount) +"'")