Преглед на файлове

Revert "增加是否启用字段"

This reverts commit d9a184e6212627f59051e117e2440ef10a4f55d1.
9060 преди 6 месеца
родител
ревизия
73ed2d47af
променени са 20 файла, в които са добавени 39 реда и са изтрити 614 реда
  1. 3 13
      metadata/com/kingdee/eas/hr/project/MemberManagement.bizunit
  2. 26 50
      metadata/com/kingdee/eas/hr/project/app/CT_PRO_MemberManagement.table
  3. 4 92
      metadata/com/kingdee/eas/hr/project/app/MemberManagement.entity
  4. 0 47
      metadata/com/kingdee/eas/hr/project/app/MemberManagementQuery.query
  5. 0 2
      metadata/com/kingdee/eas/hr/project/app/R_MemberManagement_Person_employee.relation
  6. 0 2
      metadata/com/kingdee/eas/hr/project/app/R_MemberManagement_ProjectRole_projectRole.relation
  7. 0 340
      metadata/com/kingdee/eas/hr/project/client/MemberManagementEditUI.ui
  8. 0 11
      metadata/com/kingdee/eas/hr/project/client/MemberManagementListUI.ui
  9. 2 2
      metadata/entity_pkmapping.properties
  10. 1 1
      metadata/facade_pkmapping.properties
  11. 0 13
      src/com/kingdee/eas/hr/project/AbstractMemberManagementInfo.java
  12. 3 27
      src/com/kingdee/eas/hr/project/client/AbstractMemberManagementEditUI.java
  13. 0 2
      src/com/kingdee/eas/hr/project/client/AbstractMemberManagementEditUI.properties
  14. 0 2
      src/com/kingdee/eas/hr/project/client/AbstractMemberManagementEditUI_l1.properties
  15. 0 2
      src/com/kingdee/eas/hr/project/client/AbstractMemberManagementEditUI_l2.properties
  16. 0 2
      src/com/kingdee/eas/hr/project/client/AbstractMemberManagementEditUI_l3.properties
  17. 0 0
      src/com/kingdee/eas/hr/project/client/AbstractMemberManagementListUI.java
  18. 0 2
      src/com/kingdee/eas/hr/project/client/AbstractMemberManagementListUI.properties
  19. 0 2
      src/com/kingdee/eas/hr/project/client/AbstractMemberManagementListUI_l2.properties
  20. 0 2
      src/com/kingdee/eas/hr/project/client/AbstractMemberManagementListUI_l3.properties

+ 3 - 13
metadata/com/kingdee/eas/hr/project/MemberManagement.bizunit

@@ -75,16 +75,6 @@
             <lang locale="zh_CN" value="com.kingdee.eas.hr.project.client.MemberManagementEditUI" />
             <lang locale="zh_TW" value="com.kingdee.eas.hr.project.client.MemberManagementEditUI" />
         </rs>
-        <rs key="bizUnit[com.kingdee.eas.hr.project.MemberManagement].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.hr.project.MemberManagement].extendedProperty.genBusinessImplCode">
-            <lang locale="en_US" value="true" />
-            <lang locale="zh_CN" value="true" />
-            <lang locale="zh_TW" value="true" />
-        </rs>
         <rs key="bizUnit[com.kingdee.eas.hr.project.MemberManagement].extendedProperty.isAsstAcctType">
             <lang locale="en_US" value="false" />
             <lang locale="zh_CN" value="false" />
@@ -101,9 +91,9 @@
             <lang locale="zh_TW" value="com.kingdee.eas.hr.project.client.MemberManagementListUI" />
         </rs>
         <rs key="bizUnit[com.kingdee.eas.hr.project.MemberManagement].extendedProperty.maxFieldIndex">
-            <lang locale="en_US" value="6" />
-            <lang locale="zh_CN" value="6" />
-            <lang locale="zh_TW" value="6" />
+            <lang locale="en_US" value="5" />
+            <lang locale="zh_CN" value="5" />
+            <lang locale="zh_TW" value="5" />
         </rs>
         <rs key="bizUnit[com.kingdee.eas.hr.project.MemberManagement].extendedProperty.userDefined">
             <lang locale="en_US" value="true" />

+ 26 - 50
metadata/com/kingdee/eas/hr/project/app/CT_PRO_MemberManagement.table

@@ -5,7 +5,7 @@
     <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].alias</alias>
     <description>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].description</description>
     <userDefined>true</userDefined>
-    <bizUnitPK>com.kingdee.eas.hr.project.MemberManagement</bizUnitPK>
+    <bizUnitPK />
     <columns>
         <column>
             <name>FFivouchered</name>
@@ -371,20 +371,6 @@
             <scale>0</scale>
             <precision>44</precision>
         </column>
-        <column>
-            <name>CFState</name>
-            <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].columns.column[CFState].alias</alias>
-            <description>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].columns.column[CFState].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>PK_MemberManagemen</name>
@@ -623,7 +609,8 @@
         </rs>
         <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].columns.column[CFProjectManagementID].description">
             <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="" />
+            <lang locale="zh_CN" value="项目管理" />
+            <lang locale="zh_HK" value="項目管理" />
             <lang locale="zh_TW" value="項目管理" />
         </rs>
         <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].columns.column[CFProjectName].alias">
@@ -650,23 +637,11 @@
             <lang locale="zh_HK" value="項目角色" />
             <lang locale="zh_TW" value="項目角色" />
         </rs>
-        <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].columns.column[CFState].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.hr.project.app.CT_PRO_MemberManagement].columns.column[CFState].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.hr.project.app.CT_PRO_MemberManagement].columns.column[FAdminOrgUnitId].alias">
             <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="行政组织" />
-            <lang locale="zh_HK" value="行政組織" />
-            <lang locale="zh_TW" value="行政組織" />
+            <lang locale="zh_CN" value="null" />
+            <lang locale="zh_HK" value="null" />
+            <lang locale="zh_TW" value="null" />
         </rs>
         <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].columns.column[FAdminOrgUnitId].description">
             <lang locale="en_US" value="null" />
@@ -686,9 +661,9 @@
         </rs>
         <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].columns.column[FAuditorID].alias">
             <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="审核人" />
-            <lang locale="zh_HK" value="審核人" />
-            <lang locale="zh_TW" value="審核人" />
+            <lang locale="zh_CN" value="null" />
+            <lang locale="zh_HK" value="null" />
+            <lang locale="zh_TW" value="null" />
         </rs>
         <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].columns.column[FAuditorID].description">
             <lang locale="en_US" value="null" />
@@ -722,9 +697,9 @@
         </rs>
         <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].columns.column[FControlUnitID].alias">
             <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="控制单元" />
-            <lang locale="zh_HK" value="控制單元" />
-            <lang locale="zh_TW" value="控制單元" />
+            <lang locale="zh_CN" value="null" />
+            <lang locale="zh_HK" value="null" />
+            <lang locale="zh_TW" value="null" />
         </rs>
         <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].columns.column[FControlUnitID].description">
             <lang locale="en_US" value="null" />
@@ -746,9 +721,9 @@
         </rs>
         <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].columns.column[FCreatorID].alias">
             <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="创建者" />
-            <lang locale="zh_HK" value="創建者" />
-            <lang locale="zh_TW" value="創建者" />
+            <lang locale="zh_CN" value="null" />
+            <lang locale="zh_HK" value="null" />
+            <lang locale="zh_TW" value="null" />
         </rs>
         <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].columns.column[FCreatorID].description">
             <lang locale="en_US" value="null" />
@@ -782,20 +757,21 @@
         </rs>
         <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].columns.column[FHROrgUnitID].alias">
             <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="HR组织" />
-            <lang locale="zh_HK" value="HR組織" />
-            <lang locale="zh_TW" value="HR組織" />
+            <lang locale="zh_CN" value="null" />
+            <lang locale="zh_HK" value="null" />
+            <lang locale="zh_TW" value="null" />
         </rs>
         <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].columns.column[FHROrgUnitID].description">
             <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="" />
+            <lang locale="zh_CN" value="null" />
+            <lang locale="zh_HK" value="null" />
             <lang locale="zh_TW" value="null" />
         </rs>
         <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].columns.column[FHandlerID].alias">
             <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="经手人" />
-            <lang locale="zh_HK" value="經手人" />
-            <lang locale="zh_TW" value="經手人" />
+            <lang locale="zh_CN" value="null" />
+            <lang locale="zh_HK" value="null" />
+            <lang locale="zh_TW" value="null" />
         </rs>
         <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].columns.column[FHandlerID].description">
             <lang locale="en_US" value="null" />
@@ -852,9 +828,9 @@
         </rs>
         <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].columns.column[FLastUpdateUserID].alias">
             <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="最后修改者" />
-            <lang locale="zh_HK" value="最後修改者" />
-            <lang locale="zh_TW" value="最後修改者" />
+            <lang locale="zh_CN" value="null" />
+            <lang locale="zh_HK" value="null" />
+            <lang locale="zh_TW" value="null" />
         </rs>
         <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].columns.column[FLastUpdateUserID].description">
             <lang locale="en_US" value="null" />

+ 4 - 92
metadata/com/kingdee/eas/hr/project/app/MemberManagement.entity

@@ -236,7 +236,7 @@
             <isNullable>false</isNullable>
             <formula />
             <length>1</length>
-            <precision>1</precision>
+            <precision>0</precision>
             <decimalDigits>0</decimalDigits>
             <defaultValue>entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.ownProperty[Fivouchered].defaultValue</defaultValue>
             <displayFormat />
@@ -256,7 +256,7 @@
             <isNullable>false</isNullable>
             <formula />
             <length>100</length>
-            <precision>100</precision>
+            <precision>0</precision>
             <decimalDigits>0</decimalDigits>
             <defaultValue>entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.ownProperty[projectCode].defaultValue</defaultValue>
             <displayFormat />
@@ -276,7 +276,7 @@
             <isNullable>false</isNullable>
             <formula />
             <length>100</length>
-            <precision>100</precision>
+            <precision>0</precision>
             <decimalDigits>0</decimalDigits>
             <defaultValue>entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.ownProperty[projectName].defaultValue</defaultValue>
             <displayFormat />
@@ -324,7 +324,7 @@
             <isNullable>false</isNullable>
             <formula />
             <length>100</length>
-            <precision>100</precision>
+            <precision>0</precision>
             <decimalDigits>0</decimalDigits>
             <defaultValue>entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.ownProperty[notes].defaultValue</defaultValue>
             <displayFormat />
@@ -346,26 +346,6 @@
                 <key name="name" value="R_MemberManagement_ProjectManagement_entrys" />
             </relationship>
         </linkProperty>
-        <ownProperty>
-            <name>state</name>
-            <alias>entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.ownProperty[state].alias</alias>
-            <description>entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.ownProperty[state].description</description>
-            <userDefined>true</userDefined>
-            <configured>false</configured>
-            <dataType>Enum</dataType>
-            <metadataRef>com.kingdee.shr.base.syssetting.BaseItemStateEnum</metadataRef>
-            <isMultilingual>false</isMultilingual>
-            <isNullable>false</isNullable>
-            <formula />
-            <length>80</length>
-            <precision>0</precision>
-            <decimalDigits>0</decimalDigits>
-            <defaultValue>entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.ownProperty[state].defaultValue</defaultValue>
-            <displayFormat />
-            <mappingField>
-                <key name="name" value="CFState" />
-            </mappingField>
-        </ownProperty>
     </properties>
     <logicalKey>
         <name>id</name>
@@ -1279,73 +1259,5 @@
             <lang locale="zh_CN" value="true" />
             <lang locale="zh_TW" value="true" />
         </rs>
-        <rs key="entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.ownProperty[state].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.hr.project.app.MemberManagement].properties.ownProperty[state].defaultValue">
-            <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="ENABLE" />
-            <lang locale="zh_HK" value="ENABLE" />
-            <lang locale="zh_TW" value="ENABLE" />
-        </rs>
-        <rs key="entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.ownProperty[state].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.hr.project.app.MemberManagement].properties.ownProperty[state].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.hr.project.app.MemberManagement].properties.ownProperty[state].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.hr.project.app.MemberManagement].properties.ownProperty[state].extendedProperty.defaultValue">
-            <lang locale="en_US" value="NEW" />
-            <lang locale="zh_CN" value="NEW" />
-            <lang locale="zh_TW" value="NEW" />
-        </rs>
-        <rs key="entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.ownProperty[state].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.hr.project.app.MemberManagement].properties.ownProperty[state].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.hr.project.app.MemberManagement].properties.ownProperty[state].extendedProperty.isForMapping">
-            <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.hr.project.app.MemberManagement].properties.ownProperty[state].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.hr.project.app.MemberManagement].properties.ownProperty[state].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.hr.project.app.MemberManagement].properties.ownProperty[state].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.hr.project.app.MemberManagement].properties.ownProperty[state].extendedProperty.isVisibleForKDTable">
-            <lang locale="en_US" value="true" />
-            <lang locale="zh_CN" value="true" />
-            <lang locale="zh_TW" value="true" />
-        </rs>
     </resource>
 </entityObject>

+ 0 - 47
metadata/com/kingdee/eas/hr/project/app/MemberManagementQuery.query

@@ -1231,37 +1231,6 @@
                 <key name="name" value="MemberManagementQuery" />
             </query>
         </queryField>
-        <queryField>
-            <name>state</name>
-            <userDefined>true</userDefined>
-            <formulaString>#0</formulaString>
-            <constString />
-            <displayName>joinQuery[com.kingdee.eas.hr.project.app.MemberManagementQuery].units.queryField[state].displayName</displayName>
-            <groupType />
-            <isSelector>true</isSelector>
-            <isFilter>true</isFilter>
-            <isSorter>true</isSorter>
-            <isParameter>false</isParameter>
-            <returnType>Int</returnType>
-            <propertyRefs>
-                <propertyRef>
-                    <key>b4759d1a-93f3-4f0b-b128-566ebf51f301</key>
-                    <parentUnit>
-                        <key name="name" value="state" />
-                    </parentUnit>
-                    <subEntity>
-                        <key name="name" value="MemberManagement" />
-                    </subEntity>
-                    <refProperty>
-                        <key name="name" value="state" />
-                    </refProperty>
-                </propertyRef>
-            </propertyRefs>
-            <query>
-                <key name="package" value="com.kingdee.eas.hr.project.app" />
-                <key name="name" value="MemberManagementQuery" />
-            </query>
-        </queryField>
     </units>
     <defaultFilter>
         <name>defaultFilter</name>
@@ -1953,21 +1922,5 @@
             <lang locale="zh_CN" value="true" />
             <lang locale="zh_TW" value="true" />
         </rs>
-        <rs key="joinQuery[com.kingdee.eas.hr.project.app.MemberManagementQuery].units.queryField[state].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.hr.project.app.MemberManagementQuery].units.queryField[state].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.hr.project.app.MemberManagementQuery].units.queryField[state].extendedProperty.isCommonQuerySorter">
-            <lang locale="en_US" value="true" />
-            <lang locale="zh_CN" value="true" />
-            <lang locale="zh_TW" value="true" />
-        </rs>
     </resource>
 </joinQuery>

+ 0 - 2
metadata/com/kingdee/eas/hr/project/app/R_MemberManagement_Person_employee.relation

@@ -21,13 +21,11 @@
         <rs key="relationship[com.kingdee.eas.hr.project.app.R_MemberManagement_Person_employee].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="relationship[com.kingdee.eas.hr.project.app.R_MemberManagement_Person_employee].description">
             <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>
     </resource>

+ 0 - 2
metadata/com/kingdee/eas/hr/project/app/R_MemberManagement_ProjectRole_projectRole.relation

@@ -21,13 +21,11 @@
         <rs key="relationship[com.kingdee.eas.hr.project.app.R_MemberManagement_ProjectRole_projectRole].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="relationship[com.kingdee.eas.hr.project.app.R_MemberManagement_ProjectRole_projectRole].description">
             <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>
     </resource>

Файловите разлики са ограничени, защото са твърде много
+ 0 - 340
metadata/com/kingdee/eas/hr/project/client/MemberManagementEditUI.ui


Файловите разлики са ограничени, защото са твърде много
+ 0 - 11
metadata/com/kingdee/eas/hr/project/client/MemberManagementListUI.ui


+ 2 - 2
metadata/entity_pkmapping.properties

@@ -1,5 +1,5 @@
 #
-#Sat Nov 30 11:50:24 CST 2024
+#Fri Nov 29 11:38:19 CST 2024
 79ADB148=com.kingdee.eas.hr.project.app.ProjectChange
 95FA0614=com.kingdee.eas.hr.project.app.MemberManagementEntry
 C5DD122F=com.kingdee.eas.hr.project.app.Employee
@@ -11,5 +11,5 @@ B15489DB=com.kingdee.eas.hr.project.app.ProjectManagement
 2AC6A40E=com.kingdee.eas.hr.project.app.ProjectRole
 2AC7B2D2=com.kingdee.eas.hr.project.app.ProjectType
 9F122B78=com.kingdee.eas.hr.project.app.Project
-400CA33B=com.kingdee.eas.hr.project.app.Type
 CF9DCEB1=com.kingdee.eas.hr.project.app.WorkHoursReport
+400CA33B=com.kingdee.eas.hr.project.app.Type

+ 1 - 1
metadata/facade_pkmapping.properties

@@ -1,2 +1,2 @@
 #
-#Sat Nov 30 11:50:24 CST 2024
+#Fri Nov 29 11:38:19 CST 2024

+ 0 - 13
src/com/kingdee/eas/hr/project/AbstractMemberManagementInfo.java

@@ -102,19 +102,6 @@ public class AbstractMemberManagementInfo extends com.kingdee.eas.hr.base.HRBill
     {
         put("projectManagement", item);
     }
-    /**
-     * Object:ÏîÄ¿³ÉÔ±¹ÜÀí's ÊÇ·ñ״̬property 
-     */
-    public com.kingdee.shr.base.syssetting.BaseItemStateEnum getState()
-    {
-        return com.kingdee.shr.base.syssetting.BaseItemStateEnum.getEnum(getInt("state"));
-    }
-    public void setState(com.kingdee.shr.base.syssetting.BaseItemStateEnum item)
-    {
-		if (item != null) {
-        setInt("state", item.getValue());
-		}
-    }
     public BOSObjectType getBOSType()
     {
         return new BOSObjectType("B49500FE");

+ 3 - 27
src/com/kingdee/eas/hr/project/client/AbstractMemberManagementEditUI.java

@@ -62,7 +62,6 @@ public abstract class AbstractMemberManagementEditUI extends com.kingdee.eas.fra
     protected com.kingdee.bos.ctrl.swing.KDLabelContainer contemployee;
     protected com.kingdee.bos.ctrl.swing.KDLabelContainer contnotes;
     protected com.kingdee.bos.ctrl.swing.KDLabelContainer kDLabelContainer1;
-    protected com.kingdee.bos.ctrl.swing.KDLabelContainer contstate;
     protected com.kingdee.bos.ctrl.extendcontrols.KDBizPromptBox prmtCreator;
     protected com.kingdee.bos.ctrl.swing.KDDatePicker kDDateCreateTime;
     protected com.kingdee.bos.ctrl.extendcontrols.KDBizPromptBox prmtLastUpdateUser;
@@ -77,7 +76,6 @@ public abstract class AbstractMemberManagementEditUI extends com.kingdee.eas.fra
     protected com.kingdee.bos.ctrl.extendcontrols.KDBizPromptBox prmtemployee;
     protected com.kingdee.bos.ctrl.swing.KDTextField txtnotes;
     protected com.kingdee.bos.ctrl.extendcontrols.KDBizPromptBox kDBizPromptBox1;
-    protected com.kingdee.bos.ctrl.swing.KDComboBox state;
     protected com.kingdee.eas.hr.project.MemberManagementInfo editData = null;
     /**
      * output class constructor
@@ -157,7 +155,6 @@ public abstract class AbstractMemberManagementEditUI extends com.kingdee.eas.fra
         this.contemployee = new com.kingdee.bos.ctrl.swing.KDLabelContainer();
         this.contnotes = new com.kingdee.bos.ctrl.swing.KDLabelContainer();
         this.kDLabelContainer1 = new com.kingdee.bos.ctrl.swing.KDLabelContainer();
-        this.contstate = new com.kingdee.bos.ctrl.swing.KDLabelContainer();
         this.prmtCreator = new com.kingdee.bos.ctrl.extendcontrols.KDBizPromptBox();
         this.kDDateCreateTime = new com.kingdee.bos.ctrl.swing.KDDatePicker();
         this.prmtLastUpdateUser = new com.kingdee.bos.ctrl.extendcontrols.KDBizPromptBox();
@@ -172,7 +169,6 @@ public abstract class AbstractMemberManagementEditUI extends com.kingdee.eas.fra
         this.prmtemployee = new com.kingdee.bos.ctrl.extendcontrols.KDBizPromptBox();
         this.txtnotes = new com.kingdee.bos.ctrl.swing.KDTextField();
         this.kDBizPromptBox1 = new com.kingdee.bos.ctrl.extendcontrols.KDBizPromptBox();
-        this.state = new com.kingdee.bos.ctrl.swing.KDComboBox();
         this.contCreator.setName("contCreator");
         this.contCreateTime.setName("contCreateTime");
         this.contLastUpdateUser.setName("contLastUpdateUser");
@@ -188,7 +184,6 @@ public abstract class AbstractMemberManagementEditUI extends com.kingdee.eas.fra
         this.contemployee.setName("contemployee");
         this.contnotes.setName("contnotes");
         this.kDLabelContainer1.setName("kDLabelContainer1");
-        this.contstate.setName("contstate");
         this.prmtCreator.setName("prmtCreator");
         this.kDDateCreateTime.setName("kDDateCreateTime");
         this.prmtLastUpdateUser.setName("prmtLastUpdateUser");
@@ -203,7 +198,6 @@ public abstract class AbstractMemberManagementEditUI extends com.kingdee.eas.fra
         this.prmtemployee.setName("prmtemployee");
         this.txtnotes.setName("txtnotes");
         this.kDBizPromptBox1.setName("kDBizPromptBox1");
-        this.state.setName("state");
         // CoreUI		
         this.btnTraceUp.setVisible(false);		
         this.btnTraceDown.setVisible(false);		
@@ -305,11 +299,6 @@ public abstract class AbstractMemberManagementEditUI extends com.kingdee.eas.fra
         this.kDLabelContainer1.setBoundLabelLength(100);		
         this.kDLabelContainer1.setBoundLabelUnderline(true);		
         this.kDLabelContainer1.setVisible(true);
-        // contstate		
-        this.contstate.setBoundLabelText(resHelper.getString("contstate.boundLabelText"));		
-        this.contstate.setBoundLabelLength(100);		
-        this.contstate.setBoundLabelUnderline(true);		
-        this.contstate.setVisible(true);
         // prmtCreator		
         this.prmtCreator.setEnabled(false);
         // kDDateCreateTime		
@@ -368,11 +357,7 @@ public abstract class AbstractMemberManagementEditUI extends com.kingdee.eas.fra
         this.kDBizPromptBox1.setEditFormat("$number$");		
         this.kDBizPromptBox1.setCommitFormat("$number$");		
         this.kDBizPromptBox1.setRequired(false);
-        // state		
-        this.state.setVisible(true);		
-        this.state.addItems(EnumUtils.getEnumList("com.kingdee.shr.base.syssetting.BaseItemStateEnum").toArray());		
-        this.state.setRequired(false);
-        this.setFocusTraversalPolicy(new com.kingdee.bos.ui.UIFocusTraversalPolicy(new java.awt.Component[] {txtprojectCode,txtprojectName,prmtprojectRole,prmtemployee,txtnotes,state}));
+        this.setFocusTraversalPolicy(new com.kingdee.bos.ui.UIFocusTraversalPolicy(new java.awt.Component[] {txtprojectCode,txtprojectName,prmtprojectRole,prmtemployee,txtnotes}));
         this.setFocusCycleRoot(true);
 		//Register control's property binding
 		registerBindings();
@@ -431,8 +416,6 @@ public abstract class AbstractMemberManagementEditUI extends com.kingdee.eas.fra
         this.add(contnotes, null);
         kDLabelContainer1.setBounds(new Rectangle(441, 61, 270, 19));
         this.add(kDLabelContainer1, null);
-        contstate.setBounds(new Rectangle(0, 0, 270, 19));
-        this.add(contstate, null);
         //contCreator
         contCreator.setBoundEditor(prmtCreator);
         //contCreateTime
@@ -461,8 +444,6 @@ public abstract class AbstractMemberManagementEditUI extends com.kingdee.eas.fra
         contnotes.setBoundEditor(txtnotes);
         //kDLabelContainer1
         kDLabelContainer1.setBoundEditor(kDBizPromptBox1);
-        //contstate
-        contstate.setBoundEditor(state);
 
     }
 
@@ -653,8 +634,7 @@ public abstract class AbstractMemberManagementEditUI extends com.kingdee.eas.fra
 		dataBinder.registerBinding("projectName", String.class, this.txtprojectName, "text");
 		dataBinder.registerBinding("projectRole", com.kingdee.eas.hr.project.ProjectRoleInfo.class, this.prmtprojectRole, "data");
 		dataBinder.registerBinding("employee", com.kingdee.eas.basedata.person.PersonInfo.class, this.prmtemployee, "data");
-		dataBinder.registerBinding("notes", String.class, this.txtnotes, "text");
-		dataBinder.registerBinding("state", com.kingdee.shr.base.syssetting.BaseItemStateEnum.class, this.state, "selectedItem");		
+		dataBinder.registerBinding("notes", String.class, this.txtnotes, "text");		
 	}
 	//Regiester UI State
 	private void registerUIState(){		
@@ -803,8 +783,7 @@ public abstract class AbstractMemberManagementEditUI extends com.kingdee.eas.fra
 		getValidateHelper().registerBindProperty("projectName", ValidateHelper.ON_SAVE);    
 		getValidateHelper().registerBindProperty("projectRole", ValidateHelper.ON_SAVE);    
 		getValidateHelper().registerBindProperty("employee", ValidateHelper.ON_SAVE);    
-		getValidateHelper().registerBindProperty("notes", ValidateHelper.ON_SAVE);    
-		getValidateHelper().registerBindProperty("state", ValidateHelper.ON_SAVE);    		
+		getValidateHelper().registerBindProperty("notes", ValidateHelper.ON_SAVE);    		
 	}
 
 
@@ -893,7 +872,6 @@ public abstract class AbstractMemberManagementEditUI extends com.kingdee.eas.fra
         	sic.add(new SelectorItemInfo("employee.name"));
 		}
         sic.add(new SelectorItemInfo("notes"));
-        sic.add(new SelectorItemInfo("state"));
         return sic;
     }        
     	
@@ -1033,8 +1011,6 @@ public abstract class AbstractMemberManagementEditUI extends com.kingdee.eas.fra
      * output applyDefaultValue method
      */
     protected void applyDefaultValue(IObjectValue vo) {        
-		vo.put("state",new Integer(0));
-        
     }        
 	protected void setFieldsNull(com.kingdee.bos.dao.AbstractObjectValue arg0) {
 		super.setFieldsNull(arg0);

+ 0 - 2
src/com/kingdee/eas/hr/project/client/AbstractMemberManagementEditUI.properties

@@ -15,8 +15,6 @@ contprojectRole.boundLabelText=\u9879\u76EE\u89D2\u8272
 contemployee.boundLabelText=\u5458\u5DE5
 contnotes.boundLabelText=\u5907\u6CE8
 kDLabelContainer1.boundLabelText=\u9879\u76EE\u7BA1\u7406
-contstate.boundLabelText=\u662F\u5426\u72B6\u6001
-state.items=[Enum]com.kingdee.shr.base.syssetting.BaseItemStateEnum
 ActionSubmit.SHORT_DESCRIPTION=\u63D0\u4EA4
 ActionSubmit.LONG_DESCRIPTION=\u63D0\u4EA4
 ActionSubmit.NAME=\u63D0\u4EA4

+ 0 - 2
src/com/kingdee/eas/hr/project/client/AbstractMemberManagementEditUI_l1.properties

@@ -15,8 +15,6 @@ contprojectRole.boundLabelText=
 contemployee.boundLabelText=
 contnotes.boundLabelText=
 kDLabelContainer1.boundLabelText=
-contstate.boundLabelText=
-state.items=
 ActionSubmit.SHORT_DESCRIPTION=
 ActionSubmit.LONG_DESCRIPTION=
 ActionSubmit.NAME=

+ 0 - 2
src/com/kingdee/eas/hr/project/client/AbstractMemberManagementEditUI_l2.properties

@@ -15,8 +15,6 @@ contprojectRole.boundLabelText=\u9879\u76EE\u89D2\u8272
 contemployee.boundLabelText=\u5458\u5DE5
 contnotes.boundLabelText=\u5907\u6CE8
 kDLabelContainer1.boundLabelText=\u9879\u76EE\u7BA1\u7406
-contstate.boundLabelText=\u662F\u5426\u72B6\u6001
-state.items=[Enum]com.kingdee.shr.base.syssetting.BaseItemStateEnum
 ActionSubmit.SHORT_DESCRIPTION=\u63D0\u4EA4
 ActionSubmit.LONG_DESCRIPTION=\u63D0\u4EA4
 ActionSubmit.NAME=\u63D0\u4EA4

+ 0 - 2
src/com/kingdee/eas/hr/project/client/AbstractMemberManagementEditUI_l3.properties

@@ -15,8 +15,6 @@ contprojectRole.boundLabelText=\u9805\u76EE\u89D2\u8272
 contemployee.boundLabelText=\u54E1\u5DE5
 contnotes.boundLabelText=\u5099\u8A3B
 kDLabelContainer1.boundLabelText=\u9805\u76EE\u7BA1\u7406
-contstate.boundLabelText=\u662F\u5426\u72C0\u614B
-state.items=[Enum]com.kingdee.shr.base.syssetting.BaseItemStateEnum
 ActionSubmit.SHORT_DESCRIPTION=\u63D0\u4EA4
 ActionSubmit.LONG_DESCRIPTION=\u63D0\u4EA4
 ActionSubmit.NAME=\u63D0\u4EA4

Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
src/com/kingdee/eas/hr/project/client/AbstractMemberManagementListUI.java


Файловите разлики са ограничени, защото са твърде много
+ 0 - 2
src/com/kingdee/eas/hr/project/client/AbstractMemberManagementListUI.properties


Файловите разлики са ограничени, защото са твърде много
+ 0 - 2
src/com/kingdee/eas/hr/project/client/AbstractMemberManagementListUI_l2.properties


Файловите разлики са ограничени, защото са твърде много
+ 0 - 2
src/com/kingdee/eas/hr/project/client/AbstractMemberManagementListUI_l3.properties


Някои файлове не бяха показани, защото твърде много файлове са промени