Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java =================================================================== diff -u -r18065 -r18072 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 18065) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 18072) @@ -2162,8 +2162,7 @@ } @Override - public String quickRecycing(String id, String tousseBarcodes) { - String message = "{success:true}"; + public void quickRecycing(String id, String tousseBarcodes) { UseRecord useRecord = getUseRecordById(id); String[] barcodesArr = tousseBarcodes.split(";"); List tousseInstanceList = new ArrayList(); @@ -2175,11 +2174,14 @@ //验证选中的器械包是否已被快速回收并关联到另外的使用记录 TousseInstance tousseInstance = tousseInstanceManager. getTousseInstanceByBarcode(barcodesArr[i]); + if(tousseInstance == null){ + throw new RuntimeException("未获取到条码为" + barcodesArr[i] + "的器械包"); + } UseRecord oldUseRecord = getUseRecordById(tousseInstance.getUseRecord_id()); if(useRecord == oldUseRecord){ tousseInstanceList.add(tousseInstance); }else{ - return message = "{success:false}"; + throw new RuntimeException("器械包"+tousseInstance.getTousseName() + "不在当前使用记录中,请先保存使用记录"); } } @@ -2220,8 +2222,6 @@ createRecyclingApplicationByUseRecords(idList,newUseRecord.getOperator(), newUseRecord.getDepart(),newUseRecord.getDepartCoding(),new Date()); - - return message; } // 审核,增加并发处理 Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js =================================================================== diff -u -r18066 -r18072 --- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js (.../config.js) (revision 18066) +++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js (.../config.js) (revision 18072) @@ -20,6 +20,8 @@ autoFillUserName:false, // 自动补全用户名的长度 autoFillUserNameLength:6, + //PDA使用记录是否启用快速回收 +// enableQuickRecycleInUseRecordWithPDA:true, // 是否支持部分终止申请单中的物品 enableTerminatePartOfApplication : false, //限制入库单填写的一次性物品为能申领的物品 Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java =================================================================== diff -u -r17981 -r18072 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java (.../UseRecordManager.java) (revision 17981) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java (.../UseRecordManager.java) (revision 18072) @@ -131,7 +131,7 @@ String applicant, String depart, String departCoding) throws Exception; - public String quickRecycing(String id,String tousseBarcodes); + public void quickRecycing(String id,String tousseBarcodes); // 审核 public void auditUseRecords_TRANS_REQUIRED(List ids); Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r17991 -r18072 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 17991) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 18072) @@ -148,6 +148,7 @@ import com.forgon.tools.Path; import com.forgon.tools.SpringBeanManger; import com.forgon.tools.SqlBuilder; +import com.forgon.tools.StrutsParamUtils; import com.forgon.tools.date.DateTools; import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.ObjectDao; @@ -3808,4 +3809,12 @@ } return JSONUtil.buildJsonObject(true, JSONArray.fromObject(urgents)).toString(); } + + public String quickRecycle(JSONObject params){ + String useRecordID = params.optString("id", ""); + String barcodes = params.optString("barcodes", ""); + + useRecordManager.quickRecycing(useRecordID,barcodes); + return JSONUtil.buildJsonObject(true).toString(); + } }