From 1ec3de8254a3dc8d77f01283ab4d85f52d446192 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期五, 09 五月 2025 08:00:59 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
Wms/Wms/Controllers/DownApiController.cs | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/Wms/Wms/Controllers/DownApiController.cs b/Wms/Wms/Controllers/DownApiController.cs
index c027bdf..75d7a71 100644
--- a/Wms/Wms/Controllers/DownApiController.cs
+++ b/Wms/Wms/Controllers/DownApiController.cs
@@ -1271,7 +1271,7 @@
{
return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
- _hopper.jiaoLiaoHopper(model.AreaNo,model.LocateNo,model.PlnStatus,model.Standard,model.SkuNo,model.LotNo, int.Parse(userId));
+ _hopper.jiaoLiaoHopper(model.AreaNo,model.LocateNo,model.PlnStatus,model.Standard,model.SkuNo,model.LotNo,"", int.Parse(userId));
return Ok(new { data = model, code = 0, msg = "" });
}
@@ -1302,7 +1302,7 @@
{
return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
- _hopper.jiaoCheHopper(model.AreaNo, model.LocateNo,model.PlnNo, model.PlnStatus, model.Weight , model.SkuNo, model.LotNo, int.Parse(userId));
+ _hopper.jiaoCheHopper(model.AreaNo, model.LocateNo,model.PlnNo, model.PlnStatus, model.Weight , model.SkuNo, model.LotNo,"", int.Parse(userId));
return Ok(new { data = model, code = 0, msg = "" });
}
@@ -1311,8 +1311,39 @@
return Ok(new { data = "", code = 1, msg = e.Message });
}
}
+ /// <summary>
+ /// 娓呮礂鏈哄彨鏂欑姸鎬�
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult RCSCleanRequest(RCSCleanRequestModel model)
+ {
+ var logStr = $@".\log\AGV\娓呮礂鏈哄彨鏂�" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+ AgvResultModel resultModel = null;//杩斿洖淇℃伅
+ try
+ {
+ var jsonData = JsonConvert.SerializeObject(model);
+ LogFile.SaveLogToFile($"娓呮礂鏈哄彨鏂�-璇锋眰鎶ユ枃锛�( {jsonData} ),", logStr);
+ //鍏蜂綋澶勭悊鏂规硶
+ _hopper.RCSCleanRequest(model.deviceID,model.deviceStation,model.status, _config.AgvHost + _config.GenAgvSchedulingTask);
+ resultModel = new AgvResultModel { code = "0", message = "璇锋眰鎴愬姛!"};
+ var jsonData2 = JsonConvert.SerializeObject(resultModel);
+ LogFile.SaveLogToFile($"娓呮礂鏈哄彨鏂�-杩斿洖鎶ユ枃锛�( {jsonData2} ),", logStr);
+ return Ok(resultModel);
+ }
+ catch (Exception e)
+ {
+ LogFile.SaveLogToFile($"娓呮礂鏈哄彨鏂欏紓甯革細( {e.Message} ),", logStr);
+
+ resultModel = new AgvResultModel { code = "1", message = e.Message, data = "", reqCode = "" };
+ var jsonData2 = JsonConvert.SerializeObject(resultModel);
+ LogFile.SaveLogToFile($"娓呮礂鏈哄彨鏂�-杩斿洖鎶ユ枃锛�( {jsonData2} ),", logStr);
+ return Ok(resultModel);
+ }
+ }
#endregion
}
--
Gitblit v1.8.0