Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntry.java =================================================================== diff -u -r13500 -r14160 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntry.java (.../GodownEntry.java) (revision 13500) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntry.java (.../GodownEntry.java) (revision 14160) @@ -81,21 +81,25 @@ * 仓库ID */ private Long warehouseID; + private Long orgUnitId; /** * 仓库名称 */ private String warehouseName; + private String orgUnitName; /** * 目标仓库ID(只有当类型为调拨单时才有值) */ private Long targetWareHouseId; + private Long targetOrgUnitId; /** * 目标仓库名称(只有当类型为调拨单时才有值) */ private String targetWareHouseName; + private String targetOrgUnitName; /** * 源单Id.比如调拨单生成调拨入库单与调拨出库单后,在调拨入库单与调拨出库单需记录源调拨单的id;盘盈入库、盘亏出库需关联的盘点记录ID; @@ -262,6 +266,38 @@ this.sourceId = sourceId; } + public Long getOrgUnitId() { + return orgUnitId; + } + + public String getOrgUnitName() { + return orgUnitName; + } + + public Long getTargetOrgUnitId() { + return targetOrgUnitId; + } + + public String getTargetOrgUnitName() { + return targetOrgUnitName; + } + + public void setOrgUnitId(Long orgUnitId) { + this.orgUnitId = orgUnitId; + } + + public void setOrgUnitName(String orgUnitName) { + this.orgUnitName = orgUnitName; + } + + public void setTargetOrgUnitId(Long targetOrgUnitId) { + this.targetOrgUnitId = targetOrgUnitId; + } + + public void setTargetOrgUnitName(String targetOrgUnitName) { + this.targetOrgUnitName = targetOrgUnitName; + } + public boolean manualIn() { if (StringUtils.equals(subType, SUBTYPE_MANUAL_IN)) { return true;