From 2f6502b1ac9e1a979a8e01c9c9763d9c327e522b Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 20 十二月 2024 08:52:34 +0800
Subject: [PATCH] 切换环境至dev并优化单据处理逻辑
---
src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java | 138 +++++++++------------------------------------
1 files changed, 28 insertions(+), 110 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java b/src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java
index 5f3f9c3..4783d06 100644
--- a/src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java
@@ -3,6 +3,7 @@
import lombok.Data;
import java.util.List;
+import java.util.Objects;
@Data
public class OrderSyncParam {
@@ -10,10 +11,13 @@
private String 鎿嶄綔鍗曟嵁;
private String 鎿嶄綔绫诲瀷;
+
//鍏ュ嚭搴撴爣璁�
private Integer pakin;
-
- //閲囪喘璁㈠崟缂栧彿
+ //鍗曟嵁绫诲瀷
+ private String orderType;
+ private String Upstreamcode;
+ //璁㈠崟缂栧彿
private String cPOID;
//渚涘簲鍟嗙紪鐮�
private String cVenCode;
@@ -31,67 +35,23 @@
private Integer states;
//鍗曟嵁鏃ユ湡
private String ddate;
+ //浠舵暟
+ private Double iNum;
+
+ //鎹㈢畻鐜�
+ private Double iinvexchrate;
private List<OrderDetl> children;
- public void setcPOID(String cPOID) {
- this.cPOID = cPOID;
- }
-
- public void setcVenCode(String cVenCode) {
- this.cVenCode = cVenCode;
- }
-
- public void setcPersonCode(String cPersonCode) {
- this.cPersonCode = cPersonCode;
- }
-
- public void setcSCCode(String cSCCode) {
- this.cSCCode = cSCCode;
- }
-
- public void setCexch_name(String cexch_name) {
- this.cexch_name = cexch_name;
- }
-
- public void setNflat(Double nflat) {
- this.nflat = nflat;
- }
-
- public void setcMemo(String cMemo) {
- this.cMemo = cMemo;
- }
-
- public void setStates(Integer states) {
- this.states = states;
- }
-
- public void setDdate(String ddate) {
- this.ddate = ddate;
- }
-
- public void setChildren(List<OrderDetl> children) {
- this.children = children;
- }
-
- public void set鎿嶄綔绯荤粺鍙�(String 鎿嶄綔绯荤粺鍙�) {
- this.鎿嶄綔绯荤粺鍙� = 鎿嶄綔绯荤粺鍙�;
- }
-
- public void set鎿嶄綔鍗曟嵁(String 鎿嶄綔鍗曟嵁) {
- this.鎿嶄綔鍗曟嵁 = 鎿嶄綔鍗曟嵁;
- }
-
- public void set鎿嶄綔绫诲瀷(String 鎿嶄綔绫诲瀷) {
- this.鎿嶄綔绫诲瀷 = 鎿嶄綔绫诲瀷;
- }
@Data
- public static class OrderDetl{
- //閲囪喘璁㈠崟琛屽彿
+ public static class OrderDetl {
+ //璁㈠崟琛屽彿
private String ivouchrowno;
//鐗╂枡缂栫爜
private String cInvCode;
+ //鎵瑰彿
+ private String batch;
//闇�姹傛椂闂�
private String dArriveDate;
//闇�姹傛暟閲�
@@ -104,6 +64,9 @@
private String cbMemo;
//浠舵暟
private Double iNum;
+
+ //鎹㈢畻鐜�
+ private Double iinvexchrate;
//鍗曟嵁鏉ユ簮
private String cSource;
//鐢熶骇璁㈠崟鍙凤紙閿�鍞鍗曞彿锛�
@@ -119,66 +82,21 @@
//閿�鍞鍗曞瓙琛ㄦ爣璇�
private String iorderdid;
+ private String iPOsID;
- public void setIvouchrowno(String ivouchrowno) {
- this.ivouchrowno = ivouchrowno;
+ @Override
+ public boolean equals(Object object) {
+ if (this == object) return true;
+ if (object == null || getClass() != object.getClass()) return false;
+ OrderDetl orderDetl = (OrderDetl) object;
+ return Objects.equals(cInvCode, orderDetl.cInvCode) && Objects.equals(batch, orderDetl.batch) && Objects.equals(bFree1, orderDetl.bFree1) && Objects.equals(cDefine22, orderDetl.cDefine22);
}
- public void setcInvCode(String cInvCode) {
- this.cInvCode = cInvCode;
+ @Override
+ public int hashCode() {
+ return Objects.hash(ivouchrowno, cInvCode, batch, dArriveDate, iQuantity, iTaxPrice, iPerTaxRate, cbMemo, iNum, cSource, cDefine22, Rstates, csocode, bFree1, id, iorderdid);
}
- public void setdArriveDate(String dArriveDate) {
- this.dArriveDate = dArriveDate;
- }
-
- public void setiQuantity(Double iQuantity) {
- this.iQuantity = iQuantity;
- }
-
- public void setiTaxPrice(Double iTaxPrice) {
- this.iTaxPrice = iTaxPrice;
- }
-
- public void setiPerTaxRate(Double iPerTaxRate) {
- this.iPerTaxRate = iPerTaxRate;
- }
-
- public void setCbMemo(String cbMemo) {
- this.cbMemo = cbMemo;
- }
-
- public void setiNum(Double iNum) {
- this.iNum = iNum;
- }
-
- public void setcSource(String cSource) {
- this.cSource = cSource;
- }
-
- public void setcDefine22(String cDefine22) {
- this.cDefine22 = cDefine22;
- }
-
- public void setRstates(String rstates) {
- Rstates = rstates;
- }
-
- public void setCsocode(String csocode) {
- this.csocode = csocode;
- }
-
- public void setbFree1(String bFree1) {
- this.bFree1 = bFree1;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public void setIorderdid(String iorderdid) {
- this.iorderdid = iorderdid;
- }
}
--
Gitblit v1.9.1