Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java
===================================================================
diff -u -r14910 -r14996
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java	(.../ProxyDisinfectionManagerImpl.java)	(revision 14910)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java	(.../ProxyDisinfectionManagerImpl.java)	(revision 14996)
@@ -130,12 +130,9 @@
 			JSONArray basketInfos,String loginUserName,String loginUserCode) {
 		//处理PDA端在发货前打开，发货后再保存问题。
 		if (proxyDisinfection != null) {
-			if (InvoicePlan.DELIVERSTATUS_PARTDELIVERED
-					.equals(proxyDisinfection.getDeliverStatus())
-					|| InvoicePlan.DELIVERSTATUS_DELIVERED
-							.equals(proxyDisinfection.getDeliverStatus())
-					|| InvoicePlan.STATUS_END.equals(proxyDisinfection
-							.getDeliverStatus())) {
+			if (proxyDisinfection.partDelivered()
+					|| proxyDisinfection.delivered()
+					|| proxyDisinfection.deliverEnd()) {
 				return null;
 			}
 		}
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r14992 -r14996
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 14992)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 14996)
@@ -2677,12 +2677,9 @@
 						.getByProperty(ProxyDisinfection.class.getSimpleName(),
 								"id", pdid);
 				if (pd != null){
-					String deliverStatus = pd.getDeliverStatus();
-					if (InvoicePlan.DELIVERSTATUS_DELIVERED.equals(deliverStatus)
-							|| InvoicePlan.STATUS_END.equals(deliverStatus)) {
+					if (pd.delivered() || pd.deliverEnd()) {
 						continue;
-					} else if (InvoicePlan.DELIVERSTATUS_PARTDELIVERED
-							.equals(deliverStatus)) {
+					} else if (pd.partDelivered()) {
 						List<TousseItem> tis = pd.getApplicationItems();
 						for (TousseItem tousseItem : tis) {
 							if (tousseItem.getTousseName().equals(
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r14993 -r14996
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 14993)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 14996)
@@ -322,11 +322,8 @@
 			}
 		}
 		// 已终止、部分发货的、已发货的不可编辑
-		if (InvoicePlan.STATUS_END.equals(application.getDeliverStatus())
-				|| InvoicePlan.DELIVERSTATUS_PARTDELIVERED.equals(application
-						.getDeliverStatus())
-				|| InvoicePlan.DELIVERSTATUS_DELIVERED.equals(application
-						.getDeliverStatus())) {
+		if (application.deliverEnd()||application.partDelivered()
+				|| application.delivered()) {
 			application.setEditable("false");
 		}
 		return application;
@@ -376,10 +373,8 @@
 						.equals(invoicePlan.getRecyclingStatus())) {
 			canDelete = false;
 		}
-		if (InvoicePlan.DELIVERSTATUS_DELIVERED
-				.equals(invoicePlan.getDeliverStatus())
-				|| InvoicePlan.DELIVERSTATUS_PARTDELIVERED
-						.equals(invoicePlan.getDeliverStatus())) {
+		if (invoicePlan.delivered()
+				|| invoicePlan.partDelivered()) {
 			canDelete = false;
 		}
 		ForeignTousseApplication foreignTousseApplication = null;