Pārlūkot izejas kodu

升级更新库

肖奇伟 4 mēneši atpakaļ
vecāks
revīzija
f63f7f7ba1

BIN
Lib/SCADA.CNC.FANUC.dll


BIN
Lib/SCADA.CommonCtrl.dll


+ 12 - 0
Lib/SCADA.CommonCtrl.xml

@@ -5082,6 +5082,18 @@
             
             </summary>
         </member>
+        <member name="M:SCADA.CommonCtrl.WpfControl.Charts.CPKChart.UpdateCPKSamples(System.Collections.Generic.IEnumerable{System.Double},SCADA.CommonLib.CommonModel.SPC.SPCConfig)">
+            <summary>
+            更新CPK样本
+            </summary>
+            <param name="source"></param>
+            <param name="config"></param>
+        </member>
+        <member name="M:SCADA.CommonCtrl.WpfControl.Charts.CPKChart.#ctor">
+            <summary>
+            
+            </summary>
+        </member>
         <member name="P:SCADA.CommonCtrl.WpfControl.Charts.CPKChart.SeriesCollection">
             <summary>
             

BIN
Lib/SCADA.CommonLib.dll


+ 322 - 7
Lib/SCADA.CommonLib.xml

@@ -552,6 +552,19 @@
             <param name="isEncrypt">是否加密</param>
             <returns></returns>
         </member>
+        <member name="M:SCADA.CommonLib.AutoSaveParameterItem.Create``1(System.String,``0,System.String,System.String,System.Windows.Data.Binding,System.Boolean)">
+            <summary>
+            创建一个自动保存参数的对象
+            </summary>
+            <typeparam name="T"></typeparam>
+            <param name="parameterName">参数名称</param>
+            <param name="defaulValue">默认值</param>
+            <param name="displayName">显示名称</param>
+            <param name="isEnableBinding">使能绑定</param>
+            <param name="unit">单位</param>
+            <param name="isEncrypt">是否加密</param>
+            <returns></returns>
+        </member>
         <member name="P:SCADA.CommonLib.AutoSaveParameterItem.ParameterPath">
             <summary>
             参数在文件中的保存位置
@@ -582,6 +595,21 @@
             
             </summary>
         </member>
+        <member name="P:SCADA.CommonLib.AutoSaveParameterItem.IsEnableBinding">
+            <summary>
+            绑定使能
+            </summary>
+        </member>
+        <member name="P:SCADA.CommonLib.AutoSaveParameterItem.VisibilityBinding">
+            <summary>
+            可视性绑定
+            </summary>
+        </member>
+        <member name="P:SCADA.CommonLib.AutoSaveParameterItem.Command">
+            <summary>
+            
+            </summary>
+        </member>
         <member name="M:SCADA.CommonLib.AutoSaveParameterItem.OnParameterChanged">
             <summary>
             
@@ -4324,6 +4352,111 @@
             <param name="value">更新值</param>
             <returns></returns>
         </member>
+        <member name="T:SCADA.CommonLib.Data.DIL.MySql.MySQLDB">
+            <summary>
+            MySQL 数据库
+            </summary>
+        </member>
+        <member name="M:SCADA.CommonLib.Data.DIL.MySql.MySQLDB.#ctor(System.String,System.String,System.String,System.String)">
+            <summary>
+            MySQL 数据库
+            </summary>
+            <param name="server">如果不是用默认端口请用':' 隔开 例如127.0.0.1:3306</param>
+            <param name="database"></param>
+            <param name="username"></param>
+            <param name="password"></param>
+        </member>
+        <member name="M:SCADA.CommonLib.Data.DIL.MySql.MySQLDB.GetDate">
+            <summary>
+            获取服务器时间和日期
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:SCADA.CommonLib.Data.DIL.MySql.MySQLDB.Init(System.String,System.String,System.String,System.String)">
+            <summary>
+            数据库初始化
+            </summary>
+            <param name="serverName">服务器</param>
+            <param name="dataBaseName">数据库名称</param>
+            <param name="dataBaseUserName">用户名</param>
+            <param name="dataBasePassWord">密码</param>
+        </member>
+        <member name="M:SCADA.CommonLib.Data.DIL.MySql.MySQLDB.GetCnn">
+            <summary>
+            获取连接
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:SCADA.CommonLib.Data.DIL.MySql.MySQLDB.GetProduceParameters">
+            <summary>
+            获取存储过程参数
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:SCADA.CommonLib.Data.DIL.MySql.MySQLDB.GetProduces">
+            <summary>
+            
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:SCADA.CommonLib.Data.DIL.MySql.MySQLDB.GetTableColumns">
+            <summary>
+            
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:SCADA.CommonLib.Data.DIL.MySql.MySQLDB.GetTables">
+            <summary>
+            
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:SCADA.CommonLib.Data.DIL.MySql.MySQLDB.GetViewColumns">
+            <summary>
+            
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:SCADA.CommonLib.Data.DIL.MySql.MySQLDB.GetViews">
+            <summary>
+            
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:SCADA.CommonLib.Data.DIL.MySql.MySQLDB.UpdateTableComment(System.String,System.String)">
+            <summary>
+            
+            </summary>
+            <param name="tableName"></param>
+            <param name="comment"></param>
+            <returns></returns>
+        </member>
+        <member name="M:SCADA.CommonLib.Data.DIL.MySql.MySQLDB.UpdateColumnComment(System.String,System.String,System.String)">
+            <summary>
+            
+            </summary>
+            <param name="tableName"></param>
+            <param name="columnName"></param>
+            <param name="comment"></param>
+            <returns></returns>
+        </member>
+        <member name="M:SCADA.CommonLib.Data.DIL.MySql.MySQLDB.CreateTable(System.String)">
+            <summary>
+            
+            </summary>
+            <param name="tableName"></param>
+            <returns></returns>
+            <exception cref="T:System.NotImplementedException"></exception>
+        </member>
+        <member name="M:SCADA.CommonLib.Data.DIL.MySql.MySQLDB.CreateTable(System.String,System.String)">
+            <summary>
+            
+            </summary>
+            <param name="id"></param>
+            <param name="tableName"></param>
+            <returns></returns>
+            <exception cref="T:System.NotImplementedException"></exception>
+        </member>
         <member name="T:SCADA.CommonLib.Data.DIL.MySql.MySqlTable">
             <summary>
             
@@ -5208,6 +5341,63 @@
             <param name="dstTableName"></param>
             <param name="src">数据源</param>
         </member>
+        <member name="T:SCADA.CommonLib.Data.MySQLHeleper">
+            <summary>
+            MySQL 操作类
+            </summary>
+        </member>
+        <member name="M:SCADA.CommonLib.Data.MySQLHeleper.#ctor(System.String)">
+            <summary>
+            
+            </summary>
+            <param name="cnnStr"></param>
+        </member>
+        <member name="M:SCADA.CommonLib.Data.MySQLHeleper.GetCommand">
+            <summary>
+            
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:SCADA.CommonLib.Data.MySQLHeleper.GetConnection">
+            <summary>
+            
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:SCADA.CommonLib.Data.MySQLHeleper.GetDataAdapter">
+            <summary>
+            
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:SCADA.CommonLib.Data.MySQLHeleper.GetDBParameter(System.String,System.Object)">
+            <summary>
+            
+            </summary>
+            <param name="parameterName"></param>
+            <param name="value"></param>
+            <returns></returns>
+        </member>
+        <member name="M:SCADA.CommonLib.Data.MySQLHeleper.BulkInsert(System.String,System.Collections.Generic.List{SCADA.CommonLib.Data.DIL.UpdateItem[]})">
+            <summary>
+            
+            </summary>
+            <param name="dstTableName"></param>
+            <param name="src"></param>
+        </member>
+        <member name="M:SCADA.CommonLib.Data.MySQLHeleper.BulkInsert(System.String,System.Data.DataTable)">
+            <summary>
+            
+            </summary>
+            <param name="dstTableName"></param>
+            <param name="srcdt"></param>
+        </member>
+        <member name="M:SCADA.CommonLib.Data.MySQLHeleper.GetLastRowIdStr">
+            <summary>
+            
+            </summary>
+            <returns></returns>
+        </member>
         <member name="T:SCADA.CommonLib.Data.NpgSQLHelper">
             <summary>
             
@@ -6751,6 +6941,33 @@
             
             </summary>
         </member>
+        <member name="T:SCADA.CommonLib.Helper.BartenderHelper">
+            <summary>
+            bartender 标签打印帮助类
+            </summary>
+        </member>
+        <member name="M:SCADA.CommonLib.Helper.BartenderHelper.GetPreviewImage``1(``0,System.String,System.String,System.Boolean,System.Collections.Generic.Dictionary{System.String,System.String})">
+            <summary>
+            
+            </summary>
+            <typeparam name="T"></typeparam>
+            <param name="obj"></param>
+            <param name="templetPath"></param>
+            <param name="imageFilePath"></param>
+            <param name="autoMapper"></param>
+            <param name="mapping"></param>
+        </member>
+        <member name="M:SCADA.CommonLib.Helper.BartenderHelper.Print``1(``0,System.String,System.String,System.Boolean,System.Collections.Generic.Dictionary{System.String,System.String})">
+            <summary>
+            
+            </summary>
+            <typeparam name="T"></typeparam>
+            <param name="obj"></param>
+            <param name="templetPath"></param>
+            <param name="printer"></param>
+            <param name="autoMapper"></param>
+            <param name="mapping"></param>
+        </member>
         <member name="T:SCADA.CommonLib.Helper.BeepHelper">
             <summary>
             控制蜂鸣器
@@ -7048,6 +7265,39 @@
             <param name="type"></param>
             <returns></returns>
         </member>
+        <member name="T:SCADA.CommonLib.Helper.ColorHelper">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="M:SCADA.CommonLib.Helper.ColorHelper.ColorToHexString(System.Windows.Media.Color)">
+            <summary>
+            将ARGB颜色转换成16进制字符
+            </summary>
+            <param name="color">Color 类型的 ARGB颜色</param>
+            <returns>返回string 16进制的ARGB颜色</returns>
+        </member>
+        <member name="M:SCADA.CommonLib.Helper.ColorHelper.HexStringToColor(System.String)">
+            <summary>
+            将16进制类型的ARGB颜色 转换成 Color 类型
+            </summary>
+            <param name="strcolor">string类型的16进制ARGB颜色,00FF0000</param>
+            <returns>返回 Color 类型的ARGB颜色</returns>
+        </member>
+        <member name="M:SCADA.CommonLib.Helper.ColorHelper.ColorToArgbString(System.Windows.Media.Color)">
+            <summary>
+            将ARGB颜色转换成string
+            </summary>
+            <param name="color">Color 类型的 ARGB颜色</param>
+            <returns>返回string类型的ARGB颜色</returns>
+        </member>
+        <member name="M:SCADA.CommonLib.Helper.ColorHelper.ArgbStringToColor(System.String)">
+            <summary>
+            将string类型的ARGB颜色 转换成 Color 类型
+            </summary>
+            <param name="strcolor">string类型的ARGB颜色,以逗号分隔。如:255,255,128,255</param>
+            <returns>返回 Color 类型的ARGB颜色</returns>
+        </member>
         <member name="T:SCADA.CommonLib.Helper.ConvertEx">
             <summary>
             
@@ -7933,6 +8183,13 @@
             <param name="obj"></param>
             <returns></returns>
         </member>
+        <member name="M:SCADA.CommonLib.Helper.JsonHelper.IsJsonString(System.String)">
+            <summary>
+            判断字符串是Json
+            </summary>
+            <param name="str"></param>
+            <returns></returns>
+        </member>
         <member name="M:SCADA.CommonLib.Helper.JsonHelper.JsonDeserialize``1(System.String)">
             <summary>
             JSON反序列化
@@ -7970,13 +8227,6 @@
             <param name="type"></param>
             <returns></returns>
         </member>
-        <member name="M:SCADA.CommonLib.Helper.JsonHelper.IsJsonString(System.String)">
-            <summary>
-            判断字符串是Json
-            </summary>
-            <param name="str"></param>
-            <returns></returns>
-        </member>
         <member name="T:SCADA.CommonLib.Helper.WhereBuilder">
             <summary>
             Generating SQL from expression trees, Part 2
@@ -8868,6 +9118,19 @@
             </summary>
             <param name="random">随机数填充</param>
         </member>
+        <member name="M:SCADA.CommonLib.Helper.ReflectionHelper.SetBindingValue(System.Windows.Data.Binding,System.Object)">
+            <summary>
+            
+            </summary>
+            <param name="binding"></param>
+            <param name="value"></param>
+        </member>
+        <member name="M:SCADA.CommonLib.Helper.ReflectionHelper.GetBindingValue(System.Windows.Data.Binding)">
+            <summary>
+            
+            </summary>
+            <param name="binding"></param>
+        </member>
         <member name="M:SCADA.CommonLib.Helper.ReflectionHelper.InvokeMatchPara(System.Reflection.MethodInfo,System.Object,System.Object)">
             <summary>
             自动匹配执行参数
@@ -9231,6 +9494,46 @@
             <param name="para"></param>
             <returns></returns>
         </member>
+        <member name="M:SCADA.CommonLib.Helper.WebApiHelper.RpcInvokeWithLog``1(System.String,System.Object[],System.String)">
+            <summary>
+            远程调用输出诊断日志
+            </summary>
+            <typeparam name="T"></typeparam>
+            <param name="url"></param>
+            <param name="paras"></param>
+            <param name="method"></param>
+            <returns></returns>
+        </member>
+        <member name="M:SCADA.CommonLib.Helper.WebApiHelper.RpcInvokeWithLog``1(System.String,System.String,System.Object[])">
+            <summary>
+            远程调用输出诊断日志
+            </summary>
+            <typeparam name="T"></typeparam>
+            <param name="url"></param>
+            <param name="method"></param>
+            <param name="paras"></param>
+            <returns></returns>
+        </member>
+        <member name="M:SCADA.CommonLib.Helper.WebApiHelper.RpcInvoke``1(System.String,System.Object[],System.String)">
+            <summary>
+            远程调用
+            </summary>
+            <typeparam name="T"></typeparam>
+            <param name="url"></param>
+            <param name="paras"></param>
+            <param name="method"></param>
+            <returns></returns>
+        </member>
+        <member name="M:SCADA.CommonLib.Helper.WebApiHelper.RpcInvoke``1(System.String,System.String,System.Object[])">
+            <summary>
+            Rpc远程调用
+            </summary>
+            <typeparam name="T"></typeparam>
+            <param name="url"></param>
+            <param name="method"></param>
+            <param name="paras"></param>
+            <returns></returns>
+        </member>
         <member name="M:SCADA.CommonLib.Helper.WebApiHelper.IsAvaiable(System.String,System.Int32)">
             <summary>
             检查Web服务是否可用
@@ -10989,6 +11292,13 @@
             
             </summary>
         </member>
+        <member name="P:SCADA.CommonLib.ObservableObject.Item(System.String)">
+            <summary>
+            
+            </summary>
+            <param name="columnName"></param>
+            <returns></returns>
+        </member>
         <member name="P:SCADA.CommonLib.ObservableObject.Error">
             <summary>
             
@@ -11152,6 +11462,11 @@
             
             </summary>
         </member>
+        <member name="P:SCADA.CommonLib.Context.HttpContext">
+            <summary>
+            Http 上下文
+            </summary>
+        </member>
         <member name="T:SCADA.CommonLib.RpcPara">
             <summary>
             远程调用参数

BIN
Lib/SCADA.NetCamera.dll


BIN
Lib/SCADA.dll


+ 52 - 2
Lib/SCADA.xml

@@ -1169,11 +1169,12 @@
             <param name="comm"></param>
             <param name="address"></param>
         </member>
-        <member name="M:SCADA.BarcodeReader.SyncBarcodeReader.ReadBarcode(System.Collections.Generic.List{System.Byte})">
+        <member name="M:SCADA.BarcodeReader.SyncBarcodeReader.ReadBarcode(System.Collections.Generic.List{System.Byte},SCADA.Comm.ResponseInfo)">
             <summary>
             
             </summary>
             <param name="sendCmd"></param>
+            <param name="response"></param>
             <returns></returns>
         </member>
         <member name="T:SCADA.BaseCmd">
@@ -3976,9 +3977,18 @@
             <param name="port"></param>
             <param name="responseInfos"></param>
         </member>
+        <member name="M:SCADA.Comm.UdpComm.#ctor(System.String,System.Int32,System.Int32,SCADA.Comm.ResponseInfo)">
+            <summary>
+            UDP测试通道
+            </summary>
+            <param name="ipAddress"></param>
+            <param name="port"></param>
+            <param name="localport"></param>
+            <param name="responseInfos"></param>
+        </member>
         <member name="M:SCADA.Comm.UdpComm.#ctor(System.String,System.Int32,System.Int32,System.Collections.Generic.IEnumerable{SCADA.Comm.ResponseInfo})">
             <summary>
-            TCP测试通道
+            UDP测试通道
             </summary>
             <param name="ipAddress"></param>
             <param name="port"></param>
@@ -7646,6 +7656,16 @@
             0x41 ws2812控制
             </summary>
         </member>
+        <member name="F:SCADA.Drive.Modbus.ModbusAddressType.SM">
+            <summary>
+            汇川系统M
+            </summary>
+        </member>
+        <member name="F:SCADA.Drive.Modbus.ModbusAddressType.SD">
+            <summary>
+            汇川系统D
+            </summary>
+        </member>
         <member name="F:SCADA.Drive.Modbus.ModbusCmdCode.ReadMultipleCoil">
             <summary>
             读取输出线圈状态取得一组逻辑线圈的当前状态(ON/OFF) 包括Q,M,R
@@ -7699,6 +7719,36 @@
             Ws2812控制
             </summary>
         </member>
+        <member name="F:SCADA.Drive.Modbus.ModbusCmdCode.InovanceSMReadMul">
+            <summary>
+            汇川SM批量读
+            </summary>
+        </member>
+        <member name="F:SCADA.Drive.Modbus.ModbusCmdCode.InovanceSMWriteSingle">
+            <summary>
+            汇川SM单点写
+            </summary>
+        </member>
+        <member name="F:SCADA.Drive.Modbus.ModbusCmdCode.InovanceSMWriteMul">
+            <summary>
+            汇川SM批量写
+            </summary>
+        </member>
+        <member name="F:SCADA.Drive.Modbus.ModbusCmdCode.InovanceSDReadMul">
+            <summary>
+            汇川SD批量读
+            </summary>
+        </member>
+        <member name="F:SCADA.Drive.Modbus.ModbusCmdCode.InovanceSDWriteSingle">
+            <summary>
+            汇川SD单点写
+            </summary>
+        </member>
+        <member name="F:SCADA.Drive.Modbus.ModbusCmdCode.InovanceSDWriteMul">
+            <summary>
+            汇川SD批量写
+            </summary>
+        </member>
         <member name="M:SCADA.Drive.Modbus.ModbusRtuCmd.#ctor(System.Collections.Generic.List{System.Byte})">
             <summary>
             解码

BIN
Lib/SCADA_DAQ.Plugin.Core.dll


BIN
Lib/SCADA_DAQ.Plugin.CoreUI.dll


BIN
Lib/SCADA_DAQ.Plugin.Machine.dll


BIN
Lib/SCADA_DAQ.Plugin.MachineUI.dll


BIN
Lib/SCADA_DAQ.Plugin.RESTful.dll


BIN
Lib/Xceed.Wpf.Toolkit.dll