From 18675524096643ce5cb3f53f134f2982dd0fd6d7 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期五, 31 十月 2025 16:42:15 +0800
Subject: [PATCH] 修改任务页面
---
Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs b/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs
index 4b2d6de..33e1063 100644
--- a/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs
+++ b/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs
@@ -525,9 +525,10 @@
/// <returns>鍙嶉淇℃伅</returns>
[HttpPost]
[AllowAnonymous]
- public IsBaleModel2 HttpInConfirm(PortModel models)
+ public ResponseModel HttpInConfirm(PortModel models)
{
-
+ ResponseModel result = new ResponseModel();
+ result.StatusCode = 0;
try
{
string str = JsonConvert.SerializeObject(models);
@@ -565,7 +566,7 @@
var modDevice = _db.Queryable<WcsPosition>().Where(s => s.StationNum == portno && s.Text == "PLC").First();
var (res1, val) = plcConn.GetPlcDBValue(modDevice.PosType, listPlcDevice.DbNumber, modDevice.PlcPos);
- if (val.ToString() == "120")
+ if (val.ToString() == "120" || val.ToString() == "130")
{
//璇诲彇鎴愬姛鍚庡啓鍏�130
modDevice = _db.Queryable<WcsPosition>().Where(s => s.StationNum == portno && s.Text == "WCS").First();
@@ -573,14 +574,17 @@
if (ret.IsSucceed)
{
//鍥炰紶WMS鍙斁淇″彿
- return new IsBaleModel2() { Success = 0, Message = "鎺ュ彈鎴愬姛" };
+ result.Msg = "鎺ュ彈鎴愬姛";
+ return result;
}
}
- return new IsBaleModel2() { Success = -1, Message = "璇诲彇PLC鐐逛綅淇℃伅澶辫触" };
+ result.StatusCode = -1;
+ result.Msg = "璇诲彇PLC鐐逛綅淇℃伅澶辫触";
+ return result;
}
catch (Exception ex)
{
- return new IsBaleModel2() { Success = -1, Message = ex.Message };
+ return new ResponseModel() { StatusCode = -1, Msg = ex.Message };
}
}
@@ -594,6 +598,8 @@
[AllowAnonymous]
public ResponseModel HttpInRequest(PortRequestModel models)
{
+ ResponseModel result = new ResponseModel();
+ result.StatusCode = 0;
try
{
string str = JsonConvert.SerializeObject(models);
@@ -640,10 +646,13 @@
var ret = plcConn.SetPlcDBValue(modDevice.PosType, listPlcDevice.DbNumber, modDevice.PlcPos, "140");//鍐欏叆寮�濮嬫斁璐т俊鍙�
if (ret.IsSucceed == true)
{
- return new ResponseModel() { StatusCode = 0, Msg = "PLC鍏佽鏀捐揣" };
+ result.Msg = "PLC鍏佽鏀捐揣";
+ return result;
}
-
- return new ResponseModel() { StatusCode = -1, Msg = "璇诲彇PLC鐐逛綅淇℃伅澶辫触" };
+
+ result.StatusCode = -1;
+ result.Msg = "璇诲彇PLC鐐逛綅淇℃伅澶辫触";
+ return result;
}
catch (Exception ex)
{
@@ -660,9 +669,10 @@
/// <returns>鍙嶉淇℃伅</returns>
[HttpPost]
[AllowAnonymous]
- public IsBaleModel2 HttpInFinish(PortModel models)
+ public ResponseModel HttpInFinish(PortModel models)
{
-
+ ResponseModel result = new ResponseModel();
+ result.StatusCode = 0;
try
{
string str = JsonConvert.SerializeObject(models);
@@ -702,13 +712,16 @@
if (ret.IsSucceed)
{
//鍥炰紶WMS鏀捐揣淇″彿
- return new IsBaleModel2() { Success = 0, Message = "鎺ュ彈鎴愬姛" };
+ result.Msg = "鎺ュ彈鎴愬姛";
+ return result;
}
- return new IsBaleModel2() { Success = -1, Message = "璇诲彇PLC鐐逛綅淇℃伅澶辫触" };
+ result.StatusCode = -1;
+ result.Msg = "璇诲彇PLC鐐逛綅淇℃伅澶辫触";
+ return result;
}
catch (Exception ex)
{
- return new IsBaleModel2() { Success = -1, Message = ex.Message };
+ return new ResponseModel() { StatusCode = -1, Msg = ex.Message };
}
}
--
Gitblit v1.8.0