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

zjh

4 天以前 94c9e2a81a3808e9e974ad43b7c2798093b632ed

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

@@ -1,4 +1,7 @@
using MES.Service.DB;
using System.Data;
using System.Globalization;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;

@@ -8,72 +11,152 @@
{
    //当前类已经继承了 Repository 增、删、查、改的方法

    //这里面写的代码不会给覆盖,如果要重新生成请删除 SalesOrderManager.cs


    #region 教学方法

    /// <summary>
    ///     仓储方法满足不了复杂业务需求，业务代码请在这里面定义方法
    /// </summary>
    public void Study()
    private readonly SalesOrderDetailManager _SalesOrderDetailManager = new();
    //ErpSalesOrder
    public bool Save(ErpSalesOrder SalesOrder)
    {
        /*********查询*********/
        var erpSalesOrderDto = SalesOrder.OrderDto;
        var mesSalesOrder = ConvertErpToSalesOrder(SalesOrder.OrderDto);
        var mesSalesOrderDatas = ConvertErpToSalesOrderDetail(SalesOrder.Items);

        var data1 = base.GetById(1); //根据ID查询
        var data2 = base.GetList(); //查询所有
        var data3 = base.GetList(it => 1 == 1); //根据条件查询  
        //var data4 = base.GetSingle(it => 1 == 1);//根据条件查询一条,如果超过一条会报错

        var p = new PageModel { PageIndex = 1, PageSize = 2 }; // 分页查询
        var data5 = base.GetPageList(it => 1 == 1, p);
        Console.Write(p.TotalCount); //返回总数

        var data6 =
            base.GetPageList(it => 1 == 1, p,
                it => SqlFunc.GetRandom()); // 分页查询加排序
        Console.Write(p.TotalCount); //返回总数

        var conModels = new List<IConditionalModel>(); //组装条件查询作为条件实现 分页查询加排序
        conModels.Add(new ConditionalModel
        return UseTransaction(db =>
        {
            FieldName = typeof(SalesOrder).GetProperties()[0].Name,
            ConditionalType = ConditionalType.Equal,
            FieldValue = "1"
        }); //id=1
        var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom());

        AsQueryable().Where(x => 1 == 1)
            .ToList(); //支持了转换成queryable,我们可以用queryable实现复杂功能


        /*********插入*********/
        var insertData = new SalesOrder(); //测试参数
        var insertArray = new[] { insertData };
        base.Insert(insertData); //插入
        base.InsertRange(insertArray); //批量插入
        var id = base.InsertReturnIdentity(insertData); //插入返回自增列
        AsInsertable(insertData).ExecuteCommand(); //我们可以转成 Insertable实现复杂插入


        /*********更新*********/
        var updateData = new SalesOrder(); //测试参数
        var updateArray = new[] { updateData }; //测试参数
        base.Update(updateData); //根据实体更新
        base.UpdateRange(updateArray); //批量更新
        //base.Update(it => new SalesOrder() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// 只更新ClassName列和CreateTime列，其它列不更新，条件id=1
        AsUpdateable(updateData).ExecuteCommand(); //转成Updateable可以实现复杂的插入


        /*********删除*********/
        var deldata = new SalesOrder(); //测试参数
        base.Delete(deldata); //根据实体删除
        base.DeleteById(1); //根据主键删除
        base.DeleteById(new[] { 1, 2 }); //根据主键数组删除
        base.Delete(it => 1 == 2); //根据条件删除
        AsDeleteable().Where(it => 1 == 2)
            .ExecuteCommand(); //转成Deleteable实现复杂的操作
            switch (erpSalesOrderDto.Type)
            {
                case "3":
                    return DeleteData(db, mesSalesOrder, mesSalesOrderDatas) ? 1 : 0;
                case "2":
                case "4":
                case "5":
                    return SaveOrUpdateData(db, mesSalesOrder, mesSalesOrderDatas, erpSalesOrderDto.Type)  ? 1: 0;
                default:
                    throw new NotImplementedException( $"type没有{erpSalesOrderDto.Type}这个类型");
            }
        }) > 0;
    }

    #endregion
    private bool DeleteData(SqlSugarScope db, SalesOrder mesSalesOrder,List<SalesOrderDetail> mesSalesOrderDatas)
    {
        var decimals = mesSalesOrderDatas.Select(s => s.Id).ToArray();
        var update = base.DeleteById(mesSalesOrder.Id);
        var insertOrUpdate = db.Deleteable<SalesOrderDetail>().In(decimals).ExecuteCommand() > 0;

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

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

        if (mesSalesOrderDatas.Count > 0)
        {
            db.Deleteable<SalesOrderDetail>().Where(s => s.EHID == mesSalesOrder.ErpID).ExecuteCommand();
        }

        var orUpdate = base.Insert(mesSalesOrder);
        var baOrUpdate = _SalesOrderDetailManager.InsertRange(mesSalesOrderDatas);
        if (orUpdate && baOrUpdate)
        {
            return true;
        }

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

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

    private SalesOrder ConvertErpToSalesOrder(ErpSalesOrderDto 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 SalesOrder
        {
            BillNo = erpDto.FBillNo,
            ErpID = Convert.ToDecimal(erpDto.ErpID),
            FDate = ParseDateTime(erpDto.FDate) ?? null,
            BillTypeId = erpDto.FBillTypeID, // 单据类型
            DocumentStatus = erpDto.FDocumentStatus, // 单据状态
            CustId = erpDto.FCustId, // 客户
            SaleDeptId = erpDto.FSaleDeptId, // 销售部门
            EntryNote = erpDto.FEntryNote, // 备注
            FSalesPerson= erpDto.FSalesPerson,
            FProject= erpDto.FProject,
            FDemandCategory = erpDto.FDemandCategory,
            FStartDate = erpDto.FStartDate,
            FEndDate = erpDto.FEndDate
        };

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

        return salesOrder;
    }

    private List<SalesOrderDetail> ConvertErpToSalesOrderDetail(List<ErpSalesOrderDetailDto> erpDtoList)
    {
        var salesOrderSubList = new List<SalesOrderDetail>();

        foreach (var erpDto in erpDtoList)
        {
            var salesOrderSub = new SalesOrderDetail
            {
                ErpID = Convert.ToDecimal(erpDto.ErpID),
                EHID = Convert.ToDecimal(erpDto.EHID),
                MaterialId = erpDto.FMaterialId,
                Qty = Convert.ToDecimal(erpDto.FQty),
                PriceUnitId = erpDto.FPriceUnitId,
                DeliveryDate = Convert.ToDateTime(erpDto.FDeliveryDate),
                OwnerId = erpDto.FOwnerId,
                EntryNote = erpDto.FEntryNote,
                Lot = erpDto.FLot,
                ItemNo = erpDto.FMapId,
                FLineNo= erpDto.FLineNo,
                FLineStatus = erpDto.FLineStatus,
                FExtendField = erpDto.FExtendField,
                FCustomer = erpDto.FCustomer,
                FReceiveLocation= erpDto.FReceiveLocation,
                FSupplyOrg= erpDto.FSupplyOrg,
                FDepartment = erpDto.FDepartment,
                FSalesPerson = erpDto.FSalesPerson,
                FProject = erpDto.FProject,
                FDemandCategory = erpDto.FDemandCategory
            };

            var single = _SalesOrderDetailManager.GetSingle(it =>it.ErpID == Convert.ToDecimal(salesOrderSub.ErpID));
            if (single != null)
            {
                salesOrderSub.Id = single.Id;
            }

            salesOrderSubList.Add(salesOrderSub);
        }

        return salesOrderSubList;
    }
}