Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutToSupplyRoomView.js =================================================================== diff -u -r13089 -r13092 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutToSupplyRoomView.js (.../godownOutToSupplyRoomView.js) (revision 13089) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutToSupplyRoomView.js (.../godownOutToSupplyRoomView.js) (revision 13092) @@ -23,31 +23,6 @@ {name : 'deleteButton'} ]; -//供应室的仓库数据源 -var cssdWareHouseStore = new Ext.data.Store({ - proxy : new Ext.data.HttpProxy({ - url : WWWROOT + '/disinfectSystem/baseData/wareHouseAction!getWareHouseData.do?isCssd=yes', - method : 'POST' - }), - reader : new Ext.data.JsonReader({ - totalProperty : 'totalCount', - root : 'data' - }, [ - {name : 'id',mapping : 'id'}, - {name : 'name',mapping : 'name'}, - {name : 'orgUnitCode',mapping : 'orgUnitCode'}, - ]), - listeners : { - load : function(store,records) { - if(records.length > 0){ - var combo = top.Ext.getCmp("cssdWareHouse"); - // 触发目标仓库选中事件 - //combo.fireEvent('select', combo,records[0],0); - } - } - } -}); - // 清除表单数据 function clearFormData(){ diposableGoodsBatchNumStore.removeAll(); @@ -366,6 +341,31 @@ function addReceiveRecord(type) { + //供应室的仓库数据源 + var cssdWareHouseStore = new Ext.data.Store({ + proxy : new Ext.data.HttpProxy({ + url : WWWROOT + '/disinfectSystem/baseData/wareHouseAction!getWareHouseData.do?isCssd=yes', + method : 'POST' + }), + reader : new Ext.data.JsonReader({ + totalProperty : 'totalCount', + root : 'data' + }, [ + {name : 'id',mapping : 'id'}, + {name : 'name',mapping : 'name'}, + {name : 'orgUnitCode',mapping : 'orgUnitCode'}, + ]), + listeners : { + load : function(store,records) { + if(records.length > 0 && id == "") { + if (top.Ext.getCmp('cssdWareHouse')) { + top.Ext.getCmp('cssdWareHouse').setValue(records[0].data.id); + } + } + } + } + }); + var form = new top.Ext.FormPanel({ id : 'receiveRecordForm', frame : true, @@ -888,7 +888,13 @@ params : {id : id}, success : function(form, action) { top.Ext.getCmp("time").setValue(Ext.util.Format.date(new Date(action.result.data.time.time), 'Y-m-d')); - + //仓库赋值,物品与材料的下拉框启用 + top.Ext.getCmp('warehouseId').setValue(action.result.data.warehouseId); + top.Ext.getCmp('warehouseName').setValue(action.result.data.warehouseName); + top.Ext.getCmp('cssdWareHouse').setValue(action.result.data.warehouseId); + top.Ext.getCmp('cssdWareHouse').setRawValue(action.result.data.warehouseName); + top.Ext.getCmp("diposableGoodsName").setDisabled(false); + top.Ext.getCmp("materialCombo").setDisabled(false); for(var i = 0 ;i < action.result.data.items.length ;i++){ var godownOutItem = new ReceiveRecordItem({ id : action.result.data.items[i].id, Index: ssts-receiverecord/src/main/java/com/forgon/disinfectsystem/receiverecord/action/ReceiveRecordAction.java =================================================================== diff -u -r12331 -r13092 --- ssts-receiverecord/src/main/java/com/forgon/disinfectsystem/receiverecord/action/ReceiveRecordAction.java (.../ReceiveRecordAction.java) (revision 12331) +++ ssts-receiverecord/src/main/java/com/forgon/disinfectsystem/receiverecord/action/ReceiveRecordAction.java (.../ReceiveRecordAction.java) (revision 13092) @@ -24,6 +24,8 @@ import org.apache.struts2.convention.annotation.ParentPackage; import com.forgon.Constants; +import com.forgon.disinfectsystem.diposablegoods.service.DiposableGoodBatchStockManager; +import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsBatchStock; import com.forgon.disinfectsystem.entity.receiverecord.ReceiveRecord; import com.forgon.disinfectsystem.entity.receiverecord.ReceiveRecordItem; import com.forgon.disinfectsystem.entity.stocktakemanager.StockTakeInfo; @@ -48,13 +50,21 @@ private ReceiveRecordManager receiveRecordManager; + private DiposableGoodBatchStockManager diposableGoodBatchStockManager; + public void setReceiveRecord(ReceiveRecord receiveRecord) { this.receiveRecord = receiveRecord; } public void setReceiveRecordManager(ReceiveRecordManager receiveRecordManager) { this.receiveRecordManager = receiveRecordManager; } + + public void setDiposableGoodBatchStockManager( + DiposableGoodBatchStockManager diposableGoodBatchStockManager) { + this.diposableGoodBatchStockManager = diposableGoodBatchStockManager; + } + // 设置ReceiveRecord参数 private void setReceiveRecordPropertiesFromParams(ReceiveRecord entry, String formParams, String items) { @@ -194,7 +204,7 @@ } return null; } - @Deprecated// 未做并发处理，并且一次性物品库存操作有bug +// @Deprecated// 未做并发处理，并且一次性物品库存操作有bug // public void saveReceiveRecord_old() { // String itemsStr = StrutsParamUtils.getPraramValue("itemsStr", ""); // try { @@ -216,6 +226,8 @@ recordVo.setOperator(receiveRecord.getOperator()); recordVo.setTime(receiveRecord.getTime()); recordVo.setRemark(receiveRecord.getRemark()); + recordVo.setWarehouseId(receiveRecord.getWarehouseId()); + recordVo.setWarehouseName(receiveRecord.getWarehouseName()); List voItems = new ArrayList(); List items = receiveRecord.getItems(); @@ -227,17 +239,20 @@ if (item.getType().equals(StockTakeInfo.TYPE_DISPOSABLEGOOD)) { vo.setDiposableGoodsID(item.getDiposableGoodsID()); vo.setObjID(item.getObjID()); - String name = item.getDiposableGoodBatchStock().getDiposableGoods().getName(); - String specification = item.getDiposableGoodBatchStock().getDiposableGoods().getSpecification(); + + DisposableGoodsBatchStock disposableGoodsBatchStock = + diposableGoodBatchStockManager.getDiposableGoodBatchStockById(String.valueOf(item.getDisposableGoodsBatchStockId())); + String name = disposableGoodsBatchStock.getDiposableGoods().getName(); + String specification = disposableGoodsBatchStock.getDiposableGoods().getSpecification(); if (StringUtils.isNotBlank(specification)) { name = name + "[" + specification + "]"; } vo.setName(name); - vo.setBatchNumber(item.getDiposableGoodBatchStock().getBatchNumber()); + vo.setBatchNumber(disposableGoodsBatchStock.getBatchNumber()); vo.setCost(item.getPrice()); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - vo.setExpDate(sdf.format(item.getDiposableGoodBatchStock().getExpDate())); - vo.setSupplierName(item.getDiposableGoodBatchStock().getSupplierName()); + vo.setExpDate(sdf.format(disposableGoodsBatchStock.getExpDate())); + vo.setSupplierName(disposableGoodsBatchStock.getSupplierName()); } else if (item.getType().equals(StockTakeInfo.TYPE_MATERIALENTRY)) { vo.setObjID(item.getMaterialDefinition().getId()); String name = item.getMaterialDefinition().getName(); Index: ssts-receiverecord/src/main/java/com/forgon/disinfectsystem/receiverecord/vo/ReceiveRecordVo.java =================================================================== diff -u -r12331 -r13092 --- ssts-receiverecord/src/main/java/com/forgon/disinfectsystem/receiverecord/vo/ReceiveRecordVo.java (.../ReceiveRecordVo.java) (revision 12331) +++ ssts-receiverecord/src/main/java/com/forgon/disinfectsystem/receiverecord/vo/ReceiveRecordVo.java (.../ReceiveRecordVo.java) (revision 13092) @@ -23,6 +23,16 @@ private String remark; //备注 private List items = new ArrayList (); + + /** + * 仓库id + */ + private Long warehouseId; + + /** + * 仓库名称 + */ + private String warehouseName; public Long getId() { return id; @@ -63,4 +73,20 @@ public void setItems(List items) { this.items = items; } + + public Long getWarehouseId() { + return warehouseId; + } + + public void setWarehouseId(Long warehouseId) { + this.warehouseId = warehouseId; + } + + public String getWarehouseName() { + return warehouseName; + } + + public void setWarehouseName(String warehouseName) { + this.warehouseName = warehouseName; + } }