Merge remote-tracking branch 'origin/master'

YYC

2023-09-07 7243e0b4bd9a267a633d2e481e17646509b6868d

 igds-core/src/main/java/models/igds.model.xml

@@ -188,18 +188,24 @@
    </PropertyDef>
    <PropertyDef name="buildingId">
      <Property></Property>
      <Property name="label">所属建筑</Property>
      <Property name="label">所属仓房</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;buildingPR#getCacheBuilding&quot;).getResult()}</Property>
        <Property name="keyProperty">id</Property>
        <Property name="valueProperty">name</Property>
      </Property>
      <Property name="required">false</Property>
    </PropertyDef>
    <PropertyDef name="granaryId">
      <Property></Property>
      <Property name="label">所属廒间</Property>
      <Property name="required">false</Property>
    </PropertyDef>
    <PropertyDef name="depotType">
      <Property></Property>
      <Property name="label">仓库类型</Property>
      <Property name="label">仓房类型</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;DEPOT_TYPE&quot;)}</Property>
        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#triggerDepotType&quot;).getResult()}</Property>
        <Property name="keyProperty">code</Property>
        <Property name="valueProperty">name</Property>
      </Property>
@@ -209,20 +215,23 @@
      <Property></Property>
      <Property name="label">仓库状态</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;DEPOT_STATUS&quot;)}</Property>
        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#triggerDepotStatus&quot;).getResult()}</Property>
        <Property name="keyProperty">code</Property>
        <Property name="valueProperty">name</Property>
      </Property>
      <Property name="required">true</Property>
    </PropertyDef>
    <PropertyDef name="storageMax">
      <Property name="dataType">Double</Property>
      <Property name="label">设计仓容</Property>
      <Property name="label">设计储量</Property>
      <Property name="displayFormat">#,##0 KG</Property>
      <Property name="required">true</Property>
    </PropertyDef>
    <PropertyDef name="storageReal">
      <Property name="dataType">Double</Property>
      <Property name="label">实际储量</Property>
      <Property name="displayFormat">#,##0 KG</Property>
      <Property name="required">false</Property>
    </PropertyDef>
    <PropertyDef name="storeType">
      <Property></Property>
@@ -233,10 +242,6 @@
        <Property name="valueProperty">name</Property>
      </Property>
      <Property name="required">true</Property>
    </PropertyDef>
    <PropertyDef name="orientation">
      <Property></Property>
      <Property name="label">仓库朝向</Property>
    </PropertyDef>
    <PropertyDef name="foodType">
      <Property></Property>
@@ -260,7 +265,7 @@
      <Property></Property>
      <Property name="label">粮食等级</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_LEVEL_&quot;)}</Property>
        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#triggerFoodLevel&quot;).getResult()}</Property>
        <Property name="keyProperty">code</Property>
        <Property name="valueProperty">name</Property>
      </Property>
@@ -286,7 +291,7 @@
    </PropertyDef>
    <PropertyDef name="storeKeeper">
      <Property></Property>
      <Property name="label">保管员账号</Property>
      <Property name="label">保管员</Property>
    </PropertyDef>
    <PropertyDef name="storeKeeperName">
      <Property></Property>
@@ -294,7 +299,7 @@
    </PropertyDef>
    <PropertyDef name="checkDate">
      <Property name="dataType">Date</Property>
      <Property name="label">质检日期</Property>
      <Property name="label">最后质检日期</Property>
    </PropertyDef>
    <PropertyDef name="storeDate">
      <Property name="dataType">Date</Property>
@@ -308,21 +313,191 @@
      <Property></Property>
      <Property name="label">备注</Property>
    </PropertyDef>
    <PropertyDef name="foodVarietyName">
    <PropertyDef name="ggm">
      <Property></Property>
      <Property name="label">粮食品种</Property>
      <Property name="label">国规码</Property>
    </PropertyDef>
    <PropertyDef name="foodTypeName">
  </DataType>
  <DataType name="dtDepotStore">
    <Property name="creationType">com.ld.igds.models.DepotStore</Property>
    <PropertyDef name="id">
      <Property></Property>
    </PropertyDef>
    <PropertyDef name="companyId">
      <Property></Property>
      <Property name="label">组织编码</Property>
    </PropertyDef>
    <PropertyDef name="deptId">
      <Property></Property>
      <Property name="label">所属分库</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="country">
      <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">156</Property>
              <Property name="value">中国</Property>
            </Entity>
            <Entity>
              <Property name="key">076</Property>
              <Property name="value">巴西</Property>
            </Entity>
            <Entity>
              <Property name="key">124</Property>
              <Property name="value">加拿大</Property>
            </Entity>
            <Entity>
              <Property name="key">036</Property>
              <Property name="value">澳大利亚</Property>
            </Entity>
            <Entity>
              <Property name="key">356</Property>
              <Property name="value">印度</Property>
            </Entity>
            <Entity>
              <Property name="key">764</Property>
              <Property name="value">泰国</Property>
            </Entity>
            <Entity>
              <Property name="key">840</Property>
              <Property name="value">美国</Property>
            </Entity>
          </Collection>
        </Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="manageType">
      <Property></Property>
      <Property name="label">管理方式</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#triggerManagerType&quot;).getResult()}</Property>
        <Property name="keyProperty">code</Property>
        <Property name="valueProperty">name</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="storeType">
      <Property></Property>
      <Property name="label">储粮方式</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#triggerStoreType&quot;).getResult()}</Property>
        <Property name="keyProperty">code</Property>
        <Property name="valueProperty">name</Property>
      </Property>
      <Property name="required">true</Property>
    </PropertyDef>
    <PropertyDef name="depotStatus">
      <Property></Property>
      <Property name="label">货位状态</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#triggerDepotStatus&quot;).getResult()}</Property>
        <Property name="keyProperty">code</Property>
        <Property name="valueProperty">name</Property>
      </Property>
      <Property name="required">true</Property>
    </PropertyDef>
    <PropertyDef name="foodType">
      <Property></Property>
      <Property name="label">粮食性质</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_TYPE_&quot;)}</Property>
        <Property name="keyProperty">code</Property>
        <Property name="valueProperty">name</Property>
      </Property>
      <Property name="required">true</Property>
    </PropertyDef>
    <PropertyDef name="depotTypeName">
    <PropertyDef name="foodVariety">
      <Property></Property>
      <Property name="label">仓库类型</Property>
      <Property name="label">粮食品种</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_VARIETY_&quot;)}</Property>
        <Property name="keyProperty">code</Property>
        <Property name="valueProperty">name</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="foodLevelName">
    <PropertyDef name="foodLevel">
      <Property></Property>
      <Property name="label">粮食等级</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#triggerFoodLevel&quot;).getResult()}</Property>
        <Property name="keyProperty">code</Property>
        <Property name="valueProperty">name</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="foodLocationId">
      <Property></Property>
      <Property name="label">粮食产地</Property>
    </PropertyDef>
    <PropertyDef name="foodLocation">
      <Property></Property>
      <Property name="label">粮食产地</Property>
    </PropertyDef>
    <PropertyDef name="foodYear">
      <Property></Property>
      <Property name="label">收货年度</Property>
    </PropertyDef>
    <PropertyDef name="storeDate">
      <Property name="dataType">DateTime</Property>
      <Property name="label">入仓时间</Property>
    </PropertyDef>
    <PropertyDef name="storageReal">
      <Property name="dataType">Double</Property>
      <Property name="label">实际储量</Property>
      <Property name="displayFormat">#,##0 KG</Property>
      <Property name="required">true</Property>
    </PropertyDef>
    <PropertyDef name="storageSettle">
      <Property name="dataType">Double</Property>
      <Property name="label">计价数量</Property>
      <Property name="displayFormat">#,##0 KG</Property>
      <Property name="required">true</Property>
    </PropertyDef>
    <PropertyDef name="fullDate">
      <Property name="dataType">Date</Property>
      <Property name="label">封仓日期</Property>
    </PropertyDef>
    <PropertyDef name="outDate">
      <Property name="label">出仓完成时间</Property>
      <Property name="dataType">DateTime</Property>
    </PropertyDef>
    <PropertyDef name="grainHeight">
      <Property name="dataType">Double</Property>
      <Property name="label">装粮线高</Property>
      <Property name="displayFormat">0.00 米</Property>
    </PropertyDef>
    <PropertyDef name="grainVolume">
      <Property name="dataType">Double</Property>
      <Property name="label">装粮体积</Property>
      <Property name="displayFormat">0.00 立方米</Property>
    </PropertyDef>
    <PropertyDef name="remark">
      <Property></Property>
      <Property name="label">备注</Property>
    </PropertyDef>
    <PropertyDef name="updateUser">
      <Property></Property>
      <Property name="label">修改人</Property>
    </PropertyDef>
    <PropertyDef name="updateDate">
      <Property name="dataType">Date</Property>
      <Property name="label">修改时间</Property>
    </PropertyDef>
    <PropertyDef name="createDate">
      <Property name="dataType">Date</Property>
    </PropertyDef>
  </DataType>
  <DataType name="dtDevice">
@@ -343,14 +518,17 @@
        <Property name="keyProperty">id</Property>
        <Property name="valueProperty">name</Property>
      </Property>
      <Property name="required">true</Property>
    </PropertyDef>
    <PropertyDef name="name">
      <Property></Property>
      <Property name="label">名称</Property>
      <Property name="required">true</Property>
    </PropertyDef>
    <PropertyDef name="passCode">
      <Property name="dataType">int</Property>
      <Property name="label">设备编号</Property>
      <Property name="required">true</Property>
    </PropertyDef>
    <PropertyDef name="link">
      <Property></Property>
@@ -373,6 +551,7 @@
        <Property name="keyProperty">id</Property>
        <Property name="valueProperty">name</Property>
      </Property>
      <Property name="required">true</Property>
    </PropertyDef>
    <PropertyDef name="type">
      <Property></Property>
@@ -427,6 +606,22 @@
    <PropertyDef name="locationName">
      <Property></Property>
      <Property name="label">位置</Property>
    </PropertyDef>
    <PropertyDef name="ext1">
      <Property></Property>
      <Property name="label">扩展字段1</Property>
    </PropertyDef>
    <PropertyDef name="ext2">
      <Property></Property>
      <Property name="label">扩展字段2</Property>
    </PropertyDef>
    <PropertyDef name="ext3">
      <Property></Property>
      <Property name="label">扩展字段3</Property>
    </PropertyDef>
    <PropertyDef name="statusName">
      <Property></Property>
      <Property name="label">当前状态</Property>
    </PropertyDef>
  </DataType>
  <DataType name="dtDeviceSer">
@@ -676,24 +871,6 @@
      <Property name="dataType">Double</Property>
      <Property name="label">虫害上限</Property>
    </PropertyDef>
    <PropertyDef name="videoIn">
      <Property></Property>
      <Property name="label">内部视频</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;securityPR#listCamera&quot;).getResult()}</Property>
        <Property name="keyProperty">id</Property>
        <Property name="valueProperty">name</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="quantitySer">
      <Property></Property>
      <Property name="label">数量检测分机</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;deviceSerPR2#getSerCacheByType&quot;).getResult(&quot;99&quot;)}</Property>
        <Property name="keyProperty">id</Property>
        <Property name="valueProperty">name</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="thSer">
      <Property></Property>
      <Property name="label">温湿度分机</Property>
@@ -745,6 +922,14 @@
        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#triggerStartPoint&quot;).getResult()}</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="startConvert">
      <Property name="label">层行转换</Property>
      <Property name="mapping">
        <Property name="keyProperty">code</Property>
        <Property name="valueProperty">name</Property>
        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#triggerStartConvert&quot;).getResult()}</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="depotName">
      <Property></Property>
    </PropertyDef>
@@ -756,6 +941,33 @@
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#triggerCableCone&quot;).getResult()}</Property>
        <Property name="keyProperty">code</Property>
        <Property name="valueProperty">name</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="gasSer">
      <Property></Property>
      <Property name="label">气体分机</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;deviceSerPR#getAllSerCache&quot;).getResult()}</Property>
        <Property name="keyProperty">id</Property>
        <Property name="valueProperty">name</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="pestSer">
      <Property/>
      <Property name="label">气体分机</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;deviceSerPR#getAllSerCache&quot;).getResult()}</Property>
        <Property name="keyProperty">id</Property>
        <Property name="valueProperty">name</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="verbSer">
      <Property/>
      <Property name="label">通风分机</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;deviceSerPR#getAllSerCache&quot;).getResult()}</Property>
        <Property name="keyProperty">id</Property>
        <Property name="valueProperty">name</Property>
      </Property>
    </PropertyDef>
@@ -960,32 +1172,6 @@
      <Property name="label">页面中的坐标</Property>
    </PropertyDef>
  </DataType>
  <DataType name="dtFoodOrigin">
    <Property name="creationType">com.ld.igds.models.DicFoodOrigin</Property>
    <PropertyDef name="id">
      <Property name="dataType">int</Property>
    </PropertyDef>
    <PropertyDef name="code">
      <Property></Property>
      <Property name="label">产地编码</Property>
    </PropertyDef>
    <PropertyDef name="name">
      <Property></Property>
      <Property name="label">产地名称</Property>
    </PropertyDef>
    <PropertyDef name="sort">
      <Property name="dataType">int</Property>
      <Property name="label">排序</Property>
    </PropertyDef>
    <PropertyDef name="simple">
      <Property></Property>
      <Property name="label">产地简拼</Property>
    </PropertyDef>
    <PropertyDef name="disabledTag">
      <Property></Property>
      <Property name="label">是否禁用</Property>
    </PropertyDef>
  </DataType>
  <DataType name="dtSecFire">
    <Property name="creationType">com.ld.igds.models.SecFire</Property>
    <PropertyDef name="id">
@@ -1153,135 +1339,17 @@
    <PropertyDef name="type">
      <Property name="label">类型</Property>
    </PropertyDef>
  </DataType>
  <DataType name="dtDepotStore">
    <Property name="creationType">com.ld.igds.models.DepotStore</Property>
    <PropertyDef name="id">
    <PropertyDef name="simple">
      <Property></Property>
      <Property name="label">简拼</Property>
    </PropertyDef>
    <PropertyDef name="companyId">
    <PropertyDef name="disabledTag">
      <Property></Property>
      <Property name="label">组织编码</Property>
    </PropertyDef>
    <PropertyDef name="deptId">
      <Property></Property>
      <Property name="label">所属分库</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="storeType">
      <Property></Property>
      <Property name="label">储粮方式</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#triggerStoreType&quot;).getResult()}</Property>
        <Property name="keyProperty">code</Property>
        <Property name="valueProperty">name</Property>
      </Property>
      <Property name="required">true</Property>
    </PropertyDef>
    <PropertyDef name="depotStatus">
      <Property></Property>
      <Property name="label">仓库状态</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;DEPOT_STATUS&quot;)}</Property>
        <Property name="keyProperty">code</Property>
        <Property name="valueProperty">name</Property>
      </Property>
      <Property name="required">true</Property>
    </PropertyDef>
    <PropertyDef name="foodType">
      <Property></Property>
      <Property name="label">粮食性质</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_TYPE_&quot;)}</Property>
        <Property name="keyProperty">code</Property>
        <Property name="valueProperty">name</Property>
      </Property>
      <Property name="required">true</Property>
    </PropertyDef>
    <PropertyDef name="foodVariety">
      <Property></Property>
      <Property name="label">粮食品种</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_VARIETY_&quot;)}</Property>
        <Property name="keyProperty">code</Property>
        <Property name="valueProperty">name</Property>
      </Property>
      <Property name="required">true</Property>
    </PropertyDef>
    <PropertyDef name="foodLevel">
      <Property></Property>
      <Property name="label">粮食等级</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_LEVEL_&quot;)}</Property>
        <Property name="keyProperty">code</Property>
        <Property name="valueProperty">name</Property>
      </Property>
      <Property name="required">true</Property>
    </PropertyDef>
    <PropertyDef name="foodLocation">
      <Property></Property>
      <Property name="label">粮食产地</Property>
      <Property name="required">true</Property>
    </PropertyDef>
    <PropertyDef name="foodYear">
      <Property></Property>
      <Property name="label">收货年度</Property>
      <Property name="required">true</Property>
    </PropertyDef>
    <PropertyDef name="storeDate">
      <Property name="dataType">DateTime</Property>
      <Property name="label">入仓时间</Property>
    </PropertyDef>
    <PropertyDef name="storageReal">
      <Property name="dataType">Double</Property>
      <Property name="label">实际储量</Property>
      <Property name="displayFormat">#,##0 KG</Property>
      <Property name="required">true</Property>
    </PropertyDef>
    <PropertyDef name="fullDate">
      <Property name="dataType">Date</Property>
      <Property name="label">封仓日期</Property>
    </PropertyDef>
    <PropertyDef name="outDate">
      <Property name="label">出仓时间</Property>
      <Property name="dataType">DateTime</Property>
    </PropertyDef>
    <PropertyDef name="grainHeight">
      <Property name="dataType">Double</Property>
      <Property name="label">装粮线高</Property>
      <Property name="displayFormat">0.00 米</Property>
      <Property name="required">true</Property>
    </PropertyDef>
    <PropertyDef name="grainVolume">
      <Property name="dataType">Double</Property>
      <Property name="label">装粮体积</Property>
      <Property name="displayFormat">0.00 立方米</Property>
      <Property name="required">true</Property>
      <Property name="label">是否禁用</Property>
    </PropertyDef>
    <PropertyDef name="remark">
      <Property></Property>
      <Property name="label">备注</Property>
    </PropertyDef>
    <PropertyDef name="updateUser">
      <Property></Property>
      <Property name="label">修改人</Property>
    </PropertyDef>
    <PropertyDef name="updateDate">
      <Property name="dataType">Date</Property>
      <Property name="label">修改时间</Property>
    </PropertyDef>
    <PropertyDef name="createDate">
      <Property name="dataType">Date</Property>
      <Property name="label">创建时间</Property>
      <Property name="label">备注信息</Property>
    </PropertyDef>
  </DataType>
  <DataType name="dtFileData">