智能终端修改

CarMeterSystem/App.config

@@ -4,10 +4,12 @@
 		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
 	</startup>
 	<appSettings>
-		<add key="ServiceUrl" value="http://127.0.0.1:9004/v1" />
+		<!--<add key="ServiceUrl" value="http://127.0.0.1:9004/v1" />-->
+    <!--<add key="ServiceUrl" value="http://10.104.4.105: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://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="icoredbTcp" value="tarantool://guest@10.99.200.86:2101" />
 		<!--SFTP或者vsftp服务端连接及地址-->
 		<add key="fip" value="192.168.185.238" />

CarMeterSystem/Form1.cs

@@ -335,7 +335,6 @@ namespace CarMeterSystem
                         l.WriteLog(12, "主线程扫码值赋值；sweepCodeClass.StrCode值为" + sweepCodeClass.StrCode + " ；PbCache.strCode前值为：" + PbCache.strCode);
                         PbCache.strCode = sweepCodeClass.StrCode;
                         firstCode = PbCache.strCode;
-
                     }
                 }
 

CarMeterSystem/Properties/licenses.licx

@@ -1 +1,2 @@
 Infragistics.Win.UltraWinEditors.UltraTextEditor, Infragistics2.Win.UltraWinEditors.v9.2, Version=9.2.20092.1003, Culture=neutral, PublicKeyToken=7dd5c3163f2cd0cb
+Infragistics.Win.UltraWinGrid.UltraGrid, Infragistics2.Win.UltraWinGrid.v9.2, Version=9.2.20092.1003, Culture=neutral, PublicKeyToken=7dd5c3163f2cd0cb

CarMeterSystem/frmOneYardToEnd.Designer.cs

@@ -68,7 +68,7 @@
             this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnSave.Font = new System.Drawing.Font("楷体", 16F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)), true);
             this.btnSave.ForeColor = System.Drawing.Color.White;
-            this.btnSave.Location = new System.Drawing.Point(537, 788);
+            this.btnSave.Location = new System.Drawing.Point(532, 650);
             this.btnSave.Name = "btnSave";
             this.btnSave.Size = new System.Drawing.Size(129, 35);
             this.btnSave.TabIndex = 641;
@@ -83,7 +83,7 @@
             this.btnRecover.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnRecover.Font = new System.Drawing.Font("楷体", 16F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)), true);
             this.btnRecover.ForeColor = System.Drawing.Color.White;
-            this.btnRecover.Location = new System.Drawing.Point(0, -1);
+            this.btnRecover.Location = new System.Drawing.Point(928, 753);
             this.btnRecover.Name = "btnRecover";
             this.btnRecover.Size = new System.Drawing.Size(132, 31);
             this.btnRecover.TabIndex = 644;
@@ -98,7 +98,7 @@
             this.btnFH.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnFH.Font = new System.Drawing.Font("楷体", 16F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)), true);
             this.btnFH.ForeColor = System.Drawing.Color.White;
-            this.btnFH.Location = new System.Drawing.Point(670, 785);
+            this.btnFH.Location = new System.Drawing.Point(667, 650);
             this.btnFH.Name = "btnFH";
             this.btnFH.Size = new System.Drawing.Size(255, 42);
             this.btnFH.TabIndex = 642;
@@ -112,7 +112,7 @@
             this.btnTare.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnTare.Font = new System.Drawing.Font("楷体", 16F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)), true);
             this.btnTare.ForeColor = System.Drawing.Color.White;
-            this.btnTare.Location = new System.Drawing.Point(415, 788);
+            this.btnTare.Location = new System.Drawing.Point(410, 649);
             this.btnTare.Name = "btnTare";
             this.btnTare.Size = new System.Drawing.Size(116, 36);
             this.btnTare.TabIndex = 643;
@@ -127,7 +127,7 @@
             this.btnHelp.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnHelp.Font = new System.Drawing.Font("楷体", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)), true);
             this.btnHelp.ForeColor = System.Drawing.Color.White;
-            this.btnHelp.Location = new System.Drawing.Point(502, 709);
+            this.btnHelp.Location = new System.Drawing.Point(514, 574);
             this.btnHelp.Name = "btnHelp";
             this.btnHelp.Size = new System.Drawing.Size(280, 70);
             this.btnHelp.TabIndex = 638;
@@ -188,7 +188,7 @@
             // txtGroess
             // 
             this.txtGroess.Font = new System.Drawing.Font("宋体", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtGroess.Location = new System.Drawing.Point(45, 7);
+            this.txtGroess.Location = new System.Drawing.Point(51, 9);
             this.txtGroess.Name = "txtGroess";
             this.txtGroess.ReadOnly = true;
             this.txtGroess.Size = new System.Drawing.Size(70, 24);
@@ -236,6 +236,7 @@
             this.panelCarFormCentered.Controls.Add(this.tableLayoutPanelPromptMsg);
             this.panelCarFormCentered.Controls.Add(this.ucWeightT1);
             this.panelCarFormCentered.Controls.Add(this.panelShowWeightJGNoUsed);
+            this.panelCarFormCentered.Controls.Add(this.btnRecover);
             this.panelCarFormCentered.Controls.Add(this.btnSave);
             this.panelCarFormCentered.Controls.Add(this.btnHelp);
             this.panelCarFormCentered.Controls.Add(this.btnTare);
@@ -251,7 +252,7 @@
             this.ucCarMeterInfoJisco1.BackColor = System.Drawing.Color.White;
             this.ucCarMeterInfoJisco1.Location = new System.Drawing.Point(3, 146);
             this.ucCarMeterInfoJisco1.Name = "ucCarMeterInfoJisco1";
-            this.ucCarMeterInfoJisco1.Size = new System.Drawing.Size(1274, 376);
+            this.ucCarMeterInfoJisco1.Size = new System.Drawing.Size(1274, 283);
             this.ucCarMeterInfoJisco1.TabIndex = 649;
             // 
             // txtCarNo
@@ -285,12 +286,12 @@
             this.tableLayoutPanelPromptMsg.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
             this.tableLayoutPanelPromptMsg.Controls.Add(this.txtMsgInfo, 0, 1);
             this.tableLayoutPanelPromptMsg.Controls.Add(this.label9, 0, 0);
-            this.tableLayoutPanelPromptMsg.Location = new System.Drawing.Point(0, 525);
+            this.tableLayoutPanelPromptMsg.Location = new System.Drawing.Point(0, 435);
             this.tableLayoutPanelPromptMsg.Name = "tableLayoutPanelPromptMsg";
             this.tableLayoutPanelPromptMsg.RowCount = 2;
             this.tableLayoutPanelPromptMsg.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 40F));
             this.tableLayoutPanelPromptMsg.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanelPromptMsg.Size = new System.Drawing.Size(1277, 162);
+            this.tableLayoutPanelPromptMsg.Size = new System.Drawing.Size(1277, 133);
             this.tableLayoutPanelPromptMsg.TabIndex = 646;
             // 
             // txtMsgInfo
@@ -304,7 +305,7 @@
             this.txtMsgInfo.Margin = new System.Windows.Forms.Padding(2);
             this.txtMsgInfo.Name = "txtMsgInfo";
             this.txtMsgInfo.ReadOnly = true;
-            this.txtMsgInfo.Size = new System.Drawing.Size(1273, 118);
+            this.txtMsgInfo.Size = new System.Drawing.Size(1273, 89);
             this.txtMsgInfo.TabIndex = 2;
             this.txtMsgInfo.Text = "请在具备过磅状态后扫码计量！";
             this.txtMsgInfo.Visible = false;
@@ -324,7 +325,7 @@
             // ucWeightT1
             // 
             this.ucWeightT1.Enabled = false;
-            this.ucWeightT1.Location = new System.Drawing.Point(24, 787);
+            this.ucWeightT1.Location = new System.Drawing.Point(3, 782);
             this.ucWeightT1.Margin = new System.Windows.Forms.Padding(2);
             this.ucWeightT1.Name = "ucWeightT1";
             this.ucWeightT1.Size = new System.Drawing.Size(386, 44);
@@ -340,9 +341,8 @@
             this.panelShowWeightJGNoUsed.Controls.Add(this.label3);
             this.panelShowWeightJGNoUsed.Controls.Add(this.label4);
             this.panelShowWeightJGNoUsed.Controls.Add(this.label5);
-            this.panelShowWeightJGNoUsed.Controls.Add(this.btnRecover);
             this.panelShowWeightJGNoUsed.Enabled = false;
-            this.panelShowWeightJGNoUsed.Location = new System.Drawing.Point(931, 786);
+            this.panelShowWeightJGNoUsed.Location = new System.Drawing.Point(919, 785);
             this.panelShowWeightJGNoUsed.Name = "panelShowWeightJGNoUsed";
             this.panelShowWeightJGNoUsed.Size = new System.Drawing.Size(349, 41);
             this.panelShowWeightJGNoUsed.TabIndex = 645;

CarMeterSystem/frmOneYardToEnd.cs

@@ -34,6 +34,7 @@ namespace CarMeterSystem
         private MeterWorkCarActualFirstService workCarActualFirstService = new MeterWorkCarActualFirstService(); //一次计量数据
         private PreTrackScaleService trackService = new PreTrackScaleService();//查询预报信息
         private MeterBaseMatterInfoService matterInfoService = new MeterBaseMatterInfoService(); //物料信息
+        private PreTrackScaleService PreTrackScaleService = new PreTrackScaleService(); 
 
         private validTermTareCar termTareCar = new validTermTareCar();//验证是否可留期限皮
         private validRecoverInfo recoverInfo = new validRecoverInfo();//验证是否需要复磅以及是否满足复磅条件
@@ -278,6 +279,7 @@ namespace CarMeterSystem
                             {
                                 try
                                 {
+                                    btnSave.Enabled = true;
                                     strRm = em.GetAndExecuteMethod<rtInfo>("MeterSceneLibrary", "InnerCarJISCO", "MeterMethod", new object[] { new PreTrackScale { } });
                                 }
                                 catch (Exception exp)
@@ -294,6 +296,7 @@ namespace CarMeterSystem
                             {
                                 try
                                 {
+                                    btnSave.Enabled = true;
                                     strRm = em.GetAndExecuteMethod<rtInfo>("MeterSceneLibrary", "OuterCarJISCO", "MeterMethod", new object[] { new PreTrackScale { } });
                                 }
                                 catch (Exception exp)
@@ -316,12 +319,14 @@ namespace CarMeterSystem
                                     PbCache.isLockFrm = false;
                                     btnSave.Enabled = true;
                                     setMsg(PbCache.ResultMessage);
+                                    Monitor(strRm.Data);
                                     return;
                                 }
 
                                 if (strRm.Data.result) //说明：标识当前跑了一个场景成功了；场景完成后则返回，不再进行下一个场景的执行操作；
                                 {
                                     PbCache.ResultMessage = strRm.Data.resultInfo; //语音提示文件
+                                    Monitor(strRm.Data);
                                     //return;
                                 }
                                 else
@@ -348,11 +353,10 @@ namespace CarMeterSystem
                                         lg.WriteLog(3, PbCache.lockCarNo + "求助写入失败");
                                     }
                                 }
-
+                                Monitor(strRm.Data);
                                 return;
 
                             }
-                            Monitor(strRm.Data);
                         }
                         else
                         {
@@ -360,6 +364,10 @@ namespace CarMeterSystem
                             PbCache.isLockFrm = false;
                             btnSave.Enabled = true;
                             setMsg(PbCache.ResultMessage);
+                            rtInfo rt = new rtInfo();
+                            rt.isWarn = true;
+                            rt.WarnContent = "carErr";
+                            Monitor(rt);
                             return;
                         }
                     }
@@ -577,6 +585,13 @@ namespace CarMeterSystem
                     this.Close();
                 }
 
+                #region 0.接受远程修改过后的车号并显示
+                //if (PbCache.monitor != null && !string.IsNullOrEmpty(PbCache.monitor.editCar))
+                //{
+                //    PbCache.lockCarNo = PbCache.monitor.editCar;
+                //}
+                #endregion
+
                 #region 1、求助按钮控制
                 if (PbCache.monitor != null && !string.IsNullOrEmpty(PbCache.monitor.isHelp))
                 {
@@ -854,9 +869,26 @@ namespace CarMeterSystem
                                 }
                             }
                         }
+                        else
+                        {
+                            RESTfulResult<List<PreTrackScale>> RESTfulResultPre = PreTrackScaleService.doQueryWf(new PreTrackScale { carNo = PbCache.collect.carno, valueFlag = "1" });
+                            if (RESTfulResultPre.Succeed)
+                            {
+                                if (RESTfulResult.Data != null && RESTfulResultPre.Data.Count == 1)
+                                {
+                                    firstWgt = RESTfulResultPre.Data[0].meterWeight.Value;
+
+                                    EntityBase<PreTrackScale> entityBase1 = new EntityBase<PreTrackScale>();
+                                    firstDb = entityBase1.format<MeterWorkCarActualFirst>(RESTfulResultPre.Data[0], firstDb);
+
+                                    firstDb.predictionNo = firstDb.predictionNo.Replace("_", "");
+                                    //给用户控件设置值
+                                    ucCarMeterInfoJisco1.setFormControlValue(firstDb);
+                                }
+                            }
+                        }
                         bRailwayActual = false;
                     }
-
                     #endregion 查询一次计量表中是否存在一条未结净的数据，非一车联运情况扫码两次，一车联运的话
 
                     #region 查一次是否可留期限皮，可以则显示按钮
@@ -918,10 +950,6 @@ namespace CarMeterSystem
                             vicPlayClass.GetVoicePlay("车上人员请下车", PbCache.collect.carno);
                             //txtMsgInfo.Text = "请核对车号后，扫描您手机中的二维码";
                         }
-
-                        //五秒后自动执行保存方法
-                        Thread.Sleep(5000);
-                        this.btnSave.PerformClick();
                     }
                     else if (PbCache.monitor.validMatClick == "0")
                     {
@@ -933,6 +961,10 @@ namespace CarMeterSystem
 
                             // 如果计量点配置中，设置了秤点计量类型为智能计量（下秤），验证扫码信息是否与识别车号一致。
                             // 如果为是，自动保存
+
+                            //五秒后自动执行保存方法
+                            //Thread.Sleep(5000);
+                            //this.btnSave.PerformClick();
                         }
                     }
 
@@ -1703,6 +1735,7 @@ namespace CarMeterSystem
         {
             MeterWorkMonitor meterWorkMonitor = new MeterWorkMonitor();
             meterWorkMonitor.pointNo = PbCache.sportInfo.baseSpotNo;
+            RESTfulResult<string> rms = null;
             if (rt.isWarn)
             {
                 if (rt.WarnContent == "validIsPre")
@@ -1711,14 +1744,19 @@ namespace CarMeterSystem
                 }
                 if(rt.WarnContent == "validWgt")
                 {
-                    meterWorkMonitor.validWgt = "1";
+                    meterWorkMonitor.wgtErr = "1";
+                }
+                if (rt.WarnContent == "carErr")
+                {
+                    meterWorkMonitor.carErr = "1";
                 }
+                rms = monitor.doUpdateWf(meterWorkMonitor);
             }
             if (rt.isHelp)
             {
                 meterWorkMonitor.isHelp = "1";
+                rms = monitor.doUpdateWf(meterWorkMonitor);
             }
-            RESTfulResult<string> rms = monitor.doUpdateWf(meterWorkMonitor);
             if (!rms.Succeed)
             {
                 lg.WriteLog(3, PbCache.lockCarNo + "求助写入失败");

Common/Reflex/EntityBase.cs

@@ -20,7 +20,7 @@ namespace Common
             {
                 foreach (PropertyInfo p1 in PropertyInfos1) 
                 {
-                    if (p2.Name == "createManNo" || p2.Name == "createManName")
+                    if (p2.Name == "createManNo" || p2.Name == "createManName" || p2.Name == "createTime")
                     {
                         continue;
                     }

MeterModuleLibrary/uc/ucCarMeterInfoJisco.Designer.cs

@@ -32,36 +32,28 @@
             this.panelRECEIVING_UINT_NAME = new System.Windows.Forms.Panel();
             this.txtRECEIVING_UINT_NAME = new System.Windows.Forms.Label();
             this.panelSHIPMENT_NET_WEIGHT = new System.Windows.Forms.Panel();
-            this.txtSHIPMENT_WEIGHT = new System.Windows.Forms.Label();
             this.panelCONTRACT_NO = new System.Windows.Forms.Panel();
             this.txtCONTRACT_NO = new System.Windows.Forms.Label();
             this.panelFORWARDING_UNIT_NAME = new System.Windows.Forms.Panel();
             this.txtFORWARDING_UNIT_NAME = new System.Windows.Forms.Label();
-            this.panelMATTER_NAME = new System.Windows.Forms.Panel();
-            this.txtMATTER_NAME = new System.Windows.Forms.Label();
             this.panelMETER_TYPE = new System.Windows.Forms.Panel();
             this.txtMETER_TYPE = new System.Windows.Forms.Label();
             this.label1 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
-            this.label3 = new System.Windows.Forms.Label();
             this.label4 = new System.Windows.Forms.Label();
-            this.label5 = new System.Windows.Forms.Label();
-            this.label6 = new System.Windows.Forms.Label();
-            this.label8 = new System.Windows.Forms.Label();
             this.panelPREDICTION_NO = new System.Windows.Forms.Panel();
             this.txtPREDICTION_NO = new System.Windows.Forms.Label();
-            this.panelMETER_PIER_NAME = new System.Windows.Forms.Panel();
-            this.txtMETER_PIER_NAME = new System.Windows.Forms.Label();
-            this.label7 = new System.Windows.Forms.Label();
+            this.label8 = new System.Windows.Forms.Label();
+            this.label5 = new System.Windows.Forms.Label();
+            this.label3 = new System.Windows.Forms.Label();
+            this.txtMATTER_NAME = new System.Windows.Forms.Label();
             this.tableLayoutPanelMsg.SuspendLayout();
             this.panelRECEIVING_UINT_NAME.SuspendLayout();
             this.panelSHIPMENT_NET_WEIGHT.SuspendLayout();
             this.panelCONTRACT_NO.SuspendLayout();
             this.panelFORWARDING_UNIT_NAME.SuspendLayout();
-            this.panelMATTER_NAME.SuspendLayout();
             this.panelMETER_TYPE.SuspendLayout();
             this.panelPREDICTION_NO.SuspendLayout();
-            this.panelMETER_PIER_NAME.SuspendLayout();
             this.SuspendLayout();
             // 
             // tableLayoutPanelMsg
@@ -71,31 +63,25 @@
             this.tableLayoutPanelMsg.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
             this.tableLayoutPanelMsg.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 180F));
             this.tableLayoutPanelMsg.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tableLayoutPanelMsg.Controls.Add(this.panelRECEIVING_UINT_NAME, 3, 3);
+            this.tableLayoutPanelMsg.Controls.Add(this.panelRECEIVING_UINT_NAME, 3, 2);
+            this.tableLayoutPanelMsg.Controls.Add(this.label3, 2, 1);
             this.tableLayoutPanelMsg.Controls.Add(this.panelSHIPMENT_NET_WEIGHT, 3, 1);
             this.tableLayoutPanelMsg.Controls.Add(this.panelCONTRACT_NO, 3, 0);
-            this.tableLayoutPanelMsg.Controls.Add(this.panelFORWARDING_UNIT_NAME, 1, 3);
-            this.tableLayoutPanelMsg.Controls.Add(this.panelMATTER_NAME, 1, 2);
+            this.tableLayoutPanelMsg.Controls.Add(this.panelFORWARDING_UNIT_NAME, 1, 2);
             this.tableLayoutPanelMsg.Controls.Add(this.panelMETER_TYPE, 1, 1);
             this.tableLayoutPanelMsg.Controls.Add(this.label1, 0, 0);
             this.tableLayoutPanelMsg.Controls.Add(this.label2, 0, 1);
-            this.tableLayoutPanelMsg.Controls.Add(this.label3, 0, 2);
-            this.tableLayoutPanelMsg.Controls.Add(this.label4, 0, 3);
+            this.tableLayoutPanelMsg.Controls.Add(this.label4, 0, 2);
             this.tableLayoutPanelMsg.Controls.Add(this.label5, 2, 0);
-            this.tableLayoutPanelMsg.Controls.Add(this.label6, 2, 1);
-            this.tableLayoutPanelMsg.Controls.Add(this.label8, 2, 3);
+            this.tableLayoutPanelMsg.Controls.Add(this.label8, 2, 2);
             this.tableLayoutPanelMsg.Controls.Add(this.panelPREDICTION_NO, 1, 0);
-            this.tableLayoutPanelMsg.Controls.Add(this.panelMETER_PIER_NAME, 3, 2);
-            this.tableLayoutPanelMsg.Controls.Add(this.label7, 2, 2);
             this.tableLayoutPanelMsg.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tableLayoutPanelMsg.Location = new System.Drawing.Point(0, 0);
             this.tableLayoutPanelMsg.Name = "tableLayoutPanelMsg";
-            this.tableLayoutPanelMsg.RowCount = 4;
-            this.tableLayoutPanelMsg.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
-            this.tableLayoutPanelMsg.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
-            this.tableLayoutPanelMsg.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
-            this.tableLayoutPanelMsg.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
-            this.tableLayoutPanelMsg.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+            this.tableLayoutPanelMsg.RowCount = 3;
+            this.tableLayoutPanelMsg.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
+            this.tableLayoutPanelMsg.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
+            this.tableLayoutPanelMsg.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
             this.tableLayoutPanelMsg.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
             this.tableLayoutPanelMsg.Size = new System.Drawing.Size(1199, 373);
             this.tableLayoutPanelMsg.TabIndex = 0;
@@ -105,10 +91,10 @@
             this.panelRECEIVING_UINT_NAME.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(236)))), ((int)(((byte)(244)))), ((int)(((byte)(252)))));
             this.panelRECEIVING_UINT_NAME.Controls.Add(this.txtRECEIVING_UINT_NAME);
             this.panelRECEIVING_UINT_NAME.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panelRECEIVING_UINT_NAME.Location = new System.Drawing.Point(779, 279);
+            this.panelRECEIVING_UINT_NAME.Location = new System.Drawing.Point(779, 248);
             this.panelRECEIVING_UINT_NAME.Margin = new System.Windows.Forms.Padding(0);
             this.panelRECEIVING_UINT_NAME.Name = "panelRECEIVING_UINT_NAME";
-            this.panelRECEIVING_UINT_NAME.Size = new System.Drawing.Size(420, 94);
+            this.panelRECEIVING_UINT_NAME.Size = new System.Drawing.Size(420, 125);
             this.panelRECEIVING_UINT_NAME.TabIndex = 21;
             // 
             // txtRECEIVING_UINT_NAME
@@ -116,7 +102,7 @@
             this.txtRECEIVING_UINT_NAME.Anchor = System.Windows.Forms.AnchorStyles.Left;
             this.txtRECEIVING_UINT_NAME.AutoSize = true;
             this.txtRECEIVING_UINT_NAME.Font = new System.Drawing.Font("Microsoft Sans Serif", 22F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.txtRECEIVING_UINT_NAME.Location = new System.Drawing.Point(3, 33);
+            this.txtRECEIVING_UINT_NAME.Location = new System.Drawing.Point(3, 48);
             this.txtRECEIVING_UINT_NAME.Name = "txtRECEIVING_UINT_NAME";
             this.txtRECEIVING_UINT_NAME.Size = new System.Drawing.Size(195, 36);
             this.txtRECEIVING_UINT_NAME.TabIndex = 15;
@@ -125,25 +111,14 @@
             // panelSHIPMENT_NET_WEIGHT
             // 
             this.panelSHIPMENT_NET_WEIGHT.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(236)))), ((int)(((byte)(244)))), ((int)(((byte)(252)))));
-            this.panelSHIPMENT_NET_WEIGHT.Controls.Add(this.txtSHIPMENT_WEIGHT);
+            this.panelSHIPMENT_NET_WEIGHT.Controls.Add(this.txtMATTER_NAME);
             this.panelSHIPMENT_NET_WEIGHT.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panelSHIPMENT_NET_WEIGHT.Location = new System.Drawing.Point(779, 93);
+            this.panelSHIPMENT_NET_WEIGHT.Location = new System.Drawing.Point(779, 124);
             this.panelSHIPMENT_NET_WEIGHT.Margin = new System.Windows.Forms.Padding(0);
             this.panelSHIPMENT_NET_WEIGHT.Name = "panelSHIPMENT_NET_WEIGHT";
-            this.panelSHIPMENT_NET_WEIGHT.Size = new System.Drawing.Size(420, 93);
+            this.panelSHIPMENT_NET_WEIGHT.Size = new System.Drawing.Size(420, 124);
             this.panelSHIPMENT_NET_WEIGHT.TabIndex = 22;
             // 
-            // txtSHIPMENT_WEIGHT
-            // 
-            this.txtSHIPMENT_WEIGHT.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.txtSHIPMENT_WEIGHT.AutoSize = true;
-            this.txtSHIPMENT_WEIGHT.Font = new System.Drawing.Font("Microsoft Sans Serif", 22F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.txtSHIPMENT_WEIGHT.Location = new System.Drawing.Point(3, 32);
-            this.txtSHIPMENT_WEIGHT.Name = "txtSHIPMENT_WEIGHT";
-            this.txtSHIPMENT_WEIGHT.Size = new System.Drawing.Size(195, 36);
-            this.txtSHIPMENT_WEIGHT.TabIndex = 13;
-            this.txtSHIPMENT_WEIGHT.Text = "                    ";
-            // 
             // panelCONTRACT_NO
             // 
             this.panelCONTRACT_NO.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(236)))), ((int)(((byte)(244)))), ((int)(((byte)(252)))));
@@ -152,7 +127,7 @@
             this.panelCONTRACT_NO.Location = new System.Drawing.Point(779, 0);
             this.panelCONTRACT_NO.Margin = new System.Windows.Forms.Padding(0);
             this.panelCONTRACT_NO.Name = "panelCONTRACT_NO";
-            this.panelCONTRACT_NO.Size = new System.Drawing.Size(420, 93);
+            this.panelCONTRACT_NO.Size = new System.Drawing.Size(420, 124);
             this.panelCONTRACT_NO.TabIndex = 20;
             // 
             // txtCONTRACT_NO
@@ -160,7 +135,7 @@
             this.txtCONTRACT_NO.Anchor = System.Windows.Forms.AnchorStyles.Left;
             this.txtCONTRACT_NO.AutoSize = true;
             this.txtCONTRACT_NO.Font = new System.Drawing.Font("Microsoft Sans Serif", 22F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.txtCONTRACT_NO.Location = new System.Drawing.Point(3, 32);
+            this.txtCONTRACT_NO.Location = new System.Drawing.Point(3, 48);
             this.txtCONTRACT_NO.Name = "txtCONTRACT_NO";
             this.txtCONTRACT_NO.Size = new System.Drawing.Size(195, 36);
             this.txtCONTRACT_NO.TabIndex = 12;
@@ -171,10 +146,10 @@
             this.panelFORWARDING_UNIT_NAME.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(236)))), ((int)(((byte)(244)))), ((int)(((byte)(252)))));
             this.panelFORWARDING_UNIT_NAME.Controls.Add(this.txtFORWARDING_UNIT_NAME);
             this.panelFORWARDING_UNIT_NAME.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panelFORWARDING_UNIT_NAME.Location = new System.Drawing.Point(180, 279);
+            this.panelFORWARDING_UNIT_NAME.Location = new System.Drawing.Point(180, 248);
             this.panelFORWARDING_UNIT_NAME.Margin = new System.Windows.Forms.Padding(0);
             this.panelFORWARDING_UNIT_NAME.Name = "panelFORWARDING_UNIT_NAME";
-            this.panelFORWARDING_UNIT_NAME.Size = new System.Drawing.Size(419, 94);
+            this.panelFORWARDING_UNIT_NAME.Size = new System.Drawing.Size(419, 125);
             this.panelFORWARDING_UNIT_NAME.TabIndex = 19;
             // 
             // txtFORWARDING_UNIT_NAME
@@ -183,42 +158,21 @@
             this.txtFORWARDING_UNIT_NAME.AutoSize = true;
             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.Location = new System.Drawing.Point(3, 33);
+            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);
             this.txtFORWARDING_UNIT_NAME.TabIndex = 11;
             this.txtFORWARDING_UNIT_NAME.Text = "                    ";
             // 
-            // panelMATTER_NAME
-            // 
-            this.panelMATTER_NAME.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(236)))), ((int)(((byte)(244)))), ((int)(((byte)(252)))));
-            this.panelMATTER_NAME.Controls.Add(this.txtMATTER_NAME);
-            this.panelMATTER_NAME.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panelMATTER_NAME.Location = new System.Drawing.Point(180, 186);
-            this.panelMATTER_NAME.Margin = new System.Windows.Forms.Padding(0);
-            this.panelMATTER_NAME.Name = "panelMATTER_NAME";
-            this.panelMATTER_NAME.Size = new System.Drawing.Size(419, 93);
-            this.panelMATTER_NAME.TabIndex = 18;
-            // 
-            // txtMATTER_NAME
-            // 
-            this.txtMATTER_NAME.AutoSize = true;
-            this.txtMATTER_NAME.Font = new System.Drawing.Font("Microsoft Sans Serif", 22F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.txtMATTER_NAME.Location = new System.Drawing.Point(3, 23);
-            this.txtMATTER_NAME.Name = "txtMATTER_NAME";
-            this.txtMATTER_NAME.Size = new System.Drawing.Size(195, 36);
-            this.txtMATTER_NAME.TabIndex = 10;
-            this.txtMATTER_NAME.Text = "                    ";
-            // 
             // panelMETER_TYPE
             // 
             this.panelMETER_TYPE.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(236)))), ((int)(((byte)(244)))), ((int)(((byte)(252)))));
             this.panelMETER_TYPE.Controls.Add(this.txtMETER_TYPE);
             this.panelMETER_TYPE.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panelMETER_TYPE.Location = new System.Drawing.Point(180, 93);
+            this.panelMETER_TYPE.Location = new System.Drawing.Point(180, 124);
             this.panelMETER_TYPE.Margin = new System.Windows.Forms.Padding(0);
             this.panelMETER_TYPE.Name = "panelMETER_TYPE";
-            this.panelMETER_TYPE.Size = new System.Drawing.Size(419, 93);
+            this.panelMETER_TYPE.Size = new System.Drawing.Size(419, 124);
             this.panelMETER_TYPE.TabIndex = 17;
             // 
             // txtMETER_TYPE
@@ -227,7 +181,7 @@
             this.txtMETER_TYPE.AutoSize = true;
             this.txtMETER_TYPE.BackColor = System.Drawing.Color.Transparent;
             this.txtMETER_TYPE.Font = new System.Drawing.Font("Microsoft Sans Serif", 22F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.txtMETER_TYPE.Location = new System.Drawing.Point(3, 32);
+            this.txtMETER_TYPE.Location = new System.Drawing.Point(3, 48);
             this.txtMETER_TYPE.Name = "txtMETER_TYPE";
             this.txtMETER_TYPE.Size = new System.Drawing.Size(195, 36);
             this.txtMETER_TYPE.TabIndex = 9;
@@ -238,78 +192,34 @@
             this.label1.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 22F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label1.Location = new System.Drawing.Point(20, 28);
+            this.label1.Location = new System.Drawing.Point(20, 44);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(139, 36);
             this.label1.TabIndex = 0;
-            this.label1.Text = "预报编号";
+            this.label1.Text = "委托编号";
             // 
             // label2
             // 
             this.label2.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 22F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label2.Location = new System.Drawing.Point(20, 121);
+            this.label2.Location = new System.Drawing.Point(20, 168);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(139, 36);
             this.label2.TabIndex = 1;
             this.label2.Text = "检斤类型";
             // 
-            // label3
-            // 
-            this.label3.Anchor = System.Windows.Forms.AnchorStyles.None;
-            this.label3.AutoSize = true;
-            this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 22F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label3.Location = new System.Drawing.Point(20, 214);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(139, 36);
-            this.label3.TabIndex = 2;
-            this.label3.Text = "物资名称";
-            // 
             // label4
             // 
             this.label4.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 22F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label4.Location = new System.Drawing.Point(20, 308);
+            this.label4.Location = new System.Drawing.Point(20, 292);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(139, 36);
             this.label4.TabIndex = 3;
             this.label4.Text = "发货单位";
             // 
-            // label5
-            // 
-            this.label5.Anchor = System.Windows.Forms.AnchorStyles.None;
-            this.label5.AutoSize = true;
-            this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 22F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label5.Location = new System.Drawing.Point(619, 28);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(139, 36);
-            this.label5.TabIndex = 4;
-            this.label5.Text = "预报类型";
-            // 
-            // label6
-            // 
-            this.label6.Anchor = System.Windows.Forms.AnchorStyles.None;
-            this.label6.AutoSize = true;
-            this.label6.Font = new System.Drawing.Font("Microsoft Sans Serif", 22F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label6.Location = new System.Drawing.Point(619, 121);
-            this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(139, 36);
-            this.label6.TabIndex = 5;
-            this.label6.Text = "预报重量";
-            // 
-            // label8
-            // 
-            this.label8.Anchor = System.Windows.Forms.AnchorStyles.None;
-            this.label8.AutoSize = true;
-            this.label8.Font = new System.Drawing.Font("Microsoft Sans Serif", 22F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label8.Location = new System.Drawing.Point(619, 308);
-            this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(139, 36);
-            this.label8.TabIndex = 7;
-            this.label8.Text = "收货单位";
-            // 
             // panelPREDICTION_NO
             // 
             this.panelPREDICTION_NO.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(236)))), ((int)(((byte)(244)))), ((int)(((byte)(252)))));
@@ -318,7 +228,7 @@
             this.panelPREDICTION_NO.Location = new System.Drawing.Point(180, 0);
             this.panelPREDICTION_NO.Margin = new System.Windows.Forms.Padding(0);
             this.panelPREDICTION_NO.Name = "panelPREDICTION_NO";
-            this.panelPREDICTION_NO.Size = new System.Drawing.Size(419, 93);
+            this.panelPREDICTION_NO.Size = new System.Drawing.Size(419, 124);
             this.panelPREDICTION_NO.TabIndex = 16;
             // 
             // txtPREDICTION_NO
@@ -326,47 +236,54 @@
             this.txtPREDICTION_NO.Anchor = System.Windows.Forms.AnchorStyles.Left;
             this.txtPREDICTION_NO.AutoSize = true;
             this.txtPREDICTION_NO.Font = new System.Drawing.Font("Microsoft Sans Serif", 22F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.txtPREDICTION_NO.Location = new System.Drawing.Point(3, 32);
+            this.txtPREDICTION_NO.Location = new System.Drawing.Point(3, 48);
             this.txtPREDICTION_NO.Name = "txtPREDICTION_NO";
             this.txtPREDICTION_NO.Size = new System.Drawing.Size(195, 36);
             this.txtPREDICTION_NO.TabIndex = 8;
             this.txtPREDICTION_NO.Text = "                    ";
             // 
-            // panelMETER_PIER_NAME
-            // 
-            this.panelMETER_PIER_NAME.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(236)))), ((int)(((byte)(244)))), ((int)(((byte)(252)))));
-            this.panelMETER_PIER_NAME.Controls.Add(this.txtMETER_PIER_NAME);
-            this.panelMETER_PIER_NAME.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panelMETER_PIER_NAME.Location = new System.Drawing.Point(779, 186);
-            this.panelMETER_PIER_NAME.Margin = new System.Windows.Forms.Padding(0);
-            this.panelMETER_PIER_NAME.Name = "panelMETER_PIER_NAME";
-            this.panelMETER_PIER_NAME.Size = new System.Drawing.Size(420, 93);
-            this.panelMETER_PIER_NAME.TabIndex = 26;
-            this.panelMETER_PIER_NAME.Visible = false;
-            // 
-            // txtMETER_PIER_NAME
-            // 
-            this.txtMETER_PIER_NAME.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.txtMETER_PIER_NAME.AutoSize = true;
-            this.txtMETER_PIER_NAME.Font = new System.Drawing.Font("Microsoft Sans Serif", 22F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.txtMETER_PIER_NAME.Location = new System.Drawing.Point(3, 32);
-            this.txtMETER_PIER_NAME.Name = "txtMETER_PIER_NAME";
-            this.txtMETER_PIER_NAME.Size = new System.Drawing.Size(195, 36);
-            this.txtMETER_PIER_NAME.TabIndex = 15;
-            this.txtMETER_PIER_NAME.Text = "                    ";
-            this.txtMETER_PIER_NAME.Visible = false;
-            // 
-            // label7
-            // 
-            this.label7.Anchor = System.Windows.Forms.AnchorStyles.None;
-            this.label7.AutoSize = true;
-            this.label7.Font = new System.Drawing.Font("Microsoft Sans Serif", 22F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label7.Location = new System.Drawing.Point(619, 214);
-            this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(139, 36);
-            this.label7.TabIndex = 27;
-            this.label7.Text = "码头名称";
-            this.label7.Visible = false;
+            // label8
+            // 
+            this.label8.Anchor = System.Windows.Forms.AnchorStyles.None;
+            this.label8.AutoSize = true;
+            this.label8.Font = new System.Drawing.Font("Microsoft Sans Serif", 22F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.label8.Location = new System.Drawing.Point(619, 292);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(139, 36);
+            this.label8.TabIndex = 7;
+            this.label8.Text = "收货单位";
+            // 
+            // label5
+            // 
+            this.label5.Anchor = System.Windows.Forms.AnchorStyles.None;
+            this.label5.AutoSize = true;
+            this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 22F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.label5.Location = new System.Drawing.Point(619, 44);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(139, 36);
+            this.label5.TabIndex = 4;
+            this.label5.Text = "委托类型";
+            // 
+            // label3
+            // 
+            this.label3.Anchor = System.Windows.Forms.AnchorStyles.None;
+            this.label3.AutoSize = true;
+            this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 22F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.label3.Location = new System.Drawing.Point(619, 168);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(139, 36);
+            this.label3.TabIndex = 2;
+            this.label3.Text = "物资名称";
+            // 
+            // txtMATTER_NAME
+            // 
+            this.txtMATTER_NAME.AutoSize = true;
+            this.txtMATTER_NAME.Font = new System.Drawing.Font("Microsoft Sans Serif", 22F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.txtMATTER_NAME.Location = new System.Drawing.Point(3, 28);
+            this.txtMATTER_NAME.Name = "txtMATTER_NAME";
+            this.txtMATTER_NAME.Size = new System.Drawing.Size(195, 36);
+            this.txtMATTER_NAME.TabIndex = 10;
+            this.txtMATTER_NAME.Text = "                    ";
             // 
             // ucCarMeterInfoJisco
             // 
@@ -387,14 +304,10 @@
             this.panelCONTRACT_NO.PerformLayout();
             this.panelFORWARDING_UNIT_NAME.ResumeLayout(false);
             this.panelFORWARDING_UNIT_NAME.PerformLayout();
-            this.panelMATTER_NAME.ResumeLayout(false);
-            this.panelMATTER_NAME.PerformLayout();
             this.panelMETER_TYPE.ResumeLayout(false);
             this.panelMETER_TYPE.PerformLayout();
             this.panelPREDICTION_NO.ResumeLayout(false);
             this.panelPREDICTION_NO.PerformLayout();
-            this.panelMETER_PIER_NAME.ResumeLayout(false);
-            this.panelMETER_PIER_NAME.PerformLayout();
             this.ResumeLayout(false);
 
         }
@@ -404,27 +317,21 @@
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanelMsg;
         private System.Windows.Forms.Label label1;
         private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.Label label3;
         private System.Windows.Forms.Label label4;
-        private System.Windows.Forms.Label label5;
-        private System.Windows.Forms.Label label6;
-        private System.Windows.Forms.Label label8;
         private System.Windows.Forms.Label txtPREDICTION_NO;
         private System.Windows.Forms.Label txtMETER_TYPE;
         private System.Windows.Forms.Label txtRECEIVING_UINT_NAME;
-        private System.Windows.Forms.Label txtSHIPMENT_WEIGHT;
         private System.Windows.Forms.Label txtCONTRACT_NO;
-        private System.Windows.Forms.Label txtMATTER_NAME;
         private System.Windows.Forms.Label txtFORWARDING_UNIT_NAME;
         private System.Windows.Forms.Panel panelPREDICTION_NO;
         private System.Windows.Forms.Panel panelMETER_TYPE;
-        private System.Windows.Forms.Panel panelMATTER_NAME;
         private System.Windows.Forms.Panel panelFORWARDING_UNIT_NAME;
         private System.Windows.Forms.Panel panelCONTRACT_NO;
         private System.Windows.Forms.Panel panelRECEIVING_UINT_NAME;
         private System.Windows.Forms.Panel panelSHIPMENT_NET_WEIGHT;
-        private System.Windows.Forms.Panel panelMETER_PIER_NAME;
-        private System.Windows.Forms.Label txtMETER_PIER_NAME;
-        private System.Windows.Forms.Label label7;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.Label label8;
+        private System.Windows.Forms.Label txtMATTER_NAME;
     }
 }

MeterModuleLibrary/uc/ucCarMeterInfoJisco.cs

@@ -38,7 +38,7 @@ namespace MeterModuleLibrary
             txtFORWARDING_UNIT_NAME.Text = first.forwardingUnitName;
             txtRECEIVING_UINT_NAME.Text = first.receivingUintName;
             txtCONTRACT_NO.Text = first.contractNo;
-            txtSHIPMENT_WEIGHT.Text = "毛/净：" + first.shipmentGrossWeight / 1000 + " T / " + first.shipmentNetWeight / 1000 + " T"; //预报毛重
+            //txtSHIPMENT_WEIGHT.Text = "毛/净：" + first.shipmentGrossWeight / 1000 + " T / " + first.shipmentNetWeight / 1000 + " T"; //预报毛重
             //txtLOAD_POINT_NAME.Text = first.loadPointName;
             string strMemo = first.memo;
             if (!string.IsNullOrEmpty(strMemo) && strMemo.Contains("发运："))
@@ -46,7 +46,7 @@ namespace MeterModuleLibrary
                 strMemo = Regex.Split(strMemo, "发运：", RegexOptions.IgnoreCase)[1];
             }
            // txtMEMO.Text = strMemo;
-            txtMETER_PIER_NAME.Text = first.meterPierName;
+            //txtMETER_PIER_NAME.Text = first.meterPierName;
             if (txtMETER_TYPE.Text.Contains("外购"))
             {
                 setWgtBackColor(false);
@@ -64,7 +64,7 @@ namespace MeterModuleLibrary
             txtFORWARDING_UNIT_NAME.Text = preTrack.forwardingUnitName;
             txtRECEIVING_UINT_NAME.Text = preTrack.receivingUintName;
             txtCONTRACT_NO.Text = preTrack.contractNo;
-            txtSHIPMENT_WEIGHT.Text = "毛/净：" + preTrack.shipmentGrossWeight / 1000 + " T / " + preTrack.shipmentNetWeight / 1000 + " T"; //预报毛重
+            //txtSHIPMENT_WEIGHT.Text = "毛/净：" + preTrack.shipmentGrossWeight / 1000 + " T / " + preTrack.shipmentNetWeight / 1000 + " T"; //预报毛重
             //txtLOAD_POINT_NAME.Text = preTrack.loadPointName;
             //string strMemo = preTrack.memo;
             //if (!string.IsNullOrEmpty(strMemo) &&  strMemo.Contains("发运："))
@@ -72,7 +72,7 @@ namespace MeterModuleLibrary
             //    strMemo = Regex.Split(strMemo, "发运：", RegexOptions.IgnoreCase)[1];
             //}
             //txtMEMO.Text = strMemo;
-            txtMETER_PIER_NAME.Text = preTrack.meterPierName;
+            //txtMETER_PIER_NAME.Text = preTrack.meterPierName;
             if (PbCache.limit != null && PbCache.limit.Count > 0)
             {
                 List<MeterBaseLimitChemical> mblc = PbCache.limit.Where(s => s.matterNo == preTrack.matterNo).ToList();
@@ -110,7 +110,6 @@ namespace MeterModuleLibrary
             {
                 if (txtFORWARDING_UNIT_NAME.IsHandleCreated)
                 {
-    
                     string sValue = bControlText ? "ControlText" : "NotShow";
                     txtFORWARDING_UNIT_NAME.Invoke(new UpdateUIEventHander(UpdateUIBackColor_Method), txtFORWARDING_UNIT_NAME, new UpdateUIArgs(sValue));
                 }

MeterSceneLibrary/JISCO/InnerCarJISCO.cs

@@ -34,6 +34,9 @@ namespace MeterSceneLibrary
         // 结净最小值，默认取配置文件
         private double diffrentWgt = AppConfigCache.differenceWgt;
 
+        // 根据称点查询监控信息
+        private RESTfulResult<List<MeterWorkMonitor>> listMonitor;
+
         // 根据车号查询委托表中未使用和使用中的委托
         private List<PreTrackScale> listPreScale;
 
@@ -47,6 +50,9 @@ namespace MeterSceneLibrary
             string ResultMessage = "";
             bool isError = false;
 
+            //根据称点查询监控信息
+            MeterWorkMonitorService meterWorkMonitorService = new MeterWorkMonitorService();
+            listMonitor = meterWorkMonitorService.doQueryOneWf(new MeterWorkMonitor { pointNo = PbCache.sportInfo.baseSpotNo });
 
             mwaf.carNo = PbCache.lockCarNo;
             mwaf.weightType = "";  // 默认重量类型为空
@@ -148,11 +154,15 @@ namespace MeterSceneLibrary
                                     else if (list[0].weightTypeNo == "001033002" && PbCache.monitorResult.valid_wgt == false)
                                     {
                                         rt = saveMethod.doError(PbCache.ResultMessage);
+                                        rt.isWarn = true;
+                                        rt.WarnContent = "validWgt";
                                     }
                                     // 重量类型为毛重，在皮重误差内
                                     else if (list[0].weightTypeNo == "001033001" && PbCache.monitorResult.valid_wgt == true)
                                     {
                                         rt = saveMethod.doError("当次重量类型为毛重，在皮重误差内");
+                                        rt.isWarn = true;
+                                        rt.WarnContent = "validWgt";
                                     }
                                     // 重量类型为毛重，不在皮重误差内
                                     else if (list[0].weightTypeNo == "001033001" && PbCache.monitorResult.valid_wgt == false)
@@ -226,7 +236,7 @@ namespace MeterSceneLibrary
                                     }
 
                                     // 当次重量和上次重量满足洁净最小值条件
-                                    if (Math.Abs(rmFirst.Data[0].meterWeight.Value - PbCache.lockWgt) > diffrentWgt)
+                                    if (Math.Abs(rmFirst.Data[0].meterWeight.Value - PbCache.lockWgt) > diffrentWgt || listMonitor.Data[0].validPredictionDiff == "0")
                                     {
                                         // 查询当前秤点是否启用历史皮重判断（暂时不考虑此限制）By BourneCao
                                         // String spotNo = PbCache.sportInfo.baseSpotNo;
@@ -278,6 +288,8 @@ namespace MeterSceneLibrary
                                     else
                                     {
                                         rt = saveMethod.doError("第一次计量重量【" + rmFirst.Data[0].meterWeight.Value / 1000 + "T】和第二次计量重量【" + PbCache.lockWgt / 1000 + "T】接近，小于结净最小值【" + diffrentWgt / 1000 + " T】");
+                                        rt.isWarn = true;
+                                        rt.WarnContent = "validWgt";
                                     }
                                 }
                                 // 存在多条有效的一次计量数据
@@ -306,9 +318,88 @@ namespace MeterSceneLibrary
                     }
                     else
                     {
-                        rt = saveMethod.doError("没有已选择的委托，请联系计量大厅");
+                        if (rmScale.Succeed && rmScale.Data.Count == 0)
+                        {
+                            // 查询一次计量数据表
+                            RESTfulResult<List<MeterWorkCarActualFirst>> rmFirst = mwcfs.doQueryByFlag(new MeterWorkCarActualFirst { carNo = PbCache.lockCarNo });
+
+                            if (rmFirst.Succeed)
+                            {
+                                List<MeterWorkCarActualFirst> firstList = rmFirst.Data;
+
+                                // 重量类型为皮重
+                                if (list[0].weightTypeNo == "001033002")
+                                {
+                                    // 历史皮重验证
+                                    rt = saveMethod.validHisTare();
+                                    if (firstList == null || firstList.Count == 0)
+                                    {
+                                        //在皮重误差内
+                                        if (PbCache.monitorResult.valid_wgt == true || listMonitor.Data[0].validPredictionDiff == "0")
+                                        {
+                                            //正常保存一次数据
+                                            mwaf.weightType = "1";
+                                            rt = saveMethod.doAddFirst(null, mwaf);
+                                        }
+                                        else
+                                        {
+                                            rt = saveMethod.doError(PbCache.ResultMessage);
+                                            rt.isWarn = true;
+                                            rt.WarnContent = "validWgt";
+                                        }
+                                    }
+                                    else if (firstList.Count == 1 && firstList[0].weightType != "0")
+                                    {
+                                        // 在皮重误差内
+                                        if (PbCache.monitorResult.valid_wgt == true || listMonitor.Data[0].validPredictionDiff == "0")
+                                        {
+                                           //保存一条作废的皮重数据
+                                            mwaf.weightType = "1";
+                                            mwaf.valueFlag = "0";
+                                            rt = saveMethod.doAddFirst(null, mwaf);
+                                        }
+                                        else
+                                        {
+                                            rt = saveMethod.doError(PbCache.ResultMessage);
+                                            rt.isWarn = true;
+                                            rt.WarnContent = "validWgt";
+                                        }
+                                    }
+                                    else if (firstList.Count == 1 && firstList[0].weightType == "0")
+                                    {
+                                        if (PbCache.monitorResult.valid_wgt == true || listMonitor.Data[0].validPredictionDiff == "0")
+                                        {
+                                            //匹配结净
+                                            rt = saveMethod.doNet(null, firstList[0], mwaf);
+                                        }
+                                        else
+                                        {
+                                            rt = saveMethod.doError(PbCache.ResultMessage);
+                                            rt.isWarn = true;
+                                            rt.WarnContent = "validWgt";
+                                        }
+                                    }
+                                }
+                                else
+                                {
+                                    rt = saveMethod.doError("毛重未匹配委托，请联系计量大厅处理");
+                                    rt.isWarn = true;
+                                    rt.WarnContent = "validIsPre";
+                                }
+                            }
+                        }
+                        else
+                        {
+                            rt = saveMethod.doError("存在多条已选择的委托，请联系计量大厅");
+                            rt.isWarn = true;
+                            rt.WarnContent = "validIsPre";
+                        }
                     }
                 }
+                else
+                {
+                    rt = saveMethod.doError("存在多条上称申请数据，请联系计量大厅");
+                }
             }
 
 

MeterSceneLibrary/JISCO/OuterCarJISCO.cs

@@ -29,6 +29,9 @@ namespace MeterSceneLibrary
         // 根据车号查询委托表中未使用和使用中的委托
         private List<PreTrackScale> listPreScale;
 
+        // 根据称点查询监控信息
+        private RESTfulResult<List<MeterWorkMonitor>> listMonitor;
+
         private JISCO.SaveMethod saveMethod = new JISCO.SaveMethod();
 
         public rtInfo MeterMethod(PreTrackScale scale)
@@ -39,6 +42,9 @@ namespace MeterSceneLibrary
             string ResultMessage = "";
             bool isError = false;
 
+            //根据称点查询监控信息
+            MeterWorkMonitorService meterWorkMonitorService = new MeterWorkMonitorService();
+            listMonitor = meterWorkMonitorService.doQueryOneWf(new MeterWorkMonitor { pointNo = PbCache.sportInfo.baseSpotNo });
 
             mwaf.carNo = PbCache.lockCarNo;
             mwaf.weightType = "";  // 默认重量类型为空
@@ -374,7 +380,7 @@ namespace MeterSceneLibrary
                     }
 
                     // 校验上次计量数据和当次计量数据是否满足基础配置表中的洁净最小值条件
-                    if (Math.Abs(rmX.Data[0].meterWeight.Value - PbCache.lockWgt) > diffrentWgt)
+                    if (Math.Abs(rmX.Data[0].meterWeight.Value - PbCache.lockWgt) > diffrentWgt || listMonitor.Data[0].validPredictionDiff == "0")
                     {
                         if (rmPre.Succeed)
                         {
@@ -553,7 +559,6 @@ namespace MeterSceneLibrary
                                 rt.resultInfo = "称重完成";
                             }
                         }
-                        
                     }
                     // 不满足
                     else

MeterSceneLibrary/JISCO/private/SaveMethod.cs

@@ -89,6 +89,7 @@ namespace MeterSceneLibrary.JISCO
             {
                 EntityBase<PreTrackScale> entityBase = new EntityBase<PreTrackScale>();
                 netDb = entityBase.format<MeterWorkCarActual>(scale, netDb);
+                netDb.isPreScale = "1";
             }
 
             netDb.carNo = actualFirst.carNo;
@@ -118,7 +119,6 @@ namespace MeterSceneLibrary.JISCO
             netDb.grossClass = actualFirst.meterClass;
             netDb.grossGroup = actualFirst.meterGroup;
             netDb.valueFlag = "1";
-            netDb.isPreScale = "1";
 
             netDb.netTime = DateTime.Now;
 
@@ -156,7 +156,15 @@ namespace MeterSceneLibrary.JISCO
                 rt.resultInfo = "称重完成";
                 PbCache.actualFirstNo = rmI.Data;
                 PbCache.strQRCode = rmI.Message;
-                PbCache.isTareWeight = false;//毛重
+                if (actualFirst2.meterWeight.Value > actualFirst.meterWeight.Value)
+                {
+                    PbCache.isTareWeight = true;//毛重
+                }
+                else
+                {
+                    PbCache.isTareWeight = false;//皮重
+                }
+                
             }
             else
             {
@@ -185,6 +193,7 @@ namespace MeterSceneLibrary.JISCO
             {
                 EntityBase<PreTrackScale> entityBase3 = new EntityBase<PreTrackScale>();
                 netDb = entityBase3.format<MeterWorkCarActual>(scale, netDb);
+                netDb.isPreScale = "1";
             }
 
             
@@ -211,8 +220,7 @@ namespace MeterSceneLibrary.JISCO
             netDb.grossManName = actualFirst.createManName;
             netDb.grossClass = actualFirst.meterClass;
             netDb.grossGroup = actualFirst.meterGroup;
-            netDb.valueFlag = "2";
-            netDb.isPreScale = "1";
+            netDb.valueFlag = "1";
 
             netDb.netTime = DateTime.Now;
 
@@ -251,7 +259,14 @@ namespace MeterSceneLibrary.JISCO
                 rt.resultInfo = "称重完成";
                 PbCache.actualFirstNo = rmI.Data;
                 PbCache.strQRCode = rmI.Message;
-                PbCache.isTareWeight = false;//毛重
+                if (actualFirst2.meterWeight.Value > actualFirst.meterWeight.Value)
+                {
+                    PbCache.isTareWeight = true;//毛重
+                }
+                else
+                {
+                    PbCache.isTareWeight = false;//皮重
+                }
             }
             else
             {
@@ -386,7 +401,14 @@ namespace MeterSceneLibrary.JISCO
                 rt.resultInfo = "称重完成";
                 PbCache.actualFirstNo = rmI.Data;
                 PbCache.strQRCode = rmI.Message;
-                PbCache.isTareWeight = false;//毛重
+                if (actualFirst1.meterWeight.Value > actualFirst.meterWeight.Value)
+                {
+                    PbCache.isTareWeight = true;//毛重
+                }
+                else
+                {
+                    PbCache.isTareWeight = false;//皮重
+                }
             }
             else
             {
@@ -411,6 +433,7 @@ namespace MeterSceneLibrary.JISCO
             {
                 EntityBase<PreTrackScale> entityBase = new EntityBase<PreTrackScale>();
                 netDb = entityBase.format<MeterWorkCarActual>(scale, netDb);
+                netDb.isPreScale = "1";//是否匹配委托，0未匹配，1已匹配
             }
 
             netDb.actualFirst1No = actualFirst.actualFirstNo;
@@ -443,7 +466,6 @@ namespace MeterSceneLibrary.JISCO
             netDb.valueFlag = "1"; //0=有效，1=作废
             netDb.uploadFlag = "1"; //0=待审核；1：待上传；2=已上传
             netDb.dataSource = "1"; //1 = 智能终端，2 = 本地计量，3 = 应急计量，4 = 手动录入(计量票据录入)
-            netDb.isPreScale = "1";//是否匹配委托，0未匹配，1已匹配
                                     //要判断下当前是否勾选了不验证皮重
 
             // 保存结净记录，后续改成统一提交模式  BourneCao
@@ -457,7 +479,7 @@ namespace MeterSceneLibrary.JISCO
                 rt.resultInfo = "称重完成";
                 PbCache.actualFirstNo = rmI.Data;
                 PbCache.strQRCode = rmI.Message;
-                PbCache.isTareWeight = false;//毛重
+                PbCache.isTareWeight = true;//皮重
             }
             else
             {
@@ -651,7 +673,7 @@ namespace MeterSceneLibrary.JISCO
         }
 
         /// <summary>
-        /// 产生一次计量数据，同时结净并匹配委托（多委托）
+        /// 多毛一重
         /// </summary>
         /// <param name="scale"></param>
         /// <param name="actualFirst"></param>

RailMeterSystem/frmTgMotoriaMain.cs

@@ -399,7 +399,7 @@ namespace RailMeterSystem
 
             RESTfulResult<List<MeterWorkRailwayRecMain>> rm = meterWorkRailwayRecMainService.Query(hashtable);
 
-            dtV = rm.Data;
+            dtV = ListToDatatable.ListToDataTable(rm.Data);
 
             //PbModelDbService<List<MeterWorkRailwayRecMain>> pb = new PbModelDbService<List<MeterWorkRailwayRecMain>>();
             //RESTfulResult<List<MeterWorkRailwayRecMain>> rmType = pb.executeSqlDataWf(sql);
@@ -721,5 +721,50 @@ namespace RailMeterSystem
             }
             ultraGridNet.UpdateData();
         }
+
+        public class ListToDatatable
+        {
+            public ListToDatatable() { }
+            public static DataTable ListToDataTable<T>(List<T> entitys)
+            {
+
+                //检查实体集合不能为空
+                if (entitys == null || entitys.Count < 1)
+                {
+                    return new DataTable();
+                }
+
+                //取出第一个实体的所有Propertie
+                Type entityType = entitys[0].GetType();
+                PropertyInfo[] entityProperties = entityType.GetProperties();
+
+                //生成DataTable的structure
+                //生产代码中，应将生成的DataTable结构Cache起来，此处略
+                DataTable dt = new DataTable("dt");
+                for (int i = 0; i < entityProperties.Length; i++)
+                {
+                    //dt.Columns.Add(entityProperties[i].Name, entityProperties[i].PropertyType);
+                    dt.Columns.Add(entityProperties[i].Name);
+                }
+
+                //将所有entity添加到DataTable中
+                foreach (object entity in entitys)
+                {
+                    //检查所有的的实体都为同一类型
+                    if (entity.GetType() != entityType)
+                    {
+                        throw new Exception("要转换的集合元素类型不一致");
+                    }
+                    object[] entityValues = new object[entityProperties.Length];
+                    for (int i = 0; i < entityProperties.Length; i++)
+                    {
+                        entityValues[i] = entityProperties[i].GetValue(entity, null);
+
+                    }
+                    dt.Rows.Add(entityValues);
+                }
+                return dt;
+            }
+        }
     }
 }

TrainVideoDataDispose/Form1.cs

@@ -143,9 +143,6 @@ namespace TrainVideoDataDispose
                 MessageBox.Show("程序已经启动.", "提示");
                 Application.Exit();
             }
-
-
-
         }
         /// <summary>
         /// 线程读取原始数据