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

@@ -85,11 +85,11 @@
                mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getNewFoodType());
                apiData.setHzhlsxzdm(mappingCode);
                apiData.setHzrq(sysData.getChangeTime());
                apiData.setCcshr(sysData.getCcshr());
                apiData.setZjshr(sysData.getZjshr());
                apiData.setTjshr(sysData.getTjshr());
                apiData.setKjshr(sysData.getKjshr());
                apiData.setLdshr(sysData.getLdshr());
                apiData.setCcshr(StringUtils.isEmpty(sysData.getCcshr()) ? "审批人" : sysData.getCcshr());
                apiData.setZjshr(StringUtils.isEmpty(sysData.getZjshr()) ? "审批人" : sysData.getZjshr());
                apiData.setTjshr(StringUtils.isEmpty(sysData.getTjshr()) ? "审批人" : sysData.getTjshr());
                apiData.setKjshr(StringUtils.isEmpty(sysData.getKjshr()) ? "审批人" : sysData.getKjshr());
                apiData.setLdshr(StringUtils.isEmpty(sysData.getLdshr()) ? "审批人" : sysData.getLdshr());
                apiData.setBz(sysData.getRemark());
                apiData.setZhgxsj(new Date());

@@ -98,10 +98,10 @@
                apiData.setKqdm(kqdm);
                apiData.setSyncTime(new Date());
                api1210List = api1210Rep.getDataById(apiData.getLsxzzbdh());
                if(null == api1210List || api1210List.isEmpty()){
                if (null == api1210List || api1210List.isEmpty()) {
                    apiData.setCzbz(Constant.CZBZ_I);
                }else {
                    if(StringUtils.isNotEmpty(api1210List.get(0).getJhmxdh())){
                } else {
                    if (StringUtils.isNotEmpty(api1210List.get(0).getJhmxdh())) {
                        apiData.setJhmxdh(api1210List.get(0).getJhmxdh());
                    }
                    apiData.setCzbz(api1210List.get(0).getCzbz());

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

@@ -125,14 +125,14 @@
                    for (Fz40DrugLogDtl dtl : dtls) {
                        api9201Dtl = new Gd2022Api1023Dtl();
                        BeanUtils.copyProperties(dtl, api9201Dtl);
                        api1105 = commonService.getApi1105Cache(data.getDepotId());
                        api1105 = commonService.getApi1105Cache(dtl.getDepotId());
                        if (null != api1105) {
                            api9201Dtl.setCfmc(api1105.getHwmc());
                            api9201Dtl.setCfdm(api1105.getHwdm().substring(0, 25));
                        }

                        //粮食品种
                        String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, data.getFoodVariety());
                        String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, dtl.getFoodVariety());
                        api9201Dtl.setLspzdm(mappingCode);
                        api9201Dtl.setLsxzdm(data.getFoodType());
                        api9201Dtl.setLsdjdm(data.getFoodLevel());

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

@@ -13,6 +13,6 @@
 * @Author:YAN
 */
public interface Fzzy40Sync1210Rep extends JpaRepository<Fz40InoutVarietyChange, String> {
    @Query("from Fz40InoutVarietyChange where deptId=:deptId and changeTime >=:start and changeTime <:end order by changeTime ")
    @Query("from Fz40InoutVarietyChange where deptId=:deptId and updateTime >=:start and updateTime <:end order by updateTime ")
    List<Fz40InoutVarietyChange> listVarietyChange(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);
}

 src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java

@@ -356,7 +356,8 @@
            return JSON.toJSONString(api1105);
        }
        if (Constant.API_CODE_1106.equals(inteId)) {
            Gd2023Api1106 api1106 = (Gd2023Api1106) data;
            Gd2023Api1106 api1106 = new Gd2023Api1106();
            BeanUtils.copyProperties(data, api1106);
            api1106.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if (StringUtils.isEmpty(api1106.getTykqbm())) {

 src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1306.java

@@ -2,6 +2,7 @@

import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

@@ -118,6 +119,7 @@
    @PropertyDef(label = "补药前仓内磷化氢浓度" )
    private Double byqcnlhqnd;

    @JsonProperty("lhqnddw")
    @PropertyDef(label = "磷化氢浓度单位",description = "1：g/m³ (默认)  2：ppm 3:ml/m³ 4：%VOL。")
    private String nlhqnddw;