Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManagerImpl.java =================================================================== diff -u -r26453 -r26520 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManagerImpl.java (.../MaterialErrorDamageDetailManagerImpl.java) (revision 26453) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManagerImpl.java (.../MaterialErrorDamageDetailManagerImpl.java) (revision 26520) @@ -145,6 +145,8 @@ String linkType = json.optString("linkType"); String damageOfPeople = json.optString("damageOfPeople"); String remark = json.optString("remark"); + //器械包报损或者器械包丢失类型 + String type = json.optString("type"); if(StringUtils.isBlank(linkType)){ throw new RuntimeException("参数错误!"); } @@ -193,8 +195,14 @@ item.setOperator(damageOfPeople); item.setWarehouseId(wareHouse.getId()); item.setWarehouseName(wareHouse.getName()); - item.setType(MaterialErrorDamageDetail.TYPE_DAMAGE); - item.setDamageRemark(remark); + item.setType(type); + if (MaterialErrorDamageDetail.TYPE_DAMAGE.equals(type)) { + //添加器械包报损备注 + item.setDamageRemark(remark); + } else if (MaterialErrorDamageDetail.TYPE_ERROR.equals(type)){ + //添加器械包丢失备注 + item.setErrorRemark(remark); + } objectDao.saveOrUpdate(item); } } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingerror/RecyclingError.java =================================================================== diff -u -r23492 -r26520 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingerror/RecyclingError.java (.../RecyclingError.java) (revision 23492) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingerror/RecyclingError.java (.../RecyclingError.java) (revision 26520) @@ -39,6 +39,10 @@ public static String ERRORTYPE_ADD = "增加"; public static String ERRORTYPE_REDUCE = "缺失"; + + public static String LINKTYPE_RECYCLINGRECORD= "回收丢失"; + public static String LINKTYPE_WASHANDDISINFECTRECORD= "清洗丢失"; + public static String LINKTYPE_PACKINGRECORD= "装配丢失"; private Long id;