Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManagerImpl.java =================================================================== diff -u -r17524 -r17542 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManagerImpl.java (.../MaterialErrorDamageDetailManagerImpl.java) (revision 17524) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManagerImpl.java (.../MaterialErrorDamageDetailManagerImpl.java) (revision 17542) @@ -189,6 +189,12 @@ if(dfValue == 0){ return; } + //不补充可以装配的时候,不能讲丢失、报损数量改大,因为在回收的时候已经按包定义材料数量拆分过了 + if(dfValue > 0){ + if(CssdUtils.getSystemSetConfigByNameBool("allowPackingWhenUnSupplementMaterial")){ + throw new RuntimeException(detail.getMaterialName() + "不能改大数量!"); + } + } String description = String.format("器械报损【%s,%s个】数量被修改为%s个!", detail.getMaterialName(), detail.getAmount(), amount); Index: ssts-web/src/main/webapp/disinfectsystem/recyclingError/recyclingErrorView.js =================================================================== diff -u -r17512 -r17542 --- ssts-web/src/main/webapp/disinfectsystem/recyclingError/recyclingErrorView.js (.../recyclingErrorView.js) (revision 17512) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingError/recyclingErrorView.js (.../recyclingErrorView.js) (revision 17542) @@ -12,7 +12,7 @@ var ids = ""; for ( var i = 0, len = records.length; i < len; i++) { if(ids != "") { - ids = ";"; + ids += ";"; } ids += records[i].data['id']; } Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r17524 -r17542 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 17524) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 17542) @@ -354,7 +354,6 @@ detail.setType(itemType); detail.setTousseName(recyclingItem.getTousseName()); detail.setOperator(record.getOperator()); - detail.setTousseBarcode(tousseBarcode); if(MaterialErrorDamageDetail.TYPE_DAMAGE.equals(itemType)){ detail.setLinkType(MaterialErrorDamageDetail.LINKTYPE_RECYCLINGRECORD); } @@ -363,6 +362,7 @@ detail.setAmount(amount); detail.setErrorType(errorType); detail.setIsUnionToussInstance(false); + detail.setTousseBarcode(""); detail.setTousseDefinitionId(tousseDefinitionID); Long currerntDetailId = detail.getId();