From 899d74ab3d00f7d0b0909d23551b1f971e2edea4 Mon Sep 17 00:00:00 2001
From: WS <1143478319@qq.com>
Date: 星期四, 17 八月 2023 18:57:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService11.java | 24
src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutSettle.java | 114 +++
src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1209Rep.java | 27
src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultDepot.java | 4
src/main/java/com/fzzy/api/entity/Api1108.java | 18
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1108.java | 110 +++
src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1108Rep.java | 19
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1107.java | 99 +++
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1112.java | 111 +++
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1204.java | 152 +++++
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1207.java | 35 +
src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutLossOver.java | 174 +++++
src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java | 21
src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1107Rep.java | 18
src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultBuild.java | 6
src/main/java/com/fzzy/async/fzzy40/entity/Fz40DeptDevice.java | 93 +++
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1206.java | 144 ++++
src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1112Rep.java | 18
src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1204Rep.java | 27
src/main/java/com/fzzy/async/fzzy40/entity/Fz40Drug.java | 126 ++++
src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugKey.java | 19
src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1207Rep.java | 28
src/main/java/com/fzzy/async/fzzy40/entity/Fz40OAStaff.java | 132 ++++
src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutStockChange.java | 91 +++
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java | 146 ++++
25 files changed, 1,730 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1108.java b/src/main/java/com/fzzy/api/entity/Api1108.java
index fbc3bda..9b7d610 100644
--- a/src/main/java/com/fzzy/api/entity/Api1108.java
+++ b/src/main/java/com/fzzy/api/entity/Api1108.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
@@ -17,14 +18,14 @@
@Data
@Entity
@Table(name = "API_1108")
-public class Api1108 implements Serializable {
+public class Api1108 implements Serializable {
/**
- *
- */
- private static final long serialVersionUID = -7131774374918644731L;
+ *
+ */
+ private static final long serialVersionUID = -7131774374918644731L;
- @Id
+ @Id
@Column(name = "ID_", length = 40)
@JsonIgnore
private String id;
@@ -92,7 +93,8 @@
@PropertyDef(label = "淇濊川鏈�")
@Column(name = "bzq", length = 20)
- private String bzq;
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date bzq;
@PropertyDef(label = "閲囪喘鏃ユ湡")
@JSONField(format = "yyyy-MM-dd")
@@ -103,6 +105,10 @@
@Column(name = "kcsl", precision = 20, scale = 6)
private Double kcsl;
+ @Column(name = "kcsldw", length = 1)
+ @PropertyDef(label = "搴撳瓨閲忓崟浣�", description = "1(榛樿)锛氬叕鏂わ紱2锛氬厠锛�3锛氭鍗囷紱")
+ private String kcsldw;
+
@PropertyDef(label = "鎿嶄綔鏍囧織")
@Column(name = "czbz", length = 1)
private String czbz;
diff --git a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService11.java b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService11.java
index dc127ad..05afc75 100644
--- a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService11.java
+++ b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService11.java
@@ -3,19 +3,21 @@
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.SyncProtocol;
import com.fzzy.api.service.SyncService11;
+import com.fzzy.async.fzzy40.impl.Fzzy40Sync1107;
+import com.fzzy.async.fzzy40.impl.Fzzy40Sync1108;
import com.fzzy.async.fzzy40.impl.Fzzy40Sync1111;
+import com.fzzy.async.fzzy40.impl.Fzzy40Sync1112;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+
import java.util.Date;
/**
* @Desc: 鍩虹淇℃伅鍚屾
- *
* @author: czt
* @update-time: 2023/08/14
- *
*/
@Slf4j
@Component
@@ -24,6 +26,12 @@
@Autowired
private Fzzy40Sync1111 fzzy40Sync1111;
+ @Autowired
+ private Fzzy40Sync1107 fzzy40Sync1107;
+ @Autowired
+ private Fzzy40Sync1108 fzzy40Sync1108;
+ @Autowired
+ private Fzzy40Sync1112 fzzy40Sync1112;
@Override
public String getProtocol() {
@@ -43,12 +51,12 @@
//鐩戞帶鐐逛綅淇℃伅鍚屾
fzzy40Sync1111.syncData(kqdm, deptId, start, end);
- //鑽墏淇℃伅鍚屾 TODO
-
- //璁惧淇℃伅鍚屾 TODO
-
- //浜哄憳淇℃伅鍚屾 TODO
-
+ //鑽墏淇℃伅鍚屾
+ fzzy40Sync1108.syncData(kqdm, deptId, start, end);
+ //璁惧淇℃伅鍚屾
+ fzzy40Sync1107.syncData(kqdm, deptId, start, end);
+ //浜哄憳淇℃伅鍚屾
+ fzzy40Sync1112.syncData(kqdm, deptId, start, end);
//浼佷笟淇＄敤淇℃伅鍚屾--鏆備笉鎵ц
}
diff --git a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
index 11947f2..46ea62d 100644
--- a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
+++ b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
@@ -8,6 +8,7 @@
import com.fzzy.async.fzzy40.impl.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+
import java.util.Date;
/**
@@ -30,6 +31,12 @@
private Fzzy40Sync1208 fzzySync1208;
@Autowired
private Fzzy40Sync1203 fzzySync1203;
+ @Autowired
+ private Fzzy40Sync1204 fzzySync1204;
+ @Autowired
+ private Fzzy40Sync1206 fzzySync1206;
+ @Autowired
+ private Fzzy40Sync1209 fzzySync1209;
@Override
public String getProtocol() {
@@ -53,18 +60,18 @@
//绮鍏ュ簱鍚屾
fzzySync1202.syncData(kqdm, deptId, start, end);
- //绮鍏ュ簱璐ㄦ TODO
+ //绮鍏ュ簱璐ㄦ
fzzySync1203.syncData(kqdm, deptId, start, end);
- //绮鍏ュ簱缁撶畻 TODO
-
+ //绮鍏ュ簱缁撶畻
+ fzzySync1204.syncData(kqdm, deptId, start, end);
//绮鍑哄簱鍚屾
fzzySync1205.syncData(kqdm, deptId, start, end);
- //绮鍑哄簱缁撶畻 TODO
-
- //绮鎹熺泭 TODO
-
+ //绮鍑哄簱缁撶畻
+ fzzySync1206.syncData(kqdm, deptId, start, end);
+ //绮鎹熺泭
+ fzzySync1209.syncData(kqdm, deptId, start, end);
//鍊掍粨淇℃伅鍚屾 TODO
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DeptDevice.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DeptDevice.java
new file mode 100644
index 0000000..e8e02f5
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DeptDevice.java
@@ -0,0 +1,93 @@
+package com.fzzy.async.fzzy40.entity;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 璁惧淇℃伅
+ *
+ * @Author:YAN
+ */
+@Data
+@Entity
+@Table(name = "D_DEPT_DEVICE")
+public class Fz40DeptDevice implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ @Id
+ @Column(name = "ID_", length = 40)
+ @PropertyDef(label = "ID")
+ private String id;
+
+ @Column(name = "kqdm", length = 40)
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String kqdm;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜", description = "")
+ private String companyId;
+
+ @Column(name = "dwdm", length = 18)
+ @PropertyDef(label = "鍗曚綅浠ｇ爜")
+ private String dwdm;
+
+ @Column(name = "kqmc", length = 256)
+ @PropertyDef(label = "搴撳尯鍚嶇О")
+ private String kqmc;
+
+ @Column(name = "sbbh", length = 20)
+ @PropertyDef(label = "璁惧缂栧彿")
+ private String sbbh;
+
+ @Column(name = "sbyqmc", length = 50)
+ @PropertyDef(label = "璁惧浠櫒鍚嶇О")
+ private String sbyqmc;
+
+ @Column(name = "sbyqdm", length = 8)
+ @PropertyDef(label = "璁惧浠櫒浠ｇ爜")
+ private String sbyqdm;
+
+ @Column(name = "sbggxh", length = 50)
+ @PropertyDef(label = "璁惧瑙勬牸鍨嬪彿")
+ private String sbggxh;
+
+ @Column(name = "sccj", length = 256)
+ @PropertyDef(label = "鐢熶骇鍘傚")
+ private String sccj;
+
+ @Column(name = "scrq")
+ @PropertyDef(label = "鐢熶骇鏃ユ湡")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date scrq;
+
+ @Column(name = "sbms", length = 50)
+ @PropertyDef(label = "璁惧鎻忚堪")
+ private String sbms;
+
+ @Column(name = "sbzt", length = 1)
+ @PropertyDef(label = "璁惧鐘舵��")
+ private String sbzt;
+
+ @Column(name = "jdsj")
+ @PropertyDef(label = "妫�瀹氭椂闂�")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date jdsj;
+
+ @Column(name = "jddw", length = 256)
+ @PropertyDef(label = "妫�瀹氬崟浣�")
+ private String jddw;
+
+ @Column(name = "UPDATE_TIME_")
+ @PropertyDef(label = "鏇存柊鏃堕棿")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date updateTime;
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Drug.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Drug.java
new file mode 100644
index 0000000..80def0e
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Drug.java
@@ -0,0 +1,126 @@
+package com.fzzy.async.fzzy40.entity;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鐜祦鐔忚捀-鑽搧搴撳瓨
+ *
+ * @ClassName: Fz40Drug
+ * @date 2023骞�8鏈�17鏃�
+ */
+@Data
+@Entity
+@Table(name = "D_DRUG")
+@IdClass(Fz40DrugKey.class)
+public class Fz40Drug implements Serializable {
+
+ @Id
+ @Column(name = "ID_", length = 40)
+ @PropertyDef(label = "鑽墏缂栧彿", description = "搴撳尯浠ｇ爜+涓変綅椤哄簭鍙�")
+ private String id;
+
+ @Id
+ @Column(name = "DEPT_ID_", length = 50)
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String deptId;
+
+ @Id
+ @Column(name = "cgrq")
+ @PropertyDef(label = "閲囪喘鏃ユ湡")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date cgrq;
+
+ @Column(name = "DEPT_NAME_", length = 256)
+ @PropertyDef(label = "搴撳尯鍚嶇О")
+ private String deptName;
+
+ @Column(name = "dwdm", length = 18)
+ @PropertyDef(label = "鍗曚綅浠ｇ爜")
+ private String dwdm;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "NAME_", length = 50)
+ @PropertyDef(label = "鑽搧鍚嶇О")
+ private String name;
+
+
+ @Column(name = "bzw", length = 1)
+ @PropertyDef(label = "鍖呰鐗�", description = "1锛氱摱瑁咃紝2锛氳瑁咃紝3锛氬叾浠�")
+ private String bzw;
+
+ @Column(name = "ggxh", length = 256)
+ @PropertyDef(label = "鍨嬪彿瑙勬牸", description = "濡傦細100mg/绮掓垨10g/鐗�")
+ private String ggxh;
+
+ @Column(name = "aqsysms", length = 1000)
+ @PropertyDef(label = "瀹夊叏浣跨敤璇存槑涔�")
+ private String aqsysms;
+
+ @Column(name = "sccj", length = 40)
+ @PropertyDef(label = "鐢熶骇鍘傚")
+ private String sccj;
+
+ @Column(name = "cgly", length = 40)
+ @PropertyDef(label = "閲囪喘鏉ユ簮")
+ private String cgly;
+
+ @Column(name = "cctj", length = 200)
+ @PropertyDef(label = "瀛樺偍鏉′欢")
+ private String cctj;
+
+ @Column(name = "ccdd", length = 1)
+ @PropertyDef(label = "鍌ㄥ瓨鍦扮偣", description = "1:鑽墏搴�,2:鍏朵粬")
+ private String ccdd;
+
+ @Column(name = "bzwclfs", length = 1000)
+ @PropertyDef(label = "鍖呰鐗╁鐞嗘柟寮�")
+ private String bzwclfs;
+
+ @Column(name = "czclfs", length = 1000)
+ @PropertyDef(label = "娈嬫福澶勭悊鏂瑰紡")
+ private String czclfs;
+
+ @Column(name = "bzq", length = 20)
+ @PropertyDef(label = "淇濊川鏈�")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date bzq;
+
+// @Column(name = "SPEC_", length = 50)
+// @PropertyDef(label = "瑙勬牸璇存槑")
+// private String spec;
+
+ @Column(name = "DOSAGE_", length = 20)
+ @PropertyDef(label = "鍓傚瀷")
+ private String dosage;
+
+ @Column(name = "COUNT_")
+ @PropertyDef(label = "搴撳瓨閲�")
+ private Double count = 0.0;
+
+ @Column(name = "kcsldw", length = 1)
+ @PropertyDef(label = "搴撳瓨閲忓崟浣�", description = "1(榛樿)锛氬叕鏂わ紱2锛氬厠锛�3锛氭鍗囷紱")
+ private String kcsldw;
+
+
+ @PropertyDef(label = "鎿嶄綔鍛�")
+ @Column(name = "UPDATE_USER_", length = 30)
+ private String updateUser;
+
+ @PropertyDef(label = "鏇存柊鏃堕棿")
+ @Column(name = "UPDATE_TIME_")
+ private Date updateTime;
+
+ @PropertyDef(label = "澶囨敞")
+ @Column(name = "REMARKS_", length = 300)
+ private String remarks;
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugKey.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugKey.java
new file mode 100644
index 0000000..cc5cac1
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugKey.java
@@ -0,0 +1,19 @@
+package com.fzzy.async.fzzy40.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+public class Fz40DrugKey implements Serializable {
+ private String id;
+ private String deptId;
+ private Date cgrq;
+
+ public Fz40DrugKey() {
+ super();
+ }
+}
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutLossOver.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutLossOver.java
new file mode 100644
index 0000000..4fff6b5
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutLossOver.java
@@ -0,0 +1,174 @@
+package com.fzzy.async.fzzy40.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 缁煎悎绠＄悊-鎹熸孩绠＄悊
+ *
+ * @author: andy.jia
+ * @description:
+ * @version:
+ * @data:2020骞�5鏈�27鏃�
+ */
+@Data
+@Entity
+@Table(name = "D_INOUT_LOSS_OVER")
+public class Fz40InoutLossOver implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @Id
+ @Column(name = "ID_", length = 40)
+ @PropertyDef(label = "鎹熺泭鍗曞彿", description = "鐢辫揣浣嶄唬鐮�+涓氬姟鏃ユ湡(yyyyMMdd)+3浣嶉『搴忓彿缁勬垚")
+ private String id;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 40)
+ @PropertyDef(label = "鎵�灞炲垎搴�")
+ private String deptId;
+
+ @Column(name = "DEPOT_ID_", length = 50)
+ @PropertyDef(label = "鎵�灞炰粨搴�")
+ private String depotId;
+
+
+ @Column(name = "TYPE_", length = 10)
+ @PropertyDef(label = "绫诲瀷", description = "鎹熻��/婧㈠嚭")
+ private String type;
+
+ @Column(name = "SUBMIT_TIME_")
+ @PropertyDef(label = "涓氬姟鏃ユ湡", description = "yyyy-MM-dd")
+ private Date submitTime;
+
+ @PropertyDef(label = "鍏ュ簱鍑�閲�", description = "鍗曚綅锛欿G")
+ @Column(name = "rkjz", precision = 20, scale = 6)
+ private double rkjz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鍏ュ簱鏃堕棿")
+ @Column(name = "rksj")
+ private Date rksj;
+
+ @PropertyDef(label = "鍏ュ簱姘村垎(%)")
+ @Column(name = "rksf", precision = 20, scale = 6)
+ private double rksf;
+
+ @PropertyDef(label = "鍏ュ簱鏉傝川(%)")
+ @Column(name = "rkzz", precision = 20, scale = 6)
+ private double rkzz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鍑哄簱鏃堕棿")
+ @Column(name = "cksj")
+ private Date cksj;
+
+ @PropertyDef(label = "鍑哄簱鍑�閲�", description = "鍗曚綅锛欿G")
+ @Column(name = "ckjz", precision = 20, scale = 6)
+ private double ckjz;
+
+ @PropertyDef(label = "鍑哄簱姘村垎(%)")
+ @Column(name = "cksf", precision = 16, scale = 6)
+ private double cksf;
+
+ @PropertyDef(label = "鍑哄簱鏉傝川(%)")
+ @Column(name = "ckzz", precision = 16, scale = 6)
+ private double ckzz;
+
+ @Column(name = "AMOUNT_")
+ @PropertyDef(label = "閲嶉噺", description = "鎹熸孩鏁伴噺KG锛涙崯鑰椾负姝ｆ暟锛屾孩浣欎负璐熸暟")
+ private Double amount;
+
+
+ @PropertyDef(label = "鎹熺泭鏄惁姝ｅ父", description = "0锛氭甯� 1锛氫笉姝ｅ父")
+ @Column(name = "sysfzc", length = 1)
+ private String sysfzc;
+
+ @PropertyDef(label = "鎹熸孩鍘熷洜")
+ @Column(name = "syyy", length = 400)
+ private String syyy;
+
+ @PropertyDef(label = "浠撳偍瀹℃牳浜�")
+ @Column(name = "ccshr", length = 64)
+ private String ccshr;
+
+ @Column(name = "AUDIT_CCSH_", length = 10)
+ @PropertyDef(label = "瀹℃壒鐘舵��")
+ private String auditCcsh;
+
+ @Column(name = "INFO_CCSH_", length = 200)
+ @PropertyDef(label = "瀹℃牳璇存槑")
+ private String InfoCcsh;
+
+ @PropertyDef(label = "璐ㄦ瀹℃牳浜�")
+ @Column(name = "zjshr", length = 64)
+ private String zjshr;
+
+ @Column(name = "AUDIT_ZJSH_", length = 10)
+ @PropertyDef(label = "瀹℃壒鐘舵��")
+ private String auditZjsh;
+
+ @Column(name = "INFO_ZJSH_", length = 200)
+ @PropertyDef(label = "瀹℃牳璇存槑")
+ private String infoZjsh;
+
+ @PropertyDef(label = "缁熻瀹℃牳浜�")
+ @Column(name = "tjshr", length = 64)
+ private String tjshr;
+
+ @Column(name = "AUDIT_TJSH_", length = 10)
+ @PropertyDef(label = "瀹℃壒鐘舵��")
+ private String auditTjsh;
+
+ @Column(name = "INFO_TJSH_", length = 200)
+ @PropertyDef(label = "瀹℃牳璇存槑")
+ private String infoTjsh;
+
+ @PropertyDef(label = "浼氳瀹℃牳浜�")
+ @Column(name = "kjshr", length = 64)
+ private String kjshr;
+
+ @Column(name = "AUDIT_KJSH_", length = 10)
+ @PropertyDef(label = "瀹℃壒鐘舵��")
+ private String auditKjsh;
+
+ @Column(name = "INFO_KJSH_", length = 200)
+ @PropertyDef(label = "瀹℃牳璇存槑")
+ private String infoKjsh;
+
+ @PropertyDef(label = "棰嗗瀹℃牳浜�")
+ @Column(name = "ldshr", length = 64)
+ private String ldshr;
+
+ @Column(name = "AUDIT_LDSH_", length = 10)
+ @PropertyDef(label = "瀹℃壒鐘舵��", description = "鏈�缁堝鏍哥姸鎬佷互棰嗗瀹℃牳涓哄噯")
+ private String auditLdsh;
+
+ @Column(name = "INFO_LDSH_", length = 200)
+ @PropertyDef(label = "瀹℃牳璇存槑")
+ private String infoLdsh;
+
+ @Column(name = "REMARK_", length = 300)
+ @PropertyDef(label = "澶囨敞")
+ private String remark;
+
+ @Column(name = "UPDATE_TIME_")
+ @PropertyDef(label = "鏇存柊鏃堕棿")
+ private Date updateTime;
+
+ @Column(name = "UPDATE_USER_", length = 50)
+ @PropertyDef(label = "鏇存柊浜�")
+ private String updateUser;
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutSettle.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutSettle.java
new file mode 100644
index 0000000..5768940
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutSettle.java
@@ -0,0 +1,114 @@
+package com.fzzy.async.fzzy40.entity;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.util.Date;
+
+/**
+ * 鍑哄叆搴撶粨绠楋紝2023骞�5鏈�26鏃ワ紝鏍规嵁鏂板浗绮浼樺寲璋冩暣
+ */
+@Data
+@Entity
+@Table(name = "D_INOUT_SETTLE")
+public class Fz40InoutSettle {
+
+ @Id
+ @Column(name = "ID_", length = 40)
+ @PropertyDef(label = "娴佹按鍙�", description = "缁撶畻鏃ユ湡锛坹yyyMMdd锛�+4浣嶉『搴忓彿缁勬垚")
+ private String id;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 50)
+ @PropertyDef(label = "搴撳尯缂栫爜")
+ private String deptId;
+
+ @Column(name = "INOUT_TYPE_")
+ @PropertyDef(label = "鍑哄叆搴撶被鍨�")
+ private String inoutType;
+
+ @Column(name = "BIZ_TYPE_")
+ @PropertyDef(label = "澶勭悊鏂瑰紡", description = "0=鍗曡溅缁撶畻/1=鍚堝悓缁撶畻")
+ private String bizType;
+
+ @Column(name = "DEPOT_ID_", length = 50)
+ @PropertyDef(label = "鎵�灞炰粨搴�")
+ private String depotId;
+
+ @Column(name = "CONTRACT_ID_", length = 40)
+ @PropertyDef(label = "鍚堝悓缂栫爜", description = "閽堝杞崲绮蹇呭～")
+ private String contractId;
+
+ @Column(name = "CONTRACT_NAME_", length = 50)
+ @PropertyDef(label = "鍚堝悓鍚嶇О", description = "閽堝杞崲绮蹇呭～")
+ private String contractName;
+
+ // 缁撶畻淇℃伅
+ @Column(name = "PAY_PRICE_")
+ @PropertyDef(label = "鍗曚环")
+ private Double payPrice = 0.0;
+
+ @Column(name = "PAY_MONEY_")
+ @PropertyDef(label = "缁撶畻鎬婚")
+ private Double payMoney = 0.0;
+
+ @Column(name = "SETTLE_WEIGHT_")
+ @PropertyDef(label = "缁撶畻閲嶉噺")
+ private double settleWeight = 0.0;
+
+ @Column(name = "PAY_TIME_")
+ @PropertyDef(label = "缁撶畻鏃堕棿")
+ private Date payTime;
+
+ @Column(name = "PAY_TYPE_", length = 10)
+ @PropertyDef(label = "浠樻鏂瑰紡")
+ private String payType;
+
+ @Column(name = "PAYEE_")
+ @PropertyDef(label = "鏀舵浜�", description = "鏀舵鍗曚綅鎴栬�呬釜浜�")
+ private String payee;
+
+ @Column(name = "PAYEE_ID_")
+ @PropertyDef(label = "鏀舵浜鸿韩浠借瘉鍙�")
+ private String payeeId;
+
+ @Column(name = "BANK_CATEGORY_", length = 10)
+ @PropertyDef(label = "閾惰琛屽埆浠ｇ爜")
+ private String bankCategory;
+
+ @Column(name = "BANK_CODE_", length = 20)
+ @PropertyDef(label = "寮�鎴疯鍙�")
+ private String bankCode;
+
+ @Column(name = "BANK_", length = 50)
+ @PropertyDef(label = "寮�鎴疯鍚嶇О")
+ private String bank;
+
+ @Column(name = "BANK_NUM_", length = 20)
+ @PropertyDef(label = "閾惰璐﹀彿")
+ private String bankNum;
+
+ @Column(name = "PAY_UNIT_", length = 50)
+ @PropertyDef(label = "浠樻鍗曚綅")
+ private String payUnit;
+
+ @Column(name = "PAY_USER_", length = 40)
+ @PropertyDef(label = "浠樻鎿嶄綔浜�")
+ private String payUser;
+
+ @Column(name = "REMARKS_", length = 200)
+ @PropertyDef(label = "澶囨敞淇℃伅")
+ private String remarks;
+
+ @Column(name = "UPDATE_TIME_")
+ @PropertyDef(label = "鏁版嵁鏇存柊鏃堕棿")
+ private Date updateTime;
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutStockChange.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutStockChange.java
new file mode 100644
index 0000000..d7c8df1
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutStockChange.java
@@ -0,0 +1,91 @@
+package com.fzzy.async.fzzy40.entity;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Desc: 鍊掍粨鍔熻兘锛�2023骞�5鏈�26鏃� 鏍规嵁鏂板浗绮鏇存柊浼樺寲
+ * @author: Andy
+ * @update-time: 2023/5/26
+ */
+@Data
+@Entity
+@Table(name = "D_INOUT_STOCK_CHANGE")
+public class Fz40InoutStockChange {
+
+ /**
+ * 鍊掍粨鍗曞彿
+ */
+ @Id
+ @Column(name = "ID_", length = 32)
+ @PropertyDef(label = "鍊掍粨鍗曞彿", description = "鐢卞�掍粨鏃ユ湡(yyyyMMdd)+4浣嶉『搴忓彿缁勬垚")
+ private String id;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 40)
+ @PropertyDef(label = "鎵�灞炲垎搴�")
+ private String deptId;
+
+ @Column(name = "TYPE_", length = 2)
+ @PropertyDef(label = "鍊掍粨绫诲瀷", description = "0锛氬�掍粨 1锛氱Щ搴�")
+ private String type;
+
+ @Column(name = "PLAN_CODE_", length = 40)
+ @PropertyDef(label = "鍊掍粨璁″垝鏂囦欢缂栧彿", description = "鍊掍粨璁″垝鏂囦欢缂栧彿")
+ private String planCode;
+
+ @Column(name = "NOTICE_ID_", length = 40)
+ @PropertyDef(label = "閫氱煡鍗曞彿", description = "閫氱煡鍗曞彿")
+ private String noticeId;
+
+ @Column(name = "FOOD_VARIETY_", length = 10)
+ @PropertyDef(label = "绮鍝佺", description = "浠ｇ爜涓嶈冻7浣嶉渶鍦ㄦ湯浣嶈ˉ0")
+ private String foodVariety;
+
+ @Column(name = "DEPOT_ID_IN", length = 50)
+ @PropertyDef(label = "鍊掑叆浠撳簱")
+ private String depotIdIn;
+
+ @Column(name = "DEPOT_ID_OUT", length = 50)
+ @PropertyDef(label = "鍊掑嚭浠撳簱")
+ private String depotIdOut;
+
+ @Column(name = "CHANGE_DATE_")
+ @PropertyDef(label = "鍊掍粨鏃ユ湡", description = "yyyy-MM-dd")
+ private Date changeDate;
+
+ @Column(name = "NUMBER_")
+ @PropertyDef(label = "鍊掍粨鏁伴噺", description = "鍗曚綅锛氬叕鏂�")
+ private Double number = 0.0;
+
+ @Column(name = "UPDATE_TIME_")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date updateTime;
+
+ @Column(name = "UPDATE_USER_", length = 50)
+ @PropertyDef(label = "鏇存柊浜�")
+ private String updateUser;
+
+ @Column(name = "bzw", length = 1)
+ @PropertyDef(label = "鍖呰鐗�", description = "1锛氶夯琚� 2锛氱紪缁囪 3锛氭暎瑁� 9锛氬叾浠�")
+ private String bzw;
+
+ @Column(name = "bzbjs")
+ @PropertyDef(label = "鏍囧噯鍖呬欢鏁�", description = "鍗曚綅锛氫欢")
+ private Integer bzbjs = 0;
+
+ @Column(name = "zxzydw", length = 256)
+ @PropertyDef(label = "瑁呭嵏浣滀笟鍗曚綅", description = "瑁呭嵏浣滀笟鐨勪汉鍛樺鍚嶆垨鍗曚綅鍚嶇О锛岀敤鍗婅閫楀彿鍒嗛殧")
+ private String zxzydw;
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40OAStaff.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40OAStaff.java
new file mode 100644
index 0000000..f676635
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40OAStaff.java
@@ -0,0 +1,132 @@
+package com.fzzy.async.fzzy40.entity;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * OA-浜哄憳绠＄悊
+ *
+ * @author: YAN
+ * @description:
+ * @version:
+ * @data:2023骞�8鏈�10鏃�
+ */
+@Data
+@Entity
+@Table(name = "D_OA_STAFF")
+public class Fz40OAStaff implements Serializable {
+ private static final long serialVersionUID = 1L;
+ @Id
+ @Column(name = "ID_", length = 40)
+ @PropertyDef(label = "ID")
+ private String id;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜", description = "")
+ private String companyId;
+
+ @Column(name = "dwdm", length = 18)
+ @PropertyDef(label = "鍗曚綅浠ｇ爜")
+ private String dwdm;
+
+ @Column(name = "dwmc", length = 256)
+ @PropertyDef(label = "鍗曚綅鍚嶇О")
+ private String dwmc;
+
+ @Column(name = "lsbm", length = 256)
+ @PropertyDef(label = "闅跺睘閮ㄩ棬", description = "闅跺睘閮ㄩ棬鍚嶇О")
+ private String lsbm;
+
+ @Column(name = "xzqhdm", length = 6)
+ @PropertyDef(label = "琛屾斂鍖哄垝浠ｇ爜")
+ private String xzqhdm;
+
+ @Column(name = "xm", length = 32)
+ @PropertyDef(label = "濮撳悕")
+ private String xm;
+
+ @Column(name = "xb", length = 1)
+ @PropertyDef(label = "鎬у埆")
+ private String xb;
+
+ @Column(name = "sfzhm", length = 18)
+ @PropertyDef(label = "韬唤璇佸彿鐮�")
+ private String sfzhm;
+
+ @Column(name = "rzrq")
+ @PropertyDef(label = "鍏ヨ亴鏃ユ湡")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date rzrq;
+ /**
+ * 11锛� 鍦ㄥ矖鑱屽伐(闀挎湡)锛�12锛� 鍦ㄥ矖 鑱屽伐(涓存椂)锛�20锛� 鍏朵粬浠庝笟浜哄憳
+ */
+ @Column(name = "gwxz", length = 2)
+ @PropertyDef(label = "宀椾綅鎬ц川")
+ private String gwxz;
+ /**
+ * 01锛� 鍦ㄥ矖 02锛� 宸茬鑱�
+ */
+ @Column(name = "zgzt", length = 2)
+ @PropertyDef(label = "鍦ㄥ矖鐘舵��")
+ private String zgzt;
+
+ @Column(name = "lzrq")
+ @PropertyDef(label = "绂昏亴鏃ユ湡")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date lzrq;
+
+ @Column(name = "zjdh", length = 16)
+ @PropertyDef(label = "搴ф満鐢佃瘽")
+ private String zjdh;
+
+ @Column(name = "yddh", length = 16)
+ @PropertyDef(label = "绉诲姩鐢佃瘽")
+ private String yddh;
+
+ @Column(name = "dzyx", length = 32)
+ @PropertyDef(label = "鐢靛瓙閭")
+ private String dzyx;
+
+ @Column(name = "mz", length = 2)
+ @PropertyDef(label = "姘戞棌")
+ private String mz;
+
+ @Column(name = "zzmm", length = 2)
+ @PropertyDef(label = "鏀挎不闈㈣矊")
+ private String zzmm;
+
+ @Column(name = "rylb", length = 4)
+ @PropertyDef(label = "浜哄憳绫诲埆")
+ private String rylb;
+
+ @Column(name = "zy", length = 128)
+ @PropertyDef(label = "涓撲笟")
+ private String zy;
+
+ @Column(name = "qdzgzchzyzgsj")
+ @PropertyDef(label = "鍙栧緱鏈�楂樿亴绉版垨鑱屼笟璧勬牸鏃堕棿")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date qdzgzchzyzgsj;
+
+ @Column(name = "xl", length = 1)
+ @PropertyDef(label = "瀛﹀巻")
+ private String xl;
+
+ @Column(name = "zw", length = 16)
+ @PropertyDef(label = "鑱屽姟")
+ private String zw;
+
+ @Column(name = "UPDATE_TIME_")
+ @PropertyDef(label = "鏇存柊鏃堕棿")
+ private Date updateTime;
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1107.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1107.java
new file mode 100644
index 0000000..3fb99a6
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1107.java
@@ -0,0 +1,99 @@
+package com.fzzy.async.fzzy40.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.*;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1101Rep;
+import com.fzzy.api.view.repository.Api1102Rep;
+import com.fzzy.api.view.repository.Api1107Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy40.entity.Fz40DeptDevice;
+import com.fzzy.async.fzzy40.repository.Fzzy40Sync1107Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 璁惧淇℃伅
+ *
+ * @Author:YAN
+ */
+@Slf4j
+@Component
+public class Fzzy40Sync1107 {
+ @Autowired
+ private Fzzy40Sync1107Rep fzzy40Sync1107Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+ @Autowired
+ private Api1101Rep api1101Rep;
+ @Autowired
+ private Api1102Rep api1102Rep;
+ @Autowired
+ private Api1107Rep api1107Rep;
+
+ /**
+ * 鍚屾璁惧淇℃伅
+ *
+ * @param kqdm
+ * @param deptId
+ * @param start
+ * @param end
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------1107鎺ュ彛璁惧淇℃伅寮�濮嬪悓姝�------------------");
+
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1107);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz40DeptDevice> list = fzzy40Sync1107Rep.listDecixe(deptId);
+
+ if (null == list || list.isEmpty()) {
+ log.info("-------------娌℃湁鑾峰彇鍒拌澶囦俊鎭�------------------");
+ return;
+ }
+ Api1102 api1102 = api1102Rep.findById(kqdm).get();
+ Api1101 api1101 = api1101Rep.findById(api1102.getDwdm()).get();
+ Api1107 apiData;
+
+ for (Fz40DeptDevice sysData : list) {
+ apiData = new Api1107();
+
+ apiData.setBizId(sysData.getId());
+ apiData.setSbbh(sysData.getSbbh());
+ apiData.setDwdm(api1101.getDwdm());//鍗曚綅浠ｇ爜
+ apiData.setKqdm(api1102.getKqdm());//搴撳尯浠ｇ爜
+ apiData.setKqmc(api1102.getKqmc());//搴撳尯鍚嶇О
+ apiData.setSbyqmc(sysData.getSbyqmc());
+ apiData.setSbyqdm(sysData.getSbyqdm());
+ apiData.setSbggxh(sysData.getSbggxh());
+ apiData.setSccj(sysData.getSccj());
+ apiData.setScrq(sysData.getScrq());
+ apiData.setSbms(sysData.getSbms());
+ apiData.setSbzt(sysData.getSbzt());
+ apiData.setJdsj(sysData.getJdsj());
+ apiData.setJddw(sysData.getJddw());
+ apiData.setCzbz(Constant.CZBZ_I);
+ apiData.setZhgxsj(sysData.getUpdateTime());
+
+ //淇濆瓨鏁版嵁
+ api1107Rep.save(apiData);
+ log.info("1107---鍚屾鏁版嵁锛歿}", apiData.toString());
+ }
+
+ } catch (Exception e) {
+ log.error("---璁惧淇℃伅鍚屾鎵ц澶辫触----{}", e.toString());
+ apiLog.setResult("璁惧淇℃伅鍚屾鎵ц澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+}
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1108.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1108.java
new file mode 100644
index 0000000..7101e67
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1108.java
@@ -0,0 +1,110 @@
+package com.fzzy.async.fzzy40.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1101;
+import com.fzzy.api.entity.Api1102;
+import com.fzzy.api.entity.Api1108;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1101Rep;
+import com.fzzy.api.view.repository.Api1102Rep;
+import com.fzzy.api.view.repository.Api1108Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy40.entity.Fz40Drug;
+import com.fzzy.async.fzzy40.repository.Fzzy40Sync1108Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鑽墏淇℃伅鍚屾
+ *
+ * @Author:YAN
+ */
+@Slf4j
+@Component
+public class Fzzy40Sync1108 {
+
+ @Autowired
+ private Fzzy40Sync1108Rep fzzy40Sync1108Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+ @Autowired
+ private Api1101Rep api1101Rep;
+ @Autowired
+ private Api1102Rep api1102Rep;
+ @Autowired
+ private Api1108Rep api1108Rep;
+
+
+ /**
+ * 鍚屾鑽墏淇℃伅
+ *
+ * @param kqdm
+ * @param deptId
+ * @param start
+ * @param end
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------1108鎺ュ彛鑽墏淇℃伅寮�濮嬪悓姝�------------------");
+
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1108);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+
+ try {
+ List<Fz40Drug> list = fzzy40Sync1108Rep.listDrug(deptId);
+
+ if (null == list || list.isEmpty()) {
+ log.info("-------------娌℃湁鑾峰彇鍒拌嵂鍓備俊鎭�------------------");
+ return;
+ }
+ Api1102 api1102 = api1102Rep.findById(kqdm).get();
+ Api1101 api1101 = api1101Rep.findById(api1102.getDwdm()).get();
+ Api1108 apiData;
+ for (Fz40Drug sysData : list) {
+
+ apiData = new Api1108();
+ apiData.setId(ContextUtil.getUUID());//ID
+ apiData.setBizId(sysData.getId());//涓氬姟id
+ apiData.setDwdm(api1101.getDwdm());//鍗曚綅浠ｇ爜
+ apiData.setKqdm(api1102.getKqdm());//搴撳尯浠ｇ爜
+ apiData.setKqmc(api1102.getKqmc());//搴撳尯鍚嶇О
+ apiData.setYjbh(sysData.getId());//鑽墏缂栧彿
+ apiData.setYjmc(sysData.getName());//鑽墏鍚嶇О
+ apiData.setBzw(sysData.getBzw());//鍖呰鐗�
+ apiData.setGgxh(sysData.getGgxh());//鍨嬪彿瑙勬牸
+ apiData.setAqsysms(sysData.getAqsysms());//瀹夊叏浣跨敤璇存槑涔�
+ apiData.setSccj(sysData.getSccj());//鐢熶骇鍘傚
+ apiData.setCgly(sysData.getCgly());//閲囪喘鏉ユ簮
+ apiData.setCctj(sysData.getCctj());//瀛樺偍鏉′欢
+ apiData.setCcdd(sysData.getCcdd());//鍌ㄥ瓨鍦扮偣
+ apiData.setBzwclfs(sysData.getBzwclfs());//鍖呰鐗╁鐞嗘柟寮�
+ apiData.setCzclfs(sysData.getCzclfs());//娈嬫福澶勭悊鏂瑰紡
+ apiData.setBzq(sysData.getBzq());//淇濊川鏈�
+ apiData.setCgrq(sysData.getCgrq());//閲囪喘鏃ユ湡
+ apiData.setKcsl(sysData.getCount());//搴撳瓨鏁伴噺
+ apiData.setKcsldw(sysData.getKcsldw());//搴撳瓨鏁伴噺鍗曚綅
+ apiData.setCzbz(Constant.CZBZ_I);//鎿嶄綔鏍囧織
+ apiData.setZhgxsj(sysData.getUpdateTime());//鏈�鍚庢洿鏂版椂闂�
+
+ //淇濆瓨鏁版嵁
+ api1108Rep.save(apiData);
+ log.info("1108---鍚屾鏁版嵁锛歿}", apiData.toString());
+ }
+
+ } catch (Exception e) {
+ log.error("---鑽墏淇℃伅鍚屾鎵ц澶辫触----{}", e.toString());
+ apiLog.setResult("鑽墏淇℃伅鍚屾鎵ц澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+}
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1112.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1112.java
new file mode 100644
index 0000000..908d35d
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1112.java
@@ -0,0 +1,111 @@
+package com.fzzy.async.fzzy40.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1101;
+import com.fzzy.api.entity.Api1102;
+import com.fzzy.api.entity.Api1112;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.*;
+import com.fzzy.async.fzzy40.entity.Fz40OAStaff;
+import com.fzzy.async.fzzy40.repository.Fzzy40Sync1112Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 浜哄憳淇℃伅
+ *
+ * @Author:YAN
+ */
+@Slf4j
+@Component
+public class Fzzy40Sync1112 {
+
+ @Autowired
+ private Fzzy40Sync1112Rep fzzy40Sync1112Rep;
+ @Autowired
+ private Api1101Rep api1101Rep;
+ @Autowired
+ private Api1102Rep api1102Rep;
+ @Autowired
+ private Api1112Rep api1112Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+
+ /**
+ * 鍚屾浜哄憳淇℃伅
+ *
+ * @param kqdm
+ * @param deptId
+ * @param start
+ * @param end
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------1112鎺ュ彛浜哄憳淇℃伅鏁版嵁寮�濮嬪悓姝�------------------");
+
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1112);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+
+ try {
+ List<Fz40OAStaff> list = fzzy40Sync1112Rep.listStaff(deptId.substring(0, 4));
+ if (null == list || list.isEmpty()) {
+ log.info("-------------娌℃湁鑾峰彇鍒颁汉鍛樹俊鎭�------------------");
+ return;
+ }
+
+ //鏍规嵁搴撳尯浠ｇ爜鑾峰彇鍗曚綅浠ｇ爜
+ Api1102 api1102 = api1102Rep.findById(kqdm).get();
+ Api1101 api1101 = api1101Rep.findById(api1102.getDwdm()).get();
+
+ Api1112 apiData;
+
+ for (Fz40OAStaff sysData : list) {
+ apiData = new Api1112();
+ apiData.setDwmc(api1101.getDwmc());
+ apiData.setDwdm(api1101.getDwdm());
+ apiData.setKqdm(api1102.getKqdm());
+ apiData.setBizId(sysData.getId());
+ apiData.setSfzhm(sysData.getSfzhm());
+ apiData.setLsbm(sysData.getLsbm());
+ apiData.setXzqhdm(sysData.getXzqhdm());
+ apiData.setXm(sysData.getXm());
+ apiData.setXb(sysData.getXb());
+ apiData.setRzrq(sysData.getRzrq());
+ apiData.setGwxz(sysData.getGwxz());
+ apiData.setZgzt(sysData.getZgzt());
+ apiData.setLzrq(sysData.getLzrq());
+ apiData.setZjdh(sysData.getZjdh());
+ apiData.setYddh(sysData.getYddh());
+ apiData.setDzyx(sysData.getDzyx());
+ apiData.setMz(sysData.getMz());
+ apiData.setZzmm(sysData.getZzmm());
+ apiData.setRylb(sysData.getZy());
+ apiData.setQdzgzchzyzgsj(sysData.getQdzgzchzyzgsj());
+ apiData.setXl(sysData.getXl());
+ apiData.setZw(sysData.getZw());
+ apiData.setCzbz(Constant.CZBZ_I);
+ apiData.setZhgxsj(sysData.getUpdateTime());
+
+ //淇濆瓨鏁版嵁
+ api1112Rep.save(apiData);
+ log.info("1112---鍚屾鏁版嵁锛歿}", apiData.toString());
+
+ }
+
+ } catch (Exception e) {
+ log.error("---浜哄憳淇℃伅鍚屾鎵ц澶辫触----{}", e.toString());
+ apiLog.setResult("浜哄憳淇℃伅鍚屾鎵ц澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+}
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1204.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1204.java
new file mode 100644
index 0000000..a97d794
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1204.java
@@ -0,0 +1,152 @@
+package com.fzzy.async.fzzy40.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1105;
+import com.fzzy.api.entity.Api1204;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.*;
+import com.fzzy.async.fzzy30.repository.FzzySync1202Rep;
+import com.fzzy.async.fzzy35.repository.Fzzy35Sync1202Rep;
+import com.fzzy.async.fzzy40.entity.Fz40InoutRecord;
+import com.fzzy.async.fzzy40.entity.Fz40InoutSettle;
+import com.fzzy.async.fzzy40.entity.Fz40InoutNoticeIn;
+import com.fzzy.async.fzzy40.entity.Fz40InoutRecord;
+import com.fzzy.async.fzzy40.entity.Fz40InoutSettle;
+import com.fzzy.async.fzzy40.repository.Fzzy40Sync1107Rep;
+import com.fzzy.async.fzzy40.repository.Fzzy40Sync1202Rep;
+import com.fzzy.async.fzzy40.repository.Fzzy40Sync1204Rep;
+import com.fzzy.async.fzzy40.repository.Fzzy40SyncNoticeInRep;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 绮鍏ュ簱缁撶畻淇℃伅鍚屾
+ *
+ * @Author:YAN
+ */
+@Slf4j
+@Component
+public class Fzzy40Sync1204 {
+
+ /**
+ * 鍏ュ簱绫诲瀷
+ */
+ private final static String INOUT_TYPE_IN = "IN";
+
+ @Autowired
+ private Fzzy40Sync1202Rep fzzy40Sync1202Rep;
+ @Autowired
+ private Fzzy40Sync1204Rep fzzy40Sync1204Rep;
+ @Autowired
+ private Fzzy40SyncNoticeInRep fzzySyncNoticeInRep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+ @Autowired
+ private Api1204Rep api1204Rep;
+ @Autowired
+ private ApiCommonService commonService;
+
+ /**
+ * 绮鍏ュ簱缁撶畻淇℃伅鍚屾
+ *
+ * @param kqdm
+ * @param deptId
+ * @param start
+ * @param end
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+
+ log.info("-------------1204鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1204);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ //鑾峰彇绮鍏ュ簱缁撶畻淇℃伅
+ List<Fz40InoutSettle> list = fzzy40Sync1204Rep.listInoutSettle(INOUT_TYPE_IN, start, end);
+
+ if (null == list || list.isEmpty()) {
+ log.info("-------------娌℃湁鑾峰彇鍒扮伯椋熷叆搴撶粨绠椾俊鎭�------------------");
+ return;
+ }
+
+ Api1204 apiData;
+ Api1105 api1105;
+ List<Fz40InoutRecord> fz40InoutRecords;
+ Fz40InoutRecord fz40InoutRecord;
+ for (Fz40InoutSettle sysData : list) {
+
+ //鑾峰彇绮鍏ュ簱淇℃伅
+ fz40InoutRecords = fzzy40Sync1202Rep.listInoutRecordById(sysData.getId());
+ if (null == fz40InoutRecords || fz40InoutRecords.isEmpty()) {
+ continue;
+ }
+ fz40InoutRecord = fz40InoutRecords.get(0);
+ if (!deptId.equals(fz40InoutRecord.getDeptId())) {
+ continue;
+ }
+
+ //鑾峰彇璐т綅淇℃伅
+ api1105 = commonService.getApi1105Cache(fz40InoutRecord.getDepotId());
+ if (null == api1105) {
+ continue;
+ }
+
+ apiData = new Api1204();
+ //鍏ュ簱缁撶畻鍗曞彿:搴撳尯浠ｇ爜 + yyMMdd + 4涓洪『搴忓彿
+ apiData.setRkjsdh(kqdm + sysData.getId().substring(2));
+
+ //璐т綅浠ｇ爜
+ apiData.setHwdm(api1105.getHwdm());
+
+ //缁撶畻閲嶉噺銆佺粨绠楀崟浠枫�佺粨绠楅噾棰濄�佺粨绠楁椂闂�
+ apiData.setJssl(sysData.getSettleWeight());
+ apiData.setJsdj(sysData.getPayPrice());
+ apiData.setJsje(sysData.getPayMoney());
+ apiData.setJssj(sysData.getPayTime());
+
+ //缁撶畻鏂瑰紡
+ apiData.setJsfs(sysData.getPayType());
+
+ apiData.setSkr(sysData.getPayee());
+ apiData.setYhhbdm(sysData.getBankCategory());
+ apiData.setSkrsfzh(sysData.getPayeeId());
+ apiData.setKhhh(sysData.getBankCode());
+ apiData.setKhhmc(sysData.getBank());
+ apiData.setYhzh(sysData.getBankNum());
+ apiData.setFphm("");
+ apiData.setFpzt("");
+ apiData.setFkdw(sysData.getPayUnit());
+
+ //鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
+ apiData.setCzbz(Constant.CZBZ_I);
+ apiData.setZhgxsj(sysData.getUpdateTime());
+
+ //涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
+ apiData.setBizId(sysData.getId());
+ apiData.setKqdm(kqdm);
+ apiData.setSyncTime(new Date());
+ log.info("1204---鍚屾鏁版嵁锛歿}", apiData.toString());
+ //淇濆瓨鏁版嵁
+ api1204Rep.save(apiData);
+ }
+ } catch (Exception e) {
+ log.error("---鍚屾澶辫触----{}", e);
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1206.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1206.java
new file mode 100644
index 0000000..223a9ea
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1206.java
@@ -0,0 +1,144 @@
+package com.fzzy.async.fzzy40.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1102;
+import com.fzzy.api.entity.Api1105;
+import com.fzzy.api.entity.Api1206;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.service.ApiTriggerService;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1102Rep;
+import com.fzzy.api.view.repository.Api1206Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy40.entity.Fz40InoutRecord;
+import com.fzzy.async.fzzy40.entity.Fz40InoutSettle;
+import com.fzzy.async.fzzy40.repository.Fzzy40Sync1202Rep;
+import com.fzzy.async.fzzy40.repository.Fzzy40Sync1204Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 绮鍑哄簱缁撶畻
+ */
+@Slf4j
+@Component
+public class Fzzy40Sync1206 {
+
+ /**
+ * 鍑哄簱绫诲瀷
+ */
+ private final static String INOUT_TYPE_OUT = "OUT";
+
+ @Autowired
+ private Fzzy40Sync1202Rep fzzySync1202Rep;
+ @Autowired
+ private Fzzy40Sync1204Rep fzzySync1204Rep;
+ @Autowired
+ private ApiTriggerService apiTriggerService;
+ @Autowired
+ private Api1206Rep api1206Rep;
+ @Autowired
+ private ApiCommonService commonService;
+ @Autowired
+ private Api1102Rep api1102Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+
+ /**
+ * 绮鍑哄簱缁撶畻
+ *
+ * @param deptId
+ * @param start
+ * @param end
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+
+ log.info("-------------1206鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1206);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ //鑾峰彇绮鍏ュ簱缁撶畻淇℃伅
+ List<Fz40InoutSettle> list = fzzySync1204Rep.listInoutSettle(INOUT_TYPE_OUT, start, end);
+
+ if (null == list || list.isEmpty()) {
+ log.info("-------------娌℃湁鑾峰彇鍒扮伯椋熷叆搴撶粨绠椾俊鎭�------------------");
+ return;
+ }
+
+ //鏍规嵁搴撳尯浠ｇ爜鑾峰彇搴撳尯淇℃伅
+ Api1102 api1201 = api1102Rep.findById(kqdm).get();
+
+ Api1206 apiData;
+ Api1105 api1105;
+ List<Fz40InoutRecord> fz40InoutRecords;
+ Fz40InoutRecord fz40InoutRecord;
+ for (Fz40InoutSettle sysData : list) {
+
+ //鑾峰彇绮鍑哄簱淇℃伅
+ fz40InoutRecords = fzzySync1202Rep.listInoutRecordById(sysData.getId());
+ if (null == fz40InoutRecords || fz40InoutRecords.isEmpty()) {
+ continue;
+ }
+ fz40InoutRecord = fz40InoutRecords.get(0);
+ if (!deptId.equals(fz40InoutRecord.getDeptId())) {
+ continue;
+ }
+
+ //鑾峰彇璐т綅淇℃伅
+ api1105 = commonService.getApi1105Cache(fz40InoutRecord.getDepotId());
+ if (null == api1105) {
+ continue;
+ }
+
+ apiData = new Api1206();
+ //鍏ュ簱缁撶畻鍗曞彿:搴撳尯浠ｇ爜 + yyMMdd + 4涓洪『搴忓彿
+ apiData.setCkjsdh(kqdm + sysData.getId().substring(2));
+
+ //鍚堝悓鍙�
+ apiData.setHth(api1201.getDwdm() + sysData.getId());
+
+ //缁撶畻閲嶉噺銆佺粨绠楀崟浠枫�佺粨绠楅噾棰濄�佺粨绠楁椂闂�
+ apiData.setJssl(sysData.getSettleWeight());
+ apiData.setJsdj(sysData.getPayPrice());
+ apiData.setJsje(sysData.getPayMoney());
+ apiData.setJssj(sysData.getPayTime());
+
+ //缁撶畻鏂瑰紡
+ apiData.setJsfs(sysData.getPayType());
+ apiData.setYhhbdm(sysData.getBankCategory());
+ apiData.setKhhh(sysData.getBankCode());
+ apiData.setKhhmc(sysData.getBank());
+ apiData.setYhzh(sysData.getBankNum());
+ apiData.setFphm("");
+ apiData.setFpzt("");
+
+ //鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
+ apiData.setCzbz(Constant.CZBZ_I);
+ apiData.setZhgxsj(sysData.getUpdateTime());
+
+ //涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
+ apiData.setBizId(sysData.getId());
+ apiData.setKqdm(kqdm);
+ apiData.setSyncTime(new Date());
+ log.info("1206---鍚屾鏁版嵁锛歿}", apiData.toString());
+ //淇濆瓨鏁版嵁
+ api1206Rep.save(apiData);
+ }
+ } catch (Exception e) {
+ log.error("---鍚屾澶辫触----{}", e);
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+}
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1207.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1207.java
new file mode 100644
index 0000000..bf6d48f
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1207.java
@@ -0,0 +1,35 @@
+package com.fzzy.async.fzzy40.impl;
+
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.service.ApiTriggerService;
+import com.fzzy.api.view.repository.Api1102Rep;
+import com.fzzy.api.view.repository.Api1207Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy40.repository.Fzzy40Sync1202Rep;
+import com.fzzy.async.fzzy40.repository.Fzzy40Sync1207Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author:YAN
+ */
+@Slf4j
+@Component
+public class Fzzy40Sync1207 {
+
+ @Autowired
+ private Fzzy40Sync1202Rep fzzySync1202Rep;
+ @Autowired
+ private Fzzy40Sync1207Rep fzzySync1207Rep;
+ @Autowired
+ private ApiTriggerService apiTriggerService;
+ @Autowired
+ private Api1207Rep api1207Rep;
+ @Autowired
+ private ApiCommonService commonService;
+ @Autowired
+ private Api1102Rep api1102Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+}
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java
new file mode 100644
index 0000000..4dc3bf6
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java
@@ -0,0 +1,146 @@
+package com.fzzy.async.fzzy40.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1105;
+import com.fzzy.api.entity.Api1209;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1209Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy40.entity.Fz40InoutLossOver;
+import com.fzzy.async.fzzy40.repository.Fzzy40Sync1209Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.time.DateFormatUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 绮鎹熸孩
+ */
+@Slf4j
+@Component
+public class Fzzy40Sync1209 {
+
+ /**
+ * 鎹熸孩绫诲瀷-鎹熻��
+ */
+ public static final String LOSS_OVER_LOSS = "LOSS";
+ /**
+ * 鎹熸孩绫诲瀷-婧㈠嚭
+ */
+ public static final String LOSS_OVER_OVER = "OVER";
+
+ @Autowired
+ private Fzzy40Sync1209Rep fzzySync1209Rep;
+ @Autowired
+ private Api1209Rep api1209Rep;
+ @Autowired
+ private ApiCommonService commonService;
+ @Autowired
+ private ApiLogRep apiLogRep;
+
+ /**
+ * 鍚屾绮鎹熸孩淇℃伅
+ *
+ * @param deptId
+ * @param start
+ * @param end
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------1209鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1209);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz40InoutLossOver> list = fzzySync1209Rep.listMLossOver(deptId, start, end);
+
+ if (null == list || list.isEmpty()) {
+
+ log.info("-------------娌℃湁鑾峰彇鍒扮伯椋熸崯婧俊鎭�------------------");
+
+ return;
+ }
+
+ Api1209 apiData;
+ Api1105 api1105;
+ List<Api1209> api1209List;
+ for (Fz40InoutLossOver sysData : list) {
+
+ //鑾峰彇璐т綅淇℃伅
+ api1105 = commonService.getApi1105Cache(sysData.getDepotId());
+ if (null == api1105) {
+ continue;
+ }
+
+ apiData = new Api1209();
+ apiData.setSydh(api1105.getHwdm() + sysData.getId());
+ apiData.setHwdm(api1105.getHwdm());
+ apiData.setYwrq(sysData.getSubmitTime());
+
+ //鍑�閲嶆崯婧㈡暟閲忥紝鎹熻�椾负姝ｏ紝婧㈠嚭涓鸿礋
+ if (LOSS_OVER_LOSS.equals(sysData.getType())) {
+ apiData.setJzsysl(sysData.getAmount());
+ apiData.setCkjz(sysData.getAmount());
+ apiData.setRkjz(0);
+ } else {
+ apiData.setJzsysl(0 - sysData.getAmount());
+ apiData.setRkjz(sysData.getAmount());
+ apiData.setCkjz(0);
+ }
+
+ apiData.setRksj(sysData.getSubmitTime());
+ apiData.setCksj(sysData.getSubmitTime());
+
+ apiData.setRksf(sysData.getRksf());
+ apiData.setRkzz(sysData.getRkzz());
+ apiData.setCksf(sysData.getCksf());
+ apiData.setCkzz(sysData.getCkzz());
+ apiData.setQzchwqsh(0);
+ apiData.setQzszkl(0);
+ apiData.setQzzrshde(0);
+ apiData.setChsl(0);
+ apiData.setSysfzc(null == sysData.getSysfzc() || sysData.getSysfzc() == "" ? "0" : sysData.getSysfzc());
+ apiData.setSyyy(sysData.getSyyy());
+ apiData.setCcshr(sysData.getCcshr());
+ apiData.setZjshr(sysData.getZjshr());
+ apiData.setTjshr(sysData.getTjshr());
+ apiData.setKjshr(sysData.getKjshr());
+ apiData.setLdshr(sysData.getLdshr());
+ apiData.setBz(sysData.getRemark());
+
+
+ //鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
+ apiData.setZhgxsj(new Date());
+
+ //涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
+ apiData.setBizId(sysData.getId());
+ apiData.setKqdm(kqdm);
+ apiData.setSyncTime(new Date());
+
+ api1209List = api1209Rep.getDataBySydh(apiData.getSydh());
+ if (null == api1209List || api1209List.isEmpty()) {
+ apiData.setCzbz(Constant.CZBZ_I);
+ } else {
+ apiData.setCzbz(api1209List.get(0).getCzbz());
+ }
+
+ //淇濆瓨鏁版嵁
+ api1209Rep.save(apiData);
+ }
+ } catch (Exception e) {
+ log.error("---鍚屾澶辫触----{}", e);
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1107Rep.java b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1107Rep.java
new file mode 100644
index 0000000..efdc3fa
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1107Rep.java
@@ -0,0 +1,18 @@
+package com.fzzy.async.fzzy40.repository;
+
+import com.fzzy.async.fzzy40.entity.Fz40DeptDevice;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+/**
+ * 璁惧淇℃伅
+ *
+ * @Author:YAN
+ */
+public interface Fzzy40Sync1107Rep extends JpaRepository<Fz40DeptDevice, String> {
+ @Query("from Fz40DeptDevice where kqdm=:deptId order by sbbh")
+ List<Fz40DeptDevice> listDecixe(@Param("deptId") String deptId);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1108Rep.java b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1108Rep.java
new file mode 100644
index 0000000..0bff8b7
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1108Rep.java
@@ -0,0 +1,19 @@
+package com.fzzy.async.fzzy40.repository;
+
+import com.fzzy.async.fzzy40.entity.Fz40Drug;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+/**
+ * 鑽墏淇℃伅
+ *
+ * @Author:YAN
+ */
+public interface Fzzy40Sync1108Rep extends JpaRepository<Fz40Drug, String> {
+
+ @Query("from Fz40Drug where deptId=:deptId order by id")
+ List<Fz40Drug> listDrug(@Param("deptId") String deptId);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1112Rep.java b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1112Rep.java
new file mode 100644
index 0000000..8ed3344
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1112Rep.java
@@ -0,0 +1,18 @@
+package com.fzzy.async.fzzy40.repository;
+
+import com.fzzy.async.fzzy40.entity.Fz40OAStaff;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+/**
+ * 浜哄憳淇℃伅
+ *
+ * @Author:YAN
+ */
+public interface Fzzy40Sync1112Rep extends JpaRepository<Fz40OAStaff, String> {
+ @Query("from Fz40OAStaff where companyId=:companyId order by sfzhm")
+ List<Fz40OAStaff> listStaff(@Param("companyId") String companyId);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1204Rep.java b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1204Rep.java
new file mode 100644
index 0000000..d533228
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1204Rep.java
@@ -0,0 +1,27 @@
+package com.fzzy.async.fzzy40.repository;
+
+import com.fzzy.async.fzzy40.entity.Fz40InoutSettle;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 绮鍏ュ簱缁撶畻淇℃伅
+ *
+ * @Author:YAN
+ */
+public interface Fzzy40Sync1204Rep extends JpaRepository<Fz40InoutSettle, String> {
+ /**
+ * 鑾峰彇鍑哄叆搴撶粨绠椾俊鎭�
+ *
+ * @param type
+ * @param start
+ * @param end
+ * @return
+ */
+ @Query("from Fz40InoutSettle where inoutType=:type and payTime >=:start and payTime <:end order by payTime ")
+ List<Fz40InoutSettle> listInoutSettle(@Param("type") String type, @Param("start") Date start, @Param("end") Date end);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1207Rep.java b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1207Rep.java
new file mode 100644
index 0000000..19e82a7
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1207Rep.java
@@ -0,0 +1,28 @@
+package com.fzzy.async.fzzy40.repository;
+
+import com.fzzy.async.fzzy40.entity.Fz40InoutLossOver;
+import com.fzzy.async.fzzy40.entity.Fz40InoutStockChange;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鍊掍粨
+ *
+ * @Author:YAN
+ */
+public interface Fzzy40Sync1207Rep extends JpaRepository<Fz40InoutStockChange, String> {
+
+ /**
+ * 鏍规嵁淇℃伅鑾峰彇鍊掍粨淇℃伅
+ *
+ * @param start
+ * @param end
+ * @return
+ */
+ @Query("from Fz40InoutStockChange where deptId=:deptId and changeDate >=:start and changeDate <:end order by changeDate ")
+ List<Fz40InoutStockChange> listStockChange(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1209Rep.java b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1209Rep.java
new file mode 100644
index 0000000..0e90a96
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1209Rep.java
@@ -0,0 +1,27 @@
+package com.fzzy.async.fzzy40.repository;
+
+import com.fzzy.async.fzzy35.entity.Fz35MLossOver;
+import com.fzzy.async.fzzy40.entity.Fz40InoutLossOver;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鎹熸孩淇℃伅
+ *
+ * @Author:YAN
+ */
+public interface Fzzy40Sync1209Rep extends JpaRepository<Fz40InoutLossOver, String> {
+ /**
+ * 鏍规嵁淇℃伅鑾峰彇鎹熸孩淇℃伅
+ *
+ * @param start
+ * @param end
+ * @return
+ */
+ @Query("from Fz40InoutLossOver where deptId=:deptId and submitTime >=:start and submitTime <:end order by submitTime ")
+ List<Fz40InoutLossOver> listMLossOver(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);
+}
diff --git a/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultBuild.java b/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultBuild.java
index 787a5b1..55d052e 100644
--- a/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultBuild.java
+++ b/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultBuild.java
@@ -32,11 +32,7 @@
@Column(name = "COMPANY_ID_", length = 10)
@PropertyDef(label = "缁勭粐缂栫爜")
private String companyId;
-
- @Column(name = "ggm", length = 50)
- @PropertyDef(label = "鍥借鐮�")
- private String ggm;
-
+
@Column(name = "DEPT_ID_", length = 40)
@PropertyDef(label = "鎵�灞炲簱鐐�")
private String deptId;
diff --git a/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultDepot.java b/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultDepot.java
index 2fba0e5..ad19c10 100644
--- a/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultDepot.java
+++ b/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultDepot.java
@@ -29,6 +29,10 @@
@PropertyDef(label = "璐т綅缂栧彿")
private String id;
+ @Column(name = "ggm", length = 50)
+ @PropertyDef(label = "鍥借鐮�")
+ private String ggm;
+
@Column(name = "COMPANY_ID_", length = 10)
@PropertyDef(label = "缁勭粐缂栫爜")
private String companyId;
--
Gitblit v1.9.3