提交代码

CarLocalMeter/frmMain.Designer.cs

@@ -917,7 +917,7 @@ namespace CarLocalMeter
             this.tableLayoutPanel7.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 90F));
             this.tableLayoutPanel7.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 222F));
             this.tableLayoutPanel7.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 50F));
-            this.tableLayoutPanel7.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 47F));
+            this.tableLayoutPanel7.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 48F));
             this.tableLayoutPanel7.Controls.Add(this.label1, 5, 0);
             this.tableLayoutPanel7.Controls.Add(this.txtCarNo, 4, 0);
             this.tableLayoutPanel7.Controls.Add(this.cbCarNo, 3, 0);
@@ -941,7 +941,7 @@ namespace CarLocalMeter
             this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.label1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label1.ForeColor = System.Drawing.Color.Blue;
-            this.label1.Location = new System.Drawing.Point(758, 1);
+            this.label1.Location = new System.Drawing.Point(757, 1);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(42, 36);
@@ -953,7 +953,7 @@ namespace CarLocalMeter
             // 
             this.txtCarNo.Dock = System.Windows.Forms.DockStyle.Fill;
             this.txtCarNo.Font = new System.Drawing.Font("宋体", 16F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtCarNo.Location = new System.Drawing.Point(534, 3);
+            this.txtCarNo.Location = new System.Drawing.Point(533, 3);
             this.txtCarNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txtCarNo.Name = "txtCarNo";
             this.txtCarNo.Size = new System.Drawing.Size(216, 32);
@@ -1000,7 +1000,7 @@ namespace CarLocalMeter
             "琼",
             "京",
             "津"});
-            this.cbCarNo.Location = new System.Drawing.Point(443, 3);
+            this.cbCarNo.Location = new System.Drawing.Point(442, 3);
             this.cbCarNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.cbCarNo.Name = "cbCarNo";
             this.cbCarNo.Size = new System.Drawing.Size(84, 31);
@@ -1017,7 +1017,7 @@ namespace CarLocalMeter
             this.lbPointName.Location = new System.Drawing.Point(86, 1);
             this.lbPointName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lbPointName.Name = "lbPointName";
-            this.lbPointName.Size = new System.Drawing.Size(288, 36);
+            this.lbPointName.Size = new System.Drawing.Size(287, 36);
             this.lbPointName.TabIndex = 3;
             this.lbPointName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
@@ -1043,7 +1043,7 @@ namespace CarLocalMeter
             this.label2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.label2.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label2.ForeColor = System.Drawing.Color.Blue;
-            this.label2.Location = new System.Drawing.Point(383, 1);
+            this.label2.Location = new System.Drawing.Point(382, 1);
             this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(52, 36);
@@ -1054,7 +1054,7 @@ namespace CarLocalMeter
             // pbLineOn
             // 
             this.pbLineOn.Image = ((System.Drawing.Image)(resources.GetObject("pbLineOn.Image")));
-            this.pbLineOn.Location = new System.Drawing.Point(808, 4);
+            this.pbLineOn.Location = new System.Drawing.Point(807, 4);
             this.pbLineOn.Name = "pbLineOn";
             this.pbLineOn.Size = new System.Drawing.Size(39, 30);
             this.pbLineOn.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;

CarLocalMeter/frmMain.cs

@@ -46,25 +46,23 @@ namespace CarLocalMeter
         /// </summary>
         VoicePlay vicPlayClass = new VoicePlay();
 
-        RfIdCarNo rfid = new RfIdCarNo();
-
-
-        /*
-        1、视频车号识别、rfid车号识别(rs232串口通信？或者Moxa通信？需搞一个读卡器安装上)
-        2、
-        */
         /// <summary>
         /// 摄像头车号识别
         /// </summary>
         CarNoCls carCls = new CarNoCls();
 
-        //rfid车号识别，暂缺
+
+        /// <summary>
+        /// rfid车号识别
+        /// </summary>
+        RfIdCarNo rfid = new RfIdCarNo();
 
         bool bVoice = false;
         CamerEs ce = new CamerEs(AppConfigCache.voicePlayIp, $"{AppConfigCache.voicePlayPort}", AppConfigCache.voicePlayUid, AppConfigCache.voicePlayPwd);
         List<int> voPlay = new List<int>();
         int iPic = 0;
 
+
         private void frmMain_Load(object sender, EventArgs e)
         {
             plImgShow.Visible = false;
@@ -95,6 +93,7 @@ namespace CarLocalMeter
             TaskDbUpload();
             imgControl.Start();
             plc.Start();
+            carCls.Login()
             //*/
         }
 
@@ -187,11 +186,14 @@ namespace CarLocalMeter
                             {
                                 CacleCls.Clear(); //清理一次数据
                                 cbCarNo.Text = "";
+                                cbCarNo.SelectedIndex = -1;
                                 txtCarNo.Text = "";
                                 txtMATTER_NAME.Text = "";
                                 txtFORWARDING_UNIT_NAME.Text = "";
                                 txtRECEIVING_UINT_NAME.Text = "";
                                 txtMETER_TYPE.Text = "";
+                                cbCarNo.Enabled = true;
+                                txtCarNo.Enabled = true;
                             }
                         }
 
@@ -303,7 +305,47 @@ namespace CarLocalMeter
         
         private void btnSave_Click(object sender, EventArgs e)
         {
-            //carCls.Login();
+            #region 下面是业务逻辑代码
+            string msgInfo = "";
+            if (txtCarNo.Focused) 
+            {
+                return; //如果正在修改车号，就必须等光标离开后再保存，否则容易导致车号输入了一半保存了
+            }
+
+
+            if (CacleCls.serverFlag) //网络正常
+            {
+                if (CacleCls.firstDb != null)
+                {
+                    //进行结净
+                    
+                }
+                else
+                {
+                    //进行一次计量
+                    
+                }
+            }
+            else 
+            {
+                //写本地文件
+                bool flag = FileOption.WriterDb(new ActualFirstModel { actualFirstNo = "", baseSpotNo = "", baseSpotName = "", carNo = "", createTime = DateTime.Now, meterWeight = 999 },out msgInfo);
+                if (flag)
+                {
+                    //计量完成
+                }
+                else 
+                {
+                    txtMsgInfo.Text = msgInfo;
+                }
+            }
+
+            
+
+            cbCarNo.Enabled = false;
+            txtCarNo.Enabled = false;
+            #endregion
+
 
             /*
             List<MeterWorkMonitor> lt = RedisCls.getValue<List<MeterWorkMonitor>>("MeterWorkMonitor");
@@ -343,7 +385,6 @@ namespace CarLocalMeter
 
         private void btnOpenVoice_Click(object sender, EventArgs e)
         {
-            //carCls.LoginOut();
             /*
             if (btnOpenVoice.Text == "打开对讲")
             {
@@ -371,7 +412,7 @@ namespace CarLocalMeter
             _cts?.Cancel();
             _cts2?.Cancel();
             _dbCts?.Cancel();
-            //carCls.LoginOut();
+            carCls?.LoginOut();
             imgControl.Stop();
         }
 

CarLocalMeter/frmMain.resx

@@ -124,7 +124,7 @@
     <value>198, 15</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="picHRed.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="pbLineOn.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         R0lGODlhjgCOAIZMAAT3Acf8xYLsclrjQUXjLdv+23fpZC7lFxbtCT/iJ2blT8H7vtX+1UniMYbsd0/j
         NzDlGRzqC17jRmrlU5fxi8n8x8n8yE3hNEjiL6X0nArzAwj0Aqn1oT3jJm3nWIntehjsCbf5szTkHA7w
@@ -152,7 +152,7 @@
         1IhUqAIcrXAlgT8JylA0oxSm7A+CJknJSlrykqPU5CY52QkGR0jCEprwhChMoQpXyELeBAQAOw==
 </value>
   </data>
-  <data name="picQRed.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="picHRed.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         R0lGODlhjgCOAIZMAAT3Acf8xYLsclrjQUXjLdv+23fpZC7lFxbtCT/iJ2blT8H7vtX+1UniMYbsd0/j
         NzDlGRzqC17jRmrlU5fxi8n8x8n8yE3hNEjiL6X0nArzAwj0Aqn1oT3jJm3nWIntehjsCbf5szTkHA7w
@@ -180,7 +180,7 @@
         1IhUqAIcrXAlgT8JylA0oxSm7A+CJknJSlrykqPU5CY52QkGR0jCEprwhChMoQpXyELeBAQAOw==
 </value>
   </data>
-  <data name="pbLineOn.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="picQRed.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         R0lGODlhjgCOAIZMAAT3Acf8xYLsclrjQUXjLdv+23fpZC7lFxbtCT/iJ2blT8H7vtX+1UniMYbsd0/j
         NzDlGRzqC17jRmrlU5fxi8n8x8n8yE3hNEjiL6X0nArzAwj0Aqn1oT3jJm3nWIntehjsCbf5szTkHA7w

CarMeterSystem/App.config

@@ -5,8 +5,8 @@
 	</startup>
 	<appSettings>
 	<!--测试库-->
-	<add key="ServiceUrl" value="http://10.104.4.130:9004/v1" />
-    <!--<add key="ServiceUrl" value="http://10.99.81.20/icore.icp.web/pass/systemBase/v1"/>-->
+	<!--<add key="ServiceUrl" value="http://10.104.4.130:9004/v1" />-->
+    <add key="ServiceUrl" value="http://10.99.81.20/icore.icp.web/pass/systemBase/v1"/>
     <!--正式库-->
 	<!--<add key="ServiceUrl" value="http://jgwzjl.jiugang.com/icore.icp.web/pass/systemBase/v1"/>-->
     <!--<add key="ServiceUrl" value="http://10.130.1.2/icore.icp.web/pass/systemBase/v1"/>-->