From ec3e4e46da50f911b9d3eaef98b399962f3e4c70 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期五, 02 二月 2024 14:56:16 +0800
Subject: [PATCH] Merge branch 'wxw'
---
Wms/Wms/Controllers/BllAsnController.cs | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/Wms/Wms/Controllers/BllAsnController.cs b/Wms/Wms/Controllers/BllAsnController.cs
index 72f1158..fee616f 100644
--- a/Wms/Wms/Controllers/BllAsnController.cs
+++ b/Wms/Wms/Controllers/BllAsnController.cs
@@ -25,10 +25,11 @@
private readonly IOperationASNServer _logSvc; //鍏ュ簱搴撴搷浣滄棩蹇桽vc
private readonly IPalletUnbindServer _palletUnbind; //鎵樼洏瑙ｇ粦缁戝畾
private readonly IAuditLogServer _auditLog; //瀹℃牳璁板綍
+ private readonly IBllLabelBoxNoServer _labelBox; //绠辩爜鏍囩
#endregion
#region 鏋勯�犲嚱鏁�
- public BllAsnController(IArrivalNoticeServer arrivalNoticeSvc, IPalletBindServer palletBindSvc,IBllBoxInfoServer bllBoxInfoSvc, ITaskServer taskSvc,IOperationASNServer logSvc, IPalletUnbindServer palletUnbind,IAuditLogServer auditLog)
+ public BllAsnController(IArrivalNoticeServer arrivalNoticeSvc, IPalletBindServer palletBindSvc,IBllBoxInfoServer bllBoxInfoSvc, ITaskServer taskSvc,IOperationASNServer logSvc, IPalletUnbindServer palletUnbind,IAuditLogServer auditLog,IBllLabelBoxNoServer labelBox)
{
_arrivalNoticeSvc = arrivalNoticeSvc;
_PalletBindSvc = palletBindSvc;
@@ -37,6 +38,7 @@
_logSvc = logSvc;
_palletUnbind = palletUnbind;
_auditLog = auditLog;
+ _labelBox = labelBox;
}
#endregion
@@ -843,6 +845,39 @@
}
#endregion
+
+ #region 绠辩爜鏍囩
+
+ [HttpPost]
+ public IActionResult GetLabelBoxList(LabelBoxVm model)
+ {
+ try
+ {
+ var list = _labelBox.GetLabelBoxList(model, out int count);
+ return Ok(new { code = 0, count, msg = "绠辩爜鏍囩鍒楄〃", data = list });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, count = 0, msg = e.Message });
+ }
+ }
+
+ [HttpGet]
+ public IActionResult GetLabelBoxModel(int id)
+ {
+ try
+ {
+ var list = _labelBox.GetLabelBoxModel(id);
+ return Ok(new { code = 0, msg = "绠辩爜妯℃澘淇℃伅", data = list });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
+
+
+ #endregion
}
}
--
Gitblit v1.8.0