Merge remote-tracking branch 'origin/master'

jiazx0107@163.com

2023-11-04 43ce77a85d8297a53dc25430fff10ead57296167

 igds-core/src/main/java/com/ld/igds/view/DepotBookStore.view.xml

@@ -12,13 +12,29 @@
        <Property></Property>
        <Property name="label">组织编码</Property>
      </PropertyDef>
      <PropertyDef name="kqdm">
      <PropertyDef name="deptId">
        <Property></Property>
        <Property name="label">库区代码</Property>
        <Property name="label">所属分库</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#loadParents&quot;).getResult()}</Property>
          <Property name="keyProperty">id</Property>
          <Property name="valueProperty">name</Property>
        </Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="depotId">
        <Property></Property>
        <Property name="label">所属仓库</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getAllCache&quot;).getResult()}</Property>
          <Property name="keyProperty">id</Property>
          <Property name="valueProperty">name</Property>
        </Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="lspzdm">
        <Property></Property>
        <Property name="label">粮食品种代码</Property>
        <Property name="label">粮食品种</Property>
        <Property name="required">true</Property>
        <Property name="mapping">
          <Property name="keyProperty">code</Property>
@@ -44,24 +60,25 @@
        <Property name="dataType">Double</Property>
        <Property name="label">期初数量</Property>
        <Property name="required">true</Property>
        <Property name="displayFormat">#,##0 KG</Property>
      </PropertyDef>
      <PropertyDef name="bqsrsl">
        <Property name="dataType">Double</Property>
        <Property name="label">本期收入数量</Property>
        <Property name="required">true</Property>
        <Property name="displayFormat">#0.000KG</Property>
        <Property name="displayFormat">#,##0 KG</Property>
      </PropertyDef>
      <PropertyDef name="bqzcsl">
        <Property name="dataType">Double</Property>
        <Property name="label">本期支出数量</Property>
        <Property name="required">true</Property>
        <Property name="displayFormat">#0.000KG</Property>
        <Property name="displayFormat">#,##0 KG</Property>
      </PropertyDef>
      <PropertyDef name="qmye">
        <Property name="dataType">Double</Property>
        <Property name="label">期末数量</Property>
        <Property name="required">true</Property>
        <Property name="displayFormat">#0.000KG</Property>
        <Property name="displayFormat">#,##0 KG</Property>
      </PropertyDef>
      <PropertyDef name="yjbz">
        <Property name="dataType">Integer</Property>
@@ -88,30 +105,6 @@
        <Property name="dataType">Date</Property>
        <Property name="label">业务日期</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="czbz">
        <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">i</Property>
                <Property name="value">新增数据</Property>
              </Entity>
              <Entity>
                <Property name="key">u</Property>
                <Property name="value">修改数据</Property>
              </Entity>
              <Entity>
                <Property name="key">d</Property>
                <Property name="value">删除数据</Property>
              </Entity>
            </Collection>
          </Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="zhgxsj">
        <Property name="dataType">DateTime</Property>
@@ -220,6 +213,10 @@
        <Property name="dataSet">dsMain</Property>
        <Property name="readOnly">true</Property>
        <RowNumColumn/>
        <DataColumn name="depotId">
          <Property name="property">depotId</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="lspzdm">
          <Property name="property">lspzdm</Property>
          <Property name="align">center</Property>
@@ -250,14 +247,6 @@
        </DataColumn>
        <DataColumn name="yjbz">
          <Property name="property">yjbz</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="ywrq">
          <Property name="property">ywrq</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="czbz">
          <Property name="property">czbz</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="zhgxsj">
@@ -308,6 +297,16 @@
          <Property name="cols">*,*</Property>
          <Property name="labelWidth">120</Property>
          <AutoFormElement>
            <Property name="name">depotId</Property>
            <Property name="property">depotId</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">deptId</Property>
            <Property name="property">deptId</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">lspzdm</Property>
            <Property name="property">lspzdm</Property>
            <Editor/>
@@ -352,11 +351,6 @@
          <AutoFormElement>
            <Property name="name">ywrq</Property>
            <Property name="property">ywrq</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">czbz</Property>
            <Property name="property">czbz</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>