仓库信息

快乐的昕的电脑

2025-11-27 e5d3f5d9e36d78a8383fbe0de3a0f818b4df203c

仓库信息

 MES.Service/Dto/webApi/ErpDepots.cs

@@ -2,9 +2,9 @@

public class ErpDepots
{
    public string? FNumber { get; set; }
    public string FNumber { get; set; }//必填
    public string? FName { get; set; }
    public string Id { get; set; }
    public string? Id { get; set; }
    public string? FAllowMinusQty { get; set; }
    public string? FPrincipal { get; set; }
    public string? FStockProperty { get; set; }
@@ -17,4 +17,9 @@
    public string? ClientId { get; set; }
    public string? Fdeptid { get; set; }
    public string? Phone { get; set; }

    public string? Factory { get; set; }
    public string? remark3 { get; set; }
    public string? remark4 { get; set; }
    public string? remark5 { get; set; }
}

 MES.Service/service/BasicData/MesDepotsManager.cs

@@ -76,25 +76,82 @@
        throw new NotImplementedException("反审核失败");
    }

    // 插入或更新仓库的方法
    /// <summary>
    /// 同步物料信息new_0/4
    /// </summary>
    /// <param name="db"></param>
    /// <param name="entity"></param>
    /// <returns></returns>
    private bool InsertOrUpdate(SqlSugarScope db, MesDepots entity)
    {
        db.Deleteable<MesDepots>()
            .Where(s => s.DepotId == entity.DepotId)
            .ExecuteCommand();
        var insert = db.Insertable(entity).ExecuteCommand();
        return insert > 0;
        if (entity.DepotId == 0)
        {
            // 新增情况：生成新ID并插入
            var newId = GenerateNewId();
            entity.DepotId = newId;
            entity.Guid = newId.ToString();
            return db.Insertable(entity).ExecuteCommand() > 0;
        }
        else
        {
            // 更新情况：删除后重新插入，保持原有ID
            var originalId = entity.DepotId;

            // 先删除原记录（如果存在）
            db.Deleteable<MesDepots>().Where(s => s.DepotId == originalId).ExecuteCommand();

            // 重新插入，保持原有ID
            entity.DepotId = originalId;
            entity.Guid = originalId.ToString();
            return db.Insertable(entity).ExecuteCommand() > 0;
        }
    }

    // 插入或更新仓库的方法
    //private bool InsertOrUpdate(SqlSugarScope db, MesDepots entity)
    //{
    //    db.Deleteable<MesDepots>()
    //        .Where(s => s.DepotId == entity.DepotId)
    //        .ExecuteCommand();
    //    var insert = db.Insertable(entity).ExecuteCommand();
    //    return insert > 0;
    //}

    /// <summary>
    /// 生成新的ID，确保不重复
    /// </summary>
    private decimal GenerateNewId()
    {
        // 处理空表的情况，从1开始
        var maxId = Db.Queryable<MesDepots>().Max(x => (decimal?)x.DepotId) ?? 0;
        var newId = maxId + 1;

        // 双重检查，确保生成的ID不存在
        while (Db.Queryable<MesDepots>().Where(x => x.DepotId == newId).Any())
        {
            newId++;
        }

        return newId;
    }

    // 将 ErpDepots 对象转换为 MesDepots 对象的方法
    private MesDepots GetMesDepots(ErpDepots depots)
    {
        return new MesDepots
        // 查找是否已存在相同编码的记录。
        var existingCustomer = Db.Queryable<MesDepots>()
            .Where(s => s.DepotCode == depots.FNumber)
            .First();

        var entity = new MesDepots
        {
            Guid = depots.Id,
            // 如果存在，使用现有的ID，后续将删除后重新插入
            // 如果不存在，设为0，InsertOrUpdate方法将生成新ID
            DepotId = existingCustomer?.DepotId ?? 0,
            //DepotId = Convert.ToDecimal(depots.Id),
            Guid = existingCustomer?.Guid ?? string.Empty,
            DepotCode = depots.FNumber,
            DepotName = depots.FName,
            DepotId = Convert.ToDecimal(depots.Id),
            IsFkc = depots.FAllowMinusQty,
            CreateBy = depots.FPrincipal,
            Depottype = depots.FStockProperty,
@@ -102,15 +159,34 @@
            Zuid = depots.FGroup,
            FSubsidiary = depots.FUseOrgId,
            Fumbrella = depots.FCreateOrgId,
            CreateDate = DateTime.Now,
            // 如果存在，使用现有的CreateDate，后续将删除后重新插入
            // 如果不存在，设为当前时间
            CreateDate = existingCustomer?.CreateDate ?? DateTime.Now,
            LastupdateDate = DateTime.Now,
            SupplierId = depots.FSUPPLIERID,
            ClientId = depots.ClientId,
            Department = depots.Fdeptid,
            Phone = depots.Phone,
            Company = "1000",
            Factory = "1000"
            Factory = depots.Factory??"1000",
            Remark3 = depots.remark3,
            Remark4 = depots.remark4,
            Remark5 = depots.remark5,
        };
        // ERP: 0=未禁用, 1=禁用
        // MES: A=未禁用, B=禁用
        if (string.IsNullOrEmpty(depots.FForbidStatus))
        {
            entity.IsNg = "A";
        }
        else
        {
            //我期望的值是A=否,B=是
            //实际给我的值是0或1，我希望为我转换从A和B的方式
            entity.IsNg = depots.FForbidStatus == "1" ? "B" : "A";
        }

        return entity;
    }

    // SaveList 方法用于保存多个仓库记录，根据类型批量执行不同的操作