winfrom提交

CarMeterSystem/App.config

@@ -10,7 +10,7 @@
     <add key="ServiceUrl" value="http://10.104.0.1:9004/v1" />
 		<!--<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/winform/systemBase/v1"/>-->
+    <!--<add key="ServiceUrl" value="http://jgwzjl.jiugang.com/icore.icp.web/pass/systemBase/v1"/>-->
     <!--实时库地址-->
 		<add key="icoredbTcp" value="tarantool://guest@10.99.200.86:2101" />
 		<!--SFTP或者vsftp服务端连接及地址-->

CarMeterSystem/Form1.cs

@@ -389,7 +389,7 @@ namespace CarMeterSystem
                 #region 每10秒写入一次当前时间
                 if (iCount % 20 == 0)
                 {
-                    RESTfulResult<string> rms = meterWorkMonitor.doUpdateWf(new MeterWorkMonitor { pointNo = PbCache.sportInfo.baseSpotNo, lastTime = DateTime.Now });
+                    RESTfulResult<string> rms = meterWorkMonitor.doUpdateWfBySpotNo(new MeterWorkMonitor { pointNo = PbCache.sportInfo.baseSpotNo });
                     if (!rms.Succeed)
                     {
                         l.WriteLog(0, "frmMain.EventData异常：写入时间异常");
@@ -431,11 +431,11 @@ namespace CarMeterSystem
                     //PbCache.collect.carno = e.carno;
                 }
 
-#if DEBUG
+                #if DEBUG
 
                 
 
-#endif
+                #endif
 
                 #region 摄像头当前采集的车号与上次采集的不一样且当前未勾选不验证的情况
                 if (preCarNo != e.carno && PbCache.monitor != null && PbCache.monitor.validCarno != "0")
@@ -1261,6 +1261,15 @@ namespace CarMeterSystem
                             break;
                         case "RfidState":
                             mwm.rfidState = lv.Value.ToString();
+                            if (((lv.Value ?? "0") + "").Equals("1"))
+                            {
+                                doInsertZeroAlarm();
+                                PbCache.isZeroAlarm = true;
+                            }
+                            else
+                            {
+                                PbCache.isZeroAlarm = false;
+                            }
                             break;
                     }
                 }

CarMeterSystem/OptionCls/LoginCls.cs

@@ -13,6 +13,7 @@ namespace CarMeterSystem
         public bool LoginIn()
         {
             MeterBaseSpotInfoService service = new MeterBaseSpotInfoService();
+            Log l = Log.GetInstance();
             if (AppConfigCache.productType == "2" || AppConfigCache.productType == "0")
             {
                 RESTfulResult<List<MeterBaseSpotInfo>> rm = service.doQueryWf(new MeterBaseSpotInfo { flatComputerIp = IpAddress.getIp, validFlag = "1" });

CarMeterSystem/frmMain.cs

@@ -186,7 +186,7 @@ namespace CarMeterSystem
                 }
                 else
                 {
-                    l.WriteLog(0, "按IP地址找不到计量点信息，系统登录失败");
+                    l.WriteLog(0, "按IP地址找不到计量点信息，系统登录失败,ip:" + IpAddress.getIp);
                 }
             }
             catch (Exception ex)
@@ -455,10 +455,10 @@ namespace CarMeterSystem
                 if (iCount % 20 == 0)
                 {
                     //更新在线时间
-                    RESTfulResult<string> rms = meterWorkMonitor.doUpdateWf(new MeterWorkMonitor { pointNo = PbCache.sportInfo.baseSpotNo, lastTime = DateTime.Now });
+                    RESTfulResult<string> rms = meterWorkMonitor.doUpdateWfBySpotNo(new MeterWorkMonitor { pointNo = PbCache.sportInfo.baseSpotNo});
                     if (!rms.Succeed)
                     {
-                        l.WriteLog(0, "frmMain.EventData异常：写入时间异常");
+                        l.WriteLog(0, "frmMain.EventData异常：写入时间异常，原因：" + rms.ResultMessage);
                     }
                 }
                 #endregion
@@ -832,59 +832,47 @@ namespace CarMeterSystem
                             uc.setControlEnable(false);
                         }
                     }
+
+                    //*
+                    //另外初始化一次监控数据
+                    RESTfulResult<string> rmss = meterWorkMonitor.doUpdateWf(new MeterWorkMonitor
+                    {
+                        pointNo = PbCache.sportInfo.baseSpotNo,
+                        validWgt = "1",
+                        validCarno = "1",
+                        validTareTime = "1",
+                        validMatTime = "1",
+                        validTimeInterval = "1",
+                        validParkStatus = "1",
+                        validExceedWgt = "1",
+                        validPredictionDiff = "1",
+                        validLianda = "1",
+                        validMatClick = "1",
+                        setCar = "",
+                        rfidCar = "",
+                        photoCar = "",
+                        scanCar = "",
+                        editCar = "",
+                        zeroState = "0",
+                        carErr = "0",
+                        ferroalloyResult = "0",
+                        wgtErr = "0",
+                        stopOverTime = "0",
+                        msgInfo = "",
+                        ledWriter = "",
+                        isOverWgt = "",
+                        isHelp = "0",
+                        wgt = e.weight
+                    });
+                    if (!rmss.Succeed)
+                    {
+                        l.WriteLog(0, "frmMain.EventData异常754：写入信息异常");
+                    }
+                    //*/
                     //LED写入
                     if (isLedWrite)
                     {
-                        //if (PbCache.monitor == null || string.IsNullOrEmpty(PbCache.monitor.ledWriter))
-                        //{
-                        //    PbCache.ledInfo = "欢迎使用酒钢汽车衡智能计量系统";
-                        //}
-                        //else
-                        //{
-                        //    PbCache.ledInfo = PbCache.monitor == null ? "" : PbCache.monitor.ledWriter;
-                        //}
-
-                        //led_controler.setOneLineMsg(PbCache.sportInfo.ledIp, PbCache.ledInfo);
-
                         isLedWrite = false;
-
-                        //*
-                        //另外初始化一次监控数据
-                        RESTfulResult<string> rms = meterWorkMonitor.doUpdateWf(new MeterWorkMonitor
-                        {
-                            pointNo = PbCache.sportInfo.baseSpotNo,
-                            validWgt = "1",
-                            validCarno = "1",
-                            validTareTime = "1",
-                            validMatTime = "1",
-                            validTimeInterval = "1",
-                            validParkStatus = "1",
-                            validExceedWgt = "1",
-                            validPredictionDiff = "1",
-                            validLianda = "1",
-                            validMatClick = "1",
-                            setCar = "",
-                            rfidCar = "",
-                            photoCar = "",
-                            scanCar = "",
-                            editCar = "",
-                            zeroState = "0",
-                            carErr = "0",
-                            ferroalloyResult = "0",
-                            wgtErr = "0",
-                            stopOverTime = "0",
-                            msgInfo = "",
-                            ledWriter = "",
-                            isOverWgt = "",
-                            isHelp = "0",
-                            wgt = 0
-                        });
-                        if (!rms.Succeed)
-                        {
-                            l.WriteLog(0, "frmMain.EventData异常754：写入信息异常");
-                            isLedWrite = true;
-                        }
-                        //*/
                     }
                 }
 
@@ -912,10 +900,6 @@ namespace CarMeterSystem
             {
                 foreach (LiveData lv in ll)
                 {
-                    if (lv.Tagname == "ZeroWeightStatus")
-                    {
-                        lv.Value = "1";
-                    }
                     switch (lv.Tagname.Replace(PbCache.collect_no, ""))
                     {
                         case "StaticStatus"://车辆检测	"0、东西方向激光均无报警；否则报警
@@ -961,10 +945,6 @@ namespace CarMeterSystem
             {
                 foreach (LiveData lv in ll)
                 {
-                    if (lv.Tagname == "ZeroWeightStatus")
-                    {
-                        lv.Value = "1";
-                    }
                     switch (lv.Tagname.Replace(PbCache.collect_no, ""))
                     {
                         case "PowerStatus":
@@ -1027,6 +1007,15 @@ namespace CarMeterSystem
                             break;
                         case "ZeroWeightStatus":
                             mwm.zeroState = lv.Value.ToString();
+                            if (((lv.Value ?? "0") + "").Equals("1"))
+                            {
+                                doInsertZeroAlarm();
+                                PbCache.isZeroAlarm = true;
+                            }
+                            else
+                            {
+                                PbCache.isZeroAlarm = false;
+                            }
                             break;
                     }
                 }

CarMeterSystem/frmOneYardToEnd.cs

@@ -89,7 +89,7 @@ namespace CarMeterSystem
                 wgt = 0;
                 temporaryResult = "";
                 temporaryCarNo = "";
-                if (!string.IsNullOrEmpty(PbCache.sportInfo.ledIp))
+                if (!string.IsNullOrEmpty(PbCache.sportInfo.ledIp) && PbCache.monitor.isTakeOver != "1" && PbCache.monitor.isTakeOver != "2")
                 {
                     led_controler = new LED_Control(PbCache.sportInfo.ledIp);
                 }
@@ -1016,6 +1016,8 @@ namespace CarMeterSystem
                                 //txtMsgInfo.Text = "计量完成";
                                 setMsg("计量完成");
                                 vicPlayClass.GetVoicePlay("计量完成，请离开秤台", PbCache.collect.carno);
+                                PbCache.voiceType = 1;
+                                isMeasureSuccess = true;
                                 isOverSound = true;
                                 Print1(PbCache.monitor.isOverWgt);
                                 return;
@@ -1453,9 +1455,9 @@ namespace CarMeterSystem
                             // 如果为是，自动保存
                             //3秒后自动执行保存方法
                             lg.WriteLog(25, PbCache.lockCarNo + "Sleep前点击保存按钮");
-                            //Thread.Sleep(3000);
+                            Thread.Sleep(3000);
                             lg.WriteLog(25, PbCache.lockCarNo + "Sleep后点击保存按钮");
-                            //this.btnSave.PerformClick();
+                            this.btnSave.PerformClick();
                             lg.WriteLog(25, PbCache.lockCarNo + "PerformClick后保存按钮");
                         }
                         else if (PbCache.monitor.validMatClick == "0")

Common/DbOption/work/MeterWorkMonitorService.cs

@@ -71,6 +71,13 @@ namespace Common
             return rm;
         }
 
+        public RESTfulResult<string> doUpdateWfBySpotNo(MeterWorkMonitor info)
+        {
+            DbHelper db = new DbHelper();
+            RESTfulResult<string> rm = db.doOption<string>("meterworkmonitors", "doUpdateWfBySpotNo", new object[] { info }, 1);
+            return rm;
+        }
+
 
     }
 }

MeterPlugInLibrary/LED/LED_Control.cs

@@ -232,7 +232,7 @@ namespace MeterPlugInLibrary
             try
             {
 
-                if (ledInfo == null) return;
+                if (string.IsNullOrEmpty(ledInfo)) return;
                 ledInfo = ledInfo.Replace("，", "\r\n");
 
                 if (PbCache.OldLedInfo == ledInfo) return;

MeterSceneLibrary/JISCO/InnerCarJISCO.cs

@@ -1494,7 +1494,7 @@ namespace MeterSceneLibrary
                                         {
                                             if (PbCache.ResultMessage == "")
                                             {
-                                                PbCache.ResultMessage = "重量类型为毛重，在皮重误差内";
+                                                PbCache.ResultMessage = "毛重接近历史皮重，请联系处理";
                                             }
                                             PbCache.voiceType = 23;
                                             rt = saveMethod.doError(PbCache.ResultMessage);

MeterSceneLibrary/JISCO/OuterCarJISCO.cs

@@ -358,7 +358,7 @@ namespace MeterSceneLibrary
                                                 rt.resultInfo += "，混装业务";
                                                 double? netWeight = PbCache.lockWgt - lastMeterWorkCarActual.grossWeight;
                                                 PbCache.voiceType = 1;
-                                                PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，净重{2}吨，混装业务", PbCache.lockCarNo, Math.Round(PbCache.lockWgt / 1000, 2), Math.Round((double)netWeight / 1000, 2));
+                                                PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，净重{2}吨，混装业务", PbCache.lockCarNo, Math.Round(PbCache.lockWgt / 1000, 2), Math.Abs(Math.Round((double)netWeight / 1000, 2)));
                                             }
                                             else
                                             {