From 550b14e27b9bba40e80f1141d0943d1dc62acbbc Mon Sep 17 00:00:00 2001
From: 陈战涛 <chenzhantao7055@sina.com>
Date: 星期一, 22 五月 2023 15:26:55 +0800
Subject: [PATCH] 优化广东粮食购销接口
---
src/main/java/com/fzzy/api/utils/FileUtil.java | 2
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java | 3
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java | 16 ++-
src/main/java/com/fzzy/api/view/Api1202.view.xml | 8 --
src/main/java/com/fzzy/api/entity/Api1202.java | 9 +-
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java | 22 +++--
src/main/java/com/fzzy/api/entity/Api1205.java | 8 -
src/main/java/com/fzzy/async/fzzy35/entity/Fz35InoutRecord.java | 27 ++----
src/main/java/com/fzzy/api/view/Api1205.view.xml | 3
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java | 34 +++++---
src/main/java/com/fzzy/api/view/repository/Api1205Rep.java | 4 +
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java | 8 +
src/main/java/com/fzzy/api/view/repository/Api1201Rep.java | 4 +
src/main/java/com/fzzy/api/view/repository/Api1202Rep.java | 4 +
src/main/java/com/fzzy/api/view/repository/Api1109Rep.java | 4 +
src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023PushService12.java | 5 -
src/main/java/com/fzzy/api/view/repository/Api1203Rep.java | 4 +
src/main/java/com/fzzy/api/entity/Api1203.java | 6 -
src/main/java/com/fzzy/api/view/pr/Api1202PR.java | 2
src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1203Rep.java | 2
src/main/java/com/fzzy/api/view/pr/Api1205PR.java | 2
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1201.java | 10 +-
src/main/java/com/fzzy/api/view/pr/Api1203PR.java | 2
src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java | 2
src/main/java/com/fzzy/api/view/Api1203.view.xml | 5 -
25 files changed, 106 insertions(+), 90 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1202.java b/src/main/java/com/fzzy/api/entity/Api1202.java
index 633e84e..17cffde 100644
--- a/src/main/java/com/fzzy/api/entity/Api1202.java
+++ b/src/main/java/com/fzzy/api/entity/Api1202.java
@@ -27,12 +27,13 @@
public static String SORT_PROP = "rkywdh";
- @Id
- @JSONField(serialize = false)
- @Column(name = "id", length = 40)
- private String id;
+// @Id
+// @JSONField(serialize = false)
+// @Column(name = "id", length = 40)
+// private String id;
//12 浣嶆暟瀛楃粍鎴愶紝绗� 1-2 浣嶄负涓氬姟浠ｇ爜锛�14浠ｈ〃绮鍏ュ簱锛夛紝绗� 3-8 浣嶄緷娆′负骞翠唤鐨勫悗涓や綅銆�2 浣嶆湀浠姐��2 浣嶆棩鏈燂紝鍚庡洓浣嶄负椤哄簭鐮併�備緥濡傦細141605041234
+ @Id
@PropertyDef(label = "鍏ュ簱涓氬姟鍗曞彿")
@Column(name = "rkywdh", length = 12, nullable = false)
private String rkywdh;
diff --git a/src/main/java/com/fzzy/api/entity/Api1203.java b/src/main/java/com/fzzy/api/entity/Api1203.java
index 5c913d4..414cce9 100644
--- a/src/main/java/com/fzzy/api/entity/Api1203.java
+++ b/src/main/java/com/fzzy/api/entity/Api1203.java
@@ -27,12 +27,8 @@
public static String SORT_PROP = "rkjydh";
- @Id
- @JSONField(serialize = false)
- @Column(name = "id", length = 40)
- private String id;
-
//鍏ュ簱涓氬姟鍗曞彿鐢� 12 浣嶆暟瀛楃粍鎴愶紝绗� 1-2 浣嶄负涓氬姟浠ｇ爜锛�14浠ｈ〃绮鍏ュ簱锛夛紝绗� 3-8 浣嶄緷娆′负骞翠唤鐨勫悗涓や綅銆�2 浣嶆湀浠姐��2 浣嶆棩鏈燂紝鍚庡洓浣嶄负椤哄簭鐮併�備緥濡傦細141605041234
+ @Id
@PropertyDef(label = "鍏ュ簱妫�楠屽崟鍙�")
@Column(name = "rkjydh", length = 12, nullable = false)
private String rkjydh;
diff --git a/src/main/java/com/fzzy/api/entity/Api1205.java b/src/main/java/com/fzzy/api/entity/Api1205.java
index 0d51549..12f90ff 100644
--- a/src/main/java/com/fzzy/api/entity/Api1205.java
+++ b/src/main/java/com/fzzy/api/entity/Api1205.java
@@ -26,16 +26,10 @@
*/
private static final long serialVersionUID = -6381473449862569451L;
-
public static String SORT_PROP = "ckywdh";
-
- @JSONField(serialize = false)
- @Id
- @Column(name = "id", length = 40)
- private String id;
-
//涓氬姟鍗曞彿鐢� 12 浣嶆暟瀛楃粍鎴愶紝绗� 1-2 浣嶄负涓氬姟缂栫爜锛�15 浠ｈ〃绮鍑哄簱锛夛紝绗� 3-8 浣嶄緷娆′负骞翠唤鐨勫悗涓や綅銆�2 浣嶆湀浠姐��2浣嶆棩鏈燂紝鍚庡洓浣嶄负椤哄簭鐮併�備緥濡傦細141605041234
+ @Id
@PropertyDef(label = "鍑哄簱涓氬姟鍗曞彿")
@Column(name = "ckywdh", length = 12)
private String ckywdh;
diff --git a/src/main/java/com/fzzy/api/utils/FileUtil.java b/src/main/java/com/fzzy/api/utils/FileUtil.java
index 2a41907..2c1e52f 100644
--- a/src/main/java/com/fzzy/api/utils/FileUtil.java
+++ b/src/main/java/com/fzzy/api/utils/FileUtil.java
@@ -31,7 +31,7 @@
date = new Date();
}
- String basePath = configData.getFilePath() + "INOUT/"
+ String basePath = configData.getImgPath() + "INOUT/"
+ DateFormatUtils.format(date, "yyyyMM") + "/";
File file = new File(basePath);
diff --git a/src/main/java/com/fzzy/api/view/Api1202.view.xml b/src/main/java/com/fzzy/api/view/Api1202.view.xml
index c01c93e..430b5ef 100644
--- a/src/main/java/com/fzzy/api/view/Api1202.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1202.view.xml
@@ -276,9 +276,6 @@
<Property></Property>
<Property name="label">搴撳尯浠ｇ爜</Property>
</PropertyDef>
- <PropertyDef name="id">
- <Property name="dataType">Integer</Property>
- </PropertyDef>
<PropertyDef name="cchlx">
<Property/>
<Property name="label">杞﹁埞鍙风被鍨�</Property>
@@ -846,11 +843,6 @@
<AutoFormElement>
<Property name="name">bizId</Property>
<Property name="property">bizId</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">id</Property>
- <Property name="property">id</Property>
<Editor/>
</AutoFormElement>
</AutoForm>
diff --git a/src/main/java/com/fzzy/api/view/Api1203.view.xml b/src/main/java/com/fzzy/api/view/Api1203.view.xml
index 9ddde53..1f00d95 100644
--- a/src/main/java/com/fzzy/api/view/Api1203.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1203.view.xml
@@ -5,9 +5,6 @@
<Model>
<DataType name="dtMain">
<Property name="creationType">com.fzzy.api.entity.Api1203</Property>
- <PropertyDef name="id">
- <Property name="dataType">Integer</Property>
- </PropertyDef>
<PropertyDef name="rkjydh">
<Property></Property>
<Property name="label">鍏ュ簱妫�楠屽崟鍙�</Property>
@@ -21,7 +18,7 @@
<Property name="label">鍏ュ簱涓氬姟鍗曞彿</Property>
</PropertyDef>
<PropertyDef name="qysj">
- <Property name="dataType">Date</Property>
+ <Property name="dataType">DateTime</Property>
<Property name="label">鎵︽牱鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="qyrxm">
diff --git a/src/main/java/com/fzzy/api/view/Api1205.view.xml b/src/main/java/com/fzzy/api/view/Api1205.view.xml
index 9d67f1c..170321e 100644
--- a/src/main/java/com/fzzy/api/view/Api1205.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1205.view.xml
@@ -26,9 +26,6 @@
<Property></Property>
<Property name="label">搴撳尯浠ｇ爜</Property>
</PropertyDef>
- <PropertyDef name="id">
- <Property name="dataType">Integer</Property>
- </PropertyDef>
<PropertyDef name="ckywdh">
<Property></Property>
<Property name="label">鍑哄簱涓氬姟鍗曞彿</Property>
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1202PR.java b/src/main/java/com/fzzy/api/view/pr/Api1202PR.java
index 8d81643..c8efa98 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1202PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1202PR.java
@@ -130,7 +130,7 @@
@Expose
public String delData(Api1202 data) {
- apiRepository.deleteById(data.getId());
+ apiRepository.deleteById(data.getRkywdh());
return null;
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1203PR.java b/src/main/java/com/fzzy/api/view/pr/Api1203PR.java
index dccf249..cc6f12e 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1203PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1203PR.java
@@ -130,7 +130,7 @@
@Expose
public String delData(Api1203 data) {
if (null == data) return "鏃犳暟鎹墽琛�";
- apiRepository.deleteById(data.getBizId());
+ apiRepository.deleteById(data.getRkjydh());
return null;
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1205PR.java b/src/main/java/com/fzzy/api/view/pr/Api1205PR.java
index ac893f7..7dd9401 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1205PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1205PR.java
@@ -131,7 +131,7 @@
@Expose
public String delData(Api1205 data) {
if(null == data) return "鏃犳暟鎹墽琛�";
- apiRepository.deleteById(data.getId());
+ apiRepository.deleteById(data.getCkywdh());
return null;
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1109Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1109Rep.java
index 64f871d..e93b925 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1109Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1109Rep.java
@@ -1,6 +1,7 @@
package com.fzzy.api.view.repository;
import com.fzzy.api.entity.Api1109;
+import com.fzzy.api.entity.Api1202;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
@@ -19,4 +20,7 @@
@Modifying
@Query("update Api1109 set czbz =:czbz where id=:id")
void updateStatus(@Param("id") String id, @Param("czbz") String czbz);
+
+ @Query("from Api1109 where bizId=:bizId ")
+ List<Api1109> getDataByBizId(@Param("bizId") String bizId);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1201Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1201Rep.java
index 4b2bfe5..68fe964 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1201Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1201Rep.java
@@ -1,6 +1,7 @@
package com.fzzy.api.view.repository;
import com.fzzy.api.entity.Api1201;
+import com.fzzy.api.entity.Api1202;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
@@ -21,4 +22,7 @@
@Modifying
@Query("update Api1201 set czbz =:czbz where hth=:hth")
void updateStatus(@Param("hth") String hth, @Param("czbz") String czbz);
+
+ @Query("from Api1201 where hth=:hth ")
+ List<Api1201> getDataById(@Param("hth") String hth);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1202Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1202Rep.java
index 283f2b1..97be837 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1202Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1202Rep.java
@@ -2,6 +2,7 @@
import com.fzzy.api.entity.Api1202;
+import com.fzzy.api.entity.Api1208;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
@@ -21,4 +22,7 @@
@Modifying
@Query("update Api1202 set czbz =:czbz where rkywdh=:rkywdh")
int updateStatus(@Param("rkywdh") String rkywdh, @Param("czbz") String czbz);
+
+ @Query("from Api1202 where rkywdh=:rkywdh ")
+ List<Api1202> getDataById(@Param("rkywdh") String rkywdh);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1203Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1203Rep.java
index 0b4f05b..2813adc 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1203Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1203Rep.java
@@ -1,5 +1,6 @@
package com.fzzy.api.view.repository;
+import com.fzzy.api.entity.Api1202;
import com.fzzy.api.entity.Api1203;
import org.springframework.data.jpa.repository.JpaRepository;
@@ -21,4 +22,7 @@
@Modifying
@Query("update Api1203 set czbz =:czbz where rkjydh=:rkjydh")
void updateStatus(@Param("rkjydh") String rkjydh, @Param("czbz") String czbz);
+
+ @Query("from Api1203 where rkjydh=:rkjydh ")
+ List<Api1203> getDataById(@Param("rkjydh") String rkjydh);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1205Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1205Rep.java
index f9f6f8e..40e081f 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1205Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1205Rep.java
@@ -1,6 +1,7 @@
package com.fzzy.api.view.repository;
+import com.fzzy.api.entity.Api1202;
import com.fzzy.api.entity.Api1205;
import org.springframework.data.jpa.repository.JpaRepository;
@@ -22,4 +23,7 @@
@Modifying
@Query("update Api1205 set czbz =:czbz where ckywdh=:ckywdh")
void updateStatus(@Param("ckywdh") String ckywdh, @Param("czbz") String czbz);
+
+ @Query("from Api1205 where ckywdh=:ckywdh ")
+ List<Api1205> getDataById(@Param("ckywdh") String ckywdh);
}
diff --git a/src/main/java/com/fzzy/async/fzzy35/entity/Fz35InoutRecord.java b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35InoutRecord.java
index c8b34da..7e1d9bf 100644
--- a/src/main/java/com/fzzy/async/fzzy35/entity/Fz35InoutRecord.java
+++ b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35InoutRecord.java
@@ -31,7 +31,7 @@
private String deptId;
@Column(name = "NOTICE_ID_", length = 40)
- @PropertyDef(label = "閫氱煡鍗旾d")
+ @PropertyDef(label = "閫氱煡鍗曠紪鐮�")
private String noticeId;
@Column(name = "DEPOT_ID_", length = 50)
@@ -86,10 +86,6 @@
@PropertyDef(label = "鎵胯繍浜哄湴鍧�")
private String userAddress;
- @Column(name = "CUR_STORAGE_")
- @PropertyDef(label = "褰撳墠搴撳瓨")
- private double curStorage = 0.0;
-
// 鍩烘湰淇℃伅
@Column(name = "INTEL_CARD_", length = 20)
@PropertyDef(label = "鏅烘収鍗″彿")
@@ -104,7 +100,7 @@
private String transType; //TransType.TYPE_1.getCode();
@Column(name = "CUSTOMER_ID_", length = 40)
- @PropertyDef(label = "寰�鏉ュ崟浣岻D", description = "鍏ュ簱鏃讹紝琛ㄧず鍙戣揣鍗曚綅锛屽嚭搴撴椂鍊欒〃绀烘敹璐у崟浣�")
+ @PropertyDef(label = "寰�鏉ュ崟浣�", description = "鍏ュ簱鏃讹紝琛ㄧず鍙戣揣鍗曚綅锛屽嚭搴撴椂鍊欒〃绀烘敹璐у崟浣�")
private String customerId;
@Column(name = "CUSTOMER_NAME_", length = 50)
@@ -124,8 +120,9 @@
@PropertyDef(label = "绮绛夌骇")
private String foodLevel;
+
@Column(name = "FOOD_LOCATION_", length = 40)
- @PropertyDef(label = "绮浜у湴")
+ @PropertyDef(label = "浜у湴鍚嶇О")
private String foodLocation;
@Column(name = "FOOD_YEAR_", length = 20)
@@ -161,7 +158,6 @@
@Column(name = "DE_WET_")
@PropertyDef(label = "姘村垎鎵ｉ噸", description = "鍗曚綅KG")
private Double deWet = 0.0;
-
@Column(name = "DE_HANDLE_")
@PropertyDef(label = "鍊间粨鎵ｉ噸", description = "鍗曚綅KG")
@@ -204,8 +200,12 @@
private Double netWeight = 0.0;
@Column(name = "SETTLE_WEIGHT_")
- @PropertyDef(label = "缁撶畻鍑�閲�", description = "鎵ｉ噸鍚庡噣閲嶏紝缁撶畻鍑�閲嶏紝鍗曚綅KG")
+ @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 = "鍗曚綅锛氬厓/鍏枻")
@@ -240,13 +240,6 @@
@Column(name = "SETTLE_TAG_", length = 2)
@PropertyDef(label = "鏄惁缁撶畻", description = "Y:琛ㄧず宸茬粨绠楋紱N:琛ㄧず鏈粨绠�")
- private String settleTag ;
-
- @Override
- public String toString() {
- return "InoutRecord [id=" + id + ", depotId=" + depotId + ", type="
- + type + ", settleWeight=" + settleWeight + ", completeTime="
- + completeTime + "]";
- }
+ private String settleTag;
}
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java
index 7ce3b64..3de9c9e 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java
@@ -2,6 +2,7 @@
import com.fzzy.api.Constant;
import com.fzzy.api.entity.Api1109;
+import com.fzzy.api.entity.Api1201;
import com.fzzy.api.entity.ApiLog;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.utils.FileUtil;
@@ -83,6 +84,7 @@
Api1109 apiData;
String wjlx;
String wjmc;
+ List<Api1109> api1109List;
for (Fz35FileInfo sysData : list) {
if (StringUtils.isEmpty(sysData.getBizId())) {
continue;
@@ -120,7 +122,6 @@
apiData.setWjlx(wjlx);
//鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
- apiData.setCzbz(Constant.CZBZ_I);
apiData.setZhgxsj(new Date());
//涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
@@ -128,6 +129,11 @@
apiData.setKqdm(kqdm);
apiData.setSyncTime(new Date());
+ api1109List = api1109Rep.getDataByBizId(apiData.getBizId());
+ if(null == api1109List || api1109List.isEmpty()){
+ apiData.setCzbz(Constant.CZBZ_I);
+ }
+
//淇濆瓨鏁版嵁
api1109Rep.save(apiData);
log.info("1109---鍚屾鏁版嵁锛歿}", apiData.toString());
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1201.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1201.java
index bcb19b3..0e86cec 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1201.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1201.java
@@ -15,11 +15,9 @@
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;
-
/**
* 鍚堝悓淇℃伅鏁版嵁鎺ュ彛
@@ -71,6 +69,7 @@
Api1102 api1201 = api1102Rep.findById(kqdm).get();
Api1201 apiData;
+ List<Api1201> api1201List;
for (Fz35MContract sysData : list) {
apiData = new Api1201();
@@ -78,7 +77,6 @@
apiData.setHth(api1201.getDwdm() + sysData.getId());
apiData.setHtmc(sysData.getName());
apiData.setDwdm(api1201.getDwdm());
-
//涓氬姟绫诲瀷
String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_HT_YWLX, sysData.getType());
@@ -123,7 +121,6 @@
apiData.setWcrq(sysData.getEndTime());
- apiData.setCzbz(Constant.CZBZ_I);
apiData.setZhgxsj(sysData.getCreateTime());
apiData.setSyncTime(new Date());
@@ -132,6 +129,11 @@
apiLog.setDataId(apiData.getBizId());
apiLog.setKqdm(kqdm);
+ api1201List = api1201Rep.getDataById(apiData.getHth());
+ if(null == api1201List || api1201List.isEmpty()){
+ apiData.setCzbz(Constant.CZBZ_I);
+ }
+
//淇濆瓨鏁版嵁
api1201Rep.save(apiData);
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
index d369ba9..cbc63a9 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
@@ -3,6 +3,7 @@
import com.fzzy.api.Constant;
import com.fzzy.api.entity.Api1105;
import com.fzzy.api.entity.Api1202;
+import com.fzzy.api.entity.Api1208;
import com.fzzy.api.entity.ApiLog;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiTriggerService;
@@ -78,16 +79,19 @@
Api1202 apiData;
Api1105 api1105;
List<Fz35InoutNoticeIn> listInoutNotice;
+ List<Api1202> api1202List;
Calendar c = Calendar.getInstance();
for (Fz35InoutRecord sysData : list) {
+ //鍒ゆ柇鍑�閲嶆槸鍚﹀ぇ浜�0锛岀瓑浜�0琛ㄧず涓嶅悎鏍硷紝涓嶈繘琛屽悓姝ヤ笂浼�
+ if(sysData.getRecordWeight() == 0){
+ continue;
+ }
//鑾峰彇璐т綅淇℃伅
api1105 = commonService.getApi1105Cache(sysData.getDepotId());
if (null == api1105) {
continue;
}
apiData = new Api1202();
-
- apiData.setId(sysData.getId());
apiData.setRkywdh(Constant.INOUT_TYPE_14 + sysData.getId().substring(4));
@@ -164,25 +168,25 @@
//鍊间粨 鐜板満鎵ｉ噸
apiData.setXckl( 0 - sysData.getDeHandle());
-
- apiData.setJz(sysData.getSettleWeight());
+ apiData.setJz(sysData.getRecordWeight());
c.setTime(sysData.getCompleteTime());
c.add(Calendar.MINUTE,3);
apiData.setCmsj(c.getTime());
-
- //鍏ュ簱缁撶畻鍗曞彿
- apiData.setRkjsdh(kqdm + sysData.getId().substring(2));
+ //鍏ュ簱缁撶畻鍗曞彿,榛樿缁熶竴缁撶畻锛屼笉璁剧疆缁撶畻鍗曞彿
+ //apiData.setRkjsdh(kqdm + sysData.getId().substring(2));
//鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
- apiData.setCzbz(Constant.CZBZ_I);
apiData.setZhgxsj(c.getTime());
//涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
apiData.setBizId(sysData.getId());
apiData.setKqdm(kqdm);
apiData.setSyncTime(new Date());
-
+ api1202List = api1202Rep.getDataById(apiData.getRkywdh());
+ if(null == api1202List || api1202List.isEmpty()){
+ apiData.setCzbz(Constant.CZBZ_I);
+ }
//淇濆瓨鏁版嵁
api1202Rep.save(apiData);
log.info("1202---鍚屾鏁版嵁锛歿}", apiData.toString());
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
index 2277270..43d445f 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
@@ -1,10 +1,7 @@
package com.fzzy.async.fzzy35.impl;
import com.fzzy.api.Constant;
-import com.fzzy.api.entity.Api1105;
-import com.fzzy.api.entity.Api1203;
-import com.fzzy.api.entity.ApiLog;
-import com.fzzy.api.entity.GbCheckItem;
+import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.ContextUtil;
@@ -16,6 +13,7 @@
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1202Rep;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1203Rep;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -86,8 +84,13 @@
String jyz;
String zkj;
String zkl;
+ List<Api1203> api1203List;
for (Fz35InoutRecord sysData : list) {
-
+ //鍒ゆ柇鍑�閲嶆槸鍚﹀ぇ浜�0锛岀瓑浜�0琛ㄧず涓嶅悎鏍硷紝涓嶈繘琛屽悓姝ヤ笂浼�
+ if(sysData.getRecordWeight() == 0){
+ continue;
+ }
+ fz35CheckItems = null;
//鑾峰彇鍏ュ簱璐ㄦ淇℃伅
fz35CheckItems = fzzySync1203Rep.listInoutCheckItem(sysData.getCheckId());
if (null == fz35CheckItems || fz35CheckItems.isEmpty()) {
@@ -102,7 +105,6 @@
}
apiData = new Api1203();
- apiData.setId(sysData.getId());
apiData.setRkjydh(Constant.INOUT_TYPE_14 + sysData.getId().substring(4));
@@ -127,18 +129,22 @@
}
jyxm += gbCheckList.get(0).getCode() + ",";
jyz += fz35CheckItem.getValue() + ",";
- zkj += "0,";
- zkl += "0,";
+ zkj += "0.0,";
+ zkl += "0.0,";
}
apiData.setJyxm(jyxm);
apiData.setJyz(jyz);
apiData.setZkj(zkj);
apiData.setZkl(zkl);
- apiData.setJyjg("0");
+ if("UNPASS".equals(sysData.getCheckStatus())){
+ apiData.setJyjg("0");
+ }
+ if("PASS".equals(sysData.getCheckStatus())){
+ apiData.setJyjg("1");
+ }
apiData.setJyrxm(sysData.getCheckUser());
- apiData.setJysj(sysData.getFullWeightTime());
- //apiData.setJyjg("");
+ apiData.setJysj(DateUtils.addMinutes(sysData.getFullWeightTime(), 5));
//绮鍝佺
String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
@@ -149,7 +155,6 @@
apiData.setLsdd(mappingCode);
//鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
- apiData.setCzbz(Constant.CZBZ_I);
apiData.setZhgxsj(sysData.getCompleteTime());
//涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
@@ -157,6 +162,11 @@
apiData.setKqdm(kqdm);
apiData.setSyncTime(new Date());
+ api1203List = api1203Rep.getDataById(apiData.getRkjydh());
+ if(null == api1203List || api1203List.isEmpty()){
+ apiData.setCzbz(Constant.CZBZ_I);
+ }
+
//淇濆瓨鏁版嵁
api1203Rep.save(apiData);
log.info("1203---鍚屾鏁版嵁锛歿}", apiData.toString());
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java
index ceae9f1..91702ab 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java
@@ -77,18 +77,20 @@
Api1205 apiData;
Api1105 api1105;
List<Fz35InoutNoticeOut> listInoutNotice;
+ List<Api1205> api1205List;
// List<GbArea> gbAreaList;
Calendar c = Calendar.getInstance();
for (Fz35InoutRecord sysData : list) {
-
+ //鍒ゆ柇鍑�閲嶆槸鍚﹀ぇ浜�0锛岀瓑浜�0琛ㄧず涓嶅悎鏍硷紝涓嶈繘琛屽悓姝ヤ笂浼�
+ if(sysData.getRecordWeight() == 0){
+ continue;
+ }
//鑾峰彇璐т綅淇℃伅
api1105 = commonService.getApi1105Cache(sysData.getDepotId());
if(null == api1105){
continue;
}
apiData = new Api1205();
-
- apiData.setId(sysData.getId());
apiData.setCkywdh(Constant.INOUT_TYPE_15 + sysData.getId().substring(4));
@@ -150,13 +152,12 @@
apiData.setMzjly(sysData.getFullWeightUser());
//鍑�閲�
- apiData.setJz(sysData.getSettleWeight());
+ apiData.setJz(sysData.getRecordWeight());
c.setTime(sysData.getCompleteTime());
c.add(Calendar.MINUTE,3);
apiData.setCmsj(c.getTime());
//鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
- apiData.setCzbz(Constant.CZBZ_I);
apiData.setZhgxsj(c.getTime());
//涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
@@ -164,6 +165,11 @@
apiData.setKqdm(kqdm);
apiData.setSyncTime(new Date());
log.info("1201---鍚屾鏁版嵁锛歿}",apiData.toString());
+
+ api1205List = api1205Rep.getDataById(apiData.getCkywdh());
+ if(null == api1205List || api1205List.isEmpty()){
+ apiData.setCzbz(Constant.CZBZ_I);
+ }
//淇濆瓨鏁版嵁
api1205Rep.save(apiData);
}
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java
index 74a72c5..ba783be 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java
@@ -118,6 +118,9 @@
//璐т綅鐘舵��
mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_HWZT, fz35Depot.getDepotStatus());
apiData.setHwzt(mappingCode);
+ if(null == fz35Depot.getStoreDate()){
+ fz35Depot.setStoreDate(new Date());
+ }
//鍏ヤ粨鏃堕棿
apiData.setRcsj(fz35Depot.getStoreDate());
//灏佷粨鏃ユ湡
diff --git a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1203Rep.java b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1203Rep.java
index c3f7ac2..719f1b1 100644
--- a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1203Rep.java
+++ b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1203Rep.java
@@ -18,6 +18,6 @@
* @param checkId
* @return
*/
- @Query("from Fz35CheckItem where checkId=:checkId ")
+ @Query("from Fz35CheckItem where checkId=:checkId order by standardId")
List<Fz35CheckItem> listInoutCheckItem(@Param("checkId") String checkId);
}
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023PushService12.java b/src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023PushService12.java
index 5d58ec3..934a5e4 100644
--- a/src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023PushService12.java
+++ b/src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023PushService12.java
@@ -1,18 +1,13 @@
package com.fzzy.push.shjdjw2023;
-import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.PushProtocol;
-import com.fzzy.api.dto.ResponseDto;
-import com.fzzy.api.entity.Api1202;
import com.fzzy.api.service.PushService12;
import com.fzzy.api.view.repository.Api1202Rep;
import com.fzzy.push.impl.ComPushService12;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-
-import java.util.List;
/**
* 涓婃捣鍢夊畾绾鐩戠骞冲彴-绮璐攢鏁版嵁涓婁紶
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java b/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
index ff6a39d..a5817cf 100644
--- a/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
+++ b/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
@@ -317,7 +317,7 @@
shjdjwApi1209.setNx(api1209.getYwrq());
//杈呮崯鐩婃暟閲�
- shjdjwApi1209.setFsysl(Math.abs(api1209.getJzsysl()));
+ shjdjwApi1209.setFsysl(0.0);
//鎹熺泭绫诲瀷
shjdjwApi1209.setSylx(api1209.getJzsysl() > 0 ? "0" : "1");
return shjdjwApi1209;
--
Gitblit v1.9.3