From 23c28e3c0437081a78a48e54dc066c87500fa8bc Mon Sep 17 00:00:00 2001
From: lss <2538410689@qq.com>
Date: 星期三, 30 七月 2025 17:30:05 +0800
Subject: [PATCH] 111
---
HH.WCS.Mobox3 - 大车间/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs | 45 +++++++++++++++++++++++++++++++--------------
1 files changed, 31 insertions(+), 14 deletions(-)
diff --git "a/HH.WCS.Mobox3 - \345\244\247\350\275\246\351\227\264/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs" "b/HH.WCS.Mobox3 - \345\244\247\350\275\246\351\227\264/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs"
index 627207b..325b458 100644
--- "a/HH.WCS.Mobox3 - \345\244\247\350\275\246\351\227\264/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs"
+++ "b/HH.WCS.Mobox3 - \345\244\247\350\275\246\351\227\264/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs"
@@ -104,7 +104,10 @@
case "YBK":
n_type = 2;
Source = "棰勫搴�;
- state = "绛夊緟鎺ㄩ�";
+ if (taskData.taskType == 1)
+ {
+ state = "绛夊緟鎺ㄩ�";
+ }
break;
}
@@ -242,7 +245,7 @@
/// <returns></returns>
internal static Result MstStateInquire(MstStateInquire model)
{
- Result result = new Result() { code = "200", msg = "鐘舵�涓嬪彂鎴愬姛" };
+ Result result = new Result() { code = "0", msg = "鐘舵�涓嬪彂鎴愬姛" };
var db = new SqlHelper<object>().GetInstance();
if (model == null)
{
@@ -258,8 +261,21 @@
var task = db.Queryable<WCSTask>().Where(a => a.S_EQ_NO.Trim() == model.taskNum).First();
if (task != null)
{
- task.S_B_STATE ="绛夊緟";
- db.Updateable(task).UpdateColumns(a => new { a.S_B_STATE}).ExecuteCommand();
+ if (task.S_B_STATE != "绛夊緟鎺ㄩ�")
+ {
+ result.code = "1";
+ result.msg = $"鎺ㄩ�澶辫触锛屼换鍔″凡缁忓鐞�;
+ AddErrorInfo("鎺ㄩ�澶辫触", result.msg);
+ return result;
+ }
+ task.S_B_STATE = "绛夊緟";
+ if (db.Updateable(task).UpdateColumns(a => new { a.S_B_STATE }).ExecuteCommand() < 0)
+ {
+ result.code = "1";
+ result.msg = $"鎺ㄩ�澶辫触锛屼慨鏀逛换鍔＄姸鎬佸け璐ワ紝璇烽噸鏂颁笅鍙�;
+ AddErrorInfo("鎺ㄩ�澶辫触", result.msg);
+ return result;
+ }
}
else
{
@@ -465,21 +481,22 @@
RequestList<UploadLoc> result1 = new RequestList<UploadLoc>();
List<UploadLoc> listuploadloc = new List<UploadLoc>();
var db = new SqlHelper<object>().GetInstance();
+ //鑾峰彇鏃堕棿鎴�+ var time = new DateTimeOffset(DateTime.UtcNow).ToUnixTimeSeconds();
+ result1.RequestId = "鏉弶AGV" + time;
+ result1.UseToken = "iFQ5fExGrLYLXliHYWzs";
foreach (var item in model)
{
var loc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == item.Location).First();
if (loc != null)
{
UploadLoc upload = new UploadLoc();
- //鑾峰彇鏃堕棿鎴�- var time = new DateTimeOffset(DateTime.UtcNow).ToUnixTimeSeconds();
- result1.RequestId = "鏉弶AGV" + time;
- result1.UseToken = "iFQ5fExGrLYLXliHYWzs";
- upload.LocationNum = loc.S_CODE;
- upload.Type = loc.S_TYPE;
- upload.LockState = loc.S_LOCK_STATE;
- upload.WorkCenter = loc.S_AREA_CODE;
- upload.Warehouse = loc.S_AREA_CODE;
+
+ upload.locationNum = loc.S_CODE;
+ upload.type = loc.S_TYPE;
+ upload.lockState = loc.S_LOCK_STATE;
+ upload.workCenter = loc.S_AREA_CODE;
+ upload.warehouse = loc.S_AREA_CODE;
listuploadloc.Add(upload);
}
else
@@ -510,7 +527,7 @@
result.code = "1";
result.msg = result.msg;
}
- ApiHelper.AddInfo("Mes", "Mes鐐瑰鐐逛换鍔′笅鍙�, JsonConvert.SerializeObject(date), JsonConvert.SerializeObject(result), "Post", url.url);
+ ApiHelper.AddInfo("Mes", "璐т綅鍚屾", JsonConvert.SerializeObject(date), JsonConvert.SerializeObject(result), "Post", url.url);
}
else
--
Gitblit v1.9.1