陈战涛
2023-05-22 550b14e27b9bba40e80f1141d0943d1dc62acbbc
优化广东粮食购销接口
已修改25个文件
192 ■■■■ 文件已修改
src/main/java/com/fzzy/api/entity/Api1202.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/api/entity/Api1203.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/api/entity/Api1205.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/api/utils/FileUtil.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/api/view/Api1202.view.xml 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/api/view/Api1203.view.xml 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/api/view/Api1205.view.xml 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/api/view/pr/Api1202PR.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/api/view/pr/Api1203PR.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/api/view/pr/Api1205PR.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/api/view/repository/Api1109Rep.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/api/view/repository/Api1201Rep.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/api/view/repository/Api1202Rep.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/api/view/repository/Api1203Rep.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/api/view/repository/Api1205Rep.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/async/fzzy35/entity/Fz35InoutRecord.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1201.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1203Rep.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023PushService12.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/api/entity/Api1202.java
@@ -27,12 +27,13 @@
    public static String SORT_PROP = "rkywdh";
    @Id
    @JSONField(serialize = false)
    @Column(name = "id", length = 40)
    private String id;
//    @Id
//    @JSONField(serialize = false)
//    @Column(name = "id", length = 40)
//    private String id;
    //12 位数字组成,第 1-2 位为业务代码(14代表粮食入库),第 3-8 位依次为年份的后两位、2 位月份、2 位日期,后四位为顺序码。例如:141605041234
    @Id
    @PropertyDef(label = "入库业务单号")
    @Column(name = "rkywdh", length = 12, nullable = false)
    private String rkywdh;
src/main/java/com/fzzy/api/entity/Api1203.java
@@ -27,12 +27,8 @@
    public static String SORT_PROP = "rkjydh";
    @Id
    @JSONField(serialize = false)
    @Column(name = "id", length = 40)
    private String id;
    //入库业务单号由 12 位数字组成,第 1-2 位为业务代码(14代表粮食入库),第 3-8 位依次为年份的后两位、2 位月份、2 位日期,后四位为顺序码。例如:141605041234
    @Id
    @PropertyDef(label = "入库检验单号")
    @Column(name = "rkjydh", length = 12, nullable = false)
    private String rkjydh;
src/main/java/com/fzzy/api/entity/Api1205.java
@@ -26,16 +26,10 @@
     */
    private static final long serialVersionUID = -6381473449862569451L;
    public static String SORT_PROP = "ckywdh";
    @JSONField(serialize = false)
    @Id
    @Column(name = "id", length = 40)
    private String id;
    //业务单号由 12 位数字组成,第 1-2 位为业务编码(15 代表粮食出库),第 3-8 位依次为年份的后两位、2 位月份、2位日期,后四位为顺序码。例如:141605041234
    @Id
    @PropertyDef(label = "出库业务单号")
    @Column(name = "ckywdh", length = 12)
    private String ckywdh;
src/main/java/com/fzzy/api/utils/FileUtil.java
@@ -31,7 +31,7 @@
            date = new Date();
        }
        String basePath = configData.getFilePath() + "INOUT/"
        String basePath = configData.getImgPath() + "INOUT/"
                + DateFormatUtils.format(date, "yyyyMM") + "/";
        File file = new File(basePath);
src/main/java/com/fzzy/api/view/Api1202.view.xml
@@ -276,9 +276,6 @@
        <Property></Property>
        <Property name="label">库区代码</Property>
      </PropertyDef>
      <PropertyDef name="id">
        <Property name="dataType">Integer</Property>
      </PropertyDef>
      <PropertyDef name="cchlx">
        <Property/>
        <Property name="label">车船号类型</Property>
@@ -846,11 +843,6 @@
          <AutoFormElement>
            <Property name="name">bizId</Property>
            <Property name="property">bizId</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">id</Property>
            <Property name="property">id</Property>
            <Editor/>
          </AutoFormElement>
        </AutoForm>
src/main/java/com/fzzy/api/view/Api1203.view.xml
@@ -5,9 +5,6 @@
  <Model>
    <DataType name="dtMain">
      <Property name="creationType">com.fzzy.api.entity.Api1203</Property>
      <PropertyDef name="id">
        <Property name="dataType">Integer</Property>
      </PropertyDef>
      <PropertyDef name="rkjydh">
        <Property></Property>
        <Property name="label">入库检验单号</Property>
@@ -21,7 +18,7 @@
        <Property name="label">入库业务单号</Property>
      </PropertyDef>
      <PropertyDef name="qysj">
        <Property name="dataType">Date</Property>
        <Property name="dataType">DateTime</Property>
        <Property name="label">扦样时间</Property>
      </PropertyDef>
      <PropertyDef name="qyrxm">
src/main/java/com/fzzy/api/view/Api1205.view.xml
@@ -26,9 +26,6 @@
        <Property></Property>
        <Property name="label">库区代码</Property>
      </PropertyDef>
      <PropertyDef name="id">
        <Property name="dataType">Integer</Property>
      </PropertyDef>
      <PropertyDef name="ckywdh">
        <Property></Property>
        <Property name="label">出库业务单号</Property>
src/main/java/com/fzzy/api/view/pr/Api1202PR.java
@@ -130,7 +130,7 @@
    @Expose
    public String delData(Api1202 data) {
        apiRepository.deleteById(data.getId());
        apiRepository.deleteById(data.getRkywdh());
        return null;
    }
src/main/java/com/fzzy/api/view/pr/Api1203PR.java
@@ -130,7 +130,7 @@
    @Expose
    public String delData(Api1203 data) {
        if (null == data) return "无数据执行";
        apiRepository.deleteById(data.getBizId());
        apiRepository.deleteById(data.getRkjydh());
        return null;
    }
src/main/java/com/fzzy/api/view/pr/Api1205PR.java
@@ -131,7 +131,7 @@
    @Expose
    public String delData(Api1205 data) {
        if(null == data) return "无数据执行";
        apiRepository.deleteById(data.getId());
        apiRepository.deleteById(data.getCkywdh());
        return null;
    }
src/main/java/com/fzzy/api/view/repository/Api1109Rep.java
@@ -1,6 +1,7 @@
package com.fzzy.api.view.repository;
import com.fzzy.api.entity.Api1109;
import com.fzzy.api.entity.Api1202;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
@@ -19,4 +20,7 @@
    @Modifying
    @Query("update Api1109 set czbz =:czbz where id=:id")
    void updateStatus(@Param("id") String id, @Param("czbz") String czbz);
    @Query("from Api1109 where bizId=:bizId ")
    List<Api1109> getDataByBizId(@Param("bizId") String bizId);
}
src/main/java/com/fzzy/api/view/repository/Api1201Rep.java
@@ -1,6 +1,7 @@
package com.fzzy.api.view.repository;
import com.fzzy.api.entity.Api1201;
import com.fzzy.api.entity.Api1202;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
@@ -21,4 +22,7 @@
    @Modifying
    @Query("update Api1201 set czbz =:czbz where hth=:hth")
    void updateStatus(@Param("hth") String hth, @Param("czbz") String czbz);
    @Query("from Api1201 where hth=:hth ")
    List<Api1201> getDataById(@Param("hth") String hth);
}
src/main/java/com/fzzy/api/view/repository/Api1202Rep.java
@@ -2,6 +2,7 @@
import com.fzzy.api.entity.Api1202;
import com.fzzy.api.entity.Api1208;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
@@ -21,4 +22,7 @@
    @Modifying
    @Query("update Api1202 set czbz =:czbz where rkywdh=:rkywdh")
    int updateStatus(@Param("rkywdh") String rkywdh, @Param("czbz") String czbz);
    @Query("from Api1202 where rkywdh=:rkywdh ")
    List<Api1202> getDataById(@Param("rkywdh") String rkywdh);
}
src/main/java/com/fzzy/api/view/repository/Api1203Rep.java
@@ -1,5 +1,6 @@
package com.fzzy.api.view.repository;
import com.fzzy.api.entity.Api1202;
import com.fzzy.api.entity.Api1203;
import org.springframework.data.jpa.repository.JpaRepository;
@@ -21,4 +22,7 @@
    @Modifying
    @Query("update Api1203 set czbz =:czbz where rkjydh=:rkjydh")
    void updateStatus(@Param("rkjydh") String rkjydh, @Param("czbz") String czbz);
    @Query("from Api1203 where rkjydh=:rkjydh ")
    List<Api1203> getDataById(@Param("rkjydh") String rkjydh);
}
src/main/java/com/fzzy/api/view/repository/Api1205Rep.java
@@ -1,6 +1,7 @@
package com.fzzy.api.view.repository;
import com.fzzy.api.entity.Api1202;
import com.fzzy.api.entity.Api1205;
import org.springframework.data.jpa.repository.JpaRepository;
@@ -22,4 +23,7 @@
    @Modifying
    @Query("update Api1205 set czbz =:czbz where ckywdh=:ckywdh")
    void updateStatus(@Param("ckywdh") String ckywdh, @Param("czbz") String czbz);
    @Query("from Api1205 where ckywdh=:ckywdh ")
    List<Api1205> getDataById(@Param("ckywdh") String ckywdh);
}
src/main/java/com/fzzy/async/fzzy35/entity/Fz35InoutRecord.java
@@ -31,7 +31,7 @@
    private String deptId;
    @Column(name = "NOTICE_ID_", length = 40)
    @PropertyDef(label = "通知单Id")
    @PropertyDef(label = "通知单编码")
    private String noticeId;
    @Column(name = "DEPOT_ID_", length = 50)
@@ -86,10 +86,6 @@
    @PropertyDef(label = "承运人地址")
    private String userAddress;
    @Column(name = "CUR_STORAGE_")
    @PropertyDef(label = "当前库存")
    private double curStorage = 0.0;
    // 基本信息
    @Column(name = "INTEL_CARD_", length = 20)
    @PropertyDef(label = "智慧卡号")
@@ -104,7 +100,7 @@
    private String transType; //TransType.TYPE_1.getCode();
    @Column(name = "CUSTOMER_ID_", length = 40)
    @PropertyDef(label = "往来单位ID", description = "入库时,表示发货单位,出库时候表示收货单位")
    @PropertyDef(label = "往来单位", description = "入库时,表示发货单位,出库时候表示收货单位")
    private String customerId;
    @Column(name = "CUSTOMER_NAME_", length = 50)
@@ -124,8 +120,9 @@
    @PropertyDef(label = "粮食等级")
    private String foodLevel;
    @Column(name = "FOOD_LOCATION_", length = 40)
    @PropertyDef(label = "粮食产地")
    @PropertyDef(label = "产地名称")
    private String foodLocation;
    @Column(name = "FOOD_YEAR_", length = 20)
@@ -161,7 +158,6 @@
    @Column(name = "DE_WET_")
    @PropertyDef(label = "水分扣重", description = "单位KG")
    private Double deWet = 0.0;
    @Column(name = "DE_HANDLE_")
    @PropertyDef(label = "值仓扣重", description = "单位KG")
@@ -204,8 +200,12 @@
    private Double netWeight = 0.0;
    @Column(name = "SETTLE_WEIGHT_")
    @PropertyDef(label = "结算净重", description = "扣重后净重,结算净重,单位KG")
    @PropertyDef(label = "结算重量", description = "扣重后净重,结算净重,单位KG")
    private Double settleWeight = 0.0;
    @Column(name = "RECORD_WEIGHT_")
    @PropertyDef(label = "入库重量", description = "扣重后净重,结算净重,补包括增重,单位KG")
    private Double recordWeight = 0.0;
    @Column(name = "PRICE_")
    @PropertyDef(label = "单价", description = "单位:元/公斤")
@@ -241,12 +241,5 @@
    @Column(name = "SETTLE_TAG_", length = 2)
    @PropertyDef(label = "是否结算", description = "Y:表示已结算;N:表示未结算")
    private String settleTag ;
    @Override
    public String toString() {
        return "InoutRecord [id=" + id + ", depotId=" + depotId + ", type="
                + type + ", settleWeight=" + settleWeight + ", completeTime="
                + completeTime + "]";
    }
}
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java
@@ -2,6 +2,7 @@
import com.fzzy.api.Constant;
import com.fzzy.api.entity.Api1109;
import com.fzzy.api.entity.Api1201;
import com.fzzy.api.entity.ApiLog;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.utils.FileUtil;
@@ -83,6 +84,7 @@
            Api1109 apiData;
            String wjlx;
            String wjmc;
            List<Api1109> api1109List;
            for (Fz35FileInfo sysData : list) {
                if (StringUtils.isEmpty(sysData.getBizId())) {
                    continue;
@@ -120,7 +122,6 @@
                    apiData.setWjlx(wjlx);
                    //操作标志及最后更新时间
                    apiData.setCzbz(Constant.CZBZ_I);
                    apiData.setZhgxsj(new Date());
                    //业务id、库区编码、同步时间
@@ -128,6 +129,11 @@
                    apiData.setKqdm(kqdm);
                    apiData.setSyncTime(new Date());
                    api1109List = api1109Rep.getDataByBizId(apiData.getBizId());
                    if(null == api1109List || api1109List.isEmpty()){
                        apiData.setCzbz(Constant.CZBZ_I);
                    }
                    //保存数据
                    api1109Rep.save(apiData);
                    log.info("1109---同步数据:{}", apiData.toString());
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1201.java
@@ -15,11 +15,9 @@
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
 * 合同信息数据接口
@@ -71,6 +69,7 @@
            Api1102 api1201 = api1102Rep.findById(kqdm).get();
            Api1201 apiData;
            List<Api1201> api1201List;
            for (Fz35MContract sysData : list) {
                apiData = new Api1201();
@@ -78,7 +77,6 @@
                apiData.setHth(api1201.getDwdm() + sysData.getId());
                apiData.setHtmc(sysData.getName());
                apiData.setDwdm(api1201.getDwdm());
                //业务类型
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_HT_YWLX, sysData.getType());
@@ -123,7 +121,6 @@
                apiData.setWcrq(sysData.getEndTime());
                apiData.setCzbz(Constant.CZBZ_I);
                apiData.setZhgxsj(sysData.getCreateTime());
                apiData.setSyncTime(new Date());
@@ -132,6 +129,11 @@
                apiLog.setDataId(apiData.getBizId());
                apiLog.setKqdm(kqdm);
                api1201List = api1201Rep.getDataById(apiData.getHth());
                if(null == api1201List || api1201List.isEmpty()){
                    apiData.setCzbz(Constant.CZBZ_I);
                }
                //保存数据
                api1201Rep.save(apiData);
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
@@ -3,6 +3,7 @@
import com.fzzy.api.Constant;
import com.fzzy.api.entity.Api1105;
import com.fzzy.api.entity.Api1202;
import com.fzzy.api.entity.Api1208;
import com.fzzy.api.entity.ApiLog;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiTriggerService;
@@ -78,16 +79,19 @@
            Api1202 apiData;
            Api1105 api1105;
            List<Fz35InoutNoticeIn> listInoutNotice;
            List<Api1202> api1202List;
            Calendar c = Calendar.getInstance();
            for (Fz35InoutRecord sysData : list) {
                //判断净重是否大于0,等于0表示不合格,不进行同步上传
                if(sysData.getRecordWeight() == 0){
                    continue;
                }
                //获取货位信息
                api1105 = commonService.getApi1105Cache(sysData.getDepotId());
                if (null == api1105) {
                    continue;
                }
                apiData = new Api1202();
                apiData.setId(sysData.getId());
                apiData.setRkywdh(Constant.INOUT_TYPE_14 + sysData.getId().substring(4));
@@ -164,25 +168,25 @@
                //值仓 现场扣重
                apiData.setXckl( 0 - sysData.getDeHandle());
                apiData.setJz(sysData.getSettleWeight());
                apiData.setJz(sysData.getRecordWeight());
                c.setTime(sysData.getCompleteTime());
                c.add(Calendar.MINUTE,3);
                apiData.setCmsj(c.getTime());
                //入库结算单号
                apiData.setRkjsdh(kqdm + sysData.getId().substring(2));
                //入库结算单号,默认统一结算,不设置结算单号
                //apiData.setRkjsdh(kqdm + sysData.getId().substring(2));
                //操作标志及最后更新时间
                apiData.setCzbz(Constant.CZBZ_I);
                apiData.setZhgxsj(c.getTime());
                //业务id、库区编码、同步时间
                apiData.setBizId(sysData.getId());
                apiData.setKqdm(kqdm);
                apiData.setSyncTime(new Date());
                api1202List = api1202Rep.getDataById(apiData.getRkywdh());
                if(null == api1202List || api1202List.isEmpty()){
                    apiData.setCzbz(Constant.CZBZ_I);
                }
                //保存数据
                api1202Rep.save(apiData);
                log.info("1202---同步数据:{}", apiData.toString());
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
@@ -1,10 +1,7 @@
package com.fzzy.async.fzzy35.impl;
import com.fzzy.api.Constant;
import com.fzzy.api.entity.Api1105;
import com.fzzy.api.entity.Api1203;
import com.fzzy.api.entity.ApiLog;
import com.fzzy.api.entity.GbCheckItem;
import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.ContextUtil;
@@ -16,6 +13,7 @@
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1202Rep;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1203Rep;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -86,8 +84,13 @@
            String jyz;
            String zkj;
            String zkl;
            List<Api1203> api1203List;
            for (Fz35InoutRecord sysData : list) {
                //判断净重是否大于0,等于0表示不合格,不进行同步上传
                if(sysData.getRecordWeight() == 0){
                    continue;
                }
                fz35CheckItems = null;
                //获取入库质检信息
                fz35CheckItems = fzzySync1203Rep.listInoutCheckItem(sysData.getCheckId());
                if (null == fz35CheckItems || fz35CheckItems.isEmpty()) {
@@ -102,7 +105,6 @@
                }
                apiData = new Api1203();
                apiData.setId(sysData.getId());
                apiData.setRkjydh(Constant.INOUT_TYPE_14 + sysData.getId().substring(4));
@@ -127,18 +129,22 @@
                    }
                    jyxm += gbCheckList.get(0).getCode() + ",";
                    jyz += fz35CheckItem.getValue() + ",";
                    zkj += "0,";
                    zkl += "0,";
                    zkj += "0.0,";
                    zkl += "0.0,";
                }
                apiData.setJyxm(jyxm);
                apiData.setJyz(jyz);
                apiData.setZkj(zkj);
                apiData.setZkl(zkl);
                if("UNPASS".equals(sysData.getCheckStatus())){
                apiData.setJyjg("0");
                }
                if("PASS".equals(sysData.getCheckStatus())){
                    apiData.setJyjg("1");
                }
                apiData.setJyrxm(sysData.getCheckUser());
                apiData.setJysj(sysData.getFullWeightTime());
                //apiData.setJyjg("");
                apiData.setJysj(DateUtils.addMinutes(sysData.getFullWeightTime(), 5));
                //粮食品种
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
@@ -149,7 +155,6 @@
                apiData.setLsdd(mappingCode);
                //操作标志及最后更新时间
                apiData.setCzbz(Constant.CZBZ_I);
                apiData.setZhgxsj(sysData.getCompleteTime());
                //业务id、库区编码、同步时间
@@ -157,6 +162,11 @@
                apiData.setKqdm(kqdm);
                apiData.setSyncTime(new Date());
                api1203List = api1203Rep.getDataById(apiData.getRkjydh());
                if(null == api1203List || api1203List.isEmpty()){
                    apiData.setCzbz(Constant.CZBZ_I);
                }
                //保存数据
                api1203Rep.save(apiData);
                log.info("1203---同步数据:{}", apiData.toString());
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java
@@ -77,18 +77,20 @@
        Api1205 apiData;
        Api1105 api1105;
        List<Fz35InoutNoticeOut> listInoutNotice;
        List<Api1205> api1205List;
        // List<GbArea> gbAreaList;
        Calendar c = Calendar.getInstance();
        for (Fz35InoutRecord sysData : list) {
            //判断净重是否大于0,等于0表示不合格,不进行同步上传
            if(sysData.getRecordWeight() == 0){
                continue;
            }
            //获取货位信息
            api1105 = commonService.getApi1105Cache(sysData.getDepotId());
            if(null == api1105){
                continue;
            }
            apiData = new Api1205();
            apiData.setId(sysData.getId());
            apiData.setCkywdh(Constant.INOUT_TYPE_15 + sysData.getId().substring(4));
@@ -150,13 +152,12 @@
            apiData.setMzjly(sysData.getFullWeightUser());
            //净重
            apiData.setJz(sysData.getSettleWeight());
            apiData.setJz(sysData.getRecordWeight());
            c.setTime(sysData.getCompleteTime());
            c.add(Calendar.MINUTE,3);
            apiData.setCmsj(c.getTime());
            //操作标志及最后更新时间
            apiData.setCzbz(Constant.CZBZ_I);
            apiData.setZhgxsj(c.getTime());
            //业务id、库区编码、同步时间
@@ -164,6 +165,11 @@
            apiData.setKqdm(kqdm);
            apiData.setSyncTime(new Date());
            log.info("1201---同步数据:{}",apiData.toString());
            api1205List = api1205Rep.getDataById(apiData.getCkywdh());
            if(null == api1205List || api1205List.isEmpty()){
                apiData.setCzbz(Constant.CZBZ_I);
            }
            //保存数据
            api1205Rep.save(apiData);
        }
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java
@@ -118,6 +118,9 @@
                //货位状态
                mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_HWZT, fz35Depot.getDepotStatus());
                apiData.setHwzt(mappingCode);
                if(null == fz35Depot.getStoreDate()){
                    fz35Depot.setStoreDate(new Date());
                }
                //入仓时间
                apiData.setRcsj(fz35Depot.getStoreDate());
                //封仓日期
src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1203Rep.java
@@ -18,6 +18,6 @@
     * @param checkId
     * @return
     */
    @Query("from Fz35CheckItem where checkId=:checkId ")
    @Query("from Fz35CheckItem where checkId=:checkId order by standardId")
    List<Fz35CheckItem> listInoutCheckItem(@Param("checkId") String checkId);
}
src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023PushService12.java
@@ -1,18 +1,13 @@
package com.fzzy.push.shjdjw2023;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.Api1202;
import com.fzzy.api.service.PushService12;
import com.fzzy.api.view.repository.Api1202Rep;
import com.fzzy.push.impl.ComPushService12;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.List;
/**
 * 上海嘉定纪委监管平台-粮食购销数据上传
src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
@@ -317,7 +317,7 @@
        shjdjwApi1209.setNx(api1209.getYwrq());
        //辅损益数量
        shjdjwApi1209.setFsysl(Math.abs(api1209.getJzsysl()));
        shjdjwApi1209.setFsysl(0.0);
        //损益类型
        shjdjwApi1209.setSylx(api1209.getJzsysl() > 0 ? "0" : "1");
        return shjdjwApi1209;