优化调整船运出入库图片同步问题

czt

2024-04-18 701f0bd7adccb1c630a3745a53405fafb23b939e

 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")) {
@@ -113,7 +113,7 @@
                apiData.setHwdm(api1105.getHwdm());
                apiData.setYwlx(Constant.INOUT_TYPE_2);
                apiData.setYwrq(DateUtils.parseDate(sysData.getId().substring(2, 10), new String[]{"yyyyMMdd"}));
                apiData.setCyr(sysData.getUserName());
                apiData.setCyr(sysData.getUserName().trim());

                //默认一个随便值
                apiData.setLxdh(StringUtils.isEmpty(sysData.getUserContact()) ? "13012345678" : sysData.getUserContact().trim());
@@ -206,8 +206,20 @@
                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.getDataByHthAndHwdm(apiData.getHth(), apiData.getHwdm());
                    if(null == api1204List || api1204List.isEmpty()){
                        api1204List = api1204Rep.getDataByHth(apiData.getHth());
                        if(null != api1204List && api1204List.size() > 0){
                            apiData.setRkjsdh(api1204List.get(0).getRkjsdh());
                        }
                    }else {
                        apiData.setRkjsdh(api1204List.get(0).getRkjsdh());
                    }
                }
                //其它
                apiData.setQtkl(0 - sysData.getDeOther());
@@ -230,13 +242,13 @@
                apiData.setBz(null == sysData.getRemarks() ? "备注" : sysData.getRemarks());
                apiData.setKlyy("扣量原因");

                apiData.setCmqrmgryxm(sysData.getRegisterUser());
                apiData.setDjmgryxm(sysData.getRegisterUser());
                apiData.setCmqrmgryxm(StringUtils.isEmpty(sysData.getRegisterUser())?"登记人":sysData.getRegisterUser());
                apiData.setDjmgryxm(StringUtils.isEmpty(sysData.getRegisterUser())?"登记人":sysData.getRegisterUser());
                //01:表示大型汽车号牌,黄底黑字； 02:表示小型汽车号牌,蓝底白字； 03:表示新能源汽车号牌,绿底黑 字；
                //04:表示农用车车牌号，绿底白字； LS:表示临时虚拟号牌，仅限于售 粮车无固定号牌时使用
                apiData.setCchlx("01");
                apiData.setLdd("装粮地点");
                apiData.setQzbwslkl(0.0);
                apiData.setQzsfzkl(0.0);
                apiData.setQzzzzkl(0.0);
                apiData.setQzgwcmkl(0.0);
                apiData.setQzhhkl(0.0);
@@ -245,6 +257,7 @@
                apiData.setQzsmlkl(0.0);
                apiData.setQzzjmlkl(0.0);
                apiData.setQzqtkl(0.0);
                apiData.setZkhyy("增扣价原因");
                apiData.setZxzydw(api1105.getBgdw());
                if (sysData.getCompanyId().equals("5329")) {
                    apiData.setLqgsdwdm("91440604MA56D2AM1X");
@@ -272,6 +285,7 @@
                        apiData.setJz(fz40InoutRecordItem.getSettleWeight());
                        apiData.setMzjlsj(fz40InoutRecordItem.getFullWeightTime());
                        apiData.setPzjlsj(fz40InoutRecordItem.getEmptyWeightTime());
                        apiData.setQtkl(0 - fz40InoutRecordItem.getDe());
                        api1202List = api1202Rep.getDataById(apiData.getRkywdh());
                        if (null == api1202List || api1202List.isEmpty()) {
                            apiData.setCzbz(Constant.CZBZ_I);