Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/instrumentrepair/InstrumentRepair.java =================================================================== diff -u -r41076 -r41126 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/instrumentrepair/InstrumentRepair.java (.../InstrumentRepair.java) (revision 41076) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/instrumentrepair/InstrumentRepair.java (.../InstrumentRepair.java) (revision 41126) @@ -102,6 +102,13 @@ private String engineer; /** + * 工程师电话 + * 现场工程师的联系电话,由现场自行填写,维修记录仅用于保存和展示 + * ZSYKEQ-38 + */ + private String engineerPhoneNumber; + + /** * 送修类别 * 默认不勾选,选项有:送修厂家、自行维修、无法维修,只能选择其中一个 */ @@ -784,6 +791,14 @@ this.repairPrice = repairPrice; } + public String getEngineerPhoneNumber() { + return engineerPhoneNumber; + } + + public void setEngineerPhoneNumber(String engineerPhoneNumber) { + this.engineerPhoneNumber = engineerPhoneNumber; + } + /** * CDSLQYQYYY-118新增可提醒用户的器械维修记录版本 * 在此版本中,此字段的根据以下规则来取值: Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/instrumentrepair/InstrumentRepairGoods.java =================================================================== diff -u -r40852 -r41126 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/instrumentrepair/InstrumentRepairGoods.java (.../InstrumentRepairGoods.java) (revision 40852) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/instrumentrepair/InstrumentRepairGoods.java (.../InstrumentRepairGoods.java) (revision 41126) @@ -78,6 +78,13 @@ * BJDXZLYY-70 */ private String instrumentBarcode; + + /** + * (维修器械的)序列号 + * 维修器械的序列号,由现场自行填写,维修记录仅用于保存和展示 + * ZSYKEQ-38 + */ + private String instrumentSerialNumber; @Id @GeneratedValue(strategy = GenerationType.AUTO) @@ -166,4 +173,12 @@ this.instrumentBarcode = instrumentBarcode; } + public String getInstrumentSerialNumber() { + return instrumentSerialNumber; + } + + public void setInstrumentSerialNumber(String instrumentSerialNumber) { + this.instrumentSerialNumber = instrumentSerialNumber; + } + }