diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/DBModel/资产系统.PDM b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/DBModel/资产系统.PDM index fa6b9e4d0..9cb31d337 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/DBModel/资产系统.PDM +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/DBModel/资产系统.PDM @@ -1,5 +1,5 @@ - + @@ -11848,7 +11848,7 @@ LABL 0 新宋体,8,N 1598423768 1599201856 -1 -((-140220,176396), (-109606,188544)) +((-140414,175984), (-109412,188956)) 12615680 16570034 12632256 @@ -47122,7 +47122,7 @@ B9AF ADR_Record 1598423768 edz -1599193860 +1599211229 Administrator 考情记录 @@ -47267,9 +47267,20 @@ B9AF nvarchar(50) 50 + +0080F4F4-5E25-4DC1-8812-F5FD1B02D71B +考勤照片 +ADPhoto +1599211212 +Administrator +1599211229 +Administrator +nvarchar(500) +500 + - + 99F727D3-CAB0-4E9A-A661-D3347EF8CD96 Key_1 Key_1 @@ -47283,10 +47294,10 @@ B9AF - + - + @@ -47300,7 +47311,7 @@ B9AF 考勤设备管理 - + 9D249636-3C2D-4FC5-A874-DFE2F2155F8B Id Id @@ -47312,7 +47323,7 @@ B9AF 50 1 - + 12FB6C42-EF4F-4AED-90C3-7B5E9929E9FD 设备名称 DName @@ -47323,7 +47334,7 @@ B9AF nvarchar(50) 50 - + CFC854AC-7287-4EDA-AC5F-8D5E5B3B5338 设备编号 DCode @@ -47334,7 +47345,7 @@ B9AF nvarchar(50) 50 - + 925DAAC4-4C87-4D50-B506-2B84B5D762B2 Ip地址 IpAddress @@ -47345,7 +47356,7 @@ B9AF nvarchar(50) 50 - + 81D77744-A546-4C7C-87D2-1C6345B6C650 端口号 PortNumber @@ -47355,7 +47366,7 @@ B9AF Administrator int - + D693475B-44DD-43B6-8417-16D6E6CB9752 管理员帐号 AdminAccount @@ -47366,7 +47377,7 @@ B9AF nvarchar(50) 50 - + 1C21FD25-CF5E-471F-BB1E-DAFFCB9622ED 管理员密码 AdminPwd @@ -47377,7 +47388,7 @@ B9AF nvarchar(50) 50 - + F4CB8471-DA6E-4739-A65E-F0B273A35B71 是否启用 F_EnabledMark @@ -47387,7 +47398,7 @@ B9AF Administrator int - + 71354792-8DB0-44A7-98DC-D63D0DF97800 设备布防状态 DOnlineStatus @@ -47397,7 +47408,7 @@ B9AF Administrator bit - + 601184F9-95FC-4887-B9E4-1DCEDBE8A26E 设备最后通讯时间 DConnectDate @@ -47407,7 +47418,7 @@ B9AF Administrator datetime - + 9354AF58-F9F4-4B44-B43A-DAA0CCF27DF6 设备lUserID DlUserID @@ -47418,7 +47429,7 @@ B9AF nvarchar(50) 50 - + 9FDC6101-5468-48DA-913E-0EDFA776E01E F_CreateDate F_CreateDate @@ -47428,7 +47439,7 @@ B9AF Administrator datetime - + ADE41F7A-D721-457A-8B2B-4C1F186344C5 F_CreateUserId F_CreateUserId @@ -47439,7 +47450,7 @@ B9AF nvarchar(50) 50 - + 9A968663-BAC9-4B8D-8F58-410E553E50B8 F_CreateUserName F_CreateUserName @@ -47450,7 +47461,7 @@ B9AF nvarchar(50) 50 - + 2D7B4825-D319-4740-AD74-2F707908FEEA F_ModifyDate F_ModifyDate @@ -47460,7 +47471,7 @@ B9AF Administrator datetime - + 696D9EF8-31BB-47C5-8526-C322470A96AC F_ModifyUserId F_ModifyUserId @@ -47471,7 +47482,7 @@ B9AF nvarchar(50) 50 - + BD0F8981-431B-42EC-A515-F1A2CA46FCA1 F_ModifyUserName F_ModifyUserName @@ -47484,7 +47495,7 @@ B9AF - + 7D84A058-BAB4-4CA1-B262-896747D61705 Key_1 Key_1 @@ -47493,15 +47504,15 @@ B9AF 1599104860 Administrator - + - + - + @@ -47515,7 +47526,7 @@ B9AF 考勤设备日志 - + 9CEE15F0-DD42-4FA4-B6E7-6D3561423F95 LogId LogId @@ -47527,7 +47538,7 @@ B9AF 50 1 - + FF4B4905-5EB3-4B23-931D-CF2C781C50E7 设备Id DeviceId @@ -47538,7 +47549,7 @@ B9AF nvarchar(50) 50 - + 18DA3B68-1424-4DAF-880F-B9FD2279728B 日志类型 LogType @@ -47549,7 +47560,7 @@ B9AF nvarchar(50) 50 - + 0A812357-6E40-46E8-8A20-94C121AF3285 日志记录信息 LogData @@ -47559,7 +47570,7 @@ B9AF Administrator nvarchar(Max) - + 2029F63E-0C33-4039-93BA-CBEA2E803082 F_CreateDate F_CreateDate @@ -47569,7 +47580,7 @@ B9AF Administrator datetime - + 40533AFD-66A4-4F4D-8343-27E5F6A79B56 F_CreateUserId F_CreateUserId @@ -47580,7 +47591,7 @@ B9AF nvarchar(50) 50 - + 7D493CA7-4AFD-4305-8681-6E9B382B9C07 F_CreateUserName F_CreateUserName @@ -47591,7 +47602,7 @@ B9AF nvarchar(50) 50 - + C195B8D4-14D5-4CDE-9F7A-5B4C2DA8E689 F_ModifyDate F_ModifyDate @@ -47601,7 +47612,7 @@ B9AF Administrator datetime - + 1C8B2B07-C690-4888-A179-96F90198212E F_ModifyUserId F_ModifyUserId @@ -47612,7 +47623,7 @@ B9AF nvarchar(50) 50 - + CA128145-50F6-4266-809E-34FCDE435CF0 F_ModifyUserName F_ModifyUserName @@ -47625,7 +47636,7 @@ B9AF - + C4CDBD69-2DFE-443B-B26A-CEB7655EEDEA Key_1 Key_1 @@ -47634,15 +47645,15 @@ B9AF 1599105066 Administrator - + - + - + @@ -47656,7 +47667,7 @@ B9AF 考勤限制 - + 3BFFB929-C500-4FA2-9A09-AF9BF59854F8 编号 ID @@ -47669,7 +47680,7 @@ B9AF 50 1 - + 93C88E0D-2759-4697-BE6C-43E0CAB2FE07 上班时间 WorkTime @@ -47681,7 +47692,7 @@ B9AF nvarchar(50) 50 - + 4078D2EB-E5FF-43D3-8D13-3D8587D2AC49 下班时间 CloseTime @@ -47693,7 +47704,7 @@ B9AF nvarchar(50) 50 - + EE9B7C66-B13F-4559-ADDD-796DEDFCBB5B 签到时间开始 SignInStartTime @@ -47705,7 +47716,7 @@ B9AF nvarchar(50) 50 - + 737642C0-24B3-46F2-BE53-2FA629EF6A2B 签到时间结束 SignInEndTime @@ -47717,7 +47728,7 @@ B9AF nvarchar(50) 50 - + C42C687A-FBB6-4D67-8EB6-04E112FC44AB 签退时间开始 SignOutStartTime @@ -47729,7 +47740,7 @@ B9AF nvarchar(50) 50 - + 370EEA06-C637-466E-880C-03AFC80DE145 签退时间结束 SignOutEndTime @@ -47741,7 +47752,7 @@ B9AF nvarchar(50) 50 - + FDD05771-1B66-4DAC-B2B3-4330AC4F9036 迟到超时 LateOvertime @@ -47752,7 +47763,7 @@ B9AF 迟到超时 int - + FA1B8722-054D-4003-8BBF-4140509E5C74 早退超时 LeaveOverTime @@ -47763,7 +47774,7 @@ B9AF 早退超时 int - + A80CB89E-F4C9-476F-A175-314F31A11521 未签到，记为 NoSignIn @@ -47774,7 +47785,7 @@ B9AF 未签到，记为 int - + E8CC0680-7B0A-4513-B2BC-4125BE20D4B0 未签退，记为 NoSignOut @@ -47785,7 +47796,7 @@ B9AF 未签退，记为 int - + 6D306382-82C1-4B11-916A-759CED546B14 是否启用 REnable @@ -47797,7 +47808,7 @@ B9AF - + 8ADE1FCB-0EC0-4C87-833F-EF8E53656C24 Key_1 Key_1 @@ -47806,15 +47817,15 @@ B9AF 1599115046 edz - + - + - + @@ -47839,7 +47850,7 @@ B9AF - + 14D78C43-17A2-48F0-83B4-3DF757D5ABE8 1552635393 l @@ -47874,7 +47885,7 @@ B9AF - + FEAECB7B-8E2A-4492-A530-B0062E1511B8 1552635777 l @@ -47909,7 +47920,7 @@ B9AF - + 81527A47-E565-49C2-AAA7-F0555E81CE72 1553245426 l @@ -47944,7 +47955,7 @@ B9AF - + A3225D9D-069C-4A67-ABF0-43DC2FA55CF0 1553247802 l @@ -47978,7 +47989,7 @@ B9AF - + B458081F-CEE1-4251-9E7A-5E9CC93519D5 1553248376 l @@ -48013,7 +48024,7 @@ B9AF - + 8397C4F6-A728-4D3F-B2F8-FAC56886462B 1553248622 l @@ -48047,7 +48058,7 @@ B9AF - + 2F8BC700-F31E-41CC-9DA8-9505EAC5DA85 1553483161 l @@ -48081,7 +48092,7 @@ B9AF - + 0E2D2049-564F-4247-9F5B-B0AA82F9BE96 1555404296 admin @@ -48098,7 +48109,7 @@ B9AF - + 46EC3E2A-6CBF-421A-9DA8-6BCCEDEC7DF5 PUBLIC PUBLIC @@ -48361,7 +48372,7 @@ B9AF - + B1BAD530-6C69-4A9D-BD41-F62F564CA348 Microsoft SQL Server 2008 MSSQLSRV2008 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordEntity.cs index 479ebd1ea..1ec9fc78c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordEntity.cs @@ -74,6 +74,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement /// [Column("ADDAY")] public string ADDay { get; set; } + /// + /// 考勤照片 + /// + [Column("ADPHOTO")] + public string ADPhoto { get; set; } #endregion #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/AnalyzeData.dll b/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/AnalyzeData.dll deleted file mode 100644 index 1b8db2a39..000000000 Binary files a/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/AnalyzeData.dll and /dev/null differ diff --git a/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/AudioIntercom.dll b/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/AudioIntercom.dll deleted file mode 100644 index cd032acfd..000000000 Binary files a/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/AudioIntercom.dll and /dev/null differ diff --git a/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/HCAlarm.dll b/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/HCAlarm.dll deleted file mode 100644 index 54e716ba7..000000000 Binary files a/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/HCAlarm.dll and /dev/null differ diff --git a/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/HCAlarm.lib b/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/HCAlarm.lib deleted file mode 100644 index 971d52b28..000000000 Binary files a/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/HCAlarm.lib and /dev/null differ diff --git a/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/HCCoreDevCfg.dll b/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/HCCoreDevCfg.dll deleted file mode 100644 index d901cad37..000000000 Binary files a/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/HCCoreDevCfg.dll and /dev/null differ diff --git a/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/HCDisplay.dll b/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/HCDisplay.dll deleted file mode 100644 index f3429daaf..000000000 Binary files a/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/HCDisplay.dll and /dev/null differ diff --git a/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/HCGeneralCfgMgr.dll b/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/HCGeneralCfgMgr.dll deleted file mode 100644 index 0acb3256f..000000000 Binary files a/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/HCGeneralCfgMgr.dll and /dev/null differ diff --git a/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/HCGeneralCfgMgr.lib b/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/HCGeneralCfgMgr.lib deleted file mode 100644 index b2acf0082..000000000 Binary files a/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/HCGeneralCfgMgr.lib and /dev/null differ diff --git a/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/HCIndustry.dll b/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/HCIndustry.dll deleted file mode 100644 index 3d983716e..000000000 Binary files a/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/HCIndustry.dll and /dev/null differ diff --git a/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/HCPlayBack.dll b/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/HCPlayBack.dll deleted file mode 100644 index e27bc1808..000000000 Binary files a/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/HCPlayBack.dll and /dev/null differ diff --git a/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/HCPreview.dll b/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/HCPreview.dll deleted file mode 100644 index a9da36a81..000000000 Binary files a/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/HCPreview.dll and /dev/null differ diff --git a/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/HCPreview.lib b/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/HCPreview.lib deleted file mode 100644 index 355596dfa..000000000 Binary files a/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/HCPreview.lib and /dev/null differ diff --git a/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/HCVoiceTalk.dll b/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/HCVoiceTalk.dll deleted file mode 100644 index 575e4dd17..000000000 Binary files a/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/HCVoiceTalk.dll and /dev/null differ diff --git a/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/OpenAL32.dll b/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/OpenAL32.dll deleted file mode 100644 index ea91a5f52..000000000 Binary files a/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/OpenAL32.dll and /dev/null differ diff --git a/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/StreamTransClient.dll b/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/StreamTransClient.dll deleted file mode 100644 index b4af48532..000000000 Binary files a/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/StreamTransClient.dll and /dev/null differ diff --git a/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/SystemTransform.dll b/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/SystemTransform.dll deleted file mode 100644 index d890af2e8..000000000 Binary files a/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/SystemTransform.dll and /dev/null differ diff --git a/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/libiconv2.dll b/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/libiconv2.dll deleted file mode 100644 index 978e2fa5f..000000000 Binary files a/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/HCNetSDKCom/libiconv2.dll and /dev/null differ diff --git a/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/Service1.cs b/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/Service1.cs index 83591ee68..c5ce03115 100644 --- a/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/Service1.cs +++ b/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/Service1.cs @@ -470,6 +470,7 @@ namespace Quanjiang.DigitalScholl.JobService adrRecordEntity.ADYear = datetimenow.Year.ToString(); adrRecordEntity.ADMonth = datetimenow.Month.ToString(); adrRecordEntity.ADDay = datetimenow.Day.ToString(); + adrRecordEntity.ADPhoto = str; //去重 //获取当日考勤记录 var attendancerecordlist = adrRecordIbll.GetADR_RecordEntityByEmpNo(strTimeYear, strTimeMonth, strTimeDay, EmpNo); @@ -487,6 +488,7 @@ namespace Quanjiang.DigitalScholl.JobService firstoffworkentity.ADTime = datetimenow; firstoffworkentity.ClockTime = devicetime; firstoffworkentity.ClockStatus = ClockStatus; + firstoffworkentity.ADPhoto = str; adrRecordIbll.SaveEntity(firstoffworkentity.ID,firstoffworkentity); return true; }