问题修改

YYC

2023-08-17 f23f7a18fe8fe3729dfb91af5b55b515b835c7d8

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

@@ -154,10 +154,6 @@
        <Property name="valueProperty">name</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="gbm">
      <Property/>
      <Property name="label">廒间国别码</Property>
    </PropertyDef>
  </DataType>
  <DataType name="dtDepot">
    <Property name="creationType">com.ld.igds.models.Depot</Property>
@@ -317,6 +313,10 @@
      <Property></Property>
      <Property name="label">备注</Property>
    </PropertyDef>
    <PropertyDef name="ggm">
      <Property/>
      <Property name="label">国规码</Property>
    </PropertyDef>
  </DataType>
  <DataType name="dtDepotStore">
    <Property name="creationType">com.ld.igds.models.DepotStore</Property>
@@ -344,6 +344,42 @@
    <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>
@@ -567,6 +603,26 @@
      <Property></Property>
      <Property name="label">位置</Property>
    </PropertyDef>
    <PropertyDef name="modbus">
      <Property></Property>
      <Property name="label">Modbus配置</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">
    <Property name="creationType">com.ld.igds.models.DeviceSer</Property>