根据上海新接口规则进行调整

CZT

2023-12-21 d1b7f2eb67cd87edc4b5eb11def5acba07c75698

根据上海新接口规则进行调整

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

@@ -71,4 +71,10 @@
    @PropertyDef(label = "同步时间", description = "从粮库系统同步到接口管理中心的时间")
    @Column(name = "syncTime")
    private Date syncTime;

    /*-----上海使用-----*/

    @PropertyDef(label = "业务单号", description = "当文件类型为1，为空；当文件类型为2、3、4、5传出入库业务单号；当文件类型为6，传合同号；当文件类型为10.、11，传风险点编码")
    @Column(name = "ywdh")
    private String ywdh;
}

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

@@ -102,4 +102,8 @@
    private Date zhgxsj;


    /*-----上海使用-----*/
    @PropertyDef(label = "计划明细单号")
    @Column(name = "jhmxdh", length = 400)
    private String jhmxdh;
}

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

@@ -159,4 +159,10 @@
    @Column(name = "zhgxsj")
    private Date zhgxsj;


    /*-----上海使用-----*/
    @PropertyDef(label = "报告类型", description = "1-单位检验；2-整体检验(加权平均)；3-其他")
    @Column(name = "bglx", length = 1)
    private String bglx;

}

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

@@ -25,6 +25,10 @@
        <Property></Property>
        <Property name="label">文件id</Property>
      </PropertyDef>
      <PropertyDef name="ywdh">
        <Property></Property>
        <Property name="label">业务单号</Property>
      </PropertyDef>
      <PropertyDef name="wjlx">
        <Property></Property>
        <Property name="label">文件类型</Property>
@@ -348,6 +352,11 @@
            <Property name="property">bizId</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ywdh</Property>
            <Property name="property">ywdh</Property>
            <Editor/>
          </AutoFormElement>
        </AutoForm>
      </Children>
      <Tools/>

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

@@ -101,6 +101,10 @@
        <Property></Property>
        <Property name="label">备注</Property>
      </PropertyDef>
      <PropertyDef name="jhmxdh">
        <Property></Property>
        <Property name="label">计划明细单号</Property>
      </PropertyDef>
    </DataType>
    <DataType name="dtParam">
      <Property name="creationType">com.fzzy.api.data.ApiParam</Property>
@@ -332,110 +336,135 @@
        </Button>
      </Buttons>
      <Children>
        <AutoForm>
          <Property name="dataSet">dsMain</Property>
          <Property name="cols">*,*,*</Property>
          <Property name="labelWidth">100</Property>
          <Property name="labelAlign">left</Property>
          <Property name="labelSeparator">：</Property>
          <Property name="labelPosition">top</Property>
          <AutoFormElement>
            <Property name="name">lsxzzbdh</Property>
            <Property name="property">lsxzzbdh</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">hwdm</Property>
            <Property name="property">hwdm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">lssl</Property>
            <Property name="property">lssl</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">hzsl</Property>
            <Property name="property">hzsl</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">bzwh</Property>
            <Property name="property">bzwh</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">lspzdm</Property>
            <Property name="property">lspzdm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">hzqlsxzdm</Property>
            <Property name="property">hzqlsxzdm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">hzhlsxzdm</Property>
            <Property name="property">hzhlsxzdm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">hzrq</Property>
            <Property name="property">hzrq</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ccshr</Property>
            <Property name="property">ccshr</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">zjshr</Property>
            <Property name="property">zjshr</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">tjshr</Property>
            <Property name="property">tjshr</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">kjshr</Property>
            <Property name="property">kjshr</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ldshr</Property>
            <Property name="property">ldshr</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement layoutConstraint="colSpan:3">
            <Property name="name">bz</Property>
            <Property name="property">bz</Property>
            <Property name="editorType">TextArea</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">czbz</Property>
            <Property name="property">czbz</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">zhgxsj</Property>
            <Property name="property">zhgxsj</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">kqdm</Property>
            <Property name="property">kqdm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">bizId</Property>
            <Property name="property">bizId</Property>
            <Editor/>
          </AutoFormElement>
        </AutoForm>
        <GroupBox>
          <Property name="caption">基础信息</Property>
          <Buttons/>
          <Children>
            <AutoForm>
              <Property name="dataSet">dsMain</Property>
              <Property name="cols">*,*,*</Property>
              <Property name="labelWidth">100</Property>
              <Property name="labelAlign">left</Property>
              <Property name="labelSeparator">：</Property>
              <Property name="labelPosition">top</Property>
              <AutoFormElement>
                <Property name="name">lsxzzbdh</Property>
                <Property name="property">lsxzzbdh</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">hwdm</Property>
                <Property name="property">hwdm</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">lssl</Property>
                <Property name="property">lssl</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">hzsl</Property>
                <Property name="property">hzsl</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">bzwh</Property>
                <Property name="property">bzwh</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">lspzdm</Property>
                <Property name="property">lspzdm</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">hzqlsxzdm</Property>
                <Property name="property">hzqlsxzdm</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">hzhlsxzdm</Property>
                <Property name="property">hzhlsxzdm</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">hzrq</Property>
                <Property name="property">hzrq</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">ccshr</Property>
                <Property name="property">ccshr</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">zjshr</Property>
                <Property name="property">zjshr</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">tjshr</Property>
                <Property name="property">tjshr</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">kjshr</Property>
                <Property name="property">kjshr</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">ldshr</Property>
                <Property name="property">ldshr</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:3">
                <Property name="name">bz</Property>
                <Property name="property">bz</Property>
                <Property name="editorType">TextArea</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">czbz</Property>
                <Property name="property">czbz</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">zhgxsj</Property>
                <Property name="property">zhgxsj</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">kqdm</Property>
                <Property name="property">kqdm</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">bizId</Property>
                <Property name="property">bizId</Property>
                <Editor/>
              </AutoFormElement>
            </AutoForm>
          </Children>
        </GroupBox>
        <GroupBox>
          <Property name="caption">上海市平台</Property>
          <Buttons/>
          <Children>
            <AutoForm>
              <Property name="dataSet">dsMain</Property>
              <Property name="cols">*,*,*</Property>
              <Property name="labelWidth">100</Property>
              <Property name="labelAlign">left</Property>
              <Property name="labelSeparator">：</Property>
              <Property name="labelPosition">top</Property>
              <AutoFormElement>
                <Property name="name">jhmxdh</Property>
                <Property name="property">jhmxdh</Property>
                <Editor/>
              </AutoFormElement>
            </AutoForm>
          </Children>
        </GroupBox>
      </Children>
      <Tools/>
    </Dialog>

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

@@ -171,6 +171,30 @@
          </Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="bglx">
        <Property></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>
      <PropertyDef name="sfzcccnx">
        <Property></Property>
        <Property name="label">是否正常存储年限</Property>
@@ -418,179 +442,204 @@
        </Button>
      </Buttons>
      <Children>
        <AutoForm>
          <Property name="dataSet">dsMain</Property>
          <Property name="cols">*,*,*</Property>
          <Property name="labelWidth">100</Property>
          <Property name="labelAlign">left</Property>
          <Property name="labelSeparator">：</Property>
          <Property name="labelPosition">top</Property>
          <AutoFormElement>
            <Property name="name">zjbgdh</Property>
            <Property name="property">zjbgdh</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">hwdm</Property>
            <Property name="property">hwdm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">lspzdm</Property>
            <Property name="property">lspzdm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">lsdjdm</Property>
            <Property name="property">lsdjdm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">rkrq</Property>
            <Property name="property">rkrq</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">jylb</Property>
            <Property name="property">jylb</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">jysj</Property>
            <Property name="property">jysj</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">jydw</Property>
            <Property name="property">jydw</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">jyr</Property>
            <Property name="property">jyr</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">jyyj</Property>
            <Property name="property">jyyj</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">zblb</Property>
            <Property name="property">zblb</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">qfrq</Property>
            <Property name="property">qfrq</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement layoutConstraint="colSpan:2">
            <Property name="name">jyxm</Property>
            <Property name="property">jyxm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">bgcjsj</Property>
            <Property name="property">bgcjsj</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement layoutConstraint="colSpan:2">
            <Property name="name">jyxmz</Property>
            <Property name="property">jyxmz</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">shrxm</Property>
            <Property name="property">shrxm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement layoutConstraint="colSpan:2">
            <Property name="name">zbjgpd</Property>
            <Property name="property">zbjgpd</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">spaqzbsfhg</Property>
            <Property name="property">spaqzbsfhg</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">qydbh</Property>
            <Property name="property">qydbh</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">qysj</Property>
            <Property name="property">qysj</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">qyqy</Property>
            <Property name="property">qyqy</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">qyrxm</Property>
            <Property name="property">qyrxm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">jdrxm</Property>
            <Property name="property">jdrxm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ypbh</Property>
            <Property name="property">ypbh</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ypsl</Property>
            <Property name="property">ypsl</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">dbsl</Property>
            <Property name="property">dbsl</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ypdj</Property>
            <Property name="property">ypdj</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">sfzcccnx</Property>
            <Property name="property">sfzcccnx</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">bz</Property>
            <Property name="property">bz</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">czbz</Property>
            <Property name="property">czbz</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">zhgxsj</Property>
            <Property name="property">zhgxsj</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">bizId</Property>
            <Property name="property">bizId</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">kqdm</Property>
            <Property name="property">kqdm</Property>
            <Editor/>
          </AutoFormElement>
        </AutoForm>
        <GroupBox>
          <Property name="caption">基础信息</Property>
          <Buttons/>
          <Children>
            <AutoForm>
              <Property name="dataSet">dsMain</Property>
              <Property name="cols">*,*,*</Property>
              <Property name="labelWidth">100</Property>
              <Property name="labelAlign">left</Property>
              <Property name="labelSeparator">：</Property>
              <Property name="labelPosition">top</Property>
              <AutoFormElement>
                <Property name="name">zjbgdh</Property>
                <Property name="property">zjbgdh</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">hwdm</Property>
                <Property name="property">hwdm</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">lspzdm</Property>
                <Property name="property">lspzdm</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">lsdjdm</Property>
                <Property name="property">lsdjdm</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">rkrq</Property>
                <Property name="property">rkrq</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">jylb</Property>
                <Property name="property">jylb</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">jysj</Property>
                <Property name="property">jysj</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">jydw</Property>
                <Property name="property">jydw</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">jyr</Property>
                <Property name="property">jyr</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">jyyj</Property>
                <Property name="property">jyyj</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">zblb</Property>
                <Property name="property">zblb</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">qfrq</Property>
                <Property name="property">qfrq</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">jyxm</Property>
                <Property name="property">jyxm</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">bgcjsj</Property>
                <Property name="property">bgcjsj</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">jyxmz</Property>
                <Property name="property">jyxmz</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">shrxm</Property>
                <Property name="property">shrxm</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">zbjgpd</Property>
                <Property name="property">zbjgpd</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">spaqzbsfhg</Property>
                <Property name="property">spaqzbsfhg</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">qydbh</Property>
                <Property name="property">qydbh</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">qysj</Property>
                <Property name="property">qysj</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">qyqy</Property>
                <Property name="property">qyqy</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">qyrxm</Property>
                <Property name="property">qyrxm</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">jdrxm</Property>
                <Property name="property">jdrxm</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">ypbh</Property>
                <Property name="property">ypbh</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">ypsl</Property>
                <Property name="property">ypsl</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">dbsl</Property>
                <Property name="property">dbsl</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">ypdj</Property>
                <Property name="property">ypdj</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">sfzcccnx</Property>
                <Property name="property">sfzcccnx</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">bz</Property>
                <Property name="property">bz</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">czbz</Property>
                <Property name="property">czbz</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">zhgxsj</Property>
                <Property name="property">zhgxsj</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">bizId</Property>
                <Property name="property">bizId</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">kqdm</Property>
                <Property name="property">kqdm</Property>
                <Editor/>
              </AutoFormElement>
            </AutoForm>
          </Children>
        </GroupBox>
        <GroupBox>
          <Property name="caption">上海市平台</Property>
          <Buttons/>
          <Children>
            <AutoForm>
              <Property name="dataSet">dsMain</Property>
              <Property name="cols">*,*,*</Property>
              <Property name="labelWidth">100</Property>
              <Property name="labelAlign">left</Property>
              <Property name="labelSeparator">：</Property>
              <Property name="labelPosition">top</Property>
              <AutoFormElement>
                <Property name="name">bglx</Property>
                <Property name="property">bglx</Property>
                <Editor/>
              </AutoFormElement>
            </AutoForm>
          </Children>
        </GroupBox>
      </Children>
      <Tools/>
    </Dialog>

 src/main/java/com/fzzy/api/view/repository/Api1210Rep.java

@@ -25,4 +25,15 @@

    @Query("from Api1210 where lsxzzbdh=:lsxzzbdh ")
    List<Api1210> getDataById(@Param("lsxzzbdh") String lsxzzbdh);


    /**
     * æ ¹æ®è´§ä½ä»£ç å’Œä¸šåŠ¡æ—¶é—´æŸ¥è¯¢æ€§è´¨è½¬å˜å•ä¿¡æ¯(正序)
     * @param hwdm
     * @param start
     * @return
     */
    @Query("from Api1210 where hwdm=:hwdm and hzrq >=:start order by zhgxsj ")
    List<Api1210> findDataByHwdmAndTime(@Param("hwdm") String hwdm, @Param("start") Date start);

}

 src/main/java/com/fzzy/api/view/repository/Api1303Rep.java

@@ -26,4 +26,7 @@

    @Query("from Api1303 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
    List<Api1303> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);

    @Query("from Api1303 where bizId=:bizId ")
    List<Api1303> getDataByBizId(@Param("bizId") String bizId);
}

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

@@ -105,12 +105,16 @@
            //货位代码
            apiData.setHwdm(api1105.getHwdm());
            apiData.setYwlx(Constant.INOUT_TYPE_1);
            apiData.setYwrq(DateUtils.parseDate(sysData.getId().substring(2, 10), new String[] { "yyyyMMdd" }));
            apiData.setCyr(sysData.getUserName());

            //默认一个随便值
            apiData.setLxdh(StringUtils.isEmpty(sysData.getUserContact()) ? "13012345678" : sysData.getUserContact().trim());

            apiData.setSfzh(null == sysData.getUserId() ? "410183199003187055" : sysData.getUserId().trim());

            //通知单号
            apiData.setCktzdh(sysData.getNoticeId());

            apiData.setYwrq(DateUtils.parseDate(sysData.getId().substring(2, 10), new String[] { "yyyyMMdd" }));

            //获取合同号
            listInoutNotice = fzzySyncNoticeOutRep.listInoutNoticeOutById(sysData.getNoticeId());
            if (null != listInoutNotice && listInoutNotice.size() > 0) {

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

@@ -4,6 +4,7 @@
import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.Api1303Rep;
import com.fzzy.api.view.repository.Api1306Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.fzzy40.entity.Fz40DrugLog;
@@ -32,7 +33,8 @@
    private ApiCommonService commonService;
    @Autowired
    private Api1306Rep api1306Rep;

    @Autowired
    private Api1303Rep api1303Rep;
    @Autowired
    private ApiLogRep apiLogRep;

@@ -62,6 +64,7 @@
            Api1306 api1306;
            Api1105 api1105;
            List<Api1306> api1306List;
            List<Api1303> api1303List;
            for (Fz40DrugLog fz40DrugLog : list) {
                //获取货位信息
                api1105 = commonService.getApi1105Cache(fz40DrugLog.getDepotId());
@@ -76,7 +79,13 @@
                api1306.setCfdm(api1105.getHwdm().substring(0,25));
                api1306.setXzkssj(fz40DrugLog.getStart());
                api1306.setXzjssj(fz40DrugLog.getEnd());
                api1306.setHcjcdh(fz40DrugLog.getPestBatchId());
                //设置虫害检测单号
                api1306.setHcjcdh(api1105.getHwdm() + fz40DrugLog.getPestBatchId());
                api1303List = api1303Rep.getDataByHcjcdh(fz40DrugLog.getPestBatchId());
                if (null != api1303List || api1303List.size() > 0) {
                    api1306.setHcjcdh(api1303List.get(0).getHcjcdh());
                }

                api1306.setDjcxz(fz40DrugLog.getNum());
                api1306.setCgxzfs(fz40DrugLog.getMode());
                api1306.setHlxzfs(fz40DrugLog.getRecirMode());

 src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java

@@ -443,9 +443,10 @@
            return JSON.toJSONString(apiData);
        }
        if (Constant.API_CODE_1210.equals(inteId)) {
            Api1210 apiData = (Api1210) data;
            apiData.setZhgxsj(new Date());
            return JSON.toJSONString(apiData);
            Gd2022Api1210 api1210 = new Gd2022Api1210();
            BeanUtils.copyProperties(data, api1210);
            api1210.setZhgxsj(new Date());
            return JSON.toJSONString(api1210);
        }
        if (Constant.API_CODE_1211.equals(inteId)) {
            Api1211 apiData = (Api1211) data;
@@ -523,9 +524,10 @@
            return JSON.toJSONString(apiData);
        }
        if (Constant.API_CODE_1310.equals(inteId)) {
            Api1310 apiData = (Api1310) data;
            apiData.setZhgxsj(new Date());
            return JSON.toJSONString(apiData);
            Gd2022Api1310 api1310 = new Gd2022Api1310();
            BeanUtils.copyProperties(data, api1310);
            api1310.setZhgxsj(new Date());
            return JSON.toJSONString(api1310);
        }
        if (Constant.API_CODE_1401.equals(inteId)) {
            Api1401 apiData = (Api1401) data;

 src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1210.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,74 @@
package com.fzzy.push.gd2022.dto;

import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;

/**
 * æŽ¥å£è¡¨-粮食性质转变单
 */
@Data
@EqualsAndHashCode(callSuper = false)
public class Gd2022Api1210 implements Serializable {

    /**
     * 
     */
    private static final long serialVersionUID = -8223096234800082280L;

    @PropertyDef(label = "粮食性质转变单号")
    private String lsxzzbdh;

    @PropertyDef(label = "货位代码")
    private String hwdm;

    @PropertyDef(label = "粮食数量(公斤)")
    private double lssl;

    @PropertyDef(label = "划转数量(公斤)")
    private double hzsl;

    @PropertyDef(label = "批准文号")
    private String bzwh;

    @PropertyDef(label = "粮食品种代码")
    private String lspzdm;

    @PropertyDef(label = "划转前粮食性质代码")
    private String hzqlsxzdm;

    @PropertyDef(label = "划转后粮食性质代码")
    private String hzhlsxzdm;

    @JSONField(format = "yyyy-MM-dd")
    @PropertyDef(label = "划转日期")
    private Date hzrq;

    @PropertyDef(label = "仓储审核人" )
    private String ccshr;

    @PropertyDef(label = "质检审核人" )
    private String zjshr;

    @PropertyDef(label = "统计审核人" )
    private String tjshr;

    @PropertyDef(label = "会计审核人" )
    private String kjshr;

    @PropertyDef(label = "领导审核人" )
    private String ldshr;

    @PropertyDef(label = "备注" )
    private String bz;

    @PropertyDef(label = "操作标志" )
    private String czbz;

    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
    @PropertyDef(label = "更新时间" )
    private Date zhgxsj;
}

 src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1310.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,123 @@
package com.fzzy.push.gd2022.dto;

import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;

/**
 * æŽ¥å£è¡¨-质检数据表
 *
 * @author czt
 */
@Data
@EqualsAndHashCode(callSuper=false)
public class Gd2022Api1310 implements Serializable {

    /**
     *
     */
    private static final long serialVersionUID = 1L;

    @PropertyDef(label = "质检报告单号" )
    private String zjbgdh;

    @PropertyDef(label = "货位代码" )
    private String hwdm;

    @PropertyDef(label = "粮食品种代码" )
    private String lspzdm;

    @PropertyDef(label = "粮食等级代码" )
    private String lsdjdm;

    @JSONField(format = "yyyy-MM-dd")
    @PropertyDef(label = "入库日期" )
    private Date rkrq;

    @PropertyDef(label = "检验类别" )
    private String jylb;

    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
    @PropertyDef(label = "检验时间" )
    private Date jysj;

    @PropertyDef(label = "检验单位" )
    private String jydw;

    @PropertyDef(label = "检验人" )
    private String jyr;

    @PropertyDef(label = "检验依据" )
    private String jyyj;

    @PropertyDef(label = "指标类别" )
    private String zblb;

    @PropertyDef(label = "检验项目" )
    private String jyxm;

    @PropertyDef(label = "检验项目值" )
    private String jyxmz;

    @PropertyDef(label = "指标结果判定" )
    private String zbjgpd;

    @PropertyDef(label = "食品安全指标是否合格" )
    private String spaqzbsfhg;

    @JSONField(format = "yyyy-MM-dd")
    @PropertyDef(label = "签发日期" )
    private Date qfrq;

    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
    @PropertyDef(label = "报告出具时间" )
    private Date bgcjsj;

    @PropertyDef(label = "审核人姓名" )
    private String shrxm;

    @PropertyDef(label = "扦样单编号" )
    private String qydbh;

    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
    @PropertyDef(label = "扦样时间" )
    private Date qysj;

    @PropertyDef(label = "扦样区域" )
    private String qyqy;

    @PropertyDef(label = "扦样人姓名" )
    private String qyrxm;

    @PropertyDef(label = "监督人姓名" )
    private String jdrxm;

    @PropertyDef(label = "样品编号" )
    private String ypbh;

    @PropertyDef(label = "样品数量" )
    private double ypsl;

    @PropertyDef(label = "代表数量" )
    private double dbsl;

    @PropertyDef(label = "样品等级" )
    private String ypdj;

    @PropertyDef(label = "是否正常存储年限" )
    private String sfzcccnx;

    @PropertyDef(label = "备注" )
    private String bz;

    @PropertyDef(label = "操作标志" )
    private String czbz;

    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
    @PropertyDef(label = "最后更新时间" )
    private Date zhgxsj;

}

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

@@ -54,6 +54,8 @@
    @Autowired
    private Api1208Rep api1208Rep;
    @Autowired
    private Api1210Rep api1210Rep;
    @Autowired
    private Api1109Rep api1109Rep;
    @Autowired
    private Api1202Rep api1202Rep;
@@ -195,14 +197,11 @@
                return responseDto;
            }

            //查询库区信息行政区划码
            List<Api1102> api1102List = api1102Rep.findPushData(kqdm);
            //封装数据
            SH2023PullReqDto reqData = new SH2023PullReqDto();;

            reqData.setName(conf.getUserName());
            reqData.setPwd(conf.getAppCode());

            log.info("拉取共享数据请求信息=" + JSON.toJSONString(reqData));

            String url = conf.getApiUrl().replace("UPLOAD", "Shared");
@@ -243,7 +242,6 @@
            list.add(object);
            return JSON.toJSONString(list);
        }

    }

    /**
@@ -255,7 +253,6 @@
     * @return
     */
    private Object getJsonApiData(String inteId, Object data, String code) {
        List<Object> list = new ArrayList<>();
        //具体根据接口进行封装
        if (SH2023Constant.SH_2023_API_CODE_1101.equals(inteId)) {
            SH2023Api1101 api1101 = new SH2023Api1101();
@@ -302,7 +299,12 @@
            BeanUtils.copyProperties(apiData, api1104);
            api1104.setAjdm(apiData.getAjdh());
            api1104.setCfdm(apiData.getCfbh());
            api1104.setLsxzdm("122");

            //设置粮食性质代码(查看廒间对应的最新库存进行赋值)
            List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1104.getAjdm() + "01");
            if (null != api1208List && api1208List.size() > 0) {
                api1104.setLsxzdm(api1208List.get(0).getLsxzdm());
            }

            //设置空属性为默认值
            changeObject(api1104);
@@ -355,7 +357,7 @@
            //上海市平台文件名称规则：库区编码_业务流水号_分类码_顺序码.jpg，例如：91310114703439394M001_142211080101_GL_00.jpg
            api1109.setWjmc(getWjmc(api1109.getWjlx(), api1109.getWjmc()));
            //业务类型
            api1109.setYwdh(getYwdh(api1109.getWjlx(), api1109.getWjmc()));
            api1109.setYwdh(getYwdh(api1109.getWjlx(), api1109.getWjmc(), api1109.getYwdh()));
            //设置空属性为默认值
            changeObject(api1109);
            return api1109;
@@ -387,6 +389,7 @@
            BeanUtils.copyProperties(data, api1112);
            api1112.setHdrychsj(api1112.getQdzgzchzyzgsj());
            api1112.setBjw(ShAreaBjw.getBjw(code));
            api1112.setZy("01");

            //设置空属性为默认值
            changeObject(api1112);
@@ -435,8 +438,7 @@
            if (StringUtils.isEmpty(api1202.getRkjsdh())) {
                api1202.setRkjsdh("0");
            }

            //设置粮食轮换年度
            //设置粮食轮换年度,根据计划明细号查询计划明细，再根据计划明细查询轮换计划
            List<Api1404> api1404List = api1404Rep.getDataByJhmxdh(apiData.getJhmxh());
            if (null != api1404List && api1404List.size() > 0) {
                List<Api1403> api1403List = api1403Rep.getDataByLhjhdh(api1404List.get(0).getLhjhdh());
@@ -446,12 +448,19 @@
                    }
                }
            }

            //查询粮食性质转变单号(根据入库时间和货位代码查询粮食性质转变单)
            List<Api1210> api1210List = api1210Rep.findDataByHwdmAndTime(api1202.getHwdm(), api1202.getCmsj());
            if (null != api1210List && api1210List.size() > 0) {
                api1202.setLsxzzbdh(api1210List.get(0).getLsxzzbdh());
            }
            //设置批次号
            List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1202.getHwdm());
            if (null != api1208List && api1208List.size() > 0) {
                api1202.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
            }
            //粮食性质
            api1202.setLsxzdm("200");

            //设置空属性为默认值
            changeObject(api1202);
            return api1202;
@@ -478,6 +487,8 @@
            if (null != api1208List && api1208List.size() > 0) {
                api1203.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
            }
            //设置质检编码(默认等同于入库质检单号)
            api1203.setZjbh(api1203.getRkjydh());

            //设置空属性为默认值
            changeObject(api1203);
@@ -542,6 +553,8 @@
                api1205.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
            }

            //粮食性质
            api1205.setLsxzdm("200");
            //设置空属性为默认值
            changeObject(api1205);
            return api1205;
@@ -615,6 +628,9 @@
                api1209.setPch(api1209.getHwdm() + api1208List.get(0).getShnd());
            }

            //粮食性质,暂时默认区级储备
            api1209.setLsxzdm("122");

            //设置空属性为默认值
            changeObject(api1209);
            return api1209;
@@ -646,7 +662,8 @@
            if (null != api1208List && api1208List.size() > 0) {
                api1211.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
            }

            //主管粮库代码
            api1211.setZglkdm(apiData.getKqdm());
            //设置空属性为默认值
            changeObject(api1211);
            return api1211;
@@ -854,6 +871,22 @@
            api1403.setJhzxdw(api1101List.get(0).getDwdm());
            api1403.setJhzxdwmc(api1101List.get(0).getDwmc());
            api1403.setBjw(ShAreaBjw.getBjw(code));

            //查询轮换计划的轮入数量和轮出数量
            List<Api1404> list = api1404Rep.getDataByLhjhdh(api1403.getLhjhdh());
            Double lrsl = 0.0, lcsl = 0.0; //用于统计轮入数量和轮出数量
            if(null != list && list.size() > 0){
                for (Api1404 api1404 : list) {
                    if(null!= api1404.getLhlx() && "2".equals(api1404.getLhlx())){
                        lrsl += api1404.getLhsl();
                    }
                    if(null!= api1404.getLhlx() && "1".equals(api1404.getLhlx())){
                        lcsl += api1404.getLhsl();
                    }
                }
            }
            api1403.setLrsl(lrsl);
            api1403.setLcsl(lcsl);

            //设置空属性为默认值
            changeObject(api1403);
@@ -1261,8 +1294,7 @@
        }
        return wjmc;
    }
    private String getYwdh(String wjlx, String wjmc) {
        String ywdh = "";
    private String getYwdh(String wjlx, String wjmc, String ywdh) {
        String[] s = wjmc.split("_");
        if ("2".equals(wjlx) || "3".equals(wjlx)) {
            ywdh = s[1];

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

@@ -91,6 +91,9 @@
    @PropertyDef(label = "廒间数")
    private Integer ajs;

    @PropertyDef(label = "单位状态")
    private String dwzt;

    @PropertyDef(label = "油罐数")
    private Integer ygs;


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

@@ -39,9 +39,6 @@
    @PropertyDef(label = "库区产权", description = "1： è‡ªæœ‰ 2：租赁 3：共有 4：混合 9：其他")
    private String kqcq;

    @PropertyDef(label = "储备仓容")
    private Double cbcr;

    @PropertyDef(label = "有效仓容")
    private Double yxcr;

@@ -54,9 +51,6 @@
    @PropertyDef(label = "仓房数")
    private Integer cfs;

    @PropertyDef(label = "廒间数")
    private Integer ajs;

    @PropertyDef(label = "油罐数")
    private Integer ygs;

@@ -65,6 +59,9 @@

    @PropertyDef(label = "库区纬度")
    private Double wd;

    @PropertyDef(label = "库区状态", description = "1:正常（默认） 2:退出储备粮承储")
    private String kqzt;

    @PropertyDef(label = "操作标志")
    private String czbz;
@@ -76,9 +73,12 @@
    @PropertyDef(label = "库区属性", description = "1:市级直属，2:市级代储，3:区级直储，4:区级代储，9：其他")
    private String kqsx;

    @PropertyDef(label = "库区状态")
    private String kqzt;
    @PropertyDef(label = "廒间数")
    private Integer ajs;

    @PropertyDef(label = "标记位", description = "1:正常(默认), 2:退出储备粮承储")
    private String bjw;

    @PropertyDef(label = "储备仓容")
    private Double cbcr;
}

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

@@ -190,10 +190,10 @@
    @PropertyDef(label = "最后更新时间")
    private Date zhgxsj;

    @PropertyDef(label = "粮食性质代码")
    private String lsxzdm;

    @PropertyDef(label = "标记位")
    private String bjw;

    @PropertyDef(label = "粮食性质代码")
    private String lsxzdm;

}

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

@@ -2,14 +2,9 @@

import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import com.fzzy.api.entity.ApiParent;
import lombok.Data;
import lombok.EqualsAndHashCode;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;

@@ -24,7 +19,6 @@
     *
     */
    private static final long serialVersionUID = 760284619085936798L;


    //12 ä½æ•°å­—组成，第 1-2 ä½ä¸ºä¸šåŠ¡ä»£ç ï¼ˆ14代表粮食入库），第 3-8 ä½ä¾æ¬¡ä¸ºå¹´ä»½çš„后两位、2 ä½æœˆä»½ã€2 ä½æ—¥æœŸï¼ŒåŽå››ä½ä¸ºé¡ºåºç ã€‚例如：141605041234

@@ -212,15 +206,26 @@
    @PropertyDef(label = "更新时间")
    private Date zhgxsj;

    @PropertyDef(label = "批次号")
    private String pch = "无";

    @PropertyDef(label = "标记位")
    private String bjw;

    @PropertyDef(label = "驳运单号")
    private String bydh = "无";

    @PropertyDef(label = "检斤单号")
    private String jjdh = "无";
    @PropertyDef(label = "操作标志")

    @PropertyDef(label = "轮换年度")
    private String lhnd;
    

    @PropertyDef(label = "粮食性质转变单号")
    private String lsxzzbdh;

    @JSONField(format = "yyyy-MM-dd")
    @PropertyDef(label = "记账日期")
    private Date jzrq;

}
}

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

@@ -91,4 +91,7 @@

    @PropertyDef(label = "标记位")
    private String bjw;

    @PropertyDef(label = "质检编号")
    private String zjbh;
}

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

@@ -69,8 +69,6 @@
    @PropertyDef(label = "车船号")
    private String cch;



    @PropertyDef(label = "挂车号")
    private String gch;


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

@@ -109,7 +109,7 @@
    private String bjw;

    @PropertyDef(label = "成品粮规格")
    private String cplgg = "无";
    private String cplgg = "3";

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

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

@@ -70,6 +70,9 @@
    @PropertyDef(label = "损益是否正常")
    private String sysfzc;

    @PropertyDef(label = "损溢类型",description = "1:损耗，2：损失，3.其他")
    private String sylx;

    @PropertyDef(label = "损溢原因")
    private String syyy;

@@ -107,4 +110,10 @@
    @PropertyDef(label = "标记位")
    private String bjw;

    @PropertyDef(label = "粮食性质代码")
    private String lsxzdm;

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

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

@@ -78,4 +78,7 @@
    @PropertyDef(label = "标记位")
    private String bjw;

    @PropertyDef(label = "计划明细单号")
    private String jhmxdh;

}

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

@@ -129,4 +129,7 @@
    @PropertyDef(label = "粮食性质代码")
    private String lsxzdm;

    @PropertyDef(label = "报告类型", description = "1-单位检验；2-整体检验；3-其他")
    private String bglx;

}

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

@@ -65,5 +65,11 @@
    @PropertyDef(label = "标记位")
    private String bjw;

    @PropertyDef(label = "轮入数量")
    private Double lrsl;

    @PropertyDef(label = "轮出数量")
    private Double lcsl;


}