Merge remote-tracking branch 'origin/master'

sgj

12 小时以前 d491a7503e9b33f26afa39834d8c456a673607bb

Merge remote-tracking branch 'origin/master'

 fzzy-igdss-view/src/main/java/com/fzzy/igds/GrainReport.view.xml

@@ -534,6 +534,24 @@
      <PropertyDef name="title">
        <Property name="label"> </Property>
      </PropertyDef>
      <PropertyDef name="companyId">
        <Property></Property>
        <Property name="label">收储公司</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;companyPR#getData&quot;).getResult()}</Property>
          <Property name="keyProperty">id</Property>
          <Property name="valueProperty">dwmc</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="deptId">
        <Property></Property>
        <Property name="label">所属库区</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#getAllData&quot;).getResult()}</Property>
          <Property name="keyProperty">id</Property>
          <Property name="valueProperty">kqmc</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="depotId">
        <Property></Property>
        <Property name="label">选择仓库：</Property>
@@ -549,7 +567,7 @@
      </PropertyDef>
      <PropertyDef name="end">
        <Property name="dataType">Date</Property>
        <Property name="label">检测时间截至</Property>
        <Property name="label">检测时间</Property>
      </PropertyDef>
      <PropertyDef name="createUser">
        <Property name="label">制表人</Property>
@@ -620,11 +638,21 @@
    <Container>
      <Property name="className">c-param</Property>
      <AutoForm>
        <Property name="cols">*,*,*,90,90</Property>
        <Property name="cols">*,*,*,*,90,90</Property>
        <Property name="dataSet">dataSetC</Property>
        <Property name="labelSeparator">：</Property>
        <Property name="labelAlign">right</Property>
        <Property name="labelWidth">110</Property>
        <AutoFormElement>
          <Property name="name">companyId</Property>
          <Property name="property">companyId</Property>
          <Editor/>
        </AutoFormElement>
        <AutoFormElement>
          <Property name="name">deptId</Property>
          <Property name="property">deptId</Property>
          <Editor/>
        </AutoFormElement>
        <AutoFormElement>
          <Property name="name">start</Property>
          <Property name="property">start</Property>
@@ -633,12 +661,6 @@
        <AutoFormElement>
          <Property name="name">end</Property>
          <Property name="property">end</Property>
          <Editor/>
        </AutoFormElement>
        <AutoFormElement>
          <Property name="name">names</Property>
          <Property name="property">names</Property>
          <Property name="trigger">CDDDept</Property>
          <Editor/>
        </AutoFormElement>
        <Button>