Index: ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnTousseByInvoice.js
===================================================================
diff -u -r27319 -r28345
--- ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnTousseByInvoice.js	(.../returnTousseByInvoice.js)	(revision 27319)
+++ ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnTousseByInvoice.js	(.../returnTousseByInvoice.js)	(revision 28345)
@@ -108,7 +108,8 @@
 	rootNode.eachChild(function(tousseNode) {
 		// 有且只有二层节点(不包括根节点rootNode)
 		tousseNode.eachChild(function(tousseInstanceNode) {
-			var depart = tousseInstanceNode.attributes.settleAccountsDepartCode;
+			//var depart = tousseInstanceNode.attributes.settleAccountsDepartCode;
+			var depart = tousseInstanceNode.attributes.location2;
 			if(isUndefinedOrNullOrEmpty(depart)){
 				depart = tousseInstanceNode.attributes.location;
 			}
Index: ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
===================================================================
diff -u -r28274 -r28345
--- ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java	(.../ReturnGoodsRecordManagerImpl.java)	(revision 28274)
+++ ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java	(.../ReturnGoodsRecordManagerImpl.java)	(revision 28345)
@@ -1827,6 +1827,13 @@
 			List<TousseInstance> list = objectDao.findBySql(TousseInstance.class.getSimpleName(), String.format(" where (po.invoice_id=%s or invoice2_id=%s) and po.status in('%s','%s')", invoice.getId(),invoice.getId(),TousseInstance.STATUS_SHIPPED,TousseInstance.STATUS_SIGNED));
 			if(list != null){
 				for (TousseInstance tousseInstance : list) {
+					Long invoiceId2OfTi = tousseInstance.getInvoice2_id();
+					//判断如果该包定义的二次发货单id不为空,则过滤掉二次发货单id不为该发货单id的包实例
+					if(DatabaseUtil.isPoIdValid(invoiceId2OfTi)){
+						if(!invoiceId.equals(invoiceId2OfTi)){
+							continue;
+						}
+					}
 					TousseDefinition tousseDefinition = tousseInstance.getTousseDefinition();
 					if(tousseDefinition == null){
 						continue;