Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java =================================================================== diff -u -r12835 -r12838 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java (.../WareHouseManagerImpl.java) (revision 12835) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java (.../WareHouseManagerImpl.java) (revision 12838) @@ -1,11 +1,13 @@ package com.forgon.disinfectsystem.basedatamanager.warehouse.service; import java.util.ArrayList; +import java.util.Collection; import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; +import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.apache.commons.collections4.CollectionUtils; @@ -15,6 +17,8 @@ import com.forgon.directory.model.OrgUnit; import com.forgon.directory.service.OrgUnitManager; import com.forgon.directory.vo.LoginUserData; +import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager; +import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig; import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsBatchStock; import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsStock; import com.forgon.disinfectsystem.entity.assestmanagement.GodownEntry; @@ -33,6 +37,7 @@ import com.forgon.disinfectsystem.entity.stocktakemanager.StockTakeItem; import com.forgon.serialnumber.model.SerialNum; import com.forgon.serialnumber.service.SerialNumManager; +import com.forgon.tools.SqlBuilder; import com.forgon.tools.hibernate.ObjectDao; /** @@ -44,8 +49,9 @@ private ObjectDao objectDao; private OrgUnitManager orgUnitManager; - private SerialNumManager serialNumManager; + private SupplyRoomConfigManager supplyRoomConfigManager; + public void setObjectDao(ObjectDao objectDao) { this.objectDao = objectDao; } @@ -58,6 +64,11 @@ this.serialNumManager = serialNumManager; } + public void setSupplyRoomConfigManager( + SupplyRoomConfigManager supplyRoomConfigManager) { + this.supplyRoomConfigManager = supplyRoomConfigManager; + } + /** * 查询所有的仓库 * @return @@ -110,7 +121,17 @@ } return objectDao.findBySql(WareHouse.class.getSimpleName(), sql); } - + @SuppressWarnings("unchecked") + public List getWareHouseListByOrgUnit(Collection orgUnitCodes){ + if(orgUnitCodes != null && !orgUnitCodes.isEmpty()){ + String sql = " where "; + sql += SqlBuilder.build_IN_Statement("po.orgUnitCode", SqlBuilder.IN, orgUnitCodes); + sql += " order by sequence"; + return objectDao.findBySql(WareHouse.class.getSimpleName(), sql); + }else{ + return null; + } + } public List getWareHouseListByCurrentOrgUnit(){ LoginUserData loginUserData = AcegiHelper.getLoginUser(); List list = new ArrayList(); @@ -295,19 +316,48 @@ OrgUnit orgUnit = new OrgUnit(); orgUnit.setOrgUnitCoding(orgUnitCoding); List wareHouselist = getWareHouseListByOrgUnit(orgUnit); + return WareHouseListToJSON(wareHouselist); + } + + private JSONObject WareHouseListToJSON( + List wareHouselist) { List> data = new ArrayList>(); - for (WareHouse wareHouse : wareHouselist) { - Map temp = new HashMap(); - temp.put("id", wareHouse.getId()); - temp.put("name", wareHouse.getName()); - temp.put("orgUnitCode", wareHouse.getOrgUnitCode()); - data.add(temp); + if(wareHouselist != null && !wareHouselist.isEmpty()){ + for (WareHouse wareHouse : wareHouselist) { + Map temp = getWareHouseInfoMap(wareHouse); + if(temp != null){ + data.add(temp); + } + } } Map map = new HashMap(); map.put("totalCount", data.size()); map.put("data", data); map.put("success", true); - return JSONObject.fromObject(map); } + + private Map getWareHouseInfoMap(WareHouse wareHouse) { + Map temp = null; + if(wareHouse != null){ + temp = new HashMap(); + temp.put("id", wareHouse.getId()); + temp.put("name", wareHouse.getName()); + temp.put("orgUnitCode", wareHouse.getOrgUnitCode()); + } + return temp; + } + + @Override + public JSONObject getCssdWareHouse() { + JSONArray jsonArray = supplyRoomConfigManager.getCssdList(); + List codeList = new ArrayList(); + for(int i = 0; i < jsonArray.size();++i){ + JSONObject obj = jsonArray.getJSONObject(i); + String code = obj.optString("departCode"); + codeList.add(code); + } + List list = getWareHouseListByOrgUnit(codeList); + return WareHouseListToJSON(list); + } } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java =================================================================== diff -u -r12331 -r12838 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java (.../SupplyRoomConfigManagerImpl.java) (revision 12331) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java (.../SupplyRoomConfigManagerImpl.java) (revision 12838) @@ -1,11 +1,15 @@ package com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service; +import java.util.ArrayList; import java.util.Calendar; import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; + import org.apache.commons.lang.StringUtils; import com.forgon.directory.model.OrgUnit; @@ -457,4 +461,26 @@ } return null; } + + @Override + public JSONArray getCssdList() { + SupplyRoomConfig firstSupplyRoom = getFirstSupplyRoomConfig(); + List secondSupplyRooms = getSecondSupplyRoomList(); + JSONArray jsonArray = new JSONArray(); + if (firstSupplyRoom != null) { + JSONObject temp = new JSONObject(); + temp.put("departCode", firstSupplyRoom.getOrgUnitCoding()); + temp.put("departName", firstSupplyRoom.getOrgUnitName()); + jsonArray.add(temp); + } + if (secondSupplyRooms != null) { + for (SupplyRoomConfig config : secondSupplyRooms) { + JSONObject temp = new JSONObject(); + temp.put("departCode", config.getOrgUnitCoding()); + temp.put("departName", config.getOrgUnitName()); + jsonArray.add(temp); + } + } + return jsonArray; + } } Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java =================================================================== diff -u -r12817 -r12838 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java (.../DiposableGoodsTableManager.java) (revision 12817) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java (.../DiposableGoodsTableManager.java) (revision 12838) @@ -14,7 +14,9 @@ import com.forgon.databaseadapter.service.DateQueryAdapter; import com.forgon.disinfectsystem.diposablegoods.service.DiposableGoodBatchStockManager; import com.forgon.disinfectsystem.diposablegoods.service.DiposableGoodsManager; +import com.forgon.disinfectsystem.diposablegoods.service.DisposableGoodsBatchManager; import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods; +import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsBatch; import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsBatchStock; import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsStock; import com.forgon.disinfectsystem.entity.basedatamanager.datasynchronization.HisMaterialDefinition; @@ -36,6 +38,8 @@ private DiposableGoodsManager diposableGoodsManager; private DateQueryAdapter dateQueryAdapter; + + private DisposableGoodsBatchManager disposableGoodBatchManager; public void setDateQueryAdapter(DateQueryAdapter dateQueryAdapter) { this.dateQueryAdapter = dateQueryAdapter; @@ -54,6 +58,11 @@ DiposableGoodsManager diposableGoodsManager) { this.diposableGoodsManager = diposableGoodsManager; } + public void setDisposableGoodBatchManager( + DisposableGoodsBatchManager disposableGoodBatchManager) { + this.disposableGoodBatchManager = disposableGoodBatchManager; + } + // 查找物品库存 public String findDisposableGoodsStockTableList( Map> parameterMap) { @@ -444,19 +453,43 @@ DisposableGoodsStock goods = diposableGoodsManager .getDiposableGoodsStockById(goodsId); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); - for (DisposableGoodsBatchStock batchStock : goods.getGoodsBatchs()) { - if (batchStock.getBatchNumber().equals(batchNumber)) { - String Manufacturer = batchStock.getManufacturer(); - String sterileBatchNumber = batchStock.getSterileBatchNumber(); - String expDateStr = dateFormat.format(batchStock.getExpDate()); - return (StringUtils.isBlank(Manufacturer) ? "" : Manufacturer) - + "#;" - + (StringUtils.isBlank(sterileBatchNumber) ? "" - : sterileBatchNumber) - + "#;" - + (StringUtils.isBlank(expDateStr) ? "" :expDateStr); + if(goods != null){ + for (DisposableGoodsBatchStock batchStock : goods.getGoodsBatchs()) { + if (batchStock.getBatchNumber().equals(batchNumber)) { + String Manufacturer = batchStock.getManufacturer(); + String sterileBatchNumber = batchStock.getSterileBatchNumber(); + String expDateStr = dateFormat.format(batchStock.getExpDate()); + return (StringUtils.isBlank(Manufacturer) ? "" : Manufacturer) + + "#;" + + (StringUtils.isBlank(sterileBatchNumber) ? "" + : sterileBatchNumber) + + "#;" + + (StringUtils.isBlank(expDateStr) ? "" :expDateStr); + } } } return ""; } + /** + * 根据一次性物品定义的id，获取指定批次号的批次属性 + * @param disposableGoodsId 一次性物品定义的id + * @param batchNumber 批次号 + * @return + */ + public String getDisposableGoodsBatchPropertyByDisposableGoodsID(String disposableGoodsId,String batchNumber){ + DisposableGoodsBatch disposableGoodsBatch = disposableGoodBatchManager.getDisposableGoodsBatchProperty(disposableGoodsId, batchNumber); + if(disposableGoodsBatch != null){ + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + String Manufacturer = disposableGoodsBatch.getManufacturer(); + String sterileBatchNumber = disposableGoodsBatch.getSterileBatchNumber(); + String expDateStr = dateFormat.format(disposableGoodsBatch.getExpDate()); + return (StringUtils.isBlank(Manufacturer) ? "" : Manufacturer) + + "#;" + + (StringUtils.isBlank(sterileBatchNumber) ? "" + : sterileBatchNumber) + + "#;" + + (StringUtils.isBlank(expDateStr) ? "" :expDateStr); + } + return ""; + } } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/action/WareHouseAction.java =================================================================== diff -u -r12835 -r12838 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/action/WareHouseAction.java (.../WareHouseAction.java) (revision 12835) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/action/WareHouseAction.java (.../WareHouseAction.java) (revision 12838) @@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletResponse; +import net.sf.json.JSONArray; import net.sf.json.JSONObject; import net.sf.json.JsonConfig; import net.sf.json.processors.DefaultValueProcessor; @@ -19,16 +20,17 @@ import org.apache.struts2.convention.annotation.Action; import org.apache.struts2.convention.annotation.Namespace; import org.apache.struts2.convention.annotation.ParentPackage; +import org.apache.struts2.util.StrutsUtil; import com.forgon.directory.acegi.tools.AcegiHelper; import com.forgon.directory.model.BarcodeDevice; import com.forgon.directory.model.OrgUnit; import com.forgon.directory.vo.LoginUserData; import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager; import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager; -import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig; import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse; import com.forgon.tools.StrutsParamUtils; +import com.forgon.tools.util.StrutsUtils; import com.opensymphony.xwork2.ModelDriven; import com.opensymphony.xwork2.Preparable; @@ -203,31 +205,11 @@ * @return */ public void getCssds() { - SupplyRoomConfig firstSupplyRoom = supplyRoomConfigManager - .getFirstSupplyRoomConfig(); - List secondSupplyRooms = supplyRoomConfigManager - .getSecondSupplyRoomList(); - List> mapList = new ArrayList>(); - if (firstSupplyRoom != null) { - Map temp = new HashMap(); - temp.put("departCode", firstSupplyRoom.getOrgUnitCoding()); - temp.put("departName", firstSupplyRoom.getOrgUnitName()); - mapList.add(temp); - } + JSONArray jsonArray = supplyRoomConfigManager.getCssdList(); + JSONObject json = new JSONObject(); + json.put("totalCount", jsonArray.size()); + json.put("data", jsonArray); - if (secondSupplyRooms != null) { - for (SupplyRoomConfig config : secondSupplyRooms) { - Map temp = new HashMap(); - temp.put("departCode", config.getOrgUnitCoding()); - temp.put("departName", config.getOrgUnitName()); - mapList.add(temp); - } - } - Map map = new HashMap(); - map.put("totalCount", mapList.size()); - map.put("data", mapList); - JSONObject json = JSONObject.fromObject(map); - HttpServletResponse response = StrutsParamUtils.getResponse(); response.setCharacterEncoding("UTF-8"); PrintWriter out; @@ -248,8 +230,14 @@ */ public void getWareHouseData() { try { - String orgUnitCoding = AcegiHelper.getLoginUser().getCurrentOrgUnitCode(); - JSONObject json = wareHouseManager.getAllWareHouse(orgUnitCoding); + JSONObject json = null; + String isCssd = StrutsParamUtils.getPraramValue("isCssd",null); + if(StringUtils.equals(isCssd, "yes")){ + json = wareHouseManager.getCssdWareHouse(); + }else{ + String orgUnitCoding = AcegiHelper.getLoginUser().getCurrentOrgUnitCode(); + json = wareHouseManager.getAllWareHouse(orgUnitCoding); + } HttpServletResponse response = StrutsParamUtils.getResponse(); response.setCharacterEncoding("UTF-8"); PrintWriter out = response.getWriter(); Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsBatchManager.java =================================================================== diff -u -r12833 -r12838 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsBatchManager.java (.../DisposableGoodsBatchManager.java) (revision 12833) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsBatchManager.java (.../DisposableGoodsBatchManager.java) (revision 12838) @@ -12,4 +12,12 @@ * @return 一次性物品定义下的所有批次定义 */ public List getDisposableGoodsBatch(String disposableGoodsId,String spell); + /** + * 根据一次性物品定义的id获取一次性物品批次的属性 + * @param disposableGoodsId 一次性物品定义的id + * @param batchNumber 批次号 + * @return 一次性物品定义下的某个批次号的批次 + */ + public DisposableGoodsBatch getDisposableGoodsBatchProperty(String disposableGoodsId,String batchNumber); + } Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/appropriationView.js =================================================================== diff -u -r12811 -r12838 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/appropriationView.js (.../appropriationView.js) (revision 12811) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/appropriationView.js (.../appropriationView.js) (revision 12838) @@ -6,10 +6,9 @@ //单价数据源 var priceStore = null; var PriceRecord = null; - // 清除表单数据 function clearFormData(){ - diposableGoodsBatchNumStore.removeAll(); + disposableGoodsBatchNumStore.removeAll(); priceStore.removeAll(); } // 清空批次和价格 @@ -18,7 +17,7 @@ clearPrice(); } function clearBatchNumber() { - clearCombo(diposableGoodsBatchNumStore,'batchNumber1'); + clearCombo(disposableGoodsBatchNumStore,'batchNumber1'); } // 清空价格 function clearPrice() { @@ -32,7 +31,7 @@ } for(var i = 0;i 0 && (!commonEntry.isOpen())){ var combo = top.Ext.getCmp("targetWareHouse"); - var outIndex = (1 % records.length); // 触发目标仓库选中事件 - combo.fireEvent('select', combo,records[outIndex],outIndex); + combo.fireEvent('select', combo,records[0],0); } - top.Ext.getCmp("name1").enable(); } } }); -var diposableGoodsStore = new Ext.data.Store({ +var disposableGoodsStockStore = new Ext.data.Store({ proxy : new Ext.data.HttpProxy({ - url : WWWROOT + '/disinfectSystem/diposableGoodsAction!getDiposableGoodsData.do', + url : WWWROOT + '/disinfectSystem/disposableGoodsStockAction!getDisposableGoodsStockData.do', method : 'POST' }), reader : new Ext.data.JsonReader({ @@ -107,10 +124,15 @@ {name : 'name',mapping : 'name'}, {name : 'referencePrice',mapping : 'referencePrice'}, {name : 'supplierName',mapping : 'supplierName'}, - ]) + ]), + listeners : { + beforeload : function(store,option) { + store.baseParams['wareHouseId'] = top.Ext.getCmp('warehouseID').getValue(); + } + } }); -var diposableGoodsBatchNumStore = new Ext.data.Store({ +var disposableGoodsBatchNumStore = new Ext.data.Store({ reader : new Ext.data.JsonReader({ fields : [ {name : 'id'}, @@ -146,14 +168,17 @@ {name : 'canOutAmount'}, {name : 'cost'}, {name : 'batchNumber'}, + {name : 'sterileBatchNumber'}, + {name : 'manufacturer'}, + {name : 'certification'}, {name : 'identification'}, {name : 'identificationID'}, {name : 'batchID'}, {name : 'disposableGoodsStockID'}, {name : 'expDate' ,type : 'date'}, - {name : 'supplierName'} + {name : 'supplierName'}, + {name : 'producingArea'} ]); - /** * 设置仓库的id和name的隐藏域的内容 * @param id @@ -163,8 +188,15 @@ top.Ext.getCmp('warehouseID').setValue(id); top.Ext.getCmp('warehouseName').setValue(name); } - /** + * 判断源仓库和目标仓库是不是一样的 + */ +function isWareHouseSame(){ + var wareHouse1 = top.Ext.getCmp('warehouseID').getValue(); + var wareHouse2 = top.Ext.getCmp('targetWareHouseId').getValue(); + return wareHouse1 == wareHouse2; +} +/** * 设置目标仓库的id和name的隐藏域的内容 * @param id * @param name @@ -177,7 +209,7 @@ // 获取当前选中的批次 function getSelectedBatch(){ var batchNumber = top.Ext.getCmp('batchNumber1').getValue(); - var batch = findRecordDataByNameAndValue(diposableGoodsBatchNumStore,'batchNumber',batchNumber); + var batch = findRecordDataByNameAndValue(disposableGoodsBatchNumStore,'batchNumber',batchNumber); return batch; } // 获取当前选中的价格 @@ -224,6 +256,10 @@ // var cost = top.Ext.getCmp('cost').getValue(); var expDate = top.Ext.getCmp('expDate').getValue(); var supplierName = top.Ext.getCmp('supplierName').getValue(); + var sterileBatchNumber = top.Ext.getCmp('sterileBatchNumber').getValue(); + var manufacturer = top.Ext.getCmp('manufacturer').getValue(); + var producingArea = top.Ext.getCmp('producingArea').getValue(); + var certification = top.Ext.getCmp('certification').getValue(); //添加操作 var godownEntryItem = new GodownEntryItemRecord({ disposableGoodsID: batch.disposableGoodsID, @@ -242,7 +278,10 @@ cost : priceAmount.price, batchNumber : batch.batchNumber, expDate : expDate, - supplierName : supplierName + supplierName : supplierName, + sterileBatchNumber : sterileBatchNumber, + manufacturer : manufacturer, + producingArea : producingArea }); top.Ext.getCmp('appropriateItemGrid').getStore().add(godownEntryItem); @@ -251,7 +290,7 @@ // top.Ext.getCmp('batchNumber1').setValue(''); // top.Ext.getCmp('cost').setValue(''); // top.Ext.getCmp('disposableGoodsStockID').setValue(''); -// diposableGoodsBatchNumStore.removeAll(); +// disposableGoodsBatchNumStore.removeAll(); // top.Ext.getCmp('expDate').setValue(''); // top.Ext.getCmp('supplierName').setValue(''); // top.Ext.getCmp('name1').focus(); @@ -275,6 +314,7 @@ // 清除表单数据 clearFormData(); wareHouseStore.load(); + targetWareHouseStore.load(); var toolbar = [{ xtype : 'hidden', name : 'disposableGoodsStockID', @@ -284,6 +324,22 @@ name : 'barcode', id : 'barcode' },{ + xtype : 'hidden', + name : 'sterileBatchNumber', + id : 'sterileBatchNumber' + },{ + xtype : 'hidden', + name : 'manufacturer', + id : 'manufacturer' + },{ + xtype : 'hidden', + name : 'certification', + id : 'certification' + },{ + xtype : 'hidden', + name : 'producingArea', + id : 'producingArea' + },{ text : '名称:' },{ xtype : 'combo', @@ -293,7 +349,7 @@ minChars : 0, valueField : 'id', displayField : 'name', - store : diposableGoodsStore, + store : disposableGoodsStockStore, forceSelection : true, lazyInit : false, triggerAction : 'all', @@ -308,17 +364,17 @@ top.Ext.getCmp('disposableGoodsStockID').setValue(record.data.id); top.Ext.getCmp('cost').setValue(record.data.referencePrice); top.Ext.getCmp('supplierName').setValue(record.data.supplierName); + top.Ext.getCmp('certification').setValue(record.data.certification); // 清空批次和价格 clearBatchNumberAndPrice(); var wareHouseid = top.Ext.getCmp('warehouseID').getValue(); - DiposableGoodsTableManager.getBatchsByDisposableGoodsIDAndWareHouse(record.data.id,wareHouseid,false,function(batchesStr){ + DiposableGoodsTableManager.getBatchsByDisposableGoodsStockIdAndWareHouse(record.data.id,wareHouseid,false,function(batchesStr){ var batches = JSON.parse(batchesStr); for(var i = 0;i list = objectDao.findBySql(DisposableGoodsBatch.class.getSimpleName(), sql); + if(CollectionUtils.isNotEmpty(list)){ + return list.get(0); + } + return null; + } + } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManager.java =================================================================== diff -u -r12803 -r12838 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManager.java (.../WareHouseManager.java) (revision 12803) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManager.java (.../WareHouseManager.java) (revision 12838) @@ -1,6 +1,7 @@ package com.forgon.disinfectsystem.basedatamanager.warehouse.service; import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -42,6 +43,12 @@ * @return */ public List getWareHouseListByOrgUnit(OrgUnit orgUnit); + /** + * 查询多个科室下的仓库 + * @param orgUnit 默认按科室id,如果id为空,则按code查询 + * @return + */ + public List getWareHouseListByOrgUnit(Collection orgUnitCodes); public List getWareHouseListByCurrentOrgUnit(); @@ -85,4 +92,9 @@ * @return */ public JSONObject getAllWareHouse(String orgUnitCoding); + /** + * 获取所有供应室的仓库，包括一级供应室和二级供应室 + * @return + */ + public JSONObject getCssdWareHouse(); } Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js =================================================================== diff -u -r12833 -r12838 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js (.../godownEntryView.js) (revision 12833) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js (.../godownEntryView.js) (revision 12838) @@ -709,7 +709,7 @@ var goodsId = top.Ext.getCmp('disposableGoodsID').getValue(); var batchNumber = record.data.batchNumber; //加载灭菌批号、生产厂家 - DiposableGoodsTableManager.getDiposableGoodBatchProperty(goodsId,batchNumber,function(result){ + DiposableGoodsTableManager.getDisposableGoodsBatchPropertyByDisposableGoodsID(goodsId,batchNumber,function(result){ if(result!=""){ var array = result.split("#;"); top.Ext.getCmp('manufacturer').setValue(array[0]); Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js =================================================================== diff -u -r12822 -r12838 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js (.../godownOutView.js) (revision 12822) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js (.../godownOutView.js) (revision 12838) @@ -104,7 +104,7 @@ ]), listeners : { beforeload : function(store,option) { - store.baseParams['wareHouseId'] = top.Ext.getCmp('warehouseID').getValue(id); + store.baseParams['wareHouseId'] = top.Ext.getCmp('warehouseID').getValue(); } } }); @@ -366,7 +366,7 @@ top.Ext.getCmp('name1').focus(); top.Ext.getCmp('name1').enable(); disposableGoodsStockStore.removeAll(); - disposableGoodsStockStore.reload(); + //disposableGoodsStockStore.reload(); }, specialkey : function(field, ee) { if (ee.getKey() == Ext.EventObject.ENTER) { Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java =================================================================== diff -u -r12331 -r12838 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java (.../SupplyRoomConfigManager.java) (revision 12331) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java (.../SupplyRoomConfigManager.java) (revision 12838) @@ -1,9 +1,13 @@ package com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service; +import java.util.ArrayList; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; +import net.sf.json.JSONArray; + import com.forgon.directory.model.OrgUnit; import com.forgon.directory.vo.LoginUserData; import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig; @@ -80,5 +84,7 @@ public boolean isCssdTraceabilitySystemRelativeDepartment(String orgUnitCoding); public OrgUnit getOrgUnitByOrgName(String depart); + + public JSONArray getCssdList(); }