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/Outbound/OutboundOrderController.cs | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 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/Outbound/OutboundOrderController.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/Outbound/OutboundOrderController.cs"
index 366a6a4..8dd9ee3 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/Outbound/OutboundOrderController.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/Outbound/OutboundOrderController.cs"
@@ -2,14 +2,19 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
+using System.Threading.Tasks;
+using WIDESEA_Common.OrderEnum;
using WIDESEA_Core;
using WIDESEA_Core.Attributes;
using WIDESEA_Core.BaseController;
using WIDESEA_Core.CodeConfigEnum;
+using WIDESEA_Core.Helper;
using WIDESEA_DTO.Inbound;
using WIDESEA_DTO.Outbound;
using WIDESEA_IOutboundService;
using WIDESEA_Model.Models;
+using WIDESEA_WMSServer.Controllers.Inbound;
namespace WIDESEA_WMSServer.Controllers.Outbound
{
@@ -20,9 +25,10 @@
[ApiController]
public class OutboundOrderController : ApiBaseController<IOutboundOrderService, Dt_OutboundOrder>
{
- public OutboundOrderController(IOutboundOrderService service) : base(service)
+ private readonly ILogger<OutboundOrderController> _logger;
+ public OutboundOrderController(IOutboundOrderService service, ILogger<OutboundOrderController> logger) : base(service)
{
-
+ _logger = logger;
}
/// <summary>
/// 鎺ユ敹MES鍑哄簱鍗曚俊鎭�
@@ -30,8 +36,9 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost, Route("ReceiveOutBoundOrder"), AllowAnonymous, MethodParamsValidate]
- public WebResponseContent ReceiveOutBoundOrder([FromBody] OutboundRequestModel model)
+ public async Task<WebResponseContent> ReceiveOutBoundOrder([FromBody] OutboundRequestModel model)
{
+ _logger.LogInformation("OutboundOrderController ReceiveOutBoundOrder: " + JsonConvert.SerializeObject(model));
Dt_OutboundOrder dt_OutboundOrder = new Dt_OutboundOrder() { Details = new List<Dt_OutboundOrderDetail>() };
foreach (var detailitem in model.details)
{
@@ -44,7 +51,11 @@
Unit = detailitem.unit,
WarehouseCode = detailitem.warehouseCode,
MoveQty = detailitem.moveQty,
- OrderQuantity = detailitem.qty
+ BarcodeMoveQty=detailitem.moveQty,
+ BarcodeQty=detailitem.qty,
+ BarcodeUnit=detailitem.unit,
+ OrderQuantity = detailitem.qty,
+ Remark = detailitem.remark??"",
};
dt_OutboundOrder.Details.Add(inboundOrderDetail);
}
@@ -52,8 +63,10 @@
dt_OutboundOrder.BusinessType = model.business_type;
dt_OutboundOrder.IsBatch = model.isBatch;
dt_OutboundOrder.FactoryArea = model.factoryArea;
+ dt_OutboundOrder.CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt();
+ dt_OutboundOrder.DepartmentName = model.lineName??"";
- var content = Service.ReceiveOutboundOrder(dt_OutboundOrder, model.operationType);
+ var content =await Service.ReceiveOutboundOrder(dt_OutboundOrder, model.operationType);
if (content.Status) return WebResponseContent.Instance.OK(200);
else return WebResponseContent.Instance.Error(content.Message);
@@ -62,7 +75,7 @@
/// <summary>
/// 鏍规嵁ID鑾峰彇鍑哄簱鍗�
/// </summary>ss
- [HttpPost, Route("GetById"), AllowAnonymous, MethodParamsValidate]
+ [HttpGet, Route("GetById"), AllowAnonymous, MethodParamsValidate]
public async Task<WebResponseContent> GetById(int id)
{
var order = await Service.GetById(id);
@@ -72,5 +85,11 @@
}
return WebResponseContent.Instance.OK(null, order);
}
+
+ [HttpGet, Route("GetOrderNoByPalletCode"), AllowAnonymous, MethodParamsValidate]
+ public WebResponseContent GetOrderNoByPalletCode(string palletCode)
+ {
+ return Service.GetOrderNoByPalletCode(palletCode);
+ }
}
}
--
Gitblit v1.9.3