流转卡的备注要预处理一下，删除车钩备注里不会存在的字眼

SIMDP/SIMDP.BLL/BlCopulerRequest.cs

@@ -28,16 +28,9 @@ namespace SIMDP.BLL
         /// <returns></returns>
         public long FindCopulerRequest(string cardRemark, string mCode, out string requireCode)
         {
-            if (cardRemark.Contains("压溃"))
-                cardRemark = cardRemark.Replace("压溃", "");
-            if (cardRemark.Contains("缓冲系统"))
-                cardRemark = cardRemark.Replace("缓冲系统", "");
-            if (cardRemark.Contains("拉杆"))
-                cardRemark = cardRemark.Replace("拉杆", "");
-            if (cardRemark.Contains("缓冲器"))
-                cardRemark = cardRemark.Replace("缓冲器", "");
-            if (cardRemark.Contains("缓冲"))
-                cardRemark = cardRemark.Replace("缓冲", "");
+            //流转卡的备注要预处理一下，删除车钩备注里不会存在的字眼
+            cardRemark = ProEnvironment.RemoveKeyField(cardRemark);
+
             long id = -1;
             requireCode = "";
             if (cardRemark.Length < 3) return -1;
@@ -68,20 +61,10 @@ namespace SIMDP.BLL
                     {
                         continue;
                     }
-                    //else if (list2.Count > 1)
-                    //{
-                    //    requireCode = list2[0].RequestCode;
-                    //    id = list2[0].ID;
-                    //    continue;
-                    //    //return -1;//NOT ERROR!
-                    //}
-                    //else
-                    //{
-                    //    continue;
-                    //}
                 }
                 return id;
             }
         }
+
     }
 }

SIMDP/SIMDP.Project/SIMDP.Project.csproj

@@ -51,8 +51,20 @@
     <Reference Include="NModbus4, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\NModbus4.2.1.0\lib\net40\NModbus4.dll</HintPath>
     </Reference>
-    <Reference Include="OpcUaHelper">
-      <HintPath>..\SIMDP.Device\bin\Debug\OpcUaHelper.dll</HintPath>
+    <Reference Include="Opc.Ua.Client, Version=1.3.342.0, Culture=neutral, PublicKeyToken=78aea80f6827b5ab, processorArchitecture=MSIL">
+      <HintPath>..\packages\OpcUaHelper.1.0.0\lib\Opc.Ua.Client.dll</HintPath>
+    </Reference>
+    <Reference Include="Opc.Ua.ClientControls, Version=1.3.342.0, Culture=neutral, PublicKeyToken=78aea80f6827b5ab, processorArchitecture=MSIL">
+      <HintPath>..\packages\OpcUaHelper.1.0.0\lib\Opc.Ua.ClientControls.dll</HintPath>
+    </Reference>
+    <Reference Include="Opc.Ua.Configuration, Version=1.3.342.0, Culture=neutral, PublicKeyToken=78aea80f6827b5ab, processorArchitecture=MSIL">
+      <HintPath>..\packages\OpcUaHelper.1.0.0\lib\Opc.Ua.Configuration.dll</HintPath>
+    </Reference>
+    <Reference Include="Opc.Ua.Core, Version=1.3.342.0, Culture=neutral, PublicKeyToken=78aea80f6827b5ab, processorArchitecture=MSIL">
+      <HintPath>..\packages\OpcUaHelper.1.0.0\lib\Opc.Ua.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="OpcUaHelper, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\OpcUaHelper.1.0.0\lib\OpcUaHelper.dll</HintPath>
     </Reference>
     <Reference Include="Oracle.ManagedDataAccess, Version=4.121.1.0, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

SIMDP/SIMDP.Project/packages.config

@@ -3,5 +3,6 @@
   <package id="log4net" version="2.0.8" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net46" />
   <package id="NModbus4" version="2.1.0" targetFramework="net452" />
+  <package id="OpcUaHelper" version="1.0.0" targetFramework="net46" />
   <package id="StackExchange.Redis" version="1.2.0" targetFramework="net46" />
 </packages>

SIMDP/SIMDP.Util/ProEnvironment.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SIMDP.Util
+{
+    public static class ProEnvironment
+    {
+        /// <summary>
+        /// 流转卡绑定车钩时，对流转卡的备注进行处理
+        /// </summary>
+        /// <param name="cardRemark"></param>
+        public static string RemoveKeyField( string cardRemark)
+        {
+            if (cardRemark.Contains("压溃"))
+                cardRemark = cardRemark.Replace("压溃", "");
+            if (cardRemark.Contains("缓冲系统"))
+                cardRemark = cardRemark.Replace("缓冲系统", "");
+            if (cardRemark.Contains("拉杆"))
+                cardRemark = cardRemark.Replace("拉杆", "");
+            if (cardRemark.Contains("缓冲器"))
+                cardRemark = cardRemark.Replace("缓冲器", "");
+            if (cardRemark.Contains("缓冲"))
+                cardRemark = cardRemark.Replace("缓冲", "");
+
+            return cardRemark;
+        }
+    }
+}

SIMDP/SIMDP.Util/SIMDP.Util.csproj

@@ -42,6 +42,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ProEnvironment.cs" />
     <Compile Include="SysEnvironment.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>

SIMDP/SIMDP.Util/SysEnvironment.cs

@@ -1,5 +1,4 @@
-
-using GlobalStatus;
+using GlobalStatus;
 using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
@@ -8,11 +7,10 @@ namespace SIMDP.Util
 {
     public static class SysEnvironment
     {
+        #region 机器人工作站全局变量
 
         public static bool FlagBlankingMode = false;
 
-        #region 工作站整体属性
-
         /// <summary>
         /// 成品是否需要自动下料（WMS入库+AGV转运）
         /// </summary>
@@ -131,7 +129,7 @@ namespace SIMDP.Util
 
         #endregion
 
-        #region 系统级属性 
+        #region SIMDP全局变量
 
         /// <summary>
         /// 当前登录人ID
@@ -387,6 +385,7 @@ namespace SIMDP.Util
         #endregion
 
     }
+
 }
 
 namespace GlobalStatus

SIMDP/SIMDP.View/FormEditCopulerRequest.cs

@@ -99,7 +99,7 @@ namespace SIMDP
                 modelTask.OrderCode = this.txt_OrderCode.Text;
                 modelTask.WorkCode = this.txt_WorkCode.Text;
                 modelTask.MCode = this.txt_MrlCode.Text;
-                modelTask.Remark = this.txt_Remark.Text;
+                modelTask.Remark = ProEnvironment.RemoveKeyField(this.txt_Remark.Text);
 
                 modelTask.ProjectCode = this.txt_ProjectCode.Text;
                 modelTask.ProjectName = this.txt_ProjectName.Text;
@@ -169,7 +169,7 @@ namespace SIMDP
                 model.OrderCode = this.txt_OrderCode.Text;
                 model.WorkCode = this.txt_WorkCode.Text;
                 model.MCode = this.txt_MrlCode.Text;
-                model.Remark = this.txt_Remark.Text;
+                model.Remark = ProEnvironment.RemoveKeyField(this.txt_Remark.Text);
 
                 model.ProjectCode = this.txt_ProjectCode.Text;
                 model.ProjectName = this.txt_ProjectName.Text;