From 1b6bf29ff7daa1987de65940af52f452cabd6881 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期二, 15 七月 2025 17:27:50 +0800
Subject: [PATCH] 优化AGV任务部分日志、货位绑定内部方法
---
core/Monitor.cs | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/core/Monitor.cs b/core/Monitor.cs
index 87fc655..93892f7 100644
--- a/core/Monitor.cs
+++ b/core/Monitor.cs
@@ -74,7 +74,8 @@
var db = new SqlHelper<object>().GetInstance();
var info = "";
- const string taskName = TaskName.C鎴愬搧鑳跺嚭搴�
+ var taskInfo = Settings.GetTaskInfo(ETask.C鎴愬搧鑳跺嚭搴�;
+ var taskName = taskInfo.TaskName;
try {
var orderList = db.Queryable<TN_Outbound_Order>()
@@ -162,11 +163,15 @@
var cntId = detail.S_CNTR_CODE;
- var erp_no = string.IsNullOrEmpty(detail.S_BS_NO) ? "" : detail.S_BS_NO;
- var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName, detail.S_OO_NO, erp_no);
+ var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
+ task.S_OP_CODE = detail.S_OO_NO;
+ if (string.IsNullOrEmpty(detail.S_BS_NO)) {
+ task.S_BS_NO = detail.S_BS_NO;
+ task.S_BS_TYPE = "ERP";
+ }
- LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�- LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�+ WCSHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�+ WCSHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
using (var tran = db.Ado.UseTran()) {
if (db.Updateable<TN_Outbound_Detail>(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand() <= 0) {
@@ -235,7 +240,8 @@
var db = new SqlHelper<object>().GetInstance();
var info = "";
- const string taskName = TaskName.C鎶芥_鍑哄簱;
+ var taskInfo = Settings.GetTaskInfo(ETask.C鎶芥鍑哄簱);
+ var taskName = taskInfo.TaskName;
try {
var orderList = db.Queryable<TN_Spot_Check>()
@@ -300,10 +306,11 @@
detail.N_B_STATE = 2;
var cntId = detail.S_CNTR_CODE;
- var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName, detail.S_OO_NO);
+ var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
+ task.S_OP_CODE = detail.S_OO_NO;
- LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�- LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�+ WCSHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�+ WCSHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
using (var tran = db.Ado.UseTran()) {
if (db.Updateable<TN_SpotCheck_Detail>(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand() <= 0) {
@@ -360,7 +367,8 @@
var db = new SqlHelper<object>().GetInstance();
var info = "";
- const string taskName = TaskName.Y绉诲簱;
+ var taskInfo = Settings.GetTaskInfo(ETask.Y绉诲簱);
+ var taskName = taskInfo.TaskName;
try {
var orderList = db.Queryable<TN_Relocation_List>()
@@ -429,10 +437,11 @@
detail.N_B_STATE = 2;
var cntId = detail.S_CNTR_CODE;
- var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName, detail.S_OO_NO);
+ var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
+ task.S_OP_CODE = detail.S_OO_NO;
- LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�- LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�+ WCSHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�+ WCSHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
using (var tran = db.Ado.UseTran()) {
if (db.Updateable<TN_RelocationList_Detail>(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand() <= 0) {
@@ -568,7 +577,7 @@
model.ph = cgDetail.S_BATCH_NO;
var jsonInfo = JsonConvert.SerializeObject(model);
- var result = httpH.WebPost(Settings.ErpApiUrl + "CreateTaskReturn", jsonInfo);
+ var result = httpH.WebPost(Settings.ErpApiUrl + Settings.ErpRoute.CreateTaskReturn, jsonInfo);
LogHelper.InfoApi($"鍒涘缓浠诲姟瀹屾垚鍙嶉ERP鎺ュ彛锛岀粨鏋�{result}锛岃皟鐢ㄥ弬鏁帮細", model);
--
Gitblit v1.9.1