1.仓库信息储存逻辑调整 2.生产订单接口优化。

南骏 池

2025-06-06 a4ae3bf5f1826e8e29a95da3dc2c947d713d4ebb

 MES.Service/service/BasicData/SalesOrderManager.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,337 @@
using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
using System.Globalization;
using System.Security.Cryptography;

namespace MES.Service.service.BasicData;

public class SalesOrderManager : Repository<SalesOrder>
{
    //当前类已经继承了 Repository å¢žã€åˆ ã€æŸ¥ã€æ”¹çš„方法

    //这里面写的代码不会给覆盖,如果要重新生成请删除 SalesOrderManager.cs
    //当前类已经继承了 Repository å¢žã€åˆ ã€æŸ¥ã€æ”¹çš„方法


    private readonly SalesOrderDetailManager _SalesOrderDetailManager =
        new();

    //private Guid Tid = Guid.Empty;

    //ErpSalesOrder
    public bool Save(ErpSalesOrder SalesOrder)
    {
        var erpSalesOrderDto = SalesOrder.OrderDto;
        var mesSalesOrder = ConvertErpToSalesOrder(SalesOrder.OrderDto);
        var mesSalesOrderDatas = ConvertErpToSalesOrderDetail(mesSalesOrder, SalesOrder.Items);

        return UseTransaction(db =>
        {
            switch (erpSalesOrderDto.Type)
            {
                // case "2":
                //     return InsertData(db, mesSalesOrder, mesSalesOrderDatas,
                //         rohInErpRohIn.FBILLTYPE)
                //         ? 1
                //         : 0;
                case "3":
                    return UpdateData(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;
    }

    private bool UpdateData(SqlSugarScope db, SalesOrder mesSalesOrder,
        List<SalesOrderDetail> mesSalesOrderDatas)
    {
        int update = 0;
        int insertOrUpdate = 0;

        if (mesSalesOrder.ErpID != null)
        {
            update = db.Deleteable<SalesOrder>()
                .Where(s => s.ErpID == mesSalesOrder.ErpID)
                .ExecuteCommand();
        }

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

        // ä¿®æ­£é€»è¾‘判断，将 int ç±»åž‹ä¸Ž bool ç±»åž‹æ¯”较改为实际值判断
        if (update > 0 && insertOrUpdate > 0)
        {
            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 (mesSalesOrder.ErpID != null)
            db.Deleteable<SalesOrder>()
                .Where(s => s.ErpID == mesSalesOrder.ErpID).ExecuteCommand();

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

        //var orUpdate = base.Insert(mesSalesOrder);
        //var baOrUpdate = _SalesOrderDetailManager.InsertRange(mesSalesOrderDatas);


        var orUpdate = db.Insertable(mesSalesOrder)
            .IgnoreColumns(true).ExecuteCommand() > 0;


        var baOrUpdate = db.Insertable(mesSalesOrderDatas).PageSize(1)
            .IgnoreColumnsNull()
            .ExecuteCommand() > 0;
        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
        {
            Id = Guid.NewGuid(),
            BillNo = erpDto.FBillNo,
            ErpID = Convert.ToDecimal(erpDto.ErpID),
            FDate = ParseDateTime(erpDto.FDate) ?? null,
            BillTypeId = erpDto.FBillTypeID, // å•æ®ç±»åž‹
            DocumentStatus = erpDto.FDocumentStatus, // å•æ®çŠ¶æ€
            BusinessType = erpDto.FBusinessType, // ä¸šåŠ¡ç±»åž‹
            HeadDeliveryWay = erpDto.FHeadDeliveryWay, // äº¤è´§æ–¹å¼
            HeadLocId = erpDto.FHEADLOCID, // äº¤è´§åœ°ç‚¹
            SaleOrgId = erpDto.FSaleOrgId,
            //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, // å®¢æˆ·äº¤è´§åœ°ç‚¹
            ///ReceiveId = erpDto.FReceiveId,//收货方
            ///ReceiveContact = erpDto.FReceiveContact,//收货方联系人
            ///SettleId = erpDto.FSettleId, // ç»“ç®—æ–¹
            ApproverId = erpDto.FApproverId, // å®¡æ ¸äºº
            ///LinkMan = erpDto.FLinkMan, // æ”¶è´§äººå§“名
            ///ChargeId = erpDto.FChargeId, // ä»˜æ¬¾æ–¹
            ///LinkPhone = erpDto.FLinkPhone, // è”系电话
            CreatorId = erpDto.FCreatorId, // åˆ›å»ºäºº
            //CreateDate = ParseDateTime(erpDto.FCreateDate) ?? null, // åˆ›å»ºæ—¥æœŸ
            CreateDate = DateTime.TryParse(erpDto.FCreateDate, out var conveyDate)
            ? (conveyDate <= new DateTime(1900, 1, 1) ? null : conveyDate)
                : null, // åˆ›å»ºæ—¥æœŸ
            ModifierId = erpDto.FModifierId, // æœ€åŽä¿®æ”¹äºº
            ModifyDate = ParseDateTime(erpDto.FModifyDate) ?? null, // æœ€åŽä¿®æ”¹æ—¥æœŸ
            ApproveDate = ParseDateTime(erpDto.FApproveDate) ?? null, // å®¡æ ¸æ—¥æœŸ
            CloserId = erpDto.FCloserId, // å…³é—­äºº
            //CloseDate = ParseDateTime(erpDto.FCloseDate) ?? null, // å…³é—­æ—¥æœŸ
            //ChangeDate = ParseDateTime(erpDto.FChangeDate) ?? null, // å˜æ›´æ—¥æœŸ
            ChangeDate = DateTime.TryParse(erpDto.FChangeDate, out var ChangeDate)
            ? (ChangeDate <= new DateTime(1900, 1, 1) ? null : ChangeDate)
                : null,  // å˜æ›´æ—¥æœŸ
            CancelStatus = erpDto.FCancelStatus, // ä½œåºŸçŠ¶æ€
            CancellerId = erpDto.FCancellerId, // ä½œåºŸäºº
            VersionNo = Convert.ToDouble(erpDto.FVersionNo), // ç‰ˆæœ¬å·
            ChangerId = erpDto.FChangerId, // å˜æ›´äºº
            SynchronousDate = DateTime.Now
            //EntryNote = erpDto.FEntryNote // å¤‡æ³¨
            //ParseDateTime() ?? null
            //long.Parse()
            //Convert.ToDecimal()
            //Convert.ToDouble()
        };

        if (!string.IsNullOrEmpty(salesOrder.CloserId))
            salesOrder.CloseDate = string.IsNullOrEmpty(erpDto.FCloseDate)
            ? (DateTime?)null
            : DateTime.ParseExact(erpDto.FCloseDate, "yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture);

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

        return salesOrder;
    }

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

        foreach (var erpDto in erpDtoList)
        {
            var salesOrderSub = new SalesOrderDetail
            {
                Pid = salesOrder.Id,
                ErpID = Convert.ToDecimal(erpDto.ErpID),
                EHID = Convert.ToDecimal(erpDto.EHID),
                MaterialId = erpDto.FMaterialId,
                MapId = erpDto.FMapId,
                MapName = erpDto.FMapName,
                MapSpec = erpDto.FMapSpec,
                Seq = Convert.ToInt32(erpDto.Seq),
                UnitId = erpDto.FUnitID,
                Qty = Convert.ToDecimal(erpDto.FQty),
                PriceUnitId = erpDto.FPriceUnitId,
                PriceUnitQty = Convert.ToDecimal(erpDto.FPriceUnitQty),
                DeliveryDate = Convert.ToDateTime(erpDto.FDeliveryDate),
                IsFree = erpDto.FIsFree,
                SupplyOrgId = erpDto.FSupplyOrgId,
                StockOrgId = erpDto.FStockOrgId,
                SettleOrgIds = erpDto.FSettleOrgIds,
                //SalesOrderNo = erpDto.F_UNW_Text_xsddh,
                //SalesFollowUp = erpDto.F_UNW_Base_GDY,
                OwnerTypeId = erpDto.FOwnerTypeId,
                OwnerId = erpDto.FOwnerId,
                EntryNote = erpDto.FEntryNote,
                MtoNo = erpDto.FMtoNo,
                Lot = erpDto.FLot,
                DeliveryMaxQty = Convert.ToDecimal(erpDto.FDeliveryMaxQty),
                DeliveryMinQty = Convert.ToDecimal(erpDto.FDeliveryMinQty),
                OutLmtUnitId = erpDto.FOutLmtUnitID,
                MrpCloseStatus = erpDto.FMrpCloseStatus,
                MrpTerminateStatus = erpDto.FMrpTerminateStatus,
                //TerminateDate = Convert.ToDateTime(erpDto.FTerminateDate),
                TerminaterId = erpDto.FTerminatorId,
                SrcType = erpDto.FSrcType,
                SrcBillNo = erpDto.FSrcBillNo,
                DeliQty = Convert.ToDecimal(erpDto.FDeliQty),
                StockOutQty = Convert.ToDecimal(erpDto.FStockOutQty),
                BaseRetNoticeQty = Convert.ToDecimal(erpDto.FBaseRetNoticeQty),
                BaseReturnQty = Convert.ToDecimal(erpDto.FBaseReturnQty),
                BaseRemainOutQty = Convert.ToDecimal(erpDto.FBaseRemainOutQty),
                BASEARQTY = Convert.ToDecimal(erpDto.FBASEARQTY),

            };

            if (!string.IsNullOrEmpty(salesOrderSub.TerminaterId))
                salesOrderSub.TerminateDate = string.IsNullOrEmpty(erpDto.FTerminateDate)
                ? (DateTime?)null
                : DateTime.ParseExact(erpDto.FTerminateDate, "yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture);

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

            salesOrderSubList.Add(salesOrderSub);
        }

        return salesOrderSubList;
    }

    #region æ•™å­¦æ–¹æ³•

    /// <summary>
    ///     ä»“储方法满足不了复杂业务需求，业务代码请在这里面定义方法
    /// </summary>
    public void Study()
    {
        /*********查询*********/

        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
        {
            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实现复杂的操作
    }

    #endregion
}