调整品种信息

CZT

2023-11-07 9075639de65743f310d63a65700ce9a3b79247fe

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

@@ -87,14 +87,14 @@
            List<Api1202> api1202List;
            List<Fz40InoutRecordItem> listInoutRecordItem;
            for (Fz40InoutRecord sysData : list) {
                if(sysData.getRecordStatus().equals("DEL") || sysData.getRecordStatus().equals("ERROR")){
                if (sysData.getRecordStatus().equals("DEL") || sysData.getRecordStatus().equals("ERROR")) {
                    continue;
                }
                if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
                if (null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0) {
                    sysData.setRecordWeight(sysData.getSettleWeight());
                }
                //判断净重是否大于0，等于0表示不合格，不进行同步上传
                if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
                if (null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0) {
                    continue;
                }
                //获取货位信息
@@ -109,7 +109,7 @@
                //货位代码
                apiData.setHwdm(api1105.getHwdm());
                apiData.setYwlx(Constant.INOUT_TYPE_2);
                apiData.setYwrq(DateUtils.parseDate(sysData.getId().substring(2, 10), new String[] { "yyyyMMdd" }));
                apiData.setYwrq(DateUtils.parseDate(sysData.getId().substring(2, 10), new String[]{"yyyyMMdd"}));
                apiData.setCyr(sysData.getUserName());

                //默认一个随便值
@@ -119,19 +119,19 @@

                //获取合同号
                listInoutNotice = fzzySyncNoticeInRep.listInoutNoticeInById(sysData.getNoticeId());
                if(null != listInoutNotice && listInoutNotice.size() >0){
                    if(StringUtils.isNotEmpty(listInoutNotice.get(0).getContractId())){
                        apiData.setHth(api1105.getHwdm().substring(0,18) + listInoutNotice.get(0).getContractId());
                if (null != listInoutNotice && listInoutNotice.size() > 0) {
                    if (StringUtils.isNotEmpty(listInoutNotice.get(0).getContractId())) {
                        apiData.setHth(api1105.getHwdm().substring(0, 18) + listInoutNotice.get(0).getContractId());
                    }
                    if(StringUtils.isNotEmpty(listInoutNotice.get(0).getPlanId())){
                    if (StringUtils.isNotEmpty(listInoutNotice.get(0).getPlanId())) {
                        apiData.setJhmxh(listInoutNotice.get(0).getPlanId());
                    }
                }

                apiData.setXxdz(StringUtils.isEmpty(sysData.getUserAddress()) ? "详细地址":sysData.getUserAddress());
                apiData.setXxdz(StringUtils.isEmpty(sysData.getUserAddress()) ? "详细地址" : sysData.getUserAddress());

                //运输工具，若为空，则默认给1-汽车
                apiData.setYsgj(StringUtils.isEmpty(sysData.getTransType()) ? "1":sysData.getTransType());
                apiData.setYsgj(StringUtils.isEmpty(sysData.getTransType()) ? "1" : sysData.getTransType());

                //车船号
                apiData.setCch(sysData.getPlateNum().trim());
@@ -139,19 +139,22 @@
                apiData.setDjsj(sysData.getRegisterTime());

                //粮食品种
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0,3));
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
                if(StringUtils.isEmpty(mappingCode)){
                    mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
                }
                apiData.setLspzdm(mappingCode);

                //粮食性质
                mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());
                apiData.setLsxzdm(mappingCode);

                apiData.setShnd(StringUtils.isEmpty(sysData.getFoodYear())? DateFormatUtils.format(new Date(), "yyyy") :sysData.getFoodYear());
                apiData.setShnd(StringUtils.isEmpty(sysData.getFoodYear()) ? DateFormatUtils.format(new Date(), "yyyy") : sysData.getFoodYear());

                //产地代码
                mappingCode = commonService.getFoodLocationIdFromCache(sysData.getFoodLocation());
                if(StringUtils.isEmpty(mappingCode)){
                    mappingCode = apiData.getHwdm().substring(2,8);
                if (StringUtils.isEmpty(mappingCode)) {
                    mappingCode = apiData.getHwdm().substring(2, 8);
                }
                apiData.setCddm(mappingCode);

@@ -160,7 +163,7 @@

                //毛重信息
                apiData.setMz(sysData.getFullWeight());
                if(!sysData.getFullWeightTime().after(sysData.getRegisterTime())){
                if (!sysData.getFullWeightTime().after(sysData.getRegisterTime())) {
                    sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 25));
                }
                apiData.setMzjlsj(sysData.getFullWeightTime());
@@ -171,7 +174,7 @@

                //皮重信息
                apiData.setPz(sysData.getEmptyWeight());
                if(!sysData.getEmptyWeightTime().after(sysData.getFullWeightTime())){
                if (!sysData.getEmptyWeightTime().after(sysData.getFullWeightTime())) {
                    sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 60));
                }
                apiData.setPzjlsj(sysData.getEmptyWeightTime());
@@ -181,13 +184,16 @@
                //扣重 化验总扣重
                apiData.setZjklxj(sysData.getDeCheck());

                apiData.setBzwkl(0 - sysData.getDePackage());
                apiData.setBzbjs(sysData.getBzbjs());

                //其它
                apiData.setQtkl( 0 - sysData.getDeOther());
                apiData.setQtkl(0 - sysData.getDeOther());
                //值仓 现场扣重
                apiData.setXckl( 0 - sysData.getDeHandle());
                apiData.setXckl(0 - sysData.getDeHandle());

                apiData.setJz(sysData.getRecordWeight());
                if(!sysData.getCompleteTime().after(sysData.getEmptyWeightTime())){
                if (!sysData.getCompleteTime().after(sysData.getEmptyWeightTime())) {
                    sysData.setCompleteTime(DateUtils.addMinutes(sysData.getEmptyWeightTime(), 10));
                }
                apiData.setCmsj(sysData.getCompleteTime());
@@ -200,33 +206,33 @@
                apiData.setKqdm(kqdm);
                apiData.setSyncTime(new Date());
                api1202List = api1202Rep.getDataById(apiData.getRkywdh());
                if(null == api1202List || api1202List.isEmpty()){
                if (null == api1202List || api1202List.isEmpty()) {
                    apiData.setCzbz(Constant.CZBZ_I);
                }else {
                } else {
                    apiData.setCzbz(api1202List.get(0).getCzbz());
                }
                //判断是否为船运
                if(StringUtils.isNotEmpty(sysData.getTransType()) && sysData.getTransType().equals("3")){
                if (StringUtils.isNotEmpty(sysData.getTransType()) && sysData.getTransType().equals("3")) {
                    listInoutRecordItem = fzzy40SyncInoutRecordItemRep.findDataByRecordId(sysData.getId());
                    if(null == listInoutRecordItem || listInoutRecordItem.isEmpty()){
                    if (null == listInoutRecordItem || listInoutRecordItem.isEmpty()) {
                        api1202Rep.save(apiData);
                        continue;
                    }

                    int idNum = Integer.valueOf(sysData.getId().substring(12))*100 + 10001;
                    int idNum = Integer.valueOf(sysData.getId().substring(12)) * 100 + 10001;
                    for (Fz40InoutRecordItem fz40InoutRecordItem : listInoutRecordItem) {
                        if(fz40InoutRecordItem.getSettleWeight() <= 0){
                        if (fz40InoutRecordItem.getSettleWeight() <= 0) {
                            continue;
                        }
                        apiData.setRkywdh(Constant.INOUT_TYPE_14 + sysData.getId().substring(4,10) + String.valueOf(idNum).substring(1));
                        apiData.setRkywdh(Constant.INOUT_TYPE_14 + sysData.getId().substring(4, 10) + String.valueOf(idNum).substring(1));
                        apiData.setMz(fz40InoutRecordItem.getFullWeight());
                        apiData.setPz(fz40InoutRecordItem.getEmptyWeight());
                        apiData.setJz(fz40InoutRecordItem.getSettleWeight());

                        api1202Rep.save(apiData);
                        idNum ++;
                        idNum++;
                    }
                }else {
                } else {
                    //保存数据
                    api1202Rep.save(apiData);
                }