From b7dc6470dc167527fa1937365fbeae929a6ac63d Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 06 九月 2023 15:21:11 +0800
Subject: [PATCH] 财务报表增加库区编码字段
---
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java | 45 +++++++++++++++++++++++++++++++++------------
1 files changed, 33 insertions(+), 12 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 ceae9f1..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.*;
/**
* 绮鍑哄簱淇℃伅
@@ -77,20 +76,36 @@
Api1205 apiData;
Api1105 api1105;
List<Fz35InoutNoticeOut> listInoutNotice;
- // List<GbArea> gbAreaList;
+ List<Api1205> api1205List;
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());
+ }
+ //鍒ゆ柇鍑�閲嶆槸鍚﹀ぇ浜�0锛岀瓑浜�0琛ㄧず涓嶅悎鏍硷紝涓嶈繘琛屽悓姝ヤ笂浼�
+ if(null == sysData.getRecordWeight() || 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));
-
+ //鍒ゆ柇涓氬姟鏃堕棿涓庡崟鎹彿鏄惁鍖归厤
+ 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());
@@ -110,8 +125,8 @@
}
- //杩愯緭宸ュ叿锛岄粯璁ゆ苯杞�
- apiData.setYsgj("1");
+ //杩愯緭宸ュ叿锛岃嫢涓虹┖锛屽垯榛樿缁�1-姹借溅
+ apiData.setYsgj(StringUtils.isEmpty(sysData.getTransType()) ? "1":sysData.getTransType());
//杞﹁埞鍙�
apiData.setCch(sysData.getPlateNum());
@@ -150,13 +165,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 +178,13 @@
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);
+ }else {
+ apiData.setCzbz(api1205List.get(0).getCzbz());
+ }
//淇濆瓨鏁版嵁
api1205Rep.save(apiData);
}
--
Gitblit v1.9.3