From 3d39be5233a455095cd70d119568559a3b804533 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=88=91=E5=8F=AB=E9=94=84=E5=A4=B4?= <nodyang@qq.com>
Date: Mon, 15 Jan 2024 09:10:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B0=8F=E6=9D=A82=E5=BE=97?=
 =?UTF-8?q?=E5=90=8D=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Mesnac.Action.ChemicalWeighing/LjDeliver/DaCangFactory.cs | 2 +-
 .../LjDeliver/DeliverInitAction.cs                            | 4 ++--
 Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml             | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DaCangFactory.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DaCangFactory.cs
index 695ec9d..aa218d1 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DaCangFactory.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DaCangFactory.cs
@@ -22,7 +22,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver
                     }
                 },
                 {
-                    "小料2",
+                    "碳粉9",
                     new DaCangValue()
                     {
                         volume = 150,
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs
index 81f0d0b..1af8b51 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs
@@ -925,9 +925,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver
 
             var dic = DaCangFactory.GetDefault();
             ControlsImprot.SetMCLabel(LabelE.HslBottleValue1, JiSuan(PlcTemp.Bottle1_Set, dic["小料1"]) + "t");
-            ControlsImprot.SetMCLabel(LabelE.HslBottleValue2, JiSuan(PlcTemp.Bottle2_Set, dic["小料2"]) + "t");
+            ControlsImprot.SetMCLabel(LabelE.HslBottleValue2, JiSuan(PlcTemp.Bottle2_Set, dic["碳酸钙"]) + "t");
             ControlsImprot.SetMCLabel(LabelE.HslBottleValue3, JiSuan(PlcTemp.Bottle3_Set, dic["木粉"]) + "t");
-            ControlsImprot.SetMCLabel(LabelE.HslBottleValue4, JiSuan(PlcTemp.Bottle4_Set, dic["碳酸钙"]) + "t");
+            ControlsImprot.SetMCLabel(LabelE.HslBottleValue4, JiSuan(PlcTemp.Bottle4_Set, dic["碳粉9"]) + "t");
             ControlsImprot.SetMCLabel(LabelE.HslBottleValue5, JiSuan(PlcTemp.Bottle5_Set, dic["木薯粉"]) + "t");
             ControlsImprot.SetMCLabel(LabelE.HslBottleValue6, JiSuan(PlcTemp.Bottle6_Set, dic["玉米粉"]) + "t");
             ControlsImprot.SetMCLabel(LabelE.HslBottleValue7, JiSuan(PlcTemp.Bottle7_Set, dic["碳粉1"]) + "t");
diff --git a/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml b/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml
index 6e3f151..fc54d40 100644
--- a/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml
+++ b/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml
@@ -6287,7 +6287,7 @@
       </Object>
       <Object type="Mesnac.Controls.ChemicalWeighing.HslBottle, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Bottle4" children="Controls">
         <Property name="Value">100</Property>
-        <Property name="HeadTag">碳酸钙</Property>
+        <Property name="HeadTag">碳粉9</Property>
         <Property name="ForeColorEdge">194, 190, 77</Property>
         <Property name="ForeColorCenter">226, 221, 98</Property>
         <Property name="ForeColorTop">243, 245, 139</Property>
@@ -6387,7 +6387,7 @@
       </Object>
       <Object type="Mesnac.Controls.ChemicalWeighing.HslBottle, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Bottle2" children="Controls">
         <Property name="Value">100</Property>
-        <Property name="HeadTag">小料2</Property>
+        <Property name="HeadTag">碳酸钙</Property>
         <Property name="ForeColorEdge">194, 190, 77</Property>
         <Property name="ForeColorCenter">226, 221, 98</Property>
         <Property name="ForeColorTop">243, 245, 139</Property>