From 6ec432ea8db5aa36c7cc50f90a7e02676950a22f Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期一, 14 七月 2025 17:21:16 +0800
Subject: [PATCH] 修改问题
---
Wms/Wms/Controllers/PdaSoController.cs | 96 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 92 insertions(+), 4 deletions(-)
diff --git a/Wms/Wms/Controllers/PdaSoController.cs b/Wms/Wms/Controllers/PdaSoController.cs
index 7e4d432..77e01ba 100644
--- a/Wms/Wms/Controllers/PdaSoController.cs
+++ b/Wms/Wms/Controllers/PdaSoController.cs
@@ -13,6 +13,7 @@
using Wms.Tools;
using Utility;
using System.Security.Cryptography;
+using Model.InterFaceModel;
namespace Wms.Controllers
{
@@ -75,10 +76,35 @@
/// <param name="model">PalletNo:鎵樼洏鐮併�丼oNo:鍗曟嵁鍙�</param>
/// <returns></returns>
[HttpPost]
+ public async Task<List<DetailIdSkuLotNo>> GetSoSkuLotNoListBySo(PdaSoVm model)
+ {
+ return await _pdaSoSvc.GetSoSkuLotNoListBySo(model.SoNo);
+ }
+
+
+ /// <summary>
+ /// 鑾峰彇鐗╂枡-鎵规淇℃伅
+ /// </summary>
+ /// <param name="model">PalletNo:鎵樼洏鐮併�丼oNo:鍗曟嵁鍙�</param>
+ /// <returns></returns>
+ [HttpPost]
+ public async Task<List<string>> GetPalletListBySo(PdaSoVm model)
+ {
+ return await _pdaSoSvc.GetPalletListBySo(model.SoNo,model.SoDetailId);
+ }
+
+
+ /// <summary>
+ /// 鑾峰彇鐗╂枡-鎵规淇℃伅
+ /// </summary>
+ /// <param name="model">PalletNo:鎵樼洏鐮併�丼oNo:鍗曟嵁鍙�</param>
+ /// <returns></returns>
+ [HttpPost]
public async Task<List<DetailIdSkuLotNo>> GetSoSkuLotNoListByPallet(PdaSoVm model)
{
return await _pdaSoSvc.GetSoSkuLotNoListByPallet(model.PalletNo, model.SoNo);
}
+
/// <summary>
/// 鑾峰彇鍑哄簱鍙ｃ�佽鏍笺�佸緟鎷ｅ強宸叉嫞鏁伴噺锛堟牴鎹嚭搴撳崟鏄庣粏ID銆佹墭鐩樺彿锛�
@@ -148,6 +174,25 @@
await _pdaSoSvc.SoSetQtyPick(model.SoNo, model.SoDetailId, model.PalletNo, model.PickQty, _userManager.UserId);
}
+ /// <summary>
+ /// 鏍规嵁绠辩爜鑾峰彇鏍囩绠辩爜淇℃伅锛堣溅闂村叆搴�-鑾峰彇WMS鐢熸垚鐨勭淇℃伅锛�
+ /// </summary>
+ /// <param name="boxNo">BoxNo:绠卞彿</param>
+ /// <returns></returns>
+ [HttpGet]
+ public IActionResult GetWmsBoxInfos(string boxNo)
+ {
+ try
+ {
+ var models = _pdaSoSvc.GetWmsBoxInfos(boxNo);
+
+ return Ok(new { code = 0, msg = "鏍囩绠辩爜淇℃伅", data = models });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
/// <summary>
/// 绌烘墭鍑哄簱
@@ -155,9 +200,18 @@
/// <param name="model">绌烘墭鐩樺嚭搴�</param>
/// <returns></returns>
[HttpPost]
- public async Task<string> IssuePlnOutHouse(OutModePalletVm model)
+ public async Task<IActionResult> IssuePlnOutHouse(OutModePalletVm model)
{
- return await _pdaSoSvc.IssuePlnOutHouse(model, _userManager.UserId, _config.WcsHost + _config.IssueComApiUrl);
+ try
+ {
+ await _pdaSoSvc.IssuePlnOutHouse(model, _userManager.UserId, _config.WcsHost + _config.IssueComApiUrl);
+ return Ok(new HttpReturnModel { Success = "0", Message = "涓嬪彂璇锋眰鎴愬姛" });
+ }
+ catch (Exception e)
+ {
+ return Ok(new HttpReturnModel { Success = "1", Message = e.Message });
+ }
+
}
@@ -251,7 +305,7 @@
[HttpPost]
public async Task SoSetPinPick(PdaSoVm model)
{
- await _pdaSoSvc.SoSetPinPick(model.SoNo, model.SoDetailId, model.PalletNo, model.BoxNo, model.BoxNo3, model.PickQty, model.PalletNoNew, _userManager.UserId);
+ await _pdaSoSvc.SoSetPinPick34(model.SoNo, model.SoDetailId, model.PalletNo, model.BoxNo, model.PalletNoNew, _userManager.UserId);
}
/// <summary>
/// 鎷兼墭鍑哄簱pda鎷ｈ揣-鏁伴噺
@@ -261,8 +315,42 @@
[HttpPost]
public async Task SoSetQtyPinPick(PdaSoVm model)
{
- await _pdaSoSvc.SoSetQtyPinPick(model.SoNo, model.SoDetailId, model.PalletNo, model.PickQty, model.PalletNoNew, _userManager.UserId);
+ await _pdaSoSvc.SoSetQtyPinPick34(model.SoNo, model.SoDetailId, model.PalletNo, model.PickQty, model.PalletNoNew, _userManager.UserId);
}
+
+ /// <summary>
+ /// 杞﹂棿pda鎷ｈ揣-鏍囩
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public async Task ChejianPick(PdaSoVm model)
+ {
+ if (_userManager.UserId == 0)
+ {
+ throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
+ }
+
+ await _pdaSoSvc.ChejianPick(model.PalletNo, model.BoxNo, _userManager.UserId);
+ }
+
+ /// <summary>
+ /// 杞﹂棿Pda鍑哄簱-鏁伴噺
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ [HttpPost]
+ public async Task ChejianPickNum(PdaSoVm model)
+ {
+ if (_userManager.UserId == 0)
+ {
+ throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
+ }
+
+ await _pdaSoSvc.ChejianPickNum(model, _userManager.UserId);
+ }
+
#endregion
#region JC23鐗堝彇鏍�
--
Gitblit v1.8.0