From f248d4a25fb196149c9add083e74252d7334b37d Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期四, 05 六月 2025 17:31:45 +0800
Subject: [PATCH] 部分细节优化
---
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/9442875d-8d82-4dfd-bd01-827281423d02.vsidx | 0
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/9c0aa391-6594-401b-9354-62501bb2601d.vsidx | 0
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/4ae243f4-d9f0-4a8c-8620-a0c519179a88.vsidx | 0
/dev/null | 0
api/ApiHelper.cs | 16 +---------------
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/00234e98-2307-4b05-8393-c563c56d7614.vsidx | 0
models/TN_Task_Action.cs | 2 +-
7 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/62511dbf-e9d3-41f0-9ebd-1f1dfea56ad8.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/00234e98-2307-4b05-8393-c563c56d7614.vsidx
similarity index 68%
rename from .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/62511dbf-e9d3-41f0-9ebd-1f1dfea56ad8.vsidx
rename to .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/00234e98-2307-4b05-8393-c563c56d7614.vsidx
index 10c4324..d65f539 100644
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/62511dbf-e9d3-41f0-9ebd-1f1dfea56ad8.vsidx
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/00234e98-2307-4b05-8393-c563c56d7614.vsidx
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/18c7ba82-96c0-49b8-853d-f97228ef5b2e.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/18c7ba82-96c0-49b8-853d-f97228ef5b2e.vsidx
deleted file mode 100644
index 9194961..0000000
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/18c7ba82-96c0-49b8-853d-f97228ef5b2e.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/4ae243f4-d9f0-4a8c-8620-a0c519179a88.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/4ae243f4-d9f0-4a8c-8620-a0c519179a88.vsidx
new file mode 100644
index 0000000..9ced449
--- /dev/null
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/4ae243f4-d9f0-4a8c-8620-a0c519179a88.vsidx
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/6f070d61-bbc8-4cf3-8d70-7244f5a6b3b6.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/9442875d-8d82-4dfd-bd01-827281423d02.vsidx
similarity index 65%
rename from .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/6f070d61-bbc8-4cf3-8d70-7244f5a6b3b6.vsidx
rename to .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/9442875d-8d82-4dfd-bd01-827281423d02.vsidx
index 1e1ce3d..a28bb5a 100644
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/6f070d61-bbc8-4cf3-8d70-7244f5a6b3b6.vsidx
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/9442875d-8d82-4dfd-bd01-827281423d02.vsidx
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/62c30b9e-0d60-4b2a-b4d8-3f249467cf7b.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/9c0aa391-6594-401b-9354-62501bb2601d.vsidx
similarity index 70%
rename from .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/62c30b9e-0d60-4b2a-b4d8-3f249467cf7b.vsidx
rename to .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/9c0aa391-6594-401b-9354-62501bb2601d.vsidx
index 892da72..7440612 100644
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/62c30b9e-0d60-4b2a-b4d8-3f249467cf7b.vsidx
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/9c0aa391-6594-401b-9354-62501bb2601d.vsidx
Binary files differ
diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index 50eb72a..a24a1cb 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -209,7 +209,6 @@
var locCntrRelOld = db.Queryable<TN_Loc_Container>()
.Where(c => c.S_CNTR_CODE == model.CntrCode).First();
- //var locOld = new TN_Location();
TN_Location locOld = null;
if (locCntrRelOld != null) { // 濡傛灉闇�瑙ｇ粦瀹瑰櫒璐т綅锛屼篃闇�淇敼璐т綅淇℃伅
locOld = db.Queryable<TN_Location>()
@@ -218,9 +217,6 @@
locOld.N_CURRENT_NUM = 0; // 濡傛灉鏃ц揣浣嶅瓨鍦紝灏嗘棫璐т綅鐨勬暟閲忚缃负 0
}
}
- //else {
- // locOld = null;
- //}
// 缁戝畾璐т綅鍜屽鍣ㄥ彿锛圥DA鍦ㄦ帴椹充綅缁戝畾锛� var locCntrRel = new TN_Loc_Container {
@@ -391,7 +387,6 @@
var locCntrRelOld = db.Queryable<TN_Loc_Container>()
.Where(c => c.S_CNTR_CODE == model.CntrCode).First();
- //var locOld = new TN_Location();
TN_Location locOld = null;
if (locCntrRelOld != null) { // 濡傛灉闇�瑙ｇ粦瀹瑰櫒璐т綅锛屼篃闇�淇敼璐т綅淇℃伅
locOld = db.Queryable<TN_Location>()
@@ -400,9 +395,6 @@
locOld.N_CURRENT_NUM = 0; // 濡傛灉鏃ц揣浣嶅瓨鍦紝灏嗘棫璐т綅鐨勬暟閲忚缃负 0
}
}
- //else {
- // locOld = null;
- //}
// 缁戝畾璐т綅鍜屽鍣ㄥ彿
var locCntrRel = new TN_Loc_Container {
@@ -650,7 +642,7 @@
var info = "";
var taskName = TaskName.H濂借繍绠盻绌虹涓婄嚎;
- var startAreaName = AreaName.K绌烘墭瀛樻斁鍖�
+ var startAreaName = AreaName.K绌虹璐ф灦鍖�
var endAreaName = AreaName.K绌虹鎿嶄綔鍖�
try {
@@ -888,12 +880,6 @@
var locCntrRel = db.Queryable<TN_Loc_Container>()
.Where(c => c.S_CNTR_CODE == cgDetail.S_CNTR_CODE)
.First();
-
- //var startLoc = db.Queryable<TN_Location>()
- // .LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE)
- // .Where((l, c) => c.S_CNTR_CODE == cgDetail.S_CNTR_CODE) // 鎸囧畾瀹瑰櫒鍙�- // .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
- // .First();
var startLoc = db.Queryable<TN_Location>()
.Where(l => l.S_CODE == locCntrRel.S_LOC_CODE)
diff --git a/models/TN_Task_Action.cs b/models/TN_Task_Action.cs
index f617f62..de1c194 100644
--- a/models/TN_Task_Action.cs
+++ b/models/TN_Task_Action.cs
@@ -16,7 +16,7 @@
public string S_TASK_CODE { get; set; }
public string S_EQ_CODE { get; set; }
-
+ public string S_ACTION { get; set; }
public int N_ACTION_CODE { get; set; }
}
}
--
Gitblit v1.9.1