出库结算信息加入货位字段，上传不使用

CZT

2024-03-09 4c6b38c84b14e90bd0844046645c61796746696c

出库结算信息加入货位字段，上传不使用

 src/main/java/com/fzzy/api/entity/Api1202.java

@@ -86,7 +86,7 @@
    private String cchlx;

    @PropertyDef(label = "挂车号")
    @Column(name = "gch", length = 7)
    @Column(name = "gch", length = 32)
    private String gch;

    @PropertyDef(label = "装粮地点")

 src/main/java/com/fzzy/api/entity/Api1205.java

@@ -88,7 +88,7 @@
    private String cchlx;

    @PropertyDef(label = "挂车号")
    @Column(name = "gch", length = 7)
    @Column(name = "gch", length = 32)
    private String gch;

    @JSONField(format = "yyyy-MM-dd HH:mm:ss")

 src/main/java/com/fzzy/api/entity/Api1206.java

@@ -96,4 +96,9 @@
    @PropertyDef(label = "更新时间")
    @Column(name = "zhgxsj")
    private Date zhgxsj;

    @JSONField(serialize = false)
    @PropertyDef(label = "货位代码")
    @Column(name = "hwdm", length = 30)
    private String hwdm;
}

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

@@ -147,7 +147,6 @@

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

            //粮食品种
@@ -206,10 +205,15 @@
                apiData.setCkjsdh(kqdm + sysData.getSettleId());
            }
            if(StringUtils.isNotEmpty(apiData.getHth())){
                api1206List = api1206Rep.getDataByHthAndHwdm(apiData.getHth(), apiData.getHwdm());
                if(null == api1206List || api1206List.isEmpty()){
                api1206List = api1206Rep.getDataByHth(apiData.getHth());
                if(null != api1206List && api1206List.size() > 0){
                    apiData.setCkjsdh(api1206List.get(0).getCkjsdh());
                }
                }else {
                    apiData.setCkjsdh(api1206List.get(0).getCkjsdh());
                }
            }

            apiData.setCchlx("01");

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

@@ -2,8 +2,10 @@

import com.fzzy.api.Constant;
import com.fzzy.api.entity.Api1102;
import com.fzzy.api.entity.Api1105;
import com.fzzy.api.entity.Api1206;
import com.fzzy.api.entity.ApiLog;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.Api1102Rep;
import com.fzzy.api.view.repository.Api1206Rep;
@@ -38,6 +40,8 @@
    private Api1102Rep api1102Rep;
    @Autowired
    private ApiLogRep apiLogRep;
    @Autowired
    private ApiCommonService commonService;

    /**
     * 粮食出库结算
@@ -70,6 +74,7 @@
            Api1102 api1102 = api1102Rep.findById(kqdm).get();

            Api1206 apiData;
            Api1105 api1105;
            List<Api1206> api1206List;
            for (Fz40InoutSettle sysData : list) {

@@ -82,6 +87,12 @@
                    apiData.setHth(api1102.getDwdm() + sysData.getContractId());
                }

                if(StringUtils.isNotEmpty(sysData.getDepotId())){
                    api1105 = commonService.getApi1105Cache(sysData.getDepotId());
                    //货位代码
                    apiData.setHwdm(api1105.getHwdm());
                }

                //结算重量、结算单价、结算金额、结算时间
                apiData.setJssl(sysData.getSettleWeight());
                apiData.setJsdj(sysData.getPayPrice());

 src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java

@@ -589,6 +589,12 @@
                    }
                }
            }
            if (StringUtils.isNotEmpty(apiData.getHwdm())) {
                List<Api1208> api1208List = api1208Rep.findDataByHwdm(apiData.getHwdm());
                if (null != api1208List && api1208List.size() > 0) {
                    api1206.setPch(api1208List.get(0).getHwdm() + api1208List.get(0).getShnd());
                }
            }
            //设置空属性为默认值
            changeObject(api1206);
            return api1206;