From 5e0de5156fd817d0eb6efa7624df4d2740215379 Mon Sep 17 00:00:00 2001
From: sjz <1240968267@qq.com>
Date: 星期四, 10 七月 2025 08:20:35 +0800
Subject: [PATCH] 部门修改字段
---
MES.Service/Modes/SysDepartment.cs | 26 --------------------------
MES.Service/service/BasicData/MesDeliveryNoteManager.cs | 16 ----------------
MES.Service/service/BasicData/SysDepartmentManager.cs | 5 ++---
3 files changed, 2 insertions(+), 45 deletions(-)
diff --git a/MES.Service/Modes/SysDepartment.cs b/MES.Service/Modes/SysDepartment.cs
index 4ea2a99..7b99287 100644
--- a/MES.Service/Modes/SysDepartment.cs
+++ b/MES.Service/Modes/SysDepartment.cs
@@ -120,19 +120,6 @@
/// </summary>
[SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
public decimal Id { get; set; }
-
- /// <summary>
- /// 鐢熶骇杞﹂棿
- /// </summary>
- [SugarColumn(ColumnName = "PRODUCTION_WORKSHOP")]
- public string? ProductionWorkshop { get; set; }
-
- /// <summary>
- /// 鐗╂枡灞炴��
- /// </summary>
- [SugarColumn(ColumnName = "MATERIAL_PROPERTI")]
- public string? MaterialProperti { get; set; }
-
/// <summary>
/// 鍒涘缓缁勭粐
/// </summary>
@@ -150,19 +137,6 @@
/// </summary>
[SugarColumn(ColumnName = "PARENT_ID")]
public decimal? ParentId { get; set; }
-
- /// <summary>
- /// 鑷畾涔夊瓧娈�4
- /// </summary>
- [SugarColumn(ColumnName = "REMARK4")]
- public string? Remark4 { get; set; }
-
- /// <summary>
- /// 鑷畾涔夊瓧娈�5
- /// </summary>
- [SugarColumn(ColumnName = "REMARK5")]
- public string? Remark5 { get; set; }
-
[SugarColumn(IsIgnore = true)] public string? Type { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/MesDeliveryNoteManager.cs b/MES.Service/service/BasicData/MesDeliveryNoteManager.cs
index 3093fe2..f8016d4 100644
--- a/MES.Service/service/BasicData/MesDeliveryNoteManager.cs
+++ b/MES.Service/service/BasicData/MesDeliveryNoteManager.cs
@@ -35,22 +35,6 @@
}) > 0;
}
- // 鎻掑叆鏁版嵁鐨勬柟娉�
- private bool InsertData(SqlSugarScope db, MesDeliveryNote mesDeliveryNote,List<MesDeliveryNoteDetails> mesDeliveryNoteDetails)
- {
- var decimals = mesDeliveryNoteDetails.Select(s => s.Id).ToArray();
-
- if (mesDeliveryNote.Id != null) base.DeleteById(mesDeliveryNote.Id);
-
- if (decimals.Length > 0)
- db.Deleteable<MesRohInData>().In(decimals).ExecuteCommand();
-
- var insert = base.Insert(mesDeliveryNote);
- var insertRange = mesDeliveryNoteManager.InsertRange(mesDeliveryNoteDetails);
-
- if (insert && insertRange) return true;
- throw new NotImplementedException("鎻掑叆澶辫触");
- }
// 鏇存柊鏁版嵁鐨勬柟娉�
private bool DeleteData(SqlSugarScope db, MesDeliveryNote mesDeliveryNote,List<MesDeliveryNoteDetails> mesDeliveryNoteDetails)
diff --git a/MES.Service/service/BasicData/SysDepartmentManager.cs b/MES.Service/service/BasicData/SysDepartmentManager.cs
index 5410fdb..f10a7e5 100644
--- a/MES.Service/service/BasicData/SysDepartmentManager.cs
+++ b/MES.Service/service/BasicData/SysDepartmentManager.cs
@@ -12,8 +12,7 @@
// Save 鏂规硶鐢ㄤ簬淇濆瓨鍗曚釜閮ㄩ棬璁板綍锛屾牴鎹被鍨嬫墽琛屼笉鍚岀殑鎿嶄綔
public bool Save(ErpDepartment department)
{
- var entity =
- GetSysDepartment(department); // 灏� ErpDepartment 杞崲涓� SysDepartment
+ var entity = GetSysDepartment(department); // 灏� ErpDepartment 杞崲涓� SysDepartment
return UseTransaction(db =>
{
@@ -109,10 +108,10 @@
{
return new SysDepartment
{
+ Id = Convert.ToDecimal(department.Id),
Departmentcode = department.FNumber,
Departmentname = department.FName,
Departmentid = Convert.ToDecimal(department.Id),
- Id = Convert.ToDecimal(department.Id),
Depextr1 = department.FDeptProperty,
Depextr2 = department.FGroup,
Depextr3 = department.FWIPStockID,
--
Gitblit v1.9.3