Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/action/ConsumptiveMaterialContainerAction.java =================================================================== diff -u -r34065 -r34068 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/action/ConsumptiveMaterialContainerAction.java (.../ConsumptiveMaterialContainerAction.java) (revision 34065) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/action/ConsumptiveMaterialContainerAction.java (.../ConsumptiveMaterialContainerAction.java) (revision 34068) @@ -524,6 +524,7 @@ consumptiveMaterialVolumeStr = StringTools.join(volumeStrList, "|"); } result.put("consumptiveMaterialVolumes", consumptiveMaterialVolumeStr); + result.put("consumptiveMaterialContainerId", consumptiveMaterialContainer.getId()); } } catch (Exception e) { result = JSONUtil.buildJsonObject(false, "加载失败:" + e.getMessage()); Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java =================================================================== diff -u -r34067 -r34068 --- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java (.../WashAndDisinfectRecordManagerImpl.java) (revision 34067) +++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java (.../WashAndDisinfectRecordManagerImpl.java) (revision 34068) @@ -496,7 +496,20 @@ useRecord.setCleanMethodId(cleanMethod.getId()); useRecord.setRinserId(rinser.getId()); useRecord.setRinserName(rinser.getName()); - useRecord.setRemark("清洗机绑定的清洗耗材容器,没有配置耗材种类,本次消耗没有扣除"); + useRecord.setRemark("清洗机绑定的清洗耗材容器,没有配置耗材种类,本次消耗扣除失败"); + List details = new ArrayList(); + for (CleanMethodConsumptionVolume cVolume : cleanMethod.getCleanMethodConsumptionVolumes()) { + //生成清洗耗材使用记录 + ConsumptiveMaterialType type = cVolume.getConsumptiveMaterialType(); + if(type == null){ + Long useAmount = cVolume.getVolume(); + ConsumptiveMaterialUseDetail detail = new ConsumptiveMaterialUseDetail(); + detail.setConsumptiveMaterialType(type); + detail.setUseAmount(useAmount); + objectDao.save(detail); + details.add(detail); + } + } objectDao.saveOrUpdate(useRecord); return; }