YYC
2024-04-07 7ffa75d4ebf2483f39c57e89037d1b5752d8912d
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -109,7 +109,7 @@
            apiData.setHwdm(api1105.getHwdm());
            apiData.setYwlx(Constant.INOUT_TYPE_1);
            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());
@@ -147,7 +147,6 @@
            //车船号
            apiData.setCch(sysData.getPlateNum());
            apiData.setGch(sysData.getPlateNum());
            apiData.setDjsj(sysData.getRegisterTime());
            //粮食品种
@@ -185,6 +184,7 @@
            //毛重信息
            apiData.setMz(sysData.getFullWeight());
            apiData.setKzl(0-sysData.getDeCheck()+sysData.getAddCheck()-sysData.getDeHandle()-sysData.getDePackage()-sysData.getDeOther());
            if (null == sysData.getFullWeightTime()) {
                sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getEmptyWeightTime(), 60));
            }
@@ -206,14 +206,23 @@
                apiData.setCkjsdh(kqdm + sysData.getSettleId());
            }
            if(StringUtils.isNotEmpty(apiData.getHth())){
                api1206List = api1206Rep.getDataByHth(apiData.getHth());
                if(null != api1206List && api1206List.size() > 0){
                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");
            apiData.setXldd("库内");
            apiData.setBz(StringUtils.isEmpty(sysData.getRemarks())?"暂无备注信息":sysData.getRemarks());
            apiData.setBzbdbz(25);
            apiData.setBzbjs(0);
            apiData.setCmqrmgryxm(StringUtils.isEmpty(sysData.getRegisterUser())?"门岗人":sysData.getRegisterUser());
            apiData.setDjmgryxm(StringUtils.isEmpty(sysData.getRegisterUser())?"登记人":sysData.getRegisterUser());
            apiData.setZcbgyxm(StringUtils.isEmpty(sysData.getHandleUser())?"值仓员":sysData.getHandleUser());
            apiData.setZxzydw("外聘单位");
@@ -249,7 +258,7 @@
                    apiData.setJz(fz40InoutRecordItem.getSettleWeight());
                    apiData.setMzjlsj(fz40InoutRecordItem.getFullWeightTime());
                    apiData.setPzjlsj(fz40InoutRecordItem.getEmptyWeightTime());
                    apiData.setKzl(0 - fz40InoutRecordItem.getDe());
                    api1205List = api1205Rep.getDataById(apiData.getCkywdh());
                    if(null == api1205List || api1205List.isEmpty()){
                        apiData.setCzbz(Constant.CZBZ_I);