From 696edbff3c8812e4b820f624d66a02ae6ddb1a06 Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期四, 16 四月 2026 13:40:18 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Allocate/AllocateOrderController.cs | 56 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 44 insertions(+), 12 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 31f6001..54997b7 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"
@@ -1,12 +1,15 @@
锘縰sing Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
using System.Data.Common;
using System.Diagnostics.Eventing.Reader;
using System.Threading.Tasks;
using WIDESEA_Common.AllocateEnum;
+using WIDESEA_Common.OrderEnum;
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;
@@ -25,14 +28,17 @@
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]
public async Task<WebResponseContent> ReceiveAllocateOrder([FromBody] AllocateDto model)
{
+ _logger.LogInformation("AllocateOrderController ReceiveAllocateOrder: " + JsonConvert.SerializeObject(model));
Dt_AllocateOrder allocateOrder = new Dt_AllocateOrder
{
OrderNo = model.OrderNo,
@@ -40,37 +46,57 @@
BusinessType = model.BusinessType,
FactoryArea = model.FactoryArea,
IsBatch = model.IsBatch,
- CreateType = model.OperationType,
- FromWarehouse=model.fromWarehouse,
- ToWarehouse=model.toWarehouse,
+ CreateType =(int)OrderCreateTypeEnum.UpperSystemPush,
+ FromWarehouse = model.fromWarehouse,
+ ToWarehouse = model.toWarehouse,
Details = new List<Dt_AllocateOrderDetail>()
};
Enum.TryParse<BusinessTypeEnum>(allocateOrder.BusinessType, out var businessType);
-
+ //allocateOrder.OrderType = businessType == BusinessTypeEnum.鏅轰粨璋冨閮ㄤ粨搴� ? 215 : 115;
+ if (businessType == BusinessTypeEnum.鏅轰粨璋冨閮ㄤ粨搴�)
+ {
+ allocateOrder.OrderType = 215;
+ }
+ else if (businessType == BusinessTypeEnum.澶栭儴浠撳簱璋冩櫤浠�)
+ {
+ 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)
{
Dt_AllocateOrderDetail orderDetail = new Dt_AllocateOrderDetail
{
- WarehouseCode = detailDto.WarehouseCode,
+ WarehouseCode = model.toWarehouse,
MaterielCode = detailDto.MaterialCode,
+ MaterielName = materialName,
LineNo = detailDto.LineNo,
- OrderQuantity = detailDto.Qty,
+ OrderQuantity = barcodeDto.Qty,
SupplyCode = barcodeDto.SupplyCode,
Unit = detailDto.Unit,
Barcode = barcodeDto.Barcode,
BatchNo = barcodeDto.BatchNo,
BarcodeQty = barcodeDto.Qty,
- BarcodeUnit = barcodeDto.Unit
+ BarcodeUnit = barcodeDto.Unit,
+ ValidDate = barcodeDto.validDate,
+ BoxSN = barcodeDto.BoxSN
};
+ if (businessType == BusinessTypeEnum.鏅轰粨璋冨閮ㄤ粨搴� || businessType == BusinessTypeEnum.鏅轰粨璋冩櫤浠�)
+ {
+ orderDetail.WarehouseCode = model.fromWarehouse;
+ }
allocateOrder.Details.Add(orderDetail);
}
}
@@ -78,15 +104,21 @@
{
Dt_AllocateOrderDetail orderDetail = new Dt_AllocateOrderDetail
{
- WarehouseCode = detailDto.WarehouseCode,
+ WarehouseCode = model.toWarehouse,
MaterielCode = detailDto.MaterialCode,
LineNo = detailDto.LineNo,
OrderQuantity = detailDto.Qty,
- Unit = detailDto.Unit
+ Unit = detailDto.Unit,
+ BarcodeUnit =detailDto.Unit,
+ BarcodeQty=detailDto.Qty,
+ MaterielName = materialName
};
+ if (businessType == BusinessTypeEnum.鏅轰粨璋冨閮ㄤ粨搴� || businessType == BusinessTypeEnum.鏅轰粨璋冩櫤浠�)
+ {
+ orderDetail.WarehouseCode = model.fromWarehouse;
+ }
allocateOrder.Details.Add(orderDetail);
}
- allocateOrder.Details.AddRange(allocateOrder.Details);
}
var content = await Service.ReceiveAllocateOrder(allocateOrder, model.OperationType);
--
Gitblit v1.9.3