From f311876e3a1341c4051e0d8eb45032fd35407f3c Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期一, 08 十二月 2025 11:23:48 +0800
Subject: [PATCH] 基础信息：在数据库表内存在创建组织与使用组织的添加默认传入值1
---
MES.Service/service/BasicData/MesUnitManager.cs | 4 +
MES.Service/service/BasicData/MesStaffManager.cs | 13 +++-
MES.Service/Dto/webApi/ErpWorkshopcenters.cs | 3 +
MES.Service/service/BasicData/MesPositionManager.cs | 13 +++-
MES.Service/service/BasicData/SysDepartmentManager.cs | 11 ++-
MES.Service/service/BasicData/MesCustomerManager.cs | 13 +++-
MES.Service/service/BasicData/MesWorkshopcentersManager.cs | 3 +
MES.Service/service/BasicData/MesSupplierManager.cs | 13 +++-
MES.Service/Dto/webApi/ErpUnitMatrixing.cs | 2
MES.Service/service/BasicData/MesUnitMatrixingManager.cs | 9 ++
MES.Service/Modes/MesUnitMatrixing.cs | 12 ++++
MES.Service/service/BasicData/MesDepotsManager.cs | 21 +++---
MES.Service/service/BasicData/MesItemsManager.cs | 13 +++-
13 files changed, 94 insertions(+), 36 deletions(-)
diff --git a/MES.Service/Dto/webApi/ErpUnitMatrixing.cs b/MES.Service/Dto/webApi/ErpUnitMatrixing.cs
index 70c9020..8f29831 100644
--- a/MES.Service/Dto/webApi/ErpUnitMatrixing.cs
+++ b/MES.Service/Dto/webApi/ErpUnitMatrixing.cs
@@ -14,4 +14,6 @@
public string? remark3 { get; set; }
public string? remark4 { get; set; }
public string? remark5 { get; set; }
+ public string? FUseOrgId { get; set; }
+ public string? FCreateOrgId { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpWorkshopcenters.cs b/MES.Service/Dto/webApi/ErpWorkshopcenters.cs
index e43ab54..92f2cd3 100644
--- a/MES.Service/Dto/webApi/ErpWorkshopcenters.cs
+++ b/MES.Service/Dto/webApi/ErpWorkshopcenters.cs
@@ -12,4 +12,7 @@
public string? FName { get; set; }//宸ヤ綔涓績鍚嶇О
public string? factory_name { get; set; }//宸ュ巶鍚嶇О
public string? Factory { get; set; }//宸ュ巶鍚嶇О
+
+ public string? FUseOrgId { get; set; }//浣跨敤缁勭粐
+ public string? FCreateOrgId { get; set; }//鍒涘缓缁勭粐
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesUnitMatrixing.cs b/MES.Service/Modes/MesUnitMatrixing.cs
index 89b4e99..b3987f3 100644
--- a/MES.Service/Modes/MesUnitMatrixing.cs
+++ b/MES.Service/Modes/MesUnitMatrixing.cs
@@ -74,5 +74,17 @@
[SugarColumn(ColumnName = "remark5")]
public string? remark5 { get; set; }
+ /// <summary>
+ /// 浣跨敤缁勭粐
+ /// </summary>
+ [SugarColumn(ColumnName = "FSUBSIDIARY")]
+ public string? FSubsidiary { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓缁勭粐
+ /// </summary>
+ [SugarColumn(ColumnName = "FUMBRELLA")]
+ public string? Fumbrella { get; set; }
+
[SugarColumn(IsIgnore = true)] public string? Type { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/MesCustomerManager.cs b/MES.Service/service/BasicData/MesCustomerManager.cs
index ffa64c2..b29eca6 100644
--- a/MES.Service/service/BasicData/MesCustomerManager.cs
+++ b/MES.Service/service/BasicData/MesCustomerManager.cs
@@ -6,7 +6,9 @@
using Masuit.Tools;
namespace MES.Service.service.BasicData;
-
+/// <summary>
+/// 瀹㈡埛淇℃伅
+/// </summary>
public class MesCustomerManager : Repository<MesCustomer>
{
public bool Save(ErpCustomer customer)
@@ -151,8 +153,8 @@
Fseller = customer.Fseller,
//Fforbidstatus = customer.FForbidStatus,
Remark = customer.FDescription,
- FSubsidiary = "1",
- Fumbrella = "1",
+ //FSubsidiary = "1",
+ //Fumbrella = "1",
// 濡傛灉瀛樺湪锛屼娇鐢ㄧ幇鏈夌殑CreateDate锛屽悗缁皢鍒犻櫎鍚庨噸鏂版彃鍏�
// 濡傛灉涓嶅瓨鍦紝璁句负褰撳墠鏃堕棿
CreateDate = existingCustomer?.CreateDate ?? DateTime.Now,
@@ -165,7 +167,10 @@
ItemC =null,
ItemSap=null,
LotFlag=null,
- Iscommit= null
+ Iscommit= null,
+
+ FSubsidiary = string.IsNullOrEmpty(customer.FUseOrgId) ? "1" : customer.FUseOrgId,
+ Fumbrella = string.IsNullOrEmpty(customer.FCreateOrgId) ? "1" : customer.FCreateOrgId,
};
// ERP: 0=鏈鐢�, 1=绂佺敤
diff --git a/MES.Service/service/BasicData/MesDepotsManager.cs b/MES.Service/service/BasicData/MesDepotsManager.cs
index e6690b7..2e5830f 100644
--- a/MES.Service/service/BasicData/MesDepotsManager.cs
+++ b/MES.Service/service/BasicData/MesDepotsManager.cs
@@ -4,7 +4,9 @@
using SqlSugar;
namespace MES.Service.service.BasicData;
-
+/// <summary>
+/// 浠撳簱淇℃伅
+/// </summary>
public class MesDepotsManager : Repository<MesDepots>
{
// Save 鏂规硶鐢ㄤ簬淇濆瓨鍗曚釜浠撳簱璁板綍锛屾牴鎹被鍨嬫墽琛屼笉鍚岀殑鎿嶄綔
@@ -77,7 +79,7 @@
}
/// <summary>
- /// 鍚屾鐗╂枡淇℃伅new_0/4
+ /// 鍚屾浠撳簱淇℃伅new_0/4
/// </summary>
/// <param name="db"></param>
/// <param name="entity"></param>
@@ -157,8 +159,8 @@
Depottype = depots.FStockProperty,
IsNg = depots.FForbidStatus,
Zuid = depots.FGroup,
- FSubsidiary = depots.FUseOrgId,
- Fumbrella = depots.FCreateOrgId,
+ //FSubsidiary = depots.FUseOrgId,
+ //Fumbrella = depots.FCreateOrgId,
// 濡傛灉瀛樺湪锛屼娇鐢ㄧ幇鏈夌殑CreateDate锛屽悗缁皢鍒犻櫎鍚庨噸鏂版彃鍏�
// 濡傛灉涓嶅瓨鍦紝璁句负褰撳墠鏃堕棿
CreateDate = existingCustomer?.CreateDate ?? DateTime.Now,
@@ -172,6 +174,8 @@
factory_name = depots.factory_name,
Remark4 = depots.remark4,
Remark5 = depots.remark5,
+ FSubsidiary = string.IsNullOrEmpty(depots.FUseOrgId) ? "1" : depots.FUseOrgId,
+ Fumbrella = string.IsNullOrEmpty(depots.FCreateOrgId) ? "1" : depots.FCreateOrgId,
};
// ERP: 0=鏈鐢�, 1=绂佺敤
// MES: A=鏈鐢�, B=绂佺敤
@@ -240,8 +244,7 @@
}
// 鎵归噺鏇存柊浠撳簱鐘舵�佺殑鏂规硶
- private bool UpdateDepotStatusBatch(SqlSugarScope db,
- List<MesDepots> depotList, string status)
+ private bool UpdateDepotStatusBatch(SqlSugarScope db,List<MesDepots> depotList, string status)
{
var ids = depotList.Select(it => it.DepotId).ToArray();
var result = db.Updateable<MesDepots>()
@@ -255,8 +258,7 @@
}
// 鎵归噺鎻掑叆浠撳簱鐨勬柟娉�
- private bool InsertDepotBatch(SqlSugarScope db,
- List<MesDepots> depotList)
+ private bool InsertDepotBatch(SqlSugarScope db,List<MesDepots> depotList)
{
var insertRange = db.Insertable(depotList).ExecuteCommand();
if (insertRange > 0)
@@ -280,8 +282,7 @@
}
// 鎵归噺鎻掑叆鎴栨洿鏂颁粨搴撶殑鏂规硶
- private bool InsertOrUpdateBatch(SqlSugarScope db,
- List<MesDepots> depotList)
+ private bool InsertOrUpdateBatch(SqlSugarScope db,List<MesDepots> depotList)
{
return depotList.All(entity => InsertOrUpdate(db, entity));
}
diff --git a/MES.Service/service/BasicData/MesItemsManager.cs b/MES.Service/service/BasicData/MesItemsManager.cs
index ef92180..36ff2a1 100644
--- a/MES.Service/service/BasicData/MesItemsManager.cs
+++ b/MES.Service/service/BasicData/MesItemsManager.cs
@@ -6,7 +6,9 @@
using SqlSugar;
namespace MES.Service.service.BasicData;
-
+/// <summary>
+/// 鐗╂枡淇℃伅
+/// </summary>
public class MesItemsManager : Repository<MesItems>
{
public bool Save(ErpItems item)
@@ -159,8 +161,8 @@
ProductionWorkshop = item.FWorkShopId,
ProduceUnit = item.FPRODUCEUNITID,
SubconUnit = item.FSUBCONUNITID,
- FSubsidiary = item.FUseOrgId,
- Fumbrella = item.FCreateOrgId,
+ //FSubsidiary = item.FUseOrgId,
+ //Fumbrella = item.FCreateOrgId,
LastupdateDate = DateTime.Now,
// 濡傛灉瀛樺湪锛屼娇鐢ㄧ幇鏈夌殑CreateDate锛屽悗缁皢鍒犻櫎鍚庨噸鏂版彃鍏�
// 濡傛灉涓嶅瓨鍦紝璁句负褰撳墠鏃堕棿
@@ -173,7 +175,10 @@
ExpirationDate= item.Expirationdate,
ReviewPeriod= item.Reviewperiod,
LeadDays= item.FLeadDays,
- Remark5 = item.FRemark5
+ Remark5 = item.FRemark5,
+
+ FSubsidiary = string.IsNullOrEmpty(item.FUseOrgId) ? "1" : item.FUseOrgId,
+ Fumbrella = string.IsNullOrEmpty(item.FCreateOrgId) ? "1" : item.FCreateOrgId,
};
// ERP: 0=鏈鐢�, 1=绂佺敤
diff --git a/MES.Service/service/BasicData/MesPositionManager.cs b/MES.Service/service/BasicData/MesPositionManager.cs
index a108107..bcee4bc 100644
--- a/MES.Service/service/BasicData/MesPositionManager.cs
+++ b/MES.Service/service/BasicData/MesPositionManager.cs
@@ -4,7 +4,9 @@
using SqlSugar;
namespace MES.Service.service.BasicData;
-
+/// <summary>
+/// 宀椾綅淇℃伅
+/// </summary>
public class MesPositionManager : Repository<MesPosition>
{
// 褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
@@ -143,8 +145,8 @@
PositionDescription = position.FDESCRIPTIONS,
Department = position.FDept,
Fforbidstatus = position.FForbidStatus,
- FUseOrgId = position.FUseOrgId,
- FCreateOrgId = position.FCreateOrgId,
+ //FUseOrgId = position.FUseOrgId,
+ //FCreateOrgId = position.FCreateOrgId,
//// 濡傛灉瀛樺湪锛屼娇鐢ㄧ幇鏈夌殑CreateDate锛屽悗缁皢鍒犻櫎鍚庨噸鏂版彃鍏�
//// 濡傛灉涓嶅瓨鍦紝璁句负褰撳墠鏃堕棿
//CreationDate = existingCustomer?.CreationDate ?? DateTime.Now,
@@ -162,7 +164,10 @@
DisabledDate = position.FForbidDate != null
? DateTime.ParseExact(position.FForbidDate,
"yyyy-MM-dd HH:mm:ss", null)
- : null
+ : null,
+
+ FUseOrgId = string.IsNullOrEmpty(position.FUseOrgId) ? "1" : position.FUseOrgId,
+ FCreateOrgId = string.IsNullOrEmpty(position.FCreateOrgId) ? "1" : position.FCreateOrgId,
};
// ERP: 0=鏈鐢�, 1=绂佺敤
diff --git a/MES.Service/service/BasicData/MesStaffManager.cs b/MES.Service/service/BasicData/MesStaffManager.cs
index f83112e..8573aca 100644
--- a/MES.Service/service/BasicData/MesStaffManager.cs
+++ b/MES.Service/service/BasicData/MesStaffManager.cs
@@ -4,7 +4,9 @@
using SqlSugar;
namespace MES.Service.service.BasicData;
-
+/// <summary>
+/// 鍛樺伐淇℃伅
+/// </summary>
public class MesStaffManager : Repository<MesStaff>
{
// Save 鏂规硶鐢ㄤ簬淇濆瓨鍗曚釜鍛樺伐璁板綍锛屾牴鎹被鍨嬫墽琛屼笉鍚岀殑鎿嶄綔
@@ -173,14 +175,17 @@
PhoneNumber = staff.FMobile,
Remark = staff.FDescription,
FforbidStatus = staff.FForbidStatus,
- FSubsidiary = staff.FUseOrgId,
- Fumbrella = staff.FCreateOrgId,
+ //FSubsidiary = staff.FUseOrgId,
+ //Fumbrella = staff.FCreateOrgId,
// 濡傛灉瀛樺湪锛屼娇鐢ㄧ幇鏈夌殑CreateDate锛屽悗缁皢鍒犻櫎鍚庨噸鏂版彃鍏�
// 濡傛灉涓嶅瓨鍦紝璁句负褰撳墠鏃堕棿
CreateDate = existingCustomer?.CreateDate ?? DateTime.Now,
//CreateDate = DateTime.Now,
LastupdateDate = DateTime.Now,
- Type = staff.Type
+ Type = staff.Type,
+
+ FSubsidiary = string.IsNullOrEmpty(staff.FUseOrgId) ? "1" : staff.FUseOrgId,
+ Fumbrella = string.IsNullOrEmpty(staff.FCreateOrgId) ? "1" : staff.FCreateOrgId,
};
if (staff.FStaffStartDate != null)
diff --git a/MES.Service/service/BasicData/MesSupplierManager.cs b/MES.Service/service/BasicData/MesSupplierManager.cs
index 63ad3f4..599b019 100644
--- a/MES.Service/service/BasicData/MesSupplierManager.cs
+++ b/MES.Service/service/BasicData/MesSupplierManager.cs
@@ -7,7 +7,9 @@
using Masuit.Tools;
namespace MES.Service.service.BasicData;
-
+/// <summary>
+/// 渚涘簲鍟嗕俊鎭�
+/// </summary>
public class MesSupplierManager : Repository<MesSupplier>
{
public bool Save(ErpSupplier unit)
@@ -135,14 +137,17 @@
Fstaffid = supplier.FStaffId,
//Fforbidstatus = supplier.FForbidStatus,
Type = supplier.Type,
- FSubsidiary = "1",
- Fumbrella = "1",
+ //FSubsidiary = "1",
+ //Fumbrella = "1",
// 濡傛灉瀛樺湪锛屼娇鐢ㄧ幇鏈夌殑CreateDate锛屽悗缁皢鍒犻櫎鍚庨噸鏂版彃鍏�
// 濡傛灉涓嶅瓨鍦紝璁句负褰撳墠鏃堕棿
CreateDate = existingCustomer?.CreateDate ?? DateTime.Now,
LastupdateDate = DateTime.Now,
Company = "1000",
- Factory = "1000"
+ Factory = "1000",
+
+ FSubsidiary = string.IsNullOrEmpty(supplier.FUseOrgId) ? "1" : supplier.FUseOrgId,
+ Fumbrella = string.IsNullOrEmpty(supplier.FCreateOrgId) ? "1" : supplier.FCreateOrgId,
};
// ERP: 0=鏈鐢�, 1=绂佺敤
diff --git a/MES.Service/service/BasicData/MesUnitManager.cs b/MES.Service/service/BasicData/MesUnitManager.cs
index 2176fd2..ed8ffdb 100644
--- a/MES.Service/service/BasicData/MesUnitManager.cs
+++ b/MES.Service/service/BasicData/MesUnitManager.cs
@@ -5,7 +5,9 @@
using SqlSugar;
namespace MES.Service.service.BasicData;
-
+/// <summary>
+/// 鐗╂枡鍗曚綅淇℃伅
+/// </summary>
public class MesUnitManager : Repository<MesUnit>
{
public bool Save(ErpUnit unit)
diff --git a/MES.Service/service/BasicData/MesUnitMatrixingManager.cs b/MES.Service/service/BasicData/MesUnitMatrixingManager.cs
index 1fe562d..a77cb42 100644
--- a/MES.Service/service/BasicData/MesUnitMatrixingManager.cs
+++ b/MES.Service/service/BasicData/MesUnitMatrixingManager.cs
@@ -5,7 +5,9 @@
using SqlSugar;
namespace MES.Service.service.BasicData;
-
+/// <summary>
+/// 鐗╂枡鍗曚綅鎹㈢畻淇℃伅
+/// </summary>
public class MesUnitMatrixingManager : Repository<MesUnitMatrixing>
{
public bool Save(ErpUnitMatrixing unit)
@@ -129,7 +131,10 @@
CONVMOL=unit.FConvertMolecules,
CONVDEN=unit.FConvertDenominator,
AltUnits=unit.FCurrentUnitId,
- ValStates=unit.FForbidStatus
+ ValStates=unit.FForbidStatus,
+
+ FSubsidiary = string.IsNullOrEmpty(unit.FUseOrgId) ? "1" : unit.FUseOrgId,
+ Fumbrella = string.IsNullOrEmpty(unit.FCreateOrgId) ? "1" : unit.FCreateOrgId,
};
// ERP: 0=鏈鐢�, 1=绂佺敤
diff --git a/MES.Service/service/BasicData/MesWorkshopcentersManager.cs b/MES.Service/service/BasicData/MesWorkshopcentersManager.cs
index 44f54c5..86f092f 100644
--- a/MES.Service/service/BasicData/MesWorkshopcentersManager.cs
+++ b/MES.Service/service/BasicData/MesWorkshopcentersManager.cs
@@ -161,6 +161,9 @@
? existingCustomer?.Factory
: department.Factory,
+ FSubsidiary = string.IsNullOrEmpty(department.FUseOrgId) ? "1" : department.FUseOrgId,
+ Fumbrella = string.IsNullOrEmpty(department.FCreateOrgId) ? "1" : department.FCreateOrgId,
+
};
// ERP: 0=鏈鐢�, 1=绂佺敤
diff --git a/MES.Service/service/BasicData/SysDepartmentManager.cs b/MES.Service/service/BasicData/SysDepartmentManager.cs
index 6ba27fc..dd8c947 100644
--- a/MES.Service/service/BasicData/SysDepartmentManager.cs
+++ b/MES.Service/service/BasicData/SysDepartmentManager.cs
@@ -4,7 +4,9 @@
using SqlSugar;
namespace MES.Service.service.BasicData;
-
+/// <summary>
+/// 閮ㄩ棬淇℃伅
+/// </summary>
public class SysDepartmentManager : Repository<SysDepartment>
{
// 褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
@@ -144,8 +146,8 @@
Depextr3 = department.FWIPStockID,
Depextr4 = department.FForbidStatus,
FParentID = department.FParentID,
- FSubsidiary = department.FUseOrgId,
- Fumbrella = department.FCreateOrgId,
+ //FSubsidiary = department.FUseOrgId,
+ //Fumbrella = department.FCreateOrgId,
// 濡傛灉瀛樺湪锛屼娇鐢ㄧ幇鏈夌殑CreateDate锛屽悗缁皢鍒犻櫎鍚庨噸鏂版彃鍏�
// 濡傛灉涓嶅瓨鍦紝璁句负褰撳墠鏃堕棿
CreateDate = existingCustomer?.CreateDate ?? DateTime.Now,
@@ -171,6 +173,9 @@
? existingCustomer?.Factory
: department.Factory,
+
+ FSubsidiary = string.IsNullOrEmpty(department.FUseOrgId) ? "1" : department.FUseOrgId,
+ Fumbrella = string.IsNullOrEmpty(department.FCreateOrgId) ? "1" : department.FCreateOrgId,
};
// ERP: 0=鏈鐢�, 1=绂佺敤
--
Gitblit v1.9.3