From cf3050083e157819b94781d0445547ffc73e21f2 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期五, 28 十一月 2025 21:17:28 +0800
Subject: [PATCH] 提交
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs | 92 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 69 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_OutboundService/OutboundOrderService.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_OutboundService/OutboundOrderService.cs"
index 9b0c138..ab67148 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_OutboundService/OutboundOrderService.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_OutboundService/OutboundOrderService.cs"
@@ -1,7 +1,10 @@
锘縰sing Autofac.Core;
using AutoMapper;
using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
using SqlSugar;
+using SqlSugar.Extensions;
+using WIDESEA_Common.OrderEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
@@ -9,6 +12,7 @@
using WIDESEA_Core.DB;
using WIDESEA_Core.Enums;
using WIDESEA_Core.Seed;
+using WIDESEA_IBasicService;
using WIDESEA_IOutboundService;
using WIDESEA_Model.Models;
@@ -19,24 +23,26 @@
private readonly IMapper _mapper;
private readonly IUnitOfWorkManage _unitOfWorkManage;
public IRepository<Dt_OutboundOrder> Repository => BaseDal;
-
+ private readonly ILogger<OutboundOrderService> _logger;
private readonly IRepository<Dt_OutboundOrderDetail> _outboundOrderDetailRepository;
-
- public OutboundOrderService(IRepository<Dt_OutboundOrder> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IRepository<Dt_OutboundOrderDetail> outboundOrderDetailRepository) : base(BaseDal)
+ private readonly IMaterialUnitService _materialUnitService;
+ public OutboundOrderService(IRepository<Dt_OutboundOrder> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IRepository<Dt_OutboundOrderDetail> outboundOrderDetailRepository, ILogger<OutboundOrderService> logger, IMaterialUnitService materialUnitService) : base(BaseDal)
{
_mapper = mapper;
_unitOfWorkManage = unitOfWorkManage;
_outboundOrderDetailRepository = outboundOrderDetailRepository;
+ _logger = logger;
+ _materialUnitService = materialUnitService;
}
- public WebResponseContent ReceiveOutboundOrder(Dt_OutboundOrder model, int operateType)
+ public async Task<WebResponseContent> ReceiveOutboundOrder(Dt_OutboundOrder model, int operateType)
{
try
{
return operateType switch
{
- 1 => AddOutboundOrder(model),
- 2 => UpdateOutboundOrder(model),
+ 1 => await AddOutboundOrder(model),
+ 2 => await UpdateOutboundOrder(model),
3 => DeleteOutboundOrder(model),
_ => WebResponseContent.Instance.OK(),
@@ -48,7 +54,7 @@
}
}
- public WebResponseContent AddOutboundOrder(Dt_OutboundOrder model)
+ public async Task<WebResponseContent> AddOutboundOrder(Dt_OutboundOrder model)
{
try
{
@@ -57,8 +63,19 @@
{
return WebResponseContent.Instance.Error($"鍑哄簱鍗曞彿閲嶅");
}
+ foreach (var item in model.Details)
+ {
+ var issueoStockResult = await _materialUnitService.ConvertFromToStockAsync(item.MaterielCode,item.BarcodeUnit, item.BarcodeQty);
+ item.Unit = issueoStockResult.Unit;
+ item.OrderQuantity = issueoStockResult.Quantity;
+ var moveissueoStockResult = await _materialUnitService.ConvertFromToStockAsync(item.MaterielCode, item.BarcodeUnit, item.BarcodeMoveQty);
+ item.MoveQty = moveissueoStockResult.Quantity;
+ }
- model.OrderNo = CreateCodeByRule(nameof(RuleCodeEnum.OutboundOrderRule));
+ if (model.OrderType != InOrderTypeEnum.Allocat.ObjToInt() || model.OrderType != InOrderTypeEnum.InternalAllocat.ObjToInt())
+ {
+ model.OrderNo = CreateCodeByRule(nameof(RuleCodeEnum.OutboundOrderRule));
+ }
Db.InsertNav(model).Include(x => x.Details).ExecuteCommand();
return WebResponseContent.Instance.OK();
@@ -68,7 +85,7 @@
return WebResponseContent.Instance.Error(ex.Message);
}
}
- public WebResponseContent UpdateOutboundOrder(Dt_OutboundOrder model)
+ public async Task<WebResponseContent> UpdateOutboundOrder(Dt_OutboundOrder model)
{
try
{
@@ -82,8 +99,12 @@
{
return WebResponseContent.Instance.Error($"鏈壘鍒板嚭搴撳崟鏄庣粏淇℃伅");
}
- List<Dt_OutboundOrderDetail> inboundOrderDetails = new List<Dt_OutboundOrderDetail>();
- List<Dt_OutboundOrderDetail> updateInboundOrderDetails = new List<Dt_OutboundOrderDetail>();
+ if (outboundOrder.OrderStatus != OutOrderStatusEnum.鏈紑濮�.ObjToInt())
+ {
+ return WebResponseContent.Instance.Error($"璇ヨ鍗曠姸鎬佷笉鍏佽淇敼");
+ }
+ List<Dt_OutboundOrderDetail> outboundOrderDetails = new List<Dt_OutboundOrderDetail>();
+ List<Dt_OutboundOrderDetail> updateoutboundOrderDetails = new List<Dt_OutboundOrderDetail>();
List<int> detailIds = new List<int>();
foreach (var item in model.Details)
{
@@ -100,10 +121,19 @@
BatchNo = item.BatchNo,
Unit = item.Unit,
WarehouseCode = item.WarehouseCode,
- MoveQty=item.MoveQty,
- OrderQuantity = item.OrderQuantity
+ MoveQty = item.MoveQty,
+ OrderQuantity = item.OrderQuantity,
+ BarcodeMoveQty = item.MoveQty,
+ BarcodeQty = item.OrderQuantity,
+ BarcodeUnit = item.Unit,
};
- inboundOrderDetails.Add(outboundOrderDetail);
+ var issueoStockResult = await _materialUnitService.ConvertFromToStockAsync(item.MaterielCode,item.BarcodeUnit, item.BarcodeQty);
+ item.Unit = issueoStockResult.Unit;
+ item.OrderQuantity = issueoStockResult.Quantity;
+ var moveissueoStockResult = await _materialUnitService.ConvertFromToStockAsync(item.MaterielCode, item.BarcodeUnit, item.BarcodeMoveQty);
+ item.MoveQty = moveissueoStockResult.Quantity;
+
+ outboundOrderDetails.Add(outboundOrderDetail);
}
else
{
@@ -115,8 +145,17 @@
outboundOrderDetail.WarehouseCode = item.WarehouseCode;
outboundOrderDetail.MoveQty = item.MoveQty;
outboundOrderDetail.OrderQuantity = item.OrderQuantity;
+ outboundOrderDetail.BarcodeMoveQty = item.MoveQty;
+ outboundOrderDetail.BarcodeQty = item.OrderQuantity;
+ outboundOrderDetail.BarcodeUnit = item.Unit;
+ var issueoStockResult = await _materialUnitService.ConvertFromToStockAsync(item.MaterielCode, item.BarcodeUnit, item.BarcodeQty);
+ outboundOrderDetail.Unit = issueoStockResult.Unit;
+ outboundOrderDetail.OrderQuantity = issueoStockResult.Quantity;
+ var moveissueoStockResult = await _materialUnitService.ConvertFromToStockAsync(item.MaterielCode, item.BarcodeUnit, item.BarcodeMoveQty);
+ outboundOrderDetail.MoveQty = moveissueoStockResult.Quantity;
- updateInboundOrderDetails.Add(outboundOrderDetail);
+
+ updateoutboundOrderDetails.Add(outboundOrderDetail);
detailIds.Add(outboundOrderDetail.Id);
}
}
@@ -132,11 +171,12 @@
_unitOfWorkManage.BeginTran();
foreach (var item in deletePurchaseOrderDetails)
{
- _outboundOrderDetailRepository.DeleteAndMoveIntoHty(item, OperateTypeEnum.鑷姩鍒犻櫎);
+ // _outboundOrderDetailRepository.DeleteAndMoveIntoHty(item, OperateTypeEnum.鑷姩鍒犻櫎);
+ _outboundOrderDetailRepository.DeleteData(item);
}
- _outboundOrderDetailRepository.UpdateData(updateInboundOrderDetails);
- _outboundOrderDetailRepository.AddData(inboundOrderDetails);
+ _outboundOrderDetailRepository.UpdateData(updateoutboundOrderDetails);
+ _outboundOrderDetailRepository.AddData(outboundOrderDetails);
BaseDal.UpdateData(outboundOrder);
_unitOfWorkManage.CommitTran();
@@ -154,7 +194,7 @@
{
try
{
- var outboundOrder = Db.Queryable<Dt_OutboundOrder>().Where(x => x.UpperOrderNo == model.UpperOrderNo).Includes(x => x.Details).First();
+ var outboundOrder = Db.Queryable<Dt_OutboundOrder>().Where(x => x.UpperOrderNo == model.UpperOrderNo).Includes(x => x.Details).First();
if (outboundOrder == null)
{
return WebResponseContent.Instance.Error($"鏈壘鍒板嚭搴撳崟淇℃伅");
@@ -163,13 +203,18 @@
{
return WebResponseContent.Instance.Error($"鏈壘鍒板嚭搴撳崟鏄庣粏淇℃伅");
}
- //Db.DeleteNav(inboundOrder).Include(x => x.Details).ExecuteCommand();
+ if (outboundOrder.OrderStatus != OutOrderStatusEnum.鏈紑濮�.ObjToInt())
+ {
+ return WebResponseContent.Instance.Error($"璇ヨ鍗曠姸鎬佷笉鍏佽鍒犻櫎");
+ }
_unitOfWorkManage.BeginTran();
- BaseDal.DeleteAndMoveIntoHty(outboundOrder, OperateTypeEnum.鑷姩鍒犻櫎);
+ //BaseDal.DeleteAndMoveIntoHty(outboundOrder, OperateTypeEnum.鑷姩鍒犻櫎);
foreach (var item in outboundOrder.Details)
{
- _outboundOrderDetailRepository.DeleteAndMoveIntoHty(item, OperateTypeEnum.鑷姩鍒犻櫎);
+ // _outboundOrderDetailRepository.DeleteAndMoveIntoHty(item, OperateTypeEnum.鑷姩鍒犻櫎);\\
+ _outboundOrderDetailRepository.DeleteData(item);
}
+ BaseDal.DeleteData(outboundOrder);
_unitOfWorkManage.CommitTran();
return WebResponseContent.Instance.OK();
@@ -177,6 +222,7 @@
catch (Exception ex)
{
_unitOfWorkManage.RollbackTran();
+ _logger.LogInformation(ex.Message);
return WebResponseContent.Instance.Error(ex.Message);
}
}
@@ -186,7 +232,7 @@
/// </summary>
public async Task<WebResponseContent> GetById(int id)
{
- var order = await Db.Queryable<Dt_OutboundOrder>().FirstAsync(o=>o.Id==id);
+ var order = await Db.Queryable<Dt_OutboundOrder>().FirstAsync(o => o.Id == id);
if (order == null)
{
return WebResponseContent.Instance.Error("鏈壘鍒板嚭搴撳崟淇℃伅");
--
Gitblit v1.9.3