wanyong:新增项目变更表

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

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

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

@@ -21,90 +21,6 @@
             <scale>0</scale>
             <precision>1</precision>
         </column>
-        <column>
-            <name>CFClockTime</name>
-            <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReport].columns.column[CFClockTime].alias</alias>
-            <description>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReport].columns.column[CFClockTime].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>CFClockLocation</name>
-            <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReport].columns.column[CFClockLocation].alias</alias>
-            <description>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReport].columns.column[CFClockLocation].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>CFData</name>
-            <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReport].columns.column[CFData].alias</alias>
-            <description>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReport].columns.column[CFData].description</description>
-            <userDefined>true</userDefined>
-            <isMultilingual>false</isMultilingual>
-            <isEncoded>false</isEncoded>
-            <isNullable>true</isNullable>
-            <defaultValue />
-            <sqlType>DATETIME</sqlType>
-            <length>8</length>
-            <scale>0</scale>
-            <precision>8</precision>
-        </column>
-        <column>
-            <name>CFWorkingHours</name>
-            <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReport].columns.column[CFWorkingHours].alias</alias>
-            <description>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReport].columns.column[CFWorkingHours].description</description>
-            <userDefined>true</userDefined>
-            <isMultilingual>false</isMultilingual>
-            <isEncoded>false</isEncoded>
-            <isNullable>true</isNullable>
-            <defaultValue />
-            <sqlType>NUMERIC</sqlType>
-            <length>28</length>
-            <scale>10</scale>
-            <precision>28</precision>
-        </column>
-        <column>
-            <name>CFNotes</name>
-            <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReport].columns.column[CFNotes].alias</alias>
-            <description>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReport].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>CFEmployeeID</name>
-            <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReport].columns.column[CFEmployeeID].alias</alias>
-            <description>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReport].columns.column[CFEmployeeID].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>FAdminOrgUnitId</name>
             <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReport].columns.column[FAdminOrgUnitId].alias</alias>
@@ -399,6 +315,34 @@
             <scale>0</scale>
             <precision>0</precision>
         </column>
+        <column>
+            <name>CFFillingStartDate</name>
+            <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReport].columns.column[CFFillingStartDate].alias</alias>
+            <description>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReport].columns.column[CFFillingStartDate].description</description>
+            <userDefined>true</userDefined>
+            <isMultilingual>false</isMultilingual>
+            <isEncoded>false</isEncoded>
+            <isNullable>true</isNullable>
+            <defaultValue />
+            <sqlType>DATETIME</sqlType>
+            <length>8</length>
+            <scale>0</scale>
+            <precision>0</precision>
+        </column>
+        <column>
+            <name>CFFillingEndDate</name>
+            <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReport].columns.column[CFFillingEndDate].alias</alias>
+            <description>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReport].columns.column[CFFillingEndDate].description</description>
+            <userDefined>true</userDefined>
+            <isMultilingual>false</isMultilingual>
+            <isEncoded>false</isEncoded>
+            <isNullable>true</isNullable>
+            <defaultValue />
+            <sqlType>DATETIME</sqlType>
+            <length>8</length>
+            <scale>0</scale>
+            <precision>0</precision>
+        </column>
     </columns>
     <primaryKey>
         <name>PK_WorkHoursReport</name>
@@ -547,25 +491,6 @@
                 </fkColumnPair>
             </fkColumnPairs>
         </foreignKey>
-        <foreignKey>
-            <name>CFK_PRO_PROWHRMply</name>
-            <userDefined>true</userDefined>
-            <refTable>
-                <key name="package" value="com.kingdee.eas.basedata.person" />
-                <key name="name" value="T_BD_Person" />
-            </refTable>
-            <fkColumnPairs>
-                <fkColumnPair>
-                    <sequence>0</sequence>
-                    <refColumn>
-                        <key name="name" value="FID" />
-                    </refColumn>
-                    <fkColumn>
-                        <key name="name" value="CFEmployeeID" />
-                    </fkColumn>
-                </fkColumnPair>
-            </fkColumnPairs>
-        </foreignKey>
         <foreignKey>
             <name>CFK_PRO_PROWHRFlkc</name>
             <userDefined>true</userDefined>
@@ -605,30 +530,6 @@
             <lang locale="zh_HK" value="所屬項目" />
             <lang locale="zh_TW" value="所屬項目" />
         </rs>
-        <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReport].columns.column[CFClockLocation].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_WorkHoursReport].columns.column[CFClockLocation].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_WorkHoursReport].columns.column[CFClockTime].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_WorkHoursReport].columns.column[CFClockTime].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_WorkHoursReport].columns.column[CFDataSource].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="数据来源" />
@@ -641,53 +542,29 @@
             <lang locale="zh_HK" value="數據來源" />
             <lang locale="zh_TW" value="數據來源" />
         </rs>
-        <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReport].columns.column[CFData].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_WorkHoursReport].columns.column[CFData].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_WorkHoursReport].columns.column[CFEmployeeID].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_WorkHoursReport].columns.column[CFEmployeeID].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_WorkHoursReport].columns.column[CFNotes].alias">
+        <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReport].columns.column[CFFillingEndDate].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_WorkHoursReport].columns.column[CFNotes].description">
+        <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReport].columns.column[CFFillingEndDate].description">
             <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_WorkHoursReport].columns.column[CFWorkingHours].alias">
+        <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReport].columns.column[CFFillingStartDate].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_WorkHoursReport].columns.column[CFWorkingHours].description">
+        <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReport].columns.column[CFFillingStartDate].description">
             <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_WorkHoursReport].columns.column[FAdminOrgUnitId].alias">
             <lang locale="en_US" value="null" />

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

@@ -49,6 +49,90 @@
             <scale>0</scale>
             <precision>44</precision>
         </column>
+        <column>
+            <name>CFEmployeeID</name>
+            <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReportEntry].columns.column[CFEmployeeID].alias</alias>
+            <description>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReportEntry].columns.column[CFEmployeeID].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>CFClockTime</name>
+            <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReportEntry].columns.column[CFClockTime].alias</alias>
+            <description>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReportEntry].columns.column[CFClockTime].description</description>
+            <userDefined>true</userDefined>
+            <isMultilingual>false</isMultilingual>
+            <isEncoded>false</isEncoded>
+            <isNullable>true</isNullable>
+            <defaultValue />
+            <sqlType>NVARCHAR</sqlType>
+            <length>100</length>
+            <scale>0</scale>
+            <precision>0</precision>
+        </column>
+        <column>
+            <name>CFClockLocation</name>
+            <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReportEntry].columns.column[CFClockLocation].alias</alias>
+            <description>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReportEntry].columns.column[CFClockLocation].description</description>
+            <userDefined>true</userDefined>
+            <isMultilingual>false</isMultilingual>
+            <isEncoded>false</isEncoded>
+            <isNullable>true</isNullable>
+            <defaultValue />
+            <sqlType>NVARCHAR</sqlType>
+            <length>100</length>
+            <scale>0</scale>
+            <precision>0</precision>
+        </column>
+        <column>
+            <name>CFData</name>
+            <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReportEntry].columns.column[CFData].alias</alias>
+            <description>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReportEntry].columns.column[CFData].description</description>
+            <userDefined>true</userDefined>
+            <isMultilingual>false</isMultilingual>
+            <isEncoded>false</isEncoded>
+            <isNullable>true</isNullable>
+            <defaultValue />
+            <sqlType>DATETIME</sqlType>
+            <length>8</length>
+            <scale>0</scale>
+            <precision>0</precision>
+        </column>
+        <column>
+            <name>CFWorkingHours</name>
+            <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReportEntry].columns.column[CFWorkingHours].alias</alias>
+            <description>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReportEntry].columns.column[CFWorkingHours].description</description>
+            <userDefined>true</userDefined>
+            <isMultilingual>false</isMultilingual>
+            <isEncoded>false</isEncoded>
+            <isNullable>true</isNullable>
+            <defaultValue />
+            <sqlType>NUMERIC</sqlType>
+            <length>28</length>
+            <scale>10</scale>
+            <precision>28</precision>
+        </column>
+        <column>
+            <name>CFNotes</name>
+            <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReportEntry].columns.column[CFNotes].alias</alias>
+            <description>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReportEntry].columns.column[CFNotes].description</description>
+            <userDefined>true</userDefined>
+            <isMultilingual>false</isMultilingual>
+            <isEncoded>false</isEncoded>
+            <isNullable>true</isNullable>
+            <defaultValue />
+            <sqlType>NVARCHAR</sqlType>
+            <length>100</length>
+            <scale>0</scale>
+            <precision>0</precision>
+        </column>
     </columns>
     <primaryKey>
         <name>PK_WorkHoursReport</name>
@@ -83,6 +167,25 @@
                 </fkColumnPair>
             </fkColumnPairs>
         </foreignKey>
+        <foreignKey>
+            <name>CFK_PRO_PROWHREMm3</name>
+            <userDefined>true</userDefined>
+            <refTable>
+                <key name="package" value="com.kingdee.eas.basedata.person" />
+                <key name="name" value="T_BD_Person" />
+            </refTable>
+            <fkColumnPairs>
+                <fkColumnPair>
+                    <sequence>0</sequence>
+                    <refColumn>
+                        <key name="name" value="FID" />
+                    </refColumn>
+                    <fkColumn>
+                        <key name="name" value="CFEmployeeID" />
+                    </fkColumn>
+                </fkColumnPair>
+            </fkColumnPairs>
+        </foreignKey>
     </foreignKeys>
     <resource>
         <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReportEntry].alias">
@@ -91,6 +194,78 @@
             <lang locale="zh_HK" value="分錄" />
             <lang locale="zh_TW" value="分錄" />
         </rs>
+        <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReportEntry].columns.column[CFClockLocation].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_WorkHoursReportEntry].columns.column[CFClockLocation].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_WorkHoursReportEntry].columns.column[CFClockTime].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_WorkHoursReportEntry].columns.column[CFClockTime].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_WorkHoursReportEntry].columns.column[CFData].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_WorkHoursReportEntry].columns.column[CFData].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_WorkHoursReportEntry].columns.column[CFEmployeeID].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_WorkHoursReportEntry].columns.column[CFEmployeeID].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_WorkHoursReportEntry].columns.column[CFNotes].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_WorkHoursReportEntry].columns.column[CFNotes].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_WorkHoursReportEntry].columns.column[CFWorkingHours].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_WorkHoursReportEntry].columns.column[CFWorkingHours].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_WorkHoursReportEntry].columns.column[FID].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="ID" />

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

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<relationship xmlns="com.kingdee.bos.metadata">
-    <package>com.kingdee.eas.hr.project.app</package>
-    <name>R_WorkHoursReport_Person_employee</name>
-    <alias>relationship[com.kingdee.eas.hr.project.app.R_WorkHoursReport_Person_employee].alias</alias>
-    <description>relationship[com.kingdee.eas.hr.project.app.R_WorkHoursReport_Person_employee].description</description>
-    <userDefined>true</userDefined>
-    <type>Association</type>
-    <clientCardinality>1</clientCardinality>
-    <supplierCardinality>0..1</supplierCardinality>
-    <xmlNodeRelationship />
-    <clientObject>
-        <key name="package" value="com.kingdee.eas.hr.project.app" />
-        <key name="name" value="WorkHoursReport" />
-    </clientObject>
-    <supplierObject>
-        <key name="package" value="com.kingdee.eas.basedata.person.app" />
-        <key name="name" value="Person" />
-    </supplierObject>
-    <resource>
-        <rs key="relationship[com.kingdee.eas.hr.project.app.R_WorkHoursReport_Person_employee].alias">
-            <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="null" />
-            <lang locale="zh_HK" value="null" />
-            <lang locale="zh_TW" value="null" />
-        </rs>
-        <rs key="relationship[com.kingdee.eas.hr.project.app.R_WorkHoursReport_Person_employee].description">
-            <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="null" />
-            <lang locale="zh_HK" value="null" />
-            <lang locale="zh_TW" value="null" />
-        </rs>
-    </resource>
-</relationship>

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

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

@@ -210,49 +210,43 @@
             </mappingField>
         </ownProperty>
         <ownProperty>
-            <name>clockTime</name>
-            <alias>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[clockTime].alias</alias>
-            <description>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[clockTime].description</description>
+            <name>dataSource</name>
+            <alias>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[dataSource].alias</alias>
+            <description>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[dataSource].description</description>
             <userDefined>true</userDefined>
             <configured>false</configured>
-            <dataType>String</dataType>
-            <metadataRef />
+            <dataType>Enum</dataType>
+            <metadataRef>com.kingdee.eas.hr.project.dataSource</metadataRef>
             <isMultilingual>false</isMultilingual>
             <isNullable>false</isNullable>
             <formula />
-            <length>100</length>
-            <precision>100</precision>
+            <length>80</length>
+            <precision>0</precision>
             <decimalDigits>0</decimalDigits>
-            <defaultValue>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[clockTime].defaultValue</defaultValue>
+            <defaultValue>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[dataSource].defaultValue</defaultValue>
             <displayFormat />
             <mappingField>
-                <key name="name" value="CFClockTime" />
+                <key name="name" value="CFDataSource" />
             </mappingField>
         </ownProperty>
-        <ownProperty>
-            <name>clockLocation</name>
-            <alias>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[clockLocation].alias</alias>
-            <description>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[clockLocation].description</description>
+        <linkProperty>
+            <name>affiliatedProject</name>
+            <alias>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.linkProperty[affiliatedProject].alias</alias>
+            <description>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.linkProperty[affiliatedProject].description</description>
             <userDefined>true</userDefined>
             <configured>false</configured>
-            <dataType>String</dataType>
-            <metadataRef />
-            <isMultilingual>false</isMultilingual>
-            <isNullable>false</isNullable>
-            <formula />
-            <length>100</length>
-            <precision>100</precision>
-            <decimalDigits>0</decimalDigits>
-            <defaultValue>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[clockLocation].defaultValue</defaultValue>
-            <displayFormat />
             <mappingField>
-                <key name="name" value="CFClockLocation" />
+                <key name="name" value="CFAffiliatedProjec" />
             </mappingField>
-        </ownProperty>
+            <relationship>
+                <key name="package" value="com.kingdee.eas.hr.project.app" />
+                <key name="name" value="R_WorkHoursReport_ProjectManagement_affiliatedProject" />
+            </relationship>
+        </linkProperty>
         <ownProperty>
-            <name>data</name>
-            <alias>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[data].alias</alias>
-            <description>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[data].description</description>
+            <name>fillingStartDate</name>
+            <alias>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[fillingStartDate].alias</alias>
+            <description>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[fillingStartDate].description</description>
             <userDefined>true</userDefined>
             <configured>false</configured>
             <dataType>Date</dataType>
@@ -261,102 +255,34 @@
             <isNullable>false</isNullable>
             <formula />
             <length>8</length>
-            <precision>8</precision>
+            <precision>0</precision>
             <decimalDigits>0</decimalDigits>
-            <defaultValue>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[data].defaultValue</defaultValue>
-            <displayFormat />
-            <mappingField>
-                <key name="name" value="CFData" />
-            </mappingField>
-        </ownProperty>
-        <ownProperty>
-            <name>WorkingHours</name>
-            <alias>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[WorkingHours].alias</alias>
-            <description>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[WorkingHours].description</description>
-            <userDefined>true</userDefined>
-            <configured>false</configured>
-            <dataType>BigDecimal</dataType>
-            <metadataRef />
-            <isMultilingual>false</isMultilingual>
-            <isNullable>false</isNullable>
-            <formula />
-            <length>28</length>
-            <precision>28</precision>
-            <decimalDigits>10</decimalDigits>
-            <defaultValue>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[WorkingHours].defaultValue</defaultValue>
+            <defaultValue>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[fillingStartDate].defaultValue</defaultValue>
             <displayFormat />
             <mappingField>
-                <key name="name" value="CFWorkingHours" />
+                <key name="name" value="CFFillingStartDate" />
             </mappingField>
         </ownProperty>
         <ownProperty>
-            <name>notes</name>
-            <alias>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[notes].alias</alias>
-            <description>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[notes].description</description>
+            <name>fillingEndDate</name>
+            <alias>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[fillingEndDate].alias</alias>
+            <description>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[fillingEndDate].description</description>
             <userDefined>true</userDefined>
             <configured>false</configured>
-            <dataType>String</dataType>
+            <dataType>Date</dataType>
             <metadataRef />
             <isMultilingual>false</isMultilingual>
             <isNullable>false</isNullable>
             <formula />
-            <length>100</length>
-            <precision>100</precision>
-            <decimalDigits>0</decimalDigits>
-            <defaultValue>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[notes].defaultValue</defaultValue>
-            <displayFormat />
-            <mappingField>
-                <key name="name" value="CFNotes" />
-            </mappingField>
-        </ownProperty>
-        <linkProperty>
-            <name>employee</name>
-            <alias>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.linkProperty[employee].alias</alias>
-            <description>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.linkProperty[employee].description</description>
-            <userDefined>true</userDefined>
-            <configured>false</configured>
-            <mappingField>
-                <key name="name" value="CFEmployeeID" />
-            </mappingField>
-            <relationship>
-                <key name="package" value="com.kingdee.eas.hr.project.app" />
-                <key name="name" value="R_WorkHoursReport_Person_employee" />
-            </relationship>
-        </linkProperty>
-        <ownProperty>
-            <name>dataSource</name>
-            <alias>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[dataSource].alias</alias>
-            <description>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[dataSource].description</description>
-            <userDefined>true</userDefined>
-            <configured>false</configured>
-            <dataType>Enum</dataType>
-            <metadataRef>com.kingdee.eas.hr.project.dataSource</metadataRef>
-            <isMultilingual>false</isMultilingual>
-            <isNullable>false</isNullable>
-            <formula />
-            <length>80</length>
+            <length>8</length>
             <precision>0</precision>
             <decimalDigits>0</decimalDigits>
-            <defaultValue>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[dataSource].defaultValue</defaultValue>
+            <defaultValue>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[fillingEndDate].defaultValue</defaultValue>
             <displayFormat />
             <mappingField>
-                <key name="name" value="CFDataSource" />
+                <key name="name" value="CFFillingEndDate" />
             </mappingField>
         </ownProperty>
-        <linkProperty>
-            <name>affiliatedProject</name>
-            <alias>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.linkProperty[affiliatedProject].alias</alias>
-            <description>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.linkProperty[affiliatedProject].description</description>
-            <userDefined>true</userDefined>
-            <configured>false</configured>
-            <mappingField>
-                <key name="name" value="CFAffiliatedProjec" />
-            </mappingField>
-            <relationship>
-                <key name="package" value="com.kingdee.eas.hr.project.app" />
-                <key name="name" value="R_WorkHoursReport_ProjectManagement_affiliatedProject" />
-            </relationship>
-        </linkProperty>
     </properties>
     <logicalKey>
         <name>id</name>
@@ -1032,58 +958,6 @@
             <lang locale="zh_CN" value="true" />
             <lang locale="zh_TW" value="true" />
         </rs>
-        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.linkProperty[employee].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.WorkHoursReport].properties.linkProperty[employee].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.WorkHoursReport].properties.linkProperty[employee].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.WorkHoursReport].properties.linkProperty[employee].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.WorkHoursReport].properties.linkProperty[employee].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.WorkHoursReport].properties.linkProperty[employee].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.WorkHoursReport].properties.linkProperty[employee].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.WorkHoursReport].properties.linkProperty[employee].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.WorkHoursReport].properties.linkProperty[employee].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.WorkHoursReport].properties.linkProperty[employee].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.WorkHoursReport].properties.linkProperty[entrys].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="分录" />
@@ -1158,195 +1032,6 @@
             <lang locale="zh_CN" value="true" />
             <lang locale="zh_TW" value="true" />
         </rs>
-        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[WorkingHours].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.WorkHoursReport].properties.ownProperty[WorkingHours].defaultValue">
-            <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="null" />
-            <lang locale="zh_HK" value="null" />
-            <lang locale="zh_TW" value="null" />
-        </rs>
-        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[WorkingHours].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.WorkHoursReport].properties.ownProperty[WorkingHours].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.WorkHoursReport].properties.ownProperty[WorkingHours].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.WorkHoursReport].properties.ownProperty[WorkingHours].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.WorkHoursReport].properties.ownProperty[WorkingHours].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.WorkHoursReport].properties.ownProperty[WorkingHours].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.WorkHoursReport].properties.ownProperty[WorkingHours].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.WorkHoursReport].properties.ownProperty[WorkingHours].extendedProperty.isForWrittenBack">
-            <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.WorkHoursReport].properties.ownProperty[WorkingHours].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.WorkHoursReport].properties.ownProperty[WorkingHours].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.WorkHoursReport].properties.ownProperty[clockLocation].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.WorkHoursReport].properties.ownProperty[clockLocation].defaultValue">
-            <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="null" />
-            <lang locale="zh_HK" value="null" />
-            <lang locale="zh_TW" value="null" />
-        </rs>
-        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[clockLocation].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.WorkHoursReport].properties.ownProperty[clockLocation].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.WorkHoursReport].properties.ownProperty[clockLocation].extendedProperty.bizDataType">
-            <lang locale="en_US" value="STRING" />
-            <lang locale="zh_CN" value="STRING" />
-            <lang locale="zh_TW" value="STRING" />
-        </rs>
-        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[clockLocation].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.WorkHoursReport].properties.ownProperty[clockLocation].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.WorkHoursReport].properties.ownProperty[clockLocation].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.WorkHoursReport].properties.ownProperty[clockLocation].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.WorkHoursReport].properties.ownProperty[clockLocation].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.WorkHoursReport].properties.ownProperty[clockLocation].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.WorkHoursReport].properties.ownProperty[clockLocation].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.WorkHoursReport].properties.ownProperty[clockTime].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.WorkHoursReport].properties.ownProperty[clockTime].defaultValue">
-            <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="null" />
-            <lang locale="zh_HK" value="null" />
-            <lang locale="zh_TW" value="null" />
-        </rs>
-        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[clockTime].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.WorkHoursReport].properties.ownProperty[clockTime].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.WorkHoursReport].properties.ownProperty[clockTime].extendedProperty.bizDataType">
-            <lang locale="en_US" value="STRING" />
-            <lang locale="zh_CN" value="STRING" />
-            <lang locale="zh_TW" value="STRING" />
-        </rs>
-        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[clockTime].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.WorkHoursReport].properties.ownProperty[clockTime].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.WorkHoursReport].properties.ownProperty[clockTime].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.WorkHoursReport].properties.ownProperty[clockTime].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.WorkHoursReport].properties.ownProperty[clockTime].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.WorkHoursReport].properties.ownProperty[clockTime].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.WorkHoursReport].properties.ownProperty[clockTime].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.WorkHoursReport].properties.ownProperty[dataSource].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="数据来源" />
@@ -1415,128 +1100,128 @@
             <lang locale="zh_CN" value="true" />
             <lang locale="zh_TW" value="true" />
         </rs>
-        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[data].alias">
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[fillingEndDate].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.WorkHoursReport].properties.ownProperty[data].defaultValue">
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[fillingEndDate].defaultValue">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="null" />
             <lang locale="zh_HK" value="null" />
             <lang locale="zh_TW" value="null" />
         </rs>
-        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[data].description">
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[fillingEndDate].description">
             <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.WorkHoursReport].properties.ownProperty[data].extendedProperty.ColWidthInKDTable">
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[fillingEndDate].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.WorkHoursReport].properties.ownProperty[data].extendedProperty.bizDataType">
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[fillingEndDate].extendedProperty.bizDataType">
             <lang locale="en_US" value="DATE" />
             <lang locale="zh_CN" value="DATE" />
             <lang locale="zh_TW" value="DATE" />
         </rs>
-        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[data].extendedProperty.enableFieldPermission">
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[fillingEndDate].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.WorkHoursReport].properties.ownProperty[data].extendedProperty.isForGrouping">
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[fillingEndDate].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.WorkHoursReport].properties.ownProperty[data].extendedProperty.isForMapping">
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[fillingEndDate].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.WorkHoursReport].properties.ownProperty[data].extendedProperty.isForMatching">
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[fillingEndDate].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.WorkHoursReport].properties.ownProperty[data].extendedProperty.isForWrittenBack">
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[fillingEndDate].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.WorkHoursReport].properties.ownProperty[data].extendedProperty.isInCode">
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[fillingEndDate].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.WorkHoursReport].properties.ownProperty[data].extendedProperty.isVisibleForKDTable">
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[fillingEndDate].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.WorkHoursReport].properties.ownProperty[notes].alias">
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[fillingStartDate].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.WorkHoursReport].properties.ownProperty[notes].defaultValue">
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[fillingStartDate].defaultValue">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="null" />
             <lang locale="zh_HK" value="null" />
             <lang locale="zh_TW" value="null" />
         </rs>
-        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[notes].description">
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[fillingStartDate].description">
             <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.WorkHoursReport].properties.ownProperty[notes].extendedProperty.ColWidthInKDTable">
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[fillingStartDate].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.WorkHoursReport].properties.ownProperty[notes].extendedProperty.bizDataType">
-            <lang locale="en_US" value="STRING" />
-            <lang locale="zh_CN" value="STRING" />
-            <lang locale="zh_TW" value="STRING" />
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[fillingStartDate].extendedProperty.bizDataType">
+            <lang locale="en_US" value="DATE" />
+            <lang locale="zh_CN" value="DATE" />
+            <lang locale="zh_TW" value="DATE" />
         </rs>
-        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[notes].extendedProperty.enableFieldPermission">
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[fillingStartDate].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.WorkHoursReport].properties.ownProperty[notes].extendedProperty.isForGrouping">
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[fillingStartDate].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.WorkHoursReport].properties.ownProperty[notes].extendedProperty.isForMapping">
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[fillingStartDate].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.WorkHoursReport].properties.ownProperty[notes].extendedProperty.isForMatching">
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[fillingStartDate].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.WorkHoursReport].properties.ownProperty[notes].extendedProperty.isForWrittenBack">
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[fillingStartDate].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.WorkHoursReport].properties.ownProperty[notes].extendedProperty.isInCode">
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[fillingStartDate].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.WorkHoursReport].properties.ownProperty[notes].extendedProperty.isVisibleForKDTable">
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReport].properties.ownProperty[fillingStartDate].extendedProperty.isVisibleForKDTable">
             <lang locale="en_US" value="true" />
             <lang locale="zh_CN" value="true" />
             <lang locale="zh_TW" value="true" />

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

@@ -192,6 +192,120 @@
                 <key name="name" value="R_WorkHoursReport_WorkHoursReportEntry_entrys" />
             </relationship>
         </linkProperty>
+        <linkProperty>
+            <name>employee</name>
+            <alias>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReportEntry].properties.linkProperty[employee].alias</alias>
+            <description>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReportEntry].properties.linkProperty[employee].description</description>
+            <userDefined>true</userDefined>
+            <configured>false</configured>
+            <mappingField>
+                <key name="name" value="CFEmployeeID" />
+            </mappingField>
+            <relationship>
+                <key name="package" value="com.kingdee.eas.hr.project.app" />
+                <key name="name" value="R_WorkHoursReportEntry_Person_employee" />
+            </relationship>
+        </linkProperty>
+        <ownProperty>
+            <name>clockTime</name>
+            <alias>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReportEntry].properties.ownProperty[clockTime].alias</alias>
+            <description>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReportEntry].properties.ownProperty[clockTime].description</description>
+            <userDefined>true</userDefined>
+            <configured>false</configured>
+            <dataType>String</dataType>
+            <metadataRef />
+            <isMultilingual>false</isMultilingual>
+            <isNullable>false</isNullable>
+            <formula />
+            <length>100</length>
+            <precision>0</precision>
+            <decimalDigits>0</decimalDigits>
+            <defaultValue>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReportEntry].properties.ownProperty[clockTime].defaultValue</defaultValue>
+            <displayFormat />
+            <mappingField>
+                <key name="name" value="CFClockTime" />
+            </mappingField>
+        </ownProperty>
+        <ownProperty>
+            <name>clockLocation</name>
+            <alias>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReportEntry].properties.ownProperty[clockLocation].alias</alias>
+            <description>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReportEntry].properties.ownProperty[clockLocation].description</description>
+            <userDefined>true</userDefined>
+            <configured>false</configured>
+            <dataType>String</dataType>
+            <metadataRef />
+            <isMultilingual>false</isMultilingual>
+            <isNullable>false</isNullable>
+            <formula />
+            <length>100</length>
+            <precision>0</precision>
+            <decimalDigits>0</decimalDigits>
+            <defaultValue>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReportEntry].properties.ownProperty[clockLocation].defaultValue</defaultValue>
+            <displayFormat />
+            <mappingField>
+                <key name="name" value="CFClockLocation" />
+            </mappingField>
+        </ownProperty>
+        <ownProperty>
+            <name>data</name>
+            <alias>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReportEntry].properties.ownProperty[data].alias</alias>
+            <description>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReportEntry].properties.ownProperty[data].description</description>
+            <userDefined>true</userDefined>
+            <configured>false</configured>
+            <dataType>Date</dataType>
+            <metadataRef />
+            <isMultilingual>false</isMultilingual>
+            <isNullable>false</isNullable>
+            <formula />
+            <length>8</length>
+            <precision>0</precision>
+            <decimalDigits>0</decimalDigits>
+            <defaultValue>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReportEntry].properties.ownProperty[data].defaultValue</defaultValue>
+            <displayFormat />
+            <mappingField>
+                <key name="name" value="CFData" />
+            </mappingField>
+        </ownProperty>
+        <ownProperty>
+            <name>WorkingHours</name>
+            <alias>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReportEntry].properties.ownProperty[WorkingHours].alias</alias>
+            <description>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReportEntry].properties.ownProperty[WorkingHours].description</description>
+            <userDefined>true</userDefined>
+            <configured>false</configured>
+            <dataType>BigDecimal</dataType>
+            <metadataRef />
+            <isMultilingual>false</isMultilingual>
+            <isNullable>false</isNullable>
+            <formula />
+            <length>28</length>
+            <precision>28</precision>
+            <decimalDigits>10</decimalDigits>
+            <defaultValue>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReportEntry].properties.ownProperty[WorkingHours].defaultValue</defaultValue>
+            <displayFormat />
+            <mappingField>
+                <key name="name" value="CFWorkingHours" />
+            </mappingField>
+        </ownProperty>
+        <ownProperty>
+            <name>notes</name>
+            <alias>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReportEntry].properties.ownProperty[notes].alias</alias>
+            <description>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReportEntry].properties.ownProperty[notes].description</description>
+            <userDefined>true</userDefined>
+            <configured>false</configured>
+            <dataType>String</dataType>
+            <metadataRef />
+            <isMultilingual>false</isMultilingual>
+            <isNullable>false</isNullable>
+            <formula />
+            <length>100</length>
+            <precision>0</precision>
+            <decimalDigits>0</decimalDigits>
+            <defaultValue>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReportEntry].properties.ownProperty[notes].defaultValue</defaultValue>
+            <displayFormat />
+            <mappingField>
+                <key name="name" value="CFNotes" />
+            </mappingField>
+        </ownProperty>
     </properties>
     <logicalKey>
         <name>id</name>
@@ -205,6 +319,11 @@
             </baseProperty>
         </keyProperties>
     </logicalKey>
+    <defaultView>
+        <name />
+        <alias>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReportEntry].defaultViewalias</alias>
+        <description>entityObject[com.kingdee.eas.hr.project.app.WorkHoursReportEntry].defaultViewdescription</description>
+    </defaultView>
     <resource>
         <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReportEntry].alias">
             <lang locale="en_US" value="null" />
@@ -212,6 +331,18 @@
             <lang locale="zh_HK" value="分錄" />
             <lang locale="zh_TW" value="分錄" />
         </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReportEntry].defaultViewalias">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="null" />
+            <lang locale="zh_HK" value="null" />
+            <lang locale="zh_TW" value="null" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReportEntry].defaultViewdescription">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="null" />
+            <lang locale="zh_HK" value="null" />
+            <lang locale="zh_TW" value="null" />
+        </rs>
         <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReportEntry].description">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="" />
@@ -318,6 +449,58 @@
             <lang locale="zh_HK" value="null" />
             <lang locale="zh_TW" value="null" />
         </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReportEntry].properties.linkProperty[employee].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.WorkHoursReportEntry].properties.linkProperty[employee].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.WorkHoursReportEntry].properties.linkProperty[employee].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.WorkHoursReportEntry].properties.linkProperty[employee].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.WorkHoursReportEntry].properties.linkProperty[employee].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.WorkHoursReportEntry].properties.linkProperty[employee].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.WorkHoursReportEntry].properties.linkProperty[employee].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.WorkHoursReportEntry].properties.linkProperty[employee].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.WorkHoursReportEntry].properties.linkProperty[employee].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.WorkHoursReportEntry].properties.linkProperty[employee].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.WorkHoursReportEntry].properties.linkProperty[parent].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="单据头" />
@@ -329,5 +512,320 @@
             <lang locale="zh_CN" value="" />
             <lang locale="zh_TW" value="null" />
         </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReportEntry].properties.ownProperty[WorkingHours].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.WorkHoursReportEntry].properties.ownProperty[WorkingHours].defaultValue">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="null" />
+            <lang locale="zh_HK" value="null" />
+            <lang locale="zh_TW" value="null" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReportEntry].properties.ownProperty[WorkingHours].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.WorkHoursReportEntry].properties.ownProperty[WorkingHours].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.WorkHoursReportEntry].properties.ownProperty[WorkingHours].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.WorkHoursReportEntry].properties.ownProperty[WorkingHours].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.WorkHoursReportEntry].properties.ownProperty[WorkingHours].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.WorkHoursReportEntry].properties.ownProperty[WorkingHours].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.WorkHoursReportEntry].properties.ownProperty[WorkingHours].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.WorkHoursReportEntry].properties.ownProperty[WorkingHours].extendedProperty.isForWrittenBack">
+            <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.WorkHoursReportEntry].properties.ownProperty[WorkingHours].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.WorkHoursReportEntry].properties.ownProperty[WorkingHours].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.WorkHoursReportEntry].properties.ownProperty[clockLocation].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.WorkHoursReportEntry].properties.ownProperty[clockLocation].defaultValue">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="null" />
+            <lang locale="zh_HK" value="null" />
+            <lang locale="zh_TW" value="null" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReportEntry].properties.ownProperty[clockLocation].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.WorkHoursReportEntry].properties.ownProperty[clockLocation].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.WorkHoursReportEntry].properties.ownProperty[clockLocation].extendedProperty.bizDataType">
+            <lang locale="en_US" value="STRING" />
+            <lang locale="zh_CN" value="STRING" />
+            <lang locale="zh_TW" value="STRING" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReportEntry].properties.ownProperty[clockLocation].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.WorkHoursReportEntry].properties.ownProperty[clockLocation].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.WorkHoursReportEntry].properties.ownProperty[clockLocation].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.WorkHoursReportEntry].properties.ownProperty[clockLocation].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.WorkHoursReportEntry].properties.ownProperty[clockLocation].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.WorkHoursReportEntry].properties.ownProperty[clockLocation].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.WorkHoursReportEntry].properties.ownProperty[clockLocation].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.WorkHoursReportEntry].properties.ownProperty[clockTime].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.WorkHoursReportEntry].properties.ownProperty[clockTime].defaultValue">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="null" />
+            <lang locale="zh_HK" value="null" />
+            <lang locale="zh_TW" value="null" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReportEntry].properties.ownProperty[clockTime].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.WorkHoursReportEntry].properties.ownProperty[clockTime].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.WorkHoursReportEntry].properties.ownProperty[clockTime].extendedProperty.bizDataType">
+            <lang locale="en_US" value="STRING" />
+            <lang locale="zh_CN" value="STRING" />
+            <lang locale="zh_TW" value="STRING" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReportEntry].properties.ownProperty[clockTime].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.WorkHoursReportEntry].properties.ownProperty[clockTime].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.WorkHoursReportEntry].properties.ownProperty[clockTime].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.WorkHoursReportEntry].properties.ownProperty[clockTime].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.WorkHoursReportEntry].properties.ownProperty[clockTime].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.WorkHoursReportEntry].properties.ownProperty[clockTime].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.WorkHoursReportEntry].properties.ownProperty[clockTime].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.WorkHoursReportEntry].properties.ownProperty[data].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.WorkHoursReportEntry].properties.ownProperty[data].defaultValue">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="null" />
+            <lang locale="zh_HK" value="null" />
+            <lang locale="zh_TW" value="null" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReportEntry].properties.ownProperty[data].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.WorkHoursReportEntry].properties.ownProperty[data].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.WorkHoursReportEntry].properties.ownProperty[data].extendedProperty.bizDataType">
+            <lang locale="en_US" value="DATE" />
+            <lang locale="zh_CN" value="DATE" />
+            <lang locale="zh_TW" value="DATE" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReportEntry].properties.ownProperty[data].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.WorkHoursReportEntry].properties.ownProperty[data].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.WorkHoursReportEntry].properties.ownProperty[data].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.WorkHoursReportEntry].properties.ownProperty[data].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.WorkHoursReportEntry].properties.ownProperty[data].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.WorkHoursReportEntry].properties.ownProperty[data].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.WorkHoursReportEntry].properties.ownProperty[data].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.WorkHoursReportEntry].properties.ownProperty[notes].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.WorkHoursReportEntry].properties.ownProperty[notes].defaultValue">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="null" />
+            <lang locale="zh_HK" value="null" />
+            <lang locale="zh_TW" value="null" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReportEntry].properties.ownProperty[notes].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.WorkHoursReportEntry].properties.ownProperty[notes].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.WorkHoursReportEntry].properties.ownProperty[notes].extendedProperty.bizDataType">
+            <lang locale="en_US" value="STRING" />
+            <lang locale="zh_CN" value="STRING" />
+            <lang locale="zh_TW" value="STRING" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReportEntry].properties.ownProperty[notes].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.WorkHoursReportEntry].properties.ownProperty[notes].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.WorkHoursReportEntry].properties.ownProperty[notes].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.WorkHoursReportEntry].properties.ownProperty[notes].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.WorkHoursReportEntry].properties.ownProperty[notes].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.WorkHoursReportEntry].properties.ownProperty[notes].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.WorkHoursReportEntry].properties.ownProperty[notes].extendedProperty.isVisibleForKDTable">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_TW" value="true" />
+        </rs>
     </resource>
 </entityObject>

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

@@ -88,29 +88,29 @@
             </entityRef>
         </subEntity>
         <subEntity>
-            <name>employee</name>
-            <alias>joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].subObjects.subEntity[employee].alias</alias>
+            <name>affiliatedProject</name>
+            <alias>joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].subObjects.subEntity[affiliatedProject].alias</alias>
             <userDefined>true</userDefined>
             <query>
                 <key name="package" value="com.kingdee.eas.hr.project.app" />
                 <key name="name" value="WorkHoursReportQuery" />
             </query>
             <entityRef>
-                <key name="package" value="com.kingdee.eas.basedata.person.app" />
-                <key name="name" value="Person" />
+                <key name="package" value="com.kingdee.eas.hr.project.app" />
+                <key name="name" value="ProjectManagement" />
             </entityRef>
         </subEntity>
         <subEntity>
-            <name>affiliatedProject</name>
-            <alias>joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].subObjects.subEntity[affiliatedProject].alias</alias>
+            <name>entrys_employee</name>
+            <alias>joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].subObjects.subEntity[entrys_employee].alias</alias>
             <userDefined>true</userDefined>
             <query>
                 <key name="package" value="com.kingdee.eas.hr.project.app" />
                 <key name="name" value="WorkHoursReportQuery" />
             </query>
             <entityRef>
-                <key name="package" value="com.kingdee.eas.hr.project.app" />
-                <key name="name" value="ProjectManagement" />
+                <key name="package" value="com.kingdee.eas.basedata.person.app" />
+                <key name="name" value="Person" />
             </entityRef>
         </subEntity>
     </subObjects>
@@ -953,11 +953,11 @@
             </query>
         </queryField>
         <queryField>
-            <name>clockTime</name>
+            <name>dataSource</name>
             <userDefined>true</userDefined>
             <formulaString>#0</formulaString>
             <constString />
-            <displayName>joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.queryField[clockTime].displayName</displayName>
+            <displayName>joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.queryField[dataSource].displayName</displayName>
             <groupType />
             <isSelector>true</isSelector>
             <isFilter>true</isFilter>
@@ -966,15 +966,15 @@
             <returnType>String</returnType>
             <propertyRefs>
                 <propertyRef>
-                    <key>9800b683-8d13-4b3d-866f-14ce924bc903</key>
+                    <key>4868b282-b431-433f-b188-81f80a685289</key>
                     <parentUnit>
-                        <key name="name" value="clockTime" />
+                        <key name="name" value="dataSource" />
                     </parentUnit>
                     <subEntity>
                         <key name="name" value="WorkHoursReport" />
                     </subEntity>
                     <refProperty>
-                        <key name="name" value="clockTime" />
+                        <key name="name" value="dataSource" />
                     </refProperty>
                 </propertyRef>
             </propertyRefs>
@@ -984,11 +984,11 @@
             </query>
         </queryField>
         <queryField>
-            <name>clockLocation</name>
+            <name>affiliatedProject.projectName</name>
             <userDefined>true</userDefined>
             <formulaString>#0</formulaString>
             <constString />
-            <displayName>joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.queryField[clockLocation].displayName</displayName>
+            <displayName>joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.queryField[affiliatedProject.projectName].displayName</displayName>
             <groupType />
             <isSelector>true</isSelector>
             <isFilter>true</isFilter>
@@ -997,15 +997,15 @@
             <returnType>String</returnType>
             <propertyRefs>
                 <propertyRef>
-                    <key>9c5d19a4-1cb5-4f0d-a4ff-58fe73ee46b5</key>
+                    <key>14bf0995-3172-4694-92b5-077a5e94312a</key>
                     <parentUnit>
-                        <key name="name" value="clockLocation" />
+                        <key name="name" value="affiliatedProject.projectName" />
                     </parentUnit>
                     <subEntity>
-                        <key name="name" value="WorkHoursReport" />
+                        <key name="name" value="affiliatedProject" />
                     </subEntity>
                     <refProperty>
-                        <key name="name" value="clockLocation" />
+                        <key name="name" value="projectName" />
                     </refProperty>
                 </propertyRef>
             </propertyRefs>
@@ -1014,29 +1014,29 @@
                 <key name="name" value="WorkHoursReportQuery" />
             </query>
         </queryField>
-        <queryField>
-            <name>data</name>
+        <propertyUnit>
+            <name>41bef0ae-524c-41f0-9109-6e00176bd3f6</name>
             <userDefined>true</userDefined>
-            <formulaString>#0</formulaString>
+            <formulaString />
             <constString />
-            <displayName>joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.queryField[data].displayName</displayName>
+            <displayName>joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.propertyUnit[41bef0ae-524c-41f0-9109-6e00176bd3f6].displayName</displayName>
             <groupType />
-            <isSelector>true</isSelector>
-            <isFilter>true</isFilter>
-            <isSorter>true</isSorter>
+            <isSelector>false</isSelector>
+            <isFilter>false</isFilter>
+            <isSorter>false</isSorter>
             <isParameter>false</isParameter>
-            <returnType>Date</returnType>
+            <returnType />
             <propertyRefs>
                 <propertyRef>
-                    <key>f112a772-ffcb-48af-8b0c-afc77cb1013b</key>
+                    <key>05d7cb0f-c864-4432-95a3-be81d91bd51d</key>
                     <parentUnit>
-                        <key name="name" value="data" />
+                        <key name="name" value="41bef0ae-524c-41f0-9109-6e00176bd3f6" />
                     </parentUnit>
                     <subEntity>
                         <key name="name" value="WorkHoursReport" />
                     </subEntity>
                     <refProperty>
-                        <key name="name" value="data" />
+                        <key name="name" value="affiliatedProject" />
                     </refProperty>
                 </propertyRef>
             </propertyRefs>
@@ -1044,30 +1044,30 @@
                 <key name="package" value="com.kingdee.eas.hr.project.app" />
                 <key name="name" value="WorkHoursReportQuery" />
             </query>
-        </queryField>
-        <queryField>
-            <name>WorkingHours</name>
+        </propertyUnit>
+        <propertyUnit>
+            <name>e693df00-47d9-4bd6-85b4-a025ff0a6e21</name>
             <userDefined>true</userDefined>
-            <formulaString>#0</formulaString>
+            <formulaString />
             <constString />
-            <displayName>joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.queryField[WorkingHours].displayName</displayName>
+            <displayName>joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.propertyUnit[e693df00-47d9-4bd6-85b4-a025ff0a6e21].displayName</displayName>
             <groupType />
-            <isSelector>true</isSelector>
-            <isFilter>true</isFilter>
-            <isSorter>true</isSorter>
+            <isSelector>false</isSelector>
+            <isFilter>false</isFilter>
+            <isSorter>false</isSorter>
             <isParameter>false</isParameter>
-            <returnType>Number</returnType>
+            <returnType />
             <propertyRefs>
                 <propertyRef>
-                    <key>342f95d4-c87d-42a1-a5c9-7cc3076ab5e7</key>
+                    <key>d37028ea-c79b-4eb5-9157-112a0b6bd10a</key>
                     <parentUnit>
-                        <key name="name" value="WorkingHours" />
+                        <key name="name" value="e693df00-47d9-4bd6-85b4-a025ff0a6e21" />
                     </parentUnit>
                     <subEntity>
-                        <key name="name" value="WorkHoursReport" />
+                        <key name="name" value="affiliatedProject" />
                     </subEntity>
                     <refProperty>
-                        <key name="name" value="WorkingHours" />
+                        <key name="name" value="id" />
                     </refProperty>
                 </propertyRef>
             </propertyRefs>
@@ -1075,13 +1075,13 @@
                 <key name="package" value="com.kingdee.eas.hr.project.app" />
                 <key name="name" value="WorkHoursReportQuery" />
             </query>
-        </queryField>
+        </propertyUnit>
         <queryField>
-            <name>notes</name>
+            <name>entrys.employee.name</name>
             <userDefined>true</userDefined>
             <formulaString>#0</formulaString>
             <constString />
-            <displayName>joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.queryField[notes].displayName</displayName>
+            <displayName>joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.queryField[entrys.employee.name].displayName</displayName>
             <groupType />
             <isSelector>true</isSelector>
             <isFilter>true</isFilter>
@@ -1090,15 +1090,15 @@
             <returnType>String</returnType>
             <propertyRefs>
                 <propertyRef>
-                    <key>f7c23b8a-3825-4408-b9e4-9c81f50f4d2d</key>
+                    <key>ffff249e-d690-417c-a825-21df401f16d9</key>
                     <parentUnit>
-                        <key name="name" value="notes" />
+                        <key name="name" value="entrys.employee.name" />
                     </parentUnit>
                     <subEntity>
-                        <key name="name" value="WorkHoursReport" />
+                        <key name="name" value="entrys_employee" />
                     </subEntity>
                     <refProperty>
-                        <key name="name" value="notes" />
+                        <key name="name" value="name" />
                     </refProperty>
                 </propertyRef>
             </propertyRefs>
@@ -1107,29 +1107,29 @@
                 <key name="name" value="WorkHoursReportQuery" />
             </query>
         </queryField>
-        <queryField>
-            <name>employee.name</name>
+        <propertyUnit>
+            <name>f68527ed-2260-4e15-8f73-c152372e1be5</name>
             <userDefined>true</userDefined>
-            <formulaString>#0</formulaString>
+            <formulaString />
             <constString />
-            <displayName>joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.queryField[employee.name].displayName</displayName>
+            <displayName>joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.propertyUnit[f68527ed-2260-4e15-8f73-c152372e1be5].displayName</displayName>
             <groupType />
-            <isSelector>true</isSelector>
-            <isFilter>true</isFilter>
-            <isSorter>true</isSorter>
+            <isSelector>false</isSelector>
+            <isFilter>false</isFilter>
+            <isSorter>false</isSorter>
             <isParameter>false</isParameter>
-            <returnType>String</returnType>
+            <returnType />
             <propertyRefs>
                 <propertyRef>
-                    <key>ffff1531-bc91-46be-92da-d5fed176bbb1</key>
+                    <key>24b4eac5-96d1-459e-8e71-1cb254d4ba62</key>
                     <parentUnit>
-                        <key name="name" value="employee.name" />
+                        <key name="name" value="f68527ed-2260-4e15-8f73-c152372e1be5" />
                     </parentUnit>
                     <subEntity>
-                        <key name="name" value="employee" />
+                        <key name="name" value="entrys" />
                     </subEntity>
                     <refProperty>
-                        <key name="name" value="name" />
+                        <key name="name" value="employee" />
                     </refProperty>
                 </propertyRef>
             </propertyRefs>
@@ -1137,13 +1137,13 @@
                 <key name="package" value="com.kingdee.eas.hr.project.app" />
                 <key name="name" value="WorkHoursReportQuery" />
             </query>
-        </queryField>
+        </propertyUnit>
         <propertyUnit>
-            <name>f531030e-0050-4120-b31d-3e62e895dcfc</name>
+            <name>3ab08ab3-8bfd-4962-80a5-6ac825279ea6</name>
             <userDefined>true</userDefined>
             <formulaString />
             <constString />
-            <displayName>joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.propertyUnit[f531030e-0050-4120-b31d-3e62e895dcfc].displayName</displayName>
+            <displayName>joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.propertyUnit[3ab08ab3-8bfd-4962-80a5-6ac825279ea6].displayName</displayName>
             <groupType />
             <isSelector>false</isSelector>
             <isFilter>false</isFilter>
@@ -1152,15 +1152,15 @@
             <returnType />
             <propertyRefs>
                 <propertyRef>
-                    <key>fcc87ad7-c42a-4081-bb13-b639699f25d4</key>
+                    <key>f1e2b9f1-4145-4e1f-9012-a40bb3daea5b</key>
                     <parentUnit>
-                        <key name="name" value="f531030e-0050-4120-b31d-3e62e895dcfc" />
+                        <key name="name" value="3ab08ab3-8bfd-4962-80a5-6ac825279ea6" />
                     </parentUnit>
                     <subEntity>
-                        <key name="name" value="WorkHoursReport" />
+                        <key name="name" value="entrys_employee" />
                     </subEntity>
                     <refProperty>
-                        <key name="name" value="employee" />
+                        <key name="name" value="id" />
                     </refProperty>
                 </propertyRef>
             </propertyRefs>
@@ -1169,29 +1169,29 @@
                 <key name="name" value="WorkHoursReportQuery" />
             </query>
         </propertyUnit>
-        <propertyUnit>
-            <name>90ab1d61-2488-47be-ae0e-7e7fab3908ef</name>
+        <queryField>
+            <name>entrys.clockTime0</name>
             <userDefined>true</userDefined>
-            <formulaString />
+            <formulaString>#0</formulaString>
             <constString />
-            <displayName>joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.propertyUnit[90ab1d61-2488-47be-ae0e-7e7fab3908ef].displayName</displayName>
+            <displayName>joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.queryField[entrys.clockTime0].displayName</displayName>
             <groupType />
-            <isSelector>false</isSelector>
-            <isFilter>false</isFilter>
-            <isSorter>false</isSorter>
+            <isSelector>true</isSelector>
+            <isFilter>true</isFilter>
+            <isSorter>true</isSorter>
             <isParameter>false</isParameter>
-            <returnType />
+            <returnType>String</returnType>
             <propertyRefs>
                 <propertyRef>
-                    <key>2f3d5dd7-34c3-40fd-a4e3-040453d2de60</key>
+                    <key>5a576a31-f27e-486c-8a5b-286033d974e2</key>
                     <parentUnit>
-                        <key name="name" value="90ab1d61-2488-47be-ae0e-7e7fab3908ef" />
+                        <key name="name" value="entrys.clockTime0" />
                     </parentUnit>
                     <subEntity>
-                        <key name="name" value="employee" />
+                        <key name="name" value="entrys" />
                     </subEntity>
                     <refProperty>
-                        <key name="name" value="id" />
+                        <key name="name" value="clockTime" />
                     </refProperty>
                 </propertyRef>
             </propertyRefs>
@@ -1199,13 +1199,13 @@
                 <key name="package" value="com.kingdee.eas.hr.project.app" />
                 <key name="name" value="WorkHoursReportQuery" />
             </query>
-        </propertyUnit>
+        </queryField>
         <queryField>
-            <name>dataSource</name>
+            <name>entrys.clockLocation0</name>
             <userDefined>true</userDefined>
             <formulaString>#0</formulaString>
             <constString />
-            <displayName>joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.queryField[dataSource].displayName</displayName>
+            <displayName>joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.queryField[entrys.clockLocation0].displayName</displayName>
             <groupType />
             <isSelector>true</isSelector>
             <isFilter>true</isFilter>
@@ -1214,15 +1214,15 @@
             <returnType>String</returnType>
             <propertyRefs>
                 <propertyRef>
-                    <key>4868b282-b431-433f-b188-81f80a685289</key>
+                    <key>0292cf29-c4b1-4b5d-88ed-848770877283</key>
                     <parentUnit>
-                        <key name="name" value="dataSource" />
+                        <key name="name" value="entrys.clockLocation0" />
                     </parentUnit>
                     <subEntity>
-                        <key name="name" value="WorkHoursReport" />
+                        <key name="name" value="entrys" />
                     </subEntity>
                     <refProperty>
-                        <key name="name" value="dataSource" />
+                        <key name="name" value="clockLocation" />
                     </refProperty>
                 </propertyRef>
             </propertyRefs>
@@ -1232,11 +1232,73 @@
             </query>
         </queryField>
         <queryField>
-            <name>affiliatedProject.projectName</name>
+            <name>entrys.data0</name>
             <userDefined>true</userDefined>
             <formulaString>#0</formulaString>
             <constString />
-            <displayName>joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.queryField[affiliatedProject.projectName].displayName</displayName>
+            <displayName>joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.queryField[entrys.data0].displayName</displayName>
+            <groupType />
+            <isSelector>true</isSelector>
+            <isFilter>true</isFilter>
+            <isSorter>true</isSorter>
+            <isParameter>false</isParameter>
+            <returnType>Date</returnType>
+            <propertyRefs>
+                <propertyRef>
+                    <key>57c4d08e-3e80-46de-a56d-b19f0d305d23</key>
+                    <parentUnit>
+                        <key name="name" value="entrys.data0" />
+                    </parentUnit>
+                    <subEntity>
+                        <key name="name" value="entrys" />
+                    </subEntity>
+                    <refProperty>
+                        <key name="name" value="data" />
+                    </refProperty>
+                </propertyRef>
+            </propertyRefs>
+            <query>
+                <key name="package" value="com.kingdee.eas.hr.project.app" />
+                <key name="name" value="WorkHoursReportQuery" />
+            </query>
+        </queryField>
+        <queryField>
+            <name>entrys.WorkingHours0</name>
+            <userDefined>true</userDefined>
+            <formulaString>#0</formulaString>
+            <constString />
+            <displayName>joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.queryField[entrys.WorkingHours0].displayName</displayName>
+            <groupType />
+            <isSelector>true</isSelector>
+            <isFilter>true</isFilter>
+            <isSorter>true</isSorter>
+            <isParameter>false</isParameter>
+            <returnType>Number</returnType>
+            <propertyRefs>
+                <propertyRef>
+                    <key>8b1a6323-5fa2-40b7-8670-65e7665b74cf</key>
+                    <parentUnit>
+                        <key name="name" value="entrys.WorkingHours0" />
+                    </parentUnit>
+                    <subEntity>
+                        <key name="name" value="entrys" />
+                    </subEntity>
+                    <refProperty>
+                        <key name="name" value="WorkingHours" />
+                    </refProperty>
+                </propertyRef>
+            </propertyRefs>
+            <query>
+                <key name="package" value="com.kingdee.eas.hr.project.app" />
+                <key name="name" value="WorkHoursReportQuery" />
+            </query>
+        </queryField>
+        <queryField>
+            <name>entrys.notes0</name>
+            <userDefined>true</userDefined>
+            <formulaString>#0</formulaString>
+            <constString />
+            <displayName>joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.queryField[entrys.notes0].displayName</displayName>
             <groupType />
             <isSelector>true</isSelector>
             <isFilter>true</isFilter>
@@ -1245,15 +1307,15 @@
             <returnType>String</returnType>
             <propertyRefs>
                 <propertyRef>
-                    <key>14bf0995-3172-4694-92b5-077a5e94312a</key>
+                    <key>f1325a03-5239-4dbd-a199-0375016b3fb6</key>
                     <parentUnit>
-                        <key name="name" value="affiliatedProject.projectName" />
+                        <key name="name" value="entrys.notes0" />
                     </parentUnit>
                     <subEntity>
-                        <key name="name" value="affiliatedProject" />
+                        <key name="name" value="entrys" />
                     </subEntity>
                     <refProperty>
-                        <key name="name" value="projectName" />
+                        <key name="name" value="notes" />
                     </refProperty>
                 </propertyRef>
             </propertyRefs>
@@ -1262,29 +1324,29 @@
                 <key name="name" value="WorkHoursReportQuery" />
             </query>
         </queryField>
-        <propertyUnit>
-            <name>41bef0ae-524c-41f0-9109-6e00176bd3f6</name>
+        <queryField>
+            <name>fillingStartDate</name>
             <userDefined>true</userDefined>
-            <formulaString />
+            <formulaString>#0</formulaString>
             <constString />
-            <displayName>joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.propertyUnit[41bef0ae-524c-41f0-9109-6e00176bd3f6].displayName</displayName>
+            <displayName>joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.queryField[fillingStartDate].displayName</displayName>
             <groupType />
-            <isSelector>false</isSelector>
-            <isFilter>false</isFilter>
-            <isSorter>false</isSorter>
+            <isSelector>true</isSelector>
+            <isFilter>true</isFilter>
+            <isSorter>true</isSorter>
             <isParameter>false</isParameter>
-            <returnType />
+            <returnType>Date</returnType>
             <propertyRefs>
                 <propertyRef>
-                    <key>05d7cb0f-c864-4432-95a3-be81d91bd51d</key>
+                    <key>d79ab4bf-3847-4077-8f4b-b86d16410679</key>
                     <parentUnit>
-                        <key name="name" value="41bef0ae-524c-41f0-9109-6e00176bd3f6" />
+                        <key name="name" value="fillingStartDate" />
                     </parentUnit>
                     <subEntity>
                         <key name="name" value="WorkHoursReport" />
                     </subEntity>
                     <refProperty>
-                        <key name="name" value="affiliatedProject" />
+                        <key name="name" value="fillingStartDate" />
                     </refProperty>
                 </propertyRef>
             </propertyRefs>
@@ -1292,30 +1354,30 @@
                 <key name="package" value="com.kingdee.eas.hr.project.app" />
                 <key name="name" value="WorkHoursReportQuery" />
             </query>
-        </propertyUnit>
-        <propertyUnit>
-            <name>e693df00-47d9-4bd6-85b4-a025ff0a6e21</name>
+        </queryField>
+        <queryField>
+            <name>fillingEndDate</name>
             <userDefined>true</userDefined>
-            <formulaString />
+            <formulaString>#0</formulaString>
             <constString />
-            <displayName>joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.propertyUnit[e693df00-47d9-4bd6-85b4-a025ff0a6e21].displayName</displayName>
+            <displayName>joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.queryField[fillingEndDate].displayName</displayName>
             <groupType />
-            <isSelector>false</isSelector>
-            <isFilter>false</isFilter>
-            <isSorter>false</isSorter>
+            <isSelector>true</isSelector>
+            <isFilter>true</isFilter>
+            <isSorter>true</isSorter>
             <isParameter>false</isParameter>
-            <returnType />
+            <returnType>Date</returnType>
             <propertyRefs>
                 <propertyRef>
-                    <key>d37028ea-c79b-4eb5-9157-112a0b6bd10a</key>
+                    <key>d7d9babd-54ea-48a4-a7e8-5461744f8491</key>
                     <parentUnit>
-                        <key name="name" value="e693df00-47d9-4bd6-85b4-a025ff0a6e21" />
+                        <key name="name" value="fillingEndDate" />
                     </parentUnit>
                     <subEntity>
-                        <key name="name" value="affiliatedProject" />
+                        <key name="name" value="WorkHoursReport" />
                     </subEntity>
                     <refProperty>
-                        <key name="name" value="id" />
+                        <key name="name" value="fillingEndDate" />
                     </refProperty>
                 </propertyRef>
             </propertyRefs>
@@ -1323,7 +1385,7 @@
                 <key name="package" value="com.kingdee.eas.hr.project.app" />
                 <key name="name" value="WorkHoursReportQuery" />
             </query>
-        </propertyUnit>
+        </queryField>
     </units>
     <defaultFilter>
         <name>defaultFilter</name>
@@ -1521,27 +1583,27 @@
             </query>
         </join>
         <join>
-            <name>32add0d1-50d8-4843-afa8-131821320433</name>
+            <name>38aff0a3-2e11-4218-bb6d-07b151bfd169</name>
             <formulaString>#0</formulaString>
             <type>LEFT OUTER JOIN</type>
             <leftObject>
                 <key name="name" value="WorkHoursReport" />
             </leftObject>
             <rightObject>
-                <key name="name" value="employee" />
+                <key name="name" value="affiliatedProject" />
             </rightObject>
             <joinItems>
                 <joinItem>
-                    <name>8c69257b-147e-4185-9b1f-2676f55e3dd3</name>
+                    <name>c1196cbf-d270-4cfb-9a02-4a6a9694162b</name>
                     <compareType>=</compareType>
                     <leftField>
-                        <key name="name" value="f531030e-0050-4120-b31d-3e62e895dcfc" />
+                        <key name="name" value="41bef0ae-524c-41f0-9109-6e00176bd3f6" />
                     </leftField>
                     <rightField>
-                        <key name="name" value="90ab1d61-2488-47be-ae0e-7e7fab3908ef" />
+                        <key name="name" value="e693df00-47d9-4bd6-85b4-a025ff0a6e21" />
                     </rightField>
                     <join>
-                        <key name="name" value="32add0d1-50d8-4843-afa8-131821320433" />
+                        <key name="name" value="38aff0a3-2e11-4218-bb6d-07b151bfd169" />
                     </join>
                 </joinItem>
             </joinItems>
@@ -1551,27 +1613,27 @@
             </query>
         </join>
         <join>
-            <name>38aff0a3-2e11-4218-bb6d-07b151bfd169</name>
+            <name>f85fd6da-8dd6-4f37-afe2-82161d3dd8ed</name>
             <formulaString>#0</formulaString>
             <type>LEFT OUTER JOIN</type>
             <leftObject>
-                <key name="name" value="WorkHoursReport" />
+                <key name="name" value="entrys" />
             </leftObject>
             <rightObject>
-                <key name="name" value="affiliatedProject" />
+                <key name="name" value="entrys_employee" />
             </rightObject>
             <joinItems>
                 <joinItem>
-                    <name>c1196cbf-d270-4cfb-9a02-4a6a9694162b</name>
+                    <name>9e9b9b06-b3cb-43d4-aca6-cab61abfb133</name>
                     <compareType>=</compareType>
                     <leftField>
-                        <key name="name" value="41bef0ae-524c-41f0-9109-6e00176bd3f6" />
+                        <key name="name" value="f68527ed-2260-4e15-8f73-c152372e1be5" />
                     </leftField>
                     <rightField>
-                        <key name="name" value="e693df00-47d9-4bd6-85b4-a025ff0a6e21" />
+                        <key name="name" value="3ab08ab3-8bfd-4962-80a5-6ac825279ea6" />
                     </rightField>
                     <join>
-                        <key name="name" value="38aff0a3-2e11-4218-bb6d-07b151bfd169" />
+                        <key name="name" value="f85fd6da-8dd6-4f37-afe2-82161d3dd8ed" />
                     </join>
                 </joinItem>
             </joinItems>
@@ -1645,13 +1707,13 @@
             <lang locale="zh_HK" value="null" />
             <lang locale="zh_TW" value="null" />
         </rs>
-        <rs key="joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].subObjects.subEntity[employee].alias">
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].subObjects.subEntity[entrys].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.WorkHoursReportQuery].subObjects.subEntity[entrys].alias">
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].subObjects.subEntity[entrys_employee].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="null" />
             <lang locale="zh_HK" value="null" />
@@ -1669,13 +1731,13 @@
             <lang locale="zh_HK" value="null" />
             <lang locale="zh_TW" value="null" />
         </rs>
-        <rs key="joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.propertyUnit[41bef0ae-524c-41f0-9109-6e00176bd3f6].displayName">
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.propertyUnit[3ab08ab3-8bfd-4962-80a5-6ac825279ea6].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.WorkHoursReportQuery].units.propertyUnit[90ab1d61-2488-47be-ae0e-7e7fab3908ef].displayName">
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.propertyUnit[41bef0ae-524c-41f0-9109-6e00176bd3f6].displayName">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="null" />
             <lang locale="zh_HK" value="null" />
@@ -1747,7 +1809,7 @@
             <lang locale="zh_HK" value="null" />
             <lang locale="zh_TW" value="null" />
         </rs>
-        <rs key="joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.propertyUnit[f531030e-0050-4120-b31d-3e62e895dcfc].displayName">
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.propertyUnit[f68527ed-2260-4e15-8f73-c152372e1be5].displayName">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="null" />
             <lang locale="zh_HK" value="null" />
@@ -1769,22 +1831,6 @@
             <lang locale="zh_CN" value="true" />
             <lang locale="zh_TW" value="true" />
         </rs>
-        <rs key="joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.queryField[WorkingHours].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.WorkHoursReportQuery].units.queryField[WorkingHours].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.WorkHoursReportQuery].units.queryField[WorkingHours].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.WorkHoursReportQuery].units.queryField[affiliatedProject.projectName].displayName">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="所属项目" />
@@ -1834,38 +1880,6 @@
             <lang locale="zh_CN" value="true" />
             <lang locale="zh_TW" value="true" />
         </rs>
-        <rs key="joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.queryField[clockLocation].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.WorkHoursReportQuery].units.queryField[clockLocation].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.WorkHoursReportQuery].units.queryField[clockLocation].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.WorkHoursReportQuery].units.queryField[clockTime].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.WorkHoursReportQuery].units.queryField[clockTime].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.WorkHoursReportQuery].units.queryField[clockTime].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.WorkHoursReportQuery].units.queryField[createTime].displayName">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="创建时间" />
@@ -1910,55 +1924,103 @@
             <lang locale="zh_CN" value="true" />
             <lang locale="zh_TW" value="true" />
         </rs>
-        <rs key="joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.queryField[data].displayName">
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.queryField[description].displayName">
             <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.WorkHoursReportQuery].units.queryField[data].extendedProperty.isCommonQueryFilter">
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.queryField[description].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.WorkHoursReportQuery].units.queryField[data].extendedProperty.isCommonQuerySorter">
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.queryField[description].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.WorkHoursReportQuery].units.queryField[description].displayName">
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.queryField[entrys.WorkingHours0].displayName">
             <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.WorkHoursReportQuery].units.queryField[description].extendedProperty.isCommonQueryFilter">
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.queryField[entrys.WorkingHours0].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.WorkHoursReportQuery].units.queryField[description].extendedProperty.isCommonQuerySorter">
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.queryField[entrys.WorkingHours0].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.WorkHoursReportQuery].units.queryField[entrys.clockLocation0].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.WorkHoursReportQuery].units.queryField[entrys.clockLocation0].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.WorkHoursReportQuery].units.queryField[entrys.clockLocation0].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.WorkHoursReportQuery].units.queryField[entrys.clockTime0].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.WorkHoursReportQuery].units.queryField[entrys.clockTime0].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.WorkHoursReportQuery].units.queryField[entrys.clockTime0].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.WorkHoursReportQuery].units.queryField[entrys.data0].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.WorkHoursReportQuery].units.queryField[entrys.data0].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.WorkHoursReportQuery].units.queryField[entrys.data0].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.WorkHoursReportQuery].units.queryField[employee.name].displayName">
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.queryField[entrys.employee.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.WorkHoursReportQuery].units.queryField[employee.name].extendedProperty.isCommonQueryFilter">
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.queryField[entrys.employee.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.WorkHoursReportQuery].units.queryField[employee.name].extendedProperty.isCommonQuerySorter">
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.queryField[entrys.employee.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.WorkHoursReportQuery].units.queryField[employee.name].extendedProperty.isUsingF7">
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.queryField[entrys.employee.name].extendedProperty.isUsingF7">
             <lang locale="en_US" value="true" />
             <lang locale="zh_CN" value="true" />
             <lang locale="zh_TW" value="true" />
@@ -1969,6 +2031,22 @@
             <lang locale="zh_HK" value="null" />
             <lang locale="zh_TW" value="null" />
         </rs>
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.queryField[entrys.notes0].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.WorkHoursReportQuery].units.queryField[entrys.notes0].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.WorkHoursReportQuery].units.queryField[entrys.notes0].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.WorkHoursReportQuery].units.queryField[entrys.seq].displayName">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="单据分录序列号" />
@@ -1985,6 +2063,38 @@
             <lang locale="zh_CN" value="true" />
             <lang locale="zh_TW" value="true" />
         </rs>
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.queryField[fillingEndDate].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.WorkHoursReportQuery].units.queryField[fillingEndDate].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.WorkHoursReportQuery].units.queryField[fillingEndDate].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.WorkHoursReportQuery].units.queryField[fillingStartDate].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.WorkHoursReportQuery].units.queryField[fillingStartDate].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.WorkHoursReportQuery].units.queryField[fillingStartDate].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.WorkHoursReportQuery].units.queryField[handler.name].displayName">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="别名" />
@@ -2031,22 +2141,6 @@
             <lang locale="zh_HK" value="用戶名" />
             <lang locale="zh_TW" value="用戶名" />
         </rs>
-        <rs key="joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.queryField[notes].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.WorkHoursReportQuery].units.queryField[notes].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.WorkHoursReportQuery].units.queryField[notes].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.WorkHoursReportQuery].units.queryField[number].displayName">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="单据编号" />

metadata/entity_pkmapping.properties

@@ -1,5 +1,5 @@
 #
-#Thu Nov 28 11:51:26 CST 2024
+#Thu Nov 28 14:32:41 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

metadata/facade_pkmapping.properties

@@ -1,2 +1,2 @@
 #
-#Thu Nov 28 11:51:26 CST 2024
+#Thu Nov 28 14:32:41 CST 2024