Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
===================================================================
diff -u -r37250 -r37449
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js	(.../tousseForm.js)	(revision 37250)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js	(.../tousseForm.js)	(revision 37449)
@@ -244,6 +244,17 @@
 	}
 }
 
+//DGSETYY-80：显示或隐藏发货回原申请单
+function setShipBackToOriginalApplyBox(isTraceable){
+	var tousseType = top.Ext.getCmp('tousseType').getValue();
+	if(sstsConfig.enableTraceableToussesShippedBackToTheOriginalApplyInfoFunction && tousseType == '器械包' && isTraceable == '是'){
+		top.Ext.getCmp('shipBackToOriginalApplyBox').show();
+	}else {
+		top.Ext.getCmp('shipBackToOriginalApply').setValue('否');
+		top.Ext.getCmp('shipBackToOriginalApplyBox').hide();
+	}
+}
+
 function deleteItem(id){
 	var sterilingMethodItemStore = top.Ext.getCmp('sterilingMethodGrid').getStore();
 	for(var j=0;j<sterilingMethodItemStore.getCount();j++){
@@ -865,6 +876,8 @@
 				var isSterileCombo = formObj.findById('isSterile');
 				isSterileCombo.store.loadData(newData);
 			}
+			//DGSETYY-80：显示或隐藏发货回原申请单
+			setShipBackToOriginalApplyBox(tousseDefinition.isTraceable);
 		}
 	});
 }
@@ -1459,6 +1472,10 @@
 								//ZSWY-206：显示或隐藏灭菌包装类型和灭菌标签纸类型
 								var isSterile = top.Ext.getCmp('isSterile').getValue();
 								setPackageTypeAndPaperTypeBox(tousseType,isSterile);
+
+								//DGSETYY-80：显示或隐藏发货回原申请单
+								var isTraceable = top.Ext.getCmp('isTraceable').getValue();
+								setShipBackToOriginalApplyBox(isTraceable);
 							}
 						},
 						anchor: '100%'
@@ -2009,6 +2026,8 @@
 									top.Ext.getCmp('isReview').disable();
 									top.Ext.getCmp('autoOutStockForPacking').setValue("否");
 									top.Ext.getCmp('autoOutStockForPacking').disable();
+									//DGSETYY-80：显示或隐藏发货回原申请单
+									setShipBackToOriginalApplyBox('否');
 								} else {
 									top.Ext.getCmp('isPrint').enable();
 									top.Ext.getCmp('isTraceable').enable();
@@ -2055,6 +2074,9 @@
 
 									top.Ext.getCmp('printOrgSource').disable();
 									top.Ext.getCmp('printOrgSource').setValue("无");
+
+									//DGSETYY-80：显示或隐藏发货回原申请单
+									setShipBackToOriginalApplyBox('否');
 								} else {
 									top.Ext.getCmp('isTraceable').enable();
 									top.Ext.getCmp('isReview').enable();
@@ -2177,16 +2199,44 @@
 								//ZSWY-206：显示或隐藏灭菌包装类型和灭菌标签纸类型
 								setPackageTypeAndPaperTypeBox('','否');
 
+								//DGSETYY-80：显示或隐藏发货回原申请单
+								setShipBackToOriginalApplyBox(combo.getRawValue());
+
 								setStatisticsReviewWorkload();
 							}
 						}
-
 					}]
 				}, {
 					columnWidth: colWidth,
 					layout: 'form',
+					labelWidth: fontSize == 12 ? 90 : 100,
+					labelAlign: "right",
+					id:'shipBackToOriginalApplyBox',
+					hidden:!sstsConfig.enableTraceableToussesShippedBackToTheOriginalApplyInfoFunction,
 					items: [{
 						xtype: 'combo',
+						fieldLabel: '发货回原申请单',
+						id: 'shipBackToOriginalApply',
+						name: 'shipBackToOriginalApply',
+						valueField: 'value',
+						displayField: 'value',
+						store: new Ext.data.SimpleStore({
+							fields: ['value'],
+							data: [['是'], ['否']]
+						}),
+						editable: false,
+						forceSelection: true,
+						mode: 'local',
+						value: '是',
+						allowBlank: true,
+						triggerAction: 'all',
+						anchor: '100%'
+					}]
+				}, {
+					columnWidth: colWidth,
+					layout: 'form',
+					items: [{
+						xtype: 'combo',
 						fieldLabel: '是否' + reviewViewText + '',
 						id: 'isReview',
 						name: 'isReview',
@@ -2922,6 +2972,9 @@
 									top.Ext.getCmp('isPrint').enable();  //启用"是否打印标签"
 									top.Ext.getCmp('autoOutStockForPacking').enable();  //启用"自动扣包内材料"
 									top.Ext.getCmp('isReview').enable();  //启用"是否审核"
+
+									//DGSETYY-80：显示或隐藏发货回原申请单
+									setShipBackToOriginalApplyBox('是');
 								} else {
 									top.Ext.getCmp('isPacking').enable();
 									top.Ext.getCmp('isTraceable').enable();
Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js
===================================================================
diff -u -r37347 -r37449
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js	(.../tousseInstanceInfoTab.js)	(revision 37347)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js	(.../tousseInstanceInfoTab.js)	(revision 37449)
@@ -343,6 +343,20 @@
 										takeImgAndVideo(tousseName,objectId,true,imageTypeCameraApplication,videoTypePacking);
 	                                }
 	                            }]
+	                        }, {
+	                            layout : 'form',
+	                            columnWidth : 1,
+	                            cls:'edit-part2-labelwidth',
+								hidden:!sstsConfig.enableTraceableToussesShippedBackToTheOriginalApplyInfoFunction,
+	                            items : [{
+	                                id : 'returnMsg',
+	                                name : 'returnMsg',
+	                                xtype : 'textfield',
+	                                fieldLabel : '退货重发',
+	                                anchor : '100%',
+	                                readOnly : true,
+	                                cls : 'fieldReadOnlyNoRemove'
+	                            }]
 	                        }]
 	                    }],
 	                    buttons : [this.cancelButton]
@@ -2577,7 +2591,11 @@
 	                        top.Ext.getCmp('invoice_applicationTime').setValue(invoicePlanJSON.invoice_applicationTime);  //申请时间
 	                        top.Ext.getCmp('iinvoice_SerialNum').setValue(invoicePlanJSON.iinvoice_SerialNum);  //申请单号
 	                        top.Ext.getCmp('invoice__applicant').setValue(invoicePlanJSON.invoice__applicant);  //申请人
-	                        top.Ext.getCmp('invoice_Type').setValue(invoicePlanJSON.invoice_Type);  //申请单类型     
+	                        top.Ext.getCmp('invoice_Type').setValue(invoicePlanJSON.invoice_Type);  //申请单类型  
+							//DGSETYY-80：退货重发
+							if(sstsConfig.enableTraceableToussesShippedBackToTheOriginalApplyInfoFunction){
+								top.Ext.getCmp('returnMsg').setValue(invoicePlanJSON.returnMsg);  
+							}
 						}
 						//二次回收(普通器械包、非外来器械包)
 						if(result.tousseInstance.tousseDefinition
Index: ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/config.js
===================================================================
diff -u -r37325 -r37449
--- ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/config.js	(.../config.js)	(revision 37325)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/config.js	(.../config.js)	(revision 37449)
@@ -326,6 +326,8 @@
   enableUrgentNeedGoodsProcessingCycleReport:true,
   //启用灭菌时不允许增删器械包的功能
   enableNotAllowedToAddOrDeleteToussesDuringSterilizationFunction:true,
+  //启用可追溯的器械包发货回原申请单功能
+  enableTraceableToussesShippedBackToTheOriginalApplyInfoFunction:true,
  //提取诊疗号的正则表达式 
   regExpForExtractingClinicNumber:"[0-9]+"
 }
\ No newline at end of file