From e8dff3d9ad3f39088886173da44fff6cc1ae3e13 Mon Sep 17 00:00:00 2001
From: DESKTOP-9BNTV8O <DESKTOP-9BNTV8O@163.com>
Date: 星期六, 14 十二月 2024 17:13:50 +0800
Subject: [PATCH] 修改问题
---
Wms/WMS.BLL/BllTransServer/RcsServer.cs | 18 +++
HTML/views/StatisticalReport/BoxInfor.html | 22 ++--
Wms/Wms/Controllers/DownApiController.cs | 208 ++++++++++++++++++++++++++++++++++++++--
3 files changed, 222 insertions(+), 26 deletions(-)
diff --git a/HTML/views/StatisticalReport/BoxInfor.html b/HTML/views/StatisticalReport/BoxInfor.html
index 49f2323..5dde6a5 100644
--- a/HTML/views/StatisticalReport/BoxInfor.html
+++ b/HTML/views/StatisticalReport/BoxInfor.html
@@ -220,17 +220,19 @@
{{# } }}
</script>
<script type="text/html" id="TempletStatus">
- {{# if(d.Status == '0') { }}
- <p>寰呭垎閰�</p>
- {{# } else if(d.Status == '1'){ }}
- <p>閮ㄥ垎鍒嗛厤</p>
- {{# } else if(d.Status == '2'){ }}
- <p>宸插垎閰�</p>
- {{# } else if(d.Status == '3') { }}
- <p>鐩樼偣閿佸畾</p>
+ {{# if(d.Status=='0'){ }}
+ <button class="layui-btn layui-btn-radius layui-btn-danger layui-btn-xs">寰呭垎閰�</button>
+ {{# } else if(d.Status == '1') { }}
+ <button class="layui-btn layui-btn-radius layui-btn-xs">閮ㄥ垎鍒嗛厤</button>
+ {{# } else if(d.Status == '2') { }}
+ <button class="layui-btn layui-btn-radius layui-btn-xs">宸插垎閰�</button>
+ {{# } else if(d.Status == '3') { }}
+ <button class="layui-btn layui-btn-radius layui-btn-xs">鐩樼偣閿佸畾</button>
{{# } else if(d.Status == '4') { }}
- <p>绉诲簱閿佸畾</p>
- {{# } }}
+ <button class="layui-btn layui-btn-radius layui-btn-xs">绉诲簱閿佸畾</button>
+ {{# } else if(d.Status == '5') { }}
+ <button class="layui-btn layui-btn-radius layui-btn-xs layui-btn-danger">寮傚父閿佸畾</button>
+ {{# } }}
</script>
<script type="text/html" id="toolbarDemo">
diff --git a/Wms/WMS.BLL/BllTransServer/RcsServer.cs b/Wms/WMS.BLL/BllTransServer/RcsServer.cs
index 9c651a2..0f0c2f1 100644
--- a/Wms/WMS.BLL/BllTransServer/RcsServer.cs
+++ b/Wms/WMS.BLL/BllTransServer/RcsServer.cs
@@ -7,6 +7,7 @@
using System.Linq;
using System.Security.Policy;
using System.Text;
+using System.Threading.Tasks;
using Utility.Tools;
using WMS.DAL;
using WMS.Entity.BllAsnEntity;
@@ -87,7 +88,6 @@
throw new Exception("鏆傛棤娣锋枡妗跺彲鍒嗛厤");
}
pallet.Status = "2";//鍒嗛厤鐘舵�� 0:寰呭垎閰嶏紝1锛氶儴鍒嗗垎閰� 锛� 2:宸插垎閰�
- pallet.LotNo = model.LotNo;//鎵规鍙�
//鏇存柊妗跺簱瀛樻槑缁�
Db.Updateable(pallet).ExecuteCommand();
@@ -348,6 +348,12 @@
}
var houseNo = deviceLocatInfo.WareHouseNo;//鐢宠鍌ㄤ綅璁惧鎵�鍦ㄨ溅闂寸紪鍙�
var noticeno = "0";//鍑哄叆搴撳崟鎹槑缁咺D
+ //妗跺簱瀛樹俊鎭�
+ var palletInfo = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == model.PalletNo);
+ if (palletInfo == null)
+ {
+ throw new Exception($"鏈煡璇㈠埌璇ユ《鐨勫簱瀛樹俊鎭紝PalletNo:{model.PalletNo}");
+ }
var storageLocat = Db.Queryable<SysStorageLocat>().Where(w => w.IsDel == "0" && w.Status == "0");
//寮�鍚簨鍔�
@@ -380,6 +386,9 @@
{
throw new Exception("璇ヨ溅闂撮娣峰尯鏆傛棤绌轰綑鍌ㄤ綅");
}
+ palletInfo.LotNo = model.LotNo;//鎵规鍙�
+ //鏇存柊妗跺簱瀛樹俊鎭�
+ Db.Updateable(palletInfo).ExecuteCommand();
taskMsg = "鎺ユ枡璁惧锛堥娣锋枡妗讹級鐢宠鍌ㄤ綅浠诲姟";
break;
@@ -440,7 +449,7 @@
SendDate = DateTime.Now, //鍙戦�佹椂闂�
//BackDate = DateTime.Now, //杩斿洖鏃堕棿
StartLocat = model.Location,//璧峰浣嶇疆
- EndLocat = model.Location,//鐩爣浣嶇疆
+ EndLocat = loction.LocatNo,//鐩爣浣嶇疆
PalletNo = model.PalletNo,//妗跺彿
IsSend = 1,//鏄惁鍙啀娆′笅鍙�
IsCancel = 1,//鏄惁鍙彇娑�
@@ -453,6 +462,7 @@
};
var task = new TaskDetial
{
+ Taskno = taskNo,//浠诲姟鍙�
Startport = model.Location,
Endport = loction.LocatNo,
Pallno = model.PalletNo,
@@ -825,6 +835,10 @@
#endregion
taskInfo.Status = "2";//鎵ц瀹屾垚
+ taskInfo.IsSend = 0;
+ taskInfo.IsCancel = 0;
+ taskInfo.IsFinish = 0;
+ taskInfo.FinishDate = DateTime.Now;//瀹屾垚鏃堕棿
//淇敼浠诲姟鐘舵��
Db.Updateable(taskInfo).ExecuteCommand();
diff --git a/Wms/Wms/Controllers/DownApiController.cs b/Wms/Wms/Controllers/DownApiController.cs
index 574632f..c567d93 100644
--- a/Wms/Wms/Controllers/DownApiController.cs
+++ b/Wms/Wms/Controllers/DownApiController.cs
@@ -19,6 +19,7 @@
using static Model.InterFaceModel.RCSModel;
using WMS.IBLL.IBllTransServer;
using Microsoft.Extensions.Logging;
+using ZXing.QrCode.Internal;
namespace Wms.Controllers
{
@@ -659,28 +660,43 @@
public IActionResult GetPalletNo(Pallnetmsg pallmsg)
{
var logStr = $@".\log\AGV\AGV鐢宠鍙《" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+ AgvResultModel resultModel = null;//杩斿洖淇℃伅
try
{
var jsonData = JsonConvert.SerializeObject(pallmsg);
- LogFile.SaveLogToFile($"AGV鐢宠鍙《锛�( {jsonData} ),", logStr);
+ LogFile.SaveLogToFile($"AGV鐢宠鍙《-璇锋眰鎶ユ枃锛�( {jsonData} ),", logStr);
if (string.IsNullOrWhiteSpace(pallmsg.Location))
{
- return Ok(new AgvResultModel { code = "1", message = "鍙枡浣嶇疆涓虹┖锛�", data = "", reqCode = "" });
+ resultModel = new AgvResultModel { code = "1", message = "鍙枡浣嶇疆涓虹┖!", data = "", reqCode = "" };
+ var jsonData3 = JsonConvert.SerializeObject(resultModel);
+ LogFile.SaveLogToFile($"AGV鐢宠鍙《-杩斿洖鎶ユ枃锛�( {jsonData3} ),", logStr);
+ return Ok(resultModel);
}
if (string.IsNullOrWhiteSpace(pallmsg.Type))
{
- return Ok(new AgvResultModel { code = "1", message = "浠诲姟绫诲瀷涓虹┖锛�", data = "", reqCode = "" });
+ resultModel = new AgvResultModel { code = "1", message = "浠诲姟绫诲瀷涓虹┖!", data = "", reqCode = "" };
+ var jsonData4 = JsonConvert.SerializeObject(resultModel);
+ LogFile.SaveLogToFile($"AGV鐢宠鍙《-杩斿洖鎶ユ枃锛�( {jsonData4} ),", logStr);
+ return Ok(resultModel);
}
string taskNo = "";
+ //鍏蜂綋澶勭悊鏂规硶
_rcsserver.GetPalletNo(pallmsg, _config.AgvHost + _config.GenAgvSchedulingTask, out taskNo);
- return Ok(new AgvResultModel { code = "0", message = "鍙《鎴愬姛", data = taskNo, reqCode = "" });
+
+ resultModel = new AgvResultModel { code = "0", message = "鍙《鎴愬姛!", data = taskNo, reqCode = "" };
+ var jsonData2 = JsonConvert.SerializeObject(resultModel);
+ LogFile.SaveLogToFile($"AGV鐢宠鍙《-杩斿洖鎶ユ枃锛�( {jsonData2} ),", logStr);
+ return Ok(resultModel);
}
catch (Exception e)
{
LogFile.SaveLogToFile($"AGV鐢宠鍙《寮傚父锛�( {e.Message} ),", logStr);
- return Ok(new AgvResultModel { code = "1", message = e.Message, data = "", reqCode = "" });
+ resultModel = new AgvResultModel { code = "1", message = e.Message, data = "", reqCode = "" };
+ var jsonData2 = JsonConvert.SerializeObject(resultModel);
+ LogFile.SaveLogToFile($"AGV鐢宠鍙《-杩斿洖鎶ユ枃锛�( {jsonData2} ),", logStr);
+ return Ok(resultModel);
}
}
@@ -693,34 +709,50 @@
public IActionResult ApplyLocatNo(Pallnetmsg pallmsg)
{
var logStr = $@".\log\AGV\AGV鐢宠鍌ㄤ綅" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
-
+ AgvResultModel resultModel = null;//杩斿洖淇℃伅
try
{
var jsonData = JsonConvert.SerializeObject(pallmsg);
- LogFile.SaveLogToFile($"AGV鐢宠鍌ㄤ綅锛�( {jsonData} ),", logStr);
+ LogFile.SaveLogToFile($"AGV鐢宠鍌ㄤ綅-璇锋眰鎶ユ枃锛�( {jsonData} ),", logStr);
if (string.IsNullOrWhiteSpace(pallmsg.Location))
{
- return Ok(new AgvResultModel { code = "1", message = "鐢宠浣嶇疆涓虹┖锛�", data = "", reqCode = "" });
+ resultModel = new AgvResultModel { code = "1", message = "鐢宠浣嶇疆涓虹┖!", data = "", reqCode = "" };
+ var jsonData3 = JsonConvert.SerializeObject(resultModel);
+ LogFile.SaveLogToFile($"AGV鐢宠鍌ㄤ綅-杩斿洖鎶ユ枃锛�( {jsonData3} ),", logStr);
+ return Ok(resultModel);
}
if (string.IsNullOrWhiteSpace(pallmsg.Type))
{
- return Ok(new AgvResultModel { code = "1", message = "浠诲姟绫诲瀷涓虹┖锛�", data = "", reqCode = "" });
+ resultModel = new AgvResultModel { code = "1", message = "浠诲姟绫诲瀷涓虹┖!", data = "", reqCode = "" };
+ var jsonData3 = JsonConvert.SerializeObject(resultModel);
+ LogFile.SaveLogToFile($"AGV鐢宠鍌ㄤ綅-杩斿洖鎶ユ枃锛�( {jsonData3} ),", logStr);
+ return Ok(resultModel);
}
if (string.IsNullOrWhiteSpace(pallmsg.PalletNo))
{
- return Ok(new AgvResultModel { code = "1", message = "鐢宠鎵樼洏鍙蜂负绌猴紒", data = "", reqCode = "" });
+ resultModel = new AgvResultModel { code = "1", message = "鐢宠妗跺彿涓虹┖!", data = "", reqCode = "" };
+ var jsonData3 = JsonConvert.SerializeObject(resultModel);
+ LogFile.SaveLogToFile($"AGV鐢宠鍌ㄤ綅-杩斿洖鎶ユ枃锛�( {jsonData3} ),", logStr);
+ return Ok(resultModel);
}
string taskNo = "";
+ //鍏蜂綋澶勭悊鏂规硶
_rcsserver.ApplyLocatNo(pallmsg, _config.AgvHost + _config.GenAgvSchedulingTask, out taskNo);
- return Ok(new AgvResultModel { code = "0", message = "鐢宠鍌ㄤ綅鎴愬姛锛�", data = taskNo, reqCode = "" });
+ resultModel = new AgvResultModel { code = "0", message = "鐢宠鍌ㄤ綅鎴愬姛!", data = taskNo, reqCode = "" };
+ var jsonData2 = JsonConvert.SerializeObject(resultModel);
+ LogFile.SaveLogToFile($"AGV鐢宠鍌ㄤ綅-杩斿洖鎶ユ枃锛�( {jsonData2} ),", logStr);
+ return Ok(resultModel);
}
catch (Exception e)
{
LogFile.SaveLogToFile($"AGV鐢宠鍌ㄤ綅寮傚父锛�( {e.Message} ),", logStr);
- return Ok(new AgvResultModel { code = "1", message = e.Message, data = "", reqCode = "" });
+ resultModel = new AgvResultModel { code = "1", message = e.Message, data = "", reqCode = "" };
+ var jsonData3 = JsonConvert.SerializeObject(resultModel);
+ LogFile.SaveLogToFile($"AGV鐢宠鍌ㄤ綅-杩斿洖鎶ユ枃锛�( {jsonData3} ),", logStr);
+ return Ok(resultModel);
}
}
/// <summary>
@@ -818,6 +850,150 @@
}
}
+
+ #region Agv浠诲姟瀹屾垚鍙嶉
+ /// <summary>
+ /// 浠诲姟寮�濮�
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult start(AgvTaskDto model)
+ {
+ //璁板綍log
+ var logStr = $@".\log\AGV\浠诲姟鎵ц閫氱煡" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+ AgvResultModel resultModel = null;//杩斿洖淇℃伅
+ try
+ {
+ var jsonData = JsonConvert.SerializeObject(model);
+ LogFile.SaveLogToFile($"AGV浠诲姟鎵ц閫氱煡-浠诲姟寮�濮�-璇锋眰鎶ユ枃锛�( {jsonData} ),", logStr);
+
+ //鍏蜂綋澶勭悊鏂规硶
+
+
+
+ resultModel = new AgvResultModel { code = "0", message = "鎴愬姛", reqCode = model.reqCode };
+ var jsonData2 = JsonConvert.SerializeObject(resultModel);
+ LogFile.SaveLogToFile($"AGV浠诲姟鎵ц閫氱煡-浠诲姟寮�濮�-杩斿洖鎶ユ枃锛�( {jsonData2} ),", logStr);
+ return Ok(resultModel);
+ }
+ catch (Exception ex)
+ {
+ LogFile.SaveLogToFile($"AGV浠诲姟鎵ц閫氱煡-浠诲姟寮�濮�-寮傚父锛�( {ex.Message} ),", logStr);
+
+ resultModel = new AgvResultModel { code = "1", message = ex.Message, reqCode = model.reqCode };
+ var jsonData2 = JsonConvert.SerializeObject(resultModel);
+ LogFile.SaveLogToFile($"AGV浠诲姟鎵ц閫氱煡-浠诲姟寮�濮�-杩斿洖鎶ユ枃锛�( {jsonData2} ),", logStr);
+ return Ok(resultModel);
+ }
+ }
+ /// <summary>
+ /// 璧板嚭鍌ㄤ綅
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult outbin(AgvTaskDto model)
+ {
+ //璁板綍log
+ var logStr = $@".\log\AGV\浠诲姟鎵ц閫氱煡" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+ AgvResultModel resultModel = null;//杩斿洖淇℃伅
+ try
+ {
+ var jsonData = JsonConvert.SerializeObject(model);
+ LogFile.SaveLogToFile($"AGV浠诲姟鎵ц閫氱煡-璧板嚭鍌ㄤ綅-璇锋眰鎶ユ枃锛�( {jsonData} ),", logStr);
+
+ //鍏蜂綋澶勭悊鏂规硶
+
+
+
+ resultModel = new AgvResultModel { code = "0", message = "鎴愬姛", reqCode = model.reqCode };
+ var jsonData2 = JsonConvert.SerializeObject(resultModel);
+ LogFile.SaveLogToFile($"AGV浠诲姟鎵ц閫氱煡-璧板嚭鍌ㄤ綅-杩斿洖鎶ユ枃锛�( {jsonData2} ),", logStr);
+ return Ok(resultModel);
+ }
+ catch (Exception ex)
+ {
+ LogFile.SaveLogToFile($"AGV浠诲姟鎵ц閫氱煡-璧板嚭鍌ㄤ綅-寮傚父锛�( {ex.Message} ),", logStr);
+
+ resultModel = new AgvResultModel { code = "1", message = ex.Message, reqCode = model.reqCode };
+ var jsonData2 = JsonConvert.SerializeObject(resultModel);
+ LogFile.SaveLogToFile($"AGV浠诲姟鎵ц閫氱煡-璧板嚭鍌ㄤ綅-杩斿洖鎶ユ枃锛�( {jsonData2} ),", logStr);
+ return Ok(resultModel);
+ }
+ }
+ /// <summary>
+ /// 浠诲姟缁撴潫
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult end(AgvTaskDto model)
+ {
+ //璁板綍log
+ var logStr = $@".\log\AGV\浠诲姟鎵ц閫氱煡" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+ AgvResultModel resultModel = null;//杩斿洖淇℃伅
+ try
+ {
+ var jsonData = JsonConvert.SerializeObject(model);
+ LogFile.SaveLogToFile($"AGV浠诲姟鎵ц閫氱煡-浠诲姟缁撴潫-璇锋眰鎶ユ枃锛�( {jsonData} ),", logStr);
+
+ //鍏蜂綋澶勭悊鏂规硶
+ _rcsserver.RCSFinishTask(model.taskCode, "1");
+
+
+ resultModel = new AgvResultModel { code = "0", message = "鎴愬姛", reqCode = model.reqCode };
+ var jsonData2 = JsonConvert.SerializeObject(resultModel);
+ LogFile.SaveLogToFile($"AGV浠诲姟鎵ц閫氱煡-浠诲姟缁撴潫-杩斿洖鎶ユ枃锛�( {jsonData2} ),", logStr);
+ return Ok(resultModel);
+ }
+ catch (Exception ex)
+ {
+ LogFile.SaveLogToFile($"AGV浠诲姟鎵ц閫氱煡-浠诲姟缁撴潫-寮傚父锛�( {ex.Message} ),", logStr);
+
+ resultModel = new AgvResultModel { code = "1", message = ex.Message, reqCode = model.reqCode };
+ var jsonData2 = JsonConvert.SerializeObject(resultModel);
+ LogFile.SaveLogToFile($"AGV浠诲姟鎵ц閫氱煡-浠诲姟缁撴潫-杩斿洖鎶ユ枃锛�( {jsonData2} ),", logStr);
+ return Ok(resultModel);
+ }
+ }
+ /// <summary>
+ /// 浠诲姟鍗曞彇娑�
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult cancel(AgvTaskDto model)
+ {
+ //璁板綍log
+ var logStr = $@".\log\AGV\浠诲姟鎵ц閫氱煡" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+ AgvResultModel resultModel = null;//杩斿洖淇℃伅
+ try
+ {
+ var jsonData = JsonConvert.SerializeObject(model);
+ LogFile.SaveLogToFile($"AGV浠诲姟鎵ц閫氱煡-浠诲姟鍗曞彇娑�-璇锋眰鎶ユ枃锛�( {jsonData} ),", logStr);
+
+ //鍏蜂綋澶勭悊鏂规硶
+
+
+
+ resultModel = new AgvResultModel { code = "0", message = "鎴愬姛", reqCode = model.reqCode };
+ var jsonData2 = JsonConvert.SerializeObject(resultModel);
+ LogFile.SaveLogToFile($"AGV浠诲姟鎵ц閫氱煡-浠诲姟鍗曞彇娑�-杩斿洖鎶ユ枃锛�( {jsonData2} ),", logStr);
+ return Ok(resultModel);
+ }
+ catch (Exception ex)
+ {
+ LogFile.SaveLogToFile($"AGV浠诲姟鎵ц閫氱煡-浠诲姟鍗曞彇娑�-寮傚父锛�( {ex.Message} ),", logStr);
+
+ resultModel = new AgvResultModel { code = "1", message = ex.Message, reqCode = model.reqCode };
+ var jsonData2 = JsonConvert.SerializeObject(resultModel);
+ LogFile.SaveLogToFile($"AGV浠诲姟鎵ц閫氱煡-浠诲姟鍗曞彇娑�-杩斿洖鎶ユ枃锛�( {jsonData2} ),", logStr);
+ return Ok(resultModel);
+ }
+ }
+
+ #endregion
/// <summary>
/// Agv浠诲姟瀹屾垚鍙嶉
/// </summary>
@@ -828,14 +1004,18 @@
{
//璁板綍log
var logStr = $@".\log\AGV\浠诲姟鎵ц閫氱煡" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+ AgvResultModel resultModel = null;
try
{
var jsonData = JsonConvert.SerializeObject(model);
- LogFile.SaveLogToFile($"浠诲姟鎵ц閫氱煡锛�( {jsonData} ),", logStr);
+ LogFile.SaveLogToFile($"浠诲姟鎵ц閫氱煡-璇锋眰鎶ユ枃锛�( {jsonData} ),", logStr);
if (string.IsNullOrEmpty(model.taskCode))
{
- return Ok(new AgvResultModel { code = "-1", message = "璇锋眰澶辫触锛宼askCode鍙傛暟寮傚父", reqCode = model.reqCode });
+ resultModel = new AgvResultModel { code = "-1", message = "璇锋眰澶辫触锛宼askCode鍙傛暟寮傚父", reqCode = model.reqCode };
+ var jsonData2 = JsonConvert.SerializeObject(resultModel);
+ LogFile.SaveLogToFile($"浠诲姟鎵ц閫氱煡-杩斿洖鎶ユ枃锛�( {jsonData2} ),", logStr);
+ return Ok(resultModel);
}
switch (model.method)
{
--
Gitblit v1.8.0