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_AllocateService/AllocateService.cs | 50 +++++++++++++++++++++++++++-----------------------
1 files changed, 27 insertions(+), 23 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_AllocateService/AllocateService.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_AllocateService/AllocateService.cs"
index 38b7329..5e198a5 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_AllocateService/AllocateService.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_AllocateService/AllocateService.cs"
@@ -666,7 +666,6 @@
public override PageGridData<Dt_InboundOrderDetail> GetDetailPage(PageDataOptions options)
{
string wheres = ValidatePageOptions(options);
- //鑾峰彇鎺掑簭瀛楁
Dictionary<string, SqlSugar.OrderByType> orderbyDic = GetPageDataSort(options, TProperties);
List<OrderByModel> orderByModels = new List<OrderByModel>();
foreach (var item in orderbyDic)
@@ -679,7 +678,6 @@
orderByModels.Add(orderByModel);
}
-
int totalCount = 0;
List<SearchParameters> searchParametersList = new List<SearchParameters>();
if (!string.IsNullOrEmpty(options.Wheres))
@@ -691,35 +689,41 @@
}
catch { }
}
- //var data = BaseDal.Db.Queryable<Dt_AllocateOrderDetail>()
- // .WhereIF(!wheres.IsNullOrEmpty(), wheres)
- // .OrderBy(orderByModels)
- // .ToPageList(options.Page, options.Rows, ref totalCount);
- //Dt_AllocateOrder allocateOrder = _allocateOrderRepository.QueryFirst(x => x.Id == (int)options.Value);
- //Dt_InboundOrder _InboundOrder = SqlSugarHelper.DbWMS.Queryable<Dt_InboundOrder>().Where(x => x.UpperOrderNo == allocateOrder.UpperOrderNo).First();
- //var details = _inboundOrderDetailRepository.QueryData(x => x.OrderId == _InboundOrder.Id );
- //foreach (var item in data)
- //{
- // var detail = details.Where(x => x.MaterielCode == item.MaterielCode).FirstOrDefault();
- // if (detail != null)
- // {
- // item.OrderQuantity = detail.OrderQuantity;
- // item.ReceiptQuantity = detail.ReceiptQuantity;
- // item.OverInQuantity = detail.OverInQuantity;
- // item.OrderDetailStatus = detail.OrderDetailStatus;
- // }
- //}
- //return new PageGridData<Dt_AllocateOrderDetail>(totalCount, data);
Dt_AllocateOrder allocateOrder = _allocateOrderRepository.QueryFirst(x => x.Id == (int)options.Value);
Dt_InboundOrder _InboundOrder = SqlSugarHelper.DbWMS.Queryable<Dt_InboundOrder>().Where(x => x.UpperOrderNo == allocateOrder.UpperOrderNo).First();
var Id = _InboundOrder == null ? 0 : _InboundOrder.Id;
+
var data = BaseDal.Db.Queryable<Dt_InboundOrderDetail>()
- .WhereIF(!wheres.IsNullOrEmpty(), wheres)
- .Where( x => x.OrderId == Id)
+ .WhereIF(!string.IsNullOrEmpty(wheres), wheres)
+ .Where(x => x.OrderId == Id)
.OrderBy(orderByModels)
.ToPageList(options.Page, options.Rows, ref totalCount);
+ foreach (var detail in data)
+ {
+ if (string.IsNullOrEmpty(detail.Barcode))
+ {
+ detail.Pallet = string.Empty;
+ continue;
+ }
+
+ var stockDetail = BaseDal.Db.Queryable<Dt_StockInfoDetail>()
+ .Where(sd => sd.Barcode == detail.Barcode)
+ .First();
+
+ if (stockDetail == null || stockDetail.StockId <= 0)
+ {
+ detail.Pallet = string.Empty;
+ continue;
+ }
+
+ var stock = BaseDal.Db.Queryable<Dt_StockInfo>()
+ .Where(s => s.Id == stockDetail.StockId)
+ .First();
+
+ detail.Pallet = stock == null ? string.Empty : stock.PalletCode;
+ }
return new PageGridData<Dt_InboundOrderDetail>(totalCount, data);
}
--
Gitblit v1.9.3