1\修正收料通知单

kyy

7 天以前 f476ec010c22cd4e3c6a119eea035cbf4594bfbb

 MES.Service/service/BasicData/MesUnitManager.cs

@@ -43,39 +43,15 @@

    public bool SaveList(List<ErpUnit> units)
    {
        var list = units.Select(GetMesUnit).ToList();
        var groupBy = list.GroupBy(s => s.Type)
            .ToDictionary(g => g.Key, g => g.ToList());

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

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

    private bool UpdateUnitStatus(SqlSugarScope db, decimal unitId,
@@ -112,27 +88,53 @@

    private MesUnit GetMesUnit(ErpUnit unit)
    {
        return new MesUnit
        var fForbidStatus = unit.FForbidStatus;
        if (unit.FForbidStatus == "0")
        {
            Id = Convert.ToDecimal(unit.Id),
            fForbidStatus = "A";
        }
        else if (unit.FForbidStatus == "1")
        {
            fForbidStatus = "B";
        }

        var entity = new MesUnit
        {
            Fnumber = unit.FNumber,
            Fname = unit.FName,
            Funitgroupid = unit.FUnitGroupId,
            Fconvertdenominator = Convert.ToDouble(unit.FConvertDenominator),
            Fconvertdenominator = Convert.ToDecimal(unit.FConvertDenominator),
            Fcurrentunitid = unit.FCurrentUnitId,
            Fconvertnumerator = unit.FConvertNumerator,
            Fconvertnumerator = Convert.ToDecimal(unit.FConvertNumerator),
            Fbaseunit = unit.FBaseUnit,
            Froundtype = unit.FRoundType,
            Fprecision = unit.FPrecision,
            Fdescription = unit.FDescription,
            Fforbidstatus = unit.FForbidStatus,
            Fforbidstatus = fForbidStatus,
            CreateDate = DateTime.Now,
            LastupdateDate = DateTime.Now,
            Company = "1000",
            Factory = "1000",
            Type = unit.Type,
            FDocumentStatus  = unit.FDocumentStatus
            Type = unit.Type
        };

        // 查找是否已存在相同单位编码的记录
        var existingUnit = Db.Queryable<MesUnit>()
            .Where(s => s.Fnumber == entity.Fnumber)
            .First();

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

        return entity;
    }

    private bool UpdateUnitStatusBatch(SqlSugarScope db, List<MesUnit> unitList,
@@ -166,12 +168,45 @@
        return deleteByIds > 0;
    }

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

    private bool InsertOrUpdate(SqlSugarScope db, MesUnit entity)
    {
        db.Deleteable<MesUnit>()
            .Where(s => s.Id == entity.Id).ExecuteCommand();
        var insert = db.Insertable(entity).ExecuteCommand();
        return insert > 0;
        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<MesUnit>().Where(s => s.Id == originalId).ExecuteCommand();
            
            // 重新插入，保持原有ID
            entity.Id = originalId;
            return db.Insertable(entity).IgnoreColumns(ignoreNullColumn:true).ExecuteCommand() > 0;
        }
    }

    private bool InsertOrUpdateBatch(SqlSugarScope db, List<MesUnit> unitList)