Browse Source

wanyong:项目管理新增计划人天字段

wanyong 1 year ago
parent
commit
d7766cd73a
30 changed files with 418 additions and 56 deletions
  1. 26 0
      metadata/com/kingdee/eas/hr/project/app/CT_PRO_ProjectManagement.table
  2. 38 0
      metadata/com/kingdee/eas/hr/project/app/ProjectManagement.entity
  3. 37 0
      metadata/com/kingdee/eas/hr/project/app/ProjectManagementQuery.query
  4. 212 0
      metadata/com/kingdee/eas/hr/project/client/ProjectManagementEditUI.ui
  5. 0 0
      metadata/com/kingdee/eas/hr/project/client/ProjectManagementListUI.ui
  6. 13 0
      src/com/kingdee/eas/hr/project/AbstractMemberManagementInfo.java
  7. 11 0
      src/com/kingdee/eas/hr/project/AbstractProjectManagementInfo.java
  8. 7 2
      src/com/kingdee/eas/hr/project/app/MemberManagementControllerBean.java
  9. 2 2
      src/com/kingdee/eas/hr/project/app/ProjectChangeControllerBean.java
  10. 3 4
      src/com/kingdee/eas/hr/project/app/ProjectRoleControllerBean.java
  11. 2 3
      src/com/kingdee/eas/hr/project/app/ProjectTypeControllerBean.java
  12. 2 2
      src/com/kingdee/eas/hr/project/app/WorkHoursReportControllerBean.java
  13. 27 3
      src/com/kingdee/eas/hr/project/client/AbstractMemberManagementEditUI.java
  14. 2 0
      src/com/kingdee/eas/hr/project/client/AbstractMemberManagementEditUI.properties
  15. 2 0
      src/com/kingdee/eas/hr/project/client/AbstractMemberManagementEditUI_l1.properties
  16. 2 0
      src/com/kingdee/eas/hr/project/client/AbstractMemberManagementEditUI_l2.properties
  17. 2 0
      src/com/kingdee/eas/hr/project/client/AbstractMemberManagementEditUI_l3.properties
  18. 0 0
      src/com/kingdee/eas/hr/project/client/AbstractMemberManagementListUI.java
  19. 0 1
      src/com/kingdee/eas/hr/project/client/AbstractMemberManagementListUI.properties
  20. 0 1
      src/com/kingdee/eas/hr/project/client/AbstractMemberManagementListUI_l2.properties
  21. 0 1
      src/com/kingdee/eas/hr/project/client/AbstractMemberManagementListUI_l3.properties
  22. 26 30
      src/com/kingdee/eas/hr/project/client/AbstractProjectManagementEditUI.java
  23. 1 1
      src/com/kingdee/eas/hr/project/client/AbstractProjectManagementEditUI.properties
  24. 1 1
      src/com/kingdee/eas/hr/project/client/AbstractProjectManagementEditUI_l1.properties
  25. 1 1
      src/com/kingdee/eas/hr/project/client/AbstractProjectManagementEditUI_l2.properties
  26. 1 1
      src/com/kingdee/eas/hr/project/client/AbstractProjectManagementEditUI_l3.properties
  27. 0 0
      src/com/kingdee/eas/hr/project/client/AbstractProjectManagementListUI.java
  28. 0 1
      src/com/kingdee/eas/hr/project/client/AbstractProjectManagementListUI.properties
  29. 0 1
      src/com/kingdee/eas/hr/project/client/AbstractProjectManagementListUI_l2.properties
  30. 0 1
      src/com/kingdee/eas/hr/project/client/AbstractProjectManagementListUI_l3.properties

+ 26 - 0
metadata/com/kingdee/eas/hr/project/app/CT_PRO_ProjectManagement.table

@@ -483,6 +483,20 @@
             <scale>0</scale>
             <precision>0</precision>
         </column>
+        <column>
+            <name>CFplannedManDays</name>
+            <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_ProjectManagement].columns.column[CFplannedManDays].alias</alias>
+            <description>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_ProjectManagement].columns.column[CFplannedManDays].description</description>
+            <userDefined>true</userDefined>
+            <isMultilingual>false</isMultilingual>
+            <isEncoded>false</isEncoded>
+            <isNullable>false</isNullable>
+            <defaultValue>0</defaultValue>
+            <sqlType>NUMERIC</sqlType>
+            <length>28</length>
+            <scale>10</scale>
+            <precision>28</precision>
+        </column>
     </columns>
     <primaryKey>
         <name>PK_ProjectManageme</name>
@@ -802,6 +816,18 @@
             <lang locale="zh_HK" value="項目總人天" />
             <lang locale="zh_TW" value="項目總人天" />
         </rs>
+        <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_ProjectManagement].columns.column[CFplannedManDays].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_ProjectManagement].columns.column[CFplannedManDays].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_ProjectManagement].columns.column[FAdminOrgUnitId].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="行政组织" />

+ 38 - 0
metadata/com/kingdee/eas/hr/project/app/ProjectManagement.entity

@@ -483,6 +483,26 @@
                 <key name="name" value="CFProjectState" />
             </mappingField>
         </ownProperty>
+        <ownProperty>
+            <name>plannedManDays</name>
+            <alias>entityObject[com.kingdee.eas.hr.project.app.ProjectManagement].properties.ownProperty[plannedManDays].alias</alias>
+            <description>entityObject[com.kingdee.eas.hr.project.app.ProjectManagement].properties.ownProperty[plannedManDays].description</description>
+            <userDefined>true</userDefined>
+            <configured>false</configured>
+            <dataType>BigDecimal</dataType>
+            <metadataRef />
+            <isMultilingual>false</isMultilingual>
+            <isNullable>false</isNullable>
+            <formula />
+            <length>28</length>
+            <precision>28</precision>
+            <decimalDigits>10</decimalDigits>
+            <defaultValue>entityObject[com.kingdee.eas.hr.project.app.ProjectManagement].properties.ownProperty[plannedManDays].defaultValue</defaultValue>
+            <displayFormat />
+            <mappingField>
+                <key name="name" value="CFplannedManDays" />
+            </mappingField>
+        </ownProperty>
     </properties>
     <logicalKey>
         <name>id</name>
@@ -1610,6 +1630,24 @@
             <lang locale="zh_CN" value="true" />
             <lang locale="zh_TW" value="true" />
         </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.ProjectManagement].properties.ownProperty[plannedManDays].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.ProjectManagement].properties.ownProperty[plannedManDays].defaultValue">
+            <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="entityObject[com.kingdee.eas.hr.project.app.ProjectManagement].properties.ownProperty[plannedManDays].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.ProjectManagement].properties.ownProperty[proDayConsumption].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="人天耗用占比" />

+ 37 - 0
metadata/com/kingdee/eas/hr/project/app/ProjectManagementQuery.query

@@ -1404,6 +1404,37 @@
                 <key name="name" value="ProjectManagementQuery" />
             </query>
         </queryField>
+        <queryField>
+            <name>plannedManDays</name>
+            <userDefined>true</userDefined>
+            <formulaString />
+            <constString />
+            <displayName>joinQuery[com.kingdee.eas.hr.project.app.ProjectManagementQuery].units.queryField[plannedManDays].displayName</displayName>
+            <groupType />
+            <isSelector>true</isSelector>
+            <isFilter>true</isFilter>
+            <isSorter>false</isSorter>
+            <isParameter>false</isParameter>
+            <returnType>Number</returnType>
+            <propertyRefs>
+                <propertyRef>
+                    <key>c05f2b17-fcf6-41b8-b841-35bb428c3d84</key>
+                    <parentUnit>
+                        <key name="name" value="plannedManDays" />
+                    </parentUnit>
+                    <subEntity>
+                        <key name="name" value="ProjectManagement" />
+                    </subEntity>
+                    <refProperty>
+                        <key name="name" value="plannedManDays" />
+                    </refProperty>
+                </propertyRef>
+            </propertyRefs>
+            <query>
+                <key name="package" value="com.kingdee.eas.hr.project.app" />
+                <key name="name" value="ProjectManagementQuery" />
+            </query>
+        </queryField>
     </units>
     <defaultFilter>
         <name>defaultFilter</name>
@@ -2069,6 +2100,12 @@
             <lang locale="zh_CN" value="true" />
             <lang locale="zh_TW" value="true" />
         </rs>
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.ProjectManagementQuery].units.queryField[plannedManDays].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.ProjectManagementQuery].units.queryField[projectCode].displayName">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="项目编码" />

+ 212 - 0
metadata/com/kingdee/eas/hr/project/client/ProjectManagementEditUI.ui

@@ -1084,6 +1084,11 @@
             <tabIndex>33</tabIndex>
             <herited>false</herited>
             <bimUIObjectPK />
+            <layoutInfo>
+                <name />
+                <type>XYLayout</type>
+                <value />
+            </layoutInfo>
             <properties>
                 <property>
                     <name>text</name>
@@ -1173,6 +1178,55 @@
                 <key name="name" value="CoreUI" />
             </parent>
         </component>
+        <component>
+            <name>kDLabelContainer3</name>
+            <alias>uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[kDLabelContainer3].alias</alias>
+            <userDefined>true</userDefined>
+            <classType>com.kingdee.bos.ctrl.swing.KDLabelContainer</classType>
+            <isContainer>true</isContainer>
+            <constraints>727,131,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.hr.project.client.ProjectManagementEditUI].components.component[kDLabelContainer3].properties.property[boundLabelText].value</value>
+                    <isMultiLan>true</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+                <property>
+                    <name>boundLabelLength</name>
+                    <type>int</type>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[kDLabelContainer3].properties.property[boundLabelLength].value</value>
+                    <isMultiLan>false</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+                <property>
+                    <name>boundLabelUnderline</name>
+                    <type>boolean</type>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[kDLabelContainer3].properties.property[boundLabelUnderline].value</value>
+                    <isMultiLan>false</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+                <property>
+                    <name>visible</name>
+                    <type>boolean</type>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[kDLabelContainer3].properties.property[visible].value</value>
+                    <isMultiLan>false</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+            </properties>
+            <parent>
+                <key name="name" value="CoreUI" />
+            </parent>
+        </component>
         <component>
             <name>prmtCreator</name>
             <alias>uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[prmtCreator].alias</alias>
@@ -2265,6 +2319,11 @@
             <tabIndex>30</tabIndex>
             <herited>false</herited>
             <bimUIObjectPK />
+            <layoutInfo>
+                <name />
+                <type>XYLayout</type>
+                <value />
+            </layoutInfo>
             <properties>
                 <property>
                     <name>horizontalAlignment</name>
@@ -2343,6 +2402,11 @@
             <tabIndex>34</tabIndex>
             <herited>false</herited>
             <bimUIObjectPK />
+            <layoutInfo>
+                <name />
+                <type>XYLayout</type>
+                <value />
+            </layoutInfo>
             <properties>
                 <property>
                     <name>visible</name>
@@ -2383,6 +2447,76 @@
                 </propertyBinding>
             </propertyBindings>
         </component>
+        <component>
+            <name>kDFormattedTextField3</name>
+            <alias>uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[kDFormattedTextField3].alias</alias>
+            <userDefined>true</userDefined>
+            <classType>com.kingdee.bos.ctrl.swing.KDFormattedTextField</classType>
+            <isContainer>false</isContainer>
+            <constraints>7</constraints>
+            <tabIndex>0</tabIndex>
+            <herited>false</herited>
+            <bimUIObjectPK />
+            <layoutInfo>
+                <name />
+                <type>XYLayout</type>
+                <value />
+            </layoutInfo>
+            <properties>
+                <property>
+                    <name>horizontalAlignment</name>
+                    <type>int</type>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[kDFormattedTextField3].properties.property[horizontalAlignment].value</value>
+                    <isMultiLan>false</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+                <property>
+                    <name>dataType</name>
+                    <type>int</type>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[kDFormattedTextField3].properties.property[dataType].value</value>
+                    <isMultiLan>false</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+                <property>
+                    <name>supportedEmpty</name>
+                    <type>boolean</type>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[kDFormattedTextField3].properties.property[supportedEmpty].value</value>
+                    <isMultiLan>false</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+                <property>
+                    <name>minimumValue</name>
+                    <type>java.math.BigDecimal</type>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[kDFormattedTextField3].properties.property[minimumValue].value</value>
+                    <isMultiLan>false</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+                <property>
+                    <name>maximumValue</name>
+                    <type>java.math.BigDecimal</type>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[kDFormattedTextField3].properties.property[maximumValue].value</value>
+                    <isMultiLan>false</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+                <property>
+                    <name>precision</name>
+                    <type>int</type>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[kDFormattedTextField3].properties.property[precision].value</value>
+                    <isMultiLan>false</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+                <property>
+                    <name>required</name>
+                    <type>boolean</type>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[kDFormattedTextField3].properties.property[required].value</value>
+                    <isMultiLan>false</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+            </properties>
+            <parent>
+                <key name="name" value="kDLabelContainer3" />
+            </parent>
+        </component>
         <component>
             <name>btnTraceUp</name>
             <alias>uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[btnTraceUp].alias</alias>
@@ -3852,6 +3986,54 @@
             <lang locale="zh_HK" value="true" />
             <lang locale="zh_TW" value="true" />
         </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[kDFormattedTextField3].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.hr.project.client.ProjectManagementEditUI].components.component[kDFormattedTextField3].properties.property[dataType].value">
+            <lang locale="en_US" value="1" />
+            <lang locale="zh_CN" value="1" />
+            <lang locale="zh_HK" value="1" />
+            <lang locale="zh_TW" value="1" />
+        </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[kDFormattedTextField3].properties.property[horizontalAlignment].value">
+            <lang locale="en_US" value="2" />
+            <lang locale="zh_CN" value="2" />
+            <lang locale="zh_HK" value="2" />
+            <lang locale="zh_TW" value="2" />
+        </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[kDFormattedTextField3].properties.property[maximumValue].value">
+            <lang locale="en_US" value="&quot;1.0E18&quot;" />
+            <lang locale="zh_CN" value="&quot;1.0E18&quot;" />
+            <lang locale="zh_HK" value="&quot;1.0E18&quot;" />
+            <lang locale="zh_TW" value="&quot;1.0E18&quot;" />
+        </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[kDFormattedTextField3].properties.property[minimumValue].value">
+            <lang locale="en_US" value="&quot;-1.0E18&quot;" />
+            <lang locale="zh_CN" value="&quot;-1.0E18&quot;" />
+            <lang locale="zh_HK" value="&quot;-1.0E18&quot;" />
+            <lang locale="zh_TW" value="&quot;-1.0E18&quot;" />
+        </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[kDFormattedTextField3].properties.property[precision].value">
+            <lang locale="en_US" value="10" />
+            <lang locale="zh_CN" value="10" />
+            <lang locale="zh_HK" value="10" />
+            <lang locale="zh_TW" value="10" />
+        </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[kDFormattedTextField3].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.hr.project.client.ProjectManagementEditUI].components.component[kDFormattedTextField3].properties.property[supportedEmpty].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.hr.project.client.ProjectManagementEditUI].components.component[kDLabelContainer1].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="null" />
@@ -3912,6 +4094,36 @@
             <lang locale="zh_HK" value="true" />
             <lang locale="zh_TW" value="true" />
         </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[kDLabelContainer3].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.hr.project.client.ProjectManagementEditUI].components.component[kDLabelContainer3].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.hr.project.client.ProjectManagementEditUI].components.component[kDLabelContainer3].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.hr.project.client.ProjectManagementEditUI].components.component[kDLabelContainer3].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.hr.project.client.ProjectManagementEditUI].components.component[kDLabelContainer3].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.hr.project.client.ProjectManagementEditUI].components.component[kdtEntrys].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="null" />

File diff suppressed because it is too large
+ 0 - 0
metadata/com/kingdee/eas/hr/project/client/ProjectManagementListUI.ui


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

@@ -102,6 +102,19 @@ 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");

+ 11 - 0
src/com/kingdee/eas/hr/project/AbstractProjectManagementInfo.java

@@ -194,6 +194,17 @@ public class AbstractProjectManagementInfo extends com.kingdee.eas.hr.base.HRBil
         setInt("projectState", item.getValue());
 		}
     }
+    /**
+     * Object:ÏîÄ¿¹ÜÀí's ÏîÄ¿¼Æ»®ÈËÌìproperty 
+     */
+    public java.math.BigDecimal getPlannedManDays()
+    {
+        return getBigDecimal("plannedManDays");
+    }
+    public void setPlannedManDays(java.math.BigDecimal item)
+    {
+        setBigDecimal("plannedManDays", item);
+    }
     public BOSObjectType getBOSType()
     {
         return new BOSObjectType("B15489DB");

+ 7 - 2
src/com/kingdee/eas/hr/project/app/MemberManagementControllerBean.java

@@ -18,13 +18,13 @@ import com.kingdee.bos.service.ServiceContext;
 import com.kingdee.bos.service.IServiceContext;
 
 import com.kingdee.eas.framework.CoreBillBaseCollection;
+import com.kingdee.eas.framework.app.CoreBillBaseControllerBean;
 import com.kingdee.eas.framework.CoreBaseInfo;
 import com.kingdee.eas.hr.project.MemberManagementCollection;
 import com.kingdee.bos.dao.IObjectPK;
-import com.kingdee.eas.hr.base.HRBillBaseCollection;
-import com.kingdee.eas.hr.base.app.HRBillBaseControllerBean;
 import com.kingdee.bos.metadata.entity.SelectorItemCollection;
 import com.kingdee.eas.common.EASBizException;
+import com.kingdee.eas.framework.SystemEnum;
 import com.kingdee.eas.framework.CoreBaseCollection;
 import com.kingdee.bos.metadata.entity.EntityViewInfo;
 import java.lang.String;
@@ -35,4 +35,9 @@ public class MemberManagementControllerBean extends AbstractMemberManagementCont
 {
     private static Logger logger =
         Logger.getLogger("com.kingdee.eas.hr.project.app.MemberManagementControllerBean");
+
+    @Override
+    protected IObjectPK _submit(Context ctx, IObjectValue model) throws BOSException, EASBizException {
+        return super._submit(ctx, model);
+    }
 }

+ 2 - 2
src/com/kingdee/eas/hr/project/app/ProjectChangeControllerBean.java

@@ -18,14 +18,14 @@ import com.kingdee.bos.service.ServiceContext;
 import com.kingdee.bos.service.IServiceContext;
 
 import com.kingdee.eas.framework.CoreBillBaseCollection;
+import com.kingdee.eas.framework.app.CoreBillBaseControllerBean;
 import com.kingdee.eas.hr.project.ProjectChangeCollection;
 import com.kingdee.eas.hr.project.ProjectChangeInfo;
 import com.kingdee.eas.framework.CoreBaseInfo;
 import com.kingdee.bos.dao.IObjectPK;
-import com.kingdee.eas.hr.base.HRBillBaseCollection;
-import com.kingdee.eas.hr.base.app.HRBillBaseControllerBean;
 import com.kingdee.bos.metadata.entity.SelectorItemCollection;
 import com.kingdee.eas.common.EASBizException;
+import com.kingdee.eas.framework.SystemEnum;
 import com.kingdee.eas.framework.CoreBaseCollection;
 import com.kingdee.bos.metadata.entity.EntityViewInfo;
 import java.lang.String;

+ 3 - 4
src/com/kingdee/eas/hr/project/app/ProjectRoleControllerBean.java

@@ -17,17 +17,16 @@ import com.kingdee.bos.dao.IObjectCollection;
 import com.kingdee.bos.service.ServiceContext;
 import com.kingdee.bos.service.IServiceContext;
 
-import com.kingdee.eas.framework.CoreBaseInfo;
-import com.kingdee.eas.hr.project.ProjectRoleInfo;
 import com.kingdee.bos.dao.IObjectPK;
-import com.kingdee.shr.base.syssetting.app.SHRBaseItemControllerBean;
 import com.kingdee.bos.metadata.entity.SelectorItemCollection;
 import com.kingdee.eas.hr.project.ProjectRoleCollection;
-import com.kingdee.shr.base.syssetting.SHRBaseItemCollection;
 import com.kingdee.eas.common.EASBizException;
 import com.kingdee.eas.framework.CoreBaseCollection;
+import com.kingdee.eas.framework.CoreBaseInfo;
+import com.kingdee.eas.hr.project.ProjectRoleInfo;
 import com.kingdee.bos.metadata.entity.EntityViewInfo;
 import java.lang.String;
+import com.kingdee.eas.framework.app.DataBaseControllerBean;
 import com.kingdee.eas.framework.DataBaseCollection;
 import com.kingdee.eas.framework.ObjectBaseCollection;
 

+ 2 - 3
src/com/kingdee/eas/hr/project/app/ProjectTypeControllerBean.java

@@ -17,17 +17,16 @@ import com.kingdee.bos.dao.IObjectCollection;
 import com.kingdee.bos.service.ServiceContext;
 import com.kingdee.bos.service.IServiceContext;
 
-import com.kingdee.eas.framework.CoreBaseInfo;
 import com.kingdee.bos.dao.IObjectPK;
-import com.kingdee.shr.base.syssetting.app.SHRBaseItemControllerBean;
 import com.kingdee.bos.metadata.entity.SelectorItemCollection;
 import com.kingdee.eas.hr.project.ProjectTypeCollection;
-import com.kingdee.shr.base.syssetting.SHRBaseItemCollection;
 import com.kingdee.eas.common.EASBizException;
 import com.kingdee.eas.framework.CoreBaseCollection;
+import com.kingdee.eas.framework.CoreBaseInfo;
 import com.kingdee.eas.hr.project.ProjectTypeInfo;
 import com.kingdee.bos.metadata.entity.EntityViewInfo;
 import java.lang.String;
+import com.kingdee.eas.framework.app.DataBaseControllerBean;
 import com.kingdee.eas.framework.DataBaseCollection;
 import com.kingdee.eas.framework.ObjectBaseCollection;
 

+ 2 - 2
src/com/kingdee/eas/hr/project/app/WorkHoursReportControllerBean.java

@@ -19,12 +19,12 @@ import com.kingdee.bos.service.IServiceContext;
 
 import com.kingdee.eas.hr.project.WorkHoursReportCollection;
 import com.kingdee.eas.framework.CoreBillBaseCollection;
+import com.kingdee.eas.framework.app.CoreBillBaseControllerBean;
 import com.kingdee.eas.framework.CoreBaseInfo;
 import com.kingdee.bos.dao.IObjectPK;
-import com.kingdee.eas.hr.base.HRBillBaseCollection;
-import com.kingdee.eas.hr.base.app.HRBillBaseControllerBean;
 import com.kingdee.bos.metadata.entity.SelectorItemCollection;
 import com.kingdee.eas.common.EASBizException;
+import com.kingdee.eas.framework.SystemEnum;
 import com.kingdee.eas.framework.CoreBaseCollection;
 import com.kingdee.bos.metadata.entity.EntityViewInfo;
 import com.kingdee.eas.hr.project.WorkHoursReportInfo;

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

@@ -62,6 +62,7 @@ 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;
@@ -76,6 +77,7 @@ 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
@@ -155,6 +157,7 @@ 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();
@@ -169,6 +172,7 @@ 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");
@@ -184,6 +188,7 @@ 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");
@@ -198,6 +203,7 @@ 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);		
@@ -299,6 +305,11 @@ 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		
@@ -357,7 +368,11 @@ public abstract class AbstractMemberManagementEditUI extends com.kingdee.eas.fra
         this.kDBizPromptBox1.setEditFormat("$number$");		
         this.kDBizPromptBox1.setCommitFormat("$number$");		
         this.kDBizPromptBox1.setRequired(false);
-        this.setFocusTraversalPolicy(new com.kingdee.bos.ui.UIFocusTraversalPolicy(new java.awt.Component[] {txtprojectCode,txtprojectName,prmtprojectRole,prmtemployee,txtnotes}));
+        // 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.setFocusCycleRoot(true);
 		//Register control's property binding
 		registerBindings();
@@ -416,6 +431,8 @@ 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
@@ -444,6 +461,8 @@ public abstract class AbstractMemberManagementEditUI extends com.kingdee.eas.fra
         contnotes.setBoundEditor(txtnotes);
         //kDLabelContainer1
         kDLabelContainer1.setBoundEditor(kDBizPromptBox1);
+        //contstate
+        contstate.setBoundEditor(state);
 
     }
 
@@ -634,7 +653,8 @@ 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("notes", String.class, this.txtnotes, "text");
+		dataBinder.registerBinding("state", com.kingdee.shr.base.syssetting.BaseItemStateEnum.class, this.state, "selectedItem");		
 	}
 	//Regiester UI State
 	private void registerUIState(){		
@@ -783,7 +803,8 @@ 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("notes", ValidateHelper.ON_SAVE);    
+		getValidateHelper().registerBindProperty("state", ValidateHelper.ON_SAVE);    		
 	}
 
 
@@ -872,6 +893,7 @@ 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;
     }        
     	
@@ -1011,6 +1033,8 @@ 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);

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

@@ -15,6 +15,8 @@ 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

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

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

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

@@ -15,6 +15,8 @@ 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

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

@@ -15,6 +15,8 @@ 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

File diff suppressed because it is too large
+ 0 - 0
src/com/kingdee/eas/hr/project/client/AbstractMemberManagementListUI.java


File diff suppressed because it is too large
+ 0 - 1
src/com/kingdee/eas/hr/project/client/AbstractMemberManagementListUI.properties


File diff suppressed because it is too large
+ 0 - 1
src/com/kingdee/eas/hr/project/client/AbstractMemberManagementListUI_l2.properties


File diff suppressed because it is too large
+ 0 - 1
src/com/kingdee/eas/hr/project/client/AbstractMemberManagementListUI_l3.properties


+ 26 - 30
src/com/kingdee/eas/hr/project/client/AbstractProjectManagementEditUI.java

@@ -70,7 +70,7 @@ public abstract class AbstractProjectManagementEditUI extends com.kingdee.eas.fr
     protected com.kingdee.bos.ctrl.swing.KDLabelContainer contchangedManDays;
     protected com.kingdee.bos.ctrl.swing.KDCheckBox chkbeingChanged;
     protected com.kingdee.bos.ctrl.swing.KDLabelContainer contprojectState;
-    protected com.kingdee.bos.ctrl.swing.KDLabelContainer contplannedManDays;
+    protected com.kingdee.bos.ctrl.swing.KDLabelContainer kDLabelContainer3;
     protected com.kingdee.bos.ctrl.extendcontrols.KDBizPromptBox prmtCreator;
     protected com.kingdee.bos.ctrl.swing.KDDatePicker kDDateCreateTime;
     protected com.kingdee.bos.ctrl.extendcontrols.KDBizPromptBox prmtLastUpdateUser;
@@ -92,7 +92,7 @@ public abstract class AbstractProjectManagementEditUI extends com.kingdee.eas.fr
     protected com.kingdee.bos.ctrl.swing.KDFormattedTextField kDFormattedTextField2;
     protected com.kingdee.bos.ctrl.swing.KDFormattedTextField txtchangedManDays;
     protected com.kingdee.bos.ctrl.swing.KDComboBox projectState;
-    protected com.kingdee.bos.ctrl.swing.KDFormattedTextField txtplannedManDays;
+    protected com.kingdee.bos.ctrl.swing.KDFormattedTextField kDFormattedTextField3;
     protected com.kingdee.eas.hr.project.ProjectManagementInfo editData = null;
     /**
      * output class constructor
@@ -180,7 +180,7 @@ public abstract class AbstractProjectManagementEditUI extends com.kingdee.eas.fr
         this.contchangedManDays = new com.kingdee.bos.ctrl.swing.KDLabelContainer();
         this.chkbeingChanged = new com.kingdee.bos.ctrl.swing.KDCheckBox();
         this.contprojectState = new com.kingdee.bos.ctrl.swing.KDLabelContainer();
-        this.contplannedManDays = new com.kingdee.bos.ctrl.swing.KDLabelContainer();
+        this.kDLabelContainer3 = 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();
@@ -202,7 +202,7 @@ public abstract class AbstractProjectManagementEditUI extends com.kingdee.eas.fr
         this.kDFormattedTextField2 = new com.kingdee.bos.ctrl.swing.KDFormattedTextField();
         this.txtchangedManDays = new com.kingdee.bos.ctrl.swing.KDFormattedTextField();
         this.projectState = new com.kingdee.bos.ctrl.swing.KDComboBox();
-        this.txtplannedManDays = new com.kingdee.bos.ctrl.swing.KDFormattedTextField();
+        this.kDFormattedTextField3 = new com.kingdee.bos.ctrl.swing.KDFormattedTextField();
         this.contCreator.setName("contCreator");
         this.contCreateTime.setName("contCreateTime");
         this.contLastUpdateUser.setName("contLastUpdateUser");
@@ -226,7 +226,7 @@ public abstract class AbstractProjectManagementEditUI extends com.kingdee.eas.fr
         this.contchangedManDays.setName("contchangedManDays");
         this.chkbeingChanged.setName("chkbeingChanged");
         this.contprojectState.setName("contprojectState");
-        this.contplannedManDays.setName("contplannedManDays");
+        this.kDLabelContainer3.setName("kDLabelContainer3");
         this.prmtCreator.setName("prmtCreator");
         this.kDDateCreateTime.setName("kDDateCreateTime");
         this.prmtLastUpdateUser.setName("prmtLastUpdateUser");
@@ -248,7 +248,7 @@ public abstract class AbstractProjectManagementEditUI extends com.kingdee.eas.fr
         this.kDFormattedTextField2.setName("kDFormattedTextField2");
         this.txtchangedManDays.setName("txtchangedManDays");
         this.projectState.setName("projectState");
-        this.txtplannedManDays.setName("txtplannedManDays");
+        this.kDFormattedTextField3.setName("kDFormattedTextField3");
         // CoreUI		
         this.btnTraceUp.setVisible(false);		
         this.btnTraceDown.setVisible(false);		
@@ -389,11 +389,11 @@ public abstract class AbstractProjectManagementEditUI extends com.kingdee.eas.fr
         this.contprojectState.setBoundLabelLength(100);		
         this.contprojectState.setBoundLabelUnderline(true);		
         this.contprojectState.setVisible(true);
-        // contplannedManDays		
-        this.contplannedManDays.setBoundLabelText(resHelper.getString("contplannedManDays.boundLabelText"));		
-        this.contplannedManDays.setBoundLabelLength(100);		
-        this.contplannedManDays.setBoundLabelUnderline(true);		
-        this.contplannedManDays.setVisible(true);
+        // kDLabelContainer3		
+        this.kDLabelContainer3.setBoundLabelText(resHelper.getString("kDLabelContainer3.boundLabelText"));		
+        this.kDLabelContainer3.setBoundLabelLength(100);		
+        this.kDLabelContainer3.setBoundLabelUnderline(true);		
+        this.kDLabelContainer3.setVisible(true);
         // prmtCreator		
         this.prmtCreator.setEnabled(false);		
         this.prmtCreator.setVisible(false);
@@ -491,16 +491,15 @@ public abstract class AbstractProjectManagementEditUI extends com.kingdee.eas.fr
         this.projectState.setVisible(true);		
         this.projectState.addItems(EnumUtils.getEnumList("com.kingdee.eas.hr.project.projectState").toArray());		
         this.projectState.setRequired(false);
-        // txtplannedManDays		
-        this.txtplannedManDays.setVisible(true);		
-        this.txtplannedManDays.setHorizontalAlignment(2);		
-        this.txtplannedManDays.setDataType(1);		
-        this.txtplannedManDays.setSupportedEmpty(true);		
-        this.txtplannedManDays.setMinimumValue( new java.math.BigDecimal("-1.0E18"));		
-        this.txtplannedManDays.setMaximumValue( new java.math.BigDecimal("1.0E18"));		
-        this.txtplannedManDays.setPrecision(10);		
-        this.txtplannedManDays.setRequired(false);
-        this.setFocusTraversalPolicy(new com.kingdee.bos.ui.UIFocusTraversalPolicy(new java.awt.Component[] {txtNumber,pkBizDate,txtDescription,prmtAuditor,prmtCreator,kDDateCreateTime,prmtLastUpdateUser,kDDateLastUpdateTime,txtprojectCode,txtprojectName,projectLevel,prmtprojectManager,pkexpectedStartTime,pkexpectedEndTime,txttotalPersonDays,txtcostAmount,txtchangedManDays,txtnotes,kdtEntrys,chkbeingChanged,projectState,txtplannedManDays}));
+        // kDFormattedTextField3		
+        this.kDFormattedTextField3.setHorizontalAlignment(2);		
+        this.kDFormattedTextField3.setDataType(1);		
+        this.kDFormattedTextField3.setSupportedEmpty(true);		
+        this.kDFormattedTextField3.setMinimumValue( new java.math.BigDecimal("-1.0E18"));		
+        this.kDFormattedTextField3.setMaximumValue( new java.math.BigDecimal("1.0E18"));		
+        this.kDFormattedTextField3.setPrecision(10);		
+        this.kDFormattedTextField3.setRequired(false);
+        this.setFocusTraversalPolicy(new com.kingdee.bos.ui.UIFocusTraversalPolicy(new java.awt.Component[] {txtNumber,pkBizDate,txtDescription,prmtAuditor,prmtCreator,kDDateCreateTime,prmtLastUpdateUser,kDDateLastUpdateTime,txtprojectCode,txtprojectName,projectLevel,prmtprojectManager,pkexpectedStartTime,pkexpectedEndTime,txttotalPersonDays,txtcostAmount,txtchangedManDays,txtnotes,kdtEntrys,chkbeingChanged,projectState}));
         this.setFocusCycleRoot(true);
 		//Register control's property binding
 		registerBindings();
@@ -575,8 +574,8 @@ public abstract class AbstractProjectManagementEditUI extends com.kingdee.eas.fr
         this.add(chkbeingChanged, null);
         contprojectState.setBounds(new Rectangle(32, 128, 270, 19));
         this.add(contprojectState, null);
-        contplannedManDays.setBounds(new Rectangle(725, 128, 270, 19));
-        this.add(contplannedManDays, null);
+        kDLabelContainer3.setBounds(new Rectangle(727, 131, 270, 19));
+        this.add(kDLabelContainer3, null);
         //contCreator
         contCreator.setBoundEditor(prmtCreator);
         //contCreateTime
@@ -619,8 +618,8 @@ public abstract class AbstractProjectManagementEditUI extends com.kingdee.eas.fr
         contchangedManDays.setBoundEditor(txtchangedManDays);
         //contprojectState
         contprojectState.setBoundEditor(projectState);
-        //contplannedManDays
-        contplannedManDays.setBoundEditor(txtplannedManDays);
+        //kDLabelContainer3
+        kDLabelContainer3.setBoundEditor(kDFormattedTextField3);
 
     }
 
@@ -819,8 +818,7 @@ public abstract class AbstractProjectManagementEditUI extends com.kingdee.eas.fr
 		dataBinder.registerBinding("costAmount", java.math.BigDecimal.class, this.txtcostAmount, "value");
 		dataBinder.registerBinding("notes", String.class, this.txtnotes, "text");
 		dataBinder.registerBinding("changedManDays", java.math.BigDecimal.class, this.txtchangedManDays, "value");
-		dataBinder.registerBinding("projectState", com.kingdee.eas.hr.project.projectState.class, this.projectState, "selectedItem");
-		dataBinder.registerBinding("plannedManDays", java.math.BigDecimal.class, this.txtplannedManDays, "value");		
+		dataBinder.registerBinding("projectState", com.kingdee.eas.hr.project.projectState.class, this.projectState, "selectedItem");		
 	}
 	//Regiester UI State
 	private void registerUIState(){		
@@ -977,8 +975,7 @@ public abstract class AbstractProjectManagementEditUI extends com.kingdee.eas.fr
 		getValidateHelper().registerBindProperty("costAmount", ValidateHelper.ON_SAVE);    
 		getValidateHelper().registerBindProperty("notes", ValidateHelper.ON_SAVE);    
 		getValidateHelper().registerBindProperty("changedManDays", ValidateHelper.ON_SAVE);    
-		getValidateHelper().registerBindProperty("projectState", ValidateHelper.ON_SAVE);    
-		getValidateHelper().registerBindProperty("plannedManDays", ValidateHelper.ON_SAVE);    		
+		getValidateHelper().registerBindProperty("projectState", ValidateHelper.ON_SAVE);    		
 	}
 
 
@@ -1066,7 +1063,6 @@ public abstract class AbstractProjectManagementEditUI extends com.kingdee.eas.fr
         sic.add(new SelectorItemInfo("notes"));
         sic.add(new SelectorItemInfo("changedManDays"));
         sic.add(new SelectorItemInfo("projectState"));
-        sic.add(new SelectorItemInfo("plannedManDays"));
         return sic;
     }        
     	

+ 1 - 1
src/com/kingdee/eas/hr/project/client/AbstractProjectManagementEditUI.properties

@@ -26,7 +26,7 @@ contchangedManDays.boundLabelText=\u53D8\u66F4\u4EBA\u5929
 chkbeingChanged.text=\u662F\u5426\u53D8\u66F4\u4E2D
 contprojectState.boundLabelText=\u5355\u636E\u72B6\u6001
 projectState.items=[Enum]com.kingdee.eas.hr.project.projectState
-contplannedManDays.boundLabelText=\u9879\u76EE\u8BA1\u5212\u4EBA\u5929
+kDLabelContainer3.boundLabelText=\u9879\u76EE\u8BA1\u5212\u4EBA\u5929
 ActionSubmit.SHORT_DESCRIPTION=\u63D0\u4EA4
 ActionSubmit.LONG_DESCRIPTION=\u63D0\u4EA4
 ActionSubmit.NAME=\u63D0\u4EA4

+ 1 - 1
src/com/kingdee/eas/hr/project/client/AbstractProjectManagementEditUI_l1.properties

@@ -25,7 +25,7 @@ contchangedManDays.boundLabelText=
 chkbeingChanged.text=
 contprojectState.boundLabelText=
 projectState.items=
-contplannedManDays.boundLabelText=
+kDLabelContainer3.boundLabelText=
 ActionSubmit.SHORT_DESCRIPTION=
 ActionSubmit.LONG_DESCRIPTION=
 ActionSubmit.NAME=

+ 1 - 1
src/com/kingdee/eas/hr/project/client/AbstractProjectManagementEditUI_l2.properties

@@ -26,7 +26,7 @@ contchangedManDays.boundLabelText=\u53D8\u66F4\u4EBA\u5929
 chkbeingChanged.text=\u662F\u5426\u53D8\u66F4\u4E2D
 contprojectState.boundLabelText=\u5355\u636E\u72B6\u6001
 projectState.items=[Enum]com.kingdee.eas.hr.project.projectState
-contplannedManDays.boundLabelText=\u9879\u76EE\u8BA1\u5212\u4EBA\u5929
+kDLabelContainer3.boundLabelText=\u9879\u76EE\u8BA1\u5212\u4EBA\u5929
 ActionSubmit.SHORT_DESCRIPTION=\u63D0\u4EA4
 ActionSubmit.LONG_DESCRIPTION=\u63D0\u4EA4
 ActionSubmit.NAME=\u63D0\u4EA4

+ 1 - 1
src/com/kingdee/eas/hr/project/client/AbstractProjectManagementEditUI_l3.properties

@@ -26,7 +26,7 @@ contchangedManDays.boundLabelText=\u8B8A\u66F4\u4EBA\u5929
 chkbeingChanged.text=\u662F\u5426\u8B8A\u66F4\u4E2D
 contprojectState.boundLabelText=\u55AE\u64DA\u72C0\u614B
 projectState.items=[Enum]com.kingdee.eas.hr.project.projectState
-contplannedManDays.boundLabelText=\u9805\u76EE\u8A08\u756B\u4EBA\u5929
+kDLabelContainer3.boundLabelText=\u9805\u76EE\u8A08\u756B\u4EBA\u5929
 ActionSubmit.SHORT_DESCRIPTION=\u63D0\u4EA4
 ActionSubmit.LONG_DESCRIPTION=\u63D0\u4EA4
 ActionSubmit.NAME=\u63D0\u4EA4

File diff suppressed because it is too large
+ 0 - 0
src/com/kingdee/eas/hr/project/client/AbstractProjectManagementListUI.java


File diff suppressed because it is too large
+ 0 - 1
src/com/kingdee/eas/hr/project/client/AbstractProjectManagementListUI.properties


File diff suppressed because it is too large
+ 0 - 1
src/com/kingdee/eas/hr/project/client/AbstractProjectManagementListUI_l2.properties


File diff suppressed because it is too large
+ 0 - 1
src/com/kingdee/eas/hr/project/client/AbstractProjectManagementListUI_l3.properties


Some files were not shown because too many files changed in this diff