From c34986a09e6f98fc8c031bd15f847a71efa18349 Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期五, 23 五月 2025 14:24:08 +0800
Subject: [PATCH] Merge branch 'master' into csc
---
Wms/Wms/Controllers/PdaAsnController.cs | 122 +++++++++++++++++++++++++++++-----------
1 files changed, 88 insertions(+), 34 deletions(-)
diff --git a/Wms/Wms/Controllers/PdaAsnController.cs b/Wms/Wms/Controllers/PdaAsnController.cs
index e9c7604..3987256 100644
--- a/Wms/Wms/Controllers/PdaAsnController.cs
+++ b/Wms/Wms/Controllers/PdaAsnController.cs
@@ -1,13 +1,22 @@
锘縰sing Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
+using Model.InterFaceModel;
+using Model.ModelDto.BllAsnDto;
using Model.ModelDto.DataDto;
using Model.ModelVm;
using Model.ModelVm.BllAsnVm;
using Model.ModelVm.PdaVm;
+using Newtonsoft.Json;
using System;
using System.Security.Claims;
using Utility;
+using Utility.Tools;
+using Wms.Tools;
+using WMS.BLL.LogServer;
using WMS.Entity.BllAsnEntity;
+using WMS.Entity.DataEntity;
using WMS.IBLL.IPdaServer;
namespace Wms.Controllers
@@ -17,11 +26,15 @@
[Authorize]
public class PdaAsnController : ControllerBase
{
+ private readonly ApiUrlConfig _config; //鎺ュ彛浜や簰璺緞
private readonly IPdaAsnServer _PdaAsnSvc;
+ private readonly UserManager _userManager;
- public PdaAsnController(IPdaAsnServer pdaAsnSvc)
+ public PdaAsnController(IOptions<ApiUrlConfig> setting, IPdaAsnServer pdaAsnSvc,UserManager userManager)
{
- _PdaAsnSvc = pdaAsnSvc;
+ _config = setting.Value;
+ _PdaAsnSvc = pdaAsnSvc;
+ _userManager = userManager;
}
@@ -33,8 +46,6 @@
/// 缁戝畾鎵樼洏
/// </summary>
/// <param name="model"></param>
- /// <returns></returns>
- /// <returns></returns>
/// <returns></returns>
[HttpPost]
[UnitOfWork]
@@ -94,33 +105,6 @@
var models = _PdaAsnSvc.GetNoPasteAsnNoStrList();
return Ok(new { code = 0, msg = "鍏ュ簱鍗曚俊鎭�", data = models });
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
- }
-
- /// <summary>
- /// 鍒ゆ柇鎵樼洏鏄惁鍙敤
- /// </summary>
- /// <param name="model">PalletNo锛氭墭鐩樻潯鐮�</param>
- /// <returns></returns>
- [HttpPost]
- public IActionResult IsEnablePalletNo(PalletBindVm model)
- {
- try
- {
- var strMsg = _PdaAsnSvc.IsEnablePalletNo(model.PalletNo);
-
- if (strMsg == "")
- {
- return Ok(new { code = 0, msg = "鎵樼洏鍙敤!" });
- }
- else
- {
- return Ok(new { code = 1, msg = strMsg });
- }
}
catch (Exception e)
{
@@ -198,7 +182,7 @@
{
try
{
- var models = _PdaAsnSvc.GetBindBoxInfos(model);
+ var models = _PdaAsnSvc.GetBindBoxInfos(model, _config.BoxHost + _config.GetBoxUrl);
return Ok(new { code = 0, msg = "鏍囩绠辩爜淇℃伅", data = models });
}
@@ -208,11 +192,81 @@
}
}
-
+ /// <summary>
+ /// 鍒ゆ柇鎵樼洏鏄惁鍙敤 鍏敤鏂规硶
+ /// </summary>
+ /// <param name="model">PalletNo锛氭墭鐩樻潯鐮�</param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult IsEnablePalletNo(PalletBindVm model)
+ {
+ try
+ {
+ var strMsg = _PdaAsnSvc.IsEnablePalletNo(model.PalletNo);
- //---------------------------------------------缁勬墭鏀惰揣椤甸潰----------------------------------------------------------------------
+ if (strMsg == "")
+ {
+ return Ok(new { code = 0, msg = "鎵樼洏鍙敤!" });
+ }
+ else
+ {
+ return Ok(new { code = 1, msg = strMsg });
+ }
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
+ /// <summary>
+ /// 鏍规嵁鍗曟嵁鑾峰彇鏍囩鏁伴噺
+ /// </summary>
+ /// <param name="model">ASNNo锛氬叆搴撳崟銆丄SNDetailNo锛氬叆搴撳崟鏄庣粏鍙�</param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult GetBoxCountByAsn(PalletBindVm model)
+ {
+ try
+ {
+ var list = _PdaAsnSvc.GetBoxCountByAsn(model.ASNNo,model.ASNDetailNo);
+
+
+ return Ok(new { code = 0, msg = "鏍规嵁鍗曟嵁鑾峰彇鏍囩鏁伴噺", data= list});
+
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
+
+
+ //---------------------------------------------鐢宠鍏ュ簱椤甸潰----------------------------------------------------------------------
+
+
+ /// <summary>
+ /// 淇濆瓨鎸囧畾鐨勫偍浣�
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult SaveAppointLocate(PalletBindVm model)
+ {
+ try
+ {
+ _PdaAsnSvc.SaveAppointLocate(model.PalletNo, model.LocatNo, _userManager.UserId);
+
+ return Ok(new HttpReturnModel{ Success = "0", Message = "鎴愬姛鎸囧畾鍌ㄤ綅" });
+
+ }
+ catch (Exception e)
+ {
+ return Ok(new HttpReturnModel { Success = "1", Message = e.Message });
+ }
+ }
+
#endregion
--
Gitblit v1.8.0