From e354b5938f49ac90b237289923dcde923d22daf5 Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期四, 20 十一月 2025 09:08:27 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_AllocateService/AllocateService.cs | 49 ++++++++++++++++++++++++++++++-------------------
1 files changed, 30 insertions(+), 19 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 c8ccfc4..7d707ca 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,13 @@
-锘縰sing SqlSugar;
+锘縰sing 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 +31,36 @@
public readonly IOutboundService _outboundService;
public readonly IRepository<Dt_AllocateOrder> _allocateOrderRepository;
public readonly IRepository<Dt_AllocateOrderDetail> _allocateOrderDetailRepository;
+
+ 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 +71,7 @@
}
}
- public WebResponseContent AddInboundOrder(Dt_AllocateOrder allocateOrder)
+ public async Task<WebResponseContent> AddAllocateOrder(Dt_AllocateOrder allocateOrder)
{
try
{
@@ -76,15 +83,15 @@
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.澶栭儴浠撳簱璋冩櫤浠�)
{
var outboundOrders = ConvertToOutboundOrders(allocateOrder);
- _outboundService.OutboundOrderService.ReceiveOutboundOrder(outboundOrders, 1);
+ await _outboundService.OutboundOrderService.ReceiveOutboundOrder(outboundOrders, 1);
}
else
{
@@ -96,10 +103,11 @@
}
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
{
@@ -170,7 +178,8 @@
_unitOfWorkManage.BeginTran();
foreach (var item in deletePurchaseOrderDetails)
{
- _allocateOrderDetailRepository.DeleteAndMoveIntoHty(item, OperateTypeEnum.鑷姩鍒犻櫎);
+ // _allocateOrderDetailRepository.DeleteAndMoveIntoHty(item, OperateTypeEnum.鑷姩鍒犻櫎);
+ _allocateOrderDetailRepository.DeleteData(item);
}
_allocateOrderDetailRepository.UpdateData(updateAllocateOrderDetails);
@@ -185,11 +194,12 @@
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
{
@@ -202,7 +212,7 @@
{
return WebResponseContent.Instance.Error($"鏈壘鍒拌皟鎷ㄥ崟鏄庣粏淇℃伅");
}
- //Db.DeleteNav(inboundOrder).Include(x => x.Details).ExecuteCommand();
+ //Db.DeleteNav(Allocate).Include(x => x.Details).ExecuteCommand();
_unitOfWorkManage.BeginTran();
// BaseDal.DeleteAndMoveIntoHty(allocateOrder, OperateTypeEnum.鑷姩鍒犻櫎);
foreach (var item in allocateOrder.Details)
@@ -217,6 +227,7 @@
catch (Exception ex)
{
_unitOfWorkManage.RollbackTran();
+ _logger.LogInformation("AllocateService DeleteAllocateOrder err: " + ex.Message);
return WebResponseContent.Instance.Error(ex.Message);
}
}
@@ -230,7 +241,7 @@
InboundOrderNo=allocateOrder.OrderNo,
UpperOrderNo=allocateOrder.UpperOrderNo,
SupplierId=allocateOrder.SupplierId,
- OrderType=allocateOrder.OrderType,
+ OrderType=InOrderTypeEnum.Allocat.ObjToInt(),
OrderStatus=allocateOrder.OrderStatus,
CreateType=allocateOrder.CreateType,
BusinessType=allocateOrder.BusinessType,
@@ -249,7 +260,7 @@
OrderDetailStatus=detail.OrderDetailStatus,
Unit=detail.Unit,
RowNo=0,
- SupplyCode="",
+ SupplyCode=detail.SupplyCode,
WarehouseCode=detail.WarehouseCode,
Barcode=detail.Barcode,
OutBoxbarcodes="",
@@ -267,7 +278,7 @@
WarehouseId = allocateOrder.WarehouseId,
OrderNo = allocateOrder.OrderNo,
UpperOrderNo = allocateOrder.UpperOrderNo,
- OrderType = allocateOrder.OrderType,
+ OrderType = OutOrderTypeEnum.Allocate.ObjToInt(),
OrderStatus = allocateOrder.OrderStatus,
CreateType = allocateOrder.CreateType,
BusinessType = allocateOrder.BusinessType,
@@ -288,7 +299,7 @@
OrderDetailStatus = detail.OrderDetailStatus,
Unit = detail.Unit,
RowNo = 0,
- SupplyCode = "",
+ SupplyCode = detail.SupplyCode,
WarehouseCode = detail.WarehouseCode,
}).ToList()
--
Gitblit v1.9.3