From 1da002910c1d9d44cd195bd24d951b4942a4e29c Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 14 一月 2025 14:58:02 +0800
Subject: [PATCH] 优化定时任务间隔及字段命名，调整环境配置
---
src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java | 49 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 43 insertions(+), 6 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 fb52a63..4783d06 100644
--- a/src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java
@@ -2,12 +2,22 @@
import lombok.Data;
-import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Data
public class OrderSyncParam {
- //閲囪喘璁㈠崟缂栧彿
+ private String 鎿嶄綔绯荤粺鍙�;
+ private String 鎿嶄綔鍗曟嵁;
+ private String 鎿嶄綔绫诲瀷;
+
+
+ //鍏ュ嚭搴撴爣璁�
+ private Integer pakin;
+ //鍗曟嵁绫诲瀷
+ private String orderType;
+ private String Upstreamcode;
+ //璁㈠崟缂栧彿
private String cPOID;
//渚涘簲鍟嗙紪鐮�
private String cVenCode;
@@ -25,17 +35,25 @@
private Integer states;
//鍗曟嵁鏃ユ湡
private String ddate;
+ //浠舵暟
+ private Double iNum;
+
+ //鎹㈢畻鐜�
+ private Double iinvexchrate;
private List<OrderDetl> children;
+
@Data
- public static class OrderDetl{
- //閲囪喘璁㈠崟琛屽彿
+ public static class OrderDetl {
+ //璁㈠崟琛屽彿
private String ivouchrowno;
//鐗╂枡缂栫爜
private String cInvCode;
+ //鎵瑰彿
+ private String batch;
//闇�姹傛椂闂�
- private Date dArriveDate;
+ private String dArriveDate;
//闇�姹傛暟閲�
private Double iQuantity;
//鍚◣鍗曚环
@@ -46,6 +64,9 @@
private String cbMemo;
//浠舵暟
private Double iNum;
+
+ //鎹㈢畻鐜�
+ private Double iinvexchrate;
//鍗曟嵁鏉ユ簮
private String cSource;
//鐢熶骇璁㈠崟鍙凤紙閿�鍞鍗曞彿锛�
@@ -57,10 +78,26 @@
//瑙勬牸锛堣嚜鐢遍」1锛�
private String bFree1;
//閲囪喘璁㈠崟瀛愯〃鏍囪瘑
- private String ID;
+ private String id;
//閿�鍞鍗曞瓙琛ㄦ爣璇�
private String iorderdid;
+ private String iPOsID;
+
+ @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);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(ivouchrowno, cInvCode, batch, dArriveDate, iQuantity, iTaxPrice, iPerTaxRate, cbMemo, iNum, cSource, cDefine22, Rstates, csocode, bFree1, id, iorderdid);
+ }
+
+
}
--
Gitblit v1.9.1