From eccda264142b905de36f93b4bac1da9136c19326 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期四, 04 七月 2024 10:18:27 +0800
Subject: [PATCH] Merge branch 'wxw'
---
Wms/Wms/Controllers/UpApiController.cs | 64 +++++++++++++++++++++++++++++++-
1 files changed, 62 insertions(+), 2 deletions(-)
diff --git a/Wms/Wms/Controllers/UpApiController.cs b/Wms/Wms/Controllers/UpApiController.cs
index e67646d..d187930 100644
--- a/Wms/Wms/Controllers/UpApiController.cs
+++ b/Wms/Wms/Controllers/UpApiController.cs
@@ -437,6 +437,66 @@
return Ok(result);
}
}
+ /// <summary>
+ /// 灏嗗噣妗舵敼涓鸿剰妗跺苟鎷夊埌鑴忔《鍖�
+ /// </summary>
+ /// <param name="pallmsg"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult ChangePalletStatus(Pallnetmsg pallmsg)
+ {
+ var result = new ErpModel { Success = -1, Message = "", };
+ try
+ {
+ if (string.IsNullOrWhiteSpace(pallmsg.PalletNo))
+ {
+ result.Message = "妗剁紪鍙蜂笉鑳戒负绌猴紒";
+ return Ok(result);
+ }
+ _rcsserver.ChangePalletStatus(pallmsg.PalletNo);
+ result.Success = 0;
+ result.Message = "鎿嶄綔鎴愬姛锛�";
+ return Ok(result);
+ }
+ catch (Exception e)
+ {
+ result.Message = e.Message;
+ return Ok(result);
+ }
+ }
+
+ /// <summary>
+ /// MES涓嬪彂娓呮礂閿佸畾鑴忔《
+ /// </summary>
+ /// <param name="pallmsg"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult CleanPallet(Pallnetmsg pallmsg)
+ {
+ var result = new ErpModel { Success = -1, Message = "", };
+ try
+ {
+ if (string.IsNullOrWhiteSpace(pallmsg.Location))
+ {
+ result.Message = "鍙枡浣嶇疆涓虹┖锛�";
+ return Ok(result);
+ }
+ if (string.IsNullOrWhiteSpace(pallmsg.PalletNo))
+ {
+ result.Message = "妗跺彿涓虹┖锛�";
+ return Ok(result);
+ }
+ _rcsserver.CleanPallet(pallmsg);
+ result.Success = 0;
+ result.Message = "鍙《鎴愬姛锛�";
+ return Ok(result);
+ }
+ catch (Exception e)
+ {
+ result.Message = e.Message;
+ return Ok(result);
+ }
+ }
/// <summary>
/// RCS鐢宠鍌ㄤ綅
@@ -459,7 +519,7 @@
result.Message = "浠诲姟绫诲瀷涓虹┖锛�";
return Ok(result);
}
- if (string.IsNullOrWhiteSpace(pallmsg.Palletno))
+ if (string.IsNullOrWhiteSpace(pallmsg.PalletNo))
{
result.Message = "鐢宠鎵樼洏鍙蜂负绌猴紒";
return Ok(result);
@@ -566,7 +626,7 @@
throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
}*/
- SoResInfo result = _exNoticeSvc.ErpAddExportNotice(model);
+ SoResInfo result = _noticeSvc.CreateSoWork(model);
return Ok(result);
}
--
Gitblit v1.8.0