From bca371e7ecc906ec824630c32aefd29a7a4f68d0 Mon Sep 17 00:00:00 2001
From: 陈战涛 <chenzhantao7055@sina.com>
Date: 星期三, 10 五月 2023 18:48:35 +0800
Subject: [PATCH] 提交库存同步

---
 src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1302.java |   42 +++++++++++++++++++++---------------------
 1 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1302.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1302.java
index f48b4d4..c4bf0c7 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1302.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1302.java
@@ -10,7 +10,7 @@
 import com.fzzy.api.utils.ContextUtil;
 import com.fzzy.api.view.repository.Api1302Rep;
 import com.fzzy.api.view.repository.ApiLogRep;
-import com.fzzy.async.fzzy35.entity.Grain;
+import com.fzzy.async.fzzy35.entity.Fz35Grain;
 import com.fzzy.async.fzzy35.repository.Fzzy35Sync1302Rep;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
@@ -60,7 +60,7 @@
         apiLog.setStatus(99);
         apiLog.setId(ContextUtil.getUUID());
         try {
-            List<Grain> list = fzzySync1302Rep.findByReceiveDate(start, end);
+            List<Fz35Grain> list = fzzySync1302Rep.findByReceiveDate(start, end);
             log.info(DateUtils.format("yyyy-MM-dd HH:mm:ss",start));
             log.info(DateUtils.format("yyyy-MM-dd HH:mm:ss",end));
             if (null == list || list.isEmpty()) {
@@ -72,9 +72,9 @@
             Api1302 api1302;
             Api1105 api1105;
             //int index = 10001;
-            for (Grain grain : list) {
+            for (Fz35Grain fz35Grain : list) {
                 //鑾峰彇璐т綅淇℃伅
-                api1105 = commonService.getApi1105Cache(grain.getDepotId());
+                api1105 = commonService.getApi1105Cache(fz35Grain.getDepotId());
                 if (null == api1105) {
                     continue;
                 }
@@ -82,41 +82,41 @@
                 //鐢辫揣浣嶄唬鐮�+妫�娴嬫棩鏈�     锛坹yyyMMdd锛� +4 浣嶉『搴忓彿缁勬垚  --2019 1128 0819
                 api1302 = new Api1302();
                 //api1302.setWsdjcdh(api1105.getHwdm() + DateFormatUtils.format(grain.getReceiveDate(), "yyyyMMdd") + String.valueOf(index).substring(1));
-                api1302.setWsdjcdh(api1105.getHwdm() + grain.getBatchId());
-                api1302.setJcsj(grain.getReceiveDate());
+                api1302.setWsdjcdh(api1105.getHwdm() + fz35Grain.getBatchId());
+                api1302.setJcsj(fz35Grain.getReceiveDate());
                 api1302.setHwdm(api1105.getHwdm());
 
-                api1302.setCfww(grain.getTempOut() == null ? 0.00:grain.getTempOut());
-                if(null == grain.getHumidityOut() || grain.getHumidityOut() < 0){
+                api1302.setCfww(fz35Grain.getTempOut() == null ? 0.00: fz35Grain.getTempOut());
+                if(null == fz35Grain.getHumidityOut() || fz35Grain.getHumidityOut() < 0){
                     api1302.setCfws(-1);
                 }else {
-                    api1302.setCfws(grain.getHumidityOut());
+                    api1302.setCfws(fz35Grain.getHumidityOut());
                 }
 
-                api1302.setCfnw(grain.getTempIn() == null ? 0.00:grain.getTempIn());
-                if(null == grain.getHumidityIn() || grain.getHumidityIn() < 0){
+                api1302.setCfnw(fz35Grain.getTempIn() == null ? 0.00: fz35Grain.getTempIn());
+                if(null == fz35Grain.getHumidityIn() || fz35Grain.getHumidityIn() < 0){
                     api1302.setCfns(-1);
                 }else {
-                    api1302.setCfns(grain.getHumidityIn());
+                    api1302.setCfns(fz35Grain.getHumidityIn());
                 }
 
-                api1302.setLszgw(grain.getTempMax() == null ? 0.00:grain.getTempMax());
-                api1302.setLspjw(grain.getTempAve() == null ? 0.00:grain.getTempAve());
-                api1302.setLszdw(grain.getTempMin() == null ? 0.00:grain.getTempMin());
+                api1302.setLszgw(fz35Grain.getTempMax() == null ? 0.00: fz35Grain.getTempMax());
+                api1302.setLspjw(fz35Grain.getTempAve() == null ? 0.00: fz35Grain.getTempAve());
+                api1302.setLszdw(fz35Grain.getTempMin() == null ? 0.00: fz35Grain.getTempMin());
 
                 //娓╁害闆嗗悎
-                if (StringUtils.isEmpty(grain.getCableCir())) {
-                    api1302.setLswdzjh(getTempPointList1(grain.getPoints(), grain.getCable()));
-                    api1302.setLssdzjh(getHumPointList1(grain.getPoints(), grain.getCable()));
+                if (StringUtils.isEmpty(fz35Grain.getCableCir())) {
+                    api1302.setLswdzjh(getTempPointList1(fz35Grain.getPoints(), fz35Grain.getCable()));
+                    api1302.setLssdzjh(getHumPointList1(fz35Grain.getPoints(), fz35Grain.getCable()));
                 } else {
-                    api1302.setLswdzjh(getTempPointList2(grain.getPoints(), grain.getCable(), grain.getCableCir()));
-                    api1302.setLssdzjh(getHumPointList2(grain.getPoints(), grain.getCable(), grain.getCableCir()));
+                    api1302.setLswdzjh(getTempPointList2(fz35Grain.getPoints(), fz35Grain.getCable(), fz35Grain.getCableCir()));
+                    api1302.setLssdzjh(getHumPointList2(fz35Grain.getPoints(), fz35Grain.getCable(), fz35Grain.getCableCir()));
                 }
 
                 api1302.setCzbz(Constant.CZBZ_I);
                 api1302.setZhgxsj(syncTime);
 
-                api1302.setBizId(grain.getBatchId());
+                api1302.setBizId(fz35Grain.getBatchId());
                 api1302.setKqdm(api1105.getKqdm());
                 api1302.setSyncTime(syncTime);
                 log.info("1302---鍚屾鏁版嵁锛�" + api1302.toString());

--
Gitblit v1.9.3