czt
2024-04-22 07cc0a3e45a2f4db1d991877393e2759922231c8
统一编码-调整轮换计划及计划明细接口字段名称
已修改7个文件
33 ■■■■ 文件已修改
src/main/java/com/fzzy/api/entity/Api1403.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/api/entity/Api1404.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/api/view/Api1403.view.xml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/api/view/Api1404.view.xml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1403.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1404.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/api/entity/Api1403.java
@@ -61,8 +61,8 @@
    private String jhxddw;
    @PropertyDef(label = "统一单位编码")
    @Column(name = "tydwbm", length = 20)
    private String tydwbm;
    @Column(name = "jhxddwtybm", length = 20)
    private String jhxddwtybm;
    @PropertyDef(label = "计划下达单位名称" )
    @Column(name = "jhxddwmc", length = 256)
src/main/java/com/fzzy/api/entity/Api1404.java
@@ -58,8 +58,8 @@
    private String lhhwdm;
    @PropertyDef(label = "统一货位编码" )
    @Column(name = "tyhwbm", length = 28)
    private String tyhwbm;
    @Column(name = "lhhwtybm", length = 28)
    private String lhhwtybm;
    @PropertyDef(label = "轮换数量" )
    @Column(name = "lhsl", precision = 20, scale = 6)
src/main/java/com/fzzy/api/view/Api1403.view.xml
@@ -31,7 +31,7 @@
      <PropertyDef name="jhxddw">
        <Property name="label">计划下达单位</Property>
      </PropertyDef>
      <PropertyDef name="tydwbm">
      <PropertyDef name="jhxddwtybm">
        <Property name="label">国家统一单位编码</Property>
      </PropertyDef>
      <PropertyDef name="jhxddwmc">
@@ -419,8 +419,8 @@
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">tydwbm</Property>
                <Property name="property">tydwbm</Property>
                <Property name="name">jhxddwtybm</Property>
                <Property name="property">jhxddwtybm</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
src/main/java/com/fzzy/api/view/Api1404.view.xml
@@ -44,7 +44,7 @@
      <PropertyDef name="lhhwdm">
        <Property name="label">轮换货位代码</Property>
      </PropertyDef>
      <PropertyDef name="tyhwbm">
      <PropertyDef name="lhhwtybm">
        <Property name="label">国家统一货位编码</Property>
      </PropertyDef>
      <PropertyDef name="lhsl">
@@ -366,8 +366,8 @@
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">tyhwbm</Property>
            <Property name="property">tyhwbm</Property>
            <Property name="name">lhhwtybm</Property>
            <Property name="property">lhhwtybm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
@@ -751,14 +751,15 @@
                        lcsl += gd2022Api1404.getLhsl();
                    }
                    //校验统一编码是否为空,为空则查询信息进行赋值
                    if(StringUtils.isEmpty(gd2022Api1404.getTyhwbm())){
                    if(StringUtils.isEmpty(gd2022Api1404.getLhhwtybm())){
                        String tyhwbm = apiCommonService.getTyhwbm(gd2022Api1404.getLhhwdm());
                        gd2022Api1404.setTyhwbm(tyhwbm);
                        gd2022Api1404.setLhhwtybm(tyhwbm);
                    }
                    gd2022Api1404.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
                    dtls.add(gd2022Api1404);
                }
            }
            api1403.setRotationInQty(lrsl);
            api1403.setRotationOutQty(lcsl);
            api1403.setDtls(dtls);
@@ -767,9 +768,9 @@
            //设置上传文件id
            api1403.setFileStorageId((String) responseDto.getData());
            //校验统一编码是否为空,为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1403.getTydwbm())){
            if(StringUtils.isEmpty(api1403.getJhxddwtybm())){
                String tydwbm = apiCommonService.getTydwbm(api1403.getJhxddw());
                api1403.setTydwbm(tydwbm);
                api1403.setJhxddwtybm(tydwbm);
            }
            api1403.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
            return JSON.toJSONString(api1403);
src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1403.java
@@ -49,7 +49,7 @@
    private String jhxddw;
    @PropertyDef(label = "统一单位编码")
    private String tydwbm;
    private String jhxddwtybm;
    @PropertyDef(label = "计划下达单位名称" )
    private String jhxddwmc;
src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1404.java
@@ -39,7 +39,7 @@
    private String lhhwdm;
    @PropertyDef(label = "统一货位编码" )
    private String tyhwbm;
    private String lhhwtybm;
    @PropertyDef(label = "轮换数量" )
    private double lhsl;