增加码块订货号解析顺序配置项

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"/>

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>

SCADA/Funtion/MIS_Funtion.cs

@@ -185,6 +185,7 @@ namespace MesWork
         /// 支持格式：
         /// 0/DHN2.5Q0219-36/D426E016767
         /// DHH02K0014-400/B726E00584555
+        /// CodeBlockOrderNoReverse=0：订货号/流水号；CodeBlockOrderNoReverse=1：流水号/订货号
         /// </summary>
         private bool TryConvertCodeBlockData(string codeBlock, out string orderNo, out string productNo)
         {
@@ -199,8 +200,16 @@ namespace MesWork
             string[] parts = normalizedCode.Split('/');
             if (parts.Length >= 2)
             {
-                orderNo = parts[parts.Length - 2].Trim();
+                if (CodeBlockOrderNoReverse == 1)
-                productNo = parts[parts.Length - 1].Trim();
+                {
+                    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
             {