Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/receiverecord/ReceiveRecordItem.java =================================================================== diff -u -r13051 -r13081 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/receiverecord/ReceiveRecordItem.java (.../ReceiveRecordItem.java) (revision 13051) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/receiverecord/ReceiveRecordItem.java (.../ReceiveRecordItem.java) (revision 13081) @@ -31,6 +31,9 @@ private MaterialDefinition materialDefinition; + /** + * + */ private String goodsName; private String type; @@ -49,6 +52,16 @@ private Long disposableGoodsStockId ;// 一次性物品库存id private Long disposableGoodsBatchId ;// 批次id private Long disposableGoodsBatchStockId ;// 批次库存id + + /** + * 仓库id + */ + private Long warehouseId; + + /** + * 仓库名称 + */ + private String warehouseName; @Id @GeneratedValue(strategy=GenerationType.AUTO) @@ -170,5 +183,21 @@ public void setDisposableGoodsBatchStockId(Long disposableGoodsBatchStockId) { this.disposableGoodsBatchStockId = disposableGoodsBatchStockId; } + + 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; + } } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/receiverecord/ReceiveRecord.java =================================================================== diff -u -r12331 -r13081 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/receiverecord/ReceiveRecord.java (.../ReceiveRecord.java) (revision 12331) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/receiverecord/ReceiveRecord.java (.../ReceiveRecord.java) (revision 13081) @@ -39,7 +39,25 @@ private String remark; // 备注 + /** + * 领用科室 + */ + private String depart; + + /** + * 领用科室编码 + */ private String departCoding; + + /** + * 仓库id + */ + private Long warehouseId; + + /** + * 仓库名称 + */ + private String warehouseName; @JsonIgnore private List items = new ArrayList(); @@ -107,4 +125,28 @@ Long inventoryWriteBackEntryId) { this.inventoryWriteBackEntryId = inventoryWriteBackEntryId; } + + public String getDepart() { + return depart; + } + + public void setDepart(String depart) { + this.depart = depart; + } + + 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; + } }