From 7630b25d94f2eb9c8e1cee99196e8976ca4f4819 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 31 十月 2024 12:23:17 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
Model/工资管理/ClsPay_WorkTimesBillSub.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git "a/Model/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_WorkTimesBillSub.cs" "b/Model/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_WorkTimesBillSub.cs"
index c6ab705..25828d0 100644
--- "a/Model/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_WorkTimesBillSub.cs"
+++ "b/Model/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_WorkTimesBillSub.cs"
@@ -6,13 +6,12 @@
{
public class ClsPay_WorkTimesBillSub:DBUtility.ClsXt_BaseBillSub
{
- public DateTime HEntryCloseDate;// datetime --行关闭 (默认为'') new
- public string HRemark;// varchar(200) --备注
public Int64 HEmpID;// int '职员
public Single HEmpRate;// money '职员系数
public Single HPMTimes;// money '下午工时
public Single HAMTimes;// money '上午工时
public Single HBaseTimes;// money '基本工时
+ public Single HBaseTimes_Sec;// money '计时工时
public Single HBaseDays;// money '基本天数
public Single HOverTimes;// money '加班工时
public Single HOverDays;// money '加班天数
@@ -29,6 +28,7 @@
public Int64 HAbsentDays;// int ‘旷工天数
public bool HRestFlag;// bit '厂休
public Int64 HSchClassID;// int '班次 暂时存0
+ public Single HNeedTimes;// money '应上班工时
public Int64 HCTPrjID;// int '核算方案
public Int64 HWorkTypeID;// int //工种
public Single HPayMoney;// money //小时工资
--
Gitblit v1.9.1