From 011d17bc8df981ba31e895873ab0e4a17da8288f Mon Sep 17 00:00:00 2001
From: lss <2538410689@qq.com>
Date: 星期四, 26 六月 2025 17:46:13 +0800
Subject: [PATCH] 优化
---
HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs | 80 ++++++++++++++++++++++++++++++++--------
1 files changed, 64 insertions(+), 16 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 6045bc1..0482db9 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;
@@ -54,7 +56,7 @@
if (!string.IsNullOrEmpty(mst.S_CNTR_CODE))
{
- LogHelper.Info($"浠诲姟{mst.S_CODE} 璐т綅{mst.S_END_LOC}鍗歌揣瀹屾垚锛岃捣鐐硅В缁戝鍣▄mst.S_CNTR_CODE}");
+ LogHelper.Info($"浠诲姟{mst.S_CODE} 璐т綅{mst.S_END_LOC}鍗歌揣瀹屾垚锛岀粓鐐圭粦瀹氬鍣▄mst.S_CNTR_CODE}");
LocationHelper.BindingLoc(mst.S_END_LOC, mst.S_CNTR_CODE.Split(',').ToList());
}
else
@@ -82,13 +84,10 @@
}
else
{
-
//璧风偣缁堢偣瑙ｉ攣
LocationHelper.UnLockLoc(mst.S_START_LOC);
LocationHelper.UnLockLoc(mst.S_END_LOC);
-
}
-
}
/// <summary>
@@ -133,7 +132,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 +212,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 +264,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 +313,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 +453,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 false;
+ }
+
var mstbyEqno = db.Queryable<WCSTask>().Where(a => a.S_EQ_NO == mst.S_EQ_NO).ToList();
if (mstbyEqno.Count() == 1)
{
@@ -455,12 +486,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 +617,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);
@@ -784,6 +824,11 @@
var time = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
statusarrive.RequestId = "鏉弶AGV" + time;
+ int flag = 0;
+ if (mst.S_NOTE == "绮夋枡")
+ {
+ flag = 1;
+ }
//List<StatusArrive> statusArrives = new List<StatusArrive>();
StatusArrive statusArrive = new StatusArrive();
statusarrive.UseToken = "iFQ5fExGrLYLXliHYWzs";
@@ -791,7 +836,9 @@
statusArrive.LocationNum = mst.S_END_LOC;
statusArrive.Time = DateTime.Now.ToString();
statusArrive.Status = status.ToString();
-
+ statusArrive.Rfid = mst.S_CNTR_CODE;
+ statusArrive.Flag = flag;
+
//statusArrives.Add(statusArrive);
statusarrive.data = statusArrive;
//寮�鍥炴姤
@@ -857,7 +904,8 @@
mesItemBackModel.Rfid = mst.S_CNTR_CODE;
mesItemBackModel.LocationNum = mst.S_END_LOC;
mesItemBackModel.Result = "1";
- mesItemBackModel.ArricalTime = DateTime.Now.ToString("yyyy-MM-dd");
+ mesItemBackModel.ArricalTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");
+
if (cntritem != null)
{
list.Add(new MesItemBackInfoModel()
--
Gitblit v1.9.1