From 254da24705ba4daa8bf289a2c10b912fb8c53ad2 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 18 七月 2023 21:18:37 +0800
Subject: [PATCH] 增加V40接口-粮情、出入库

---
 src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 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 cbc63a9..8d4540b 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
@@ -82,8 +82,11 @@
             List<Api1202> api1202List;
             Calendar c = Calendar.getInstance();
             for (Fz35InoutRecord sysData : list) {
+                if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
+                    sysData.setRecordWeight(sysData.getSettleWeight());
+                }
                 //鍒ゆ柇鍑�閲嶆槸鍚﹀ぇ浜�0锛岀瓑浜�0琛ㄧず涓嶅悎鏍硷紝涓嶈繘琛屽悓姝ヤ笂浼�
-                if(sysData.getRecordWeight() == 0){
+                if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
                     continue;
                 }
                 //鑾峰彇璐т綅淇℃伅
@@ -116,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());
@@ -186,6 +189,8 @@
                 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);

--
Gitblit v1.9.3