From 6b4e3935dceb3a4b158c0005468a5c803df509be Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期一, 24 十一月 2025 10:14:13 +0800
Subject: [PATCH] 提交
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_AllocateService/AllocateService.cs | 267 +++++++++++++++++++++++++++++------------------------
1 files changed, 145 insertions(+), 122 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 9b4af39..b720756 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,10 +1,14 @@
-锘縰sing SqlSugar;
+锘縰sing MailKit.Search;
+using Microsoft.Extensions.Logging;
+using SqlSugar;
+using SqlSugar.Extensions;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Common.AllocateEnum;
+using WIDESEA_Common.OrderEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
@@ -28,32 +32,36 @@
public readonly IOutboundService _outboundService;
public readonly IRepository<Dt_AllocateOrder> _allocateOrderRepository;
public readonly IRepository<Dt_AllocateOrderDetail> _allocateOrderDetailRepository;
- public AllocateService(IRepository<Dt_AllocateOrder> BaseDal,
+
+ private readonly ILogger<AllocateService> _logger;
+ public AllocateService(IRepository<Dt_AllocateOrder> BaseDal,
IUnitOfWorkManage unitOfWorkManage,
IInboundService inboundService,
IOutboundService outboundService,
IRepository<Dt_AllocateOrder> allocateOrderRepository,
- IRepository<Dt_AllocateOrderDetail> allocateOrderDetailRepository) : base(BaseDal)
+ IRepository<Dt_AllocateOrderDetail> allocateOrderDetailRepository,
+ ILogger<AllocateService> logger) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
_inboundService = inboundService;
_outboundService = outboundService;
_allocateOrderRepository = allocateOrderRepository;
_allocateOrderDetailRepository = allocateOrderDetailRepository;
+ _logger = logger;
}
public IRepository<Dt_AllocateOrder> Repository => BaseDal;
- public WebResponseContent ReceiveAllocateOrder(Dt_AllocateOrder allocateOrder, int operateType)
+ public async Task<WebResponseContent> ReceiveAllocateOrder(Dt_AllocateOrder allocateOrder, int operateType)
{
try
{
return operateType switch
{
- 1 => AddInboundOrder(allocateOrder),
- 2 => UpdateInboundOrder(allocateOrder),
- 3 => DeleteInboundOrder(allocateOrder),
+ 1 => await AddAllocateOrder(allocateOrder),
+ 2 => await UpdateAllocateOrder(allocateOrder),
+ 3 => DeleteAllocateOrder(allocateOrder),
_ => WebResponseContent.Instance.OK(),
};
@@ -64,7 +72,7 @@
}
}
- public WebResponseContent AddInboundOrder(Dt_AllocateOrder allocateOrder)
+ public async Task<WebResponseContent> AddAllocateOrder(Dt_AllocateOrder allocateOrder)
{
try
{
@@ -76,15 +84,24 @@
Db.InsertNav(allocateOrder).Include(x => x.Details).ExecuteCommand();
if (Enum.TryParse<BusinessTypeEnum>(allocateOrder.BusinessType, out var businessType))
{
- if (businessType == BusinessTypeEnum.澶栭儴浠撳簱璋冩櫤浠�)
+ if (businessType == BusinessTypeEnum.鏅轰粨璋冨閮ㄤ粨搴�)
{
var inboundOrders = ConvertToInboundOrders(allocateOrder);
- _inboundService.InbounOrderService.ReceiveInboundOrder(inboundOrders, 1);
+ await _inboundService.InbounOrderService.ReceiveInboundOrder(inboundOrders, 1);
}
- else if (businessType == BusinessTypeEnum.鏅轰粨璋冨閮ㄤ粨搴�)
+ else if (businessType == BusinessTypeEnum.澶栭儴浠撳簱璋冩櫤浠� || businessType == BusinessTypeEnum.鏅轰粨璋冩櫤浠�)
{
+ if (businessType == BusinessTypeEnum.澶栭儴浠撳簱璋冩櫤浠�)
+ {
+ allocateOrder.OrderType = InOrderTypeEnum.Allocat.ObjToInt();
+ }
+ else if (businessType == BusinessTypeEnum.鏅轰粨璋冩櫤浠�)
+ {
+ allocateOrder.OrderType = InOrderTypeEnum.InternalAllocat.ObjToInt();
+ }
+
var outboundOrders = ConvertToOutboundOrders(allocateOrder);
- _outboundService.OutboundOrderService.ReceiveOutboundOrder(outboundOrders, 1);
+ await _outboundService.OutboundOrderService.ReceiveOutboundOrder(outboundOrders, 1);
}
else
{
@@ -96,88 +113,90 @@
}
catch (Exception ex)
{
+ _logger.LogInformation("AllocateService AddAllocateOrder err: " + ex.Message);
return WebResponseContent.Instance.Error(ex.Message);
}
}
- public WebResponseContent UpdateInboundOrder(Dt_AllocateOrder model)
+ public async Task<WebResponseContent> UpdateAllocateOrder(Dt_AllocateOrder model)
{
try
{
- var allocateOrder = Db.Queryable<Dt_AllocateOrder>().Where(x => x.UpperOrderNo == model.UpperOrderNo).Includes(x => x.Details).First();
- if (allocateOrder == null)
+ var allocateOrder = Db.Queryable<Dt_AllocateOrder>().Where(x => x.UpperOrderNo == model.UpperOrderNo).Includes(x => x.Details).First();
+ if (allocateOrder == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒拌皟鎷ㄥ崟淇℃伅");
+ }
+ if (allocateOrder.Details == null || allocateOrder.Details.Count == 0)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒拌皟鎷ㄥ崟鏄庣粏淇℃伅");
+ }
+ List<Dt_AllocateOrderDetail> allocateOrderDetails = new List<Dt_AllocateOrderDetail>();
+ List<Dt_AllocateOrderDetail> updateAllocateOrderDetails = new List<Dt_AllocateOrderDetail>();
+ List<int> detailIds = new List<int>();
+ foreach (var item in model.Details)
+ {
+ if (string.IsNullOrEmpty(item.Barcode))
{
- return WebResponseContent.Instance.Error($"鏈壘鍒拌皟鎷ㄥ崟淇℃伅");
- }
- if (allocateOrder.Details == null || allocateOrder.Details.Count == 0)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒拌皟鎷ㄥ崟鏄庣粏淇℃伅");
- }
- List<Dt_AllocateOrderDetail> allocateOrderDetails = new List<Dt_AllocateOrderDetail>();
- List<Dt_AllocateOrderDetail> updateAllocateOrderDetails = new List<Dt_AllocateOrderDetail>();
- List<int> detailIds = new List<int>();
- foreach (var item in model.Details)
- {
- if (string.IsNullOrEmpty(item.Barcode))
- {
+ }
+ else
+ {
+ Dt_AllocateOrderDetail? allocateOrderDetail = allocateOrder.Details.FirstOrDefault(x => x.Barcode == item.Barcode);
+ if (allocateOrderDetail == null)
+ {
+ allocateOrderDetail = new Dt_AllocateOrderDetail()
+ {
+ OrderId = allocateOrder.Id,
+ MaterielCode = item.MaterielCode,
+ LineNo = item.LineNo,
+ BatchNo = item.BatchNo,
+ Unit = item.Unit,
+ WarehouseCode = item.WarehouseCode,
+ Barcode = item.Barcode,
+ BarcodeUnit = item.BarcodeUnit,
+ BarcodeQty = (decimal)item.BarcodeQty,
+ OrderQuantity = item.OrderQuantity
+ };
+ allocateOrderDetails.Add(allocateOrderDetail);
}
else
{
- Dt_AllocateOrderDetail? allocateOrderDetail = allocateOrder.Details.FirstOrDefault(x => x.Barcode == item.Barcode);
- if (allocateOrderDetail == null)
- {
- allocateOrderDetail = new Dt_AllocateOrderDetail()
- {
- OrderId = allocateOrder.Id,
- MaterielCode = item.MaterielCode,
- LineNo= item.LineNo,
- BatchNo = item.BatchNo,
- Unit = item.Unit,
- WarehouseCode = item.WarehouseCode,
- Barcode = item.Barcode,
- BarcodeUnit = item.BarcodeUnit,
- BarcodeQty = (decimal)item.BarcodeQty,
- OrderQuantity = item.OrderQuantity
- };
- allocateOrderDetails.Add(allocateOrderDetail);
- }
- else
- {
- allocateOrderDetail.LineNo = item.LineNo;
- allocateOrderDetail.MaterielCode = item.MaterielCode;
- allocateOrderDetail.BatchNo = item.BatchNo;
- allocateOrderDetail.Unit = item.Unit;
- allocateOrderDetail.WarehouseCode = item.WarehouseCode;
- allocateOrderDetail.Barcode = item.Barcode;
- allocateOrderDetail.BarcodeUnit = item.BarcodeUnit;
- allocateOrderDetail.BarcodeQty = item.BarcodeQty;
- allocateOrderDetail.OrderQuantity = item.OrderQuantity;
+ allocateOrderDetail.LineNo = item.LineNo;
+ allocateOrderDetail.MaterielCode = item.MaterielCode;
+ allocateOrderDetail.BatchNo = item.BatchNo;
+ allocateOrderDetail.Unit = item.Unit;
+ allocateOrderDetail.WarehouseCode = item.WarehouseCode;
+ allocateOrderDetail.Barcode = item.Barcode;
+ allocateOrderDetail.BarcodeUnit = item.BarcodeUnit;
+ allocateOrderDetail.BarcodeQty = item.BarcodeQty;
+ allocateOrderDetail.OrderQuantity = item.OrderQuantity;
- updateAllocateOrderDetails.Add(allocateOrderDetail);
- detailIds.Add(allocateOrderDetail.Id);
- }
+ updateAllocateOrderDetails.Add(allocateOrderDetail);
+ detailIds.Add(allocateOrderDetail.Id);
}
}
+ }
- allocateOrder.UpperOrderNo = model.UpperOrderNo;
- allocateOrder.BusinessType = model.BusinessType;
- allocateOrder.IsBatch = model.IsBatch;
- allocateOrder.FactoryArea = model.FactoryArea;
+ allocateOrder.UpperOrderNo = model.UpperOrderNo;
+ allocateOrder.BusinessType = model.BusinessType;
+ allocateOrder.IsBatch = model.IsBatch;
+ allocateOrder.FactoryArea = model.FactoryArea;
- List<Dt_AllocateOrderDetail> deletePurchaseOrderDetails = allocateOrder.Details.Where(x => !detailIds.Contains(x.Id)).ToList();
+ List<Dt_AllocateOrderDetail> deletePurchaseOrderDetails = allocateOrder.Details.Where(x => !detailIds.Contains(x.Id)).ToList();
- _unitOfWorkManage.BeginTran();
- foreach (var item in deletePurchaseOrderDetails)
- {
- _allocateOrderDetailRepository.DeleteAndMoveIntoHty(item, OperateTypeEnum.鑷姩鍒犻櫎);
- }
+ _unitOfWorkManage.BeginTran();
+ foreach (var item in deletePurchaseOrderDetails)
+ {
+ // _allocateOrderDetailRepository.DeleteAndMoveIntoHty(item, OperateTypeEnum.鑷姩鍒犻櫎);
+ _allocateOrderDetailRepository.DeleteData(item);
+ }
- _allocateOrderDetailRepository.UpdateData(updateAllocateOrderDetails);
- _allocateOrderDetailRepository.AddData(allocateOrderDetails);
+ _allocateOrderDetailRepository.UpdateData(updateAllocateOrderDetails);
+ _allocateOrderDetailRepository.AddData(allocateOrderDetails);
- BaseDal.UpdateData(allocateOrder);
- _unitOfWorkManage.CommitTran();
+ BaseDal.UpdateData(allocateOrder);
+ _unitOfWorkManage.CommitTran();
return WebResponseContent.Instance.OK();
@@ -185,36 +204,40 @@
catch (Exception ex)
{
_unitOfWorkManage.RollbackTran();
+ _logger.LogInformation("AllocateService UpdateAllocateOrder err: " + ex.Message);
return WebResponseContent.Instance.Error(ex.Message);
}
}
- public WebResponseContent DeleteInboundOrder(Dt_AllocateOrder model)
+ public WebResponseContent DeleteAllocateOrder(Dt_AllocateOrder model)
{
try
{
- var allocateOrder = Db.Queryable<Dt_AllocateOrder>().Where(x => x.UpperOrderNo == model.UpperOrderNo).Includes(x => x.Details).First();
- if (allocateOrder == null)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒拌皟鎷ㄥ崟淇℃伅");
- }
- if (allocateOrder.Details == null || allocateOrder.Details.Count == 0)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒拌皟鎷ㄥ崟鏄庣粏淇℃伅");
- }
- //Db.DeleteNav(inboundOrder).Include(x => x.Details).ExecuteCommand();
- _unitOfWorkManage.BeginTran();
- BaseDal.DeleteAndMoveIntoHty(allocateOrder, OperateTypeEnum.鑷姩鍒犻櫎);
- foreach (var item in allocateOrder.Details)
- {
- _allocateOrderDetailRepository.DeleteAndMoveIntoHty(item, OperateTypeEnum.鑷姩鍒犻櫎);
- }
- _unitOfWorkManage.CommitTran();
+ var allocateOrder = Db.Queryable<Dt_AllocateOrder>().Where(x => x.UpperOrderNo == model.UpperOrderNo).Includes(x => x.Details).First();
+ if (allocateOrder == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒拌皟鎷ㄥ崟淇℃伅");
+ }
+ if (allocateOrder.Details == null || allocateOrder.Details.Count == 0)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒拌皟鎷ㄥ崟鏄庣粏淇℃伅");
+ }
+ //Db.DeleteNav(Allocate).Include(x => x.Details).ExecuteCommand();
+ _unitOfWorkManage.BeginTran();
+ // BaseDal.DeleteAndMoveIntoHty(allocateOrder, OperateTypeEnum.鑷姩鍒犻櫎);
+ foreach (var item in allocateOrder.Details)
+ {
+ // _allocateOrderDetailRepository.DeleteAndMoveIntoHty(item, OperateTypeEnum.鑷姩鍒犻櫎);
+ _allocateOrderDetailRepository.DeleteData(item);
+ }
+ BaseDal.DeleteData(allocateOrder);
+ _unitOfWorkManage.CommitTran();
return WebResponseContent.Instance.OK();
}
catch (Exception ex)
{
_unitOfWorkManage.RollbackTran();
+ _logger.LogInformation("AllocateService DeleteAllocateOrder err: " + ex.Message);
return WebResponseContent.Instance.Error(ex.Message);
}
}
@@ -228,7 +251,7 @@
InboundOrderNo=allocateOrder.OrderNo,
UpperOrderNo=allocateOrder.UpperOrderNo,
SupplierId=allocateOrder.SupplierId,
- OrderType=allocateOrder.OrderType,
+ OrderType= allocateOrder.OrderType ,
OrderStatus=allocateOrder.OrderStatus,
CreateType=allocateOrder.CreateType,
BusinessType=allocateOrder.BusinessType,
@@ -247,7 +270,7 @@
OrderDetailStatus=detail.OrderDetailStatus,
Unit=detail.Unit,
RowNo=0,
- SupplyCode="",
+ SupplyCode=detail.SupplyCode,
WarehouseCode=detail.WarehouseCode,
Barcode=detail.Barcode,
OutBoxbarcodes="",
@@ -262,34 +285,34 @@
{
return new Dt_OutboundOrder()
{
- WarehouseId= allocateOrder.WarehouseId,
- OrderNo=allocateOrder.OrderNo,
- UpperOrderNo=allocateOrder.UpperOrderNo,
- OrderType=allocateOrder.OrderType,
- OrderStatus=allocateOrder.OrderStatus,
- CreateType=allocateOrder.CreateType,
- BusinessType=allocateOrder.BusinessType,
- IsBatch=allocateOrder.IsBatch,
- FactoryArea=allocateOrder.FactoryArea,
- Remark=allocateOrder.Remark,
- DepartmentCode="",
- DepartmentName="",
- Details=allocateOrder.Details.Select(detail=>new Dt_OutboundOrderDetail
- {
- OrderId= detail.OrderId,
- MaterielCode=detail.MaterielCode,
- MaterielName="",
- BatchNo=detail.BatchNo,
- OrderQuantity=detail.OrderQuantity,
- LockQuantity=0,
- OverOutQuantity=0,
- OrderDetailStatus=detail.OrderDetailStatus,
- Unit=detail.Unit,
- RowNo=0,
- SupplyCode="",
- WarehouseCode=detail.WarehouseCode,
-
- }).ToList()
+ WarehouseId = allocateOrder.WarehouseId,
+ OrderNo = allocateOrder.OrderNo,
+ UpperOrderNo = allocateOrder.UpperOrderNo,
+ OrderType = OutOrderTypeEnum.Allocate.ObjToInt(),
+ OrderStatus = allocateOrder.OrderStatus,
+ CreateType = allocateOrder.CreateType,
+ BusinessType = allocateOrder.BusinessType,
+ IsBatch = allocateOrder.IsBatch,
+ FactoryArea = allocateOrder.FactoryArea,
+ Remark = allocateOrder.Remark,
+ DepartmentCode = "",
+ DepartmentName = "",
+ Details = allocateOrder.Details.Select(detail => new Dt_OutboundOrderDetail
+ {
+ OrderId = detail.OrderId,
+ MaterielCode = detail.MaterielCode,
+ MaterielName = "",
+ BatchNo = detail.BatchNo,
+ OrderQuantity = detail.OrderQuantity,
+ LockQuantity = 0,
+ OverOutQuantity = 0,
+ OrderDetailStatus = detail.OrderDetailStatus,
+ Unit = detail.Unit,
+ RowNo = 0,
+ SupplyCode = detail.SupplyCode,
+ WarehouseCode = detail.WarehouseCode,
+
+ }).ToList()
};
}
--
Gitblit v1.9.3