From d0b3abf74ac5f94f5373922172ed79fbfc24e6be Mon Sep 17 00:00:00 2001
From: lss <Lss@HanInfo>
Date: 星期二, 17 六月 2025 17:28:53 +0800
Subject: [PATCH] 电梯流程开发
---
HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs | 63 ++++++++++++++++++++++++++-----
1 files changed, 53 insertions(+), 10 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 3721af6..528b307 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs
@@ -2,11 +2,13 @@
using HH.WCS.JiaTong.core;
using HH.WCS.JiaTong.device;
using HH.WCS.JiaTong.dispatch;
+using HH.WCS.JiaTong.LISTA.models;
using HH.WCS.JiaTong.LISTA.process;
using HH.WCS.JiaTong.util;
using HH.WCS.JiaTong.wms;
using Microsoft.Owin.BuilderProperties;
using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using SqlSugar;
using System;
using System.Collections.Generic;
@@ -133,7 +135,11 @@
}
else
{
- ModbusHelper.WriteSingleRegister(40089, EndLoc.N_LAYER, device.address, 1024);
+ int layerValue = 0;
+ if (EndLoc.N_LAYER == 1) layerValue = 1;
+ else if (EndLoc.N_LAYER == 2) layerValue = 3;
+ else if (EndLoc.N_LAYER == 3) layerValue = 5;
+ ModbusHelper.WriteSingleRegister(40089, layerValue, device.address, 1024);
ModbusHelper.WriteSingleRegister(40101, 2, device.address, 1024);
ModbusHelper.WriteSingleRegister(40003, 2, device.address, 1024);
ModbusHelper.WriteSingleRegister(40102, 1, device.address, 1024);
@@ -209,13 +215,25 @@
if (Device != null)
{
//鍐欏叆澶辫触閲嶆柊鍐欏叆
- while (!S7Helper.WriteDpj(Device.address, 1001, 1))
+ if (!S7Helper.WriteDpj(Device.address, 1001, 1))
{
- Thread.Sleep(1000);
+ Task.Run(() =>
+ {
+ while (!S7Helper.WriteDpj(Device.address, 1001, 1))
+ {
+ Thread.Sleep(1000);
+ }
+ });
}
- while (!S7Helper.WriteDpj(Device.address, 1002, 0))
+ if (!S7Helper.WriteDpj(Device.address, 1002, 0))
{
- Thread.Sleep(1000);
+ Task.Run(() =>
+ {
+ while (!S7Helper.WriteDpj(Device.address, 1002, 0))
+ {
+ Thread.Sleep(1000);
+ }
+ });
}
}
else
@@ -249,9 +267,13 @@
}
else
{
+ int layerValue = 0;
+ if (startloc.N_LAYER == 1) layerValue = 1;
+ else if (startloc.N_LAYER == 2) layerValue = 3;
+ else if (startloc.N_LAYER == 3) layerValue = 5;
ModbusHelper.WriteSingleRegister(40101, 2, device.address, 1024);
ModbusHelper.WriteSingleRegister(40003, 2, device.address, 1024);
- ModbusHelper.WriteSingleRegister(40089, startloc.N_LAYER, device.address, 1024);
+ ModbusHelper.WriteSingleRegister(40089, layerValue, device.address, 1024);
ModbusHelper.WriteSingleRegister(40102, 1, device.address, 1024);
}
@@ -294,7 +316,11 @@
{
LogHelper.Info($"鏍规嵁浠诲姟缁堢偣:{mstbyEqno.S_END_LOC},鏈壘鍒板搴旇揣浣�);
}
- ModbusHelper.WriteSingleRegister(40089, Endloc.N_LAYER, device.address, 1024);
+ int value = 0;
+ if (Endloc.N_LAYER == 1) value = 1;
+ else if (Endloc.N_LAYER == 2) value = 3;
+ else if (Endloc.N_LAYER == 3) value = 5;
+ ModbusHelper.WriteSingleRegister(40089, value, device.address, 1024);
ModbusHelper.WriteSingleRegister(40102, 1, device.address, 1024);
}
@@ -430,6 +456,14 @@
{
var result = true;
var db = new SqlHelper<object>().GetInstance();
+ //鏍规嵁璧风偣浠撳簱缂栫爜鍒ゆ柇鏄惁鍙互鎺ㄩ�
+ var taskLimit = db.Queryable<TASK_LIMIT>().Where(a => a.S_WH_CODE == mst.S_START_WH && a.OPEN == "1").First();
+ if (taskLimit != null)
+ {
+ Console.WriteLine($"浠诲姟锛歿mst.S_CODE},璧风偣浠撳簱锛歿mst.S_START_WH}宸茬粡绂佺敤鎺ㄩ�");
+ return result;
+ }
+
var mstbyEqno = db.Queryable<WCSTask>().Where(a => a.S_EQ_NO == mst.S_EQ_NO).ToList();
if (mstbyEqno.Count() == 1)
{
@@ -455,12 +489,16 @@
else if (mst.S_TYPE == "鐢垫2")
{
var mst2 = mstbyEqno.Where(a => a.S_TYPE == "鐢垫1").First();
- if (mst2.S_B_STATE == "鍗歌揣瀹屾垚" || mst2.S_B_STATE == "瀹屾垚")
- {
+ if (mst2 == null)
+ {
return result;
}
else
{
+ if (mst2.S_B_STATE == "鍗歌揣瀹屾垚" || mst2.S_B_STATE == "瀹屾垚")
+ {
+ return result;
+ }
result = false;
}
}
@@ -582,7 +620,12 @@
{
LogHelper.Info($"鏍规嵁浠诲姟璧风偣:{mst.S_START_LOC},鏈壘鍒板搴旇揣浣�);
}
- ModbusHelper.WriteSingleRegister(40089, loc.N_LAYER, device.address, 1024);
+ int value = 0;
+ if (loc.N_LAYER == 1) value = 1;
+ else if (loc.N_LAYER == 2) value = 3;
+ else if (loc.N_LAYER == 3) value = 5;
+
+ ModbusHelper.WriteSingleRegister(40089, value, device.address, 1024);
ModbusHelper.WriteSingleRegister(40102, 1, device.address, 1024);
--
Gitblit v1.9.1