打卡位置提交

metadata/com/kingdee/eas/hr/project/ProjectClock.bizunit

@@ -40,9 +40,9 @@
     <resource>
         <rs key="bizUnit[com.kingdee.eas.hr.project.ProjectClock].alias">
             <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="项目位置" />
-            <lang locale="zh_HK" value="項目位置" />
-            <lang locale="zh_TW" value="項目位置" />
+            <lang locale="zh_CN" value="项目打卡位置" />
+            <lang locale="zh_HK" value="項目打卡位置" />
+            <lang locale="zh_TW" value="項目打卡位置" />
         </rs>
         <rs key="bizUnit[com.kingdee.eas.hr.project.ProjectClock].description">
             <lang locale="en_US" value="null" />
@@ -50,10 +50,15 @@
             <lang locale="zh_HK" value="null" />
             <lang locale="zh_TW" value="null" />
         </rs>
+        <rs key="bizUnit[com.kingdee.eas.hr.project.ProjectClock].extendedProperty.MainOrgFieldName">
+            <lang locale="en_US" value="adminOrgUnit" />
+            <lang locale="zh_CN" value="adminOrgUnit" />
+            <lang locale="zh_TW" value="adminOrgUnit" />
+        </rs>
         <rs key="bizUnit[com.kingdee.eas.hr.project.ProjectClock].extendedProperty.OrgType">
-            <lang locale="en_US" value="NONE" />
-            <lang locale="zh_CN" value="NONE" />
-            <lang locale="zh_TW" value="NONE" />
+            <lang locale="en_US" value="Admin" />
+            <lang locale="zh_CN" value="Admin" />
+            <lang locale="zh_TW" value="Admin" />
         </rs>
         <rs key="bizUnit[com.kingdee.eas.hr.project.ProjectClock].extendedProperty.codingRuleEnabled">
             <lang locale="en_US" value="true" />
@@ -75,11 +80,6 @@
             <lang locale="zh_CN" value="com.kingdee.eas.hr.project.client.ProjectClockEditUI" />
             <lang locale="zh_TW" value="com.kingdee.eas.hr.project.client.ProjectClockEditUI" />
         </rs>
-        <rs key="bizUnit[com.kingdee.eas.hr.project.ProjectClock].extendedProperty.enableFieldPermission">
-            <lang locale="en_US" value="false" />
-            <lang locale="zh_CN" value="false" />
-            <lang locale="zh_TW" value="false" />
-        </rs>
         <rs key="bizUnit[com.kingdee.eas.hr.project.ProjectClock].extendedProperty.isAsstAcctType">
             <lang locale="en_US" value="false" />
             <lang locale="zh_CN" value="false" />
@@ -101,9 +101,9 @@
             <lang locale="zh_TW" value="com.kingdee.eas.hr.project.client.ProjectClockListUI" />
         </rs>
         <rs key="bizUnit[com.kingdee.eas.hr.project.ProjectClock].extendedProperty.maxFieldIndex">
-            <lang locale="en_US" value="3" />
-            <lang locale="zh_CN" value="3" />
-            <lang locale="zh_TW" value="3" />
+            <lang locale="en_US" value="2" />
+            <lang locale="zh_CN" value="2" />
+            <lang locale="zh_TW" value="2" />
         </rs>
         <rs key="bizUnit[com.kingdee.eas.hr.project.ProjectClock].extendedProperty.userDefined">
             <lang locale="en_US" value="true" />

metadata/com/kingdee/eas/hr/project/app/CT_PRO_ProjectClock.table

@@ -147,6 +147,20 @@
             <scale>0</scale>
             <precision>0</precision>
         </column>
+        <column>
+            <name>CFAdminOrgUnitID</name>
+            <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_ProjectClock].columns.column[CFAdminOrgUnitID].alias</alias>
+            <description>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_ProjectClock].columns.column[CFAdminOrgUnitID].description</description>
+            <userDefined>true</userDefined>
+            <isMultilingual>false</isMultilingual>
+            <isEncoded>false</isEncoded>
+            <isNullable>true</isNullable>
+            <defaultValue />
+            <sqlType>VARCHAR</sqlType>
+            <length>44</length>
+            <scale>0</scale>
+            <precision>0</precision>
+        </column>
         <column>
             <name>CFProjectID</name>
             <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_ProjectClock].columns.column[CFProjectID].alias</alias>
@@ -177,7 +191,7 @@
         </column>
     </columns>
     <primaryKey>
-        <name>CPK_PRO_Project73u</name>
+        <name>CPK_PRO_Projectuua</name>
         <userDefined>true</userDefined>
         <primaryKeyColumns>
             <primaryKeyColumn>
@@ -191,7 +205,7 @@
     </primaryKey>
     <foreignKeys>
         <foreignKey>
-            <name>CFK_PRO_PROPCCrt73</name>
+            <name>CFK_PRO_PROPCCrtuu</name>
             <userDefined>true</userDefined>
             <refTable>
                 <key name="package" value="com.kingdee.eas.base.permission.app" />
@@ -210,7 +224,7 @@
             </fkColumnPairs>
         </foreignKey>
         <foreignKey>
-            <name>CFK_PRO_PROPCLUU73</name>
+            <name>CFK_PRO_PROPCLUUuu</name>
             <userDefined>true</userDefined>
             <refTable>
                 <key name="package" value="com.kingdee.eas.base.permission.app" />
@@ -229,7 +243,7 @@
             </fkColumnPairs>
         </foreignKey>
         <foreignKey>
-            <name>CFK_PRO_PROPCCnU73</name>
+            <name>CFK_PRO_PROPCCnUvu</name>
             <userDefined>true</userDefined>
             <refTable>
                 <key name="package" value="com.kingdee.eas.basedata.org" />
@@ -248,7 +262,26 @@
             </fkColumnPairs>
         </foreignKey>
         <foreignKey>
-            <name>CFK_PRO_PROPCRjcm5</name>
+            <name>CFK_PRO_PROPCDmnmv</name>
+            <userDefined>true</userDefined>
+            <refTable>
+                <key name="package" value="com.kingdee.eas.basedata.org" />
+                <key name="name" value="T_ORG_Admin" />
+            </refTable>
+            <fkColumnPairs>
+                <fkColumnPair>
+                    <sequence>0</sequence>
+                    <refColumn>
+                        <key name="name" value="FID" />
+                    </refColumn>
+                    <fkColumn>
+                        <key name="name" value="CFAdminOrgUnitID" />
+                    </fkColumn>
+                </fkColumnPair>
+            </fkColumnPairs>
+        </foreignKey>
+        <foreignKey>
+            <name>CFK_PRO_PROPCRjcb9</name>
             <userDefined>true</userDefined>
             <refTable>
                 <key name="package" value="com.kingdee.eas.hr.project.app" />
@@ -270,9 +303,21 @@
     <resource>
         <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_ProjectClock].alias">
             <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="项目位置" />
-            <lang locale="zh_HK" value="項目位置" />
-            <lang locale="zh_TW" value="項目位置" />
+            <lang locale="zh_CN" value="项目打卡位置" />
+            <lang locale="zh_HK" value="項目打卡位置" />
+            <lang locale="zh_TW" value="項目打卡位置" />
+        </rs>
+        <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_ProjectClock].columns.column[CFAdminOrgUnitID].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_ProjectClock].columns.column[CFAdminOrgUnitID].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_ProjectClock].columns.column[CFProjectID].alias">
             <lang locale="en_US" value="null" />

metadata/com/kingdee/eas/hr/project/app/ProjectClock.entity

@@ -17,7 +17,7 @@
             <isListenerMethod>false</isListenerMethod>
             <alias>entityObject[com.kingdee.eas.hr.project.app.ProjectClock].methods.method[getValue].alias</alias>
             <description>entityObject[com.kingdee.eas.hr.project.app.ProjectClock].methods.method[getValue].description</description>
-            <innerID>500cc0f1-783f-4d42-9335-00ce96e58194</innerID>
+            <innerID>6aaa0d6d-af2e-4895-a159-d5280478d190</innerID>
             <accessLevel>public</accessLevel>
             <subClassingMode>normal</subClassingMode>
             <returnValueType>ObjectValue</returnValueType>
@@ -43,7 +43,7 @@
             <isListenerMethod>false</isListenerMethod>
             <alias>entityObject[com.kingdee.eas.hr.project.app.ProjectClock].methods.method[getValue].alias</alias>
             <description>entityObject[com.kingdee.eas.hr.project.app.ProjectClock].methods.method[getValue].description</description>
-            <innerID>91e9ee60-2053-478a-bf9d-fdde811eb251</innerID>
+            <innerID>87d0071c-3375-4926-9c4d-c2c6b49665cd</innerID>
             <accessLevel>public</accessLevel>
             <subClassingMode>normal</subClassingMode>
             <returnValueType>ObjectValue</returnValueType>
@@ -78,7 +78,7 @@
             <isListenerMethod>false</isListenerMethod>
             <alias>entityObject[com.kingdee.eas.hr.project.app.ProjectClock].methods.method[getValue].alias</alias>
             <description>entityObject[com.kingdee.eas.hr.project.app.ProjectClock].methods.method[getValue].description</description>
-            <innerID>804ea83f-8bb3-4ce2-9bfe-19a619451c24</innerID>
+            <innerID>b17d8b7a-1643-499c-ad30-82fbb0cc4ff5</innerID>
             <accessLevel>public</accessLevel>
             <subClassingMode>normal</subClassingMode>
             <returnValueType>ObjectValue</returnValueType>
@@ -104,7 +104,7 @@
             <isListenerMethod>false</isListenerMethod>
             <alias>entityObject[com.kingdee.eas.hr.project.app.ProjectClock].methods.method[getCollection].alias</alias>
             <description>entityObject[com.kingdee.eas.hr.project.app.ProjectClock].methods.method[getCollection].description</description>
-            <innerID>3c871f61-6f00-4c47-8144-ad5435bb9329</innerID>
+            <innerID>8639c358-d935-4f77-87fe-813137392737</innerID>
             <accessLevel>public</accessLevel>
             <subClassingMode>normal</subClassingMode>
             <returnValueType>ObjectCollection</returnValueType>
@@ -119,7 +119,7 @@
             <isListenerMethod>false</isListenerMethod>
             <alias>entityObject[com.kingdee.eas.hr.project.app.ProjectClock].methods.method[getCollection].alias</alias>
             <description>entityObject[com.kingdee.eas.hr.project.app.ProjectClock].methods.method[getCollection].description</description>
-            <innerID>f93c9c57-a8bf-4d3e-ae09-c2c282840a03</innerID>
+            <innerID>295b4fc1-6e38-4d2a-915e-204ea7349fe3</innerID>
             <accessLevel>public</accessLevel>
             <subClassingMode>normal</subClassingMode>
             <returnValueType>ObjectCollection</returnValueType>
@@ -145,7 +145,7 @@
             <isListenerMethod>false</isListenerMethod>
             <alias>entityObject[com.kingdee.eas.hr.project.app.ProjectClock].methods.method[getCollection].alias</alias>
             <description>entityObject[com.kingdee.eas.hr.project.app.ProjectClock].methods.method[getCollection].description</description>
-            <innerID>08363489-2f9e-4bb8-8389-f06757715246</innerID>
+            <innerID>6b7fb18b-a1e8-4947-97f1-1e58c81b7bc4</innerID>
             <accessLevel>public</accessLevel>
             <subClassingMode>normal</subClassingMode>
             <returnValueType>ObjectCollection</returnValueType>
@@ -178,6 +178,20 @@
         <key name="name" value="CT_PRO_ProjectClock" />
     </table>
     <properties>
+        <linkProperty>
+            <name>adminOrgUnit</name>
+            <alias>entityObject[com.kingdee.eas.hr.project.app.ProjectClock].properties.linkProperty[adminOrgUnit].alias</alias>
+            <description>entityObject[com.kingdee.eas.hr.project.app.ProjectClock].properties.linkProperty[adminOrgUnit].description</description>
+            <userDefined>true</userDefined>
+            <configured>false</configured>
+            <mappingField>
+                <key name="name" value="CFAdminOrgUnitID" />
+            </mappingField>
+            <relationship>
+                <key name="package" value="com.kingdee.eas.hr.project.app" />
+                <key name="name" value="R_ProjectClock_AdminOrgUnit_adminOrgUnit" />
+            </relationship>
+        </linkProperty>
         <linkProperty>
             <name>project</name>
             <alias>entityObject[com.kingdee.eas.hr.project.app.ProjectClock].properties.linkProperty[project].alias</alias>
@@ -233,9 +247,9 @@
     <resource>
         <rs key="entityObject[com.kingdee.eas.hr.project.app.ProjectClock].alias">
             <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="项目位置" />
-            <lang locale="zh_HK" value="項目位置" />
-            <lang locale="zh_TW" value="項目位置" />
+            <lang locale="zh_CN" value="项目打卡位置" />
+            <lang locale="zh_HK" value="項目打卡位置" />
+            <lang locale="zh_TW" value="項目打卡位置" />
         </rs>
         <rs key="entityObject[com.kingdee.eas.hr.project.app.ProjectClock].defaultViewalias">
             <lang locale="en_US" value="null" />
@@ -249,10 +263,15 @@
             <lang locale="zh_HK" value="null" />
             <lang locale="zh_TW" value="null" />
         </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.ProjectClock].defaultViewextendedProperty.MainOrgFieldName">
+            <lang locale="en_US" value="adminOrgUnit" />
+            <lang locale="zh_CN" value="adminOrgUnit" />
+            <lang locale="zh_TW" value="adminOrgUnit" />
+        </rs>
         <rs key="entityObject[com.kingdee.eas.hr.project.app.ProjectClock].defaultViewextendedProperty.OrgType">
-            <lang locale="en_US" value="NONE" />
-            <lang locale="zh_CN" value="NONE" />
-            <lang locale="zh_TW" value="NONE" />
+            <lang locale="en_US" value="Admin" />
+            <lang locale="zh_CN" value="Admin" />
+            <lang locale="zh_TW" value="Admin" />
         </rs>
         <rs key="entityObject[com.kingdee.eas.hr.project.app.ProjectClock].defaultViewextendedProperty.codingRuleEnabled">
             <lang locale="en_US" value="true" />
@@ -274,11 +293,6 @@
             <lang locale="zh_CN" value="com.kingdee.eas.hr.project.client.ProjectClockEditUI" />
             <lang locale="zh_TW" value="com.kingdee.eas.hr.project.client.ProjectClockEditUI" />
         </rs>
-        <rs key="entityObject[com.kingdee.eas.hr.project.app.ProjectClock].defaultViewextendedProperty.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.ProjectClock].defaultViewextendedProperty.isAsstAcctType">
             <lang locale="en_US" value="false" />
             <lang locale="zh_CN" value="false" />
@@ -304,10 +318,15 @@
             <lang locale="zh_CN" value="" />
             <lang locale="zh_TW" value="單級基礎資料範本" />
         </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.ProjectClock].extendedProperty.MainOrgFieldName">
+            <lang locale="en_US" value="adminOrgUnit" />
+            <lang locale="zh_CN" value="adminOrgUnit" />
+            <lang locale="zh_TW" value="adminOrgUnit" />
+        </rs>
         <rs key="entityObject[com.kingdee.eas.hr.project.app.ProjectClock].extendedProperty.OrgType">
-            <lang locale="en_US" value="NONE" />
-            <lang locale="zh_CN" value="NONE" />
-            <lang locale="zh_TW" value="NONE" />
+            <lang locale="en_US" value="Admin" />
+            <lang locale="zh_CN" value="Admin" />
+            <lang locale="zh_TW" value="Admin" />
         </rs>
         <rs key="entityObject[com.kingdee.eas.hr.project.app.ProjectClock].extendedProperty.codingRuleEnabled">
             <lang locale="en_US" value="true" />
@@ -450,6 +469,63 @@
             <lang locale="zh_HK" value="null" />
             <lang locale="zh_TW" value="null" />
         </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.ProjectClock].properties.linkProperty[adminOrgUnit].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.ProjectClock].properties.linkProperty[adminOrgUnit].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.ProjectClock].properties.linkProperty[adminOrgUnit].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.ProjectClock].properties.linkProperty[adminOrgUnit].extendedProperty.dataField">
+            <lang locale="en_US" value="name" />
+            <lang locale="zh_CN" value="name" />
+            <lang locale="zh_TW" value="name" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.ProjectClock].properties.linkProperty[adminOrgUnit].extendedProperty.isAsstAcctType">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.ProjectClock].properties.linkProperty[adminOrgUnit].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.ProjectClock].properties.linkProperty[adminOrgUnit].extendedProperty.isForMapping">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.ProjectClock].properties.linkProperty[adminOrgUnit].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.ProjectClock].properties.linkProperty[adminOrgUnit].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.ProjectClock].properties.linkProperty[adminOrgUnit].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.ProjectClock].properties.linkProperty[adminOrgUnit].extendedProperty.isVisibleForKDTable">
+            <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.ProjectClock].properties.linkProperty[project].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="项目" />

metadata/com/kingdee/eas/hr/project/app/ProjectClockQuery.query

@@ -48,6 +48,19 @@
                 <key name="name" value="User" />
             </entityRef>
         </subEntity>
+        <subEntity>
+            <name>adminOrgUnit</name>
+            <alias>joinQuery[com.kingdee.eas.hr.project.app.ProjectClockQuery].subObjects.subEntity[adminOrgUnit].alias</alias>
+            <userDefined>true</userDefined>
+            <query>
+                <key name="package" value="com.kingdee.eas.hr.project.app" />
+                <key name="name" value="ProjectClockQuery" />
+            </query>
+            <entityRef>
+                <key name="package" value="com.kingdee.eas.basedata.org.app" />
+                <key name="name" value="AdminOrgUnit" />
+            </entityRef>
+        </subEntity>
         <subEntity>
             <name>project</name>
             <alias>joinQuery[com.kingdee.eas.hr.project.app.ProjectClockQuery].subObjects.subEntity[project].alias</alias>
@@ -528,6 +541,99 @@
                 <key name="name" value="ProjectClockQuery" />
             </query>
         </queryField>
+        <queryField>
+            <name>adminOrgUnit.name</name>
+            <userDefined>true</userDefined>
+            <formulaString>#0</formulaString>
+            <constString />
+            <displayName>joinQuery[com.kingdee.eas.hr.project.app.ProjectClockQuery].units.queryField[adminOrgUnit.name].displayName</displayName>
+            <groupType />
+            <isSelector>true</isSelector>
+            <isFilter>true</isFilter>
+            <isSorter>true</isSorter>
+            <isParameter>false</isParameter>
+            <returnType>String</returnType>
+            <propertyRefs>
+                <propertyRef>
+                    <key>d13ab222-2a5b-4ddb-af8e-92aec4b3ec9d</key>
+                    <parentUnit>
+                        <key name="name" value="adminOrgUnit.name" />
+                    </parentUnit>
+                    <subEntity>
+                        <key name="name" value="adminOrgUnit" />
+                    </subEntity>
+                    <refProperty>
+                        <key name="name" value="name" />
+                    </refProperty>
+                </propertyRef>
+            </propertyRefs>
+            <query>
+                <key name="package" value="com.kingdee.eas.hr.project.app" />
+                <key name="name" value="ProjectClockQuery" />
+            </query>
+        </queryField>
+        <propertyUnit>
+            <name>74a9247e-469c-41a4-af9e-de651bc546e2</name>
+            <userDefined>true</userDefined>
+            <formulaString />
+            <constString />
+            <displayName>joinQuery[com.kingdee.eas.hr.project.app.ProjectClockQuery].units.propertyUnit[74a9247e-469c-41a4-af9e-de651bc546e2].displayName</displayName>
+            <groupType />
+            <isSelector>false</isSelector>
+            <isFilter>false</isFilter>
+            <isSorter>false</isSorter>
+            <isParameter>false</isParameter>
+            <returnType />
+            <propertyRefs>
+                <propertyRef>
+                    <key>822e1d00-8a67-427e-959a-c22787c2ec42</key>
+                    <parentUnit>
+                        <key name="name" value="74a9247e-469c-41a4-af9e-de651bc546e2" />
+                    </parentUnit>
+                    <subEntity>
+                        <key name="name" value="ProjectClock" />
+                    </subEntity>
+                    <refProperty>
+                        <key name="name" value="adminOrgUnit" />
+                    </refProperty>
+                </propertyRef>
+            </propertyRefs>
+            <query>
+                <key name="package" value="com.kingdee.eas.hr.project.app" />
+                <key name="name" value="ProjectClockQuery" />
+            </query>
+        </propertyUnit>
+        <propertyUnit>
+            <name>ae675945-d937-4a38-9750-a4240939f1a2</name>
+            <userDefined>true</userDefined>
+            <formulaString />
+            <constString />
+            <displayName>joinQuery[com.kingdee.eas.hr.project.app.ProjectClockQuery].units.propertyUnit[ae675945-d937-4a38-9750-a4240939f1a2].displayName</displayName>
+            <groupType />
+            <isSelector>false</isSelector>
+            <isFilter>false</isFilter>
+            <isSorter>false</isSorter>
+            <isParameter>false</isParameter>
+            <returnType />
+            <propertyRefs>
+                <propertyRef>
+                    <key>e6d4a496-251b-4d37-85ee-93f58f1abf17</key>
+                    <parentUnit>
+                        <key name="name" value="ae675945-d937-4a38-9750-a4240939f1a2" />
+                    </parentUnit>
+                    <subEntity>
+                        <key name="name" value="adminOrgUnit" />
+                    </subEntity>
+                    <refProperty>
+                        <key name="name" value="id" />
+                    </refProperty>
+                </propertyRef>
+            </propertyRefs>
+            <query>
+                <key name="package" value="com.kingdee.eas.hr.project.app" />
+                <key name="name" value="ProjectClockQuery" />
+            </query>
+        </propertyUnit>
         <queryField>
             <name>project.projectName</name>
             <userDefined>true</userDefined>
@@ -542,7 +648,7 @@
             <returnType>String</returnType>
             <propertyRefs>
                 <propertyRef>
-                    <key>88f4fef3-300d-48b5-bf99-ad4809f2e04e</key>
+                    <key>22e7565f-05c9-4cf0-9c7e-aa8eb28df884</key>
                     <parentUnit>
                         <key name="name" value="project.projectName" />
                     </parentUnit>
@@ -560,11 +666,11 @@
             </query>
         </queryField>
         <propertyUnit>
-            <name>2131dce6-5dd4-454b-b56f-73a15873f7fc</name>
+            <name>6fdd26d6-dc9f-4d65-b643-8d11a38a91b0</name>
             <userDefined>true</userDefined>
             <formulaString />
             <constString />
-            <displayName>joinQuery[com.kingdee.eas.hr.project.app.ProjectClockQuery].units.propertyUnit[2131dce6-5dd4-454b-b56f-73a15873f7fc].displayName</displayName>
+            <displayName>joinQuery[com.kingdee.eas.hr.project.app.ProjectClockQuery].units.propertyUnit[6fdd26d6-dc9f-4d65-b643-8d11a38a91b0].displayName</displayName>
             <groupType />
             <isSelector>false</isSelector>
             <isFilter>false</isFilter>
@@ -573,9 +679,9 @@
             <returnType />
             <propertyRefs>
                 <propertyRef>
-                    <key>9a603c3a-986e-404d-b564-1dfc256650bd</key>
+                    <key>bfe76c42-8155-47ea-883d-e3223f3e2c15</key>
                     <parentUnit>
-                        <key name="name" value="2131dce6-5dd4-454b-b56f-73a15873f7fc" />
+                        <key name="name" value="6fdd26d6-dc9f-4d65-b643-8d11a38a91b0" />
                     </parentUnit>
                     <subEntity>
                         <key name="name" value="ProjectClock" />
@@ -591,11 +697,11 @@
             </query>
         </propertyUnit>
         <propertyUnit>
-            <name>669b3ed5-24ef-4a53-ad9d-298b811f2855</name>
+            <name>265fbcba-16ce-4434-881c-6e6469bb4644</name>
             <userDefined>true</userDefined>
             <formulaString />
             <constString />
-            <displayName>joinQuery[com.kingdee.eas.hr.project.app.ProjectClockQuery].units.propertyUnit[669b3ed5-24ef-4a53-ad9d-298b811f2855].displayName</displayName>
+            <displayName>joinQuery[com.kingdee.eas.hr.project.app.ProjectClockQuery].units.propertyUnit[265fbcba-16ce-4434-881c-6e6469bb4644].displayName</displayName>
             <groupType />
             <isSelector>false</isSelector>
             <isFilter>false</isFilter>
@@ -604,9 +710,9 @@
             <returnType />
             <propertyRefs>
                 <propertyRef>
-                    <key>19ab14a4-9b90-40a9-850a-2b2ad0a52891</key>
+                    <key>f4ec2d4f-9c7f-48bc-af25-1c321b14dcf0</key>
                     <parentUnit>
-                        <key name="name" value="669b3ed5-24ef-4a53-ad9d-298b811f2855" />
+                        <key name="name" value="265fbcba-16ce-4434-881c-6e6469bb4644" />
                     </parentUnit>
                     <subEntity>
                         <key name="name" value="project" />
@@ -635,7 +741,7 @@
             <returnType>Int</returnType>
             <propertyRefs>
                 <propertyRef>
-                    <key>74373718-0a0d-4999-9a19-7b9c2d6d9d8c</key>
+                    <key>020c6214-c4a4-4546-b58c-254ba5ee30fe</key>
                     <parentUnit>
                         <key name="name" value="state" />
                     </parentUnit>
@@ -746,7 +852,37 @@
             </query>
         </join>
         <join>
-            <name>2a3351ee-4797-4cde-80ec-06018d5483fe</name>
+            <name>e4b6f775-dc78-4edf-be81-7837660bffce</name>
+            <formulaString>#0</formulaString>
+            <type>LEFT OUTER JOIN</type>
+            <leftObject>
+                <key name="name" value="ProjectClock" />
+            </leftObject>
+            <rightObject>
+                <key name="name" value="adminOrgUnit" />
+            </rightObject>
+            <joinItems>
+                <joinItem>
+                    <name>5edc44fe-3fab-40a8-937b-f80062e4beba</name>
+                    <compareType>=</compareType>
+                    <leftField>
+                        <key name="name" value="74a9247e-469c-41a4-af9e-de651bc546e2" />
+                    </leftField>
+                    <rightField>
+                        <key name="name" value="ae675945-d937-4a38-9750-a4240939f1a2" />
+                    </rightField>
+                    <join>
+                        <key name="name" value="e4b6f775-dc78-4edf-be81-7837660bffce" />
+                    </join>
+                </joinItem>
+            </joinItems>
+            <query>
+                <key name="package" value="com.kingdee.eas.hr.project.app" />
+                <key name="name" value="ProjectClockQuery" />
+            </query>
+        </join>
+        <join>
+            <name>e184f27f-e94f-4215-8bbc-c8aac0a32d10</name>
             <formulaString>#0</formulaString>
             <type>LEFT OUTER JOIN</type>
             <leftObject>
@@ -757,16 +893,16 @@
             </rightObject>
             <joinItems>
                 <joinItem>
-                    <name>de2e81c5-0bbe-4544-acb8-02ad31e9c2ae</name>
+                    <name>bf2e342f-b9ea-414c-9af5-727f9a44129a</name>
                     <compareType>=</compareType>
                     <leftField>
-                        <key name="name" value="2131dce6-5dd4-454b-b56f-73a15873f7fc" />
+                        <key name="name" value="6fdd26d6-dc9f-4d65-b643-8d11a38a91b0" />
                     </leftField>
                     <rightField>
-                        <key name="name" value="669b3ed5-24ef-4a53-ad9d-298b811f2855" />
+                        <key name="name" value="265fbcba-16ce-4434-881c-6e6469bb4644" />
                     </rightField>
                     <join>
-                        <key name="name" value="2a3351ee-4797-4cde-80ec-06018d5483fe" />
+                        <key name="name" value="e184f27f-e94f-4215-8bbc-c8aac0a32d10" />
                     </join>
                 </joinItem>
             </joinItems>
@@ -779,9 +915,9 @@
     <resource>
         <rs key="joinQuery[com.kingdee.eas.hr.project.app.ProjectClockQuery].alias">
             <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="项目位置" />
-            <lang locale="zh_HK" value="項目位置" />
-            <lang locale="zh_TW" value="項目位置" />
+            <lang locale="zh_CN" value="项目打卡位置" />
+            <lang locale="zh_HK" value="項目打卡位置" />
+            <lang locale="zh_TW" value="項目打卡位置" />
         </rs>
         <rs key="joinQuery[com.kingdee.eas.hr.project.app.ProjectClockQuery].defaultSorters.querySorterItemextendedProperty.ColWidthInKDTable">
             <lang locale="en_US" value="50" />
@@ -825,9 +961,9 @@
             <lang locale="zh_TW" value="com.kingdee.eas.hr.project.client.ProjectResource.ProjectClockQueryF7WindowTitle" />
         </rs>
         <rs key="joinQuery[com.kingdee.eas.hr.project.app.ProjectClockQuery].extendedProperty.f7WindowTitle">
-            <lang locale="en_US" value="项目位置" />
-            <lang locale="zh_CN" value="项目位置" />
-            <lang locale="zh_TW" value="项目位置" />
+            <lang locale="en_US" value="项目打卡位置" />
+            <lang locale="zh_CN" value="项目打卡位置" />
+            <lang locale="zh_TW" value="项目打卡位置" />
         </rs>
         <rs key="joinQuery[com.kingdee.eas.hr.project.app.ProjectClockQuery].extendedProperty.isCommonQueryFilter">
             <lang locale="en_US" value="false" />
@@ -867,6 +1003,12 @@
             <lang locale="zh_HK" value="null" />
             <lang locale="zh_TW" value="null" />
         </rs>
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.ProjectClockQuery].subObjects.subEntity[adminOrgUnit].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="joinQuery[com.kingdee.eas.hr.project.app.ProjectClockQuery].subObjects.subEntity[creator].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="null" />
@@ -885,13 +1027,19 @@
             <lang locale="zh_HK" value="null" />
             <lang locale="zh_TW" value="null" />
         </rs>
-        <rs key="joinQuery[com.kingdee.eas.hr.project.app.ProjectClockQuery].units.propertyUnit[2131dce6-5dd4-454b-b56f-73a15873f7fc].displayName">
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.ProjectClockQuery].units.propertyUnit[265fbcba-16ce-4434-881c-6e6469bb4644].displayName">
             <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="joinQuery[com.kingdee.eas.hr.project.app.ProjectClockQuery].units.propertyUnit[669b3ed5-24ef-4a53-ad9d-298b811f2855].displayName">
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.ProjectClockQuery].units.propertyUnit[6fdd26d6-dc9f-4d65-b643-8d11a38a91b0].displayName">
+            <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="joinQuery[com.kingdee.eas.hr.project.app.ProjectClockQuery].units.propertyUnit[74a9247e-469c-41a4-af9e-de651bc546e2].displayName">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="null" />
             <lang locale="zh_HK" value="null" />
@@ -921,6 +1069,33 @@
             <lang locale="zh_HK" value="null" />
             <lang locale="zh_TW" value="null" />
         </rs>
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.ProjectClockQuery].units.propertyUnit[ae675945-d937-4a38-9750-a4240939f1a2].displayName">
+            <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="joinQuery[com.kingdee.eas.hr.project.app.ProjectClockQuery].units.queryField[adminOrgUnit.name].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.ProjectClockQuery].units.queryField[adminOrgUnit.name].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.ProjectClockQuery].units.queryField[adminOrgUnit.name].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.ProjectClockQuery].units.queryField[adminOrgUnit.name].extendedProperty.isUsingF7">
+            <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.ProjectClockQuery].units.queryField[createTime].displayName">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="创建时间" />

metadata/com/kingdee/eas/hr/project/app/R_ProjectClock_ProjectManagement_Project.relation

@@ -21,11 +21,13 @@
         <rs key="relationship[com.kingdee.eas.hr.project.app.R_ProjectClock_ProjectManagement_project].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="null" />
+            <lang locale="zh_HK" value="null" />
             <lang locale="zh_TW" value="null" />
         </rs>
         <rs key="relationship[com.kingdee.eas.hr.project.app.R_ProjectClock_ProjectManagement_project].description">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="null" />
+            <lang locale="zh_HK" value="null" />
             <lang locale="zh_TW" value="null" />
         </rs>
     </resource>

metadata/com/kingdee/eas/hr/project/client/ProjectClockEditUI.ui

@@ -213,6 +213,55 @@
                 <key name="name" value="CoreUI" />
             </parent>
         </component>
+        <component>
+            <name>contadminOrgUnit</name>
+            <alias>uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[contadminOrgUnit].alias</alias>
+            <userDefined>true</userDefined>
+            <classType>com.kingdee.bos.ctrl.swing.KDLabelContainer</classType>
+            <isContainer>true</isContainer>
+            <constraints>0,0,270,19</constraints>
+            <tabIndex>0</tabIndex>
+            <herited>false</herited>
+            <bimUIObjectPK />
+            <layoutInfo>
+                <name />
+                <type>LabelContainerLayout</type>
+                <value />
+            </layoutInfo>
+            <properties>
+                <property>
+                    <name>boundLabelText</name>
+                    <type>java.lang.String</type>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[contadminOrgUnit].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.ProjectClockEditUI].components.component[contadminOrgUnit].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.ProjectClockEditUI].components.component[contadminOrgUnit].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.ProjectClockEditUI].components.component[contadminOrgUnit].properties.property[visible].value</value>
+                    <isMultiLan>false</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+            </properties>
+            <parent>
+                <key name="name" value="CoreUI" />
+            </parent>
+        </component>
         <component>
             <name>contproject</name>
             <alias>uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[contproject].alias</alias>
@@ -457,6 +506,84 @@
                 </propertyBinding>
             </propertyBindings>
         </component>
+        <component>
+            <name>prmtadminOrgUnit</name>
+            <alias>uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[prmtadminOrgUnit].alias</alias>
+            <userDefined>true</userDefined>
+            <classType>com.kingdee.bos.ctrl.extendcontrols.KDBizPromptBox</classType>
+            <isContainer>false</isContainer>
+            <constraints>7</constraints>
+            <tabIndex>0</tabIndex>
+            <herited>false</herited>
+            <bimUIObjectPK />
+            <properties>
+                <property>
+                    <name>queryInfo</name>
+                    <type>java.lang.String</type>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[prmtadminOrgUnit].properties.property[queryInfo].value</value>
+                    <isMultiLan>false</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+                <property>
+                    <name>visible</name>
+                    <type>boolean</type>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[prmtadminOrgUnit].properties.property[visible].value</value>
+                    <isMultiLan>false</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+                <property>
+                    <name>editable</name>
+                    <type>boolean</type>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[prmtadminOrgUnit].properties.property[editable].value</value>
+                    <isMultiLan>false</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+                <property>
+                    <name>displayFormat</name>
+                    <type>java.lang.String</type>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[prmtadminOrgUnit].properties.property[displayFormat].value</value>
+                    <isMultiLan>false</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+                <property>
+                    <name>editFormat</name>
+                    <type>java.lang.String</type>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[prmtadminOrgUnit].properties.property[editFormat].value</value>
+                    <isMultiLan>false</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+                <property>
+                    <name>commitFormat</name>
+                    <type>java.lang.String</type>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[prmtadminOrgUnit].properties.property[commitFormat].value</value>
+                    <isMultiLan>false</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+                <property>
+                    <name>required</name>
+                    <type>boolean</type>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[prmtadminOrgUnit].properties.property[required].value</value>
+                    <isMultiLan>false</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+            </properties>
+            <parent>
+                <key name="name" value="contadminOrgUnit" />
+            </parent>
+            <propertyBindings>
+                <propertyBinding>
+                    <propertyName>data</propertyName>
+                    <propertyType>java.lang.Object</propertyType>
+                    <bindingObject>editData</bindingObject>
+                    <bindingField>adminOrgUnit</bindingField>
+                    <fieldType>com.kingdee.eas.basedata.org.AdminOrgUnitInfo</fieldType>
+                    <accessType>2</accessType>
+                    <autoMode>false</autoMode>
+                    <herited>false</herited>
+                    <userDefined>true</userDefined>
+                </propertyBinding>
+            </propertyBindings>
+        </component>
         <component>
             <name>prmtproject</name>
             <alias>uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[prmtproject].alias</alias>
@@ -464,7 +591,7 @@
             <classType>com.kingdee.bos.ctrl.extendcontrols.KDBizPromptBox</classType>
             <isContainer>false</isContainer>
             <constraints>7</constraints>
-            <tabIndex>10</tabIndex>
+            <tabIndex>11</tabIndex>
             <herited>false</herited>
             <bimUIObjectPK />
             <properties>
@@ -542,7 +669,7 @@
             <classType>com.kingdee.bos.ctrl.swing.KDComboBox</classType>
             <isContainer>false</isContainer>
             <constraints>7</constraints>
-            <tabIndex>11</tabIndex>
+            <tabIndex>12</tabIndex>
             <herited>false</herited>
             <bimUIObjectPK />
             <properties>
@@ -797,9 +924,9 @@
     <resource>
         <rs key="uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].alias">
             <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="项目位置" />
-            <lang locale="zh_HK" value="項目位置" />
-            <lang locale="zh_TW" value="項目位置" />
+            <lang locale="zh_CN" value="项目打卡位置" />
+            <lang locale="zh_HK" value="項目打卡位置" />
+            <lang locale="zh_TW" value="項目打卡位置" />
         </rs>
         <rs key="uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[CoreUI].alias">
             <lang locale="en_US" value="null" />
@@ -831,6 +958,36 @@
             <lang locale="zh_HK" value="false" />
             <lang locale="zh_TW" value="false" />
         </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[contadminOrgUnit].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.ProjectClockEditUI].components.component[contadminOrgUnit].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.ProjectClockEditUI].components.component[contadminOrgUnit].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.ProjectClockEditUI].components.component[contadminOrgUnit].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.ProjectClockEditUI].components.component[contadminOrgUnit].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.ProjectClockEditUI].components.component[contproject].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="null" />
@@ -1023,6 +1180,54 @@
             <lang locale="zh_HK" value="false" />
             <lang locale="zh_TW" value="false" />
         </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[prmtadminOrgUnit].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.ProjectClockEditUI].components.component[prmtadminOrgUnit].properties.property[commitFormat].value">
+            <lang locale="en_US" value="$number$" />
+            <lang locale="zh_CN" value="$number$" />
+            <lang locale="zh_HK" value="$number$" />
+            <lang locale="zh_TW" value="$number$" />
+        </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[prmtadminOrgUnit].properties.property[displayFormat].value">
+            <lang locale="en_US" value="$name$" />
+            <lang locale="zh_CN" value="$name$" />
+            <lang locale="zh_HK" value="$name$" />
+            <lang locale="zh_TW" value="$name$" />
+        </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[prmtadminOrgUnit].properties.property[editFormat].value">
+            <lang locale="en_US" value="$number$" />
+            <lang locale="zh_CN" value="$number$" />
+            <lang locale="zh_HK" value="$number$" />
+            <lang locale="zh_TW" value="$number$" />
+        </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[prmtadminOrgUnit].properties.property[editable].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.ProjectClockEditUI].components.component[prmtadminOrgUnit].properties.property[queryInfo].value">
+            <lang locale="en_US" value="com.kingdee.eas.basedata.org.app.AdminItemQuery" />
+            <lang locale="zh_CN" value="com.kingdee.eas.basedata.org.app.AdminItemQuery" />
+            <lang locale="zh_HK" value="com.kingdee.eas.basedata.org.app.AdminItemQuery" />
+            <lang locale="zh_TW" value="com.kingdee.eas.basedata.org.app.AdminItemQuery" />
+        </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[prmtadminOrgUnit].properties.property[required].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.ProjectClockEditUI].components.component[prmtadminOrgUnit].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.ProjectClockEditUI].components.component[prmtproject].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="项目" />
@@ -1185,9 +1390,9 @@
         </rs>
         <rs key="uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].title">
             <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="项目位置" />
-            <lang locale="zh_HK" value="項目位置" />
-            <lang locale="zh_TW" value="項目位置" />
+            <lang locale="zh_CN" value="项目打卡位置" />
+            <lang locale="zh_HK" value="項目打卡位置" />
+            <lang locale="zh_TW" value="項目打卡位置" />
         </rs>
     </resource>
 </uiObject>

metadata/com/kingdee/eas/hr/project/client/ProjectResource.resource

@@ -57,6 +57,11 @@
             <value>i18nResource[com.kingdee.eas.hr.project.client.ProjectResource].resourceItems.resourceItem[WorkHoursConfirmQueryF7WindowTitle].value</value>
             <userDefined>true</userDefined>
         </resourceItem>
+        <resourceItem>
+            <name>ProjectClockQueryF7WindowTitle</name>
+            <value>i18nResource[com.kingdee.eas.hr.project.client.ProjectResource].resourceItems.resourceItem[ProjectClockQueryF7WindowTitle].value</value>
+            <userDefined>true</userDefined>
+        </resourceItem>
     </resourceItems>
     <resource>
         <rs key="i18nResource[com.kingdee.eas.hr.project.client.ProjectResource].alias">
@@ -89,6 +94,12 @@
             <lang locale="zh_HK" value="項目變更" />
             <lang locale="zh_TW" value="項目變更" />
         </rs>
+        <rs key="i18nResource[com.kingdee.eas.hr.project.client.ProjectResource].resourceItems.resourceItem[ProjectClockQueryF7WindowTitle].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="i18nResource[com.kingdee.eas.hr.project.client.ProjectResource].resourceItems.resourceItem[ProjectManagementQueryF7WindowTitle].value">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="项目管理" />

metadata/entity_pkmapping.properties

@@ -1,8 +1,9 @@
 #
-#Wed Dec 04 19:27:26 CST 2024
+#Mon Dec 16 19:37:06 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
+2D392B76=com.kingdee.eas.hr.project.app.ProjectClock
 44CE7F57=com.kingdee.eas.hr.project.app.ProjectManagementEntry
 A88F114F=com.kingdee.eas.hr.project.app.WorkHoursConfirmEntry
 1B8E9CE3=com.kingdee.eas.hr.project.app.WorkHoursConfirm

metadata/facade_pkmapping.properties

@@ -1,2 +1,3 @@
 #
-#Wed Dec 04 19:27:26 CST 2024
+#Mon Dec 16 19:37:06 CST 2024
+BAE52A17=com.kingdee.eas.hr.project.app.WorkHoursFacade

src/com/kingdee/eas/hr/project/AbstractProjectClockInfo.java

@@ -18,7 +18,18 @@ public class AbstractProjectClockInfo extends com.kingdee.eas.framework.DataBase
         super(pkField);
     }
     /**
-     * Object: 项目位置 's 项目 property 
+     * Object: 项目打卡位置 's 行政组织 property 
+     */
+    public com.kingdee.eas.basedata.org.AdminOrgUnitInfo getAdminOrgUnit()
+    {
+        return (com.kingdee.eas.basedata.org.AdminOrgUnitInfo)get("adminOrgUnit");
+    }
+    public void setAdminOrgUnit(com.kingdee.eas.basedata.org.AdminOrgUnitInfo item)
+    {
+        put("adminOrgUnit", item);
+    }
+    /**
+     * Object: 项目打卡位置 's 项目 property 
      */
     public com.kingdee.eas.hr.project.ProjectManagementInfo getProject()
     {
@@ -29,7 +40,7 @@ public class AbstractProjectClockInfo extends com.kingdee.eas.framework.DataBase
         put("project", item);
     }
     /**
-     * Object:项目位置's 是否启用property 
+     * Object:项目打卡位置's 是否启用property 
      */
     public com.kingdee.shr.base.syssetting.BaseItemStateEnum getState()
     {

src/com/kingdee/eas/hr/project/app/AbstractProjectClockControllerBean.java

@@ -49,7 +49,7 @@ public abstract class AbstractProjectClockControllerBean extends DataBaseControl
     public ProjectClockInfo getProjectClockInfo(Context ctx, IObjectPK pk) throws BOSException, EASBizException
     {
         try {
-            ServiceContext svcCtx = createServiceContext(new MetaDataPK("500cc0f1-783f-4d42-9335-00ce96e58194"), new Object[]{ctx, pk});
+            ServiceContext svcCtx = createServiceContext(new MetaDataPK("6aaa0d6d-af2e-4895-a159-d5280478d190"), new Object[]{ctx, pk});
             invokeServiceBefore(svcCtx);
             if(!svcCtx.invokeBreak()) {
             ProjectClockInfo retValue = (ProjectClockInfo)_getValue(ctx, pk);
@@ -74,7 +74,7 @@ public abstract class AbstractProjectClockControllerBean extends DataBaseControl
     public ProjectClockInfo getProjectClockInfo(Context ctx, IObjectPK pk, SelectorItemCollection selector) throws BOSException, EASBizException
     {
         try {
-            ServiceContext svcCtx = createServiceContext(new MetaDataPK("91e9ee60-2053-478a-bf9d-fdde811eb251"), new Object[]{ctx, pk, selector});
+            ServiceContext svcCtx = createServiceContext(new MetaDataPK("87d0071c-3375-4926-9c4d-c2c6b49665cd"), new Object[]{ctx, pk, selector});
             invokeServiceBefore(svcCtx);
             if(!svcCtx.invokeBreak()) {
             ProjectClockInfo retValue = (ProjectClockInfo)_getValue(ctx, pk, selector);
@@ -99,7 +99,7 @@ public abstract class AbstractProjectClockControllerBean extends DataBaseControl
     public ProjectClockInfo getProjectClockInfo(Context ctx, String oql) throws BOSException, EASBizException
     {
         try {
-            ServiceContext svcCtx = createServiceContext(new MetaDataPK("804ea83f-8bb3-4ce2-9bfe-19a619451c24"), new Object[]{ctx, oql});
+            ServiceContext svcCtx = createServiceContext(new MetaDataPK("b17d8b7a-1643-499c-ad30-82fbb0cc4ff5"), new Object[]{ctx, oql});
             invokeServiceBefore(svcCtx);
             if(!svcCtx.invokeBreak()) {
             ProjectClockInfo retValue = (ProjectClockInfo)_getValue(ctx, oql);
@@ -124,7 +124,7 @@ public abstract class AbstractProjectClockControllerBean extends DataBaseControl
     public ProjectClockCollection getProjectClockCollection(Context ctx) throws BOSException
     {
         try {
-            ServiceContext svcCtx = createServiceContext(new MetaDataPK("3c871f61-6f00-4c47-8144-ad5435bb9329"), new Object[]{ctx});
+            ServiceContext svcCtx = createServiceContext(new MetaDataPK("8639c358-d935-4f77-87fe-813137392737"), new Object[]{ctx});
             invokeServiceBefore(svcCtx);
             if(!svcCtx.invokeBreak()) {
             ProjectClockCollection retValue = (ProjectClockCollection)_getCollection(ctx, svcCtx);
@@ -147,7 +147,7 @@ public abstract class AbstractProjectClockControllerBean extends DataBaseControl
     public ProjectClockCollection getProjectClockCollection(Context ctx, EntityViewInfo view) throws BOSException
     {
         try {
-            ServiceContext svcCtx = createServiceContext(new MetaDataPK("f93c9c57-a8bf-4d3e-ae09-c2c282840a03"), new Object[]{ctx, view});
+            ServiceContext svcCtx = createServiceContext(new MetaDataPK("295b4fc1-6e38-4d2a-915e-204ea7349fe3"), new Object[]{ctx, view});
             invokeServiceBefore(svcCtx);
             if(!svcCtx.invokeBreak()) {
             ProjectClockCollection retValue = (ProjectClockCollection)_getCollection(ctx, svcCtx, view);
@@ -170,7 +170,7 @@ public abstract class AbstractProjectClockControllerBean extends DataBaseControl
     public ProjectClockCollection getProjectClockCollection(Context ctx, String oql) throws BOSException
     {
         try {
-            ServiceContext svcCtx = createServiceContext(new MetaDataPK("08363489-2f9e-4bb8-8389-f06757715246"), new Object[]{ctx, oql});
+            ServiceContext svcCtx = createServiceContext(new MetaDataPK("6b7fb18b-a1e8-4947-97f1-1e58c81b7bc4"), new Object[]{ctx, oql});
             invokeServiceBefore(svcCtx);
             if(!svcCtx.invokeBreak()) {
             ProjectClockCollection retValue = (ProjectClockCollection)_getCollection(ctx, svcCtx, oql);
@@ -190,6 +190,14 @@ public abstract class AbstractProjectClockControllerBean extends DataBaseControl
         return super._getCollection(ctx, svcCtx, oql);
     }
 
+					protected com.kingdee.eas.basedata.org.OrgUnitInfo getMainBizOrgUnit(Context ctx,com.kingdee.eas.framework.CoreBillBaseInfo model) {
+			Object obj = model.get("adminOrgUnit");
+			if (obj != null && obj instanceof com.kingdee.eas.basedata.org.OrgUnitInfo)
+				return (com.kingdee.eas.basedata.org.OrgUnitInfo)obj;
+			else
+				return null;
+		}
+
     public DataBaseCollection getDataBaseCollection (Context ctx) throws BOSException
     {
     	return (DataBaseCollection)(getProjectClockCollection(ctx).cast(DataBaseCollection.class));

src/com/kingdee/eas/hr/project/client/AbstractProjectClockEditUI.java

@@ -50,12 +50,14 @@ public abstract class AbstractProjectClockEditUI extends com.kingdee.eas.framewo
     protected com.kingdee.bos.ctrl.swing.KDLabelContainer kDLabelContainer2;
     protected com.kingdee.bos.ctrl.swing.KDLabelContainer kDLabelContainer3;
     protected com.kingdee.bos.ctrl.swing.KDLabelContainer kDLabelContainer4;
+    protected com.kingdee.bos.ctrl.swing.KDLabelContainer contadminOrgUnit;
     protected com.kingdee.bos.ctrl.swing.KDLabelContainer contproject;
     protected com.kingdee.bos.ctrl.swing.KDLabelContainer contstate;
     protected com.kingdee.bos.ctrl.swing.KDTextField txtNumber;
     protected com.kingdee.bos.ctrl.extendcontrols.KDBizMultiLangBox txtName;
     protected com.kingdee.bos.ctrl.swing.KDTextField txtSimpleName;
     protected com.kingdee.bos.ctrl.extendcontrols.KDBizMultiLangBox txtDescription;
+    protected com.kingdee.bos.ctrl.extendcontrols.KDBizPromptBox prmtadminOrgUnit;
     protected com.kingdee.bos.ctrl.extendcontrols.KDBizPromptBox prmtproject;
     protected com.kingdee.bos.ctrl.swing.KDComboBox state;
     protected com.kingdee.eas.hr.project.ProjectClockInfo editData = null;
@@ -82,24 +84,28 @@ public abstract class AbstractProjectClockEditUI extends com.kingdee.eas.framewo
         this.kDLabelContainer2 = new com.kingdee.bos.ctrl.swing.KDLabelContainer();
         this.kDLabelContainer3 = new com.kingdee.bos.ctrl.swing.KDLabelContainer();
         this.kDLabelContainer4 = new com.kingdee.bos.ctrl.swing.KDLabelContainer();
+        this.contadminOrgUnit = new com.kingdee.bos.ctrl.swing.KDLabelContainer();
         this.contproject = new com.kingdee.bos.ctrl.swing.KDLabelContainer();
         this.contstate = new com.kingdee.bos.ctrl.swing.KDLabelContainer();
         this.txtNumber = new com.kingdee.bos.ctrl.swing.KDTextField();
         this.txtName = new com.kingdee.bos.ctrl.extendcontrols.KDBizMultiLangBox();
         this.txtSimpleName = new com.kingdee.bos.ctrl.swing.KDTextField();
         this.txtDescription = new com.kingdee.bos.ctrl.extendcontrols.KDBizMultiLangBox();
+        this.prmtadminOrgUnit = new com.kingdee.bos.ctrl.extendcontrols.KDBizPromptBox();
         this.prmtproject = new com.kingdee.bos.ctrl.extendcontrols.KDBizPromptBox();
         this.state = new com.kingdee.bos.ctrl.swing.KDComboBox();
         this.kDLabelContainer1.setName("kDLabelContainer1");
         this.kDLabelContainer2.setName("kDLabelContainer2");
         this.kDLabelContainer3.setName("kDLabelContainer3");
         this.kDLabelContainer4.setName("kDLabelContainer4");
+        this.contadminOrgUnit.setName("contadminOrgUnit");
         this.contproject.setName("contproject");
         this.contstate.setName("contstate");
         this.txtNumber.setName("txtNumber");
         this.txtName.setName("txtName");
         this.txtSimpleName.setName("txtSimpleName");
         this.txtDescription.setName("txtDescription");
+        this.prmtadminOrgUnit.setName("prmtadminOrgUnit");
         this.prmtproject.setName("prmtproject");
         this.state.setName("state");
         // CoreUI		
@@ -125,6 +131,11 @@ public abstract class AbstractProjectClockEditUI extends com.kingdee.eas.framewo
         this.kDLabelContainer4.setBoundLabelUnderline(true);		
         this.kDLabelContainer4.setBoundLabelAlignment(7);		
         this.kDLabelContainer4.setVisible(true);
+        // contadminOrgUnit		
+        this.contadminOrgUnit.setBoundLabelText(resHelper.getString("contadminOrgUnit.boundLabelText"));		
+        this.contadminOrgUnit.setBoundLabelLength(100);		
+        this.contadminOrgUnit.setBoundLabelUnderline(true);		
+        this.contadminOrgUnit.setVisible(true);
         // contproject		
         this.contproject.setBoundLabelText(resHelper.getString("contproject.boundLabelText"));		
         this.contproject.setBoundLabelLength(100);		
@@ -141,6 +152,16 @@ public abstract class AbstractProjectClockEditUI extends com.kingdee.eas.framewo
         // txtSimpleName		
         this.txtSimpleName.setMaxLength(80);
         // txtDescription
+        // prmtadminOrgUnit		
+        this.prmtadminOrgUnit.setQueryInfo("com.kingdee.eas.basedata.org.app.AdminItemQuery");		
+        this.prmtadminOrgUnit.setVisible(true);		
+        this.prmtadminOrgUnit.setEditable(true);		
+        this.prmtadminOrgUnit.setDisplayFormat("$name$");		
+        this.prmtadminOrgUnit.setEditFormat("$number$");		
+        this.prmtadminOrgUnit.setCommitFormat("$number$");		
+        this.prmtadminOrgUnit.setRequired(true);
+        		setOrgF7(prmtadminOrgUnit,com.kingdee.eas.basedata.org.OrgType.getEnum("Admin"));
+					
         // prmtproject		
         this.prmtproject.setQueryInfo("com.kingdee.eas.hr.project.app.ProjectManagementQuery");		
         this.prmtproject.setVisible(true);		
@@ -189,6 +210,8 @@ public abstract class AbstractProjectClockEditUI extends com.kingdee.eas.framewo
         this.add(kDLabelContainer3, null);
         kDLabelContainer4.setBounds(new Rectangle(102, 155, 270, 19));
         this.add(kDLabelContainer4, null);
+        contadminOrgUnit.setBounds(new Rectangle(0, 0, 270, 19));
+        this.add(contadminOrgUnit, null);
         contproject.setBounds(new Rectangle(0, 0, 270, 19));
         this.add(contproject, null);
         contstate.setBounds(new Rectangle(0, 0, 270, 19));
@@ -201,6 +224,8 @@ public abstract class AbstractProjectClockEditUI extends com.kingdee.eas.framewo
         kDLabelContainer3.setBoundEditor(txtSimpleName);
         //kDLabelContainer4
         kDLabelContainer4.setBoundEditor(txtDescription);
+        //contadminOrgUnit
+        contadminOrgUnit.setBoundEditor(prmtadminOrgUnit);
         //contproject
         contproject.setBoundEditor(prmtproject);
         //contstate
@@ -319,6 +344,7 @@ public abstract class AbstractProjectClockEditUI extends com.kingdee.eas.framewo
 		dataBinder.registerBinding("name", String.class, this.txtName, "_multiLangItem");
 		dataBinder.registerBinding("simpleName", String.class, this.txtSimpleName, "text");
 		dataBinder.registerBinding("description", String.class, this.txtDescription, "_multiLangItem");
+		dataBinder.registerBinding("adminOrgUnit", com.kingdee.eas.basedata.org.AdminOrgUnitInfo.class, this.prmtadminOrgUnit, "data");
 		dataBinder.registerBinding("project", com.kingdee.eas.hr.project.ProjectManagementInfo.class, this.prmtproject, "data");
 		dataBinder.registerBinding("state", com.kingdee.shr.base.syssetting.BaseItemStateEnum.class, this.state, "selectedItem");		
 	}
@@ -382,7 +408,7 @@ public abstract class AbstractProjectClockEditUI extends com.kingdee.eas.framewo
     protected void removeByPK(IObjectPK pk) throws Exception {
     	IObjectValue editData = this.editData;
     	super.removeByPK(pk);
-    	recycleNumberByOrg(editData,"NONE",editData.getString("number"));
+    	recycleNumberByOrg(editData,"Admin",editData.getString("number"));
     }
     
     protected void recycleNumberByOrg(IObjectValue editData,String orgType,String number) {
@@ -438,13 +464,21 @@ public abstract class AbstractProjectClockEditUI extends com.kingdee.eas.framewo
             }
         }
     }
+			protected com.kingdee.eas.basedata.org.OrgType getMainBizOrgType() {
+			return com.kingdee.eas.basedata.org.OrgType.getEnum("Admin");
+		}
+
+	protected KDBizPromptBox getMainBizOrg() {
+		return prmtadminOrgUnit;
+}
+
 
     /**
      * output loadFields method
      */
     public void loadFields()
     {
-        		setAutoNumberByOrg("NONE");
+        		setAutoNumberByOrg("Admin");
         dataBinder.loadFields();
     }
 		protected void setOrgF7(KDBizPromptBox f7,com.kingdee.eas.basedata.org.OrgType orgType) throws Exception
@@ -471,6 +505,7 @@ public abstract class AbstractProjectClockEditUI extends com.kingdee.eas.framewo
 		getValidateHelper().registerBindProperty("name", ValidateHelper.ON_SAVE);    
 		getValidateHelper().registerBindProperty("simpleName", ValidateHelper.ON_SAVE);    
 		getValidateHelper().registerBindProperty("description", ValidateHelper.ON_SAVE);    
+		getValidateHelper().registerBindProperty("adminOrgUnit", ValidateHelper.ON_SAVE);    
 		getValidateHelper().registerBindProperty("project", ValidateHelper.ON_SAVE);    
 		getValidateHelper().registerBindProperty("state", ValidateHelper.ON_SAVE);    		
 	}
@@ -515,6 +550,15 @@ public abstract class AbstractProjectClockEditUI extends com.kingdee.eas.framewo
         sic.add(new SelectorItemInfo("name"));
         sic.add(new SelectorItemInfo("simpleName"));
         sic.add(new SelectorItemInfo("description"));
+		if(selectorAll.equalsIgnoreCase("true"))
+		{
+			sic.add(new SelectorItemInfo("adminOrgUnit.*"));
+		}
+		else{
+        	sic.add(new SelectorItemInfo("adminOrgUnit.id"));
+        	sic.add(new SelectorItemInfo("adminOrgUnit.number"));
+        	sic.add(new SelectorItemInfo("adminOrgUnit.name"));
+		}
 		if(selectorAll.equalsIgnoreCase("true"))
 		{
 			sic.add(new SelectorItemInfo("project.*"));
@@ -558,6 +602,9 @@ public abstract class AbstractProjectClockEditUI extends com.kingdee.eas.framewo
     protected IObjectValue createNewData()
     {
         com.kingdee.eas.hr.project.ProjectClockInfo objectValue = new com.kingdee.eas.hr.project.ProjectClockInfo();
+				if (com.kingdee.eas.common.client.SysContext.getSysContext().getCurrentOrgUnit(com.kingdee.eas.basedata.org.OrgType.getEnum("Admin")) != null)
+			objectValue.put("adminOrgUnit",com.kingdee.eas.common.client.SysContext.getSysContext().getCurrentOrgUnit(com.kingdee.eas.basedata.org.OrgType.getEnum("Admin")));
+ 
         objectValue.setCreator((com.kingdee.eas.base.permission.UserInfo)(com.kingdee.eas.common.client.SysContext.getSysContext().getCurrentUser()));		
         return objectValue;
     }

src/com/kingdee/eas/hr/project/client/AbstractProjectClockEditUI.properties

@@ -1,8 +1,9 @@
-this.title=\u9879\u76EE\u4F4D\u7F6E
+this.title=\u9879\u76EE\u6253\u5361\u4F4D\u7F6E
 kDLabelContainer1.boundLabelText=\u7F16\u7801\:
 kDLabelContainer2.boundLabelText=\u540D\u79F0\:
 kDLabelContainer3.boundLabelText=\u7B80\u79F0\:
 kDLabelContainer4.boundLabelText=\u63CF\u8FF0\:
+contadminOrgUnit.boundLabelText=\u884C\u653F\u7EC4\u7EC7
 contproject.boundLabelText=\u9879\u76EE
 contstate.boundLabelText=\u662F\u5426\u542F\u7528
 state.items=[Enum]com.kingdee.shr.base.syssetting.BaseItemStateEnum

src/com/kingdee/eas/hr/project/client/AbstractProjectClockEditUI_l1.properties

@@ -3,6 +3,7 @@ kDLabelContainer1.boundLabelText=
 kDLabelContainer2.boundLabelText=
 kDLabelContainer3.boundLabelText=
 kDLabelContainer4.boundLabelText=
+contadminOrgUnit.boundLabelText=
 contproject.boundLabelText=
 contstate.boundLabelText=
 state.items=

src/com/kingdee/eas/hr/project/client/AbstractProjectClockEditUI_l2.properties

@@ -1,8 +1,9 @@
-this.title=\u9879\u76EE\u4F4D\u7F6E
+this.title=\u9879\u76EE\u6253\u5361\u4F4D\u7F6E
 kDLabelContainer1.boundLabelText=\u7F16\u7801\:
 kDLabelContainer2.boundLabelText=\u540D\u79F0\:
 kDLabelContainer3.boundLabelText=\u7B80\u79F0\:
 kDLabelContainer4.boundLabelText=\u63CF\u8FF0\:
+contadminOrgUnit.boundLabelText=\u884C\u653F\u7EC4\u7EC7
 contproject.boundLabelText=\u9879\u76EE
 contstate.boundLabelText=\u662F\u5426\u542F\u7528
 state.items=[Enum]com.kingdee.shr.base.syssetting.BaseItemStateEnum

src/com/kingdee/eas/hr/project/client/AbstractProjectClockEditUI_l3.properties

@@ -1,8 +1,9 @@
-this.title=\u9805\u76EE\u4F4D\u7F6E
+this.title=\u9805\u76EE\u6253\u5361\u4F4D\u7F6E
 kDLabelContainer1.boundLabelText=\u7DE8\u78BC\:
 kDLabelContainer2.boundLabelText=\u540D\u7A31\:
 kDLabelContainer3.boundLabelText=\u7C21\u7A31\:
 kDLabelContainer4.boundLabelText=\u63CF\u8FF0\:
+contadminOrgUnit.boundLabelText=\u884C\u653F\u7D44\u7E54
 contproject.boundLabelText=\u9805\u76EE
 contstate.boundLabelText=\u662F\u5426\u555F\u7528
 state.items=[Enum]com.kingdee.shr.base.syssetting.BaseItemStateEnum

src/com/kingdee/eas/hr/project/client/AbstractWorkHoursReportEditUI.java

@@ -269,16 +269,6 @@ public abstract class AbstractWorkHoursReportEditUI extends com.kingdee.eas.fram
         ObjectValueRender kdtEntrys_employee_OVR = new ObjectValueRender();
         kdtEntrys_employee_OVR.setFormat(new BizDataFormat("$name$"));
         this.kdtEntrys.getColumn("employee").setRenderer(kdtEntrys_employee_OVR);
-        KDTextField kdtEntrys_clockTime_TextField = new KDTextField();
-        kdtEntrys_clockTime_TextField.setName("kdtEntrys_clockTime_TextField");
-        kdtEntrys_clockTime_TextField.setMaxLength(100);
-        KDTDefaultCellEditor kdtEntrys_clockTime_CellEditor = new KDTDefaultCellEditor(kdtEntrys_clockTime_TextField);
-        this.kdtEntrys.getColumn("clockTime").setEditor(kdtEntrys_clockTime_CellEditor);
-        KDTextField kdtEntrys_clockLocation_TextField = new KDTextField();
-        kdtEntrys_clockLocation_TextField.setName("kdtEntrys_clockLocation_TextField");
-        kdtEntrys_clockLocation_TextField.setMaxLength(100);
-        KDTDefaultCellEditor kdtEntrys_clockLocation_CellEditor = new KDTDefaultCellEditor(kdtEntrys_clockLocation_TextField);
-        this.kdtEntrys.getColumn("clockLocation").setEditor(kdtEntrys_clockLocation_CellEditor);
         KDDatePicker kdtEntrys_data_DatePicker = new KDDatePicker();
         kdtEntrys_data_DatePicker.setName("kdtEntrys_data_DatePicker");
         kdtEntrys_data_DatePicker.setVisible(true);
@@ -296,11 +286,6 @@ public abstract class AbstractWorkHoursReportEditUI extends com.kingdee.eas.fram
         kdtEntrys_WorkingHours_TextField.setPrecision(10);
         KDTDefaultCellEditor kdtEntrys_WorkingHours_CellEditor = new KDTDefaultCellEditor(kdtEntrys_WorkingHours_TextField);
         this.kdtEntrys.getColumn("WorkingHours").setEditor(kdtEntrys_WorkingHours_CellEditor);
-        KDTextField kdtEntrys_notes_TextField = new KDTextField();
-        kdtEntrys_notes_TextField.setName("kdtEntrys_notes_TextField");
-        kdtEntrys_notes_TextField.setMaxLength(100);
-        KDTDefaultCellEditor kdtEntrys_notes_CellEditor = new KDTDefaultCellEditor(kdtEntrys_notes_TextField);
-        this.kdtEntrys.getColumn("notes").setEditor(kdtEntrys_notes_CellEditor);
         // contdataSource		
         this.contdataSource.setBoundLabelText(resHelper.getString("contdataSource.boundLabelText"));		
         this.contdataSource.setBoundLabelLength(100);		

src/com/kingdee/eas/hr/project/client/ProjectClockEditUI.java

@@ -429,6 +429,9 @@ public class ProjectClockEditUI extends AbstractProjectClockEditUI
     protected com.kingdee.bos.dao.IObjectValue createNewData()
     {
         com.kingdee.eas.hr.project.ProjectClockInfo objectValue = new com.kingdee.eas.hr.project.ProjectClockInfo();
+				if (com.kingdee.eas.common.client.SysContext.getSysContext().getCurrentOrgUnit(com.kingdee.eas.basedata.org.OrgType.getEnum("Admin")) != null)
+			objectValue.put("adminOrgUnit",com.kingdee.eas.common.client.SysContext.getSysContext().getCurrentOrgUnit(com.kingdee.eas.basedata.org.OrgType.getEnum("Admin")));
+ 
         objectValue.setCreator((com.kingdee.eas.base.permission.UserInfo)(com.kingdee.eas.common.client.SysContext.getSysContext().getCurrentUser()));
 		
         return objectValue;

src/com/kingdee/eas/hr/project/client/ProjectResource.properties

@@ -8,3 +8,4 @@ ProjectQueryF7WindowTitle=\u9879\u76EE
 TypeQueryF7WindowTitle=\u7C7B\u522B
 ProjectChangeQueryF7WindowTitle=\u9879\u76EE\u53D8\u66F4
 WorkHoursConfirmQueryF7WindowTitle=\u5DE5\u65F6\u786E\u8BA4\u5355
+ProjectClockQueryF7WindowTitle=\u9879\u76EE\u6253\u5361\u4F4D\u7F6E

src/com/kingdee/eas/hr/project/client/ProjectResource_l1.properties

@@ -8,3 +8,4 @@ ProjectQueryF7WindowTitle=
 TypeQueryF7WindowTitle=
 ProjectChangeQueryF7WindowTitle=
 WorkHoursConfirmQueryF7WindowTitle=
+ProjectClockQueryF7WindowTitle=

src/com/kingdee/eas/hr/project/client/ProjectResource_l2.properties

@@ -8,3 +8,4 @@ ProjectQueryF7WindowTitle=\u9879\u76EE
 TypeQueryF7WindowTitle=\u7C7B\u522B
 ProjectChangeQueryF7WindowTitle=\u9879\u76EE\u53D8\u66F4
 WorkHoursConfirmQueryF7WindowTitle=\u5DE5\u65F6\u786E\u8BA4\u5355
+ProjectClockQueryF7WindowTitle=\u9879\u76EE\u6253\u5361\u4F4D\u7F6E

src/com/kingdee/eas/hr/project/client/ProjectResource_l3.properties

@@ -8,3 +8,4 @@ ProjectQueryF7WindowTitle=\u9805\u76EE
 TypeQueryF7WindowTitle=\u985E\u5225
 ProjectChangeQueryF7WindowTitle=\u9805\u76EE\u8B8A\u66F4
 WorkHoursConfirmQueryF7WindowTitle=\u5DE5\u6642\u78BA\u8A8D\u55AE
+ProjectClockQueryF7WindowTitle=\u9805\u76EE\u6253\u5361\u4F4D\u7F6E