From 266e4bf654c55ce2f7e9271048e4625f1b8b49f6 Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期一, 29 十二月 2025 14:36:08 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_AllocateService/AllocateService.cs | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 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 240fb3f..4ef506d 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"
@@ -27,6 +27,7 @@
public readonly IRepository<Dt_AllocateOrder> _allocateOrderRepository;
public readonly IRepository<Dt_AllocateOrderDetail> _allocateOrderDetailRepository;
private readonly IMaterielInfoService _materielInfoService;
+ private readonly IRepository<Dt_MaterielInfo> _materielInforepository;
public readonly IRepository<Dt_InboundOrderDetail> _inboundOrderDetailRepository;
private readonly ILogger<AllocateService> _logger;
@@ -38,7 +39,8 @@
IRepository<Dt_AllocateOrderDetail> allocateOrderDetailRepository,
IRepository<Dt_InboundOrderDetail> inboundOrderDetailRepository,
ILogger<AllocateService> logger,
- IMaterielInfoService materielInfoService) : base(BaseDal)
+ IMaterielInfoService materielInfoService,
+ IRepository<Dt_MaterielInfo> materielInforepository) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
_inboundService = inboundService;
@@ -48,6 +50,7 @@
_logger = logger;
_inboundOrderDetailRepository = inboundOrderDetailRepository;
_materielInfoService = materielInfoService;
+ _materielInforepository = materielInforepository;
}
public IRepository<Dt_AllocateOrder> Repository => BaseDal;
@@ -299,6 +302,15 @@
.Select(g => g.First())
.ToList();
+ // 鑾峰彇鎵�鏈夌墿鏂欎唬鐮�
+ var materielCodes = distinctDetails.Select(d => d.MaterielCode).Distinct().ToList();
+
+ // 浠庢暟鎹簱鏌ヨ鐗╂枡淇℃伅锛堝亣璁句娇鐢� DbContext锛�
+ var materielInfos = _materielInforepository.Db.Queryable<Dt_MaterielInfo>()
+ .Where(m => materielCodes.Contains(m.MaterielCode))
+ .Select(m => new { m.MaterielCode, m.MaterielName })
+ .ToDictionary(m => m.MaterielCode, m => m.MaterielName);
+
return new List<Dt_InboundOrder>()
{
new Dt_InboundOrder(){
@@ -315,9 +327,10 @@
Remark=allocateOrder.Remark,
Details=distinctDetails.Select(detail=>new Dt_InboundOrderDetail
{
+
OrderId= 0,
MaterielCode=detail.MaterielCode,
- MaterielName="",
+ MaterielName=detail.MaterielName,
BatchNo=detail.BatchNo,
OrderQuantity=detail.OrderQuantity,
ReceiptQuantity=detail.ReceiptQuantity,
--
Gitblit v1.9.3