From b1a419c2886666934da6499ee552516d0769562e Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期四, 16 四月 2026 13:40:56 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderDetailService.cs | 49 ++++---------------------------------------------
1 files changed, 4 insertions(+), 45 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 250becf..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"
@@ -594,56 +594,15 @@
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);
- }
+ 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