Browse Source

wanyong:修改工时确认单字段打卡时间数据类型

wanyong 1 year ago
parent
commit
f1104539e5
23 changed files with 390 additions and 75 deletions
  1. 3 3
      metadata/com/kingdee/eas/hr/project/ProjectManagement.bizunit
  2. 76 49
      metadata/com/kingdee/eas/hr/project/app/CT_PRO_ProjectManagement.table
  3. 10 10
      metadata/com/kingdee/eas/hr/project/app/CT_PRO_WorkHoursConfirm.table
  4. 98 0
      metadata/com/kingdee/eas/hr/project/app/ProjectManagement.entity
  5. 57 0
      metadata/com/kingdee/eas/hr/project/app/ProjectManagementQuery.query
  6. 1 1
      metadata/com/kingdee/eas/hr/project/app/WorkHoursConfirm.entity
  7. 74 0
      metadata/com/kingdee/eas/hr/project/client/ProjectManagementEditUI.ui
  8. 11 0
      metadata/com/kingdee/eas/hr/project/client/ProjectManagementListUI.ui
  9. 2 2
      metadata/entity_pkmapping.properties
  10. 1 1
      metadata/facade_pkmapping.properties
  11. 11 0
      src/com/kingdee/eas/hr/project/AbstractProjectManagementInfo.java
  12. 4 4
      src/com/kingdee/eas/hr/project/AbstractWorkHoursConfirmInfo.java
  13. 13 1
      src/com/kingdee/eas/hr/project/client/AbstractProjectManagementEditUI.java
  14. 1 0
      src/com/kingdee/eas/hr/project/client/AbstractProjectManagementEditUI.properties
  15. 1 0
      src/com/kingdee/eas/hr/project/client/AbstractProjectManagementEditUI_l1.properties
  16. 1 0
      src/com/kingdee/eas/hr/project/client/AbstractProjectManagementEditUI_l2.properties
  17. 1 0
      src/com/kingdee/eas/hr/project/client/AbstractProjectManagementEditUI_l3.properties
  18. 0 0
      src/com/kingdee/eas/hr/project/client/AbstractProjectManagementListUI.java
  19. 0 1
      src/com/kingdee/eas/hr/project/client/AbstractProjectManagementListUI.properties
  20. 0 1
      src/com/kingdee/eas/hr/project/client/AbstractProjectManagementListUI_l2.properties
  21. 0 1
      src/com/kingdee/eas/hr/project/client/AbstractProjectManagementListUI_l3.properties
  22. 8 0
      websrc/com/kingdee/eas/hr/project/handler/ProjectManagementEditHandler.java
  23. 17 1
      websrc/com/kingdee/eas/hr/project/handler/ProjectManagementListHandler.java

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

@@ -101,9 +101,9 @@
             <lang locale="zh_TW" value="com.kingdee.eas.hr.project.client.ProjectManagementListUI" />
         </rs>
         <rs key="bizUnit[com.kingdee.eas.hr.project.ProjectManagement].extendedProperty.maxFieldIndex">
-            <lang locale="en_US" value="19" />
-            <lang locale="zh_CN" value="19" />
-            <lang locale="zh_TW" value="19" />
+            <lang locale="en_US" value="21" />
+            <lang locale="zh_CN" value="21" />
+            <lang locale="zh_TW" value="21" />
         </rs>
         <rs key="bizUnit[com.kingdee.eas.hr.project.ProjectManagement].extendedProperty.userDefined">
             <lang locale="en_US" value="true" />

+ 76 - 49
metadata/com/kingdee/eas/hr/project/app/CT_PRO_ProjectManagement.table

@@ -133,6 +133,20 @@
             <scale>10</scale>
             <precision>28</precision>
         </column>
+        <column>
+            <name>CFNotes</name>
+            <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_ProjectManagement].columns.column[CFNotes].alias</alias>
+            <description>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_ProjectManagement].columns.column[CFNotes].description</description>
+            <userDefined>true</userDefined>
+            <isMultilingual>false</isMultilingual>
+            <isEncoded>false</isEncoded>
+            <isNullable>true</isNullable>
+            <defaultValue />
+            <sqlType>VARCHAR</sqlType>
+            <length>100</length>
+            <scale>0</scale>
+            <precision>100</precision>
+        </column>
         <column>
             <name>FWorkerDaysReported</name>
             <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_ProjectManagement].columns.column[FWorkerDaysReported].alias</alias>
@@ -176,18 +190,60 @@
             <precision>28</precision>
         </column>
         <column>
-            <name>CFNotes</name>
-            <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_ProjectManagement].columns.column[CFNotes].alias</alias>
-            <description>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_ProjectManagement].columns.column[CFNotes].description</description>
+            <name>CFBeingChanged</name>
+            <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_ProjectManagement].columns.column[CFBeingChanged].alias</alias>
+            <description>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_ProjectManagement].columns.column[CFBeingChanged].description</description>
+            <userDefined>true</userDefined>
+            <isMultilingual>false</isMultilingual>
+            <isEncoded>false</isEncoded>
+            <isNullable>true</isNullable>
+            <defaultValue>0</defaultValue>
+            <sqlType>INT</sqlType>
+            <length>1</length>
+            <scale>0</scale>
+            <precision>0</precision>
+        </column>
+        <column>
+            <name>CFProjectState</name>
+            <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_ProjectManagement].columns.column[CFProjectState].alias</alias>
+            <description>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_ProjectManagement].columns.column[CFProjectState].description</description>
+            <userDefined>true</userDefined>
+            <isMultilingual>false</isMultilingual>
+            <isEncoded>false</isEncoded>
+            <isNullable>true</isNullable>
+            <defaultValue>0</defaultValue>
+            <sqlType>INT</sqlType>
+            <length>4</length>
+            <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>true</isNullable>
             <defaultValue />
-            <sqlType>VARCHAR</sqlType>
-            <length>100</length>
+            <sqlType>NUMERIC</sqlType>
+            <length>28</length>
+            <scale>10</scale>
+            <precision>28</precision>
+        </column>
+        <column>
+            <name>CFIsFirstEnabled</name>
+            <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_ProjectManagement].columns.column[CFIsFirstEnabled].alias</alias>
+            <description>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_ProjectManagement].columns.column[CFIsFirstEnabled].description</description>
+            <userDefined>true</userDefined>
+            <isMultilingual>false</isMultilingual>
+            <isEncoded>false</isEncoded>
+            <isNullable>true</isNullable>
+            <defaultValue>1</defaultValue>
+            <sqlType>INT</sqlType>
+            <length>1</length>
             <scale>0</scale>
-            <precision>100</precision>
+            <precision>1</precision>
         </column>
         <column>
             <name>FAdminOrgUnitId</name>
@@ -455,48 +511,6 @@
             <scale>0</scale>
             <precision>44</precision>
         </column>
-        <column>
-            <name>CFBeingChanged</name>
-            <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_ProjectManagement].columns.column[CFBeingChanged].alias</alias>
-            <description>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_ProjectManagement].columns.column[CFBeingChanged].description</description>
-            <userDefined>true</userDefined>
-            <isMultilingual>false</isMultilingual>
-            <isEncoded>false</isEncoded>
-            <isNullable>true</isNullable>
-            <defaultValue />
-            <sqlType>INT</sqlType>
-            <length>1</length>
-            <scale>0</scale>
-            <precision>0</precision>
-        </column>
-        <column>
-            <name>CFProjectState</name>
-            <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_ProjectManagement].columns.column[CFProjectState].alias</alias>
-            <description>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_ProjectManagement].columns.column[CFProjectState].description</description>
-            <userDefined>true</userDefined>
-            <isMultilingual>false</isMultilingual>
-            <isEncoded>false</isEncoded>
-            <isNullable>true</isNullable>
-            <defaultValue />
-            <sqlType>INT</sqlType>
-            <length>10</length>
-            <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>
@@ -732,6 +746,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[CFIsFirstEnabled].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[CFIsFirstEnabled].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[CFNotes].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="备注" />
@@ -954,7 +980,8 @@
         </rs>
         <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_ProjectManagement].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_ProjectManagement].columns.column[FHandlerID].alias">

+ 10 - 10
metadata/com/kingdee/eas/hr/project/app/CT_PRO_WorkHoursConfirm.table

@@ -351,7 +351,7 @@
             <isMultilingual>false</isMultilingual>
             <isEncoded>false</isEncoded>
             <isNullable>false</isNullable>
-            <defaultValue />
+            <defaultValue>''</defaultValue>
             <sqlType>VARCHAR</sqlType>
             <length>44</length>
             <scale>0</scale>
@@ -613,9 +613,9 @@
         </rs>
         <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursConfirm].columns.column[FAdminOrgUnitId].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" />
+            <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_WorkHoursConfirm].columns.column[FAdminOrgUnitId].description">
             <lang locale="en_US" value="null" />
@@ -671,9 +671,9 @@
         </rs>
         <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursConfirm].columns.column[FControlUnitID].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" />
+            <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_WorkHoursConfirm].columns.column[FControlUnitID].description">
             <lang locale="en_US" value="null" />
@@ -731,9 +731,9 @@
         </rs>
         <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursConfirm].columns.column[FHROrgUnitID].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" />
+            <lang locale="zh_CN" value="HR组织" />
+            <lang locale="zh_HK" value="HR組織" />
+            <lang locale="zh_TW" value="HR組織" />
         </rs>
         <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursConfirm].columns.column[FHROrgUnitID].description">
             <lang locale="en_US" value="null" />

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

@@ -503,6 +503,26 @@
                 <key name="name" value="CFplannedManDays" />
             </mappingField>
         </ownProperty>
+        <ownProperty>
+            <name>isFirstEnabled</name>
+            <alias>entityObject[com.kingdee.eas.hr.project.app.ProjectManagement].properties.ownProperty[isFirstEnabled].alias</alias>
+            <description>entityObject[com.kingdee.eas.hr.project.app.ProjectManagement].properties.ownProperty[isFirstEnabled].description</description>
+            <userDefined>true</userDefined>
+            <configured>false</configured>
+            <dataType>Boolean</dataType>
+            <metadataRef />
+            <isMultilingual>false</isMultilingual>
+            <isNullable>false</isNullable>
+            <formula />
+            <length>1</length>
+            <precision>0</precision>
+            <decimalDigits>0</decimalDigits>
+            <defaultValue>entityObject[com.kingdee.eas.hr.project.app.ProjectManagement].properties.ownProperty[isFirstEnabled].defaultValue</defaultValue>
+            <displayFormat />
+            <mappingField>
+                <key name="name" value="CFIsFirstEnabled" />
+            </mappingField>
+        </ownProperty>
     </properties>
     <logicalKey>
         <name>id</name>
@@ -1567,6 +1587,69 @@
             <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[isFirstEnabled].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[isFirstEnabled].defaultValue">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_HK" value="true" />
+            <lang locale="zh_TW" value="true" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.ProjectManagement].properties.ownProperty[isFirstEnabled].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[isFirstEnabled].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.ProjectManagement].properties.ownProperty[isFirstEnabled].extendedProperty.bizDataType">
+            <lang locale="en_US" value="BOOLEAN" />
+            <lang locale="zh_CN" value="BOOLEAN" />
+            <lang locale="zh_TW" value="BOOLEAN" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.ProjectManagement].properties.ownProperty[isFirstEnabled].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.ProjectManagement].properties.ownProperty[isFirstEnabled].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.ProjectManagement].properties.ownProperty[isFirstEnabled].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.ProjectManagement].properties.ownProperty[isFirstEnabled].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.ProjectManagement].properties.ownProperty[isFirstEnabled].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.ProjectManagement].properties.ownProperty[isFirstEnabled].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.ProjectManagement].properties.ownProperty[isFirstEnabled].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.hr.project.app.ProjectManagement].properties.ownProperty[notes].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="备注" />
@@ -1648,6 +1731,21 @@
             <lang locale="zh_HK" value="項目計畫人天" />
             <lang locale="zh_TW" value="項目計畫人天" />
         </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.ProjectManagement].properties.ownProperty[plannedManDays].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.ProjectManagement].properties.ownProperty[plannedManDays].extendedProperty.bizDataType">
+            <lang locale="en_US" value="DECIMAL" />
+            <lang locale="zh_CN" value="DECIMAL" />
+            <lang locale="zh_TW" value="DECIMAL" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.ProjectManagement].properties.ownProperty[plannedManDays].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.ProjectManagement].properties.ownProperty[proDayConsumption].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="人天耗用占比" />

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

@@ -1435,6 +1435,37 @@
                 <key name="name" value="ProjectManagementQuery" />
             </query>
         </queryField>
+        <queryField>
+            <name>isFirstEnabled</name>
+            <userDefined>true</userDefined>
+            <formulaString>#0</formulaString>
+            <constString />
+            <displayName>joinQuery[com.kingdee.eas.hr.project.app.ProjectManagementQuery].units.queryField[isFirstEnabled].displayName</displayName>
+            <groupType />
+            <isSelector>true</isSelector>
+            <isFilter>true</isFilter>
+            <isSorter>true</isSorter>
+            <isParameter>false</isParameter>
+            <returnType>Boolean</returnType>
+            <propertyRefs>
+                <propertyRef>
+                    <key>a7d379b6-b87d-483a-9cb4-634d9ff02dfc</key>
+                    <parentUnit>
+                        <key name="name" value="isFirstEnabled" />
+                    </parentUnit>
+                    <subEntity>
+                        <key name="name" value="ProjectManagement" />
+                    </subEntity>
+                    <refProperty>
+                        <key name="name" value="isFirstEnabled" />
+                    </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>
@@ -2040,6 +2071,22 @@
             <lang locale="zh_HK" value="null" />
             <lang locale="zh_TW" value="null" />
         </rs>
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.ProjectManagementQuery].units.queryField[isFirstEnabled].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[isFirstEnabled].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.ProjectManagementQuery].units.queryField[isFirstEnabled].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.hr.project.app.ProjectManagementQuery].units.queryField[lastUpdateTime].displayName">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="最后修改时间" />
@@ -2106,6 +2153,16 @@
             <lang locale="zh_HK" value="項目計畫人天" />
             <lang locale="zh_TW" value="項目計畫人天" />
         </rs>
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.ProjectManagementQuery].units.queryField[plannedManDays].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.ProjectManagementQuery].units.queryField[plannedManDays].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.hr.project.app.ProjectManagementQuery].units.queryField[projectCode].displayName">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="项目编码" />

+ 1 - 1
metadata/com/kingdee/eas/hr/project/app/WorkHoursConfirm.entity

@@ -283,7 +283,7 @@
             <description>entityObject[com.kingdee.eas.hr.project.app.WorkHoursConfirm].properties.ownProperty[clockTime].description</description>
             <userDefined>true</userDefined>
             <configured>false</configured>
-            <dataType>Time</dataType>
+            <dataType>TimeStamp</dataType>
             <metadataRef />
             <isMultilingual>false</isMultilingual>
             <isNullable>false</isNullable>

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

@@ -1227,6 +1227,56 @@
                 <key name="name" value="CoreUI" />
             </parent>
         </component>
+        <component>
+            <name>chkisFirstEnabled</name>
+            <alias>uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[chkisFirstEnabled].alias</alias>
+            <userDefined>true</userDefined>
+            <classType>com.kingdee.bos.ctrl.swing.KDCheckBox</classType>
+            <isContainer>false</isContainer>
+            <constraints>31,638,270,19</constraints>
+            <tabIndex>36</tabIndex>
+            <herited>false</herited>
+            <bimUIObjectPK />
+            <properties>
+                <property>
+                    <name>text</name>
+                    <type>java.lang.String</type>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[chkisFirstEnabled].properties.property[text].value</value>
+                    <isMultiLan>true</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+                <property>
+                    <name>visible</name>
+                    <type>boolean</type>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[chkisFirstEnabled].properties.property[visible].value</value>
+                    <isMultiLan>false</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+                <property>
+                    <name>horizontalAlignment</name>
+                    <type>int</type>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[chkisFirstEnabled].properties.property[horizontalAlignment].value</value>
+                    <isMultiLan>false</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+            </properties>
+            <parent>
+                <key name="name" value="CoreUI" />
+            </parent>
+            <propertyBindings>
+                <propertyBinding>
+                    <propertyName>selected</propertyName>
+                    <propertyType>boolean</propertyType>
+                    <bindingObject>editData</bindingObject>
+                    <bindingField>isFirstEnabled</bindingField>
+                    <fieldType>boolean</fieldType>
+                    <accessType>2</accessType>
+                    <autoMode>false</autoMode>
+                    <herited>false</herited>
+                    <userDefined>true</userDefined>
+                </propertyBinding>
+            </propertyBindings>
+        </component>
         <component>
             <name>prmtCreator</name>
             <alias>uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[prmtCreator].alias</alias>
@@ -3260,6 +3310,30 @@
             <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[chkisFirstEnabled].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.hr.project.client.ProjectManagementEditUI].components.component[chkisFirstEnabled].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[chkisFirstEnabled].properties.property[text].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[chkisFirstEnabled].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[contAuditor].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="null" />

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


+ 2 - 2
metadata/entity_pkmapping.properties

@@ -1,5 +1,5 @@
 #
-#Mon Dec 02 17:43:49 CST 2024
+#Wed Dec 04 19:27:26 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
@@ -12,6 +12,6 @@ B15489DB=com.kingdee.eas.hr.project.app.ProjectManagement
 1315F40A=com.kingdee.eas.hr.project.app.ProjectChangeEntry
 2AC6A40E=com.kingdee.eas.hr.project.app.ProjectRole
 2AC7B2D2=com.kingdee.eas.hr.project.app.ProjectType
-400CA33B=com.kingdee.eas.hr.project.app.Type
 9F122B78=com.kingdee.eas.hr.project.app.Project
+400CA33B=com.kingdee.eas.hr.project.app.Type
 CF9DCEB1=com.kingdee.eas.hr.project.app.WorkHoursReport

+ 1 - 1
metadata/facade_pkmapping.properties

@@ -1,2 +1,2 @@
 #
-#Mon Dec 02 17:43:49 CST 2024
+#Wed Dec 04 19:27:26 CST 2024

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

@@ -205,6 +205,17 @@ public class AbstractProjectManagementInfo extends com.kingdee.eas.hr.base.HRBil
     {
         setBigDecimal("plannedManDays", item);
     }
+    /**
+     * Object:项目管理's 是否是第一次启用property 
+     */
+    public boolean isIsFirstEnabled()
+    {
+        return getBoolean("isFirstEnabled");
+    }
+    public void setIsFirstEnabled(boolean item)
+    {
+        setBoolean("isFirstEnabled", item);
+    }
     public BOSObjectType getBOSType()
     {
         return new BOSObjectType("B15489DB");

+ 4 - 4
src/com/kingdee/eas/hr/project/AbstractWorkHoursConfirmInfo.java

@@ -83,13 +83,13 @@ public class AbstractWorkHoursConfirmInfo extends com.kingdee.eas.hr.base.HRBill
     /**
      * Object:¹¤Ê±È·Èϵ¥'s ´ò¿¨Ê±¼äproperty 
      */
-    public java.sql.Time getClockTime()
+    public java.sql.Timestamp getClockTime()
     {
-        return getTime("clockTime");
+        return getTimestamp("clockTime");
     }
-    public void setClockTime(java.sql.Time item)
+    public void setClockTime(java.sql.Timestamp item)
     {
-        setTime("clockTime", item);
+        setTimestamp("clockTime", item);
     }
     public BOSObjectType getBOSType()
     {

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

@@ -71,6 +71,7 @@ public abstract class AbstractProjectManagementEditUI extends com.kingdee.eas.fr
     protected com.kingdee.bos.ctrl.swing.KDCheckBox chkbeingChanged;
     protected com.kingdee.bos.ctrl.swing.KDLabelContainer contprojectState;
     protected com.kingdee.bos.ctrl.swing.KDLabelContainer kDLabelContainer3;
+    protected com.kingdee.bos.ctrl.swing.KDCheckBox chkisFirstEnabled;
     protected com.kingdee.bos.ctrl.extendcontrols.KDBizPromptBox prmtCreator;
     protected com.kingdee.bos.ctrl.swing.KDDatePicker kDDateCreateTime;
     protected com.kingdee.bos.ctrl.extendcontrols.KDBizPromptBox prmtLastUpdateUser;
@@ -181,6 +182,7 @@ public abstract class AbstractProjectManagementEditUI extends com.kingdee.eas.fr
         this.chkbeingChanged = new com.kingdee.bos.ctrl.swing.KDCheckBox();
         this.contprojectState = new com.kingdee.bos.ctrl.swing.KDLabelContainer();
         this.kDLabelContainer3 = new com.kingdee.bos.ctrl.swing.KDLabelContainer();
+        this.chkisFirstEnabled = new com.kingdee.bos.ctrl.swing.KDCheckBox();
         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();
@@ -227,6 +229,7 @@ public abstract class AbstractProjectManagementEditUI extends com.kingdee.eas.fr
         this.chkbeingChanged.setName("chkbeingChanged");
         this.contprojectState.setName("contprojectState");
         this.kDLabelContainer3.setName("kDLabelContainer3");
+        this.chkisFirstEnabled.setName("chkisFirstEnabled");
         this.prmtCreator.setName("prmtCreator");
         this.kDDateCreateTime.setName("kDDateCreateTime");
         this.prmtLastUpdateUser.setName("prmtLastUpdateUser");
@@ -394,6 +397,10 @@ public abstract class AbstractProjectManagementEditUI extends com.kingdee.eas.fr
         this.kDLabelContainer3.setBoundLabelLength(100);		
         this.kDLabelContainer3.setBoundLabelUnderline(true);		
         this.kDLabelContainer3.setVisible(true);
+        // chkisFirstEnabled		
+        this.chkisFirstEnabled.setText(resHelper.getString("chkisFirstEnabled.text"));		
+        this.chkisFirstEnabled.setVisible(true);		
+        this.chkisFirstEnabled.setHorizontalAlignment(2);
         // prmtCreator		
         this.prmtCreator.setEnabled(false);		
         this.prmtCreator.setVisible(false);
@@ -499,7 +506,7 @@ public abstract class AbstractProjectManagementEditUI extends com.kingdee.eas.fr
         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.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,chkisFirstEnabled}));
         this.setFocusCycleRoot(true);
 		//Register control's property binding
 		registerBindings();
@@ -576,6 +583,8 @@ public abstract class AbstractProjectManagementEditUI extends com.kingdee.eas.fr
         this.add(contprojectState, null);
         kDLabelContainer3.setBounds(new Rectangle(727, 131, 270, 19));
         this.add(kDLabelContainer3, null);
+        chkisFirstEnabled.setBounds(new Rectangle(31, 638, 270, 19));
+        this.add(chkisFirstEnabled, null);
         //contCreator
         contCreator.setBoundEditor(prmtCreator);
         //contCreateTime
@@ -800,6 +809,7 @@ public abstract class AbstractProjectManagementEditUI extends com.kingdee.eas.fr
 		dataBinder.registerBinding("entrys", com.kingdee.eas.hr.project.ProjectManagementEntryInfo.class, this.kdtEntrys, "userObject");
 		dataBinder.registerBinding("entrys.clockLocation", String.class, this.kdtEntrys, "clockLocation.text");
 		dataBinder.registerBinding("beingChanged", boolean.class, this.chkbeingChanged, "selected");
+		dataBinder.registerBinding("isFirstEnabled", boolean.class, this.chkisFirstEnabled, "selected");
 		dataBinder.registerBinding("creator", com.kingdee.eas.base.permission.UserInfo.class, this.prmtCreator, "data");
 		dataBinder.registerBinding("createTime", java.sql.Timestamp.class, this.kDDateCreateTime, "value");
 		dataBinder.registerBinding("lastUpdateUser", com.kingdee.eas.base.permission.UserInfo.class, this.prmtLastUpdateUser, "data");
@@ -957,6 +967,7 @@ public abstract class AbstractProjectManagementEditUI extends com.kingdee.eas.fr
 		getValidateHelper().registerBindProperty("entrys", ValidateHelper.ON_SAVE);    
 		getValidateHelper().registerBindProperty("entrys.clockLocation", ValidateHelper.ON_SAVE);    
 		getValidateHelper().registerBindProperty("beingChanged", ValidateHelper.ON_SAVE);    
+		getValidateHelper().registerBindProperty("isFirstEnabled", ValidateHelper.ON_SAVE);    
 		getValidateHelper().registerBindProperty("creator", ValidateHelper.ON_SAVE);    
 		getValidateHelper().registerBindProperty("createTime", ValidateHelper.ON_SAVE);    
 		getValidateHelper().registerBindProperty("lastUpdateUser", ValidateHelper.ON_SAVE);    
@@ -1012,6 +1023,7 @@ public abstract class AbstractProjectManagementEditUI extends com.kingdee.eas.fr
 		}
     	sic.add(new SelectorItemInfo("entrys.clockLocation"));
         sic.add(new SelectorItemInfo("beingChanged"));
+        sic.add(new SelectorItemInfo("isFirstEnabled"));
 		if(selectorAll.equalsIgnoreCase("true"))
 		{
 			sic.add(new SelectorItemInfo("creator.*"));

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

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

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

@@ -26,6 +26,7 @@ chkbeingChanged.text=
 contprojectState.boundLabelText=
 projectState.items=
 kDLabelContainer3.boundLabelText=
+chkisFirstEnabled.text=
 ActionSubmit.SHORT_DESCRIPTION=
 ActionSubmit.LONG_DESCRIPTION=
 ActionSubmit.NAME=

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

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

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

@@ -27,6 +27,7 @@ chkbeingChanged.text=\u662F\u5426\u8B8A\u66F4\u4E2D
 contprojectState.boundLabelText=\u55AE\u64DA\u72C0\u614B
 projectState.items=[Enum]com.kingdee.eas.hr.project.projectState
 kDLabelContainer3.boundLabelText=\u9805\u76EE\u8A08\u756B\u4EBA\u5929
+chkisFirstEnabled.text=\u662F\u5426\u662F\u7B2C\u4E00\u6B21\u555F\u7528
 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


+ 8 - 0
websrc/com/kingdee/eas/hr/project/handler/ProjectManagementEditHandler.java

@@ -1,6 +1,7 @@
 package com.kingdee.eas.hr.project.handler;
 
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -66,6 +67,13 @@ public class ProjectManagementEditHandler extends EditHandler{
 					result.put("state", "error");
 					result.put("errorMsg", "只能启用“未启用”、“禁用”的项目!");
 				} else {
+					
+			        if (getProject.isIsFirstEnabled()) {
+			        	BigDecimal plannedManDays = getProject.getPlannedManDays();
+			            getProject.setTotalPersonDays(plannedManDays);
+			            getProject.setIsFirstEnabled(false);
+			            iProjectManagement.update(new ObjectUuidPK(billId), getProject);
+			        }
 					getProject.setProjectState(projectState.INPROGRESS);
 					iProjectManagement.update(new ObjectUuidPK(billId), getProject);
 					result.put("state", "success");

+ 17 - 1
websrc/com/kingdee/eas/hr/project/handler/ProjectManagementListHandler.java

@@ -1,6 +1,8 @@
 package com.kingdee.eas.hr.project.handler;
 
 
+import java.math.BigDecimal;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -46,11 +48,19 @@ public class ProjectManagementListHandler  extends ListHandler {
 		int failure = 0;
 		String billId = "";
 		if (!StringUtils.isEmpty(billIds)) {
+			System.out.print("*******billIds不为空******");
 			IProjectManagement iProjectManagement;
 			ProjectManagementCollection coll;
+			
+
+			EntityViewInfo view = new EntityViewInfo();
+			FilterInfo filterInfo = new FilterInfo();
+			filterInfo.getFilterItems().add(new FilterItemInfo("id", billIds, CompareType.EQUALS));
+			view.setFilter(filterInfo);
 			try {
 				iProjectManagement = ProjectManagementFactory.getLocalInstance(ctx);
-				coll = iProjectManagement.getProjectManagementCollection("billIds");
+				coll = iProjectManagement.getProjectManagementCollection(view);
+				System.out.print("*******获取coll集合成功******");
 			} catch (BOSException var17) {
 				logger.error(var17.getMessage(), var17);
 				throw new ShrWebBizException("数据异常!获取项目异常");
@@ -72,6 +82,12 @@ public class ProjectManagementListHandler  extends ListHandler {
 						body.setMuitTipsMessage("只能启用“未启用”、“禁用”的项目!");
 						batchMessageTipsHeader.addResult(body);
 					} else {
+				        if (getProject.isIsFirstEnabled()) {
+				        	BigDecimal plannedManDays = getProject.getPlannedManDays();
+				            getProject.setTotalPersonDays(plannedManDays);
+				            getProject.setIsFirstEnabled(false);
+				            iProjectManagement.update(new ObjectUuidPK(billId), getProject);
+				        }
 						getProject.setProjectState(projectState.INPROGRESS);
 						iProjectManagement.update(new ObjectUuidPK(billId), getProject);
 						++success;

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