Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingdamagerecord/RecyclingDamageItem.java =================================================================== diff -u -r23492 -r39145 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingdamagerecord/RecyclingDamageItem.java (.../RecyclingDamageItem.java) (revision 23492) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingdamagerecord/RecyclingDamageItem.java (.../RecyclingDamageItem.java) (revision 39145) @@ -44,87 +44,73 @@ public static String STATUS_ALL_ADDITIONAL= "已补充"; public static String STATUS_SOME_ADDITIONAL= "部分补充"; public static String STATUS_NO_ADDITIONAL= "未补充"; - + /**主键*/ private Long id; + /**补充人*/ + private String additionalPerson; + /**报损环节 */ + private String linkType; + /**报损人*/ + private String damageOfPeople; + /**报损科室*/ + private String depart; + /**报损科室编码*/ + private String departCoding; + /**报损时间*/ + private Date time; + /**状态*/ + private String status; + /**报损的器材*/ + private String materialName; + /**包类型*/ + private String tousseName; + /**报损数量*/ + private Integer amount; + /**补充数量*/ + private Integer additionalAmount = 0;// 做了限制、只能补充一次 + /**质量监测id*/ + private Long qualityMonitoringId; + /**补充时间*/ + private Date additionalTime; - private String additionalPerson;// 补充人 - - private String linkType;//报损环节 + /**材料的成本价格 */ + private Double materialCost;// 如果材料有多个价格,这里求的是平均值 - private String damageOfPeople;//报损人 - - private String depart;// 报损科室 - - private String departCoding;// 报损科室编码 - - private Date time;//报损时间 - - private String status; // 状态 - - private String materialName;// 报损的器材 - - private String tousseName;// 包类型 - - private Integer amount;// 报损数量 - - private Integer additionalAmount = 0;// 补充数量(做了限制、只能补充一次) - - private Long qualityMonitoringId;// 质量监测 - - private Date additionalTime;// 补充时间 - - /** - * 如果材料有多个价格,这里求的是平均值 - */ - private Double materialCost;// 材料的成本价格 - - /** - * 补充数量价格合计 - */ + /**补充数量价格合计*/ private Double settlementPrice = 0d; + /**处理科室编码*/ + private String handleDepartCode; + /**处理科室名称*/ + private String handleDepartName; + /**回收报损记录ID*/ + private Long damageRecordId; + /**器械包定义ID*/ + private Long tousseDefinitionId; + /**材料定义ID*/ + private Long materialDefinitionId; + /**回收物品项ID*/ + private Long tousseItem_ID; + /**装配任务ID*/ + private Long packingTask_ID; + /**仓库ID*/ + private Long warehouseId; + /**仓库名称*/ + private String warehouseName; - private String handleDepartCode;//处理科室编码 - - private String handleDepartName;//处理科室名称 - - private Long damageRecordId;//回收报损记录ID - - private Long tousseDefinitionId;//器械包定义ID - - private Long materialDefinitionId;//材料定义ID - - private Long tousseItem_ID;//回收物品项ID - - private Long packingTask_ID;//装配任务ID - - private Long warehouseId;//仓库ID - - private String warehouseName;//仓库名称 - - /** - * 丢失报损材料类型 - */ + /**丢失报损材料类型*/ private String damageErrorMaterialType; - /** - * 丢失报损科室类型 - */ + /**丢失报损科室类型*/ private String damageErrorDepartType; - /** - * 报损补充器械关联的清洗篮筐实例 - */ + /**报损补充器械关联的清洗篮筐实例*/ private ClassifyBasket classifyBasket; - /** - * 清洗时间 不持久化 - */ - private String washTime; + /**清洗时间*/ + private String washTime;// 不持久化 - /** - * 清洗人 不持久化 - */ - private String washOperator; + /**清洗人*/ + private String washOperator;// 不持久化 @Id @GeneratedValue(strategy = GenerationType.AUTO)