From c206acfaedc69c390fb67daa81bc686f58a212ef Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 27 十一月 2023 16:12:11 +0800
Subject: [PATCH] 提交配置信息2
---
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1106.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1106.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1106.java
index eb38708..daa67f3 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1106.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1106.java
@@ -11,9 +11,11 @@
import com.ld.igds.sh.param.ApiRequest;
import com.ld.igds.sh.service.impl.HApiShServiceImpl;
import com.ld.igds.sh.util.ApiShConst;
+import com.ld.igds.sh.util.ApiShUtil;
import com.ld.igds.sh.util.RespCodeEnum;
import com.ld.igds.sh.util.RespUtil;
import com.ld.igds.util.ContextUtil;
+import com.ld.igds.util.NumberUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
@@ -71,9 +73,9 @@
continue;
}
dto = new Dto1106();
- dto.setAjdh(depot.getId());
+ dto.setAjdh(ApiShUtil.getGbDepotId(depot.getId()));
dto.setAjmc(depot.getName());
- dto.setCfbh(depot.getId().substring(0, 25));
+ dto.setCfbh(ApiShUtil.getGbDepotId(depot.getId()).substring(0, 25));
building = hApiShServiceImpl.getBuilding(companyId, depot.getBuildingId());
if (null != building) {
@@ -81,17 +83,21 @@
dto.setAjkd(building.getWidth() == null ? "0.0" : building.getWidth() + "");
dto.setAjgd(building.getHeight() == null ? "0.0" : building.getHeight() + "");
}
- dto.setSjcr(depot.getStorageMax() == null ? "0.0" : depot.getStorageMax() + "");
+ dto.setSjcr(depot.getStorageMax() == null ? "0.0" : NumberUtil.keepPrecision(depot.getStorageMax()/1000, 1) + "");
dto.setQyrq(DateFormatUtils.format((depot.getStoreDate() == null ? new Date() : depot.getStoreDate()), "yyyy-MM-dd"));
- dto.setAjzt("1"); //鐜╁ソ
+ if(DepotStatus.STATUS_9.getCode().equals(depot.getDepotStatus())){
+ dto.setAjzt("3"); //闇�澶т慨
+ }else {
+ dto.setAjzt("1"); //鐜╁ソ
+ }
dto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
//鏌ヨ鏃ュ織鐘舵�佽〃锛岃缃搷浣滄爣蹇�
- log = inteStatusLogService.getLogByBizId(companyId, ApiShConst.API_SH_1106 + "_" + depot.getId());
+ log = inteStatusLogService.getLogByBizId(companyId, ApiShConst.API_SH_1106 + "_" + ApiShUtil.getGbDepotId(depot.getId()));
if(null == log){
addLog = new InteStatusLog();
- addLog.setBizId(ApiShConst.API_SH_1106 + "_" + depot.getId());
+ addLog.setBizId(ApiShConst.API_SH_1106 + "_" + ApiShUtil.getGbDepotId(depot.getId()));
addLog.setCompanyId(companyId);
addLog.setBizType(ApiShConst.API_SH_TYPE_BASIC);
addLog.setInterfaceId(ApiShConst.API_SH_1106);
--
Gitblit v1.9.3