Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManagerImpl.java =================================================================== diff -u -r27476 -r28804 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManagerImpl.java (.../ReviewedBasketManagerImpl.java) (revision 27476) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManagerImpl.java (.../ReviewedBasketManagerImpl.java) (revision 28804) @@ -67,8 +67,10 @@ JSONUtil.addLogProperty(json, "reviewedBasketContainer",reviewedBasket.getContainer()); } appLogManager.saveLog(AcegiHelper.getLoginUser(), "灭菌篮筐", Log.TYPE_DELETE, json); + objectDao.executeUpdate(String.format("update %s set reviewBasket_id=null,sterilizationBasket=null where reviewBasket_id=%s", + TousseInstance.class.getSimpleName(),reviewedBasket.getId())); + objectDao.delete(reviewedBasket); } - objectDao.delete(reviewedBasket); } @Override Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js =================================================================== diff -u -r28784 -r28804 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js (.../sterilizationLoadingForm.js) (revision 28784) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js (.../sterilizationLoadingForm.js) (revision 28804) @@ -129,15 +129,15 @@ tousseStore.load(); stasticsStore.load() //如果篮筐内器械包数量为空,删除此篮筐记录(释放篮筐) - if(tousseStore.getCount() == 0) { + if(tousseStore.getCount() <= 1) { delEmptyBasket(); } else { reviewedPanel.loader.load(reviewedPanel.root,function(){ //reviewedPanel.expandAll(); }); } //待灭菌装载列表数据源重新刷新 - waitSterileLoadingTousseStore.reload(); + //waitSterileLoadingTousseStore.reload(); hiddenMask();//进度条结束 }, failure : function(response, options) { @@ -172,7 +172,7 @@ }); } //待灭菌装载列表数据源重新刷新 - waitSterileLoadingTousseStore.reload(); + //waitSterileLoadingTousseStore.reload(); hiddenMask();//进度条结束 }, failure : function(response, options) { @@ -238,8 +238,6 @@ } } } - //待灭菌装载列表数据源重新刷新 - waitSterileLoadingTousseStore.reload(); //如果篮筐内器械包数量为空,删除此篮筐记录(释放篮筐) if(tousseStore.getCount() == 0) { delEmptyBasket(); @@ -268,6 +266,8 @@ reviewedPanel.loader.load(reviewedPanel.root,function(){ //reviewedPanel.expandAll(); }); + //待灭菌装载列表数据源重新刷新 + waitSterileLoadingTousseStore.reload(); }, failure : function(response, options) { var result = Ext.decode(response.responseText); @@ -782,6 +782,7 @@ isLoading = false; }); if(result.data && result.data.length > 0){ + var reviewedBasketIdOfTousseInstance; for(var i = 0;i < result.data.length;i++){ var currentTousseInstance = new tousseInstanceRecord({ depart:result.data[i].depart, @@ -812,7 +813,11 @@ if(isInsertFirst){ Ext.getCmp('tousseGrid').getStore().insert(0,currentTousseInstance);//最新扫描的器械包放到第一行 } + if(!reviewedBasketIdOfTousseInstance){ + reviewedBasketIdOfTousseInstance = result.data[i].reviewBasketId; + } } + reviewedBasketId = reviewedBasketIdOfTousseInstance; //待灭菌装载列表数据源重新刷新 waitSterileLoadingTousseStore.reload(); Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r28556 -r28804 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 28556) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 28804) @@ -1179,6 +1179,9 @@ vo.setSterilingMode(rs.getString("sterilingMode")); }catch(Exception e){} try{ + vo.setReviewBasketId(rs.getLong("reviewBasket_id")); + }catch(Exception e){} + try{ vo.setValidUntil(ForgonDateUtils.safelyFormatDate(rs.getTimestamp("validUntil"), Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMM, null)); }catch(Exception e){} try{ @@ -2010,7 +2013,7 @@ } //1.根据传入的条码查询vo - String querySql = "select ti.tousseName,ti.departCoding,ti.depart,ti.sterilingMode,b.barcode,td.isTraceable "+ + String querySql = "select ti.reviewBasket_id,ti.tousseName,ti.departCoding,ti.depart,ti.sterilingMode,b.barcode,td.isTraceable "+ "from TousseInstance ti join barcodeDevice b on ti.id=b.id "+ "join TousseDefinition td on ti.tousseDefinition_id=td.id "+ "join TousseDefinition tdAncestor on td.ancestorID=tdAncestor.id "+ Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java =================================================================== diff -u -r28521 -r28804 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java (.../TousseInstanceAction.java) (revision 28521) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java (.../TousseInstanceAction.java) (revision 28804) @@ -977,6 +977,7 @@ json.put("barcode", tousseInstance.getFixedBarcode()); json.put("fixedBarcode", tousseInstance.getFixedBarcode()); json.put("departCoding", tousseInstance.getDepartCoding()); + json.put("reviewBasketId", tousseInstance.getReviewBasketId()); json.put("amount", 1); bMap.put(objName, json); } @@ -988,6 +989,7 @@ json.put("fixedBarcode", ""); json.put("departCoding", tousseInstance.getDepartCoding()); json.put("sterilingMode", tousseInstance.getSterilingMode()); + json.put("reviewBasketId", tousseInstance.getReviewBasketId()); json.put("amount", 1); bMap.put(tousseInstance.getBarcode(), json); }