Merge branch 'master' of http://43.142.96.171:8080/r/~yhj/HM_JK

cnf

2025-05-09 af3455bc13c0ed48f4e3fa1b1614f601df24f12c

 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
            

        };
    }