格式化代码

啊鑫

2 天以前 ed05efdc17aab076146b134ebe105b6382f221d7

 MES.Service/service/WomcaaManager.cs

@@ -1,9 +1,7 @@
using Dm;
using MES.Service.DB;
using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
using System.Net.NetworkInformation;

namespace MES.Service.service;

@@ -24,7 +22,8 @@
    public bool Save(ErpWOM wom)
    {
        var womErpCaa = wom.ErpCaa;
        var mesWomcaa = MapErpCAAtoWomcaa(womErpCaa, wom.ErpCabs[0].FXSHTBH, wom.ErpCabs[0].F_ZJXF_HSDJ);
        var mesWomcaa = MapErpCAAtoWomcaa(womErpCaa, wom.ErpCabs[0].FXSHTBH,
            wom.ErpCabs[0].F_ZJXF_HSDJ);
        var mesWomcabs =
            MapErpCABtoWomcab(wom.ErpCabs);

@@ -46,16 +45,14 @@
            }
        }) > 0;
    }
    private bool UpdateData(SqlSugarScope db, Womcaa mesWomcaa, List<Womcab> mesWomcabs)

    private bool UpdateData(SqlSugarScope db, Womcaa mesWomcaa,
        List<Womcab> mesWomcabs)
    {
        if (mesWomcaa.Id != null)
        {
            base.DeleteById(mesWomcaa.Id);
        }
        if (mesWomcaa.Id != null) base.DeleteById(mesWomcaa.Id);
        if (mesWomcabs.Count > 0)
        {
            db.Deleteable<Womcab>().Where(s => s.Eid == mesWomcaa.Erpid).ExecuteCommand();
        }
            db.Deleteable<Womcab>().Where(s => s.Eid == mesWomcaa.Erpid)
                .ExecuteCommand();
        var orUpdate = base.Insert(mesWomcaa);
        var baOrUpdate = _womcabManager.InsertRange(mesWomcabs);
        db.Ado.CommitTran();
@@ -67,34 +64,34 @@
            var outParam1 = new SugarParameter("c_Result", null, true);
            var outParam2 = new SugarParameter("C_MSG", null, true);
            // 使用 SqlSugar 执行存储过程
            Db.Ado.ExecuteCommand("BEGIN PRC_UPDATE_DAA(:P_WORK_NO,:c_Result,:C_MSG); END;", inputParam1, outParam1, outParam2);
            Db.Ado.ExecuteCommand(
                "BEGIN PRC_UPDATE_DAA(:P_WORK_NO,:c_Result,:C_MSG); END;",
                inputParam1, outParam1, outParam2);
            // 获取输出参数的值
            int result = int.Parse((string)outParam1.Value);
            string message = outParam2.Value == DBNull.Value ? string.Empty : (string)outParam2.Value;
            var result = int.Parse((string)outParam1.Value);
            var message = outParam2.Value == DBNull.Value
                ? string.Empty
                : (string)outParam2.Value;
            if (result == 1)
            {
                //存储过程失败则事务进行回滚
                //db.Ado.RollbackTran();
                throw new Exception(message);
            }
            // 提交事务
            //db.Ado.CommitTran();
            return true;
        }

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

    private bool SaveOrUpdateData(SqlSugarScope db, Womcaa mesWomcaa,List<Womcab> mesWomcabs)
    private bool SaveOrUpdateData(SqlSugarScope db, Womcaa mesWomcaa,
        List<Womcab> mesWomcabs)
    {
        if (mesWomcaa.Id != null) 
        {
            base.DeleteById(mesWomcaa.Id);
        }
        if (mesWomcaa.Id != null) base.DeleteById(mesWomcaa.Id);

        if (mesWomcabs.Count > 0) 
        {
            db.Deleteable<Womcab>().Where(s => s.Eid == mesWomcaa.Erpid).ExecuteCommand();
        }
        if (mesWomcabs.Count > 0)
            db.Deleteable<Womcab>().Where(s => s.Eid == mesWomcaa.Erpid)
                .ExecuteCommand();

        var orUpdate = base.Insert(mesWomcaa);
        var baOrUpdate = _womcabManager.InsertRange(mesWomcabs);
@@ -107,36 +104,41 @@
            var outParam1 = new SugarParameter("c_Result", null, true);
            var outParam2 = new SugarParameter("C_MSG", null, true);
            // 使用 SqlSugar 执行存储过程
            Db.Ado.ExecuteCommand("BEGIN PRC_UPDATE_DAA(:P_WORK_NO,:c_Result,:C_MSG); END;", inputParam1, outParam1, outParam2);
            Db.Ado.ExecuteCommand(
                "BEGIN PRC_UPDATE_DAA(:P_WORK_NO,:c_Result,:C_MSG); END;",
                inputParam1, outParam1, outParam2);
            // 获取输出参数的值
            int result = int.Parse((string)outParam1.Value);
            string message = outParam2.Value == DBNull.Value ? string.Empty : (string)outParam2.Value;
            var result = int.Parse((string)outParam1.Value);
            var message = outParam2.Value == DBNull.Value
                ? string.Empty
                : (string)outParam2.Value;
            if (result == 1)
            {
                //存储过程失败则事务进行回滚
                //db.Ado.RollbackTran();
                throw new Exception(message);
            }
            // 提交事务
            //db.Ado.CommitTran();
            return true;
        }

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

    private bool DeleteData(SqlSugarScope db, Womcaa mesWomcaa,List<Womcab> mesWomcabs)
    private bool DeleteData(SqlSugarScope db, Womcaa mesWomcaa,
        List<Womcab> mesWomcabs)
    {
        var decimals = mesWomcabs.Select(s => s.Id).ToArray();
        var update = base.DeleteById(mesWomcaa.Id);
        var insertOrUpdate = db.Deleteable<Womcab>().In(decimals).ExecuteCommand() > 0;
        var insertOrUpdate =
            db.Deleteable<Womcab>().In(decimals).ExecuteCommand() > 0;

        if (update && insertOrUpdate) return true;
        throw new NotImplementedException("更新失败");
    }

    private Womcaa MapErpCAAtoWomcaa(ErpCAA dto,string? fxshtbh,string? hsdj)
    private Womcaa MapErpCAAtoWomcaa(ErpCAA dto, string? fxshtbh, string? hsdj)
    {
        string jabs="0";
        var jabs = "0";

        var entity = new Womcaa
        {
@@ -187,19 +189,15 @@
            TrustOrg = dto.erP_WTZZ,
            TbTime = DateTime.Now,
            JaBs = "0",
            SupplierId=dto.SupplierId,
            FinishedProduct=dto.FinishedProduct,
            F_ZJXF_HSDJ= hsdj
            SupplierId = dto.SupplierId,
            FinishedProduct = dto.FinishedProduct,
            F_ZJXF_HSDJ = hsdj
        };

        if (dto.Type == "5")
        {
            entity.IsXg = 1;
        }
        else
        {
            entity.IsXg = 0;
        }

        if (dto.FStatus == "6" || dto.FStatus == "7")
        {
@@ -233,8 +231,8 @@
                Pid = Convert.ToDecimal(dto.FID),
                Eid = Convert.ToDecimal(dto.FID),
                PositionNo = dto.FPositionNO,
                IssuingOrganization=dto.FSupplyOrg,
                SupplyOrganization=dto.FChildSupplyOrgId,
                IssuingOrganization = dto.FSupplyOrg,
                SupplyOrganization = dto.FChildSupplyOrgId,
                OwnerId = dto.FOwnerID,
                Mtono = dto.FMTONO,
                Lot = dto.FLot,
@@ -245,9 +243,9 @@
                Denominator = Convert.ToDecimal(dto.FDenominator),
                SCRAPQTY = Convert.ToDecimal(dto.FFixScrapQty),
                SCRAPRATE = Convert.ToDecimal(dto.FScrapRate),
                SalesOrder=dto.FXSHTBH,
                F_ZJXF_YHRQ=dto.F_ZJXF_YHRQ,
                ProcNo=dto.F_ZJXF_SSGX
                SalesOrder = dto.FXSHTBH,
                F_ZJXF_YHRQ = dto.F_ZJXF_YHRQ,
                ProcNo = dto.F_ZJXF_SSGX
            };

            var entity = Db.Queryable<Womcab>()
@@ -256,6 +254,7 @@

            womcabList.Add(womcab);
        }

        return womcabList;
    }
}