From 0ed390381862dea0c7fd0210d16017eb09f12da4 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期三, 30 七月 2025 17:27:27 +0800
Subject: [PATCH] 封装插入容器表等业务代码, 修复部分底层旧框架方法问题
---
wms/WCSHelper.cs | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/wms/WCSHelper.cs b/wms/WCSHelper.cs
index 0e73985..9962930 100644
--- a/wms/WCSHelper.cs
+++ b/wms/WCSHelper.cs
@@ -1,14 +1,10 @@
-锘縰sing HH.WCS.Mobox3.DSZSH.models;
-using HH.WCS.Mobox3.DSZSH.util;
-using HH.WCS.Mobox3.DSZSH;
-
-using Newtonsoft.Json;
-
-using System;
+锘縰sing System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using HH.WCS.Mobox3.DSZSH.models;
+using HH.WCS.Mobox3.DSZSH.util;
namespace HH.WCS.Mobox3.DSZSH.wms {
/// <summary>
@@ -58,7 +54,7 @@
#region 浠诲姟鍒涘缓 / 涓嬪彂 / 鏌ヨ
internal static string GenerateTaskNo() {
- //var id = SYSHelper.GetSerialNumberResetByDay("浠诲姟鍙�, "TN");
+ //var id = SYSHelper.GetSerialNumber("浠诲姟鍙�, "TN");
//var date = DateTime.Now.ToString("yyMMdd");
//return $"TN{date}{id.ToString().PadLeft(4, '0')}";
return SYSHelper.GenerateSN("浠诲姟鍙�, "TN", "yyMMdd");
@@ -221,8 +217,8 @@
/// 鍒涘缓浠诲姟
/// </summary>
/// <remarks><b>[ 瑕佹眰 ]</b> startLoc / endLoc 鈮�null ; startLoc / endLoc 瀛樺湪 S_CODE , S_AREA_CODE 瀛楁</remarks>
- /// <param name="startLoc">璧风偣璐т綅 : 鑷冲皯鎻愪緵:S_CODE , S_AREA_CODE</param>
- /// <param name="endLoc">缁堢偣璐т綅 : 鑷冲皯鎻愪緵:S_CODE , S_AREA_CODE</param>
+ /// <param name="startLoc">璧风偣璐т綅 : 鑷冲皯鎻愪緵 : S_CODE , S_AREA_CODE</param>
+ /// <param name="endLoc">缁堢偣璐т綅 : 鑷冲皯鎻愪緵 : S_CODE , S_AREA_CODE</param>
/// <param name="cntId">瀹瑰櫒鍙�/param>
/// <param name="type">浠诲姟绫诲瀷 ( 鍚嶇О )</param>
/// <param name="pri">浼樺厛绾�/param>
@@ -260,12 +256,15 @@
/// <returns></returns>
public static TN_Task BuildTaskWithLocLock(TN_Location startLoc, TN_Location endLoc, string cntId, string type,
int pri = 3, int agv = 1) {
+
var task = BuildTask(startLoc, endLoc, cntId, type, pri);
LockStartLoc(startLoc, task.S_CODE);
LockEndLoc(endLoc, task.S_CODE);
return task;
}
+
+
#endregion
#region 浠诲姟鍒嗗彂 / 鎵ц / 璁板綍
@@ -274,7 +273,7 @@
return db.Queryable<TN_Task_Action>().Count(a => a.S_TASK_CODE == no && a.N_ACTION_CODE == code) > 0;
}
- internal static void Begin(TN_Task task, string forklift_no) {
+ internal static void SetTaskBegin(TN_Task task, string forklift_no) {
var db = new SqlHelper<TN_Task>().GetInstance();
if (task != null) {
if (task.N_B_STATE == 1 || task.N_B_STATE == 0) { // 娣诲姞褰搕ask鐘舵�涓�鏃朵篃鍙互瑙﹀彂
@@ -286,7 +285,7 @@
}
}
}
- internal static void End(TN_Task task) {
+ internal static void SetTaskEnd(TN_Task task) {
var db = new SqlHelper<TN_Task>().GetInstance();
if (task != null) {
task.N_B_STATE = 3;
@@ -295,7 +294,7 @@
db.Updateable(task).UpdateColumns(it => new { it.N_B_STATE, it.S_B_STATE, it.T_END_TIME }).ExecuteCommand();
}
}
- internal static void Fail(TN_Task task) {
+ internal static void SetTaskFail(TN_Task task) {
var db = new SqlHelper<TN_Task>().GetInstance();
if (task != null) {
//鍒ゆ柇鏈夋病鏈夊彇璐у畬鎴�娌℃湁灏卞彉鎴愬け璐ャ�鏈夊彇璐у畬鎴愰粯璁ゅ畬鎴愪簡 (璺熸嵁椤圭洰鑰屽畾,鏈変簺椤圭洰浜哄伐鎷夎蛋浜嗕篃娌℃湁鏀惧埌缁堢偣) 銆�
--
Gitblit v1.9.1