From 7ba2510fb07b0fd4984dd51ebd5fb1438a58c324 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=94=84=E5=A4=B4?= <yangw@mesnac.com>
Date: Sun, 9 Jun 2024 17:33:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=82=B9=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LjDeliver/DeliverInitAction.cs            | 33 ++++++++++---------
 DataBlockHelper/DBHelpers/MReadHelp.cs        |  9 ++---
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs
index 3b4920a..308f25e 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs
@@ -602,21 +602,24 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver
             PlcTemp.Bottle14_Set = DB120.SiloN;
             PlcTemp.Bottle15_Set = DB120.SiloO;
 
-            PlcTemp.Cabinet1 = MReadHelp.ReadCabinet()[0];
-            PlcTemp.Cabinet2 = MReadHelp.ReadCabinet()[1];
-            PlcTemp.Cabinet3 = MReadHelp.ReadCabinet()[2];
-            PlcTemp.Cabinet4 = MReadHelp.ReadCabinet()[3];
-            PlcTemp.Cabinet5 = MReadHelp.ReadCabinet()[4];
-            PlcTemp.Cabinet6 = MReadHelp.ReadCabinet()[5];
-            PlcTemp.Cabinet7 = MReadHelp.ReadCabinet()[6];
-            PlcTemp.Cabinet8 = MReadHelp.ReadCabinet()[7];
-            PlcTemp.Cabinet9 = MReadHelp.ReadCabinet()[8];
-            PlcTemp.Cabinet10 = MReadHelp.ReadCabinet()[9];
-            PlcTemp.Cabinet11 = MReadHelp.ReadCabinet()[10];
-            PlcTemp.Cabinet12 = MReadHelp.ReadCabinet()[11];
-            PlcTemp.Cabinet13 = MReadHelp.ReadCabinet()[12];
-            PlcTemp.Cabinet14 = MReadHelp.ReadCabinet()[13];
-            PlcTemp.Cabinet15 = MReadHelp.ReadCabinet()[14];
+
+            var bbb = MReadHelp.ReadCabinet();
+            PlcTemp.Cabinet1 = bbb[0];
+            PlcTemp.Cabinet2 = bbb[1];
+            PlcTemp.Cabinet3 = bbb[2];
+            PlcTemp.Cabinet4 = bbb[3];
+            PlcTemp.Cabinet5 = bbb[4];
+            PlcTemp.Cabinet6 = bbb[5];
+            PlcTemp.Cabinet7 = bbb[6];
+            PlcTemp.Cabinet8 = bbb[7];
+            PlcTemp.Cabinet9 = bbb[8];
+            PlcTemp.Cabinet10 = bbb[9];
+
+            PlcTemp.Cabinet11 = bbb[10];
+            PlcTemp.Cabinet12 = bbb[11];
+            PlcTemp.Cabinet13 = bbb[12];
+            PlcTemp.Cabinet14 = bbb[13];
+            PlcTemp.Cabinet15 = bbb[14];
 
             PlcTemp.Steps1 = new bool[7]
             {
diff --git a/DataBlockHelper/DBHelpers/MReadHelp.cs b/DataBlockHelper/DBHelpers/MReadHelp.cs
index a578073..9562d1d 100644
--- a/DataBlockHelper/DBHelpers/MReadHelp.cs
+++ b/DataBlockHelper/DBHelpers/MReadHelp.cs
@@ -41,10 +41,11 @@ namespace DataBlockHelper.DBHelpers
                 p.ReadBool("M2017.7").Content,
                 p.ReadBool("M2018.0").Content,
                 p.ReadBool("M2018.1").Content,
-                p.ReadBool("M2030.0").Content,
-                p.ReadBool("M2030.1").Content,
-                p.ReadBool("M2030.2").Content,
-                p.ReadBool("M2030.3").Content,
+
+                p.ReadBool("M2201.4").Content,
+                p.ReadBool("M2201.5").Content,
+                p.ReadBool("M2201.6").Content,
+                p.ReadBool("M2201.7").Content,
                 p.ReadBool("M2018.2").Content,
             };