From 5b4f00ff3ea04a3246a8f6f86bdefe749fcfd0c4 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期二, 26 三月 2024 08:24:28 +0800
Subject: [PATCH] 合并代码
---
Wms/Wms/Controllers/PdaAsnController.cs | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 47 insertions(+), 0 deletions(-)
diff --git a/Wms/Wms/Controllers/PdaAsnController.cs b/Wms/Wms/Controllers/PdaAsnController.cs
index f1067ab..9fdbda8 100644
--- a/Wms/Wms/Controllers/PdaAsnController.cs
+++ b/Wms/Wms/Controllers/PdaAsnController.cs
@@ -46,6 +46,33 @@
}
/// <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)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
+
+ /// <summary>
/// 鍒ゆ柇鎵樼洏鏄惁鍙敤
/// </summary>
/// <param name="model">PalletNo锛氭墭鐩樻潯鐮�</param>
@@ -383,6 +410,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 闆剁鍏ュ簱
--
Gitblit v1.8.0