From 6b9801e47304eac1640cf737ef6bc039ff104dd1 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期一, 23 六月 2025 17:17:39 +0800
Subject: [PATCH] 删除冗余的注释和功能，优化部分代码
---
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/c4ac5a83-2808-437a-8fe9-e1ee6fd17012.vsidx | 0
api/DebugController.cs | 15 +++++
core/Monitor.cs | 3 -
/dev/null | 0
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/70dcfb51-010f-40e1-9d83-9060381efdfe.vsidx | 0
process/TaskProcess.cs | 104 ----------------------------------
core/WCSCore.cs | 1
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/340c6236-9991-45c1-b640-67c509d34eff.vsidx | 0
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/43faf91b-3c60-45a1-9be8-c044d303f12b.vsidx | 0
9 files changed, 15 insertions(+), 108 deletions(-)
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/0e884f1e-4fd0-4787-9609-a6c54b2ab0a3.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/0e884f1e-4fd0-4787-9609-a6c54b2ab0a3.vsidx
deleted file mode 100644
index 73a440b..0000000
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/0e884f1e-4fd0-4787-9609-a6c54b2ab0a3.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/19a983e0-631c-4b72-b755-2e661241e308.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/19a983e0-631c-4b72-b755-2e661241e308.vsidx
deleted file mode 100644
index f96b73b..0000000
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/19a983e0-631c-4b72-b755-2e661241e308.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/340c6236-9991-45c1-b640-67c509d34eff.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/340c6236-9991-45c1-b640-67c509d34eff.vsidx
new file mode 100644
index 0000000..4f14c31
--- /dev/null
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/340c6236-9991-45c1-b640-67c509d34eff.vsidx
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/43faf91b-3c60-45a1-9be8-c044d303f12b.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/43faf91b-3c60-45a1-9be8-c044d303f12b.vsidx
new file mode 100644
index 0000000..6385482
--- /dev/null
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/43faf91b-3c60-45a1-9be8-c044d303f12b.vsidx
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/5e91e44d-4d36-490a-beac-2fd1987570d3.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/5e91e44d-4d36-490a-beac-2fd1987570d3.vsidx
deleted file mode 100644
index aba1210..0000000
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/5e91e44d-4d36-490a-beac-2fd1987570d3.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/e0f83dcf-d522-4b17-abfd-a6bde9dac332.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/70dcfb51-010f-40e1-9d83-9060381efdfe.vsidx
similarity index 73%
rename from .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/e0f83dcf-d522-4b17-abfd-a6bde9dac332.vsidx
rename to .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/70dcfb51-010f-40e1-9d83-9060381efdfe.vsidx
index c2af166..67db0ef 100644
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/e0f83dcf-d522-4b17-abfd-a6bde9dac332.vsidx
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/70dcfb51-010f-40e1-9d83-9060381efdfe.vsidx
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/c4ac5a83-2808-437a-8fe9-e1ee6fd17012.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/c4ac5a83-2808-437a-8fe9-e1ee6fd17012.vsidx
new file mode 100644
index 0000000..88c69e3
--- /dev/null
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/c4ac5a83-2808-437a-8fe9-e1ee6fd17012.vsidx
Binary files differ
diff --git a/api/DebugController.cs b/api/DebugController.cs
index 1a08eaf..c7524f5 100644
--- a/api/DebugController.cs
+++ b/api/DebugController.cs
@@ -335,6 +335,11 @@
}
}
+ /// <summary>
+ /// 妯℃嫙Erp涓嬪彂鍑哄簱璁″垝鍗�+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
[HttpPost]
[Route("TestErpSendOutboundPlan")]
public ErpResult TestErpSendOutboundPlan(TestErpSendOutboundPlanInfo model) {
@@ -351,6 +356,11 @@
return ApiHelper.ErpSendOutboundPlan(erpModel);
}
+ /// <summary>
+ /// 锛堝唴閮ㄦ柟娉曡鍕胯皟鐢級妯℃嫙鍙栬揣瀹屾垚鍙嶉Erp鍥炴姤缁撴灉锛堥粯璁や负success锛�+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
[HttpPost]
[Route("PickUpReturn")]
public TestErpResult PickUpReturn(PickUpReturnErpInfo model) {
@@ -367,6 +377,11 @@
};
}
+ /// <summary>
+ /// 锛堝唴閮ㄦ柟娉曡鍕胯皟鐢級妯℃嫙浠诲姟鍒涘缓瀹屾垚鍙嶉Erp鍥炴姤缁撴灉锛堥粯璁や负success锛�+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
[HttpPost]
[Route("CreateTaskReturn")]
public TestErpResult CreateTaskReturn(CreateTaskReturnErpInfo model) {
diff --git a/core/Monitor.cs b/core/Monitor.cs
index 1e40a8d..b24ff54 100644
--- a/core/Monitor.cs
+++ b/core/Monitor.cs
@@ -9,11 +9,8 @@
using HH.WCS.Mobox3.DSZSH.models;
using HH.WCS.Mobox3.DSZSH.util;
using HH.WCS.Mobox3.DSZSH.wms;
-using Microsoft.Win32;
using Newtonsoft.Json;
-
-using Org.BouncyCastle.Asn1.X509;
namespace HH.WCS.Mobox3.DSZSH.core {
public class Monitor {
diff --git a/core/WCSCore.cs b/core/WCSCore.cs
index e7b3f66..6423042 100644
--- a/core/WCSCore.cs
+++ b/core/WCSCore.cs
@@ -443,7 +443,6 @@
list.ForEach(task => {
//浣跨敤鑷畾涔変换鍔℃帹閫� TaskProcess.SendTask(task);//璋冨害NDC鎴栨澀濂ユ垨鍥借嚜璁惧
- //TaskProcess.SendGZTask(task);///璋冨害鍥借嚜璁惧
});
}
else {
diff --git a/process/TaskProcess.cs b/process/TaskProcess.cs
index 638f618..e600622 100644
--- a/process/TaskProcess.cs
+++ b/process/TaskProcess.cs
@@ -108,32 +108,13 @@
/// </summary>
/// <param name="mst"></param>
internal static bool SendTask(TN_Task mst) {
-
var result = false;
var start = "0"; var end = "0";
var taskType = mst.S_TYPE.Trim();
- //var db = new SqlHelper<object>().GetInstance();
-
if (mst.N_B_STATE == 0) {
start = LocationHelper.GetAgvSite(mst.S_START_LOC);
end = LocationHelper.GetAgvSite(mst.S_END_LOC);
-
- //if (mst.S_TYPE == "绌烘墭涓嬬嚎鍫嗗彔") {
- // end = LocationHelper.GetAgvSite(mst.S_END_LOC, true);
- //}
-
- // 浠诲姟涓嬪彂鍚庯紝鏃犺AGV鏄惁鎺ュ彈锛宻tate 閮芥槸2浜嗭紝灏辩畻鏆傚仠鏃犳祹浜庝簨
- // 濡傛灉鍚庣画闇�璁╂殏鍋滅殑浠诲姟涓嶅啀鍒嗗彂锛岄偅涔堝繀椤绘敼鍙樼幇鏈夌殑state鍒ゆ柇鏈哄埗
-
- //if (mst.S_TYPE == TaskName.绉诲簱) {
- // var detail = db.Queryable<TN_RelocationList_Detail>()
- // .Where(d => d.S_CNTR_CODE == mst.S_CNTR_CODE).First();
-
- // if (detail == null) {
-
- // }
- //}
LogHelper.Info($"NDC鎺ㄩ�浠诲姟 {mst.S_CODE};" + "start=" + start + "end= " + end);
var startLoc = LocationHelper.GetLoc(mst.S_START_LOC);
@@ -145,14 +126,6 @@
dic.Add(new param() { name = "FUNC", value = startLoc.N_LAYER.ToString() });
dic.Add(new param() { name = "Ctype", value = "0" });
-
-
- //if (mst.S_TYPE == "浣欐枡涓嬬嚎鍏ュ簱" || mst.S_TYPE == "浜哄伐鎷嗙洏鍏ュ簱") {
- // dic.Add(new param() { name = "DATA", value = "1024" });
- //}
- //else {
- // dic.Add(new param() { name = "DATA", value = "0" });
- //}
var res = NDCApi.AddOrderNew(1, 1, mst.S_CODE, dic);//娣诲姞鏂板懡浠� if (res != null && (res.err_code == 0 || res.err_code == 50009)) {
@@ -166,83 +139,6 @@
else {
LogHelper.Info($"NDC鎺ㄩ�浠诲姟澶辫触 {mst.S_CODE};Res:" + JsonConvert.SerializeObject(res));
}
-
- //if (mst.N_SCHEDULE_TYPE == 1)//閫氳繃NDC锛宧osttoagv璋冨害璁惧
- //{
- // start = LocationHelper.GetAgvSite(mst.S_START_LOC);
- // end = LocationHelper.GetAgvSite(mst.S_END_LOC);
-
- // //if (mst.S_TYPE == "绌烘墭涓嬬嚎鍫嗗彔") {
- // // end = LocationHelper.GetAgvSite(mst.S_END_LOC, true);
- // //}
-
- // LogHelper.Info($"NDC鎺ㄩ�浠诲姟 {mst.S_CODE};" + "start=" + start + "end= " + end);
- // var startLoc = LocationHelper.GetLoc(mst.S_START_LOC);
- // var endLoc = LocationHelper.GetLoc(mst.S_END_LOC);
- // var dic = new List<param>();
- // dic.Add(new param() { name = "IKey", value = "IKey" });
- // dic.Add(new param() { name = "From", value = start.ToString() });
- // dic.Add(new param() { name = "To", value = end.ToString() });
- // dic.Add(new param() { name = "FUNC", value = startLoc.N_LAYER.ToString() });
-
- // dic.Add(new param() { name = "Ctype", value = "0" });
-
-
- // //if (mst.S_TYPE == "浣欐枡涓嬬嚎鍏ュ簱" || mst.S_TYPE == "浜哄伐鎷嗙洏鍏ュ簱") {
- // // dic.Add(new param() { name = "DATA", value = "1024" });
- // //}
- // //else {
- // // dic.Add(new param() { name = "DATA", value = "0" });
- // //}
-
- // var res = NDCApi.AddOrderNew(1, 1, mst.S_CODE, dic);//娣诲姞鏂板懡浠�- // if (res != null && (res.err_code == 0 || res.err_code == 50009)) {
- // //鎺ㄩ�鎴愬姛锛屼慨鏀逛换鍔′紭鍏堢骇
- // mst.N_B_STATE = 1;
- // mst.S_B_STATE = TN_Task.GetStateStr(1);
- // WCSHelper.UpdateStatus(mst);//鏇存柊浠诲姟鐘舵�
- // result = true;
- // LogHelper.Info($"NDC鎺ㄩ�浠诲姟鎴愬姛 {mst.S_CODE}start= {mst.S_START_LOC} + end = {mst.S_END_LOC}");
- // }
- // else {
- // LogHelper.Info($"NDC鎺ㄩ�浠诲姟澶辫触 {mst.S_CODE};Res:" + JsonConvert.SerializeObject(res));
- // }
- //}
- //else if (mst.N_SCHEDULE_TYPE == 5)//閫氳繃鏉ゥ璋冨害璁惧
- //{
- // //璋冪涓夋柟鎺ュ彛
- // var model = new HanAo.TaskInfoModel {
- // requestPk = mst.S_CODE,
- // frmPos = mst.S_START_LOC,
- // toPos = mst.S_END_LOC,
- // trkType = mst.S_OP_NAME == "鍏ュ簱" ? "1" : "2",
- // contNo = mst.S_CNTR_CODE
- // };
- // if (HanAo.CreateOrder(model)) {
- // mst.N_B_STATE = 1;
- // WCSHelper.UpdateStatus(mst);
- // LogHelper.Info($"鏉ゥ鎺ㄩ�浠诲姟鎴愬姛 {mst.S_CODE};" + "start=" + model.frmPos + "end= " + model.toPos);
- // }
- // else {
- // LogHelper.Info($"鏉ゥ鎺ㄩ�浠诲姟澶辫触 {mst.S_CODE};" + JsonConvert.SerializeObject(model));
- // }
- //}
- //else if (mst.N_SCHEDULE_TYPE == 3) //閫氳繃鍥借嚜璋冨害璁惧
- //{
- // var code = GZRobot.CreateOrder(mst.S_CODE, mst.N_PRIORITY, JsonConvert.SerializeObject(new { src = mst.S_START_LOC, dst = mst.S_END_LOC }), "p2p");
- // if (code > 0) {
- // //鏇存柊浠诲姟鐘舵�
- // mst.N_B_STATE = 1;
- // mst.S_EQ_TASK_CODE = code.ToString();
- // WCSHelper.UpdateStatus(mst);
- // WCSHelper.UpdateEQNo(mst);
- // LogHelper.Info($"鍥借嚜鎺ㄩ�浠诲姟鎴愬姛 {mst.S_CODE};" + "start=" + mst.S_START_LOC + "end= " + mst.S_END_LOC);
- // }
- // else {
- // LogHelper.Info($"鍥借嚜鎺ㄩ�浠诲姟澶辫触 {mst.S_CODE};" + JsonConvert.SerializeObject(mst));
- // }
- //}
-
}
return result;
}
--
Gitblit v1.9.1