Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r14106 -r14266 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 14106) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 14266) @@ -22,6 +22,7 @@ import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import net.sf.json.JsonConfig; import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.collections4.Closure; @@ -1194,7 +1195,10 @@ // 一次查询出所有需要打印的TousseItem List allTousseItems = getTousseItems(tousseTypes, departCode); - + //批量打印日志输出 + JsonConfig config = new JsonConfig(); + config.setExcludes(new String[]{"recyclingRecord","invoicePlan","recyclingErrors","recyclingDamages"}); + logger.debug("批量打印日志输出:departCode=" + departCode + ",allTousseItems=" + JSONArray.fromObject(allTousseItems,config)); // 分组过滤TousseItem populatePrintSummaryVoList(printScope, printUser,allTousseItems, @@ -1819,22 +1823,25 @@ // 升序排列，按申请的时间顺序 Collections.sort(applicationIdsArray); + //批量打印日志输出 + JsonConfig config = new JsonConfig(); + config.setExcludes(new String[]{"recyclingRecord","invoicePlan","recyclingErrors","recyclingDamages"}); for (Long id : applicationIdsArray){ - + logger.debug("批量打印发货计划日志,待打印申请单id=" + id); // 待打印的器械包集合 List toPrintItemsOfTousses = new ArrayList(); Collection tousseCollection = toussesMap.getCollection(id); if (tousseCollection != null){ toPrintItemsOfTousses.addAll(tousseCollection); } - + logger.debug("批量打印发货计划日志,待打印申请的器械包=" + JSONArray.fromObject(toPrintItemsOfTousses,config)); // 待打印的一次性物品集合 List toPrintItemsOfDiposableGoods = new ArrayList(); Collection disposablesCollection = disposablesMap.getCollection(id); if (disposablesCollection != null){ toPrintItemsOfDiposableGoods.addAll(disposablesCollection); } - + logger.debug("批量打印发货计划日志,待打印申请的一次性物品=" + JSONArray.fromObject(toPrintItemsOfDiposableGoods,config)); List toPrintItemsOfDisinfectGoods = new ArrayList(); // 待打印的消毒物品集合 @@ -1864,6 +1871,7 @@ toPrintItemsOfDisinfectGoods.addAll(disinfectGoodsCollection); } } + logger.debug("批量打印发货计划日志,待打印申请的消毒物品=" + JSONArray.fromObject(toPrintItemsOfDisinfectGoods,config)); // 器械包和一次性物品合并打印 if (isMergePrintTousseAndDisposable){ @@ -2466,6 +2474,8 @@ InvoicePlan.TYPE_RECYCLINGCREATE_APPLICATION, InvoicePlan.TYPE_CUSTOM_TOUSSE_APPLIACTION_FORM, InvoicePlan.TYPE_DISINFECT_GOODS_APPLICATION_FORM)); + + logger.debug("批量打印日志输出:query hql=" + query.getQueryString()); @SuppressWarnings("unchecked") List items = query.list(); @@ -3738,6 +3748,7 @@ for(TousseItem tousseItem: tousseItems){ tousseItem.setIsPrinted(true); + logger.debug("申请物品tousseItem表:id="+tousseItem.getId()+",tousseDefinitionId="+tousseItem.getTousseDefinitionId()+",tousseName=" + tousseItem.getTousseName() + "是否已打印isPrinted设置为1."); objectDao.saveOrUpdate(tousseItem); } Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r14169 -r14266 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 14169) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 14266) @@ -20,6 +20,7 @@ import org.apache.commons.collections4.Predicate; import org.apache.commons.collections4.map.MultiValueMap; import org.apache.commons.lang.StringUtils; +import org.apache.log4j.Logger; import com.forgon.directory.acegi.tools.AcegiHelper; import com.forgon.disinfectsystem.basedata.becleanitem.service.BeCleanItemManager; @@ -76,6 +77,8 @@ * 2012-3-25 下午12:11:34 */ public class RecyclingRecordManagerImpl implements RecyclingRecordManager { + + private Logger logger = Logger.getLogger(RecyclingRecordManagerImpl.class); private ObjectDao objectDao; @@ -851,7 +854,7 @@ String basketBarcode = json.optString("basketBarcode"); String idCardBarcode = json.optString("idCardBarcode"); if(StringUtils.isBlank(basketBarcode)){ - throw new RuntimeException("参数错误，保存失败！"); + throw new RecyclingRecordException("参数错误，保存失败！"); } String [] barcodeArray = basketBarcode.split(";"); String basketName = ""; @@ -892,11 +895,11 @@ //已装配 if (task == null && amount < 0) { - throw new RuntimeException(tousseName + "已装配，不能修改！"); + throw new RecyclingRecordException(tousseName + "已装配，不能修改！"); } //部分装配 后修改回收数量 if(task != null && task.getUnPackAmount() != null && task.getUnPackAmount() + amount < 0){ - throw new RuntimeException(tousseName + "已装配，不能修改！"); + throw new RecyclingRecordException(tousseName + "已装配，不能修改！"); } if(task == null){ task = new PackingTask(); @@ -951,11 +954,11 @@ setIDCardTousseInstanceBeforeRecycleStatus(idCardTousseInstance); packingManager.delete(idCardPackingTask); }else{ - throw new RuntimeException("标识牌条码为"+idCardBarcode+"的器械包已装配，不能删除！"); + throw new RecyclingRecordException("标识牌条码为"+idCardBarcode+"的器械包已装配，不能删除！"); } } }else{ - throw new RuntimeException(idCardBarcode+",条码不存在！"); + throw new RecyclingRecordException(idCardBarcode+",条码不存在！"); } } } @@ -1161,6 +1164,7 @@ //删除的物品 if(currentAmount <= 0){ currentAmount = 0; + logger.debug("申请物品tousseItem表:id="+appItem.getId()+",tousseDefinitionId="+appItem.getTousseDefinitionId()+",tousseName=" + appItem.getTousseName() + "是否已打印isPrinted设置为1."); appItem.setIsPrinted(true); } appItem.setRecyclingAmount(currentAmount); Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java =================================================================== diff -u -r14237 -r14266 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 14237) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 14266) @@ -927,7 +927,7 @@ PrintConfig config = printConfigManager.getPrintConfigById(batchId); if(config != null){ - shiftName = config.getShift(); + shiftName = config.getShift();//批量打印发货计划的班次名称 String departCodes = config.getDepartCodes(); if (departCodes.length() > 0){ String[] depts = departCodes.split(";"); @@ -1079,7 +1079,7 @@ json.addProperty("error", "该申请单没有符合条件的打印内容，请检查申请单状态和物品内容是否满足打印条件！"); } } - + logger.debug("批量打印发货计划的日志:返回结果的json=" + json); return json.toString(); }