广东省平台v5.1-相关接口字段调整

czt

2024-06-29 6277d8d6623a1ab8c38a255b57d62bc62ef8a408

广东省平台v5.1-相关接口字段调整

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

@@ -40,7 +40,7 @@
    @Column(name = "tyhwbm", length = 28)
    private String tyhwbm;

    @PropertyDef(label = "业务类型", description = "2：入库（默认）")
    @PropertyDef(label = "业务类型", description = "2：入库（默认）;3:移库储存入库")
    @Column(name = "ywlx", length = 1)
    private String ywlx = "2";


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

@@ -182,6 +182,10 @@
    @Column(name = "kzl", precision = 20, scale = 6)
    private double kzl;

    @PropertyDef(label = "扣（增）量原因", description = "扣（增）量不为0时，需注明原因")
    @Column(name = "kzlyy", length = 512)
    private String kzlyy;

    @PropertyDef(label = "值仓保管员姓名")
    @Column(name = "zcbgyxm", length = 256)
    private String zcbgyxm;

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

@@ -88,6 +88,16 @@
    @Column(name = "dcrq", length = 10)
    private Date dcrq;

    @JSONField(format = "yyyy-MM-dd")
    @PropertyDef(label = "倒仓开始日期" )
    @Column(name = "dcksrq", length = 10)
    private Date dcksrq;

    @JSONField(format = "yyyy-MM-dd")
    @PropertyDef(label = "倒仓结束日期" )
    @Column(name = "dcjsrq", length = 10)
    private Date dcjsrq;

    @PropertyDef(label = "倒仓数量(公斤)" )
    @Column(name = "dcsl", precision = 20, scale = 6)
    private double dcsl;

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

@@ -112,6 +112,10 @@
    @Column(name = "sylx",length = 1)
    private String sylx;

    @PropertyDef(label = "损溢环节",description = "1:入库损溢，2：出库损溢，3.其他")
    @Column(name = "syhj",length = 1)
    private String syhj;

    @PropertyDef(label = "损溢原因" )
    @Column(name = "syyy", length = 400)
    private String syyy;

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

@@ -70,6 +70,10 @@
    @Column(name = "yyhthlzjh", length = 8000, columnDefinition = "text")
    private String yyhthlzjh;

    @PropertyDef(label = "氮气含量值集合" )
    @Column(name = "dqndzjh", length = 8000, columnDefinition = "text")
    private String dqndzjh;

    @PropertyDef(label = "操作标志" )
    @Column(name = "czbz", length = 1)
    private String czbz;

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

@@ -173,6 +173,9 @@
        <Property name="dataType">double</Property>
        <Property name="label">扣/增量(公斤)</Property>
      </PropertyDef>
      <PropertyDef name="kzlyy">
        <Property name="label">扣（增）量原因</Property>
      </PropertyDef>
      <PropertyDef name="zcbgyxm">
        <Property></Property>
        <Property name="label">值仓保管员姓名</Property>
@@ -625,6 +628,11 @@
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">kzlyy</Property>
            <Property name="property">kzlyy</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">zcbgyxm</Property>
            <Property name="property">zcbgyxm</Property>
            <Editor/>

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

@@ -92,6 +92,14 @@
        <Property name="dataType">Date</Property>
        <Property name="label">倒仓日期</Property>
      </PropertyDef>
      <PropertyDef name="dcksrq">
        <Property name="dataType">Date</Property>
        <Property name="label">倒仓开始日期</Property>
      </PropertyDef>
      <PropertyDef name="dcjsrq">
        <Property name="dataType">Date</Property>
        <Property name="label">倒仓结束日期</Property>
      </PropertyDef>
      <PropertyDef name="dcsl">
        <Property name="dataType">double</Property>
        <Property name="label">倒仓数量(公斤)</Property>
@@ -423,6 +431,16 @@
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">dcksrq</Property>
            <Property name="property">dcksrq</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">dcjsrq</Property>
            <Property name="property">dcjsrq</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">dcsl</Property>
            <Property name="property">dcsl</Property>
            <Editor/>

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

@@ -157,6 +157,30 @@
          </Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="syhj">
        <Property/>
        <Property name="label">损溢环节</Property>
        <Property name="mapping">
          <Property name="keyProperty">key</Property>
          <Property name="valueProperty">value</Property>
          <Property name="mapValues">
            <Collection>
              <Entity>
                <Property name="key">1</Property>
                <Property name="value">1:入库损溢</Property>
              </Entity>
              <Entity>
                <Property name="key">2</Property>
                <Property name="value">2:出库损溢</Property>
              </Entity>
              <Entity>
                <Property name="key">3</Property>
                <Property name="value">3:其他</Property>
              </Entity>
            </Collection>
          </Property>
        </Property>
      </PropertyDef>
    </DataType>
    <DataType name="dtParam">
      <Property name="creationType">com.fzzy.api.data.ApiParam</Property>
@@ -562,6 +586,11 @@
                <Property name="property">sylx</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">syhj</Property>
                <Property name="property">syhj</Property>
                <Editor/>
              </AutoFormElement>
            </AutoForm>
          </Children>
        </GroupBox>

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

@@ -60,7 +60,6 @@
                return;
            }

            Date syncTime = new Date();
            Api1304 api1304;
            Api1105 api1105;
            List<Api1304> api1304List;
@@ -72,7 +71,6 @@
                }

                api1304 = new Api1304();
                // api1304.setQtndjcdh(api1105.getHwdm() + DateFormatUtils.format(gas.getReceiveDate(), "yyyyMMdd") + String.valueOf(index).substring(1));
                api1304.setQtndjcdh(api1105.getHwdm() + fz40Gas.getBatchId());
                api1304.setJcsj(fz40Gas.getReceiveDate());
                api1304.setHwdm(api1105.getHwdm());
@@ -110,17 +108,33 @@
        String[] attr = points.split(";");

        String[] arrt2;
        String o2 = "", co2 = "", ph3 = "";
        String o2 = "", co2 = "", ph3 = "", n2 = "";
        for (String temp : attr) {
            arrt2 = temp.split(",");
            o2 += arrt2[2] + ",";
            co2 += arrt2[1] + ",";
            ph3 += arrt2[3] + ",";
            o2 +=  "," + arrt2[2];
            co2 += "," + arrt2[1];
            ph3 += "," + arrt2[3];
            n2 += "," + arrt2[4];
        }

        if(o2.length() > 0){
            o2 = o2.substring(1);
        }
        if(co2.length() > 0){
            co2 = co2.substring(1);
        }
        if(ph3.length() > 0){
            ph3 = ph3.substring(1);
        }
        if(n2.length() > 0){
            n2 = n2.substring(1);
        }
        co2 += "|ppm";
        ph3 += "|ppm";
        api1304.setYqhlzjh(o2);
        api1304.setEyhthlzjh(co2);
        api1304.setLhqndzjh(ph3);
        api1304.setDqndzjh(n2);
        return api1304;
    }