Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js =================================================================== diff -u -r21892 -r21893 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 21892) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 21893) @@ -1713,7 +1713,6 @@ sterilizationColumnTreeEditer.on("beforestartedit", function(thiz,el,v){ var tempNode = thiz.editNode;//将要编辑的节点&& tempNode.attributes.scanFixedBarcode == '是' - //alert(parseInt(tempNode.attributes.stockAmount)) if(thiz.editColIndex == 'amount' && parseInt(tempNode.attributes.stockAmount)>0){ return true; }else { Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r21886 -r21893 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 21886) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 21893) @@ -3069,6 +3069,11 @@ JSONArray jsonArray = new JSONArray(); Map bMap=Maps.newHashMap(); + String orgUnitCoding = AcegiHelper.getLoginUser() + .getOrgUnitCodingFromSupplyRoomConfig(); + // 当天审核的,未入筐的器械包 + List toussesOutsideBasketOfToday = tousseInstanceManager.getTodayReviewedTousseInstanceWithOutBasket(orgUnitCoding); + // 没入篮筐的器械包 if(CollectionUtils.isNotEmpty(tousseInstanceList)){ for (TousseInstance tousse : tousseInstanceList) { @@ -3102,10 +3107,14 @@ jsonObj.put("uiProvider", "col"); jsonObj.put("iconCls", "task"); jsonObj.put("leaf", true); + jsonObj.put("stockAmount",tousseInstanceManager.getTousseInstanceStockAmount(tousse.getBarcode()));//库存数量 + jsonObj.put("todayAmount",toussesOutsideBasketOfToday.size());//今日审核数量 if(!isCountBarcode){ bMap.put(tousse.getBarcode(), jsonObj); }else{ - jsonObj.put("barcode", tousseInstanceManager.getTousseInsFixedBarcode(tousseName));//固定条码 + String fixedBarcode = tousseInstanceManager.getTousseInsFixedBarcode(tousseName); + jsonObj.put("barcode",fixedBarcode);//固定条码 + jsonObj.put("stockAmount",tousseInstanceManager.getTousseInstanceStockAmount(fixedBarcode));//库存数量 bMap.put(key, jsonObj); } }