From ce9d44e48aa77ebf2537f22ff8bf4a70089d0474 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 22 八月 2023 18:17:29 +0800
Subject: [PATCH] 优化3.5和4.0版本的出入库信息同步
---
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
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 3dfae3c..4fdc9f4 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
@@ -20,9 +20,7 @@
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.*;
/**
* 绮鍏ュ簱淇℃伅
@@ -81,6 +79,9 @@
List<Fz35InoutNoticeIn> listInoutNotice;
List<Api1202> api1202List;
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());
@@ -97,6 +98,16 @@
apiData = new Api1202();
apiData.setRkywdh(Constant.INOUT_TYPE_14 + 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.setRkywdh(Constant.INOUT_TYPE_14 + ywsj + num);
+ map.put(ywsj, map.get(ywsj) + 1);
+ }
//璐т綅浠ｇ爜
apiData.setHwdm(api1105.getHwdm());
@@ -107,7 +118,7 @@
//榛樿涓�涓殢渚垮��
apiData.setLxdh(StringUtils.isEmpty(sysData.getUserContact()) ? "13012345678" : sysData.getUserContact());
- apiData.setSfzh(null == sysData.getUserId() ? "410183200010100000" : sysData.getUserId());
+ apiData.setSfzh(null == sysData.getUserId() ? "410183200010100000" : sysData.getUserId().trim());
//鑾峰彇鍚堝悓鍙�
listInoutNotice = fzzy35SyncNoticeInRep.listInoutNoticeInById(sysData.getNoticeId());
@@ -119,8 +130,8 @@
apiData.setXxdz(sysData.getUserAddress());
- //杩愯緭宸ュ叿锛岄粯璁ゆ苯杞︼紝TODO>> 寰呰皟鏁翠负鏍规嵁鏁版嵁搴撹幏鍙�
- apiData.setYsgj("1");
+ //杩愯緭宸ュ叿锛岃嫢涓虹┖锛屽垯榛樿缁�1-姹借溅
+ apiData.setYsgj(StringUtils.isEmpty(sysData.getTransType()) ? "1":sysData.getTransType());
//杞﹁埞鍙�
apiData.setCch(sysData.getPlateNum());
--
Gitblit v1.9.3