From f43613cc5aba07a9cb0482b7171ae6569c901e50 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 22 九月 2025 10:32:01 +0800
Subject: [PATCH] 61版本同步
---
src/main/java/com/fzzy/async/fzzy61/entity/Fz61DepotStore.java | 130 +
src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutVarietyChange.java | 148 +
src/main/java/com/fzzy/async/fzzy61/entity/Fz61FileInfo.java | 54
src/main/java/com/fzzy/async/fzzy61/Fzzy61SyncService11.java | 48
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1112.java | 124 +
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1202Rep.java | 57
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1212.java | 120 +
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1204.java | 143 +
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1112Rep.java | 18
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1209.java | 156 +
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1203.java | 270 ++
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1204Rep.java | 28
src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutSettle.java | 130 +
src/main/java/com/fzzy/api/service/ApiTriggerService.java | 1
src/main/java/com/fzzy/async/fzzy61/entity/Fz61Drug.java | 114 +
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1111.java | 139 +
src/main/java/com/fzzy/async/fzzy61/entity/Fz61DepotBookStore.java | 88
src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutCustomer.java | 100
src/main/java/com/fzzy/async/fzzy61/entity/Fz61DepotStatusConfirm.java | 111
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync2102.java | 136 +
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1208Rep.java | 23
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1109.java | 358 +++
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1211Rep.java | 23
src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutContract.java | 253 ++
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1210.java | 116 +
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync9201.java | 3
src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutNoticeOut.java | 135 +
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1213Rep.java | 24
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1205.java | 315 ++
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1202.java | 344 +++
src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutNoticeIn.java | 134 +
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1208.java | 213 +
src/main/java/com/fzzy/api/data/SyncProtocol.java | 1
src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutStockChange.java | 99
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1107Rep.java | 18
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1213.java | 130 +
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1201.java | 229 ++
src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutLossOver.java | 236 ++
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1207.java | 125 +
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1201Rep.java | 25
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1107.java | 108
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1109Rep.java | 27
src/main/java/com/fzzy/async/fzzy61/entity/Fz61DeptDevice.java | 82
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1203Rep.java | 23
src/main/java/com/fzzy/async/fzzy61/entity/Fz61OAStaff.java | 128 +
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61SyncNoticeOutRep.java | 27
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1206.java | 136 +
src/main/java/com/fzzy/async/fzzy61/entity/Fz61SecCamera.java | 140 +
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1210Rep.java | 17
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1207Rep.java | 27
src/main/java/com/fzzy/async/fzzy61/Fzzy61SyncService12.java | 115 +
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1209Rep.java | 26
src/main/java/com/fzzy/async/fzzy61/entity/Fz61CheckItemKey.java | 18
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1211.java | 121 +
src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutRecord.java | 302 ++
src/main/java/com/fzzy/async/fzzy61/entity/Fz61CheckItem.java | 123 +
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1212Rep.java | 29
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61SyncNoticeInRep.java | 27
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1111Rep.java | 25
src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutRecordItem.java | 102
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1108.java | 117 +
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1108Rep.java | 20
src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61SyncInoutRecordItemRep.java | 26
63 files changed, 6,685 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/fzzy/api/data/SyncProtocol.java b/src/main/java/com/fzzy/api/data/SyncProtocol.java
index 984af8c..f59bf7d 100644
--- a/src/main/java/com/fzzy/api/data/SyncProtocol.java
+++ b/src/main/java/com/fzzy/api/data/SyncProtocol.java
@@ -12,6 +12,7 @@
FZZY_V30_GB("FZZY_V30_GB", "椋庢鑷磋繙V3.0"),
FZZY_V35_GB("FZZY_V35_GB", "椋庢鑷磋繙V3.5"),
FZZY_V40_GB("FZZY_V40_GB", "椋庢鑷磋繙V4.0"),
+ FZZY_V61_GB("FZZY_V61_GB", "椋庢鑷磋繙V6.1"),
FZZY_V40_WHJL("FZZY_V40_WHJL", "椋庢鑷磋繙V4.0-姝︽眽鍐涚伯"),
FZZY_V35_SHYZ("FZZY_V35_SHYZ", "椋庢鑷磋繙2涓婃捣浣戝崜瑙勮寖");
diff --git a/src/main/java/com/fzzy/api/service/ApiTriggerService.java b/src/main/java/com/fzzy/api/service/ApiTriggerService.java
index b7ca9e0..6b20b3d 100644
--- a/src/main/java/com/fzzy/api/service/ApiTriggerService.java
+++ b/src/main/java/com/fzzy/api/service/ApiTriggerService.java
@@ -215,6 +215,7 @@
list.add(new ApiTrigger(SyncProtocol.FZZY_V30_GB.getCode(), SyncProtocol.FZZY_V30_GB.getName()));
list.add(new ApiTrigger(SyncProtocol.FZZY_V35_GB.getCode(), SyncProtocol.FZZY_V35_GB.getName()));
list.add(new ApiTrigger(SyncProtocol.FZZY_V40_GB.getCode(), SyncProtocol.FZZY_V40_GB.getName()));
+ list.add(new ApiTrigger(SyncProtocol.FZZY_V61_GB.getCode(), SyncProtocol.FZZY_V61_GB.getName()));
list.add(new ApiTrigger(SyncProtocol.FZZY_V40_WHJL.getCode(), SyncProtocol.FZZY_V40_WHJL.getName()));
list.add(new ApiTrigger(SyncProtocol.FZZY_V35_SHYZ.getCode(), SyncProtocol.FZZY_V35_SHYZ.getName()));
return list;
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync9201.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync9201.java
index 496442d..34b288a 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync9201.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync9201.java
@@ -178,6 +178,9 @@
if (StringUtils.isEmpty(people.getZyzg())) {
people.setZyzg("鍩硅鍚堟牸");
}
+ if (StringUtils.isEmpty(people.getSfwb())) {
+ people.setSfwb("鍚�");
+ }
api9201People.setZyzg(people.getZyzg().trim());
peopleList.add(api9201People);
}
diff --git a/src/main/java/com/fzzy/async/fzzy61/Fzzy61SyncService11.java b/src/main/java/com/fzzy/async/fzzy61/Fzzy61SyncService11.java
new file mode 100644
index 0000000..ecc3c0f
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/Fzzy61SyncService11.java
@@ -0,0 +1,48 @@
+package com.fzzy.async.fzzy61;
+
+import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.data.SyncProtocol;
+import com.fzzy.api.service.SyncService11;
+import com.fzzy.async.fzzy61.impl.Fzzy61Sync1107;
+import com.fzzy.async.fzzy61.impl.Fzzy61Sync1108;
+import com.fzzy.async.fzzy61.impl.Fzzy61Sync1111;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+@Slf4j
+@Component
+public class Fzzy61SyncService11 implements SyncService11 {
+ @Autowired
+ private Fzzy61Sync1111 fzzy61Sync1111;
+ @Autowired
+ private Fzzy61Sync1108 fzzy61Sync1108;
+ @Autowired
+ private Fzzy61Sync1107 fzzy61Sync1107;
+
+ @Override
+ public String getProtocol() {
+ return SyncProtocol.FZZY_V61_GB.getCode();
+ }
+
+ @Override
+ public void syncData(ApiParam param) {
+ log.info("--------------鍩虹鏁版嵁鎵嬪姩閰嶇疆鎺ㄩ��--------");
+ String kqdm = param.getKqdm();
+ String deptId = param.getDeptId();
+ Date start = param.getStart();
+ Date end = param.getEnd();
+ //鐩戞帶鐐逛綅淇℃伅鍚屾
+ fzzy61Sync1111.syncData(kqdm, deptId, start, end);
+
+ //鑽墏淇℃伅鍚屾
+ fzzy61Sync1108.syncData(kqdm, deptId, start, end);
+
+ //璁惧淇℃伅鍚屾
+ fzzy61Sync1107.syncData(kqdm, deptId, start, end);
+ //浜哄憳淇℃伅鍚屾
+// fzzy61Sync1112.syncData(kqdm, deptId, start, end);
+ }
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/Fzzy61SyncService12.java b/src/main/java/com/fzzy/async/fzzy61/Fzzy61SyncService12.java
new file mode 100644
index 0000000..37885d1
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/Fzzy61SyncService12.java
@@ -0,0 +1,115 @@
+package com.fzzy.async.fzzy61;
+
+import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.data.PushProtocol;
+import com.fzzy.api.data.SyncProtocol;
+import com.fzzy.api.service.SyncService12;
+import com.fzzy.async.fzzy61.impl.*;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * @Desc: 绮璐攢鐩稿叧鏁版嵁鍚屾
+ * @author: czt
+ * @update-time: 2023/6/29
+ */
+@Component
+public class Fzzy61SyncService12 implements SyncService12 {
+
+ @Autowired
+ private Fzzy61Sync1201 fzzySync1201;
+ @Autowired
+ private Fzzy61Sync1202 fzzySync1202;
+ @Autowired
+ private Fzzy61Sync1203 fzzySync1203;
+ @Autowired
+ private Fzzy61Sync1204 fzzySync1204;
+ @Autowired
+ private Fzzy61Sync1205 fzzySync1205;
+ @Autowired
+ private Fzzy61Sync1206 fzzySync1206;
+ @Autowired
+ private Fzzy61Sync1207 fzzySync1207;
+ @Autowired
+ private Fzzy61Sync1208 fzzySync1208;
+ @Autowired
+ private Fzzy61Sync1209 fzzySync1209;
+ @Autowired
+ private Fzzy61Sync1211 fzzySync1211;
+ @Autowired
+ private Fzzy61Sync1210 fzzySync1210;
+ @Autowired
+ private Fzzy61Sync1212 fzzySync1212;
+ @Autowired
+ private Fzzy61Sync1213 fzzySync1213;
+ @Autowired
+ private Fzzy61Sync1109 fzzySync1109;
+ @Autowired
+ private Fzzy61Sync2102 fzzySync2102;
+
+ @Override
+ public String getProtocol() {
+ return SyncProtocol.FZZY_V61_GB.getCode();
+ }
+
+ @Override
+ public void syncData(ApiParam param) {
+
+ String kqdm = param.getKqdm();
+ String deptId = param.getDeptId();
+ Date start = param.getStart();
+ Date end = param.getEnd();
+
+ //瀹㈡埛鍚屾
+ fzzySync1212.syncData(kqdm, deptId, start, end);
+
+ //鍚堝悓鍚屾
+ fzzySync1201.syncData(kqdm, deptId, start, end);
+
+ //绮鍏ュ簱缁撶畻
+ fzzySync1204.syncData(kqdm, deptId, start, end);
+
+ //绮鍏ュ簱鍚屾
+ fzzySync1202.syncData(kqdm, deptId, start, end);
+
+ //绮鍏ュ簱璐ㄦ
+ fzzySync1203.syncData(kqdm, deptId, start, end);
+
+ //绮鍑哄簱缁撶畻
+ fzzySync1206.syncData(kqdm, deptId, start, end);
+
+ //绮鍑哄簱鍚屾
+ fzzySync1205.syncData(kqdm, deptId, start, end);
+
+ //绮鎹熺泭
+ fzzySync1209.syncData(kqdm, deptId, start, end);
+ //鍊掍粨淇℃伅鍚屾
+ fzzySync1207.syncData(kqdm, deptId, start, end);
+
+ //鍑哄叆搴撴枃浠朵俊鎭悓姝�
+ fzzySync1109.syncData(kqdm, deptId, start, end);
+
+ //绮搴撳瓨鍚屾
+ fzzySync1208.syncData(kqdm, deptId, start, end);
+
+ //绮鎬ц川杞彉淇℃伅鍚屾
+ fzzySync1210.syncData(kqdm, deptId, start, end);
+
+ //璐﹂潰搴撳瓨淇℃伅鍚屾
+ fzzySync1211.syncData(kqdm, deptId, start, end);
+ //灏佷粨纭淇℃伅鍚屾
+ fzzySync1213.syncData(kqdm, deptId, start, end);
+
+ /*-----鍚勭渷鐙湁鎺ュ彛淇℃伅鍚屾-----*/
+ //涓婃捣甯傚钩鍙�2023鐗�
+ if (StringUtils.isNotEmpty(param.getPushProtocol()) && PushProtocol.SB_SH_2023.getCode().equals(param.getPushProtocol())) {
+ //鍊掍粨鍊掑叆淇℃伅鍚屾
+ fzzySync2102.syncData(kqdm, deptId, start, end);
+ }
+
+ }
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61CheckItem.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61CheckItem.java
new file mode 100644
index 0000000..77fab00
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61CheckItem.java
@@ -0,0 +1,123 @@
+package com.fzzy.async.fzzy61.entity;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fzzy.async.fzzy40.entity.Fz40CheckItemKey;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * 鐢ㄤ簬鍑哄叆搴撹川妫�璇︾粏椤瑰拰鏃ュ父宸℃鐨勮缁嗛」璁板綍
+ *
+ * @author: andy.jia
+ * @description:
+ * @version:
+ * @data:2020骞�4鏈�7鏃�
+ */
+@Data
+@Entity
+@Table(name = "D_CHECK_ITEM")
+@IdClass(Fz61CheckItemKey.class)
+public class Fz61CheckItem implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ @Id
+ @Column(name = "CHECK_ID_", length = 40)
+ @PropertyDef(label = "妫�娴嬬紪鐮�")
+ private String checkId;
+
+ @Id
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Id
+ @Column(name = "STANDARD_ID_", length = 10)
+ @PropertyDef(label = "妫�娴嬮」缂栫爜")
+ private String standardId;
+
+ @Column(name = "STANDARD_NAME_", length = 50)
+ @PropertyDef(label = "鍖栭獙椤�")
+ private String standardName;
+
+ @Column(name = "UNIT_", length = 20)
+ @PropertyDef(label = "鍗曚綅")
+ private String unit;
+
+ @Column(name = "UPPER_LIMIT_")
+ @PropertyDef(label = "鏍囧噯浼愬��")
+ private Double upperLimit;
+
+ @Column(name = "OPERA_SYMBOL_", length = 4)
+ @PropertyDef(label = "杩愮畻绗﹀彿")
+ private String operaSymbol;
+
+ @Column(name = "RULE_NUM_")
+ @PropertyDef(label = "鎵ｉ噸绯绘暟")
+ private Double ruleNum;
+
+ @Column(name = "RULE_ADD_")
+ @PropertyDef(label = "澧為噸%")
+ private Double ruleAdd;
+
+ @Column(name = "RULE_ADD_END_")
+ @PropertyDef(label = "澧為噸涓婇檺%")
+ private Double ruleAddEnd;
+
+ @Column(name = "RULE_REDUCE_")
+ @PropertyDef(label = "鎵ｉ噸鍊�%")
+ private Double ruleReduce;
+
+ @Column(name = "VALUE_", length = 40)
+ @PropertyDef(label = "妫�娴嬪��")
+ private String value;
+
+ @Column(name = "RULE_PRICE_")
+ @PropertyDef(label = "鎵ｈ垂绯绘暟")
+ private Double rulePrice;
+
+ @Column(name = "RULE_REDUCE_PRICE_")
+ @PropertyDef(label = "鎵ｈ垂")
+ private Double ruleReducePrice;
+
+ @Column(name = "ADD_NUM_")
+ @PropertyDef(label = "澧為噸", description = "鍗曚綅锛歬G")
+ private Double addNum;
+
+ @Column(name = "DE_NUM_")
+ @PropertyDef(label = "鎵ｉ噸", description = "鍗曚綅锛歬G")
+ private Double deNum;
+
+ @Column(name = "ADD_PRICE_")
+ @PropertyDef(label = "澧炰环", description = "鍗曚綅锛氬厓")
+ private Double addPrice;
+
+ @Column(name = "DE_PRICE_")
+ @PropertyDef(label = "鎵ｄ环", description = "鍗曚綅锛氬厓")
+ private Double dePrice;
+
+ @Column(name = "RESULT_", length = 2)
+ @PropertyDef(label = "妫�楠岀粨鏋�", description = "0=涓嶅悎鏍� 1=鍚堟牸")
+ private String result;
+
+ @Column(name = "REMARKS_", length = 50)
+ @PropertyDef(label = "澶囨敞")
+ private String remarks;
+
+ @Transient
+ @PropertyDef(label = "杩愮畻绗﹀彿鍊硷紝鍙仛椤甸潰鏄剧ず鐢�")
+ private String operaSymbolValue;
+
+ @Transient
+ @PropertyDef(label = "婀垮害")
+ private double perWet;
+
+ @Transient
+ @PropertyDef(label = "鏉傝川")
+ private double perImpurity;
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61CheckItemKey.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61CheckItemKey.java
new file mode 100644
index 0000000..b48fb41
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61CheckItemKey.java
@@ -0,0 +1,18 @@
+package com.fzzy.async.fzzy61.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+public class Fz61CheckItemKey implements Serializable {
+ private String checkId;
+ private String companyId;
+ private String standardId;
+
+ public Fz61CheckItemKey(){
+ super();
+ }
+ }
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61DepotBookStore.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61DepotBookStore.java
new file mode 100644
index 0000000..b1988c5
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61DepotBookStore.java
@@ -0,0 +1,88 @@
+package com.fzzy.async.fzzy61.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 czt
+ *
+ * 鎸変粨搴撹繘琛岀粺璁★紝姣忎釜鏈堝簳缁熻涓�娆�(鍥犱笂娴峰競璐﹂潰搴撳瓨鎺ュ彛涓烘寜璐т綅缁熻锛岃浆鎹㈡帴鍙ｆ湇鍔℃椂鏍规嵁鐪佷唤瑕佹眰缁熻鎴愬搴旂殑璐﹂潰搴撳瓨)
+ **/
+@Data
+@Entity
+@Table(name = "D_DEPOT_BOOK_STORE")
+public class Fz61DepotBookStore implements Serializable {
+
+ public static String SORT_PROP = "id";
+
+ @Id
+ @Column(name = "ID_", length = 40)
+ @PropertyDef(label = "涓婚敭", description = "瑙勫垯锛氫粨搴撶紪鐮乢yyyyMMdd")
+ private String id;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 20)
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String deptId;
+
+ @Column(name = "DEPOT_ID_", length = 30)
+ @PropertyDef(label = "浠撳簱缂栫爜", description = "鐩墠涓婃捣浣跨敤")
+ private String depotId;
+
+ @PropertyDef(label = "绮鎬ц川浠ｇ爜", description = "鐩墠涓婃捣浣跨敤")
+ @Column(name = "lsxzdm", length = 7)
+ private String lsxzdm;
+
+ @Column(name = "lspzdm", length = 7)
+ @PropertyDef(label = "绮鍝佺浠ｇ爜")
+ private String lspzdm;
+
+ @Column(name = "nd", length = 4)
+ @PropertyDef(label = "骞村害")
+ private String nd;
+
+ @Column(name = "yf", length = 2)
+ @PropertyDef(label = "鏈堜唤")
+ private String yf;
+
+ @Column(name = "qcsl", precision = 20, scale = 3)
+ @PropertyDef(label = "鏈熷垵鏁伴噺", description = "鍗曚綅锛氬叕鏂�")
+ private Double qcsl = 0.0;
+
+ @Column(name = "bqsrsl", precision = 20, scale = 3)
+ @PropertyDef(label = "鏈湡鏀跺叆鏁伴噺", description = "鍗曚綅锛氬叕鏂�")
+ private Double bqsrsl = 0.0;
+
+ @Column(name = "bqzcsl", precision = 20, scale = 3)
+ @PropertyDef(label = "鏈湡鏀嚭鏁伴噺", description = "鍗曚綅锛氬叕鏂�")
+ private Double bqzcsl = 0.0;
+
+ @Column(name = "qmye", precision = 20, scale = 3)
+ @PropertyDef(label = "鏈熸湯鏁伴噺", description = "鍗曚綅锛氬叕鏂�")
+ private Double qmye = 0.0;
+
+ @Column(name = "yjbz")
+ @PropertyDef(label = "鏈堢粨鏍囧織", description = "0锛氭湀缁擄紱1 鏈湀缁�")
+ private Integer yjbz;
+
+ @Column(name = "ywrq")
+ @PropertyDef(label = "涓氬姟鏃ユ湡")
+ private Date ywrq;
+
+ @Column(name = "zhgxsj")
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date zhgxsj;
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61DepotStatusConfirm.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61DepotStatusConfirm.java
new file mode 100644
index 0000000..fe41c3f
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61DepotStatusConfirm.java
@@ -0,0 +1,111 @@
+package com.fzzy.async.fzzy61.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;
+
+/**
+ * @Desc: 浠撴埧鐘舵�佺‘璁よ〃
+ * @author:
+ * @update-time:
+ */
+@Data
+@Entity
+@Table(name = "D_DEPOT_STATUS_CONFIRM")
+public class Fz61DepotStatusConfirm {
+
+ public static String SORT_PROP = "fcqrdh";
+
+ /**
+ * 21yyyyMMdd+鍥涗綅椤哄簭鍙�
+ * 21202405041234
+ */
+ @Id
+ @Column(name = "fcqrdh", length = 14)
+ @PropertyDef(label = "灏佷粨纭鍗曞彿", description = "鏍规嵁涓�瀹氱殑瑙勫垯鐢熸垚")
+ private String fcqrdh;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 50)
+ @PropertyDef(label = "搴撳尯缂栫爜")
+ private String deptId;
+
+ @Column(name = "DEPOT_ID_", length = 28)
+ @PropertyDef(label = "璐т綅缂栫爜")
+ private String depotId;
+
+ /*** ------------------------纭鍐呭-------------------------------------**/
+ @Column(name = "fcrq")
+ @PropertyDef(label = "灏佷粨鏃ユ湡", description = "yyyy-MM-dd")
+ private Date fcrq;
+
+ @Column(name = "FOOD_VARIETY_", length = 20)
+ @PropertyDef(label = "绮鍝佺")
+ private String foodVariety;
+
+ @Column(name = "FOOD_TYPE_", length = 20)
+ @PropertyDef(label = "绮鎬ц川")
+ private String foodType;
+
+ @Column(name = "FOOD_LEVEL_", length = 10)
+ @PropertyDef(label = "绮绛夌骇")
+ private String foodLevel;
+
+ @Column(name = "FOOD_LOCATION_ID_", length = 20)
+ @PropertyDef(label = "浜у湴鍚嶇О浠ｇ爜")
+ private String foodLocationId;
+
+ @Column(name = "FOOD_LOCATION_", length = 40)
+ @PropertyDef(label = "浜у湴鍚嶇О")
+ private String foodLocation;
+
+ @Column(name = "FOOD_YEAR_", length = 10)
+ @PropertyDef(label = "鏀惰揣骞村害")
+ private String foodYear;
+
+ @Column(name = "COUNTRY_", length = 10)
+ @PropertyDef(label = "鍥藉埆")
+ private String country;
+
+ @Column(name = "STORE_KEEPER_NAME_", length = 64)
+ @PropertyDef(label = "淇濈鍛�", description = "涓枃鍚嶇О")
+ private String storeKeeperName;
+
+ @Column(name = "fcsl")
+ @PropertyDef(label = "灏佷粨鏁伴噺", description = "鎵�鏈夊叆搴撲俊鎭腑鐨勫噣閲嶄箣鍜岋紝鍗曚綅KG")
+ private Double fcsl = 0.0;
+
+
+ /*** ------------------------鍏叡瀛楁-------------------------------------**/
+
+ @Column(name = "APPLY_USER_", length = 50)
+ @PropertyDef(label = "鐢宠浜�")
+ private String applyUser;
+
+ @Column(name = "DEPT_AUDIT_USER_", length = 50)
+ @PropertyDef(label = "閮ㄩ棬瀹℃牳浜�")
+ private String deptAuditUser;
+
+ @Column(name = "LEADER_AUDIT_USER_", length = 50)
+ @PropertyDef(label = "棰嗗瀹℃牳浜�")
+ private String leaderAuditUser;
+
+ // 澶囨敞
+ @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/fzzy61/entity/Fz61DepotStore.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61DepotStore.java
new file mode 100644
index 0000000..a80a7f7
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61DepotStore.java
@@ -0,0 +1,130 @@
+package com.fzzy.async.fzzy61.entity;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fzzy.async.fzzy30.entity.Depot;
+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: 绮搴撳瓨绠＄悊锛屾牴鎹浗鏍囨爣缁撴灉瑕佹眰鍒涘缓
+ * @author: Andy
+ * @update-time: 2022/11/17
+ */
+@Data
+@Entity
+@Table(name = "D_DEPOT_STORE")
+public class Fz61DepotStore implements Serializable {
+
+ public static String SORT_PROP = "id";
+
+ @Id
+ @Column(name = "ID_", length = 40)
+ 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 = "COUNTRY_", length = 10)
+ @PropertyDef(label = "鍥藉埆")
+ private String country;
+
+ @Column(name = "STORE_TYPE_", length = 6)
+ @PropertyDef(label = "鍌ㄧ伯鏂瑰紡", description = "1:鏁ｈ鍌ㄧ伯 2:鍖呰鍌ㄧ伯 3:鍥村寘鏁ｅ瓨 9:鍏朵粬")
+ private String storeType;
+
+ @Column(name = "MANAGE_TYPE_", length = 6)
+ @PropertyDef(label = "绠＄悊鏂瑰紡", description = "01 鐩村偍02 浠ｅ偍03 绉熶粨04 濮旀墭")
+ private String manageType;
+
+ @Column(name = "FOOD_TYPE_", length = 10)
+ @PropertyDef(label = "绮鎬ц川")
+ private String foodType;
+
+ @Column(name = "FOOD_VARIETY_", length = 10)
+ @PropertyDef(label = "绮鍝佺")
+ private String foodVariety;
+
+ @Column(name = "FOOD_LEVEL_", length = 10)
+ @PropertyDef(label = "绮绛夌骇")
+ private String foodLevel;
+
+ @Column(name = "FOOD_LOCATION_ID_", length = 50)
+ @PropertyDef(label = "绮浜у湴")
+ private String foodLocationId;
+
+ @Column(name = "FOOD_LOCATION_", length = 50)
+ @PropertyDef(label = "绮浜у湴")
+ private String foodLocation;
+
+ @Column(name = "FOOD_YEAR_", length = 10)
+ @PropertyDef(label = "鏀惰揣骞村害")
+ private String foodYear;
+
+ @Column(name = "DEPOT_STATUS_", length = 10)
+ @PropertyDef(label = "浠撳簱鐘舵��", description = "1=绌轰粨銆�2=鍏ュ簱涓��3=婊′粨銆�4=鍑哄簱涓��9=鍏朵粬")
+ private String depotStatus;
+
+ @Column(name = "STORE_DATE_")
+ @PropertyDef(label = "鍏ュ簱鏃堕棿", description = "鍏ュ簱鏃堕棿锛岀涓�杞︾伯椋熷叆浠撴椂闂�,鏍煎紡锛歽yyy-MM-dd HH:mm:ss")
+ private Date storeDate;
+
+ @Column(name = "FULL_DATE_")
+ @PropertyDef(label = "灏佷粨鏃ユ湡", description = "褰撹揣浣嶏紙娌圭綈锛夌姸鎬佷负灏佷粨鏃讹紝姝ら」涓哄繀濉」")
+ private Date fullDate;
+
+ @Column(name = "OUT_DATE_")
+ @PropertyDef(label = "鍑轰粨鏃堕棿", description = "鍑哄簱鏃堕棿锛屾渶鍚庝竴杞︾伯椋熷嚭浠撳畬鎴愭椂闂�,鏍煎紡锛歽yyy-MM-dd HH:mm:ss")
+ private Date outDate;
+
+ @Column(name = "STORAGE_REAL_")
+ @PropertyDef(label = "瀹為檯鍌ㄩ噺", description = "鍗曚綅锛欿G")
+ private Double storageReal;
+
+ @Column(name = "STORE_SETTLE__")
+ @PropertyDef(label = "璁′环鏁伴噺", description = "鍗曚綅锛欿G")
+ private Double storageSettle;
+
+ @Column(name = "GRAIN_HEIGHT_")
+ @PropertyDef(label = "瑁呯伯绾块珮", description = "鍗曚綅锛氱背")
+ private Double grainHeight;
+
+ @Column(name = "GRAIN_VOLUME_")
+ @PropertyDef(label = "瑁呯伯浣撶Н", description = "鍗曚綅锛氱珛鏂圭背")
+ private Double grainVolume;
+
+ @Column(name = "REMARK_", length = 250)
+ @PropertyDef(label = "澶囨敞", description = "澶囨敞淇℃伅")
+ private String remark;
+
+ @Column(name = "UPDATE_USER_", length = 50)
+ @PropertyDef(label = "淇敼浜�")
+ private String updateUser;
+
+ @PropertyDef(label = "绮潈褰掑睘鍗曚綅浠ｇ爜")
+ @Column(name = "lqgsdwdm", length = 18)
+ private String lqgsdwdm;
+
+
+ @Column(name = "UPDATE_DATE_")
+ @PropertyDef(label = "淇敼鏃堕棿")
+ private Date updateDate;
+
+ @Column(name = "CREATE_DATE_")
+ private Date createDate;
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61DeptDevice.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61DeptDevice.java
new file mode 100644
index 0000000..e57942b
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61DeptDevice.java
@@ -0,0 +1,82 @@
+package com.fzzy.async.fzzy61.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 Fz61DeptDevice implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ public static String SORT_PROP = "sbbh";
+
+ @Id
+ @Column(name = "sbbh", length = 20)
+ @PropertyDef(label = "璁惧缂栧彿")
+ private String sbbh;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜", description = "")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 40)
+ @PropertyDef(label = "鎵�灞炲簱鍖�")
+ private String deptId;
+
+ @Column(name = "sbyqmc", length = 50)
+ @PropertyDef(label = "璁惧浠櫒鍚嶇О")
+ private String sbyqmc;
+
+ @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 = "璁惧鐘舵��",description = "1 瀹屽ソ 2 鎶ュ簾 3 寰呮淇� 4 鍏朵粬")
+ private String sbzt;
+
+ @Column(name = "jdsj")
+ @PropertyDef(label = "妫�瀹氭椂闂�")
+ private Date jdsj;
+
+ @Column(name = "jddw", length = 256)
+ @PropertyDef(label = "妫�瀹氬崟浣�")
+ private String jddw;
+
+ @Column(name = "sbgly", length = 50)
+ @PropertyDef(label = "璁惧绠＄悊鍛�")
+ private String sbgly;
+
+ @Column(name = "UPDATE_TIME_")
+ @PropertyDef(label = "鏇存柊鏃堕棿")
+ private Date updateTime;
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Drug.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Drug.java
new file mode 100644
index 0000000..925f216
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Drug.java
@@ -0,0 +1,114 @@
+package com.fzzy.async.fzzy61.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;
+
+/**
+ * 鐜祦鐔忚捀-鑽搧搴撳瓨
+ *
+ * @ClassName: Fz61Drug
+ * @date 2023骞�8鏈�17鏃�
+ */
+@Data
+@Entity
+@Table(name = "D_DRUG")
+public class Fz61Drug implements Serializable {
+
+ public static String SORT_PROP = "id";
+
+ @Id
+ @Column(name = "ID_", length = 40)
+ @PropertyDef(label = "鑽墏缂栧彿", description = "閲囪喘鏃ユ湡(yyyyMMdd)+涓変綅椤哄簭鍙�")
+ private String id;
+
+ @Id
+ @Column(name = "DEPT_ID_", length = 50)
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String deptId;
+
+ @Column(name = "cgrq")
+ @PropertyDef(label = "閲囪喘鏃ユ湡")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date cgrq;
+
+ @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 = 50)
+ @PropertyDef(label = "淇濊川鏈�", description = "鍑犲勾銆佸嚑涓湀绛�")
+ private String bzq;
+
+ @Column(name = "COUNT_")
+ @PropertyDef(label = "搴撳瓨閲�")
+ private Double count = 0.0;
+
+ @Column(name = "kcsldw", length = 1)
+ @PropertyDef(label = "搴撳瓨閲忓崟浣�", description = "1(榛樿)锛氬叕鏂わ紱2锛氬厠锛�3锛氭鍗囷紱")
+ private String kcsldw = "1";
+
+ @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;
+
+ @Column(name = "DEL_TAG_")
+ @PropertyDef(label = "鍒犻櫎鏍囪锛屽湪椤甸潰鍒犻櫎鏃跺�欎娇鐢�")
+ private String delTag;
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61FileInfo.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61FileInfo.java
new file mode 100644
index 0000000..2558bd2
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61FileInfo.java
@@ -0,0 +1,54 @@
+package com.fzzy.async.fzzy61.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;
+
+/**
+ * 闄勪欢淇℃伅锛岀郴缁熸墍鏈夌被鍨嬮檮浠跺潎浣跨敤璇ョ被
+ * <p>
+ * 鍏朵腑鍥剧墖淇℃伅锛屾敮鎸佺洿鎺ヤ繚瀛樺埌鏁版嵁搴撲腑锛屼娇鐢ㄥ瓧娈碉細imgData
+ * <p>
+ * 闄勪欢淇℃伅鍏ㄩ儴淇濆瓨鍦ㄦ湇鍔″櫒纭洏涓紝涓嶅啀淇濆瓨鏁版嵁搴�
+ *
+ * @author Andy
+ */
+@Data
+@Entity
+@Table(name = "D_FILE")
+public class Fz61FileInfo implements Serializable {
+
+ private static final long serialVersionUID = 86018008520229637L;
+
+ @Id
+ @Column(name = "FILE_ID_", length = 40)
+ @PropertyDef(label = "闄勪欢ID")
+ private String fileId;
+
+ @PropertyDef(label = "缁勭粐缂栧彿")
+ @Column(name = "COMPANY_ID_", length = 10)
+ private String companyId;
+
+ @Column(name = "BIZ_ID_", length = 40)
+ @PropertyDef(label = "涓氬姟ID")
+ private String bizId;
+
+ @Column(name = "BIZ_TAG_", length = 20)
+ @PropertyDef(label = "涓氬姟鏍囩", description = "闄勪欢鍦ㄧ粦瀹氫笟鍔＄殑鏃跺�欏彲鑳介渶瑕佸叾浠栨爣璇嗗尯鍒�")
+ private String bizTag;
+
+ @PropertyDef(label = "鏂囦欢鍚嶇О")
+ @Column(name = "FILE_NAME_", length = 100)
+ private String fileName;
+
+ @PropertyDef(label = "鍒涘缓鏃堕棿")
+ @Column(name = "CREATE_TIME_")
+ private Date createTime;
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutContract.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutContract.java
new file mode 100644
index 0000000..ef1e4e8
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutContract.java
@@ -0,0 +1,253 @@
+package com.fzzy.async.fzzy61.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;
+
+/**
+ * @Author: YYC
+ * @Description:
+ * @DateTime: 2025-9-17 15:07
+ **/
+@Data
+@Entity
+@Table(name = "D_INOUT_CONTRACT")
+public class Fz61InoutContract implements Serializable {
+
+ public static String SORT_PROP = "id";
+
+ @Id
+ @Column(name = "ID_", length = 40)
+ @PropertyDef(label = "ID_")
+ 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 = "NAME_", length = 50)
+ @PropertyDef(label = "鍚堝悓鍚嶇О")
+ private String name;
+
+ @Column(name = "PLAN_ID_", length = 40)
+ @PropertyDef(label = "璁″垝缂栫爜")
+ private String planId;
+
+ @Column(name = "PLAN_NAME_", length = 50)
+ @PropertyDef(label = "璁″垝鍚嶇О")
+ private String planName;
+
+ @Column(name = "TYPE_", length = 10)
+ @PropertyDef(label = "涓氬姟绫诲埆", description = "1:閿�鍞悎鍚� 2:閲囪喘鍚堝悓 3:浠ｅ偍鍚堝悓")
+ private String type;
+
+ @Column(name = "CUSTOMER_TYPE_", length = 10)
+ @PropertyDef(label = "瀹㈡埛绫诲瀷", description = "1:浼佷笟 2:涓汉")
+ private String customerType;
+
+ @Column(name = "YEAR_", length = 10)
+ @PropertyDef(label = "骞翠唤")
+ private String year;
+
+ @Column(name = "CUSTOMER_ID_", length = 20)
+ @PropertyDef(label = "绀句細淇＄敤鐮�", description = "濡傛灉鏄紒涓�=瀹㈡埛缁熶竴绀句細淇＄敤浠ｇ爜")
+ private String customerId;
+
+ @Column(name = "CUSTOMER_NAME_", length = 50)
+ @PropertyDef(label = "瀹㈡埛鍚嶇О")
+ private String customerName;
+
+ @Column(name = "fddbr", length = 50)
+ @PropertyDef(label = "娉曞畾浠ｈ〃浜�")
+ private String fddbr;
+
+ @Column(name = "txdz", length = 200)
+ @PropertyDef(label = "閫氳鍦板潃")
+ private String txdz;
+
+ @Column(name = "yzbm", length = 6)
+ @PropertyDef(label = "閭斂缂栫爜")
+ private String yzbm;
+
+ @PropertyDef(label = "鑱旂郴浜哄鍚�")
+ @Column(name = "lxrxm", length = 50)
+ private String lxrxm;
+
+ @PropertyDef(label = "鑱旂郴鐢佃瘽")
+ @Column(name = "lxrdh", length = 20)
+ private String lxrdh;
+
+ @PropertyDef(label = "韬唤璇佸彿")
+ @Column(name = "sfzh", length = 20)
+ private String sfzh;
+
+ @PropertyDef(label = "鐢靛瓙淇＄")
+ @Column(name = "dzyx", length = 50)
+ private String dzyx;
+
+ @Column(name = "SIGNING_TIME_")
+ @PropertyDef(label = "绛捐鏃堕棿", description = "鏍煎紡锛歽yyy-MM-dd")
+ private Date signingTime;
+
+ @Column(name = "SIGN_ADDRESS_", length = 100)
+ @PropertyDef(label = "绛剧害鍦扮偣")
+ private String signAddress;
+
+ @Column(name = "BEGIN_TIME_")
+ @PropertyDef(label = "绾﹀畾寮�濮嬫椂闂�")
+ private Date beginTime;
+
+ @Column(name = "END_TIME_")
+ @PropertyDef(label = "绾﹀畾瀹屾垚鏃堕棿")
+ private Date endTime;
+
+ @Column(name = "REL_END_TIME_")
+ @PropertyDef(label = "瀹為檯瀹屾垚鏃堕棿")
+ private Date relEndTime;
+
+ @Column(name = "FOOD_VARIETY_", length = 20)
+ @PropertyDef(label = "绮鍝佺")
+ private String foodVariety;
+
+ @Column(name = "FOOD_TYPE_", length = 20)
+ @PropertyDef(label = "绮鎬ц川")
+ private String foodType;
+
+ @Column(name = "PRICE_")
+ @PropertyDef(label = "鍚堝悓鍗曚环锛屽厓/鍚�")
+ private Double price;
+
+ @Column(name = "MONEY_")
+ @PropertyDef(label = "鍚堝悓鎬婚噾棰�", description = "鍗曚綅锛氬厓")
+ private Double money;
+
+ @Column(name = "CONTRACT_AMOUNT_")
+ @PropertyDef(label = "鍚堝悓鏁伴噺", description = "鍗曚綅锛氬叕鏂�")
+ private Double contactAmount;
+
+ @Column(name = "COMPLETE_NUM_")
+ @PropertyDef(label = "灞ョ害鏁伴噺", description = "鍗曚綅锛氬叕鏂�")
+ private Double completeNum;
+
+ @Column(name = "lybzj")
+ @PropertyDef(label = "灞ョ害淇濊瘉閲�", description = "鍗曚綅锛氬厓")
+ private Double lybzj;
+
+ @PropertyDef(label = "灞ョ害鐜�", description = "鍗曚綅锛�%")
+ @Column(name = "lyl")
+ private Double lyl;
+
+ @Column(name = "jsjg")
+ @PropertyDef(label = "缁撶畻浠锋牸锛屽厓/鍚�")
+ private Double jsjg;
+
+ @PropertyDef(label = "缁撶畻鎬婚噾棰�", description = "鍗曚綅锛氬厓")
+ @Column(name = "jszje")
+ private Double jszje;
+
+ @PropertyDef(label = "缁撶畻涓庡悎鍚屼竴鑷存��", description = "1锛氱鍚� 2锛氫笉绗﹀悎")
+ @Column(name = "jsyhtyzx", length = 1)
+ private String jsyhtyzx;
+
+ @PropertyDef(label = "涓嶄竴鑷村師鍥�")
+ @Column(name = "jsyhtbyzyy", length = 250)
+ private String jsyhtbyzyy;
+
+ @Column(name = "CUSTOMER_BANK_", length = 10)
+ @PropertyDef(label = "瀹㈡埛寮�鎴疯")
+ private String customerBank;
+
+ @Column(name = "CUSTOMER_BANK_ACCOUNT_", length = 40)
+ @PropertyDef(label = "瀹㈡埛鏂硅处鍙�")
+ private String customerBankAccount;
+
+ @Column(name = "CUSTOMER_SIGN_USER_", length = 50)
+ @PropertyDef(label = "瀹㈡埛绛剧害浜�")
+ private String customerSignUser;
+
+ @Column(name = "BANK_", length = 50)
+ @PropertyDef(label = "鏈柟寮�鎴疯")
+ private String bank;
+
+ @Column(name = "BANK_ACCOUNT_", length = 40)
+ @PropertyDef(label = "鏈柟璐﹀彿")
+ private String bankAccount;
+
+ @Column(name = "SIGN_USER_", length = 50)
+ @PropertyDef(label = "鏈柟绛剧害浜�")
+ private String signUser;
+
+ @Column(name = "PAY_TYPE_", length = 6)
+ @PropertyDef(label = "鏀粯鏂瑰紡")
+ private String payType;
+
+ @Column(name = "fkfs")
+ @PropertyDef(label = "浠樻鏂瑰紡")
+ private Integer fkfs;
+
+ @Column(name = "ysfs", length = 64)
+ @PropertyDef(label = "楠屾敹鏂瑰紡")
+ private String ysfs;
+ /**
+ * --------瀹℃壒淇℃伅--------
+ **/
+
+ @Column(name = "CREATE_USER_", length = 50)
+ @PropertyDef(label = "鍒涘缓浜�")
+ private String createUser;
+
+ @Column(name = "AUDIT_USER_", length = 50)
+ @PropertyDef(label = "瀹℃壒浜�")
+ private String auditUser;
+
+ @Column(name = "AUDIT_DATE_")
+ @PropertyDef(label = "瀹℃壒鏃堕棿", description = "鏍煎紡锛歽yyy-MM-dd HH:mm:ss")
+ private Date auditDate;
+
+ @Column(name = "AUDIT_STATUS_", length = 10)
+ @PropertyDef(label = "瀹℃壒鐘舵��")
+ private String auditStatus;
+
+ @Column(name = "CREATE_TIME_")
+ @PropertyDef(label = "鍒涘缓鏃堕棿")
+ private Date createTime;
+
+ @Column(name = "wcrq")
+ @PropertyDef(label = "瀹屾垚鏃堕棿")
+ private Date wcrq;
+
+ @Column(name = "hqzz", length = 30)
+ @PropertyDef(label = "璐ф潈缁勭粐")
+ private String hqzz;
+
+ @Column(name = "UPDATE_TIME_")
+ @PropertyDef(label = "鏇存柊鏃堕棿")
+ private Date updateTime;
+
+
+ /**
+ * --------闄勪欢--------
+ **/
+ @Column(name = "FILE_ID_", length = 30)
+ @PropertyDef(label = "闄勪欢id")
+ private String fileId;
+
+ @Column(name = "FILE_NAME_", length = 50)
+ @PropertyDef(label = "闄勪欢鍚嶇О")
+ private String fileName;
+
+ @Column(name = "FILE_TIME_")
+ @PropertyDef(label = "闄勪欢涓婁紶鏃堕棿")
+ private Date fileTime;
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutCustomer.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutCustomer.java
new file mode 100644
index 0000000..be36758
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutCustomer.java
@@ -0,0 +1,100 @@
+package com.fzzy.async.fzzy61.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;
+
+/**
+ * 鍑哄叆搴撳鎴�-寰�鏉ュ崟浣嶄俊鎭� 2023骞�5鏈�26鏃� 鏍规嵁鏂板浗绮浼樺寲
+ *
+ * @author czt
+ * @description 鐗堟湰4.0瀛楁宸插
+ * @date 2023-05-25 17:16
+ */
+@Data
+@Entity
+@Table(name = "D_INOUT_CUSTOMER")
+public class Fz61InoutCustomer implements Serializable {
+
+ public static String SORT_PROP = "id";
+
+ @Id
+ @Column(name = "ID_", length = 40)
+ @PropertyDef(label = "涓婚敭id缂栫爜", description = "绯荤粺鍐呯紪鐮�")
+ 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 = 4)
+ @PropertyDef(label = "涓氬姟鍒嗙被", description = "绯荤粺鍐呬娇鐢細鎻愯揣鍟嗐�佷緵璐у晢")
+ private String type;
+
+ @Column(name = "khlx", length = 50)
+ @PropertyDef(label = "瀹㈡埛绫诲瀷", description = "1-浼佷笟锛�2-涓汉")
+ private String khlx;
+
+ @PropertyDef(label = "瀹㈡埛缂栫爜锛氫紒涓氬鎴峰～鍐欑粺涓�绀句細淇＄敤浠ｇ爜锛屼釜浜哄鎴峰～鍐欒韩浠借瘉鍙�")
+ @Column(name = "khbh", length = 18)
+ private String khbh;
+
+ @Column(name = "NAME_", length = 50)
+ @PropertyDef(label = "瀹㈡埛鍚嶇О")
+ private String name;
+
+ @PropertyDef(label = "娉曞畾浠ｈ〃浜�")
+ @Column(name = "fddbr", length = 64)
+ private String fddbr;
+
+ @Column(name = "ADDRESS_", length = 200)
+ @PropertyDef(label = "閫氳鍦板潃")
+ private String address;
+
+ @PropertyDef(label = "閭斂缂栫爜")
+ @Column(name = "yzbm", length = 6)
+ private String yzbm;
+
+ @Column(name = "CONTACT_USER_", length = 50)
+ @PropertyDef(label = "鑱旂郴浜�")
+ private String contactUser;
+
+ @Column(name = "PHONE_", length = 20)
+ @PropertyDef(label = "鑱旂郴鐢佃瘽")
+ private String phone;
+
+ @Column(name = "CARD_ID_", length = 20)
+ @PropertyDef(label = "鑱旂郴浜鸿韩浠借瘉鍙�")
+ private String cardId;
+
+ @PropertyDef(label = "鐢靛瓙淇＄")
+ @Column(name = "dzyx", length = 64)
+ private String dzyx;
+
+ @Column(name = "BANK_", length = 50)
+ @PropertyDef(label = "寮�鎴烽摱琛�")
+ private String bank;
+
+ @Column(name = "BANK_NUM_", length = 30)
+ @PropertyDef(label = "閾惰璐﹀彿")
+ private String bankNum;
+
+ @Column(name = "FOOD_AREA_", length = 30)
+ @PropertyDef(label = "绉嶆闈㈢Н")
+ private Double foodArea = 0.0;
+
+ @Column(name = "UPDATE_TIME_")
+ @PropertyDef(label = "鏁版嵁鏇存柊鏃堕棿")
+ private Date updateTime;
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutLossOver.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutLossOver.java
new file mode 100644
index 0000000..a788372
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutLossOver.java
@@ -0,0 +1,236 @@
+package com.fzzy.async.fzzy61.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 Fz61InoutLossOver implements Serializable {
+
+ public static String SORT_PROP = "updateTime";
+
+ @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 = "SUBMIT_TIME_")
+ @PropertyDef(label = "涓氬姟鏃ユ湡", description = "yyyy-MM-dd")
+ private Date submitTime;
+
+ @Column(name = "TYPE_", length = 1)
+ @PropertyDef(label = "绫诲瀷", description = "1锛氭崯鑰楋紝2锛氭崯澶憋紝3锛氬叾浠�")
+ private String type;
+
+ @Column(name = "FOOD_VARIETY_", length = 10)
+ @PropertyDef(label = "绮鍝佺")
+ private String foodVariety;
+
+ @Column(name = "FOOD_LEVEL_", length = 10)
+ @PropertyDef(label = "绮绛夌骇")
+ private String foodLevel;
+
+ @Column(name = "FOOD_TYPE_", length = 10)
+ @PropertyDef(label = "绮鎬ц川")
+ private String foodType;
+
+ @Column(name = "QUANTITY_ID1", length = 40)
+ @PropertyDef(label = "鍏ュ簱璐ㄦ", description = "鏁版嵁浠嶮Quantity涓幏鍙栵紝涓婁釜璐ㄦ鎵规")
+ private String quantity1;
+
+ @PropertyDef(label = "鍏ュ簱鍑�閲�", description = "鍗曚綅锛欿G")
+ @Column(name = "rkjz", precision = 20, scale = 6)
+ private Double rkjz;
+
+ @PropertyDef(label = "鍏ュ簱鏁伴噺", description = "鍗曚綅锛欿G")
+ @Column(name = "rksl", precision = 20, scale = 6)
+ private Double rksl;
+
+ @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;
+
+ @Column(name = "QUANTITY_ID2", length = 40)
+ @PropertyDef(label = "鍑哄簱璐ㄦ", description = "鏁版嵁浠嶮Quantity涓幏鍙栵紝涓婁釜璐ㄦ鎵规")
+ private String quantity2;
+
+ @Column(name = "ccsc")
+ @PropertyDef(label = "鍌ㄥ瓨鏃堕暱", description = "鍗曚綅锛氭湀")
+ private Integer ccsc;
+
+ @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 = "qzsfkl")
+ @PropertyDef(label = "姘村垎鍑忛噺")
+ private Double qzsfkl;
+
+ @Column(name = "qzzzkl")
+ @PropertyDef(label = "鏉傝川鍑忛噺")
+ private Double qzzzkl;
+
+ @Column(name = "qzszkl")
+ @PropertyDef(label = "姘存潅鎬诲噺閲�")
+ private Double qzszkl;
+
+ @Column(name = "qzzrshde")
+ @PropertyDef(label = "淇濈鑷劧鎹熻��")
+ private Double qzzrshde;
+
+ @Column(name = "chsl")
+ @PropertyDef(label = "瓒呰�楁暟閲�")
+ private Double chsl;
+
+ @Column(name = "AMOUNT_")
+ @PropertyDef(label = "鎹熻�楅噺", description = "鎹熸孩鏁伴噺KG锛涙崯鑰椾负姝ｆ暟锛屾孩浣欎负璐熸暟")
+ private Double amount;
+
+ @Column(name = "LOSS_PER_")
+ @PropertyDef(label = "鎹熻�楃巼")
+ private Double lossPer;
+
+ @PropertyDef(label = "鏄惁瓒呰��")
+ @Column(name = "sfch")
+ private Integer sfch;
+
+ @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 = "cqqrbs")
+ private Integer cqqrbs;
+
+ @Column(name = "cqqrsj")
+ @PropertyDef(label = "鍑烘竻纭鏃堕棿")
+ private Date cqqrsj;
+
+ @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/fzzy61/entity/Fz61InoutNoticeIn.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutNoticeIn.java
new file mode 100644
index 0000000..e9956ff
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutNoticeIn.java
@@ -0,0 +1,134 @@
+package com.fzzy.async.fzzy61.entity;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鍑哄叆搴�-鍏ュ簱閫氱煡鍗曪紝2023骞�5鏈�26鏃� 浼樺寲璋冩暣
+ *
+ * @author czt
+ */
+@Data
+@Entity
+@Table(name = "D_INOUT_NOTICE_IN")
+public class Fz61InoutNoticeIn implements Serializable {
+
+ public static String SORT_PROP = "id";
+
+ @Id
+ @Column(name = "ID_", length = 40)
+ @PropertyDef(label = "閫氱煡鍗曞彿")
+ 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 = "NAME_", length = 50)
+ @PropertyDef(label = "閫氱煡鍗曞悕绉�")
+ private String name;
+
+ @Column(name = "PLAN_ID_", length = 40)
+ @PropertyDef(label = "璁″垝鏄庣粏鍙�", description = "閽堝杞崲绮蹇呭～")
+ private String planId;
+
+ @Column(name = "PLAN_NAME_", length = 40)
+ @PropertyDef(label = "璁″垝缂栫爜", description = "閽堝杞崲绮蹇呭～")
+ private String planName;
+
+ @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 = "DEPOT_ID_", length = 50)
+ @PropertyDef(label = "鐩爣浠撳簱")
+ private String depotId;
+
+ @Column(name = "CUSTOMER_ID_", length = 40)
+ @PropertyDef(label = "鍙戣揣瀹㈡埛")
+ private String customerId;
+
+ @Column(name = "CUSTOMER_NAME_", length = 50)
+ @PropertyDef(label = "鍙戣揣瀹㈡埛")
+ private String customerName;
+
+ @Column(name = "UNIT_NAME_", length = 50)
+ @PropertyDef(label = "鏀惰揣鍗曚綅", description = "搴撳尯鎵�灞炲叕鍙革紝鎵嬪姩褰曞叆")
+ private String unitName;
+
+ @Column(name = "FOOD_VARIETY_", length = 10)
+ @PropertyDef(label = "绮鍝佺")
+ private String foodVariety;
+
+ @Column(name = "YEAR_", length = 10)
+ @PropertyDef(label = "骞翠唤")
+ private String year;
+
+ @Column(name = "TARGET_NUMBER_")
+ @PropertyDef(label = "鐩爣鏁伴噺", description = "鍗曚綅锛氬惃锛屾墜鍔ㄥ～鎶�")
+ private Double targetNumber = 0.0;
+
+ @Column(name = "COMPLETE_NUMBER_")
+ @PropertyDef(label = "瀹屾垚鏁伴噺", description = "鍗曚綅锛氬惃锛岀郴缁熻嚜鍔ㄥ悎璁�")
+ private Double completeNumber = 0.0;
+
+ @Column(name = "AUDIT_STATUS_", length = 10)
+ @PropertyDef(label = "瀹℃牳鐘舵��", description = "涓哄鏍革紝瀹℃牳閫氳繃锛屾嫆鎺�")
+ private String auditStatus;
+
+ @Column(name = "AUDIT_USER_", length = 50)
+ @PropertyDef(label = "瀹℃牳浜�")
+ private String auditUser;
+
+ @Column(name = "AUDIT_DATE_")
+ @PropertyDef(label = "瀹℃壒鏃堕棿", description = "鏍煎紡锛歽yyy-MM-dd HH:mm:ss")
+ private String auditDate;
+
+ @Column(name = "COMPLETE_STATUS_", length = 10)
+ @PropertyDef(label = "瀹屾垚鐘舵��", description = "鏈畬鎴愶紝宸插畬鎴�")
+ private String completeStatus;
+
+ @Column(name = "COMPLETE_TIME_")
+ @PropertyDef(label = "瀹屾垚鏃堕棿")
+ private Date completeTime;
+
+ @Column(name = "CREATE_TIME_")
+ @PropertyDef(label = "鍒涘缓鏃堕棿")
+ private Date createTime = new Date();
+
+ @Column(name = "CREATE_USER_", length = 50)
+ @PropertyDef(label = "鍒涘缓浜�")
+ private String createUser;
+
+ @Column(name = "REMARK_", length = 200)
+ @PropertyDef(label = "澶囨敞淇℃伅")
+ private String remark;
+
+ @Column(name = "TYPE_", length = 2)
+ @PropertyDef(label = "涓氬姟璇存槑", description = "杞崲绮锛岄潪杞崲绮紝濡傛灉涓鸿疆鎹㈢伯椋燂紝璁″垝鏄庣粏鍜屽悎鍚屽繀濉�")
+ private String type;
+
+ @Transient
+ @PropertyDef(label = "鏍囪", description = "鐢ㄤ簬鍒ゆ柇閫氱煡鍗曟槸鍚︿负鏂板")
+ private String tag;
+
+ @Transient
+ @PropertyDef(label = "浠撳簱鍚嶇О")
+ private String depotName = "";
+
+ @Transient
+ @PropertyDef(label = "绮鍝佺")
+ private String foodVarietyName;
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutNoticeOut.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutNoticeOut.java
new file mode 100644
index 0000000..5184f3f
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutNoticeOut.java
@@ -0,0 +1,135 @@
+package com.fzzy.async.fzzy61.entity;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鍑哄叆搴�-鍑哄簱閫氱煡鍗曪紝鏍规嵁鏂板浗鏍囧凡鏍稿 2023骞�5鏈�26鏃� 09:35:23
+ *
+ * @author czt
+ */
+@Data
+@Entity
+@Table(name = "D_INOUT_NOTICE_OUT")
+public class Fz61InoutNoticeOut implements Serializable {
+
+ public static String SORT_PROP = "id";
+
+ @Id
+ @Column(name = "ID_", length = 40)
+ @PropertyDef(label = "閫氱煡鍗曞彿")
+ 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 = "NAME_", length = 50)
+ @PropertyDef(label = "閫氱煡鍗曞悕绉�")
+ private String name;
+
+ @Column(name = "PLAN_ID_", length = 40)
+ @PropertyDef(label = "璁″垝鏄庣粏鍙�", description = "閽堝杞崲绮蹇呭～")
+ private String planId;
+
+ @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 = "PLAN_NAME_", length = 50)
+ @PropertyDef(label = "璁″垝鍚嶇О")
+ private String planName;
+
+ @Column(name = "DEPOT_ID_", length = 50)
+ @PropertyDef(label = "鐩爣浠撳簱")
+ private String depotId;
+
+ @Column(name = "CUSTOMER_ID_", length = 40)
+ @PropertyDef(label = "鍙戣揣瀹㈡埛")
+ private String customerId;
+
+ @Column(name = "CUSTOMER_NAME_", length = 50)
+ @PropertyDef(label = "鍙戣揣瀹㈡埛")
+ private String customerName;
+
+ @Column(name = "UNIT_NAME_", length = 50)
+ @PropertyDef(label = "鏀惰揣鍗曚綅", description = "搴撳尯鎵�灞炲叕鍙革紝鎵嬪姩褰曞叆")
+ private String unitName;
+
+ @Column(name = "FOOD_VARIETY_", length = 10)
+ @PropertyDef(label = "绮鍝佺")
+ private String foodVariety;
+
+ @Column(name = "YEAR_", length = 10)
+ @PropertyDef(label = "骞翠唤")
+ private String year;
+
+ @Column(name = "TARGET_NUMBER_")
+ @PropertyDef(label = "鐩爣鏁伴噺", description = "鍗曚綅锛欿G锛屾墜鍔ㄥ～鎶�")
+ private Double targetNumber = 0.0;
+
+ @Column(name = "COMPLETE_NUMBER_")
+ @PropertyDef(label = "瀹屾垚鏁伴噺", description = "鍗曚綅锛欿G锛岀郴缁熻嚜鍔ㄥ悎璁�")
+ private Double completeNumber = 0.0;
+
+ @Column(name = "AUDIT_STATUS_", length = 10)
+ @PropertyDef(label = "瀹℃牳鐘舵��", description = "涓哄鏍革紝瀹℃牳閫氳繃锛屾嫆鎺�")
+ private String auditStatus;
+
+ @Column(name = "AUDIT_USER_", length = 50)
+ @PropertyDef(label = "瀹℃牳浜�")
+ private String auditUser;
+
+ @Column(name = "AUDIT_DATE_")
+ @PropertyDef(label = "瀹℃壒鏃堕棿", description = "鏍煎紡锛歽yyy-MM-dd HH:mm:ss")
+ private String auditDate;
+
+ @Column(name = "COMPLETE_STATUS_", length = 10)
+ @PropertyDef(label = "瀹屾垚鐘舵��", description = "鏈畬鎴愶紝宸插畬鎴�")
+ private String completeStatus;
+
+ @Column(name = "COMPLETE_TIME_")
+ @PropertyDef(label = "瀹屾垚鏃堕棿")
+ private Date completeTime;
+
+ @Column(name = "CREATE_TIME_")
+ @PropertyDef(label = "鍒涘缓鏃堕棿")
+ private Date createTime = new Date();
+
+ @Column(name = "CREATE_USER_", length = 50)
+ @PropertyDef(label = "鍒涘缓浜�")
+ private String createUser;
+
+ @Column(name = "REMARK_", length = 200)
+ @PropertyDef(label = "澶囨敞淇℃伅")
+ private String remark;
+
+ @Column(name = "TYPE_", length = 2)
+ @PropertyDef(label = "涓氬姟璇存槑", description = "杞崲绮锛岄潪杞崲绮紝濡傛灉涓鸿疆鎹㈢伯椋燂紝璁″垝鏄庣粏鍜屽悎鍚屽繀濉�")
+ private String type;
+
+ @Transient
+ @PropertyDef(label = "鏍囪", description = "鐢ㄤ簬鍒ゆ柇閫氱煡鍗曟槸鍚︿负鏂板")
+ private String tag;
+
+ @Transient
+ @PropertyDef(label = "浠撳簱鍚嶇О")
+ private String depotName = "";
+
+ @Transient
+ @PropertyDef(label = "绮鍝佺")
+ private String foodVarietyName;
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutRecord.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutRecord.java
new file mode 100644
index 0000000..ef8f617
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutRecord.java
@@ -0,0 +1,302 @@
+package com.fzzy.async.fzzy61.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;
+
+/**
+ * @Desc: 鍑哄叆搴撴祦姘磋〃锛屾牴鎹柊鍥界伯瑙勮皟鏁翠紭鍖栧瓧娈碉紝2023骞�5鏈�26鏃� 鏍规嵁鏂板浗绮浼樺寲
+ * @author: Andy
+ * @update-time: 2023/5/26
+ */
+@Data
+@Entity
+@Table(name = "D_INOUT_RECORD")
+public class Fz61InoutRecord {
+
+ public static String SORT_PROP = "id";
+
+ @Id
+ @Column(name = "ID_", length = 40)
+ @PropertyDef(label = "娴佹按鍙�", description = "鏍规嵁涓�瀹氱殑瑙勫垯鐢熸垚")
+ 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 = "NOTICE_ID_", length = 40)
+ @PropertyDef(label = "閫氱煡鍗曠紪鐮�")
+ private String noticeId;
+
+ @Column(name = "DEPOT_ID_", length = 50)
+ @PropertyDef(label = "瑁呭嵏浠撳簱")
+ private String depotId;
+
+ @Column(name = "TYPE_", length = 10)
+ @PropertyDef(label = "鍑哄叆搴撶被鍨�", description = "IN=鍏ュ簱锛孫UT=鍑哄簱")
+ private String type;
+
+ @Column(name = "PROGRESS_", length = 20)
+ @PropertyDef(label = "娴佺▼杩涘害")
+ private String progress;
+
+ @Column(name = "RECORD_STATUS_", length = 10)
+ @PropertyDef(label = "鏁版嵁鐘舵��", description = "鏁版嵁鐘舵�侊紝姝ｅ父锛屽紓甯革紙2灏忔椂鍐呴噸澶嶅嚭鍏ュ簱绛夛級锛岃ˉ褰�")
+ private String recordStatus;
+
+ @Column(name = "CUSTOMER_NAME_", length = 50)
+ @PropertyDef(label = "寰�鏉ュ崟浣�", description = "鍏宠仈閫氱煡鍗曡幏鍙�")
+ private String customerName;
+
+ @Column(name = "INTEL_CARD_", length = 20)
+ @PropertyDef(label = "鏅烘収鍗″彿")
+ private String intelCard;
+
+ /*** ------------------------鐧昏-------------------------------------**/
+ @Column(name = "REGISTER_TIME_")
+ @PropertyDef(label = "鐧昏鏃堕棿")
+ private Date registerTime;
+
+ @Column(name = "REGISTER_USER_", length = 50)
+ @PropertyDef(label = "鐧昏浜�")
+ private String registerUser;
+
+ @Column(name = "USER_NAME_", length = 40)
+ @PropertyDef(label = "鎵胯繍浜�")
+ private String userName;
+
+ @Column(name = "USER_CONTACT_", length = 20)
+ @PropertyDef(label = "鑱旂郴鏂瑰紡")
+ private String userContact;
+
+ @Column(name = "USER_ID_", length = 20)
+ @PropertyDef(label = "韬唤璇佸彿")
+ private String userId;
+
+ @Column(name = "USER_ADDRESS_", length = 100)
+ @PropertyDef(label = "鎵胯繍浜哄湴鍧�")
+ private String userAddress;
+
+ @Column(name = "USER_BIRTHDAY_")
+ @PropertyDef(label = "鍑虹敓鏃ユ湡")
+ private Date userBirthday;
+
+ @Column(name = "USER_SEX_", length = 10)
+ @PropertyDef(label = "鎬у埆")
+ private String userSex;
+
+ @Column(name = "USER_NATION_", length = 10)
+ @PropertyDef(label = "姘戞棌")
+ private String userNation;
+
+ @Column(name = "PLATE_NUM_", length = 20)
+ @PropertyDef(label = "杞﹁埞鍙�", description = "杞︾墝鍙�+鏍囪瘑绗�")
+ private String plateNum;
+
+ @Column(name = "TRANS_TYPE_", length = 6)
+ @PropertyDef(label = "杩愯緭宸ュ叿")
+ private String transType;
+
+
+ /*** ------------------------绮鍩虹淇℃伅-------------------------------------**/
+ @Column(name = "FOOD_VARIETY_", length = 20)
+ @PropertyDef(label = "绮鍝佺")
+ private String foodVariety;
+
+ @Column(name = "FOOD_TYPE_", length = 20)
+ @PropertyDef(label = "绮鎬ц川")
+ private String foodType;
+
+ @Column(name = "FOOD_LOCATION_ID_", length = 20)
+ @PropertyDef(label = "浜у湴鍚嶇О浠ｇ爜")
+ private String foodLocationId;
+
+ @Column(name = "FOOD_LOCATION_", length = 40)
+ @PropertyDef(label = "浜у湴鍚嶇О")
+ private String foodLocation;
+
+ @Column(name = "FOOD_YEAR_", length = 10)
+ @PropertyDef(label = "鏀惰揣骞村害")
+ private String foodYear;
+
+ /*** ------------------------鎵︽牱璐ㄦ淇℃伅-------------------------------------**/
+ @Column(name = "FOOD_LEVEL_", length = 20)
+ @PropertyDef(label = "绮瀹氱瓑")
+ private String foodLevel;
+
+ @Column(name = "CHECK_STATUS_", length = 10)
+ @PropertyDef(label = "璐ㄦ缁撴灉")
+ private String checkStatus;
+
+ @Column(name = "CHECK_USER_", length = 50)
+ @PropertyDef(label = "璐ㄦ浜�")
+ private String checkUser;
+
+ @Column(name = "CHECK_TIME_")
+ @PropertyDef(label = "璐ㄦ鏃堕棿")
+ private Date checkTime;
+
+ @Column(name = "SAMPLE_USER_", length = 50)
+ @PropertyDef(label = "鎵︽牱浜�")
+ private String sampleUser;
+
+ @Column(name = "SAMPLE_TIME_")
+ @PropertyDef(label = "鎵︽牱鏃堕棿")
+ private Date sampleTime;
+
+ @Column(name = "SAMPLE_TYPE_", length = 1)
+ @PropertyDef(label = "鎵︽牱鏂瑰紡", description = "0-浜哄伐锛�1=鑷姩锛�2=鏅鸿兘闅忔満")
+ private String sampleType;
+
+ @Column(name = "CHECK_ID_", length = 12)
+ @PropertyDef(label = "璐ㄦ鍗曞彿")
+ private String checkId;
+
+ @Column(name = "DE_CHECK_")
+ @PropertyDef(label = "璐ㄦ鎵ｉ噸", description = "鍗曚綅KG")
+ private double deCheck = 0.0;
+
+ @Column(name = "ADD_CHECK_")
+ @PropertyDef(label = "璐ㄦ澧為噸", description = "鍗曚綅KG")
+ private double addCheck = 0.0;
+
+ /*** ------------------------绉伴噸鐜妭-------------------------------------**/
+
+ @Column(name = "jjlx", length = 2)
+ @PropertyDef(label = "妫�鏂ょ被鍨�", description = "0锛氱О閲嶅叆搴� 1锛氭爣鍑嗗寘鍏ュ簱 榛樿涓虹О閲嶅叆搴擄紝鏍囧噯鍖呭叆搴撶浉鍏冲瓧娈靛彲涓虹┖")
+ private String jjlx = "0";
+
+ @Column(name = "FULL_WEIGHT_")
+ @PropertyDef(label = "婊¤溅绉伴噸", description = "鍏ュ簱鏃跺�欒〃绀虹涓�娆＄О閲嶏紝鍑哄簱鏃跺�欒〃绀虹浜屾绉伴噸锛屽崟浣岾G")
+ private Double fullWeight = 0.0;
+
+ @Column(name = "FULL_WEIGHT_TIME_")
+ @PropertyDef(label = "婊¤溅绉伴噸鏃堕棿")
+ private Date fullWeightTime;
+
+ @Column(name = "FULL_WEIGHT_USER_", length = 40)
+ @PropertyDef(label = "婊¤溅绉伴噸浜�")
+ private String fullWeightUser;
+
+ @Column(name = "EMPTY_WEIGHT_")
+ @PropertyDef(label = "绌鸿溅绉伴噸", description = "鍏ュ簱鏃惰〃绀虹浜屾绉伴噸锛屽嚭搴撴椂鍊欒〃绀虹涓�娆＄О閲嶏紝鍗曚綅KG")
+ private Double emptyWeight = 0.0;
+
+ @Column(name = "EMPTY_WEIGHT_TIME_")
+ @PropertyDef(label = "绌鸿溅绉伴噸鏃堕棿")
+ private Date emptyWeightTime;
+
+ @Column(name = "EMPTY_WEIGHT_USER_", length = 50)
+ @PropertyDef(label = "绌鸿溅绉伴噸浜�")
+ private String emptyWeightUser;
+
+ @Column(name = "NET_WEIGHT_")
+ @PropertyDef(label = "鍑�姣涢噸", description = "鍗曚綅KG锛岀瓑浜庢弧杞� - 绌鸿溅")
+ private double netWeight = 0.0;
+
+ @Column(name = "DE_HANDLE_")
+ @PropertyDef(label = "鐜板満鎵ｉ噸", description = "鍗曚綅KG")
+ private double deHandle = 0.0;
+
+ @Column(name = "DE_PACKAGE_")
+ @PropertyDef(label = "鍖呰鎵ｉ噸", description = "鍗曚綅KG")
+ private double dePackage = 0.0;
+
+ @Column(name = "DE_OTHER_")
+ @PropertyDef(label = "鍏朵粬鎵ｉ噸", description = "鍗曚綅KG")
+ private double deOther = 0.0;
+
+ @Column(name = "DE_OTHER_INTO_", length = 200)
+ @PropertyDef(label = "鍏朵粬鎵ｉ噸鍘熷洜")
+ private String deOtherInfo;
+
+ @Column(name = "SETTLE_WEIGHT_")
+ @PropertyDef(label = "缁撶畻閲嶉噺", description = "鎵ｉ噸鍚庡噣閲嶏紝缁撶畻鍑�閲嶏紝鍗曚綅KG")
+ private Double settleWeight = 0.0;
+
+ @Column(name = "RECORD_WEIGHT_")
+ @PropertyDef(label = "鍏ュ簱閲嶉噺", description = "鎵ｉ噸鍚庡噣閲嶏紝缁撶畻鍑�閲嶏紝琛ュ寘鎷閲嶏紝鍗曚綅KG")
+ private Double recordWeight = 0.0;
+
+
+ /**
+ * -----------缁撶畻淇℃伅-----------------------
+ **/
+ @Column(name = "PRICE_")
+ @PropertyDef(label = "鍗曚环", description = "鍗曚綅锛氬厓/鍏枻锛屽疄闄呯粨绠椾环鏍间互缁撶畻鍗曚腑鍗曚环涓哄噯")
+ private Double price = 0.0;
+
+ @Column(name = "SETTLE_MONEY_")
+ @PropertyDef(label = "缁撶畻閲戦", description = "鍗曚綅锛氬厓锛屽疄闄呯粨绠椾互璁＄畻鍗曚负鍑�")
+ private Double settleMoney = 0.00;
+
+ @Column(name = "SETTLE_ID_", length = 50)
+ @PropertyDef(label = "缁撶畻鍗曞彿", description = "濡傛灉鏄崟杞︾粨绠楀繀濉�")
+ private String settleId;
+
+ @Column(name = "SETTLE_TAG_", length = 2)
+ @PropertyDef(label = "缁撶畻鏍囩")
+ private String settleTag;
+
+ /**
+ * ----------- 鍊间粨淇℃伅-----------------------
+ **/
+ @Column(name = "HANDLE_USER_", length = 40)
+ @PropertyDef(label = "鍊间粨鎿嶄綔浜�")
+ private String handleUser;
+
+ // 鍑哄簱
+ @Column(name = "COMPLETE_TIME_")
+ @PropertyDef(label = "瀹屾垚鏃堕棿")
+ private Date completeTime;
+
+ @Column(name = "COMPLETE_USER_", length = 40)
+ @PropertyDef(label = "瀹屾垚纭浜�")
+ private String completeUser;
+
+ // 澶囨敞
+ @Column(name = "REMARKS_", length = 200)
+ @PropertyDef(label = "澶囨敞淇℃伅")
+ private String remarks;
+
+ /**
+ * ----------- 鍊间粨鏃堕棿锛屾墜鏈虹浣跨敤-----------------------
+ **/
+ @Column(name = "HANDLE_START_")
+ @PropertyDef(label = "鍊间粨寮�濮嬫椂闂�")
+ private Date handleStart;
+
+ @Column(name = "HANDLE_END_")
+ @PropertyDef(label = "鍊间粨缁撴潫鏃堕棿")
+ private Date handleEnd;
+
+ /**
+ * ----------- 鍏朵粬淇℃伅锛岄拡瀵规鏂ょ被鍨嬫爣鍑嗗寘鍏ュ簱濉啓-----------------------
+ **/
+ @Column(name = "bzw", length = 2)
+ @PropertyDef(label = "鍖呰鐗�", description = "1锛氶夯琚�2锛氱紪缁囪3锛氭暎瑁�9锛氬叾浠�")
+ private String bzw;
+
+ @Column(name = "dbz")
+ @PropertyDef(label = "鍗曞寘閲�", description = "鍗曚綅锛氬叕鏂�")
+ private Double dbz;
+
+ @Column(name = "bzbjs")
+ @PropertyDef(label = "鍖呬欢鏁�", description = "鍗曚綅锛氫欢")
+ private int bzbjs;
+
+ @Column(name = "UPDATE_TIME_")
+ @PropertyDef(label = "鏁版嵁鏇存柊鏃堕棿")
+ private Date updateTime;
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutRecordItem.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutRecordItem.java
new file mode 100644
index 0000000..67fc0a1
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutRecordItem.java
@@ -0,0 +1,102 @@
+package com.fzzy.async.fzzy61.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;
+
+/**
+ * 鍑哄叆搴撴祦姘村瓧琛�
+ * @author
+ */
+@Data
+@Entity
+@Table(name = "D_INOUT_RECORD_ITEM")
+public class Fz61InoutRecordItem {
+
+ @Id
+ @Column(name = "ID_", length = 40)
+ @PropertyDef(label = "涓婚敭id", description = "鏍规嵁涓�瀹氱殑瑙勫垯鐢熸垚")
+ private String id;
+
+ @Column(name = "RECORD_ID_", length = 40)
+ @PropertyDef(label = "娴佹按Id")
+ private String recordId;
+
+ @Column(name = "DEPOT_ID_", length = 50)
+ @PropertyDef(label = "瑁呭嵏浠撳簱")
+ private String depotId;
+
+ @Column(name = "CAR_NUM_", length = 20)
+ @PropertyDef(label = "鑸硅繍杞﹁締搴忓彿")
+ private String carNum;
+
+ @Column(name = "CAR_NAME_", length = 20)
+ @PropertyDef(label = "鑸硅繍杞﹁締鍚嶇О")
+ private String carName;
+
+ @Column(name = "TYPE_", length = 10)
+ @PropertyDef(label = "鍑哄叆搴撶被鍨�", description = "鍑哄簱锛屽叆搴�")
+ private String type;
+
+ @Column(name = "PROGRESS_", length = 20)
+ @PropertyDef(label = "娴佺▼杩涘害")
+ private String progress;
+
+ @Column(name = "RECORD_STATUS_", length = 10)
+ @PropertyDef(label = "鏁版嵁鐘舵��", description = "鏁版嵁鐘舵�侊紝姝ｅ父锛屽紓甯革紙2灏忔椂鍐呴噸澶嶅嚭鍏ュ簱绛夛級锛岃ˉ褰�")
+ private String recordStatus;
+
+ @Column(name = "DE_")
+ @PropertyDef(label = "鎵ｉ噸", description = "鍗曚綅KG")
+ private Double de = 0.0;
+
+ @Column(name = "FULL_WEIGHT_")
+ @PropertyDef(label = "婊¤溅绉伴噸", description = "鍏ュ簱鏃跺�欒〃绀虹涓�娆＄О閲嶏紝鍑哄簱鏃跺�欒〃绀虹浜屾绉伴噸锛屽崟浣岾G")
+ private Double fullWeight = 0.0;
+
+ @Column(name = "FULL_WEIGHT_TIME_")
+ @PropertyDef(label = "婊¤溅绉伴噸鏃堕棿")
+ private Date fullWeightTime;
+
+ @Column(name = "FULL_WEIGHT_USER_", length = 40)
+ @PropertyDef(label = "婊¤溅绉伴噸浜�")
+ private String fullWeightUser;
+
+ @Column(name = "EMPTY_WEIGHT_")
+ @PropertyDef(label = "绌鸿溅绉伴噸", description = "鍏ュ簱鏃惰〃绀虹浜屾绉伴噸锛屽嚭搴撴椂鍊欒〃绀虹涓�娆＄О閲嶏紝鍗曚綅KG")
+ private Double emptyWeight = 0.0;
+
+ @Column(name = "EMPTY_WEIGHT_TIME_")
+ @PropertyDef(label = "绌鸿溅绉伴噸鏃堕棿")
+ private Date emptyWeightTime;
+
+ @Column(name = "EMPTY_WEIGHT_USER_")
+ @PropertyDef(label = "绌鸿溅绉伴噸浜�")
+ private String emptyWeightUser;
+
+ @Column(name = "NET_WEIGHT_")
+ @PropertyDef(label = "鍑�閲�", description = "鍗曚綅KG")
+ private Double netWeight = 0.0;
+
+ @Column(name = "SETTLE_WEIGHT_")
+ @PropertyDef(label = "缁撶畻鍑�閲�", description = "鎵ｉ噸鍚庡噣閲嶏紝缁撶畻鍑�閲嶏紝鍗曚綅KG")
+ private Double settleWeight = 0.0;
+
+ @Column(name = "RECORD_WEIGHT_")
+ @PropertyDef(label = "鍏ュ簱閲嶉噺", description = "鎵ｉ噸鍚庡噣閲嶏紝缁撶畻鍑�閲嶏紝琛ュ寘鎷閲嶏紝鍗曚綅KG")
+ private Double recordWeight = 0.0;
+
+ @Column(name = "CREATE_TIME_")
+ @PropertyDef(label = "鍒涘缓鏃堕棿")
+ private Date createTime;
+
+ // 澶囨敞
+ @Column(name = "REMARKS_", length = 200)
+ @PropertyDef(label = "澶囨敞淇℃伅")
+ private String remarks;
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutSettle.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutSettle.java
new file mode 100644
index 0000000..c0ae211
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutSettle.java
@@ -0,0 +1,130 @@
+package com.fzzy.async.fzzy61.entity;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fzzy.async.fzzy30.entity.InoutRecord;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鍑哄叆搴撶粨绠楋紝2023骞�5鏈�26鏃ワ紝鏍规嵁鏂板浗绮浼樺寲璋冩暣
+ */
+@Data
+@Entity
+@Table(name = "D_INOUT_SETTLE")
+public class Fz61InoutSettle {
+
+ public static String SORT_PROP = "id";
+
+ @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 = 40)
+ @PropertyDef(label = "寮�鎴疯鍙�")
+ private String bankCode;
+
+ @Column(name = "BANK_", length = 50)
+ @PropertyDef(label = "寮�鎴疯鍚嶇О")
+ private String bank;
+
+ @Column(name = "BANK_NUM_", length = 40)
+ @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 = "fphm", length = 10)
+ @PropertyDef(label = "鍙戠エ鍙风爜")
+ private String fphm;
+
+ @Column(name = "fpzt", length = 10)
+ @PropertyDef(label = "鍙戠エ鐘舵��",description = "1锛氭甯�,0锛氫綔搴�")
+ private String fpzt;
+
+ @Column(name = "INOUT_RECORD_ID_", length = 40)
+ @PropertyDef(label = "娴佹按鍙�", description = "鏍规嵁涓�瀹氱殑瑙勫垯鐢熸垚")
+ private String inoutRecordId;
+
+ @Column(name = "UPDATE_TIME_")
+ @PropertyDef(label = "鏁版嵁鏇存柊鏃堕棿")
+ private Date updateTime;
+
+ @Transient
+ private List<InoutRecord> recordItems;
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutStockChange.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutStockChange.java
new file mode 100644
index 0000000..e97f488
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutStockChange.java
@@ -0,0 +1,99 @@
+package com.fzzy.async.fzzy61.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;
+
+/**
+ * @Desc: 鍊掍粨鍔熻兘锛�2023骞�5鏈�26鏃� 鏍规嵁鏂板浗绮鏇存柊浼樺寲
+ * @author: Andy
+ * @update-time: 2023/5/26
+ */
+@Data
+@Entity
+@Table(name = "D_INOUT_STOCK_CHANGE")
+public class Fz61InoutStockChange {
+
+ public static String SORT_PROP = "updateTime";
+ /**
+ * 鍊掍粨鍗曞彿
+ */
+ @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 = "CHANGE_START_DATE_")
+ @PropertyDef(label = "鍊掍粨寮�濮嬫棩鏈�", description = "yyyy-MM-dd")
+ private Date changeStartDate;
+
+ @Column(name = "CHANGE_END_DATE_")
+ @PropertyDef(label = "鍊掍粨缁撴潫鏃ユ湡", description = "yyyy-MM-dd")
+ private Date changeEndDate;
+
+ @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/fzzy61/entity/Fz61InoutVarietyChange.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutVarietyChange.java
new file mode 100644
index 0000000..8d46977
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutVarietyChange.java
@@ -0,0 +1,148 @@
+package com.fzzy.async.fzzy61.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;
+
+/**
+ * 缁煎悎绠＄悊-绮鎬ц川鍙樻洿锛屼富瑕佹槸鍑哄叆搴撲箣鍓嶅仛 鍌ㄥ杞晢鍝侊紝瀹屾垚涔嬪悗 鍟嗗搧杞偍澶囥��
+ * <p>
+ * 鍙樻洿璁板綍锛氳〃鍚嶅彉鏇翠负 D_INOUT_VARIETY_CHANGE
+ */
+@Data
+@Entity
+@Table(name = "D_INOUT_VARIETY_CHANGE")
+public class Fz61InoutVarietyChange implements Serializable {
+
+ public static String SORT_PROP = "changeTime";
+
+ @Id
+ @Column(name = "ID_", length = 41)
+ @PropertyDef(label = "绮鎬ц川杞彉鍗曞彿", description = "鐢辫揣浣嶄唬鐮�+鍒掕浆鏃ユ湡锛坹yyyMMdd锛�+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 = "NUMBER_")
+ @PropertyDef(label = "绮鏁伴噺", description = "鍗曚綅锛氬叕鏂�")
+ private Double number = 0.0;
+
+ @Column(name = "CHANGE_NUMBER_")
+ @PropertyDef(label = "鍒掕浆鏁伴噺", description = "鍗曚綅锛氬叕鏂�")
+ private Double changeNumber = 0.0;
+
+ @Column(name = "APPROVAL_ID_", length = 40)
+ @PropertyDef(label = "鎵瑰噯鏂囧彿")
+ private String approvalId;
+
+ @Column(name = "FOOD_VARIETY_", length = 10)
+ @PropertyDef(label = "绮鍝佺", description = "浠ｇ爜涓嶈冻7浣嶉渶鍦ㄦ湯浣嶈ˉ0")
+ private String foodVariety;
+
+ /**
+ * 100銆佸偍澶囩伯 110銆佷腑澶偍澶囩伯 120銆佸湴鏂瑰偍澶囩伯
+ * 121銆佺渷(鑷不鍖恒�佺洿杈栧競)绾у湴鏂瑰偍澶囩伯
+ * 122銆佸競(鍦板尯銆佽嚜娌诲窞銆佺洘)绾у湴鏂瑰偍澶囩伯
+ * 123銆佸幙(鑷不鍘裤�佸幙绾у競銆佹棗銆佽嚜娌绘棗銆佸競杈栧尯銆佹灄鍖恒�佺壒鍖�)绾у湴鏂瑰偍澶囩伯
+ * 129銆佸叾浠栧偍澶囩伯 200銆佸晢鍝佺伯 270銆佷腑鍌ㄧ伯绯荤粺鍟嗗搧绮�
+ * 280銆佽繘鍙ｅ晢鍝佺伯 290銆佸叾浠栧晢鍝佺伯 300銆佹斂绛栨�х伯椋�
+ * 310銆佹渶浣庢敹璐环绮� 320銆佸浗瀹朵复鏃跺瓨鍌ㄧ伯 330銆佸浗瀹朵复鍌ㄨ繘鍙ｇ伯
+ * 340銆佸湴鏂逛复鏃跺瓨鍌ㄧ伯
+ */
+ @Column(name = "FOOD_TYPE_", length = 10)
+ @PropertyDef(label = "鍒掕浆鍓嶇伯椋熸�ц川浠ｇ爜")
+ private String foodType;
+
+ @Column(name = "NEW_FOOD_TYPE_", length = 10)
+ @PropertyDef(label = "鍒掕浆鍚庣伯椋熸�ц川浠ｇ爜")
+ private String newFoodType;
+
+ @Column(name = "CHANGE_TIME_")
+ @PropertyDef(label = "鍒掕浆鏃ユ湡")
+ private Date changeTime;
+
+ @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 = "UPDATE_TIME_")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date updateTime;
+
+ @Column(name = "REMARK_", length = 200)
+ @PropertyDef(label = "澶囨敞")
+ private String remark;
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61OAStaff.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61OAStaff.java
new file mode 100644
index 0000000..3309916
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61OAStaff.java
@@ -0,0 +1,128 @@
+package com.fzzy.async.fzzy61.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 Fz61OAStaff implements Serializable {
+ private static final long serialVersionUID = 1L;
+ @Id
+ @Column(name = "sfzhm", length = 18)
+ @PropertyDef(label = "韬唤璇佸彿鐮�")
+ private String sfzhm;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜", description = "")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 20)
+ @PropertyDef(label = "搴撳尯缂栫爜", description = "")
+ private String deptId;
+
+ @Column(name = "lsbm", length = 256)
+ @PropertyDef(label = "闅跺睘閮ㄩ棬", description = "闅跺睘閮ㄩ棬鍚嶇О")
+ private String lsbm;
+
+ @Column(name = "xzqhdm", length = 6)
+ @PropertyDef(label = "鎵�灞炶鏀垮尯鍒�")
+ private String xzqhdm;
+
+ @Column(name = "xzqhmc", length = 6)
+ @PropertyDef(label = "鎵�灞炶鏀垮尯鍒�")
+ private String xzqhmc;
+
+ @Column(name = "xm", length = 32)
+ @PropertyDef(label = "濮撳悕")
+ private String xm;
+
+ @Column(name = "xb", length = 1)
+ @PropertyDef(label = "鎬у埆")
+ private String xb;
+
+ @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/fzzy61/entity/Fz61SecCamera.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61SecCamera.java
new file mode 100644
index 0000000..3afacc4
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61SecCamera.java
@@ -0,0 +1,140 @@
+package com.fzzy.async.fzzy61.entity;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author: YYC
+ * @Description:
+ * @DateTime: 2025-9-16 16:25
+ **/
+@Data
+@Entity
+@Table(name = "D_SEC_CAMERA")
+public class Fz61SecCamera implements Serializable {
+
+ public static String SORT_PROP = "orderNum";
+
+ @Id
+ @Column(name = "ID_", length = 40)
+ @PropertyDef(label = "ID")
+ 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 = "NAME_", length = 50)
+ @PropertyDef(label = "鍚嶇О")
+ private String name;
+
+
+ @Column(name = "TYPE_", length = 10)
+ @PropertyDef(label = "璁惧绫诲瀷")
+ private String type;
+
+
+ @Column(name = "BRAND_", length = 50)
+ @PropertyDef(label = "璁惧鍝佺墝")
+ private String brand;
+
+ @Column(name = "SN_", length = 50)
+ @PropertyDef(label = "搴忓垪鍙�")
+ private String sn;
+
+ @Column(name = "PLAY_TYPE_", length = 40)
+ @PropertyDef(label = "鎾斁鏂瑰紡")
+ private String playType;
+
+ @Column(name = "LOGIN_ID_", length = 20)
+ @PropertyDef(label = "甯愬彿")
+ private String loginId;
+
+ @Column(name = "PWD_", length = 20)
+ @PropertyDef(label = "瀵嗙爜")
+ private String pwd;
+
+ @Column(name = "IP_", length = 20)
+ @PropertyDef(label = "IP鍦板潃")
+ private String ip;
+
+ @Column(name = "CONTROL_PORT_")
+ @PropertyDef(label = "鎺у埗绔彛")
+ private Integer controlPort;
+
+ @Column(name = "WEB_PORT_")
+ @PropertyDef(label = "WEB绔彛")
+ private Integer webPort;
+
+ @Column(name = "CHAN_NUM_")
+ @PropertyDef(label = "閫氶亾鍙�")
+ private Integer chanNum = 1;
+
+ @PropertyDef(label = "鍐呯綉鐩存挱鍦板潃")
+ @Column(name = "URL_IN_", length = 254)
+ private String urlIn;
+
+ @PropertyDef(label = "澶栫綉鐩存挱鍦板潃")
+ @Column(name = "URL_OUT_", length = 254)
+ private String urlOut;
+
+ @Column(name = "MEDIA_ADDR_", length = 100)
+ @PropertyDef(label = "RTSP鍦板潃")
+ private String mediaAddr;
+
+ @Column(name = "SNAP_TYPE_", length = 25)
+ @PropertyDef(label = "鎶撴媿鏂瑰紡")
+ private String snapType;
+
+ @Column(name = "spjklx", length = 1)
+ @PropertyDef(label = "瑙嗛鐩戞帶绫诲瀷")
+ private String spjklx;
+
+ @Column(name = "spdwlx", length = 2)
+ @PropertyDef(label = "瑙嗛鐐逛綅绫诲瀷")
+ private String spdwlx;
+
+ @PropertyDef(label = "椤甸潰涓殑鍧愭爣")
+ @Column(name = "POS_X_")
+ private Double posX;
+
+ @PropertyDef(label = "椤甸潰涓殑鍧愭爣")
+ @Column(name = "POS_Y_")
+ private Double posY;
+
+ @PropertyDef(label = "澶у睆鏄剧ず鏍囪")
+ @Column(name = "SCREEN_SHOW_", length = 1)
+ private String screenShow;
+
+ @PropertyDef(label = "鎵嬫満鏄惁鏄剧ず")
+ @Column(name = "PHONE_SHOW_TAG_", length = 1)
+ private String phoneShowTag ;
+
+ @Column(name = "ORDER_NUM_")
+ @PropertyDef(label = "鏄剧ず椤哄簭")
+ private Integer orderNum = 1;
+
+ @PropertyDef(label = "鏄惁浣跨敤")
+ @Column(name = "VLD_", length = 1)
+ private String vld;
+
+ @Column(name = "REMARK_", length = 300)
+ @PropertyDef(label = "澶囨敞")
+ private String remark;
+
+ @Column(name = "UPDATE_TIME_", length = 1)
+ @PropertyDef(label = "鏇存柊鏃堕棿")
+ private Date updateTime;
+
+
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1107.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1107.java
new file mode 100644
index 0000000..cd49e84
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1107.java
@@ -0,0 +1,108 @@
+package com.fzzy.async.fzzy61.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1102;
+import com.fzzy.api.entity.Api1107;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.utils.ContextUtil;
+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.apache.commons.lang.StringUtils;
+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 Fzzy61Sync1107 {
+ @Autowired
+ private Fzzy40Sync1107Rep fzzy40Sync1107Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+ @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.listDevice(deptId);
+
+ if (null == list || list.isEmpty()) {
+ log.info("-------------娌℃湁鑾峰彇鍒拌澶囦俊鎭�------------------");
+ return;
+ }
+ Api1102 api1102 = api1102Rep.findById(kqdm).get();
+ Api1107 apiData;
+ List<Api1107> api1107List;
+ for (Fz40DeptDevice sysData : list) {
+ apiData = new Api1107();
+
+ apiData.setSbbh(sysData.getSbbh());
+ apiData.setDwdm(api1102.getDwdm());//鍗曚綅浠ｇ爜
+ apiData.setKqdm(api1102.getKqdm());//搴撳尯浠ｇ爜
+ apiData.setKqmc(api1102.getKqmc());//搴撳尯鍚嶇О
+ apiData.setSbyqmc(sysData.getSbyqmc());
+ apiData.setSbyqdm(sysData.getSbyqdm());
+ apiData.setSbggxh(sysData.getSbggxh());
+ if (StringUtils.isEmpty(sysData.getSccj())) {
+ apiData.setSccj("鐢熶骇鍘傚");
+ } else {
+ 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.setZhgxsj(sysData.getUpdateTime());
+ apiData.setBizId(sysData.getSbbh());
+
+ api1107List = api1107Rep.getDataByBizId(apiData.getBizId());
+ if (null == api1107List || api1107List.isEmpty()) {
+ apiData.setCzbz(Constant.CZBZ_I);
+ } else {
+ apiData.setCzbz(api1107List.get(0).getCzbz());
+ }
+
+ //淇濆瓨鏁版嵁
+ api1107Rep.save(apiData);
+ log.info("1107璁惧淇℃伅---鍚屾鏁版嵁锛歿}", apiData.toString());
+ }
+
+ } catch (Exception e) {
+ log.error("---1107璁惧淇℃伅鍚屾鎵ц澶辫触----{}", e.toString());
+ apiLog.setResult("璁惧淇℃伅鍚屾鎵ц澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1108.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1108.java
new file mode 100644
index 0000000..2ff202d
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1108.java
@@ -0,0 +1,117 @@
+package com.fzzy.async.fzzy61.impl;
+
+import com.fzzy.api.Constant;
+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.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 com.fzzy.async.fzzy61.entity.Fz61Drug;
+import com.fzzy.async.fzzy61.repository.Fzzy61Sync1108Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+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 Fzzy61Sync1108 {
+
+ @Autowired
+ private Fzzy61Sync1108Rep fzzy61Sync1108Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+ @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<Fz61Drug> list = fzzy61Sync1108Rep.listDrug(deptId, start, end);
+
+ if (null == list || list.isEmpty()) {
+ log.info("-------------娌℃湁鑾峰彇鍒拌嵂鍓備俊鎭�------------------");
+ return;
+ }
+ Api1102 api1102 = api1102Rep.findById(kqdm).get();
+ Api1108 apiData;
+ List<Api1108> api1108List;
+ for (Fz61Drug sysData : list) {
+
+ apiData = new Api1108();
+ apiData.setId(kqdm + sysData.getId());//ID
+ apiData.setBizId(sysData.getId());//涓氬姟id
+ apiData.setDwdm(api1102.getDwdm());//鍗曚綅浠ｇ爜
+ apiData.setKqdm(api1102.getKqdm());//搴撳尯浠ｇ爜
+ apiData.setKqmc(api1102.getKqmc());//搴撳尯鍚嶇О
+ apiData.setYjbh(kqdm + sysData.getId().substring(8));//鑽墏缂栧彿
+ apiData.setYjmc(sysData.getName());//鑽墏鍚嶇О
+ apiData.setBzw(StringUtils.isEmpty(sysData.getBzw())?"":sysData.getBzw());//鍖呰鐗�
+ apiData.setGgxh(StringUtils.isEmpty(sysData.getGgxh())?"":sysData.getGgxh());//鍨嬪彿瑙勬牸
+ apiData.setAqsysms(StringUtils.isEmpty(sysData.getAqsysms())?"":sysData.getAqsysms());//瀹夊叏浣跨敤璇存槑涔�
+ apiData.setSccj(StringUtils.isEmpty(sysData.getSccj())?"":sysData.getSccj());//鐢熶骇鍘傚
+ apiData.setCgly(StringUtils.isEmpty(sysData.getCgly())?"":sysData.getCgly());//閲囪喘鏉ユ簮
+ apiData.setCctj(StringUtils.isEmpty(sysData.getCctj())?"":sysData.getCctj());//瀛樺偍鏉′欢
+ apiData.setCcdd(StringUtils.isEmpty(sysData.getCcdd())?"":sysData.getCcdd());//鍌ㄥ瓨鍦扮偣
+ apiData.setBzwclfs(StringUtils.isEmpty(sysData.getBzwclfs())?"":sysData.getBzwclfs());//鍖呰鐗╁鐞嗘柟寮�
+ apiData.setCzclfs(StringUtils.isEmpty(sysData.getCzclfs())?"":sysData.getCzclfs());//娈嬫福澶勭悊鏂瑰紡
+ apiData.setBzq(StringUtils.isEmpty(sysData.getBzw())? "1骞�": sysData.getBzq());//淇濊川鏈�
+ apiData.setCgrq(null == sysData.getBzw()?new Date():sysData.getCgrq());//閲囪喘鏃ユ湡
+ apiData.setKcsl(sysData.getCount());//搴撳瓨鏁伴噺
+ apiData.setKcsldw(StringUtils.isEmpty(sysData.getKcsldw())?"":sysData.getKcsldw());//搴撳瓨鏁伴噺鍗曚綅
+
+ apiData.setZhgxsj(sysData.getUpdateTime());//鏈�鍚庢洿鏂版椂闂�
+ apiData.setBizId(sysData.getId());//涓氬姟id
+
+ api1108List = api1108Rep.getDataByBizId(apiData.getBizId());
+ if (null == api1108List || api1108List.isEmpty()) {
+ apiData.setCzbz(Constant.CZBZ_I);
+ } else {
+ apiData.setCzbz(api1108List.get(0).getCzbz());
+ }
+
+ //淇濆瓨鏁版嵁
+ api1108Rep.save(apiData);
+ log.info("1108鑽墏淇℃伅---鍚屾鏁版嵁锛歿}", apiData.toString());
+ }
+
+ } catch (Exception e) {
+ log.error("---1108鑽墏淇℃伅鍚屾鎵ц澶辫触----{}", e.toString());
+ apiLog.setResult("鑽墏淇℃伅鍚屾鎵ц澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1109.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1109.java
new file mode 100644
index 0000000..7ae3b4f
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1109.java
@@ -0,0 +1,358 @@
+package com.fzzy.async.fzzy61.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1109;
+import com.fzzy.api.entity.Api1202;
+import com.fzzy.api.entity.Api1205;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.utils.FileUtils;
+import com.fzzy.api.view.repository.Api1109Rep;
+import com.fzzy.api.view.repository.Api1202Rep;
+import com.fzzy.api.view.repository.Api1205Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy61.entity.Fz61FileInfo;
+import com.fzzy.async.fzzy61.entity.Fz61InoutRecord;
+import com.fzzy.async.fzzy61.repository.Fzzy61Sync1109Rep;
+import com.fzzy.async.fzzy61.repository.Fzzy61Sync1202Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 鏂囦欢淇℃伅
+ */
+@Slf4j
+@Component
+public class Fzzy61Sync1109 {
+
+ private final static String IMG_START_C = "C_";
+ private final static String IMG_START_R = "R_";
+ /**
+ * 鍥剧墖绫诲瀷
+ */
+ private final static String IMG_TYPE_1 = "1"; //搴撳尯楦熺灠鍥�
+ private final static String IMG_TYPE_2 = "2"; //鍏ュ簱鍥剧墖
+ private final static String IMG_TYPE_3 = "3"; //鍑哄簱鍥剧墖
+ private final static String IMG_TYPE_4 = "4"; //鍏ュ簱妫�鏂よ棰�
+ private final static String IMG_TYPE_5 = "5"; //鍑哄簱妫�鏂よ棰�
+ private final static String IMG_TYPE_104 = "104";//鐔忚捀澶囨鎺ュ彛闄勪欢锛岀敤浜庡箍涓滅渷
+
+ /**
+ * 涓氬姟绫诲瀷
+ */
+ private final static String BIZ_TAG_WEIGHT_FULL = "WEIGHT_FULL";
+ private final static String BIZ_TAG_WEIGHT_EMPTY = "WEIGHT_EMPTY";
+ private final static String BIZ_TAG_REGISTER = "REGISTER";
+ private final static String BIZ_TAG_CARD_BACK = "CARD_BACK";
+ /**
+ * 鍑哄叆搴撶被鍨�
+ */
+ private final static String INOUT_TYPE_IN = "IN";
+ private final static String INOUT_TYPE_OUT = "OUT";
+
+ @Autowired
+ private Fzzy61Sync1109Rep fzzySync1109Rep;
+ @Autowired
+ private Fzzy61Sync1202Rep fzzySync1202Rep;
+ @Autowired
+ private Api1109Rep api1109Rep;
+ @Autowired
+ private Api1202Rep api1202Rep;
+ @Autowired
+ private Api1205Rep api1205Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+ @Autowired
+ private FileUtils fileUtil;
+
+ /**
+ * 鍚屾鏂囦欢鎺ュ彛
+ *
+ * @param deptId
+ * @param start
+ * @param end
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+
+ log.info("-------------1109鏂囦欢淇℃伅鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1109);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ //鑾峰彇鍑哄叆搴撴暟鎹�
+ List<Fz61InoutRecord> list = fzzySync1202Rep.listInAndOutRecord(deptId, INOUT_TYPE_IN, INOUT_TYPE_OUT, start, end);
+
+ if (null == list || list.isEmpty()) {
+ log.info("-------------娌℃湁鑾峰彇鍒版枃浠朵俊鎭�------------------");
+ return;
+ }
+
+ Map<String, Integer> map = new HashMap<>();
+ Api1109 apiData;
+ String wjlx;
+ String wjmc;
+ List<Api1109> api1109List;
+ List<Api1202> api1202List;
+ List<Api1205> api1205List;
+ String str = ""; //鍑哄叆搴撲笟鍔″崟鍙�
+ List<Fz61FileInfo> fileList; //鏂囦欢淇℃伅
+ List<String> ids;
+ for (Fz61InoutRecord inoutData : list) {
+ if (inoutData.getRecordStatus().equals("DEL") || inoutData.getRecordStatus().equals("ERROR")) {
+ continue;
+ }
+ if (!inoutData.getProgress().equals("RECORD")) {
+ continue;
+ }
+ ids = new ArrayList<>();
+ wjlx = "";
+ //鑾峰彇鍑哄叆搴撲笟鍔″崟鍙蜂俊鎭�
+ if (inoutData.getType().equals(INOUT_TYPE_IN)) {
+ wjlx = IMG_TYPE_2;
+ api1202List = api1202Rep.getDataByBizId(inoutData.getId());
+ if (null == api1202List || api1202List.isEmpty()) {
+ continue;
+ }
+ ids = api1202List.stream().map(Api1202::getRkywdh).collect(Collectors.toList());
+ }
+ if (inoutData.getType().equals(INOUT_TYPE_OUT)) {
+ wjlx = IMG_TYPE_3;
+ api1205List = api1205Rep.getDataByBizId(inoutData.getId());
+ if (null == api1205List || api1205List.isEmpty()) {
+ continue;
+ }
+ ids = api1205List.stream().map(Api1205::getCkywdh).collect(Collectors.toList());
+
+ }
+
+ //鑻ユ枃浠剁被鍨嬩负绌猴紝鍒欒烦杩�
+ if (StringUtils.isEmpty(wjlx)) {
+ continue;
+ }
+
+ //鏍规嵁鍑哄叆搴撳崟鍙疯幏鍙栧搴旀枃浠朵俊鎭�
+ fileList = fzzySync1109Rep.listFileInfoByBizId(inoutData.getId());
+ if (null == fileList || fileList.isEmpty()) {
+ continue;
+ }
+ int num = 1;
+ int idsNum = 0;
+ String bizTag = null;
+ for (Fz61FileInfo sysData : fileList) {
+ apiData = new Api1109();
+
+ //涓婚敭id
+ apiData.setId(sysData.getFileId());
+ //鏂囦欢璺緞
+ apiData.setWjdz(fileUtil.getInoutFilePath(sysData.getCreateTime()) + sysData.getFileName());
+ //鐧昏
+ if (BIZ_TAG_REGISTER.equals(sysData.getBizTag()) || BIZ_TAG_CARD_BACK.equals(sysData.getBizTag())) {
+ str = ids.get(0);
+ wjmc = kqdm + "_" + str;
+ //鏂囦欢鍚嶇О
+ wjmc = getImgNameType(wjmc, sysData.getBizTag(), str, sysData.getFileName(), map);
+ apiData.setWjmc(wjmc);
+ //鏂囦欢绫诲瀷
+ apiData.setWjlx(wjlx);
+ }
+ //绉伴噸
+ if (BIZ_TAG_WEIGHT_FULL.equals(sysData.getBizTag()) || BIZ_TAG_WEIGHT_EMPTY.equals(sysData.getBizTag())) {
+ bizTag = sysData.getBizTag();
+ if (StringUtils.isNotEmpty(inoutData.getTransType()) && inoutData.getTransType().equals("3")) {
+ if (num > 6) {
+ num = 1;
+ idsNum++;
+ }
+ } else {
+ if (num > 8) {
+ num = 1;
+ idsNum++;
+ }
+ }
+ //2024-05-23 姝ゅ鏆傛椂璁剧疆鍚嶇О闀垮害闄愬埗锛屽悗鏈熻皟鏁村悗鍙垹闄�
+ if (sysData.getCreateTime().after(DateUtils.parseDate("2024-04-18", new String[]{"yyyy-MM-dd"}))) {
+ if (StringUtils.isNotEmpty(inoutData.getTransType()) && inoutData.getTransType().equals("3")) {
+ bizTag = sysData.getBizTag();
+ } else {
+ bizTag = null;
+ }
+ }
+ if (idsNum == ids.size()) {
+ break;
+ }
+ str = ids.get(idsNum);
+
+ wjmc = kqdm + "_" + str;
+
+ //鏂囦欢鍚嶇О
+ wjmc = getImgNameType(wjmc, bizTag, str, sysData.getFileName(), map);
+ apiData.setWjmc(wjmc);
+ apiData.setWjlx(wjlx);
+ if (wjmc.indexOf(Constant.IMG_NAME_TYPE_IVG) >= 0 || wjmc.indexOf(Constant.IMG_NAME_TYPE_IVT) >= 0) {
+ apiData.setWjlx(IMG_TYPE_4);
+ }
+ if (wjmc.indexOf(Constant.IMG_NAME_TYPE_OVG) >= 0 || wjmc.indexOf(Constant.IMG_NAME_TYPE_OVT) >= 0) {
+ apiData.setWjlx(IMG_TYPE_5);
+ }
+ num++;
+ }
+
+ //鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
+ apiData.setZhgxsj(new Date());
+
+ //涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
+ apiData.setBizId(sysData.getFileId());
+ apiData.setKqdm(kqdm);
+ apiData.setSyncTime(new Date());
+
+ api1109List = api1109Rep.getDataByBizId(apiData.getBizId());
+ if (null == api1109List || api1109List.isEmpty()) {
+ apiData.setCzbz(Constant.CZBZ_I);
+ } else {
+ apiData.setCzbz(api1109List.get(0).getCzbz());
+ }
+
+ //淇濆瓨鏁版嵁
+ api1109Rep.save(apiData);
+ log.info("1109鏂囦欢淇℃伅---鍚屾鏁版嵁锛歿}", apiData.toString());
+ }
+ }
+ } catch (Exception e) {
+ log.error("---1109鏂囦欢鍚屾鎵ц澶辫触----{}", e.toString());
+ apiLog.setResult("鍚屾鏂囦欢淇℃伅澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+
+ /**
+ * 鑾峰彇鍥剧墖鍛藉悕绫诲瀷
+ *
+ * @param wjmc 闇�瑕佺殑鏂囦欢鍚嶇О
+ * @param bizTag 鏂囦欢涓氬姟绫诲瀷
+ * @param bizId 鏂囦欢涓氬姟id
+ * @param fileName 鍘熸枃浠跺悕
+ * @param map
+ * @return
+ */
+ private String getImgNameType(String wjmc, String bizTag, String bizId, String fileName, Map<String, Integer> map) {
+ if (null == bizTag) {
+ if (fileName.indexOf(Constant.IMG_NAME_TYPE_DJ) >= 0) {
+ return wjmc + "_" + Constant.IMG_NAME_TYPE_DJ + ".jpg";
+ }
+ if (fileName.indexOf(Constant.IMG_NAME_TYPE_RK) >= 0) {
+ return wjmc + "_" + Constant.IMG_NAME_TYPE_RK + ".jpg";
+ }
+ if (fileName.indexOf(Constant.IMG_NAME_TYPE_CK) >= 0) {
+ return wjmc + "_" + Constant.IMG_NAME_TYPE_CK + ".jpg";
+ }
+ if (fileName.indexOf(Constant.IMG_NAME_TYPE_GL) >= 0) {
+ return wjmc + "_" + Constant.IMG_NAME_TYPE_GL + ".jpg";
+ }
+ if (fileName.indexOf(Constant.IMG_NAME_TYPE_GR) >= 0) {
+ return wjmc + "_" + Constant.IMG_NAME_TYPE_GR + ".jpg";
+ }
+ if (fileName.indexOf(Constant.IMG_NAME_TYPE_GT) >= 0) {
+ return wjmc + "_" + Constant.IMG_NAME_TYPE_GT + ".jpg";
+ }
+ if (fileName.indexOf(Constant.IMG_NAME_TYPE_TL) >= 0) {
+ return wjmc + "_" + Constant.IMG_NAME_TYPE_TL + ".jpg";
+ }
+ if (fileName.indexOf(Constant.IMG_NAME_TYPE_TR) >= 0) {
+ return wjmc + "_" + Constant.IMG_NAME_TYPE_TR + ".jpg";
+ }
+ if (fileName.indexOf(Constant.IMG_NAME_TYPE_TT) >= 0) {
+ return wjmc + "_" + Constant.IMG_NAME_TYPE_TT + ".jpg";
+ }
+ if (fileName.indexOf(Constant.IMG_NAME_TYPE_SL) >= 0) {
+ return wjmc + "_" + Constant.IMG_NAME_TYPE_SL + ".jpg";
+ }
+ if (fileName.indexOf(Constant.IMG_NAME_TYPE_SF) >= 0) {
+ return wjmc + "_" + Constant.IMG_NAME_TYPE_SF + ".jpg";
+ }
+ if (fileName.indexOf(Constant.IMG_NAME_TYPE_IVG) >= 0) {
+ return wjmc + "_" + Constant.IMG_NAME_TYPE_IVG + ".mp4";
+ }
+ if (fileName.indexOf(Constant.IMG_NAME_TYPE_IVT) >= 0) {
+ return wjmc + "_" + Constant.IMG_NAME_TYPE_IVT + ".mp4";
+ }
+ if (fileName.indexOf(Constant.IMG_NAME_TYPE_OVG) >= 0) {
+ return wjmc + "_" + Constant.IMG_NAME_TYPE_OVG + ".mp4";
+ }
+ if (fileName.indexOf(Constant.IMG_NAME_TYPE_OVT) >= 0) {
+ return wjmc + "_" + Constant.IMG_NAME_TYPE_OVT + ".mp4";
+ }
+ }
+
+ Integer num = 0;
+ //姣涢噸
+ if (BIZ_TAG_WEIGHT_FULL.equals(bizTag)) {
+ if (null == map.get(bizId + "_" + bizTag)) {
+ map.put(bizId + "_" + bizTag, 1);
+ }
+ num = map.get(bizId + "_" + bizTag);
+ if (num == 1) {
+ wjmc += "_" + Constant.IMG_NAME_TYPE_GL;
+ map.put(bizId + "_" + bizTag, 2);
+ }
+ if (num == 2) {
+ wjmc += "_" + Constant.IMG_NAME_TYPE_GR;
+ map.put(bizId + "_" + bizTag, 3);
+ }
+ if (num == 3) {
+ wjmc += "_" + Constant.IMG_NAME_TYPE_GT;
+ map.remove(bizId + "_" + bizTag);
+ }
+ }
+ //鐨噸
+ if (BIZ_TAG_WEIGHT_EMPTY.equals(bizTag)) {
+ if (null == map.get(bizId + "_" + bizTag)) {
+ map.put(bizId + "_" + bizTag, 1);
+ }
+ num = map.get(bizId + "_" + bizTag);
+ if (num == 1) {
+ wjmc += "_" + Constant.IMG_NAME_TYPE_TL;
+ map.put(bizId + "_" + bizTag, 2);
+ }
+ if (num == 2) {
+ wjmc += "_" + Constant.IMG_NAME_TYPE_TR;
+ map.put(bizId + "_" + bizTag, 3);
+ }
+ if (num == 3) {
+ wjmc += "_" + Constant.IMG_NAME_TYPE_TT;
+ map.remove(bizId + "_" + bizTag);
+ }
+ }
+ //鍏ュ簱鐧昏
+ if (BIZ_TAG_REGISTER.equals(bizTag)) {
+ if (null == map.get(bizId + "_" + bizTag)) {
+ map.put(bizId + "_" + bizTag, 1);
+ }
+ num = map.get(bizId + "_" + bizTag);
+ if (num == 1) {
+ wjmc += "_" + Constant.IMG_NAME_TYPE_DJ;
+ map.put(bizId + "_" + bizTag, 2);
+ }
+ if (num == 2) {
+ wjmc += "_" + Constant.IMG_NAME_TYPE_RK;
+ map.remove(bizId + "_" + bizTag);
+ }
+ }
+ //鍑哄簱鐓х墖
+ if (BIZ_TAG_CARD_BACK.equals(bizTag)) {
+ wjmc += "_" + Constant.IMG_NAME_TYPE_CK;
+ }
+ return wjmc + ".jpg";
+ }
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1111.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1111.java
new file mode 100644
index 0000000..6c6504d
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1111.java
@@ -0,0 +1,139 @@
+package com.fzzy.async.fzzy61.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.*;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.*;
+import com.fzzy.async.fzzy40.entity.Fz40SecCamera;
+import com.fzzy.async.fzzy40.repository.Fzzy40Sync1111Rep;
+import com.fzzy.async.fzzy61.entity.Fz61SecCamera;
+import com.fzzy.async.fzzy61.repository.Fzzy61Sync1111Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 搴撳尯鍥捐棰戠洃鎺ц澶囩偣浣嶆爣娉�
+ */
+@Slf4j
+@Component
+public class Fzzy61Sync1111 {
+
+ @Autowired
+ private Fzzy61Sync1111Rep fzzy61Sync1111Rep;
+ @Autowired
+ private Api1101Rep api1101Rep;
+ @Autowired
+ private Api1102Rep api1102Rep;
+ @Autowired
+ private Api1111Rep api1111Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+ @Autowired
+ private ApiConfsRep apiConfsRep;
+
+ /**
+ * 鍚屾鐩戞帶鎺ュ彛
+ *
+ * @param deptId
+ * @param start
+ * @param end
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+
+ log.info("-------------1111鎺ュ彛鐩戞帶鐐逛綅鏁版嵁寮�濮嬪悓姝�------------------");
+
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1111);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz61SecCamera> list = fzzy61Sync1111Rep.listCamera(deptId, start, end);
+ List<ApiConfs> apiConfs = apiConfsRep.getDataByKqdm(kqdm);
+
+ if (null == list || list.isEmpty()) {
+ log.info("-------------娌℃湁鑾峰彇鍒扮洃鎺т俊鎭�------------------");
+ return;
+ }
+
+ //鏍规嵁搴撳尯浠ｇ爜鑾峰彇鍗曚綅浠ｇ爜
+ Api1102 api1102 = api1102Rep.findById(kqdm).get();
+ Api1101 api1101 = api1101Rep.findById(api1102.getDwdm()).get();
+ Api1111 apiData;
+ List<Api1111> listApi1111;
+ Integer num = 1000001;
+ for (Fz61SecCamera sysData : list) {
+
+ apiData = new Api1111();
+ apiData.setDwmc(api1101.getDwmc());
+ apiData.setDwdm(api1101.getDwdm());
+ apiData.setKqdm(api1102.getKqdm());
+ apiData.setKqmc(api1102.getKqmc());
+
+ apiData.setSpjksbmc(api1102.getKqmc() + "-" + sysData.getName());
+ apiData.setSpjksbid(api1102.getXzqhdm() + "00401327" + String.valueOf(num).substring(1));
+ if (sysData.getId().contains(api1102.getXzqhdm())) {
+ apiData.setSpjksbid(sysData.getId());
+ }
+
+ apiData.setSpjksbxdwz("(" + Math.round(sysData.getPosX() * apiConfs.get(0).getPosX()) + "," + Math.round(sysData.getPosY() * apiConfs.get(0).getPosY()) + ")");
+ apiData.setBz(sysData.getRemark());
+ //瑙嗛鐩戞帶绫诲瀷鍜岀偣浣嶇被鍨�
+ apiData.setSpjklx(StringUtils.isEmpty(sysData.getSpjklx()) ? "3" : sysData.getSpjklx());
+ apiData.setSpdwlx(StringUtils.isEmpty(sysData.getSpdwlx()) ? "7" : sysData.getSpdwlx());
+ //鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
+ apiData.setZhgxsj(new Date());
+ //涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
+ apiData.setSyncTime(new Date());
+ apiData.setCzbz(Constant.CZBZ_I);
+
+ listApi1111 = api1111Rep.getApi1111ById(apiData.getSpjksbid());
+ if (null != listApi1111 && listApi1111.size() > 0) {
+ apiData.setCzbz(listApi1111.get(0).getCzbz());
+ if (StringUtils.isNotEmpty(listApi1111.get(0).getSpjklx())) {
+ apiData.setSpjklx(listApi1111.get(0).getSpjklx());
+ }
+ if (StringUtils.isNotEmpty(listApi1111.get(0).getSpdwlx())) {
+ apiData.setSpdwlx(listApi1111.get(0).getSpdwlx());
+ }
+ if (StringUtils.isNotEmpty(listApi1111.get(0).getHkCameraIndexCode())) {
+ apiData.setHkCameraIndexCode(listApi1111.get(0).getHkCameraIndexCode());
+ }
+ if (StringUtils.isNotEmpty(listApi1111.get(0).getCfdm())) {
+ apiData.setCfdm(listApi1111.get(0).getCfdm());
+ }
+ if (StringUtils.isNotEmpty(listApi1111.get(0).getAjdm())) {
+ apiData.setAjdm(listApi1111.get(0).getAjdm());
+ }
+ if (StringUtils.isNotEmpty(listApi1111.get(0).getSpjksbwzys())) {
+ apiData.setSpjksbwzys(listApi1111.get(0).getSpjksbwzys());
+ }
+ if (StringUtils.isNotEmpty(listApi1111.get(0).getBz())) {
+ apiData.setBz(listApi1111.get(0).getBz());
+ }
+ apiData.setCzbz(listApi1111.get(0).getCzbz());
+ } else {
+ apiData.setCzbz(Constant.CZBZ_I);
+ }
+ apiData.setBizId(sysData.getId());
+
+ //淇濆瓨鏁版嵁
+ api1111Rep.save(apiData);
+ num++;
+ log.info("1111鐩戞帶鐐逛綅---鍚屾鏁版嵁锛歿}", apiData.toString());
+ }
+ } catch (Exception e) {
+ log.error("---1111鐩戞帶鐐逛綅鍚屾鎵ц澶辫触----{}", e.toString());
+ apiLog.setResult("鐩戞帶鐐逛綅鍚屾鎵ц澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1112.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1112.java
new file mode 100644
index 0000000..94bdaab
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1112.java
@@ -0,0 +1,124 @@
+package com.fzzy.async.fzzy61.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.Api1101Rep;
+import com.fzzy.api.view.repository.Api1102Rep;
+import com.fzzy.api.view.repository.Api1112Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy40.entity.Fz40OAStaff;
+import com.fzzy.async.fzzy40.repository.Fzzy40Sync1112Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+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 Fzzy61Sync1112 {
+
+ @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;
+ List<Api1112> api1112List;
+ for (Fz40OAStaff sysData : list) {
+ apiData = new Api1112();
+ apiData.setDwmc(api1101.getDwmc());
+ apiData.setDwdm(api1101.getDwdm());
+ apiData.setKqdm(api1101.getKqdm());
+
+ 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.setZy(sysData.getZy());
+ apiData.setQdzgzchzyzgsj(sysData.getQdzgzchzyzgsj());
+ apiData.setXl(StringUtils.isEmpty(sysData.getXl()) ? "3" : sysData.getXl());
+ apiData.setZw(sysData.getZw());
+ apiData.setRylb(sysData.getRylb());
+
+ apiData.setZhgxsj(sysData.getUpdateTime());
+ apiData.setBizId(sysData.getSfzhm());
+
+ api1112List = api1112Rep.getDataByBizId(apiData.getBizId());
+ if (null == api1112List || api1112List.isEmpty()) {
+ apiData.setCzbz(Constant.CZBZ_I);
+ } else {
+ apiData.setCzbz(api1112List.get(0).getCzbz());
+ }
+
+ //淇濆瓨鏁版嵁
+ api1112Rep.save(apiData);
+ log.info("1112浜哄憳淇℃伅---鍚屾鏁版嵁锛歿}", apiData.toString());
+
+ }
+
+ } catch (Exception e) {
+ log.error("---1112浜哄憳淇℃伅鍚屾鎵ц澶辫触----{}", e.toString());
+ apiLog.setResult("浜哄憳淇℃伅鍚屾鎵ц澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1201.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1201.java
new file mode 100644
index 0000000..6a11bc2
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1201.java
@@ -0,0 +1,229 @@
+package com.fzzy.async.fzzy61.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.data.PushProtocol;
+import com.fzzy.api.entity.*;
+import com.fzzy.api.service.ApiTriggerService;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.utils.FileUtils;
+import com.fzzy.api.view.repository.*;
+import com.fzzy.async.fzzy61.entity.Fz61InoutContract;
+import com.fzzy.async.fzzy61.entity.Fz61InoutCustomer;
+import com.fzzy.async.fzzy61.repository.Fzzy61Sync1201Rep;
+import com.fzzy.async.fzzy61.repository.Fzzy61Sync1212Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鍚堝悓淇℃伅鏁版嵁鎺ュ彛
+ */
+@Slf4j
+@Component
+public class Fzzy61Sync1201 {
+
+ @Autowired
+ private Fzzy61Sync1212Rep fzzySync1212Rep;
+ @Autowired
+ private Fzzy61Sync1201Rep fzzySync1201Rep;
+ @Autowired
+ private ApiTriggerService apiTriggerService;
+ @Autowired
+ private ApiConfsRep apiConfsRep;
+ @Autowired
+ private FileUtils fileUtil;
+ @Autowired
+ private Api1109Rep api1109Rep;
+ @Autowired
+ private Api1201Rep api1201Rep;
+ @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("-------------1201鍚堝悓淇℃伅鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1201);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz61InoutContract> list = fzzySync1201Rep.listContract(deptId, start, end);
+
+ if (null == list || list.isEmpty()) {
+ log.debug("-------------娌℃湁鑾峰彇鍒板悎鍚屼俊鎭�------------------");
+ return;
+ }
+
+ //鏍规嵁搴撳尯浠ｇ爜鑾峰彇鍗曚綅浠ｇ爜
+ Api1102 api1201 = api1102Rep.findById(kqdm).get();
+
+ Api1201 apiData;
+ List<Api1201> api1201List;
+ List<Fz61InoutCustomer> listCustomer;
+ Api1109 api1109;
+ List<Api1109> api1109List;
+ for (Fz61InoutContract sysData : list) {
+
+ apiData = new Api1201();
+ //鍗曚綅浠ｇ爜锛� 1101 鎺ュ彛鐨勫崟浣嶄唬 鐮侊級 +鑷畾涔夌紪鐮�
+ apiData.setHth(api1201.getDwdm() + sysData.getId());
+ apiData.setHtmc(sysData.getName().trim());
+ apiData.setDwdm(api1201.getDwdm());
+
+ //涓氬姟绫诲瀷
+ apiData.setYwlx(sysData.getType());
+ apiData.setHtzl(sysData.getType());
+ //瀹㈡埛绫诲瀷
+ apiData.setKhlx(sysData.getCustomerType());
+
+ //浼佷笟瀹㈡埛锛岄渶瑕佽缃俊鐢ㄧ爜
+ if ("1".equals(sysData.getCustomerType())) {
+ listCustomer = fzzySync1212Rep.getDataById(sysData.getCustomerId());
+ if (null == listCustomer || listCustomer.isEmpty()) {
+ continue;
+ }
+ apiData.setKhtyshxydm(listCustomer.get(0).getKhbh());
+ apiData.setSfzh(listCustomer.get(0).getCardId());
+ apiData.setLxrdh(listCustomer.get(0).getPhone());
+ apiData.setYzbm(StringUtils.isEmpty(listCustomer.get(0).getYzbm()) ? "000000" : listCustomer.get(0).getYzbm());
+ apiData.setDzyx(listCustomer.get(0).getDzyx());
+ }
+
+
+ apiData.setKhmc(sysData.getCustomerName());
+ apiData.setFddbr(StringUtils.isEmpty(sysData.getCustomerSignUser()) ? null : sysData.getCustomerSignUser());
+
+ apiData.setQdrq(sysData.getSigningTime());
+
+ if (StringUtils.isEmpty(sysData.getFoodVariety())) {
+ continue;
+ }
+ //绮鍝佺
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
+ apiData.setLspzdm(mappingCode);
+
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());
+ apiData.setLsxzdm(mappingCode);
+
+
+ apiData.setYsfs(StringUtils.isEmpty(sysData.getYsfs()) ? "浠ュ叆浠撴暟閲忎负鏍囧噯" : sysData.getYsfs());
+
+ apiData.setFkfs(null == sysData.getFkfs() ? "1" : sysData.getFkfs().toString());
+ //鍗曚环锛氬厓/鍚�
+ apiData.setHtdj(sysData.getPrice() == null ? 0.0 : sysData.getPrice());
+ apiData.setYdgxlssl(sysData.getContactAmount() == null ? 0.0 : sysData.getContactAmount());
+
+ apiData.setHtzje(new BigDecimal(sysData.getMoney()));
+
+ apiData.setJsyhtyzx(StringUtils.isEmpty(sysData.getJsyhtyzx()) ? "1" : sysData.getJsyhtyzx());
+
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_BANK, sysData.getCustomerBank());
+ apiData.setKhfkhh(mappingCode);
+
+ apiData.setKhfzh(sysData.getCustomerBankAccount());
+
+ apiData.setKhqyr(sysData.getCustomerSignUser());
+
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_BANK, sysData.getBank());
+ apiData.setBfkhh(mappingCode == null ? "999" : mappingCode);
+
+ apiData.setBfzh(StringUtils.isEmpty(sysData.getBankAccount()) ? "100000000000000000" : sysData.getBankAccount());
+
+ apiData.setWcrq(sysData.getEndTime());
+ apiData.setLxrxm(StringUtils.isEmpty(sysData.getLxrxm()) ? apiData.getFddbr() : sysData.getLxrxm());
+ apiData.setJsyhtbyzyy(StringUtils.isEmpty(sysData.getJsyhtbyzyy()) ? "缁撶畻涓庡悎鍚屼笉涓�鑷村師鍥�" : sysData.getJsyhtbyzyy());
+ apiData.setQddd(StringUtils.isEmpty(sysData.getSignAddress()) ? "绛捐鍦扮偣" : sysData.getSignAddress());
+ apiData.setTxdz(StringUtils.isEmpty(sysData.getTxdz()) ? "閫氳鍦板潃" : sysData.getTxdz());
+ apiData.setZhgxsj(sysData.getUpdateTime());
+ apiData.setShr(StringUtils.isEmpty(sysData.getAuditUser()) ? "瀹℃壒浜�" : sysData.getAuditUser());
+ apiData.setShsj(sysData.getAuditDate() == null ? new Date() : sysData.getAuditDate());
+ apiData.setSswcsj(sysData.getRelEndTime());
+ apiData.setYdwcsj(sysData.getEndTime());
+ apiData.setBfqyr(StringUtils.isEmpty(sysData.getSignUser()) ? "鏈柟绛剧害浜�" : sysData.getSignUser());
+
+ //璁剧疆骞村害
+ apiData.setLhnd(sysData.getYear());
+
+ apiData.setSyncTime(new Date());
+ apiData.setBizId(sysData.getId());
+ apiData.setKqdm(kqdm);
+
+ api1201List = api1201Rep.getDataById(apiData.getHth());
+ if (null == api1201List || api1201List.isEmpty()) {
+ apiData.setCzbz(Constant.CZBZ_I);
+ } else {
+ apiData.setCzbz(api1201List.get(0).getCzbz());
+ }
+
+ //淇濆瓨鏁版嵁
+ api1201Rep.save(apiData);
+ log.info("1201---鍚堝悓鍚屾鏁版嵁锛歿}", apiData.toString());
+
+ //鑻ラ檮浠秈d涓嶄负绌猴紝鍒欏垽鏂槸鍚︿负涓婃捣鍗忚锛屼笂娴峰崗璁椂锛岄渶鍚屾椂鍚屾鍚堝悓闄勪欢淇℃伅
+ if (StringUtils.isNotEmpty(sysData.getFileId())) {
+ //鑻ヤ负涓婃捣鐪佸钩鍙板崗璁紝鍒欓渶鍚屾椂鍚屾鍚堝悓闄勪欢淇℃伅
+ List<ApiConfs> apiConfs = apiConfsRep.getDataByKqdm(kqdm);
+ if (null != apiConfs && PushProtocol.SB_SH_2023.getCode().equals(apiConfs.get(0).getPushProtocol())) {
+ api1109 = new Api1109();
+ //涓婚敭id
+ api1109.setId(apiData.getHth());
+ //鏂囦欢璺緞
+ api1109.setWjdz(fileUtil.getCommonFilePath(sysData.getFileTime()) + sysData.getFileId());
+
+ String kzm = "pdf"; //鎵╁睍鍚嶏細榛樿涓簆df
+ String[] split = sysData.getFileId().split("\\.");
+ if (split.length > 0) {
+ kzm = split[split.length - 1];
+ }
+
+ //鏂囦欢鍚嶇О(鍚堝悓鍙�+鎵╁睍鍚�)
+ api1109.setWjmc(apiData.getHth() + "." + kzm);
+ //鏂囦欢绫诲瀷
+ api1109.setWjlx("6"); //6-鍚堝悓鏂囦欢(pdf,jpg)
+ api1109.setYwdh(apiData.getHth()); //6-鍚堝悓鏂囦欢(pdf,jpg)
+ //鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
+ api1109.setZhgxsj(new Date());
+
+ //涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
+ api1109.setBizId(apiData.getHth());
+ api1109.setKqdm(kqdm);
+ api1109.setSyncTime(new Date());
+ api1109List = api1109Rep.getDataByBizId(api1109.getBizId());
+ if (null == api1109List || api1109List.isEmpty()) {
+ api1109.setCzbz(Constant.CZBZ_I);
+ } else {
+ api1109.setCzbz(api1109List.get(0).getCzbz());
+ }
+ //淇濆瓨鏁版嵁
+ api1109Rep.save(api1109);
+ log.info("1201---鍚堝悓闄勪欢淇℃伅鍚屾锛歿}", api1109.toString());
+ }
+ }
+ }
+ } catch (Exception e) {
+ log.error("---1201鍚堝悓鍚屾鎵ц澶辫触----{}", e.toString());
+ apiLog.setResult("鍚屾鍚堝悓淇℃伅澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1202.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1202.java
new file mode 100644
index 0000000..d2539d9
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1202.java
@@ -0,0 +1,344 @@
+package com.fzzy.async.fzzy61.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.*;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.service.ApiTriggerService;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.*;
+import com.fzzy.async.fzzy61.entity.Fz61InoutNoticeIn;
+import com.fzzy.async.fzzy61.entity.Fz61InoutRecord;
+import com.fzzy.async.fzzy61.entity.Fz61InoutRecordItem;
+import com.fzzy.async.fzzy61.repository.Fzzy61Sync1202Rep;
+import com.fzzy.async.fzzy61.repository.Fzzy61SyncInoutRecordItemRep;
+import com.fzzy.async.fzzy61.repository.Fzzy61SyncNoticeInRep;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.DateFormatUtils;
+import org.apache.commons.lang.time.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 绮鍏ュ簱淇℃伅
+ */
+@Slf4j
+@Component
+public class Fzzy61Sync1202 {
+
+ /**
+ * 鍏ュ簱绫诲瀷
+ */
+ private final static String INOUT_TYPE_IN = "IN";
+
+ @Autowired
+ private Fzzy61Sync1202Rep fzzySync1202Rep;
+ @Autowired
+ private Fzzy61SyncInoutRecordItemRep fzzy61SyncInoutRecordItemRep;
+ @Autowired
+ private Fzzy61SyncNoticeInRep fzzySyncNoticeInRep;
+ @Autowired
+ private ApiTriggerService apiTriggerService;
+ @Autowired
+ private Api1201Rep api1201Rep;
+ @Autowired
+ private Api1202Rep api1202Rep;
+ @Autowired
+ private Api1204Rep api1204Rep;
+ @Autowired
+ private Api1208Rep api1208Rep;
+ @Autowired
+ private Api1404Rep api1404Rep;
+ @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("-------------1202鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1202);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ //鑾峰彇绮鍏ュ簱璁板綍淇℃伅锛屾牴鎹祦绋嬪畬鎴愭椂闂磋幏鍙�
+ List<Fz61InoutRecord> list = fzzySync1202Rep.listInoutRecord(deptId, INOUT_TYPE_IN, start, end);
+
+ if (null == list || list.isEmpty()) {
+ log.info("-------------娌℃湁鑾峰彇鍒扮伯椋熷叆搴撲俊鎭�------------------");
+ return;
+ }
+
+ Api1202 apiData;
+ Api1105 api1105;
+ List<Fz61InoutNoticeIn> listInoutNotice;
+ List<Api1202> api1202List;
+ List<Fz61InoutRecordItem> listInoutRecordItem;
+ List<Api1201> api1201List;
+ List<Api1204> api1204List;
+ List<Api1404> api1404List;
+ for (Fz61InoutRecord sysData : list) {
+ if (sysData.getRecordStatus().equals("DEL") || sysData.getRecordStatus().equals("ERROR")) {
+ continue;
+ }
+ if (!sysData.getProgress().equals("RECORD")) {
+ continue;
+ }
+ if (null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0) {
+ sysData.setRecordWeight(sysData.getSettleWeight());
+ }
+ //鍒ゆ柇鍑�閲嶆槸鍚﹀ぇ浜�0锛岀瓑浜�0琛ㄧず涓嶅悎鏍硷紝涓嶈繘琛屽悓姝ヤ笂浼�
+ if (null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0) {
+ continue;
+ }
+ //鑾峰彇璐т綅淇℃伅
+ api1105 = commonService.getApi1105Cache(sysData.getDepotId());
+ if (null == api1105) {
+ continue;
+ }
+ apiData = new Api1202();
+
+ apiData.setRkywdh(Constant.INOUT_TYPE_14 + sysData.getId().substring(4));
+
+ //璐т綅浠ｇ爜
+ apiData.setHwdm(api1105.getHwdm());
+ apiData.setYwlx(Constant.INOUT_TYPE_2);
+ apiData.setYwrq(DateUtils.parseDate(sysData.getId().substring(2, 10), new String[]{"yyyyMMdd"}));
+ apiData.setCyr(sysData.getUserName().trim());
+
+ //榛樿涓�涓殢渚垮��
+ apiData.setLxdh(StringUtils.isEmpty(sysData.getUserContact()) ? "13012345678" : sysData.getUserContact().trim());
+
+ if (StringUtils.isEmpty(sysData.getUserId()) || sysData.getUserId().length() != 18) {
+ sysData.setUserId("410183199003187055");
+ }
+ apiData.setSfzh(sysData.getUserId());
+
+ //鑾峰彇閫氱煡鍗曚俊鎭紝鏌ヨ鍚堝悓鍙峰拰璁″垝鏄庣粏鍙�
+ listInoutNotice = fzzySyncNoticeInRep.listInoutNoticeInById(sysData.getNoticeId());
+ if (null != listInoutNotice && listInoutNotice.size() > 0) {
+ //鍚堝悓鍙�
+ if (StringUtils.isNotEmpty(listInoutNotice.get(0).getContractId())) {
+ api1201List = api1201Rep.getDataByBizId(listInoutNotice.get(0).getContractId());
+ if (null != api1201List && api1201List.size() > 0) {
+ apiData.setHth(api1201List.get(0).getHth());
+ }
+ }
+ if (StringUtils.isNotEmpty(listInoutNotice.get(0).getPlanId())) {
+ api1404List = api1404Rep.getDataByBizIdAndKqdm(listInoutNotice.get(0).getPlanId(), kqdm);
+ if (null != api1404List && api1404List.size() > 0) {
+ apiData.setJhmxh(api1404List.get(0).getJhmxdh());
+ if (StringUtils.isEmpty(sysData.getFoodYear())) {
+ sysData.setFoodYear(api1404List.get(0).getShnd());
+ }
+ }
+ }
+ }
+
+ //绮潈鍗曚綅褰掑睘浠ｇ爜
+ List<Api1208> dataByHwdm = api1208Rep.findDataByHwdm(apiData.getHwdm());
+ if (null != dataByHwdm && dataByHwdm.size() > 0) {
+ apiData.setLqgsdwdm(StringUtils.isEmpty(dataByHwdm.get(0).getLqgsdwdm()) ? kqdm.substring(0, 18) : dataByHwdm.get(0).getLqgsdwdm());
+ } else {
+ apiData.setLqgsdwdm(kqdm.substring(0, 18));
+ }
+ apiData.setSlr("鍞伯浜�");
+ apiData.setSlrdz("鍞伯浜哄湴鍧�");
+ apiData.setBz(StringUtils.isEmpty(sysData.getRemarks()) ? "澶囨敞" : sysData.getRemarks());
+
+ apiData.setXxdz(StringUtils.isEmpty(sysData.getUserAddress()) ? "璇︾粏鍦板潃" : sysData.getUserAddress());
+
+ //杩愯緭宸ュ叿锛岃嫢涓虹┖锛屽垯榛樿缁�1-姹借溅
+ apiData.setYsgj(StringUtils.isEmpty(sysData.getTransType()) ? "1" : sysData.getTransType());
+
+ //杞﹁埞鍙�
+ apiData.setCch(sysData.getPlateNum().trim());
+
+ apiData.setDjsj(sysData.getRegisterTime());
+
+ //鐢熸垚鏂瑰紡
+ apiData.setScfs(1);
+ if (StringUtils.isNotEmpty(sysData.getRecordStatus()) && sysData.getRecordStatus().equals("ADD")) {
+ apiData.setScfs(2);
+ apiData.setSdblyy("搴撳尯鍋滅數瀵艰嚧鏃犳硶鎸夋祦绋嬭繘琛屽嚭搴�");
+ }
+
+ //绮鍝佺
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
+ apiData.setLspzdm(mappingCode);
+
+ //绮鎬ц川
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());
+ apiData.setLsxzdm(mappingCode);
+
+ apiData.setShnd(StringUtils.isEmpty(sysData.getFoodYear()) ? DateFormatUtils.format(sysData.getRegisterTime(), "yyyy") : sysData.getFoodYear());
+
+ //浜у湴浠ｇ爜
+ mappingCode = commonService.getFoodLocationIdFromCache(sysData.getFoodLocation());
+ if (StringUtils.isEmpty(mappingCode)) {
+ mappingCode = apiData.getHwdm().substring(2, 8);
+ }
+ apiData.setCddm(mappingCode);
+
+ //妫�鏂ょ被鍨嬶紝榛樿0-绉伴噸鍏ュ簱
+ apiData.setJjlx(sysData.getJjlx());
+ apiData.setBzbdbz(sysData.getDbz() == null ? 25 : sysData.getDbz());
+
+ //姣涢噸淇℃伅
+ apiData.setMz(sysData.getFullWeight());
+ if (null == sysData.getFullWeightTime()) {
+ sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 25));
+ }
+ if (!sysData.getFullWeightTime().after(sysData.getRegisterTime())) {
+ sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 25));
+ }
+ apiData.setMzjlsj(sysData.getFullWeightTime());
+ apiData.setMzjby(sysData.getFullWeightUser());
+ apiData.setMzjly(sysData.getFullWeightUser());
+
+ apiData.setZcy(null == sysData.getHandleUser() ? sysData.getFullWeightUser() : sysData.getHandleUser());
+
+ //鐨噸淇℃伅
+ apiData.setPz(sysData.getEmptyWeight());
+ if (null == sysData.getEmptyWeightTime()) {
+ sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 60));
+ }
+ if (!sysData.getEmptyWeightTime().after(sysData.getFullWeightTime())) {
+ sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 60));
+ }
+
+ apiData.setPzjlsj(sysData.getEmptyWeightTime());
+ apiData.setPzjby(sysData.getEmptyWeightUser());
+ apiData.setPzjly(sysData.getEmptyWeightUser());
+
+ //鎵ｉ噸 鍖栭獙鎬绘墸閲�
+ apiData.setZjklxj(sysData.getDeCheck());
+ apiData.setBzw(StringUtils.isEmpty(sysData.getBzw()) ? "9" : sysData.getBzw());
+ apiData.setBzwkl(0 - sysData.getDePackage());
+ apiData.setBzbjs(sysData.getBzbjs());
+ apiData.setCmsj(sysData.getCompleteTime());
+ //缁撶畻鍗曞彿
+ if (StringUtils.isNotEmpty(sysData.getSettleId())) {
+ apiData.setRkjsdh(kqdm + sysData.getSettleId());
+ }
+ if (StringUtils.isNotEmpty(apiData.getHth())) {
+ api1204List = api1204Rep.getDataByHthAndHwdm(apiData.getHth(), apiData.getHwdm());
+ if (null == api1204List || api1204List.isEmpty()) {
+ api1204List = api1204Rep.getDataByHth(apiData.getHth());
+ if (null != api1204List && api1204List.size() > 0) {
+ apiData.setRkjsdh(api1204List.get(0).getRkjsdh());
+ }
+ } else {
+ apiData.setRkjsdh(api1204List.get(0).getRkjsdh());
+ }
+ }
+ //鍏跺畠
+ apiData.setQtkl(0 - sysData.getDeOther());
+ //鍊间粨 鐜板満鎵ｉ噸
+ apiData.setXckl(0 - sysData.getDeHandle());
+
+ apiData.setJz(sysData.getRecordWeight());
+ if (!sysData.getCompleteTime().after(sysData.getEmptyWeightTime())) {
+ sysData.setCompleteTime(DateUtils.addMinutes(sysData.getEmptyWeightTime(), 10));
+ }
+ apiData.setCmsj(sysData.getCompleteTime());
+
+ //鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
+ apiData.setZhgxsj(sysData.getUpdateTime());
+
+ //涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
+ apiData.setBizId(sysData.getId());
+ apiData.setKqdm(kqdm);
+ apiData.setSyncTime(new Date());
+ apiData.setKlyy("鎵ｉ噺鍘熷洜");
+
+ apiData.setCmqrmgryxm(StringUtils.isEmpty(sysData.getRegisterUser()) ? "鐧昏浜�" : sysData.getRegisterUser());
+ apiData.setDjmgryxm(StringUtils.isEmpty(sysData.getRegisterUser()) ? "鐧昏浜�" : sysData.getRegisterUser());
+ //01:琛ㄧず澶у瀷姹借溅鍙风墝,榛勫簳榛戝瓧锛� 02:琛ㄧず灏忓瀷姹借溅鍙风墝,钃濆簳鐧藉瓧锛� 03:琛ㄧず鏂拌兘婧愭苯杞﹀彿鐗�,缁垮簳榛� 瀛楋紱
+ //04:琛ㄧず鍐滅敤杞﹁溅鐗屽彿锛岀豢搴曠櫧瀛楋紱 LS:琛ㄧず涓存椂铏氭嫙鍙风墝锛屼粎闄愪簬鍞� 绮溅鏃犲浐瀹氬彿鐗屾椂浣跨敤
+ apiData.setCchlx("01");
+ apiData.setLdd("瑁呯伯鍦扮偣");
+ apiData.setZkj(0.0);
+ apiData.setZlfyzkl(0.0);
+ apiData.setQzsfzkl(0.0);
+ apiData.setQzzzzkl(0.0);
+ apiData.setQzgwcmkl(0.0);
+ apiData.setQzhhkl(0.0);
+ apiData.setQzbwslkl(0.0);
+ apiData.setQzhlmkl(0.0);
+ apiData.setQzsmlkl(0.0);
+ apiData.setQzzjmlkl(0.0);
+ apiData.setQzqtkl(0.0);
+ apiData.setZkhyy("澧炴墸浠峰師鍥�");
+ apiData.setZxzydw(api1105.getBgdw());
+ if (sysData.getCompanyId().equals("5329")) {
+ apiData.setLqgsdwdm("91461604MA56D2AM1X");
+ }
+ api1202List = api1202Rep.getDataById(apiData.getRkywdh());
+ if (null == api1202List || api1202List.isEmpty()) {
+ apiData.setCzbz(Constant.CZBZ_I);
+ } else {
+ apiData.setCzbz(api1202List.get(0).getCzbz());
+ }
+ //鍒ゆ柇鏄惁涓鸿埞杩�
+ if (StringUtils.isNotEmpty(sysData.getTransType()) && sysData.getTransType().equals("3")) {
+ listInoutRecordItem = fzzy61SyncInoutRecordItemRep.findDataByRecordId(sysData.getId());
+ if (null == listInoutRecordItem || listInoutRecordItem.isEmpty()) {
+ api1202Rep.save(apiData);
+ continue;
+ }
+
+ int idNum = Integer.valueOf(sysData.getId().substring(12)) * 100 + 10001;
+ for (Fz61InoutRecordItem fz61InoutRecordItem : listInoutRecordItem) {
+ if ("DEL".equals(fz61InoutRecordItem.getRecordStatus())) {
+ continue;
+ }
+ if (fz61InoutRecordItem.getSettleWeight() <= 0) {
+ continue;
+ }
+ apiData.setRkywdh(Constant.INOUT_TYPE_14 + sysData.getId().substring(4, 10) + String.valueOf(idNum).substring(1));
+ apiData.setMz(fz61InoutRecordItem.getFullWeight());
+ apiData.setPz(fz61InoutRecordItem.getEmptyWeight());
+ apiData.setJz(fz61InoutRecordItem.getSettleWeight());
+ apiData.setMzjlsj(fz61InoutRecordItem.getFullWeightTime());
+ apiData.setPzjlsj(fz61InoutRecordItem.getEmptyWeightTime());
+ apiData.setQtkl(0 - fz61InoutRecordItem.getDe());
+ api1202List = api1202Rep.getDataById(apiData.getRkywdh());
+ if (null == api1202List || api1202List.isEmpty()) {
+ apiData.setCzbz(Constant.CZBZ_I);
+ } else {
+ apiData.setCzbz(api1202List.get(0).getCzbz());
+ }
+ api1202Rep.save(apiData);
+ idNum++;
+ }
+ } else {
+ //淇濆瓨鏁版嵁
+ api1202Rep.save(apiData);
+ }
+
+ log.info("1202---鍚屾鏁版嵁锛歿}", apiData.toString());
+ }
+ } catch (Exception e) {
+
+ log.error("---1202鏁版嵁鍚屾澶辫触----{}", e.toString());
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1203.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1203.java
new file mode 100644
index 0000000..8d012bf
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1203.java
@@ -0,0 +1,270 @@
+package com.fzzy.async.fzzy61.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1202;
+import com.fzzy.api.entity.Api1203;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.entity.GbCheckItem;
+import com.fzzy.api.service.ApiTriggerService;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.utils.DateUtil;
+import com.fzzy.api.view.repository.Api1202Rep;
+import com.fzzy.api.view.repository.Api1203Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.api.view.repository.GbCheckItemRep;
+import com.fzzy.async.fzzy61.entity.Fz61CheckItem;
+import com.fzzy.async.fzzy61.entity.Fz61InoutRecord;
+import com.fzzy.async.fzzy61.entity.Fz61InoutRecordItem;
+import com.fzzy.async.fzzy61.repository.Fzzy61Sync1202Rep;
+import com.fzzy.async.fzzy61.repository.Fzzy61Sync1203Rep;
+import com.fzzy.async.fzzy61.repository.Fzzy61SyncInoutRecordItemRep;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.DateFormatUtils;
+import org.apache.commons.lang.time.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 绮鍏ュ簱妫�楠屼俊鎭�
+ */
+@Slf4j
+@Component
+public class Fzzy61Sync1203 {
+
+ /**
+ * 鍏ュ簱绫诲瀷
+ */
+ private final static String INOUT_TYPE_IN = "IN";
+
+ @Autowired
+ private Fzzy61Sync1202Rep fzzySync1202Rep;
+ @Autowired
+ private Fzzy61SyncInoutRecordItemRep fzzy61SyncInoutRecordItemRep;
+ @Autowired
+ private Fzzy61Sync1203Rep fzzySync1203Rep;
+ @Autowired
+ private ApiTriggerService apiTriggerService;
+ @Autowired
+ private Api1202Rep api1202Rep;
+ @Autowired
+ private Api1203Rep api1203Rep;
+ @Autowired
+ private GbCheckItemRep gbCheckItemRep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+
+ /**
+ * 绮鍏ュ簱妫�楠屼俊鎭�
+ *
+ * @param deptId
+ * @param start
+ * @param end
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+
+ log.info("-------------1203鍏ュ簱妫�楠屾帴鍙ｆ暟鎹紑濮嬪悓姝�------------------");
+
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1203);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ //鑾峰彇绮鍏ュ簱璁板綍淇℃伅
+ List<Fz61InoutRecord> list = fzzySync1202Rep.listInoutRecord(deptId, INOUT_TYPE_IN, start, end);
+
+ if (null == list || list.isEmpty()) {
+ log.info("-------------娌℃湁鑾峰彇鍒扮伯椋熷叆搴撲俊鎭�------------------");
+ return;
+ }
+
+ Api1203 apiData;
+ List<Fz61CheckItem> fz61CheckItems;
+ List<GbCheckItem> gbCheckList;
+ String jyxm;
+ String jyz;
+ String zkj;
+ String zkl;
+ List<Api1203> api1203List;
+ List<Api1202> api1102List;
+ List<Fz61InoutRecordItem> listInoutRecordItem;
+ List<String> listIds;
+ for (Fz61InoutRecord sysData : list) {
+ listIds = new ArrayList<>();
+ //鍒ゆ柇鏄惁涓鸿埞杩�
+ if (StringUtils.isNotEmpty(sysData.getTransType()) && sysData.getTransType().equals("3")) {
+ listInoutRecordItem = fzzy61SyncInoutRecordItemRep.findDataByRecordId(sysData.getId());
+ if (null != listInoutRecordItem && listInoutRecordItem.size() > 0) {
+ int idNum = Integer.valueOf(sysData.getId().substring(12)) * 100 + 10001;
+
+ for (Fz61InoutRecordItem fz61InoutRecordItem : listInoutRecordItem) {
+ if ("DEL".equals(fz61InoutRecordItem.getRecordStatus())) {
+ continue;
+ }
+ listIds.add(Constant.INOUT_TYPE_14 + sysData.getId().substring(4, 10) + String.valueOf(idNum).substring(1));
+ idNum++;
+ }
+ } else {
+ listIds.add(Constant.INOUT_TYPE_14 + sysData.getId().substring(4));
+ }
+ } else {
+ listIds.add(Constant.INOUT_TYPE_14 + sysData.getId().substring(4));
+ }
+
+ //鑾峰彇鍏ュ簱璐ㄦ淇℃伅
+ fz61CheckItems = fzzySync1203Rep.listInoutCheckItem(sysData.getCheckId(), deptId.substring(0, 4));
+ if (null == fz61CheckItems || fz61CheckItems.isEmpty()) {
+ log.info("-------------娌℃湁鑾峰彇鍒板綋鍓嶅叆搴撹川妫�淇℃伅--------------");
+ continue;
+ }
+
+ for (String listId : listIds) {
+ //鏌ヨ绮鍏ュ簱淇℃伅锛岃嫢涓虹┖鍒欎笉杩涜鍚屾涓婁紶
+ api1102List = api1202Rep.getDataById(listId);
+ if (null == api1102List || api1102List.isEmpty()) {
+ continue;
+ }
+
+ apiData = new Api1203();
+
+ apiData.setRkjydh(api1102List.get(0).getRkywdh());
+ //璐т綅浠ｇ爜
+ apiData.setHwdm(api1102List.get(0).getHwdm());
+ apiData.setRkywdh(api1102List.get(0).getRkywdh());
+ if (null == sysData.getFullWeightTime()) {
+ sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 5));
+ }
+
+ //鍒ゆ柇涓氬姟鏃堕棿涓庡崟鎹彿鏄惁鍖归厤锛岃嫢涓嶅尮閰嶏紝鍒欐洿鏀逛笟鍔℃椂闂翠负鍗曟嵁鍙锋墍鍦ㄧ殑鏃堕棿
+ String time = apiData.getRkjydh().substring(2, 8);
+ if (sysData.getCheckTime() != null) {
+ String isCheckTime = DateFormatUtils.format(sysData.getCheckTime(), "yyMMdd");
+ if (!isCheckTime.equals(time)) {
+ int difDay = DateUtil.difDay1(sysData.getRegisterTime(), sysData.getCheckTime());
+ if (difDay == 0) {
+ apiData.setRkjydh("14" + isCheckTime + "01" + api1102List.get(0).getRkywdh().substring(10));
+ } else {
+ apiData.setRkjydh("14" + isCheckTime + String.format("%02d", difDay) + api1102List.get(0).getRkywdh().substring(10));
+ }
+ }
+ }
+
+ //鑸硅繍浣跨敤鍏ュ簱鍗曟嵁鍙峰仛璐ㄦ鍗曞彿
+ if (StringUtils.isNotEmpty(sysData.getTransType()) && sysData.getTransType().equals("3")) {
+ apiData.setRkjydh(api1102List.get(0).getRkywdh());
+ }
+
+ apiData.setQyrxm(sysData.getCheckUser());
+ //鎵︽牱鏂瑰紡 2-鏅鸿兘闅忔満
+ apiData.setQyfs("2");
+
+ //妫�娴嬮」锛屾娴嬪�硷紝澧炴墸浠峰強澧炴墸閲�
+ jyxm = "";
+ jyz = "";
+ zkj = "";
+ zkl = "";
+ for (Fz61CheckItem fz61CheckItem : fz61CheckItems) {
+ gbCheckList = gbCheckItemRep.findByBizCode(fz61CheckItem.getStandardId());
+
+ if (gbCheckList == null || gbCheckList.isEmpty()) {
+ continue;
+ }
+ if (StringUtils.isEmpty(fz61CheckItem.getValue())) {
+ continue;
+ }
+ jyxm += "," + gbCheckList.get(0).getCode();
+ jyz += "," + fz61CheckItem.getValue();
+ zkj += ",0.0";
+ zkl += ",0.0";
+ }
+ if (jyxm.length() > 0) {
+ jyxm = jyxm.substring(1);
+ }
+ if (jyz.length() > 0) {
+ jyz = jyz.substring(1);
+ }
+ apiData.setJyxm(jyxm);
+ apiData.setJyz(jyz);
+ apiData.setZkj(StringUtils.isEmpty(zkj) ? "" : zkj.substring(1));
+ apiData.setZkl(StringUtils.isEmpty(zkl) ? "" : zkl.substring(1));
+ if ("UNPASS".equals(sysData.getCheckStatus())) {
+ apiData.setJyjg("0");
+ } else {
+ apiData.setJyjg("1");
+ }
+ apiData.setJyrxm(sysData.getCheckUser());
+ if (null == sysData.getCheckTime()) {
+ sysData.setCheckTime(DateUtils.addMinutes(sysData.getFullWeightTime(), -5));
+ }
+ if (sysData.getCheckTime().after(sysData.getEmptyWeightTime())) {
+ sysData.setCheckTime(DateUtils.addMinutes(sysData.getFullWeightTime(), -5));
+ }
+ apiData.setJysj(sysData.getCheckTime());
+ if (null == sysData.getSampleTime()) {
+ sysData.setSampleTime(DateUtils.addMinutes(sysData.getCheckTime(), -1));
+ }
+ if (sysData.getSampleTime().after(sysData.getCheckTime())) {
+ sysData.setSampleTime(DateUtils.addMinutes(sysData.getCheckTime(), -1));
+ }
+ apiData.setQysj(sysData.getSampleTime());
+
+ //绮鍝佺
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
+ apiData.setLspzdm(mappingCode);
+
+ //淇濈鍛樺鏍�
+ apiData.setBgyfh(apiData.getJyjg());
+ apiData.setSpaqzbsfhg("1");
+
+ //绮绛夌骇
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSDJ, sysData.getFoodLevel());
+ apiData.setLsdd(mappingCode);
+
+ //鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
+ apiData.setZhgxsj(sysData.getCompleteTime());
+
+ //涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
+ apiData.setBizId(sysData.getId());
+ apiData.setKqdm(kqdm);
+ apiData.setSyncTime(new Date());
+
+ api1203List = api1203Rep.getDataById(apiData.getRkjydh());
+ if (null == api1203List || api1203List.isEmpty()) {
+ apiData.setCzbz(Constant.CZBZ_I);
+ } else {
+ apiData.setCzbz(api1203List.get(0).getCzbz());
+ }
+
+ api1203Rep.save(apiData);
+ log.info("1203鍏ュ簱妫�楠�---鍚屾鏁版嵁锛歿}", apiData.toString());
+ }
+ }
+ } catch (Exception e) {
+ log.error("---1203鍏ュ簱妫�楠屾暟鎹悓姝ュけ璐�----{}", e.toString());
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+
+ public static void main(String[] args) {
+ //鍒ゆ柇涓氬姟鏃堕棿涓庡崟鎹彿鏄惁鍖归厤锛岃嫢涓嶅尮閰嶏紝鍒欐洿鏀逛笟鍔℃椂闂翠负鍗曟嵁鍙锋墍鍦ㄧ殑鏃堕棿
+ String id = "142508200001";
+ String time = id.substring(2, 8);
+
+ String isCheckTime = "250821";
+ if (!isCheckTime.equals(time)) {
+ int difDay = 2;
+ String idd = "14" + isCheckTime + difDay + id.substring(9);
+ System.out.println(idd);
+ }
+
+ }
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1204.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1204.java
new file mode 100644
index 0000000..0430568
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1204.java
@@ -0,0 +1,143 @@
+package com.fzzy.async.fzzy61.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1102;
+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.Api1102Rep;
+import com.fzzy.api.view.repository.Api1204Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy61.entity.Fz61InoutSettle;
+import com.fzzy.async.fzzy61.repository.Fzzy61Sync1204Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+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 Fzzy61Sync1204 {
+
+ /**
+ * 鍏ュ簱绫诲瀷
+ */
+ private final static String INOUT_TYPE_IN = "IN";
+
+ @Autowired
+ private Fzzy61Sync1204Rep fzzy61Sync1204Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+ @Autowired
+ private Api1102Rep api1102Rep;
+ @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<Fz61InoutSettle> list = fzzy61Sync1204Rep.listInoutSettle(deptId, INOUT_TYPE_IN, start, end);
+
+ if (null == list || list.isEmpty()) {
+ log.info("-------------娌℃湁鑾峰彇鍒扮伯椋熷叆搴撶粨绠椾俊鎭�------------------");
+ return;
+ }
+ //鏍规嵁搴撳尯浠ｇ爜鑾峰彇搴撳尯淇℃伅
+ Api1102 api1102 = api1102Rep.findById(kqdm).get();
+
+ Api1204 apiData;
+ Api1105 api1105;
+ List<Api1204> api1204List;
+ for (Fz61InoutSettle sysData : list) {
+
+ apiData = new Api1204();
+ //鍏ュ簱缁撶畻鍗曞彿:搴撳尯浠ｇ爜 + yyyyMMdd + 4涓洪『搴忓彿
+ apiData.setRkjsdh(kqdm + sysData.getId());
+
+ //鍚堝悓鍙�
+ if(StringUtils.isNotEmpty(sysData.getContractId())){
+ apiData.setHth(api1102.getDwdm() + sysData.getContractId());
+ }
+
+ if(StringUtils.isNotEmpty(sysData.getDepotId())){
+ api1105 = commonService.getApi1105Cache(sysData.getDepotId());
+ //璐т綅浠ｇ爜
+ 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.setZhgxsj(new Date());
+
+ //涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
+ apiData.setBizId(sysData.getId());
+ apiData.setKqdm(kqdm);
+ apiData.setSyncTime(new Date());
+ log.info("1204鍏ュ簱缁撶畻---鍚屾鏁版嵁锛歿}", apiData.toString());
+ //淇濆瓨鏁版嵁
+ api1204List = api1204Rep.getDataById(apiData.getRkjsdh());
+ if (null == api1204List || api1204List.isEmpty()) {
+ apiData.setCzbz(Constant.CZBZ_I);
+ } else {
+ apiData.setCzbz(api1204List.get(0).getCzbz());
+ }
+ api1204Rep.save(apiData);
+ }
+ } catch (Exception e) {
+ log.error("---1204鍏ュ簱缁撶畻鍚屾澶辫触----{}", e.toString());
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1205.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1205.java
new file mode 100644
index 0000000..24157c2
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1205.java
@@ -0,0 +1,315 @@
+package com.fzzy.async.fzzy61.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.*;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.service.ApiTriggerService;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.*;
+import com.fzzy.async.fzzy61.entity.Fz61InoutNoticeOut;
+import com.fzzy.async.fzzy61.entity.Fz61InoutRecord;
+import com.fzzy.async.fzzy61.entity.Fz61InoutRecordItem;
+import com.fzzy.async.fzzy61.repository.Fzzy61Sync1202Rep;
+import com.fzzy.async.fzzy61.repository.Fzzy61SyncInoutRecordItemRep;
+import com.fzzy.async.fzzy61.repository.Fzzy61SyncNoticeOutRep;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.DateFormatUtils;
+import org.apache.commons.lang.time.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 绮鍑哄簱淇℃伅
+ */
+@Slf4j
+@Component
+public class Fzzy61Sync1205 {
+
+ /**
+ * 鍑哄簱绫诲瀷
+ */
+ private final static String INOUT_TYPE_OUT = "OUT";
+ @Autowired
+ private Fzzy61Sync1202Rep fzzySync1202Rep;
+ @Autowired
+ private Fzzy61SyncInoutRecordItemRep fzzy61SyncInoutRecordItemRep;
+ @Autowired
+ private Fzzy61SyncNoticeOutRep fzzySyncNoticeOutRep;
+ @Autowired
+ private ApiTriggerService apiTriggerService;
+ @Autowired
+ private Api1201Rep api1201Rep;
+ @Autowired
+ private Api1205Rep api1205Rep;
+ @Autowired
+ private Api1206Rep api1206Rep;
+ @Autowired
+ private Api1310Rep api1310Rep;
+ @Autowired
+ private Api1404Rep api1404Rep;
+ @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("-------------1205鍑哄簱淇℃伅鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1205);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ //鑾峰彇绮鍑哄簱淇℃伅锛屾牴鎹祦绋嬪畬鎴愭椂闂磋幏鍙�
+ List<Fz61InoutRecord> list = fzzySync1202Rep.listInoutRecord(deptId, INOUT_TYPE_OUT, start, end);
+
+ if (null == list || list.isEmpty()) {
+ log.info("-------------娌℃湁鑾峰彇鍒扮伯椋熷嚭搴撲俊鎭�------------------");
+ return;
+ }
+
+ Api1205 apiData;
+ Api1105 api1105;
+ List<Fz61InoutNoticeOut> listInoutNotice;
+ List<Api1205> api1205List;
+ List<Api1206> api1206List;
+ List<Fz61InoutRecordItem> listInoutRecordItem;
+ for (Fz61InoutRecord sysData : list) {
+ if (sysData.getRecordStatus().equals("DEL") || sysData.getRecordStatus().equals("ERROR")) {
+ continue;
+ }
+ if (!sysData.getProgress().equals("RECORD")) {
+ continue;
+ }
+ if (null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0) {
+ sysData.setRecordWeight(sysData.getSettleWeight());
+ }
+ //鍒ゆ柇鍑�閲嶆槸鍚﹀ぇ浜�0锛岀瓑浜�0琛ㄧず涓嶅悎鏍硷紝涓嶈繘琛屽悓姝ヤ笂浼�
+ if (null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0) {
+ continue;
+ }
+ //鑾峰彇璐т綅淇℃伅
+ api1105 = commonService.getApi1105Cache(sysData.getDepotId());
+ if (null == api1105) {
+ continue;
+ }
+ apiData = new Api1205();
+ apiData.setCkywdh(Constant.INOUT_TYPE_15 + sysData.getId().substring(4));
+
+ //璐т綅浠ｇ爜
+ apiData.setHwdm(api1105.getHwdm());
+ apiData.setYwlx(Constant.INOUT_TYPE_1);
+ apiData.setYwrq(DateUtils.parseDate(sysData.getId().substring(2, 10), new String[]{"yyyyMMdd"}));
+
+ //榛樿涓�涓殢渚垮��
+ apiData.setLxdh(StringUtils.isEmpty(sysData.getUserContact()) ? "13012345678" : sysData.getUserContact().trim());
+
+ if (StringUtils.isEmpty(sysData.getUserId()) || sysData.getUserId().length() != 18) {
+ sysData.setUserId("410183199003187055");
+ }
+ apiData.setSfzh(sysData.getUserId());
+
+ //閫氱煡鍗曞彿
+ apiData.setCktzdh(sysData.getNoticeId());
+ //鑾峰彇鍚堝悓鍙�
+ listInoutNotice = fzzySyncNoticeOutRep.listInoutNoticeOutById(sysData.getNoticeId());
+ if (null != listInoutNotice && listInoutNotice.size() > 0) {
+ //鍚堝悓鍙�
+ if (StringUtils.isNotEmpty(listInoutNotice.get(0).getContractId())) {
+ List<Api1201> api1201List = api1201Rep.getDataByBizId(listInoutNotice.get(0).getContractId());
+ if (null != api1201List && api1201List.size() > 0) {
+ apiData.setHth(api1201List.get(0).getHth());
+ }
+ }
+ if (StringUtils.isNotEmpty(listInoutNotice.get(0).getPlanId())) {
+ List<Api1404> api1404List = api1404Rep.getDataByBizIdAndKqdm(listInoutNotice.get(0).getPlanId(), kqdm);
+ if (null != api1404List && api1404List.size() > 0) {
+ apiData.setJhmxh(api1404List.get(0).getJhmxdh());
+ if (StringUtils.isEmpty(sysData.getFoodYear())) {
+ sysData.setFoodYear(api1404List.get(0).getShnd());
+ }
+ }
+ }
+ }
+
+ //杩愯緭宸ュ叿锛岃嫢涓虹┖锛屽垯榛樿缁�1-姹借溅
+ apiData.setYsgj(StringUtils.isEmpty(sysData.getTransType()) ? "1" : sysData.getTransType());
+
+ //杞﹁埞鍙�
+ apiData.setCch(sysData.getPlateNum());
+ apiData.setDjsj(sysData.getRegisterTime());
+
+ //绮鍝佺
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
+ apiData.setLspzdm(mappingCode);
+
+ //绮绛夌骇
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSDJ, sysData.getFoodLevel());
+ apiData.setLsdjdm(mappingCode);
+
+ //璐ㄦ鎶ュ憡鍗曞彿
+ List<Api1310> dataByHwdm = api1310Rep.getDataByHwdm(apiData.getHwdm(), "02");
+ if (null != dataByHwdm && dataByHwdm.size() > 0) {
+ apiData.setZjbgdh(dataByHwdm.get(0).getZjbgdh());
+ }
+
+ //鐢熸垚鏂瑰紡
+ apiData.setScfs(1);
+ if (StringUtils.isNotEmpty(sysData.getRecordStatus()) && sysData.getRecordStatus().equals("ADD")) {
+ apiData.setScfs(2);
+ apiData.setSdblyy("搴撳尯鍋滅數瀵艰嚧鏃犳硶鎸夋祦绋嬭繘琛屽嚭搴�");
+ }
+
+ //绮鎬ц川
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());
+ apiData.setLsxzdm(mappingCode);
+
+ apiData.setShnd(StringUtils.isEmpty(sysData.getFoodYear()) ? DateFormatUtils.format(sysData.getRegisterTime(), "yyyy") : sysData.getFoodYear());
+
+ //浜у湴浠ｇ爜
+ mappingCode = commonService.getFoodLocationIdFromCache(sysData.getFoodLocation());
+ if (StringUtils.isEmpty(mappingCode)) {
+ mappingCode = apiData.getHwdm().substring(2, 8);
+ }
+ apiData.setCddm(mappingCode);
+
+ //鐨噸淇℃伅
+ apiData.setPz(sysData.getEmptyWeight());
+ if (null == sysData.getEmptyWeightTime()) {
+ sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 25));
+ }
+ if (!sysData.getEmptyWeightTime().after(sysData.getRegisterTime())) {
+ sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 25));
+ }
+ apiData.setPzjlsj(sysData.getEmptyWeightTime());
+ apiData.setPzjby(StringUtils.isEmpty(sysData.getEmptyWeightUser()) ? "鐩戠鍛�" : sysData.getEmptyWeightUser());
+ apiData.setPzjly(StringUtils.isEmpty(sysData.getEmptyWeightUser()) ? "璁￠噺鍛�" : sysData.getEmptyWeightUser());
+
+ //姣涢噸淇℃伅
+ apiData.setMz(sysData.getFullWeight());
+ apiData.setKzl(0 - sysData.getDeCheck() + sysData.getAddCheck() - sysData.getDeHandle() - sysData.getDePackage() - sysData.getDeOther());
+ if (null == sysData.getFullWeightTime()) {
+ sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getEmptyWeightTime(), 60));
+ }
+ if (!sysData.getFullWeightTime().after(sysData.getEmptyWeightTime())) {
+ sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getEmptyWeightTime(), 60));
+ }
+ apiData.setMzjlsj(sysData.getFullWeightTime());
+ apiData.setMzjby(StringUtils.isEmpty(sysData.getFullWeightUser()) ? "鐩戠鍛�" : sysData.getFullWeightUser());
+ apiData.setMzjly(StringUtils.isEmpty(sysData.getFullWeightUser()) ? "璁￠噺鍛�" : sysData.getFullWeightUser());
+
+ //鍑�閲�
+ apiData.setJz(sysData.getRecordWeight());
+ if (!sysData.getCompleteTime().after(sysData.getFullWeightTime())) {
+ sysData.setCompleteTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 10));
+ }
+ apiData.setCmsj(sysData.getCompleteTime());
+ //缁撶畻鍗曞彿
+ if (StringUtils.isNotEmpty(sysData.getSettleId())) {
+ apiData.setCkjsdh(kqdm + sysData.getSettleId());
+ }
+ if (StringUtils.isNotEmpty(apiData.getHth())) {
+ api1206List = api1206Rep.getDataByHthAndHwdm(apiData.getHth(), apiData.getHwdm());
+ if (null == api1206List || api1206List.isEmpty()) {
+ api1206List = api1206Rep.getDataByHth(apiData.getHth());
+ if (null != api1206List && api1206List.size() > 0) {
+ apiData.setCkjsdh(api1206List.get(0).getCkjsdh());
+ }
+ } else {
+ apiData.setCkjsdh(api1206List.get(0).getCkjsdh());
+ }
+ }
+
+ apiData.setCchlx("01");
+ apiData.setXldd("搴撳唴");
+ apiData.setBz(StringUtils.isEmpty(sysData.getRemarks()) ? "鏆傛棤澶囨敞淇℃伅" : sysData.getRemarks());
+ apiData.setBzbdbz(sysData.getDbz() == null ? 25 : sysData.getDbz());
+ apiData.setBzbjs(sysData.getBzbjs());
+ apiData.setJjlx(sysData.getJjlx());
+ apiData.setBzw(StringUtils.isEmpty(sysData.getBzw()) ? "9" : sysData.getBzw());
+ apiData.setCmqrmgryxm(StringUtils.isEmpty(sysData.getRegisterUser()) ? "闂ㄥ矖浜�" : sysData.getRegisterUser());
+ apiData.setDjmgryxm(StringUtils.isEmpty(sysData.getRegisterUser()) ? "鐧昏浜�" : sysData.getRegisterUser());
+ apiData.setZcbgyxm(StringUtils.isEmpty(sysData.getHandleUser()) ? "鍊间粨鍛�" : sysData.getHandleUser());
+ apiData.setZxzydw("澶栬仒鍗曚綅");
+ apiData.setKzlyy("鎵ｏ紙澧烇級閲忓師鍥�");
+
+ //鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
+ apiData.setZhgxsj(sysData.getUpdateTime());
+
+ //鎵胯繍浜� 韬唤璇佸彿 鐢佃瘽
+ apiData.setSfzh(sysData.getUserId());
+ apiData.setCyr(sysData.getUserName().trim());
+ apiData.setLxdh(sysData.getUserContact());
+
+
+ //涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
+ apiData.setBizId(sysData.getId());
+ apiData.setKqdm(kqdm);
+ apiData.setSyncTime(new Date());
+ log.info("1205鍑哄簱淇℃伅---鍚屾鏁版嵁锛歿}", apiData.toString());
+ api1205List = api1205Rep.getDataById(apiData.getCkywdh());
+ if (null == api1205List || api1205List.isEmpty()) {
+ apiData.setCzbz(Constant.CZBZ_I);
+ } else {
+ apiData.setCzbz(api1205List.get(0).getCzbz());
+ }
+ //鍒ゆ柇鏄惁涓鸿埞杩�
+ if (StringUtils.isNotEmpty(sysData.getTransType()) && sysData.getTransType().equals("3")) {
+ listInoutRecordItem = fzzy61SyncInoutRecordItemRep.findDataByRecordId(sysData.getId());
+ if (null == listInoutRecordItem || listInoutRecordItem.isEmpty()) {
+ api1205Rep.save(apiData);
+ continue;
+ }
+
+ int idNum = Integer.valueOf(sysData.getId().substring(12)) * 100 + 10001;
+ for (Fz61InoutRecordItem fz61InoutRecordItem : listInoutRecordItem) {
+ if ("DEL".equals(fz61InoutRecordItem.getRecordStatus())) {
+ continue;
+ }
+ if (fz61InoutRecordItem.getSettleWeight() <= 0) {
+ continue;
+ }
+ apiData.setCkywdh(Constant.INOUT_TYPE_15 + sysData.getId().substring(4, 10) + String.valueOf(idNum).substring(1));
+ apiData.setMz(fz61InoutRecordItem.getFullWeight());
+ apiData.setPz(fz61InoutRecordItem.getEmptyWeight());
+ apiData.setJz(fz61InoutRecordItem.getSettleWeight());
+ apiData.setMzjlsj(fz61InoutRecordItem.getFullWeightTime());
+ apiData.setPzjlsj(fz61InoutRecordItem.getEmptyWeightTime());
+ apiData.setKzl(0 - fz61InoutRecordItem.getDe());
+ api1205List = api1205Rep.getDataById(apiData.getCkywdh());
+ if (null == api1205List || api1205List.isEmpty()) {
+ apiData.setCzbz(Constant.CZBZ_I);
+ } else {
+ apiData.setCzbz(api1205List.get(0).getCzbz());
+ }
+ api1205Rep.save(apiData);
+ idNum++;
+ }
+ } else {
+ //淇濆瓨鏁版嵁
+ api1205Rep.save(apiData);
+ }
+ }
+ } catch (Exception e) {
+ log.error("---1205鍑哄簱淇℃伅鍚屾澶辫触----{}", e.toString());
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1206.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1206.java
new file mode 100644
index 0000000..ba24e13
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1206.java
@@ -0,0 +1,136 @@
+package com.fzzy.async.fzzy61.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.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.fzzy61.entity.Fz61InoutSettle;
+import com.fzzy.async.fzzy61.repository.Fzzy61Sync1204Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 绮鍑哄簱缁撶畻
+ */
+@Slf4j
+@Component
+public class Fzzy61Sync1206 {
+
+ /**
+ * 鍑哄簱绫诲瀷
+ */
+ private final static String INOUT_TYPE_OUT = "OUT";
+
+ @Autowired
+ private Fzzy61Sync1204Rep fzzySync1204Rep;
+ @Autowired
+ private Api1206Rep api1206Rep;
+ @Autowired
+ private Api1102Rep api1102Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+ @Autowired
+ private ApiCommonService commonService;
+
+ /**
+ * 绮鍑哄簱缁撶畻
+ *
+ * @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<Fz61InoutSettle> list = fzzySync1204Rep.listInoutSettle(deptId, INOUT_TYPE_OUT, start, end);
+
+ if (null == list || list.isEmpty()) {
+ log.info("-------------娌℃湁鑾峰彇鍒扮伯椋熷嚭搴撶粨绠椾俊鎭�------------------");
+ return;
+ }
+
+ //鏍规嵁搴撳尯浠ｇ爜鑾峰彇搴撳尯淇℃伅
+ Api1102 api1102 = api1102Rep.findById(kqdm).get();
+
+ Api1206 apiData;
+ Api1105 api1105;
+ List<Api1206> api1206List;
+ for (Fz61InoutSettle sysData : list) {
+
+ apiData = new Api1206();
+ //鍏ュ簱缁撶畻鍗曞彿:搴撳尯浠ｇ爜 + yyyyMMdd + 4涓洪『搴忓彿
+ apiData.setCkjsdh(kqdm + sysData.getId());
+
+ //鍚堝悓鍙�
+ if (StringUtils.isNotEmpty(sysData.getContractId())) {
+ apiData.setHth(api1102.getDwdm() + sysData.getContractId());
+ }
+
+ if (StringUtils.isNotEmpty(sysData.getDepotId())) {
+ api1105 = commonService.getApi1105Cache(sysData.getDepotId());
+ //璐т綅浠ｇ爜
+ 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.setYhhbdm(sysData.getBankCategory());
+ apiData.setKhhh(sysData.getBankCode());
+ apiData.setKhhmc(sysData.getBank());
+ apiData.setYhzh(sysData.getBankNum());
+ apiData.setFkr(StringUtils.isEmpty(sysData.getPayUser()) ? "浠樻浜�" : sysData.getPayUser());
+ apiData.setFphm("");
+ apiData.setFpzt("");
+
+ //鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
+ apiData.setZhgxsj(new Date());
+
+ //涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
+ apiData.setBizId(sysData.getId());
+ apiData.setKqdm(kqdm);
+ apiData.setSyncTime(new Date());
+ log.info("1206鍑哄簱缁撶畻---鍚屾鏁版嵁锛歿}", apiData.toString());
+
+ api1206List = api1206Rep.getDataById(apiData.getCkjsdh());
+ if (null == api1206List || api1206List.isEmpty()) {
+ apiData.setCzbz(Constant.CZBZ_I);
+ } else {
+ apiData.setCzbz(api1206List.get(0).getCzbz());
+ }
+ //淇濆瓨鏁版嵁
+ api1206Rep.save(apiData);
+ }
+ } catch (Exception e) {
+ log.error("---1206鍑哄簱缁撶畻鏁版嵁鍚屾澶辫触----{}", e.toString());
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1207.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1207.java
new file mode 100644
index 0000000..92a60d8
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1207.java
@@ -0,0 +1,125 @@
+package com.fzzy.async.fzzy61.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1105;
+import com.fzzy.api.entity.Api1207;
+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.Api1207Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy61.entity.Fz61InoutStockChange;
+import com.fzzy.async.fzzy61.repository.Fzzy61Sync1207Rep;
+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 Fzzy61Sync1207 {
+
+ @Autowired
+ private Fzzy61Sync1207Rep fzzySync1207Rep;
+ @Autowired
+ private ApiCommonService commonService;
+ @Autowired
+ private Api1207Rep api1207Rep;
+ @Autowired
+ private ApiTriggerService apiTriggerService;
+ @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("-------------1207鍊掍粨鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1207);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+
+ try {
+ List<Fz61InoutStockChange> list = fzzySync1207Rep.listStockChange(deptId, start, end);
+ if (null == list || list.isEmpty()) {
+ log.info("-------------娌℃湁鑾峰彇鍒板�掍粨淇℃伅------------------");
+ return;
+ }
+
+ Api1207 apiData;
+ Api1105 api1105In;
+ Api1105 api1105Out;
+ List<Api1207> api1207List;
+ for (Fz61InoutStockChange sysData : list) {
+ //鑾峰彇璐т綅淇℃伅
+ api1105Out = commonService.getApi1105Cache(sysData.getDepotIdOut());
+ if (null == api1105Out) {
+ continue;
+ }
+ //鑾峰彇璐т綅淇℃伅
+ api1105In = commonService.getApi1105Cache(sysData.getDepotIdIn());
+ if (null == api1105In) {
+ continue;
+ }
+ apiData = new Api1207();
+ apiData.setDcdh(kqdm + sysData.getId());
+ apiData.setDclx(sysData.getType());
+ apiData.setDcjhwjbh(sysData.getPlanCode());
+ apiData.setTzdh(sysData.getNoticeId());
+ apiData.setDcdw(kqdm);
+ apiData.setDrdw(kqdm);
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
+ apiData.setLspzdm(mappingCode);
+ apiData.setDchwdm(api1105Out.getHwdm());
+ apiData.setDrhwdm(api1105In.getHwdm());
+ apiData.setDcrq(sysData.getChangeDate());
+ apiData.setDcksrq(sysData.getChangeStartDate());
+ apiData.setDcjsrq(sysData.getChangeEndDate());
+ apiData.setDcsl(sysData.getNumber());
+ apiData.setBzw(sysData.getBzw());
+ apiData.setBzbjs(sysData.getBzbjs());
+ apiData.setZxzydw(sysData.getZxzydw());
+ apiData.setZhgxsj(sysData.getUpdateTime());
+
+ apiData.setBizId(sysData.getId());
+ apiData.setKqdm(kqdm);
+ apiData.setSyncTime(new Date());
+
+ api1207List = api1207Rep.getDataById(apiData.getDcdh());
+ if (null == api1207List || api1207List.isEmpty()) {
+ apiData.setCzbz(Constant.CZBZ_I);
+ } else {
+ apiData.setCzbz(api1207List.get(0).getCzbz());
+ }
+
+ //淇濆瓨鏁版嵁
+ api1207Rep.save(apiData);
+ log.info("1207---鍚屾鏁版嵁锛歿}", apiData.toString());
+ }
+
+ } catch (Exception e) {
+ log.error("---1207鍊掍粨淇℃伅鍚屾澶辫触----{}", e.toString());
+ apiLog.setResult("鍊掍粨淇℃伅鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1208.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1208.java
new file mode 100644
index 0000000..9a96021
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1208.java
@@ -0,0 +1,213 @@
+package com.fzzy.async.fzzy61.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1102;
+import com.fzzy.api.entity.Api1105;
+import com.fzzy.api.entity.Api1208;
+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.Api1208Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy61.entity.Fz61DepotStore;
+import com.fzzy.async.fzzy61.repository.Fzzy61Sync1208Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 绮搴撳瓨
+ */
+@Slf4j
+@Component
+public class Fzzy61Sync1208 {
+
+ @Autowired
+ private Fzzy61Sync1208Rep fzzySync1208Rep;
+ @Autowired
+ private ApiTriggerService apiTriggerService;
+ @Autowired
+ private Api1208Rep api1208Rep;
+ @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("-------------1208绮搴撳瓨淇℃伅鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1208);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz61DepotStore> list = fzzySync1208Rep.listDepot(deptId, start, end);
+
+ if (null == list || list.isEmpty()) {
+
+ log.info("-------------娌℃湁鑾峰彇鍒扮伯椋熷簱瀛樹俊鎭�------------------");
+
+ return;
+ }
+
+ //鏍规嵁搴撳尯浠ｇ爜鑾峰彇鍗曚綅浠ｇ爜
+ Api1102 api1102 = api1102Rep.findById(kqdm).get();
+
+ Api1208 apiData;
+ Api1105 api1105;
+ List<Api1208> api1208List;
+ for (Fz61DepotStore fz61DepotStore : list) {
+
+ //鑾峰彇璐т綅淇℃伅
+ api1105 = commonService.getApi1105Cache(fz61DepotStore.getDepotId());
+ if (null == api1105) {
+ continue;
+ }
+
+ apiData = new Api1208();
+ apiData.setId(fz61DepotStore.getId());
+ apiData.setHwdm(api1105.getHwdm());
+
+ //绮鍝佺
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz61DepotStore.getFoodVariety());
+ apiData.setLspzdm(mappingCode);
+
+ //绮鎬ц川
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, fz61DepotStore.getFoodType());
+ apiData.setLsxzdm(mappingCode);
+
+ //绮绛夌骇
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSDJ, fz61DepotStore.getFoodLevel());
+ apiData.setLsdjdm(mappingCode);
+
+ apiData.setShnd(fz61DepotStore.getFoodYear());
+
+ //浜у湴浠ｇ爜
+ mappingCode = commonService.getFoodLocationIdFromCache(fz61DepotStore.getFoodLocation());
+ if (StringUtils.isEmpty(mappingCode)) {
+ mappingCode = apiData.getHwdm().substring(2, 8);
+ }
+ apiData.setCd(mappingCode);
+
+ apiData.setBgy(StringUtils.isEmpty(api1105.getBgy()) ? "淇濈鍛�" : api1105.getBgy());
+ apiData.setLqgsdwdm(fz61DepotStore.getLqgsdwdm());
+ apiData.setLqxzqhdm(api1102.getXzqhdm());
+ if (apiData.getLsxzdm().equals("121")) {
+ //鐪佺骇鍌ㄥ绮�-绮潈琛屾斂鍖哄垝浠ｇ爜涓虹渷绾�
+ apiData.setLqxzqhdm(api1102.getXzqhdm().substring(0, 2) + "0000");
+ }
+ if (apiData.getLsxzdm().equals("122")) {
+ //甯傜骇鍌ㄥ绮�-绮潈琛屾斂鍖哄垝浠ｇ爜涓哄競绾�
+ apiData.setLqxzqhdm(api1102.getXzqhdm().substring(0, 4) + "00");
+ }
+
+ //绮潈褰掑睘鍗曚綅
+ if (null == apiData.getLqgsdwdm()) {
+ api1208List = api1208Rep.findDataByHwdm(api1105.getHwdm());
+ if (null != api1208List && api1208List.size() > 0) {
+ apiData.setLqgsdwdm(api1208List.get(0).getLqgsdwdm());
+ apiData.setLqxzqhdm(api1208List.get(0).getLqxzqhdm());
+ apiData.setLqgstydwbm(api1208List.get(0).getLqgstydwbm());
+ } else {
+ apiData.setLqgsdwdm(api1102.getDwdm());
+ apiData.setLqxzqhdm(api1102.getXzqhdm());
+ }
+ }
+
+
+ //鑻ヤ负鍟嗗搧绮紝鍒欑伯鏉冩�ц川鍖哄垝浠ｇ爜涓簄ull
+ if ("200".equals(apiData.getLsxzdm())) {
+ apiData.setLqxzqhdm(null);
+ }
+
+ //绠＄悊鏂瑰紡-榛樿鐩村偍
+ if (StringUtils.isEmpty(fz61DepotStore.getManageType())) {
+ apiData.setGlfs("01");
+ } else {
+ apiData.setGlfs(fz61DepotStore.getManageType());
+ }
+
+ //鏀跺偍鍦扮偣-榛樿搴撳唴
+ apiData.setScdd("1");
+ //鍌ㄧ伯鏂瑰紡
+ apiData.setClfs(fz61DepotStore.getStoreType());
+ //鍖呰鍌ㄧ伯鏄紝鏍告煡鍖呭瓨绮寘鏁�
+ if ("2".equals(apiData.getClfs())) {
+ apiData.setBclbs((int) (fz61DepotStore.getStorageReal() / 25));
+ }
+
+ //璐т綅鐘舵��
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_HWZT, fz61DepotStore.getDepotStatus());
+ apiData.setHwzt(mappingCode);
+ if (null == fz61DepotStore.getStoreDate()) {
+ fz61DepotStore.setStoreDate(new Date());
+ }
+ //鍏ヤ粨鏃堕棿
+ apiData.setRcsj(fz61DepotStore.getStoreDate());
+ //灏佷粨鏃ユ湡
+ if ("3".equals(apiData.getHwzt()) || "4".equals(apiData.getHwzt())) {
+ if (null == fz61DepotStore.getFullDate()) {
+ fz61DepotStore.setFullDate(DateUtils.addDays(fz61DepotStore.getStoreDate(), 30));
+ }
+ apiData.setFcrq(fz61DepotStore.getFullDate());
+ }
+
+ if ("1".equals(apiData.getHwzt())) {
+ //鍑轰粨瀹屾垚鏃堕棿
+ apiData.setCcwcsj(fz61DepotStore.getOutDate());
+ //娓呬粨鏃堕棿
+ apiData.setQcsj(DateUtils.addHours(apiData.getCcwcsj(), 60));
+ }
+ //鍥藉埆
+ apiData.setGb("156");
+ apiData.setSjsl(fz61DepotStore.getStorageReal());
+ apiData.setJjsl(fz61DepotStore.getStorageReal());
+ apiData.setSjzlxg(6);
+ apiData.setLdtj(10000);
+
+ apiData.setZhgxsj(fz61DepotStore.getUpdateDate());
+
+ //涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
+ apiData.setBizId(fz61DepotStore.getId());
+ apiData.setKqdm(kqdm);
+ apiData.setSyncTime(new Date());
+
+ //搴撳瓨姣忔鏂板
+ api1208List = api1208Rep.getDataById(apiData.getId());
+ if (null == api1208List || api1208List.isEmpty()) {
+ apiData.setCzbz(Constant.CZBZ_I);
+ } else {
+ apiData.setCzbz(api1208List.get(0).getCzbz());
+ }
+
+ //淇濆瓨鏁版嵁
+ api1208Rep.save(apiData);
+ }
+ } catch (Exception e) {
+ log.error("---1208绮搴撳瓨淇℃伅鍚屾澶辫触----{}", e.toString());
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1209.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1209.java
new file mode 100644
index 0000000..9b8cc8e
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1209.java
@@ -0,0 +1,156 @@
+package com.fzzy.async.fzzy61.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.fzzy61.entity.Fz61InoutLossOver;
+import com.fzzy.async.fzzy61.repository.Fzzy61Sync1209Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 绮鎹熸孩
+ */
+@Slf4j
+@Component
+public class Fzzy61Sync1209 {
+
+ /**
+ * 鎹熸孩绫诲瀷-鎹熻��
+ */
+ public static final String LOSS_OVER_LOSS = "LOSS";
+ /**
+ * 鎹熸孩绫诲瀷-婧㈠嚭
+ */
+ public static final String LOSS_OVER_OVER = "OVER";
+
+ @Autowired
+ private Fzzy61Sync1209Rep 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<Fz61InoutLossOver> list = fzzySync1209Rep.listMLossOver(deptId, start, end);
+
+ if (null == list || list.isEmpty()) {
+
+ log.info("-------------娌℃湁鑾峰彇鍒扮伯椋熸崯婧俊鎭�------------------");
+
+ return;
+ }
+
+ Api1209 apiData;
+ Api1105 api1105;
+ List<Api1209> api1209List;
+ for (Fz61InoutLossOver 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());
+ apiData.setSylx(sysData.getType());
+ //鍑�閲嶆崯婧㈡暟閲忥紝鎹熻�椾负姝ｏ紝婧㈠嚭涓鸿礋
+ apiData.setJzsysl(sysData.getAmount());
+ if (LOSS_OVER_LOSS.equals(sysData.getType())) {
+ sysData.setType("2");
+ }
+ if (LOSS_OVER_OVER.equals(sysData.getType())) {
+ sysData.setType("3");
+ apiData.setJzsysl(0 - sysData.getAmount());
+ }
+ apiData.setRkjz(sysData.getRkjz());
+ apiData.setCkjz(sysData.getCkjz());
+ apiData.setRksj(sysData.getRksj());
+ apiData.setCksj(sysData.getCksj());
+ apiData.setCcsc(sysData.getCcsc());
+
+ apiData.setRksf(sysData.getRksf());
+ apiData.setRkzz(sysData.getRkzz());
+ apiData.setCksf(sysData.getCksf());
+ apiData.setCkzz(sysData.getCkzz());
+ apiData.setQzszkl(sysData.getQzszkl());
+
+ BigDecimal bigDecimal = BigDecimal.valueOf(sysData.getQzzrshde());
+ apiData.setQzzrshde(bigDecimal.setScale(3, RoundingMode.UP).doubleValue());
+
+ apiData.setChsl(sysData.getChsl());
+ apiData.setCqqrbs(1);
+ apiData.setCqqrsj(sysData.getCqqrsj() == null ? DateUtils.addSeconds(sysData.getCksj(), 120) : sysData.getCqqrsj());
+ apiData.setSyhj("2");
+ apiData.setSysfzc(StringUtils.isEmpty(sysData.getSysfzc()) ? "0" : sysData.getSysfzc());
+ apiData.setSfch(sysData.getSfch());
+ apiData.setSyyy(sysData.getSyyy());
+ apiData.setCcshr(StringUtils.isEmpty(sysData.getCcshr()) ? "瀹℃牳浜�" : sysData.getCcshr());
+ apiData.setZjshr(StringUtils.isEmpty(sysData.getZjshr()) ? "瀹℃牳浜�" : sysData.getZjshr());
+ apiData.setTjshr(StringUtils.isEmpty(sysData.getTjshr()) ? "瀹℃牳浜�" : sysData.getTjshr());
+ apiData.setKjshr(StringUtils.isEmpty(sysData.getKjshr()) ? "瀹℃牳浜�" : sysData.getKjshr());
+ apiData.setLdshr(StringUtils.isEmpty(sysData.getLdshr()) ? "瀹℃牳浜�" : sysData.getLdshr());
+ apiData.setBz(StringUtils.isEmpty(sysData.getRemark()) ? "澶囨敞淇℃伅" : 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("---1209鎹熸孩淇℃伅鍚屾澶辫触----{}", e.toString());
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1210.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1210.java
new file mode 100644
index 0000000..944e6d4
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1210.java
@@ -0,0 +1,116 @@
+package com.fzzy.async.fzzy61.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1105;
+import com.fzzy.api.entity.Api1210;
+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.Api1210Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy61.entity.Fz61InoutVarietyChange;
+import com.fzzy.async.fzzy61.repository.Fzzy61Sync1210Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+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 Fzzy61Sync1210 {
+
+ @Autowired
+ private Fzzy61Sync1210Rep fzzySync1210Rep;
+ @Autowired
+ private Api1210Rep api1210Rep;
+ @Autowired
+ private ApiCommonService commonService;
+ @Autowired
+ private ApiTriggerService apiTriggerService;
+ @Autowired
+ private ApiLogRep apiLogRep;
+
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------1210鎬ц川杞彉鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ 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<Fz61InoutVarietyChange> list = fzzySync1210Rep.listVarietyChange(deptId, start, end);
+
+ if (null == list || list.isEmpty()) {
+ log.info("-------------娌℃湁鑾峰彇鍒版�ц川杞彉淇℃伅------------------");
+ return;
+ }
+
+ Api1210 apiData;
+ Api1105 api1105;
+ List<Api1210> api1210List;
+ for (Fz61InoutVarietyChange sysData : list) {
+ //鑾峰彇璐т綅淇℃伅
+ api1105 = commonService.getApi1105Cache(sysData.getDepotId());
+ if (null == api1105) {
+ continue;
+ }
+ apiData = new Api1210();
+ apiData.setLsxzzbdh(api1105.getHwdm() + sysData.getId());
+ apiData.setHwdm(api1105.getHwdm());
+ apiData.setLssl(sysData.getNumber());
+ apiData.setHzsl(sysData.getChangeNumber());
+ apiData.setBzwh(sysData.getApprovalId());
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
+ apiData.setLspzdm(mappingCode);
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());
+ apiData.setHzqlsxzdm(mappingCode);
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getNewFoodType());
+ apiData.setHzhlsxzdm(mappingCode);
+ apiData.setHzrq(sysData.getChangeTime());
+ apiData.setCcshr(StringUtils.isEmpty(sysData.getCcshr()) ? "瀹℃壒浜�" : sysData.getCcshr());
+ apiData.setZjshr(StringUtils.isEmpty(sysData.getZjshr()) ? "瀹℃壒浜�" : sysData.getZjshr());
+ apiData.setTjshr(StringUtils.isEmpty(sysData.getTjshr()) ? "瀹℃壒浜�" : sysData.getTjshr());
+ apiData.setKjshr(StringUtils.isEmpty(sysData.getKjshr()) ? "瀹℃壒浜�" : sysData.getKjshr());
+ apiData.setLdshr(StringUtils.isEmpty(sysData.getLdshr()) ? "瀹℃壒浜�" : sysData.getLdshr());
+ apiData.setBz(sysData.getRemark());
+ apiData.setZhgxsj(new Date());
+
+ //涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
+ apiData.setBizId(sysData.getId());
+ apiData.setKqdm(kqdm);
+ apiData.setSyncTime(new Date());
+ api1210List = api1210Rep.getDataById(apiData.getLsxzzbdh());
+ if (null == api1210List || api1210List.isEmpty()) {
+ apiData.setCzbz(Constant.CZBZ_I);
+ } else {
+ if (StringUtils.isNotEmpty(api1210List.get(0).getJhmxdh())) {
+ apiData.setJhmxdh(api1210List.get(0).getJhmxdh());
+ }
+ apiData.setCzbz(api1210List.get(0).getCzbz());
+ }
+ //淇濆瓨鏁版嵁
+ api1210Rep.save(apiData);
+
+ }
+
+ } catch (Exception e) {
+ log.error("---1210鎬ц川杞彉鍚屾澶辫触----{}", e.toString());
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1211.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1211.java
new file mode 100644
index 0000000..6a4b22e
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1211.java
@@ -0,0 +1,121 @@
+package com.fzzy.async.fzzy61.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1105;
+import com.fzzy.api.entity.Api1211;
+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.Api1211Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy61.entity.Fz61DepotBookStore;
+import com.fzzy.async.fzzy61.repository.Fzzy61Sync1211Rep;
+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 czt
+ * 璐﹂潰搴撳瓨
+ */
+@Slf4j
+@Component
+public class Fzzy61Sync1211 {
+
+ @Autowired
+ private Fzzy61Sync1211Rep fzzy61Sync1211Rep;
+ @Autowired
+ private ApiTriggerService apiTriggerService;
+ @Autowired
+ private Api1211Rep api1211Rep;
+ @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("-------------1211璐﹂潰搴撳瓨鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1208);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz61DepotBookStore> list = fzzy61Sync1211Rep.listDepot(deptId, start, end);
+ if (null == list || list.isEmpty()) {
+ log.info("-------------娌℃湁鑾峰彇鍒拌处闈㈠簱瀛樹俊鎭�------------------");
+ return;
+ }
+
+ Api1211 apiData;
+ Api1105 api1105;
+ List<Api1211> api1211List;
+ for (Fz61DepotBookStore fz61DepotBookStore : list) {
+
+ //鑾峰彇璐т綅淇℃伅
+ api1105 = commonService.getApi1105Cache(fz61DepotBookStore.getDepotId());
+ if (null == api1105) {
+ continue;
+ }
+
+ apiData = new Api1211();
+ apiData.setId(fz61DepotBookStore.getId());
+ apiData.setBizId(fz61DepotBookStore.getId());
+ apiData.setKqdm(kqdm);
+ apiData.setHwdm(api1105.getHwdm());
+
+ //绮鍝佺
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz61DepotBookStore.getLspzdm());
+ apiData.setLspzdm(mappingCode);
+
+ //绮鎬ц川
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, fz61DepotBookStore.getLsxzdm());
+ apiData.setLsxzdm(mappingCode);
+ apiData.setNd(fz61DepotBookStore.getNd());
+ apiData.setYf(fz61DepotBookStore.getYf());
+ apiData.setQcsl(fz61DepotBookStore.getQcsl() == null ? 0.0 : fz61DepotBookStore.getQcsl());
+ apiData.setBqsrsl(fz61DepotBookStore.getBqsrsl() == null ? 0.0 : fz61DepotBookStore.getBqsrsl());
+ apiData.setBqzcsl(fz61DepotBookStore.getBqzcsl() == null ? 0.0 : fz61DepotBookStore.getBqzcsl());
+ apiData.setQmye(fz61DepotBookStore.getQmye() == null ? 0.0 : fz61DepotBookStore.getQmye());
+ //鏈堢粨鏍囧織涓虹┖鍒欓粯璁ょ粰0-鏈堢粨
+ if (null == fz61DepotBookStore.getYjbz()) {
+ fz61DepotBookStore.setYjbz(0);
+ }
+ apiData.setYjbz(fz61DepotBookStore.getYjbz());
+ apiData.setYwrq(fz61DepotBookStore.getYwrq());
+ apiData.setZhgxsj(new Date());
+
+ api1211List = api1211Rep.getDataByBizId(apiData.getBizId());
+ if (null == api1211List || api1211List.isEmpty()) {
+ apiData.setCzbz(Constant.CZBZ_I);
+ } else {
+ apiData.setCzbz(api1211List.get(0).getCzbz());
+ }
+
+ //淇濆瓨鏁版嵁
+ api1211Rep.save(apiData);
+ }
+
+ } catch (Exception e) {
+ log.error("---1211璐﹂潰搴撳瓨鍚屾澶辫触----{}", e.toString());
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1212.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1212.java
new file mode 100644
index 0000000..78809a7
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1212.java
@@ -0,0 +1,120 @@
+package com.fzzy.async.fzzy61.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1101;
+import com.fzzy.api.entity.Api1102;
+import com.fzzy.api.entity.Api1212;
+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.Api1212Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy61.entity.Fz61InoutCustomer;
+import com.fzzy.async.fzzy61.repository.Fzzy61Sync1212Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 瀹㈡埛淇℃伅鏁版嵁鎺ュ彛
+ */
+@Slf4j
+@Component
+public class Fzzy61Sync1212 {
+
+ @Autowired
+ private Fzzy61Sync1212Rep fzzySync1212Rep;
+ @Autowired
+ private Api1102Rep api1102Rep;
+ @Autowired
+ private Api1212Rep api1212Rep;
+ @Autowired
+ private Api1101Rep api1101Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+
+ /**
+ * 鍚屾瀹㈡埛鎺ュ彛
+ *
+ * @param deptId
+ * @param start
+ * @param end
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+
+ log.info("-------------1212瀹㈡埛淇℃伅鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1201);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz61InoutCustomer> list = fzzySync1212Rep.listInoutCustomer(deptId, start, end);
+
+ if (null == list || list.isEmpty()) {
+ log.debug("-------------娌℃湁鑾峰彇鍒板鎴蜂俊鎭�------------------");
+ return;
+ }
+
+ //鏍规嵁搴撳尯浠ｇ爜鑾峰彇鍗曚綅浠ｇ爜
+ Api1102 api1102 = api1102Rep.findById(kqdm).get();
+ Api1101 api1101 = api1101Rep.findById(api1102.getDwdm()).get();
+
+ Api1212 apiData;
+ List<Api1212> api1212List;
+ for (Fz61InoutCustomer sysData : list) {
+
+ apiData = new Api1212();
+ //鍗曚綅浠ｇ爜
+ apiData.setId(sysData.getKhbh());
+ apiData.setDwdm(api1101.getDwdm());
+ apiData.setDwmc(api1101.getDwmc());
+ apiData.setKqdm(api1102.getKqdm());
+ apiData.setKqmc(api1102.getKqmc());
+ apiData.setKhlx(sysData.getKhlx());
+ apiData.setKhtyshxydmhsfzh(sysData.getKhbh());
+ apiData.setKhmc(sysData.getName());
+ apiData.setFddbr(StringUtils.isEmpty(sysData.getFddbr()) ? "娉曚汉" : sysData.getFddbr());
+ apiData.setTxdz(StringUtils.isEmpty(sysData.getAddress()) ? "鍗曚綅鍦板潃" : sysData.getAddress());
+
+ apiData.setLxrxm(StringUtils.isEmpty(sysData.getContactUser()) ? sysData.getFddbr() : sysData.getContactUser());
+ apiData.setLxrdh(StringUtils.isEmpty(sysData.getPhone()) ? "" : sysData.getPhone());
+ if (StringUtils.isNotEmpty(sysData.getCardId())) {
+ apiData.setLxrsfzh(sysData.getCardId());
+ }
+ apiData.setYzbm(StringUtils.isEmpty(sysData.getYzbm()) ? "000000" : sysData.getYzbm());
+ apiData.setDzyx(StringUtils.isEmpty(sysData.getDzyx()) ? "" : sysData.getDzyx());
+ apiData.setKhfkhh(StringUtils.isEmpty(sysData.getBank()) ? "999" : sysData.getBank());
+ apiData.setKhfzh(StringUtils.isEmpty(sysData.getBankNum()) ? "" : sysData.getBankNum());
+ apiData.setZhgxsj(sysData.getUpdateTime() == null ? new Date() : sysData.getUpdateTime());
+ apiData.setBizId(sysData.getId());
+
+
+ api1212List = api1212Rep.getDataById(apiData.getId());
+ if (null == api1212List || api1212List.isEmpty()) {
+ apiData.setCzbz(Constant.CZBZ_I);
+ } else {
+ apiData.setCzbz(api1212List.get(0).getCzbz());
+ }
+
+ //淇濆瓨鏁版嵁
+ api1212Rep.save(apiData);
+
+ log.info("1212鍚堝悓淇℃伅---鍚屾鏁版嵁锛歿}", apiData.toString());
+ }
+ } catch (Exception e) {
+ log.error("---1212鍚堝悓淇℃伅鍚屾鎵ц澶辫触----{}", e.toString());
+ apiLog.setResult("鍚屾鍚堝悓淇℃伅澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1213.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1213.java
new file mode 100644
index 0000000..1f7aa52
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1213.java
@@ -0,0 +1,130 @@
+package com.fzzy.async.fzzy61.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1105;
+import com.fzzy.api.entity.Api1213;
+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.Api1213Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy61.entity.Fz61DepotStatusConfirm;
+import com.fzzy.async.fzzy61.repository.Fzzy61Sync1213Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author czt
+ * 灏佷粨纭鍗�
+ */
+@Slf4j
+@Component
+public class Fzzy61Sync1213 {
+
+ @Autowired
+ private Fzzy61Sync1213Rep fzzy61Sync1213Rep;
+ @Autowired
+ private ApiTriggerService apiTriggerService;
+ @Autowired
+ private Api1213Rep api1213Rep;
+ @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("-------------1213灏佷粨纭淇℃伅鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1208);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz61DepotStatusConfirm> list = fzzy61Sync1213Rep.listData(deptId, start, end);
+ if (null == list || list.isEmpty()) {
+ log.info("-------------娌℃湁鑾峰彇鍒板皝浠撶‘璁や俊鎭�------------------");
+ return;
+ }
+
+ Api1213 apiData;
+ Api1105 api1105;
+ List<Api1213> api1213List;
+ for (Fz61DepotStatusConfirm depotStatusConfirm : list) {
+
+ //鑾峰彇璐т綅淇℃伅
+ api1105 = commonService.getApi1105Cache(depotStatusConfirm.getDepotId());
+ if (null == api1105) {
+ continue;
+ }
+
+ apiData = new Api1213();
+ BeanUtils.copyProperties(depotStatusConfirm, apiData);
+ apiData.setFcqrdh(depotStatusConfirm.getFcqrdh());
+ apiData.setBizId(depotStatusConfirm.getFcqrdh());
+ apiData.setKqdm(kqdm);
+ apiData.setHwdm(api1105.getHwdm());
+
+ //绮鍝佺
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, depotStatusConfirm.getFoodVariety().substring(0, 3));
+ apiData.setLspzdm(mappingCode);
+
+ //绮鎬ц川
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, depotStatusConfirm.getFoodType());
+ apiData.setLsxzdm(mappingCode);
+ //绮绛夌骇
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSDJ, depotStatusConfirm.getFoodLevel());
+ apiData.setLsdjdm(mappingCode);
+ //浜у湴浠ｇ爜
+ mappingCode = commonService.getFoodLocationIdFromCache(depotStatusConfirm.getFoodLocation());
+ if (StringUtils.isEmpty(mappingCode)) {
+ mappingCode = apiData.getHwdm().substring(2, 8);
+ }
+ apiData.setCd(mappingCode);
+ //骞村害
+ apiData.setShnd(depotStatusConfirm.getFoodYear());
+ if (StringUtils.isEmpty(depotStatusConfirm.getCountry())) {
+ apiData.setGb("156");
+ }
+ apiData.setBgy(depotStatusConfirm.getStoreKeeperName());
+ apiData.setFcsqr(depotStatusConfirm.getApplyUser());
+ apiData.setBmshr(depotStatusConfirm.getDeptAuditUser());
+ apiData.setLdshr(depotStatusConfirm.getLeaderAuditUser());
+ apiData.setZhgxsj(new Date());
+
+ api1213List = api1213Rep.getDataById(apiData.getBizId());
+ if (null == api1213List || api1213List.isEmpty()) {
+ apiData.setCzbz(Constant.CZBZ_I);
+ } else {
+ apiData.setCzbz(api1213List.get(0).getCzbz());
+ }
+
+ //淇濆瓨鏁版嵁
+ api1213Rep.save(apiData);
+ }
+
+ } catch (Exception e) {
+ log.error("---1213灏佷粨纭淇℃伅鍚屾澶辫触----{}", e.toString());
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync2102.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync2102.java
new file mode 100644
index 0000000..b0eebcd
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync2102.java
@@ -0,0 +1,136 @@
+package com.fzzy.async.fzzy61.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1102;
+import com.fzzy.api.entity.Api1105;
+import com.fzzy.api.entity.ApiInfoData;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1102Rep;
+import com.fzzy.api.view.repository.ApiInfoDataRep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy61.entity.Fz61InoutStockChange;
+import com.fzzy.async.fzzy61.repository.Fzzy61Sync1207Rep;
+import com.fzzy.push.sh2023.SH2023Constant;
+import com.fzzy.push.sh2023.dto.SH2023Api2102;
+import com.fzzy.push.sh2023.dto.ShAreaBjw;
+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 czt
+ */
+@Slf4j
+@Component
+public class Fzzy61Sync2102 {
+
+ @Autowired
+ private Fzzy61Sync1207Rep fzzySync1207Rep;
+ @Autowired
+ private ApiCommonService commonService;
+ @Autowired
+ private Api1102Rep api1102Rep;
+ @Autowired
+ private ApiInfoDataRep apiInfoDataRep;
+ @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("-------------2101鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(SH2023Constant.SH_2023_API_CODE_2101);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz61InoutStockChange> list = fzzySync1207Rep.listStockChange(deptId, start, end);
+ if (null == list || list.isEmpty()) {
+ log.info("-------------娌℃湁鑾峰彇鍒板�掍粨鍊掑叆淇℃伅------------------");
+ return;
+ }
+
+ SH2023Api2102 apiData;
+ Api1105 api1105;
+ List<ApiInfoData> apiInfoDataList;
+ List<Api1102> api1102List = api1102Rep.findPushData(kqdm);
+ String bjw = "";
+ if (null != api1102List && api1102List.size() > 0) {
+ bjw = ShAreaBjw.getBjw(api1102List.get(0).getXzqhdm());
+ }
+ Api1105 api1105In;
+ Api1105 api1105Out;
+ for (Fz61InoutStockChange sysData : list) {
+ //鑾峰彇璐т綅淇℃伅
+ api1105Out = commonService.getApi1105Cache(sysData.getDepotIdOut());
+ if (null == api1105Out) {
+ continue;
+ }
+ //鑾峰彇璐т綅淇℃伅
+ api1105In = commonService.getApi1105Cache(sysData.getDepotIdIn());
+ if (null == api1105In) {
+ continue;
+ }
+ apiData = new SH2023Api2102();
+ apiData.setDrdh(kqdm + sysData.getId());
+ apiData.setDrdw(kqdm);
+ apiData.setDrhwdm(api1105In.getHwdm());
+ apiData.setDrhwsl(sysData.getNumber());
+ apiData.setDcrq(sysData.getChangeDate());
+ apiData.setZhgxsj(sysData.getUpdateTime());
+ apiData.setBjw(bjw);
+
+
+ //鎸佷箙鍖栦繚瀛橈紝鍗曠嫭瀛樺叆闈炲浗鏍囨帴鍙ｈ〃
+ ApiInfoData infoData = new ApiInfoData();
+ infoData.setId(ContextUtil.getUUID());
+ infoData.setKqdm(kqdm);
+ infoData.setInteType(Constant.API_CATEGORY_12);
+ infoData.setInteId(SH2023Constant.SH_2023_API_CODE_2102);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(apiData.getDrdh());
+ infoData.setRemarks("鍊掍粨鍊掑叆");
+
+ //璁剧疆鎿嶄綔鏍囧織
+ apiInfoDataList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2101, infoData.getDataId(), kqdm);
+ if (null == apiInfoDataList || apiInfoDataList.isEmpty()) {
+ infoData.setCzbz(Constant.CZBZ_I);
+ apiData.setCzbz(Constant.CZBZ_I);
+ } else {
+ infoData.setCzbz(apiInfoDataList.get(0).getCzbz());
+ apiData.setCzbz(apiInfoDataList.get(0).getCzbz());
+ }
+
+ infoData.setData(JSON.toJSONString(apiData));
+ apiInfoDataRep.save(infoData);
+
+ log.info("2102---鍊掍粨鍊掑叆-鍚屾鏁版嵁锛歿}", apiData);
+
+ }
+
+ } catch (Exception e) {
+ log.error("---鍊掍粨鍊掑叆鍚屾鎵ц澶辫触----{}", e.toString());
+ apiLog.setResult("鍊掍粨鍊掑叆澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1107Rep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1107Rep.java
new file mode 100644
index 0000000..18c3612
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1107Rep.java
@@ -0,0 +1,18 @@
+package com.fzzy.async.fzzy61.repository;
+
+import com.fzzy.async.fzzy61.entity.Fz61DeptDevice;
+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 Fzzy61Sync1107Rep extends JpaRepository<Fz61DeptDevice, String> {
+ @Query("from Fz61DeptDevice where deptId =:deptId order by sbbh")
+ List<Fz61DeptDevice> listDevice(@Param("deptId") String deptId);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1108Rep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1108Rep.java
new file mode 100644
index 0000000..979b35d
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1108Rep.java
@@ -0,0 +1,20 @@
+package com.fzzy.async.fzzy61.repository;
+
+import com.fzzy.async.fzzy61.entity.Fz61Drug;
+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 Fzzy61Sync1108Rep extends JpaRepository<Fz61Drug, String> {
+
+ @Query("from Fz61Drug where deptId=:deptId and updateTime >=:start and updateTime <:end order by updateTime ")
+ List<Fz61Drug> listDrug(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1109Rep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1109Rep.java
new file mode 100644
index 0000000..4722d7f
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1109Rep.java
@@ -0,0 +1,27 @@
+package com.fzzy.async.fzzy61.repository;
+
+import com.fzzy.async.fzzy61.entity.Fz61FileInfo;
+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 Fzzy61Sync1109Rep extends JpaRepository<Fz61FileInfo, String> {
+ /**
+ * 鏍规嵁淇℃伅鏂囦欢淇℃伅
+ *
+ * @param start
+ * @param end
+ * @return
+ */
+ @Query("from Fz61FileInfo where createTime >=:start and createTime <:end order by createTime ")
+ List<Fz61FileInfo> listFileInfo(@Param("start") Date start, @Param("end") Date end);
+
+ @Query("from Fz61FileInfo where bizId =:bizId order by createTime ")
+ List<Fz61FileInfo> listFileInfoByBizId(@Param("bizId") String bizId);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1111Rep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1111Rep.java
new file mode 100644
index 0000000..1d77541
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1111Rep.java
@@ -0,0 +1,25 @@
+package com.fzzy.async.fzzy61.repository;
+
+import com.fzzy.async.fzzy40.entity.Fz40SecCamera;
+import com.fzzy.async.fzzy61.entity.Fz61SecCamera;
+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;
+
+/**
+ * 鐩戞帶淇℃伅
+ */
+public interface Fzzy61Sync1111Rep extends JpaRepository<Fz61SecCamera, String> {
+
+ /**
+ * 鑾峰彇鎽勫儚澶翠俊鎭�
+ *
+ * @return
+ */
+ @Query("from Fz61SecCamera where deptId=:deptId and updateTime >=:start and updateTime <:end order by ip ")
+ List<Fz61SecCamera> listCamera(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1112Rep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1112Rep.java
new file mode 100644
index 0000000..b43821c
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1112Rep.java
@@ -0,0 +1,18 @@
+package com.fzzy.async.fzzy61.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 Fzzy61Sync1112Rep 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/fzzy61/repository/Fzzy61Sync1201Rep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1201Rep.java
new file mode 100644
index 0000000..028994b
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1201Rep.java
@@ -0,0 +1,25 @@
+package com.fzzy.async.fzzy61.repository;
+
+import com.fzzy.async.fzzy61.entity.Fz61InoutContract;
+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;
+
+/**
+ * 绮璐攢-鍚堝悓淇℃伅鏁版嵁鎺ュ彛鏁版嵁鑾峰彇
+ */
+public interface Fzzy61Sync1201Rep extends JpaRepository<Fz61InoutContract, String> {
+
+ /**
+ * 鏍规嵁淇℃伅鑾峰彇鍚堝悓淇℃伅
+ *
+ * @param start
+ * @param end
+ * @return
+ */
+ @Query("from Fz61InoutContract where deptId=:deptId and updateTime >=:start and updateTime <:end order by updateTime ")
+ List<Fz61InoutContract> listContract(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1202Rep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1202Rep.java
new file mode 100644
index 0000000..988d67d
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1202Rep.java
@@ -0,0 +1,57 @@
+package com.fzzy.async.fzzy61.repository;
+
+import com.fzzy.async.fzzy61.entity.Fz61InoutRecord;
+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 chen
+ * @date 2022-09-23 17:10
+ */
+public interface Fzzy61Sync1202Rep extends JpaRepository<Fz61InoutRecord, String> {
+
+ /**
+ * 鏍规嵁淇℃伅鑾峰彇鍑哄叆搴撲俊鎭�
+ *
+ * @param deptId
+ * @param type
+ * @param start
+ * @param end
+ * @return
+ */
+ @Query("from Fz61InoutRecord where deptId=:deptId and type=:type and updateTime >=:start and updateTime <=:end order by id ")
+ List<Fz61InoutRecord> listInoutRecord(@Param("deptId") String deptId, @Param("type") String type, @Param("start") Date start, @Param("end") Date end);
+
+ /**
+ * 鏍规嵁id鑾峰彇绮鍑哄叆搴撲俊鎭�
+ *
+ * @param id
+ * @return
+ */
+ @Query("from Fz61InoutRecord where id=:id order by updateTime ")
+ List<Fz61InoutRecord> listInoutRecordById(@Param("id") String id);
+
+
+ /**
+ * 鏍规嵁淇℃伅鑾峰彇鍑哄叆搴撲俊鎭�
+ *
+ * @param deptId
+ * @param start
+ * @param end
+ * @return
+ */
+ @Query("from Fz61InoutRecord where deptId=:deptId and updateTime >=:start and updateTime <:end order by id ")
+ List<Fz61InoutRecord> listInoutRecord(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);
+
+
+ @Query("from Fz61InoutRecord where deptId=:deptId and (type=:type1 or type=:type2) and updateTime >=:start and updateTime <=:end order by id ")
+ List<Fz61InoutRecord> listInAndOutRecord(@Param("deptId") String deptId, @Param("type1") String type1, @Param("type2") String type2, @Param("start") Date start, @Param("end") Date end);
+
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1203Rep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1203Rep.java
new file mode 100644
index 0000000..879ad58
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1203Rep.java
@@ -0,0 +1,23 @@
+package com.fzzy.async.fzzy61.repository;
+
+import com.fzzy.async.fzzy61.entity.Fz61CheckItem;
+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;
+
+/**
+ * 绮鍏ュ簱璐ㄦ
+ */
+public interface Fzzy61Sync1203Rep extends JpaRepository<Fz61CheckItem, String> {
+
+ /**
+ * 鏍规嵁鍏ュ簱妫�楠岀紪鐮佽幏鍙栨楠屼俊鎭�
+ *
+ * @param checkId
+ * @return
+ */
+ @Query("from Fz61CheckItem where checkId=:checkId and companyId=:companyId order by standardId")
+ List<Fz61CheckItem> listInoutCheckItem(@Param("checkId") String checkId, @Param("companyId") String companyId);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1204Rep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1204Rep.java
new file mode 100644
index 0000000..e654fb7
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1204Rep.java
@@ -0,0 +1,28 @@
+package com.fzzy.async.fzzy61.repository;
+
+import com.fzzy.async.fzzy61.entity.Fz61InoutSettle;
+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 Fzzy61Sync1204Rep extends JpaRepository<Fz61InoutSettle, String> {
+ /**
+ * 鑾峰彇鍑哄叆搴撶粨绠椾俊鎭�
+ *
+ * @param type
+ * @param start
+ * @param end
+ * @return
+ */
+ @Query("from Fz61InoutSettle where deptId=:deptId and inoutType=:type and updateTime >=:start and updateTime <:end order by updateTime ")
+ List<Fz61InoutSettle> listInoutSettle(@Param("deptId") String deptId, @Param("type") String type, @Param("start") Date start, @Param("end") Date end);
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1207Rep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1207Rep.java
new file mode 100644
index 0000000..834992c
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1207Rep.java
@@ -0,0 +1,27 @@
+package com.fzzy.async.fzzy61.repository;
+
+import com.fzzy.async.fzzy61.entity.Fz61InoutStockChange;
+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 Fzzy61Sync1207Rep extends JpaRepository<Fz61InoutStockChange, String> {
+
+ /**
+ * 鏍规嵁淇℃伅鑾峰彇鍊掍粨淇℃伅
+ *
+ * @param start
+ * @param end
+ * @return
+ */
+ @Query("from Fz61InoutStockChange where deptId=:deptId and updateTime >=:start and updateTime <:end order by changeDate ")
+ List<Fz61InoutStockChange> listStockChange(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1208Rep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1208Rep.java
new file mode 100644
index 0000000..79406cd
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1208Rep.java
@@ -0,0 +1,23 @@
+package com.fzzy.async.fzzy61.repository;
+
+import com.fzzy.async.fzzy61.entity.Fz61DepotStore;
+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;
+
+/**
+ * 绮璐攢-绮搴撳瓨
+ */
+public interface Fzzy61Sync1208Rep extends JpaRepository<Fz61DepotStore, String> {
+
+ /**
+ * 鏍规嵁淇℃伅鑾峰彇浠撳簱淇℃伅
+ *
+ * @return
+ */
+ @Query("from Fz61DepotStore where deptId=:deptId and updateDate >=:start and updateDate <:end order by updateDate ")
+ List<Fz61DepotStore> listDepot(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1209Rep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1209Rep.java
new file mode 100644
index 0000000..02c2ee3
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1209Rep.java
@@ -0,0 +1,26 @@
+package com.fzzy.async.fzzy61.repository;
+
+import com.fzzy.async.fzzy61.entity.Fz61InoutLossOver;
+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 Fzzy61Sync1209Rep extends JpaRepository<Fz61InoutLossOver, String> {
+ /**
+ * 鏍规嵁淇℃伅鑾峰彇鎹熸孩淇℃伅
+ *
+ * @param start
+ * @param end
+ * @return
+ */
+ @Query("from Fz61InoutLossOver where deptId=:deptId and updateTime >=:start and updateTime <:end order by updateTime ")
+ List<Fz61InoutLossOver> listMLossOver(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1210Rep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1210Rep.java
new file mode 100644
index 0000000..e67d400
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1210Rep.java
@@ -0,0 +1,17 @@
+package com.fzzy.async.fzzy61.repository;
+
+import com.fzzy.async.fzzy61.entity.Fz61InoutVarietyChange;
+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 Fzzy61Sync1210Rep extends JpaRepository<Fz61InoutVarietyChange, String> {
+ @Query("from Fz61InoutVarietyChange where deptId=:deptId and updateTime >=:start and updateTime <:end order by updateTime ")
+ List<Fz61InoutVarietyChange> listVarietyChange(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1211Rep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1211Rep.java
new file mode 100644
index 0000000..434c412
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1211Rep.java
@@ -0,0 +1,23 @@
+package com.fzzy.async.fzzy61.repository;
+
+import com.fzzy.async.fzzy61.entity.Fz61DepotBookStore;
+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;
+
+/**
+ * 绮璐攢-璐﹂潰搴撳瓨
+ */
+public interface Fzzy61Sync1211Rep extends JpaRepository<Fz61DepotBookStore, String> {
+
+ /**
+ * 鏍规嵁搴撳尯缂栫爜鍙婃椂闂磋幏鍙栬处闈㈠簱瀛樹俊鎭�
+ *
+ * @return
+ */
+ @Query("from Fz61DepotBookStore where deptId=:deptId and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Fz61DepotBookStore> listDepot(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1212Rep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1212Rep.java
new file mode 100644
index 0000000..56e7ff4
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1212Rep.java
@@ -0,0 +1,29 @@
+package com.fzzy.async.fzzy61.repository;
+
+import com.fzzy.async.fzzy61.entity.Fz61InoutCustomer;
+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;
+
+/**
+ * 绮璐攢-瀹㈡埛淇℃伅鏁版嵁鎺ュ彛鏁版嵁鑾峰彇
+ */
+public interface Fzzy61Sync1212Rep extends JpaRepository<Fz61InoutCustomer, String> {
+
+ /**
+ * 鏍规嵁淇℃伅鑾峰彇瀹㈡埛鍗曚綅淇℃伅
+ *
+ * @return
+ */
+ @Query("from Fz61InoutCustomer where deptId=:deptId order by id ")
+ List<Fz61InoutCustomer> listInoutCustomer(@Param("deptId") String deptId);
+
+ @Query("from Fz61InoutCustomer where deptId=:deptId and updateTime >=:start and updateTime <=:end order by id ")
+ List<Fz61InoutCustomer> listInoutCustomer(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);
+
+ @Query("from Fz61InoutCustomer where id=:id order by id ")
+ List<Fz61InoutCustomer> getDataById(@Param("id") String id);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1213Rep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1213Rep.java
new file mode 100644
index 0000000..cba0b6c
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61Sync1213Rep.java
@@ -0,0 +1,24 @@
+package com.fzzy.async.fzzy61.repository;
+
+import com.fzzy.async.fzzy61.entity.Fz61DepotStatusConfirm;
+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;
+
+/**
+ * 绮璐攢-璐﹂潰搴撳瓨
+ */
+public interface Fzzy61Sync1213Rep extends JpaRepository<Fz61DepotStatusConfirm, String> {
+
+ /**
+ * 鏍规嵁搴撳尯缂栫爜鍙婃椂闂磋幏鍙栬处闈㈠簱瀛樹俊鎭�
+ *
+ * @return
+ */
+ @Query("from Fz61DepotStatusConfirm where deptId=:deptId and updateTime >=:start and updateTime <:end order by updateTime ")
+ List<Fz61DepotStatusConfirm> listData(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61SyncInoutRecordItemRep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61SyncInoutRecordItemRep.java
new file mode 100644
index 0000000..51eb8c0
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61SyncInoutRecordItemRep.java
@@ -0,0 +1,26 @@
+package com.fzzy.async.fzzy61.repository;
+
+import com.fzzy.async.fzzy61.entity.Fz61InoutRecordItem;
+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 czt
+ *
+ * @date 2023-08-21
+ */
+public interface Fzzy61SyncInoutRecordItemRep extends JpaRepository<Fz61InoutRecordItem, String> {
+
+ /**
+ * 鏍规嵁浠撳簱缂栫爜鑾峰彇绮儏鍙傛暟閰嶇疆淇℃伅
+ * @param recordId
+ * @return
+ */
+ @Query("from Fz61InoutRecordItem where recordId =:recordId order by createTime ")
+ List<Fz61InoutRecordItem> findDataByRecordId(@Param("recordId") String recordId);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61SyncNoticeInRep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61SyncNoticeInRep.java
new file mode 100644
index 0000000..7de85a1
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61SyncNoticeInRep.java
@@ -0,0 +1,27 @@
+package com.fzzy.async.fzzy61.repository;
+
+import com.fzzy.async.fzzy61.entity.Fz61InoutNoticeIn;
+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 czt
+ * @date 2023-04-06 10:10
+ */
+public interface Fzzy61SyncNoticeInRep extends JpaRepository<Fz61InoutNoticeIn, String> {
+
+
+ /**
+ * 鏍规嵁id鑾峰彇鍏ュ簱閫氱煡鍗曚俊鎭�
+ * @param id
+ * @return
+ */
+ @Query("from Fz61InoutNoticeIn where id=:id ")
+ List<Fz61InoutNoticeIn> listInoutNoticeInById(@Param("id") String id);
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61SyncNoticeOutRep.java b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61SyncNoticeOutRep.java
new file mode 100644
index 0000000..a292883
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/repository/Fzzy61SyncNoticeOutRep.java
@@ -0,0 +1,27 @@
+package com.fzzy.async.fzzy61.repository;
+
+import com.fzzy.async.fzzy61.entity.Fz61InoutNoticeOut;
+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 czt
+ * @date 2023-04-06 10:10
+ */
+public interface Fzzy61SyncNoticeOutRep extends JpaRepository<Fz61InoutNoticeOut, String> {
+
+
+ /**
+ * 鏍规嵁id鑾峰彇鍑哄簱閫氱煡鍗曚俊鎭�
+ * @param id
+ * @return
+ */
+ @Query("from Fz61InoutNoticeOut where id=:id ")
+ List<Fz61InoutNoticeOut> listInoutNoticeOutById(@Param("id") String id);
+
+}
--
Gitblit v1.9.3