Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskItemVo.java
===================================================================
diff -u -r32335 -r32420
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskItemVo.java	(.../WaitPackingTaskItemVo.java)	(revision 32335)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskItemVo.java	(.../WaitPackingTaskItemVo.java)	(revision 32420)
@@ -152,6 +152,10 @@
 	 * 回收人
 	 */
 	private String recyclingUser;
+	/**
+	 * 打印材料清单
+	 */
+	private String printBOMwhenPrintLabel;
 	public Long getTaskId() {
 		return taskId;
 	}
@@ -596,6 +600,14 @@
 	public void setRecyclingUser(String recyclingUser) {
 		this.recyclingUser = recyclingUser;
 	}
+
+	public String getPrintBOMwhenPrintLabel() {
+		return printBOMwhenPrintLabel;
+	}
+
+	public void setPrintBOMwhenPrintLabel(String printBOMwhenPrintLabel) {
+		this.printBOMwhenPrintLabel = printBOMwhenPrintLabel;
+	}
 	
 	
 }
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r32336 -r32420
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 32336)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 32420)
@@ -1657,6 +1657,7 @@
 				itemVo.setRecyclingUser(task.getRecyclingUser());
 				itemVo.setUrgentAmount(task.getUrgentAmount());
 				itemVo.setTousseType(td.getTousseType());
+				itemVo.setPrintBOMwhenPrintLabel(td.getPrintBOMwhenPrintLabel());
 				itemVo.setStatus(task.getStatus());
 				itemVo.setHaveIDCard(haveIDCard);
 				itemVo.setIsTimeout(isTimeout);
@@ -2059,7 +2060,7 @@
 		}
 		if(enableUrgentFunction){
 			extraOrder = " ul.grade desc,";
-			sql = "select distinct "+ selectRecyclingUserSql +"td.needInspectMaterials,po.washRecord_id,po.sourceId, po.recyclingItemRemark,po.serialNumber,po.urgentLevel,po.errorRemark,po.damageRemark, po.id as taskId,recyclingBasketName,basketBarcode,department,po.status,washTime,startTime,unPackAmount,taskType,idCardBarcode,"
+			sql = "select distinct "+ selectRecyclingUserSql +"td.needInspectMaterials,td.printBOMwhenPrintLabel,po.washRecord_id,po.sourceId, po.recyclingItemRemark,po.serialNumber,po.urgentLevel,po.errorRemark,po.damageRemark, po.id as taskId,recyclingBasketName,basketBarcode,department,po.status,washTime,startTime,unPackAmount,taskType,idCardBarcode,"
 					+ "td.id as tousseDefinitionId,td.invoicePlanID,td.name,td.allowModifyPackageType,td.isDisableIDCard,td.tousseType,td.packagetype,td.sterilingMethod,td.isTraceable,td.packageSize,"
 					+ "td.isPrint,td.isReview,td.note,td.uuid_vedioNames,td.isUploadVideo,td.supplierName,urgentAmount,hidePackingTask"
 					+ " ,ul.id urgentLevelId,ul.name urgentLevelName,ul.colorCode,ul.grade "
@@ -2078,7 +2079,7 @@
 			
 		}else{
 			extraOrder = " po.urgentAmount desc, ";
-			sql = "select distinct "+ selectRecyclingUserSql +"td.needInspectMaterials,po.washRecord_id,po.sourceId, po.recyclingItemRemark,po.serialNumber,po.urgentLevel,po.errorRemark,po.damageRemark, po.id as taskId,recyclingBasketName,basketBarcode,department,po.status,washTime,startTime,unPackAmount,taskType,idCardBarcode,"
+			sql = "select distinct "+ selectRecyclingUserSql +"td.needInspectMaterials,td.printBOMwhenPrintLabel,po.washRecord_id,po.sourceId, po.recyclingItemRemark,po.serialNumber,po.urgentLevel,po.errorRemark,po.damageRemark, po.id as taskId,recyclingBasketName,basketBarcode,department,po.status,washTime,startTime,unPackAmount,taskType,idCardBarcode,"
 					+ "td.id as tousseDefinitionId,td.invoicePlanID,td.name,td.allowModifyPackageType,td.isDisableIDCard,td.tousseType,td.packagetype,td.sterilingMethod,td.isTraceable,td.packageSize,"
 					+ "td.isPrint,td.isReview,td.note,td.uuid_vedioNames,td.isUploadVideo,td.supplierName,urgentAmount,hidePackingTask "
 					+ "from PackingTask po "
@@ -2151,7 +2152,7 @@
 			selectRecyclingUserSql = "";
 			leftJoinRecyclingRecordSql = "";
 		}
-		String sql = "select "+ selectRecyclingUserSql +"td.needInspectMaterials,po.classifyBasket_id,po.classifyBasketIds,po.washRecord_id,po.sourceId, po.recyclingItemRemark,po.serialNumber,po.errorRemark,po.damageRemark, po.id as taskId,recyclingBasketName,basketBarcode,department,po.status,washTime,startTime,unPackAmount,taskType,idCardBarcode,"
+		String sql = "select "+ selectRecyclingUserSql +"td.needInspectMaterials,td.printBOMwhenPrintLabel,po.classifyBasket_id,po.classifyBasketIds,po.washRecord_id,po.sourceId, po.recyclingItemRemark,po.serialNumber,po.errorRemark,po.damageRemark, po.id as taskId,recyclingBasketName,basketBarcode,department,po.status,washTime,startTime,unPackAmount,taskType,idCardBarcode,"
 				+ "td.id as tousseDefinitionId,td.invoicePlanID,td.name,td.allowModifyPackageType,td.isDisableIDCard,td.tousseType,td.packagetype,td.sterilingMethod,td.isTraceable,td.packageSize,"
 				+ "td.isPrint,td.isReview,td.note,td.uuid_vedioNames,td.isUploadVideo,td.supplierName,urgentAmount,urgentLevel,hidePackingTask "
 				+ urgentlevelQuery
@@ -2204,7 +2205,7 @@
 			selectRecyclingUserSql = "";
 			leftJoinRecyclingRecordSql = "";
 		}
-		String sql = "select "+ selectRecyclingUserSql +"td.needInspectMaterials,po.washRecord_id,po.sourceId, po.recyclingItemRemark,po.serialNumber, po.errorRemark,po.damageRemark, po.id as taskId,recyclingBasketName,basketBarcode,department,po.status,washTime,startTime,unPackAmount,taskType,idCardBarcode,"
+		String sql = "select "+ selectRecyclingUserSql +"td.needInspectMaterials,td.printBOMwhenPrintLabel,po.washRecord_id,po.sourceId, po.recyclingItemRemark,po.serialNumber, po.errorRemark,po.damageRemark, po.id as taskId,recyclingBasketName,basketBarcode,department,po.status,washTime,startTime,unPackAmount,taskType,idCardBarcode,"
 				+ "td.id as tousseDefinitionId,td.invoicePlanID,td.name,td.allowModifyPackageType,td.isDisableIDCard,td.tousseType,td.packagetype,td.sterilingMethod,td.isTraceable,td.packageSize,"
 				+ "td.isPrint,td.isReview,td.note,td.uuid_vedioNames,td.isUploadVideo,td.supplierName,urgentAmount,urgentLevel,hidePackingTask "
 				+ "from PackingTask po "
@@ -2315,6 +2316,7 @@
 				td.setHidePackingTask(rs.getString("hidePackingTask"));
 				td.setPackageSize(rs.getString("packageSize"));
 				td.setNeedInspectMaterials(rs.getBoolean("needInspectMaterials"));
+				td.setPrintBOMwhenPrintLabel(rs.getString("printBOMwhenPrintLabel"));
 				Object[] obj = new Object[2];
 				obj[0] = task;
 				obj[1] = td;