数据同步调整

YYC

2025-03-26 c75c27634f569b439c83d606b052257df3d82f0a

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

@@ -101,6 +101,9 @@
                        int idNum = Integer.valueOf(sysData.getId().substring(12))*100 + 10001;

                        for (Fz40InoutRecordItem fz40InoutRecordItem : listInoutRecordItem) {
                            if ("DEL".equals(fz40InoutRecordItem.getRecordStatus())) {
                                continue;
                            }
                            listIds.add(Constant.INOUT_TYPE_14 + sysData.getId().substring(4,10) + String.valueOf(idNum).substring(1));
                            idNum ++;
                        }
@@ -143,7 +146,7 @@
                        sysData.setRegisterTime(DateUtils.addDays(sysData.getRegisterTime(), numDay));
                    }

                    apiData.setQysj(sysData.getRegisterTime());

                    apiData.setQyrxm(sysData.getCheckUser());
                    //扦样方式 2-智能随机
                    apiData.setQyfs("2");
@@ -162,12 +165,17 @@
                        if (StringUtils.isEmpty(fz40CheckItem.getValue())) {
                            continue;
                        }
                        jyxm += gbCheckList.get(0).getCode() + ",";
                        jyz += fz40CheckItem.getValue() + ",";
                        jyxm += "," + gbCheckList.get(0).getCode();
                        jyz += "," + fz40CheckItem.getValue();
                        zkj += ",0.0";
                        zkl += ",0.0";
                    }

                    if(jyxm.length() > 0){
                        jyxm = jyxm.substring(1);
                    }
                    if(jyz.length() > 0){
                        jyz = jyz.substring(1);
                    }
                    apiData.setJyxm(jyxm);
                    apiData.setJyz(jyz);
                    apiData.setZkj(StringUtils.isEmpty(zkj)?"":zkj.substring(1));
@@ -178,7 +186,20 @@
                        apiData.setJyjg("1");
                    }
                    apiData.setJyrxm(sysData.getCheckUser());
                    apiData.setJysj(DateUtils.addMinutes(sysData.getRegisterTime(), 30));
                    if (null == sysData.getCheckTime()) {
                        sysData.setCheckTime(DateUtils.addMinutes(sysData.getFullWeightTime(), -5));
                    }
                    if (sysData.getCheckTime().after(sysData.getEmptyWeightTime())) {
                        sysData.setCheckTime(DateUtils.addMinutes(sysData.getFullWeightTime(), -5));
                    }
                    apiData.setJysj(sysData.getCheckTime());
                    if (null == sysData.getSampleTime()) {
                        sysData.setSampleTime(DateUtils.addMinutes(sysData.getCheckTime(), -1));
                    }
                    if (sysData.getSampleTime().after(sysData.getCheckTime())) {
                        sysData.setSampleTime(DateUtils.addMinutes(sysData.getCheckTime(), -1));
                    }
                    apiData.setQysj(sysData.getSampleTime());

                    //粮食品种
                    String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0,3));
@@ -186,6 +207,7 @@

                    //保管员复核
                    apiData.setBgyfh(apiData.getJyjg());
                    apiData.setSpaqzbsfhg("1");

                    //粮食等级
                    mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSDJ, sysData.getFoodLevel());