From ef839d119eec2c28fac5f5ba175d71f926afae44 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期二, 20 五月 2025 11:49:22 +0800
Subject: [PATCH] 修复数据库表字段不匹配、读取重量错误处理等逻辑
---
Helpers/WCSHelper.cs | 56 +++++++++++++++++---------------------------------------
1 files changed, 17 insertions(+), 39 deletions(-)
diff --git a/Helpers/WCSHelper.cs b/Helpers/WCSHelper.cs
index d764a5f..e907819 100644
--- a/Helpers/WCSHelper.cs
+++ b/Helpers/WCSHelper.cs
@@ -7,11 +7,12 @@
using System.Text;
using System.Threading.Tasks;
using HH.WCS.Mobox3.AnGang.Helpers;
+using HH.WCS.Mobox3.AnGang.Consts;
namespace HH.WCS.Mobox3.AnGang.Helper {
internal class WCSHelper {
internal static string GenerateTaskNo() {
- var id = SYSHelper.GetSerialNumber("浠诲姟鍙�, "TN");
+ var id = SysHelper.GetSerialNumber("浠诲姟鍙�, "TN");
var date = DateTime.Now.ToString("yyMMdd");
return $"TN{date}{id.ToString().PadLeft(4, '0')}";
}
@@ -60,11 +61,25 @@
{
var fromLoc = LocationHelper.GetLocation(from);
var endLoc = LocationHelper.GetLocation(to);
+
+ var endArea = "";
+ if (endLoc == null) {
+ if (taskType == TaskName.浜у搧鍏ュ簱) {
+ endArea = "HJQ"; // 璐ф灦鍖�+ }
+ else {
+ LogHelper.Info("缁堢偣璐т綅涓嶅瓨鍦紝涓斾换鍔＄被鍨嬩笉鏄疨DA璐у搧鍏ュ簱");
+ }
+ }
+ else {
+ endArea = endLoc.S_AREA_CODE;
+ }
+
TN_Task TN_Task = new TN_Task()
{
S_CODE = GenerateTaskNo(),
S_START_AREA = fromLoc.S_AREA_CODE,
- S_END_AREA = endLoc?.S_AREA_CODE ?? "", // 濡傛灉涓簄ull杩斿洖绌哄瓧绗︿覆
+ S_END_AREA = endArea,
S_START_LOC = from,
S_END_LOC = to,
S_TYPE = taskType,
@@ -83,43 +98,6 @@
}
else
{
- LogHelper.Info($"鎻掑叆浠诲姟澶辫触锛寋log}");
- }
- return res;
- }
-
- /// <summary>
- /// 鏍规嵁缁堢偣Area鍒涘缓鎼�浠诲姟
- /// </summary>
- /// <param name="from"></param>
- /// <param name="toArea"></param>
- /// <param name="taskType"></param>
- /// <param name="pri"></param>
- /// <param name="cntrInfo"></param>
- /// <returns></returns>
- internal static bool CreateTaskWithArea(string from, string toArea, string taskType, int pri, string cntrInfo) {
- var fromLoc = LocationHelper.GetLocation(from);
- //var endLoc = LocationHelper.GetLocation(to);
- TN_Task TN_Task = new TN_Task() {
- S_CODE = GenerateTaskNo(),
- S_START_AREA = fromLoc.S_AREA_CODE,
- S_END_AREA = toArea,
- S_START_LOC = from,
- S_END_LOC = "", // 涓嶆寚瀹氱粓鐐硅揣浣�- S_TYPE = taskType,
- N_PRIORITY = pri,
- N_SCHEDULE_TYPE = 3, // 鍥借嚜
- N_B_STATE = 0,
- S_CNTR_CODE = cntrInfo,
- };
-
- var log = JsonConvert.SerializeObject(TN_Task);
- var db = DbHelper.GetDbClient();
- var res = db.Insertable(TN_Task).ExecuteCommand() > 0;
- if (res) {
- LogHelper.Info($"鎻掑叆浠诲姟鎴愬姛锛寋log}");
- }
- else {
LogHelper.Info($"鎻掑叆浠诲姟澶辫触锛寋log}");
}
return res;
--
Gitblit v1.9.1