From af3455bc13c0ed48f4e3fa1b1614f601df24f12c Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期五, 09 五月 2025 17:17:22 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~yhj/HM_JK
---
StandardInterface/MES.Service/service/BasicData/Organization/OrganizeManager.cs | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/StandardInterface/MES.Service/service/BasicData/Organization/OrganizeManager.cs b/StandardInterface/MES.Service/service/BasicData/Organization/OrganizeManager.cs
index ba61bd8..23b8085 100644
--- a/StandardInterface/MES.Service/service/BasicData/Organization/OrganizeManager.cs
+++ b/StandardInterface/MES.Service/service/BasicData/Organization/OrganizeManager.cs
@@ -26,15 +26,12 @@
if (UpdateOrganizetatus(db, entity.Id, "B"))
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 "4":
+ case "2":
if (InsertOrUpdate(db, entity))
return 1;
break;
@@ -66,15 +63,15 @@
if (!UpdateOrganizetatusBatch(db, itemGroup.Value, "B"))
throw new NotImplementedException("绂佺敤澶辫触");
break;
- case "2":
+ /* case "2":
if (!InsertItemBatch(db, itemGroup.Value))
throw new NotImplementedException("鎻掑叆澶辫触");
- break;
+ break;*/
case "3":
if (!DeleteItemBatch(db, itemGroup.Value))
throw new NotImplementedException("鍒犻櫎澶辫触");
break;
- case "4":
+ case "2":
if (!InsertOrUpdateBatch(db, itemGroup.Value))
throw new NotImplementedException("鍚屾澶辫触");
break;
@@ -123,12 +120,16 @@
return new Organize
{
Id = Convert.ToDecimal(Organize.Id),
+ Type = Organize.Type,
Fnumber = Organize.FNumber,
Fname = Organize.FName,
- Fforbidstatus = Organize.FForbidStatus,
- Type = Organize.Type,
Fparentid = Organize.FParentID,
- Fcreatedate = DateTime.Now
+ Fcreatedate = DateTime.Now,
+ FFORBIDORID= Organize.FForbidorid,
+ FFORBIDDATE = Organize.FForbiddate,
+ Fforbidstatus = Organize.FForbidStatus
+
+
};
}
--
Gitblit v1.9.3