From baa7d3abea49a36b1ca83d29343e720647ee2b8b Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期一, 05 五月 2025 10:29:55 +0800
Subject: [PATCH] 1.生产订单新增同步时间。 2.采购订单新增同步时间。 3.员工新增账号逻辑优化。 4.基础信息+业务单据增加route储存单号。
---
MESApplication/Controllers/BasicData/SysDepartmentController.cs | 1 +
MES.Service/service/BasicData/MesStaffManager.cs | 19 ++++++++++++++-----
MESApplication/Controllers/BasicData/MesSupplierController.cs | 1 +
MES.Service/service/BasicData/MesRohInManager.cs | 2 +-
MESApplication/Controllers/BasicData/SalesOrderController.cs | 1 +
MESApplication/Controllers/BasicData/MesDepotsController.cs | 1 +
MESApplication/Controllers/BasicData/ProductionOrderController.cs | 1 +
MES.Service/service/WomcaaManager.cs | 3 ++-
MES.Service/Modes/MesRohIn.cs | 6 ++++++
MESApplication/Controllers/WomcaaController.cs | 1 +
MESApplication/Controllers/BasicData/MesCustomerController.cs | 1 +
MESApplication/Controllers/BasicData/MesUnitController.cs | 1 +
MES.Service/Modes/Womcaa.cs | 6 ++++++
MESApplication/Controllers/BasicData/MesItemsController.cs | 1 +
MESApplication/Controllers/BasicData/MesPositionController.cs | 1 +
MESApplication/Controllers/BasicData/OrganizeController.cs | 1 +
MESApplication/Controllers/BasicData/MesItemTypeController.cs | 1 +
MESApplication/Controllers/BasicData/MesStaffController.cs | 1 +
18 files changed, 42 insertions(+), 7 deletions(-)
diff --git a/MES.Service/Modes/MesRohIn.cs b/MES.Service/Modes/MesRohIn.cs
index 1a38774..ceb9209 100644
--- a/MES.Service/Modes/MesRohIn.cs
+++ b/MES.Service/Modes/MesRohIn.cs
@@ -296,4 +296,10 @@
/// </summary>
[SugarColumn(ColumnName = "Acctype")]
public string? Acctype { get; set; }
+
+ /// <summary>
+ /// 鍚屾鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "SYNCHRONOUS_DATE")]
+ public DateTime? SynchronousDate { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/Womcaa.cs b/MES.Service/Modes/Womcaa.cs
index 85694b4..d5f7e5f 100644
--- a/MES.Service/Modes/Womcaa.cs
+++ b/MES.Service/Modes/Womcaa.cs
@@ -420,4 +420,10 @@
/// </summary>
[SugarColumn(ColumnName = "TYPEA")]
public string? Typea { get; set; }
+
+ /// <summary>
+ /// 鍚屾鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "SYNCHRONOUS_DATE")]
+ public DateTime? SynchronousDate { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/MesRohInManager.cs b/MES.Service/service/BasicData/MesRohInManager.cs
index d820b54..fd0edbc 100644
--- a/MES.Service/service/BasicData/MesRohInManager.cs
+++ b/MES.Service/service/BasicData/MesRohInManager.cs
@@ -152,7 +152,7 @@
mesRohIn.FixedTelephone = rohIn.FixedTelephone;
mesRohIn.Address = rohIn.Address;
mesRohIn.Acctype = rohIn.Acctype;
-
+ mesRohIn.SynchronousDate = DateTime.Now;
return mesRohIn;
}
diff --git a/MES.Service/service/BasicData/MesStaffManager.cs b/MES.Service/service/BasicData/MesStaffManager.cs
index a3aeee7..8921d64 100644
--- a/MES.Service/service/BasicData/MesStaffManager.cs
+++ b/MES.Service/service/BasicData/MesStaffManager.cs
@@ -61,14 +61,22 @@
private bool InsertOrUpdateStaff(SqlSugarScope db, SysUser sysUser,
MesStaff entity)
{
- db.Deleteable<SysUser>()
- .Where(s => s.Account == sysUser.Account).ExecuteCommand();
+
+ var exists = db.Queryable<SysUser>().Any(u => u.Account == sysUser.Account);
+ if (!exists)
+ {
+ var insertUser = db.Insertable(sysUser).ExecuteCommand();
+ if (insertUser <= 0) return false;
+ }
+
+ //db.Deleteable<SysUser>()
+ // .Where(s => s.Account == sysUser.Account).ExecuteCommand();
db.Deleteable<MesStaff>()
.Where(s => s.Id == entity.Id).ExecuteCommand();
- var insertUser = db.Insertable(sysUser).ExecuteCommand();
- if (insertUser <= 0) return false;
+
+
var insertStaff = db.Insertable(entity).ExecuteCommand();
return insertStaff > 0;
}
@@ -124,7 +132,8 @@
UserName = staff.FName,
Password = "E1ADC3949BA59ABBE56E057F2F883E", // 鍒濆瀵嗙爜
DepartNo = staff.FPostDept,
- Type = staff.Type
+ Type = staff.Type,
+ CreateTime = DateTime.Now
};
}
diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs
index e9fc3f4..aa0e102 100644
--- a/MES.Service/service/WomcaaManager.cs
+++ b/MES.Service/service/WomcaaManager.cs
@@ -145,8 +145,9 @@
// CustomerName = dto.F_XIFG_Text_qtr1, /// 瀹㈡埛鍚嶇О
// Customer = dto.F_XIFG_Base_83g1, /// 瀹㈡埛
Caa0111 = dto.FPlanFinishDate, /// 棰勮瀹屽伐鏃堕棿澶囦唤
- Typea = dto.TypeA /// 棰勮瀹屽伐鏃堕棿澶囦唤
+ Typea = dto.TypeA, /// 棰勮瀹屽伐鏃堕棿澶囦唤
//Typeb = dto.TypeB /// 棰勮瀹屽伐鏃堕棿澶囦唤
+ SynchronousDate = DateTime.Now
};
var single = base.GetSingle(it => it.Erpid == entity.Erpid);
diff --git a/MESApplication/Controllers/BasicData/MesCustomerController.cs b/MESApplication/Controllers/BasicData/MesCustomerController.cs
index 6d08d50..904e03b 100644
--- a/MESApplication/Controllers/BasicData/MesCustomerController.cs
+++ b/MESApplication/Controllers/BasicData/MesCustomerController.cs
@@ -32,6 +32,7 @@
entity.Data = JsonConvert.SerializeObject(unit);
entity.Status = 1;
entity.CreateBy = "PL017";
+ entity.Route = unit.FNumber;
try
{
dynamic resultInfos = new ExpandoObject();
diff --git a/MESApplication/Controllers/BasicData/MesDepotsController.cs b/MESApplication/Controllers/BasicData/MesDepotsController.cs
index 3a20310..f3f0ae6 100644
--- a/MESApplication/Controllers/BasicData/MesDepotsController.cs
+++ b/MESApplication/Controllers/BasicData/MesDepotsController.cs
@@ -32,6 +32,7 @@
entity.Data = JsonConvert.SerializeObject(unit);
entity.Status = 1;
entity.CreateBy = "PL017";
+ entity.Route = unit.FNumber;
try
{
dynamic resultInfos = new ExpandoObject();
diff --git a/MESApplication/Controllers/BasicData/MesItemTypeController.cs b/MESApplication/Controllers/BasicData/MesItemTypeController.cs
index a71b56f..bdb5583 100644
--- a/MESApplication/Controllers/BasicData/MesItemTypeController.cs
+++ b/MESApplication/Controllers/BasicData/MesItemTypeController.cs
@@ -33,6 +33,7 @@
entity.Data = JsonConvert.SerializeObject(unit);
entity.Status = 1;
entity.CreateBy = "PL017";
+ entity.Route = unit.FNumber;
try
{
dynamic resultInfos = new ExpandoObject();
diff --git a/MESApplication/Controllers/BasicData/MesItemsController.cs b/MESApplication/Controllers/BasicData/MesItemsController.cs
index c095307..503a9eb 100644
--- a/MESApplication/Controllers/BasicData/MesItemsController.cs
+++ b/MESApplication/Controllers/BasicData/MesItemsController.cs
@@ -32,6 +32,7 @@
entity.Data = JsonConvert.SerializeObject(unit);
entity.Status = 1;
entity.CreateBy = "PL017";
+ entity.Route = unit.FNumber;
try
{
diff --git a/MESApplication/Controllers/BasicData/MesPositionController.cs b/MESApplication/Controllers/BasicData/MesPositionController.cs
index 655941c..0769cd3 100644
--- a/MESApplication/Controllers/BasicData/MesPositionController.cs
+++ b/MESApplication/Controllers/BasicData/MesPositionController.cs
@@ -33,6 +33,7 @@
entity.Data = JsonConvert.SerializeObject(unit);
entity.Status = 1;
entity.CreateBy = "PL017";
+ entity.Route = unit.FNumber;
try
{
dynamic resultInfos = new ExpandoObject();
diff --git a/MESApplication/Controllers/BasicData/MesStaffController.cs b/MESApplication/Controllers/BasicData/MesStaffController.cs
index 9a11979..3390062 100644
--- a/MESApplication/Controllers/BasicData/MesStaffController.cs
+++ b/MESApplication/Controllers/BasicData/MesStaffController.cs
@@ -32,6 +32,7 @@
entity.Data = JsonConvert.SerializeObject(staff);
entity.Status = 1;
entity.CreateBy = "PL017";
+ entity.Route = staff.FStaffNumber;
try
{
dynamic resultInfos = new ExpandoObject();
diff --git a/MESApplication/Controllers/BasicData/MesSupplierController.cs b/MESApplication/Controllers/BasicData/MesSupplierController.cs
index 8782e2d..c612c64 100644
--- a/MESApplication/Controllers/BasicData/MesSupplierController.cs
+++ b/MESApplication/Controllers/BasicData/MesSupplierController.cs
@@ -32,6 +32,7 @@
entity.Data = JsonConvert.SerializeObject(unit);
entity.Status = 1;
entity.CreateBy = "PL017";
+ entity.Route = unit.FNumber;
try
{
dynamic resultInfos = new ExpandoObject();
diff --git a/MESApplication/Controllers/BasicData/MesUnitController.cs b/MESApplication/Controllers/BasicData/MesUnitController.cs
index 3d20342..508c644 100644
--- a/MESApplication/Controllers/BasicData/MesUnitController.cs
+++ b/MESApplication/Controllers/BasicData/MesUnitController.cs
@@ -32,6 +32,7 @@
entity.Data = JsonConvert.SerializeObject(unit);
entity.Status = 1;
entity.CreateBy = "PL017";
+ entity.Route = unit.FNumber;
try
{
dynamic resultInfos = new ExpandoObject();
diff --git a/MESApplication/Controllers/BasicData/OrganizeController.cs b/MESApplication/Controllers/BasicData/OrganizeController.cs
index cd3a95e..f08a11c 100644
--- a/MESApplication/Controllers/BasicData/OrganizeController.cs
+++ b/MESApplication/Controllers/BasicData/OrganizeController.cs
@@ -33,6 +33,7 @@
entity.Data = JsonConvert.SerializeObject(unit);
entity.Status = 1;
entity.CreateBy = "PL017";
+ entity.Route = unit.FNumber;
try
{
dynamic resultInfos = new ExpandoObject();
diff --git a/MESApplication/Controllers/BasicData/ProductionOrderController.cs b/MESApplication/Controllers/BasicData/ProductionOrderController.cs
index 6cbf09f..6fc08e4 100644
--- a/MESApplication/Controllers/BasicData/ProductionOrderController.cs
+++ b/MESApplication/Controllers/BasicData/ProductionOrderController.cs
@@ -35,6 +35,7 @@
entity.Data = JsonConvert.SerializeObject(rohIn);
entity.Status = 1;
entity.CreateBy = "PL017";
+ entity.Route = rohIn.OrderDto.FBillNo;
try
{
dynamic resultInfos = new ExpandoObject();
diff --git a/MESApplication/Controllers/BasicData/SalesOrderController.cs b/MESApplication/Controllers/BasicData/SalesOrderController.cs
index f9b6af7..677f3c7 100644
--- a/MESApplication/Controllers/BasicData/SalesOrderController.cs
+++ b/MESApplication/Controllers/BasicData/SalesOrderController.cs
@@ -38,6 +38,7 @@
entity.Data = JsonConvert.SerializeObject(salesOrder);
entity.Status = 1;
entity.CreateBy = "PL017";
+ entity.Route = salesOrder.OrderDto.FBillNo;
try
{
dynamic resultInfos = new ExpandoObject();
diff --git a/MESApplication/Controllers/BasicData/SysDepartmentController.cs b/MESApplication/Controllers/BasicData/SysDepartmentController.cs
index 7fff07b..366444f 100644
--- a/MESApplication/Controllers/BasicData/SysDepartmentController.cs
+++ b/MESApplication/Controllers/BasicData/SysDepartmentController.cs
@@ -32,6 +32,7 @@
entity.Data = JsonConvert.SerializeObject(unit);
entity.Status = 1;
entity.CreateBy = "PL017";
+ entity.Route = unit.FNumber;
try
{
dynamic resultInfos = new ExpandoObject();
diff --git a/MESApplication/Controllers/WomcaaController.cs b/MESApplication/Controllers/WomcaaController.cs
index 579cf20..398bb75 100644
--- a/MESApplication/Controllers/WomcaaController.cs
+++ b/MESApplication/Controllers/WomcaaController.cs
@@ -32,6 +32,7 @@
entity.Data = JsonConvert.SerializeObject(rohIn);
entity.Status = 1;
entity.CreateBy = "PL017";
+ entity.Route = rohIn.ErpCaa.FBillNo;
try
{
dynamic resultInfos = new ExpandoObject();
--
Gitblit v1.9.3