winfrom提交

CarMeterSystem/App.config

@@ -11,9 +11,11 @@
 		<!--<add key="ServiceUrl" value="http://192.168.107.60:8888/icore.icp.winform/pass/jlcar"/>-->
     <!--<add key="ServiceUrl" value="http://192.168.185.29/icore.icp.winform/pass/jlcar"/>-->
     <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"/>-->
     <!--实时库地址-->
-		<add key="icoredbTcp" value="tarantool://guest@10.99.200.86:2101" />
-		<!--SFTP或者vsftp服务端连接及地址-->
+    <add key="icoredbTcp" value="tarantool://guest@10.99.200.86:2101" />
+    <!--<add key="icoredbTcp" value="tarantool://guest@10.130.1.3:2101" />-->
+    <!--SFTP或者vsftp服务端连接及地址-->
 		<add key="fip" value="192.168.185.238" />
 		<add key="fport" value="22" />
 		<add key="fuid" value="jgjlftp" />
@@ -28,7 +30,7 @@
 		<!--毛皮差值验证(单位kg)-->
 		<add key="differenceWgt" value="400" />
 		<!--进入测试界面还是正式界面 0测试，1正式,2一码到底测试,3判稳测试工具-->
-		<add key="productType" value="0" />
+		<add key="productType" value="1" />
 		<!--联达比较重量-->
 		<add key="lianDaWgt" value="200" />
 		<!--联达计量点编号-->

CarMeterSystem/frmMain.cs

@@ -56,9 +56,12 @@ namespace CarMeterSystem
         //语音播报
         private VoicePlay vicPlayClass = new VoicePlay();
 
-        //扫码枪
+        //扫码枪1
         private SweepCode sweepCodeClass = new SweepCode();
 
+        //扫码枪2
+        private SweepCodeCpoy sweepCodeCpoyClass = new SweepCodeCpoy();
+
         private LED_Control led_controler = null;
 
         //监控表操作
@@ -405,37 +408,111 @@ namespace CarMeterSystem
                 {
                     e.carno = "";
                 }
-
                 #region 扫码信息
                 sweepCodeClass.StrState = e.weightStatus + ""; //重量状态信息；当StrState= 0时，获取扫码信息，StrState= 2时将扫码信息置位“”空；其他状态不处理
-
-                if (string.IsNullOrEmpty(sweepCodeClass.StrCode))
+                sweepCodeCpoyClass.StrState = e.weightStatus + ""; //重量状态信息；当StrState= 0时，获取扫码信息，StrState= 2时将扫码信息置位“”空；其他状态不处理
+                l.WriteLog(12, sweepCodeClass.ToString());
+                l.WriteLog(12, sweepCodeCpoyClass.ToString());
+
+
+                //if (string.IsNullOrEmpty(sweepCodeClass.StrCode))
+                //{
+                //    if (string.IsNullOrEmpty(PbCache.strCode))
+                //    {
+                //        codeFlag = false;
+                //        firstCode = "";
+                //        PbCache.strCode = "";
+                //        l.WriteLog(12, "主线程扫码值为空时清空；sweepCodeClass.StrCode值为" + sweepCodeClass.StrCode + " ；PbCache.strCode值为：" + PbCache.strCode);
+                //    }
+                //}
+                //else
+                //{
+                //    codeFlag = true;
+                //    frmOneYardToEnd frmOneYardToEnd = new frmOneYardToEnd();
+                //    Hashtable hashTable = new Hashtable();
+                //    hashTable.Add("message", sweepCodeClass.StrCode);
+                //    rmsSweepCodeClass = mwcfs.DecryptionForWfTest(hashTable);
+                //    if (rmsSweepCodeClass.Code == "0")
+                //    {
+                //        PbCache.collect.carno = rmsSweepCodeClass.Data;
+                //        PbCache.strCode = rmsSweepCodeClass.Data;
+                //    }
+                //    if (rmsSweepCodeClass.Code == "1")
+                //    {
+                //        vicPlayClass.GetVoicePlay("车号二维码已过期", PbCache.collect.carno);
+                //        frmOneYardToEnd.setMsgInfo("车号二维码已过期");
+                //    }
+                //    if (rmsSweepCodeClass.Code == "2")
+                //    {
+                //        vicPlayClass.GetVoicePlay("不是有效车号二维码", PbCache.collect.carno);
+                //        frmOneYardToEnd.setMsgInfo("不是有效车号二维码");
+                //    }
+                //    if (rmsSweepCodeClass.Code == "9")
+                //    {
+                //        vicPlayClass.GetVoicePlay("不是有效车号二维码", PbCache.collect.carno);
+                //        frmOneYardToEnd.setMsgInfo("不是有效车号二维码");
+                //    }
+                //    l.WriteLog(12, "测试扫码值" + rmsSweepCodeClass.Data);
+                //}
+
+                if (string.IsNullOrEmpty(sweepCodeCpoyClass.StrCode))
                 {
                     if (string.IsNullOrEmpty(PbCache.strCode))
                     {
                         codeFlag = false;
                         firstCode = "";
                         PbCache.strCode = "";
-                        l.WriteLog(12, "主线程扫码值为空时清空；sweepCodeClass.StrCode值为" + sweepCodeClass.StrCode + " ；PbCache.strCode值为：" + PbCache.strCode);
+                        l.WriteLog(12, "主线程扫码值为空时清空；sweepCodeCpoyClass.StrCode值为" + sweepCodeCpoyClass.StrCode + " ；PbCache.strCode值为：" + PbCache.strCode);
+                    }
+                    else
+                    {
+                        if (string.IsNullOrEmpty(sweepCodeClass.StrCode))
+                        {
+                            if (string.IsNullOrEmpty(PbCache.strCode))
+                            {
+                                codeFlag = false;
+                                firstCode = "";
+                                PbCache.strCode = "";
+                                l.WriteLog(12, "主线程扫码值为空时清空；sweepCodeClass.StrCode值为" + sweepCodeClass.StrCode + " ；PbCache.strCode值为：" + PbCache.strCode);
+                            }
+                        }
+                        else
+                        {
+                            codeFlag = true;
+                            frmOneYardToEnd frmOneYardToEnd = new frmOneYardToEnd();
+                            Hashtable hashTable = new Hashtable();
+                            hashTable.Add("message", sweepCodeClass.StrCode);
+                            rmsSweepCodeClass = mwcfs.DecryptionForWfTest(hashTable);
+                            if (rmsSweepCodeClass.Code == "0")
+                            {
+                                PbCache.collect.carno = rmsSweepCodeClass.Data;
+                                PbCache.strCode = rmsSweepCodeClass.Data;
+                            }
+                            if (rmsSweepCodeClass.Code == "1")
+                            {
+                                vicPlayClass.GetVoicePlay("车号二维码已过期", PbCache.collect.carno);
+                                frmOneYardToEnd.setMsgInfo("车号二维码已过期");
+                            }
+                            if (rmsSweepCodeClass.Code == "2")
+                            {
+                                vicPlayClass.GetVoicePlay("不是有效车号二维码", PbCache.collect.carno);
+                                frmOneYardToEnd.setMsgInfo("不是有效车号二维码");
+                            }
+                            if (rmsSweepCodeClass.Code == "9")
+                            {
+                                vicPlayClass.GetVoicePlay("不是有效车号二维码", PbCache.collect.carno);
+                                frmOneYardToEnd.setMsgInfo("不是有效车号二维码");
+                            }
+                            l.WriteLog(12, "测试扫码值" + rmsSweepCodeClass.Data);
+                        }
                     }
                 }
                 else
                 {
-                    ////日期2021年12月22日：重复扫码，取前面12位
-                    //if (sweepCodeClass.StrCode.Length > 15)
-                    //{
-                    //    // todo: 加入车号截取逻辑
-                    //    sweepCodeClass.StrCode = sweepCodeClass.StrCode.Substring(0,12);
-                    //}
-                    //if (firstCode != sweepCodeClass.StrCode || string.IsNullOrEmpty(PbCache.strCode))
-                    //{
-                    //    l.WriteLog(12, "主线程扫码值赋值；sweepCodeClass.StrCode值为" + sweepCodeClass.StrCode + " ；PbCache.strCode前值为：" + PbCache.strCode);
-                    //    PbCache.strCode = sweepCodeClass.StrCode;
-                    //    firstCode = PbCache.strCode;
-                    //}
                     codeFlag = true;
+                    frmOneYardToEnd frmOneYardToEnd = new frmOneYardToEnd();
                     Hashtable hashTable = new Hashtable();
-                    hashTable.Add("message", sweepCodeClass.StrCode);
+                    hashTable.Add("message", sweepCodeCpoyClass.StrCode);
                     rmsSweepCodeClass = mwcfs.DecryptionForWfTest(hashTable);
                     if (rmsSweepCodeClass.Code == "0")
                     {
@@ -457,10 +534,9 @@ namespace CarMeterSystem
                         vicPlayClass.GetVoicePlay("不是有效车号二维码", PbCache.collect.carno);
                         frmOneYardToEnd.setMsgInfo("不是有效车号二维码");
                     }
-                    l.WriteLog(12, "测试扫码值" + PbCache.strCode);
+                    l.WriteLog(12, "测试扫码值" + rmsSweepCodeClass.Data);
                 }
-
-                #endregion 扫码信息
+                #endregion
 
                 #region 秤上无车10分钟获取一次基础数据
                 if (iCount < 1200)
@@ -678,6 +754,7 @@ namespace CarMeterSystem
                             {
                                 if (PbCache.holdTime[0].retentionTime.Value < iHodeTime)
                                 {
+                                    l.WriteLog(33, "iHodeTime："+ iHodeTime + ",PbCache.holdTime[0].retentionTime.Value:"+ PbCache.holdTime[0].retentionTime.Value + ",mwUpdate.stopOverTime:"+ mwUpdate.stopOverTime);
                                     PbCache.isOvertimeAlarm = true; //是否超时报警
                                     mwUpdate.stopOverTime = "1"; //写入一次停留超时
                                     //mwUpdate.isHelp = "1";//派位

Common/log/Log.cs

@@ -143,6 +143,9 @@ namespace Common
                     case 32:
                         strLogName = "frmMain定时器重启日志_";
                         break;
+                    case 33:
+                        strLogName = "停留超时";
+                        break;
                     default: 
                         strLogName = "计量终端_"; 
                         break;

MeterPlugInLibrary/扫码枪/SweepCode.cs

@@ -74,6 +74,7 @@ namespace MeterPlugInLibrary
             }
             catch (Exception exp)
             {
+                Close();
                 strCode = "";
                 WriteLog("扫码信息读取异常！" + exp.Message);
             }
@@ -110,6 +111,7 @@ namespace MeterPlugInLibrary
         {
             try
             {
+                Close();
                 string strSweepCode = "";
                 int i = Scanning.SetDeviceType(3);//设备类型
                 if (i != 0)
@@ -146,6 +148,7 @@ namespace MeterPlugInLibrary
             }
             catch (Exception exp)
             {
+                Close();
                 isError = true;
                 WriteLog("扫码异常！" + exp.Message);
                 return "";

MeterPlugInLibrary/扫码枪/SweepCodeCpoy.cs

@@ -74,6 +74,7 @@ namespace MeterPlugInLibrary
             }
             catch (Exception exp)
             {
+                Close();
                 strCode = "";
                 WriteLog("扫码信息读取异常！" + exp.Message);
             }
@@ -110,6 +111,7 @@ namespace MeterPlugInLibrary
         {
             try
             {
+                Close();
                 string strSweepCode = "";
                 int i = Scanning.SetDeviceType(3);//设备类型
                 if (i != 0)
@@ -146,6 +148,7 @@ namespace MeterPlugInLibrary
             }
             catch (Exception exp)
             {
+                Close();
                 isError = true;
                 WriteLog("扫码异常！" + exp.Message);
                 return "";