Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java
===================================================================
diff -u -r18524 -r19098
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java	(.../PackingTask.java)	(revision 18524)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java	(.../PackingTask.java)	(revision 19098)
@@ -52,45 +52,77 @@
 	public final static String  DELETE_CAUSE_TEST  = "测试用例删除";
 	
 	private Long id;
+	/**
+	 * 回收时间
+	 */
+	private Date startTime;
+	/**
+	 * 清洗时间
+	 */
+	private String washTime;
+	/**
+	 * 清洗篮筐id
+	 */
+	private Long classifyBasket_id;
+	/**
+	 * 清洗记录id
+	 */
+	private Long washRecord_id;
 
-	private Date startTime; // 回收时间
-
-	private String washTime; // 清洗时间
-	
-	private Long classifyBasket_id;//清洗篮筐id
-	
-	private Long washRecord_id;//清洗记录id
-
 	private String status;
 
 	private TousseDefinition tousseDefinition;
 
 	private Integer amount;
+	/**
+	 * 没有确认的器械包的数量
+	 */
+	private Integer uncofirmedAmount = 0;
+	/**
+	 * 待补充器械包数量(不持久化到数据库)
+	 */
+	private Integer waitSupplementTousseAmount;
+	/**
+	 * 加急数量
+	 */
+	private Integer urgentAmount;// 
 
-	private Integer uncofirmedAmount = 0; // 没有确认的器械包的数量
-	
-	private Integer waitSupplementTousseAmount;//待补充器械包数量(不持久化到数据库)
-	
-	private Integer urgentAmount;// 加急数量
-
 	private String orgUnitCoding;
+	/**
+	 * 未装配数量
+	 */
+	private Integer unPackAmount;
 
-	private Integer unPackAmount;//未装配数量
-
 	private Date supplementTime;
-	
-	private String recyclingBasketName;// 回收篮筐名称
-	private String basketBarcode;// 篮筐条码
 	/**
+	 * 回收篮筐名称
+	 */
+	private String recyclingBasketName;
+	/**
+	 * 篮筐条码
+	 */
+	private String basketBarcode;
+	/**
 	 * 装配任务类型
 	 */
 	private Integer taskType;
+	/**
+	 * 申请单
+	 */
+	public static final Integer TASK_APPLICATION = 0;
+	/**
+	 * 回收记录
+	 */
+	public static final Integer TASK_RECYCLINGRECORD = 1;
+	/**
+	 * 退货重装
+	 */
+	public static final Integer TASK_RETURNGOODS = 2;
+	/**
+	 * 质量监测重新装配
+	 */
+	public static final Integer TASK_QUALITY_MONITOR = 3;
 	
-	public static final Integer TASK_APPLICATION = 0;// 申请单
-	public static final Integer TASK_RECYCLINGRECORD = 1;// 回收记录
-	public static final Integer TASK_RETURNGOODS = 2;// 退货重装
-	public static final Integer TASK_QUALITY_MONITOR = 3;  //质量监测重新装配
-	
 	/**
 	 * 生成装配任务的单据id,此字段与taskType字段对应关系如下:
 	 * 1.如果taskType为申请单时,则sourceId为申请单的id