From e11c727114a7a07091f591a6d76ff61cd0585c5a Mon Sep 17 00:00:00 2001
From: XingCheng3 <1773407212@qq.com>
Date: Sat, 16 May 2026 13:48:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A0=81=E5=9D=97=E8=AE=A2?=
 =?UTF-8?q?=E8=B4=A7=E5=8F=B7=E8=A7=A3=E6=9E=90=E9=A1=BA=E5=BA=8F=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SCADA/App.config             | 20 ++++++++++--------
 SCADA/Core/AppConfig.cs      |  5 +++++
 SCADA/Funtion/MIS_Funtion.cs | 41 ++++++++++++++++++++++--------------
 3 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/SCADA/App.config b/SCADA/App.config
index bc5a643..e2bc4c9 100644
--- a/SCADA/App.config
+++ b/SCADA/App.config
@@ -9,6 +9,8 @@
     <add key="IsWriteLog4" value="1"/>
 	<!--称重类型：Ground=地面称重(两独立工位), Hanging=空中称重/吊称(放油前+放油后)-->
 	<add key="WeighingType" value="Hanging"/>
+	<!--码块订货号解析顺序：0=订货号在前/流水号在后, 1=流水号在前/订货号在后-->
+	<add key="CodeBlockOrderNoReverse" value="0"/>
 	<!--逻辑工位映射：必须与SignalTable_CZ.xlsx的设备类型对应表工位号一致-->
 	<add key="Station1OpName" value="ST04"/>
 	<add key="Station2OpName" value="ST05"/>
@@ -23,15 +25,15 @@
 	<add key="Station1BarCOM" value="COM2"/>
 	<!--工位2扫码枪COM口，如COM4-->
 	<add key="Station2BarCOM" value="COM3"/>
-	<!--扫码枪波特率-->
-	<add key="BarcodeBaudRate" value="9600"/>
-
-	<!--曲线采样间隔(ms)-->
-	<add key="CurveCollectorSampleIntervalMs" value="200"/>
-	<!--曲线稳定窗口点数-->
-	<add key="CurveStableWindowSize" value="20"/>
-
-  </appSettings>
+	<!--扫码枪波特率-->
+	<add key="BarcodeBaudRate" value="9600"/>
+
+	<!--曲线采样间隔(ms)-->
+	<add key="CurveCollectorSampleIntervalMs" value="200"/>
+	<!--曲线稳定窗口点数-->
+	<add key="CurveStableWindowSize" value="20"/>
+
+  </appSettings>
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
   </startup>
diff --git a/SCADA/Core/AppConfig.cs b/SCADA/Core/AppConfig.cs
index 594b50c..4c3d389 100644
--- a/SCADA/Core/AppConfig.cs
+++ b/SCADA/Core/AppConfig.cs
@@ -53,6 +53,11 @@ namespace MesWork
         /// </summary>
         public static string WeighingType = AppSettings["WeighingType"] ?? "Hanging";
 
+        /// <summary>
+        /// 码块订货号解析顺序：0=订货号在前, 1=流水号在前
+        /// </summary>
+        public static int CodeBlockOrderNoReverse = int.TryParse(AppSettings["CodeBlockOrderNoReverse"], out var _cbonr) ? _cbonr : 0;
+
         /// <summary>
         /// 工位1现场工位号，Hanging模式下代表放油前工位
         /// </summary>
diff --git a/SCADA/Funtion/MIS_Funtion.cs b/SCADA/Funtion/MIS_Funtion.cs
index cdd3496..77b869e 100644
--- a/SCADA/Funtion/MIS_Funtion.cs
+++ b/SCADA/Funtion/MIS_Funtion.cs
@@ -180,14 +180,15 @@ namespace MesWork
         }
 
 
-        /// <summary>
-        /// 码块数据转换：将产品编号统一转大写，并拆分出订货号与产品编号
-        /// 支持格式：
-        /// 0/DHN2.5Q0219-36/D426E016767
-        /// DHH02K0014-400/B726E00584555
-        /// </summary>
-        private bool TryConvertCodeBlockData(string codeBlock, out string orderNo, out string productNo)
-        {
+        /// <summary>
+        /// 码块数据转换：将产品编号统一转大写，并拆分出订货号与产品编号
+        /// 支持格式：
+        /// 0/DHN2.5Q0219-36/D426E016767
+        /// DHH02K0014-400/B726E00584555
+        /// CodeBlockOrderNoReverse=0：订货号/流水号；CodeBlockOrderNoReverse=1：流水号/订货号
+        /// </summary>
+        private bool TryConvertCodeBlockData(string codeBlock, out string orderNo, out string productNo)
+        {
             orderNo = "";
             productNo = "";
             if (string.IsNullOrWhiteSpace(codeBlock))
@@ -196,14 +197,22 @@ namespace MesWork
             }
 
             string normalizedCode = codeBlock.Trim().ToUpperInvariant();
-            string[] parts = normalizedCode.Split('/');
-            if (parts.Length >= 2)
-            {
-                orderNo = parts[parts.Length - 2].Trim();
-                productNo = parts[parts.Length - 1].Trim();
-            }
-            else
-            {
+            string[] parts = normalizedCode.Split('/');
+            if (parts.Length >= 2)
+            {
+                if (CodeBlockOrderNoReverse == 1)
+                {
+                    productNo = parts[parts.Length - 2].Trim();
+                    orderNo = parts[parts.Length - 1].Trim();
+                }
+                else
+                {
+                    orderNo = parts[parts.Length - 2].Trim();
+                    productNo = parts[parts.Length - 1].Trim();
+                }
+            }
+            else
+            {
                 productNo = normalizedCode;
             }