Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/dwr/table/ForeignProxyDisinfectionTableManager.java
===================================================================
diff -u -r19636 -r20094
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/dwr/table/ForeignProxyDisinfectionTableManager.java	(.../ForeignProxyDisinfectionTableManager.java)	(revision 19636)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/dwr/table/ForeignProxyDisinfectionTableManager.java	(.../ForeignProxyDisinfectionTableManager.java)	(revision 20094)
@@ -81,32 +81,6 @@
 	public String findForeignProxyDisinfectionTableList(
 			Map<String, List<String>> parameterMap) {
 		String sql = "where 1=1 ";
-		/*String departSearch = sqlWhereParamMap
-				.get("departSearch");
-		String applicationTimeSearch = sqlWhereParamMap.get("applicationTimeSearch");
-		String sql = "where 1=1 ";
-		if (StringUtils.isNotBlank(applicationTimeSearch)) {
-			applicationTimeSearch = applicationTimeSearch.substring(0,10);
-			sql += " and po.applicationTime between '" + applicationTimeSearch + " 00:00:00' and '" + applicationTimeSearch + " 23:59:59'";
-		}
-		String orgUnitCoding = acegiHelper.getSessionUser().getOrgUnitCodingFromSupplyRoomConfig();
-		if(StringUtils.isNotBlank(orgUnitCoding)){
-			SupplyRoomConfig supplyRoomConfig = supplyRoomConfigManager.getSupplyRoomConfigByOrgUnitCoding(orgUnitCoding);
-			if(supplyRoomConfig != null){
-				Integer type = supplyRoomConfig.getSupplyRoomType();
-				if(type == SupplyRoomConfig.SUPPLYROOM_TYPE_2){
-					THTreeNode orgUnit =	orgUnitManager.getOrgUnitByCode(supplyRoomConfig.getOrgUnitCoding());
-					String depart1 = orgUnit.getName();
-					sql += " and po.depart = '" + depart1 + "'";
-				}else{
-					if (StringUtils.isNotBlank(departSearch)) {
-						sql += " and po.depart = '" + departSearch + "'";
-					}
-				}
-			}
-		}else{
-			sql += " and po.depart = ''";
-		}*/
 		sql += " and po.handleDepartCoding='" + AcegiHelper.getLoginUser().getCurrentOrgUnitCode() + "'";
 		ResultBackHandler lendGoodsBriefHandler = LendGoodsBriefHandler.getInstance();
 		String result = gridManager.renderGrid(parameterMap, ForeignProxyDisinfection.class.getSimpleName(), sql, new String[] { "foreignProxyItems","applicationItems","invoice" });
Index: ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
===================================================================
diff -u -r20030 -r20094
--- ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java	(.../ReturnGoodsRecordManagerImpl.java)	(revision 20030)
+++ ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java	(.../ReturnGoodsRecordManagerImpl.java)	(revision 20094)
@@ -1150,76 +1150,6 @@
 		return true;
 	}
 
-	// 加库存
-	private void addDepartmentStock(ReturnGoodsRecord returnGoodsRecord,
-			ReturnGoodsItem returnGoodsItem) {
-		if (returnGoodsItem.getTousseDefinition() == null)
-			return;
-		String tousseType = returnGoodsItem.getTousseDefinition()
-				.getTousseType();
-		if (!TousseDefinition.PACKAGE_TYPE_INSIDE.equals(tousseType))
-			return;
-		
-		DepartmentStock departmentStock = departmentStockManager
-				.getByDepartCodingAndTousseName(
-						returnGoodsRecord.getDepartCoding(),
-						returnGoodsItem.getTousseName());
-		List<TousseInstance> tousseInstanceList = returnGoodsItem
-				.getTousseInstanceList();
-		if (departmentStock != null) {
-			// 库存非负数验证
-			departmentStock.setAmount(departmentStock.getAmount()
-					+ returnGoodsItem.getAmount());
-			if(tousseInstanceList != null){
-				for(TousseInstance tousseInstance : tousseInstanceList){
-					tousseInstance.setDepartmentStock_id(departmentStock.getId());
-				}
-			}
-		} else {
-			departmentStock = new DepartmentStock();
-			departmentStock.setAmount(returnGoodsItem.getAmount());
-			departmentStock.setCardinalNum(0);
-			departmentStock.setDepartCoding(returnGoodsRecord
-					.getDepartCoding());
-			departmentStock
-					.setDepartName(returnGoodsRecord.getDepart());
-			departmentStock.setTousseName(returnGoodsItem
-					.getTousseName());
-			departmentStock.setUsedAmount(0);
-		}
-		departmentStockManager.saveOrUpdata(departmentStock);
-		
-		SupplyRoomConfig firstSupplyRoom = supplyRoomConfigManager
-				.getFirstSupplyRoomConfig();
-		DepartmentStock supplyRoomStock = null;
-		if (firstSupplyRoom != null) {
-			supplyRoomStock = departmentStockManager
-					.getByDepartCodingAndTousseName(
-							firstSupplyRoom.getOrgUnitCoding(),
-							returnGoodsItem.getTousseName());
-		}
-		// 添加供应时器械包库存的管理
-		if (supplyRoomStock != null) {
-			supplyRoomStock.setAmount(supplyRoomStock.getAmount()
-					- returnGoodsItem.getAmount());
-			if (supplyRoomStock.getAmount() < 0) {
-				supplyRoomStock.setAmount(0);
-			}
-		} else {
-			supplyRoomStock = new DepartmentStock();
-			supplyRoomStock.setAmount(0);
-			supplyRoomStock.setCardinalNum(0);
-			supplyRoomStock.setDepartCoding(firstSupplyRoom
-					.getOrgUnitCoding());
-			supplyRoomStock.setDepartName(firstSupplyRoom
-					.getOrgUnitName());
-			supplyRoomStock.setTousseName(returnGoodsItem
-					.getTousseName());
-			supplyRoomStock.setUsedAmount(0);
-		}
-		departmentStockManager.saveOrUpdata(supplyRoomStock);
-	}
-
 	// 减库存
 	private void minusDepartmentStock(ReturnGoodsRecord returnGoodsRecord,
 			ReturnGoodsItem returnGoodsItem) {
@@ -1404,32 +1334,6 @@
 	}
 
 	/**
-	 * 更新器械包实例状态
-	 * 
-	 * @param tousseInstanceList
-	 * @param status
-	 * @throws Exception
-	 */
-	private void updateTousseInstanceStatus(
-			List<TousseInstance> tousseInstanceList, String status) {
-		if (tousseInstanceList != null) {
-			for (TousseInstance tousseInstance : tousseInstanceList) {
-				if (TousseInstance.STATUS_SHIPPED.equals(tousseInstance
-						.getStatus())
-						|| TousseInstance.STATUS_STERILED.equals(tousseInstance
-								.getStatus())) {
-					tousseInstance.setStatus(status);
-					tousseInstanceManager.saveOrUpdate(tousseInstance);
-				} else {
-					throw new RuntimeException("更新条码为：" + tousseInstance.getBarcode()
-							+ "的器械包的状态出错！");
-				}
-			}
-		}
-
-	}
-	
-	/**
 	 * 更新或生成待装配任务
 	 * 
 	 * @param returnGoodsRecord