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/core/TaskCore.cs |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 deletions(-)

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 瀛愬彞锛岃秴鍑轰細鎶ヨ娉曢敊璇�*/

--
Gitblit v1.9.1