liuling 1 ヶ月 前
コミット
b56d64172d
21 ファイル変更647 行追加21 行削除
  1. 8 3
      metadata/com/kingdee/eas/custom/dormitorysystem/otherbasicdata/DormitoryType.bizunit
  2. 26 0
      metadata/com/kingdee/eas/custom/dormitorysystem/otherbasicdata/app/CT_OTH_DormitoryType.table
  3. 93 0
      metadata/com/kingdee/eas/custom/dormitorysystem/otherbasicdata/app/DormitoryType.entity
  4. 47 0
      metadata/com/kingdee/eas/custom/dormitorysystem/otherbasicdata/app/DormitoryTypeQuery.query
  5. 153 0
      metadata/com/kingdee/eas/custom/dormitorysystem/otherbasicdata/client/DormitoryTypeEditUI.ui
  6. 11 0
      metadata/com/kingdee/eas/custom/dormitorysystem/otherbasicdata/client/DormitoryTypeListUI.ui
  7. 56 9
      src/com/kingdee/eas/custom/dormitorysystem/dormitory/app/DormitoryControllerBean.java
  8. 50 2
      src/com/kingdee/eas/custom/dormitorysystem/occupants/app/OccupantsControllerBean.java
  9. 13 0
      src/com/kingdee/eas/custom/dormitorysystem/otherbasicdata/AbstractDormitoryTypeInfo.java
  10. 49 0
      src/com/kingdee/eas/custom/dormitorysystem/otherbasicdata/app/DormitoryTypeControllerBean.java
  11. 50 0
      src/com/kingdee/eas/custom/dormitorysystem/otherbasicdata/app/PersonDormitoryTypeControllerBean.java
  12. 53 0
      src/com/kingdee/eas/custom/dormitorysystem/otherbasicdata/app/RoomTypeControllerBean.java
  13. 26 3
      src/com/kingdee/eas/custom/dormitorysystem/otherbasicdata/client/AbstractDormitoryTypeEditUI.java
  14. 3 1
      src/com/kingdee/eas/custom/dormitorysystem/otherbasicdata/client/AbstractDormitoryTypeEditUI.properties
  15. 3 1
      src/com/kingdee/eas/custom/dormitorysystem/otherbasicdata/client/AbstractDormitoryTypeEditUI_l1.properties
  16. 3 1
      src/com/kingdee/eas/custom/dormitorysystem/otherbasicdata/client/AbstractDormitoryTypeEditUI_l2.properties
  17. 3 1
      src/com/kingdee/eas/custom/dormitorysystem/otherbasicdata/client/AbstractDormitoryTypeEditUI_l3.properties
  18. 0 0
      src/com/kingdee/eas/custom/dormitorysystem/otherbasicdata/client/AbstractDormitoryTypeListUI.java
  19. 0 0
      src/com/kingdee/eas/custom/dormitorysystem/otherbasicdata/client/AbstractDormitoryTypeListUI.properties
  20. 0 0
      src/com/kingdee/eas/custom/dormitorysystem/otherbasicdata/client/AbstractDormitoryTypeListUI_l2.properties
  21. 0 0
      src/com/kingdee/eas/custom/dormitorysystem/otherbasicdata/client/AbstractDormitoryTypeListUI_l3.properties

+ 8 - 3
metadata/com/kingdee/eas/custom/dormitorysystem/otherbasicdata/DormitoryType.bizunit

@@ -85,6 +85,11 @@
             <lang locale="zh_CN" value="com.kingdee.eas.custom.dormitorysystem.otherbasicdata.client.DormitoryTypeEditUI" />
             <lang locale="zh_TW" value="com.kingdee.eas.custom.dormitorysystem.otherbasicdata.client.DormitoryTypeEditUI" />
         </rs>
+        <rs key="bizUnit[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.DormitoryType].extendedProperty.enableFieldPermission">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
         <rs key="bizUnit[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.DormitoryType].extendedProperty.isAsstAcctType">
             <lang locale="en_US" value="false" />
             <lang locale="zh_CN" value="false" />
@@ -106,9 +111,9 @@
             <lang locale="zh_TW" value="com.kingdee.eas.custom.dormitorysystem.otherbasicdata.client.DormitoryTypeListUI" />
         </rs>
         <rs key="bizUnit[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.DormitoryType].extendedProperty.maxFieldIndex">
-            <lang locale="en_US" value="1" />
-            <lang locale="zh_CN" value="1" />
-            <lang locale="zh_TW" value="1" />
+            <lang locale="en_US" value="2" />
+            <lang locale="zh_CN" value="2" />
+            <lang locale="zh_TW" value="2" />
         </rs>
         <rs key="bizUnit[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.DormitoryType].extendedProperty.userDefined">
             <lang locale="en_US" value="true" />

+ 26 - 0
metadata/com/kingdee/eas/custom/dormitorysystem/otherbasicdata/app/CT_OTH_DormitoryType.table

@@ -175,6 +175,20 @@
             <scale>0</scale>
             <precision>0</precision>
         </column>
+        <column>
+            <name>CFGender</name>
+            <alias>dataTable[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.app.CT_OTH_DormitoryType].columns.column[CFGender].alias</alias>
+            <description>dataTable[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.app.CT_OTH_DormitoryType].columns.column[CFGender].description</description>
+            <userDefined>true</userDefined>
+            <isMultilingual>false</isMultilingual>
+            <isEncoded>false</isEncoded>
+            <isNullable>true</isNullable>
+            <defaultValue />
+            <sqlType>INT</sqlType>
+            <length>0</length>
+            <scale>0</scale>
+            <precision>0</precision>
+        </column>
     </columns>
     <primaryKey>
         <name>CPK_OTH_DrmtrTI9n3</name>
@@ -255,6 +269,18 @@
             <lang locale="zh_HK" value="宿舍類型" />
             <lang locale="zh_TW" value="宿舍類型" />
         </rs>
+        <rs key="dataTable[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.app.CT_OTH_DormitoryType].columns.column[CFGender].alias">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="性别" />
+            <lang locale="zh_HK" value="性別" />
+            <lang locale="zh_TW" value="性別" />
+        </rs>
+        <rs key="dataTable[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.app.CT_OTH_DormitoryType].columns.column[CFGender].description">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="性别" />
+            <lang locale="zh_HK" value="性別" />
+            <lang locale="zh_TW" value="性別" />
+        </rs>
         <rs key="dataTable[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.app.CT_OTH_DormitoryType].columns.column[CFState].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="状态" />

+ 93 - 0
metadata/com/kingdee/eas/custom/dormitorysystem/otherbasicdata/app/DormitoryType.entity

@@ -212,6 +212,26 @@
                 <key name="name" value="CFState" />
             </mappingField>
         </ownProperty>
+        <ownProperty>
+            <name>gender</name>
+            <alias>entityObject[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.app.DormitoryType].properties.ownProperty[gender].alias</alias>
+            <description>entityObject[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.app.DormitoryType].properties.ownProperty[gender].description</description>
+            <userDefined>true</userDefined>
+            <configured>false</configured>
+            <dataType>Enum</dataType>
+            <metadataRef>com.kingdee.eas.basedata.person.Genders</metadataRef>
+            <isMultilingual>false</isMultilingual>
+            <isNullable>false</isNullable>
+            <formula />
+            <length>80</length>
+            <precision>0</precision>
+            <decimalDigits>0</decimalDigits>
+            <defaultValue>entityObject[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.app.DormitoryType].properties.ownProperty[gender].defaultValue</defaultValue>
+            <displayFormat />
+            <mappingField>
+                <key name="name" value="CFGender" />
+            </mappingField>
+        </ownProperty>
     </properties>
     <logicalKey>
         <name>id</name>
@@ -415,6 +435,79 @@
             <lang locale="zh_CN" value="true" />
             <lang locale="zh_TW" value="true" />
         </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.app.DormitoryType].properties.ownProperty[gender].alias">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="性别" />
+            <lang locale="zh_HK" value="性別" />
+            <lang locale="zh_TW" value="性別" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.app.DormitoryType].properties.ownProperty[gender].defaultValue">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="Male" />
+            <lang locale="zh_HK" value="Male" />
+            <lang locale="zh_TW" value="Male" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.app.DormitoryType].properties.ownProperty[gender].description">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="性别" />
+            <lang locale="zh_HK" value="性別" />
+            <lang locale="zh_TW" value="性別" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.app.DormitoryType].properties.ownProperty[gender].extendedProperty.ColWidthInKDTable">
+            <lang locale="en_US" value="50" />
+            <lang locale="zh_CN" value="50" />
+            <lang locale="zh_TW" value="50" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.app.DormitoryType].properties.ownProperty[gender].extendedProperty.bizDataType">
+            <lang locale="en_US" value="ENUM" />
+            <lang locale="zh_CN" value="ENUM" />
+            <lang locale="zh_TW" value="ENUM" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.app.DormitoryType].properties.ownProperty[gender].extendedProperty.defaultValue">
+            <lang locale="en_US" value="Male" />
+            <lang locale="zh_CN" value="Male" />
+            <lang locale="zh_TW" value="Male" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.app.DormitoryType].properties.ownProperty[gender].extendedProperty.enableFieldPermission">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.app.DormitoryType].properties.ownProperty[gender].extendedProperty.isAsstAcctType">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.app.DormitoryType].properties.ownProperty[gender].extendedProperty.isForGrouping">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.app.DormitoryType].properties.ownProperty[gender].extendedProperty.isForMapping">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.app.DormitoryType].properties.ownProperty[gender].extendedProperty.isForMatching">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.app.DormitoryType].properties.ownProperty[gender].extendedProperty.isForWrittenBack">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.app.DormitoryType].properties.ownProperty[gender].extendedProperty.isInCode">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.app.DormitoryType].properties.ownProperty[gender].extendedProperty.isVisibleForKDTable">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_TW" value="true" />
+        </rs>
         <rs key="entityObject[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.app.DormitoryType].properties.ownProperty[state].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="状态" />

+ 47 - 0
metadata/com/kingdee/eas/custom/dormitorysystem/otherbasicdata/app/DormitoryTypeQuery.query

@@ -590,6 +590,37 @@
                 <key name="name" value="DormitoryTypeQuery" />
             </query>
         </queryField>
+        <queryField>
+            <name>gender</name>
+            <userDefined>true</userDefined>
+            <formulaString>#0</formulaString>
+            <constString />
+            <displayName>joinQuery[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.app.DormitoryTypeQuery].units.queryField[gender].displayName</displayName>
+            <groupType />
+            <isSelector>true</isSelector>
+            <isFilter>true</isFilter>
+            <isSorter>true</isSorter>
+            <isParameter>false</isParameter>
+            <returnType>Int</returnType>
+            <propertyRefs>
+                <propertyRef>
+                    <key>0acbf8d2-ab20-49ec-85a1-075373f82a19</key>
+                    <parentUnit>
+                        <key name="name" value="gender" />
+                    </parentUnit>
+                    <subEntity>
+                        <key name="name" value="DormitoryType" />
+                    </subEntity>
+                    <refProperty>
+                        <key name="name" value="gender" />
+                    </refProperty>
+                </propertyRef>
+            </propertyRefs>
+            <query>
+                <key name="package" value="com.kingdee.eas.custom.dormitorysystem.otherbasicdata.app" />
+                <key name="name" value="DormitoryTypeQuery" />
+            </query>
+        </queryField>
     </units>
     <defaultFilter>
         <name>defaultFilter</name>
@@ -915,6 +946,22 @@
             <lang locale="zh_CN" value="true" />
             <lang locale="zh_TW" value="true" />
         </rs>
+        <rs key="joinQuery[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.app.DormitoryTypeQuery].units.queryField[gender].displayName">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="性别" />
+            <lang locale="zh_HK" value="性別" />
+            <lang locale="zh_TW" value="性別" />
+        </rs>
+        <rs key="joinQuery[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.app.DormitoryTypeQuery].units.queryField[gender].extendedProperty.isCommonQueryFilter">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_TW" value="true" />
+        </rs>
+        <rs key="joinQuery[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.app.DormitoryTypeQuery].units.queryField[gender].extendedProperty.isCommonQuerySorter">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_TW" value="true" />
+        </rs>
         <rs key="joinQuery[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.app.DormitoryTypeQuery].units.queryField[id].displayName">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="null" />

+ 153 - 0
metadata/com/kingdee/eas/custom/dormitorysystem/otherbasicdata/client/DormitoryTypeEditUI.ui

@@ -262,6 +262,55 @@
                 <key name="name" value="CoreUI" />
             </parent>
         </component>
+        <component>
+            <name>contgender</name>
+            <alias>uiObject[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.client.DormitoryTypeEditUI].components.component[contgender].alias</alias>
+            <userDefined>true</userDefined>
+            <classType>com.kingdee.bos.ctrl.swing.KDLabelContainer</classType>
+            <isContainer>true</isContainer>
+            <constraints>0,0,270,19</constraints>
+            <tabIndex>0</tabIndex>
+            <herited>false</herited>
+            <bimUIObjectPK />
+            <layoutInfo>
+                <name />
+                <type>LabelContainerLayout</type>
+                <value />
+            </layoutInfo>
+            <properties>
+                <property>
+                    <name>boundLabelText</name>
+                    <type>java.lang.String</type>
+                    <value>uiObject[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.client.DormitoryTypeEditUI].components.component[contgender].properties.property[boundLabelText].value</value>
+                    <isMultiLan>true</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+                <property>
+                    <name>boundLabelLength</name>
+                    <type>int</type>
+                    <value>uiObject[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.client.DormitoryTypeEditUI].components.component[contgender].properties.property[boundLabelLength].value</value>
+                    <isMultiLan>false</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+                <property>
+                    <name>boundLabelUnderline</name>
+                    <type>boolean</type>
+                    <value>uiObject[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.client.DormitoryTypeEditUI].components.component[contgender].properties.property[boundLabelUnderline].value</value>
+                    <isMultiLan>false</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+                <property>
+                    <name>visible</name>
+                    <type>boolean</type>
+                    <value>uiObject[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.client.DormitoryTypeEditUI].components.component[contgender].properties.property[visible].value</value>
+                    <isMultiLan>false</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+            </properties>
+            <parent>
+                <key name="name" value="CoreUI" />
+            </parent>
+        </component>
         <component>
             <name>txtNumber</name>
             <alias>uiObject[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.client.DormitoryTypeEditUI].components.component[txtNumber].alias</alias>
@@ -458,6 +507,56 @@
                 </propertyBinding>
             </propertyBindings>
         </component>
+        <component>
+            <name>gender</name>
+            <alias>uiObject[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.client.DormitoryTypeEditUI].components.component[gender].alias</alias>
+            <userDefined>true</userDefined>
+            <classType>com.kingdee.bos.ctrl.swing.KDComboBox</classType>
+            <isContainer>false</isContainer>
+            <constraints>7</constraints>
+            <tabIndex>12</tabIndex>
+            <herited>false</herited>
+            <bimUIObjectPK />
+            <properties>
+                <property>
+                    <name>visible</name>
+                    <type>boolean</type>
+                    <value>uiObject[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.client.DormitoryTypeEditUI].components.component[gender].properties.property[visible].value</value>
+                    <isMultiLan>false</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+                <property>
+                    <name>items</name>
+                    <type>java.lang.String</type>
+                    <value>uiObject[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.client.DormitoryTypeEditUI].components.component[gender].properties.property[items].value</value>
+                    <isMultiLan>true</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+                <property>
+                    <name>required</name>
+                    <type>boolean</type>
+                    <value>uiObject[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.client.DormitoryTypeEditUI].components.component[gender].properties.property[required].value</value>
+                    <isMultiLan>false</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+            </properties>
+            <parent>
+                <key name="name" value="contgender" />
+            </parent>
+            <propertyBindings>
+                <propertyBinding>
+                    <propertyName>selectedItem</propertyName>
+                    <propertyType>java.lang.Object</propertyType>
+                    <bindingObject>editData</bindingObject>
+                    <bindingField>gender</bindingField>
+                    <fieldType>com.kingdee.eas.basedata.person.Genders</fieldType>
+                    <accessType>2</accessType>
+                    <autoMode>false</autoMode>
+                    <herited>false</herited>
+                    <userDefined>true</userDefined>
+                </propertyBinding>
+            </propertyBindings>
+        </component>
         <component>
             <name>btnPrint</name>
             <alias>uiObject[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.client.DormitoryTypeEditUI].components.component[btnPrint].alias</alias>
@@ -704,6 +803,36 @@
             <lang locale="zh_HK" value="false" />
             <lang locale="zh_TW" value="false" />
         </rs>
+        <rs key="uiObject[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.client.DormitoryTypeEditUI].components.component[contgender].alias">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="null" />
+            <lang locale="zh_HK" value="null" />
+            <lang locale="zh_TW" value="null" />
+        </rs>
+        <rs key="uiObject[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.client.DormitoryTypeEditUI].components.component[contgender].properties.property[boundLabelLength].value">
+            <lang locale="en_US" value="100" />
+            <lang locale="zh_CN" value="100" />
+            <lang locale="zh_HK" value="100" />
+            <lang locale="zh_TW" value="100" />
+        </rs>
+        <rs key="uiObject[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.client.DormitoryTypeEditUI].components.component[contgender].properties.property[boundLabelText].value">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="性别" />
+            <lang locale="zh_HK" value="性別" />
+            <lang locale="zh_TW" value="性別" />
+        </rs>
+        <rs key="uiObject[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.client.DormitoryTypeEditUI].components.component[contgender].properties.property[boundLabelUnderline].value">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_HK" value="true" />
+            <lang locale="zh_TW" value="true" />
+        </rs>
+        <rs key="uiObject[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.client.DormitoryTypeEditUI].components.component[contgender].properties.property[visible].value">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_HK" value="true" />
+            <lang locale="zh_TW" value="true" />
+        </rs>
         <rs key="uiObject[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.client.DormitoryTypeEditUI].components.component[contstate].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="null" />
@@ -734,6 +863,30 @@
             <lang locale="zh_HK" value="true" />
             <lang locale="zh_TW" value="true" />
         </rs>
+        <rs key="uiObject[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.client.DormitoryTypeEditUI].components.component[gender].alias">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="性别" />
+            <lang locale="zh_HK" value="性別" />
+            <lang locale="zh_TW" value="性別" />
+        </rs>
+        <rs key="uiObject[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.client.DormitoryTypeEditUI].components.component[gender].properties.property[items].value">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="[Enum]com.kingdee.eas.basedata.person.Genders" />
+            <lang locale="zh_HK" value="[Enum]com.kingdee.eas.basedata.person.Genders" />
+            <lang locale="zh_TW" value="[Enum]com.kingdee.eas.basedata.person.Genders" />
+        </rs>
+        <rs key="uiObject[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.client.DormitoryTypeEditUI].components.component[gender].properties.property[required].value">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_HK" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="uiObject[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.client.DormitoryTypeEditUI].components.component[gender].properties.property[visible].value">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_HK" value="true" />
+            <lang locale="zh_TW" value="true" />
+        </rs>
         <rs key="uiObject[com.kingdee.eas.custom.dormitorysystem.otherbasicdata.client.DormitoryTypeEditUI].components.component[kDLabelContainer1].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="null" />

ファイルの差分が大きいため隠しています
+ 11 - 0
metadata/com/kingdee/eas/custom/dormitorysystem/otherbasicdata/client/DormitoryTypeListUI.ui


+ 56 - 9
src/com/kingdee/eas/custom/dormitorysystem/dormitory/app/DormitoryControllerBean.java

@@ -1,5 +1,11 @@
 package com.kingdee.eas.custom.dormitorysystem.dormitory.app;
 
+import com.kingdee.bos.metadata.entity.*;
+import com.kingdee.bos.metadata.query.util.CompareType;
+import com.kingdee.eas.basedata.org.OrgException;
+import com.kingdee.eas.basedata.org.OrgTreeInfo;
+import com.kingdee.eas.framework.*;
+import com.kingdee.eas.framework.util.FilterUtility;
 import com.kingdee.shr.base.syssetting.BasicItemStateEnum;
 import org.apache.log4j.Logger;
 import javax.ejb.*;
@@ -19,18 +25,17 @@ import com.kingdee.bos.service.ServiceContext;
 import com.kingdee.bos.service.IServiceContext;
 
 import com.kingdee.bos.dao.IObjectPK;
-import com.kingdee.eas.framework.ObjectBaseCollection;
+
 import java.lang.String;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+
 import com.kingdee.eas.custom.dormitorysystem.dormitory.DormitoryCollection;
 import com.kingdee.eas.custom.dormitorysystem.dormitory.DormitoryInfo;
 import com.kingdee.eas.framework.app.TreeBaseControllerBean;
-import com.kingdee.bos.metadata.entity.EntityViewInfo;
-import com.kingdee.eas.framework.TreeBaseCollection;
-import com.kingdee.eas.framework.CoreBaseCollection;
-import com.kingdee.eas.framework.CoreBaseInfo;
-import com.kingdee.eas.framework.DataBaseCollection;
 import com.kingdee.eas.common.EASBizException;
-import com.kingdee.bos.metadata.entity.SelectorItemCollection;
 
 public class DormitoryControllerBean extends AbstractDormitoryControllerBean
 {
@@ -38,11 +43,13 @@ public class DormitoryControllerBean extends AbstractDormitoryControllerBean
         Logger.getLogger("com.kingdee.eas.custom.dormitorysystem.dormitory.app.DormitoryControllerBean");
 
     @Override
-    protected void _save(Context ctx, IObjectPK pk, IObjectValue model) throws BOSException, EASBizException {
+    protected IObjectPK _save(Context ctx, IObjectValue model) throws BOSException, EASBizException {
         DormitoryInfo dormitoryInfo = (DormitoryInfo)model;
         dormitoryInfo.setState(BasicItemStateEnum.getEnum(1));
         dormitoryInfo.setIsSealUp(false);
-        super._save(ctx, pk, dormitoryInfo);
+        this._checkNumberDup(ctx,dormitoryInfo);
+        IObjectPK iObjectPK = super._save(ctx, dormitoryInfo);
+        return iObjectPK;
     }
 
     @Override
@@ -51,8 +58,48 @@ public class DormitoryControllerBean extends AbstractDormitoryControllerBean
             DormitoryInfo dormitoryInfo = (DormitoryInfo)(colls.getObject(i));
             dormitoryInfo.setState(BasicItemStateEnum.getEnum(1));
             dormitoryInfo.setIsSealUp(false);
+            this._checkNumberDup(ctx,dormitoryInfo);
         }
         return super._saveBatchData(ctx, colls);
     }
 
+    public void _checkNumberDup(Context ctx, IObjectValue model) throws BOSException, EASBizException {
+        DormitoryInfo dormitoryInfo = (DormitoryInfo)model;
+        if (dormitoryInfo.getId() == null) {
+            FilterInfo filterInfo = new FilterInfo();
+//            filterInfo.getFilterItems().add(new FilterItemInfo("type", new Integer(treeInfo.getType().getValue())));
+            filterInfo.getFilterItems().add(new FilterItemInfo("number", dormitoryInfo.getNumber()));
+            if (this._exists(ctx, filterInfo)) {
+                throw new OrgException(OrgException.NUMBER_CAN_NOT_DUP);
+            }
+        } else {
+            this.checkNumberDupOnUpdate(ctx, dormitoryInfo);
+        }
+
+    }
+
+    private void checkNumberDupOnUpdate(Context ctx, DormitoryInfo dormitoryInfo) throws BOSException, EASBizException {
+        StringBuffer sql = (new StringBuffer()).append("select fid from CT_DOR_Dormitory where fnumber = '").append(dormitoryInfo.getNumber()).append("'");
+        Connection conn = null;
+        Statement stmt = null;
+        ResultSet rs = null;
+
+        try {
+            conn = this.getConnection(ctx);
+            stmt = conn.createStatement();
+            rs = stmt.executeQuery(sql.toString());
+            if (rs.next()) {
+                do {
+                    String fid = rs.getString(1);
+                    if (fid.equals(dormitoryInfo.getId().toString())) {
+                        return;
+                    }
+                } while(rs.next());
+
+                throw new OrgException(OrgException.NUMBER_CAN_NOT_DUP);
+            }
+        } catch (SQLException var8) {
+            throw new BOSException(var8);
+        }
+    }
 }

+ 50 - 2
src/com/kingdee/eas/custom/dormitorysystem/occupants/app/OccupantsControllerBean.java

@@ -1,5 +1,8 @@
 package com.kingdee.eas.custom.dormitorysystem.occupants.app;
 
+import com.kingdee.bos.metadata.entity.FilterInfo;
+import com.kingdee.bos.metadata.entity.FilterItemInfo;
+import com.kingdee.eas.basedata.org.OrgException;
 import com.kingdee.eas.custom.dormitorysystem.dormitory.DormitoryInfo;
 import com.kingdee.shr.base.syssetting.BasicItemStateEnum;
 import org.apache.log4j.Logger;
@@ -26,6 +29,10 @@ import com.kingdee.bos.dao.IObjectPK;
 import com.kingdee.eas.custom.dormitorysystem.occupants.OccupantsInfo;
 import com.kingdee.bos.metadata.entity.EntityViewInfo;
 import java.lang.String;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -42,7 +49,7 @@ public class OccupantsControllerBean extends AbstractOccupantsControllerBean
         Logger.getLogger("com.kingdee.eas.custom.dormitorysystem.occupants.app.OccupantsControllerBean");
 
     @Override
-    protected void _save(Context ctx, IObjectPK pk, IObjectValue model) throws BOSException, EASBizException {
+    protected IObjectPK _save(Context ctx,  IObjectValue model) throws BOSException, EASBizException {
         OccupantsInfo occupantsInfo = (OccupantsInfo)model;
         occupantsInfo.setState(BasicItemStateEnum.getEnum(1));
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
@@ -53,15 +60,56 @@ public class OccupantsControllerBean extends AbstractOccupantsControllerBean
             throw new RuntimeException(e);
         }
         occupantsInfo.setCheckOutDate(parse);
-        super._save(ctx, pk, occupantsInfo);
+        this._checkNumberDup(ctx,occupantsInfo);
+        return super._save(ctx, occupantsInfo);
     }
 
+    public void _checkNumberDup(Context ctx, IObjectValue model) throws BOSException, EASBizException {
+        OccupantsInfo occupantsInfo = (OccupantsInfo)model;
+        if (occupantsInfo.getId() == null) {
+            FilterInfo filterInfo = new FilterInfo();
+//            filterInfo.getFilterItems().add(new FilterItemInfo("type", new Integer(treeInfo.getType().getValue())));
+            filterInfo.getFilterItems().add(new FilterItemInfo("number", occupantsInfo.getNumber()));
+            if (this._exists(ctx, filterInfo)) {
+                throw new OrgException(OrgException.NUMBER_CAN_NOT_DUP);
+            }
+        } else {
+            this.checkNumberDupOnUpdate(ctx, occupantsInfo);
+        }
+
+    }
+
+    private void checkNumberDupOnUpdate(Context ctx, OccupantsInfo occupantsInfo) throws BOSException, EASBizException {
+        StringBuffer sql = (new StringBuffer()).append("select fid from CT_OCC_Occupants where fnumber = '").append(occupantsInfo.getNumber()).append("'");
+        Connection conn = null;
+        Statement stmt = null;
+        ResultSet rs = null;
+
+        try {
+            conn = this.getConnection(ctx);
+            stmt = conn.createStatement();
+            rs = stmt.executeQuery(sql.toString());
+            if (rs.next()) {
+                do {
+                    String fid = rs.getString(1);
+                    if (fid.equals(occupantsInfo.getId().toString())) {
+                        return;
+                    }
+                } while(rs.next());
+
+                throw new OrgException(OrgException.NUMBER_CAN_NOT_DUP);
+            }
+        } catch (SQLException var8) {
+            throw new BOSException(var8);
+        }
+    }
     @Override
     protected IObjectPK[] _saveBatchData(Context ctx, IObjectCollection colls) throws BOSException, EASBizException {
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
         Date parse = null;
         for (int i = 0; i < colls.size(); i++) {
             OccupantsInfo occupantsInfo = (OccupantsInfo)(colls.getObject(i));
+            this._checkNumberDup(ctx,occupantsInfo);
             try {
                 parse = dateFormat.parse("2199-12-31");
             } catch (ParseException e) {

+ 13 - 0
src/com/kingdee/eas/custom/dormitorysystem/otherbasicdata/AbstractDormitoryTypeInfo.java

@@ -41,6 +41,19 @@ public class AbstractDormitoryTypeInfo extends com.kingdee.eas.framework.DataBas
         setInt("state", item.getValue());
 		}
     }
+    /**
+     * Object:ËÞÉáÀàÐÍ's ÐÔ±ðproperty 
+     */
+    public com.kingdee.eas.basedata.person.Genders getGender()
+    {
+        return com.kingdee.eas.basedata.person.Genders.getEnum(getInt("gender"));
+    }
+    public void setGender(com.kingdee.eas.basedata.person.Genders item)
+    {
+		if (item != null) {
+        setInt("gender", item.getValue());
+		}
+    }
     public BOSObjectType getBOSType()
     {
         return new BOSObjectType("1D9EDF3E");

+ 49 - 0
src/com/kingdee/eas/custom/dormitorysystem/otherbasicdata/app/DormitoryTypeControllerBean.java

@@ -1,5 +1,8 @@
 package com.kingdee.eas.custom.dormitorysystem.otherbasicdata.app;
 
+import com.kingdee.bos.metadata.entity.FilterInfo;
+import com.kingdee.bos.metadata.entity.FilterItemInfo;
+import com.kingdee.eas.basedata.org.OrgException;
 import com.kingdee.eas.custom.dormitorysystem.occupants.OccupantsInfo;
 import com.kingdee.shr.base.syssetting.BasicItemStateEnum;
 import org.apache.log4j.Logger;
@@ -26,6 +29,11 @@ import com.kingdee.bos.dao.IObjectPK;
 import com.kingdee.bos.metadata.entity.EntityViewInfo;
 import com.kingdee.eas.custom.dormitorysystem.otherbasicdata.DormitoryTypeCollection;
 import java.lang.String;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+
 import com.kingdee.eas.framework.CoreBaseInfo;
 import com.kingdee.eas.framework.CoreBaseCollection;
 import com.kingdee.eas.framework.DataBaseCollection;
@@ -41,6 +49,7 @@ public class DormitoryTypeControllerBean extends AbstractDormitoryTypeController
     protected IObjectPK _save(Context ctx, IObjectValue model) throws BOSException, EASBizException {
         DormitoryTypeInfo  dormitoryTypeInfo = (DormitoryTypeInfo)model;
         dormitoryTypeInfo.setState(BasicItemStateEnum.getEnum(1));
+        this._checkNumberDup(ctx,dormitoryTypeInfo);
         return super._save(ctx, dormitoryTypeInfo);
     }
 
@@ -49,7 +58,47 @@ public class DormitoryTypeControllerBean extends AbstractDormitoryTypeController
         for (int i = 0; i < colls.size(); i++) {
             DormitoryTypeInfo dormitoryTypeInfo = (DormitoryTypeInfo)(colls.getObject(i));
             dormitoryTypeInfo.setState(BasicItemStateEnum.getEnum(1));
+            this._checkNumberDup(ctx,dormitoryTypeInfo);
         }
         return super._saveBatchData(ctx, colls);
     }
+    public void _checkNumberDup(Context ctx, IObjectValue model) throws BOSException, EASBizException {
+        DormitoryTypeInfo dormitoryTypeInfo = (DormitoryTypeInfo)model;
+        if (dormitoryTypeInfo.getId() == null) {
+            FilterInfo filterInfo = new FilterInfo();
+//            filterInfo.getFilterItems().add(new FilterItemInfo("type", new Integer(treeInfo.getType().getValue())));
+            filterInfo.getFilterItems().add(new FilterItemInfo("number", dormitoryTypeInfo.getNumber()));
+            if (this._exists(ctx, filterInfo)) {
+                throw new OrgException(OrgException.NUMBER_CAN_NOT_DUP);
+            }
+        } else {
+            this.checkNumberDupOnUpdate(ctx, dormitoryTypeInfo);
+        }
+
+    }
+
+    private void checkNumberDupOnUpdate(Context ctx, DormitoryTypeInfo dormitoryTypeInfo) throws BOSException, EASBizException {
+        StringBuffer sql = (new StringBuffer()).append("select fid from CT_OTH_DormitoryType where fnumber = '").append(dormitoryTypeInfo.getNumber()).append("'");
+        Connection conn = null;
+        Statement stmt = null;
+        ResultSet rs = null;
+
+        try {
+            conn = this.getConnection(ctx);
+            stmt = conn.createStatement();
+            rs = stmt.executeQuery(sql.toString());
+            if (rs.next()) {
+                do {
+                    String fid = rs.getString(1);
+                    if (fid.equals(dormitoryTypeInfo.getId().toString())) {
+                        return;
+                    }
+                } while(rs.next());
+
+                throw new OrgException(OrgException.NUMBER_CAN_NOT_DUP);
+            }
+        } catch (SQLException var8) {
+            throw new BOSException(var8);
+        }
+    }
 }

+ 50 - 0
src/com/kingdee/eas/custom/dormitorysystem/otherbasicdata/app/PersonDormitoryTypeControllerBean.java

@@ -1,5 +1,8 @@
 package com.kingdee.eas.custom.dormitorysystem.otherbasicdata.app;
 
+import com.kingdee.bos.metadata.entity.FilterInfo;
+import com.kingdee.bos.metadata.entity.FilterItemInfo;
+import com.kingdee.eas.basedata.org.OrgException;
 import com.kingdee.eas.custom.dormitorysystem.otherbasicdata.DormitoryTypeInfo;
 import com.kingdee.shr.base.syssetting.BasicItemStateEnum;
 import org.apache.log4j.Logger;
@@ -25,6 +28,11 @@ import com.kingdee.eas.framework.ObjectBaseCollection;
 import com.kingdee.bos.dao.IObjectPK;
 import com.kingdee.bos.metadata.entity.EntityViewInfo;
 import java.lang.String;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+
 import com.kingdee.eas.framework.CoreBaseInfo;
 import com.kingdee.eas.framework.CoreBaseCollection;
 import com.kingdee.eas.framework.DataBaseCollection;
@@ -41,6 +49,7 @@ public class PersonDormitoryTypeControllerBean extends AbstractPersonDormitoryTy
     protected IObjectPK _save(Context ctx, IObjectValue model) throws BOSException, EASBizException {
         PersonDormitoryTypeInfo personDormitoryTypeInfo = (PersonDormitoryTypeInfo)model;
         personDormitoryTypeInfo.setState(BasicItemStateEnum.getEnum(1));
+        this._checkNumberDup(ctx,personDormitoryTypeInfo);
         return super._save(ctx, personDormitoryTypeInfo);
     }
 
@@ -49,7 +58,48 @@ public class PersonDormitoryTypeControllerBean extends AbstractPersonDormitoryTy
         for (int i = 0; i < colls.size(); i++) {
             PersonDormitoryTypeInfo personDormitoryTypeInfo = (PersonDormitoryTypeInfo)(colls.getObject(i));
             personDormitoryTypeInfo.setState(BasicItemStateEnum.getEnum(1));
+            this._checkNumberDup(ctx,personDormitoryTypeInfo);
         }
         return super._saveBatchData(ctx, colls);
     }
+    public void _checkNumberDup(Context ctx, IObjectValue model) throws BOSException, EASBizException {
+        PersonDormitoryTypeInfo personDormitoryTypeInfo = (PersonDormitoryTypeInfo)model;
+        if (personDormitoryTypeInfo.getId() == null) {
+            FilterInfo filterInfo = new FilterInfo();
+//            filterInfo.getFilterItems().add(new FilterItemInfo("type", new Integer(treeInfo.getType().getValue())));
+            filterInfo.getFilterItems().add(new FilterItemInfo("number", personDormitoryTypeInfo.getNumber()));
+            if (this._exists(ctx, filterInfo)) {
+                throw new OrgException(OrgException.NUMBER_CAN_NOT_DUP);
+            }
+        } else {
+            this.checkNumberDupOnUpdate(ctx, personDormitoryTypeInfo);
+        }
+
+    }
+
+    private void checkNumberDupOnUpdate(Context ctx, PersonDormitoryTypeInfo personDormitoryTypeInfo) throws BOSException, EASBizException {
+        StringBuffer sql = (new StringBuffer()).append("select fid from CT_OTH_PersonDormitoryType where fnumber = '")
+                .append(personDormitoryTypeInfo.getNumber()).append("'");
+        Connection conn = null;
+        Statement stmt = null;
+        ResultSet rs = null;
+
+        try {
+            conn = this.getConnection(ctx);
+            stmt = conn.createStatement();
+            rs = stmt.executeQuery(sql.toString());
+            if (rs.next()) {
+                do {
+                    String fid = rs.getString(1);
+                    if (fid.equals(personDormitoryTypeInfo.getId().toString())) {
+                        return;
+                    }
+                } while(rs.next());
+
+                throw new OrgException(OrgException.NUMBER_CAN_NOT_DUP);
+            }
+        } catch (SQLException var8) {
+            throw new BOSException(var8);
+        }
+    }
 }

+ 53 - 0
src/com/kingdee/eas/custom/dormitorysystem/otherbasicdata/app/RoomTypeControllerBean.java

@@ -1,6 +1,12 @@
 package com.kingdee.eas.custom.dormitorysystem.otherbasicdata.app;
 
+import com.kingdee.bos.metadata.entity.FilterInfo;
+import com.kingdee.bos.metadata.entity.FilterItemInfo;
+import com.kingdee.eas.basedata.org.AdminOrgUnitFactory;
+import com.kingdee.eas.basedata.org.AdminOrgUnitInfo;
+import com.kingdee.eas.basedata.org.OrgException;
 import com.kingdee.eas.custom.dormitorysystem.otherbasicdata.PersonDormitoryTypeInfo;
+import com.kingdee.eas.custom.dormitorysystem.otherbasicdata.RoomTypeFactory;
 import com.kingdee.shr.base.syssetting.BasicItemStateEnum;
 import org.apache.log4j.Logger;
 import javax.ejb.*;
@@ -24,6 +30,11 @@ import com.kingdee.eas.framework.ObjectBaseCollection;
 import com.kingdee.bos.dao.IObjectPK;
 import com.kingdee.bos.metadata.entity.EntityViewInfo;
 import java.lang.String;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+
 import com.kingdee.eas.framework.CoreBaseInfo;
 import com.kingdee.eas.framework.CoreBaseCollection;
 import com.kingdee.eas.framework.DataBaseCollection;
@@ -40,6 +51,7 @@ public class RoomTypeControllerBean extends AbstractRoomTypeControllerBean
     protected IObjectPK _save(Context ctx, IObjectValue model) throws BOSException, EASBizException {
         RoomTypeInfo roomTypeInfo= (RoomTypeInfo)model;
         roomTypeInfo.setState(BasicItemStateEnum.getEnum(1));
+        this._checkNumberDup(ctx,roomTypeInfo);
         return super._save(ctx, roomTypeInfo);
     }
 
@@ -48,7 +60,48 @@ public class RoomTypeControllerBean extends AbstractRoomTypeControllerBean
         for (int i = 0; i < colls.size(); i++) {
             RoomTypeInfo roomTypeInfo = (RoomTypeInfo)(colls.getObject(i));
             roomTypeInfo.setState(BasicItemStateEnum.getEnum(1));
+            this._checkNumberDup(ctx,roomTypeInfo);
         }
         return super._saveBatchData(ctx, colls);
     }
+    public void _checkNumberDup(Context ctx, IObjectValue model) throws BOSException, EASBizException {
+        RoomTypeInfo roomTypeInfo = (RoomTypeInfo)model;
+        if (roomTypeInfo.getId() == null) {
+            FilterInfo filterInfo = new FilterInfo();
+//            filterInfo.getFilterItems().add(new FilterItemInfo("type", new Integer(treeInfo.getType().getValue())));
+            filterInfo.getFilterItems().add(new FilterItemInfo("number", roomTypeInfo.getNumber()));
+            if (this._exists(ctx, filterInfo)) {
+                throw new OrgException(OrgException.NUMBER_CAN_NOT_DUP);
+            }
+        } else {
+            this.checkNumberDupOnUpdate(ctx, roomTypeInfo);
+        }
+
+    }
+
+    private void checkNumberDupOnUpdate(Context ctx, RoomTypeInfo roomTypeInfo) throws BOSException, EASBizException {
+        StringBuffer sql = (new StringBuffer()).append("select fid from CT_OTH_RoomType where fnumber = '")
+                .append(roomTypeInfo.getNumber()).append("'");
+        Connection conn = null;
+        Statement stmt = null;
+        ResultSet rs = null;
+
+        try {
+            conn = this.getConnection(ctx);
+            stmt = conn.createStatement();
+            rs = stmt.executeQuery(sql.toString());
+            if (rs.next()) {
+                do {
+                    String fid = rs.getString(1);
+                    if (fid.equals(roomTypeInfo.getId().toString())) {
+                        return;
+                    }
+                } while(rs.next());
+
+                throw new OrgException(OrgException.NUMBER_CAN_NOT_DUP);
+            }
+        } catch (SQLException var8) {
+            throw new BOSException(var8);
+        }
+    }
 }

+ 26 - 3
src/com/kingdee/eas/custom/dormitorysystem/otherbasicdata/client/AbstractDormitoryTypeEditUI.java

@@ -51,11 +51,13 @@ public abstract class AbstractDormitoryTypeEditUI extends com.kingdee.eas.framew
     protected com.kingdee.bos.ctrl.swing.KDLabelContainer kDLabelContainer3;
     protected com.kingdee.bos.ctrl.swing.KDLabelContainer kDLabelContainer4;
     protected com.kingdee.bos.ctrl.swing.KDLabelContainer contstate;
+    protected com.kingdee.bos.ctrl.swing.KDLabelContainer contgender;
     protected com.kingdee.bos.ctrl.swing.KDTextField txtNumber;
     protected com.kingdee.bos.ctrl.extendcontrols.KDBizMultiLangBox txtName;
     protected com.kingdee.bos.ctrl.swing.KDTextField txtSimpleName;
     protected com.kingdee.bos.ctrl.extendcontrols.KDBizMultiLangBox txtDescription;
     protected com.kingdee.bos.ctrl.swing.KDComboBox state;
+    protected com.kingdee.bos.ctrl.swing.KDComboBox gender;
     protected com.kingdee.eas.custom.dormitorysystem.otherbasicdata.DormitoryTypeInfo editData = null;
     /**
      * output class constructor
@@ -81,21 +83,25 @@ public abstract class AbstractDormitoryTypeEditUI extends com.kingdee.eas.framew
         this.kDLabelContainer3 = new com.kingdee.bos.ctrl.swing.KDLabelContainer();
         this.kDLabelContainer4 = new com.kingdee.bos.ctrl.swing.KDLabelContainer();
         this.contstate = new com.kingdee.bos.ctrl.swing.KDLabelContainer();
+        this.contgender = new com.kingdee.bos.ctrl.swing.KDLabelContainer();
         this.txtNumber = new com.kingdee.bos.ctrl.swing.KDTextField();
         this.txtName = new com.kingdee.bos.ctrl.extendcontrols.KDBizMultiLangBox();
         this.txtSimpleName = new com.kingdee.bos.ctrl.swing.KDTextField();
         this.txtDescription = new com.kingdee.bos.ctrl.extendcontrols.KDBizMultiLangBox();
         this.state = new com.kingdee.bos.ctrl.swing.KDComboBox();
+        this.gender = new com.kingdee.bos.ctrl.swing.KDComboBox();
         this.kDLabelContainer1.setName("kDLabelContainer1");
         this.kDLabelContainer2.setName("kDLabelContainer2");
         this.kDLabelContainer3.setName("kDLabelContainer3");
         this.kDLabelContainer4.setName("kDLabelContainer4");
         this.contstate.setName("contstate");
+        this.contgender.setName("contgender");
         this.txtNumber.setName("txtNumber");
         this.txtName.setName("txtName");
         this.txtSimpleName.setName("txtSimpleName");
         this.txtDescription.setName("txtDescription");
         this.state.setName("state");
+        this.gender.setName("gender");
         // CoreUI		
         this.btnPrint.setVisible(false);		
         this.btnPrintPreview.setVisible(false);		
@@ -124,6 +130,11 @@ public abstract class AbstractDormitoryTypeEditUI extends com.kingdee.eas.framew
         this.contstate.setBoundLabelLength(100);		
         this.contstate.setBoundLabelUnderline(true);		
         this.contstate.setVisible(true);
+        // contgender		
+        this.contgender.setBoundLabelText(resHelper.getString("contgender.boundLabelText"));		
+        this.contgender.setBoundLabelLength(100);		
+        this.contgender.setBoundLabelUnderline(true);		
+        this.contgender.setVisible(true);
         // txtNumber		
         this.txtNumber.setMaxLength(80);
         // txtName
@@ -134,7 +145,11 @@ public abstract class AbstractDormitoryTypeEditUI extends com.kingdee.eas.framew
         this.state.setVisible(true);		
         this.state.addItems(EnumUtils.getEnumList("com.kingdee.shr.base.syssetting.BasicItemStateEnum").toArray());		
         this.state.setRequired(false);
-        this.setFocusTraversalPolicy(new com.kingdee.bos.ui.UIFocusTraversalPolicy(new java.awt.Component[] {state}));
+        // gender		
+        this.gender.setVisible(true);		
+        this.gender.addItems(EnumUtils.getEnumList("com.kingdee.eas.basedata.person.Genders").toArray());		
+        this.gender.setRequired(false);
+        this.setFocusTraversalPolicy(new com.kingdee.bos.ui.UIFocusTraversalPolicy(new java.awt.Component[] {state,gender}));
         this.setFocusCycleRoot(true);
 		//Register control's property binding
 		registerBindings();
@@ -172,6 +187,8 @@ public abstract class AbstractDormitoryTypeEditUI extends com.kingdee.eas.framew
         this.add(kDLabelContainer4, null);
         contstate.setBounds(new Rectangle(0, 0, 270, 19));
         this.add(contstate, null);
+        contgender.setBounds(new Rectangle(0, 0, 270, 19));
+        this.add(contgender, null);
         //kDLabelContainer1
         kDLabelContainer1.setBoundEditor(txtNumber);
         //kDLabelContainer2
@@ -182,6 +199,8 @@ public abstract class AbstractDormitoryTypeEditUI extends com.kingdee.eas.framew
         kDLabelContainer4.setBoundEditor(txtDescription);
         //contstate
         contstate.setBoundEditor(state);
+        //contgender
+        contgender.setBoundEditor(gender);
 
     }
 
@@ -296,7 +315,8 @@ public abstract class AbstractDormitoryTypeEditUI extends com.kingdee.eas.framew
 		dataBinder.registerBinding("name", String.class, this.txtName, "_multiLangItem");
 		dataBinder.registerBinding("simpleName", String.class, this.txtSimpleName, "text");
 		dataBinder.registerBinding("description", String.class, this.txtDescription, "_multiLangItem");
-		dataBinder.registerBinding("state", com.kingdee.shr.base.syssetting.BasicItemStateEnum.class, this.state, "selectedItem");		
+		dataBinder.registerBinding("state", com.kingdee.shr.base.syssetting.BasicItemStateEnum.class, this.state, "selectedItem");
+		dataBinder.registerBinding("gender", com.kingdee.eas.basedata.person.Genders.class, this.gender, "selectedItem");		
 	}
 	//Regiester UI State
 	private void registerUIState(){
@@ -447,7 +467,8 @@ public abstract class AbstractDormitoryTypeEditUI extends com.kingdee.eas.framew
 		getValidateHelper().registerBindProperty("name", ValidateHelper.ON_SAVE);    
 		getValidateHelper().registerBindProperty("simpleName", ValidateHelper.ON_SAVE);    
 		getValidateHelper().registerBindProperty("description", ValidateHelper.ON_SAVE);    
-		getValidateHelper().registerBindProperty("state", ValidateHelper.ON_SAVE);    		
+		getValidateHelper().registerBindProperty("state", ValidateHelper.ON_SAVE);    
+		getValidateHelper().registerBindProperty("gender", ValidateHelper.ON_SAVE);    		
 	}
 
 
@@ -491,6 +512,7 @@ public abstract class AbstractDormitoryTypeEditUI extends com.kingdee.eas.framew
         sic.add(new SelectorItemInfo("simpleName"));
         sic.add(new SelectorItemInfo("description"));
         sic.add(new SelectorItemInfo("state"));
+        sic.add(new SelectorItemInfo("gender"));
         return sic;
     }        
 
@@ -541,6 +563,7 @@ public abstract class AbstractDormitoryTypeEditUI extends com.kingdee.eas.framew
      */
     protected void applyDefaultValue(IObjectValue vo) {        
 		vo.put("state",new Integer(1));
+vo.put("gender",new Integer(1));
         
     }        
 	protected void setFieldsNull(com.kingdee.bos.dao.AbstractObjectValue arg0) {

+ 3 - 1
src/com/kingdee/eas/custom/dormitorysystem/otherbasicdata/client/AbstractDormitoryTypeEditUI.properties

@@ -4,4 +4,6 @@ kDLabelContainer2.boundLabelText=\u540D\u79F0\:
 kDLabelContainer3.boundLabelText=\u7B80\u79F0\:
 kDLabelContainer4.boundLabelText=\u63CF\u8FF0\:
 contstate.boundLabelText=\u72B6\u6001
-state.items=[Enum]com.kingdee.shr.base.syssetting.BasicItemStateEnum
+state.items=[Enum]com.kingdee.shr.base.syssetting.BasicItemStateEnum
+contgender.boundLabelText=\u6027\u522B
+gender.items=[Enum]com.kingdee.eas.basedata.person.Genders

+ 3 - 1
src/com/kingdee/eas/custom/dormitorysystem/otherbasicdata/client/AbstractDormitoryTypeEditUI_l1.properties

@@ -4,4 +4,6 @@ kDLabelContainer2.boundLabelText=
 kDLabelContainer3.boundLabelText=
 kDLabelContainer4.boundLabelText=
 contstate.boundLabelText=
-state.items=
+state.items=
+contgender.boundLabelText=
+gender.items=

+ 3 - 1
src/com/kingdee/eas/custom/dormitorysystem/otherbasicdata/client/AbstractDormitoryTypeEditUI_l2.properties

@@ -4,4 +4,6 @@ kDLabelContainer2.boundLabelText=\u540D\u79F0\:
 kDLabelContainer3.boundLabelText=\u7B80\u79F0\:
 kDLabelContainer4.boundLabelText=\u63CF\u8FF0\:
 contstate.boundLabelText=\u72B6\u6001
-state.items=[Enum]com.kingdee.shr.base.syssetting.BasicItemStateEnum
+state.items=[Enum]com.kingdee.shr.base.syssetting.BasicItemStateEnum
+contgender.boundLabelText=\u6027\u522B
+gender.items=[Enum]com.kingdee.eas.basedata.person.Genders

+ 3 - 1
src/com/kingdee/eas/custom/dormitorysystem/otherbasicdata/client/AbstractDormitoryTypeEditUI_l3.properties

@@ -4,4 +4,6 @@ kDLabelContainer2.boundLabelText=\u540D\u7A31\:
 kDLabelContainer3.boundLabelText=\u7C21\u7A31\:
 kDLabelContainer4.boundLabelText=\u63CF\u8FF0\:
 contstate.boundLabelText=\u72C0\u614B
-state.items=[Enum]com.kingdee.shr.base.syssetting.BasicItemStateEnum
+state.items=[Enum]com.kingdee.shr.base.syssetting.BasicItemStateEnum
+contgender.boundLabelText=\u6027\u5225
+gender.items=[Enum]com.kingdee.eas.basedata.person.Genders

ファイルの差分が大きいため隠しています
+ 0 - 0
src/com/kingdee/eas/custom/dormitorysystem/otherbasicdata/client/AbstractDormitoryTypeListUI.java


ファイルの差分が大きいため隠しています
+ 0 - 0
src/com/kingdee/eas/custom/dormitorysystem/otherbasicdata/client/AbstractDormitoryTypeListUI.properties


ファイルの差分が大きいため隠しています
+ 0 - 0
src/com/kingdee/eas/custom/dormitorysystem/otherbasicdata/client/AbstractDormitoryTypeListUI_l2.properties


ファイルの差分が大きいため隠しています
+ 0 - 0
src/com/kingdee/eas/custom/dormitorysystem/otherbasicdata/client/AbstractDormitoryTypeListUI_l3.properties


この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません