Merge branch 'master' of https://git.steerinfo.com/caol/jisco_winform_wzjl.git

CarMeterSystem/App.config

@@ -36,6 +36,12 @@
     <!--期限皮使用方式配置：车号-物料-路线（1），车号-物料-称点（2）-->
     <add key="TareControlType" value="1" />
 
+    <!--厂内外车配置：001004003（内部），001004002（外部）-->
+    <add key="carTypeNo" value="001004003" />
+
+    <!--厂内外车配置：001004003（内部），001004002（外部）-->
+    <add key="carTypeName" value="内部" />
+
 		<add key="ClientSettingsProvider.ServiceUri" value="" />
 	</appSettings>
 	<system.web>

CarMeterSystem/frmOneYardToEnd.cs

@@ -289,10 +289,14 @@ namespace CarMeterSystem
                                 {
                                     btnSave.Enabled = false;
                                     strRm = em.GetAndExecuteMethod<rtInfo>("MeterSceneLibrary", "InnerCarJISCO", "MeterMethod", new object[] { new PreTrackScale { } });
+                                    if (PbCache.ResultMessage != "")
+                                    {
+
+                                    }
                                     setMsg(strRm.ResultMessage);
                                     if (!string.IsNullOrEmpty(PbCache.LEDResultMessage))
                                     {
-                                        led_controler.setOneLineMsg(PbCache.sportInfo.ledIp, PbCache.LEDResultMessage);
+                                        led_controler.setStatic4LineMsg(PbCache.sportInfo.ledIp, PbCache.LEDResultMessage);
                                     }
                                 }
                                 catch (Exception exp)
@@ -303,7 +307,7 @@ namespace CarMeterSystem
                                     setMsg(PbCache.ResultMessage);
                                     if (!string.IsNullOrEmpty(PbCache.LEDResultMessage))
                                     {
-                                        led_controler.setOneLineMsg(PbCache.sportInfo.ledIp, PbCache.LEDResultMessage);
+                                        led_controler.setStatic4LineMsg(PbCache.sportInfo.ledIp, PbCache.LEDResultMessage);
                                     }
                                     //break;
                                     return;
@@ -319,7 +323,7 @@ namespace CarMeterSystem
                                     setMsg(strRm.ResultMessage);
                                     if (!string.IsNullOrEmpty(PbCache.LEDResultMessage))
                                     {
-                                        led_controler.setOneLineMsg(PbCache.sportInfo.ledIp, PbCache.LEDResultMessage);
+                                        led_controler.setStatic4LineMsg(PbCache.sportInfo.ledIp, PbCache.LEDResultMessage);
                                     }
                                 }
                                 catch (Exception exp)
@@ -330,7 +334,7 @@ namespace CarMeterSystem
                                     setMsg(PbCache.ResultMessage);
                                     if (!string.IsNullOrEmpty(PbCache.LEDResultMessage))
                                     {
-                                        led_controler.setOneLineMsg(PbCache.sportInfo.ledIp, PbCache.LEDResultMessage);
+                                        led_controler.setStatic4LineMsg(PbCache.sportInfo.ledIp, PbCache.LEDResultMessage);
                                     }
                                     //break;
                                     return;
@@ -351,7 +355,7 @@ namespace CarMeterSystem
                                     Monitor(strRm.Data);
                                     if (!string.IsNullOrEmpty(PbCache.LEDResultMessage))
                                     {
-                                        led_controler.setOneLineMsg(PbCache.sportInfo.ledIp, PbCache.LEDResultMessage);
+                                        led_controler.setStatic4LineMsg(PbCache.sportInfo.ledIp, PbCache.LEDResultMessage);
                                     }
                                     return;
                                 }
@@ -363,7 +367,7 @@ namespace CarMeterSystem
                                     Monitor(strRm.Data);
                                     if (!string.IsNullOrEmpty(PbCache.LEDResultMessage))
                                     {
-                                        led_controler.setOneLineMsg(PbCache.sportInfo.ledIp, PbCache.LEDResultMessage);
+                                        led_controler.setStatic4LineMsg(PbCache.sportInfo.ledIp, PbCache.LEDResultMessage);
                                     }
                                     //return;
                                 }
@@ -394,7 +398,7 @@ namespace CarMeterSystem
                                 Monitor(strRm.Data);
                                 if (!string.IsNullOrEmpty(PbCache.LEDResultMessage))
                                 {
-                                    led_controler.setOneLineMsg(PbCache.sportInfo.ledIp, PbCache.LEDResultMessage);
+                                    led_controler.setStatic4LineMsg(PbCache.sportInfo.ledIp, PbCache.LEDResultMessage);
                                 }
                                 return;
 
@@ -422,11 +426,11 @@ namespace CarMeterSystem
                             Monitor(rt);
                             if (!string.IsNullOrEmpty(PbCache.LEDResultMessage))
                             {
-                                led_controler.setOneLineMsg(PbCache.sportInfo.ledIp, PbCache.LEDResultMessage);
+                                led_controler.setStatic4LineMsg(PbCache.sportInfo.ledIp, PbCache.LEDResultMessage);
                             }
                             if (!string.IsNullOrEmpty(tempCarNo))
                             {
-                                carService.addCar(new MeterBaseCar { carNo = tempCarNo,carTypeNo = "001004003" ,carTypeName = "内部" });
+                                carService.addCar(new MeterBaseCar { carNo = tempCarNo,carTypeNo = AppConfigCache.carTypeNo, carTypeName = AppConfigCache.carTypeName });
                             }
                             return;
                         }
@@ -1005,7 +1009,7 @@ namespace CarMeterSystem
 
                                 if (!string.IsNullOrEmpty(PbCache.collect.carno))
                                 {
-                                    carService.addCar(new MeterBaseCar { carNo = PbCache.collect.carno, carTypeNo = "001004003", carTypeName = "内部" });
+                                    carService.addCar(new MeterBaseCar { carNo = PbCache.collect.carno, carTypeNo = AppConfigCache.carTypeNo, carTypeName = AppConfigCache.carTypeName });
                                 }
                                 return;
                             }
@@ -1068,7 +1072,7 @@ namespace CarMeterSystem
                                 isVoiceDownCar = true;
                                 vicPlayClass.GetVoicePlay("车上人员请下车", PbCache.collect.carno);
                                 //txtMsgInfo.Text = "请核对车号后，扫描您手机中的二维码";
-                            }
+                                }
                             // 如果计量点配置中，设置了秤点计量类型为智能计量（下秤），验证扫码信息是否与识别车号一致。
                             // 如果为是，自动保存
                             //3秒后自动执行保存方法
@@ -1883,5 +1887,10 @@ namespace CarMeterSystem
                 lg.WriteLog(3, PbCache.lockCarNo + "求助写入失败");
             }
         }
+
+        public void setPre(MeterWorkCarActualFirst model)
+        {
+            ucCarMeterInfoJisco1.setFormControlValue(model);
+        }
     }
 }

Common/cacheCls/AppConfigCache.cs

@@ -77,5 +77,15 @@ namespace Common
         /// </summary>
         public static readonly string TareControlType = ConfigurationManager.AppSettings["TareControlType"].ToString().Trim();
 
+        /// <summary>
+        /// 0测试，1正式
+        /// </summary>
+        public static readonly string carTypeNo = ConfigurationManager.AppSettings["carTypeNo"].ToString().Trim();
+
+        /// <summary>
+        /// 0测试，1正式
+        /// </summary>
+        public static readonly string carTypeName = ConfigurationManager.AppSettings["carTypeName"].ToString().Trim();
+
     }
 }

MeterModuleLibrary/uc/ucCarMeterInfoJisco.Designer.cs

@@ -177,9 +177,8 @@
             // 
             this.txtFORWARDING_UNIT_NAME.Anchor = System.Windows.Forms.AnchorStyles.Left;
             this.txtFORWARDING_UNIT_NAME.AutoSize = true;
-            this.txtFORWARDING_UNIT_NAME.Enabled = false;
             this.txtFORWARDING_UNIT_NAME.Font = new System.Drawing.Font("Microsoft Sans Serif", 22F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.txtFORWARDING_UNIT_NAME.ForeColor = System.Drawing.Color.Black;
+            this.txtFORWARDING_UNIT_NAME.ForeColor = System.Drawing.SystemColors.ControlText;
             this.txtFORWARDING_UNIT_NAME.Location = new System.Drawing.Point(3, 48);
             this.txtFORWARDING_UNIT_NAME.Name = "txtFORWARDING_UNIT_NAME";
             this.txtFORWARDING_UNIT_NAME.Size = new System.Drawing.Size(195, 36);

MeterSceneLibrary/JISCO/InnerCarJISCO.cs

@@ -201,11 +201,10 @@ namespace MeterSceneLibrary
                                             {
                                                 //查下当前拖的物料是否可用期限皮;验证业务类型是否允许使用期限皮重
                                                 string sqls = @"select t.matter_no id, t.matter_name text
-                                                from meter_base_matter_info t,meter_base_metertype_conf t2
+                                                from meter_base_matter_info t
                                                 where t.allowed_tare_weight = '1'
                                                 and t.valid_flag = '1'
-                                                and t.matter_no='" + rmScale.Data[0].matterNo + @"'
-                                                and t2.is_allow_term_tare = '1' and  t2.meter_type_no = '" + rmScale.Data[0].meterTypeNo + @"'";
+                                                and t.matter_no='" + rmScale.Data[0].matterNo + @"'";
 
                                                 PbModelDbService<List<PbModelDb>> pbp = new PbModelDbService<List<PbModelDb>>();
                                                 RESTfulResult<List<PbModelDb>> rmT = pbp.executeSqlDataWf(sqls);
@@ -417,6 +416,7 @@ namespace MeterSceneLibrary
                                             {
                                                 mwaf.weightType = "0";
                                                 rt = saveMethod.doAddFirst(rmScale.Data[0], mwaf);
+                                                rt.resultInfo = "无皮重信息，无法结净，请计量皮重";
                                                 PbCache.ResultMessage = "无皮重信息，无法结净，请计量皮重";
                                                 rt.isWarn = true;
                                                 rt.WarnContent = "validWgt";
@@ -654,6 +654,7 @@ namespace MeterSceneLibrary
                                     {
                                         mwaf.weightType = "0";
                                         rt = saveMethod.doAddFirst(rmScale.Data[0],mwaf);
+                                        rt.resultInfo = "无皮重信息，无法结净，请计量皮重";
                                         PbCache.ResultMessage = "无皮重信息，无法结净，请计量皮重";
                                         rt.isWarn = true;
                                         rt.WarnContent = "validWgt";
@@ -708,7 +709,7 @@ namespace MeterSceneLibrary
                                         // 在皮重误差内
                                         if (PbCache.monitorResult.valid_wgt == true || listMonitor.Data[0].validPredictionDiff == "0")
                                         {
-                                           //保存一条作废的皮重数据
+                                            //保存一条作废的皮重数据
                                             mwaf.weightType = "1";
                                             mwaf.valueFlag = "0";
                                             rt = saveMethod.doAddFirst(null, mwaf);
@@ -729,8 +730,14 @@ namespace MeterSceneLibrary
                                     {
                                         if (PbCache.monitorResult.valid_wgt == true || listMonitor.Data[0].validPredictionDiff == "0")
                                         {
+                                            RESTfulResult<List<PreTrackScale>> scales = preTrackScaleService.doQueryWf(new PreTrackScale { predictionNo = firstList[0].predictionNo });
                                             //匹配结净
-                                            rt = saveMethod.doNet(null, firstList[0], mwaf);
+                                            EntityBase<PreTrackScale> entityBase2 = new EntityBase<PreTrackScale>();
+                                            mwaf = entityBase2.format<MeterWorkCarActualFirst>(scales.Data[0], mwaf);
+                                            mwaf.isPreScale = "1";
+                                            mwaf.weightType = "0";
+
+                                            rt = saveMethod.doNet(scales.Data[0], firstList[0], mwaf);
                                             PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，净重{2}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2), Math.Round((Math.Abs(rmFirst.Data[0].meterWeight.Value - PbCache.lockWgt) / 1000), 2));
                                         }
                                         else
@@ -745,19 +752,9 @@ namespace MeterSceneLibrary
                                         }
                                     }
                                     // 存在多条有效的一次计量数据
-                                    else if (firstList == null || firstList.Count > 1)
+                                    else if (firstList.Count > 1)
                                     {
-                                        /* a. 程序报警a
-                                         * b. 自动进行语音求助
-                                         */
-                                        //多条一次记录下判断是否全为毛重，是全部结净
-                                        if (firstList[firstList.Count - 1].weightType == "0" && list[0].weightTypeNo == "001033002")
-                                        {
-                                            //给一次数据匹配委托
-                                            mwaf.weightType = "0";
-
-                                            rt = saveMethod.doNetAddMuch(mwaf);
-                                        }
+                                        
                                     }
                                 }
                                 else

MeterSceneLibrary/JISCO/private/SaveMethod.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using CarMeterSystem;
 
 namespace MeterSceneLibrary.JISCO
 {
@@ -37,6 +38,9 @@ namespace MeterSceneLibrary.JISCO
             {
                 EntityBase<PreTrackScale> entityBase = new EntityBase<PreTrackScale>();
                 model = entityBase.format<MeterWorkCarActualFirst>(scale, model);
+
+                frmOneYardToEnd frmOneYardToEnd = new frmOneYardToEnd();
+                frmOneYardToEnd.setPre(model);
             }
             //操作日志
             MeterMonitorNote monitorNote = new MeterMonitorNote();
@@ -96,6 +100,9 @@ namespace MeterSceneLibrary.JISCO
                 EntityBase<PreTrackScale> entityBase = new EntityBase<PreTrackScale>();
                 netDb = entityBase.format<MeterWorkCarActual>(scale, netDb);
                 netDb.isPreScale = "1";
+
+                frmOneYardToEnd frmOneYardToEnd = new frmOneYardToEnd();
+                frmOneYardToEnd.setPre(actualFirst2);
             }
 
             if (actualFirst2.meterWeight.Value > actualFirst.meterWeight.Value)

MeterSceneLibrary/MeterSceneLibrary.csproj

@@ -41,6 +41,10 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\output\CoreFS.CA06Lite.dll</HintPath>
     </Reference>
+    <Reference Include="MeterModuleLibrary, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\output\MeterModuleLibrary.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Windows.Forms" />