From 4a4c9c93c3ae8c809368dde96fe822a27fd86d53 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期五, 19 十二月 2025 19:09:28 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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/PDAController.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/PDAController.cs"
index 33d6641..96184ad 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/PDAController.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/PDAController.cs"
@@ -11,6 +11,7 @@
using System.IO;
using WIDESEA_Model.Models;
using System;
+using WIDESEA_IBasicService;
namespace WIDESEA_WMSServer.Controllers
{
@@ -24,12 +25,14 @@
private readonly IInboundService _inboundService;
private readonly IOutboundService _outboundService;
private readonly ITaskService _taskService;
+ private readonly IErpApiService _erpApiService;
- public PDAController(ITaskService taskService, IInboundService inboundService, IOutboundService outboundService)
+ public PDAController(ITaskService taskService, IInboundService inboundService, IOutboundService outboundService,IErpApiService erpApiService)
{
_inboundService = inboundService;
_outboundService = outboundService;
_taskService = taskService;
+ _erpApiService = erpApiService;
}
/// <summary>
@@ -109,5 +112,11 @@
}
}
+
+ [HttpPost, HttpGet, Route("GetMaterialUnitAsync"), AllowAnonymous]
+ public Task GetMaterialUnitAsync()
+ {
+ return _erpApiService.GetMaterialUnitAsync();
+ }
}
}
--
Gitblit v1.9.3