From f2bc08e28dda7022202f07217f6a3c150f818af7 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期一, 20 一月 2025 08:32:16 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/liudongl/jc24-wms
---
Wms/Wms/Controllers/PdaAsnController.cs | 263 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 245 insertions(+), 18 deletions(-)
diff --git a/Wms/Wms/Controllers/PdaAsnController.cs b/Wms/Wms/Controllers/PdaAsnController.cs
index 409b128..1a909b5 100644
--- a/Wms/Wms/Controllers/PdaAsnController.cs
+++ b/Wms/Wms/Controllers/PdaAsnController.cs
@@ -1,10 +1,13 @@
锘縰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;
namespace Wms.Controllers
@@ -16,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 鍏敤鏂规硶
@@ -37,6 +66,33 @@
var models = _PdaAsnSvc.GetArrivalNotices(model);
return Ok(new { code = 0, msg = "鍏ュ簱鍗曚俊鎭�", data = models });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁鍏ュ簱鍗曡幏鍙栧叆搴撴�诲崟淇℃伅
+ /// </summary>
+ /// <param name="model">ASNNo:鍏ュ簱鍗曞彿</param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult GetArrivalNotice(ArrivalNoticeVm model)
+ {
+ try
+ {
+ var models = _PdaAsnSvc.GetArrivalNotice(model);
+
+ if (models == null)
+ {
+ return Ok(new { code = 1, msg = "鍏ュ簱鍗曚俊鎭�", data = models });
+ }
+ else
+ {
+ return Ok(new { code = 0, msg = "鍏ュ簱鍗曚俊鎭�", data = models });
+ }
}
catch (Exception e)
{
@@ -132,29 +188,18 @@
}
/// <summary>
- /// 缁戝畾鎵樼洏
+ /// 鏍规嵁鎵樼洏鍙锋垨绠辩爜鑾峰彇鎵樼洏淇℃伅
/// </summary>
- /// <param name="model"></param>
+ /// <param name="model">PalletNo:鎵樼洏鍙�</param>
/// <returns></returns>
[HttpPost]
- public IActionResult BindPallet(PdaPalletBindVm model)
+ public IActionResult GetPalletBindInfo(BllPalletBind model)
{
try
{
- var claimsIdentity = this.User.Identity as ClaimsIdentity;
- if (claimsIdentity == null)
- {
- throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
- }
- string UserId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
- if (string.IsNullOrWhiteSpace(UserId))
- {
- throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
- }
- _PdaAsnSvc.BindPallet(model, int.Parse(UserId),model.Origin);
+ var models = _PdaAsnSvc.GetPalletBindInfo(model);
- return Ok(new { code = 0, msg = "缁戝畾鎴愬姛!" });
-
+ return Ok(new { code = 0, msg = "鎵樼洏淇℃伅", data = models });
}
catch (Exception e)
{
@@ -186,6 +231,47 @@
model.CreateUser = int.Parse(UserId);
var strMsg = _PdaAsnSvc.DelBoxInfo(model);
+
+ 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">ID\鎵樼洏鍙�</param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult DelPalletBind(BllPalletBind model)
+ {
+ try
+ {
+ var claimsIdentity = this.User.Identity as ClaimsIdentity;
+ if (claimsIdentity == null)
+ {
+ throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
+ }
+ string UserId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
+ if (string.IsNullOrWhiteSpace(UserId))
+ {
+ throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
+ }
+
+ model.CreateUser = int.Parse(UserId);
+
+ var strMsg = _PdaAsnSvc.DelPalletBind(model);
if (strMsg == "")
{
@@ -352,6 +438,26 @@
return Ok(new { code = 1, msg = e.Message });
}
}
+
+ /// <summary>
+ /// 楠岃瘉鍌ㄤ綅(鍦扮爜)鏄惁鍙敤
+ /// </summary>
+ /// <param name="model">LocatNo鍌ㄤ綅鍦板潃</param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult CheckLocatNo(PalletBindVm model)
+ {
+ try
+ {
+ var result = _PdaAsnSvc.CheckLocatNo(model.LocatNo);
+
+ return Ok(new { code = 0, msg = "楠岃瘉鎴愬姛!", data = result });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
#endregion
#region 闆剁鍏ュ簱
@@ -410,5 +516,126 @@
}
#endregion
+
+ #region 缁勬墭
+ /// <summary>
+ /// 鏍规嵁绠辩爜鑾峰彇鏍囩绠辩爜淇℃伅
+ /// </summary>
+ /// <param name="model">BoxNo:绠卞彿</param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult GetBindBoxInfos(BoxInfoVm model)
+ {
+ try
+ {
+ var models = _PdaAsnSvc.GetBindBoxInfos(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 });
+ }
+ }
+
+ /// <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)
+ {
+ try
+ {
+ var models = _PdaAsnSvc.GetBindArrivalNoticeDetails(model);
+
+ return Ok(new { code = 0, msg = "鍏ュ簱鍗曟槑缁嗕俊鎭�", data = models });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
+
+ /// <summary>
+ /// 缁戝畾鎵樼洏
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult BindPallet(PdaPalletBindVm model)
+ {
+ try
+ {
+ var claimsIdentity = this.User.Identity as ClaimsIdentity;
+ if (claimsIdentity == null)
+ {
+ throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
+ }
+ string UserId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
+ if (string.IsNullOrWhiteSpace(UserId))
+ {
+ throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
+ }
+ _PdaAsnSvc.BindPallet(model, int.Parse(UserId), model.Origin);
+
+ return Ok(new { code = 0, msg = "缁戝畾鎴愬姛!" });
+
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
+ #endregion
+
+ #region 骞冲簱鍏ュ簱
+ /// <summary>
+ /// 骞冲簱纭鍏ュ簱
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult ConfirmInStock(PalletBindVm model)
+ {
+ try
+ {
+ var claimsIdentity = this.User.Identity as ClaimsIdentity;
+ if (claimsIdentity == null)
+ {
+ throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
+ }
+ string UserId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
+ if (string.IsNullOrWhiteSpace(UserId))
+ {
+ throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
+ }
+ model.CreateUser = int.Parse(UserId);
+ _PdaAsnSvc.ConfirmInStock(model);
+
+ return Ok(new { code = 0, msg = "鍏ュ簱鎴愬姛!" });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
+ #endregion
}
}
--
Gitblit v1.8.0