From 3a3c5f5711a57439f34e772313fcbb18ba7885bc Mon Sep 17 00:00:00 2001
From: hudong <Administrator@PC-20250329JZUF>
Date: 星期一, 14 七月 2025 10:31:15 +0800
Subject: [PATCH] 优化
---
core/WCSCore.cs | 58 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 45 insertions(+), 13 deletions(-)
diff --git a/core/WCSCore.cs b/core/WCSCore.cs
index 6de5ac9..7b4f945 100644
--- a/core/WCSCore.cs
+++ b/core/WCSCore.cs
@@ -7,6 +7,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Threading.Tasks;
using static HH.WCS.Mobox3.pinggao.api.ApiModel;
namespace HH.WCS.Mobox3.pinggao.core {
@@ -32,10 +33,10 @@
case 4:
WCSHelper.UpdateStatus(TN_Task, "鍙栬揣瀹屾垚");
TaskProcess.OperateStatus(TN_Task, 4);
- if (TN_Task.N_TYPE == 2)
- {
- WMSHelper.DeleteChange(TN_Task);
- }
+ //if (TN_Task.N_TYPE == 2)
+ //{
+ // WMSHelper.DeleteChange(TN_Task);
+ //}
break;
case 5:
WCSHelper.UpdateStatus(TN_Task, "寮�鍗歌揣");
@@ -61,14 +62,19 @@
//sendsencondtask(TN_Task);
WMSHelper.End(TN_Task);
//鍑哄簱浠诲姟瀹屾垚 淇敼閰嶇洏鍗曠姸鎬佷负瀹屾垚
- if (TN_Task.N_TYPE == 2)
+ if (TN_Task.N_TYPE == 2&&TN_Task.S_TYPE!="鍑哄簱绌烘墭鐩� && TN_Task.S_TYPE != "鍗婃墭鍑哄簱")
{
WMSHelper.EndTn(TN_Task.S_CNTR_CODE);
}
break;
case 7:
- TaskProcess.OperateStatus(TN_Task, 7);
- WCSHelper.Fail(TN_Task);
+ if (TN_Task.N_B_STATE!=3)
+ {
+ TaskProcess.OperateStatus(TN_Task, 7);
+ WCSHelper.Fail(TN_Task);
+ WMSHelper.Fail(TN_Task);
+ }
+
//sendsencondtask(TN_Task);
//WMSHelper.End(TN_Task);
break;
@@ -83,7 +89,7 @@
}
else {
//瀹夊叏璇锋眰绛�- TaskProcess.OperateReq( TN_Task, model.State, model.ForkliftNo, model.ExtData, model.Ext1);
+ TaskProcess.OperateReq( TN_Task, model.State, model.ForkliftNo, model.ExtData);
}
}
}
@@ -100,7 +106,26 @@
WMSHelper.UpdateTaskState(optask);
}
}
+ //public static bool SendCd()
+ //{
+
+
+ // var result = false;
+
+ // var dic = new Dictionary<string, string>();
+ // var dic1 = new Dictionary<string, string>();
+
+ // dic.Add("ExtDeviceNo", "1");
+
+ // //鍒ゆ柇
+ // var res = NDC.OrderAdd(99, dic, dic1);
+ // if (res != null && (res.Res.ErrCode == 0 || res.Res.ErrCode == 50009))
+ // {
+ // result = true;
+ // }
+ // return result;
+ //}
/// <summary>
/// 浠诲姟鍒嗗彂锛屾牴鎹皟搴︾被鍨嬪彂缁欎笉鍚岀殑璋冨害绯荤粺
/// </summary>
@@ -120,6 +145,17 @@
}
+ }
+ internal static void Dispatch1() {
+ //鏌ヨ浠诲姟
+ //鑾峰彇鎵�湁绛夊緟鐨勪换鍔�+ TaskProcess.SendCd();
+ }
+ internal static void DSCZ()
+ {
+ //鏌ヨ浠诲姟
+ //鑾峰彇鎵�湁绛夊緟鐨勪换鍔�+ TaskProcess.SendCZ();
}
/// <summary>
@@ -133,10 +169,6 @@
var end = LocationHelper.GetLoc(wcsTask.S_END_LOC);
if (model.code == "0") {
- //鍏ュ簱
-
- //鏍囪浠诲姟瀹屾垚
- //鏍囪浣滀笟瀹屾垚
wcsTask.N_B_STATE = 3;
WCSHelper.UpdateStatus(wcsTask,"瀹屾垚");
var wmsTask = WMSHelper.GetWmsTask(wcsTask.S_OP_CODE);
@@ -147,6 +179,6 @@
sendsencondtask(wcsTask);
}
}
- }
+ }
}
}
--
Gitblit v1.9.1