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 |   26 +++++++++++++++++++++-----
 1 files changed, 21 insertions(+), 5 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 7c4befb..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
                 {
@@ -475,7 +491,7 @@
                 if (loc != null)
                 {
                     UploadLoc upload = new UploadLoc();
-                 
+
                     upload.locationNum = loc.S_CODE;
                     upload.type = loc.S_TYPE;
                     upload.lockState = loc.S_LOCK_STATE;

--
Gitblit v1.9.1