功能增添优化

helongyang

8 小时以前 a9a3f943efb083de8ed88b293897886b3ef612a2

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs

@@ -61,6 +61,31 @@
            _outStockLockInfoService = outStockLockInfoService;
            _outboundOrderRepository = outboundOrderRepository;
        }
        public override PageGridData<Dt_OutboundOrder> GetPageData(PageDataOptions options)
        {
            PageGridData<Dt_OutboundOrder> pageGridData = base.GetPageData(options);

            ISugarQueryable<Dt_OutboundOrder> sugarQueryable1 = BaseDal.Db.Queryable<Dt_OutboundOrder>().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_OutboundOrderDetail.MaterielCode).FirstLetterToLower());
                        if (searchParameters != null)
                        {
                            sugarQueryable1 = sugarQueryable1.Where(x => x.Details.Any(v => v.MaterielCode.Contains(searchParameters.Value)));
                            List<Dt_OutboundOrder> dataList = sugarQueryable1.ToPageList(options.Page, options.Rows, ref totalCount);
                            return new PageGridData<Dt_OutboundOrder>(totalCount, dataList);
                        }
                    }
                }
            }
            return pageGridData;
        }
        public override WebResponseContent AddData(SaveModel saveModel)
        {
            if (saveModel.MainData.TryGetValue(nameof(Dt_OutboundOrder.UpperOrderNo).FirstLetterToLower(), out object? upperOrderNo) && upperOrderNo != null && !string.IsNullOrEmpty(upperOrderNo.ToString()))
@@ -173,7 +198,9 @@
                    StockId = stockInfo.Id,
                    TaskNum = 0,
                    OrderQuantity = outboundOrderDetail.OrderQuantity,
                    Unit = outboundOrderDetail.Unit
                    Unit = outboundOrderDetail.Unit,
                    ProductionDate = stockInfoDetail.ProductionDate,
                    EffectiveDate = stockInfoDetail.EffectiveDate
                };

                #region ä¿®æ”¹å‡ºåº“单
@@ -266,7 +293,7 @@
                    Deptno = outboundOrder.DepartmentCode,
                    Deptname = outboundOrder.DepartmentName,
                    Createtime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
                    Createuser = string.IsNullOrEmpty(Createuser) ? Createuser : "admin",
                    Createuser = Createuser,
                    Issitem = new List<ERPIssueItemModel>() { issueItemModel },
                };
                //更新发料单号
@@ -298,7 +325,11 @@
                    DelOutOrder(oldOutboundOrder);
                    return WebResponseContent.Instance.Error($"未找到该仓库信息");
                }

                if (materielInfo.WarehouseId!= materielInfo.WarehouseId)
                {
                    DelOutOrder(oldOutboundOrder);
                    return WebResponseContent.Instance.Error($"物料{materielInfo}不属于{warehouse.WarehouseName}");
                }
                if (model.Way == 1)
                {
                    if (oldOutboundOrder != null)