diff --git a/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/entity/SPEntity.java b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/entity/SPEntity.java index 07dd7cd..7a43f75 100644 --- a/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/entity/SPEntity.java +++ b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/entity/SPEntity.java @@ -30,6 +30,9 @@ public class SPEntity { private Long F_PJZL; private String F_XCLX; private String F_PH; + private String F_ZGS; + private String F_FHDW; + private String F_SHDW; public String getFEntryID() { return FEntryID; @@ -190,5 +193,29 @@ public class SPEntity { public void setF_PH(String f_PH) { F_PH = f_PH; } + + public String getF_ZGS() { + return F_ZGS; + } + + public void setF_ZGS(String f_ZGS) { + F_ZGS = f_ZGS; + } + + public String getF_FHDW() { + return F_FHDW; + } + + public void setF_FHDW(String f_FHDW) { + F_FHDW = f_FHDW; + } + + public String getF_SHDW() { + return F_SHDW; + } + + public void setF_SHDW(String f_SHDW) { + F_SHDW = f_SHDW; + } } diff --git a/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/model/SPModel.java b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/model/SPModel.java index 357772b..3db60fc 100644 --- a/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/model/SPModel.java +++ b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/model/SPModel.java @@ -26,9 +26,6 @@ public class SPModel extends RequestModel { private FNumberRef FOwnerId0; private String F_YWBD; private String F_SJYWBD; - private String F_ZGS; - private String F_FHDW; - private String F_SHDW; public SPModel(PoundBill bill) { setFID(bill.getFid()); @@ -41,9 +38,6 @@ public class SPModel extends RequestModel { this.FOwnerId0 = new FNumberRef(bill.getOaOrgNumber()); this.F_YWBD = bill.getPoundid(); this.F_SJYWBD = bill.getPoundid(); - this.F_ZGS = bill.getZgsId(); - this.F_FHDW = bill.getSendunitid(); - this.F_SHDW = bill.getRecunitid(); this.FEntity = new SPEntity[] { new SPEntity() {{ @@ -67,6 +61,9 @@ public class SPModel extends RequestModel { setF_PJZL(0l); setF_XCLX(bill.getLinetype()); setF_PH(bill.getBatno()); + setF_ZGS(bill.getZgsId()); + setF_FHDW(bill.getSendunitid()); + setF_SHDW(bill.getRecunitid()); }} }; } @@ -85,9 +82,6 @@ public class SPModel extends RequestModel { this.FOwnerId0 = new FNumberRef(bill.getOaOrgNumber()); this.F_YWBD = bill.getPoundid(); this.F_SJYWBD = bill.getPoundid(); - this.F_ZGS = bill.getZgsId(); - this.F_FHDW = bill.getSendunitid(); - this.F_SHDW = bill.getRecunitid(); // 动态生成 FEntity 数组 this.FEntity = new SPEntity[bills.size()]; @@ -114,6 +108,9 @@ public class SPModel extends RequestModel { setF_PJZL(0L); setF_XCLX(currentBill.getLinetype()); setF_PH(currentBill.getBatno()); + setF_ZGS(bill.getZgsId()); + setF_FHDW(bill.getSendunitid()); + setF_SHDW(bill.getRecunitid()); }}; } } @@ -129,9 +126,6 @@ public class SPModel extends RequestModel { this.FOwnerId0 = new FNumberRef(bill.getOaOrgNumber()); this.F_YWBD = bill.getPoundid(); this.F_SJYWBD = bill.getPoundid(); - this.F_ZGS = bill.getZgsId(); - this.F_FHDW = bill.getSendunitid(); - this.F_SHDW = bill.getRecunitid(); } public SPEntity[] getFEntity() { @@ -214,28 +208,4 @@ public class SPModel extends RequestModel { public void setF_SJYWBD(String f_SJYWBD) { F_SJYWBD = f_SJYWBD; } - - public String getF_ZGS() { - return F_ZGS; - } - - public void setF_ZGS(String f_ZGS) { - F_ZGS = f_ZGS; - } - - public String getF_FHDW() { - return F_FHDW; - } - - public void setF_FHDW(String f_FHDW) { - F_FHDW = f_FHDW; - } - - public String getF_SHDW() { - return F_SHDW; - } - - public void setF_SHDW(String f_SHDW) { - F_SHDW = f_SHDW; - } } \ No newline at end of file