From 1a0c5192cd1269a1aa2c0af94fc2bcb5fcc9a056 Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期四, 26 六月 2025 17:16:11 +0800
Subject: [PATCH] 111
---
HH.WCS.Mobox3.NongFuLinZhi/api/ApiHelper.cs | 167 ++-----------------------------------------------------
1 files changed, 7 insertions(+), 160 deletions(-)
diff --git a/HH.WCS.Mobox3.NongFuLinZhi/api/ApiHelper.cs b/HH.WCS.Mobox3.NongFuLinZhi/api/ApiHelper.cs
index 33f1e27..83a590a 100644
--- a/HH.WCS.Mobox3.NongFuLinZhi/api/ApiHelper.cs
+++ b/HH.WCS.Mobox3.NongFuLinZhi/api/ApiHelper.cs
@@ -57,155 +57,6 @@
return result;
}
-
-
-
- internal static WeiLiResult AddTask(AddTaskModel model)
- {
- var result = new WeiLiResult();
- var db = new SqlHelper<object>().GetInstance();
- var cntrweight = model.cntrWeight == 1 ? 2 : model.cntrWeight == 2 ? 3 : model.cntrWeight == 3 ? 11 : model.cntrWeight == 4 ? 30 : model.cntrWeight == 5 ? 150 : 0;
- if (!string.IsNullOrEmpty(model.startBit) && !string.IsNullOrEmpty(model.endBit))
- {
- if (!string.IsNullOrEmpty(model.TaskNo))
- {
- var taskinfo = db.Queryable<WMSTask>().Where(a => a.S_CODE == model.TaskNo).First();
- if (taskinfo == null)
- {
- var startinfo = db.Queryable<Location>().Where(a => a.S_CODE == model.startBit).First();
- var endinfo = db.Queryable<Location>().Where(a => a.S_CODE == model.endBit).First();
- if (startinfo != null && endinfo != null)
- {
- if (startinfo.N_LOCK_STATE != 0 || endinfo.N_LOCK_STATE != 0)
- {
- result.code = 500;
- result.msg = "璧风偣鎴栫粓鐐硅揣浣嶉攣瀹氱姸鎬佸紓甯�涓嶄簣鍒涘缓浠诲姟";
- return result;
- }
-
- var startloccntr = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE == startinfo.S_CODE).First();
- LogHelper.Info("鏌ヨ璧风偣鏄惁缁戝畾鎵樼洏");
- if (startloccntr == null)
- {
- LogHelper.Info("璧风偣鏈粦瀹氭墭鐩�鍑嗗缁戝畾鎵樼洏");
- //缁戝畾璧风偣鎵樼洏
- LocationHelper.BindingLoc(model.startBit, new List<string>() { model.cntrNo });
- }
- else if (startloccntr.S_CNTR_CODE != model.cntrNo)
- {
- result.code = 500;
- result.msg = $"璧风偣宸茬粦瀹氭墭鐩榹startloccntr.S_CNTR_CODE} 涓庝换鍔℃墭鐩榹model.cntrNo} 涓嶇";
- return result;
- }
-
- LogHelper.Info("杞繍浠诲姟 鍒涘缓浣滀笟");
-
- //鍒涘缓浣滀笟
- var optask = new WMSTask
- {
- S_CODE = model.TaskNo,
- S_START_LOC = startinfo.S_CODE,
- S_END_LOC = endinfo.S_CODE,
- S_END_AREA = endinfo.S_AREA_CODE,
- S_START_AREA = startinfo.S_AREA_CODE,
- S_START_WH = startinfo.S_WH_CODE,
- S_END_WH = endinfo.S_WH_CODE,
- S_TYPE = "杞繍",
- N_TYPE = 3,
- N_B_STATE = 0,
- S_CNTR_CODE = model.cntrNo,
- S_OP_DEF_NAME = "杞繍",
- S_BS_NO = model.workNo,
- N_PRIORITY = model.priority,
- N_TRAY_WEIGHT = cntrweight
- };
-
- var note = Settings.Tasktypes.Where(a => a.StartArea == optask.S_START_AREA && a.EndArea == optask.S_END_AREA).FirstOrDefault();
- if (note != null)
- {
- optask.S_NOTE = note.TaskType;
- }
-
-
-
- db.Insertable(optask).ExecuteCommand();
- LocationHelper.LockLoc(startinfo.S_CODE, 2);
- LocationHelper.LockLoc(endinfo.S_CODE, 1);
- }
- else
- {
- result.code = 500;
- result.msg = "璧风偣鎴栫粓鐐逛俊鎭湁璇�鏌ヨ涓嶅埌绔欑偣淇℃伅";
- }
- }
- else
- {
- result.code = 500;
- result.msg = "浠诲姟鍙烽噸澶�璇峰嬁閲嶅涓嬪彂浠诲姟";
- }
- }
- else
- {
- result.code = 500;
- result.msg = "浠诲姟鍙蜂笉鑳戒负绌�;
- }
- }
- else
- {
- result.code = 500;
- result.msg = "璧风偣鎴栫粓鐐逛笉鑳戒负绌�;
- }
-
- return result;
- }
-
- internal static TaskStateresutl GetTaskState(GetTaskStateModel model)
- {
- var db = new SqlHelper<object>().GetInstance();
- TaskStateresutl result = new TaskStateresutl { success = false, code = 0};
- if (!string.IsNullOrEmpty(model.taskNo))
- {
- var info = db.Queryable<WCSTask>().Where(a => a.S_OP_CODE == model.taskNo).First();
- if (info!=null)
- {
- var TaskStates = db.Queryable<TaskAction>().Where(a => a.S_TASK_CODE == info.S_CODE).ToList();
- TaskStates=TaskStates.OrderBy(a => a.T_CREATE).ToList();
- for (int i = 0; i < TaskStates.Count; i++)
- {
- TaskState task = new TaskState
- {
- state = TaskStates[i].N_ACTION_CODE.ToString(),
- errMsg = "",
- taskNo = model.taskNo,
- transferTime = TaskStates[i].T_CREATE.ToString()
- };
- if (!string.IsNullOrEmpty(TaskStates[i].S_EQ_CODE))
- {
- task.agvNo = int.Parse(TaskStates[i].S_EQ_CODE);
- }
- result.data.Add(task);
- }
- result.success = true ;
- }
- else
- {
- result.code = 1;
- result.msg = "璇ヤ换鍔″彿娌℃湁鐘舵�璁板綍!";
- }
- }
- else
- {
- result.code = 1;
- result.msg = "璇锋眰浠诲姟鍙蜂笉鑳戒负绌�";
- }
- return result;
- }
-
-
-
-
-
-
internal static PlcSendTaskres PlcCallbackState(PlcState model)
{
var db = new SqlHelper<object>().GetInstance();
@@ -443,17 +294,11 @@
db.Updateable(task).UpdateColumns(it => new { it.S_NOTE }).ExecuteCommand();
}
-
-
-
-
-
-
internal static WeiLiResult CancelOrder(CancelOrderModel model)
{
WeiLiResult result = new WeiLiResult();
var db = new SqlHelper<object>().GetInstance();
- var tasks = db.Queryable<WCSTask>().Where(a => a.S_OP_CODE == model.orderNo).ToList();
+ var tasks = db.Queryable<WCSTask>().Where(a => a.S_OP_CODE == model.task_no).ToList();
if (tasks.Count >= 1)
{
//娴佺▼浠诲姟鏁伴噺鎵ц瓒呰繃涓�潯 浠诲姟涓嶅厑璁稿彇娑�@@ -461,7 +306,7 @@
result.msg = "娴佺▼浠诲姟鎵ц涓�涓嶅厑璁稿彇娑�;
return result;
}
- var task = db.Queryable<WCSTask>().Where(a => a.S_OP_CODE == model.orderNo).OrderByDescending(a => a.T_CREATE).First();
+ var task = db.Queryable<WCSTask>().Where(a => a.S_OP_CODE == model.task_no).OrderByDescending(a => a.T_CREATE).First();
if (task != null)
{
if (WCSHelper.CheckActionRecordExist(task.S_CODE, 4))
@@ -473,7 +318,7 @@
if (task.N_B_STATE == 0)
{
//绛夊緟鐩存帴淇敼鐘舵�涓哄彇娑�- WCSHelper.UpdateStatus(model.orderNo, 5);
+ WCSHelper.UpdateStatus(model.task_no, 5);
//result.msg = "浠诲姟绛夊緟锛岀洿鎺ュ彇娑�;
}
else if (task.N_B_STATE != 3 && task.N_B_STATE != 4)
@@ -485,7 +330,8 @@
else
{
//宸叉帹閫佷絾鏄病鏈夊畬鎴愭垨鑰呭彇娑堬紝閫氱煡hosttoagv
- NDCHelper.Cancel(task.S_CODE.Trim());
+ //NDCHelper.Cancel(task.S_CODE.Trim());
+ NDCApi.CancelOrder(task.S_CODE.Trim());
//result.msg = "浠诲姟鍙栨秷宸茬粡鍙戦�缁欏皬杞�;
}
}
@@ -528,7 +374,8 @@
else
{
//閫氱煡鏉弶淇敼浼樺厛绾�- NDCHelper.Cancel(task.S_CODE.Trim());
+ //NDCHelper.Cancel(task.S_CODE.Trim());
+ NDCApi.CancelOrder(task.S_CODE.Trim());
result.msg = "淇敼浼樺厛绾ф垚鍔�;
}
}
--
Gitblit v1.9.1