11

啊鑫

3 天以前 9d296c888a8ac49f606c0a3ebd843e617cfc0a40

 MES.Service/service/BasicData/MesSupplierManager.cs

@@ -1,4 +1,5 @@
using MES.Service.DB;
using Masuit.Tools;
using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
@@ -43,41 +44,15 @@

    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());

        return UseTransaction(db =>
        if (suppliers == null || !suppliers.Any())
        {
            foreach (var supplierGroup in groupBy)
                switch (supplierGroup.Key)
                {
                    case "0":
                        if (!UpdateSupplierStatusBatch(db, supplierGroup.Value,
                                "A"))
                            throw new NotImplementedException("启用失败");
                        break;
                    case "1":
                        if (!UpdateSupplierStatusBatch(db, supplierGroup.Value,
                                "B"))
                            throw new NotImplementedException("禁用失败");
                        break;
                    case "3":
                        if (!DeleteSupplierBatch(db, supplierGroup.Value))
                            throw new NotImplementedException("删除失败");
                        break;
                    case "2":
                    case "4":
                        if (!InsertOrUpdateBatch(db, supplierGroup.Value))
                            throw new NotImplementedException("同步失败");
                        break;
                    default:
                        throw new ArgumentNullException(
                            $"type没有{supplierGroup.Key}这个类型的参数");
                }
            Console.WriteLine("警告: 传入的列表为空");
            return false;
        }

            return 1;
        }) > 0;
        // 逐条处理，全部成功才返回true（事务内批量处理更优，此处保持原有逻辑）
        var result = suppliers.Select(Save).ToList();
        return result.All(b => b);
    }

    private bool UpdateSupplierStatus(SqlSugarScope db, decimal supplierId,
@@ -114,11 +89,8 @@

    private MesSupplier GetMesSupplier(ErpSupplier supplier)
    {
        return new MesSupplier
        var entity = new MesSupplier
        {
            Id = string.IsNullOrEmpty(supplier.Id)
                ? DateTimeOffset.UtcNow.ToUnixTimeSeconds()
                : Convert.ToDecimal(supplier.Id),
            Type = supplier.Type,
            SuppNo = supplier.FNumber,
            SuppSname = supplier.FShortName,
@@ -126,19 +98,50 @@
            Lxr = supplier.FTContact,
            Telf1 = supplier.Fmobilephone,
            Fstaffid = supplier.FStaffId,
            Fforbidstatus = supplier.FForbidStatus,
            FSubsidiary = string.IsNullOrEmpty(supplier.FUseOrgId)
                ? "1"
                : supplier.FUseOrgId,
            Fumbrella = string.IsNullOrEmpty(supplier.FCreateOrgId)
                ? "1"
                : supplier.FCreateOrgId,
            // FSubsidiary = string.IsNullOrEmpty(supplier.FUseOrgId)
            //     ? "1"
            //     : supplier.FUseOrgId,
            // Fumbrella = string.IsNullOrEmpty(supplier.FCreateOrgId)
            //     ? "1"
            //     : supplier.FCreateOrgId,
            FSubsidiary = "1",
            Fumbrella = "1",
            Remark = supplier.Remark,
            CreateDate = DateTime.Now,
            LastupdateDate = DateTime.Now,
            Company = "1000",
            Factory = "1000",
        };
        
        //Fforbidstatus = supplier.FForbidStatus,
        if (supplier.FForbidStatus.IsNullOrEmpty())
        {
            entity.Fforbidstatus = "A";
        }
        else
        {
            //我期望的值是A=否,B=是
            //实际给我的值是0或1，我希望为我转换从A和B的方式
            entity.Fforbidstatus = supplier.FForbidStatus == "1" ? "B" : "A";
        }

        // 查找是否已存在相同供应商编码的记录
        var existingSupplier = Db.Queryable<MesSupplier>()
            .Where(s => s.SuppNo == entity.SuppNo)
            .First();

        if (existingSupplier != null)
        {
            // 如果存在，使用现有的ID，后续将删除后重新插入
            entity.Id = existingSupplier.Id;
        }
        else
        {
            // 如果不存在，设为0，InsertOrUpdate方法将生成新ID
            entity.Id = 0;
        }

        return entity;
    }

    private bool UpdateSupplierStatusBatch(SqlSugarScope db,
@@ -177,16 +180,45 @@
        throw new NotImplementedException("删除失败");
    }

    /// <summary>
    /// 生成新的ID，确保不重复
    /// </summary>
    private decimal GenerateNewId()
    {
        // 处理空表的情况，从1开始
        var maxId = Db.Queryable<MesSupplier>().Max(x => (decimal?)x.Id) ?? 0;
        var newId = maxId + 1;
        
        // 双重检查，确保生成的ID不存在
        while (Db.Queryable<MesSupplier>().Where(x => x.Id == newId).Any())
        {
            newId++;
        }
        
        return newId;
    }

    private bool InsertOrUpdate(SqlSugarScope db, MesSupplier entity)
    {
        db.Deleteable<MesSupplier>().Where(s => s.Id == entity.Id)
            .ExecuteCommand();

        var insert = db.Insertable(entity).ExecuteCommand();
        if (insert > 0)
            return true;

        return false;
        if (entity.Id == 0)
        {
            // 新增情况：生成新ID并插入
            var newId = GenerateNewId();
            entity.Id = newId;
            return db.Insertable(entity).IgnoreColumns(ignoreNullColumn:true).ExecuteCommand() > 0;
        }
        else
        {
            // 更新情况：删除后重新插入，保持原有ID
            var originalId = entity.Id;
            
            // 先删除原记录（如果存在）
            db.Deleteable<MesSupplier>().Where(s => s.Id == originalId).ExecuteCommand();
            
            // 重新插入，保持原有ID
            entity.Id = originalId;
            return db.Insertable(entity).IgnoreColumns(ignoreNullColumn:true).ExecuteCommand() > 0;
        }
    }

    private bool InsertOrUpdateBatch(SqlSugarScope db,