From a2f948006c6c7e918ba4f2e66d477cc2d5017a75 Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期三, 10 十二月 2025 21:49:58 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_AllocateService/AllocateService.cs | 50 +++++++++++++++++++++++++++++---------------------
1 files changed, 29 insertions(+), 21 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 c44b258..89a2938 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,7 @@
public readonly IOutboundService _outboundService;
public readonly IRepository<Dt_AllocateOrder> _allocateOrderRepository;
public readonly IRepository<Dt_AllocateOrderDetail> _allocateOrderDetailRepository;
-
+ private readonly IMaterielInfoService _materielInfoService;
public readonly IRepository<Dt_InboundOrderDetail> _inboundOrderDetailRepository;
private readonly ILogger<AllocateService> _logger;
@@ -47,7 +37,8 @@
IRepository<Dt_AllocateOrder> allocateOrderRepository,
IRepository<Dt_AllocateOrderDetail> allocateOrderDetailRepository,
IRepository<Dt_InboundOrderDetail> inboundOrderDetailRepository,
- ILogger<AllocateService> logger) : base(BaseDal)
+ ILogger<AllocateService> logger,
+ IMaterielInfoService materielInfoService) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
_inboundService = inboundService;
@@ -56,6 +47,7 @@
_allocateOrderDetailRepository = allocateOrderDetailRepository;
_logger = logger;
_inboundOrderDetailRepository = inboundOrderDetailRepository;
+ _materielInfoService = materielInfoService;
}
public IRepository<Dt_AllocateOrder> Repository => BaseDal;
@@ -86,9 +78,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 +149,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 +173,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 +190,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);
--
Gitblit v1.9.3