同步与上传调整

YYC

2025-03-07 aee5c93d9d8f904d84ecdfff6025ddace615c6b2

 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2104.java

@@ -7,22 +7,15 @@
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.*;
import com.fzzy.async.fzzy40.entity.Fz40InoutCustomer;
import com.fzzy.async.fzzy40.entity.Fz40InoutNoticeIn;
import com.fzzy.async.fzzy40.entity.Fz40InoutRecord;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1202Rep;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1212Rep;
import com.fzzy.async.fzzy40.repository.Fzzy40SyncNoticeInRep;
import com.fzzy.push.sh2023.SH2023Constant;
import com.fzzy.push.sh2023.dto.SH2023Api2104;
import com.fzzy.push.sh2023.dto.ShAreaBjw;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateFormatUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;

@@ -83,10 +76,7 @@
                bjw = ShAreaBjw.getBjw(api1102List.get(0).getXzqhdm());
            }
            for (Fz40InoutRecord sysData : list) {
                List<ApiInfoData> apiInfoData = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2104, sysData.getId().substring(2));
                if (null != apiInfoData && apiInfoData.size() > 0) {
                    continue;
                }

                sh2023Api2104 = new SH2023Api2104();
                sh2023Api2104.setBydh(sysData.getId().substring(2));
                sh2023Api2104.setKqdm(kqdm);
@@ -102,7 +92,7 @@
                sh2023Api2104.setLldm(kqdm);

                sh2023Api2104.setJz(sysData.getNetWeight());
                sh2023Api2104.setZhgxsh(sysData.getUpdateTime());
                sh2023Api2104.setZhgxsj(sysData.getUpdateTime());

                //获取货位信息
                api1105 = commonService.getApi1105Cache(sysData.getDepotId());
@@ -121,7 +111,7 @@
                infoData.setRemarks("市储驳运单");

                //设置操作标志
                apiInfoDataList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2104, infoData.getDataId());
                apiInfoDataList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2104, infoData.getDataId(),kqdm);
                if (null == apiInfoDataList || apiInfoDataList.isEmpty()) {
                    infoData.setCzbz(Constant.CZBZ_I);
                    sh2023Api2104.setCzbz(Constant.CZBZ_I);