提交

pan

2025-11-18 19e538209cb007df7001ca218eb6e1a94ff1db60

提交

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_Common/AllocateEnum/BusinessTypeEnum.cs

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@@ -11,7 +12,58 @@
        æ™ºä»“调智仓=1,
        æ™ºä»“调外部仓库=2,
        å¤–部仓库调智仓=3
    } 
    public enum MESDocumentType
    {
        /// <summary>采购入库（入库类型）</summary>
        [Description("采购入库")]
        
        PurchaseInbound = 11,

        /// <summary>杂收单（入库类型）</summary>
        [Description("杂收单")]
        
        MiscellaneousInbound = 12,

        /// <summary>生产退料单（入库类型）</summary>
        [Description("生产退料单")]
        
        ProductionReturn = 13,

        /// <summary>外协退料单（入库类型）</summary>
        [Description("外协退料单")]
        
        OutsourcingReturn = 14,

        /// <summary>销售退库单（入库类型）</summary>
        [Description("销售退库单")]
        
        SalesReturn = 15,

        /// <summary>工单领料单申请单（出库类型）</summary>
        [Description("工单领料单申请单")]
        
        WorkOrderMaterialRequest = 21,

        /// <summary>杂发单（出库类型）</summary>
        [Description("杂发单")]
        
        MiscellaneousOutbound = 22,

        /// <summary>退货单（出库类型）</summary>
        [Description("退货单")]
        
        ReturnOrder = 23,

        /// <summary>销售出库单（出库类型）</summary>
        [Description("销售出库单")]
        
        SalesOutbound = 24,

        /// <summary>外协领料申请单（出库类型）</summary>
        [Description("外协领料申请单")]
        
        OutsourcingMaterialRequest = 25
    }

 
}

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderDetailService.cs

@@ -1,9 +1,11 @@
using Microsoft.Extensions.Logging;
using SqlSugar;
using WIDESEA_Common.LocationEnum;
using WIDESEA_Common.StockEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Helper;
using WIDESEA_DTO.Stock;
using WIDESEA_IBasicService;
using WIDESEA_IOutboundService;
@@ -256,5 +258,35 @@
            }
        }



        public override PageGridData<Dt_OutboundOrderDetail> GetPageData(PageDataOptions options)
        {
            //var  pageGridData = base.GetPageData(options);

            ISugarQueryable<Dt_OutboundOrderDetail> sugarQueryable1 = BaseDal.Db.Queryable<Dt_OutboundOrderDetail>();
            if (!string.IsNullOrEmpty(options.Wheres))
            {

                List<SearchParameters> searchParametersList = options.Wheres.DeserializeObject<List<SearchParameters>>();
                int totalCount = 0;
                if (searchParametersList.Count > 0)
                {
                    {
                        SearchParameters? searchParameters = searchParametersList.FirstOrDefault(x => x.Name == nameof(Dt_InboundOrderDetail.OrderId).FirstLetterToLower());
                        if (searchParameters != null)
                        {
                            sugarQueryable1 = sugarQueryable1.Where(x => x.OrderId== searchParameters.Value.ObjToInt());
                            var  dataList = sugarQueryable1.ToPageList(options.Page, options.Rows, ref totalCount);
                            return new PageGridData<Dt_OutboundOrderDetail>(totalCount, dataList);
                        }
                    }

                   
                }
            }
            return new PageGridData<Dt_OutboundOrderDetail> ();
        }

    }
}

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutboundOrderDetailController.cs

@@ -1,9 +1,11 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using SqlSugar;
using WIDESEA_Core;
using WIDESEA_Core.Attributes;
using WIDESEA_Core.BaseController;
using WIDESEA_Core.Helper;
using WIDESEA_DTO.Stock;
using WIDESEA_IOutboundService;
using WIDESEA_Model.Models;
@@ -27,6 +29,11 @@
        //    return Service.GetOutboundStockDataById(id);
        //}

        

        public override ActionResult GetPageData(PageDataOptions options)
        {
           return  Json( Service.GetPageData(options));
        }

    }
}