合并，接口优化等

wangxinhui

2 天以前 57148c2264abe80bd3b472f2980104d90dad5c61

 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs

@@ -78,6 +78,42 @@
            _warehouseService = warehouseService;
            _palletTypeInfoRepository = palletTypeInfoRepository;
        }

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

            ISugarQueryable<Dt_InboundOrder> sugarQueryable1 = BaseDal.Db.Queryable<Dt_InboundOrder>().Includes(x => x.Details);
            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.MaterielCode).FirstLetterToLower());
                        if (searchParameters != null)
                        {
                            sugarQueryable1 = sugarQueryable1.Where(x => x.Details.Any(v => v.MaterielCode.Contains(searchParameters.Value)));
                            List<Dt_InboundOrder> dataList = sugarQueryable1.ToPageList(options.Page, options.Rows, ref totalCount);
                            return new PageGridData<Dt_InboundOrder>(totalCount, dataList);
                        }
                    }

                    {
                        SearchParameters? searchParameters = searchParametersList.FirstOrDefault(x => x.Name == nameof(Dt_InboundOrderDetail.BatchNo).FirstLetterToLower());
                        if (searchParameters != null)
                        {
                            sugarQueryable1 = sugarQueryable1.Where(x => x.Details.Any(v => v.BatchNo.Contains(searchParameters.Value)));
                            List<Dt_InboundOrder> dataList = sugarQueryable1.ToPageList(options.Page, options.Rows, ref totalCount);
                            return new PageGridData<Dt_InboundOrder>(totalCount, dataList);
                        }
                    }
                }
            }
            return pageGridData;
        }
        public override object GetDetailPage(PageDataOptions pageData)
        {
            Type t = typeof(Dt_InboundOrder);
@@ -591,7 +627,7 @@
                #region 鍏ュ簱瀹屾垚涓婃姤ERP
                if (inboundOrder != null && inboundOrder.OrderStatus == InOrderStatusEnum.鍏ュ簱瀹屾垚.ObjToInt() && inboundOrder.OrderType != InOrderTypeEnum.Allocat.ObjToInt())
                {
                    if (inboundOrder.OrderType == InOrderTypeEnum.Return.ObjToInt())
                    if (inboundOrder.OrderType == InOrderTypeEnum.Return.ObjToInt() || inboundOrder.OrderType == InOrderTypeEnum.BomReturn.ObjToInt())
                    {
                        FeedbackReturnOrder(inboundOrder, returnOrder);
                    }
@@ -1813,6 +1849,10 @@
                }
                return palletTypeInfo.PalletType;
            }
            else if (warehouse.WarehouseCode == WarehouseEnum.HA60.ObjToString())
            {
                return 4;
            }
            return -1;
        }
        /// <summary>