Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r14932 -r14948
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 14932)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 14948)
@@ -2511,11 +2511,18 @@
 		Date sendDate = invoice.getSendTime();
 		String depart = invoicePlan.getDepart();
 		
+		ProxyDisinfection proxyDisinfection = null;
+		if(invoicePlan instanceof ProxyDisinfection){
+			proxyDisinfection = (ProxyDisinfection)invoicePlan;
+		}
+		
 		Set<Long> tousseInstanceIDs = new HashSet<Long>();
 		for (TousseInstance tousseInstance : tousseInstancesToUpdate) {
 			tousseInstanceIDs.add(tousseInstance.getId());
 			tousseInstance.setInvoice_id(invoice.getId());
-			tousseInstance.setStatus(TousseInstance.STATUS_SHIPPED);
+			if(proxyDisinfection == null || !proxyDisinfection.resendout()){
+				tousseInstance.setStatus(TousseInstance.STATUS_SHIPPED);
+			}
 			tousseInstance.setLocation(departCoding);
 			tousseInstance.setLocationForDisplay(depart);
 			tousseInstance.setSettleAccountsDepart(invoicePlan.getSettleAccountsDepart());
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionView.js
===================================================================
diff -u -r14935 -r14948
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionView.js	(.../proxyDisinfectionView.js)	(revision 14935)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionView.js	(.../proxyDisinfectionView.js)	(revision 14948)
@@ -358,6 +358,12 @@
 }
 
 function addAndEditProxyDisinfection(id) {
+	
+	var resendoutStore = new Ext.data.SimpleStore( {
+		fields : ['value'],
+		data : [ ['是'],['否']]
+	});
+	
 	var form = new top.Ext.FormPanel( {
 		id : 'proxyDisinfectionForm',
 		frame : true,
@@ -411,7 +417,7 @@
 					id:'serialNum',
 					columnWidth : .5,
 					layout : 'form',
-					labelWidth : 70,
+					labelWidth : 90,
 					items : [{
 						xtype : 'textfield',
 						fieldLabel : '流水号',
@@ -441,7 +447,7 @@
 				},{
 					columnWidth : .5,
 					layout : 'form',
-					labelWidth : 70,
+					labelWidth : 90,
 					items : [{
 						xtype : 'textfield',
 						fieldLabel : '器械包总数',
@@ -470,6 +476,24 @@
 						readOnly:true,
 						anchor : '98%'
 					}]
+				},{
+					columnWidth : .5,
+					layout : 'form',
+					labelWidth : 90,
+					items : [{
+						xtype : 'combo',
+						fieldLabel : '是否二次发货',
+						id : 'canResendout',
+						name : 'canResendout',
+						valueField : 'value',
+						displayField : 'value',
+						store : resendoutStore,
+						forceSelection : true,
+						editable : false,
+						mode : 'local',
+						triggerAction : 'all',
+						anchor : '95%'
+					}]
 				}, {
 					columnWidth : 1,
 					layout : 'form',
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
===================================================================
diff -u -r14910 -r14948
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 14910)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 14948)
@@ -1521,22 +1521,12 @@
 			params.put("invoicePlanId", Long.parseLong(invoicePlanId));
 		}
 		
-		JsonObject result = new JsonObject();
 		try{
 			invoiceManager.submitInvoice(params);
-			result.addProperty("success", true);
-			result.addProperty("msg", "保存成功！");
+			StrutsResponseUtils.output(true, "保存成功！");
 		} catch (Exception ex){
-			result.addProperty("success", false);
-			result.addProperty("msg", ex.getMessage());
+			StrutsResponseUtils.output(false, ex.getMessage());
 		}
-		
-		StrutsParamUtils.getResponse().setCharacterEncoding("UTF-8");
-		try {
-			StrutsParamUtils.getResponse().getWriter().println(result.toString());
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
 	}
 	
 	private static List<ScanGoodsVo> getInvoiceGoodsVo(String sendOutGoodsStoreData){
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
===================================================================
diff -u -r14943 -r14948
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 14943)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 14948)
@@ -1296,15 +1296,15 @@
 							waitTitle : '提交表单',
 							success : function(form, action) {
 								// 一定要事务提交成功才返回发货计划列表界面
-								showResult(action.result.msg);
+								showResult(action.result.message);
 								if(action.result.success){
 									window.close();
 									grid.getStore().reload();
 								}
 							},
 							failure : function(form, action) {
-								if(!isUndefinedOrNullOrEmpty(action.result) && !isUndefinedOrNullOrEmpty(action.result.msg)){
-									showResult(action.result.msg);
+								if(!isUndefinedOrNullOrEmpty(action.result) && !isUndefinedOrNullOrEmpty(action.result.message)){
+									showResult(action.result.message);
 								}else{
 									showResult("发货超时，请稍后查看发货单以确定发货是否成功，避免重复发货!");
 									window.close();
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/proxydisinfection/ProxyDisinfection.java
===================================================================
diff -u -r12331 -r14948
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/proxydisinfection/ProxyDisinfection.java	(.../ProxyDisinfection.java)	(revision 12331)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/proxydisinfection/ProxyDisinfection.java	(.../ProxyDisinfection.java)	(revision 14948)
@@ -12,10 +12,12 @@
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.forgon.Constants;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan;
 import com.forgon.disinfectsystem.entity.packing.ReviewedBasket;
 import com.forgon.tools.hibernate.ObjectDao;
+import com.forgon.tools.string.StringTools;
 
 /**
  * @author WangYi
@@ -29,6 +31,11 @@
 	
 	private Integer totalAmountOfTousses;
 	
+	/**
+	 * 是否二次发货
+	 */
+	private String canResendout;
+	
 	@JsonIgnore
 	private List<ReviewedBasket> reviewedBaskets;
 	
@@ -56,4 +63,18 @@
 		this.reviewedBaskets = reviewedBaskets;
 	}
 
+	public String getCanResendout() {
+		return StringTools.defaultIfEmpty(canResendout, Constants.STR_NO);
+	}
+
+	public void setCanResendout(String canResendout) {
+		this.canResendout = canResendout;
+	}
+	/**
+	 * 判断是否二次发货
+	 * @return
+	 */
+	public boolean resendout(){
+		return StringTools.equals(Constants.STR_YES, canResendout);
+	}
 }