Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/signRecord/service/SignRecordManager.java
===================================================================
diff -u -r36785 -r37137
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/signRecord/service/SignRecordManager.java	(.../SignRecordManager.java)	(revision 36785)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/signRecord/service/SignRecordManager.java	(.../SignRecordManager.java)	(revision 37137)
@@ -5,6 +5,8 @@
 import java.util.List;
 import java.util.Map;
 
+import net.sf.json.JSONArray;
+
 import com.forgon.disinfectsystem.entity.basedatamanager.signRecord.SignRecord;
 import com.forgon.disinfectsystem.signRecord.vo.SignRecordPrintTousseVo;
 import com.forgon.disinfectsystem.signRecord.vo.SignRecordVo;
@@ -33,13 +35,14 @@
     String createSignRecord(String departCode,String departName,String signUserName,String signUserCode);
     /**
      * 保存签收记录
-     * @param tousseInstanceBarcodes 签收记录签收的器械包实例条码
+     * SZSLGZXYY-22 【发货单签收】可移除操作模式下支持签收需要支持不追溯的复用性物品和一次性物品
+     * @param barcodeAndAmountJSONArray 签收记录签收的条码与数量的json数组(追溯的器械包条码,数量通常为1,数量不为1有可能是传参问题,建议也按1处理)
      * @param signUserCode 签收人工号
      * @param signUserName 签收人姓名
      * @param departCoding 签收科室编码
      * @return
      */
-    public SignRecord save(Collection<String> tousseInstanceBarcodes,String signUserCode,String signUserName, String departCoding);
+    public SignRecord save(JSONArray barcodeAndAmountJSONArray,String signUserCode,String signUserName, String departCoding);
 
     /**
      * 根据签收记录ID 获取包实例
Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
===================================================================
diff -u -r36940 -r37137
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 36940)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 37137)
@@ -5067,6 +5067,12 @@
 			return JSONUtil.buildErrorMsgJsonResult(ex.getMessage());
 		}
 	}
+
+	/**
+	 * 科室的待发货物品签收(SZSLGZXYY-17、SZSLGZXYY-22)
+	 * @param params
+	 * @return
+	 */
 	@SuppressWarnings("unchecked")
 	public String getAllInvoiceSignGoods(JSONObject params){
 		try{
@@ -5548,7 +5554,8 @@
 				return JSONUtil.buildJsonObject(false, "签收人不存在，请确认修改后再提交").toString();
 			}
 		}
-		SignRecord signRecord = signRecordManager.save(Arrays.asList(tousseBarcodes.split(";")), signUserCode, signUserName, departCoding);
+		//所传的第一个参数为非正式代码,提交签收方法调用编译不报错用,正式修改时再做调整
+		SignRecord signRecord = signRecordManager.save(null, signUserCode, signUserName, departCoding);
 		if(signRecord != null){
 			JSONUtil.addDataProperty(result, JSONObject.fromObject(signRecord));
 		}
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/signRecord/service/SignRecordManagerImpl.java
===================================================================
diff -u -r36786 -r37137
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/signRecord/service/SignRecordManagerImpl.java	(.../SignRecordManagerImpl.java)	(revision 36786)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/signRecord/service/SignRecordManagerImpl.java	(.../SignRecordManagerImpl.java)	(revision 37137)
@@ -18,6 +18,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
 import org.apache.commons.collections4.CollectionUtils;
@@ -203,8 +204,11 @@
 		}
 		return items;
 	}
+
     @Override
-	public SignRecord save(Collection<String> tousseInstanceBarcodes,String signUserCode,String signUserName, String departCoding){
+	public SignRecord save(JSONArray barcodeAndAmountJSONArray,String signUserCode,String signUserName, String departCoding){
+    	//下面这个变量是为了确定修改方法定义后的代码编辑不报错而设置,正式修改此业务方法时此变量已不变使用,改用方法的第一个参数barcodeAndAmountJSONArray
+    	List<String> tousseInstanceBarcodes = null;
     	if(CollectionUtils.isEmpty(tousseInstanceBarcodes)){
     		throw new SystemException("器械包不能为空");
     	}