winfrom修改

CarMeterSystem/frmOneYardToEnd.cs

@@ -1072,7 +1072,7 @@ namespace CarMeterSystem
                                 isVoiceDownCar = true;
                                 vicPlayClass.GetVoicePlay("车上人员请下车", PbCache.collect.carno);
                                 //txtMsgInfo.Text = "请核对车号后，扫描您手机中的二维码";
-                            }
+                                }
                             // 如果计量点配置中，设置了秤点计量类型为智能计量（下秤），验证扫码信息是否与识别车号一致。
                             // 如果为是，自动保存
                             //3秒后自动执行保存方法
@@ -1887,5 +1887,10 @@ namespace CarMeterSystem
                 lg.WriteLog(3, PbCache.lockCarNo + "求助写入失败");
             }
         }
+
+        public void setPre(MeterWorkCarActualFirst model)
+        {
+            ucCarMeterInfoJisco1.setFormControlValue(model);
+        }
     }
 }

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

@@ -730,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
@@ -746,26 +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 = "1";
-                                            rt = saveMethod.doAddFirst(null, mwaf);
-                                            rt.resultInfo += "，多毛一皮";
-                                            PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
-
-
-                                            //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" />