From 8741f7e84dc7c0a1150c92758ebb2cf4b7d18c73 Mon Sep 17 00:00:00 2001
From: pulg <plg@Haninfo>
Date: 星期五, 18 七月 2025 14:49:30 +0800
Subject: [PATCH] 1
---
HH.WCS.QingXiNongfu/core/TaskCore.cs | 78 +++++++++++++++++++++++++++++++++++++--
1 files changed, 74 insertions(+), 4 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/core/TaskCore.cs b/HH.WCS.QingXiNongfu/core/TaskCore.cs
index a62c5bc..2c83a51 100644
--- a/HH.WCS.QingXiNongfu/core/TaskCore.cs
+++ b/HH.WCS.QingXiNongfu/core/TaskCore.cs
@@ -91,6 +91,61 @@
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);
@@ -98,7 +153,7 @@
TaskHelper.BeEnd(wmsTask);
break;
case 9://寮哄埗鍙栨秷 //璧风偣瑙ｇ粦閿侀噴鏀�缁堢偣閿侀噴鏀�-
+ // var R = NDCHelper.CancelS(model.No);
r = TaskProcess.OperateStatus(wmsTask, 9);
if (r.ResultCode != -1)
{
@@ -389,6 +444,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;
@@ -486,9 +544,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