优化3.5版本同步数据

CZT

2023-11-20 b19a8901f4060dcfd4cc2477374da2a7da267336

优化3.5版本同步数据

 src/main/java/com/fzzy/api/view/repository/Api1207Rep.java

@@ -23,4 +23,7 @@

    @Query("from Api1207 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
    List<Api1207> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);

    @Query("from Api1207 where dcdh=:dcdh ")
    List<Api1207> getDataByDcdh(@Param("dcdh") String dcdh);
}

 src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService12.java

@@ -32,6 +32,8 @@
    @Autowired
    private Fzzy35Sync1206 fzzySync1206;
    @Autowired
    private Fzzy35Sync1207 fzzySync1207;
    @Autowired
    private Fzzy35Sync1208 fzzySync1208;
    @Autowired
    private Fzzy35Sync1209 fzzySync1209;

 src/main/java/com/fzzy/async/fzzy35/entity/Fz35StockChange.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,73 @@
package com.fzzy.async.fzzy35.entity;

import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.util.Date;

/**
 * @Description: å€’仓，移库
 */
@Data
@Entity
@Table(name = "D_M_STOCK_CHANGE")
public class Fz35StockChange {


    @Id
    @Column(name = "ID_", length = 40)
    @PropertyDef(label = "主键")
    private String id;

    @Column(name = "COMPANY_ID_", length = 10)
    @PropertyDef(label = "组织编码")
    private String companyId;

    @Column(name = "DEPT_ID_", length = 40)
    @PropertyDef(label = "所属分库")
    private String deptId;

    @Column(name = "TYPE_", length = 5)
    @PropertyDef(label = "倒仓类型",description = "0：倒仓 1：移库")
    private String type;

    @Column(name = "PLAN_CODE_", length = 40)
    @PropertyDef(label = "倒仓计划文件编号",description = "倒仓计划文件编号")
    private String planCode;

    @Column(name = "NOTICE_ID_", length = 40)
    @PropertyDef(label = "通知单号",description = "通知单号")
    private String noticeId;

    @Column(name = "FOOD_VARIETY_", length = 10)
    @PropertyDef(label = "粮食品种")
    private String foodVariety;

    @Column(name = "DEPOT_ID_IN", length = 50)
    @PropertyDef(label = "倒入仓库")
    private String depotIdIn;

    @Column(name = "DEPOT_ID_OUT", length = 50)
    @PropertyDef(label = "倒出仓库")
    private String depotIdOut;

    @Column(name = "CHANGE_DATE_")
    @PropertyDef(label = "倒仓日期")
    private Date changeDate;

    @Column(name = "NUMBER_")
    @PropertyDef(label = "倒仓数量")
    private Double number = 0.0;

    @Column(name = "UPDATE_TIME_")
    @PropertyDef(label = "更新时间")
    private Date updateTime;

    @Column(name = "UPDATE_USER_",length = 50)
    @PropertyDef(label = "更新人")
    private String  updateUser;

}

 src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java

@@ -12,12 +12,15 @@
import com.fzzy.api.view.repository.Api1205Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.fzzy35.entity.Fz35FileInfo;
import com.fzzy.async.fzzy35.entity.Fz35InoutRecord;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1109Rep;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1202Rep;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.*;
import java.util.stream.Collectors;

/**
 * æ–‡ä»¶ä¿¡æ¯
@@ -45,9 +48,16 @@
    private final static String BIZ_TAG_WEIGHT_EMPTY = "WEIGHT_EMPTY";
    private final static String BIZ_TAG_REGISTER = "REGISTER";
    private final static String BIZ_TAG_HANDLE = "HANDLE";
    /**
     * å‡ºå…¥åº“类型
     */
    private final static String INOUT_TYPE_IN = "IN";
    private final static String INOUT_TYPE_OUT = "OUT";

    @Autowired
    private Fzzy35Sync1109Rep fzzySync1109Rep;
    @Autowired
    private Fzzy35Sync1202Rep fzzySync1202Rep;
    @Autowired
    private Api1109Rep api1109Rep;
    @Autowired
@@ -79,7 +89,7 @@
        apiLog.setStatus(99);
        apiLog.setId(ContextUtil.getUUID());
        try {
            List<Fz35FileInfo> list = fzzySync1109Rep.listFileInfo(start, end);
            List<Fz35InoutRecord> list = fzzySync1202Rep.listInAndOutRecord(deptId, INOUT_TYPE_IN, INOUT_TYPE_OUT, start, end);

            if (null == list || list.isEmpty()) {
                log.info("-------------没有获取到文件信息------------------");
@@ -94,76 +104,90 @@
            List<Api1202> api1202List;
            List<Api1205> api1205List;
            String str = "";
            for (Fz35FileInfo sysData : list) {
                if (StringUtils.isEmpty(sysData.getBizId())) {
            List<Fz35FileInfo> fileList; //文件信息
            List<String> ids;
            for (Fz35InoutRecord inoutData : list) {
                if (inoutData.getRecordStatus().equals("DEL") || inoutData.getRecordStatus().equals("ERROR")) {
                    continue;
                }
                ids = new ArrayList<>();
                wjlx = "";

                //根据图片id查询对应出入库信息
                if(sysData.getBizId().startsWith(IMG_START_R)){
                    api1202List = api1202Rep.getDataByBizId(sysData.getBizId());
                if(inoutData.getType().startsWith(INOUT_TYPE_IN)){
                    wjlx = IMG_TYPE_2;
                    api1202List = api1202Rep.getDataByBizId(inoutData.getId());
                    if (null == api1202List || api1202List.isEmpty()) {
                        continue;
                    }
                    str = api1202List.get(0).getRkywdh();
                    ids = api1202List.stream().map(Api1202::getRkywdh).collect(Collectors.toList());
                }
                if(sysData.getBizId().startsWith(IMG_START_C)){
                    api1205List = api1205Rep.getDataByBizId(sysData.getBizId());
                if (inoutData.getType().equals(INOUT_TYPE_OUT)) {
                    wjlx = IMG_TYPE_3;
                    api1205List = api1205Rep.getDataByBizId(inoutData.getId());
                    if (null == api1205List || api1205List.isEmpty()) {
                        continue;
                    }
                    str = api1205List.get(0).getCkywdh();
                    ids = api1205List.stream().map(Api1205::getCkywdh).collect(Collectors.toList());
                }
                //若文件类型为空，则跳过
                if (StringUtils.isEmpty(wjlx)) {
                    continue;
                }
                //根据出入库单号获取对应文件信息
                fileList = fzzySync1109Rep.listFileInfoByBizId(inoutData.getId());
                if (null == fileList || fileList.isEmpty()) {
                    continue;
                }
                int num = 1;
                int idsNum = 0;
                for (Fz35FileInfo sysData : fileList) {
                    //只同步称重
                    if(BIZ_TAG_WEIGHT_FULL.equals(sysData.getBizTag()) || BIZ_TAG_WEIGHT_EMPTY.equals(sysData.getBizTag())){
                        if(num > 6){
                            num = 1;
                            idsNum ++;
                        }
                        if(idsNum == ids.size()){
                            break;
                        }
                        str = ids.get(idsNum);

                //只同步称重
                if(BIZ_TAG_WEIGHT_FULL.equals(sysData.getBizTag()) || BIZ_TAG_WEIGHT_EMPTY.equals(sysData.getBizTag())){
                    wjlx = "";
                    wjmc = kqdm;
                    //入库抓拍图
                    if (sysData.getBizId().startsWith(IMG_START_R)) {
                        wjlx = IMG_TYPE_2;
                        wjmc += "_" + Constant.INOUT_TYPE_14 + sysData.getBizId().substring(4);
                        wjmc = kqdm + "_" + str;

                        apiData = new Api1109();

                        //主键id
                        apiData.setId(UUID.randomUUID().toString());
                        //文件路径
                        apiData.setWjdz(fileUtil.getInoutFilePath(sysData.getCreateTime()) + sysData.getFileName());

                        //文件名称
                        wjmc = getImgNameType(wjmc, sysData.getBizTag(), str, sysData.getFileName(), map);
                        apiData.setWjmc(wjmc);
                        //文件类型
                        apiData.setWjlx(wjlx);

                        //操作标志及最后更新时间
                        apiData.setZhgxsj(new Date());

                        //业务id、库区编码、同步时间
                        apiData.setBizId(sysData.getFileId());
                        apiData.setKqdm(kqdm);
                        apiData.setSyncTime(new Date());

                        api1109List = api1109Rep.getDataByBizId(apiData.getBizId());
                        if(null == api1109List || api1109List.isEmpty()){
                            apiData.setCzbz(Constant.CZBZ_I);
                        }else {
                            apiData.setCzbz(api1109List.get(0).getCzbz());
                        }

                        //保存数据
                        api1109Rep.save(apiData);
                        num ++;
                        log.info("1109---同步数据：{}", apiData.toString());
                    }
                    //出库抓拍图
                    if (sysData.getBizId().startsWith(IMG_START_C)) {
                        wjlx = IMG_TYPE_3;
                        wjmc += "_" + Constant.INOUT_TYPE_15 + sysData.getBizId().substring(4);
                    }
                    //若文件类型为空，则跳过
                    if(StringUtils.isEmpty(wjlx)){
                        continue;
                    }

                    apiData = new Api1109();

                    //主键id
                    apiData.setId(UUID.randomUUID().toString());
                    //文件路径
                    apiData.setWjdz(fileUtil.getInoutFilePath(sysData.getCreateTime()) + sysData.getFileName());

                    //文件名称
                    wjmc = getImgNameType(wjmc, sysData.getBizTag(), str, sysData.getFileName(), map);
                    apiData.setWjmc(wjmc);
                    //文件类型
                    apiData.setWjlx(wjlx);

                    //操作标志及最后更新时间
                    apiData.setZhgxsj(sysData.getCreateTime());

                    //业务id、库区编码、同步时间
                    apiData.setBizId(sysData.getFileId());
                    apiData.setKqdm(kqdm);
                    apiData.setSyncTime(new Date());

                    api1109List = api1109Rep.getDataByBizId(apiData.getBizId());
                    if(null == api1109List || api1109List.isEmpty()){
                        apiData.setCzbz(Constant.CZBZ_I);
                    }else {
                        apiData.setCzbz(api1109List.get(0).getCzbz());
                    }

                    //保存数据
                    api1109Rep.save(apiData);
                    log.info("1109---同步数据：{}", apiData.toString());
                }
            }
        } catch (Exception e) {

 src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java

@@ -80,6 +80,9 @@
            List<Fz35InoutNoticeIn> listInoutNotice;
            List<Api1202> api1202List;
            for (Fz35InoutRecord sysData : list) {
                if (sysData.getRecordStatus().equals("DEL") || sysData.getRecordStatus().equals("ERROR")) {
                    continue;
                }
                if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
                    sysData.setRecordWeight(sysData.getSettleWeight());
                }
@@ -115,7 +118,7 @@
                //默认一个随便值
                apiData.setLxdh(StringUtils.isEmpty(sysData.getUserContact()) ? "13012345678" : sysData.getUserContact());

                apiData.setSfzh(null == sysData.getUserId() ? "410183200010100000" : sysData.getUserId().trim());
                apiData.setSfzh(null == sysData.getUserId() ? "410183199003187055" : sysData.getUserId().trim());

                //获取合同号
                listInoutNotice = fzzy35SyncNoticeInRep.listInoutNoticeInById(sysData.getNoticeId());
@@ -176,9 +179,10 @@

                apiData.setQzsfzkl(0 - sysData.getDeWet());
                apiData.setQzzzzkl(0 - sysData.getDeImpurity());
                //包装
               // apiData.setBzwkl(0 - sysData.getDePack());
                //其它
                if(null == sysData.getDeOther()){
                    sysData.setDeOther(0.0);
                }
                apiData.setQtkl( 0 - sysData.getDeOther());
                //值仓 çŽ°åœºæ‰£é‡
                apiData.setXckl( 0 - sysData.getDeHandle());

 src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java

@@ -135,7 +135,7 @@
                zkj = "";
                zkl = "";
                for (Fz35CheckItem fz35CheckItem : fz35CheckItems) {
                    gbCheckList = gbCheckItemRep.findByCode(fz35CheckItem.getStandardId());
                    gbCheckList = gbCheckItemRep.findByBizCode(fz35CheckItem.getStandardId());

                    if (gbCheckList == null || gbCheckList.isEmpty()) {
                        continue;
@@ -151,12 +151,11 @@

                apiData.setJyxm(jyxm);
                apiData.setJyz(jyz);
                apiData.setZkj(zkj.substring(1));
                apiData.setZkl(zkl.substring(1));
                apiData.setZkj(StringUtils.isEmpty(zkj)?"":zkj.substring(1));
                apiData.setZkl(StringUtils.isEmpty(zkl)?"":zkl.substring(1));
                if("UNPASS".equals(sysData.getCheckStatus())){
                    apiData.setJyjg("0");
                }
                if("PASS".equals(sysData.getCheckStatus())){
                }else {
                    apiData.setJyjg("1");
                }
                apiData.setJyrxm(sysData.getCheckUser());
@@ -168,7 +167,7 @@

                //保管员复核
                apiData.setBgyfh(apiData.getJyjg());

                apiData.setSpaqzbsfhg("1");
                //粮食等级
                mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSDJ, sysData.getFoodLevel());
                apiData.setLsdd(mappingCode);

 src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java

@@ -81,6 +81,9 @@
        List<Fz35InoutNoticeOut> listInoutNotice;
        List<Api1205> api1205List;
        for (Fz35InoutRecord sysData : list) {
            if (sysData.getRecordStatus().equals("DEL") || sysData.getRecordStatus().equals("ERROR")) {
                continue;
            }
            if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
                sysData.setRecordWeight(sysData.getSettleWeight());
            }
@@ -114,6 +117,8 @@
            apiData.setCktzdh(sysData.getNoticeId());

            apiData.setYwrq(sysData.getRegisterTime());
            apiData.setCyr(sysData.getUserName().trim());
            apiData.setSfzh(null == sysData.getUserId() ? "410183199003187055" : sysData.getUserId().trim());

            //获取合同号
            listInoutNotice = fzzy35SyncNoticeOutRep.listInoutNoticeOutById(sysData.getNoticeId());
@@ -128,7 +133,7 @@
            apiData.setYsgj(StringUtils.isEmpty(sysData.getTransType()) ? "1":sysData.getTransType());

            //车船号
            apiData.setCch(sysData.getPlateNum());
            apiData.setCch(sysData.getPlateNum().trim());
            apiData.setDjsj(sysData.getRegisterTime());

            //粮食品种

 src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1207.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,123 @@
package com.fzzy.async.fzzy35.impl;

import com.fzzy.api.Constant;
import com.fzzy.api.entity.Api1105;
import com.fzzy.api.entity.Api1207;
import com.fzzy.api.entity.ApiLog;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.Api1207Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.fzzy35.entity.Fz35StockChange;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1207Rep;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

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

/**
 * å€’仓信息
 *
 * @author  czt
 */
@Slf4j
@Component
public class Fzzy35Sync1207 {

    @Autowired
    private Fzzy35Sync1207Rep fzzySync1207Rep;
    @Autowired
    private ApiCommonService commonService;
    @Autowired
    private Api1207Rep api1207Rep;
    @Autowired
    private ApiTriggerService apiTriggerService;
    @Autowired
    private ApiLogRep apiLogRep;

    /**
     * å€’仓信息同步
     *
     * @param kqdm
     * @param deptId
     * @param start
     * @param end
     */
    public void syncData(String kqdm, String deptId, Date start, Date end) {
        log.info("-------------1207接口数据开始同步------------------");

        //同步数据，只记录失败的信息
        ApiLog apiLog = new ApiLog();
        apiLog.setType(ApiLog.TYPE_SYNC);
        apiLog.setKqdm(deptId);
        apiLog.setUploadTime(new Date());
        apiLog.setInteId(Constant.API_CODE_1207);
        apiLog.setStatus(99);
        apiLog.setId(ContextUtil.getUUID());

        try {
            List<Fz35StockChange> list = fzzySync1207Rep.listStockChange(deptId, start, end);
            if (null == list || list.isEmpty()) {
                log.info("-------------没有获取到倒仓信息------------------");
                return;
            }

            Api1207 apiData;
            Api1105 api1105In;
            Api1105 api1105Out;
            List<Api1207> api1207List;
            for (Fz35StockChange sysData : list) {
                //获取货位信息
                api1105Out = commonService.getApi1105Cache(sysData.getDepotIdOut());
                if (null == api1105Out) {
                    continue;
                }
                //获取货位信息
                api1105In = commonService.getApi1105Cache(sysData.getDepotIdIn());
                if (null == api1105In) {
                    continue;
                }
                apiData = new Api1207();
                apiData.setDcdh(kqdm + sysData.getId());
                apiData.setDclx(sysData.getType());
                apiData.setDcjhwjbh(sysData.getPlanCode());
                apiData.setTzdh(sysData.getNoticeId());
                apiData.setDcdw(kqdm);
                apiData.setDrdw(kqdm);
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
                apiData.setLspzdm(mappingCode);
                apiData.setDchwdm(api1105Out.getHwdm());
                apiData.setDrhwdm(api1105In.getHwdm());
                apiData.setDcrq(sysData.getChangeDate());
                apiData.setDcsl(sysData.getNumber());
                apiData.setBzw("9");
                apiData.setBzbjs(0);
                apiData.setZxzydw("外聘");
                apiData.setZhgxsj(new Date());
                apiData.setBizId(sysData.getId());
                apiData.setKqdm(kqdm);
                apiData.setSyncTime(new Date());

                //库存每次新增
                api1207List = api1207Rep.getDataByDcdh(apiData.getDcdh());
                if(null == api1207List || api1207List.isEmpty()){
                    apiData.setCzbz(Constant.CZBZ_I);
                }else {
                    apiData.setCzbz(api1207List.get(0).getCzbz());
                }

                //保存数据
                api1207Rep.save(apiData);
                log.info("1207---同步数据：{}", apiData.toString());
            }

        } catch (Exception e) {
            log.error("---倒仓信息同步失败----{}", e);
            apiLog.setResult("倒仓信息同步失败：" + e.getMessage());
            apiLogRep.save(apiLog);
        }
    }
}

 src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1302.java

@@ -66,7 +66,6 @@
                log.info("1302---同步数据：没有查询到需要同步的数据");
                return;
            }
            log.info(JSONObject.toJSONString(list));
            Date syncTime = new Date();
            Api1302 api1302;
            Api1105 api1105;
@@ -87,14 +86,14 @@

                api1302.setCfww(fz35Grain.getTempOut() == null ? 0.00: fz35Grain.getTempOut());
                if(null == fz35Grain.getHumidityOut() || fz35Grain.getHumidityOut() < 0){
                    api1302.setCfws(-1);
                    api1302.setCfws(0);
                }else {
                    api1302.setCfws(fz35Grain.getHumidityOut());
                }

                api1302.setCfnw(fz35Grain.getTempIn() == null ? 0.00: fz35Grain.getTempIn());
                if(null == fz35Grain.getHumidityIn() || fz35Grain.getHumidityIn() < 0){
                    api1302.setCfns(-1);
                    api1302.setCfns(0);
                }else {
                    api1302.setCfns(fz35Grain.getHumidityIn());
                }
@@ -156,6 +155,9 @@

        String[] points = point.split(",");
        String result = "";
        if (c * h * l > points.length) {
            return result;
        }
        for (int i = 1; i <= l; i++) {
            for (int j = 1; j <= h; j++) {
                for (int z = 1; z <= c; z++) {
@@ -180,9 +182,15 @@
        int g = 0;  //圈根数
        int g1 = 1;  //圈起始根数
        int g2 = 0;  //圈截止根数

        int genNum = 0;
        for (String s : cab) {
            genNum += Integer.valueOf(s);
        }
        String[] points = point.split(",");
        String result = "";
        if (c * genNum > points.length) {
            return result;
        }
        for (int i = 1; i <= q; i++) {
            g1 += g2;
            g = Integer.valueOf(cab[i - 1]);

 src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1109Rep.java

@@ -22,4 +22,7 @@
     */
    @Query("from Fz35FileInfo where createTime >=:start and createTime <:end order by createTime ")
    List<Fz35FileInfo> listFileInfo(@Param("start") Date start, @Param("end") Date end);

    @Query("from Fz35FileInfo where bizId =:bizId order by createTime ")
    List<Fz35FileInfo> listFileInfoByBizId(@Param("bizId") String bizId);
}

 src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1201Rep.java

@@ -22,4 +22,14 @@
     */
    @Query("from Fz35MContract where deptId=:deptId and createTime >=:start and createTime <:end order by createTime ")
    List<Fz35MContract> listContract(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);

    /**
     * æ ¹æ®ä¿¡æ¯èŽ·å–合同信息
     *
     * @param start
     * @param end
     * @return
     */
    @Query("from Fz35MContract where createTime >=:start and createTime <:end order by createTime ")
    List<Fz35MContract> listContract(@Param("start") Date start, @Param("end") Date end);
}

 src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1202Rep.java

@@ -28,6 +28,16 @@
    List<Fz35InoutRecord> listInoutRecord(@Param("deptId") String deptId, @Param("type") String type, @Param("start") Date start, @Param("end") Date end);

    /**
     * æ ¹æ®ä¿¡æ¯èŽ·å–出入库信息
     * @param type
     * @param start
     * @param end
     * @return
     */
    @Query("from Fz35InoutRecord where type=:type and completeTime >=:start and completeTime <:end order by completeTime ")
    List<Fz35InoutRecord> listInoutRecord(@Param("type") String type, @Param("start") Date start, @Param("end") Date end);

    /**
     * æ ¹æ®id获取粮食出入库信息
     * @param id
     * @return
@@ -35,4 +45,8 @@
    @Query("from Fz35InoutRecord where id=:id order by completeTime ")
    List<Fz35InoutRecord> listInoutRecordById(@Param("id") String id);

    @Query("from Fz35InoutRecord where deptId=:deptId and (type=:type1 or type=:type2) and completeTime >=:start and completeTime <=:end order by id ")
    List<Fz35InoutRecord> listInAndOutRecord(@Param("deptId") String deptId, @Param("type1") String type1, @Param("type2") String type2, @Param("start") Date start, @Param("end") Date end);


}

 src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1207Rep.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,26 @@
package com.fzzy.async.fzzy35.repository;

import com.fzzy.async.fzzy35.entity.Fz35StockChange;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import java.util.Date;
import java.util.List;

/**
 * å€’仓
 *
 * @Author:YAN
 */
public interface Fzzy35Sync1207Rep extends JpaRepository<Fz35StockChange, String> {

    /**
     * æ ¹æ®ä¿¡æ¯èŽ·å–倒仓信息
     *
     * @param start
     * @param end
     * @return
     */
    @Query("from Fz35StockChange where deptId=:deptId and changeDate >=:start and changeDate <:end order by changeDate ")
    List<Fz35StockChange> listStockChange(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);
}

 src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1208Rep.java

@@ -20,4 +20,12 @@
     */
    @Query("from Fz35DepotStore where deptId=:deptId and createDate >=:start and createDate <:end order by createDate ")
    List<Fz35DepotStore> listDepot(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);

    /**
     * æ ¹æ®ä¿¡æ¯èŽ·å–仓库信息
     *
     * @return
     */
    @Query("from Fz35DepotStore where createDate >=:start and createDate <:end order by createDate ")
    List<Fz35DepotStore> listDepot(@Param("start") Date start, @Param("end") Date end);
}

 src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1209Rep.java

@@ -22,4 +22,14 @@
     */
    @Query("from Fz35MLossOver where deptId=:deptId and submitTime >=:start and submitTime <:end order by submitTime ")
    List<Fz35MLossOver> listMLossOver(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);

    /**
     * æ ¹æ®ä¿¡æ¯èŽ·å–损溢信息
     *
     * @param start
     * @param end
     * @return
     */
    @Query("from Fz35MLossOver where submitTime >=:start and submitTime <:end order by submitTime ")
    List<Fz35MLossOver> listMLossOver(@Param("start") Date start, @Param("end") Date end);
}

 src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1212Rep.java

@@ -19,6 +19,14 @@
    @Query("from Fz35InoutCustomer where deptId=:deptId order by id ")
    List<Fz35InoutCustomer> listInoutCustomer(@Param("deptId") String deptId);

    /**
     * æ ¹æ®ä¿¡æ¯èŽ·å–客户单位信息
     *
     * @return
     */
    @Query("from Fz35InoutCustomer where companyId=:companyId order by id ")
    List<Fz35InoutCustomer> listInoutCustomerByCompanyId(@Param("companyId") String companyId);

    @Query("from Fz35InoutCustomer where id=:id order by id ")
    List<Fz35InoutCustomer> getDataById(@Param("id") String id);
}

 src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1306Rep.java

@@ -24,4 +24,13 @@
     */
    @Query("from Fz35DrugLog where deptId =:deptId and start >=:start and start <:end order by start ")
    List<Fz35DrugLog> findByReceiveDate(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);

    /**
     * æ ¹æ®æ—¶é—´æ®µæŸ¥è¯¢é€šé£Žæ•°æ®
     * @param start
     * @param end
     * @return
     */
    @Query("from Fz35DrugLog where start >=:start and start <:end order by start ")
    List<Fz35DrugLog> findByReceiveDate(@Param("start") Date start, @Param("end") Date end);
}

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

@@ -173,7 +173,7 @@
                        apiData.setWjlx(wjlx);

                        //操作标志及最后更新时间
                        apiData.setZhgxsj(sysData.getCreateTime());
                        apiData.setZhgxsj(new Date());

                        //业务id、库区编码、同步时间
                        apiData.setBizId(sysData.getFileId());

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

@@ -231,6 +231,9 @@

                    int idNum = Integer.valueOf(sysData.getId().substring(12)) * 100 + 10001;
                    for (Fz40InoutRecordItem fz40InoutRecordItem : listInoutRecordItem) {
                        if ("DEL".equals(fz40InoutRecordItem.getRecordStatus())) {
                            continue;
                        }
                        if (fz40InoutRecordItem.getSettleWeight() <= 0) {
                            continue;
                        }
@@ -243,9 +246,6 @@
                            apiData.setCzbz(Constant.CZBZ_I);
                        } else {
                            apiData.setCzbz(api1202List.get(0).getCzbz());
                        }
                        if ("DEL".equals(fz40InoutRecordItem.getRecordStatus())) {
                            apiData.setCzbz(Constant.CZBZ_D);
                        }
                        api1202Rep.save(apiData);
                        idNum++;

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

@@ -189,6 +189,7 @@

                    //保管员复核
                    apiData.setBgyfh(apiData.getJyjg());
                    apiData.setSpaqzbsfhg("1");

                    //粮食等级
                    mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSDJ, sysData.getFoodLevel());

 src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1109Rep.java

@@ -1,11 +1,9 @@
package com.fzzy.async.fzzy40.repository;

import com.fzzy.async.fzzy35.entity.Fz35FileInfo;
import com.fzzy.async.fzzy40.entity.Fz40FileInfo;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;

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


 src/main/resources/application-pro5016.yml

@@ -1,6 +1,6 @@
##########################  å¤§æ¹¾åŒº   ##########################
server:
  port: 8081
  port: 8090
  jetty:
    max-http-post-size: 209715200
  tomcat: