1、销售模块：预测订单、标准出货、销售退货接口代码提交 2、仓退申请单接口bug修复代码提交

zjh

5 天以前 94c9e2a81a3808e9e974ad43b7c2798093b632ed

 StandardPda/MES.Service/service/BasicData/SalesReturnNoticeManager.cs

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

namespace MES.Service.service.BasicData;

@@ -7,5 +12,201 @@
{
    //当前类已经继承了 Repository 增、删、查、改的方法

    //这里面写的代码不会给覆盖,如果要重新生成请删除 SalesReturnNoticeManager.cs
    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);

        return UseTransaction(db =>
        {
            switch (erpSalesReturnDto.Type)
            {
                // case "2":
                //     return InsertData(db, mesSalesReturn, mesSalesReturnDatas,
                //         rohInErpRohIn.FBILLTYPE)
                //         ? 1
                //         : 0;
                case "3":
                    return UpdateData(db, mesSalesReturn, mesSalesReturnDatas) ? 1 : 0;
                case "2":
                case "4":
                    return SaveOrUpdateData(db, mesSalesReturn, mesSalesReturnDatas, erpSalesReturnDto.Type)
                        ? 1
                        : 0;
                default:
                    throw new NotImplementedException(
                        $"type没有{erpSalesReturnDto.Type}这个类型");
            }
        }) > 0;
    }

    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;

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

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

        if (mesSalesReturnDatas.Count > 0)
            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;


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

    // 批量保存记录的方法
    public bool SaveList(List<ErpSalesRerurn> salesOrder)
    {
        var result = salesOrder.Select(Save).ToList();
        return result.All(b => b);
    }

    private SalesReturnNotice ConvertErpToSalesReturn(
        ErpSalesReturnDto erpDto)
    {
        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;

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

        var salesOrder = new SalesReturnNotice
        {
            BillNo = erpDto.FBillNo,
            ErpId = erpDto.ErpID,
            FDate = ParseDateTime(erpDto.FDate) ?? null,
            BillType = erpDto.FBillTypeID, // 单据类型
            ReturnCustomer = erpDto.FRetcustId, // 退货客户
            ReturnReason = erpDto.FRetcustReason, // 退货原因
            DeliveryLocation = erpDto.FHeadLocId, // 交货地点
            ReceiverContact = erpDto.FReceiveCusContact, // 收货方联系人
            ReceiverAddress = erpDto.FReceiveAddress, // 收货方地址
            CreatedBy = erpDto.FCreatorId, // 创建人
            CreatedDate = ParseDateTime(erpDto.FCreateDate) ?? null, // 创建时间
            ApprovedBy = erpDto.FApproverId, // 审核人
            ApprovedDate = ParseDateTime(erpDto.FApproveDate) ?? null, // 审核日期
            BillStatus = erpDto.FDocumentStatus, //单据状态
            ReturnType= erpDto.ReturnType, // 退回类型
            TotalQuantity = erpDto.TotalQuantity, // 总数量
            SourceDocumentCategory = erpDto.SourceDocumentCategory, // 来源单据类别
            SourceDocument = erpDto.SourceDocument, // 源单据
            ReplenishmentOrganization= erpDto.ReplenishmentOrganization, // 补货组织
            CustomerRequestDate = erpDto.CustomerRequestDate,  // 客户要求日期
            ReturnSalesman= erpDto.ReturnSalesman, // 退货销售员
            ReturnDescription = erpDto.ReturnDescription, // 退货说明
            ReturnDepartment = erpDto.ReturnDepartment // 退货部门

        };

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

        return salesOrder;
    }

    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;

            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,//物料编号
                //SalesUnitId = erpDto.FUnitID,//销售单位
                SalesQuantity = Convert.ToDecimal(erpDto.FQty),//销售数量
                //IsFree = 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),//库存数量
                //OwnerTypeId = erpDto.FOwnerTypeID,//货主类型
                OwnerId = erpDto.FOwnerId,//货主
                SourceBillType = erpDto.FSrcType,
                SourceBillNo = erpDto.FSrcBillNo,
                OrderBillNo = erpDto.FOrderNo,
                FLineNumber= erpDto.FLineNumber, // 行号
                FLineStatus= erpDto.FLineStatus, // 行状态
                FRefundCustomer = erpDto.FRefundCustomer, // 退款客户
                FSupplier = erpDto.FSupplier, // 供应商
                FFreebieType = erpDto.FFreebieType, // 免费品类型
                FFreebieReason = erpDto.FFreebieReason, // 免费品原因
                FSourceDocLineNo = erpDto.FSourceDocLineNo, // 源头单据行号
                FSourceDocSubLineNo = erpDto.FSourceDocSubLineNo, // 源头单据子行号
                FSourceDocType = erpDto.FSourceDocType,// 源头单据类型
                FOriginalDocLineNo = erpDto.FOriginalDocLineNo,// 原始单据行号
                FReplenishOrg = erpDto.FReplenishOrg,// 补货组织
                FReceivingOrg = erpDto.FReceivingOrg,// 收货组织
                FOriginalSalesman = erpDto.FOriginalSalesman,// 原始销售员
                FOriginalDept = erpDto.FOriginalDept,// 原始部门
                FProject = erpDto.FProject, // 项目
                FReturnReason = erpDto.FReturnReason,// 退货原因
                FReturnDescription = erpDto.FReturnDescription,// 退货说明

            };

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

            salesOrderSubList.Add(salesOrderSub);
        }

        return salesOrderSubList;
    }


}