From 8bc688f992f70815084e958a728a696871294672 Mon Sep 17 00:00:00 2001
From: pulg <plg@Haninfo>
Date: 星期二, 01 七月 2025 15:51:50 +0800
Subject: [PATCH] Merge branch 'master' of http://121.37.118.194:8000/r/WMSPrjInstance/HH-0014_NongFu_QingXi
---
HH.WCS.QingXiNongfu/core/TaskCore.cs | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/core/TaskCore.cs b/HH.WCS.QingXiNongfu/core/TaskCore.cs
index a62c5bc..42025e7 100644
--- a/HH.WCS.QingXiNongfu/core/TaskCore.cs
+++ b/HH.WCS.QingXiNongfu/core/TaskCore.cs
@@ -389,6 +389,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 +489,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