Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java =================================================================== diff -u -r17478 -r17816 --- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java (.../WashAndDisinfectRecordAction.java) (revision 17478) +++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java (.../WashAndDisinfectRecordAction.java) (revision 17816) @@ -274,26 +274,20 @@ public void deleteWashAndDisinfectRecord() { String idStr = StrutsParamUtils.getPraramValue("ids", ""); - String message = ""; + boolean success = true; + String msg = "删除成功！"; try { if (StringUtils.isNotBlank(idStr)) { String[] str = idStr.split(";"); for (String id : str) { - message = washAndDisinfectRecordManager - .deleteWashAndDisinfectRecordById(id); + washAndDisinfectRecordManager.deleteWashAndDisinfectRecordById(id); } } } catch (Exception e) { - message = "{'success':'false'}"; + success = false; + msg = e.getMessage(); } - HttpServletResponse httpServletResponse = StrutsParamUtils - .getResponse(); - httpServletResponse.setCharacterEncoding("UTF-8"); - try { - httpServletResponse.getWriter().print(message); - } catch (IOException e) { - e.printStackTrace(); - } + StrutsResponseUtils.output(success, msg); } /** Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp =================================================================== diff -u -r17230 -r17816 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 17230) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 17816) @@ -184,7 +184,7 @@
- + Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java =================================================================== diff -u -r17791 -r17816 --- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java (.../WashAndDisinfectRecordManager.java) (revision 17791) +++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java (.../WashAndDisinfectRecordManager.java) (revision 17816) @@ -34,7 +34,7 @@ public List getWashAndDisinfectRecordByBasket(long basketId); - public String deleteWashAndDisinfectRecordById(String id); + public void deleteWashAndDisinfectRecordById(String id); public void saveOrUpdateMaterials(List materials); Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r17739 -r17816 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 17739) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 17816) @@ -1683,7 +1683,7 @@ ''+ reduceButton + ''+ - ''+ + ''+ ''+ ''+ ''); Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp =================================================================== diff -u -r17625 -r17816 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 17625) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 17816) @@ -1113,7 +1113,7 @@

记住回收人

清除过滤
-
添加
+
添加
入筐入筐丢失报废删除
Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java =================================================================== diff -u -r17791 -r17816 --- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java (.../WashAndDisinfectRecordManagerImpl.java) (revision 17791) +++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java (.../WashAndDisinfectRecordManagerImpl.java) (revision 17816) @@ -654,56 +654,51 @@ Long.valueOf(id)); } - public String deleteWashAndDisinfectRecordById(String id) { - WashAndDisinfectRecord washAndDisinfectRecord = getWashAndDisinfectRecordById(id); + public void deleteWashAndDisinfectRecordById(String id) { + WashAndDisinfectRecord washRecord = getWashAndDisinfectRecordById(id); - if (WashAndDisinfectRecord.STATUS_WASHED.equals(washAndDisinfectRecord - .getWashStatus()) - || WashAndDisinfectRecord.STATUS_WASHFAILD - .equals(washAndDisinfectRecord.getWashStatus())) { - return ""; + if(washRecord == null){ + throw new RuntimeException("ID=" + id + "的清洗记录已不存在！"); } - //修改篮筐状态 - for (ClassifyBasket classifyBasket : washAndDisinfectRecord - .getClassifyBaskets()) { - Container container = containerManager - .getContainerByBarcode(classifyBasket.getContainerBarcode()); - if (container != null - && Container.CONTAINER_STATUS_WASHING.equals(container - .getStatus())) { - container.setStatus(Container.CONTAINER_STATUS_WASHLOADING); + if(washRecord.getClassifyBaskets() != null){ + //修改篮筐状态 + for (ClassifyBasket classifyBasket : washRecord.getClassifyBaskets()) { + Container container = containerManager.getContainerByBarcode(classifyBasket.getContainerBarcode()); + if (container != null) { + if(Container.CONTAINER_STATUS_WASHLOADING.equals(container.getStatus())){ + continue; + } + if(Container.CONTAINER_STATUS_PACKED.equals(container.getStatus())){ + throw new RuntimeException(container.getContainerName() + "，已装配完成，不能删除！"); + } + //清洗完成、清洗中、清洗失败删除后篮筐状态回滚 + List washRecrods = classifyBasket.getWashAndDisinfectRecords(); + //篮筐多次清洗时状态不用回滚 + if(CollectionUtils.isNotEmpty(washRecrods) && washRecrods.size() == 1){ + container.setStatus(Container.CONTAINER_STATUS_WASHLOADING); + } + } } - } - String message = "{'success':'true','message':'删除成功!'}"; - String sql1 = "delete ClassifyBasket_WashRecord " - + "where WashAndDisinfectRecord_ID = '" - + washAndDisinfectRecord.getId() + "'"; - - String sql2 = "delete WashRecord_WashMaterial " - + "where WashAndDisinfectRecord_ID = '" - + washAndDisinfectRecord.getId() + "'"; + String basketSQL = String.format("delete ClassifyBasket_WashRecord where WashAndDisinfectRecord_ID = %s", washRecord.getId()); + String materialSQL = String.format("delete WashRecord_WashMaterial where WashAndDisinfectRecord_ID = %s", washRecord.getId()); try { - objectDao.excuteSQL(sql1); - objectDao.excuteSQL(sql2); - Long recordId = washAndDisinfectRecord.getId(); - String logMsg = "serialNumber : " + washAndDisinfectRecord.getSerialNumber(); - washAndDisinfectRecord.setWashAndDisinfectMaterials(null); - washAndDisinfectRecord.setClassifyBaskets(null); - saveOrUpdate(washAndDisinfectRecord); - objectDao.delete(washAndDisinfectRecord); + objectDao.excuteSQL(basketSQL); + objectDao.excuteSQL(materialSQL); + Long recordId = washRecord.getId(); + String logMsg = "serialNumber : " + washRecord.getSerialNumber(); + washRecord.setWashAndDisinfectMaterials(null); + washRecord.setClassifyBaskets(null); + saveOrUpdate(washRecord); + objectDao.delete(washRecord); appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_WASH, "D", "id:" + recordId + ",data:" + logMsg); } catch (Exception e) { - message = "{'success':'false','message':'流水号为:" - + washAndDisinfectRecord.getSerialNumber() - + " 的清洗记录的器械包已有装配记录，不能删除。'}"; - return message; + throw new RuntimeException("删除失败，请联系管理员！"); } - return message; } /** Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js =================================================================== diff -u -r17796 -r17816 --- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js (.../washAndDisinfectView.js) (revision 17796) +++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js (.../washAndDisinfectView.js) (revision 17816) @@ -15,18 +15,13 @@ var ids = ""; for (var i = 0, len = records.length; i < len; i++) { - var washStatus = records[i].data['washStatus']; - if(washStatus == washed || washStatus == washfaild){ - continue; - } if(ids != ""){ ids += ";"; } ids += records[i].data['id']; } - if(ids == ""){ - showResult(washed + "或" + washfaild + "的记录不允许删除！"); + showResult("请选择要删除的清洗记录！"); return false; } @@ -40,18 +35,12 @@ }, success : function(response, options) { var result = Ext.decode(response.responseText); - var success = result.success; - if (true == success || success == 'true') { - MsgTip.msg('提示', '删除成功', true, 3); - grid.dwrReload(); - } else { - MsgTip.msg('提示', '该清洗记录的器械包已有装配记录，不能删除', true, 3); - grid.dwrReload(); - } + showResult(result.message); + grid.dwrReload(); }, failure : function(response, options) { var result = Ext.decode(response.responseText); - MsgTip.msg('提示', result.message, true, 3); + showResult(result.message); } }); }