From 2ca90a404fa1ab94eb6374f50c6ddd47a2b7f0e6 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期四, 31 七月 2025 17:23:57 +0800
Subject: [PATCH] 删除有问题的TCP旧代码, 优化事务处理和ERP数据模型
---
core/WCSCore.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/core/WCSCore.cs b/core/WCSCore.cs
index 26a01cd..8404866 100644
--- a/core/WCSCore.cs
+++ b/core/WCSCore.cs
@@ -195,7 +195,7 @@
try {
ModbusHelper.Relink();
- var BZQ = Settings.GetTaskInfo(ETask.M婊℃墭涓嬬嚎鍏ュ簱).StartAreas;
+ var BZQ = ETask.M婊℃墭涓嬬嚎鍏ュ簱.StartAreas();
var loc = db.Queryable<TN_Location>()
.Where(l => BZQ.Contains(l.S_AREA_CODE) && l.S_AGV_SITE == model.station_name).First();
@@ -327,7 +327,7 @@
LogHelper.Info($"鐗╂枡缂栫爜涓嶅瓨鍦�");
}
- var model = new OtherModel.PickUpReturnErpInfo {
+ var model = new ErpModel.PickUpReturnErpInfo {
jhdh = plan.JHDH, // 璁″垝鍗曞彿 (鍞竴鏍囪瘑)
ckzt = plan.CKZT, // 鍑哄簱鐘舵� (闇�杩斿洖)
jhlb = plan.JHLB, // 璁″垝绫诲埆
@@ -491,10 +491,10 @@
public static (bool, string) CreateInboundTask(string startLocCode, string cntrCode) {
var db = new SqlHelper<object>().GetInstance();
- var taskInfo = Settings.GetTaskInfo(ETask.M婊℃墭涓嬬嚎鍏ュ簱);
- var taskName = taskInfo.TaskName;
- var startAreas = taskInfo.StartAreas;
- var endAreas = taskInfo.EndAreas;
+ var tInfo = ETask.M婊℃墭涓嬬嚎鍏ュ簱.Info();
+ var taskName = tInfo.TaskName;
+ var startAreas = tInfo.StartAreas;
+ var endAreas = tInfo.EndAreas;
const string cntrType = "鎵樼洏";
try {
@@ -533,7 +533,7 @@
}
var cntId = locCntrRel.S_CNTR_CODE;
- var task = WCSHelper.BuildTaskWithLocLock(startLoc, endLoc, cntId, taskName);
+ var task = WCSHelper.BuildTaskAndLockLoc(startLoc, endLoc, cntId, taskName);
using (var tran = db.Ado.UseTran()) {
if (locCntrRelOld != null) {
--
Gitblit v1.9.1