Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/returngoodsrecord/ReturnGoodsRecord.java =================================================================== diff -u -r20892 -r23126 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/returngoodsrecord/ReturnGoodsRecord.java (.../ReturnGoodsRecord.java) (revision 20892) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/returngoodsrecord/ReturnGoodsRecord.java (.../ReturnGoodsRecord.java) (revision 23126) @@ -101,8 +101,18 @@ * 申请单id */ private Long invoicePlanId; - + /** + * 科研项目编码(针对中山眼科中心科研项目的需求增加) + */ + private String projectCode; + + /** + * 科研项目名称(中山眼科课题组使用) + */ + private String projectName; + + /** * 仓库编码(一次性物品退货回写的仓库编码,目前只适用于“中山大学中山眼科中心”) */ private String storeCode; @@ -201,6 +211,22 @@ this.departCoding = departCoding; } + public String getProjectCode() { + return projectCode; + } + + public void setProjectCode(String projectCode) { + this.projectCode = projectCode; + } + + public String getProjectName() { + return projectName; + } + + public void setProjectName(String projectName) { + this.projectName = projectName; + } + @OneToOne(cascade = CascadeType.ALL) @JoinColumn(name = "recyclingApplication_id", referencedColumnName = "id") public RecyclingApplication getRecyclingApplication() { Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java =================================================================== diff -u -r22529 -r23126 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java (.../InvoicePlan.java) (revision 22529) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java (.../InvoicePlan.java) (revision 23126) @@ -231,8 +231,10 @@ private String currentRemark; // 备注,包含系统备注 - private String projCode;//项目编号(中山眼科课题组使用) + private String projCode;//科研项目编号(中山眼科课题组使用) + private String projName;//科研项目名称(中山眼科课题组使用) + private Integer urgentAmount;// 加急数量 private String urgent = com.forgon.Constants.STR_NO;// 是否加急 @@ -855,6 +857,14 @@ this.projCode = projCode; } + public String getProjName() { + return projName; + } + + public void setProjName(String projName) { + this.projName = projName; + } + public Integer getUrgentAmount() { return urgentAmount; }