From eca13a5ffc805ea1252a75dfeae46afd1cdbe701 Mon Sep 17 00:00:00 2001
From: zyf <1071160500@qq.com>
Date: 星期二, 11 十一月 2025 14:48:12 +0800
Subject: [PATCH] 巡检入库检bug修复，物料检验周期字段增加
---
MES.Service/service/BasicData/MesStaffManager.cs | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/MES.Service/service/BasicData/MesStaffManager.cs b/MES.Service/service/BasicData/MesStaffManager.cs
index b16b7b0..71aecb0 100644
--- a/MES.Service/service/BasicData/MesStaffManager.cs
+++ b/MES.Service/service/BasicData/MesStaffManager.cs
@@ -1,5 +1,4 @@
-锘縰sing Castle.Core.Resource;
-using MES.Service.DB;
+锘縰sing MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
@@ -59,8 +58,7 @@
}
// 鎻掑叆鎴栨洿鏂板憳宸ョ殑鏂规硶
- private bool InsertOrUpdateStaff(SqlSugarScope db, SysUser sysUser,
- MesStaff entity)
+ private bool InsertOrUpdateStaff(SqlSugarScope db, SysUser sysUser,MesStaff entity)
{
var exists = db.Queryable<SysUser>().Any(u => u.Sid == sysUser.Sid);
if (exists)
@@ -74,7 +72,17 @@
{
var updateStaff = db.Updateable(entity).ExecuteCommand();
if (updateStaff > 0)
+ {
return true;
+ }
+ else
+ {
+ var insertStaff = db.Insertable(entity).ExecuteCommand();
+ if (insertStaff > 0)
+ {
+ return true;
+ }
+ }
}
}
else
@@ -115,15 +123,14 @@
Id = Convert.ToDecimal(staff.Id),
StaffNo = staff.FStaffNumber,
StaffName = staff.FName,
- DepartmentName = staff.FPostDept,
- PositionName = staff.FPost,
+ DepartmentNo = staff.FPostDept,
+ PositionCode = staff.FPostId,
PhoneNumber = staff.FMobile,
- Remark = staff.FDescription,
- FforbidStatus = staff.FForbidStatus,
- FSubsidiary = staff.FSubsidiary,
- Fumbrella = staff.Fumbrella,
+ CreateOrg = Convert.ToDecimal(staff.FCreateOrgId),
+ UseOrg = Convert.ToDecimal(staff.FUseOrgId),
CreateDate = DateTime.Now,
- LastupdateDate = DateTime.Now,
+ Remark = staff.FDescription,
+ FforbidStatus = staff.FForbidStatus
};
if (staff.FStaffStartDate != null)
@@ -142,11 +149,14 @@
Fcode = staff.FStaffNumber,
Fname = staff.FName,
Fpassword = "8+()./,", // 鍒濆瀵嗙爜
- Fsystem = "澶忚挋",
+ Fsystem = "鐓滄槍",
Lever = 0,
Fcompany = "1000",
Ffactory = "1000",
DelFlag = 0,
+ Dev=0,
+ Tet=0,
+ Prd=1,
Ismanager = 0,
Isacq = 0,
ExpField9 = "1020",
@@ -155,6 +165,9 @@
Isdeparture = 0,
CheckFlag = 0,
ExpFiel12 = 0,
+ FirstLogin = 0,
+ CreateDate = DateTime.Now,
+ PswEditTime = DateTime.Now
};
}
--
Gitblit v1.9.3