From 236ce686ed03f6cb786a5acd7492339bc2ea16ad Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期五, 07 二月 2025 11:03:14 +0800
Subject: [PATCH] Merge branch 'zwc'
---
Wms/Wms/Controllers/PdaAsnController.cs | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 52 insertions(+), 3 deletions(-)
diff --git a/Wms/Wms/Controllers/PdaAsnController.cs b/Wms/Wms/Controllers/PdaAsnController.cs
index 9fdbda8..1a909b5 100644
--- a/Wms/Wms/Controllers/PdaAsnController.cs
+++ b/Wms/Wms/Controllers/PdaAsnController.cs
@@ -1,10 +1,12 @@
锘縰sing Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
using Model.ModelVm;
using Model.ModelVm.BllAsnVm;
using Model.ModelVm.PdaVm;
using System;
using System.Security.Claims;
+using Wms.Tools;
using WMS.Entity.BllAsnEntity;
using WMS.IBLL.IPdaServer;
@@ -17,11 +19,37 @@
{
#region 渚濊禆娉ㄥ叆
private readonly IPdaAsnServer _PdaAsnSvc;
+ private readonly ApiUrlConfig _config; //鎺ュ彛浜や簰璺緞
- public PdaAsnController(IPdaAsnServer pdaAsnSvc)
+ public PdaAsnController(IPdaAsnServer pdaAsnSvc, IOptions<ApiUrlConfig> setting)
{
- _PdaAsnSvc = pdaAsnSvc;
+ _PdaAsnSvc = pdaAsnSvc;
+ _config = setting.Value;
}
+ #endregion
+
+ #region MyRegion
+
+ /// <summary>
+ /// 鑾峰彇鍗曟嵁鏄庣粏鏄剧ず鐨勭墿鏂�
+ /// </summary>
+ /// <param name="model">Type:鍗曟嵁绫诲瀷</param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult GetArrivalNoticesInfo(ArrivalNoticeVm model)
+ {
+ try
+ {
+ var models = _PdaAsnSvc.GetArrivalNoticesInfo(model);
+
+ return Ok(new { code = 0, msg = "鍏ュ簱鍗曚俊鎭�", data = models });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
+
#endregion
#region 鍏敤鏂规硶
@@ -500,7 +528,7 @@
{
try
{
- var models = _PdaAsnSvc.GetBindBoxInfos(model);
+ var models = _PdaAsnSvc.GetBindBoxInfos(model, _config.BoxHost + _config.FuMaGetBoxUrl, _config.BoxHost + _config.FuMaGetTokenUrl);
return Ok(new { code = 0, msg = "鏍囩绠辩爜淇℃伅", data = models });
}
@@ -509,6 +537,27 @@
return Ok(new { code = 1, msg = e.Message });
}
}
+
+ /// <summary>
+ /// 鏍规嵁绠辩爜鑾峰彇鏍囩鏈�灏忚拷婧爜淇℃伅
+ /// </summary>
+ /// <param name="model">BoxNo:绠卞彿</param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult GetBindBoxInfo2s(BoxInfoVm model)
+ {
+ try
+ {
+ var models = _PdaAsnSvc.GetBindBoxInfo2s(model, _config.BoxHost + _config.FuMaGetBoxUrl, _config.BoxHost + _config.FuMaGetTokenUrl);
+
+ return Ok(new { code = 0, msg = "鏍囩绠辩爜淇℃伅", data = models });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
+
[HttpPost]
public IActionResult GetBindArrivalNoticeDetails(ArrivalNoticeVm model)
{
--
Gitblit v1.8.0