From 92a558e9ebfdf05d2536aa6b3fa93b1bd7f08e30 Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期二, 22 七月 2025 17:53:15 +0800
Subject: [PATCH] 清溪瓶坯翻斗机光栅信号缓存和 安全交互处理。1101-4
---
HH.WCS.QingXiNongfu/core/TaskCore.cs | 122 ++++++++++++++++++++++++++++++++++++----
1 files changed, 109 insertions(+), 13 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/core/TaskCore.cs b/HH.WCS.QingXiNongfu/core/TaskCore.cs
index 29be3a2..42eb04e 100644
--- a/HH.WCS.QingXiNongfu/core/TaskCore.cs
+++ b/HH.WCS.QingXiNongfu/core/TaskCore.cs
@@ -7,8 +7,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using System.Web.Configuration;
-using System.Xml.Schema;
using static HH.WCS.QingXigongchang.api.ApiModel;
namespace HH.WCS.QingXigongchang.core
@@ -36,7 +34,7 @@
&& wmsTask.S_B_STATE.Trim() != "寮哄埗瀹屾垚"
&& wmsTask.S_B_STATE.Trim() != "鍙栨秷")
{
- if (model.State < 8 || model.State > 1000)
+ if (model.State < 10 || model.State > 1000)
{
if (model.State < 7 && string.IsNullOrEmpty(model.ForkliftNo))
{
@@ -93,32 +91,111 @@
TaskProcess.OperateStatus(wmsTask, 7);
wmsTask.T_END_TIME = DateTime.Now;
TaskHelper.UpdateStatus(wmsTask, "鍙栨秷");
+ try
+ {
+ if (wmsTask.S_TYPE.Contains("娉ㄥ婊℃墭-鍏ュ簱"))
+ {
+ var plc = Settings.GetDeviceInfoList().Where(a => a.location.Any(str => str == wmsTask.S_START_LOC)).FirstOrDefault();
+ if (plc != null)
+ {
+ for (var i = 0; i < plc.location.Length; i++)
+ {
+ if (wmsTask.S_START_LOC == plc.location[i])
+ {
+ PlcHelper.SendHex(plc.address, "3F00" + (i + 1) + "0" + "0d0a");
+ break;
+ }
+ }
+ }
+ }
+ else if (wmsTask.S_TYPE.Contains("娉ㄥ绌烘嫋-鍑哄簱"))
+ {
+ var plc = Settings.GetDeviceInfoList().Where(a => a.location.Any(str => str == wmsTask.S_END_LOC)).FirstOrDefault();
+ if (plc != null)
+ {
+ for (var i = 0; i < plc.location.Length; i++)
+ {
+ if (wmsTask.S_END_LOC == plc.location[i])
+ {
+ PlcHelper.SendHex(plc.address, "3F00" + (i + 1) + "0" + "0d0a");
+ break;
+ }
+ }
+ }
+ }
+ else if (wmsTask.S_TYPE.Contains("鐡跺澂缈绘枟鏈烘弧鎵�鍑哄簱"))
+ {
+ var plc = Settings.GetDeviceInfoList().Where(a => a.location.Any(str => str == wmsTask.S_END_LOC)).FirstOrDefault();
+ if (plc != null)
+ {
+ PlcHelper.SendHex(plc.address, "3F00110D0A");
+ }
+
+ }
+ else if (wmsTask.S_TYPE.Contains("鐡跺澂缈绘枟鏈虹┖鎵�鍏ュ簱"))
+ {
+ var plc = Settings.GetDeviceInfoList().Where(a => a.location.Any(str => str == wmsTask.S_START_LOC)).FirstOrDefault();
+ if (plc != null)
+ {
+ PlcHelper.SendHex(plc.address, "3F00110D0A");
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+
+ throw;
+ }
break;
case 8://寮哄埗瀹屾垚 - 鏈娇鐢� r = TaskProcess.OperateStatus(wmsTask, 8);
if (r.ResultCode != -1)
TaskHelper.BeEnd(wmsTask);
break;
+ case 9://寮哄埗鍙栨秷 //璧风偣瑙ｇ粦閿侀噴鏀�缁堢偣閿侀噴鏀�+ // var R = NDCHelper.CancelS(model.No);
+ r = TaskProcess.OperateStatus(wmsTask, 9);
+ if (r.ResultCode != -1)
+ {
+ wmsTask.T_END_TIME = DateTime.Now;
+ TaskHelper.UpdateStatus(wmsTask, "鍙栨秷");
+ }
+ break;
case 1101://鍙栬揣鐢宠 -
{
- NDCHelper.ChangeParam(wmsTask.S_TASK_NO, 1101, 18);
var plc = Settings.GetDeviceInfoList().Where(a => a.location.Contains(wmsTask.S_START_LOC.Trim()) && a.enable == 1).FirstOrDefault();
- if (plc != null && plc.deviceType == 9)
+ if (plc != null)
{
- PlcHelper.SendHex(plc.address, "3F00" + "11" + "0d0a");
+ if (plc.deviceType == 9)
+ {
+ PlcHelper.SendHex(plc.address, "3F00" + "11" + "0d0a");
+ NDCHelper.ChangeParam(wmsTask.S_TASK_NO, 1101, 18);
+ }
+ else if (plc.deviceType == 5 && DeviceProcess.doorStatus.TryGetValue(wmsTask.S_START_LOC.Trim(), out var value) && value.info == "1100")
+ PlcHelper.SendHex(plc.address, "3F00" + "1221" + "0d0a");
}
+ else
+ NDCHelper.ChangeParam(wmsTask.S_TASK_NO, 1101, 18);
+
}
break;
case 1103://鍗歌揣鐢宠 - 鏈娇鐢� {
- NDCHelper.ChangeParam(wmsTask.S_TASK_NO, 1103, 18);
var plc = Settings.GetDeviceInfoList().Where(a => a.location.Contains(wmsTask.S_END_LOC.Trim()) && a.enable == 1).FirstOrDefault();
- if (plc != null && plc.deviceType == 9)
+ if (plc != null)
{
- PlcHelper.SendHex(plc.address, "3F00" + "21" + "0d0a");
+ if (plc.deviceType == 9)
+ {
+ PlcHelper.SendHex(plc.address, "3F00" + "21" + "0d0a");
+ NDCHelper.ChangeParam(wmsTask.S_TASK_NO, 1103, 18);
+ }
+ else if (plc.deviceType == 5 && DeviceProcess.doorStatus.TryGetValue(wmsTask.S_END_LOC.Trim(), out var value) && value.info == "1100")
+ PlcHelper.SendHex(plc.address, "3F00" + "1221" + "0d0a");
}
+ else
+ NDCHelper.ChangeParam(wmsTask.S_TASK_NO, 1103, 18);
}
break;
case 1102://鍙栬揣瀹屾垚 - 鏈娇鐢�@@ -139,6 +216,10 @@
break;
}
}
+ else if (plc.deviceType == 5)
+ {
+ PlcHelper.SendHex(plc.address, "3F00" + "1020" + "0d0a");
+ }
}
}
break;
@@ -382,6 +463,9 @@
var info = db.Queryable<KuRong>().First();
if (info == null || DateTime.Now.Subtract(info.T_MODIFY).TotalMinutes > min)
{
+ db.Deleteable<KuRong>().ExecuteCommand();
+ info = null;
+
//1銆佹煡鍒板皬鏉垮簱鍖轰笅闈㈡墍鏈夌殑搴撲綅
var totalX = 0;
var totalRows = 0;
@@ -454,7 +538,7 @@
var count = db.Queryable<Location>().Where(c => c.S_AREA_CODE == norAreacode && c.N_ROW == b && c.N_CURRENT_NUM > 0).Sum(c => c.N_CURRENT_NUM) * 2; // 鎸囧畾缁熻瀛楁
kr.ProductItem = lcr.CntrItemRel.S_ITEM_CODE;
- if(!string.IsNullOrEmpty(lcr.CntrItemRel.S_ITEM_NAME))
+ if (!string.IsNullOrEmpty(lcr.CntrItemRel.S_ITEM_NAME))
kr.ProductItem = lcr.CntrItemRel.S_ITEM_NAME;
kr.MaxCapacity = total;
kr.FilledCapacity = count;
@@ -479,9 +563,21 @@
}
var totalDesiredCapacity = ordersCount * 4 * 3 * (totalX / totalRows);
LogHelper.Error($"鎴愬搧灏忔澘鍖烘�璐т綅鏄瘂totalX},鎬绘帓鏁版槸{totalRows},褰撳墠鎵ц宸ュ崟鏁伴噺鏄瘂ordersCount}", new Exception("Kurong"));
- var totalAvailableCapacity = list.Sum(a => a.AvailableCapacity);
- var totalAssignableCapacity = totalAvailableCapacity - totalDesiredCapacity;
- list.ForEach(a => { a.DesiredCapacity = totalDesiredCapacity; a.CRC = totalAvailableCapacity; a.RAC = totalAssignableCapacity; });
+ //var totalAvailableCapacity = list.Sum(a => a.AvailableCapacity);
+ //var totalAssignableCapacity = totalAvailableCapacity - totalDesiredCapacity;
+ //list.ForEach(a => { a.DesiredCapacity = totalDesiredCapacity; a.CRC = totalAvailableCapacity; a.RAC = totalAssignableCapacity; });
+ var totalAvailableCapacity = list.Sum(a => a.MaxCapacity);// AvailableCapacity);
+ var DRC = list.Sum(x => x.FilledCapacity);
+ var totalAssignableCapacity = totalAvailableCapacity - DRC - totalDesiredCapacity;
+ var BAC = list.Sum(x => x.AvailableCapacity);
+ list.ForEach(a =>
+ {
+ a.DesiredCapacity = totalDesiredCapacity;
+ a.CRC = totalAvailableCapacity;
+ a.RAC = totalAssignableCapacity;
+ a.BAC = BAC;
+ a.DRC = DRC;
+ });
if (info == null)
{
/*鈥婼QL Server鈥�1000 鏉�鎵规 鍗曚釜 INSERT 璇彞鏈�鏀寔 1000 鏉�VALUES 瀛愬彞锛岃秴鍑轰細鎶ヨ娉曢敊璇�*/
--
Gitblit v1.9.1