Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java =================================================================== diff -u -r41562 -r41565 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java (.../DiposableGoodsManagerImpl.java) (revision 41562) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java (.../DiposableGoodsManagerImpl.java) (revision 41565) @@ -4100,11 +4100,13 @@ } StringBuffer updateSuccessLogBuffer = new StringBuffer(); - //同步成功的物质编码 - List successInventorySerialNumberList = new ArrayList(); + //受影响的一次性物品定义数量 int updateAmount = 0; for (DisposableGoods disposableGoods : disposableGoodsList) { String inventorySerialNumber = disposableGoods.getInventorySerialNumber(); + if(StringUtils.isBlank(inventorySerialNumber)){ + continue; + } DisposableGoodsChasMarkerVo disposableGoodsChasMarkerVo = inventorySerialNumberDisposableGoodsChasMarkerVoMap.get(inventorySerialNumber); if(disposableGoodsChasMarkerVo == null){ if(StringUtils.equals(Constants.STR_YES, disposableGoods.getControlTagCHAS())){ @@ -4134,30 +4136,14 @@ updateSuccessLogBuffer.append(logMsg); updateAmount++; } - successInventorySerialNumberList.add(inventorySerialNumber); } } - //记录同步失败的日志 - /*StringBuffer failLogBuffer = new StringBuffer(); - for (DisposableGoodsChasMarkerVo disposableGoodsChasMarkerVo : disposableGoodsChasMarkerVoList) { - if(!successInventorySerialNumberList.contains(disposableGoodsChasMarkerVo.getInventorySerialNumber())){ - String controlTagCHAS = disposableGoodsChasMarkerVo.getIsChasMarker() ? Constants.STR_YES : Constants.STR_NO; - String logMsg = String.format("不存在物资编码为“%s”的一次性物品,CHAS管控标识为“%s”,费用项目编码为“%s”;", - disposableGoodsChasMarkerVo.getInventorySerialNumber(), controlTagCHAS, disposableGoodsChasMarkerVo.getChargeItemSerialNumber()); - failLogBuffer.append(logMsg); - } - }*/ - StringBuffer logBuffer = new StringBuffer(String.format("一次性物品CHAS标识同步完成,一次性物品定义修改数量%s。", updateAmount)); if(updateSuccessLogBuffer.length() > 0){ logBuffer.append("一次性物品修改明细:"); logBuffer.append(updateSuccessLogBuffer); } - /*if(failLogBuffer.length() > 0){ - logBuffer.append("同步失败的一次性物品:"); - logBuffer.append(failLogBuffer); - }*/ appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_DISPOSABLEGOODS, Log.LOGGER_TYPE_UPDATE, logBuffer.toString());