@ -94,7 +94,21 @@ namespace XGL.Dats.DBServiceFinishProd
/// <returns></returns>
public DataTable GetUserInfoFromCloudServer ( string userID )
{
string sql = $@"SELECT user_name,nick_name,sex FROM [dbo].[sys_user] where del_flag = '0' and pe_snr like '%{userID}%'" ;
string sql = $ @ "SELECT
su . user_name ,
su . nick_name ,
su . sex ,
sp . post_name
FROM
sys_user su
LEFT JOIN
sys_post sp
ON
su . post = sp . post_code
WHERE
su . del_flag = '0'
AND su . pe_snr LIKE ' { userID } ' ;
";
DataSet dtset = Utils . cloudDBHelper . getDataSet ( sql ) ;
if ( dtset ! = null & & dtset . Tables . Count > 0 & & dtset . Tables [ 0 ] . Rows . Count > 0 )
{
@ -109,8 +123,21 @@ namespace XGL.Dats.DBServiceFinishProd
/// <returns></returns>
public DataTable GetUserCodeServer ( string userID )
{
string sql = $@"SELECT user_name,nick_name,sex FROM [dbo].[sys_user] where del_flag = '0' and user_name = '{userID}'" ;
DataSet dtset = Utils . cloudDBHelper . getDataSet ( sql ) ;
string sql = $ @ "SELECT
su . user_name ,
su . nick_name ,
su . sex ,
sp . post_name
FROM
sys_user su
LEFT JOIN
sys_post sp
ON
su . post = sp . post_code
WHERE
su . del_flag = '0'
AND su . user_name = ' { userID } ' ;
"; DataSet dtset = Utils.cloudDBHelper.getDataSet(sql);
if ( dtset ! = null & & dtset . Tables . Count > 0 & & dtset . Tables [ 0 ] . Rows . Count > 0 )
{
return dtset . Tables [ 0 ] ;
@ -134,17 +161,17 @@ namespace XGL.Dats.DBServiceFinishProd
return null ;
}
public bool InsertAttendanceRecord ( string userID , string userName , string sex , string deviceCode )
public bool InsertAttendanceRecord ( string userID , string userName , string sex , string post , string deviceCode )
{
string attendanceTime = LoginUser . Start_Time + "-" + LoginUser . End_Time ;
string sql = $ @ " INSERT INTO [dbo].[mes_attendance_records]
( [ id ] , [ user_id ] , [ user_name ] , [ attendance_status ] , [ sex ] , [ age ] ,
[id_number] , [ start_time ] , [ start_addr ] , [ end_time ] , [ end_addr ] , [ attendance_time ] ,
[attendance_date] , [ work_hours ] , [ create_time ] )
[attendance_date] , [ work_hours ] , [ create_time ] ,[ post ] )
VALUES
( ' { Common . GetUUID ( ) } ' , ' { userID } ' , ' { userName } ' , ' 正 常 ' , ' { sex } ' , 18 ,
null , GetDate ( ) , ' { deviceCode } ' , null , null , ' { attendanceTime } ' ,
CONVERT ( VARCHAR ( 10 ) , GetDate ( ) , 120 ) , 0 , GetDate ( ) ); ";
CONVERT ( VARCHAR ( 10 ) , GetDate ( ) , 120 ) , 0 , GetDate ( ) ,' { post } ' ); ";
int ret = Utils . netClientDBHelper . executeUpdate ( sql ) ;
return ret > 0 ? true : false ;
}
@ -187,6 +214,7 @@ WHERE user_id = '{userID}'
attendance_date ,
work_hours ,
create_time ,
post ,
CONVERT ( DECIMAL ( 12 , 2 ) ,
CASE
WHEN end_time IS NOT NULL THEN DATEDIFF ( MINUTE , start_time , end_time ) / 60.00
@ -708,9 +736,9 @@ where 1=1 and
/// <returns></returns>
public DataTable GetUnitPriceData ( string deviceCode , string sheredata )
{
string sql = $ @ "select [workorder_code], [workorder_code_sap], [product_name], SUBSTRING([product_code], 8, LEN(product_code)) as product_code, [user_name], [nick_name], [childprocess_code], [childprocess_name] ,[create_by], [create_time], [ line_code] ,[attr1],[attr2]
string sql = $ @ "select [workorder_code], [workorder_code_sap], [product_name], SUBSTRING([product_code], 8, LEN(product_code)) as product_code, [user_name], [nick_name], [childprocess_code], [childprocess_name] ,[create_by], [create_time], [ post],[ line_code] ,[attr1],[attr2]
from mes_unitprice_report
where line_code = ' { deviceCode } ' AND create_tim e BETWEEN ' { sheredata } 00 : 00 : 00 ' AND ' { sheredata } 23 : 59 : 59 ' ORDER BY childprocess_code , create_time ";
where line_code = ' { deviceCode } ' AND work_order_product_dat e BETWEEN ' { sheredata } 00 : 00 : 00 ' AND ' { sheredata } 23 : 59 : 59 ' ORDER BY childprocess_code , create_time ";
DataSet dtset = Utils . netClientDBHelper . getDataSet ( sql ) ;
if ( dtset ! = null & & dtset . Tables . Count > 0 & & dtset . Tables [ 0 ] . Rows . Count > 0 )
@ -762,20 +790,20 @@ where line_code = '{deviceCode}' and CONVERT(VARCHAR(10), Create_time , 120) = C
/// </summary>
/// <param name="item"></param>
/// <exception cref="NotImplementedException"></exception>
public string GetCreateUnitPriceInfo ( sys_user item , string workorderCode , string sapWorkorderCode , string productCode , string productName , string childProcessCode , string childProcessName , string deviceCode , string number , string credata , string attr2 )
public string GetCreateUnitPriceInfo ( sys_user item , string workorderCode , string sapWorkorderCode , string productCode , string productName , string childProcessCode , string childProcessName , string deviceCode , string number , string credata , string attr2 , string post )
{
string sql = $ @ "INSERT INTO [dbo].[mes_unitprice_report] (
[id] , [ workorder_code ] , [ workorder_code_sap ] , [ product_name ] , [ product_code ] ,
[user_name] , [ nick_name ] , [ childprocess_code ] , [ childprocess_name ] , [ attr1 ] ,
[attr2] , [ attr3 ] , [ create_by ] , [ create_time ] , [ update_by ] ,
[update_time] , [ remark ] , [ line_code]
[update_time] , [ remark ] , [ post] , [ line_code] , [ work_order_product_date ]
)
VALUES
(
' { Common . GetUUID ( ) } ' , ' { workorderCode } ',' { sapWorkorderCode } ' , ' { productName } ' , ' { productCode } ' ,
N ' { item . user_name } ' , N ' { item . nick_name } ' , N ' { childProcessCode } ' , N ' { childProcessName } ',' { number } ' ,
{ attr2 } , NULL , ' { LoginUser . UserName } ' , ' { credata} 00 : 00 : 00 ' , NULL ,
NULL , NULL , ' { deviceCode} ' ) ; ";
{ attr2 } , NULL , ' { LoginUser . UserName } ' , ' { DateTime. Now . ToString ( "G" ) } ' , NULL ,
NULL , NULL , ' { post} ',' { deviceCode} ',' { credata } 00 : 00 : 00 ' ) ; ";
return sql ;
}
@ -795,7 +823,8 @@ where line_code = '{deviceCode}' and CONVERT(VARCHAR(10), Create_time , 120) = C
public List < sys_user > GetOnWorkUserList ( string deviceCode , string shereDate )
{
string sql = $"WITH RankedRecords AS (\r\n SELECT \r\n user_id as user_name,\r\n user_name as nick_name,\r\n sex,\r\n age,\r\n create_time,\r\n ROW_NUMBER() OVER (PARTITION BY user_name ORDER BY create_time DESC) as rn\r\n FROM [dbo].[mes_attendance_records]\r\n WHERE start_addr = '{deviceCode}' \r\n AND create_time BETWEEN '{shereDate} 00:00:00' AND '{shereDate} 23:59:59'\r\n)\r\nSELECT \r\n user_name,\r\n nick_name,\r\n sex,\r\n age,\r\n create_time\r\nFROM RankedRecords\r\nWHERE rn = 1\r\nORDER BY create_time DESC;" ;
string sql = $"\r\n SELECT \r\n user_id as user_name,\r\n user_name as nick_name,\r\n sex,\r\n age,\r\n\t\t\t\tpost, \r\n create_time FROM mes_attendance_records WHERE start_addr = '{deviceCode}' \r\n AND create_time BETWEEN '{shereDate} 00:00:00' AND '{shereDate} 23:59:59' ORDER BY create_time DESC;" ;
// string sql = $"WITH RankedRecords AS (\r\n SELECT \r\n user_id as user_name,\r\n user_name as nick_name,\r\n sex,\r\n post,\r\n age,\r\n create_time,\r\n ROW_NUMBER() OVER (PARTITION BY user_name ORDER BY create_time DESC) as rn\r\n FROM [dbo].[mes_attendance_records]\r\n WHERE start_addr = '{deviceCode}' \r\n AND create_time BETWEEN '{shereDate} 00:00:00' AND '{shereDate} 23:59:59'\r\n)\r\nSELECT \r\n user_name,\r\n nick_name,\r\n post, sex,\r\n age,\r\n create_time\r\nFROM RankedRecords\r\nWHERE rn = 1\r\nORDER BY create_time DESC;";
DataTable dt = Utils . netClientDBHelper . getDataSet ( sql ) . Tables [ 0 ] ;