Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/rinser/action/RinserAction.java
===================================================================
diff -u -r34039 -r34065
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/rinser/action/RinserAction.java	(.../RinserAction.java)	(revision 34039)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/rinser/action/RinserAction.java	(.../RinserAction.java)	(revision 34065)
@@ -452,4 +452,27 @@
 		}
 		StrutsResponseUtils.output(obj);
 	}
+	
+	/**
+	 * 获取没有绑定容器的清洗机及当前容器绑定的清洗机列表
+	 * @param consumptiveMaterialContainerId 当前容器ID
+	 */
+	public void getRinserNoBindContainer(){
+		JSONArray data = new JSONArray();
+		Long consumptiveMaterialContainerId = StrutsParamUtils.getPraramLongValue("consumptiveMaterialContainerId", 0l);
+		List<Rinser> list = rinserManager.getAll();
+		if(CollectionUtils.isNotEmpty(list)){
+			for (Rinser rinser : list) {
+				if(rinser.getConsumptiveMaterialContainer() == null
+						|| (rinser.getConsumptiveMaterialContainer().getId().longValue() == consumptiveMaterialContainerId.longValue())){
+					JSONObject json = new JSONObject();
+					json.put("name", rinser.getName());
+					json.put("id", rinser.getId());
+					data.add(json);
+				}
+			}
+		}
+		JSONObject result = JSONUtil.buildJsonObject(true,data);
+		StrutsResponseUtils.output(result);
+	}
 }
Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/action/ConsumptiveMaterialContainerAction.java
===================================================================
diff -u -r34063 -r34065
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/action/ConsumptiveMaterialContainerAction.java	(.../ConsumptiveMaterialContainerAction.java)	(revision 34063)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/action/ConsumptiveMaterialContainerAction.java	(.../ConsumptiveMaterialContainerAction.java)	(revision 34065)
@@ -79,7 +79,13 @@
 
 	@Override
 	public void prepare() throws Exception {
-		consumptiveMaterialContainer = new ConsumptiveMaterialContainer();
+		Long id = StrutsParamUtils.getPraramLongValue("id", null);
+		if(DatabaseUtil.isPoIdValid(id)){
+			consumptiveMaterialContainer = consumptiveMaterialContainerManager.get(id);
+		}
+		if(consumptiveMaterialContainer == null){
+			consumptiveMaterialContainer = new ConsumptiveMaterialContainer();
+		}
 	}
 
 	@Override
@@ -93,17 +99,13 @@
 	public void saveConsumptiveMaterialContainer(){
 		JSONObject result = JSONUtil.buildJsonObject(true, "保存成功！");
 		try {
-			Long id = StrutsParamUtils.getPraramLongValue("id", null);
 			//清洗机ID，如1;2;3
 			String rinserIds = StrutsParamUtils.getPraramValue("rinserIds", "");
 			//清洗耗材种类及余量,如[{"consumptiveMaterialTypeId":1, "volume":1000},{"consumptiveMaterialTypeId":2, "volume":1000}]
 			String consumptiveMaterialVolumes = StrutsParamUtils.getPraramValue("consumptiveMaterialVolumeStr", "");
 			//补充的清洗耗材(一次性物品)及数量，如
 			//{"warehouseId":1,"warehouseName":供应室仓库,"items":[{"id":"","consumptiveMaterialTypeId":1,"disposableGoodsId":"1","disposableGoodsStockId":1,"disposableGoodsBatchId":87930,"disposableGoodsBatchStockId":40051,"name":"注射器[20个/盒]","type":"一次性物品","amount":1,"price":2.3,"batchNumber":"2021-08-09","expDate":"2024-08-09","supplierName":"北京中美伟康公司","recordProperties":{"dirty":false,"modified":null}}]}
 			String receiveRecordItems = StrutsParamUtils.getPraramValue("receiveRecordItems", "");
-			if(DatabaseUtil.isPoIdValid(id)){
-				consumptiveMaterialContainer = consumptiveMaterialContainerManager.get(id);
-			}
 			consumptiveMaterialContainerManager.saveConsumptiveMaterialContainer(consumptiveMaterialContainer, rinserIds, consumptiveMaterialVolumes, receiveRecordItems);
 		} catch (Exception e) {
 			e.printStackTrace();