@ -13,7 +13,6 @@ using MySql.Data.MySqlClient;
using CommonFunc.Tools ;
using XGL.Models.Model ;
using XGL.Models ;
using System.Threading ;
namespace XGL.Dats.DBServiceFinishProd
{
@ -87,9 +86,14 @@ namespace XGL.Dats.DBServiceFinishProd
return Items ;
}
/// <summary>
/// 刷卡功能变更为取pe_snr的值
/// </summary>
/// <param name="userID"></param>
/// <returns></returns>
public DataTable GetUserInfoFromCloudServer ( string userID )
{
string sql = $@"SELECT user_name,nick_name,sex FROM [dbo].[sys_user] where del_flag = '0' and user_name = '{userID}'" ;
string sql = $@"SELECT user_name,nick_name,sex FROM [dbo].[sys_user] where del_flag = '0' and ( user_name = '{userID}' or pe_snr = '{userID}') ";
DataSet dtset = Utils . cloudDBHelper . getDataSet ( sql ) ;
if ( dtset ! = null & & dtset . Tables . Count > 0 & & dtset . Tables [ 0 ] . Rows . Count > 0 )
{
@ -138,6 +142,7 @@ namespace XGL.Dats.DBServiceFinishProd
public DataTable GetExistAttendanceRecord ( string v )
{
//不会存在一个人俩个班次工作的情况
string sql = $ @ " select 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
@ -689,6 +694,21 @@ where line_code = '{deviceCode}' and CONVERT(VARCHAR(10), Create_time , 120) = C
}
return null ;
}
public List < sys_user > GetOnWorkUserList ( string deviceCode )
{
string sql = $"SELECT user_id as user_name,user_name as nick_name,sex,age FROM [dbo].[mes_attendance_records] where start_addr = '{deviceCode}' and CONVERT(VARCHAR(10), create_time , 120) = CONVERT(VARCHAR(10), GETDATE() , 120) ;" ;
DataTable dt = Utils . netClientDBHelper . getDataSet ( sql ) . Tables [ 0 ] ;
var lst = Utils . ToDataList < sys_user > ( dt ) ;
if ( lst . Count > 0 )
{
return lst ;
}
return null ; //lst.Count > 0 ? true : false;
}
public string GetUpdateUnitPriceSql ( string workOrderCode )
{
string updateOrderSql = $@"update pro_order_workorder set salary_flag = '1', update_by = '{LoginUser.UserName}',update_time = GETDATE() where workorder_code = '{workOrderCode}' " ;
@ -3416,6 +3436,36 @@ left join basedata_plcsetting f on a.PlcId5=f.Id
public void InsertCheckTaskDetail ( string value , string where )
{
//StringBuilder strSql = new StringBuilder();
//strSql.Append("UPDATE qc_check_task_detail ");
//strSql.Append("SET actual_value =");
//if (value == null)
//StringBuilder strSql = new StringBuilder();
//strSql.Append("UPDATE qc_check_task_detail ");
//strSql.Append("SET actual_value =");
//if (value==null)
//{
// strSql.Append("NULL");
//}
//else
//{
// strSql.Append($"'{value}'");
//}
//strSql.Append(" WHERE record_id =");
//strSql.Append($"'{where}'");
//Utils.netClientDBHelper.executeUpdate(strSql.ToString());
//strSql.Append(" WHERE record_id =");
//strSql.Append($"'{where}'");
//int rowsAffected = Utils.netClientDBHelper.executeUpdate(strSql.ToString());
StringBuilder strSql = new StringBuilder ( ) ;
strSql . Append ( "UPDATE qc_check_task_detail " ) ;
strSql . Append ( "SET actual_value =" ) ;
@ -3431,6 +3481,7 @@ left join basedata_plcsetting f on a.PlcId5=f.Id
strSql . Append ( " WHERE record_id =" ) ;
strSql . Append ( $"'{where}'" ) ;
Utils . netClientDBHelper . executeUpdate ( strSql . ToString ( ) ) ;
}
// /// <summary>