From 009e869b09a63efbc5e58e22f88ad0ed2a315e2b Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期日, 04 二月 2024 16:12:16 +0800
Subject: [PATCH] Merge branch 'yyk'
---
Wms/Wms/Controllers/PdaAsnController.cs | 75 +++++++++++++++++++++++++++++++++++++
1 files changed, 75 insertions(+), 0 deletions(-)
diff --git a/Wms/Wms/Controllers/PdaAsnController.cs b/Wms/Wms/Controllers/PdaAsnController.cs
index 1fd89c2..c70ef85 100644
--- a/Wms/Wms/Controllers/PdaAsnController.cs
+++ b/Wms/Wms/Controllers/PdaAsnController.cs
@@ -5,6 +5,7 @@
using Model.ModelVm.PdaVm;
using System;
using System.Security.Claims;
+using WMS.Entity.BllAsnEntity;
using WMS.IBLL.IPdaServer;
namespace Wms.Controllers
@@ -132,6 +133,26 @@
}
/// <summary>
+ /// 鏍规嵁鎵樼洏鍙锋垨绠辩爜鑾峰彇鎵樼洏淇℃伅
+ /// </summary>
+ /// <param name="model">PalletNo:鎵樼洏鍙�</param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult GetPalletBindInfo(BllPalletBind model)
+ {
+ try
+ {
+ var models = _PdaAsnSvc.GetPalletBindInfo(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">Id锛氱瀛愪富閿�</param>
@@ -155,6 +176,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 == "")
{
@@ -400,7 +462,20 @@
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>
/// 缁戝畾鎵樼洏
--
Gitblit v1.8.0