优化多组织代码

sjz

5 天以前 302054e253f1550ee64430882786ec9a3920ec92

 MES.Service/service/BasicData/MesSupplierManager.cs

@@ -1,8 +1,8 @@
using Castle.Core.Resource;
using MES.Service.DB;
using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
using System.Collections.Generic;

namespace MES.Service.service.BasicData;

@@ -29,7 +29,7 @@
                        return 1;
                    break;
                case "3":
                    if (DeleteSupplier(entity.Id))
                    if (UpdateSupplierStatus(db, entity.Id, "B"))
                        return 1;
                    break;
                case "4":
@@ -37,10 +37,8 @@
                        return 1;
                    break;
                default:
                    throw new ArgumentNullException(
                        $"type没有{unit.Type}这个类型的参数");
                    throw new ArgumentNullException($"type没有{unit.Type}这个类型的参数");
            }

            throw new NotImplementedException("操作失败");
        }) > 0;
    }
@@ -48,8 +46,7 @@
    public bool SaveList(List<ErpSupplier> suppliers)
    {
        var list = suppliers.Select(GetMesSupplier).ToList();
        var groupBy = list.GroupBy(s => s.Type)
            .ToDictionary(g => g.Key, g => g.ToList());
        var groupBy = list.GroupBy(s => s.Type).ToDictionary(g => g.Key, g => g.ToList());

        return UseTransaction(db =>
        {
@@ -57,13 +54,11 @@
                switch (supplierGroup.Key)
                {
                    case "0":
                        if (!UpdateSupplierStatusBatch(db, supplierGroup.Value,
                                "A"))
                        if (!UpdateSupplierStatusBatch(db, supplierGroup.Value,"A"))
                            throw new NotImplementedException("启用失败");
                        break;
                    case "1":
                        if (!UpdateSupplierStatusBatch(db, supplierGroup.Value,
                                "B"))
                        if (!UpdateSupplierStatusBatch(db, supplierGroup.Value,"B"))
                            throw new NotImplementedException("禁用失败");
                        break;
                    case "2":
@@ -71,7 +66,7 @@
                            throw new NotImplementedException("插入失败");
                        break;
                    case "3":
                        if (!DeleteSupplierBatch(db, supplierGroup.Value))
                        if (!UpdateSupplierStatusBatch(db, supplierGroup.Value, "B"))
                            throw new NotImplementedException("删除失败");
                        break;
                    case "4":
@@ -79,41 +74,61 @@
                            throw new NotImplementedException("同步失败");
                        break;
                    default:
                        throw new ArgumentNullException(
                            $"type没有{supplierGroup.Key}这个类型的参数");
                        throw new ArgumentNullException($"type没有{supplierGroup.Key}这个类型的参数");
                }

            return 1;
        }) > 0;
    }

    private bool UpdateSupplierStatus(SqlSugarScope db, decimal supplierId,
        string status)
    private bool UpdateSupplierStatus(SqlSugarScope db, decimal supplierId,string status)
    {
        var result = db.Updateable<MesSupplier>()
            .SetColumns(s => s.Fforbidstatus == status)
            .Where(s => s.Id == supplierId).ExecuteCommand();

        if (result > 0)
            return true;

        throw new NotImplementedException(status == "A" ? "启用失败" : "禁用失败");
        var result = db.Updateable<MesSupplier>().SetColumns(s => s.Fforbidstatus == status).Where(s => s.Id == supplierId).ExecuteCommand();
        return true;
    }

    private bool InsertSupplier(SqlSugarScope db, MesSupplier entity)
    {
        var insert = db.Insertable(entity).ExecuteCommand();
        if (insert > 0)
        var exists = db.Queryable<MesSupplier>().Any(e => e.Id == entity.Id);
        if (exists)
        {
            var result = db.Updateable(entity).ExecuteCommand();
            return true;

        throw new NotImplementedException("插入失败");
        }
        else
        {
            var insert = db.Insertable(entity).ExecuteCommand();
            if (insert > 0)
            {
                return true;
            }
            else
            {
                throw new NotImplementedException("插入失败");
            }
        }
    }

    private bool DeleteSupplier(decimal supplierId)
    private bool InsertOrUpdate(SqlSugarScope db, MesSupplier entity)
    {
        if (base.DeleteById(supplierId)) return true;

        throw new NotImplementedException("删除失败");
        var exists = db.Queryable<MesSupplier>().Any(e => e.Id == entity.Id);
        if (exists)
        {
            var update = db.Updateable(entity).ExecuteCommand();
            return true;
        }
        else
        {
            var insert = db.Insertable(entity).ExecuteCommand();
            if (insert > 0)
            {
                return true;
            }
            else
            {
                return false;
            }
        }
    }

    private MesSupplier GetMesSupplier(ErpSupplier supplier)
@@ -124,80 +139,47 @@
            SuppNo = supplier.FNumber,
            SuppSname = supplier.FShortName,
            SuppName = supplier.FName,
            Lxr = supplier.F_UNW_LXR,
            Telf1 = supplier.F_UNW_LXRDH,
            Lxr = supplier.FContact,
            Telf1 = supplier.FTel,
            Fstaffid = supplier.FStaffId,
            Fforbidstatus = supplier.FForbidStatus,
            type= supplier.Type,
            fremarks = supplier.Fremarks,
            FSubsidiary = supplier.Fsubsidiary,
            Fumbrella = supplier.Fumbrella,
            CreateDate = DateTime.Now,
            CreateOrg = Convert.ToDecimal(supplier.FCreateOrgId),
            UseOrg = Convert.ToDecimal(supplier.FUseOrgId),
            Remark = supplier.FDescription,
            Company = "1000",
            Factory = "1000"
        };
    }

    private bool UpdateSupplierStatusBatch(SqlSugarScope db,
        List<MesSupplier> supplierList, string status)
    private bool UpdateSupplierStatusBatch(SqlSugarScope db,List<MesSupplier> supplierList, string status)
    {
        var ids = supplierList.Select(it => it.Id).ToArray();
        var result = db.Updateable<MesSupplier>()
            .SetColumns(s => s.Fforbidstatus == status)
            .Where(s => ids.Contains(s.Id)).ExecuteCommand();

        if (result > 0)
            return true;

        throw new NotImplementedException(status == "A" ? "启用失败" : "禁用失败");
        var result = db.Updateable<MesSupplier>().SetColumns(s => s.Fforbidstatus == status).Where(s => ids.Contains(s.Id)).ExecuteCommand();
        return true;
    }

    private bool InsertSupplierBatch(SqlSugarScope db,
        List<MesSupplier> supplierList)
    {
        var insertRange = db.Insertable(supplierList).ExecuteCommand();
        if (insertRange > 0)
            return true;

        throw new NotImplementedException("插入失败");
    }

    private bool DeleteSupplierBatch(SqlSugarScope db,
        List<MesSupplier> supplierList)
    {
        var ids = supplierList.Select(it => it.Id).ToArray();
        var deleteByIds = db.Deleteable<MesSupplier>().In(ids).ExecuteCommand();
        if (deleteByIds > 0)
            return true;

        throw new NotImplementedException("删除失败");
    }

    private bool InsertOrUpdate(SqlSugarScope db, MesSupplier entity)
    {
        var exists = db.Queryable<MesSupplier>().Any(e => e.Id == entity.Id);
        if (exists)
        {
            var update = db.Updateable(entity).ExecuteCommand();
            if (update > 0)
                return true;
        }
        else
        {
            var insert = db.Insertable(entity).ExecuteCommand();
            if (insert > 0)
                return true;
        }

        return false;
    }

    private bool InsertOrUpdateBatch(SqlSugarScope db,
        List<MesSupplier> supplierList)
    private bool InsertSupplierBatch(SqlSugarScope db,List<MesSupplier> supplierList)
    {
        foreach (var entity in supplierList)
            if (!InsertOrUpdate(db, entity))
        {
            if (!InsertSupplier(db, entity))
            {
                return false;
            }
        }
        return true;
    }

    private bool InsertOrUpdateBatch(SqlSugarScope db,List<MesSupplier> supplierList)
    {
        foreach (var entity in supplierList)
        {
            if (!InsertOrUpdate(db, entity))
            {
                return false;
            }
        }
        return true;
    }
}