Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r31520 -r31527
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 31520)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 31527)
@@ -6762,14 +6762,22 @@
 			//创建消毒物品新定义
 			td = buildDisinfectGoodsDefinition(td);
 		}
-
-		if (TousseDefinition.STR_NO.equals(ancestorTD.getIsPrint())) {
-			isPrint = false;
-			isTraceable = false;
-		} else {
+		if(StringUtils.equals(packingMode, "directPacking")){//自定义装配
+			if(TousseDefinition.STR_NO.equals(ancestorTD.getIsPrintOnDirectPacking())){
+				isPrint = false;
+			}
 			if (TousseDefinition.STR_NO.equals(ancestorTD.getIsTraceable())) {
 				isTraceable = false;
 			}
+		}else{
+			if (TousseDefinition.STR_NO.equals(ancestorTD.getIsPrint())) {
+				isPrint = false;
+				isTraceable = false;//由不打印得出不追溯？？？
+			}else{
+				if (TousseDefinition.STR_NO.equals(ancestorTD.getIsTraceable())) {
+					isTraceable = false;
+				}
+			}
 		}
 
 		if (TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(td.getTousseType())) {