d178c8574a4c3c9d436f5188ddfeff95ffe5f65c..1aac0b24b4b7f0e15bb4f7001ae8d1e313336caf
2025-01-07 YYC
Merge remote-tracking branch 'origin/master'
1aac0b 对比 | 目录
2025-01-07 YYC
数据调整
90582a 对比 | 目录
已修改3个文件
9 ■■■■■ 文件已修改
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1205.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -222,7 +222,7 @@
                //扣重 化验总扣重
                apiData.setZjklxj(sysData.getDeCheck());
                apiData.setBzw(sysData.getBzw());
                apiData.setBzwkl(0 - sysData.getDePackage());
                apiData.setBzbjs(sysData.getBzbjs());
                apiData.setCmsj(sysData.getCompleteTime());
src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
@@ -515,6 +515,9 @@
                String tydwbm = apiCommonService.getTydwbm(apiData.getLqgsdwdm());
                apiData.setLqgsdwtybm(tydwbm);
            }
            if (StringUtils.isEmpty(apiData.getBzw())) {
                apiData.setBzw("3");
            }
            apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
            return JSON.toJSONString(apiData);
        }
@@ -904,7 +907,7 @@
            return JSON.toJSONString(apiData);
        }
        if (Constant.API_CODE_1213.equals(inteId)) {
            Api1213 api1213 = (Api1213)data;
            Api1213 api1213 = (Api1213) data;
            Gd2023Api1213 apiData = new Gd2023Api1213();
            BeanUtils.copyProperties(api1213, apiData);
            //校验统一编码是否为空,为空则查询信息进行赋值
src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1205.java
@@ -158,7 +158,7 @@
    private String zjbgdh;
    @PropertyDef(label = "生成方式")
    private String scfs;
    private Integer scfs;
    @PropertyDef(label = "手动补录原因")
    private String sdblyy;