Merge branch 'master' of ssh://10.10.100.21/source/mes-client

UAS-MES/FunctionCode/Make/Make_FeedingCollection.cs

@@ -31,6 +31,8 @@ namespace UAS_MES.Make
 
         List<string> TSN = new List<string>();
 
+        Dictionary<string, string> CheckBarcode = new Dictionary<string, string>();
+
         //用于提醒的序列B
         string[] RemainList = new string[0];
         //提醒序列的索引
@@ -147,6 +149,7 @@ namespace UAS_MES.Make
                             string sp_ifrepeat = dt1.Rows[RemainIndex]["sp_ifrepeat"].ToString();
                             string sp_ifforsn = dt1.Rows[RemainIndex]["sp_ifforsn"].ToString();
                             string sp_barcoderule = dt1.Rows[RemainIndex]["sp_barcoderule"].ToString();
+                            string sp_checkbarcode = dt1.Rows[RemainIndex]["sp_checkbarcode"].ToString();
                             if (LogicHandler.CheckSNBeforeLoad(ma_code.Text, code.Text, sp_fsoncode, sp_soncode, sp_barcoderule, sp_prefix, length, sp_ifrepeat, out ErrorMessage))
                             {
                                 //判断采集的条码和本次采集的也不能重复
@@ -155,12 +158,28 @@ namespace UAS_MES.Make
                                     OperateResult.AppendText(">>条码" + code.Text + "已经上料\n", Color.Red, code);
                                     return;
                                 }
+                                if (sp_checkbarcode != "")
+                                {
+                                    if (CheckBarcode.ContainsKey(sp_checkbarcode))
+                                    {
+                                        if (CheckBarcode[sp_checkbarcode] != code.Text)
+                                        {
+                                            OperateResult.AppendText(">>条码" + code.Text + "需要检查物料，未匹配到之前上料数据\n", Color.Red, code);
+                                            return;
+                                        }
+                                    }
+                                    else
+                                    {
+                                        OperateResult.AppendText(">>条码" + code.Text + "需要检查物料，未匹配到之前上料数据\n", Color.Red, code);
+                                        return;
+                                    }
+                                }
                                 TSN.Add(code.Text.Substring(0, code.Text.Length > 40 ? 40 : code.Text.Length));
                                 if (sp_barcoderule == "BARCODE")
                                 {
                                     sp_soncode = ErrorMessage;
                                 }
-                                Save_OtherCode(sp_soncode, make_code, sn_code.Text, sp_id);
+                                Save_OtherCode(sp_fsoncode, sp_soncode, make_code, sn_code.Text, sp_id);
                             }
                             else
                                 OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, code);
@@ -327,8 +346,8 @@ namespace UAS_MES.Make
             //单独用一个DataTable存储一个
             dt1 = new DataTable();
             sql.Clear();
-            sql.Append("select max(sp_id)sp_id,max(sp_detno)sp_detno,min(sp_ifrepeat)sp_ifrepeat,sp_fsoncode,max(sp_barcoderule)");
-            sql.Append("sp_barcoderule,wm_concat(sp_soncode) sp_soncode,max(sp_ifuseregex)sp_ifuseregex,max(sp_ifforsn)");
+            sql.Append("select max(sp_id)sp_id,max(sp_detno)sp_detno,min(sp_ifrepeat)sp_ifrepeat,max(sp_checkbarcode)sp_checkbarcode,");
+            sql.Append("sp_fsoncode,max(sp_barcoderule)sp_barcoderule,wm_concat(sp_soncode) sp_soncode,max(sp_ifuseregex)sp_ifuseregex,max(sp_ifforsn)");
             sql.Append("sp_ifforsn,max(sp_length)sp_length,max(sp_type)sp_type,replace(wm_concat(sp_prefix),',','|')sp_prefix,max(sp_regex)");
             sql.Append("sp_regex,max(pr_detail)pr_detail from stepproduct left join product on pr_code=sp_fsoncode where ");
             sql.Append("sp_bomversion='" + ma_bomversion.Text + "' and sp_craftcode='" + ms_craftcode.Text + "' and sp_stepcode='" + User.CurrentStepCode + "' ");
@@ -378,12 +397,16 @@ namespace UAS_MES.Make
         }
 
         //此类中通用的保存逻辑
-        private void Save_OtherCode(string sp_soncode, string ma_code, string ms_sncode, string sp_id)
+        private void Save_OtherCode(string sp_fsoncode, string sp_soncode, string ma_code, string ms_sncode, string sp_id)
         {
             CollectDataSonCode.Add(sp_soncode);
             //采集成功提示
             RemainIndex = RemainIndex + 1;
             CollectData.Add(code.Text.Substring(0, code.Text.Length > 40 ? 40 : code.Text.Length));
+            if (!CheckBarcode.ContainsKey(sp_fsoncode))
+            {
+                CheckBarcode.Add(sp_fsoncode, code.Text.Substring(0, code.Text.Length > 40 ? 40 : code.Text.Length));
+            }
             SPID.Add(sp_id);
             OperateResult.AppendText(">>物料" + sp_soncode + "采集成功,条码" + code.Text + "\n", Color.Green);
             code.Clear();
@@ -434,6 +457,7 @@ namespace UAS_MES.Make
                 CollectData.Clear();
                 TSN.Clear();
                 SPID.Clear();
+                CheckBarcode.Clear();
                 CollectDataSonCode.Clear();
                 //采集成功，设置序列号栏目为空
                 RemainIndex = 0;
@@ -459,6 +483,7 @@ namespace UAS_MES.Make
             sn_code.Clear();
             SPID.Clear();
             TSN.Clear();
+            CheckBarcode.Clear();
             CollectData.Clear();
             CollectDataSonCode.Clear();
             if (dt1 != null)

UAS_CheckWork/DataHelper.cs

@@ -11,12 +11,11 @@ namespace UAS_MES.DataOperate
     class DataHelper
     {
         //系统默认的的连接字符串
-        private string ConnectionStrings = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=117.25.180.218)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
+        private string ConnectionStrings = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=MES_TEST;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=117.25.180.218)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
         //用户选择的数据库的连接字符串
         public static string DBConnectionString;
         public static OracleConnection connection = null;
         OracleCommand command = null;
-        int ReconnectTime = 0;
         /// <summary>
         /// 执行构造函数的时候打开数据库的链接
         /// </summary>
@@ -31,7 +30,7 @@ namespace UAS_MES.DataOperate
                     connection = new OracleConnection(DBConnectionString);
                 connection.Open();
             }
-            catch (Exception e) {  }
+            catch (Exception ) {  }
         }
 
         /// <summary>

UAS_CheckWork/Form1.Designer.cs

@@ -39,9 +39,9 @@
             this.Column1 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.getAllData = new System.Windows.Forms.Button();
             this.saveData = new System.Windows.Forms.Button();
-            this.allData = new System.Windows.Forms.BindingSource(this.components);
             this.chooseAll = new UAS_MES.CustomControl.ButtonUtil.ChooseAllButton();
             this.dataGridViewCheckBoxColumn1 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.allData = new System.Windows.Forms.BindingSource(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.showDataGrid)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.allData)).BeginInit();
             this.SuspendLayout();
@@ -49,44 +49,47 @@
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(226, 31);
+            this.label2.Location = new System.Drawing.Point(183, 26);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(44, 18);
+            this.label2.Size = new System.Drawing.Size(39, 15);
             this.label2.TabIndex = 14;
             this.label2.Text = "Port";
             // 
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(56, 31);
+            this.label1.Location = new System.Drawing.Point(32, 26);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(26, 18);
+            this.label1.Size = new System.Drawing.Size(23, 15);
             this.label1.TabIndex = 13;
             this.label1.Text = "IP";
             // 
             // txtPort
             // 
-            this.txtPort.Location = new System.Drawing.Point(269, 27);
+            this.txtPort.Location = new System.Drawing.Point(230, 22);
+            this.txtPort.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txtPort.Name = "txtPort";
-            this.txtPort.Size = new System.Drawing.Size(53, 28);
+            this.txtPort.Size = new System.Drawing.Size(48, 25);
             this.txtPort.TabIndex = 12;
             this.txtPort.Text = "4370";
             // 
             // txtIP
             // 
-            this.txtIP.Location = new System.Drawing.Point(87, 27);
+            this.txtIP.Location = new System.Drawing.Point(59, 22);
+            this.txtIP.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txtIP.Name = "txtIP";
-            this.txtIP.Size = new System.Drawing.Size(95, 28);
+            this.txtIP.Size = new System.Drawing.Size(118, 25);
             this.txtIP.TabIndex = 11;
             this.txtIP.Text = "192.168.1.201";
             // 
             // btnConnect
             // 
-            this.btnConnect.Location = new System.Drawing.Point(412, 27);
+            this.btnConnect.Location = new System.Drawing.Point(348, 22);
+            this.btnConnect.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.btnConnect.Name = "btnConnect";
-            this.btnConnect.Size = new System.Drawing.Size(78, 23);
+            this.btnConnect.Size = new System.Drawing.Size(69, 25);
             this.btnConnect.TabIndex = 10;
-            this.btnConnect.Text = "Connect";
+            this.btnConnect.Text = "连接";
             this.btnConnect.UseVisualStyleBackColor = true;
             this.btnConnect.Click += new System.EventHandler(this.btnConnect_Click);
             // 
@@ -94,9 +97,9 @@
             // 
             this.lblState.AutoSize = true;
             this.lblState.ForeColor = System.Drawing.Color.Crimson;
-            this.lblState.Location = new System.Drawing.Point(565, 32);
+            this.lblState.Location = new System.Drawing.Point(484, 27);
             this.lblState.Name = "lblState";
-            this.lblState.Size = new System.Drawing.Size(242, 18);
+            this.lblState.Size = new System.Drawing.Size(215, 15);
             this.lblState.TabIndex = 15;
             this.lblState.Text = "Current State:Disconnected";
             // 
@@ -108,10 +111,11 @@
             this.showDataGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.Column1});
             this.showDataGrid.Enabled = false;
-            this.showDataGrid.Location = new System.Drawing.Point(59, 191);
+            this.showDataGrid.Location = new System.Drawing.Point(23, 159);
+            this.showDataGrid.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.showDataGrid.Name = "showDataGrid";
             this.showDataGrid.RowTemplate.Height = 30;
-            this.showDataGrid.Size = new System.Drawing.Size(792, 358);
+            this.showDataGrid.Size = new System.Drawing.Size(944, 387);
             this.showDataGrid.TabIndex = 16;
             // 
             // Column1
@@ -121,9 +125,10 @@
             // 
             // getAllData
             // 
-            this.getAllData.Location = new System.Drawing.Point(59, 97);
+            this.getAllData.Location = new System.Drawing.Point(26, 81);
+            this.getAllData.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.getAllData.Name = "getAllData";
-            this.getAllData.Size = new System.Drawing.Size(151, 37);
+            this.getAllData.Size = new System.Drawing.Size(134, 31);
             this.getAllData.TabIndex = 17;
             this.getAllData.Text = "获取考勤数据";
             this.getAllData.UseVisualStyleBackColor = true;
@@ -131,9 +136,10 @@
             // 
             // saveData
             // 
-            this.saveData.Location = new System.Drawing.Point(683, 97);
+            this.saveData.Location = new System.Drawing.Point(607, 81);
+            this.saveData.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.saveData.Name = "saveData";
-            this.saveData.Size = new System.Drawing.Size(145, 37);
+            this.saveData.Size = new System.Drawing.Size(129, 31);
             this.saveData.TabIndex = 18;
             this.saveData.Text = "保存数据";
             this.saveData.UseVisualStyleBackColor = true;
@@ -141,9 +147,10 @@
             // 
             // chooseAll
             // 
-            this.chooseAll.Location = new System.Drawing.Point(59, 149);
+            this.chooseAll.Location = new System.Drawing.Point(26, 124);
+            this.chooseAll.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.chooseAll.Name = "chooseAll";
-            this.chooseAll.Size = new System.Drawing.Size(83, 28);
+            this.chooseAll.Size = new System.Drawing.Size(59, 23);
             this.chooseAll.TabIndex = 19;
             this.chooseAll.Text = "全选";
             this.chooseAll.UseVisualStyleBackColor = true;
@@ -155,9 +162,9 @@
             // 
             // Form1
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(908, 583);
+            this.ClientSize = new System.Drawing.Size(989, 564);
             this.Controls.Add(this.chooseAll);
             this.Controls.Add(this.saveData);
             this.Controls.Add(this.getAllData);
@@ -168,6 +175,7 @@
             this.Controls.Add(this.txtPort);
             this.Controls.Add(this.txtIP);
             this.Controls.Add(this.btnConnect);
+            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Name = "Form1";
             this.Text = "Form1";
             this.Load += new System.EventHandler(this.Form1_Load);

UAS_CheckWork/Form1.cs

@@ -25,44 +25,43 @@ namespace UAS_CheckWork
         {
             if (txtIP.Text.Trim() == "" || txtPort.Text.Trim() == "")
             {
-                MessageBox.Show("IP and Port cannot be null", "Error");
+                MessageBox.Show("请先输入IP和端口", "Error");
                 return;
             }
             int idwErrorCode = 0;
 
             Cursor = Cursors.WaitCursor;
-            if (btnConnect.Text == "DisConnect")
+            if (btnConnect.Text == "断开连接")
             {
                 axCZKEM1.Disconnect();
                 bIsConnected = false;
-                btnConnect.Text = "Connect";
-                lblState.Text = "Current State:DisConnected";
+                btnConnect.Text = "连接";
+                lblState.Text = "状态:未连接";
                 Cursor = Cursors.Default;
                 return;
             }
-
             bIsConnected = axCZKEM1.Connect_Net(txtIP.Text, Convert.ToInt32(txtPort.Text));
-            if (bIsConnected == true)
+            if (bIsConnected)
             {
-                btnConnect.Text = "DisConnect";
+                btnConnect.Text = "断开连接";
                 btnConnect.Refresh();
-                lblState.Text = "Current State:Connected";
+                lblState.Text = "状态:已连接";
                 iMachineNumber = 1;//In fact,when you are using the tcp/ip communication,this parameter will be ignored,that is any integer will all right.Here we use 1.
                 axCZKEM1.RegEvent(iMachineNumber, 65535);//Here you can register the realtime events that you want to be triggered(the parameters 65535 means registering all)
             }
             else
             {
                 axCZKEM1.GetLastError(ref idwErrorCode);
-                MessageBox.Show("Unable to connect the device,ErrorCode=" + idwErrorCode.ToString(), "Error");
+                MessageBox.Show("无法连接设备,ErrorCode=" + idwErrorCode.ToString(), "Error");
             }
             Cursor = Cursors.Default;
         }
 
         private void getAllData_Click(object sender, EventArgs e)
         {
-            if (bIsConnected == false)
+            if (bIsConnected)
             {
-                MessageBox.Show("Please connect the device first!", "Error");
+                MessageBox.Show("请先连接设备", "Error");
                 return;
             }
             int idwErrorCode = 0;
@@ -81,12 +80,12 @@ namespace UAS_CheckWork
                 int minute = 0;//记录考勤分钟
                 int second = 0;//记录考勤秒
                 int workCode = 0; //记录workCode
-                while (axCZKEM1.SSR_GetGeneralLogData(iMachineNumber,out enrollNumber,out verifyCode,out inoutMode,out year,out month,out day,out hour,out minute,out second,ref workCode))
+                while (axCZKEM1.SSR_GetGeneralLogData(iMachineNumber, out enrollNumber, out verifyCode, out inoutMode, out year, out month, out day, out hour, out minute, out second, ref workCode))
                 {
                     //将数据加入DataTable中
                     DataRow dr = dt.NewRow();
                     dr["cl_emcode"] = enrollNumber;
-                    dr["cl_time"] = year+"-"+month+"-"+day+" "+hour+":"+minute+":"+second;
+                    dr["cl_time"] = year + "-" + month + "-" + day + " " + hour + ":" + minute + ":" + second;
                     dt.Rows.Add(dr);
                     allData.DataSource = dt;
                     //显示

UAS_CheckWork/Form1.resx

@@ -117,12 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="allData.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>

UAS_CheckWork/UAS_CheckWork.csproj

@@ -33,6 +33,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Oracle.ManagedDataAccess">
+      <HintPath>tool\Oracle.ManagedDataAccess.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -46,6 +49,13 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ChooseAllButton.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ChooseAllButton.Designer.cs">
+      <DependentUpon>ChooseAllButton.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DataHelper.cs" />
     <Compile Include="Form1.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -54,6 +64,9 @@
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <EmbeddedResource Include="Form1.resx">
+      <DependentUpon>Form1.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
@@ -76,6 +89,17 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
+  <ItemGroup>
+    <COMReference Include="zkemkeeper">
+      <Guid>{FE9DED34-E159-408E-8490-B720A5E632C7}</Guid>
+      <VersionMajor>1</VersionMajor>
+      <VersionMinor>0</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>tlbimp</WrapperTool>
+      <Isolated>False</Isolated>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+    </COMReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.