Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r41525 -r41532
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 41525)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 41532)
@@ -6654,8 +6654,8 @@
     		objectDao.excuteSQL(updateSql);
 
     		// 返回签收信息
-    		msg = "";
-    		if(signAmount > 0){
+    		//msg = "";
+    		if(StringUtils.isBlank(msg) && signAmount > 0){
     			msg = "签收成功，复用物品总数量为" + signAmount;
     		}
     		if(disposableGoodsAmount > 0){
@@ -12135,10 +12135,10 @@
     	}
 
     	//批量签收器械实例
-    	signRecordId = this.batchSignTousseInstance_intenal(waitSignTousseInstanceList, invoiceBeginDate, invoiceEndDate, signRecordId, signOrgUnitCode, signOrgUnitName, signUserCode, signUserFullName, signDate, signInvoice, true);
+    	SignResultVo signResultVo = this.batchSignTousseInstance_intenal(waitSignTousseInstanceList, invoiceBeginDate, invoiceEndDate, signRecordId, signOrgUnitCode, signOrgUnitName, signUserCode, signUserFullName, signDate, signInvoice, true);
 
     	//需要签收成功的签收结果
-    	return buildSignResultVo(isSuccess, msg, waitSignTousseInstanceList, signRecordId, signOrgUnitCode, invoiceBeginDate, invoiceEndDate);
+    	return buildSignResultVo(isSuccess, signResultVo.getMessage(), waitSignTousseInstanceList, signResultVo.getSignRecordId(), signOrgUnitCode, invoiceBeginDate, invoiceEndDate);
     }
     
     /**
@@ -12186,12 +12186,13 @@
      * @param signInvoice					是否签收发货单(整单签收时，不需要计算签收状态，直接设置签收状态为“已签收”)
      * @param putIntoSignStorageLocation	签收成功后，将物品放入指定的签收库位
      */
-    private Long batchSignTousseInstance_intenal(List<TousseInstance> tousseInstanceList,
+    private SignResultVo batchSignTousseInstance_intenal(List<TousseInstance> tousseInstanceList,
     		String invoiceBeginDate, String invoiceEndDate,
     		Long signRecordId, String signOrgUnitCode, String signOrgUnitName,
     		String signUserCode, String signUserFullName, Date signDate,
     		boolean signInvoice, boolean putIntoSignStorageLocation){
     	
+    	SignResultVo signResultVo = new SignResultVo();
     	if(CollectionUtils.isEmpty(tousseInstanceList)){
     		throw new SystemException("无待签收物品！");
     	}
@@ -12294,34 +12295,37 @@
     	
     	//签收成功时，自动将物品入库到发货时指定的签收库位ZSYKEQ-23
     	if(putIntoSignStorageLocation){
-    		this.batchAutoPutTousseInstanceIntoSignStorageLoactionAfterSign(waitSignTousseInstanceList);
+    		String msg = this.batchAutoPutTousseInstanceIntoSignStorageLoactionAfterSign(waitSignTousseInstanceList);
+    		signResultVo.setMessage(msg);
     	}
     	
     	if(tousseInstancePushDao != null){
     		tousseInstancePushDao.pushTousseInstanceAfterSign(waitSignTousseInstanceList);
     	}
-    	
-    	return signRecordId;
+    	signResultVo.setSignRecordId(signRecordId);
+    	return signResultVo;
     }
 
     /**
      * 签收成功时，自动将物品入库到发货时指定的签收库位
      * @param waitSignTousseInstanceList 器械包实例
      */
-    private void batchAutoPutTousseInstanceIntoSignStorageLoactionAfterSign(Collection<TousseInstance> signTousseInstanceList) {
+    private String batchAutoPutTousseInstanceIntoSignStorageLoactionAfterSign(Collection<TousseInstance> signTousseInstanceList) {
+    	String returnMsg = "";
 		boolean enableDesignatedWarehouseReceiving = ConfigUtils.getSystemSetConfigByNameBool("enableDesignatedWarehouseReceiving");
 		boolean enableWarehousePositionModule = ConfigUtils.getSystemSetConfigByNameBool("enableWarehousePositionModule");
 		if(!enableDesignatedWarehouseReceiving || !enableWarehousePositionModule || CollectionUtils.isEmpty(signTousseInstanceList)){
-			return;
+			return returnMsg;
 		}
 		for (TousseInstance tousseInstance : signTousseInstanceList) {
 			objectDao.refresh(tousseInstance);
 		}
 		//根据发货单上指定的签收库位id，分开放入库位
 		Map<Long, List<TousseInstance>> signStorageLoactionIdTousseInstanceMap = getSignStorageLoactionIdTousseInstanceMap(signTousseInstanceList);
 		if(MapUtils.isEmpty(signStorageLoactionIdTousseInstanceMap)){
-			return;
+			return returnMsg;
 		}
+		int putIntoStorageLocationAmount = 0;
 		for (Entry<Long, List<TousseInstance>> entry : signStorageLoactionIdTousseInstanceMap.entrySet()) {
 			Long signStorageLoactionId = entry.getKey();
 			List<TousseInstance> tousseInstances = entry.getValue();
@@ -12330,7 +12334,12 @@
 				continue;
 			}
 			this.batchPutTousseInstanceIntoStorageLoaction(tousseInstances, storageLocation, storageLocation.getOrgUnitCode(), "签收自动存入", false);
+			putIntoStorageLocationAmount += tousseInstances.size();
 		}
+		if(putIntoStorageLocationAmount > 0){
+			returnMsg = String.format("签收成功，复用物品总数量为%s，已自动存入对应的库房。", signTousseInstanceList.size());
+		}
+		return returnMsg;
 	}
 
     /**