From cb020af49d74255d8d0a73f75eb7df42245d6ede Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期四, 15 八月 2024 16:16:20 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/JC26WMS
---
Wms/Wms/Controllers/PdaSoController.cs | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/Wms/Wms/Controllers/PdaSoController.cs b/Wms/Wms/Controllers/PdaSoController.cs
index 006663b..0056a0e 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;
@@ -65,9 +64,9 @@
/// <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 +88,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 +110,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);
}
--
Gitblit v1.8.0