生产订单 加 成品编号

sjz

2025-04-25 e3c454b61eb969d186110c3ad7ab6a289cbc013a

 MES.Service/service/BasicData/SalesOrderManager.cs

@@ -4,7 +4,6 @@
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
using DbType = System.Data.DbType;

namespace MES.Service.service.BasicData;

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

    private readonly SalesOrderDetailManager _SalesOrderDetailManager =
        new();
    private readonly SalesOrderDetailManager _SalesOrderDetailManager = new();
    //ErpSalesOrder
    public bool Save(ErpSalesOrder SalesOrder)
    {
@@ -25,52 +23,50 @@
        {
            switch (erpSalesOrderDto.Type)
            {
                // case "2":
                //     return InsertData(db, mesSalesOrder, mesSalesOrderDatas,
                //         rohInErpRohIn.FBILLTYPE)
                //         ? 1
                //         : 0;
                case "3":
                    return UpdateData(db, mesSalesOrder, mesSalesOrderDatas) ? 1 : 0;
                    return DeleteData(db, mesSalesOrder, mesSalesOrderDatas) ? 1 : 0;
                case "2":
                case "4":
                    return SaveOrUpdateData(db, mesSalesOrder, mesSalesOrderDatas, erpSalesOrderDto.Type)
                        ? 1
                        : 0;
                case "5":
                    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 UpdateData(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; 
        
        if (orUpdate && baOrUpdate)
        {
            return true;
        }

        throw new NotImplementedException("插入或更新失败");
    }
@@ -82,20 +78,17 @@
        return result.All(b => b);
    }

    private SalesOrder ConvertErpToSalesOrder(
        ErpSalesOrderDto erpDto)
    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))
            if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture, DateTimeStyles.None,out parsedDate))
            {
                return parsedDate;

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

@@ -109,17 +102,11 @@
            BusinessType = erpDto.FBusinessType, // 业务类型
            HeadDeliveryWay = erpDto.FHeadDeliveryWay, // 交货方式
            HeadLocId = erpDto.FHEADLOCID, // 交货地点
            UnWTextKhdd = erpDto.F_UNW_Text_KHDD, // 客户订单
            UnWDateKhxq = ParseDateTime(erpDto.F_UNW_Date_KHXQ) ?? null, // 客户需求交期
            UnWBasePropertyKhdj = erpDto.F_UNW_BaseProperty_KHDJ, // 客户等级
            CustId = erpDto.FCustId, // 客户
            UnWLargetextTbkhbz = erpDto.F_UNW_LargeText_TBKHBZ, // 淘宝客户备注
            CloseStatus = erpDto.FCloseStatus, // 关闭状态
            SaleDeptId = erpDto.FSaleDeptId, // 销售部门
            SalerId = erpDto.FSalerId, // 销售员
            ChangeReason = erpDto.FChangeReason, // 变更原因
            Note = erpDto.FNote, // 备注
            UnWRemarksKhjHdd = erpDto.F_UNW_Remarks_KHJHDD, // 客户交货地点
            SettleId = erpDto.FSettleId, // 结算方
            ApproverId = erpDto.FApproverId, // 审核人
            LinkMan = erpDto.FLinkMan, // 收货人姓名
@@ -138,23 +125,20 @@
            VersionNo = Convert.ToDouble(erpDto.FVersionNo), // 版本号
            ChangerId = erpDto.FChangerId, // 变更人
            EntryNote = erpDto.FEntryNote // 备注
            //ParseDateTime() ?? null
            //long.Parse()
            //Convert.ToDecimal()
            //Convert.ToDouble()
        };

        var single = base.GetSingle(it => it.ErpID == Convert.ToDecimal(erpDto.ErpID));
        if (single != null) salesOrder.Id = single.Id;
        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>();
        var salesOrderSubList = new List<SalesOrderDetail>();

        foreach (var erpDto in erpDtoList)
        {
@@ -168,9 +152,7 @@
                PriceUnitId = erpDto.FPriceUnitId,
                PriceUnitQty = Convert.ToDecimal(erpDto.FPriceUnitQty),
                DeliveryDate = Convert.ToDateTime(erpDto.FDeliveryDate),
                IsFree = erpDto.FIsFree,
                SalesOrderNo = erpDto.F_UNW_Text_xsddh,
                SalesFollowUp = erpDto.F_UNW_Base_GDY,
                IsFree = Convert.ToDecimal(erpDto.FIsFree),
                OwnerTypeId = erpDto.FOwnerTypeId,
                OwnerId = erpDto.FOwnerId,
                EntryNote = erpDto.FEntryNote,
@@ -194,8 +176,8 @@
                SalesOrder = erpDto.FXSHTH,
                CustOrder  = erpDto.F_ZJXF_TEXT_QTR_LEE,
                SalesContractNo = erpDto.FXSHTBH,
                ItemNo = erpDto.F_CPLH,
                ItemName = erpDto.F_ZJXF_REMARKS_YRR,
                ItemNo = erpDto.F_KHWLBM,
                ItemName = erpDto.F_KHWLMC,
                CustId = erpDto.F_ZJXF_TEXT_KF,
                ArrivalDate = Convert.ToDateTime(erpDto.F_ZJXF_CGDHRQ),
                ItemModel = erpDto.F_ZJXF_KHGGXH,
@@ -203,9 +185,11 @@

            };

            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;
            }

            salesOrderSubList.Add(salesOrderSub);
        }