From 5f94cc1e92d0b31905d927602d095ac3a0a3711a Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期二, 07 五月 2024 19:34:04 +0800
Subject: [PATCH] 陕西省平台提交4-接口联调
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
index be7a4b5..4bc8cfb 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
@@ -112,16 +112,34 @@
if (StringUtils.isEmpty(fz40DepotStore.getLqgsdwdm())) {
apiData.setLqgsdwdm(api1102.getDwdm());
} else {
- apiData.setLqxzqhdm(fz40DepotStore.getLqgsdwdm());
+ apiData.setLqgsdwdm(fz40DepotStore.getLqgsdwdm());
}
- //绮潈琛屾斂鍖哄垝浠ｇ爜
+
apiData.setLqxzqhdm(api1102.getXzqhdm());
+ if (apiData.getLsxzdm().equals("121")) {
+ //鐪佺骇鍌ㄥ绮�-绮潈琛屾斂鍖哄垝浠ｇ爜涓虹渷绾�
+ apiData.setLqxzqhdm(api1102.getXzqhdm().substring(0, 2) + "0000");
+ }
+ if (apiData.getLsxzdm().equals("122")) {
+ //甯傜骇鍌ㄥ绮�-绮潈琛屾斂鍖哄垝浠ｇ爜涓哄競绾�
+ apiData.setLqxzqhdm(api1102.getXzqhdm().substring(0, 4) + "00");
+ }
+
//绠＄悊鏂瑰紡-榛樿鐩村偍
- apiData.setGlfs("01");
+ if (StringUtils.isEmpty(fz40DepotStore.getManageType())) {
+ apiData.setGlfs("01");
+ } else {
+ apiData.setGlfs(fz40DepotStore.getManageType());
+ }
+
//鏀跺偍鍦扮偣-榛樿搴撳唴
apiData.setScdd("1");
//鍌ㄧ伯鏂瑰紡
apiData.setClfs(fz40DepotStore.getStoreType());
+ //鍖呰鍌ㄧ伯鏄紝鏍告煡鍖呭瓨绮寘鏁�
+ if ("2".equals(apiData.getClfs())) {
+ apiData.setBclbs((int) (fz40DepotStore.getStorageReal() / 25));
+ }
//璐т綅鐘舵��
mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_HWZT, fz40DepotStore.getDepotStatus());
@@ -133,7 +151,10 @@
apiData.setRcsj(fz40DepotStore.getStoreDate());
//灏佷粨鏃ユ湡
if ("3".equals(apiData.getHwzt()) || "4".equals(apiData.getHwzt())) {
- apiData.setFcrq(DateUtils.addDays(fz40DepotStore.getStoreDate(), 10));
+ if (null == fz40DepotStore.getFullDate()) {
+ fz40DepotStore.setFullDate(DateUtils.addDays(fz40DepotStore.getStoreDate(), 30));
+ }
+ apiData.setFcrq(fz40DepotStore.getFullDate());
}
if ("1".equals(apiData.getHwzt())) {
--
Gitblit v1.9.3