111

tjx

21 小时以前 f34f0751ef0c6305c94ff342ca7fbe24aa09844e

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

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

namespace MES.Service.service.BasicData;

@@ -13,6 +11,7 @@
    //当前类已经继承了 Repository 增、删、查、改的方法

    private readonly SalesOrderDetailManager _SalesOrderDetailManager = new();

    //ErpSalesOrder
    public bool Save(ErpSalesOrder SalesOrder)
    {
@@ -25,49 +24,49 @@
            switch (erpSalesOrderDto.Type)
            {
                case "3":
                    return DeleteData(db, mesSalesOrder, mesSalesOrderDatas) ? 1 : 0;
                    return DeleteData(db, mesSalesOrder, mesSalesOrderDatas)
                        ? 1
                        : 0;
                case "2":
                case "4":
                case "5":
                    return SaveOrUpdateData(db, mesSalesOrder, mesSalesOrderDatas, erpSalesOrderDto.Type)  ? 1: 0;
                    return SaveOrUpdateData(db, mesSalesOrder,
                        mesSalesOrderDatas, erpSalesOrderDto.Type)
                        ? 1
                        : 0;
                default:
                    throw new NotImplementedException( $"type没有{erpSalesOrderDto.Type}这个类型");
                    throw new NotImplementedException(
                        $"type没有{erpSalesOrderDto.Type}这个类型");
            }
        }) > 0;
    }

    private bool DeleteData(SqlSugarScope db, SalesOrder mesSalesOrder,List<SalesOrderDetail> mesSalesOrderDatas)
    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;
        var insertOrUpdate = db.Deleteable<SalesOrderDetail>().In(decimals)
            .ExecuteCommand() > 0;

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

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

        if (mesSalesOrderDatas.Count > 0)
        {
            db.Deleteable<SalesOrderDetail>().Where(s => s.EHID == mesSalesOrder.ErpID).ExecuteCommand();
        }
            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;
        }
        var baOrUpdate =
            _SalesOrderDetailManager.InsertRange(mesSalesOrderDatas);
        if (orUpdate && baOrUpdate) return true;

        throw new NotImplementedException("插入或更新失败");
    }
@@ -86,10 +85,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
        }

@@ -103,23 +101,22 @@
            CustId = erpDto.FCustId, // 客户
            SaleDeptId = erpDto.FSaleDeptId, // 销售部门
            EntryNote = erpDto.FEntryNote, // 备注
            FSalesPerson= erpDto.FSalesPerson,
            FProject= erpDto.FProject,
            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;
        }
        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)
    private List<SalesOrderDetail> ConvertErpToSalesOrderDetail(
        List<ErpSalesOrderDetailDto> erpDtoList)
    {
        var salesOrderSubList = new List<SalesOrderDetail>();

@@ -137,27 +134,25 @@
                EntryNote = erpDto.FEntryNote,
                Lot = erpDto.FLot,
                ItemNo = erpDto.FMapId,
                FLineNo= erpDto.FLineNo,
                FLineNo = erpDto.FLineNo,
                FLineStatus = erpDto.FLineStatus,
                FExtendField = erpDto.FExtendField,
                FCustomer = erpDto.FCustomer,
                FReceiveLocation= erpDto.FReceiveLocation,
                FSupplyOrg= erpDto.FSupplyOrg,
                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;
            }
            var single = _SalesOrderDetailManager.GetSingle(it =>
                it.ErpID == Convert.ToDecimal(salesOrderSub.ErpID));
            if (single != null) salesOrderSub.Id = single.Id;
            var mesLinkU9 = Db.Queryable<MesLinkU9>()
    .Where(x => x.U9Id == erpDto.FMaterialId
                && x.OrgId == erpDto.FSupplyOrg
                && x.TableType == "MES_ITEMS").First();
                .Where(x => x.U9Id == erpDto.FMaterialId
                            && x.OrgId == erpDto.FSupplyOrg
                            && x.TableType == "MES_ITEMS").First();

            if (mesLinkU9 != null) salesOrderSub.MaterialId = mesLinkU9.MesId;