Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/dwr/table/SterileLoadingTableManager.java =================================================================== diff -u -r22815 -r23362 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/dwr/table/SterileLoadingTableManager.java (.../SterileLoadingTableManager.java) (revision 22815) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/dwr/table/SterileLoadingTableManager.java (.../SterileLoadingTableManager.java) (revision 23362) @@ -328,7 +328,7 @@ rownum = " rownum = 1 and "; } String sql = " select "+top+" rb.id from reviewedbasket rb join container c on rb.container_id = c.id" - + " where "+rownum+" rb.container_id = "+container.getId()+" and c.status = '"+Container.CONTAINER_STATUS_STERILIZELOADING+"'" + + " where "+rownum+" rb.container_id = "+container.getId()+" and (c.status = '"+Container.CONTAINER_STATUS_STERILIZELOADING+"' or c.status='"+Container.CONTAINER_STATUS_FREE+"')" + " order by rb.id desc"; ResultSet rs = objectDao.executeSql(sql); try { Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js =================================================================== diff -u -r22987 -r23362 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js (.../sterilizationLoadingForm.js) (revision 22987) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js (.../sterilizationLoadingForm.js) (revision 23362) @@ -127,10 +127,14 @@ } tousseStore.load(); stasticsStore.load() - //刷新入筐器械包列表的数据 - reviewedPanel.loader.load(reviewedPanel.root,function(){ - //reviewedPanel.expandAll(); - }); + //如果篮筐内器械包数量为空,删除此篮筐记录(释放篮筐) + if(tousseStore.getCount() == 0) { + delEmptyBasket(); + } else { + reviewedPanel.loader.load(reviewedPanel.root,function(){ + //reviewedPanel.expandAll(); + }); + } //待灭菌装载列表数据源重新刷新 waitSterileLoadingTousseStore.reload(); hiddenMask();//进度条结束 @@ -158,10 +162,14 @@ tousseStore.remove(rowDataArray[i]); } stasticsStore.remove(row); - //刷新入筐器械包列表的数据 - reviewedPanel.loader.load(reviewedPanel.root,function(){ - //reviewedPanel.expandAll(); - }); + //如果篮筐内器械包数量为空,删除此篮筐记录(释放篮筐) + if(tousseStore.getCount() == 0) { + delEmptyBasket(); + } else { + reviewedPanel.loader.load(reviewedPanel.root,function(){ + //reviewedPanel.expandAll(); + }); + } //待灭菌装载列表数据源重新刷新 waitSterileLoadingTousseStore.reload(); hiddenMask();//进度条结束