Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r17384 -r17426
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 17384)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 17426)
@@ -2199,7 +2199,7 @@
 		SupplyRoomConfig supplyRoomConfigParams = supplyRoomConfigManager.getSystemParamsObj();
 		//是否为二级供应室发货
 		boolean isSecondSupplyRoomAutoInvoice =
-				!SupplyRoomConfig.RECYCLING_PACKING_NO.equals(supplyRoomConfigParams.getIsSecondSupplyRoomAutoInvoice());
+				SupplyRoomConfig.SECONDSUPPLYROOM_AUTOINVOICE_FROMALLORG.equals(supplyRoomConfigParams.getIsSecondSupplyRoomAutoInvoice());
 		
 		Map<String,String> packageTypeMap = httpOptionManager.getHttpOptionTextToValueMapByListIdId(HttpOption.SYSTEMSETTING_PACKAGING_TYPE);
 		
@@ -3453,7 +3453,7 @@
 		SupplyRoomConfig supplyRoomConfigParams = supplyRoomConfigManager.getSystemParamsObj();
 		//是否为二级供应室发货
 		boolean isSecondSupplyRoomAutoInvoice =
-				!SupplyRoomConfig.RECYCLING_PACKING_NO.equals(supplyRoomConfigParams.getIsSecondSupplyRoomAutoInvoice());
+				SupplyRoomConfig.SECONDSUPPLYROOM_AUTOINVOICE_FROMALLORG.equals(supplyRoomConfigParams.getIsSecondSupplyRoomAutoInvoice());
 		//是否打印装配人
 		boolean isPrintUserName = supplyRoomConfigParams.isPrintUserFullName();