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/WCSCore.cs | 43 +++++++++++++++++++++++++++++++++++--------
1 files changed, 35 insertions(+), 8 deletions(-)
diff --git a/core/WCSCore.cs b/core/WCSCore.cs
index 4c9ff87..662ba22 100644
--- a/core/WCSCore.cs
+++ b/core/WCSCore.cs
@@ -20,7 +20,7 @@
public static ReturnResult OperateAgvTaskStatus(AgvTaskState model) {
var result = new ReturnResult();
try {
- if (model.state > 0 && model.state < 1000) {
+ if (model.state > 0) {
// AGV 鎵ц浠诲姟鐨勯�杈戝鐞� if (!AgvTaskProcessOk(model)) {
// 鎵ц涓峅K锛岃鏄庢病鏈夋壘鍒颁换鍔�@@ -38,7 +38,7 @@
}
catch (Exception ex) {
result.ResultCode = -1;
- result.ResultMsg = $"鍙戠敓浜嗗紓甯革細+{ex.Message}";
+ result.ResultMsg = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
LogHelper.Info(result.ResultMsg, "Error");
return result;
}
@@ -76,9 +76,9 @@
var nextOutboundTask = Task.Run(() => {
UpdateOutboundTaskState(3);
});
- //var pickUpReturnErpTask = Task.Run(() => {
- // PickUpReturnErp(TN_Task);
- //});
+ var pickUpReturnErpTask = Task.Run(() => {
+ PickUpReturnErp(TN_Task);
+ });
}
break;
@@ -323,13 +323,40 @@
}
public static void PickUpReturnErp(TN_Task task) {
+ var db = new SqlHelper<object>().GetInstance();
+ var info = "";
var httpH = new HttpHelper();
- var model = new OtherModel.PickUpReturnErpInfo();
- model.LocCode = task.S_START_LOC;
+
try {
+ var plan = db.Queryable<TN_Outbound_Plan>()
+ .Where(p => p.JHDH == task.S_BS_NO)
+ .First();
+
+ if (plan == null) {
+ info = $"璁″垝鍗曞彿{task.S_BS_NO}涓嶅瓨鍦紒";
+ LogHelper.Info(info);
+ }
+
+ var cgDetail = db.Queryable<TN_CG_Detail>()
+ .Where(d => d.S_CNTR_CODE == task.S_CNTR_CODE)
+ .First();
+
+ if (cgDetail == null) {
+ info = $"鐗╂枡缂栫爜涓嶅瓨鍦紒";
+ LogHelper.Info(info);
+ }
+
+ // TODO
+ var model = new OtherModel.PickUpReturnErpInfo();
+ model.sfjs = cgDetail.N_ITEM_NUM;
+ model.sfsl = 0;
+ //model.hw = task.S_START_LOC;
+ //model.hwzt = "";
+
var jsonInfo = JsonConvert.SerializeObject(model);
var result = httpH.WebPost(Settings.ErpApiUrl + "PickUpReturn", jsonInfo);
- // TODO
+
+ LogHelper.InfoApi("鍙栬揣瀹屾垚鍙嶉ERP鎺ュ彛", model);
}
catch (Exception ex) {
LogHelper.InfoEx(ex);
--
Gitblit v1.9.1