From 95c92db3c831c73b05068b09221c13ad4a250322 Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期一, 02 二月 2026 20:07:00 +0800
Subject: [PATCH] 条码扫描成功音频播放功能，代码优化
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderDetailService.cs | 89 ++++++++++++--------------------------------
1 files changed, 24 insertions(+), 65 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderDetailService.cs"
index 848271c..abbe1cd 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderDetailService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderDetailService.cs"
@@ -577,73 +577,32 @@
public override PageGridData<Dt_OutboundOrderDetail> GetPageData(PageDataOptions options)
{
- return base.GetPageData(options);
+ //var pageGridData = base.GetPageData(options);
- //ISugarQueryable<Dt_OutboundOrderDetail> sugarQueryable1 = BaseDal.Db.Queryable<Dt_OutboundOrderDetail>();
- //if (!string.IsNullOrEmpty(options.Wheres))
- //{
+ 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)
- // {
- // Dt_OutboundOrder outboundOrder = _outboundOrderService.Repository.QueryFirst(x => x.Id == searchParameters.Value.ObjToInt());
- // if (outboundOrder != null)
- // {
- // if (outboundOrder.IsBatch == 0)
- // {
- // 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);
- // }
- // else
- // {
- // sugarQueryable1 = sugarQueryable1.Where(x => x.OrderId == searchParameters.Value.ObjToInt());
- // sugarQueryable1.GroupBy(x => new { x.MaterielCode, x.MaterielName, x.BatchNo, x.SupplyCode, x.WarehouseCode }).Select(s => new Dt_OutboundOrderDetail
- // {
- // WarehouseCode = s.WarehouseCode,
- // SupplyCode = s.SupplyCode,
- // BatchNo = s.BatchNo,
- // MaterielName = s.MaterielName,
- // MaterielCode = s.MaterielCode,
- // AllocatedQuantity = SqlFunc.AggregateSum(s.AllocatedQuantity),
- // OrderQuantity = SqlFunc.AggregateSum(s.OrderQuantity),
- // PickedQty = SqlFunc.AggregateSum(s.PickedQty),
- // OverOutQuantity = SqlFunc.AggregateSum(s.OverOutQuantity),
- // MoveQty = SqlFunc.AggregateSum(s.MoveQty),
- // NoStockOutQty = SqlFunc.AggregateSum(s.NoStockOutQty),
- // LockQuantity = SqlFunc.AggregateSum(s.LockQuantity),
- // BarcodeMoveQty = SqlFunc.AggregateSum(s.BarcodeMoveQty),
- // BarcodeQty =SqlFunc.AggregateMin( s.BarcodeQty),
- // BarcodeUnit = SqlFunc.AggregateMin(s.BarcodeUnit),
- // BatchAllocateStatus = SqlFunc.AggregateMin(s.BatchAllocateStatus),
- // CreateDate = SqlFunc.AggregateMin(s.CreateDate),
- // Creater = SqlFunc.AggregateMin(s.Creater),
- // documentsNO = SqlFunc.AggregateMin(s.documentsNO),
- // Id = SqlFunc.AggregateMin(s.Id),
- // lineNo = SqlFunc.AggregateMin(s.lineNo),
- // Modifier = SqlFunc.AggregateMin(s.Modifier),
- // ModifyDate = SqlFunc.AggregateMin(s.ModifyDate),
- // OrderDetailStatus = SqlFunc.AggregateMin(s.OrderDetailStatus),
- // OrderId = SqlFunc.AggregateMin(s.OrderId),
- // Remark = SqlFunc.AggregateMin(s.Remark),
- // ReturnJsonData = SqlFunc.AggregateMin(s.ReturnJsonData),
- // ReturnToMESStatus = SqlFunc.AggregateMin(s.ReturnToMESStatus),
- // RowNo = SqlFunc.AggregateMin(s.RowNo),
- // Unit = SqlFunc.AggregateMin(s.Unit)
- // });
- // var dataList = sugarQueryable1.ToPageList(options.Page, options.Rows, ref totalCount);
- // return new PageGridData<Dt_OutboundOrderDetail>(totalCount, dataList);
- // }
- // }
- // }
- // }
- // }
- //}
+ 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)
+ {
+ Dt_OutboundOrder outboundOrder = _outboundOrderService.Repository.QueryFirst(x => x.Id == searchParameters.Value.ObjToInt());
+ if (outboundOrder != 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>();
}
--
Gitblit v1.9.3