From 2b05015856b93e3bdbf5b015d3ef3562198e0819 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期日, 19 一月 2025 22:46:25 +0800
Subject: [PATCH] 1.组织信息接口
---
StandardPda/MES.Service/Modes/Organize.cs | 2 +-
StandardPda/MES.Service/Dto/webApi/ErpOrganize.cs | 11 ++++++-----
StandardPda/MES.Service/service/BasicData/OrganizeManager.cs | 22 ++++++++++++----------
3 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/StandardPda/MES.Service/Dto/webApi/ErpOrganize.cs b/StandardPda/MES.Service/Dto/webApi/ErpOrganize.cs
index ca4cd28..3e30590 100644
--- a/StandardPda/MES.Service/Dto/webApi/ErpOrganize.cs
+++ b/StandardPda/MES.Service/Dto/webApi/ErpOrganize.cs
@@ -6,12 +6,13 @@
public string? Type { get; set; }
public string? FNumber { get; set; }
public string? FName { get; set; }
- public string? FForbidStatus { get; set; }
- public string? FDescription { get; set; }
- public string? FParentID { get; set; }
public string? fCreateDate { get; set; }
- public string? FForbidorid { get; set; }
- public string? FForbiddate { get; set; }
+ public string? FForbidStatus { get; set; }
+ // public string? FDescription { get; set; }
+ //public string? FParentID { get; set; }
+
+ //public string? FForbidorid { get; set; }
+ //public string? FForbiddate { get; set; }
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Modes/Organize.cs b/StandardPda/MES.Service/Modes/Organize.cs
index 96b15b1..ba55bef 100644
--- a/StandardPda/MES.Service/Modes/Organize.cs
+++ b/StandardPda/MES.Service/Modes/Organize.cs
@@ -9,7 +9,7 @@
{
/// <summary>
/// </summary>
- [SugarColumn(ColumnName = "ID")]
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
public decimal Id { get; set; }
/// <summary>
diff --git a/StandardPda/MES.Service/service/BasicData/OrganizeManager.cs b/StandardPda/MES.Service/service/BasicData/OrganizeManager.cs
index f5f5f31..02e25f4 100644
--- a/StandardPda/MES.Service/service/BasicData/OrganizeManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/OrganizeManager.cs
@@ -30,14 +30,15 @@
if (UpdateOrganizetatus(db, entity.Id, "B"))
return 1;
break;
- case "2":
- if (InsertItem(db, entity))
- return 1;
- break;
+ //case "2":
+ // if (InsertItem(db, entity))
+ // return 1;
+ // break;
case "3":
if (DeleteItem(db, Convert.ToDecimal(entity.Id)))
return 1;
break;
+ case "2":
case "4":
if (InsertOrUpdate(db, entity))
return 1;
@@ -70,14 +71,15 @@
if (!UpdateOrganizetatusBatch(db, itemGroup.Value, "B"))
throw new NotImplementedException("绂佺敤澶辫触");
break;
- case "2":
- if (!InsertItemBatch(db, itemGroup.Value))
- throw new NotImplementedException("鎻掑叆澶辫触");
- break;
+ //case "2":
+ // if (!InsertItemBatch(db, itemGroup.Value))
+ // throw new NotImplementedException("鎻掑叆澶辫触");
+ // break;
case "3":
if (!DeleteItemBatch(db, itemGroup.Value))
throw new NotImplementedException("鍒犻櫎澶辫触");
break;
+ case "2":
case "4":
if (!InsertOrUpdateBatch(db, itemGroup.Value))
throw new NotImplementedException("鍚屾澶辫触");
@@ -132,8 +134,8 @@
Fname = Organize.FName,
Fforbidstatus = Organize.FForbidStatus,
Type = Organize.Type,
- Fparentid=Organize.FParentID,
- Fcreatedate=DateTime.Now
+ //Fparentid=Organize.FParentID,
+ Fcreatedate = Organize.fCreateDate != null ?DateTime.ParseExact(Organize.fCreateDate, "yyyy-MM-dd HH:mm:ss", null):null
};
}
--
Gitblit v1.9.3