From 564aa96d9468d82cf62db0eb6a7907cf836ea21c Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 15 八月 2023 16:24:41 +0800
Subject: [PATCH] Api12实体类核对
---
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java | 41 +++++++++++++++++++++++++----------------
1 files changed, 25 insertions(+), 16 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 7d741c1..8d4540b 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
@@ -3,14 +3,15 @@
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;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.Api1202Rep;
import com.fzzy.api.view.repository.ApiLogRep;
-import com.fzzy.async.fzzy35.entity.InoutNoticeIn;
-import com.fzzy.async.fzzy35.entity.InoutRecord;
+import com.fzzy.async.fzzy35.entity.Fz35InoutNoticeIn;
+import com.fzzy.async.fzzy35.entity.Fz35InoutRecord;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1202Rep;
import com.fzzy.async.fzzy35.repository.Fzzy35SyncNoticeInRep;
import lombok.extern.slf4j.Slf4j;
@@ -68,7 +69,7 @@
apiLog.setId(ContextUtil.getUUID());
try {
//鑾峰彇绮鍏ュ簱璁板綍淇℃伅锛屾牴鎹祦绋嬪畬鎴愭椂闂磋幏鍙�
- List<InoutRecord> list = fzzySync1202Rep.listInoutRecord(deptId, INOUT_TYPE_IN, start, end);
+ List<Fz35InoutRecord> list = fzzySync1202Rep.listInoutRecord(deptId, INOUT_TYPE_IN, start, end);
if (null == list || list.isEmpty()) {
log.info("-------------娌℃湁鑾峰彇鍒扮伯椋熷叆搴撲俊鎭�------------------");
@@ -77,17 +78,23 @@
Api1202 apiData;
Api1105 api1105;
- List<InoutNoticeIn> listInoutNotice;
+ List<Fz35InoutNoticeIn> listInoutNotice;
+ List<Api1202> api1202List;
Calendar c = Calendar.getInstance();
- for (InoutRecord sysData : list) {
+ 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 Api1202();
-
- apiData.setId(sysData.getId());
apiData.setRkywdh(Constant.INOUT_TYPE_14 + sysData.getId().substring(4));
@@ -112,8 +119,8 @@
apiData.setXxdz(sysData.getUserAddress());
- //杩愯緭宸ュ叿锛岄粯璁ゆ苯杞︼紝TODO>> 寰呰皟鏁翠负鏍规嵁鏁版嵁搴撹幏鍙�
- apiData.setYsgj("1");
+ //杩愯緭宸ュ叿锛岃嫢涓虹┖锛屽垯榛樿缁�1-姹借溅
+ apiData.setYsgj(StringUtils.isEmpty(sysData.getTransType()) ? "1":sysData.getTransType());
//杞﹁埞鍙�
apiData.setCch(sysData.getPlateNum());
@@ -164,25 +171,27 @@
//鍊间粨 鐜板満鎵ｉ噸
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);
+ }else {
+ apiData.setCzbz(api1202List.get(0).getCzbz());
+ }
//淇濆瓨鏁版嵁
api1202Rep.save(apiData);
log.info("1202---鍚屾鏁版嵁锛歿}", apiData.toString());
--
Gitblit v1.9.3