Merge remote-tracking branch 'origin/master'

YYC

2023-10-27 8ae76246e2eb899335594d2da69ae0aea61f9460

 src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1106.view.xml

@@ -5,9 +5,9 @@
  <Model>
    <DataType name="dtMain">
      <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1106</Property>
      <PropertyDef name="ajbh">
      <PropertyDef name="ygbh">
        <Property></Property>
        <Property name="label">廒间编号</Property>
        <Property name="label">油罐编号</Property>
      </PropertyDef>
      <PropertyDef name="jlqybh">
        <Property></Property>
@@ -25,79 +25,49 @@
        <Property></Property>
        <Property name="label">军供站点名称</Property>
      </PropertyDef>
      <PropertyDef name="sscfbh">
      <PropertyDef name="ygmc">
        <Property></Property>
        <Property name="label">仓房编号</Property>
        <Property name="label">油灌名称</Property>
      </PropertyDef>
      <PropertyDef name="sscfmc">
      <PropertyDef name="yglx">
        <Property></Property>
        <Property name="label">仓房名称</Property>
        <Property name="label">油灌类型</Property>
      </PropertyDef>
      <PropertyDef name="ajmc">
      <PropertyDef name="ykdj">
        <Property></Property>
        <Property name="label">廒间名称</Property>
        <Property name="label">油灌等级</Property>
      </PropertyDef>
      <PropertyDef name="ajcd">
      <PropertyDef name="ygor">
        <Property name="dataType">Double</Property>
        <Property name="label">廒间长度</Property>
        <Property name="displayFormat">#0.0米</Property>
        <Property name="label">油罐总容</Property>
      </PropertyDef>
      <PropertyDef name="ajkd">
      <PropertyDef name="ygzrd1">
        <Property name="dataType">Double</Property>
        <Property name="label">廒间宽度</Property>
        <Property name="displayFormat">#0.0米</Property>
        <Property name="label">油罐组容</Property>
      </PropertyDef>
      <PropertyDef name="ajgd">
      <PropertyDef name="lxdh">
        <Property></Property>
        <Property name="label">廒间高度</Property>
        <Property name="label">联系电话</Property>
      </PropertyDef>
      <PropertyDef name="cfjd">
        <Property name="dataType">Double</Property>
        <Property name="displayFormat">#0.0米</Property>
        <Property name="label">仓房经度</Property>
      </PropertyDef>
      <PropertyDef name="ajsjcr">
      <PropertyDef name="cfwd">
        <Property name="dataType">Double</Property>
        <Property name="label">廒间设计仓容</Property>
        <Property name="displayFormat">#0.00吨</Property>
        <Property name="label">仓房纬度</Property>
      </PropertyDef>
      <PropertyDef name="ajsjcr01">
        <Property name="dataType">Double</Property>
        <Property name="label">廒间实际仓容</Property>
        <Property name="displayFormat">#0.00吨</Property>
      </PropertyDef>
      <PropertyDef name="ajlxdh">
        <Property></Property>
        <Property name="label">廒间联系电话</Property>
      </PropertyDef>
      <PropertyDef name="ajjd">
        <Property name="dataType">Double</Property>
        <Property name="label">廒间经度</Property>
        <Property name="displayFormat">#0.000000度</Property>
      </PropertyDef>
      <PropertyDef name="ajwd">
        <Property name="dataType">Double</Property>
        <Property name="label">廒间纬度</Property>
        <Property name="displayFormat">#0.000000度</Property>
      </PropertyDef>
      <PropertyDef name="ajqyrq">
      <PropertyDef name="qyrq">
        <Property name="dataType">Date</Property>
        <Property name="label">廒间启用日期</Property>
        <Property name="label">启用日期</Property>
      </PropertyDef>
      <PropertyDef name="ajzt">
      <PropertyDef name="ygzt">
        <Property></Property>
        <Property name="label">廒间状态</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;CFZT&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
        <Property name="label">油罐状态</Property>
      </PropertyDef>
      <PropertyDef name="ajsyzt">
      <PropertyDef name="ygsyzt">
        <Property></Property>
        <Property name="label">廒间使用状态</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;HWZT&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
        <Property name="label">油罐使用状态</Property>
      </PropertyDef>
      <PropertyDef name="sfyx">
        <Property></Property>
@@ -113,20 +83,42 @@
      </PropertyDef>
      <PropertyDef name="updateTime">
        <Property name="dataType">Date</Property>
        <Property name="label">更新时间</Property>
        <Property name="label">最后更新时间</Property>
      </PropertyDef>
      <PropertyDef name="czbz">
        <Property></Property>
        <Property name="label">操作标志</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;CZBZ&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="kqdm">
        <Property></Property>
        <Property name="label">库区代码</Property>
      </PropertyDef>
    </DataType>
    <DataType name="dtGBArea">
      <Property name="creationType">com.fzzy.api.entity.GbArea</Property>
      <PropertyDef name="code">
        <Property></Property>
        <Property name="label">接口编码</Property>
      </PropertyDef>
      <PropertyDef name="name">
        <Property></Property>
        <Property name="label">名称</Property>
      </PropertyDef>
      <PropertyDef name="parentCode">
        <Property></Property>
        <Property name="label">父编码</Property>
      </PropertyDef>
      <PropertyDef name="disabledTag">
        <Property></Property>
        <Property name="label">禁用</Property>
      </PropertyDef>
      <PropertyDef name="simple">
        <Property></Property>
        <Property name="label">是否默认</Property>
      </PropertyDef>
      <PropertyDef name="remark">
        <Property></Property>
        <Property name="label">备注说明</Property>
      </PropertyDef>
    </DataType>
  </Model>
@@ -221,57 +213,53 @@
        <RowSelectorColumn>
          <Property name="caption">上传</Property>
        </RowSelectorColumn>
        <DataColumn name="ajmc">
          <Property name="property">ajmc</Property>
        <DataColumn name="ygbh">
          <Property name="property">ygbh</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="sscfmc">
          <Property name="property">sscfmc</Property>
        <DataColumn name="ygmc">
          <Property name="property">ygmc</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="ajcd">
          <Property name="property">ajcd</Property>
        <DataColumn name="yglx">
          <Property name="property">yglx</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="ajkd">
          <Property name="property">ajkd</Property>
        <DataColumn name="lxdh">
          <Property name="property">lxdh</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="ajgd">
          <Property name="property">ajgd</Property>
        <DataColumn name="cfjd">
          <Property name="property">cfjd</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="ajsjcr">
          <Property name="property">ajsjcr</Property>
        <DataColumn name="cfwd">
          <Property name="property">cfwd</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="ajsjcr01">
          <Property name="property">ajsjcr01</Property>
        <DataColumn name="qyrq">
          <Property name="property">qyrq</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="ajqyrq">
          <Property name="property">ajqyrq</Property>
        <DataColumn name="ygzt">
          <Property name="property">ygzt</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="ajzt">
          <Property name="property">ajzt</Property>
        <DataColumn name="czbz">
          <Property name="property">czbz</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="ajsyzt">
          <Property name="property">ajsyzt</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="sfyx">
          <Property name="property">sfyx</Property>
        <DataColumn name="updateTime">
          <Property name="property">updateTime</Property>
          <Property name="align">center</Property>
        </DataColumn>
      </DataGrid>
    </Container>
    <Dialog id="dialogMain">
      <Property name="width">60%</Property>
      <Property name="width">85%</Property>
      <Property name="closeable">false</Property>
      <Property name="iconClass">fa fa-sliders</Property>
      <Property name="caption">廒间信息</Property>
      <Property name="caption">军粮企业信息</Property>
      <Buttons>
        <Button>
          <ClientEvent name="onClick">var cur = view.get(&quot;#dgMain&quot;).getCurrentItem();&#xD;
@@ -293,14 +281,12 @@
      <Children>
        <AutoForm>
          <Property name="dataSet">dsMain</Property>
          <Property name="cols">*,*</Property>
          <Property name="labelPosition">left</Property>
          <Property name="cols">*,*,*,*</Property>
          <Property name="labelPosition">top</Property>
          <Property name="labelSeparator">:</Property>
          <Property name="labelWidth">120</Property>
          <Property name="labelAlign">right</Property>
          <AutoFormElement>
            <Property name="name">ajbh</Property>
            <Property name="property">ajbh</Property>
            <Property name="name">ygbh</Property>
            <Property name="property">ygbh</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
@@ -324,79 +310,68 @@
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">sscfbh</Property>
            <Property name="property">sscfbh</Property>
            <Property name="name">ygmc</Property>
            <Property name="property">ygmc</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">sscfmc</Property>
            <Property name="property">sscfmc</Property>
            <Property name="name">yglx</Property>
            <Property name="property">yglx</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ajmc</Property>
            <Property name="property">ajmc</Property>
            <Property name="name">ykdj</Property>
            <Property name="property">ykdj</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ajcd</Property>
            <Property name="property">ajcd</Property>
            <Property name="name">ygor</Property>
            <Property name="property">ygor</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ajkd</Property>
            <Property name="property">ajkd</Property>
            <Property name="name">ygzrd1</Property>
            <Property name="property">ygzrd1</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ajgd</Property>
            <Property name="property">ajgd</Property>
            <Property name="name">lxdh</Property>
            <Property name="property">lxdh</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ajsjcr</Property>
            <Property name="property">ajsjcr</Property>
            <Property name="name">cfjd</Property>
            <Property name="property">cfjd</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ajsjcr01</Property>
            <Property name="property">ajsjcr01</Property>
            <Property name="name">cfwd</Property>
            <Property name="property">cfwd</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ajlxdh</Property>
            <Property name="property">ajlxdh</Property>
            <Property name="name">qyrq</Property>
            <Property name="property">qyrq</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ajjd</Property>
            <Property name="property">ajjd</Property>
            <Property name="name">ygzt</Property>
            <Property name="property">ygzt</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ajwd</Property>
            <Property name="property">ajwd</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ajqyrq</Property>
            <Property name="property">ajqyrq</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ajzt</Property>
            <Property name="property">ajzt</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ajsyzt</Property>
            <Property name="property">ajsyzt</Property>
            <Property name="name">ygsyzt</Property>
            <Property name="property">ygsyzt</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">sfyx</Property>
            <Property name="property">sfyx</Property>
            <Property name="trigger">listDropYN</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">bz</Property>
            <Property name="property">bz</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
@@ -419,11 +394,6 @@
            <Property name="property">kqdm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">bz</Property>
            <Property name="property">bz</Property>
            <Editor/>
          </AutoFormElement>
        </AutoForm>
      </Children>
      <Tools/>
@@ -442,6 +412,53 @@
    <AjaxAction id="ajaxPush">
      <Property name="service">whjlApi1106PR#pushData</Property>
    </AjaxAction>
    <CustomDropDown id="cddGbArea">
      <Property name="assignmentMap">qyxzqhdm=code,qyxzqhmc=name</Property>
      <Property name="height">500</Property>
      <Property name="minHeight">500</Property>
      <Property name="maxHeight">500</Property>
      <Property name="width">400</Property>
      <Container layout="regionPadding:5">
        <DataSet id="dsGBArea">
          <Property name="dataProvider">gbAreaPR#findByCode</Property>
          <Property name="dataType">[dtGBArea]</Property>
        </DataSet>
        <Container layout="hbox regionPadding:5">
          <TextEditor id="key2">
            <Property name="blankText"> -- 编码或者名称 --</Property>
            <Property name="width">200</Property>
          </TextEditor>
          <Button>
            <ClientEvent name="onClick">var key = view.get(&quot;#key2.value&quot;);&#xD;
view.get(&quot;#dsGBArea&quot;).set(&quot;parameter&quot;,{key:key}).flushAsync();</ClientEvent>
            <Property name="iconClass">fa fa-search</Property>
            <Property name="caption">查询</Property>
          </Button>
          <Button>
            <ClientEvent name="onClick">var data = view.get(&quot;#dsGBArea.data:#&quot;);&#xD;
if (data) {&#xD;
   view.get(&quot;#cddGbArea&quot;).close(data.toJSON());&#xD;
}</ClientEvent>
            <Property name="caption">确定</Property>
            <Property name="iconClass">fa fa-check</Property>
          </Button>
        </Container>
        <DataGrid>
          <ClientEvent name="onDataRowDoubleClick">var data = view.get(&quot;#dsGBArea.data:#&quot;);&#xD;
if(data){&#xD;
   view.get(&quot;#cddGbArea&quot;).close(data.toJSON());&#xD;
}</ClientEvent>
          <Property name="dataSet">dsGBArea</Property>
          <Property name="readOnly">true</Property>
          <DataColumn name="code">
            <Property name="property">code</Property>
          </DataColumn>
          <DataColumn name="name">
            <Property name="property">name</Property>
          </DataColumn>
        </DataGrid>
      </Container>
    </CustomDropDown>
    <Dialog id="dialogLog">
      <Property name="width">90%</Property>
      <Property name="height">90%</Property>