调整上海原版接口

CZT

2023-10-20 3631219246be48aec1e745e94e5b28ff4e8799c8

 igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1105.java

@@ -10,14 +10,17 @@
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;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -69,10 +72,10 @@
                continue;
            }
            dto = new Dto1105();
            dto.setYgdm(depot.getId());
            dto.setYgdm(ApiShUtil.getGbDepotId(depot.getId()).substring(0, 25));
            dto.setYgmc(depot.getName());
            dto.setKqdm(depot.getId().substring(0, 24));
            dto.setGr(depot.getStorageMax() == null?"0.0":depot.getStorageMax() + "");
            dto.setKqdm(ApiShUtil.getGbDepotId(depot.getId()).substring(0, 21));
            dto.setGr(depot.getStorageMax() == null?"0.0": NumberUtil.keepPrecision(depot.getStorageMax()/1000,1) + "");
            dto.setJzsj(DateFormatUtils.format((depot.getStoreDate()==null?new Date():depot.getStoreDate()),"yyyy-MM-dd"));

            building = hApiShServiceImpl.getBuilding(companyId, depot.getBuildingId());
@@ -84,10 +87,10 @@

            dto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
            //查询日志状态表，设置操作标志
            log = inteStatusLogService.getLogByBizId(companyId, ApiShConst.API_SH_1105 + "_" + depot.getId());
            log = inteStatusLogService.getLogByBizId(companyId, ApiShConst.API_SH_1105 + "_" + ApiShUtil.getGbDepotId(depot.getId()));
            if(null == log){
                addLog = new InteStatusLog();
                addLog.setBizId(ApiShConst.API_SH_1105 + "_" + depot.getId());
                addLog.setBizId(ApiShConst.API_SH_1105 + "_" + ApiShUtil.getGbDepotId(depot.getId()));
                addLog.setCompanyId(companyId);
                addLog.setBizType(ApiShConst.API_SH_TYPE_BASIC);
                addLog.setInterfaceId(ApiShConst.API_SH_1105);