优化出入库信息的结算单绑定

CZT

2024-03-05 e2a064410d4ea573bae6e8bf96da378c8ad0e809

优化出入库信息的结算单绑定

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

@@ -34,7 +34,7 @@
    
    @JSONField(serialize = false)
    @Id
    @Column(name = "bizId", length = 60)
    @Column(name = "id", length = 60)
    private String id;

    @JSONField(serialize = false)

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

@@ -26,4 +26,7 @@

    @Query("from Api1204 where rkjsdh=:rkjsdh ")
    List<Api1204> getDataById(@Param("rkjsdh") String rkjsdh);

    @Query("from Api1204 where hth=:hth ")
    List<Api1204> getDataByHth(@Param("hth") String hth);
}

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

@@ -25,4 +25,7 @@

    @Query("from Api1206 where ckjsdh=:ckjsdh ")
    List<Api1206> getDataById(@Param("ckjsdh") String ckjsdh);

    @Query("from Api1206 where hth=:hth ")
    List<Api1206> getDataByHth(@Param("hth") String hth);
}

 src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java

@@ -70,19 +70,21 @@
        //合同同步
        fzzySync1201.syncData(kqdm, deptId, start, end);

        //粮食入库结算
        fzzySync1204.syncData(kqdm, deptId, start, end);

        //粮食入库同步
        fzzySync1202.syncData(kqdm, deptId, start, end);

        //粮食入库质检
        fzzySync1203.syncData(kqdm, deptId, start, end);

        //粮食入库结算
        fzzySync1204.syncData(kqdm, deptId, start, end);
        //粮食出库结算
        fzzySync1206.syncData(kqdm, deptId, start, end);

        //粮食出库同步
        fzzySync1205.syncData(kqdm, deptId, start, end);

        //粮食出库结算
        fzzySync1206.syncData(kqdm, deptId, start, end);
        //粮食损益
        fzzySync1209.syncData(kqdm, deptId, start, end);
        //倒仓信息同步

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

@@ -5,10 +5,7 @@
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.Api1201Rep;
import com.fzzy.api.view.repository.Api1202Rep;
import com.fzzy.api.view.repository.Api1404Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.api.view.repository.*;
import com.fzzy.async.fzzy40.entity.Fz40InoutNoticeIn;
import com.fzzy.async.fzzy40.entity.Fz40InoutRecord;
import com.fzzy.async.fzzy40.entity.Fz40InoutRecordItem;
@@ -49,6 +46,8 @@
    @Autowired
    private Api1202Rep api1202Rep;
    @Autowired
    private Api1204Rep api1204Rep;
    @Autowired
    private Api1404Rep api1404Rep;
    @Autowired
    private ApiCommonService commonService;
@@ -88,6 +87,7 @@
            List<Api1202> api1202List;
            List<Fz40InoutRecordItem> listInoutRecordItem;
            List<Api1201> api1201List;
            List<Api1204> api1204List;
            List<Api1404> api1404List;
            for (Fz40InoutRecord sysData : list) {
                if (sysData.getRecordStatus().equals("DEL") || sysData.getRecordStatus().equals("ERROR")) {
@@ -206,9 +206,16 @@
                apiData.setBzwkl(0 - sysData.getDePackage());
                apiData.setBzbjs(sysData.getBzbjs());
                apiData.setCmsj(sysData.getCompleteTime());
                if (StringUtils.isNotEmpty(sysData.getSettleId())) {
                //结算单号
                if(StringUtils.isNotEmpty(sysData.getSettleId())){
                    apiData.setRkjsdh(kqdm + sysData.getSettleId());
                }
                if(StringUtils.isNotEmpty(apiData.getHth())){
                    api1204List = api1204Rep.getDataByHth(apiData.getHth());
                    if(null != api1204List && api1204List.size() > 0){
                        apiData.setRkjsdh(api1204List.get(0).getRkjsdh());
                    }
                }
                //其它
                apiData.setQtkl(0 - sysData.getDeOther());
                //值仓 现场扣重

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

@@ -44,6 +44,8 @@
    @Autowired
    private Api1205Rep api1205Rep;
    @Autowired
    private Api1206Rep api1206Rep;
    @Autowired
    private Api1404Rep api1404Rep;
    @Autowired
    private ApiCommonService commonService;
@@ -82,6 +84,7 @@
        Api1105 api1105;
        List<Fz40InoutNoticeOut> listInoutNotice;
        List<Api1205> api1205List;
        List<Api1206> api1206List;
        List<Fz40InoutRecordItem> listInoutRecordItem;
        for (Fz40InoutRecord sysData : list) {
            if(sysData.getRecordStatus().equals("DEL") || sysData.getRecordStatus().equals("ERROR")){
@@ -197,9 +200,16 @@
                sysData.setCompleteTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 10));
            }
            apiData.setCmsj(sysData.getCompleteTime());
            //结算单号
            if(StringUtils.isNotEmpty(sysData.getSettleId())){
                apiData.setCkjsdh(kqdm + sysData.getSettleId());
            }
            if(StringUtils.isNotEmpty(apiData.getHth())){
                api1206List = api1206Rep.getDataByHth(apiData.getHth());
                if(null != api1206List && api1206List.size() > 0){
                    apiData.setCkjsdh(api1206List.get(0).getCkjsdh());
                }
            }

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