wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
周科达
2024-11-01 14:15:48 +08:00
parent 6f7ed54ec9
commit f83990b9ad
1 changed files with 52 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs
View File

@@ -732,7 +732,9 @@ namespace Tnb.ProductionMgr
return "true"; return "true";
} }
#region 同步基础数据
/// <summary> /// <summary>
/// 同步基础数据 /// 同步基础数据
/// </summary> /// </summary>
@@ -1500,15 +1502,18 @@ namespace Tnb.ProductionMgr
{ {
var erpdb = _db.AsTenant().GetConnection("erpdb"); var erpdb = _db.AsTenant().GetConnection("erpdb");
List<ErpUserDto> persons = await erpdb.Queryable<ErpBdPsndoc>() List<ErpUserDto> persons = await erpdb.Queryable<ErpBdPsndoc>()
.Where(x=>x.ENABLESTATE!=1)
.Select(x=>new ErpUserDto .Select(x=>new ErpUserDto
{ {
PERSON_ID = x.ID, PERSON_ID = x.ID,
CODE = x.CODE, CODE = x.CODE,
NAME = x.NAME, NAME = x.NAME,
TYPE = "1", TYPE = "1",
ENABLESTATE = x.ENABLESTATE
}) })
.ToListAsync(); .ToListAsync();
List<ErpUserDto> users = await erpdb.Queryable<ErpSmUser>() List<ErpUserDto> users = await erpdb.Queryable<ErpSmUser>()
.Where(x=>x.ENABLESTATE!=1)
.Select(x=>new ErpUserDto .Select(x=>new ErpUserDto
{ {
PERSON_ID = x.PK_PSNDOC, PERSON_ID = x.PK_PSNDOC,
@@ -1516,6 +1521,7 @@ namespace Tnb.ProductionMgr
CODE = x.CODE, CODE = x.CODE,
NAME = x.NAME, NAME = x.NAME,
TYPE = "2", TYPE = "2",
ENABLESTATE = x.ENABLESTATE
}) })
.ToListAsync(); .ToListAsync();
@@ -1537,6 +1543,16 @@ namespace Tnb.ProductionMgr
{ {
ErpExtendField eef = insertErpExtendFields.Find(x => x.person_id == person.PERSON_ID); ErpExtendField eef = insertErpExtendFields.Find(x => x.person_id == person.PERSON_ID);
eef.user_id = person.USER_ID; eef.user_id = person.USER_ID;
UserEntity existUser = insertUsers.Find(x => x.Id == eef.table_id);
if (existUser != null)
{
int state = person.ENABLESTATE == 2 ? 1 : 0;
if (existUser.EnabledMark != state)
{
existUser.EnabledMark = state;
}
}
} }
else else
{ {
@@ -1544,6 +1560,18 @@ namespace Tnb.ProductionMgr
if (existsUsers.Exists(x => x.Account == person.CODE)) if (existsUsers.Exists(x => x.Account == person.CODE))
{ {
userEntity = existsUsers.Find(x => x.Account == person.CODE); userEntity = existsUsers.Find(x => x.Account == person.CODE);
if (userEntity != null)
{
int state = person.ENABLESTATE == 2 ? 1 : 0;
if (userEntity.EnabledMark != state)
{
await _db.Updateable<UserEntity>()
.SetColumns(x => x.EnabledMark == state)
.Where(x => x.Id == userEntity.Id)
.ExecuteCommandAsync();
}
}
} }
else else
{ {
@@ -1556,7 +1584,7 @@ namespace Tnb.ProductionMgr
userEntity.Secretkey = Guid.NewGuid().ToString(); userEntity.Secretkey = Guid.NewGuid().ToString();
userEntity.Password = MD5Encryption.Encrypt(MD5Encryption.Encrypt(CommonConst.DEFAULTPASSWORD) + userEntity.Secretkey); userEntity.Password = MD5Encryption.Encrypt(MD5Encryption.Encrypt(CommonConst.DEFAULTPASSWORD) + userEntity.Secretkey);
userEntity.EntryDate = DateTime.Now; userEntity.EntryDate = DateTime.Now;
userEntity.EnabledMark = 1; userEntity.EnabledMark = person.ENABLESTATE == 2 ? 1 : 0;
userEntity.CreatorTime = DateTime.Now; userEntity.CreatorTime = DateTime.Now;
insertUsers.Add(userEntity); insertUsers.Add(userEntity);
@@ -1587,6 +1615,26 @@ namespace Tnb.ProductionMgr
} }
} }
else
{
ErpExtendField user = erpExtendFields.Find(x => x.person_id == person.PERSON_ID || x.user_id == person.USER_ID);
if (user != null)
{
UserEntity ue = await _db.Queryable<UserEntity>().Where(x=>x.Id==user.table_id).FirstAsync();
if (ue != null)
{
int state = person.ENABLESTATE == 2 ? 1 : 0;
if (ue.EnabledMark != state)
{
await _db.Updateable<UserEntity>()
.SetColumns(x => x.EnabledMark == state)
.Where(x => x.Id == ue.Id)
.ExecuteCommandAsync();
}
}
}
}
} }
await _db.Insertable(insertUsers).ExecuteCommandAsync(); await _db.Insertable(insertUsers).ExecuteCommandAsync();
@@ -1607,6 +1655,8 @@ namespace Tnb.ProductionMgr
return msg; return msg;
} }
#endregion
/// <summary> /// <summary>
/// 监测工艺 /// 监测工艺