diff --git a/measurement/src/main/java/com/ruoyi/webApi/ApiPostBack.java b/measurement/src/main/java/com/ruoyi/webApi/ApiPostBack.java index b46b95e..5cd3995 100644 --- a/measurement/src/main/java/com/ruoyi/webApi/ApiPostBack.java +++ b/measurement/src/main/java/com/ruoyi/webApi/ApiPostBack.java @@ -6,8 +6,6 @@ import com.alibaba.fastjson2.JSONObject; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.ruoyi.bill.domain.PoundBill; -import com.ruoyi.bill.domain.Poundappli; -import com.ruoyi.bill.domain.Poundmst; import com.ruoyi.bill.service.IPoundBillService; import com.ruoyi.bill.service.IPoundmstService; import com.ruoyi.system.service.ISysConfigService; @@ -26,17 +24,11 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; import java.io.OutputStream; -import java.math.BigDecimal; import java.net.HttpURLConnection; import java.net.URL; import java.nio.charset.StandardCharsets; -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.time.format.DateTimeFormatter; import java.util.Arrays; -import java.util.Date; import java.util.List; -import java.util.UUID; /** * 各个单据回传星空接口（单据更新，单据下推） 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 5219030..07dd7cd 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 @@ -1,7 +1,6 @@ package com.ruoyi.webApi.saveRequestBody.requestbody.entity; import com.ruoyi.webApi.saveRequestBody.requestbody.FNumberRef; -import com.ruoyi.webApi.saveRequestBody.requestbody.Ref; import java.math.BigDecimal; @@ -12,15 +11,15 @@ import java.math.BigDecimal; */ public class SPEntity { private String FEntryID; - private Ref FMaterialId; + private FNumberRef FMaterialId; private String FInStockType; private BigDecimal FMustQty; private BigDecimal FRealQty; - private Ref FStockId; - private Ref FWorkShopId1; - private Ref FShiftGroupId; + private FNumberRef FStockId; + private FNumberRef FWorkShopId1; + private FNumberRef FShiftGroupId; private String FOwnerTypeId; - private Ref FOwnerId; + private FNumberRef FOwnerId; private Long F_CZ; private String FMemo; private String F_LC; @@ -40,11 +39,11 @@ public class SPEntity { this.FEntryID = FEntryID; } - public Ref getFMaterialId() { + public FNumberRef getFMaterialId() { return FMaterialId; } - public void setFMaterialId(Ref FMaterialId) { + public void setFMaterialId(FNumberRef FMaterialId) { this.FMaterialId = FMaterialId; } @@ -72,27 +71,27 @@ public class SPEntity { this.FRealQty = FRealQty; } - public Ref getFStockId() { + public FNumberRef getFStockId() { return FStockId; } - public void setFStockId(Ref FStockId) { + public void setFStockId(FNumberRef FStockId) { this.FStockId = FStockId; } - public Ref getFWorkShopId1() { + public FNumberRef getFWorkShopId1() { return FWorkShopId1; } - public void setFWorkShopId1(Ref FWorkShopId1) { + public void setFWorkShopId1(FNumberRef FWorkShopId1) { this.FWorkShopId1 = FWorkShopId1; } - public Ref getFShiftGroupId() { + public FNumberRef getFShiftGroupId() { return FShiftGroupId; } - public void setFShiftGroupId(Ref FShiftGroupId) { + public void setFShiftGroupId(FNumberRef FShiftGroupId) { this.FShiftGroupId = FShiftGroupId; } @@ -160,11 +159,11 @@ public class SPEntity { this.FOwnerTypeId = FOwnerTypeId; } - public Ref getFOwnerId() { + public FNumberRef getFOwnerId() { return FOwnerId; } - public void setFOwnerId(Ref FOwnerId) { + public void setFOwnerId(FNumberRef FOwnerId) { this.FOwnerId = FOwnerId; } diff --git a/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/entity/STKTDEntity.java b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/entity/STKTDEntity.java index 42757ac..46cf797 100644 --- a/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/entity/STKTDEntity.java +++ b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/entity/STKTDEntity.java @@ -1,7 +1,6 @@ package com.ruoyi.webApi.saveRequestBody.requestbody.entity; import com.ruoyi.webApi.saveRequestBody.requestbody.FNumberRef; -import com.ruoyi.webApi.saveRequestBody.requestbody.Ref; /** * @author 16358 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 8b5a7cb..357772b 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 @@ -3,7 +3,6 @@ package com.ruoyi.webApi.saveRequestBody.requestbody.model; import com.ruoyi.bill.domain.PoundBill; import com.ruoyi.bill.domain.Poundmst; import com.ruoyi.webApi.saveRequestBody.requestbody.FNumberRef; -import com.ruoyi.webApi.saveRequestBody.requestbody.Ref; import com.ruoyi.webApi.saveRequestBody.requestbody.entity.SPEntity; import com.ruoyi.webApi.saveRequestBody.requestbody.RequestModel; @@ -18,13 +17,13 @@ import java.util.List; */ public class SPModel extends RequestModel { private SPEntity[] FEntity; - private Ref FBillType; + private FNumberRef FBillType; private String FDate; - private Ref FStockOrgId; - private Ref FPrdOrgId; - private Ref FCurrId; + private FNumberRef FStockOrgId; + private FNumberRef FPrdOrgId; + private FNumberRef FCurrId; private String FOwnerTypeId0; - private Ref FOwnerId0; + private FNumberRef FOwnerId0; private String F_YWBD; private String F_SJYWBD; private String F_ZGS; @@ -33,13 +32,13 @@ public class SPModel extends RequestModel { public SPModel(PoundBill bill) { setFID(bill.getFid()); - this.FBillType = new Ref<>(new FNumberRef("JDSCRK01_SYS")); + this.FBillType = new FNumberRef("JDSCRK01_SYS"); this.FDate = new SimpleDateFormat("yyyy-MM-dd").format(new Date()); - this.FStockOrgId = new Ref<>(new FNumberRef(bill.getOaOrgNumber())); - this.FPrdOrgId = new Ref<>(new FNumberRef(bill.getOaOrgNumber())); - this.FCurrId = new Ref<>(new FNumberRef("PRE001")); + this.FStockOrgId = new FNumberRef(bill.getOaOrgNumber()); + this.FPrdOrgId = new FNumberRef(bill.getOaOrgNumber()); + this.FCurrId = new FNumberRef("PRE001"); this.FOwnerTypeId0 = "BD_OwnerOrg"; - this.FOwnerId0 = new Ref<>(new FNumberRef(bill.getOaOrgNumber())); + this.FOwnerId0 = new FNumberRef(bill.getOaOrgNumber()); this.F_YWBD = bill.getPoundid(); this.F_SJYWBD = bill.getPoundid(); this.F_ZGS = bill.getZgsId(); @@ -49,15 +48,15 @@ public class SPModel extends RequestModel { this.FEntity = new SPEntity[] { new SPEntity() {{ setFEntryID(bill.getFentity_fentryid()); - setFMaterialId(new Ref<>(new FNumberRef(bill.getItmcode()))); + setFMaterialId(new FNumberRef(bill.getItmcode())); setFInStockType("1"); setFMustQty(bill.getNetmqty()); setFRealQty(bill.getNetmqty()); - setFStockId(new Ref<>(new FNumberRef(""))); - setFWorkShopId1(new Ref<>(new FNumberRef(""))); - setFShiftGroupId(new Ref<>(new FNumberRef(""))); + setFStockId(new FNumberRef("")); + setFWorkShopId1(new FNumberRef("")); + setFShiftGroupId(new FNumberRef("")); setFOwnerTypeId("BD_OwnerOrg"); - setFOwnerId(new Ref<>(new FNumberRef(bill.getOaOrgNumber()))); + setFOwnerId(new FNumberRef(bill.getOaOrgNumber())); setF_CZ(0l); setFMemo(bill.getRemark()); setF_LC(bill.getBoilerno()); @@ -77,13 +76,13 @@ public class SPModel extends RequestModel { PoundBill bill = bills.get(0); setFID(bill.getFid()); - this.FBillType = new Ref<>(new FNumberRef("JDSCRK01_SYS")); + this.FBillType = new FNumberRef("JDSCRK01_SYS"); this.FDate = new SimpleDateFormat("yyyy-MM-dd").format(new Date()); - this.FStockOrgId = new Ref<>(new FNumberRef(bill.getOaOrgNumber())); - this.FPrdOrgId = new Ref<>(new FNumberRef(bill.getOaOrgNumber())); - this.FCurrId = new Ref<>(new FNumberRef("PRE001")); + this.FStockOrgId = new FNumberRef(bill.getOaOrgNumber()); + this.FPrdOrgId = new FNumberRef(bill.getOaOrgNumber()); + this.FCurrId = new FNumberRef("PRE001"); this.FOwnerTypeId0 = "BD_OwnerOrg"; - this.FOwnerId0 = new Ref<>(new FNumberRef(bill.getOaOrgNumber())); + this.FOwnerId0 = new FNumberRef(bill.getOaOrgNumber()); this.F_YWBD = bill.getPoundid(); this.F_SJYWBD = bill.getPoundid(); this.F_ZGS = bill.getZgsId(); @@ -96,15 +95,15 @@ public class SPModel extends RequestModel { PoundBill currentBill = bills.get(i); this.FEntity[i] = new SPEntity() {{ setFEntryID(currentBill.getFentity_fentryid()); - setFMaterialId(new Ref<>(new FNumberRef(currentBill.getItmcode()))); + setFMaterialId(new FNumberRef(currentBill.getItmcode())); setFInStockType("1"); setFMustQty(currentBill.getNetmqty()); setFRealQty(currentBill.getNetmqty()); - setFStockId(new Ref<>(new FNumberRef(""))); - setFWorkShopId1(new Ref<>(new FNumberRef(""))); - setFShiftGroupId(new Ref<>(new FNumberRef(""))); + setFStockId(new FNumberRef("")); + setFWorkShopId1(new FNumberRef("")); + setFShiftGroupId(new FNumberRef("")); setFOwnerTypeId("BD_OwnerOrg"); - setFOwnerId(new Ref<>(new FNumberRef(currentBill.getOaOrgNumber()))); + setFOwnerId(new FNumberRef(currentBill.getOaOrgNumber())); setF_CZ(0L); setFMemo(currentBill.getRemark()); setF_LC(currentBill.getBoilerno()); @@ -121,13 +120,13 @@ public class SPModel extends RequestModel { public SPModel(Poundmst bill) { setFID(bill.getFid()); - this.FBillType = new Ref<>(new FNumberRef("JDSCRK01_SYS")); + this.FBillType = new FNumberRef("JDSCRK01_SYS"); this.FDate = new SimpleDateFormat("yyyy-MM-dd").format(new Date()); - this.FStockOrgId = new Ref<>(new FNumberRef(bill.getOaOrgNumber())); - this.FPrdOrgId = new Ref<>(new FNumberRef(bill.getOaOrgNumber())); - this.FCurrId = new Ref<>(new FNumberRef("PRE001")); + this.FStockOrgId = new FNumberRef(bill.getOaOrgNumber()); + this.FPrdOrgId = new FNumberRef(bill.getOaOrgNumber()); + this.FCurrId = new FNumberRef("PRE001"); this.FOwnerTypeId0 = "BD_OwnerOrg"; - this.FOwnerId0 = new Ref<>(new FNumberRef(bill.getOaOrgNumber())); + this.FOwnerId0 = new FNumberRef(bill.getOaOrgNumber()); this.F_YWBD = bill.getPoundid(); this.F_SJYWBD = bill.getPoundid(); this.F_ZGS = bill.getZgsId(); @@ -144,11 +143,11 @@ public class SPModel extends RequestModel { super.setFEntity(FEntity); } - public Ref getFBillType() { + public FNumberRef getFBillType() { return FBillType; } - public void setFBillType(Ref FBillType) { + public void setFBillType(FNumberRef FBillType) { this.FBillType = FBillType; } @@ -160,27 +159,27 @@ public class SPModel extends RequestModel { this.FDate = FDate; } - public Ref getFStockOrgId() { + public FNumberRef getFStockOrgId() { return FStockOrgId; } - public void setFStockOrgId(Ref FStockOrgId) { + public void setFStockOrgId(FNumberRef FStockOrgId) { this.FStockOrgId = FStockOrgId; } - public Ref getFPrdOrgId() { + public FNumberRef getFPrdOrgId() { return FPrdOrgId; } - public void setFPrdOrgId(Ref FPrdOrgId) { + public void setFPrdOrgId(FNumberRef FPrdOrgId) { this.FPrdOrgId = FPrdOrgId; } - public Ref getFCurrId() { + public FNumberRef getFCurrId() { return FCurrId; } - public void setFCurrId(Ref FCurrId) { + public void setFCurrId(FNumberRef FCurrId) { this.FCurrId = FCurrId; } @@ -192,11 +191,11 @@ public class SPModel extends RequestModel { this.FOwnerTypeId0 = FOwnerTypeId0; } - public Ref getFOwnerId0() { + public FNumberRef getFOwnerId0() { return FOwnerId0; } - public void setFOwnerId0(Ref FOwnerId0) { + public void setFOwnerId0(FNumberRef FOwnerId0) { this.FOwnerId0 = FOwnerId0; } diff --git a/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/model/STKTDModel.java b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/model/STKTDModel.java index d1f38b9..4916138 100644 --- a/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/model/STKTDModel.java +++ b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/model/STKTDModel.java @@ -2,7 +2,6 @@ package com.ruoyi.webApi.saveRequestBody.requestbody.model; import com.ruoyi.bill.domain.PoundBill; import com.ruoyi.webApi.saveRequestBody.requestbody.FNumberRef; -import com.ruoyi.webApi.saveRequestBody.requestbody.Ref; import com.ruoyi.webApi.saveRequestBody.requestbody.RequestModel; import com.ruoyi.webApi.saveRequestBody.requestbody.entity.STKTDEntity;