From 1b108e8d7335d5a5a59dfcf2f4eeef034a53b9b8 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期五, 06 九月 2024 12:33:06 +0800
Subject: [PATCH] 用户管理页角色问题和密码增加验证问题
---
Wms/Wms/Controllers/PdaSoController.cs | 46 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/Wms/Wms/Controllers/PdaSoController.cs b/Wms/Wms/Controllers/PdaSoController.cs
index 006663b..7e4d432 100644
--- a/Wms/Wms/Controllers/PdaSoController.cs
+++ b/Wms/Wms/Controllers/PdaSoController.cs
@@ -10,7 +10,6 @@
using Model.ModelVm.PdaVm;
using WMS.IBLL.IPdaServer;
using Model.ModelDto;
-using Model.ModelVm;
using Wms.Tools;
using Utility;
using System.Security.Cryptography;
@@ -49,7 +48,7 @@
}
/// <summary>
- /// 鑾峰彇鍗曟嵁鍒楄〃
+ /// 鏍规嵁鎵樼洏鍙疯幏鍙栧崟鎹垪琛�
/// </summary>
/// <param name="model">PalletNo:鎵樼洏鍙�</param>
/// <returns></returns>
@@ -60,14 +59,25 @@
}
/// <summary>
+ /// 鑾峰彇PDA骞冲簱鍑哄簱鍗曟嵁鍒楄〃
+ /// </summary>
+ /// <param name="type"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public async Task<List<string>> GetRunNoticeList(PdaSoVm model)
+ {
+ return await _pdaSoSvc.GetRunNoticeList(model.Type);
+ }
+
+ /// <summary>
/// 鑾峰彇鐗╂枡-鎵规淇℃伅
/// </summary>
/// <param name="model">PalletNo:鎵樼洏鐮併�丼oNo:鍗曟嵁鍙�</param>
/// <returns></returns>
[HttpPost]
- public async Task GetSoSkuLotNoListByPallet(PdaSoVm model)
+ public async Task<List<DetailIdSkuLotNo>> GetSoSkuLotNoListByPallet(PdaSoVm model)
{
- var models = await _pdaSoSvc.GetSoSkuLotNoListByPallet(model.PalletNo, model.SoNo);
+ return await _pdaSoSvc.GetSoSkuLotNoListByPallet(model.PalletNo, model.SoNo);
}
/// <summary>
@@ -89,18 +99,20 @@
[HttpPost]
public async Task<OutPdaInfo> GetPlanAndFinishQty(PdaSoVm model)
{
- return await _pdaSoSvc.GetPlanAndFinishQty(model.SoDetailId);
+ var data = await _pdaSoSvc.GetPlanAndFinishQty(model.SoDetailId);
+ return data;
}
/// <summary>
/// 鑾峰彇绠辩爜淇℃伅锛堟牴鎹鐮佸湪搴撳瓨绠辩爜鏄庣粏涓煡璇級
/// </summary>
- /// <param name="model">BoxNo:绠辩爜鍙�</param>
+ /// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public async Task<dynamic> GetDataComBoxInfo(PdaSoVm model)
+ public async Task<List<BoxInfo>> GetDataComBoxInfo(PdaSoVm model)
{
- return await _pdaSoSvc.GetDataComBoxInfo(model.SoDetailId, model.PalletNo, model.BoxNo, model.BoxNo3);
+ var data = await _pdaSoSvc.GetDataComBoxInfo(model.SoDetailId, model.PalletNo, model.BoxNo, model.BoxNo3);
+ return data;
}
/// <summary>
@@ -109,7 +121,7 @@
/// <param name="model">BoxNo:绠辩爜鍙�</param>
/// <returns></returns>
[HttpPost]
- public async Task<dynamic> GetAllotPlnInfo(PdaSoVm model)
+ public async Task<List<BoxInfo>> GetAllotPlnInfo(PdaSoVm model)
{
return await _pdaSoSvc.GetAllotPlnInfo(model.SoDetailId, model.PalletNo);
}
@@ -157,12 +169,26 @@
/// <param name="palletNo">鎵樼洏鍙�</param>
/// <returns></returns>
[HttpGet]
- public async Task<dynamic> GetPingKuInfoByPallet(string soNo, string palletNo)
+ public async Task<List<BoxInfo>> GetPingKuInfoByPallet(string soNo, string palletNo)
{
return await _pdaSoSvc.GetPingKuInfoByPallet(soNo, palletNo);
}
/// <summary>
+ /// 鑾峰彇骞冲簱鎵樼洏浣嶇疆淇℃伅
+ /// </summary>
+ /// <param name="soNo">鍑哄簱鍗曞彿</param>
+ /// <param name="SkuNo">鐗╂枡缂栫爜</param>
+ /// <param name="LotNo">鎵规</param>
+ /// <returns></returns>
+ [HttpGet]
+ public async Task<List<BoxInfo>> GetPingKuLocationInfo(string soNo,string SkuNo,string LotNo)
+ {
+ return await _pdaSoSvc.GetPingKuLocationInfo(soNo, SkuNo, LotNo);
+ }
+
+
+ /// <summary>
/// 骞冲簱鍑哄簱
/// </summary>
/// <param name="soNo">鍑哄簱鍗曞彿</param>
--
Gitblit v1.8.0