From 0b679c8b18e2b598ff27cff2fa9ade2c46bde3be Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期一, 16 六月 2025 17:30:32 +0800
Subject: [PATCH] 优化AGV调试和出库逻辑，完成部分ERP反馈代码
---
core/Monitor.cs | 64 +-------------------------------
1 files changed, 2 insertions(+), 62 deletions(-)
diff --git a/core/Monitor.cs b/core/Monitor.cs
index 23f9962..487f856 100644
--- a/core/Monitor.cs
+++ b/core/Monitor.cs
@@ -65,41 +65,6 @@
var startLocCode = prod.OffLoc[0]; // 鐢ㄤ簬娴嬭瘯
//var startLocCode = "CX01"; // 鐢ㄤ簬娴嬭瘯
- //var cgDetail = new TN_CG_Detail { // 绌烘墭涓婄嚎鏃跺氨缁戝畾濂戒簡
- // S_ITEM_CODE = itemCode,
- // S_BATCH_NO = batchNo,
- // S_CNTR_CODE = cntrCode,
- //};
-
- //var needInsertContainer = false;
- //var needUpdateContainer = false;
-
- // TEMP 鑷姩瑙﹀彂鐨勬墭鐩樹笅绾挎殏鏃朵笉鑰冭檻鍒ゆ柇锛岄粯璁ゆ病鏈夋椂鍐欏叆
- // 鏌ュ鍣ㄤ俊鎭〃鏄惁宸茬粡鏈夎繖涓鍣�- //var cntr = db.Queryable<TN_Container>()
- // .Where(c => c.S_CODE == cntrCode).First();
- // 濡傛灉鎵句笉鍒拌瀹瑰櫒锛岄渶瑕佹坊鍔狅紝骞朵笖灏嗗鍣ㄦ潵婧愯缃负浠诲姟鍚嶇О
- //if (cntr == null) {
- // needInsertContainer = true;
- // LogHelper.Info($"杞锛歿taskName}锛氬鍣細{cntrCode}锛屽湪瀹瑰櫒琛ㄤ腑娌℃湁鐧昏锛岀櫥璁板苟璁剧疆瀹瑰櫒鏉ユ簮涓猴細{taskName}");
-
- // cntr = new TN_Container {
- // S_CODE = cntrCode,
- // S_TYPE = cntrType,
- // S_SPEC = itemCode,
- // };
- //}
- //else {
- // 濡傛灉鎵惧埌璇ュ鍣紝浣嗗鍣ㄧ墿鏂欑被鍨嬩笌涓嬬嚎鐗╂枡涓嶇锛岃褰曞苟鐩存帴瑕嗙洊锛堝緟瀹氾級
- // if (!string.IsNullOrEmpty(cntr.S_SPEC) && cntr.S_SPEC != itemCode) {
- // needUpdateContainer = true;
- // LogHelper.Info($"杞锛歿taskName}锛氬鍣ㄨ〃涓鍣▄cntrCode}瀵瑰簲鐨勭墿鏂欎俊鎭細{cntr.S_SPEC}锛� +
- // $"涓庢墍闇�鐨勭墿鏂欎俊鎭瘂itemCode}涓嶇锛岀洿鎺ヨ鐩栫粨鏋�);
-
- // cntr.S_SPEC = itemCode;
- // }
- //}
-
var startLoc = db.Queryable<TN_Location>()
.Where(l => l.S_CODE == startLocCode)
.Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE))
@@ -142,9 +107,6 @@
LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿� LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
- //cntr.S_SOURCE = task.S_CODE;
- //cntr.T_MODIFY = DateTime.Now;
-
using (var tran = db.Ado.UseTran()) {
if (locCntrRelOld != null) {
if (db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0 &&
@@ -155,30 +117,6 @@
continue;
}
}
- //if (needInsertContainer) {
- // if (db.Insertable<TN_Container>(cntr).ExecuteCommand() <= 0) {
- // info = $"鎻掑叆瀹瑰櫒琛ㄥけ璐ワ細" + JsonConvert.SerializeObject(cntr);
- // tran.RollbackTran();
- // LogHelper.Info(info);
- // continue;
- // }
- //}
- //else if (needUpdateContainer) {
- // if (db.Updateable<TN_Container>(cntr)
- // .UpdateColumns(c => new { c.S_SPEC, c.S_SOURCE, c.T_MODIFY }).ExecuteCommand() <= 0) {
- // info = $"鏇存柊瀹瑰櫒琛ㄥけ璐ワ細" + JsonConvert.SerializeObject(cntr);
- // tran.RollbackTran();
- // LogHelper.Info(info);
- // continue;
- // }
- //}
-
- //if (db.Insertable<TN_CG_Detail>(cgDetail).ExecuteCommand() <= 0) {
- // tran.RollbackTran();
- // info = $"鎻掑叆瀹瑰櫒璐у搧淇℃伅琛ㄥけ璐ワ細鐗╂枡缂栫爜{cgDetail.S_ITEM_CODE}锛屽鍣ㄧ紪鐮亄cgDetail.S_CNTR_CODE}";
- // LogHelper.Info(info);
- // continue;
- //}
if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
tran.RollbackTran();
@@ -374,6 +312,8 @@
LogHelper.Info(info);
continue;
}
+
+
}
--
Gitblit v1.9.1