From de50c86d59513ec6330ea40932de8afe47f5b8f1 Mon Sep 17 00:00:00 2001 From: 16358 <1635849544@qq.com> Date: Mon, 7 Jul 2025 10:27:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=9F=E7=A9=BA=E5=AF=B9=E6=8E=A5=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=BC=80=E5=8F=91:=E4=BF=AE=E5=A4=8D=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BC=A0=E5=8F=82=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/webApi/ApiPostBack.java | 5 +++-- .../saveRequestBody/billHandlerUtil/impl/PURHandler.java | 1 - .../saveRequestBody/billHandlerUtil/impl/SALHandler.java | 1 - .../saveRequestBody/billHandlerUtil/impl/SPHandler.java | 3 +-- .../saveRequestBody/billHandlerUtil/impl/STKHandler.java | 1 - .../billHandlerUtil/impl/STKTDHandler.java | 4 ++-- .../webApi/saveRequestBody/requestbody/RequestData.java | 9 +++++++++ .../saveRequestBody/requestbody/model/PURModel.java | 4 ++-- .../saveRequestBody/requestbody/model/SALModel.java | 4 ++-- .../saveRequestBody/requestbody/model/SPModel.java | 8 ++++---- 10 files changed, 23 insertions(+), 17 deletions(-) diff --git a/measurement/src/main/java/com/ruoyi/webApi/ApiPostBack.java b/measurement/src/main/java/com/ruoyi/webApi/ApiPostBack.java index 8695d12..8136e1a 100644 --- a/measurement/src/main/java/com/ruoyi/webApi/ApiPostBack.java +++ b/measurement/src/main/java/com/ruoyi/webApi/ApiPostBack.java @@ -123,11 +123,12 @@ public class ApiPostBack { data.setNeedReturnFields(Arrays.asList("FID","FEntity.FEntryid")); SPModel model = new SPModel(poundBills); data.setModel(model); + data.setIsautosubmitandaudit("true"); request.setData(data); String jsonInputString; try { - jsonInputString = objectMapper.writeValueAsString(request); - } catch (JsonProcessingException e) { + jsonInputString = JSON.toJSONString(request); + } catch (Exception e) { throw new RuntimeException("JSON序列化失败：" + e.getMessage()); } diff --git a/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/PURHandler.java b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/PURHandler.java index f9e249c..a23d7ce 100644 --- a/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/PURHandler.java +++ b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/PURHandler.java @@ -6,7 +6,6 @@ import com.ruoyi.webApi.saveRequestBody.requestbody.DynamicFormRequest; import com.ruoyi.webApi.saveRequestBody.requestbody.RequestData; import com.ruoyi.webApi.saveRequestBody.requestbody.model.PURModel; -import java.util.ArrayList; import java.util.Arrays; /** diff --git a/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/SALHandler.java b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/SALHandler.java index c8114b4..e8a5552 100644 --- a/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/SALHandler.java +++ b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/SALHandler.java @@ -6,7 +6,6 @@ import com.ruoyi.webApi.saveRequestBody.requestbody.DynamicFormRequest; import com.ruoyi.webApi.saveRequestBody.requestbody.RequestData; import com.ruoyi.webApi.saveRequestBody.requestbody.model.SALModel; -import java.util.ArrayList; import java.util.Arrays; /** diff --git a/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/SPHandler.java b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/SPHandler.java index ad09d26..97a95ef 100644 --- a/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/SPHandler.java +++ b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/SPHandler.java @@ -4,10 +4,8 @@ import com.ruoyi.bill.domain.PoundBill; import com.ruoyi.webApi.saveRequestBody.billHandlerUtil.BillHandler; import com.ruoyi.webApi.saveRequestBody.requestbody.DynamicFormRequest; import com.ruoyi.webApi.saveRequestBody.requestbody.RequestData; -import com.ruoyi.webApi.saveRequestBody.requestbody.model.PURModel; import com.ruoyi.webApi.saveRequestBody.requestbody.model.SPModel; -import java.util.ArrayList; import java.util.Arrays; /** @@ -23,6 +21,7 @@ public class SPHandler implements BillHandler { data.setNeedReturnFields(Arrays.asList("FID", "FEntity.FEntryid")); SPModel model = new SPModel(bill); data.setModel(model); + data.setIsautosubmitandaudit("true"); request.setData(data); return request; } diff --git a/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/STKHandler.java b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/STKHandler.java index 1606a1c..2706748 100644 --- a/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/STKHandler.java +++ b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/STKHandler.java @@ -6,7 +6,6 @@ import com.ruoyi.webApi.saveRequestBody.requestbody.DynamicFormRequest; import com.ruoyi.webApi.saveRequestBody.requestbody.RequestData; import com.ruoyi.webApi.saveRequestBody.requestbody.model.STKModel; -import java.util.ArrayList; import java.util.Arrays; /** diff --git a/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/STKTDHandler.java b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/STKTDHandler.java index 0bfce42..23d48a9 100644 --- a/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/STKTDHandler.java +++ b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/STKTDHandler.java @@ -4,15 +4,14 @@ import com.ruoyi.bill.domain.PoundBill; import com.ruoyi.webApi.saveRequestBody.billHandlerUtil.BillHandler; import com.ruoyi.webApi.saveRequestBody.requestbody.DynamicFormRequest; import com.ruoyi.webApi.saveRequestBody.requestbody.RequestData; -import com.ruoyi.webApi.saveRequestBody.requestbody.model.STKModel; import com.ruoyi.webApi.saveRequestBody.requestbody.model.STKTDModel; -import java.util.ArrayList; import java.util.Arrays; /** * @author 16358 * @date 2025/6/26 + * 直接调拨单 */ public class STKTDHandler implements BillHandler { @Override @@ -22,6 +21,7 @@ public class STKTDHandler implements BillHandler { data.setNeedReturnFields(Arrays.asList("FID", "FBillEntry.FEntryid")); STKTDModel model = new STKTDModel(bill); data.setModel(model); + data.setIsautosubmitandaudit("true"); request.setData(data); return request; } diff --git a/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/RequestData.java b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/RequestData.java index d99d12a..546392f 100644 --- a/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/RequestData.java +++ b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/RequestData.java @@ -12,6 +12,7 @@ public class RequestData { private List NeedReturnFields = new ArrayList<>(); private String IsDeleteEntry = "true"; private String IsAutoAdjustField = "true"; + private String isautosubmitandaudit; private RequestModel Model; // Getter and Setter @@ -47,6 +48,14 @@ public class RequestData { IsAutoAdjustField = isAutoAdjustField; } + public String getIsautosubmitandaudit() { + return isautosubmitandaudit; + } + + public void setIsautosubmitandaudit(String isautosubmitandaudit) { + this.isautosubmitandaudit = isautosubmitandaudit; + } + public RequestModel getModel() { return Model; } diff --git a/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/model/PURModel.java b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/model/PURModel.java index 830496a..bc2400a 100644 --- a/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/model/PURModel.java +++ b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/model/PURModel.java @@ -14,8 +14,8 @@ public class PURModel extends RequestModel { public PURModel(PoundBill bill) { setFID(bill.getFid()); - setF_GMSHDW(bill.getRecunitid()); - setF_CYDW(bill.getTrnunitid()); +// setF_GMSHDW(bill.getRecunitid()); +// setF_CYDW(bill.getTrnunitid()); setF_BDMC(bill.getPoundname()); this.FDetailEntity = new PUREntity[] { diff --git a/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/model/SALModel.java b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/model/SALModel.java index 3a83d98..0ddbf12 100644 --- a/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/model/SALModel.java +++ b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/model/SALModel.java @@ -14,8 +14,8 @@ public class SALModel extends RequestModel { public SALModel(PoundBill bill) { setFID(bill.getFid()); - setF_GMSHDW(bill.getRecunitid()); - setF_CYDW(bill.getTrnunitid()); +// setF_GMSHDW(bill.getRecunitid()); +// setF_CYDW(bill.getTrnunitid()); setF_BDMC(bill.getPoundname()); this.FEntity = new SALEntity[] { 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 d488f0c..f964471 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 @@ -56,9 +56,9 @@ public class SPModel extends RequestModel { setF_LC(bill.getBoilerno()); setF_GH(bill.getCarno()); setF_GANGH(bill.getSteeno()); - setF_ZKS(0l); +// setF_ZKS(0l); setF_KH(bill.getBundleNo()); - setF_PJZL(0l); +// setF_PJZL(0l); setF_XCLX(bill.getLinetype()); setF_PH(bill.getBatno()); setF_ZGS(bill.getZgsId()); @@ -103,9 +103,9 @@ public class SPModel extends RequestModel { setF_LC(currentBill.getBoilerno()); setF_GH(currentBill.getCarno()); setF_GANGH(currentBill.getSteeno()); - setF_ZKS(0L); +// setF_ZKS(0L); setF_KH(currentBill.getBundleNo()); - setF_PJZL(0L); +// setF_PJZL(0L); setF_XCLX(currentBill.getLinetype()); setF_PH(currentBill.getBatno()); setF_ZGS(bill.getZgsId());