From b13d3d2c634df625dcaa74371f1d36a8376851b4 Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期二, 06 一月 2026 14:54:16 +0800
Subject: [PATCH] 优化撤销组盘功能
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Allocate/AllocateOrderController.cs | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 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_WMSServer/Controllers/Allocate/AllocateOrderController.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_WMSServer/Controllers/Allocate/AllocateOrderController.cs"
index 5578ed4..ba9350e 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_WMSServer/Controllers/Allocate/AllocateOrderController.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_WMSServer/Controllers/Allocate/AllocateOrderController.cs"
@@ -8,6 +8,7 @@
using WIDESEA_Core;
using WIDESEA_Core.Attributes;
using WIDESEA_Core.BaseController;
+using WIDESEA_Core.BaseRepository;
using WIDESEA_DTO.Allocate;
using WIDESEA_IAllocateService;
using WIDESEA_IInboundService;
@@ -26,9 +27,11 @@
public class AllocateOrderController : ApiBaseController<IAllocateService, Dt_AllocateOrder>
{
private readonly ILogger<AllocateOrderController> _logger;
- public AllocateOrderController(IAllocateService service, ILogger<AllocateOrderController> logger) : base(service)
+ private readonly IRepository<Dt_MaterielInfo> _materialInfoRepository;
+ public AllocateOrderController(IAllocateService service, ILogger<AllocateOrderController> logger,IRepository<Dt_MaterielInfo> materialInfoRepository) : base(service)
{
_logger = logger;
+ _materialInfoRepository = materialInfoRepository;
}
[HttpPost, Route("ReceiveAllocateOrder"), MethodParamsValidate, AllowAnonymous]
@@ -51,19 +54,24 @@
//allocateOrder.OrderType = businessType == BusinessTypeEnum.鏅轰粨璋冨閮ㄤ粨搴� ? 215 : 115;
if (businessType == BusinessTypeEnum.鏅轰粨璋冨閮ㄤ粨搴�)
{
- allocateOrder.OrderType = 115;
+ allocateOrder.OrderType = 215;
}
else if (businessType == BusinessTypeEnum.澶栭儴浠撳簱璋冩櫤浠�)
{
- allocateOrder.OrderType = 215;
+ allocateOrder.OrderType = 115;
+ }
+ else if (businessType == BusinessTypeEnum.鏅轰粨璋冩櫤浠�)
+ {
+ allocateOrder.OrderType = 117;
}
foreach (var detailDto in model.Details)
{
- if (businessType == BusinessTypeEnum.鏅轰粨璋冨閮ㄤ粨搴� && (detailDto.Barcodes == null || !detailDto.Barcodes.Any()))
+ if (businessType == BusinessTypeEnum.澶栭儴浠撳簱璋冩櫤浠� && (detailDto.Barcodes == null || !detailDto.Barcodes.Any()))
{
return WebResponseContent.Instance.Error($"鏉＄爜涓嶈兘涓虹┖");
}
+ var materialName = _materialInfoRepository.QueryFirst(x => x.MaterielCode == detailDto.MaterialCode).MaterielName;
if (detailDto.Barcodes != null && detailDto.Barcodes.Any())
{
foreach (var barcodeDto in detailDto.Barcodes)
@@ -72,8 +80,9 @@
{
WarehouseCode = detailDto.WarehouseCode,
MaterielCode = detailDto.MaterialCode,
+ MaterielName = materialName,
LineNo = detailDto.LineNo,
- OrderQuantity = detailDto.Qty,
+ OrderQuantity = barcodeDto.Qty,
SupplyCode = barcodeDto.SupplyCode,
Unit = detailDto.Unit,
Barcode = barcodeDto.Barcode,
@@ -81,7 +90,7 @@
BarcodeQty = barcodeDto.Qty,
BarcodeUnit = barcodeDto.Unit,
ValidDate = barcodeDto.validDate,
-
+ BoxSN = barcodeDto.BoxSN
};
allocateOrder.Details.Add(orderDetail);
}
@@ -94,7 +103,10 @@
MaterielCode = detailDto.MaterialCode,
LineNo = detailDto.LineNo,
OrderQuantity = detailDto.Qty,
- Unit = detailDto.Unit
+ Unit = detailDto.Unit,
+ BarcodeUnit =detailDto.Unit,
+ BarcodeQty=detailDto.Qty,
+ MaterielName = materialName
};
allocateOrder.Details.Add(orderDetail);
}
--
Gitblit v1.9.3