From 8db84793a19b02df61c8fb9e5d539c57b827da45 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期五, 28 六月 2024 16:53:58 +0800
Subject: [PATCH] 修改问题
---
Wms/Wms/Controllers/UpApiController.cs | 142 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 135 insertions(+), 7 deletions(-)
diff --git a/Wms/Wms/Controllers/UpApiController.cs b/Wms/Wms/Controllers/UpApiController.cs
index 371825e..e602b17 100644
--- a/Wms/Wms/Controllers/UpApiController.cs
+++ b/Wms/Wms/Controllers/UpApiController.cs
@@ -33,8 +33,9 @@
private readonly IStockCheckServer _stockCheckSvc;//鐩樼偣鍗昐vc
private readonly IProcurePlanServer _procurePlanSvc;//閲囪喘鍗昐vs
private readonly IRcsServer _rcsserver;//RCS鐩稿叧浠诲姟
+ private readonly INoticeServer _noticeSvc;//浜屾ゼ鍗曟嵁鐩稿叧
- public UpApiController(IOptions<ApiUrlConfig> setting,IExportNoticeServer exNoticeSvc,IArrivalNoticeServer arrivalNoticeServer,IStockCheckServer stockCheckSvc, IProcurePlanServer procurePlanSvc,IRcsServer rcsserver)
+ public UpApiController(IOptions<ApiUrlConfig> setting,IExportNoticeServer exNoticeSvc,IArrivalNoticeServer arrivalNoticeServer,IStockCheckServer stockCheckSvc, IProcurePlanServer procurePlanSvc,IRcsServer rcsserver, INoticeServer noticeSvc)
{
_config = setting.Value;
_exNoticeSvc = exNoticeSvc;
@@ -42,7 +43,7 @@
_stockCheckSvc = stockCheckSvc;
_procurePlanSvc = procurePlanSvc;
_rcsserver = rcsserver;
-
+ _noticeSvc = noticeSvc;
}
#endregion
@@ -403,11 +404,16 @@
}
}
- //RCS鍙《
+ #region 浜屾ゼ涓氬姟
+ /// <summary>
+ /// RCS鍙《
+ /// </summary>
+ /// <param name="pallmsg"></param>
+ /// <returns></returns>
[HttpPost]
public IActionResult GetPalletNo(Pallnetmsg pallmsg)
{
- var result = new ErpModel { Success = -1, Message = "",};
+ var result = new ErpModel { Success = -1, Message = "", };
try
{
if (string.IsNullOrWhiteSpace(pallmsg.Location))
@@ -415,9 +421,12 @@
result.Message = "鍙枡浣嶇疆涓虹┖锛�";
return Ok(result);
}
+ if (string.IsNullOrWhiteSpace(pallmsg.Type))
+ {
+ result.Message = "浠诲姟绫诲瀷涓虹┖锛�";
+ return Ok(result);
+ }
_rcsserver.GetPalletNo(pallmsg);
-
-
result.Success = 0;
result.Message = "鍙《鎴愬姛锛�";
return Ok(result);
@@ -429,13 +438,32 @@
}
}
- //RCS鐢宠鍌ㄤ綅
+ /// <summary>
+ /// RCS鐢宠鍌ㄤ綅
+ /// </summary>
+ /// <param name="pallmsg"></param>
+ /// <returns></returns>
[HttpPost]
public IActionResult ApplyLocatNo(Pallnetmsg pallmsg)
{
var result = new ErpModel { Success = -1, Message = "" };
try
{
+ if (string.IsNullOrWhiteSpace(pallmsg.Location))
+ {
+ result.Message = "鐢宠浣嶇疆涓虹┖锛�";
+ return Ok(result);
+ }
+ if (string.IsNullOrWhiteSpace(pallmsg.Type))
+ {
+ result.Message = "浠诲姟绫诲瀷涓虹┖锛�";
+ return Ok(result);
+ }
+ if (string.IsNullOrWhiteSpace(pallmsg.Palletno))
+ {
+ result.Message = "鐢宠鎵樼洏鍙蜂负绌猴紒";
+ return Ok(result);
+ }
_rcsserver.ApplyLocatNo(pallmsg);
result.Success = 0;
result.Message = "鐢宠鍌ㄤ綅鎴愬姛锛�";
@@ -449,6 +477,106 @@
}
}
+ /// <summary>
+ /// 鍏ュ簱鍗曟嵁涓嬪彂
+ /// </summary>
+ /// <param name="model">鍏ュ簱鍗曚俊鎭�</param>
+ /// <returns></returns>
+ //[Authorize]
+ [HttpPost]
+ public IActionResult CreateAsnWork(AsnInfo model)
+ {
+ var result = new ErpModel { Success = -1, Message = "" };
+ 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("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
+ }*/
+
+ result = _noticeSvc.CreateAsnWork(model);
+
+ return Ok(result);
+ }
+ catch (Exception e)
+ {
+ result.Message = e.Message;
+ return Ok(result);
+ }
+ }
+
+ /// <summary>
+ /// 浠诲姟瀹屾垚鍙嶉
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult RCSFinishTask(TaskModel model)
+ {
+ var result = new ErpModel { Success = -1, Message = "" };
+ 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("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
+ }*/
+
+ result = _noticeSvc.RCSFinishTask(model.TaskNo, model.Status);
+
+ return Ok(result);
+ }
+ catch (Exception e)
+ {
+ result.Message = e.Message;
+ return Ok(result);
+ }
+ }
+
+ /// <summary>
+ /// 鍑哄簱鍗曟嵁涓嬪彂
+ /// </summary>
+ /// <param name="model">鍑哄簱鍗曚俊鎭�</param>
+ /// <returns></returns>
+ //[Authorize]
+ [HttpPost]
+ public IActionResult CreateSoWork(SoInfo 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("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
+ }*/
+
+ SoResInfo result = _noticeSvc.CreateSoWork(model);
+ return Ok(result);
+
+ }
+ catch (Exception e)
+ {
+ return Ok(new ErpModel { Success = -1, Message = e.Message });
+ }
+ }
+ #endregion
+
//绠辩爜淇℃伅 鎵嬫寔缁勬墭鐢� (璧嬬爜鎴栬拷婧笅鍙戝埌wms)
//璐ㄦ缁撴灉涓嬪彂鎺ュ彛
--
Gitblit v1.8.0