From a6b22395d5b137d684c83d9197c40f596f689ded Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 07 九月 2023 19:26:07 +0800
Subject: [PATCH] 数据同步问题修改
---
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
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 d001fda..6cddd0d 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java
@@ -18,9 +18,8 @@
import org.apache.commons.lang.time.DateFormatUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+
+import java.util.*;
/**
* 绮鍑哄簱淇℃伅
@@ -78,8 +77,10 @@
Api1105 api1105;
List<Fz35InoutNoticeOut> listInoutNotice;
List<Api1205> api1205List;
- // List<GbArea> gbAreaList;
Calendar c = Calendar.getInstance();
+ String ywsj = "";
+ String num = "";
+ Map<String, Integer> map = new HashMap<>();
for (Fz35InoutRecord sysData : list) {
if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
sysData.setRecordWeight(sysData.getSettleWeight());
@@ -95,7 +96,16 @@
}
apiData = new Api1205();
apiData.setCkywdh(Constant.INOUT_TYPE_15 + sysData.getId().substring(4));
-
+ //鍒ゆ柇涓氬姟鏃堕棿涓庡崟鎹彿鏄惁鍖归厤
+ ywsj = DateFormatUtils.format(sysData.getCompleteTime(),"yyMMdd");
+ if(!ywsj.equals(sysData.getId().substring(4, 10))){
+ if(null == map.get(ywsj)){
+ map.put(ywsj, 10201);
+ }
+ num = String.valueOf(map.get(ywsj)).substring(1);
+ apiData.setCkywdh(Constant.INOUT_TYPE_15 + ywsj + num);
+ map.put(ywsj, map.get(ywsj) + 1);
+ }
//璐т綅浠ｇ爜
apiData.setHwdm(api1105.getHwdm());
@@ -115,8 +125,8 @@
}
- //杩愯緭宸ュ叿锛岄粯璁ゆ苯杞�
- apiData.setYsgj("1");
+ //杩愯緭宸ュ叿锛岃嫢涓虹┖锛屽垯榛樿缁�1-姹借溅
+ apiData.setYsgj(StringUtils.isEmpty(sysData.getTransType()) ? "1":sysData.getTransType());
//杞﹁埞鍙�
apiData.setCch(sysData.getPlateNum());
--
Gitblit v1.9.3