Index: ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java =================================================================== diff -u -r13954 -r14168 --- ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java (.../InventoryRecordManagerImpl.java) (revision 13954) +++ ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java (.../InventoryRecordManagerImpl.java) (revision 14168) @@ -212,6 +212,8 @@ .getSerialNumberStr(SerialNum.TYPE_INSERT_GODOWN)); entry.setTime(inventoryRecord.getTime()); entry.setWarehouseID(inventoryRecord.getWareHouseId()); + entry.setOrgUnitCode(inventoryRecord.getOrgUnitCode()); + entry.setOrgUnitName(inventoryRecord.getOrgUnitName()); entry.setWarehouseName(inventoryRecord.getWareHouseName()); entry.setSourceId(inventoryRecord.getId());//记录盘点记录的ID @@ -328,7 +330,6 @@ try { JSONObject obj = JSONObject.fromObject(params); LoginUserData loginUser = AcegiHelper.getLoginUser(); - String orgUnitCoding = loginUser.getOrgUnitCodingFromSupplyRoomConfig(); Long wareHouseId = obj.optLong("wareHouseId"); if(wareHouseId == null){ @@ -343,7 +344,8 @@ record = new InventoryRecord(); record.setTime(new Date()); record.setOperator(loginUser.getUserFullName()); - record.setOrgUnitCode(orgUnitCoding); + record.setOrgUnitCode(warehouse.getOrgUnitCode()); + record.setOrgUnitName(warehouse.getOrgUnitName()); record.setWareHouseId(wareHouseId); record.setType(InventoryRecord.TYPE_MATERIALENTRY); record.setWareHouseName(warehouse.getName()); @@ -384,7 +386,8 @@ record = new InventoryRecord(); record.setTime(new Date()); record.setOperator(loginUser.getUserFullName()); - record.setOrgUnitCode(orgUnitCoding); + record.setOrgUnitCode(warehouse.getOrgUnitCode()); + record.setOrgUnitName(warehouse.getOrgUnitName()); record.setWareHouseId(wareHouseId); record.setType(InventoryRecord.TYPE_DISPOSABLEGOOD); record.setWareHouseName(warehouse.getName()); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakemanager/InventoryRecord.java =================================================================== diff -u -r13124 -r14168 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakemanager/InventoryRecord.java (.../InventoryRecord.java) (revision 13124) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakemanager/InventoryRecord.java (.../InventoryRecord.java) (revision 14168) @@ -59,6 +59,8 @@ private String orgUnitCode;//科室编码 + private String orgUnitName;//科室名称 + //盘点材料明细 private List items = new ArrayList(); @@ -146,5 +148,13 @@ public void setTime(Date time) { this.time = time; } + + public String getOrgUnitName() { + return orgUnitName; + } + + public void setOrgUnitName(String orgUnitName) { + this.orgUnitName = orgUnitName; + } }