From 7e4e747ae508578c15fc93a40a9cb0de289706bd Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期三, 26 十一月 2025 00:45:07 +0800
Subject: [PATCH] 提交
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs | 55 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 44 insertions(+), 11 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/Inbound/InboundOrderController.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/Inbound/InboundOrderController.cs"
index 7a1760d..fc6cf24 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/Inbound/InboundOrderController.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/Inbound/InboundOrderController.cs"
@@ -2,6 +2,7 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
using SqlSugar;
using System.Net;
using System.Threading.Tasks;
@@ -29,26 +30,34 @@
private readonly WIDESEA_IBasicService.IErpApiService erpApiService;
private readonly WIDESEA_IBasicService.IInvokeMESService _invokeMESService;
-
+
private readonly IESSApiService _eSSApiService;
private readonly ILocationInfoService _locationInfoService;
private readonly IDailySequenceService _dailySequenceService;
- public InboundOrderController(IInboundOrderService service, WIDESEA_IBasicService.IErpApiService erpApiService, WIDESEA_IBasicService.IInvokeMESService invokeMESService, IESSApiService eSSApiService, IDailySequenceService dailySequenceService, ILocationInfoService locationInfoService) : base(service)
+ private readonly IMaterialUnitService _materialUnitService;
+ private readonly ILogger<InboundOrderController> _logger;
+ public InboundOrderController(IInboundOrderService service, WIDESEA_IBasicService.IErpApiService erpApiService, WIDESEA_IBasicService.IInvokeMESService invokeMESService, IESSApiService eSSApiService, IDailySequenceService dailySequenceService, ILocationInfoService locationInfoService, ILogger<InboundOrderController> logger, IMaterialUnitService materialUnitService) : base(service)
{
this.erpApiService = erpApiService;
_invokeMESService = invokeMESService;
_eSSApiService = eSSApiService;
_dailySequenceService = dailySequenceService;
_locationInfoService = locationInfoService;
+ _logger = logger;
+ _materialUnitService = materialUnitService;
}
[HttpPost, Route("Test"), AllowAnonymous, MethodParamsValidate]
public async Task<WebResponseContent> Test()
{
-
- var sddd = _locationInfoService.AssignLocation();
- var code = sddd.LocationCode;
- // await _dailySequenceService.GetNextSequenceAsync();
+ // var purchaseToStockResult = await _materialUnitService.ConvertPurchaseToStockAsync("101001-00002", 10);
+
+ // var pdddurchaseToStockResult = await _materialUnitService.ConvertPurchaseToStockAsync("100513-00210", 10);
+
+ //var sddd = _locationInfoService.AssignLocation();
+ //var code = sddd.LocationCode;
+ //var ssss=await _dailySequenceService.GetNextSequenceAsync();
+ //var ddddssss = "WSLOT" + DateTime.Now.ToString("yyyyMMddHHmmss") + ssss.ToString().PadLeft(5, '0');
//erpApiService.GetSuppliersAsync();
//erpApiService.GetMaterialUnitAsync();
@@ -71,7 +80,7 @@
//await _eSSApiService.MoveContainerAsync(new WIDESEA_DTO.Basic.MoveContainerRequest
//{
// slotCode = "3-5",
- // containerCode = "A000008002"
+ // containerCode = "A000008009"
//});
//await erpApiService.GetSuppliersAsync();
@@ -88,10 +97,14 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost, Route("ReceiveInboundOrder"), AllowAnonymous, MethodParamsValidate]
- public WebResponseContent ReceiveInboundOrder([FromBody] InboundRequestModel model)
+ public async Task<WebResponseContent> ReceiveInboundOrder([FromBody] InboundRequestModel model)
{
+ if(model.inBounds == null || !model.inBounds.Any())
+ {
+ return WebResponseContent.Instance.Error("鍏ュ簱鍗曚笉鑳戒负绌�");
+ }
-
+ _logger.LogInformation("InboundOrderController ReceiveInboundOrder: " + JsonConvert.SerializeObject(model));
List<Dt_InboundOrder> inboundOrders = new List<Dt_InboundOrder>();
foreach (var item in model.inBounds)
@@ -133,7 +146,9 @@
BatchNo = detailitem.batchNo,
Unit = detailitem.unit,
WarehouseCode = detailitem.warehouseCode,
- OrderQuantity = detailitem.qty
+ OrderQuantity = detailitem.qty,
+ BarcodeUnit = detailitem.unit,
+ BarcodeQty = detailitem.qty,
};
dt_InboundOrder.Details.Add(inboundOrderDetail);
}
@@ -147,7 +162,7 @@
inboundOrders.Add(dt_InboundOrder);
}
- var content = Service.ReceiveInboundOrder(inboundOrders, model.operationType);
+ var content =await Service.ReceiveInboundOrder(inboundOrders, model.operationType);
if (content.Status) return WebResponseContent.Instance.OK(200);
else return WebResponseContent.Instance.Error(content.Message);
@@ -166,6 +181,12 @@
return content;
}
+
+ [HttpPost, Route("UndoPalletGroup"), AllowAnonymous, MethodParamsValidate]
+ public WebResponseContent UndoPalletGroup(string palletCode)
+ {
+ return Service.UndoPalletGroup(palletCode);
+ }
/// <summary>
///
/// </summary>
@@ -180,5 +201,17 @@
}
+ [HttpPost, Route("UnPalletQuantity"), AllowAnonymous, MethodParamsValidate]
+ public WebResponseContent UnPalletQuantity(string orderNo)
+ {
+ return Service.UnPalletQuantity(orderNo);
+ }
+
+ [HttpPost, Route("BatchOrderFeedbackToMes"), AllowAnonymous]
+ public async Task<WebResponseContent> BatchOrderFeedbackToMes([FromBody] BatchOrderFeedbackToMesDto request)
+ {
+ return await _invokeMESService.BatchOrderFeedbackToMes(request.orderNos, request.inout);
+ }
+
}
}
--
Gitblit v1.9.3