格式化代码

啊鑫

18 小时以前 ed05efdc17aab076146b134ebe105b6382f221d7

 MES.Service/service/BasicData/SalesReturnNoticeManager.cs

@@ -1,10 +1,8 @@
using MES.Service.DB;
using System.Data;
using System.Globalization;
using System.Globalization;
using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
using DbType = System.Data.DbType;

namespace MES.Service.service.BasicData;

@@ -14,22 +12,29 @@

    private readonly SalesReturnDetailManager _SalesReturnDetailManager =
        new();

    //ErpSalesRerurn
    public bool Save(ErpSalesRerurn SalesReturn)
    {
        var erpSalesReturnDto = SalesReturn.OrderDto;
        var mesSalesReturn = ConvertErpToSalesReturn(SalesReturn.OrderDto);
        var mesSalesReturnDatas = ConvertErpToSalesReturnDetail(SalesReturn.Items);
        var mesSalesReturnDatas =
            ConvertErpToSalesReturnDetail(SalesReturn.Items);

        return UseTransaction(db =>
        {
            switch (erpSalesReturnDto.Type)
            {
                case "3":
                    return UpdateData(db, mesSalesReturn, mesSalesReturnDatas) ? 1 : 0;
                    return UpdateData(db, mesSalesReturn, mesSalesReturnDatas)
                        ? 1
                        : 0;
                case "2":
                case "4":
                    return SaveOrUpdateData(db, mesSalesReturn, mesSalesReturnDatas, erpSalesReturnDto.Type) ? 1: 0;
                    return SaveOrUpdateData(db, mesSalesReturn,
                        mesSalesReturnDatas, erpSalesReturnDto.Type)
                        ? 1
                        : 0;
                default:
                    throw new NotImplementedException(
                        $"type没有{erpSalesReturnDto.Type}这个类型");
@@ -37,39 +42,35 @@
        }) > 0;
    }

    private bool UpdateData(SqlSugarScope db, SalesReturnNotice mesSalesReturn,List<SalesReturnNoticeDetail> mesSalesReturnDatas)
    private bool UpdateData(SqlSugarScope db, SalesReturnNotice mesSalesReturn,
        List<SalesReturnNoticeDetail> mesSalesReturnDatas)
    {
        var decimals = mesSalesReturnDatas.Select(s => s.Id).ToArray();
        var update = base.DeleteById(mesSalesReturn.Id);
        var insertOrUpdate = db.Deleteable<SalesReturnNoticeDetail>().In(decimals).ExecuteCommand() > 0;
        var insertOrUpdate = db.Deleteable<SalesReturnNoticeDetail>()
            .In(decimals).ExecuteCommand() > 0;

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

    // 插入或更新数据的方法
    private bool SaveOrUpdateData(SqlSugarScope db, SalesReturnNotice mesSalesReturn,List<SalesReturnNoticeDetail> mesSalesReturnDatas,string type)
    private bool SaveOrUpdateData(SqlSugarScope db,
        SalesReturnNotice mesSalesReturn,
        List<SalesReturnNoticeDetail> mesSalesReturnDatas, string type)
    {
        if (mesSalesReturn.Id != null)
        {
            base.DeleteById(mesSalesReturn.Id);
        }
        if (mesSalesReturn.Id != null) base.DeleteById(mesSalesReturn.Id);

        if (mesSalesReturnDatas.Count > 0)
        {
            db.Deleteable<SalesReturnNoticeDetail>().Where(s => s.ErpHeadId == mesSalesReturn.ErpId).ExecuteCommand();
        }
            db.Deleteable<SalesReturnNoticeDetail>()
                .Where(s => s.ErpHeadId == mesSalesReturn.ErpId)
                .ExecuteCommand();

        var orUpdate = base.Insert(mesSalesReturn);
        var baOrUpdate = _SalesReturnDetailManager.InsertRange(mesSalesReturnDatas);
        if (orUpdate && baOrUpdate)
        {
            return true;
        }
        
        var baOrUpdate =
            _SalesReturnDetailManager.InsertRange(mesSalesReturnDatas);
        if (orUpdate && baOrUpdate) return true;


        throw new NotImplementedException("插入或更新失败");
    }
@@ -88,10 +89,9 @@
        // 时间格式转换函数，ERP时间格式为 "yyyy-MM-dd HH:mm:ss"
        DateTime? ParseDateTime(string dateStr)
        {
            if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",CultureInfo.InvariantCulture,DateTimeStyles.None,out parsedDate))
            {
                return parsedDate;
            }
            if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",
                    CultureInfo.InvariantCulture, DateTimeStyles.None,
                    out parsedDate)) return parsedDate;
            return null; // 如果转换失败，返回null
        }

@@ -110,7 +110,7 @@
            InventoryGroup = erpDto.FStockerGroupId, // 库存组
            WarehouseManager = erpDto.FStockerId, // 仓管员
            SalesGroup = erpDto.FSaleGroupId, // 销售组
            SalesPerson = erpDto.FSalesManId,//销售员
            SalesPerson = erpDto.FSalesManId, //销售员
            Receiver = erpDto.FReceiveCusId, // 收货方
            ReceiverContact = erpDto.FReceiveCusContact, // 收货方联系人
            ReceiverAddress = erpDto.FReceiveAddress, // 收货方地址
@@ -129,81 +129,72 @@
            CancelledBy = erpDto.FCancellerId, // 作废人
            CancelDate = ParseDateTime(erpDto.FCancelDate) ?? null, // 作废日期
            CloseStatus = erpDto.FBillCloseStatus, // 关闭状态
            BillStatus  = erpDto.FDocumentStatus //单据状态

            BillStatus = erpDto.FDocumentStatus //单据状态
        };

        var single = base.GetSingle(it => it.ErpId == erpDto.ErpID);
        if (single != null)
        {
            salesOrder.Id = single.Id;
        }
        if (single != null) salesOrder.Id = single.Id;

        return salesOrder;
    }

    private List<SalesReturnNoticeDetail> ConvertErpToSalesReturnDetail(List<ErpSalesReturnDetailDto> erpDtoList)
        
    private List<SalesReturnNoticeDetail> ConvertErpToSalesReturnDetail(
        List<ErpSalesReturnDetailDto> erpDtoList)

    {
        var salesOrderSubList = new List<SalesReturnNoticeDetail>();

        DateTime parsedDate;

        // 时间格式转换函数，ERP时间格式为 "yyyy-MM-dd HH:mm:ss"
        DateTime? ParseDateTime(string dateStr)
        {
            if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",CultureInfo.InvariantCulture,DateTimeStyles.None,out parsedDate))
            {
                return parsedDate;
            }
                
            if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",
                    CultureInfo.InvariantCulture, DateTimeStyles.None,
                    out parsedDate)) return parsedDate;


            return null; // 如果转换失败，返回null
        }



        foreach (var erpDto in erpDtoList)
        {
            var salesOrderSub = new SalesReturnNoticeDetail
            {
                ErpLineId = erpDto.ErpID,//ERP行ID
                ErpHeadId = erpDto.EHID,//ERP头ID
                MaterialId = erpDto.FMaterialId,//物料编号
                MaterialName = erpDto.FMaterialName,// 物料名称
                MaterialSpecification = erpDto.FMaterialModel,//规格型号
                SalesUnitId = erpDto.FUnitID,//销售单位
                SalesQuantity = Convert.ToDecimal(erpDto.FQty),//销售数量
                IsFree = Convert.ToDecimal(erpDto.FIsFree),//是否赠品
                ReturnDate = ParseDateTime(erpDto.FDeliverydate),//退货日期
                Warehouse = erpDto.FStockId,//仓库
                PlanTrackingNumber = erpDto.FMtoNo,//计划跟踪号
                LotNumber = erpDto.FLot,//批号
                Note = erpDto.FEntryDescription,//备注
                ReturnType = erpDto.FRmType,//退货类型
                InventoryUnit = erpDto.FStockUnitID,//库存单位
                InventoryQuantity = Convert.ToDecimal(erpDto.FStockQty),//库存数量
                MaterialCategory = erpDto.FMaterialType,//物料类别
                OwnerTypeId = erpDto.FOwnerTypeID,//货主类型
                OwnerId = erpDto.FOwnerId,//货主
                ErpLineId = erpDto.ErpID, //ERP行ID
                ErpHeadId = erpDto.EHID, //ERP头ID
                MaterialId = erpDto.FMaterialId, //物料编号
                MaterialName = erpDto.FMaterialName, // 物料名称
                MaterialSpecification = erpDto.FMaterialModel, //规格型号
                SalesUnitId = erpDto.FUnitID, //销售单位
                SalesQuantity = Convert.ToDecimal(erpDto.FQty), //销售数量
                IsFree = Convert.ToDecimal(erpDto.FIsFree), //是否赠品
                ReturnDate = ParseDateTime(erpDto.FDeliverydate), //退货日期
                Warehouse = erpDto.FStockId, //仓库
                PlanTrackingNumber = erpDto.FMtoNo, //计划跟踪号
                LotNumber = erpDto.FLot, //批号
                Note = erpDto.FEntryDescription, //备注
                ReturnType = erpDto.FRmType, //退货类型
                InventoryUnit = erpDto.FStockUnitID, //库存单位
                InventoryQuantity = Convert.ToDecimal(erpDto.FStockQty), //库存数量
                MaterialCategory = erpDto.FMaterialType, //物料类别
                OwnerTypeId = erpDto.FOwnerTypeID, //货主类型
                OwnerId = erpDto.FOwnerId, //货主
                SourceBillType = erpDto.FSrcType,
                SourceBillNo = erpDto.FSrcBillNo,
                OrderBillNo = erpDto.FOrderNo,
                SalesOrder  = erpDto.F_XSHTH,
                CustOrder   = erpDto.F_ZJXF_Text_re5_lee

                SalesOrder = erpDto.F_XSHTH,
                CustOrder = erpDto.F_ZJXF_Text_re5_lee
            };

            var single = _SalesReturnDetailManager.GetSingle(it =>it.ErpLineId == salesOrderSub.ErpLineId);
            if (single != null)
            {
                salesOrderSub.Id = single.Id;
            }
            var single = _SalesReturnDetailManager.GetSingle(it =>
                it.ErpLineId == salesOrderSub.ErpLineId);
            if (single != null) salesOrderSub.Id = single.Id;

            salesOrderSubList.Add(salesOrderSub);
        }

        return salesOrderSubList;
    }

 
}