优化上海账面库存接口

CZT

2023-09-23 4e15712a9b23aaf1f28d1aaecc2eb55f852e93d8

优化上海账面库存接口

 src/main/java/com/fzzy/api/entity/Api1211.java

@@ -47,6 +47,14 @@
    @Column(name = "kqdm", length = 21)
    private String kqdm;

    @PropertyDef(label = "货位代码", description = "目前上海使用")
    @Column(name = "hwdm", length = 30)
    private String hwdm;

    @PropertyDef(label = "粮食性质代码", description = "目前上海使用")
    @Column(name = "lsxzdm", length = 7)
    private String lsxzdm;

    @PropertyDef(label = "粮食品种代码",required=true)
    @Column(name = "lspzdm", length = 7)
    private String lspzdm;

 src/main/java/com/fzzy/api/view/Api1211.view.xml

@@ -26,6 +26,19 @@
        <Property></Property>
        <Property name="label">库区代码</Property>
      </PropertyDef>
      <PropertyDef name="hwdm">
        <Property></Property>
        <Property name="label">货位代码</Property>
      </PropertyDef>
      <PropertyDef name="lsxzdm">
        <Property></Property>
        <Property name="label">粮食性质代码</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;LSXZ&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="id">
        <Property name="dataType">Integer</Property>
      </PropertyDef>
@@ -332,6 +345,22 @@
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">hwdm</Property>
            <Property name="property">hwdm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">lsxzdm</Property>
            <Property name="property">lsxzdm</Property>
            <Editor/>
          </AutoFormElement>
          <Label>
            <Property name="text">说明：上海使用(货位代码、粮食性质代码)</Property>
            <Property name="style">
              <Property name="color">blue</Property>
            </Property>
          </Label>
          <AutoFormElement>
            <Property name="name">yf</Property>
            <Property name="property">yf</Property>
            <Editor/>

 src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java

@@ -659,10 +659,12 @@
                api1211 = new SH2023Api1211();
                BeanUtils.copyProperties(apiData, api1211);

                //TODO 货位代码 粮食性质代码 来粮代码


                api1211.setZglkdm(api1211.getKqdm());
                api1211.setBjw(ShAreaBjw.getBjw(code));
                api1211.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getYwrq(), "yyyyMM"));
                if(StringUtils.isEmpty(api1211.getLldm())){
                    api1211.setLldm("无");
                }
                list.add(api1211);
            }
            return JSON.toJSONString(list);

 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1211.java

@@ -28,6 +28,9 @@
    @PropertyDef(label = "货位代码")
    private String hwdm;

    @PropertyDef(label = "主管粮库代码")
    private String zglkdm;

    @PropertyDef(label = "年度")
    private String nd;

@@ -49,6 +52,7 @@
    @PropertyDef(label = "月结标志")
    private Integer yjbz;

    @JSONField(format = "yyyy-MM-dd")
    @PropertyDef(label = "业务日期")
    private Date ywrq;

@@ -69,6 +73,6 @@
    private String pch;

    @PropertyDef(label = "来粮代码")
    private String lldm;
    private String lldm = "无";

}

 src/main/resources/application-dev.yml

@@ -6,7 +6,7 @@
    #主数据源
    primary:
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8  #大湾区
      url: jdbc:mysql://127.0.0.1:3306/igds_api_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8
      url: jdbc:mysql://127.0.0.1:3306/igds_api_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8  #上海嘉定
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5311?useUnicode=true&useSSL=false&characterEncoding=utf-8
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8     #潮阳库
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_1?useUnicode=true&useSSL=false&characterEncoding=utf-8   #潮阳-港口新仓
@@ -30,9 +30,9 @@
    #次数据源
    secondary:
#      url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8  #大湾区
      url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8
      url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8  #上海嘉定
#      url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5311?useUnicode=true&useSSL=false&characterEncoding=utf-8
#      url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8
#      url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8  #潮阳
#      url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5320?useUnicode=true&useSSL=false&characterEncoding=utf-8
#      url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5321?useUnicode=true&useSSL=false&characterEncoding=utf-8
#      url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5326?useUnicode=true&useSSL=false&characterEncoding=utf-8  #惠州惠新

 src/main/resources/application.yml

@@ -32,6 +32,6 @@

igds:
  default:
    companyId: 5503
    companyId: 5326
  file-path: C:/app/igds-api
  img-path: D:/IGDS/FILE/

 velocity.log

@@ -0,0 +1 @@
2023-09-22 16:00:01,848 - ResourceManager : unable to find resource 'com/bstek/dorado/web/resolver/ErrorPage.html' in any resource loader.