Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r36607 -r36643
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 36607)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 36643)
@@ -4896,8 +4896,8 @@
 		packingPara.setSecondaryDisinfection(paramsObj.optBoolean("secondaryDisinfection", false));
 		packingPara.setSterilizedThisTime(paramsObj.optBoolean("sterilizedThisTime", false));
 		packingPara.setCreateSetCode(paramsObj.optBoolean("createSetCode", false));
+		packingPara.setLastTime(paramsObj.optBoolean("lastTime", true));
 		if(packingPara.getCreateSetCode()){
-			packingPara.setLastTime(paramsObj.optBoolean("lastTime", true));
 			packingPara.setTousseInstanceIds(paramsObj.optString("tousseInstanceIds"));
 		}
 		return packingPara;
@@ -5059,7 +5059,7 @@
 		}
 		if (StringUtils.isNotBlank(packingTaskIds)) {
 			Map<String,Integer> tousseNameAmountMap = new HashMap<String, Integer>();
-			logger.debug("装配任务packingTaskIds=" + packingTaskIds);
+			//logger.debug("装配任务packingTaskIds=" + packingTaskIds);
 			packingRecordIdList = new ArrayList<Long>();
 			String[] idsStr = packingTaskIds.split(";");
 			List<Long> ids = new ArrayList<Long>();
@@ -5173,21 +5173,6 @@
 					}
 				}	
 			}
-			// 锁定所有的虚拟篮筐
-			boolean needVirtualBasket = false;
-			for (PackingTask packingTask : packingTasks) {
-				TousseDefinition td = packingTask.getTousseDefinition();
-				Integer packingAmountPerVirtualBasket = td.getPackingAmountPerVirtualBasket();
-				if(packingAmountPerVirtualBasket != null
-						&& packingAmountPerVirtualBasket > 0){
-					needVirtualBasket = true;
-					break;
-				}
-			}
-//			if(needVirtualBasket){
-//				String sql = String.format(" where purpose='%s'", Container.CONTAINER_PURPOSE_VIRTUAL);
-//				objectDao.getBySql_ForUpdate2(Container.class.getSimpleName(), sql);
-//			}
 			if(!packingTaskBasketBarcodeSet.isEmpty()){
 				objectDao.findBySql_ForUpdate(Container.class.getSimpleName(), String.format(" where %s ", SqlUtils.getStringFieldInLargeCollectionsPredicate("po.barcode", packingTaskBasketBarcodeSet)));
 			}
@@ -5306,7 +5291,7 @@
 					packingTaskPara = packingTaskParaMap.get(currentPackingTask.getId());
 					oldRemark = packingTaskPara.getOldRemark();
 				}
-				Map<Long,Long> disposableGoodsIdToAmount = null;
+				//Map<Long,Long> disposableGoodsIdToAmount = null;
 				/*
 				 * 先判断装配任务对应的器械包定义是否需要扣一次性物品库存(目前只针对普通器械包和敷料包进行扣减,后期在器械包定义的页界加以限制,其它类型的器械包定义的装配扣一次性物品库存的属性只能为否)
 				 */
@@ -5500,7 +5485,7 @@
 					if(packingAmountForThisTask > currentPackingTask.getCanPackAmount()){
 						packingAmountForThisTask = currentPackingTask.getCanPackAmount();
 					}
-					logger.debug("添加历史装配记录,器械包名称=" + tdOfPackingTask.getName() + ",装配数量=" + packingAmountForThisTask);
+					//logger.debug("添加历史装配记录,器械包名称=" + tdOfPackingTask.getName() + ",装配数量=" + packingAmountForThisTask);
 					//logger.debug("Thread " + Thread.currentThread().getName() + "，完成批量装配器械包：" + tousseName);
 					// 先创建PackingRecord
 					PackingRecord packingRecord = null;
@@ -5643,9 +5628,9 @@
 						}
 						
 						
-						logger.debug("tousseInstances.size()=" + tousseInstances.size());
-						logger.debug("virtualSeqNumArray.size()=" + virtualSeqNumArray.size() + ",virtualSeqNumArray=" + virtualSeqNumArray);
-						logger.debug("departmentArray.size()=" + departmentArray.size() + ",departmentArray=" + departmentArray);
+						//logger.debug("tousseInstances.size()=" + tousseInstances.size());
+						//logger.debug("virtualSeqNumArray.size()=" + virtualSeqNumArray.size() + ",virtualSeqNumArray=" + virtualSeqNumArray);
+						//logger.debug("departmentArray.size()=" + departmentArray.size() + ",departmentArray=" + departmentArray);
 						if(noUserFormSterilizationInfo){
 							sterilingType = tdOfPackingTask.getSterilingMethod();
 							packageType = tdOfPackingTask.getPackageType();
@@ -5768,23 +5753,22 @@
 			if(CollectionUtils.isNotEmpty(packingRecordIdList)){
 				json.put("packingRecordIds", packingRecordIdList);
 			}
-			appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_PACKING, Log.TYPE_ADD, "装配记录ids:" + packingRecordIdList + ",装配产生包实例结果:" + toussesArray);
-			logger.debug("装配记录ids:" + packingRecordIdList + ",装配产生包实例结果:" + toussesArray);
 		}else{
 			throw new RuntimeException("装配失败!");
 		}
-		
-		// 将用户打包时常用的字段记录到session中
-		updatePackingConfigSession(session, inspector, inspectorCode, operator, operatorCode, reviewer, reviewerCode,sterileUserName,sterileUserCode,wrapper, wrapperCode,
-				packageType, sterilingType, sterilizerName, sterileFrequency, taskGroup, false, paramsObj.optString("packingType"));
-		
-		//调用websocket消息推送
-		WebSocketServer.noticeSendMessage(websocketSessionId,loginUser.getOrgUnitCodingFromSupplyRoomConfig(),
-				Log.MODEL_PACKING,taskGroup,NoticeType.REFRESH.getCode());
-		//调用websocket消息推送(向该审核任务组推送)
-		if(StringUtils.equals(Constants.STR_YES, tdOfPackingTask.getIsReview())){
-			WebSocketServer.noticeSendMessage(websocketSessionId,AcegiHelper.getCurrentOrgUnitCode(),
-					Log.MODEL_REVIEW,taskGroup,NoticeType.REFRESH.getCode());
+		if(packingPara.getLastTime()){
+			// 将用户打包时常用的字段记录到session中
+			updatePackingConfigSession(session, inspector, inspectorCode, operator, operatorCode, reviewer, reviewerCode,sterileUserName,sterileUserCode,wrapper, wrapperCode,
+					packageType, sterilingType, sterilizerName, sterileFrequency, taskGroup, false, paramsObj.optString("packingType"));
+			
+			//调用websocket消息推送
+			WebSocketServer.noticeSendMessage(websocketSessionId,loginUser.getOrgUnitCodingFromSupplyRoomConfig(),
+					Log.MODEL_PACKING,taskGroup,NoticeType.REFRESH.getCode());
+			//调用websocket消息推送(向该审核任务组推送)
+			if(StringUtils.equals(Constants.STR_YES, tdOfPackingTask.getIsReview())){
+				WebSocketServer.noticeSendMessage(websocketSessionId,AcegiHelper.getCurrentOrgUnitCode(),
+						Log.MODEL_REVIEW,taskGroup,NoticeType.REFRESH.getCode());
+			}
 		}
 		//if(true){throw new RuntimeException("装配速度测试 ");}
 		return json.toString();