优化嘉定纪委接口

czt

2023-06-05 a137500cf7a3f558fef9aafc9f608c06fbbc7dff

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

@@ -3,14 +3,15 @@
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;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.Api1202Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.fzzy35.entity.InoutNoticeIn;
import com.fzzy.async.fzzy35.entity.InoutRecord;
import com.fzzy.async.fzzy35.entity.Fz35InoutNoticeIn;
import com.fzzy.async.fzzy35.entity.Fz35InoutRecord;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1202Rep;
import com.fzzy.async.fzzy35.repository.Fzzy35SyncNoticeInRep;
import lombok.extern.slf4j.Slf4j;
@@ -68,7 +69,7 @@
        apiLog.setId(ContextUtil.getUUID());
        try {
            //获取粮食入库记录信息，根据流程完成时间获取
            List<InoutRecord> list = fzzySync1202Rep.listInoutRecord(deptId, INOUT_TYPE_IN, start, end);
            List<Fz35InoutRecord> list = fzzySync1202Rep.listInoutRecord(deptId, INOUT_TYPE_IN, start, end);

            if (null == list || list.isEmpty()) {
                log.info("-------------没有获取到粮食入库信息------------------");
@@ -77,17 +78,23 @@

            Api1202 apiData;
            Api1105 api1105;
            List<InoutNoticeIn> listInoutNotice;
            List<Fz35InoutNoticeIn> listInoutNotice;
            List<Api1202> api1202List;
            Calendar c = Calendar.getInstance();
            for (InoutRecord sysData : list) {
            for (Fz35InoutRecord sysData : list) {
                if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
                    sysData.setRecordWeight(sysData.getSettleWeight());
                }
                //判断净重是否大于0，等于0表示不合格，不进行同步上传
                if(null == sysData.getRecordWeight() || 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));

@@ -112,8 +119,8 @@

                apiData.setXxdz(sysData.getUserAddress());

                //运输工具，默认汽车，TODO>> 待调整为根据数据库获取
                apiData.setYsgj("1");
                //运输工具，若为空，则默认给1-汽车
                apiData.setYsgj(StringUtils.isEmpty(sysData.getTransType()) ? "1":sysData.getTransType());

                //车船号
                apiData.setCch(sysData.getPlateNum());
@@ -164,25 +171,27 @@
                //值仓 现场扣重
                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);
                }else {
                    apiData.setCzbz(api1202List.get(0).getCzbz());
                }
                //保存数据
                api1202Rep.save(apiData);
                log.info("1202---同步数据：{}", apiData.toString());