Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingBasketSequence.java =================================================================== diff -u -r39169 -r39214 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingBasketSequence.java (.../RecyclingBasketSequence.java) (revision 39169) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingBasketSequence.java (.../RecyclingBasketSequence.java) (revision 39214) @@ -13,7 +13,8 @@ import org.hibernate.annotations.CacheConcurrencyStrategy; /** - * 回收时自定义入筐的篮筐序号。外来器械自定义入筐时,根据入筐的篮筐进行拆包,这个序号就是拆包的序号(1/3,2/3,3/3这种)。 + * 回收时自定义入筐的篮筐序号表 + * 外来器械自定义入筐时,根据入筐的篮筐进行拆包,这个序号就是拆包的序号(1/3,2/3,3/3这种)。 * 因为一次回收可能有多个外来器械包,所以此排序需要针对包进行排序。目前,外来器械一个包,只能入一个篮筐,不能与其他外来器械包在同一个篮筐。 * 但是跟普通器械包,是可以在一个篮筐的。 * @author kzh Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingRecord.java =================================================================== diff -u -r39169 -r39214 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingRecord.java (.../RecyclingRecord.java) (revision 39169) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingRecord.java (.../RecyclingRecord.java) (revision 39214) @@ -31,10 +31,9 @@ import com.forgon.tools.string.StringTools; /** - * @author songwei * 回收记录 * 一条回收记录包含多个回收项(RecyclingItem) - * + * @author songwei * 2012-3-23 下午15:12:34 */ @Entity @@ -49,7 +48,9 @@ ,@Index(columnList = "recyclingTime,id,orgUnitCoding,operator", name = "rr_rt_id_ouc_operator")}) @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) public class RecyclingRecord { - /**回收记录id*/ + /** + * 回收记录id + */ private Long id; /**装配任务的编号*/ private String packingTaskSerialNumber; @@ -94,15 +95,24 @@ /**备注*/ private String remark; - /**回收数量是否需要确认*/ - private String recycleAmountNeedConfirm = Constants.STR_NO;//DGSFYBJY-12 申请数量跟回收数量不一致,需要确认。此值为是表示需要确认,其他都不需要确认。默认为否 + /** + * 回收数量是否需要确认 + * DGSFYBJY-12 申请数量跟回收数量不一致,需要确认。此值为是表示需要确认,其他都不需要确认。默认为否 + */ + private String recycleAmountNeedConfirm = Constants.STR_NO; /**回收数量沟通确认人名称*/ private String communicationUserName; /**回收数量沟通确认人编码*/ private String communicationUserCode; - public static final Integer RECYCLINGTIMES_TWO = 2;//外来器械二次回收记录 - /**回收次数*/ - private Integer recyclingTimes;//目前只是用来区分外来器械包二次回收记录 + /** + * 外来器械二次回收记录 + */ + public static final Integer RECYCLINGTIMES_TWO = 2; + /** + * 回收次数 + * 目前只是用来区分外来器械包二次回收记录 + */ + private Integer recyclingTimes; @Id @GeneratedValue(strategy = GenerationType.AUTO) public Long getId() { Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingItem.java =================================================================== diff -u -r39169 -r39214 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingItem.java (.../RecyclingItem.java) (revision 39169) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingItem.java (.../RecyclingItem.java) (revision 39214) @@ -32,9 +32,9 @@ import com.forgon.disinfectsystem.entity.materialerrordamage.MaterialErrorDamageDetail; /** + * 回收项 * @author WangYi * 2017年3月23日 上午11:36:51 - * 回收项 */ @Entity @DynamicInsert(false) @@ -45,7 +45,7 @@ }) @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) public class RecyclingItem { - /**回收项 回收物品id*/ + /**回收项id*/ private Long id; /**器械包名称*/ private String tousseName; @@ -79,21 +79,31 @@ private String spelling; /**备注*/ private String remark; - /**丢失原因说明*/ - private String errorRemark;//录使用记录时用 + /** + * 丢失原因说明 + * 录使用记录时用 + */ + private String errorRemark; - /**报损原因说明*/ - private String damageRemark;//录使用记录时用 + /** + * 报损原因说明 + * 录使用记录时用 + */ + private String damageRemark; /**加急等级*/ private String urgentLevel; /**丢失报损添加质量监测的key*/ private String errorDamageQmKey; /**丢失报损明细*/ private List errorDamageDetails = new ArrayList(); - /**包定义id赋值时,包定义的材料数量*/ + /** + * 包定义的材料数量 + */ private Integer materialAmount; - /**包定义id赋值时,包定义的材料数量(按材料拆分算)*/ + /** + * 包定义的材料数量(按材料拆分计算) + */ private Integer materialSplitAmount; @Id @GeneratedValue(strategy = GenerationType.AUTO) Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingTousseInstance.java =================================================================== diff -u -r39169 -r39214 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingTousseInstance.java (.../RecyclingTousseInstance.java) (revision 39169) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingTousseInstance.java (.../RecyclingTousseInstance.java) (revision 39214) @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; /** + * 回收于被回收的包实例中间表 * 已经被回收的包实例(目前只支持使用记录转换申请单的包实例) * 使用记录转换的申请单,在进行回收时,记录使用记录的包实例的回收记录及申请单 * 使用记录转换的申请单,部分拆分回收时,根据这个表判断申请单关联的包实例是否回收 Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingDateDetails.java =================================================================== diff -u -r39169 -r39214 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingDateDetails.java (.../RecyclingDateDetails.java) (revision 39169) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingDateDetails.java (.../RecyclingDateDetails.java) (revision 39214) @@ -14,17 +14,18 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; /** + * 回收物品的每次回收的信息 * @author zc.li * 2024年4月11日 - * 回收物品的每次回收的信息 SZSDSRMYY-128 + * SZSDSRMYY-128 */ @Entity @DynamicInsert(false) @DynamicUpdate(true) @Table(indexes = {@Index(columnList = "recyclingItemId", name = "rdd_recyclingItemId_index")}) @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) public class RecyclingDateDetails { - /**回收物品的每次回收的信息id */ + /**回收物品的每次回收的信息id*/ private Long id; /**所属回收项*/ private Long recyclingItemId;