混装混卸和双委托更改

CarMeterSystem/Form1.Designer.cs

@@ -169,7 +169,7 @@
             this.textBox1.Name = "textBox1";
             this.textBox1.Size = new System.Drawing.Size(100, 21);
             this.textBox1.TabIndex = 3;
-            this.textBox1.Text = "湘AE328A";
+            this.textBox1.Text = "湘G66666";
             // 
             // numericUpDown1
             // 

Common/DbOption/work/MeterWorkCarActualService.cs

@@ -140,6 +140,33 @@ namespace Common
             RESTfulResult<string> rm = db.doOption<string>("meterworkcaractualfirsts", "doAddNetHZHX", new object[] { pbSomeModel }, 1);
             return rm;
         }
+
+        /// <summary>
+        /// 双委托逻辑
+        /// </summary>
+        /// <param name="scale">List<PreTrackScale></param>
+        /// <param name="actualFirst">双委托中，自动新增的一次计量数据</param>
+        /// <param name="netDb">MeterWorkCarActual</param>
+        /// <returns></returns>
+        public RESTfulResult<string> doNetAddTwo(List<PreTrackScale> scale, MeterWorkCarActualFirst actualFirst, MeterWorkCarActual netDb)
+        {
+            DbHelper db = new DbHelper();
+            PbSomeModel<MeterWorkCarActualFirst, MeterWorkCarActual, PreTrackScale, PreTrackScale> pbSomeModel = new PbSomeModel<MeterWorkCarActualFirst, MeterWorkCarActual, PreTrackScale, PreTrackScale>();
+            pbSomeModel.one = actualFirst;
+            pbSomeModel.two = netDb;
+            pbSomeModel.three = scale[0];
+            pbSomeModel.four = scale[1];
+
+            if (actualFirst != null && string.IsNullOrEmpty(actualFirst.createManNo))
+            {
+                actualFirst.createManNo = actualFirst.baseSpotNo;
+                actualFirst.createManName = actualFirst.baseSpotName;
+            }
+
+            //RESTfulResult<string> rm = db.doOption<string>("meterworkcaractualfirsts", "doAddNetInnerWf", new object[] { secondDb, netDb, saveTare }, 1);
+            RESTfulResult<string> rm = db.doOption<string>("meterworkcaractualfirsts", "doNetAddTwo", new object[] { pbSomeModel }, 1);
+            return rm;
+        }
         #endregion
     }
 }

Common/vo/work/MeterWorkCarActual.cs

@@ -511,6 +511,13 @@ namespace Common
 
 		public string dataSource { get; set; }
 
+
+		/// 
+		/// 是否匹配委托（0:未匹配，1:已匹配）
+		/// 
+
+		public string isPreScale { get; set; }
+
 		/// 
 		/// 操作原因
 		/// 

CreateAccess/Connected Services/ServiceReference1/Reference.cs

@@ -1,3003 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace CreateAccess.ServiceReference1 {
-    
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
-    [System.ServiceModel.ServiceContractAttribute(Namespace="http://server.subject.steerinfo.com", ConfigurationName="ServiceReference1.WebServer")]
-    public interface WebServer {
-        
-        // CODEGEN: 参数“result”需要其他方案信息，使用参数模式无法捕获这些信息。特定特性为“System.Xml.Serialization.XmlElementAttribute”。
-        [System.ServiceModel.OperationContractAttribute(Action="", ReplyAction="*")]
-        [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(doUpdateProActResponse))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(doQueryComBaseInfoWf))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(doQueryTimeWf))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(doQueryStockOnlineWf))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(doQueryProAct))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(doAccessCuImplResponse))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(ExportAccess))]
-        [return: System.ServiceModel.MessageParameterAttribute(Name="result")]
-        CreateAccess.ServiceReference1.ExportAccessResponse ExportAccess(CreateAccess.ServiceReference1.ExportAccess1 request);
-        
-        // CODEGEN: 参数“result”需要其他方案信息，使用参数模式无法捕获这些信息。特定特性为“System.Xml.Serialization.XmlElementAttribute”。
-        [System.ServiceModel.OperationContractAttribute(Action="", ReplyAction="*")]
-        [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(doUpdateProActResponse))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(doQueryComBaseInfoWf))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(doQueryTimeWf))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(doQueryStockOnlineWf))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(doQueryProAct))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(doAccessCuImplResponse))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(ExportAccess))]
-        [return: System.ServiceModel.MessageParameterAttribute(Name="result")]
-        CreateAccess.ServiceReference1.doAccessCuImplResponse1 doAccessCuImpl(CreateAccess.ServiceReference1.doAccessCuImpl request);
-        
-        // CODEGEN: 参数“result”需要其他方案信息，使用参数模式无法捕获这些信息。特定特性为“System.Xml.Serialization.XmlElementAttribute”。
-        [System.ServiceModel.OperationContractAttribute(Action="", ReplyAction="*")]
-        [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(doUpdateProActResponse))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(doQueryComBaseInfoWf))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(doQueryTimeWf))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(doQueryStockOnlineWf))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(doQueryProAct))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(doAccessCuImplResponse))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(ExportAccess))]
-        [return: System.ServiceModel.MessageParameterAttribute(Name="result")]
-        CreateAccess.ServiceReference1.doQueryProActResponse doQueryProAct(CreateAccess.ServiceReference1.doQueryProAct1 request);
-        
-        // CODEGEN: 参数“result”需要其他方案信息，使用参数模式无法捕获这些信息。特定特性为“System.Xml.Serialization.XmlElementAttribute”。
-        [System.ServiceModel.OperationContractAttribute(Action="", ReplyAction="*")]
-        [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(doUpdateProActResponse))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(doQueryComBaseInfoWf))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(doQueryTimeWf))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(doQueryStockOnlineWf))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(doQueryProAct))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(doAccessCuImplResponse))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(ExportAccess))]
-        [return: System.ServiceModel.MessageParameterAttribute(Name="result")]
-        CreateAccess.ServiceReference1.doQueryStockOnlineWfResponse doQueryStockOnlineWf(CreateAccess.ServiceReference1.doQueryStockOnlineWf1 request);
-        
-        // CODEGEN: 参数“result”需要其他方案信息，使用参数模式无法捕获这些信息。特定特性为“System.Xml.Serialization.XmlElementAttribute”。
-        [System.ServiceModel.OperationContractAttribute(Action="", ReplyAction="*")]
-        [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(doUpdateProActResponse))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(doQueryComBaseInfoWf))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(doQueryTimeWf))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(doQueryStockOnlineWf))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(doQueryProAct))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(doAccessCuImplResponse))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(ExportAccess))]
-        [return: System.ServiceModel.MessageParameterAttribute(Name="result")]
-        CreateAccess.ServiceReference1.doQueryTimeWfResponse doQueryTimeWf(CreateAccess.ServiceReference1.doQueryTimeWf1 request);
-        
-        // CODEGEN: 参数“result”需要其他方案信息，使用参数模式无法捕获这些信息。特定特性为“System.Xml.Serialization.XmlElementAttribute”。
-        [System.ServiceModel.OperationContractAttribute(Action="", ReplyAction="*")]
-        [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(doUpdateProActResponse))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(doQueryComBaseInfoWf))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(doQueryTimeWf))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(doQueryStockOnlineWf))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(doQueryProAct))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(doAccessCuImplResponse))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(ExportAccess))]
-        [return: System.ServiceModel.MessageParameterAttribute(Name="result")]
-        CreateAccess.ServiceReference1.doQueryComBaseInfoWfResponse doQueryComBaseInfoWf(CreateAccess.ServiceReference1.doQueryComBaseInfoWf1 request);
-        
-        // CODEGEN: 参数“result”需要其他方案信息，使用参数模式无法捕获这些信息。特定特性为“System.Xml.Serialization.XmlElementAttribute”。
-        [System.ServiceModel.OperationContractAttribute(Action="", ReplyAction="*")]
-        [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(doUpdateProActResponse))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(doQueryComBaseInfoWf))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(doQueryTimeWf))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(doQueryStockOnlineWf))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(doQueryProAct))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(doAccessCuImplResponse))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(ExportAccess))]
-        [return: System.ServiceModel.MessageParameterAttribute(Name="result")]
-        CreateAccess.ServiceReference1.doUpdateProActResponse1 doUpdateProAct(CreateAccess.ServiceReference1.doUpdateProAct request);
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
-    [System.SerializableAttribute()]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://server.subject.steerinfo.com")]
-    public partial class commonPage : object, System.ComponentModel.INotifyPropertyChanged {
-        
-        private string endTimeField;
-        
-        private string endTime2Field;
-        
-        private object[] listField;
-        
-        private string memo0Field;
-        
-        private string memo1Field;
-        
-        private string memo10Field;
-        
-        private string memo2Field;
-        
-        private string memo3Field;
-        
-        private string memo4Field;
-        
-        private string memo5Field;
-        
-        private string memo6Field;
-        
-        private string memo7Field;
-        
-        private string memo8Field;
-        
-        private string memo9Field;
-        
-        private object objParamField;
-        
-        private int pageNumField;
-        
-        private int pageSizeField;
-        
-        private object paramField;
-        
-        private object[] paramArrayField;
-        
-        private object[] paramListField;
-        
-        private int skipResultsField;
-        
-        private string sortFieldField;
-        
-        private string sortSqlConditionField;
-        
-        private string sortTypeField;
-        
-        private string startTimeField;
-        
-        private string startTime2Field;
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=0)]
-        public string endTime {
-            get {
-                return this.endTimeField;
-            }
-            set {
-                this.endTimeField = value;
-                this.RaisePropertyChanged("endTime");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=1)]
-        public string endTime2 {
-            get {
-                return this.endTime2Field;
-            }
-            set {
-                this.endTime2Field = value;
-                this.RaisePropertyChanged("endTime2");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("list", Form=System.Xml.Schema.XmlSchemaForm.Unqualified, IsNullable=true, Order=2)]
-        public object[] list {
-            get {
-                return this.listField;
-            }
-            set {
-                this.listField = value;
-                this.RaisePropertyChanged("list");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=3)]
-        public string memo0 {
-            get {
-                return this.memo0Field;
-            }
-            set {
-                this.memo0Field = value;
-                this.RaisePropertyChanged("memo0");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=4)]
-        public string memo1 {
-            get {
-                return this.memo1Field;
-            }
-            set {
-                this.memo1Field = value;
-                this.RaisePropertyChanged("memo1");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=5)]
-        public string memo10 {
-            get {
-                return this.memo10Field;
-            }
-            set {
-                this.memo10Field = value;
-                this.RaisePropertyChanged("memo10");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=6)]
-        public string memo2 {
-            get {
-                return this.memo2Field;
-            }
-            set {
-                this.memo2Field = value;
-                this.RaisePropertyChanged("memo2");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=7)]
-        public string memo3 {
-            get {
-                return this.memo3Field;
-            }
-            set {
-                this.memo3Field = value;
-                this.RaisePropertyChanged("memo3");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=8)]
-        public string memo4 {
-            get {
-                return this.memo4Field;
-            }
-            set {
-                this.memo4Field = value;
-                this.RaisePropertyChanged("memo4");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=9)]
-        public string memo5 {
-            get {
-                return this.memo5Field;
-            }
-            set {
-                this.memo5Field = value;
-                this.RaisePropertyChanged("memo5");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=10)]
-        public string memo6 {
-            get {
-                return this.memo6Field;
-            }
-            set {
-                this.memo6Field = value;
-                this.RaisePropertyChanged("memo6");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=11)]
-        public string memo7 {
-            get {
-                return this.memo7Field;
-            }
-            set {
-                this.memo7Field = value;
-                this.RaisePropertyChanged("memo7");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=12)]
-        public string memo8 {
-            get {
-                return this.memo8Field;
-            }
-            set {
-                this.memo8Field = value;
-                this.RaisePropertyChanged("memo8");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=13)]
-        public string memo9 {
-            get {
-                return this.memo9Field;
-            }
-            set {
-                this.memo9Field = value;
-                this.RaisePropertyChanged("memo9");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=14)]
-        public object objParam {
-            get {
-                return this.objParamField;
-            }
-            set {
-                this.objParamField = value;
-                this.RaisePropertyChanged("objParam");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=15)]
-        public int pageNum {
-            get {
-                return this.pageNumField;
-            }
-            set {
-                this.pageNumField = value;
-                this.RaisePropertyChanged("pageNum");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=16)]
-        public int pageSize {
-            get {
-                return this.pageSizeField;
-            }
-            set {
-                this.pageSizeField = value;
-                this.RaisePropertyChanged("pageSize");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=17)]
-        public object param {
-            get {
-                return this.paramField;
-            }
-            set {
-                this.paramField = value;
-                this.RaisePropertyChanged("param");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("paramArray", Form=System.Xml.Schema.XmlSchemaForm.Unqualified, IsNullable=true, Order=18)]
-        public object[] paramArray {
-            get {
-                return this.paramArrayField;
-            }
-            set {
-                this.paramArrayField = value;
-                this.RaisePropertyChanged("paramArray");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("paramList", Form=System.Xml.Schema.XmlSchemaForm.Unqualified, IsNullable=true, Order=19)]
-        public object[] paramList {
-            get {
-                return this.paramListField;
-            }
-            set {
-                this.paramListField = value;
-                this.RaisePropertyChanged("paramList");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=20)]
-        public int skipResults {
-            get {
-                return this.skipResultsField;
-            }
-            set {
-                this.skipResultsField = value;
-                this.RaisePropertyChanged("skipResults");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=21)]
-        public string sortField {
-            get {
-                return this.sortFieldField;
-            }
-            set {
-                this.sortFieldField = value;
-                this.RaisePropertyChanged("sortField");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=22)]
-        public string sortSqlCondition {
-            get {
-                return this.sortSqlConditionField;
-            }
-            set {
-                this.sortSqlConditionField = value;
-                this.RaisePropertyChanged("sortSqlCondition");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=23)]
-        public string sortType {
-            get {
-                return this.sortTypeField;
-            }
-            set {
-                this.sortTypeField = value;
-                this.RaisePropertyChanged("sortType");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=24)]
-        public string startTime {
-            get {
-                return this.startTimeField;
-            }
-            set {
-                this.startTimeField = value;
-                this.RaisePropertyChanged("startTime");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=25)]
-        public string startTime2 {
-            get {
-                return this.startTime2Field;
-            }
-            set {
-                this.startTime2Field = value;
-                this.RaisePropertyChanged("startTime2");
-            }
-        }
-        
-        public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
-        
-        protected void RaisePropertyChanged(string propertyName) {
-            System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged;
-            if ((propertyChanged != null)) {
-                propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
-    [System.SerializableAttribute()]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://server.subject.steerinfo.com")]
-    public partial class doUpdateProActResponse : object, System.ComponentModel.INotifyPropertyChanged {
-        
-        private resTfulResult resultField;
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=0)]
-        public resTfulResult result {
-            get {
-                return this.resultField;
-            }
-            set {
-                this.resultField = value;
-                this.RaisePropertyChanged("result");
-            }
-        }
-        
-        public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
-        
-        protected void RaisePropertyChanged(string propertyName) {
-            System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged;
-            if ((propertyChanged != null)) {
-                propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
-    [System.SerializableAttribute()]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://server.subject.steerinfo.com")]
-    public partial class resTfulResult : object, System.ComponentModel.INotifyPropertyChanged {
-        
-        private string codeField;
-        
-        private object dataField;
-        
-        private string messageField;
-        
-        private bool succeedField;
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=0)]
-        public string code {
-            get {
-                return this.codeField;
-            }
-            set {
-                this.codeField = value;
-                this.RaisePropertyChanged("code");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=1)]
-        public object data {
-            get {
-                return this.dataField;
-            }
-            set {
-                this.dataField = value;
-                this.RaisePropertyChanged("data");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=2)]
-        public string message {
-            get {
-                return this.messageField;
-            }
-            set {
-                this.messageField = value;
-                this.RaisePropertyChanged("message");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=3)]
-        public bool succeed {
-            get {
-                return this.succeedField;
-            }
-            set {
-                this.succeedField = value;
-                this.RaisePropertyChanged("succeed");
-            }
-        }
-        
-        public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
-        
-        protected void RaisePropertyChanged(string propertyName) {
-            System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged;
-            if ((propertyChanged != null)) {
-                propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
-    [System.SerializableAttribute()]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://server.subject.steerinfo.com")]
-    public partial class comBaseInfo : object, System.ComponentModel.INotifyPropertyChanged {
-        
-        private string baseCodeField;
-        
-        private string baseNameField;
-        
-        private string createManNameField;
-        
-        private string createManNoField;
-        
-        private System.DateTime createTimeField;
-        
-        private bool createTimeFieldSpecified;
-        
-        private string deleteManNameField;
-        
-        private string deleteManNoField;
-        
-        private System.DateTime deleteTimeField;
-        
-        private bool deleteTimeFieldSpecified;
-        
-        private string idField;
-        
-        private string isCreateSubclaseFlagField;
-        
-        private string isEditFlagField;
-        
-        private string memoField;
-        
-        private string mnemonicCodeField;
-        
-        private string updateManNameField;
-        
-        private string updateManNoField;
-        
-        private System.DateTime updateTimeField;
-        
-        private bool updateTimeFieldSpecified;
-        
-        private string validFlagField;
-        
-        private string pBaseCodeField;
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=0)]
-        public string baseCode {
-            get {
-                return this.baseCodeField;
-            }
-            set {
-                this.baseCodeField = value;
-                this.RaisePropertyChanged("baseCode");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=1)]
-        public string baseName {
-            get {
-                return this.baseNameField;
-            }
-            set {
-                this.baseNameField = value;
-                this.RaisePropertyChanged("baseName");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=2)]
-        public string createManName {
-            get {
-                return this.createManNameField;
-            }
-            set {
-                this.createManNameField = value;
-                this.RaisePropertyChanged("createManName");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=3)]
-        public string createManNo {
-            get {
-                return this.createManNoField;
-            }
-            set {
-                this.createManNoField = value;
-                this.RaisePropertyChanged("createManNo");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=4)]
-        public System.DateTime createTime {
-            get {
-                return this.createTimeField;
-            }
-            set {
-                this.createTimeField = value;
-                this.RaisePropertyChanged("createTime");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool createTimeSpecified {
-            get {
-                return this.createTimeFieldSpecified;
-            }
-            set {
-                this.createTimeFieldSpecified = value;
-                this.RaisePropertyChanged("createTimeSpecified");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=5)]
-        public string deleteManName {
-            get {
-                return this.deleteManNameField;
-            }
-            set {
-                this.deleteManNameField = value;
-                this.RaisePropertyChanged("deleteManName");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=6)]
-        public string deleteManNo {
-            get {
-                return this.deleteManNoField;
-            }
-            set {
-                this.deleteManNoField = value;
-                this.RaisePropertyChanged("deleteManNo");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=7)]
-        public System.DateTime deleteTime {
-            get {
-                return this.deleteTimeField;
-            }
-            set {
-                this.deleteTimeField = value;
-                this.RaisePropertyChanged("deleteTime");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool deleteTimeSpecified {
-            get {
-                return this.deleteTimeFieldSpecified;
-            }
-            set {
-                this.deleteTimeFieldSpecified = value;
-                this.RaisePropertyChanged("deleteTimeSpecified");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=8)]
-        public string id {
-            get {
-                return this.idField;
-            }
-            set {
-                this.idField = value;
-                this.RaisePropertyChanged("id");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=9)]
-        public string isCreateSubclaseFlag {
-            get {
-                return this.isCreateSubclaseFlagField;
-            }
-            set {
-                this.isCreateSubclaseFlagField = value;
-                this.RaisePropertyChanged("isCreateSubclaseFlag");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=10)]
-        public string isEditFlag {
-            get {
-                return this.isEditFlagField;
-            }
-            set {
-                this.isEditFlagField = value;
-                this.RaisePropertyChanged("isEditFlag");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=11)]
-        public string memo {
-            get {
-                return this.memoField;
-            }
-            set {
-                this.memoField = value;
-                this.RaisePropertyChanged("memo");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=12)]
-        public string mnemonicCode {
-            get {
-                return this.mnemonicCodeField;
-            }
-            set {
-                this.mnemonicCodeField = value;
-                this.RaisePropertyChanged("mnemonicCode");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=13)]
-        public string updateManName {
-            get {
-                return this.updateManNameField;
-            }
-            set {
-                this.updateManNameField = value;
-                this.RaisePropertyChanged("updateManName");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=14)]
-        public string updateManNo {
-            get {
-                return this.updateManNoField;
-            }
-            set {
-                this.updateManNoField = value;
-                this.RaisePropertyChanged("updateManNo");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=15)]
-        public System.DateTime updateTime {
-            get {
-                return this.updateTimeField;
-            }
-            set {
-                this.updateTimeField = value;
-                this.RaisePropertyChanged("updateTime");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool updateTimeSpecified {
-            get {
-                return this.updateTimeFieldSpecified;
-            }
-            set {
-                this.updateTimeFieldSpecified = value;
-                this.RaisePropertyChanged("updateTimeSpecified");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=16)]
-        public string validFlag {
-            get {
-                return this.validFlagField;
-            }
-            set {
-                this.validFlagField = value;
-                this.RaisePropertyChanged("validFlag");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=17)]
-        public string pBaseCode {
-            get {
-                return this.pBaseCodeField;
-            }
-            set {
-                this.pBaseCodeField = value;
-                this.RaisePropertyChanged("pBaseCode");
-            }
-        }
-        
-        public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
-        
-        protected void RaisePropertyChanged(string propertyName) {
-            System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged;
-            if ((propertyChanged != null)) {
-                propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
-    [System.SerializableAttribute()]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://server.subject.steerinfo.com")]
-    public partial class doQueryComBaseInfoWf : object, System.ComponentModel.INotifyPropertyChanged {
-        
-        private comBaseInfo listField;
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=0)]
-        public comBaseInfo list {
-            get {
-                return this.listField;
-            }
-            set {
-                this.listField = value;
-                this.RaisePropertyChanged("list");
-            }
-        }
-        
-        public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
-        
-        protected void RaisePropertyChanged(string propertyName) {
-            System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged;
-            if ((propertyChanged != null)) {
-                propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
-    [System.SerializableAttribute()]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://server.subject.steerinfo.com")]
-    public partial class doQueryTimeWf : object, System.ComponentModel.INotifyPropertyChanged {
-        
-        private commonPage listField;
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=0)]
-        public commonPage list {
-            get {
-                return this.listField;
-            }
-            set {
-                this.listField = value;
-                this.RaisePropertyChanged("list");
-            }
-        }
-        
-        public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
-        
-        protected void RaisePropertyChanged(string propertyName) {
-            System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged;
-            if ((propertyChanged != null)) {
-                propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
-    [System.SerializableAttribute()]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://server.subject.steerinfo.com")]
-    public partial class meterWorkStockOnline : object, System.ComponentModel.INotifyPropertyChanged {
-        
-        private string baseSpotNameField;
-        
-        private string baseSpotNoField;
-        
-        private string idField;
-        
-        private System.DateTime lastTimeField;
-        
-        private bool lastTimeFieldSpecified;
-        
-        private string pointNoField;
-        
-        private string spotTypeNoField;
-        
-        private string userIdField;
-        
-        private string userIpField;
-        
-        private string validFlagField;
-        
-        private string weightDiffField;
-        
-        private string weightFlagField;
-        
-        private System.DateTime weightTimeField;
-        
-        private bool weightTimeFieldSpecified;
-        
-        private string workFlagField;
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=0)]
-        public string baseSpotName {
-            get {
-                return this.baseSpotNameField;
-            }
-            set {
-                this.baseSpotNameField = value;
-                this.RaisePropertyChanged("baseSpotName");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=1)]
-        public string baseSpotNo {
-            get {
-                return this.baseSpotNoField;
-            }
-            set {
-                this.baseSpotNoField = value;
-                this.RaisePropertyChanged("baseSpotNo");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=2)]
-        public string id {
-            get {
-                return this.idField;
-            }
-            set {
-                this.idField = value;
-                this.RaisePropertyChanged("id");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=3)]
-        public System.DateTime lastTime {
-            get {
-                return this.lastTimeField;
-            }
-            set {
-                this.lastTimeField = value;
-                this.RaisePropertyChanged("lastTime");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool lastTimeSpecified {
-            get {
-                return this.lastTimeFieldSpecified;
-            }
-            set {
-                this.lastTimeFieldSpecified = value;
-                this.RaisePropertyChanged("lastTimeSpecified");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=4)]
-        public string pointNo {
-            get {
-                return this.pointNoField;
-            }
-            set {
-                this.pointNoField = value;
-                this.RaisePropertyChanged("pointNo");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=5)]
-        public string spotTypeNo {
-            get {
-                return this.spotTypeNoField;
-            }
-            set {
-                this.spotTypeNoField = value;
-                this.RaisePropertyChanged("spotTypeNo");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=6)]
-        public string userId {
-            get {
-                return this.userIdField;
-            }
-            set {
-                this.userIdField = value;
-                this.RaisePropertyChanged("userId");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=7)]
-        public string userIp {
-            get {
-                return this.userIpField;
-            }
-            set {
-                this.userIpField = value;
-                this.RaisePropertyChanged("userIp");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=8)]
-        public string validFlag {
-            get {
-                return this.validFlagField;
-            }
-            set {
-                this.validFlagField = value;
-                this.RaisePropertyChanged("validFlag");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=9)]
-        public string weightDiff {
-            get {
-                return this.weightDiffField;
-            }
-            set {
-                this.weightDiffField = value;
-                this.RaisePropertyChanged("weightDiff");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=10)]
-        public string weightFlag {
-            get {
-                return this.weightFlagField;
-            }
-            set {
-                this.weightFlagField = value;
-                this.RaisePropertyChanged("weightFlag");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=11)]
-        public System.DateTime weightTime {
-            get {
-                return this.weightTimeField;
-            }
-            set {
-                this.weightTimeField = value;
-                this.RaisePropertyChanged("weightTime");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool weightTimeSpecified {
-            get {
-                return this.weightTimeFieldSpecified;
-            }
-            set {
-                this.weightTimeFieldSpecified = value;
-                this.RaisePropertyChanged("weightTimeSpecified");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=12)]
-        public string workFlag {
-            get {
-                return this.workFlagField;
-            }
-            set {
-                this.workFlagField = value;
-                this.RaisePropertyChanged("workFlag");
-            }
-        }
-        
-        public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
-        
-        protected void RaisePropertyChanged(string propertyName) {
-            System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged;
-            if ((propertyChanged != null)) {
-                propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
-    [System.SerializableAttribute()]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://server.subject.steerinfo.com")]
-    public partial class doQueryStockOnlineWf : object, System.ComponentModel.INotifyPropertyChanged {
-        
-        private meterWorkStockOnline listField;
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=0)]
-        public meterWorkStockOnline list {
-            get {
-                return this.listField;
-            }
-            set {
-                this.listField = value;
-                this.RaisePropertyChanged("list");
-            }
-        }
-        
-        public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
-        
-        protected void RaisePropertyChanged(string propertyName) {
-            System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged;
-            if ((propertyChanged != null)) {
-                propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
-    [System.SerializableAttribute()]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://server.subject.steerinfo.com")]
-    public partial class doQueryProAct : object, System.ComponentModel.INotifyPropertyChanged {
-        
-        private commonPage listField;
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=0)]
-        public commonPage list {
-            get {
-                return this.listField;
-            }
-            set {
-                this.listField = value;
-                this.RaisePropertyChanged("list");
-            }
-        }
-        
-        public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
-        
-        protected void RaisePropertyChanged(string propertyName) {
-            System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged;
-            if ((propertyChanged != null)) {
-                propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
-    [System.SerializableAttribute()]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://server.subject.steerinfo.com")]
-    public partial class doAccessCuImplResponse : object, System.ComponentModel.INotifyPropertyChanged {
-        
-        private resTfulResult resultField;
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=0)]
-        public resTfulResult result {
-            get {
-                return this.resultField;
-            }
-            set {
-                this.resultField = value;
-                this.RaisePropertyChanged("result");
-            }
-        }
-        
-        public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
-        
-        protected void RaisePropertyChanged(string propertyName) {
-            System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged;
-            if ((propertyChanged != null)) {
-                propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
-    [System.SerializableAttribute()]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://server.subject.steerinfo.com")]
-    public partial class meterWorkStorageActual : object, System.ComponentModel.INotifyPropertyChanged {
-        
-        private string actualNoField;
-        
-        private decimal actualWeightField;
-        
-        private bool actualWeightFieldSpecified;
-        
-        private string baseSpotNameField;
-        
-        private string baseSpotNoField;
-        
-        private string batchNoField;
-        
-        private string blockNumField;
-        
-        private string bucketNoField;
-        
-        private string checkFlagField;
-        
-        private string combinPackageNoField;
-        
-        private string createManNameField;
-        
-        private string createManNoField;
-        
-        private System.DateTime createTimeField;
-        
-        private bool createTimeFieldSpecified;
-        
-        private string deleteManNameField;
-        
-        private string deleteManNoField;
-        
-        private System.DateTime deleteTimeField;
-        
-        private bool deleteTimeFieldSpecified;
-        
-        private string gradeNameField;
-        
-        private string gradeNoField;
-        
-        private decimal grossWeightField;
-        
-        private bool grossWeightFieldSpecified;
-        
-        private string idField;
-        
-        private string memoField;
-        
-        private decimal netWeightField;
-        
-        private bool netWeightFieldSpecified;
-        
-        private string noticeNoField;
-        
-        private string packageNoField;
-        
-        private string predictionNoField;
-        
-        private System.DateTime productDateField;
-        
-        private bool productDateFieldSpecified;
-        
-        private string productNameField;
-        
-        private string productNoField;
-        
-        private decimal referWeightField;
-        
-        private bool referWeightFieldSpecified;
-        
-        private string sealNoField;
-        
-        private string standardNameField;
-        
-        private string standardNoField;
-        
-        private decimal tareWeightField;
-        
-        private bool tareWeightFieldSpecified;
-        
-        private string updateManNameField;
-        
-        private string updateManNoField;
-        
-        private System.DateTime updateTimeField;
-        
-        private bool updateTimeFieldSpecified;
-        
-        private string valueFlagField;
-        
-        private string weightTypeField;
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=0)]
-        public string actualNo {
-            get {
-                return this.actualNoField;
-            }
-            set {
-                this.actualNoField = value;
-                this.RaisePropertyChanged("actualNo");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=1)]
-        public decimal actualWeight {
-            get {
-                return this.actualWeightField;
-            }
-            set {
-                this.actualWeightField = value;
-                this.RaisePropertyChanged("actualWeight");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool actualWeightSpecified {
-            get {
-                return this.actualWeightFieldSpecified;
-            }
-            set {
-                this.actualWeightFieldSpecified = value;
-                this.RaisePropertyChanged("actualWeightSpecified");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=2)]
-        public string baseSpotName {
-            get {
-                return this.baseSpotNameField;
-            }
-            set {
-                this.baseSpotNameField = value;
-                this.RaisePropertyChanged("baseSpotName");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=3)]
-        public string baseSpotNo {
-            get {
-                return this.baseSpotNoField;
-            }
-            set {
-                this.baseSpotNoField = value;
-                this.RaisePropertyChanged("baseSpotNo");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=4)]
-        public string batchNo {
-            get {
-                return this.batchNoField;
-            }
-            set {
-                this.batchNoField = value;
-                this.RaisePropertyChanged("batchNo");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=5)]
-        public string blockNum {
-            get {
-                return this.blockNumField;
-            }
-            set {
-                this.blockNumField = value;
-                this.RaisePropertyChanged("blockNum");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=6)]
-        public string bucketNo {
-            get {
-                return this.bucketNoField;
-            }
-            set {
-                this.bucketNoField = value;
-                this.RaisePropertyChanged("bucketNo");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=7)]
-        public string checkFlag {
-            get {
-                return this.checkFlagField;
-            }
-            set {
-                this.checkFlagField = value;
-                this.RaisePropertyChanged("checkFlag");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=8)]
-        public string combinPackageNo {
-            get {
-                return this.combinPackageNoField;
-            }
-            set {
-                this.combinPackageNoField = value;
-                this.RaisePropertyChanged("combinPackageNo");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=9)]
-        public string createManName {
-            get {
-                return this.createManNameField;
-            }
-            set {
-                this.createManNameField = value;
-                this.RaisePropertyChanged("createManName");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=10)]
-        public string createManNo {
-            get {
-                return this.createManNoField;
-            }
-            set {
-                this.createManNoField = value;
-                this.RaisePropertyChanged("createManNo");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=11)]
-        public System.DateTime createTime {
-            get {
-                return this.createTimeField;
-            }
-            set {
-                this.createTimeField = value;
-                this.RaisePropertyChanged("createTime");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool createTimeSpecified {
-            get {
-                return this.createTimeFieldSpecified;
-            }
-            set {
-                this.createTimeFieldSpecified = value;
-                this.RaisePropertyChanged("createTimeSpecified");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=12)]
-        public string deleteManName {
-            get {
-                return this.deleteManNameField;
-            }
-            set {
-                this.deleteManNameField = value;
-                this.RaisePropertyChanged("deleteManName");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=13)]
-        public string deleteManNo {
-            get {
-                return this.deleteManNoField;
-            }
-            set {
-                this.deleteManNoField = value;
-                this.RaisePropertyChanged("deleteManNo");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=14)]
-        public System.DateTime deleteTime {
-            get {
-                return this.deleteTimeField;
-            }
-            set {
-                this.deleteTimeField = value;
-                this.RaisePropertyChanged("deleteTime");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool deleteTimeSpecified {
-            get {
-                return this.deleteTimeFieldSpecified;
-            }
-            set {
-                this.deleteTimeFieldSpecified = value;
-                this.RaisePropertyChanged("deleteTimeSpecified");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=15)]
-        public string gradeName {
-            get {
-                return this.gradeNameField;
-            }
-            set {
-                this.gradeNameField = value;
-                this.RaisePropertyChanged("gradeName");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=16)]
-        public string gradeNo {
-            get {
-                return this.gradeNoField;
-            }
-            set {
-                this.gradeNoField = value;
-                this.RaisePropertyChanged("gradeNo");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=17)]
-        public decimal grossWeight {
-            get {
-                return this.grossWeightField;
-            }
-            set {
-                this.grossWeightField = value;
-                this.RaisePropertyChanged("grossWeight");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool grossWeightSpecified {
-            get {
-                return this.grossWeightFieldSpecified;
-            }
-            set {
-                this.grossWeightFieldSpecified = value;
-                this.RaisePropertyChanged("grossWeightSpecified");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=18)]
-        public string id {
-            get {
-                return this.idField;
-            }
-            set {
-                this.idField = value;
-                this.RaisePropertyChanged("id");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=19)]
-        public string memo {
-            get {
-                return this.memoField;
-            }
-            set {
-                this.memoField = value;
-                this.RaisePropertyChanged("memo");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=20)]
-        public decimal netWeight {
-            get {
-                return this.netWeightField;
-            }
-            set {
-                this.netWeightField = value;
-                this.RaisePropertyChanged("netWeight");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool netWeightSpecified {
-            get {
-                return this.netWeightFieldSpecified;
-            }
-            set {
-                this.netWeightFieldSpecified = value;
-                this.RaisePropertyChanged("netWeightSpecified");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=21)]
-        public string noticeNo {
-            get {
-                return this.noticeNoField;
-            }
-            set {
-                this.noticeNoField = value;
-                this.RaisePropertyChanged("noticeNo");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=22)]
-        public string packageNo {
-            get {
-                return this.packageNoField;
-            }
-            set {
-                this.packageNoField = value;
-                this.RaisePropertyChanged("packageNo");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=23)]
-        public string predictionNo {
-            get {
-                return this.predictionNoField;
-            }
-            set {
-                this.predictionNoField = value;
-                this.RaisePropertyChanged("predictionNo");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=24)]
-        public System.DateTime productDate {
-            get {
-                return this.productDateField;
-            }
-            set {
-                this.productDateField = value;
-                this.RaisePropertyChanged("productDate");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool productDateSpecified {
-            get {
-                return this.productDateFieldSpecified;
-            }
-            set {
-                this.productDateFieldSpecified = value;
-                this.RaisePropertyChanged("productDateSpecified");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=25)]
-        public string productName {
-            get {
-                return this.productNameField;
-            }
-            set {
-                this.productNameField = value;
-                this.RaisePropertyChanged("productName");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=26)]
-        public string productNo {
-            get {
-                return this.productNoField;
-            }
-            set {
-                this.productNoField = value;
-                this.RaisePropertyChanged("productNo");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=27)]
-        public decimal referWeight {
-            get {
-                return this.referWeightField;
-            }
-            set {
-                this.referWeightField = value;
-                this.RaisePropertyChanged("referWeight");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool referWeightSpecified {
-            get {
-                return this.referWeightFieldSpecified;
-            }
-            set {
-                this.referWeightFieldSpecified = value;
-                this.RaisePropertyChanged("referWeightSpecified");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=28)]
-        public string sealNo {
-            get {
-                return this.sealNoField;
-            }
-            set {
-                this.sealNoField = value;
-                this.RaisePropertyChanged("sealNo");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=29)]
-        public string standardName {
-            get {
-                return this.standardNameField;
-            }
-            set {
-                this.standardNameField = value;
-                this.RaisePropertyChanged("standardName");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=30)]
-        public string standardNo {
-            get {
-                return this.standardNoField;
-            }
-            set {
-                this.standardNoField = value;
-                this.RaisePropertyChanged("standardNo");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=31)]
-        public decimal tareWeight {
-            get {
-                return this.tareWeightField;
-            }
-            set {
-                this.tareWeightField = value;
-                this.RaisePropertyChanged("tareWeight");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool tareWeightSpecified {
-            get {
-                return this.tareWeightFieldSpecified;
-            }
-            set {
-                this.tareWeightFieldSpecified = value;
-                this.RaisePropertyChanged("tareWeightSpecified");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=32)]
-        public string updateManName {
-            get {
-                return this.updateManNameField;
-            }
-            set {
-                this.updateManNameField = value;
-                this.RaisePropertyChanged("updateManName");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=33)]
-        public string updateManNo {
-            get {
-                return this.updateManNoField;
-            }
-            set {
-                this.updateManNoField = value;
-                this.RaisePropertyChanged("updateManNo");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=34)]
-        public System.DateTime updateTime {
-            get {
-                return this.updateTimeField;
-            }
-            set {
-                this.updateTimeField = value;
-                this.RaisePropertyChanged("updateTime");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool updateTimeSpecified {
-            get {
-                return this.updateTimeFieldSpecified;
-            }
-            set {
-                this.updateTimeFieldSpecified = value;
-                this.RaisePropertyChanged("updateTimeSpecified");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=35)]
-        public string valueFlag {
-            get {
-                return this.valueFlagField;
-            }
-            set {
-                this.valueFlagField = value;
-                this.RaisePropertyChanged("valueFlag");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=36)]
-        public string weightType {
-            get {
-                return this.weightTypeField;
-            }
-            set {
-                this.weightTypeField = value;
-                this.RaisePropertyChanged("weightType");
-            }
-        }
-        
-        public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
-        
-        protected void RaisePropertyChanged(string propertyName) {
-            System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged;
-            if ((propertyChanged != null)) {
-                propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
-    [System.SerializableAttribute()]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://server.subject.steerinfo.com")]
-    public partial class meterToLimsOld : object, System.ComponentModel.INotifyPropertyChanged {
-        
-        private string baseSpot1NameField;
-        
-        private string baseSpot2NameField;
-        
-        private string bzField;
-        
-        private string bzhField;
-        
-        private string chhField;
-        
-        private string cpflField;
-        
-        private string cpmcField;
-        
-        private decimal cpzField;
-        
-        private bool cpzFieldSpecified;
-        
-        private string createManNameField;
-        
-        private string createManNoField;
-        
-        private System.DateTime createTimeField;
-        
-        private bool createTimeFieldSpecified;
-        
-        private string deleteManNameField;
-        
-        private string deleteManNoField;
-        
-        private System.DateTime deleteTimeField;
-        
-        private bool deleteTimeFieldSpecified;
-        
-        private short exportNumField;
-        
-        private bool exportNumFieldSpecified;
-        
-        private decimal fjpzField;
-        
-        private bool fjpzFieldSpecified;
-        
-        private string idField;
-        
-        private string jlyField;
-        
-        private decimal jzField;
-        
-        private bool jzFieldSpecified;
-        
-        private string lyField;
-        
-        private decimal mzField;
-        
-        private bool mzFieldSpecified;
-        
-        private string netSpot3NameField;
-        
-        private string phField;
-        
-        private decimal pzField;
-        
-        private bool pzFieldSpecified;
-        
-        private string qxField;
-        
-        private System.DateTime rqField;
-        
-        private bool rqFieldSpecified;
-        
-        private System.DateTime sjField;
-        
-        private bool sjFieldSpecified;
-        
-        private string sjbzField;
-        
-        private string updateManNameField;
-        
-        private string updateManNoField;
-        
-        private System.DateTime updateTimeField;
-        
-        private bool updateTimeFieldSpecified;
-        
-        private string xhField;
-        
-        private decimal shl_changeField;
-        
-        private bool shl_changeFieldSpecified;
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=0)]
-        public string baseSpot1Name {
-            get {
-                return this.baseSpot1NameField;
-            }
-            set {
-                this.baseSpot1NameField = value;
-                this.RaisePropertyChanged("baseSpot1Name");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=1)]
-        public string baseSpot2Name {
-            get {
-                return this.baseSpot2NameField;
-            }
-            set {
-                this.baseSpot2NameField = value;
-                this.RaisePropertyChanged("baseSpot2Name");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=2)]
-        public string bz {
-            get {
-                return this.bzField;
-            }
-            set {
-                this.bzField = value;
-                this.RaisePropertyChanged("bz");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=3)]
-        public string bzh {
-            get {
-                return this.bzhField;
-            }
-            set {
-                this.bzhField = value;
-                this.RaisePropertyChanged("bzh");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=4)]
-        public string chh {
-            get {
-                return this.chhField;
-            }
-            set {
-                this.chhField = value;
-                this.RaisePropertyChanged("chh");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=5)]
-        public string cpfl {
-            get {
-                return this.cpflField;
-            }
-            set {
-                this.cpflField = value;
-                this.RaisePropertyChanged("cpfl");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=6)]
-        public string cpmc {
-            get {
-                return this.cpmcField;
-            }
-            set {
-                this.cpmcField = value;
-                this.RaisePropertyChanged("cpmc");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=7)]
-        public decimal cpz {
-            get {
-                return this.cpzField;
-            }
-            set {
-                this.cpzField = value;
-                this.RaisePropertyChanged("cpz");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool cpzSpecified {
-            get {
-                return this.cpzFieldSpecified;
-            }
-            set {
-                this.cpzFieldSpecified = value;
-                this.RaisePropertyChanged("cpzSpecified");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=8)]
-        public string createManName {
-            get {
-                return this.createManNameField;
-            }
-            set {
-                this.createManNameField = value;
-                this.RaisePropertyChanged("createManName");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=9)]
-        public string createManNo {
-            get {
-                return this.createManNoField;
-            }
-            set {
-                this.createManNoField = value;
-                this.RaisePropertyChanged("createManNo");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=10)]
-        public System.DateTime createTime {
-            get {
-                return this.createTimeField;
-            }
-            set {
-                this.createTimeField = value;
-                this.RaisePropertyChanged("createTime");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool createTimeSpecified {
-            get {
-                return this.createTimeFieldSpecified;
-            }
-            set {
-                this.createTimeFieldSpecified = value;
-                this.RaisePropertyChanged("createTimeSpecified");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=11)]
-        public string deleteManName {
-            get {
-                return this.deleteManNameField;
-            }
-            set {
-                this.deleteManNameField = value;
-                this.RaisePropertyChanged("deleteManName");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=12)]
-        public string deleteManNo {
-            get {
-                return this.deleteManNoField;
-            }
-            set {
-                this.deleteManNoField = value;
-                this.RaisePropertyChanged("deleteManNo");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=13)]
-        public System.DateTime deleteTime {
-            get {
-                return this.deleteTimeField;
-            }
-            set {
-                this.deleteTimeField = value;
-                this.RaisePropertyChanged("deleteTime");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool deleteTimeSpecified {
-            get {
-                return this.deleteTimeFieldSpecified;
-            }
-            set {
-                this.deleteTimeFieldSpecified = value;
-                this.RaisePropertyChanged("deleteTimeSpecified");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=14)]
-        public short exportNum {
-            get {
-                return this.exportNumField;
-            }
-            set {
-                this.exportNumField = value;
-                this.RaisePropertyChanged("exportNum");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool exportNumSpecified {
-            get {
-                return this.exportNumFieldSpecified;
-            }
-            set {
-                this.exportNumFieldSpecified = value;
-                this.RaisePropertyChanged("exportNumSpecified");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=15)]
-        public decimal fjpz {
-            get {
-                return this.fjpzField;
-            }
-            set {
-                this.fjpzField = value;
-                this.RaisePropertyChanged("fjpz");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool fjpzSpecified {
-            get {
-                return this.fjpzFieldSpecified;
-            }
-            set {
-                this.fjpzFieldSpecified = value;
-                this.RaisePropertyChanged("fjpzSpecified");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=16)]
-        public string id {
-            get {
-                return this.idField;
-            }
-            set {
-                this.idField = value;
-                this.RaisePropertyChanged("id");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=17)]
-        public string jly {
-            get {
-                return this.jlyField;
-            }
-            set {
-                this.jlyField = value;
-                this.RaisePropertyChanged("jly");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=18)]
-        public decimal jz {
-            get {
-                return this.jzField;
-            }
-            set {
-                this.jzField = value;
-                this.RaisePropertyChanged("jz");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool jzSpecified {
-            get {
-                return this.jzFieldSpecified;
-            }
-            set {
-                this.jzFieldSpecified = value;
-                this.RaisePropertyChanged("jzSpecified");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=19)]
-        public string ly {
-            get {
-                return this.lyField;
-            }
-            set {
-                this.lyField = value;
-                this.RaisePropertyChanged("ly");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=20)]
-        public decimal mz {
-            get {
-                return this.mzField;
-            }
-            set {
-                this.mzField = value;
-                this.RaisePropertyChanged("mz");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool mzSpecified {
-            get {
-                return this.mzFieldSpecified;
-            }
-            set {
-                this.mzFieldSpecified = value;
-                this.RaisePropertyChanged("mzSpecified");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=21)]
-        public string netSpot3Name {
-            get {
-                return this.netSpot3NameField;
-            }
-            set {
-                this.netSpot3NameField = value;
-                this.RaisePropertyChanged("netSpot3Name");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=22)]
-        public string ph {
-            get {
-                return this.phField;
-            }
-            set {
-                this.phField = value;
-                this.RaisePropertyChanged("ph");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=23)]
-        public decimal pz {
-            get {
-                return this.pzField;
-            }
-            set {
-                this.pzField = value;
-                this.RaisePropertyChanged("pz");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool pzSpecified {
-            get {
-                return this.pzFieldSpecified;
-            }
-            set {
-                this.pzFieldSpecified = value;
-                this.RaisePropertyChanged("pzSpecified");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=24)]
-        public string qx {
-            get {
-                return this.qxField;
-            }
-            set {
-                this.qxField = value;
-                this.RaisePropertyChanged("qx");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=25)]
-        public System.DateTime rq {
-            get {
-                return this.rqField;
-            }
-            set {
-                this.rqField = value;
-                this.RaisePropertyChanged("rq");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool rqSpecified {
-            get {
-                return this.rqFieldSpecified;
-            }
-            set {
-                this.rqFieldSpecified = value;
-                this.RaisePropertyChanged("rqSpecified");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=26)]
-        public System.DateTime sj {
-            get {
-                return this.sjField;
-            }
-            set {
-                this.sjField = value;
-                this.RaisePropertyChanged("sj");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool sjSpecified {
-            get {
-                return this.sjFieldSpecified;
-            }
-            set {
-                this.sjFieldSpecified = value;
-                this.RaisePropertyChanged("sjSpecified");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=27)]
-        public string sjbz {
-            get {
-                return this.sjbzField;
-            }
-            set {
-                this.sjbzField = value;
-                this.RaisePropertyChanged("sjbz");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=28)]
-        public string updateManName {
-            get {
-                return this.updateManNameField;
-            }
-            set {
-                this.updateManNameField = value;
-                this.RaisePropertyChanged("updateManName");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=29)]
-        public string updateManNo {
-            get {
-                return this.updateManNoField;
-            }
-            set {
-                this.updateManNoField = value;
-                this.RaisePropertyChanged("updateManNo");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=30)]
-        public System.DateTime updateTime {
-            get {
-                return this.updateTimeField;
-            }
-            set {
-                this.updateTimeField = value;
-                this.RaisePropertyChanged("updateTime");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool updateTimeSpecified {
-            get {
-                return this.updateTimeFieldSpecified;
-            }
-            set {
-                this.updateTimeFieldSpecified = value;
-                this.RaisePropertyChanged("updateTimeSpecified");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=31)]
-        public string xh {
-            get {
-                return this.xhField;
-            }
-            set {
-                this.xhField = value;
-                this.RaisePropertyChanged("xh");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=32)]
-        public decimal shl_change {
-            get {
-                return this.shl_changeField;
-            }
-            set {
-                this.shl_changeField = value;
-                this.RaisePropertyChanged("shl_change");
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool shl_changeSpecified {
-            get {
-                return this.shl_changeFieldSpecified;
-            }
-            set {
-                this.shl_changeFieldSpecified = value;
-                this.RaisePropertyChanged("shl_changeSpecified");
-            }
-        }
-        
-        public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
-        
-        protected void RaisePropertyChanged(string propertyName) {
-            System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged;
-            if ((propertyChanged != null)) {
-                propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
-    [System.SerializableAttribute()]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://server.subject.steerinfo.com")]
-    public partial class ExportAccess : object, System.ComponentModel.INotifyPropertyChanged {
-        
-        private commonPage listField;
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=0)]
-        public commonPage list {
-            get {
-                return this.listField;
-            }
-            set {
-                this.listField = value;
-                this.RaisePropertyChanged("list");
-            }
-        }
-        
-        public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
-        
-        protected void RaisePropertyChanged(string propertyName) {
-            System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged;
-            if ((propertyChanged != null)) {
-                propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
-            }
-        }
-    }
-    
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
-    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="ExportAccess", WrapperNamespace="http://server.subject.steerinfo.com", IsWrapped=true)]
-    public partial class ExportAccess1 {
-        
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://server.subject.steerinfo.com", Order=0)]
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
-        public CreateAccess.ServiceReference1.commonPage list;
-        
-        public ExportAccess1() {
-        }
-        
-        public ExportAccess1(CreateAccess.ServiceReference1.commonPage list) {
-            this.list = list;
-        }
-    }
-    
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
-    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="ExportAccessResponse", WrapperNamespace="http://server.subject.steerinfo.com", IsWrapped=true)]
-    public partial class ExportAccessResponse {
-        
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://server.subject.steerinfo.com", Order=0)]
-        [System.Xml.Serialization.XmlElementAttribute("result", Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
-        public CreateAccess.ServiceReference1.meterToLimsOld[] result;
-        
-        public ExportAccessResponse() {
-        }
-        
-        public ExportAccessResponse(CreateAccess.ServiceReference1.meterToLimsOld[] result) {
-            this.result = result;
-        }
-    }
-    
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
-    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="doAccessCuImpl", WrapperNamespace="http://server.subject.steerinfo.com", IsWrapped=true)]
-    public partial class doAccessCuImpl {
-        
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://server.subject.steerinfo.com", Order=0)]
-        [System.Xml.Serialization.XmlElementAttribute("list", Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
-        public CreateAccess.ServiceReference1.meterWorkStorageActual[] list;
-        
-        public doAccessCuImpl() {
-        }
-        
-        public doAccessCuImpl(CreateAccess.ServiceReference1.meterWorkStorageActual[] list) {
-            this.list = list;
-        }
-    }
-    
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
-    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="doAccessCuImplResponse", WrapperNamespace="http://server.subject.steerinfo.com", IsWrapped=true)]
-    public partial class doAccessCuImplResponse1 {
-        
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://server.subject.steerinfo.com", Order=0)]
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
-        public CreateAccess.ServiceReference1.resTfulResult result;
-        
-        public doAccessCuImplResponse1() {
-        }
-        
-        public doAccessCuImplResponse1(CreateAccess.ServiceReference1.resTfulResult result) {
-            this.result = result;
-        }
-    }
-    
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
-    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="doQueryProAct", WrapperNamespace="http://server.subject.steerinfo.com", IsWrapped=true)]
-    public partial class doQueryProAct1 {
-        
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://server.subject.steerinfo.com", Order=0)]
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
-        public CreateAccess.ServiceReference1.commonPage list;
-        
-        public doQueryProAct1() {
-        }
-        
-        public doQueryProAct1(CreateAccess.ServiceReference1.commonPage list) {
-            this.list = list;
-        }
-    }
-    
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
-    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="doQueryProActResponse", WrapperNamespace="http://server.subject.steerinfo.com", IsWrapped=true)]
-    public partial class doQueryProActResponse {
-        
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://server.subject.steerinfo.com", Order=0)]
-        [System.Xml.Serialization.XmlElementAttribute("result", Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
-        public CreateAccess.ServiceReference1.meterWorkStorageActual[] result;
-        
-        public doQueryProActResponse() {
-        }
-        
-        public doQueryProActResponse(CreateAccess.ServiceReference1.meterWorkStorageActual[] result) {
-            this.result = result;
-        }
-    }
-    
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
-    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="doQueryStockOnlineWf", WrapperNamespace="http://server.subject.steerinfo.com", IsWrapped=true)]
-    public partial class doQueryStockOnlineWf1 {
-        
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://server.subject.steerinfo.com", Order=0)]
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
-        public CreateAccess.ServiceReference1.meterWorkStockOnline list;
-        
-        public doQueryStockOnlineWf1() {
-        }
-        
-        public doQueryStockOnlineWf1(CreateAccess.ServiceReference1.meterWorkStockOnline list) {
-            this.list = list;
-        }
-    }
-    
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
-    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="doQueryStockOnlineWfResponse", WrapperNamespace="http://server.subject.steerinfo.com", IsWrapped=true)]
-    public partial class doQueryStockOnlineWfResponse {
-        
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://server.subject.steerinfo.com", Order=0)]
-        [System.Xml.Serialization.XmlElementAttribute("result", Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
-        public CreateAccess.ServiceReference1.meterWorkStockOnline[] result;
-        
-        public doQueryStockOnlineWfResponse() {
-        }
-        
-        public doQueryStockOnlineWfResponse(CreateAccess.ServiceReference1.meterWorkStockOnline[] result) {
-            this.result = result;
-        }
-    }
-    
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
-    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="doQueryTimeWf", WrapperNamespace="http://server.subject.steerinfo.com", IsWrapped=true)]
-    public partial class doQueryTimeWf1 {
-        
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://server.subject.steerinfo.com", Order=0)]
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
-        public CreateAccess.ServiceReference1.commonPage list;
-        
-        public doQueryTimeWf1() {
-        }
-        
-        public doQueryTimeWf1(CreateAccess.ServiceReference1.commonPage list) {
-            this.list = list;
-        }
-    }
-    
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
-    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="doQueryTimeWfResponse", WrapperNamespace="http://server.subject.steerinfo.com", IsWrapped=true)]
-    public partial class doQueryTimeWfResponse {
-        
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://server.subject.steerinfo.com", Order=0)]
-        [System.Xml.Serialization.XmlElementAttribute("result", Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
-        public CreateAccess.ServiceReference1.meterWorkStorageActual[] result;
-        
-        public doQueryTimeWfResponse() {
-        }
-        
-        public doQueryTimeWfResponse(CreateAccess.ServiceReference1.meterWorkStorageActual[] result) {
-            this.result = result;
-        }
-    }
-    
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
-    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="doQueryComBaseInfoWf", WrapperNamespace="http://server.subject.steerinfo.com", IsWrapped=true)]
-    public partial class doQueryComBaseInfoWf1 {
-        
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://server.subject.steerinfo.com", Order=0)]
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
-        public CreateAccess.ServiceReference1.comBaseInfo list;
-        
-        public doQueryComBaseInfoWf1() {
-        }
-        
-        public doQueryComBaseInfoWf1(CreateAccess.ServiceReference1.comBaseInfo list) {
-            this.list = list;
-        }
-    }
-    
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
-    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="doQueryComBaseInfoWfResponse", WrapperNamespace="http://server.subject.steerinfo.com", IsWrapped=true)]
-    public partial class doQueryComBaseInfoWfResponse {
-        
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://server.subject.steerinfo.com", Order=0)]
-        [System.Xml.Serialization.XmlElementAttribute("result", Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
-        public CreateAccess.ServiceReference1.comBaseInfo[] result;
-        
-        public doQueryComBaseInfoWfResponse() {
-        }
-        
-        public doQueryComBaseInfoWfResponse(CreateAccess.ServiceReference1.comBaseInfo[] result) {
-            this.result = result;
-        }
-    }
-    
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
-    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="doUpdateProAct", WrapperNamespace="http://server.subject.steerinfo.com", IsWrapped=true)]
-    public partial class doUpdateProAct {
-        
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://server.subject.steerinfo.com", Order=0)]
-        [System.Xml.Serialization.XmlElementAttribute("list", Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
-        public CreateAccess.ServiceReference1.meterWorkStorageActual[] list;
-        
-        public doUpdateProAct() {
-        }
-        
-        public doUpdateProAct(CreateAccess.ServiceReference1.meterWorkStorageActual[] list) {
-            this.list = list;
-        }
-    }
-    
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
-    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="doUpdateProActResponse", WrapperNamespace="http://server.subject.steerinfo.com", IsWrapped=true)]
-    public partial class doUpdateProActResponse1 {
-        
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://server.subject.steerinfo.com", Order=0)]
-        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
-        public CreateAccess.ServiceReference1.resTfulResult result;
-        
-        public doUpdateProActResponse1() {
-        }
-        
-        public doUpdateProActResponse1(CreateAccess.ServiceReference1.resTfulResult result) {
-            this.result = result;
-        }
-    }
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
-    public interface WebServerChannel : CreateAccess.ServiceReference1.WebServer, System.ServiceModel.IClientChannel {
-    }
-    
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
-    public partial class WebServerClient : System.ServiceModel.ClientBase<CreateAccess.ServiceReference1.WebServer>, CreateAccess.ServiceReference1.WebServer {
-        
-        public WebServerClient() {
-        }
-        
-        public WebServerClient(string endpointConfigurationName) : 
-                base(endpointConfigurationName) {
-        }
-        
-        public WebServerClient(string endpointConfigurationName, string remoteAddress) : 
-                base(endpointConfigurationName, remoteAddress) {
-        }
-        
-        public WebServerClient(string endpointConfigurationName, System.ServiceModel.EndpointAddress remoteAddress) : 
-                base(endpointConfigurationName, remoteAddress) {
-        }
-        
-        public WebServerClient(System.ServiceModel.Channels.Binding binding, System.ServiceModel.EndpointAddress remoteAddress) : 
-                base(binding, remoteAddress) {
-        }
-        
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-        CreateAccess.ServiceReference1.ExportAccessResponse CreateAccess.ServiceReference1.WebServer.ExportAccess(CreateAccess.ServiceReference1.ExportAccess1 request) {
-            return base.Channel.ExportAccess(request);
-        }
-        
-        public CreateAccess.ServiceReference1.meterToLimsOld[] ExportAccess(CreateAccess.ServiceReference1.commonPage list) {
-            CreateAccess.ServiceReference1.ExportAccess1 inValue = new CreateAccess.ServiceReference1.ExportAccess1();
-            inValue.list = list;
-            CreateAccess.ServiceReference1.ExportAccessResponse retVal = ((CreateAccess.ServiceReference1.WebServer)(this)).ExportAccess(inValue);
-            return retVal.result;
-        }
-        
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-        CreateAccess.ServiceReference1.doAccessCuImplResponse1 CreateAccess.ServiceReference1.WebServer.doAccessCuImpl(CreateAccess.ServiceReference1.doAccessCuImpl request) {
-            return base.Channel.doAccessCuImpl(request);
-        }
-        
-        public CreateAccess.ServiceReference1.resTfulResult doAccessCuImpl(CreateAccess.ServiceReference1.meterWorkStorageActual[] list) {
-            CreateAccess.ServiceReference1.doAccessCuImpl inValue = new CreateAccess.ServiceReference1.doAccessCuImpl();
-            inValue.list = list;
-            CreateAccess.ServiceReference1.doAccessCuImplResponse1 retVal = ((CreateAccess.ServiceReference1.WebServer)(this)).doAccessCuImpl(inValue);
-            return retVal.result;
-        }
-        
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-        CreateAccess.ServiceReference1.doQueryProActResponse CreateAccess.ServiceReference1.WebServer.doQueryProAct(CreateAccess.ServiceReference1.doQueryProAct1 request) {
-            return base.Channel.doQueryProAct(request);
-        }
-        
-        public CreateAccess.ServiceReference1.meterWorkStorageActual[] doQueryProAct(CreateAccess.ServiceReference1.commonPage list) {
-            CreateAccess.ServiceReference1.doQueryProAct1 inValue = new CreateAccess.ServiceReference1.doQueryProAct1();
-            inValue.list = list;
-            CreateAccess.ServiceReference1.doQueryProActResponse retVal = ((CreateAccess.ServiceReference1.WebServer)(this)).doQueryProAct(inValue);
-            return retVal.result;
-        }
-        
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-        CreateAccess.ServiceReference1.doQueryStockOnlineWfResponse CreateAccess.ServiceReference1.WebServer.doQueryStockOnlineWf(CreateAccess.ServiceReference1.doQueryStockOnlineWf1 request) {
-            return base.Channel.doQueryStockOnlineWf(request);
-        }
-        
-        public CreateAccess.ServiceReference1.meterWorkStockOnline[] doQueryStockOnlineWf(CreateAccess.ServiceReference1.meterWorkStockOnline list) {
-            CreateAccess.ServiceReference1.doQueryStockOnlineWf1 inValue = new CreateAccess.ServiceReference1.doQueryStockOnlineWf1();
-            inValue.list = list;
-            CreateAccess.ServiceReference1.doQueryStockOnlineWfResponse retVal = ((CreateAccess.ServiceReference1.WebServer)(this)).doQueryStockOnlineWf(inValue);
-            return retVal.result;
-        }
-        
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-        CreateAccess.ServiceReference1.doQueryTimeWfResponse CreateAccess.ServiceReference1.WebServer.doQueryTimeWf(CreateAccess.ServiceReference1.doQueryTimeWf1 request) {
-            return base.Channel.doQueryTimeWf(request);
-        }
-        
-        public CreateAccess.ServiceReference1.meterWorkStorageActual[] doQueryTimeWf(CreateAccess.ServiceReference1.commonPage list) {
-            CreateAccess.ServiceReference1.doQueryTimeWf1 inValue = new CreateAccess.ServiceReference1.doQueryTimeWf1();
-            inValue.list = list;
-            CreateAccess.ServiceReference1.doQueryTimeWfResponse retVal = ((CreateAccess.ServiceReference1.WebServer)(this)).doQueryTimeWf(inValue);
-            return retVal.result;
-        }
-        
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-        CreateAccess.ServiceReference1.doQueryComBaseInfoWfResponse CreateAccess.ServiceReference1.WebServer.doQueryComBaseInfoWf(CreateAccess.ServiceReference1.doQueryComBaseInfoWf1 request) {
-            return base.Channel.doQueryComBaseInfoWf(request);
-        }
-        
-        public CreateAccess.ServiceReference1.comBaseInfo[] doQueryComBaseInfoWf(CreateAccess.ServiceReference1.comBaseInfo list) {
-            CreateAccess.ServiceReference1.doQueryComBaseInfoWf1 inValue = new CreateAccess.ServiceReference1.doQueryComBaseInfoWf1();
-            inValue.list = list;
-            CreateAccess.ServiceReference1.doQueryComBaseInfoWfResponse retVal = ((CreateAccess.ServiceReference1.WebServer)(this)).doQueryComBaseInfoWf(inValue);
-            return retVal.result;
-        }
-        
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-        CreateAccess.ServiceReference1.doUpdateProActResponse1 CreateAccess.ServiceReference1.WebServer.doUpdateProAct(CreateAccess.ServiceReference1.doUpdateProAct request) {
-            return base.Channel.doUpdateProAct(request);
-        }
-        
-        public CreateAccess.ServiceReference1.resTfulResult doUpdateProAct(CreateAccess.ServiceReference1.meterWorkStorageActual[] list) {
-            CreateAccess.ServiceReference1.doUpdateProAct inValue = new CreateAccess.ServiceReference1.doUpdateProAct();
-            inValue.list = list;
-            CreateAccess.ServiceReference1.doUpdateProActResponse1 retVal = ((CreateAccess.ServiceReference1.WebServer)(this)).doUpdateProAct(inValue);
-            return retVal.result;
-        }
-    }
-}

CreateAccess/CreateAccess.csproj

@@ -9,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CreateAccess</RootNamespace>
     <AssemblyName>CreateAccess</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -21,6 +22,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -29,6 +31,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="ADODB, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

CreateAccess/app.config

@@ -1,15 +1,13 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <system.serviceModel>
         <bindings>
             <basicHttpBinding>
-              <binding name="WebServerSoapBinding" maxBufferSize="2147483647" maxBufferPoolSize="524288" maxReceivedMessageSize="2147483647" />
+              <binding name="WebServerSoapBinding" maxBufferSize="2147483647" maxBufferPoolSize="524288" maxReceivedMessageSize="2147483647"/>
             </basicHttpBinding>
         </bindings>
         <client>
-            <endpoint address="http://172.22.4.6:9004/webservice/limssubject"
-                binding="basicHttpBinding" bindingConfiguration="WebServerSoapBinding"
-                contract="ServiceReference1.WebServer" name="WebServerimplPort" />
+            <endpoint address="http://172.22.4.6:9004/webservice/limssubject" binding="basicHttpBinding" bindingConfiguration="WebServerSoapBinding" contract="ServiceReference1.WebServer" name="WebServerimplPort"/>
         </client>
     </system.serviceModel>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>

MeterSceneLibrary/JISCO/OuterCarJISCO.cs

@@ -53,7 +53,7 @@ namespace MeterSceneLibrary
             mwaf.baseSpotNo = PbCache.sportInfo.baseSpotNo;//计量点编号
             mwaf.baseSpotName = PbCache.sportInfo.baseSpotName;
             //mwaf.memo = "";
-            mwaf.valueFlag = "3"; //状态（0 = 作废，1 = 有效(已匹配)，2 = 结净，3 = 未匹配）
+            mwaf.valueFlag = "1"; //状态（0 = 作废，1 = 有效(已匹配)，2 = 结净，3 = 未匹配）
             mwaf.updateManName = "";
             mwaf.updateManNo = "";
             mwaf.updateTime = null;
@@ -61,6 +61,7 @@ namespace MeterSceneLibrary
             mwaf.meterMode = "2"; //1：远程计量；2：智能计量；3：手工录入；4：放行智能计量；5：滞后匹配
             mwaf.addWeight = PbCache.addWgt;
             mwaf.dataSource = "1"; //数据来源(1=智能终端，2=本地计量，3=应急计量，4=手动录入(计量票据录入))
+            mwaf.isPreScale = "0";
 
             // VALUE_FLAG 状态（0=作废，1=有效(已匹配)，2=结净，3=未匹配）
             // 根据车号查询最近的一次计量数据
@@ -69,16 +70,21 @@ namespace MeterSceneLibrary
             {
                 List<MeterWorkCarActualFirst> list = rmX.Data;
 
+                // 根据车号查询委托表中未使用和使用中的委托
+                // 状态（0：未配车；1：未使用；2：已使用；3：已作废；4：正使用）
+                RESTfulResult<List<PreTrackScale>> rmPre = preTrackScaleService.doQueryByFlag(new PreTrackScale { carNo = PbCache.lockCarNo });
+                listPreScale = rmPre.Data;
+
                 // 不存在一次计量数据
                 if (list == null || list.Count == 0)
                 {
-                    // 根据车号查询委托表中未使用和使用中的委托
-                    // 状态（0：未配车；1：未使用；2：已使用；3：已作废；4：正使用）
-                    RESTfulResult<List<PreTrackScale>> rmPre = preTrackScaleService.doQueryByFlag(new PreTrackScale { carNo = PbCache.lockCarNo});
+                    //// 根据车号查询委托表中未使用和使用中的委托
+                    //// 状态（0：未配车；1：未使用；2：已使用；3：已作废；4：正使用）
+                    //RESTfulResult<List<PreTrackScale>> rmPre = preTrackScaleService.doQueryByFlag(new PreTrackScale { carNo = PbCache.lockCarNo});
 
                     if (rmPre.Succeed)
                     {
-                        listPreScale = rmPre.Data;
+                        //listPreScale = rmPre.Data;
                         // 不存在委托
                         if (listPreScale == null || listPreScale.Count == 0)    
                         {
@@ -127,13 +133,13 @@ namespace MeterSceneLibrary
 
                                     
                                     // 上次净重记录未匹配委托
-                                    if (lastMeterWorkCarActual.valueFlag == "3")
+                                    if (lastMeterWorkCarActual.isPreScale == "0")
                                     {
                                         rt = saveMethod.doAddFirst(null, mwaf);
                                         rt = saveMethod.doError("称重完成，上次净重数据未匹配委托，请联系计量大厅");
                                     }
                                     // 上次净重已匹配委托 
-                                    else if (lastMeterWorkCarActual.valueFlag == "1")
+                                    else if (lastMeterWorkCarActual.isPreScale == "1")
                                     {
                                         /* 委托和当次存在委托满足一车多卸逻辑 && 当次重量值小于上次净重记录中的皮重值
                                          * 一车多卸判断逻辑1
@@ -148,23 +154,28 @@ namespace MeterSceneLibrary
                                         // 签发时间比较
                                         // 通过上次洁净记录，找到该委托的签发时间
                                         RESTfulResult<List<PreTrackScale>> lastPre = preTrackScaleService.doQueryWf(new PreTrackScale { predictionNo = lastMeterWorkCarActual.predictionNo });
-                                        int min = 999;
-
-                                        if (lastPre.Succeed && lastPre.Data.Count == 1)
-                                        {
-                                            TimeSpan ts = new TimeSpan();
-                                            ts = DateTime.Parse(listPreScale[0].trustDateTime.ToString()) - DateTime.Parse(lastPre.Data[0].trustDateTime.ToString());
-
-                                            min = ts.Minutes; //此为相差分钟
-                                        }
-
-                                        // 一车多卸 && 当次重量值小于上次净重记录中的皮重值
-                                        if (listPreScale[0].meterTypeNo.Equals("xxxx") && PbCache.lockWgt < lastMeterWorkCarActual.tareWeight)
-                                        {
-                                            isYCDX = true;
-                                        }
-                                        // 如果两条数据发货单位一致，收货单位不一致，且签发时间在10分钟内，则可判定为一车多卸业务
-                                        else if (listPreScale[0].forwardingUnitNo.Equals(lastMeterWorkCarActual.forwardingUnitNo) && listPreScale[0].receivingUintNo.Equals(lastMeterWorkCarActual.receivingUintNo) && min <= 10)
+                                        //int min = 999;
+
+                                        //if (lastPre.Succeed && lastPre.Data.Count == 1)
+                                        //{
+                                        //    TimeSpan ts = new TimeSpan();
+                                        //    ts = DateTime.Parse(listPreScale[0].trustDateTime.ToString()) - DateTime.Parse(lastPre.Data[0].trustDateTime.ToString());
+
+                                        //    min = ts.Minutes; //此为相差分钟
+                                        //}
+
+                                        //// 一车多卸 && 当次重量值小于上次净重记录中的皮重值
+                                        //if (listPreScale[0].meterTypeNo.Equals("xxxx"))
+                                        //{
+                                        //    isYCDX = true;
+                                        //}
+                                        //// 如果两条数据发货单位一致，收货单位不一致，且签发时间在10分钟内，则可判定为一车多卸业务
+                                        //else if (listPreScale[0].forwardingUnitNo.Equals(lastMeterWorkCarActual.forwardingUnitNo) && !listPreScale[0].receivingUintNo.Equals(lastMeterWorkCarActual.receivingUintNo) && min <= 10)
+                                        //{
+                                        //    isYCDX = true;
+                                        //}
+
+                                        if (lastPre.Data[0].predictionCombination == listPreScale[0].predictionCombination && lastPre.Data[0].predictionType == "6" && listPreScale[0].predictionType == "6")
                                         {
                                             isYCDX = true;
                                         }
@@ -180,7 +191,7 @@ namespace MeterSceneLibrary
                                             tempCarActualFirst.carNo = PbCache.lockCarNo;
                                             tempCarActualFirst.weightType = "0";  // 重量类型（0=毛重；1=常规皮重；2=期限皮重；3=历史皮重；4=标识皮重；5=自重皮重）
                                             tempCarActualFirst.actualFirstNo = DateTime.Now.ToString("yyyyMMdd");//10
-                                            tempCarActualFirst.meterWeight = PbCache.lockWgt;//计量重量
+                                            tempCarActualFirst.meterWeight = lastMeterWorkCarActual.tareWeight;//计量重量
                                             tempCarActualFirst.addWeight = PbCache.addWgt;//附加重量
                                             tempCarActualFirst.createManNo = PbCache.sportInfo.baseSpotNo;
                                             tempCarActualFirst.createManName = PbCache.sportInfo.baseSpotName;
@@ -190,7 +201,7 @@ namespace MeterSceneLibrary
                                             tempCarActualFirst.baseSpotNo = PbCache.sportInfo.baseSpotNo;//计量点编号
                                             tempCarActualFirst.baseSpotName = PbCache.sportInfo.baseSpotName;
                                             //mwaf.memo = "";
-                                            tempCarActualFirst.valueFlag = "3"; //状态（0 = 作废，1 = 有效(已匹配)，2 = 结净，3 = 未匹配）
+                                            tempCarActualFirst.valueFlag = "1"; //状态（0 = 作废，1 = 有效(已匹配)，2 = 结净，3 = 未匹配）
                                             tempCarActualFirst.updateManName = "";
                                             tempCarActualFirst.updateManNo = "";
                                             tempCarActualFirst.updateTime = null;
@@ -198,16 +209,20 @@ namespace MeterSceneLibrary
                                             tempCarActualFirst.meterMode = "2"; //1：远程计量；2：智能计量；3：手工录入；4：放行智能计量；5：滞后匹配
                                             tempCarActualFirst.addWeight = PbCache.addWgt;
                                             tempCarActualFirst.dataSource = "1"; //数据来源(1=智能终端，2=本地计量，3=应急计量，4=手动录入(计量票据录入))
+                                            tempCarActualFirst.isPreScale = "1";
 
                                             // 复制对象，将档次委托信息复制给一次记录
                                             EntityBase<PreTrackScale> entityBase = new EntityBase<PreTrackScale>();
                                             tempCarActualFirst = entityBase.format<MeterWorkCarActualFirst>(listPreScale[0], tempCarActualFirst);
 
+                                            EntityBase<PreTrackScale> entityBase1 = new EntityBase<PreTrackScale>();
+                                            mwaf = entityBase1.format<MeterWorkCarActualFirst>(listPreScale[0], mwaf);
 
                                             // 将当次一次计量数据重量类型改为皮重
                                             mwaf.weightType = "1"; // 常规皮重
+                                            mwaf.isPreScale = "1";
                                             // 混装卸逻辑，并洁净匹配委托
-                                            rt = saveMethod.doNetHZHX(scale, tempCarActualFirst, mwaf);
+                                            rt = saveMethod.doNetHZHX(listPreScale[0], tempCarActualFirst, mwaf);
                                         }
 
                                         /* 匹配委托和当次委托满足混装逻辑 && 当次重量大于上次净重记录中的毛重值
@@ -264,7 +279,7 @@ namespace MeterSceneLibrary
                                             newActualFirst.baseSpotNo = PbCache.sportInfo.baseSpotNo;//计量点编号
                                             newActualFirst.baseSpotName = PbCache.sportInfo.baseSpotName;
                                             //mwaf.memo = "";
-                                            newActualFirst.valueFlag = "3"; //状态（0 = 作废，1 = 有效(已匹配)，2 = 结净，3 = 未匹配）
+                                            newActualFirst.valueFlag = "1"; //状态（0 = 作废，1 = 有效(已匹配)，2 = 结净，3 = 未匹配）
                                             newActualFirst.updateManName = "";
                                             newActualFirst.updateManNo = "";
                                             newActualFirst.updateTime = null;
@@ -272,11 +287,20 @@ namespace MeterSceneLibrary
                                             newActualFirst.meterMode = "2"; //1：远程计量；2：智能计量；3：手工录入；4：放行智能计量；5：滞后匹配
                                             newActualFirst.addWeight = PbCache.addWgt;
                                             newActualFirst.dataSource = "1"; //数据来源(1=智能终端，2=本地计量，3=应急计量，4=手动录入(计量票据录入))
+                                            newActualFirst.isPreScale = "1";
+
+                                            // 复制对象，将档次委托信息复制给一次记录
+                                            EntityBase<PreTrackScale> entityBase = new EntityBase<PreTrackScale>();
+                                            newActualFirst = entityBase.format<MeterWorkCarActualFirst>(listPreScale[0], newActualFirst);
+
+                                            EntityBase<PreTrackScale> entityBase1 = new EntityBase<PreTrackScale>();
+                                            mwaf = entityBase1.format<MeterWorkCarActualFirst>(listPreScale[0], mwaf);
 
                                             // 将当次一次计量数据重量类型改为毛重
                                             mwaf.weightType = "0"; // 毛重
+                                            mwaf.isPreScale = "1";
                                             // 混装逻辑，并洁净匹配委托
-                                            rt = saveMethod.doNetHZHX(scale, newActualFirst, mwaf);
+                                            rt = saveMethod.doNetHZHX(listPreScale[0], newActualFirst, mwaf);
                                         }
 
                                     }
@@ -305,7 +329,16 @@ namespace MeterSceneLibrary
                             * a. 正常保存重量(重量类型为空)
                             * b. 提示称重完成
                             */
-                            rt = saveMethod.doAddFirst(null, mwaf);
+                            PreTrackScale pre = null;
+                            if (listPreScale.Count == 2 &&  listPreScale[0].valueFlag == "1" && listPreScale[1].valueFlag == "1" && listPreScale[0].predictionType == "6" && listPreScale[1].predictionType == "6")
+                            {
+                                pre = listPreScale[0];
+                            }
+                            if (listPreScale.Count == 2 && listPreScale[0].valueFlag == "1" && listPreScale[1].valueFlag == "1" && listPreScale[0].predictionType == "7" && listPreScale[1].predictionType == "7")
+                            {
+                                pre = listPreScale[0];
+                            }
+                            rt = saveMethod.doAddFirst(pre, mwaf);
                         }
                     }
 
@@ -334,156 +367,178 @@ namespace MeterSceneLibrary
                     // 校验上次计量数据和当次计量数据是否满足基础配置表中的洁净最小值条件
                     if (Math.Abs(rmX.Data[0].meterWeight.Value - PbCache.lockWgt) > diffrentWgt)
                     {
-                        // 存在的一次计量数据未匹配委托
-                        if (rmX.Data[0].valueFlag == "3")
+                        if (rmPre.Succeed)
                         {
-                            // 不存在委托数据
-                            if (listPreScale == null || listPreScale.Count == 0)
+                            // 存在的一次计量数据未匹配委托
+                            if (rmX.Data[0].isPreScale == "0")
                             {
-                                /*
-                                 * a. 正常产生洁净数据(状态为未发布)
-                                 * b. 提示司机当前计量数据未匹配委托，请联系计量打印进行处理
-                                 */
-
-                                rt = saveMethod.doNet(scale, rmX.Data[0], mwaf);
-
-                            }
-                            // 只存在一条使用中的委托
-                            else if (listPreScale.Count == 1 && listPreScale[0].valueFlag == "4")
-                            {
-                                /*
-                                 * a. 程序报警
-                                 * b. 提示司机存在一条使用中的委托，请联系计量大厅进行确认
-                                 * c. 自动进行语音求助
-                                 */
+                                // 不存在委托数据
+                                if (listPreScale == null || listPreScale.Count == 0)
+                                {
+                                    /*
+                                     * a. 正常产生洁净数据(状态为未发布)
+                                     * b. 提示司机当前计量数据未匹配委托，请联系计量打印进行处理
+                                     */
 
-                                rt = saveMethod.doError("存在一条使用中的委托，请联系计量大厅进行确认");
-                            }
-                            // 只存在一条未使用的委托数据
-                            else if (listPreScale.Count == 1 && (listPreScale[0].valueFlag == "0" || listPreScale[0].valueFlag == "1"))
-                            {
-                                /*
-                                 * a. 程序根据大减小的原则，保存净重并正确设置一次计量数据中的重量类型
-                                 * b. 播放称重完成的语音提示
-                                 */
+                                    rt = saveMethod.doNet(scale, rmX.Data[0], mwaf);
 
-                                rt = saveMethod.doNetAndScale(scale, rmX.Data[0], mwaf);
-                            }
-                            // 如果存在两条未使用的委托
-                            else if (listPreScale.Count == 2 && (listPreScale[0].valueFlag == "0" || listPreScale[0].valueFlag == "1"))
-                            {
-                                /* 委托关系满足双委托逻辑
-                                 * 分两种情况：
-                                 * 1、委托数据货源字段中带有委托标识，且两条委托类型都是双委托。
-                                 * 2、委托数据中没有带有委托标识，则根据签发时间排序，如果第一条委托的物料和第二条委托数据的相同，且第一条委托的收货单位是第二条委托的发货单位。
-                                 */
-                                if (1 == 1)
-                                {
-                                    // 正常洁净并生成两条净重数据
-                                    rt = saveMethod.doNetAddTwo(scale, rmX.Data[0]);
                                 }
-                                /*
-                                 * 委托关系满足一车多卸逻辑
-                                 * 分两种情况：
-                                 * 1、委托数据中没有委托类型标识，则根据签发时间排序，如果两条数据发货单位一致，收货单位不一致，且签发时间在10分钟内，则可判定为一车多卸业务，根据时间顺序选择第一条委托产生净重数据，然后使用第二条委托产生一个毛重数据。
-                                 * 2、委托数据中存在委托类型标识，且类型都为一车多卸。
-                                 */
-                                else if (2 == 2)
+                                // 只存在一条使用中的委托
+                                else if (listPreScale.Count == 1 && listPreScale[0].valueFlag == "4")
                                 {
                                     /*
-                                     * a. 正常洁净产生一条净重记录
-                                     * b. 自动生成一条一次毛重计量数据，重量值值为当次计量数据中的毛重
+                                     * a. 程序报警
+                                     * b. 提示司机存在一条使用中的委托，请联系计量大厅进行确认
+                                     * c. 自动进行语音求助
                                      */
 
-                                    // 将当次一次计量数据重量类型改为毛重
-                                    mwaf.weightType = "0"; // 毛重
-                                    // 洁净匹配委托
-                                    rt = saveMethod.doNetMass(scale, mwaf);
+                                    rt = saveMethod.doError("存在一条使用中的委托，请联系计量大厅进行确认");
                                 }
-                                // 不满足以上逻辑
-                                else
+                                // 只存在一条未使用的委托数据
+                                else if (listPreScale.Count == 1 && (listPreScale[0].valueFlag == "0" || listPreScale[0].valueFlag == "1"))
                                 {
                                     /*
-                                     * a. 正常洁净产生一条净重记录(状态为未发布)
-                                     * b. 提示司机当前存计量数据未匹配委托
-                                     * c. 进行大厅报警，请联系计量大厅进行处理
-                                     * d. 自动进行语音求助(但是原有的语音求助逻辑是重量归零相应秤点的求助信息也会清空)
+                                     * a. 程序根据大减小的原则，保存净重并正确设置一次计量数据中的重量类型
+                                     * b. 播放称重完成的语音提示
                                      */
+                                    rt = saveMethod.doNetAndScale(scale, rmX.Data[0], mwaf);
+                                }
+                                // 如果存在两条未使用的委托
+                                else if (listPreScale.Count == 2 && listPreScale[1].valueFlag == "1" && listPreScale[1].valueFlag == "1")
+                                {
+                                    /* 委托关系满足双委托逻辑
+                                     * 分两种情况：
+                                     * 1、委托数据货源字段中带有委托标识，且两条委托类型都是双委托。
+                                     * 2、委托数据中没有带有委托标识，则根据签发时间排序，如果第一条委托的物料和第二条委托数据的相同，且第一条委托的收货单位是第二条委托的发货单位。
+                                     */
+                                    if (listPreScale[0].predictionType == "5" && listPreScale[1].predictionType == "5" && listPreScale[0].predictionCombination == listPreScale[1].predictionCombination)
+                                    {
+                                        // 正常洁净并生成两条净重数据
+                                        rt = saveMethod.doNetAddTwo(listPreScale, rmX.Data[0], mwaf);
+                                    }
+                                    /*
+                                     * 委托关系满足一车多卸逻辑
+                                     * 分两种情况：
+                                     * 1、委托数据中没有委托类型标识，则根据签发时间排序，如果两条数据发货单位一致，收货单位不一致，且签发时间在10分钟内，则可判定为一车多卸业务，根据时间顺序选择第一条委托产生净重数据，然后使用第二条委托产生一个毛重数据。
+                                     * 2、委托数据中存在委托类型标识，且类型都为一车多卸。
+                                     */
+                                    else if (listPreScale[0].predictionType == "6" && listPreScale[1].predictionType == "6" || listPreScale[0].predictionType == "7" && listPreScale[1].predictionType == "7")
+                                    {
+                                        /*
+                                         * a. 正常洁净产生一条净重记录
+                                         * b. 自动生成一条一次毛重计量数据，重量值值为当次计量数据中的毛重
+                                         */
+                                        MeterWorkCarActualFirst mwca = new MeterWorkCarActualFirst();
+                                        mwca = rmX.Data[0];
+                                        mwca.isPreScale = "1";
+
+                                        EntityBase<PreTrackScale> entityBase = new EntityBase<PreTrackScale>();
+                                        mwca = entityBase.format<MeterWorkCarActualFirst>(listPreScale[0], mwca);
+
+                                        EntityBase<PreTrackScale> entityBase1 = new EntityBase<PreTrackScale>();
+                                        mwaf = entityBase1.format<MeterWorkCarActualFirst>(listPreScale[0], mwaf);
+                                        mwaf.isPreScale = "1";
 
+                                        rt = saveMethod.doNet(listPreScale[0], mwca, mwaf);
+                                    }
+                                    // 不满足以上逻辑
+                                    else
+                                    {
+                                        /*
+                                         * a. 正常洁净产生一条净重记录(状态为未发布)
+                                         * b. 提示司机当前存计量数据未匹配委托
+                                         * c. 进行大厅报警，请联系计量大厅进行处理
+                                         * d. 自动进行语音求助(但是原有的语音求助逻辑是重量归零相应秤点的求助信息也会清空)
+                                         */
+
+                                        rt = saveMethod.doNet(scale, rmX.Data[0], mwaf);
+                                        rt = saveMethod.doError("称重完成，当前所存计量数据未匹配委托，请联系计量大厅进行处理");
+                                    }
+                                }
+                                // 存在多条未使用的委托数据
+                                else if (listPreScale.Count > 2 && (listPreScale[0].valueFlag == "0" || listPreScale[0].valueFlag == "1"))
+                                {
+                                    ///* 委托关系满足多委托逻辑
+                                    // * 多委托判定逻辑：
+                                    // * 多条委托数据都存在委托类型依据，且类型都是多委托。
+                                    // */
+                                    //if (1 == 1)
+                                    //{
+                                    //    // 正常洁净并生成两条净重数据
+                                    //    rt = saveMethod.doNetAddTwo(listPreScale, rmX.Data[0], mwaf);
+                                    //}
+                                    ///*
+                                    // * 委托关系满足一车多卸逻辑
+                                    // * 一车多卸逻辑：多条委托都存在委托判断依据，且类型都是一车多卸委托。
+                                    // */
+                                    //else if (2 == 2)
+                                    //{
+                                    //    /*
+                                    //     * a. 正常洁净产生一条净重记录
+                                    //     * b. 自动生成一条一次毛重计量数据，重量值值为当次计量数据中的毛重
+                                    //     */
+
+                                    //    // 将当次一次计量数据重量类型改为毛重
+                                    //    mwaf.weightType = "0"; // 毛重
+                                    //                           // 洁净匹配委托
+                                    //    rt = saveMethod.doNetMass(scale, mwaf);
+                                    //}
+                                    //// 不满足以上逻辑
+                                    //else
+                                    //{
+                                    //    /*
+                                    //     * a. 正常洁净产生一条净重记录(状态为未发布)
+                                    //     * b. 提示司机当前计量数据未匹配委托，请联系计量大厅进行委托匹配
+                                    //     * c. 自动进行语音求助(但是原有的语音求助逻辑是重量归零相应秤点的求助信息也会清空)
+                                    //     */
+                                    //    rt = saveMethod.doNet(scale, rmX.Data[0], mwaf);
+                                    //    rt = saveMethod.doError("称重完成，当前所存计量数据未匹配委托，请联系计量大厅进行处理");
+                                    //}
                                     rt = saveMethod.doNet(scale, rmX.Data[0], mwaf);
                                     rt = saveMethod.doError("称重完成，当前所存计量数据未匹配委托，请联系计量大厅进行处理");
                                 }
                             }
-                            // 存在多条未使用的委托数据
-                            else if (listPreScale.Count > 2 && (listPreScale[0].valueFlag == "0" || listPreScale[0].valueFlag == "1"))
+                            // 存在的一次计量数据已匹配委托
+                            else if (rmX.Data[0].isPreScale == "1")
                             {
-                                /* 委托关系满足多委托逻辑
-                                 * 多委托判定逻辑：
-                                 * 多条委托数据都存在委托类型依据，且类型都是多委托。
-                                 */
-                                if (1 == 1)
-                                {
-                                    // 正常洁净并生成两条净重数据
-
-                                    rt = saveMethod.doNetAddTwo(scale, mwaf);
-                                }
                                 /*
-                                 * 委托关系满足一车多卸逻辑
-                                 * 一车多卸逻辑：多条委托都存在委托判断依据，且类型都是一车多卸委托。
+                                 * a. 程序根据大减小的原则，保存净重并正确设置一次计量数据中的重量类型
+                                 * b. 播放称重完成的语音提示
                                  */
-                                else if (2 == 2)
+                                // 原数据大于新数据，原数据是毛重，新数据是皮重
+                                MeterWorkCarActualFirst oldCarActural = rmX.Data[0];
+                                if (rmX.Data[0].meterWeight.Value > PbCache.lockWgt)
                                 {
-                                    /*
-                                     * a. 正常洁净产生一条净重记录
-                                     * b. 自动生成一条一次毛重计量数据，重量值值为当次计量数据中的毛重
-                                     */
+                                    mwaf.weightType = "1";
+
+                                    oldCarActural.weightType = "0";
 
-                                    // 将当次一次计量数据重量类型改为毛重
-                                    mwaf.weightType = "0"; // 毛重
-                                    // 洁净匹配委托
-                                    rt = saveMethod.doNetMass(scale, mwaf);
                                 }
-                                // 不满足以上逻辑
                                 else
                                 {
-                                    /*
-                                     * a. 正常洁净产生一条净重记录(状态为未发布)
-                                     * b. 提示司机当前计量数据未匹配委托，请联系计量大厅进行委托匹配
-                                     * c. 自动进行语音求助(但是原有的语音求助逻辑是重量归零相应秤点的求助信息也会清空)
-                                     */
-                                    rt = saveMethod.doNet(scale, rmX.Data[0], mwaf);
-                                    rt = saveMethod.doError("称重完成，当前所存计量数据未匹配委托，请联系计量大厅进行处理");
+                                    mwaf.weightType = "0";
+
+                                    oldCarActural.weightType = "1";
                                 }
+                                PreTrackScale pts = null;
 
-                            }
-                        }
-                        // 存在的一次计量数据已匹配委托
-                        else if (rmX.Data[0].valueFlag == "1")
-                        {
-                            /*
-                             * a. 程序根据大减小的原则，保存净重并正确设置一次计量数据中的重量类型
-                             * b. 播放称重完成的语音提示
-                             */
-                            // 原数据大于新数据，原数据是毛重，新数据是皮重
-                            MeterWorkCarActualFirst oldCarActural = rmX.Data[0];
-                            if (rmX.Data[0].meterWeight.Value > PbCache.lockWgt)
-                            {
-                                mwaf.weightType = "1";
+                                foreach (var item in listPreScale)
+                                {
+                                    if (item.predictionNo == rmX.Data[0].predictionNo)
+                                    {
+                                        pts = item;
+                                    }
+                                }
 
-                                oldCarActural.weightType = "0";
+                                EntityBase<PreTrackScale> entityBase = new EntityBase<PreTrackScale>();
+                                mwaf = entityBase.format<MeterWorkCarActualFirst>(pts, mwaf);
+                                mwaf.isPreScale = "1";
 
-                            }
-                            else
-                            {
-                                mwaf.weightType = "0";
+                                rt = saveMethod.doNet(pts, oldCarActural, mwaf);
 
-                                oldCarActural.weightType = "1";
+                                rt.result = true;
+                                rt.resultInfo = "称重完成";
                             }
-
-                            rt = saveMethod.doNet(scale, oldCarActural, mwaf);
-
-                            rt.result = true;
-                            rt.resultInfo = "称重完成";
                         }
                         
                     }

MeterSceneLibrary/JISCO/private/SaveMethod.cs

@@ -106,6 +106,8 @@ namespace MeterSceneLibrary.JISCO
             // netDb.actualFirst1No = actualFirst.meterWeight.Value > PbCache.lockWgt ? actualFirst.actualFirstNo : actualFirst2.actualFirstNo;
             // 皮重计量作业编号
             // netDb.actualFirst2No = actualFirst.meterWeight.Value < PbCache.lockWgt ? actualFirst.actualFirstNo : actualFirst2.actualFirstNo;
+            netDb.actualFirst1No = actualFirst2.meterWeight.Value > actualFirst.meterWeight.Value ? "" : actualFirst.actualFirstNo;
+            netDb.actualFirst2No = actualFirst2.meterWeight.Value > actualFirst.meterWeight.Value ? actualFirst.actualFirstNo : "";
             netDb.grossTime = actualFirst.createTime;
             netDb.grossWeight = actualFirst.meterWeight.Value > PbCache.lockWgt ? actualFirst.meterWeight.Value : PbCache.lockWgt; // 谁大谁是毛 BourneCao
             netDb.baseSpot1No = actualFirst.baseSpotNo;
@@ -116,6 +118,7 @@ namespace MeterSceneLibrary.JISCO
             netDb.grossClass = actualFirst.meterClass;
             netDb.grossGroup = actualFirst.meterGroup;
             netDb.valueFlag = "2";
+            netDb.isPreScale = "1";
 
             netDb.netTime = DateTime.Now;
 
@@ -130,7 +133,8 @@ namespace MeterSceneLibrary.JISCO
             netDb.netMode = "1"; //1：正常结净；2：匹配结净
             netDb.valueFlag = "0"; //0=有效，1=作废
             netDb.uploadFlag = "0"; //0=待审核；1：待上传；2=已上传
-                                    //要判断下当前是否勾选了不验证皮重
+            netDb.dataSource = "1";//1 = 智能终端，2 = 本地计量，3 = 应急计量，4 = 手动录入(计量票据录入)
+                                  //要判断下当前是否勾选了不验证皮重
 
 
             //操作日志
@@ -180,12 +184,6 @@ namespace MeterSceneLibrary.JISCO
             // 复制委托
             if (scale != null)
             {
-                EntityBase<PreTrackScale> entityBase1 = new EntityBase<PreTrackScale>();
-                actualFirst = entityBase1.format<MeterWorkCarActualFirst>(scale, actualFirst);
-
-                EntityBase<PreTrackScale> entityBase2 = new EntityBase<PreTrackScale>();
-                actualFirst2 = entityBase2.format<MeterWorkCarActualFirst>(scale, actualFirst2);
-
                 EntityBase<PreTrackScale> entityBase3 = new EntityBase<PreTrackScale>();
                 netDb = entityBase3.format<MeterWorkCarActual>(scale, netDb);
             }
@@ -203,8 +201,8 @@ namespace MeterSceneLibrary.JISCO
              netDb.tare_class = "";
              netDb.tare_group = "";*/
 
-            netDb.actualFirst1No = actualFirst.meterWeight.Value > actualFirst2.meterWeight.Value ? actualFirst.actualFirstNo : actualFirst2.actualFirstNo;
-            netDb.actualFirst2No = actualFirst.meterWeight.Value < actualFirst2.meterWeight.Value ? actualFirst.actualFirstNo : actualFirst2.actualFirstNo;
+            //netDb.actualFirst1No = actualFirst.meterWeight.Value > actualFirst2.meterWeight.Value ? actualFirst.actualFirstNo : actualFirst2.actualFirstNo;
+            //netDb.actualFirst2No = actualFirst.meterWeight.Value < actualFirst2.meterWeight.Value ? actualFirst.actualFirstNo : actualFirst2.actualFirstNo;
             netDb.grossTime = actualFirst.createTime;
             netDb.grossWeight = actualFirst.meterWeight.Value > actualFirst2.meterWeight.Value ? actualFirst.meterWeight.Value : actualFirst2.meterWeight.Value; // 谁大谁是毛 BourneCao
             netDb.baseSpot1No = actualFirst.baseSpotNo;
@@ -214,7 +212,8 @@ namespace MeterSceneLibrary.JISCO
             netDb.grossManName = actualFirst.createManName;
             netDb.grossClass = actualFirst.meterClass;
             netDb.grossGroup = actualFirst.meterGroup;
-            netDb.valueFlag = "3";
+            netDb.valueFlag = "2";
+            netDb.isPreScale = "1";
 
             netDb.netTime = DateTime.Now;
 
@@ -229,7 +228,8 @@ namespace MeterSceneLibrary.JISCO
             netDb.netMode = "1"; //1：正常结净；2：匹配结净
             netDb.valueFlag = "0"; //0=有效，1=作废
             netDb.uploadFlag = "0"; //0=待审核；1：待上传；2=已上传
-                                    //要判断下当前是否勾选了不验证皮重
+            netDb.dataSource = "1";//1 = 智能终端，2 = 本地计量，3 = 应急计量，4 = 手动录入(计量票据录入)
+                                   //要判断下当前是否勾选了不验证皮重
 
 
             //操作日志
@@ -304,7 +304,9 @@ namespace MeterSceneLibrary.JISCO
             netDb.uploadFlag = "0"; //0=待审核；1：待上传；2=已上传
                                     //要判断下当前是否勾选了不验证皮重
 
+
             // 保存结净记录，后续改成统一提交模式  BourneCao
+
             return rt;
         }
 
@@ -313,29 +315,26 @@ namespace MeterSceneLibrary.JISCO
         /// </summary>
         /// <param name="scale"></param>
         /// <param name="actualFirst"></param>
-        public rtInfo doNetAddTwo(PreTrackScale scale, MeterWorkCarActualFirst actualFirst)
+        /// <param name="actualFirst1"></param>
+        public rtInfo doNetAddTwo(List<PreTrackScale> scale, MeterWorkCarActualFirst actualFirst, MeterWorkCarActualFirst actualFirst1)
         {
             // 构造结净数据
             MeterWorkCarActual netDb = new MeterWorkCarActual();
 
-            // 复制对象
-            if (scale != null)
-            {
-                EntityBase<PreTrackScale> entityBase = new EntityBase<PreTrackScale>();
-                netDb = entityBase.format<MeterWorkCarActual>(scale, netDb);
-            }
+
+            netDb.actualFirst1No = actualFirst1.meterWeight.Value > actualFirst.meterWeight.Value ? "" : actualFirst.actualFirstNo;
+            netDb.actualFirst2No = actualFirst1.meterWeight.Value > actualFirst.meterWeight.Value ? actualFirst.actualFirstNo : "";
 
             netDb.tareTime = DateTime.Now;
-            netDb.tareWeight = actualFirst.meterWeight.Value < PbCache.lockWgt ? actualFirst.meterWeight.Value : PbCache.lockWgt; // 谁小谁是皮 BourneCao
+            netDb.tareWeight = actualFirst.meterWeight.Value < actualFirst1.meterWeight.Value ? actualFirst.meterWeight.Value : actualFirst1.meterWeight.Value; // 谁小谁是皮 BourneCao
             netDb.baseSpot2No = PbCache.sportInfo.baseSpotNo;
             netDb.baseSpot2Name = PbCache.sportInfo.baseSpotName;
             netDb.tareMode = "2";//1：远程计量；2：智能计量；3：手工录入；4：放行智能计量；5：滞后匹配
-            /* netDb.tare_man_no = "";
-             netDb.tare_man_name = "";
-             netDb.tare_class = "";
-             netDb.tare_group = "";*/
-
-            netDb.actualFirst1No = actualFirst.actualFirstNo;
+            netDb.tareManNo = actualFirst1.createManNo;
+            netDb.tareManName = actualFirst1.createManName;
+            netDb.tareClass = actualFirst1.meterClass;
+            netDb.tareGroup = actualFirst1.meterGroup;
+            
             netDb.grossTime = actualFirst.createTime;
             netDb.grossWeight = actualFirst.meterWeight.Value > PbCache.lockWgt ? actualFirst.meterWeight.Value : PbCache.lockWgt; // 谁大谁是毛 BourneCao
             netDb.baseSpot1No = actualFirst.baseSpotNo;
@@ -359,9 +358,13 @@ namespace MeterSceneLibrary.JISCO
             netDb.netMode = "1"; //1：正常结净；2：匹配结净
             netDb.valueFlag = "0"; //0=有效，1=作废
             netDb.uploadFlag = "0"; //0=待审核；1：待上传；2=已上传
+            netDb.dataSource = "1"; //1 = 智能终端，2 = 本地计量，3 = 应急计量，4 = 手动录入(计量票据录入)
                                     //要判断下当前是否勾选了不验证皮重
 
             // 保存结净记录，后续改成统一提交模式  BourneCao
+
+            MeterWorkCarActualService actualService = new MeterWorkCarActualService();
+            actualService.doNetAddTwo(scale, actualFirst1, netDb);
             return rt;
         }
 
@@ -372,7 +375,7 @@ namespace MeterSceneLibrary.JISCO
         /// </summary>
         /// <param name="scale"></param>
         /// <param name="actualFirst"></param>
-        public rtInfo doNetMass(PreTrackScale scale, MeterWorkCarActualFirst actualFirst)
+        public rtInfo doNetMass(List<PreTrackScale> scale, MeterWorkCarActualFirst actualFirst, MeterWorkCarActualFirst actualFirst1)
         {
             // 构造结净数据
             MeterWorkCarActual netDb = new MeterWorkCarActual();
@@ -381,7 +384,7 @@ namespace MeterSceneLibrary.JISCO
             if (scale != null)
             {
                 EntityBase<PreTrackScale> entityBase = new EntityBase<PreTrackScale>();
-                netDb = entityBase.format<MeterWorkCarActual>(scale, netDb);
+                netDb = entityBase.format<MeterWorkCarActual>(scale[0], netDb);
             }
 
             netDb.tareTime = DateTime.Now;