Index: ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java =================================================================== diff -u -r17512 -r17648 --- ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java (.../IDCardDefinitionManagerImpl.java) (revision 17512) +++ ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java (.../IDCardDefinitionManagerImpl.java) (revision 17648) @@ -604,6 +604,10 @@ private String getJsonStringForPrint(IDCardInstance idCardInstance, TousseDefinition tousseDefinition, MaterialErrorDamageDetail error) { + IDCardDefinition idCardDefinition = idCardInstance.getIDCardDefinition(objectDao); + if (idCardDefinition == null) { + throw new RuntimeException("标识牌定义已被删除!"); + } Gson gson = new Gson(); JsonObject obj = new JsonObject(); @@ -633,6 +637,7 @@ idCardInstanceObj.addProperty("tousseID", tousseDefinition.getId()); idCardInstanceObj.addProperty("tousseName", tousseDefinition.getName()); idCardInstanceObj.addProperty("idCardPaperType", tousseDefinition.getIdCardPaperType()); + idCardInstanceObj.addProperty("description", idCardDefinition.getDescription()); obj.add("idCardInstance", idCardInstanceObj); obj.add("recyclingError", gson.toJsonTree(error)); return obj.toString(); Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js =================================================================== diff -u -r15812 -r17648 --- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js (.../printConfig.js) (revision 15812) +++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js (.../printConfig.js) (revision 17648) @@ -1408,7 +1408,7 @@ var idCardLargeLabelConfig = { customPrint:printIDCardLargeLabel_zsyy } -function buildTousseDefinitionMeterialTable_zsyy(tousseDefinition,unit){ +function buildTousseDefinitionMeterialTable_zsyy(idCardInstance,tousseDefinition,unit){ if(isUndefinedOrNullOrEmpty(tousseDefinition)){ alert('包定义不能为空!'); return null; @@ -1484,6 +1484,13 @@ tableHtml += ""; } + // 描述 + var description = idCardInstance.description; + if(!isUndefinedOrNullOrEmpty(description)){ + tableHtml += "