1111

啊鑫

4 天以前 ab01d75a3fbc8467d81a895cba5d6dde76fbe053

 MES.Service/service/BasicData/MesCustomerManager.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;
@@ -89,35 +90,22 @@
    private MesCustomer GetSysDepartment(ErpCustomer customer)
    {
        //ERP傳輸的接口數據轉換為MES數據庫字段
        var fForbidStatus = customer.FForbidStatus;
        if (customer.FForbidStatus == "0")
        {
            fForbidStatus = "A";
        }
        else if (customer.FForbidStatus == "1")
        {
            fForbidStatus = "B";
        }

        var entity = new MesCustomer
        {
            // Id = string.IsNullOrEmpty(customer.Id)
            //     ? DateTimeOffset.UtcNow.ToUnixTimeSeconds()
            //     : Convert.ToDecimal(customer.Id),
            
            CustNo = customer.FNumber,
            CustSname = customer.FShortName,
            CustName = customer.FName,
            Anred = customer.FTContact,
            Telf1 = customer.Fmobilephone,
            Fseller = customer.Fseller,
            Fforbidstatus = fForbidStatus,
            FSubsidiary = string.IsNullOrEmpty(customer.FUseOrgId)
                ? "1"
                : customer.FUseOrgId,
            Fumbrella = string.IsNullOrEmpty(customer.FCreateOrgId)
                ? "1"
                : customer.FCreateOrgId,
            // FSubsidiary = string.IsNullOrEmpty(customer.FUseOrgId)
            //     ? "1"
            //     : customer.FUseOrgId,
            // Fumbrella = string.IsNullOrEmpty(customer.FCreateOrgId)
            //     ? "1"
            //     : customer.FCreateOrgId,
            FSubsidiary = "1",
            Fumbrella = "1",
            CreateDate = DateTime.Now,
            LastupdateDate = DateTime.Now,
            Company = "1000",
@@ -126,16 +114,52 @@
            Type = customer.Type,
        };

        var mesCustomer = Db.Queryable<MesCustomer>()
        if (customer.FForbidStatus.IsNullOrEmpty())
        {
            entity.Fforbidstatus = "A";
        }
        else
        {
            //我期望的值是A=否,B=是
            //实际给我的值是0或1，我希望为我转换从A和B的方式
            entity.Fforbidstatus = customer.FForbidStatus == "1" ? "B" : "A";
        }

        // 查找是否已存在相同客户编码的记录
        var existingCustomer = Db.Queryable<MesCustomer>()
            .Where(s => s.CustNo == entity.CustNo)
            .First();

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

        return entity;
    }

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

    private bool UpdateCustomerStatusBatch(SqlSugarScope db,
@@ -176,12 +200,25 @@

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

    private bool InsertOrUpdateBatch(SqlSugarScope db,