Merge remote-tracking branch 'origin/master'

YYC

2023-10-27 8ae76246e2eb899335594d2da69ae0aea61f9460

 src/main/java/com/fzzy/otherview/sh2023/ShApi2104.view.xml

@@ -6,11 +6,11 @@
    <DataType name="dtMain">
      <Property name="creationType">com.fzzy.push.sh2023.dto.SH2023Api2104</Property>
      <PropertyDef name="bydh">
        <Property/>
        <Property></Property>
        <Property name="label">驳运单号</Property>
      </PropertyDef>
      <PropertyDef name="kqdm">
        <Property/>
        <Property></Property>
        <Property name="label">库区代码</Property>
      </PropertyDef>
      <PropertyDef name="jzrq">
@@ -18,23 +18,23 @@
        <Property name="label">记账日期</Property>
      </PropertyDef>
      <PropertyDef name="khmc">
        <Property/>
        <Property></Property>
        <Property name="label">客户编号</Property>
      </PropertyDef>
      <PropertyDef name="psplan">
        <Property/>
        <Property></Property>
        <Property name="label">来粮预报号/提货单号</Property>
      </PropertyDef>
      <PropertyDef name="hth">
        <Property/>
        <Property></Property>
        <Property name="label">合同号</Property>
      </PropertyDef>
      <PropertyDef name="cch">
        <Property/>
        <Property></Property>
        <Property name="label">车船号</Property>
      </PropertyDef>
      <PropertyDef name="lspzdm">
        <Property/>
        <Property></Property>
        <Property name="label">品种大类</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;LSPZ&quot;)}</Property>
@@ -43,7 +43,7 @@
        </Property>
      </PropertyDef>
      <PropertyDef name="lsxzdm">
        <Property/>
        <Property></Property>
        <Property name="label">粮食性质代码</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;LSXZ&quot;)}</Property>
@@ -52,7 +52,7 @@
        </Property>
      </PropertyDef>
      <PropertyDef name="lldm">
        <Property/>
        <Property></Property>
        <Property name="label">来粮代码</Property>
      </PropertyDef>
      <PropertyDef name="jz">
@@ -60,7 +60,7 @@
        <Property name="label">净重</Property>
      </PropertyDef>
      <PropertyDef name="czbz">
        <Property/>
        <Property></Property>
        <Property name="label">数据状态</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;CZBZ&quot;)}</Property>
@@ -68,12 +68,12 @@
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="zhgxsh">
      <PropertyDef name="zhgxsj">
        <Property name="dataType">Date</Property>
        <Property name="label">最后更新时间</Property>
      </PropertyDef>
      <PropertyDef name="pch">
        <Property/>
        <Property></Property>
        <Property name="label">批次号</Property>
      </PropertyDef>
      <PropertyDef name="bjw">
@@ -84,34 +84,6 @@
          <Property name="valueProperty">value</Property>
          <Property name="mapValues">
            <Collection>
              <Entity>
                <Property name="value">黄浦区</Property>
                <Property name="key">huangpu</Property>
              </Entity>
              <Entity>
                <Property name="value">徐汇区</Property>
                <Property name="key">xuhui</Property>
              </Entity>
              <Entity>
                <Property name="value">长宁区</Property>
                <Property name="key">changning</Property>
              </Entity>
              <Entity>
                <Property name="value">静安区</Property>
                <Property name="key">jingan</Property>
              </Entity>
              <Entity>
                <Property name="value">普陀区</Property>
                <Property name="key">putuo</Property>
              </Entity>
              <Entity>
                <Property name="value">虹口区</Property>
                <Property name="key">hongkou</Property>
              </Entity>
              <Entity>
                <Property name="value">杨浦区</Property>
                <Property name="key">yangpu</Property>
              </Entity>
              <Entity>
                <Property name="value">闵行区</Property>
                <Property name="key">minhang</Property>
@@ -345,8 +317,8 @@
        <Property name="property">czbz</Property>
        <Property name="align">center</Property>
      </DataColumn>
      <DataColumn name="zhgxsh">
        <Property name="property">zhgxsh</Property>
      <DataColumn name="zhgxsj">
        <Property name="property">zhgxsj</Property>
        <Property name="align">center</Property>
      </DataColumn>
      <DataColumn name="bjw">
@@ -363,7 +335,7 @@
    </ToolBar>
    <Dialog id="dialogMain">
      <Property name="width">80%</Property>
      <Property name="caption">到仓信息</Property>
      <Property name="caption">市储驳运单信息</Property>
      <Property name="iconClass">fa fa-sliders</Property>
      <Property name="closeable">false</Property>
      <Buttons>
@@ -453,8 +425,8 @@
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">zhgxsh</Property>
            <Property name="property">zhgxsh</Property>
            <Property name="name">zhgxsj</Property>
            <Property name="property">zhgxsj</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>