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 | 74 ++++++++++++++++++++++++-------------
1 files changed, 48 insertions(+), 26 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 8759a0b..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"
@@ -1,15 +1,5 @@
-锘縰sing Autofac.Core;
-using MailKit.Search;
-using Microsoft.Extensions.Logging;
+锘縰sing Microsoft.Extensions.Logging;
using SqlSugar;
-using SqlSugar.Extensions;
-using System;
-using System.Collections.Generic;
-using System.Dynamic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
using WIDESEA_Common.AllocateEnum;
using WIDESEA_Common.OrderEnum;
using WIDESEA_Core;
@@ -17,10 +7,10 @@
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.CodeConfigEnum;
using WIDESEA_Core.DB;
-using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
using WIDESEA_Core.Seed;
using WIDESEA_IAllocateService;
+using WIDESEA_IBasicService;
using WIDESEA_IInboundService;
using WIDESEA_IOutboundService;
using WIDESEA_Model.Models;
@@ -36,7 +26,8 @@
public readonly IOutboundService _outboundService;
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;
@@ -47,7 +38,9 @@
IRepository<Dt_AllocateOrder> allocateOrderRepository,
IRepository<Dt_AllocateOrderDetail> allocateOrderDetailRepository,
IRepository<Dt_InboundOrderDetail> inboundOrderDetailRepository,
- ILogger<AllocateService> logger) : base(BaseDal)
+ ILogger<AllocateService> logger,
+ IMaterielInfoService materielInfoService,
+ IRepository<Dt_MaterielInfo> materielInforepository) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
_inboundService = inboundService;
@@ -56,6 +49,8 @@
_allocateOrderDetailRepository = allocateOrderDetailRepository;
_logger = logger;
_inboundOrderDetailRepository = inboundOrderDetailRepository;
+ _materielInfoService = materielInfoService;
+ _materielInforepository = materielInforepository;
}
public IRepository<Dt_AllocateOrder> Repository => BaseDal;
@@ -86,9 +81,18 @@
{
if (BaseDal.QueryFirst(x => x.UpperOrderNo == allocateOrder.UpperOrderNo) != null)
{
- return WebResponseContent.Instance.Error($"璋冩嫧鍗曞彿閲嶅");
+ return WebResponseContent.Instance.Error($"{allocateOrder.UpperOrderNo}璋冩嫧鍗曞彿閲嶅");
}
allocateOrder.OrderNo = CreateCodeByRule(nameof(RuleCodeEnum.AllocateOrderCodeRule));
+ var materielCodes = allocateOrder.Details.Select(x => x.MaterielCode).Distinct().ToList();
+ var materielInfos = _materielInfoService.Db.Queryable<Dt_MaterielInfo>().Where(x => materielCodes.Contains(x.MaterielCode)).ToList();
+ foreach (var item in allocateOrder.Details)
+ {
+ if (materielInfos.Any())
+ {
+ item.MaterielName = materielInfos.FirstOrDefault(x => x.MaterielCode == item.MaterielCode)?.MaterielName ?? "";
+ }
+ }
Db.InsertNav(allocateOrder).Include(x => x.Details).ExecuteCommand();
await AddInOutData(allocateOrder);
return WebResponseContent.Instance.OK();
@@ -148,13 +152,13 @@
List<Dt_AllocateOrderDetail> allocateOrderDetails = new List<Dt_AllocateOrderDetail>();
List<Dt_AllocateOrderDetail> updateAllocateOrderDetails = new List<Dt_AllocateOrderDetail>();
List<int> detailIds = new List<int>();
+
+ var materielCodes = allocateOrder.Details.Select(x => x.MaterielCode).Distinct().ToList();
+ var materielInfos = _materielInfoService.Db.Queryable<Dt_MaterielInfo>().Where(x => materielCodes.Contains(x.MaterielCode)).ToList();
+
foreach (var item in model.Details)
{
- if (string.IsNullOrEmpty(item.Barcode))
- {
-
- }
- else
+ if (!string.IsNullOrEmpty(item.Barcode))
{
Dt_AllocateOrderDetail? allocateOrderDetail = allocateOrder.Details.FirstOrDefault(x => x.Barcode == item.Barcode);
if (allocateOrderDetail == null)
@@ -172,6 +176,10 @@
BarcodeQty = (decimal)item.BarcodeQty,
OrderQuantity = item.OrderQuantity
};
+ if (materielInfos.Any())
+ {
+ allocateOrderDetail.MaterielName = materielInfos.FirstOrDefault(x => x.MaterielCode == item.MaterielCode)?.MaterielName ?? "";
+ }
allocateOrderDetails.Add(allocateOrderDetail);
}
else
@@ -185,7 +193,10 @@
allocateOrderDetail.BarcodeUnit = item.BarcodeUnit;
allocateOrderDetail.BarcodeQty = item.BarcodeQty;
allocateOrderDetail.OrderQuantity = item.OrderQuantity;
-
+ if (materielInfos.Any())
+ {
+ allocateOrderDetail.MaterielName = materielInfos.FirstOrDefault(x => x.MaterielCode == item.MaterielCode)?.MaterielName ?? "";
+ }
updateAllocateOrderDetails.Add(allocateOrderDetail);
detailIds.Add(allocateOrderDetail.Id);
@@ -291,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(){
@@ -307,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,
@@ -321,9 +342,10 @@
SupplyCode=detail.SupplyCode,
WarehouseCode=detail.WarehouseCode,
Barcode=detail.Barcode,
- OutBoxbarcodes="",
+ OutBoxbarcodes= detail.BoxSN,
BarcodeQty=(decimal)detail.BarcodeQty,
- BarcodeUnit=detail.BarcodeUnit
+ BarcodeUnit=detail.BarcodeUnit,
+ ValidDate = detail.ValidDate
}).ToList()
}
};
@@ -539,10 +561,10 @@
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)
- .WhereIF(!_InboundOrder.IsNullOrEmpty(), x => x.OrderId == _InboundOrder.Id)
+ .Where( x => x.OrderId == Id)
.OrderBy(orderByModels)
.ToPageList(options.Page, options.Rows, ref totalCount);
--
Gitblit v1.9.3