Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingerror/SupplementMaterialDetail.java
===================================================================
diff -u -r25246 -r39144
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingerror/SupplementMaterialDetail.java	(.../SupplementMaterialDetail.java)	(revision 25246)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingerror/SupplementMaterialDetail.java	(.../SupplementMaterialDetail.java)	(revision 39144)
@@ -29,43 +29,28 @@
 
 	public static final String TYPE_ERROR = "丢失明细";
 	public static final String TYPE_DAMAGE = "报损明细";
-	
+	/**主键*/
 	private Long id;
 	
-	/**
-	 * 补充数量
-	 */
+	/**补充数量*/
 	private Integer amount = 0;
 	
-	/**
-	 * 已回写数量
-	 */
+	/**已回写数量*/
 	private Integer alreadyWriteBackAmount = 0;
 
-	/**
-	 * 回写时间
-	 */
+	/**回写时间*/
 	private Date writeBackTime;
 	
-	/**
-	 * 单价
-	 */
+	/**单价*/
 	private Double price = 0d;
 	
-	/**
-	 * 关联的丢失或报损项id(即MaterialErrorDamageDetail表的id)
-	 */
+	/**关联的丢失或报损项id(即MaterialErrorDamageDetail表的id)*/
 	private Long sourceId;
 	
-	/**
-	 * 项类型即丢失或报损
-	 * SupplementMaterialDetail.TYPE_ERROR或SupplementMaterialDetail.TYPE_DAMAGE
-	 */
-	private String type;
+	/**项类型即丢失或报损*/
+	private String type;//SupplementMaterialDetail.TYPE_ERROR或SupplementMaterialDetail.TYPE_DAMAGE
 
-	/**
-	 * 回写记录id
-	 */
+	/**回写记录id*/
 	private Long inventoryWriteBackEntryId;
 	
 	@Id
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingerror/RecyclingError.java
===================================================================
diff -u -r26520 -r39144
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingerror/RecyclingError.java	(.../RecyclingError.java)	(revision 26520)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingerror/RecyclingError.java	(.../RecyclingError.java)	(revision 39144)
@@ -43,88 +43,74 @@
 	public static String LINKTYPE_RECYCLINGRECORD= "回收丢失";
 	public static String LINKTYPE_WASHANDDISINFECTRECORD= "清洗丢失";
 	public static String LINKTYPE_PACKINGRECORD= "装配丢失";
-
+	/**主键*/
 	private Long id;
-
-	private String errorType;// 误差类型，增加或减少
-
-	private String materialName;// 误差的器材
-
+	/**误差类型，增加或减少*/
+	private String errorType;
+	/**材料名称*/
+	private String materialName;
+	/**类型*/
 	private String type;
 
 	public static String TYPE_RECYCLINGRECORD = "回收记录";
 	public static String TYPE_PACKINGTASK = "装配任务";
-
-	private Integer amount;// 误差数量
-
-	private Integer additionalAmount = 0; // 补充数量（做了限制、只能补充一次）
-
-	private String departCodeForId; // 科室编码，仅用于器械包标识牌的丢失
-
-	private String lostIDCardInstanceBarcode; // 所丢失洗水布条码，如果有使用记录就可以找到条码
-
+	/**误差数量*/
+	private Integer amount;
+	/**补充数量*/
+	private Integer additionalAmount = 0; //做了限制、只能补充一次
+	/**科室编码*/
+	private String departCodeForId; //仅用于器械包标识牌的丢失
+	/**所丢失洗水布条码*/
+	private String lostIDCardInstanceBarcode; //如果有使用记录就可以找到条码
+	/**材料在包中的数量*/
 	private Integer amountPerTousse = 0; // 在一个器械包中它的数量是多少，临时变量
 
-	/**
-	 * 如果材料有多个价格，这里求的是平均值
-	 */
-	private Double materialCost;// 单价
+	/**单价 */
+	private Double materialCost;//如果材料有多个价格，这里求的是平均值
 	
-	/**
-	 * 补充数量价格合计
-	 */
+	/**补充数量价格合计*/
 	private Double settlementPrice = 0d;
-
-	private String depart; // 丢失材料的科室
-
+	/**丢失材料的科室名称*/
+	private String depart;
+	/**丢失材料的科室编码*/
 	private String departCode;
-	
-	private String handleDepartCode;//处理科室（一级供应室或二级供应室）
-	
-	private String handleDepartName;//处理科室名称
-
-	private Date missTime;//丢失时间
-	
-	private Date additionalTime;//补充时间
-	
-	private Long idCardInstanceID;// 标识牌ID
-	
-	private Long tousseDefinitionId;//器械包定义ID
-	
-	private Long materialDefinitionId;//材料定义ID
-	
-	private Long tousseItemId;//回收物品项ID
-
-	private Long packingTask_ID;//装配任务ID
-	
-	private Long warehouseId;//仓库ID
-	
-	private String warehouseName;//仓库名称
-	
-	private String tousseName;//材料所属器械包名称
-	/**
-	 * 丢失报损材料类型
-	 */
+	/**处理科室编码*/
+	private String handleDepartCode;
+	/**处理科室名称*/
+	private String handleDepartName;
+	/**丢失时间*/
+	private Date missTime;
+	/**补充时间*/
+	private Date additionalTime;
+	/**标识牌ID*/
+	private Long idCardInstanceID;
+	/**器械包定义ID*/
+	private Long tousseDefinitionId;
+	/**材料定义ID*/
+	private Long materialDefinitionId;
+	/**回收物品项ID*/
+	private Long tousseItemId;
+	/**装配任务ID*/
+	private Long packingTask_ID;
+	/**仓库ID*/
+	private Long warehouseId;
+	/**仓库名称*/
+	private String warehouseName;
+	/**材料所属器械包名称*/
+	private String tousseName;
+	/**丢失报损材料类型*/
 	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)