From 553f7744bedee0685635ed070a4a0e18b796238f Mon Sep 17 00:00:00 2001
From: lss <2538410689@qq.com>
Date: 星期四, 24 七月 2025 17:30:36 +0800
Subject: [PATCH] 1111
---
HH.WCS.Mobox3 - 大车间/HH.WCS.Mobox3.JiaTong/wms/WCSHelper.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git "a/HH.WCS.Mobox3 - \345\244\247\350\275\246\351\227\264/HH.WCS.Mobox3.JiaTong/wms/WCSHelper.cs" "b/HH.WCS.Mobox3 - \345\244\247\350\275\246\351\227\264/HH.WCS.Mobox3.JiaTong/wms/WCSHelper.cs"
index f629f30..84a27e8 100644
--- "a/HH.WCS.Mobox3 - \345\244\247\350\275\246\351\227\264/HH.WCS.Mobox3.JiaTong/wms/WCSHelper.cs"
+++ "b/HH.WCS.Mobox3 - \345\244\247\350\275\246\351\227\264/HH.WCS.Mobox3.JiaTong/wms/WCSHelper.cs"
@@ -20,7 +20,7 @@
{
var res = false;
var db = new SqlHelper<WCSTask>().GetInstance();
-
+
task.S_B_STATE = status;
db.Updateable(task).UpdateColumns(it => new { it.S_B_STATE }).ExecuteCommand();
@@ -213,7 +213,7 @@
if (task != null)
{
-
+
task.T_START_TIME = DateTime.Now;
task.S_WORKSHOP_NO = agvno;
db.Updateable(task).UpdateColumns(it => new { it.T_START_TIME, it.S_WORKSHOP_NO }).ExecuteCommand();
@@ -257,7 +257,7 @@
{
var Startmodel = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == TN_Task.S_START_LOC).First();
var Endmodel = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == TN_Task.S_END_LOC).First();
- if (Startmodel != null && Startmodel.S_LOCK_STATE.Trim() == "鏃�)
+ if (Startmodel != null && (string.IsNullOrEmpty(Startmodel.S_LOCK_STATE) || Startmodel.S_LOCK_STATE.Trim() == "鏃�))
{
Startmodel.N_LOCK_STATE = 2;
Startmodel.S_LOCK_STATE = Location.GetLockStateStr(2);
@@ -269,7 +269,7 @@
db.RollbackTran();
return false;
}
- if (Endmodel != null && Endmodel.S_LOCK_STATE.Trim() == "鏃�)
+ if (Endmodel != null && (string.IsNullOrEmpty(Endmodel.S_LOCK_STATE) || Endmodel.S_LOCK_STATE.Trim() == "鏃�))
{
Endmodel.N_LOCK_STATE = 1;
Endmodel.S_LOCK_STATE = Location.GetLockStateStr(1);
--
Gitblit v1.9.1