From d4fd2574b94a355de638c0a3ce5436aec8d9edea Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期二, 01 七月 2025 15:45:53 +0800
Subject: [PATCH] 1
---
HH.WCS.QingXiNongfu/Program.cs | 14 ++++++
HH.WCS.QingXiNongfu/wms/LocationHelper.cs | 2
HH.WCS.QingXiNongfu/wms/WMSModel.cs | 32 ++++++++++++++++
HH.WCS.QingXiNongfu/core/TaskCore.cs | 23 +++++++++--
HH.WCS.QingXiNongfu/core/Monitor.cs | 18 +++++---
5 files changed, 76 insertions(+), 13 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/Program.cs b/HH.WCS.QingXiNongfu/Program.cs
index 9b7ec73..0d35481 100644
--- a/HH.WCS.QingXiNongfu/Program.cs
+++ b/HH.WCS.QingXiNongfu/Program.cs
@@ -21,6 +21,7 @@
using System.Threading;
using System.Threading.Tasks;
using Topshelf;
+using static System.Net.Mime.MediaTypeNames;
using Monitor = HH.WCS.QingXigongchang.core.Monitor;
namespace HH.WCS.QingXigongchang
@@ -79,8 +80,19 @@
//Console.WriteLine(set1.SetEquals(set3));
#endregion
- var uuu16 = "TN" + (DateTime.Now.ToString("yy")) + ((6180010+ "").PadLeft(8, '0'));
+ var uuu16 = "TN" + (DateTime.Now.ToString("yy")) + ((6180010 + "").PadLeft(8, '0'));
+
Console.WriteLine(uuu16);
+
+ switch ("")
+ {
+ case var _ when true:
+ {
+
+ }
+ break;
+ default: break;
+ }
}
else
{
diff --git a/HH.WCS.QingXiNongfu/core/Monitor.cs b/HH.WCS.QingXiNongfu/core/Monitor.cs
index 8399a13..641bac1 100644
--- a/HH.WCS.QingXiNongfu/core/Monitor.cs
+++ b/HH.WCS.QingXiNongfu/core/Monitor.cs
@@ -430,13 +430,17 @@
var orders = WCSHelper.GetWorkOrder2();
var thisOrder = orders.Find(x => x.SQL_WorkNo == WorkNo);
LogHelper.Info("绉诲簱瑙ｉ攣 --褰撳墠宸ュ崟 sid:" + thisOrder?.S_ID);
- if (thisOrder != null)
- {
- var other = orders.Find(x => x.SQL_WorkNo != WorkNo && x.start_area == thisOrder.start_area && x.start_row == thisOrder.start_row);
- LogHelper.Info($"绉诲簱瑙ｉ攣 --鍏朵粬宸ュ崟 x.start_area == {thisOrder.start_area} start_row == {thisOrder.start_row} SID:" + other?.S_ID);
- if (other != null)
- j瑙ｉ攣璧风偣搴撳尯鎺�= false;
- }
+ var allarea_rows = orders.FindAll(x => x.S_ID != thisOrder.S_ID && x.start_area == thisOrder.start_area && x.start_row == thisOrder.start_row);
+ LogHelper.Info("绉诲簱瑙ｉ攣 --褰撳墠宸ュ崟 鐨勫悓搴撳尯鎺�鍏朵粬宸ュ崟:" + JsonConvert.SerializeObject(allarea_rows));
+ if (allarea_rows.Any())
+ j瑙ｉ攣璧风偣搴撳尯鎺�= false;
+ //if (thisOrder != null)
+ //{
+ // var other = orders.Find(x => x.SQL_WorkNo != WorkNo && x.start_area == thisOrder.start_area && x.start_row == thisOrder.start_row);
+ // LogHelper.Info($"绉诲簱瑙ｉ攣 --鍏朵粬宸ュ崟 x.start_area == {thisOrder.start_area} start_row == {thisOrder.start_row} SID:" + other?.S_ID);
+ // if (other != null)
+ // j瑙ｉ攣璧风偣搴撳尯鎺�= false;
+ //}
}
//if (sign == 1)
//{
diff --git a/HH.WCS.QingXiNongfu/core/TaskCore.cs b/HH.WCS.QingXiNongfu/core/TaskCore.cs
index 29be3a2..ebe053a 100644
--- a/HH.WCS.QingXiNongfu/core/TaskCore.cs
+++ b/HH.WCS.QingXiNongfu/core/TaskCore.cs
@@ -382,6 +382,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 +457,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 +482,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 瀛愬彞锛岃秴鍑轰細鎶ヨ娉曢敊璇�*/
diff --git a/HH.WCS.QingXiNongfu/wms/LocationHelper.cs b/HH.WCS.QingXiNongfu/wms/LocationHelper.cs
index dc6c1d0..dcbbabc 100644
--- a/HH.WCS.QingXiNongfu/wms/LocationHelper.cs
+++ b/HH.WCS.QingXiNongfu/wms/LocationHelper.cs
@@ -796,7 +796,7 @@
LogHelper.Info($"{plc.deviceName}-{workOrder.SQL_WorkNo}閾炬帴鐨勪骇绾垮彿{LineTo} BolArea 鏈厤缃�");
goto ______label____end;
}
- bitslocs = LocationHelper.GetAreaNormalLocList(ba.UsingBolArea, true, false);
+ bitslocs = LocationHelper.GetAreaNormalLocList(ba.UsingBolArea);
//var bits = Settings.GetInStockCacheList().Where(a => a.deviceName == _t)?.Select(x => x.location);
//bitslocs = LocationHelper.GetAllLocList().Where(x => bits.Contains(x.S_LOC_CODE.Trim())).ToList();
diff --git a/HH.WCS.QingXiNongfu/wms/WMSModel.cs b/HH.WCS.QingXiNongfu/wms/WMSModel.cs
index 93142fd..694aa85 100644
--- a/HH.WCS.QingXiNongfu/wms/WMSModel.cs
+++ b/HH.WCS.QingXiNongfu/wms/WMSModel.cs
@@ -368,14 +368,46 @@
[SuGG("搴撳琛�)]
public class KuRong : BaseModel
{
+ /// <summary>
+ /// 搴撲綅
+ /// </summary>
public string StorageLoc { get; set; }
+ /// <summary>
+ /// AGV鎬诲簱瀹�+ /// </summary>
public int MaxCapacity { get; set; }
+ /// <summary>
+ /// 宸插崰搴撳
+ /// </summary>
public int FilledCapacity { get; set; }
+ /// <summary>
+ /// 鍝佺浉
+ /// </summary>
public string ProductItem { get; set; }
+ /// <summary>
+ /// 鍓╀綑搴撳閲�+ /// </summary>
public int AvailableCapacity { get; set; }
+ /// <summary>
+ /// agv鎵�渶搴撳銆�+ /// </summary>
public int DesiredCapacity { get; set; }
+ /// <summary>
+ /// 浠撳簱鎬诲簱瀹广�
+ /// </summary>
public int CRC { get; set; }
+ /// <summary>
+ /// 鍓╀綑绌哄簱瀹广�
+ /// </summary>
public int RAC { get; set; }
+ /// <summary>
+ /// 宸插崰搴撳鐨勫拰銆�+ /// </summary>
+ public int DRC { get; set; }
+ /// <summary>
+ /// 浠撳簱鍓╀綑鎬诲簱瀹广�
+ /// </summary>
+ public int BAC { get; set; }
}
//鍧囧窞鐜板満
//[SugarTable("dbo.")]
--
Gitblit v1.9.1