From f7d36a3dd47e06bf76863179af1d76bd0e23054f Mon Sep 17 00:00:00 2001
From: lss <Lss@HanInfo>
Date: 星期一, 19 五月 2025 10:25:17 +0800
Subject: [PATCH] s7协议S7200Smart开发，接口字段更新
---
HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs | 65 ++++++++++++++++++++------------
1 files changed, 41 insertions(+), 24 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs
index df349b2..a4abc4b 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs
@@ -1,5 +1,6 @@
锘縰sing HH.WCS.JiaTong.api;
using HH.WCS.JiaTong.core;
+using HH.WCS.JiaTong.device;
using HH.WCS.JiaTong.dispatch;
using HH.WCS.JiaTong.LISTA.process;
using HH.WCS.JiaTong.util;
@@ -12,6 +13,7 @@
using System.IdentityModel.Protocols.WSTrust;
using System.Linq;
using System.Security.Cryptography;
+using static HH.WCS.JiaTong.api.ApiModel;
using static HH.WCS.JiaTong.LISTA.process.HttpModel;
namespace HH.WCS.JiaTong.process
@@ -71,27 +73,26 @@
/// <summary>
/// 瀹夊叏璇锋眰
/// </summary>
- /// <param name="no"></param>
- /// <param name="state"></param>
- /// <param name="forkliftNo"></param>
- /// <param name="extData"></param>
- internal static void OperateReq(string no, int state, string url, string forkliftNo, string extData, int Z_type)
+ /// <param name="model"></param>
+ /// <param name="url"></param>
+ /// <param name="wcs"></param>
+ internal static void OperateReq(AgvTaskState model, string url, WCSTask TN_Task)
{
try
{
LogHelper.Info($"-------寮�瀹夊叏璇锋眰------");
- var TN_Task = WCSHelper.GetTask(no);
+
if (TN_Task != null)
{
int type = 0;
string loc = "";
- if (state == 1101)
+ if (model.state == 1101)
{
//璇锋眰鍙栬揣锛� type = 1;
loc = TN_Task.S_START_LOC;
- if (Z_type == 4)
+ if (TN_Task.Z_TYPE == 4)//鍘熸潗鏂欏簱鍥借嚜瀹夊叏浜や簰
{
if (GZOperateReqByPost(url, TN_Task.S_EQ_NO, loc, type))
{
@@ -101,19 +102,35 @@
}
else
{
- if (OperateReqByPost(url, TN_Task.S_EQ_NO, TN_Task.S_CODE, loc, type, state))
+ //浜曟澗鍙犵洏鏈哄畨鍏ㄤ氦浜�+ if (TN_Task.Z_TYPE == 2 && TN_Task.S_NOTE == "绌烘墭鍥炲簱")
{
- // NDCHelper.ChangeParam(TN_Task.S_CODE.Trim(), 1101, 18);
- NDCApi.ChangeOrderParam(TN_Task.S_CODE.Trim(), 6, "1");
+ if (S7Helper.WriteDpj(1002, 1))
+ {
+ if (S7Helper.ReadDpj(2004, S7.Net.VarType.Byte) == 1)
+ {
+ NDCApi.ChangeOrderParam(TN_Task.S_CODE.Trim(), 6, "1");
+ }
+ }
+
}
+ else
+ {
+ if (OperateReqByPost(url, TN_Task.S_EQ_NO, TN_Task.S_CODE, loc, type, model.state))
+ {
+ // NDCHelper.ChangeParam(TN_Task.S_CODE.Trim(), 1101, 18);
+ NDCApi.ChangeOrderParam(TN_Task.S_CODE.Trim(), 6, "1");
+ }
+ }
+
}
}
- if (state == 1102)
+ if (model.state == 1102)
{
type = 3;
- if (Z_type == 4)
+ if (TN_Task.Z_TYPE == 4)//鍘熸潗鏂欏簱鍥借嚜瀹夊叏浜や簰
{
loc = TN_Task.S_START_LOC;
if (GZOperateReqByPost(url, TN_Task.S_EQ_NO, loc, type))
@@ -121,13 +138,18 @@
//NDCHelper.ChangeParam(TN_Task.S_CODE.Trim(), 1101, 18);
}
}
+ if (TN_Task.Z_TYPE == 2 && TN_Task.S_NOTE == "绌烘墭鍥炲簱")
+ {
+ S7Helper.WriteDpj(1001, 1);
+ S7Helper.WriteDpj(1002, 0);
+ }
}
- if (state == 1103)
+ if (model.state == 1103)
{
//璇锋眰鍗歌揣
type = 2;
loc = TN_Task.S_END_LOC;
- if (Z_type == 4)
+ if (TN_Task.Z_TYPE == 4)//鍘熸潗鏂欏簱鍥借嚜瀹夊叏浜や簰
{
loc = TN_Task.S_END_LOC;
if (GZOperateReqByPost(url, TN_Task.S_EQ_NO, loc, type))
@@ -138,18 +160,16 @@
}
else
{
- if (OperateReqByPost(url, TN_Task.S_EQ_NO, TN_Task.S_CODE, loc, type, state))
+ if (OperateReqByPost(url, TN_Task.S_EQ_NO, TN_Task.S_CODE, loc, type, model.state))
{
NDCApi.ChangeOrderParam(TN_Task.S_CODE.Trim(), 6, "1");
}
}
-
-
}
- if (state == 1104)
+ if (model.state == 1104)
{
type = 4;
- if (Z_type == 4)
+ if (TN_Task.Z_TYPE == 4)//鍘熸潗鏂欏簱鍥借嚜瀹夊叏浜や簰
{
loc = TN_Task.S_END_LOC;
if (GZOperateReqByPost(url, TN_Task.S_EQ_NO, loc, type))
@@ -159,10 +179,7 @@
}
}
}
- else
- {
- LogHelper.Info($"瀹夊叏璇锋眰==銆嬫牴鎹换鍔″彿{no}鏈壘鍒板搴斾换鍔�);
- }
+
}
catch (Exception ex)
{
--
Gitblit v1.9.1