diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Alarm/PmtAlarm/ImportAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Alarm/PmtAlarm/ImportAction.cs index a70bdd6..6862349 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Alarm/PmtAlarm/ImportAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Alarm/PmtAlarm/ImportAction.cs @@ -9,23 +9,34 @@ using ICSharpCode.Core; using Mesnac.Action.Base; using Mesnac.Codd.Session; -namespace Mesnac.Action.ChemicalWeighing.Alarm.PmtAlarm +namespace Mesnac.Action.ChemicalWeighing.Barrel { /// /// 导入报警参数业务 /// public class ImportAction: ChemicalWeighingAction, IAction { + #region 事件定义 + + /// + /// 新增物料事件定义 + /// + public static event EventHandler OnInsertBarrel; + + #endregion + private RuntimeParameter _runtime; + private string caption = StringParser.Parse(ResourceService.GetString("Mesnac_Dialog_Caption")); //提示 public void Run(RuntimeParameter runtime) { - string msg = StringParser.Parse(ResourceService.GetString("Mesnac_Action_ChemicalWeighing_Alarm_PmtAlarm_ImportAction_msg")); //导入操作会覆盖当前所有报警信息！是否继续？ + string msg = "确定要导入料桶吗？";// StringParser.Parse(ResourceService.GetString("Mesnac_Action_ChemicalWeighing_Alarm_PmtAlarm_ImportAction_msg")); //导入操作会覆盖当前所有报警信息！是否继续？ if (MessageBox.Show(msg, caption, MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) { return; } base.RunIni(runtime); //必须要调用的 - ICSharpCode.Core.LoggingService.Debug("报警参数-导入..."); + this._runtime = runtime; + ICSharpCode.Core.LoggingService.Debug("料桶参数-导入..."); DbHelper dbHelper = Mesnac.Basic.DataSourceFactory.Instance.GetDbHelper(Mesnac.Basic.DataSourceFactory.MCDbType.Local); if (dbHelper == null) @@ -46,35 +57,29 @@ namespace Mesnac.Action.ChemicalWeighing.Alarm.PmtAlarm { DataSet ds = Mesnac.Basic.DataToFileHandler.Instance.FromExcel(fileName); //判断导入Excel表格式的合法性 - if (!ds.Tables[0].Columns.Contains("Alarm_PLC") || - !ds.Tables[0].Columns.Contains("Alarm_Block") || - !ds.Tables[0].Columns.Contains("Alarm_Alias") || - !ds.Tables[0].Columns.Contains("Alarm_Cn_Info") ) + if (!ds.Tables[0].Columns.Contains("BarrelName") || + !ds.Tables[0].Columns.Contains("BarCode") ) { string msg4 = StringParser.Parse(ResourceService.GetString("Mesnac_Action_ChemicalWeighing_Alarm_PmtAlarm_ImportAction_msg4")); //导入的Excel表格式不正确！请检查后重试！ MessageBox.Show(msg4); return; } - string del = "truncate table Pmt_Alarm"; - dbHelper.ClearParameter(); - dbHelper.CommandType = CommandType.Text; - dbHelper.CommandText = del; - dbHelper.ExecuteNonQuery(); + //string del = "truncate table Pmt_Alarm"; + //dbHelper.ClearParameter(); + //dbHelper.CommandType = CommandType.Text; + //dbHelper.CommandText = del; + //dbHelper.ExecuteNonQuery(); //truncate table PmtAlarm if (ds != null && ds.Tables.Count > 0) { - string sqlstr = @"insert into Pmt_Alarm(Equip_Code, Alarm_PLC, Alarm_Block, Alarm_Alias, Alarm_Cn_Info) - values (@EquipCode, @AlarmPLC, @AlarmBlock, @Alarm_Alias, @Alarm_Cn_Info)"; + string sqlstr = @"insert into Hw_Barrel(BarrelName, BarCode)VALUES(@BarrelName, @BarCode)"; foreach (DataRow row in ds.Tables[0].Rows) { dbHelper.ClearParameter(); dbHelper.CommandType = CommandType.Text; dbHelper.CommandText = sqlstr; - dbHelper.AddParameter("@EquipCode", row["Equip_Code"]); - dbHelper.AddParameter("@AlarmPLC", row["Alarm_PLC"]); - dbHelper.AddParameter("@AlarmBlock", row["Alarm_Block"]); - dbHelper.AddParameter("@Alarm_Alias", row["Alarm_Alias"]); - dbHelper.AddParameter("@AlarmName", row["Alarm_Cn_Info"]); + dbHelper.AddParameter("@BarrelName", row["BarrelName"]); + dbHelper.AddParameter("@BarCode", row["BarCode"]); dbHelper.ExecuteNonQuery(); } string msg1 = StringParser.Parse(ResourceService.GetString("Mesnac_Action_ChemicalWeighing_Alarm_PmtAlarm_ImportAction_msg1")); //从Excel导入报警参数数据完毕! @@ -117,19 +122,29 @@ namespace Mesnac.Action.ChemicalWeighing.Alarm.PmtAlarm MessageBox.Show(msg3, Mesnac.Basic.LanguageHelper.WarnCaption, MessageBoxButtons.OK, MessageBoxIcon.Warning); } + #region 触发事件 - //刷新DataGridView数据 - DbMCControl dgPmtAlarmInfo = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "Pmt_Alarm").FirstOrDefault(); - if (dgPmtAlarmInfo == null || !(dgPmtAlarmInfo.BaseControl is DataGridView)) + if (OnInsertBarrel != null) { - ICSharpCode.Core.LoggingService.Warn("报警参数-导入-缺少报警参数DataGridView控件..."); - runtime.IsReturn = false; - return; + OnInsertBarrel(this._runtime.BaseControl.MCRoot, System.EventArgs.Empty); } - DataTable table = dbHelper.GetDataTableBySql(dgPmtAlarmInfo.BaseControl.ActionDataSource); - dgPmtAlarmInfo.BaseControl.BindDataSource = table; + #endregion + + //刷新DataGridView数据 + //DbMCControl dgPmtAlarmInfo = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "Hw_Barrel").FirstOrDefault(); + //if (dgPmtAlarmInfo == null || !(dgPmtAlarmInfo.BaseControl is DataGridView)) + //{ + // ICSharpCode.Core.LoggingService.Warn("料桶导入-导入-缺少料桶参数DataGridView控件..."); + // runtime.IsReturn = false; + // return; + //} + + //DataTable table = dbHelper.GetDataTableBySql(dgPmtAlarmInfo.BaseControl.ActionDataSource); + //dgPmtAlarmInfo.BaseControl.BindDataSource = null; + //dgPmtAlarmInfo.BaseControl.BindDataSource = table; } } + } } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Barrel/BarrelHelper.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Barrel/BarrelHelper.cs index 7e6938f..3e297c6 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Barrel/BarrelHelper.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Barrel/BarrelHelper.cs @@ -84,12 +84,14 @@ namespace Mesnac.Action.ChemicalWeighing.Barrel dbHelper.ClearParameter(); dbHelper.CommandType = CommandType.Text; - string insertUserSql = "INSERT INTO Hw_Barrel(BarrelID, BarrelName, BarCode,IsEnable) VALUES(@BarrelID, @BarrelName, @BarCode,@IsEnable)"; + string insertUserSql = "INSERT INTO Hw_Barrel(BarrelID, BarrelName, BarCode,MaterialID,MaterialName,IsEnable) VALUES(@BarrelID, @BarrelName, @BarCode,@MaterialID,@MaterialName,@IsEnable)"; dbHelper.CommandText = insertUserSql; dbHelper.AddParameter("@BarrelID", bar.BarrelID); dbHelper.AddParameter("@BarrelName", bar.BarrelName); dbHelper.AddParameter("@BarCode", bar.BarCode); + dbHelper.AddParameter("@MaterialID", bar.MaterialID); + dbHelper.AddParameter("@MaterialName", bar.MaterialName); dbHelper.AddParameter("@IsEnable", bar.IsEnable); dbHelper.ExecuteNonQuery(); } @@ -107,10 +109,12 @@ namespace Mesnac.Action.ChemicalWeighing.Barrel } dbHelper.ClearParameter(); dbHelper.CommandType = CommandType.Text; - string strSql = "UPDATE Hw_Barrel SET BarrelName=@BarrelName, BarCode=@BarCode,IsEnable=@IsEnable WHERE ID=@ID"; + string strSql = "UPDATE Hw_Barrel SET BarrelName=@BarrelName, BarCode=@BarCode,MaterialID=@MaterialID,MaterialName=@MaterialName,IsEnable=@IsEnable WHERE ID=@ID"; dbHelper.CommandText = strSql; dbHelper.AddParameter("@BarrelName", barrel.BarrelName); dbHelper.AddParameter("@BarCode", barrel.BarCode); + dbHelper.AddParameter("@MaterialID", barrel.MaterialID); + dbHelper.AddParameter("@MaterialName", barrel.MaterialName); dbHelper.AddParameter("@IsEnable", barrel.IsEnable); dbHelper.AddParameter("@ID", barrel.ID); dbHelper.ExecuteNonQuery(); diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Barrel/FrmBarrel.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Barrel/FrmBarrel.Designer.cs index 8ead345..56895c9 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Barrel/FrmBarrel.Designer.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Barrel/FrmBarrel.Designer.cs @@ -28,55 +28,28 @@ /// private void InitializeComponent() { - this.txtBarrelName = new System.Windows.Forms.TextBox(); - this.txtBarCode = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); this.chcIsEnable = new System.Windows.Forms.CheckBox(); this.btnCancel = new System.Windows.Forms.Button(); this.btnOk = new System.Windows.Forms.Button(); + this.txtBarrelName = new System.Windows.Forms.TextBox(); + this.label3 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.txtBarCode = new System.Windows.Forms.TextBox(); + this.label2 = new System.Windows.Forms.Label(); + this.txtMaterialID = new System.Windows.Forms.TextBox(); + this.txtMaterialName = new System.Windows.Forms.TextBox(); + this.lable3 = new System.Windows.Forms.Label(); this.SuspendLayout(); // - // txtBarrelName - // - this.txtBarrelName.Location = new System.Drawing.Point(160, 42); - this.txtBarrelName.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.txtBarrelName.Name = "txtBarrelName"; - this.txtBarrelName.Size = new System.Drawing.Size(202, 28); - this.txtBarrelName.TabIndex = 1; - // - // txtBarCode - // - this.txtBarCode.Location = new System.Drawing.Point(160, 98); - this.txtBarCode.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.txtBarCode.Name = "txtBarCode"; - this.txtBarCode.Size = new System.Drawing.Size(202, 28); - this.txtBarCode.TabIndex = 2; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(71, 47); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(71, 18); - this.label1.TabIndex = 3; - this.label1.Text = "桶名称:"; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(53, 103); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(89, 18); - this.label2.TabIndex = 4; - this.label2.Text = "条码编码:"; - // // chcIsEnable // this.chcIsEnable.AutoSize = true; - this.chcIsEnable.Location = new System.Drawing.Point(160, 149); + this.chcIsEnable.Checked = true; + this.chcIsEnable.CheckState = System.Windows.Forms.CheckState.Checked; + this.chcIsEnable.Location = new System.Drawing.Point(50, 217); + this.chcIsEnable.Margin = new System.Windows.Forms.Padding(2); this.chcIsEnable.Name = "chcIsEnable"; - this.chcIsEnable.Size = new System.Drawing.Size(102, 22); + this.chcIsEnable.Size = new System.Drawing.Size(72, 16); this.chcIsEnable.TabIndex = 14; this.chcIsEnable.Text = "是否启用"; this.chcIsEnable.UseVisualStyleBackColor = true; @@ -85,10 +58,9 @@ // this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.btnCancel.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnCancel.Location = new System.Drawing.Point(250, 188); - this.btnCancel.Margin = new System.Windows.Forms.Padding(4); + this.btnCancel.Location = new System.Drawing.Point(279, 205); this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(108, 48); + this.btnCancel.Size = new System.Drawing.Size(72, 32); this.btnCancel.TabIndex = 16; this.btnCancel.Text = "取消(&C)"; this.btnCancel.UseVisualStyleBackColor = true; @@ -96,30 +68,105 @@ // btnOk // this.btnOk.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnOk.Location = new System.Drawing.Point(119, 188); - this.btnOk.Margin = new System.Windows.Forms.Padding(4); + this.btnOk.Location = new System.Drawing.Point(161, 205); this.btnOk.Name = "btnOk"; - this.btnOk.Size = new System.Drawing.Size(108, 48); + this.btnOk.Size = new System.Drawing.Size(72, 32); this.btnOk.TabIndex = 15; this.btnOk.Text = "确定(&O)"; this.btnOk.UseVisualStyleBackColor = true; this.btnOk.Click += new System.EventHandler(this.button1_Click); // + // txtBarrelName + // + this.txtBarrelName.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.txtBarrelName.Location = new System.Drawing.Point(138, 33); + this.txtBarrelName.Name = "txtBarrelName"; + this.txtBarrelName.Size = new System.Drawing.Size(278, 29); + this.txtBarrelName.TabIndex = 17; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label3.Location = new System.Drawing.Point(60, 38); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(69, 19); + this.label3.TabIndex = 18; + this.label3.Text = "桶名称"; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label1.Location = new System.Drawing.Point(19, 83); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(109, 19); + this.label1.TabIndex = 18; + this.label1.Text = "条码二维码"; + // + // txtBarCode + // + this.txtBarCode.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.txtBarCode.Location = new System.Drawing.Point(138, 73); + this.txtBarCode.Name = "txtBarCode"; + this.txtBarCode.Size = new System.Drawing.Size(278, 29); + this.txtBarCode.TabIndex = 17; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label2.Location = new System.Drawing.Point(17, 125); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(109, 19); + this.label2.TabIndex = 18; + this.label2.Text = "配方二维码"; + // + // txtMaterialID + // + this.txtMaterialID.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.txtMaterialID.Location = new System.Drawing.Point(138, 118); + this.txtMaterialID.Name = "txtMaterialID"; + this.txtMaterialID.Size = new System.Drawing.Size(278, 29); + this.txtMaterialID.TabIndex = 17; + // + // txtMaterialName + // + this.txtMaterialName.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.txtMaterialName.Location = new System.Drawing.Point(138, 163); + this.txtMaterialName.Name = "txtMaterialName"; + this.txtMaterialName.Size = new System.Drawing.Size(278, 29); + this.txtMaterialName.TabIndex = 17; + // + // lable3 + // + this.lable3.AutoSize = true; + this.lable3.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lable3.Location = new System.Drawing.Point(35, 170); + this.lable3.Name = "lable3"; + this.lable3.Size = new System.Drawing.Size(89, 19); + this.lable3.TabIndex = 18; + this.lable3.Text = "配方名称"; + // // FrmBarrel // - this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(409, 260); - this.Controls.Add(this.btnCancel); - this.Controls.Add(this.btnOk); - this.Controls.Add(this.chcIsEnable); + this.ClientSize = new System.Drawing.Size(463, 264); + this.Controls.Add(this.lable3); this.Controls.Add(this.label2); this.Controls.Add(this.label1); + this.Controls.Add(this.label3); + this.Controls.Add(this.txtMaterialName); + this.Controls.Add(this.txtMaterialID); this.Controls.Add(this.txtBarCode); this.Controls.Add(this.txtBarrelName); - this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.Controls.Add(this.btnCancel); + this.Controls.Add(this.btnOk); + this.Controls.Add(this.chcIsEnable); + this.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.Name = "FrmBarrel"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "料桶管理"; this.ResumeLayout(false); this.PerformLayout(); @@ -127,12 +174,16 @@ } #endregion - private System.Windows.Forms.TextBox txtBarrelName; - private System.Windows.Forms.TextBox txtBarCode; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label2; private System.Windows.Forms.CheckBox chcIsEnable; private System.Windows.Forms.Button btnCancel; private System.Windows.Forms.Button btnOk; + private System.Windows.Forms.TextBox txtBarrelName; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.TextBox txtBarCode; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.TextBox txtMaterialID; + private System.Windows.Forms.TextBox txtMaterialName; + private System.Windows.Forms.Label lable3; } } \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Barrel/FrmBarrel.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Barrel/FrmBarrel.cs index 748eedb..7a0123e 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Barrel/FrmBarrel.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Barrel/FrmBarrel.cs @@ -20,7 +20,7 @@ namespace Mesnac.Action.ChemicalWeighing.Barrel { InitializeComponent(); - bar.BarrelID = Guid.NewGuid().ToString(); + bar.BarrelID = Guid.NewGuid().ToString("N").ToUpper(); } public FrmBarrel(ActionType type, Hw_Barrel _barrel) { @@ -28,8 +28,10 @@ namespace Mesnac.Action.ChemicalWeighing.Barrel _actionType = type; bar = _barrel; - this.txtBarrelName.Text = bar.BarrelName; - this.txtBarCode.Text = bar.BarCode; + this.txtBarrelName.Text = _barrel.BarrelName; + this.txtBarCode.Text = _barrel.BarCode; + this.txtMaterialID.Text = _barrel.MaterialID; + this.txtMaterialName.Text = _barrel.MaterialName; //if (bar.IsEnable=="是") //{ // this.chcIsEnable.Checked = true; @@ -59,10 +61,10 @@ namespace Mesnac.Action.ChemicalWeighing.Barrel bar.BarrelName = this.txtBarrelName.Text; bar.BarCode = this.txtBarCode.Text; + bar.MaterialID = this.txtMaterialID.Text; + bar.MaterialName = this.txtMaterialName.Text; bar.IsEnable = chcIsEnable.Checked == true ? "是" : "否"; - - //当修改桶时 条码唯一性都需要验证 if (_actionType == ActionType.Add || (_actionType == ActionType.Modify)) { diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Barrel/ModifyAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Barrel/ModifyAction.cs index 7f8ec98..151a454 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Barrel/ModifyAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Barrel/ModifyAction.cs @@ -63,6 +63,8 @@ namespace Mesnac.Action.ChemicalWeighing.Barrel BarrelID = Guid.NewGuid().ToString(), BarrelName = clientGridView.SelectedRows[0].Cells["BarrelName"].Value as string, BarCode = clientGridView.SelectedRows[0].Cells["BarCode"].Value as string, + MaterialID = clientGridView.SelectedRows[0].Cells["MaterialID"].Value as string, + MaterialName = clientGridView.SelectedRows[0].Cells["MaterialName"].Value as string, IsEnable = clientGridView.SelectedRows[0].Cells["IsEnable"].Value as string }; diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Barrel/RefreshAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Barrel/RefreshAction.cs index eb2b32a..17c0c46 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Barrel/RefreshAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Barrel/RefreshAction.cs @@ -43,8 +43,12 @@ namespace Mesnac.Action.ChemicalWeighing.Barrel ICSharpCode.Core.LoggingService.Debug("料桶管理—刷新料桶业务..."); #region 事件订阅 + + //添加计划后，要刷新计划 + ImportAction.OnInsertBarrel -= Process_Event; + ImportAction.OnInsertBarrel += Process_Event; #endregion - + DbMCControl clientGridControl = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "Hw_Barrel").FirstOrDefault(); //获取配方管理控件 if (clientGridControl == null || !(clientGridControl.BaseControl is DataGridView)) @@ -65,7 +69,21 @@ namespace Mesnac.Action.ChemicalWeighing.Barrel } #endregion + #region 事件处理方法 + + private void Process_Event(object sender, EventArgs e) + { + if (sender is RuntimeParameter) + { + this.Run(sender as RuntimeParameter); + } + else + { + this.Run(this._runtime); + } + } + #endregion diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ChemicalWeighingPlc/PlcPlanHelper.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ChemicalWeighingPlc/PlcPlanHelper.cs index d216a2b..9680e9a 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ChemicalWeighingPlc/PlcPlanHelper.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ChemicalWeighingPlc/PlcPlanHelper.cs @@ -29,6 +29,7 @@ namespace Mesnac.Action.ChemicalWeighing.ChemicalWeighingPlc public static object sender = null; public static event EventHandler OnUpdatePlanStateFromPlc; + public static event EventHandler AutoDownloadPlan; public static event EventHandler OnAutoAddPlan; public static event EventHandler OnChangePlan; @@ -2358,5 +2359,7 @@ namespace Mesnac.Action.ChemicalWeighing.ChemicalWeighingPlc #endregion #endregion + + } } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FinishBatch/FinishBatchService.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FinishBatch/FinishBatchService.cs index afec574..9b25592 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FinishBatch/FinishBatchService.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FinishBatch/FinishBatchService.cs @@ -65,6 +65,7 @@ namespace Mesnac.Action.ChemicalWeighing.FinishBatch { //BasePlcHelper.Instance.PlcRead(BasePlcHelper.Instance.read_data, out int[] p); Mesnac.Equips.Factory.Instance.SetMinHZReadDataEvent(ReadData); + // Mesnac.Equips.Factory.Instance.SetMinHZReadDataEvent(UpdateData); this.runState = true; } } @@ -113,13 +114,7 @@ namespace Mesnac.Action.ChemicalWeighing.FinishBatch { #region 实时刷新自动保存报警 - SaveHelper.AlarmSaveHelper.Save(); - - #endregion - - #region 更新溶剂称量计划状态 - - //ChemicalWeighingPlc.PlcPlanHelper.UpdatePlanData(); + //SaveHelper.AlarmSaveHelper.Save(); #endregion @@ -128,16 +123,28 @@ namespace Mesnac.Action.ChemicalWeighing.FinishBatch XlPlcHelper.PlcPlanHelper.ExecPlanState(); #endregion - #region 初始小料重量防错 - //ChemicalWeighingPlc.PlcPlanHelper.InitScanCode(); - #endregion + } + } + catch(Exception ex) + { + ICSharpCode.Core.LoggingService.Error(ex.Message, ex); + } + } + + private void UpdateData(object sender, Mesnac.Equips.ReadEventArgs e) + { + try + { + lock (String.Empty) + { + #region 更新计划状态 - #region 扫码读取数据 - //ChemicalWeighingPlc.PlcPlanHelper.XlScanCode(); + XlPlcHelper.PlcPlanHelper.UpdateXlPlanStateFromPlc(); + XlPlcHelper.PlcPlanHelper.UpdateBinAlarm(); #endregion } } - catch(Exception ex) + catch (Exception ex) { ICSharpCode.Core.LoggingService.Error(ex.Message, ex); } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/XlPlan/InitFormAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/XlPlan/InitFormAction.cs index 2ebffd4..f654f76 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/XlPlan/InitFormAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/XlPlan/InitFormAction.cs @@ -10,6 +10,7 @@ using Mesnac.Codd.Session; using System.Reflection; using Mesnac.Controls.Base; using System.Timers; +using Mesnac.Action.ChemicalWeighing.DBHelper; namespace Mesnac.Action.ChemicalWeighing.Product.XlPlan { @@ -26,6 +27,7 @@ namespace Mesnac.Action.ChemicalWeighing.Product.XlPlan #region 字段定义 public static bool IsFirstRun = true; //是否首次运行 + public static bool IsRun = true; //是否首次运行 private RuntimeParameter _runtime; //private DbMCControl _planDateControl = null; //计划日期 //private DbMCControl _pptShiftControl = null; //班次 @@ -73,8 +75,6 @@ namespace Mesnac.Action.ChemicalWeighing.Product.XlPlan DataGridView clientGrid = (clientGridControl.BaseControl as DataGridView); this.InitGridViewEvent(clientGrid); - - this.InitData(); #endregion @@ -105,35 +105,49 @@ namespace Mesnac.Action.ChemicalWeighing.Product.XlPlan //MessageBox.Show("11111"); } + #endregion #endregion - #region 初始化界面控件数据 - - /// - /// 初始化界面控件数据 - /// - private void InitData() - { - System.Timers.Timer timer = new System.Timers.Timer(10000); - timer.Elapsed += new ElapsedEventHandler(StartServer1); - timer.AutoReset = true; - timer.Enabled = true; - timer.Start(); - } - - private void StartServer1(object sender, ElapsedEventArgs e) + protected void DoWork() { #region 业务实现 - if (OnRefreshPlan != null) + + //int shiftID = Global.PublicVar.Instance.globalShiftID; + //int.TryParse(this._pptShiftControl.BaseControl.MCValue.ToString(), out shiftID); + string equipCode = base.CurrEquipCode; //当前机台 + //DateTime selectedDate = Convert.ToDateTime(this._planDateControl.BaseControl.MCValue); + //DataTable table = PlanHelper.GetPlanData(selectedDate, shiftID); + //DataTable table = PlanHelper.GetPlanData(selectedDate); + //DataTable table = PlanHelper.GetPlanData(); + IFreeSql fsql = FreeHelper.Instance; + string sql = @"select *from (SELECT Batch,ProductName,Plan_Serial,Recipe_ID,Recipe_Name,Equip_Code,Version,Plan_Id,Plan_Num,Real_Num,Plan_State,Plan_StateText,Start_Date,End_Date,Plan_Date,IsPrenatalTest,CreateTime FROM xl_plan + where IsPrenatalTest=0 or IsPrenatalTest IS NULL + ) t where datediff(day, t.CreateTime,getdate())=0 "; + DataTable table = fsql.Select().WithSql(sql).OrderBy("Plan_State").ToDataTable("*"); + + lock (String.Empty) { - OnRefreshPlan(this._runtime.BaseControl.MCRoot, System.EventArgs.Empty); + //本地计划 + if (this._clientGridControl != null && this._clientGridControl.BaseControl != null) + { + this._clientGridControl.BaseControl.BindDataSource = null; + this._clientGridControl.BaseControl.BindDataSource = table; + + #region 根据计划状态处理背景色 + + DataGridView clientGrid = this._clientGridControl.BaseControl as DataGridView; + PlanHelper.SetBackColor(clientGrid); + + #endregion + } + else + { + ICSharpCode.Core.LoggingService.Warn("刷新本地计划失败：本地计划控件为Null..."); + } } - #endregion - } - #endregion - - #endregion + + } } } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/XlPlan/PlanHelper.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/XlPlan/PlanHelper.cs index df26a68..5718733 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/XlPlan/PlanHelper.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/XlPlan/PlanHelper.cs @@ -2487,9 +2487,9 @@ namespace Mesnac.Action.ChemicalWeighing.Product.XlPlan throw new Exception(Mesnac.Basic.LanguageHelper.DataBaseConnectError); } dbHelper.CommandType = CommandType.Text; - string strSql = @" SELECT w.ID,m.Material_name,w.Set_Weight,w.Set_Error,m.Bin_Name FROM xl_weigh w left join + string strSql = @" SELECT w.ID,m.Material_name,w.Set_Weight,w.Set_Error,m.Bin_Name,m.Bin_Code FROM xl_weigh w left join (select b.Bin_Serial,b.Bin_Name,b.Bin_Code,b.Material_ID,m.Material_name from Pmt_Bin b left join xl_material m on m.ID=b.Material_ID) m on w.Bin_Serial=m.Bin_Serial - where w.Recipe_ID= @Recipe_ID order by Weight_Id"; + where w.Recipe_ID= @Recipe_ID order by m.Bin_Serial"; dbHelper.CommandText = strSql; dbHelper.ClearParameter(); dbHelper.AddParameter("@Recipe_ID", Recipe_ID); diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/XlPlan/RefreshAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/XlPlan/RefreshAction.cs index 82fd726..c460033 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/XlPlan/RefreshAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/XlPlan/RefreshAction.cs @@ -12,6 +12,7 @@ using Mesnac.Codd.Session; using Mesnac.Action.ChemicalWeighing.Entity; using Mesnac.Action.ChemicalWeighing.Technical; using Mesnac.Action.ChemicalWeighing.DBHelper; +using Mesnac.Action.ChemicalWeighing.ChemicalWeighingPlc; namespace Mesnac.Action.ChemicalWeighing.Product.XlPlan { @@ -79,53 +80,24 @@ namespace Mesnac.Action.ChemicalWeighing.Product.XlPlan StopAction.OnStopPlan += Process_Event; //自动下传计划成功时，刷新本地计划 - XlPlcHelper.PlcPlanHelper.sender = runtime; - XlPlcHelper.PlcPlanHelper.AutoDownloadPlan -= Process_Event; - XlPlcHelper.PlcPlanHelper.AutoDownloadPlan += Process_Event; - - //把PLC计划状态更新至数据库时，刷新本地计划 - //ChemicalWeighingPlc.XlPlcHelper.sender = runtime; - //ChemicalWeighingPlc.XlPlcHelper.OnUpdatePlanStateFromPlc -= Process_Event; - //ChemicalWeighingPlc.XlPlcHelper.OnUpdatePlanStateFromPlc += Process_Event; - - //HMI请求添加计划完成后，刷新本地计划 - //ChemicalWeighingPlc.PlcPlanHelper.sender = runtime; - //ChemicalWeighingPlc.PlcPlanHelper.OnAutoAddPlan -= Process_Event; - //ChemicalWeighingPlc.PlcPlanHelper.OnAutoAddPlan += Process_Event; - - //HMI请求修改计划完成后，刷新本地计划 - //ChemicalWeighingPlc.PlcPlanHelper.sender = runtime; - //XlPlcHelper.OnChangePlan -= Process_Event; - //XlPlcHelper.OnChangePlan += Process_Event; + //XlPlcHelper.PlcPlanHelper.sender = runtime; + //XlPlcHelper.PlcPlanHelper.AutoDownloadPlan -= Process_Event; + //XlPlcHelper.PlcPlanHelper.AutoDownloadPlan += Process_Event; //定时刷新 - InitFormAction.OnRefreshPlan -= Process_Event; - InitFormAction.OnRefreshPlan += Process_Event; + XlPlcHelper.PlcPlanHelper.OnUpdateXlPlanStateFromPlc -= Process_Event; + XlPlcHelper.PlcPlanHelper.OnUpdateXlPlanStateFromPlc += Process_Event; IsFirstRun = false; } #endregion - //DbMCControl planDateControl = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "[xl_plan].[Plan_Date]").FirstOrDefault(); - //DbMCControl pptShiftControl = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "Pmt_Shiftime").FirstOrDefault(); DbMCControl clientGridControl = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "xl_plan").FirstOrDefault(); //获取本机台计划控件 - //if (planDateControl == null) - //{ - // ICSharpCode.Core.LoggingService.Error("{当班计划-刷新计划} 缺少日期选择控件..."); - // return; - //} - //if (pptShiftControl == null) - //{ - // ICSharpCode.Core.LoggingService.Error("{当班计划-刷新计划} 缺少班次组合框控件..."); - // return; - //} if (clientGridControl == null || !(clientGridControl.BaseControl is DataGridView)) { ICSharpCode.Core.LoggingService.Error("｛当班计划—刷新计划｝缺少本机台计划网格控件..."); return; } - //this._planDateControl = planDateControl; - //this._pptShiftControl = pptShiftControl; this._clientGridControl = clientGridControl; this.DoWork(); @@ -149,9 +121,10 @@ namespace Mesnac.Action.ChemicalWeighing.Product.XlPlan //DataTable table = PlanHelper.GetPlanData(selectedDate); //DataTable table = PlanHelper.GetPlanData(); IFreeSql fsql = FreeHelper.Instance; - string sql = @"SELECT Batch,ProductName,Plan_Serial,Recipe_ID,Recipe_Name,Equip_Code,Version,Plan_Id,Plan_Num,Real_Num,Plan_State,Plan_StateText,Start_Date,End_Date,Plan_Date,IsPrenatalTest FROM xl_plan - where IsPrenatalTest=0 or IsPrenatalTest IS NULL "; - DataTable table = fsql.Select().WithSql(sql).ToDataTable("*"); + string sql = @"select * from (SELECT Batch,ProductName,Plan_Serial,Recipe_ID,Recipe_Name,Equip_Code,Version,Plan_Id,Plan_Num,Real_Num,Plan_State,Plan_StateText,Start_Date,End_Date,Plan_Date,IsPrenatalTest,CreateTime FROM xl_plan + where IsPrenatalTest=0 or IsPrenatalTest IS NULL + ) t ";// where datediff(day, t.CreateTime,getdate())=0 + DataTable table = fsql.Select().WithSql(sql).OrderBy("Plan_State").ToDataTable("*"); lock (String.Empty) { diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/BinReport/RefreshAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/BinReport/RefreshAction.cs index f5fdf41..97f90dc 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/BinReport/RefreshAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/BinReport/RefreshAction.cs @@ -13,6 +13,7 @@ using Mesnac.Action.ChemicalWeighing.Entity; using Mesnac.Action.ChemicalWeighing.Technical; using Mesnac.Action.ChemicalWeighing.DBHelper; using System.Timers; +using Mesnac.Action.ChemicalWeighing.XlPlcHelper; namespace Mesnac.Action.ChemicalWeighing.Report.BinReport { @@ -54,8 +55,10 @@ namespace Mesnac.Action.ChemicalWeighing.Report.BinReport OnRefreshBin -= Process_Event; OnRefreshBin += Process_Event; - InitData(); - + + PlcPlanHelper.OnUpdateRefreshBinEvent -= Process_Event; + PlcPlanHelper.OnUpdateRefreshBinEvent += Process_Event; + IsFirstRun = false; } @@ -75,23 +78,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.BinReport #endregion - private void InitData() - { - //System.Timers.Timer timer = new System.Timers.Timer(5000); - //timer.Elapsed += new ElapsedEventHandler(StartServer); - //timer.AutoReset = true; - //timer.Enabled = true; - //timer.Start(); - } - - private void StartServer(object sender, ElapsedEventArgs e) - { - if (OnRefreshBin != null) - { - OnRefreshBin(this._runtime.BaseControl.MCRoot, System.EventArgs.Empty); - } - //this.DoWork(); - } #region 方法定义 @@ -106,18 +92,18 @@ namespace Mesnac.Action.ChemicalWeighing.Report.BinReport string sql = @"select Bin_Serial,Bin_Name,Material_ID,x.Material_name,LimitWeight,BinWeight,ISNULL(e.OutWeight,0.00) OutWeight,ISNULL(o.EnterWeight,0.00) EnterWeight from Pmt_Bin b left join xl_material x on b.Material_ID=x.ID left join ( - select distinct BinId,BinName,MaterialCode,MaterialName,ISNULL(SUM(Weights),0.00) as OutWeight,TypeName from Hw_BinAlarm where TypeName='出库' group by BinId,BinName,MaterialCode,MaterialName,TypeName - ) e on b.Bin_Serial=e.BinId + select distinct BinId,BinName,MaterialCode,MaterialName,ISNULL(SUM(Weights),0.00) as OutWeight,TypeName from Pmt_Bin b left join Hw_BinAlarm a on b.Material_ID=a.MaterialCode where TypeName='出库' and MaterialCode is not null group by BinId,BinName,MaterialCode,MaterialName,TypeName + ) e on b.Bin_Serial=e.BinId and b.Material_ID=e.MaterialCode left join ( - select distinct BinId,BinName,MaterialCode,MaterialName,ISNULL(SUM(Weights),0.00) as EnterWeight,TypeName from Hw_BinAlarm where TypeName='入库' group by BinId,BinName,MaterialCode,MaterialName,TypeName - ) o on b.Bin_Serial=o.BinId"; + select distinct BinId,BinName,MaterialCode,MaterialName,ISNULL(SUM(Weights),0.00) as EnterWeight,TypeName from Pmt_Bin b left join Hw_BinAlarm a on b.Material_ID=a.MaterialCode where TypeName='入库' and MaterialCode is not null group by BinId,BinName,MaterialCode,MaterialName,TypeName + ) o on b.Bin_Serial=o.BinId and b.Material_ID=e.MaterialCode"; lock (String.Empty) { //本地计划 if (this._clientGridControl != null && this._clientGridControl.BaseControl != null) { - DataTable table = fsql.Select().WithSql(sql).ToDataTable("*"); + DataTable table = fsql.Select().WithSql(sql).OrderBy("Bin_Serial").ToDataTable("*"); if (table.Rows.Count > 0) { _clientGridControl.BaseControl.BindDataSource = null; diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Sys/SystemInitAutoAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Sys/SystemInitAutoAction.cs index ce16e94..923d37f 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Sys/SystemInitAutoAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Sys/SystemInitAutoAction.cs @@ -13,6 +13,7 @@ using Mesnac.PlugIn.View; using Mesnac.Gui.Workbench; using System.Reflection; using System.Runtime.InteropServices; +using Mesnac.Action.ChemicalWeighing.FinishBatch.SCADAHelper; namespace Mesnac.Action.ChemicalWeighing.Sys { @@ -67,7 +68,7 @@ namespace Mesnac.Action.ChemicalWeighing.Sys //首次运行启动更新计划状态和自动下传计划服务 FinishBatch.FinishBatchService.Instance.Start(); - + //首次运行时启动定时器运行服务，其中包含Socket通讯连接 Sys.TimerRunService.Instance.Start(); diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/XlRecipe/FrmRecipeMaterial.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/XlRecipe/FrmRecipeMaterial.cs index e4f8555..0948d7e 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/XlRecipe/FrmRecipeMaterial.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/XlRecipe/FrmRecipeMaterial.cs @@ -86,19 +86,20 @@ namespace Mesnac.Action.ChemicalWeighing.Technical.XlRecipe } if (_actionType == ActionType.Add) { - int binId =Convert.ToInt32( this.cmbMaterial.SelectedValue.ToString());//仓库ID + if (TechnicalHelper.GetXlRecipeMaterial(recipeId, materialID,binId)) { - MessageBox.Show("物料列表中存在重复物料,请修改.", Mesnac.Basic.LanguageHelper.Caption, MessageBoxButtons.OK, MessageBoxIcon.Information); + MessageBox.Show("物料列表中存在重复料仓物料,请修改.", Mesnac.Basic.LanguageHelper.Caption, MessageBoxButtons.OK, MessageBoxIcon.Information); return; } } if (_actionType == ActionType.Modify) { - if (TechnicalHelper.IsXlRecipeMaterial(pmt_Recipe.ID, weigh.Material_ID, weighID)) + int binId = Convert.ToInt32(this.cmbMaterial.SelectedValue.ToString());//仓库ID + if (TechnicalHelper.IsXlRecipeMaterial2(pmt_Recipe.ID, weigh.Material_ID, weigh.ID, binId)) { - MessageBox.Show("物料列表中存在重复物料,请修改.", Mesnac.Basic.LanguageHelper.Caption, MessageBoxButtons.OK, MessageBoxIcon.Information); + MessageBox.Show("物料列表中存在重复料仓物料,请修改.", Mesnac.Basic.LanguageHelper.Caption, MessageBoxButtons.OK, MessageBoxIcon.Information); return; } } @@ -112,9 +113,9 @@ namespace Mesnac.Action.ChemicalWeighing.Technical.XlRecipe var wList= Product.XlPlan.PlanHelper.Getxl_weighList(pmt_Recipe.ID); UpdateWeighByRecipeID(weighID, binId, weigh.Material_ID, Convert.ToDecimal(this.txtWeight.Text), Convert.ToDecimal(this.txtError.Text)); //配方对应的物料信息重新插入数据库 - decimal totalError = wList.Sum(d=>d.Set_Error); - decimal totalWeigh = wList.Sum(d => d.Set_Weight); - UpdateError(pmt_Recipe.ID, totalWeigh, totalError); + decimal totalError = wList.Where(d=>d.ID!= weigh.ID).Sum(d=>d.Set_Error)+ Convert.ToDecimal(this.txtError.Text); + decimal totalWeight = wList.Where(d => d.ID != weigh.ID).Sum(d => d.Set_Weight)+ Convert.ToDecimal(this.txtWeight.Text); + UpdateError(pmt_Recipe.ID, totalWeight, totalError); } this.DialogResult = System.Windows.Forms.DialogResult.OK; } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/XlRecipe/InsertAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/XlRecipe/InsertAction.cs index c275387..a0e5017 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/XlRecipe/InsertAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/XlRecipe/InsertAction.cs @@ -97,6 +97,7 @@ namespace Mesnac.Action.ChemicalWeighing.Technical.XlRecipe MessageBox.Show(ex.Message, Mesnac.Basic.LanguageHelper.WarnCaption, MessageBoxButtons.OK, MessageBoxIcon.Warning); } this._runtime.BaseControl.MCEnabled = true; + } #endregion diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/XlRecipe/TechnicalHelper.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/XlRecipe/TechnicalHelper.cs index bc54278..903d80d 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/XlRecipe/TechnicalHelper.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/XlRecipe/TechnicalHelper.cs @@ -496,11 +496,11 @@ namespace Mesnac.Action.ChemicalWeighing.Technical.XlRecipe throw new Exception(Mesnac.Basic.LanguageHelper.DataBaseConnectError); } dbHelper.CommandType = CommandType.Text; - string sqlstr = "select * from xl_recipe r inner join xl_weigh w on r.ID=w.Recipe_ID where Recipe_Verify = 1 and r.ID = @RecipeId and w.Material_ID=@MaterialID and w.Bin_Serial=@Bin_Serial order by Version desc"; + string sqlstr = "select * from xl_recipe r inner join xl_weigh w on r.ID=w.Recipe_ID where Recipe_Verify = 1 and r.ID = @RecipeId and w.Bin_Serial=@Bin_Serial order by Version desc"; dbHelper.CommandText = sqlstr; dbHelper.ClearParameter(); dbHelper.AddParameter("@RecipeId", recipeId); - dbHelper.AddParameter("@MaterialID", mId); + //dbHelper.AddParameter("@MaterialID", mId); dbHelper.AddParameter("@Bin_Serial", binId); DataTable dt = dbHelper.ToDataTable(); if (dt != null && dt.Rows.Count > 0) @@ -537,6 +537,36 @@ namespace Mesnac.Action.ChemicalWeighing.Technical.XlRecipe } return false; } + + /// + /// 验证料仓存在 + /// + /// ID + /// 返回对应的版本列表 + public static bool IsXlRecipeMaterial2(string recipeId, string mId,string wId,int stationId) + { + List list = new List(); + + DbHelper dbHelper = Mesnac.Basic.DataSourceFactory.Instance.GetDbHelper(Mesnac.Basic.DataSourceFactory.MCDbType.Local); + if (dbHelper == null) + { + throw new Exception(Mesnac.Basic.LanguageHelper.DataBaseConnectError); + } + dbHelper.CommandType = CommandType.Text; + string sqlstr = "select * from xl_recipe r inner join xl_weigh w on r.ID=w.Recipe_ID where Recipe_Verify = 1 and r.ID = @RecipeId and w.ID<>@WId and w.Bin_Serial=@Bin_Serial order by Bin_Serial desc"; + dbHelper.CommandText = sqlstr; + dbHelper.ClearParameter(); + dbHelper.AddParameter("@RecipeId", recipeId); + //dbHelper.AddParameter("@MaterialID", mId); + dbHelper.AddParameter("@WId", wId); + dbHelper.AddParameter("@Bin_Serial", stationId); + DataTable dt = dbHelper.ToDataTable(); + if (dt != null && dt.Rows.Count > 0) + { + return true; + } + return false; + } #endregion } } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/XlPlcHelper/PlcPlanHelper.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/XlPlcHelper/PlcPlanHelper.cs index a71f1c7..67bd2db 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/XlPlcHelper/PlcPlanHelper.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/XlPlcHelper/PlcPlanHelper.cs @@ -1,4 +1,5 @@ using Mesnac.Action.ChemicalWeighing.BinManage; +using Mesnac.Action.ChemicalWeighing.DBHelper; using Mesnac.Action.ChemicalWeighing.Entity; using Mesnac.Action.ChemicalWeighing.Entity.PptPlan; using Mesnac.Action.ChemicalWeighing.Product.XlPlan; @@ -15,6 +16,10 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper { public static object sender = null; public static event EventHandler AutoDownloadPlan; + public static event EventHandler OnUpdateXlPlanStateFromPlc;//更新小料计划 + public static event EventHandler OnUpdateRefreshBinEvent;//料仓预警 + public static int execNum = 0;//记录未完成任务数量 + public static int alarmNum = 0;//记录料仓告警数量 #region 自动下传计划列表至小料PLC /// @@ -327,8 +332,8 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper planId = item.Plan_Id; if (item.Station == 0) continue; - set_station_weight = Convert.ToInt32(item.Set_Weight * 100); - set_station_error = Convert.ToInt32(item.Set_Error * 100); + set_station_weight = Convert.ToInt32(item.Set_Weight * 1000); + set_station_error = Convert.ToInt32(item.Set_Error * 1000); if (!string.IsNullOrEmpty(item.Plan_Id)) { @@ -337,8 +342,6 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper //BasePlcHelper.Instance.PlcWriteByDataKey(BasePlcHelper.Instance.plt_Set_RecipeName, new object[] { item.Recipe_Name }); //配方名称 BasePlcHelper.Instance.PlcWriteByDataKey(BasePlcHelper.Instance.plt_Set_Batch, new object[] { item.Plan_Num });//设定执行数量 BasePlcHelper.Instance.PlcWriteByDataKey(BasePlcHelper.Instance.plt_Set_Plan_Serial, new object[] { item.Plan_Serial }); //计划号 - - } switch (item.Station) { @@ -520,7 +523,6 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper } } - BasePlcHelper.Instance.PlcWriteByDataKey(BasePlcHelper.Instance.plt_plc_Start, new object[] { 1 });//设定启动信号 return true; @@ -584,7 +586,7 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper if (BasePlcHelper.Instance.plt_Read11_PlcState.NowValue.ToInt() == 1)//1工位A { int batch = BasePlcHelper.Instance.plt_Station1_Batch.NowValue.ToInt();//工位批次 - decimal real_Weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station1_Weight.NowValue.ToInt()) / 100;//实际重量 + decimal real_Weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station1_Weight.NowValue.ToInt()) / 1000;//实际重量 bool result = SaveToData(item, batch, real_Weight); @@ -599,7 +601,7 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper if (BasePlcHelper.Instance.plt_Read12_PlcState.NowValue.ToInt() == 1)//1工位B { int batch = BasePlcHelper.Instance.plt_Station1_Batch.NowValue.ToInt();//工位批次 - decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station1_Weight.NowValue.ToInt()) / 100;//实际重量 + decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station1_Weight.NowValue.ToInt()) / 1000;//实际重量 bool result = SaveToData(item, batch, weight); if (result) @@ -615,7 +617,7 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper if (BasePlcHelper.Instance.plt_Read21_PlcState.NowValue.ToInt() == 1)//2工位A { int batch = BasePlcHelper.Instance.plt_Station2_Batch.NowValue.ToInt();//工位批次 - decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station2_Weight.NowValue.ToInt()) / 100;//实际重量 + decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station2_Weight.NowValue.ToInt()) / 1000;//实际重量 bool result = SaveToData(item, batch, weight); if (result) @@ -631,7 +633,7 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper if (BasePlcHelper.Instance.plt_Read22_PlcState.NowValue.ToInt() == 1)//2工位B { int batch = BasePlcHelper.Instance.plt_Station2_Batch.NowValue.ToInt();//工位批次 - decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station2_Weight.NowValue.ToInt()) / 100;//实际重量 + decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station2_Weight.NowValue.ToInt()) / 1000;//实际重量 bool result = SaveToData(item, batch, weight); if (result) @@ -647,7 +649,7 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper if (BasePlcHelper.Instance.plt_Read31_PlcState.NowValue.ToInt() == 1)//3工位A { int batch = BasePlcHelper.Instance.plt_Station3_Batch.NowValue.ToInt();//工位批次 - decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station3_Weight.NowValue.ToInt()) / 100;//实际重量 + decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station3_Weight.NowValue.ToInt()) / 1000;//实际重量 bool result = SaveToData(item, batch, weight); if (result) @@ -663,7 +665,7 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper if (BasePlcHelper.Instance.plt_Read32_PlcState.NowValue.ToInt() == 1)//3工位B { int batch = BasePlcHelper.Instance.plt_Station3_Batch.NowValue.ToInt();//工位批次 - decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station3_Weight.NowValue.ToInt()) / 100;//实际重量 + decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station3_Weight.NowValue.ToInt()) / 1000;//实际重量 bool result = SaveToData(item, batch, weight); if (result) @@ -679,7 +681,7 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper if (BasePlcHelper.Instance.plt_Read41_PlcState.NowValue.ToInt() == 1)//4工位A { int batch = BasePlcHelper.Instance.plt_Station4_Batch.NowValue.ToInt();//工位批次 - decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station4_Weight.NowValue.ToInt()) / 100;//实际重量 + decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station4_Weight.NowValue.ToInt()) / 1000;//实际重量 bool result = SaveToData(item, batch, weight); if (result) @@ -695,7 +697,7 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper if (BasePlcHelper.Instance.plt_Read42_PlcState.NowValue.ToInt() == 1)//4工位B { int batch = BasePlcHelper.Instance.plt_Station4_Batch.NowValue.ToInt();//工位批次 - decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station4_Weight.NowValue.ToInt()) / 100;//实际重量 + decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station4_Weight.NowValue.ToInt()) / 1000;//实际重量 bool result = SaveToData(item, batch, weight); if (result) @@ -714,7 +716,7 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper int i = BasePlcHelper.Instance.plt_Station5_Weight.NowValue.ToInt(); string i2 = BasePlcHelper.Instance.plt_Station5_Weight.NowValue.ToString(); - decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station5_Weight.NowValue.ToInt()) / 100;//实际重量 + decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station5_Weight.NowValue.ToInt()) / 1000;//实际重量 bool result = SaveToData(item, batch, weight); if (result) @@ -730,7 +732,7 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper if (BasePlcHelper.Instance.plt_Read52_PlcState.NowValue.ToInt() == 1)//5工位B { int batch = BasePlcHelper.Instance.plt_Station5_Batch.NowValue.ToInt();//工位批次 - decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station5_Weight.NowValue.ToInt()) / 100;//实际重量 + decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station5_Weight.NowValue.ToInt()) / 1000;//实际重量 bool result = SaveToData(item, batch, weight); if (result) @@ -746,8 +748,8 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper if (BasePlcHelper.Instance.plt_Read61_PlcState.NowValue.ToInt() == 1)//6工位A { int batch = BasePlcHelper.Instance.plt_Station6_Batch.NowValue.ToInt();//工位批次 - int y = BasePlcHelper.Instance.plt_Station6_Weight.NowValue.ToInt(); - decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station6_Weight.NowValue.ToInt()) / 100;//实际重量 + + decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station6_Weight.NowValue.ToInt()) / 1000;//实际重量 bool result = SaveToData(item, batch, weight); if (result) @@ -763,7 +765,7 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper if (BasePlcHelper.Instance.plt_Read62_PlcState.NowValue.ToInt() == 1)//6工位B { int batch = BasePlcHelper.Instance.plt_Station6_Batch.NowValue.ToInt();//工位批次 - decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station6_Weight.NowValue.ToInt()) / 100;//实际重量 + decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station6_Weight.NowValue.ToInt()) / 1000;//实际重量 bool result = SaveToData(item, batch, weight); if (result) @@ -779,7 +781,7 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper if (BasePlcHelper.Instance.plt_Read71_PlcState.NowValue.ToInt() == 1)//7工位A { int batch = BasePlcHelper.Instance.plt_Station7_Batch.NowValue.ToInt();//工位批次 - decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station7_Weight.NowValue.ToInt()) / 100;//实际重量 + decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station7_Weight.NowValue.ToInt()) / 1000;//实际重量 bool result = SaveToData(item, batch, weight); if (result) @@ -795,7 +797,7 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper if (BasePlcHelper.Instance.plt_Read72_PlcState.NowValue.ToInt() == 1)//7工位B { int batch = BasePlcHelper.Instance.plt_Station7_Batch.NowValue.ToInt();//工位批次 - decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station7_Weight.NowValue.ToInt()) / 100;//实际重量 + decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station7_Weight.NowValue.ToInt()) / 1000;//实际重量 bool result = SaveToData(item, batch, weight); if (result) @@ -811,7 +813,7 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper if (BasePlcHelper.Instance.plt_Read81_PlcState.NowValue.ToInt() == 1)//7工位B { int batch = BasePlcHelper.Instance.plt_Station8_Batch.NowValue.ToInt();//工位批次 - decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station8_Weight.NowValue.ToInt()) / 100;//实际重量 + decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station8_Weight.NowValue.ToInt()) / 1000;//实际重量 bool result = SaveToData(item, batch, weight); if (result) @@ -827,7 +829,7 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper if (BasePlcHelper.Instance.plt_Read82_PlcState.NowValue.ToInt() == 1)//8工位A { int batch = BasePlcHelper.Instance.plt_Station8_Batch.NowValue.ToInt();//工位批次 - decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station8_Weight.NowValue.ToInt()) / 100;//实际重量 + decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station8_Weight.NowValue.ToInt()) / 1000;//实际重量 bool result = SaveToData(item, batch, weight); if (result) @@ -843,7 +845,7 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper if (BasePlcHelper.Instance.plt_Read91_PlcState.NowValue.ToInt() == 1)//9工位A { int batch = BasePlcHelper.Instance.plt_Station9_Batch.NowValue.ToInt();//工位批次 - decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station9_Weight.NowValue.ToInt()) / 100;//实际重量 + decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station9_Weight.NowValue.ToInt()) / 1000;//实际重量 bool result = SaveToData(item, batch, weight); if (result) @@ -859,7 +861,7 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper if (BasePlcHelper.Instance.plt_Read92_PlcState.NowValue.ToInt() == 1)//9工位B { int batch = BasePlcHelper.Instance.plt_Station9_Batch.NowValue.ToInt();//工位批次 - decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station9_Weight.NowValue.ToInt()) / 100;//实际重量 + decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station9_Weight.NowValue.ToInt()) / 1000;//实际重量 bool result = SaveToData(item, batch, weight); if (result) @@ -875,7 +877,7 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper if (BasePlcHelper.Instance.plt_Read101_PlcState.NowValue.ToInt() == 1)//10工位A { int batch = BasePlcHelper.Instance.plt_Station10_Batch.NowValue.ToInt();//工位批次 - decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station10_Weight.NowValue.ToInt()) / 100;//实际重量 + decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station10_Weight.NowValue.ToInt()) / 1000;//实际重量 bool result = SaveToData(item, batch, weight); if (result) @@ -891,7 +893,7 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper if (BasePlcHelper.Instance.plt_Read102_PlcState.NowValue.ToInt() == 1)//10工位B { int batch = BasePlcHelper.Instance.plt_Station10_Batch.NowValue.ToInt();//工位批次 - decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station10_Weight.NowValue.ToInt()) / 100;//实际重量 + decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station10_Weight.NowValue.ToInt()) / 1000;//实际重量 bool result = SaveToData(item, batch, weight); if (result) @@ -909,7 +911,7 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper string b = BasePlcHelper.Instance.plt_Station11_Batch.NowValue.ToString();//工位批次 int batch = Convert.ToInt16(b); int batch2 = Convert.ToInt32(b); - decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station11_Weight.NowValue.ToInt()) / 100;//实际重量 + decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station11_Weight.NowValue.ToInt()) / 1000;//实际重量 bool result = SaveToData(item, batch, weight); if (result) @@ -925,7 +927,7 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper if (BasePlcHelper.Instance.plt_Read112_PlcState.NowValue.ToInt() == 1)//11工位B { int batch = BasePlcHelper.Instance.plt_Station11_Batch.NowValue.ToInt();//工位批次 - decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station11_Weight.NowValue.ToInt()) / 100;//实际重量 + decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station11_Weight.NowValue.ToInt()) / 1000;//实际重量 bool result = SaveToData(item, batch, weight); if (result) @@ -941,11 +943,9 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper if (BasePlcHelper.Instance.plt_Read121_PlcState.NowValue.ToInt() == 1)//12工位A { // int batch = BasePlcHelper.Instance.plt_Station12_Batch.NowValue.ToInt();//工位批次 - string b = BasePlcHelper.Instance.plt_Station11_Batch.NowValue.ToString();//工位批次 - int batch = Convert.ToInt16(b); - int batch2 = Convert.ToInt32(b); - decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station12_Weight.NowValue.ToInt()) / 100;//实际重量 - + //int batch = Convert.ToInt16(b); + decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station12_Weight.NowValue.ToInt()) / 1000;//实际重量 + int batch = BasePlcHelper.Instance.plt_Station12_Batch.NowValue.ToInt();//工位批次 bool result = SaveToData(item, batch, weight); if (result) { @@ -960,7 +960,7 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper if (BasePlcHelper.Instance.plt_Read122_PlcState.NowValue.ToInt() == 1)//12工位B { int batch = BasePlcHelper.Instance.plt_Station12_Batch.NowValue.ToInt();//工位批次 - decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station12_Weight.NowValue.ToInt()) / 100;//实际重量 + decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station12_Weight.NowValue.ToInt()) / 1000;//实际重量 bool result = SaveToData(item, batch, weight); if (result) @@ -977,7 +977,7 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper { int batch = BasePlcHelper.Instance.plt_Station13_Batch.NowValue.ToInt();//工位批次 - decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station13_Weight.NowValue.ToInt()) / 100;//实际重量 + decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station13_Weight.NowValue.ToInt()) / 1000;//实际重量 bool result = SaveToData(item, batch, weight); if (result) @@ -993,7 +993,7 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper if (BasePlcHelper.Instance.plt_Read132_PlcState.NowValue.ToInt() == 1)//13工位B { int batch = BasePlcHelper.Instance.plt_Station13_Batch.NowValue.ToInt();//工位批次 - decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station13_Weight.NowValue.ToInt()) / 100;//实际重量 + decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station13_Weight.NowValue.ToInt()) / 1000;//实际重量 bool result = SaveToData(item, batch, weight); if (result) @@ -1008,7 +1008,7 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper { int batch = BasePlcHelper.Instance.plt_Station14_Batch.NowValue.ToInt();//工位批次 var t = BasePlcHelper.Instance.plt_Station14_Weight.NowValue.ToInt(); - decimal weight = Convert.ToDecimal(t) / 100;//实际重量 + decimal weight = Convert.ToDecimal(t) / 1000;//实际重量 bool result = SaveToData(item, batch, weight); if (result) @@ -1024,7 +1024,7 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper if (BasePlcHelper.Instance.plt_Read142_PlcState.NowValue.ToInt() == 1)//14工位B { int batch = BasePlcHelper.Instance.plt_Station14_Batch.NowValue.ToInt();//工位批次 - decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station14_Weight.NowValue.ToInt()) / 100;//实际重量 + decimal weight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Station14_Weight.NowValue.ToInt()) / 1000;//实际重量 bool result = SaveToData(item, batch, weight); if (result) @@ -1048,7 +1048,7 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper { if (BasePlcHelper.Instance.plt_Read1Jc.NowValue.ToInt() == 1) { - double tcheckWeight = BasePlcHelper.Instance.plt_TCheck_Weight.NowValue.ToInt()/100;//检量秤重量 + double tcheckWeight = BasePlcHelper.Instance.plt_TCheck_Weight.NowValue.ToInt()/1000;//检量秤重量 int tcheckBatch = BasePlcHelper.Instance.plt_Batch.NowValue.ToInt();//当前执行的批次 if (tcheckBatch == down.Plan_Num) { @@ -1414,6 +1414,99 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper #endregion + #region 把PLC的计划状态更新至数据库 + + /// + /// 把PLC的计划状态更新至数据库 + /// + public static void UpdateXlPlanStateFromPlc() + { + try + { + bool flag = false; + + #region 小料同步计划状态和完成数 + + #region 触发事件 + flag = true; + if (flag) + { + IFreeSql _fsql = FreeHelper.Instance; + string sql = "select * FROM xl_plan where Plan_State=5"; + var obj = _fsql.Select().WithSql(sql).OrderBy(d=>d.Plan_State).ToList(); + if (obj.Count()!= execNum) + { + if (OnUpdateXlPlanStateFromPlc != null) + { + OnUpdateXlPlanStateFromPlc(sender, System.EventArgs.Empty); + execNum = obj.Count(); + } + + } + } + + #endregion + + #endregion + } + catch (Exception ex) + { + ICSharpCode.Core.LoggingService.Error("把PLC的计划状态更新至数据库异常：" + ex.Message, ex); + } + finally + { + Global.PublicVar.Instance.LocalPlanIsRefresh = false; + } + } + + #endregion + + #region 把PLC的计划状态更新至数据库 + + /// + /// 把PLC的计划状态更新至数据库 + /// + public static void UpdateBinAlarm() + { + try + { + bool flag = false; + + #region 料仓告警 + + #region 触发事件 + flag = true; + if (flag) + { + IFreeSql _fsql = FreeHelper.Instance; + string sql = "select * FROM Pmt_Bin where BinWeight().WithSql(sql).ToList(); + if (obj.Count() != alarmNum) + { + if (OnUpdateRefreshBinEvent != null) + { + OnUpdateRefreshBinEvent(sender, System.EventArgs.Empty); + alarmNum = obj.Count(); + } + + } + } + + #endregion + + #endregion + } + catch (Exception ex) + { + ICSharpCode.Core.LoggingService.Error("把PLC的计划状态更新至数据库异常：" + ex.Message, ex); + } + finally + { + Global.PublicVar.Instance.LocalPlanIsRefresh = false; + } + } + + #endregion #endregion #region 设定设备参数 @@ -1427,9 +1520,9 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper int set_station_Weight_Low = 0; int set_station_Weight_Advance = 0; - set_station_Weight_Medium = Convert.ToInt32(Convert.ToDecimal(item.Station_Weight_Medium) * 100); - set_station_Weight_Low = Convert.ToInt32(Convert.ToDecimal(item.Station_Weight_Low) * 100); - set_station_Weight_Advance = Convert.ToInt32(Convert.ToDecimal(item.Station_Weight_Advance) * 100); + set_station_Weight_Medium = Convert.ToInt32(Convert.ToDecimal(item.Station_Weight_Medium) * 1000); + set_station_Weight_Low = Convert.ToInt32(Convert.ToDecimal(item.Station_Weight_Low) * 1000); + set_station_Weight_Advance = Convert.ToInt32(Convert.ToDecimal(item.Station_Weight_Advance) * 1000); int set_station_speed_hight = Convert.ToInt32(Convert.ToDecimal(item.Station_Speed_Hight) * 10); int set_station_speed_medium = Convert.ToInt32(Convert.ToDecimal(item.Station_Speed_Medium) * 10); @@ -1765,11 +1858,11 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper case 1: if (BasePlcHelper.Instance.plt_Set_Station1_Weight_Medium1.NowValue.ToInt() > 0) - weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station1_Weight_Medium1.NowValue.ToInt()) / 100; + weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station1_Weight_Medium1.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station1_Weight_Low1.NowValue.ToInt() > 0) - weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station1_Weight_Low1.NowValue.ToInt()) / 100; + weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station1_Weight_Low1.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station1_Weight_Advance1.NowValue.ToInt() > 0) - weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station1_Weight_Advance1.NowValue.ToInt()) / 100; + weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station1_Weight_Advance1.NowValue.ToInt()) / 1000; var speed1_Hight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station1_Speed_Hight1.NowValue.ToString()) / 10; var speed1_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station1_Speed_Medium1.NowValue.ToString()) / 10; @@ -1787,11 +1880,11 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper case 2: if (BasePlcHelper.Instance.plt_Set_Station1_Weight_Medium2.NowValue.ToInt() > 0) - weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station1_Weight_Medium2.NowValue.ToInt()) / 100; + weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station1_Weight_Medium2.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station1_Weight_Low2.NowValue.ToInt() > 0) - weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station1_Weight_Low2.NowValue.ToInt()) / 100; + weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station1_Weight_Low2.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station1_Weight_Advance2.NowValue.ToInt() > 0) - weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station1_Weight_Advance2.NowValue.ToInt()) / 100; + weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station1_Weight_Advance2.NowValue.ToInt()) / 1000; var speed2_Hight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station1_Speed_Hight2.NowValue.ToDouble()) / 10; var speed2_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station1_Speed_Medium2.NowValue.ToDouble()) / 10; @@ -1808,11 +1901,11 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper break; case 3: if (BasePlcHelper.Instance.plt_Set_Station2_Weight_Medium3.NowValue.ToInt() > 0) - weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station2_Weight_Medium3.NowValue.ToInt()) / 100; + weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station2_Weight_Medium3.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station2_Weight_Low3.NowValue.ToInt() > 0) - weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station2_Weight_Low3.NowValue.ToInt()) / 100; + weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station2_Weight_Low3.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station2_Weight_Advance3.NowValue.ToInt() > 0) - weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station2_Weight_Advance3.NowValue.ToInt()) / 100; + weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station2_Weight_Advance3.NowValue.ToInt()) / 1000; var speed3_Hight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station2_Speed_Hight3.NowValue.ToDouble()) / 10; var speed3_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station2_Speed_Medium3.NowValue.ToDouble()) / 10; @@ -1829,11 +1922,11 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper break; case 4: if (BasePlcHelper.Instance.plt_Set_Station2_Weight_Medium4.NowValue.ToInt() > 0) - weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station2_Weight_Medium4.NowValue.ToInt()) / 100; + weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station2_Weight_Medium4.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station2_Weight_Low4.NowValue.ToInt() > 0) - weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station2_Weight_Low4.NowValue.ToInt()) / 100; + weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station2_Weight_Low4.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station2_Weight_Advance4.NowValue.ToInt() > 0) - weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station2_Weight_Advance4.NowValue.ToInt()) / 100; + weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station2_Weight_Advance4.NowValue.ToInt()) / 1000; var speed4_Hight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station2_Speed_Hight4.NowValue.ToDouble()) / 10; var speed4_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station2_Speed_Medium4.NowValue.ToDouble()) / 10; @@ -1850,11 +1943,11 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper break; case 5: if (BasePlcHelper.Instance.plt_Set_Station3_Weight_Medium5.NowValue.ToInt() > 0) - weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station3_Weight_Medium5.NowValue.ToInt()) / 100; + weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station3_Weight_Medium5.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station3_Weight_Low5.NowValue.ToInt() > 0) - weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station3_Weight_Low5.NowValue.ToInt()) / 100; + weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station3_Weight_Low5.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station3_Weight_Advance5.NowValue.ToInt() > 0) - weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station3_Weight_Advance5.NowValue.ToInt()) / 100; + weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station3_Weight_Advance5.NowValue.ToInt()) / 1000; var speed5_Hight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station3_Speed_Hight5.NowValue.ToDouble()) / 10; var speed5_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station3_Speed_Medium5.NowValue.ToDouble()) / 10; @@ -1872,11 +1965,11 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper case 6: if (BasePlcHelper.Instance.plt_Set_Station3_Weight_Medium6.NowValue.ToInt() > 0) - weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station3_Weight_Medium6.NowValue.ToInt()) / 100; + weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station3_Weight_Medium6.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station3_Weight_Low6.NowValue.ToInt() > 0) - weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station3_Weight_Low6.NowValue.ToInt()) / 100; + weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station3_Weight_Low6.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station3_Weight_Advance6.NowValue.ToInt() > 0) - weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station3_Weight_Advance6.NowValue.ToInt()) / 100; + weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station3_Weight_Advance6.NowValue.ToInt()) / 1000; var speed6_Hight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station3_Speed_Hight6.NowValue.ToDouble()) / 10; var speed6_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station3_Speed_Medium6.NowValue.ToDouble()) / 10; @@ -1894,11 +1987,11 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper case 7: if (BasePlcHelper.Instance.plt_Set_Station4_Weight_Medium7.NowValue.ToInt() > 0) - weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station4_Weight_Medium7.NowValue.ToInt()) / 100; + weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station4_Weight_Medium7.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station4_Weight_Low7.NowValue.ToInt() > 0) - weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station4_Weight_Low7.NowValue.ToInt()) / 100; + weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station4_Weight_Low7.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station4_Weight_Advance7.NowValue.ToInt() > 0) - weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station4_Weight_Advance7.NowValue.ToInt()) / 100; + weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station4_Weight_Advance7.NowValue.ToInt()) / 1000; var speed7_Hight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station4_Speed_Hight7.NowValue.ToDouble()) / 10; var speed7_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station4_Speed_Medium7.NowValue.ToDouble()) / 10; @@ -1914,14 +2007,14 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper i++; break; case 8: - var t = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station4_Weight_Advance8.NowValue.ToInt()) / 100; + var t = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station4_Weight_Advance8.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station4_Weight_Medium8.NowValue.ToInt() > 0) - weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station4_Weight_Medium8.NowValue.ToInt() / 100); + weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station4_Weight_Medium8.NowValue.ToInt() / 1000); if (BasePlcHelper.Instance.plt_Set_Station4_Weight_Low8.NowValue.ToInt() > 0) - weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station4_Weight_Low8.NowValue.ToInt() / 100); + weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station4_Weight_Low8.NowValue.ToInt() / 1000); if (BasePlcHelper.Instance.plt_Set_Station4_Weight_Advance8.NowValue.ToInt() > 0) - weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station4_Weight_Advance8.NowValue.ToInt() / 100); + weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station4_Weight_Advance8.NowValue.ToInt() / 1000); var speed8_Hight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station4_Speed_Hight8.NowValue.ToString()) / 10; var speed8_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station4_Speed_Medium8.NowValue.ToString()) / 10; @@ -1938,11 +2031,11 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper break; case 9: if (BasePlcHelper.Instance.plt_Set_Station5_Weight_Medium9.NowValue.ToInt() > 0) - weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station5_Weight_Medium9.NowValue.ToInt()) / 100; + weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station5_Weight_Medium9.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station5_Weight_Low9.NowValue.ToInt() > 0) - weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station5_Weight_Low9.NowValue.ToInt()) / 100; + weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station5_Weight_Low9.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station5_Weight_Advance9.NowValue.ToInt() > 0) - weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station5_Weight_Advance9.NowValue.ToInt()) / 100; + weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station5_Weight_Advance9.NowValue.ToInt()) / 1000; var speed9_Hight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station5_Speed_Hight9.NowValue.ToDouble()) / 10; var speed9_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station5_Speed_Medium9.NowValue.ToDouble()) / 10; @@ -1959,11 +2052,11 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper break; case 10: if (BasePlcHelper.Instance.plt_Set_Station5_Weight_Medium10.NowValue.ToInt() > 0) - weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station5_Weight_Medium10.NowValue.ToInt()) / 100; + weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station5_Weight_Medium10.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station5_Weight_Low10.NowValue.ToInt() > 0) - weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station5_Weight_Low10.NowValue.ToInt()) / 100; + weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station5_Weight_Low10.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station5_Weight_Advance10.NowValue.ToInt() > 0) - weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station5_Weight_Advance10.NowValue.ToInt()) / 100; + weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station5_Weight_Advance10.NowValue.ToInt()) / 1000; var speed10_Hight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station5_Speed_Hight10.NowValue.ToDouble()) / 10; var speed10_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station5_Speed_Medium10.NowValue.ToDouble()) / 10; @@ -1980,11 +2073,11 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper break; case 11: if (BasePlcHelper.Instance.plt_Set_Station6_Weight_Medium11.NowValue.ToInt() > 0) - weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station6_Weight_Medium11.NowValue.ToInt()) / 100; + weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station6_Weight_Medium11.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station6_Weight_Low11.NowValue.ToInt() > 0) - weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station6_Weight_Low11.NowValue.ToInt()) / 100; + weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station6_Weight_Low11.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station6_Weight_Advance11.NowValue.ToInt() > 0) - weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station6_Weight_Advance11.NowValue.ToInt()) / 100; + weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station6_Weight_Advance11.NowValue.ToInt()) / 1000; var speed11_Hight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station6_Speed_Hight11.NowValue.ToDouble()) / 10; var speed11_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station6_Speed_Medium11.NowValue.ToDouble()) / 10; @@ -2001,11 +2094,11 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper break; case 12: if (BasePlcHelper.Instance.plt_Set_Station6_Weight_Medium12.NowValue.ToInt() > 0) - weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station6_Weight_Medium12.NowValue.ToInt()) / 100; + weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station6_Weight_Medium12.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station6_Weight_Low12.NowValue.ToInt() > 0) - weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station6_Weight_Low12.NowValue.ToInt()) / 100; + weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station6_Weight_Low12.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station6_Weight_Advance12.NowValue.ToInt() > 0) - weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station6_Weight_Advance12.NowValue.ToInt()) / 100; + weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station6_Weight_Advance12.NowValue.ToInt()) / 1000; var speed12_Hight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station6_Speed_Hight12.NowValue.ToDouble()) / 10; var speed12_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station6_Speed_Medium12.NowValue.ToDouble()) / 10; @@ -2022,11 +2115,11 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper break; case 13: if (BasePlcHelper.Instance.plt_Set_Station7_Weight_Medium13.NowValue.ToInt() > 0) - weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station7_Weight_Medium13.NowValue.ToInt()) / 100; + weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station7_Weight_Medium13.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station7_Weight_Low13.NowValue.ToInt() > 0) - weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station7_Weight_Low13.NowValue.ToInt()) / 100; + weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station7_Weight_Low13.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station7_Weight_Advance13.NowValue.ToInt() > 0) - weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station7_Weight_Advance13.NowValue.ToInt()) / 100; + weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station7_Weight_Advance13.NowValue.ToInt()) / 1000; var speed13_Hight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station7_Speed_Hight13.NowValue.ToDouble()) / 10; var speed13_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station7_Speed_Medium13.NowValue.ToDouble()) / 10; @@ -2043,11 +2136,11 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper break; case 14: if (BasePlcHelper.Instance.plt_Set_Station7_Weight_Medium14.NowValue.ToInt() > 0) - weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station7_Weight_Medium14.NowValue.ToInt()) / 100; + weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station7_Weight_Medium14.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station7_Weight_Low14.NowValue.ToInt() > 0) - weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station7_Weight_Low14.NowValue.ToInt()) / 100; + weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station7_Weight_Low14.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station7_Weight_Advance14.NowValue.ToInt() > 0) - weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station7_Weight_Advance14.NowValue.ToInt()) / 100; + weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station7_Weight_Advance14.NowValue.ToInt()) / 1000; var speed14_Hight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station7_Speed_Hight14.NowValue.ToDouble()) / 10; var speed14_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station7_Speed_Medium14.NowValue.ToDouble()) / 10; @@ -2064,11 +2157,11 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper break; case 15: if (BasePlcHelper.Instance.plt_Set_Station8_Weight_Medium15.NowValue.ToInt() > 0) - weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station8_Weight_Medium15.NowValue.ToInt()) / 100; + weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station8_Weight_Medium15.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station8_Weight_Low15.NowValue.ToInt() > 0) - weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station8_Weight_Low15.NowValue.ToInt()) / 100; + weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station8_Weight_Low15.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station8_Weight_Advance15.NowValue.ToInt() > 0) - weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station8_Weight_Advance15.NowValue.ToInt()) / 100; + weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station8_Weight_Advance15.NowValue.ToInt()) / 1000; var speed15_Hight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station8_Speed_Hight16.NowValue.ToDouble()) / 10; var speed15_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station8_Speed_Medium16.NowValue.ToDouble()) / 10; @@ -2085,11 +2178,11 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper break; case 16: if (BasePlcHelper.Instance.plt_Set_Station8_Weight_Medium16.NowValue.ToInt() > 0) - weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station8_Weight_Medium16.NowValue.ToInt()) / 100; + weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station8_Weight_Medium16.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station8_Weight_Low16.NowValue.ToInt() > 0) - weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station8_Weight_Low16.NowValue.ToInt()) / 100; + weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station8_Weight_Low16.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station8_Weight_Advance16.NowValue.ToInt() > 0) - weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station8_Weight_Advance16.NowValue.ToInt()) / 100; + weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station8_Weight_Advance16.NowValue.ToInt()) / 1000; var speed16_Hight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station8_Speed_Hight16.NowValue.ToDouble()) / 10; var speed16_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station8_Speed_Medium16.NowValue.ToDouble()) / 10; @@ -2106,11 +2199,11 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper break; case 17: if (BasePlcHelper.Instance.plt_Set_Station9_Weight_Medium17.NowValue.ToInt() > 0) - weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station9_Weight_Medium17.NowValue.ToInt()) / 100; + weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station9_Weight_Medium17.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station9_Weight_Low17.NowValue.ToInt() > 0) - weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station9_Weight_Low17.NowValue.ToInt()) / 100; + weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station9_Weight_Low17.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station9_Weight_Advance17.NowValue.ToInt() > 0) - weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station9_Weight_Advance17.NowValue.ToInt()) / 100; + weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station9_Weight_Advance17.NowValue.ToInt()) / 1000; var speed17_Hight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station9_Speed_Hight17.NowValue.ToDouble()) / 10; var speed17_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station9_Speed_Medium17.NowValue.ToDouble()) / 10; @@ -2127,11 +2220,11 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper break; case 18: if (BasePlcHelper.Instance.plt_Set_Station9_Weight_Medium18.NowValue.ToInt() > 0) - weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station9_Weight_Medium18.NowValue.ToInt()) / 100; + weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station9_Weight_Medium18.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station9_Weight_Low18.NowValue.ToInt() > 0) - weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station9_Weight_Low18.NowValue.ToInt()) / 100; + weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station9_Weight_Low18.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station9_Weight_Advance18.NowValue.ToInt() > 0) - weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station9_Weight_Advance18.NowValue.ToInt()) / 100; + weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station9_Weight_Advance18.NowValue.ToInt()) / 1000; var speed18_Hight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station9_Speed_Hight18.NowValue.ToDouble()) / 10; var speed18_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station9_Speed_Medium18.NowValue.ToDouble()) / 10; @@ -2148,11 +2241,11 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper break; case 19: if (BasePlcHelper.Instance.plt_Set_Station10_Weight_Medium19.NowValue.ToInt() > 0) - weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station10_Weight_Medium19.NowValue.ToInt()) / 100; + weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station10_Weight_Medium19.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station10_Weight_Low19.NowValue.ToInt() > 0) - weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station10_Weight_Low19.NowValue.ToInt()) / 100; + weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station10_Weight_Low19.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station10_Weight_Advance19.NowValue.ToInt() > 0) - weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station10_Weight_Advance19.NowValue.ToInt()) / 100; + weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station10_Weight_Advance19.NowValue.ToInt()) / 1000; var speed19_Hight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station10_Speed_Hight19.NowValue.ToDouble()) / 10; var speed19_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station10_Speed_Medium19.NowValue.ToDouble()) / 10; @@ -2169,11 +2262,11 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper break; case 20: if (BasePlcHelper.Instance.plt_Set_Station10_Weight_Medium20.NowValue.ToInt() > 0) - weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station10_Weight_Medium20.NowValue.ToInt()) / 100; + weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station10_Weight_Medium20.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station10_Weight_Low20.NowValue.ToInt() > 0) - weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station10_Weight_Low20.NowValue.ToInt()) / 100; + weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station10_Weight_Low20.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station10_Weight_Advance20.NowValue.ToInt() > 0) - weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station10_Weight_Advance20.NowValue.ToInt()) / 100; + weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station10_Weight_Advance20.NowValue.ToInt()) / 1000; var speed20_Hight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station10_Speed_Hight20.NowValue.ToDouble()) / 10; var speed20_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station10_Speed_Medium20.NowValue.ToDouble()) / 10; @@ -2190,11 +2283,11 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper break; case 21: if (BasePlcHelper.Instance.plt_Set_Station11_Weight_Medium21.NowValue.ToInt() > 0) - weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station11_Weight_Medium21.NowValue.ToInt()) / 100; + weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station11_Weight_Medium21.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station11_Weight_Low21.NowValue.ToInt() > 0) - weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station11_Weight_Low21.NowValue.ToInt()) / 100; + weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station11_Weight_Low21.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station11_Weight_Advance21.NowValue.ToInt() > 0) - weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station11_Weight_Advance21.NowValue.ToInt()) / 100; + weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station11_Weight_Advance21.NowValue.ToInt()) / 1000; var speed21_Hight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station11_Speed_Hight21.NowValue.ToDouble()) / 10; var speed21_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station11_Speed_Medium21.NowValue.ToDouble()) / 10; @@ -2211,11 +2304,11 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper break; case 22: if (BasePlcHelper.Instance.plt_Set_Station11_Weight_Medium22.NowValue.ToInt() > 0) - weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station11_Weight_Medium22.NowValue.ToInt()) / 100; + weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station11_Weight_Medium22.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station11_Weight_Low22.NowValue.ToInt() > 0) - weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station11_Weight_Low22.NowValue.ToInt()) / 100; + weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station11_Weight_Low22.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station11_Weight_Advance22.NowValue.ToInt() > 0) - weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station11_Weight_Advance22.NowValue.ToInt()) / 100; + weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station11_Weight_Advance22.NowValue.ToInt()) / 1000; var speed22_Hight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station11_Speed_Hight22.NowValue.ToDouble()) / 10; var speed22_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station11_Speed_Medium22.NowValue.ToDouble()) / 10; @@ -2232,11 +2325,11 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper break; case 23: if (BasePlcHelper.Instance.plt_Set_Station12_Weight_Medium23.NowValue.ToInt() > 0) - weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station12_Weight_Medium23.NowValue.ToInt()) / 100; + weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station12_Weight_Medium23.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station12_Weight_Low23.NowValue.ToInt() > 0) - weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station12_Weight_Low23.NowValue.ToInt()) / 100; + weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station12_Weight_Low23.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station12_Weight_Advance23.NowValue.ToInt() > 0) - weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station12_Weight_Advance23.NowValue.ToInt()) / 100; + weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station12_Weight_Advance23.NowValue.ToInt()) / 1000; var speed23_Hight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station12_Speed_Hight23.NowValue.ToDouble()) / 10; var speed23_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station12_Speed_Medium23.NowValue.ToDouble()) / 10; @@ -2253,11 +2346,11 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper break; case 24: if (BasePlcHelper.Instance.plt_Set_Station12_Weight_Medium24.NowValue.ToInt() > 0) - weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station12_Weight_Medium24.NowValue.ToInt()) / 100; + weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station12_Weight_Medium24.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station12_Weight_Low24.NowValue.ToInt() > 0) - weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station12_Weight_Low24.NowValue.ToInt()) / 100; + weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station12_Weight_Low24.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station12_Weight_Advance24.NowValue.ToInt() > 0) - weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station12_Weight_Advance24.NowValue.ToInt()) / 100; + weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station12_Weight_Advance24.NowValue.ToInt()) / 1000; var speed24_Hight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station12_Speed_Hight24.NowValue.ToDouble()) / 10; var speed24_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station12_Speed_Medium24.NowValue.ToDouble()) / 10; @@ -2274,11 +2367,11 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper break; case 25: if (BasePlcHelper.Instance.plt_Set_Station13_Weight_Medium25.NowValue.ToInt() > 0) - weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station13_Weight_Medium25.NowValue.ToInt()) / 100; + weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station13_Weight_Medium25.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station13_Weight_Low25.NowValue.ToInt() > 0) - weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station13_Weight_Low25.NowValue.ToInt()) / 100; + weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station13_Weight_Low25.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station13_Weight_Advance25.NowValue.ToInt() > 0) - weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station13_Weight_Advance25.NowValue.ToInt()) / 100; + weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station13_Weight_Advance25.NowValue.ToInt()) / 1000; var speed25_Hight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station13_Speed_Hight25.NowValue.ToDouble()) / 10; var speed25_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station13_Speed_Medium25.NowValue.ToDouble()) / 10; @@ -2295,11 +2388,11 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper break; case 26: if (BasePlcHelper.Instance.plt_Set_Station13_Weight_Medium26.NowValue.ToInt() > 0) - weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station13_Weight_Medium26.NowValue.ToInt()) / 100; + weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station13_Weight_Medium26.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station13_Weight_Low26.NowValue.ToInt() > 0) - weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station13_Weight_Low26.NowValue.ToInt()) / 100; + weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station13_Weight_Low26.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station13_Weight_Advance26.NowValue.ToInt() > 0) - weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station13_Weight_Advance26.NowValue.ToInt()) / 100; + weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station13_Weight_Advance26.NowValue.ToInt()) / 1000; var speed26_Hight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station13_Speed_Hight26.NowValue.ToDouble()) / 10; var speed26_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station13_Speed_Medium26.NowValue.ToDouble()) / 10; @@ -2316,11 +2409,11 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper break; case 27: if (BasePlcHelper.Instance.plt_Set_Station14_Weight_Medium27.NowValue.ToInt() > 0) - weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station14_Weight_Medium27.NowValue.ToInt()) / 100; + weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station14_Weight_Medium27.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station14_Weight_Low27.NowValue.ToInt() > 0) - weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station14_Weight_Low27.NowValue.ToInt()) / 100; + weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station14_Weight_Low27.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station14_Weight_Advance27.NowValue.ToInt() > 0) - weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station14_Weight_Advance27.NowValue.ToInt()) / 100; + weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station14_Weight_Advance27.NowValue.ToInt()) / 1000; var speed27_Hight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station14_Speed_Hight27.NowValue.ToDouble()) / 10; var speed27_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station14_Speed_Medium27.NowValue.ToDouble()) / 10; @@ -2337,11 +2430,11 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper break; case 28: if (BasePlcHelper.Instance.plt_Set_Station14_Weight_Medium28.NowValue.ToInt() > 0) - weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station14_Weight_Medium28.NowValue.ToInt()) / 100; + weight_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station14_Weight_Medium28.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station14_Weight_Low28.NowValue.ToInt() > 0) - weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station14_Weight_Low28.NowValue.ToInt()) / 100; + weight_Low = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station14_Weight_Low28.NowValue.ToInt()) / 1000; if (BasePlcHelper.Instance.plt_Set_Station14_Weight_Advance28.NowValue.ToInt() > 0) - weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station14_Weight_Advance28.NowValue.ToInt()) / 100; + weight_Advance = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station14_Weight_Advance28.NowValue.ToInt()) / 1000; var speed28_Hight = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station14_Speed_Hight28.NowValue.ToDouble()) / 10; var speed28_Medium = Convert.ToDecimal(BasePlcHelper.Instance.plt_Set_Station14_Speed_Medium28.NowValue.ToDouble()) / 10; @@ -2794,5 +2887,7 @@ namespace Mesnac.Action.ChemicalWeighing.XlPlcHelper } } } + + } } diff --git a/Main/MCEdit/Data/EventConfig/小料称量/料桶管理.xml b/Main/MCEdit/Data/EventConfig/小料称量/料桶管理.xml index 45a2673..7a446a6 100644 --- a/Main/MCEdit/Data/EventConfig/小料称量/料桶管理.xml +++ b/Main/MCEdit/Data/EventConfig/小料称量/料桶管理.xml @@ -30,6 +30,10 @@ 条码预览 条码预览 + + 导入料桶 + 导入料桶 + @@ -55,6 +59,9 @@ + + + @@ -66,6 +73,7 @@ + \ No newline at end of file diff --git a/Main/MCEdit/Data/MCProject/nodeForm/BinAlarm.xml b/Main/MCEdit/Data/MCProject/nodeForm/BinAlarm.xml index 1ced810..44e900e 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/BinAlarm.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/BinAlarm.xml @@ -68,10 +68,3 @@ ControlText BinAlarm - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAEAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIENBRURBODFCREQwNDZEMUYwQkQyMjkzRUMxMjhGOENGBgYAAAAS5paZ5LuT5oql6K2m5oql6KGoBgcAAAAS5paZ5LuT5oql6K2m5oql6KGoCw== - - 5000 - True - diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FrmBarrel.xml b/Main/MCEdit/Data/MCProject/nodeForm/FrmBarrel.xml index 3df558f..b610c3b 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/FrmBarrel.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/FrmBarrel.xml @@ -3,7 +3,7 @@ False - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAABwAAAHsAAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAkIAAAACQkAAAAJCgAAAAoFBAAAAChNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zAgAAAApfZmlsZWREYXRhDF9kaXNwbGF5TmFtZQEBAgAAAAYLAAAAAklEBgwAAAAG5bqP5Y+3AQUAAAAEAAAABg0AAAAKQmFycmVsTmFtZQYOAAAADOaWmeahtuWQjeensAEGAAAABAAAAAYPAAAAB0JhckNvZGUGEAAAABrmlpnmobbnvJbnoIEo6buY6K6k5p2h56CBKQEHAAAABAAAAAYRAAAADE1hdGVyaWFsTmFtZQYSAAAADOe7keWumueJqeaWmQEIAAAABAAAAAYTAAAABldlaWdodAYUAAAADOe7keWumumHjemHjwEJAAAABAAAAAYVAAAACElzRW5hYmxlBhYAAAAM5piv5ZCm5ZCv55SoAQoAAAAEAAAABhcAAAAGUmVtYXJrBhgAAAAG5aSH5rOoCw== + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAACAAAAI0AAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAkIAAAACQkAAAAJCgAAAAkLAAAABQQAAAAoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAKX2ZpbGVkRGF0YQxfZGlzcGxheU5hbWUBAQIAAAAGDAAAAAJJRAYNAAAABuW6j+WPtwEFAAAABAAAAAYOAAAACkJhcnJlbE5hbWUGDwAAAAzmlpnmobblkI3np7ABBgAAAAQAAAAGEAAAAAdCYXJDb2RlBhEAAAAa5paZ5qG257yW56CBKOm7mOiupOadoeeggSkBBwAAAAQAAAAGEgAAAApNYXRlcmlhbElEBhMAAAAP54mp5paZ5LqM57u056CBAQgAAAAEAAAABhQAAAAMTWF0ZXJpYWxOYW1lBhUAAAAM57uR5a6a54mp5paZAQkAAAAEAAAABhYAAAAGV2VpZ2h0BhcAAAAM57uR5a6a6YeN6YePAQoAAAAEAAAABhgAAAAISXNFbmFibGUGGQAAAAzmmK/lkKblkK/nlKgBCwAAAAQAAAAGGgAAAAZSZW1hcmsGGwAAAAblpIfms6gL AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL @@ -36,6 +36,30 @@ 3 + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAASAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEU0OTVFNjdBOEM4OTc1MDM1NkUyRTk5QjBDN0EwQTZEBgYAAAAM5a+85YWl54mp5paZBgcAAAAM5a+85YWl54mp5paZCw== + + + + False + + + + None + True + True + True + + + Red + DarkGray + 导入 + 438, 3 + MCButton11 + 70, 40 + 18 + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAIAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDY3ODE0MDJENTFEQ0Y1NjYxMTkxQTZCNTNENkUwODlCBgYAAAAM6Kej57uR5paZ5qG2BgcAAAAM6Kej57uR5paZ5qG2Cw== @@ -55,7 +79,7 @@ Red DarkGray 解绑物料 - 304, 3 + 295, 3 MCButton5 70, 40 3 @@ -79,7 +103,7 @@ Red DarkGray 刷新 - 380, 3 + 366, 3 MCButton6 70, 40 3 @@ -103,7 +127,7 @@ Red DarkGray 预览 - 229, 3 + 222, 3 MCButton4 70, 40 3 @@ -127,7 +151,7 @@ Red DarkGray 删除 - 155, 3 + 150, 3 MCButton3 70, 40 2 @@ -151,7 +175,7 @@ Red DarkGray 修改 - 81, 3 + 78, 3 MCButton2 70, 40 1 diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FrmBin.xml b/Main/MCEdit/Data/MCProject/nodeForm/FrmBin.xml index 6b2c19a..16e00db 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/FrmBin.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/FrmBin.xml @@ -3,7 +3,7 @@ False - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAADAAAAJ8AAAAHAwAAAAABAAAAEAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAkIAAAACQkAAAAJCgAAAAkLAAAACQwAAAAJDQAAAAkOAAAACQ8AAAANBAUEAAAAKE1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnMCAAAACl9maWxlZERhdGEMX2Rpc3BsYXlOYW1lAQECAAAABhAAAAAKQmluX1NlcmlhbAYRAAAABuW6j+WPtwEFAAAABAAAAAYSAAAACEJpbl9OYW1lBhMAAAAM5paZ5LuT5ZCN56ewAQYAAAAEAAAABhQAAAAIQmluX0NvZGUGFQAAAAzmlpnku5PmnaHnoIEBBwAAAAQAAAAGFgAAAA1NYXRlcmlhbF9uYW1lBhcAAAAM54mp5paZ5ZCN56ewAQgAAAAEAAAABhgAAAAJQmluV2VpZ2h0BhkAAAAS5paZ5LuT5a6e5pe26YeN6YePAQkAAAAEAAAABhoAAAALTGltaXRXZWlnaHQGGwAAABLmlpnku5Porr7lrprph43ph48BCgAAAAQAAAAGHAAAABVTdGF0aW9uX1dlaWdodF9NZWRpdW0GHQAAABDkuK3pgJ/ph43ph48oa2cpAQsAAAAEAAAABh4AAAASU3RhdGlvbl9XZWlnaHRfTG93Bh8AAAAQ5L2O6YCf6YeN6YePKGtnKQEMAAAABAAAAAYgAAAAFlN0YXRpb25fV2VpZ2h0X0FkdmFuY2UGIQAAAA3mj5DliY3ph48oa2cpAQ0AAAAEAAAABiIAAAATU3RhdGlvbl9TcGVlZF9IaWdodAYjAAAAEOmrmOmAn+mAn+W6pihIeikBDgAAAAQAAAAGJAAAABRTdGF0aW9uX1NwZWVkX01lZGl1bQYlAAAAEOS4remAn+mAn+W6pihIeikBDwAAAAQAAAAGJgAAABFTdGF0aW9uX1NwZWVkX0xvdwYnAAAAEOS9jumAn+mAn+W6pihIeikL + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAACwAAAKsAAAAHAwAAAAABAAAAEAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAkIAAAACQkAAAAJCgAAAAkLAAAACQwAAAAJDQAAAAkOAAAADQUFBAAAAChNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zAgAAAApfZmlsZWREYXRhDF9kaXNwbGF5TmFtZQEBAgAAAAYPAAAACkJpbl9TZXJpYWwGEAAAAAbluo/lj7cBBQAAAAQAAAAGEQAAAAhCaW5fTmFtZQYSAAAADOaWmeS7k+WQjeensAEGAAAABAAAAAYTAAAACEJpbl9Db2RlBhQAAAAM5paZ5LuT5p2h56CBAQcAAAAEAAAABhUAAAANTWF0ZXJpYWxfbmFtZQYWAAAADOeJqeaWmeWQjeensAEIAAAABAAAAAYXAAAAC0xpbWl0V2VpZ2h0BhgAAAAS5paZ5LuT6K6+5a6a6YeN6YePAQkAAAAEAAAABhkAAAAVU3RhdGlvbl9XZWlnaHRfTWVkaXVtBhoAAAAQ5Lit6YCf6YeN6YePKGtnKQEKAAAABAAAAAYbAAAAElN0YXRpb25fV2VpZ2h0X0xvdwYcAAAAEOS9jumAn+mHjemHjyhrZykBCwAAAAQAAAAGHQAAABZTdGF0aW9uX1dlaWdodF9BZHZhbmNlBh4AAAAN5o+Q5YmN6YePKGtnKQEMAAAABAAAAAYfAAAAE1N0YXRpb25fU3BlZWRfSGlnaHQGIAAAABDpq5jpgJ/pgJ/luqYoSHopAQ0AAAAEAAAABiEAAAAUU3RhdGlvbl9TcGVlZF9NZWRpdW0GIgAAABDkuK3pgJ/pgJ/luqYoSHopAQ4AAAAEAAAABiMAAAARU3RhdGlvbl9TcGVlZF9Mb3cGJAAAABDkvY7pgJ/pgJ/luqYoSHopCw== AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL diff --git a/Main/MCEdit/Data/MCProject/nodeForm/小料监控.xml b/Main/MCEdit/Data/MCProject/nodeForm/小料监控.xml index 9531846..7b254dc 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/小料监控.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/小料监控.xml @@ -635,11 +635,11 @@ True False - CWSS_PLC.DB104.T_checking/100 + CWSS_PLC.DB104.T_checking/1000 Red DarkGray - 0.00 - 黑体, 36pt, style=Bold + 0.000 + 黑体, 26.25pt, style=Bold 60, 890 MCButton3 197, 80 @@ -663,8 +663,8 @@ Red DarkGray - 0.00 - 黑体, 36pt, style=Bold + 0.000 + 黑体, 26.25pt, style=Bold 207, 307 MCBtn14 162, 55 @@ -685,11 +685,11 @@ True False - CWSS_PLC.DB104.net14/100 + CWSS_PLC.DB104.net14/1000 Red DarkGray - 0.00 - 黑体, 36pt, style=Bold + 0.000 + 黑体, 26.25pt, style=Bold 206, 363 MCButton16 162, 55 @@ -713,8 +713,8 @@ Red DarkGray - 0.00 - 黑体, 36pt, style=Bold + 0.000 + 黑体, 26.25pt, style=Bold 370, 307 MCBtn13 162, 55 @@ -738,8 +738,8 @@ Red DarkGray - 0.00 - 黑体, 36pt, style=Bold + 0.000 + 黑体, 26.25pt, style=Bold 533, 307 MCBtn12 162, 55 @@ -760,11 +760,11 @@ True False - CWSS_PLC.DB104.net13/100 + CWSS_PLC.DB104.net13/1000 Red DarkGray - 0.00 - 黑体, 36pt, style=Bold + 0.000 + 黑体, 26.25pt, style=Bold 369, 363 MCButton15 162, 55 @@ -788,8 +788,8 @@ Red DarkGray - 0.00 - 黑体, 36pt, style=Bold + 0.000 + 黑体, 26.25pt, style=Bold 695, 307 MCBtn11 162, 55 @@ -810,11 +810,11 @@ True False - CWSS_PLC.DB104.net12/100 + CWSS_PLC.DB104.net12/1000 Red DarkGray - 0.00 - 黑体, 36pt, style=Bold + 0.000 + 黑体, 26.25pt, style=Bold 533, 363 MCButton14 162, 55 @@ -838,8 +838,8 @@ Red DarkGray - 0.00 - 黑体, 36pt, style=Bold + 0.000 + 黑体, 26.25pt, style=Bold 857, 307 MCBtn10 162, 55 @@ -860,11 +860,11 @@ True False - CWSS_PLC.DB104.net11/100 + CWSS_PLC.DB104.net11/1000 Red DarkGray - 0.00 - 黑体, 36pt, style=Bold + 0.000 + 黑体, 26.25pt, style=Bold 695, 363 MCButton13 162, 55 @@ -888,8 +888,8 @@ Red DarkGray - 0.00 - 黑体, 36pt, style=Bold + 0.000 + 黑体, 26.25pt, style=Bold 1018, 307 MCBtn9 162, 55 @@ -910,11 +910,11 @@ True False - CWSS_PLC.DB104.net10/100 + CWSS_PLC.DB104.net10/1000 Red DarkGray - 0.00 - 黑体, 36pt, style=Bold + 0.000 + 黑体, 26.25pt, style=Bold 857, 363 MCButton12 162, 55 @@ -938,8 +938,8 @@ Red DarkGray - 0.00 - 黑体, 36pt, style=Bold + 0.000 + 黑体, 26.25pt, style=Bold 1179, 307 MCBtn8 162, 55 @@ -960,11 +960,11 @@ True False - CWSS_PLC.DB104.net7/100 + CWSS_PLC.DB104.net7/1000 Red DarkGray - 0.00 - 黑体, 36pt, style=Bold + 0.000 + 黑体, 26.25pt, style=Bold 1018, 363 MCButton11 162, 55 @@ -985,11 +985,11 @@ True False - CWSS_PLC.DB104.net8/100 + CWSS_PLC.DB104.net8/1000 Red DarkGray - 0.00 - 黑体, 36pt, style=Bold + 0.000 + 黑体, 26.25pt, style=Bold 1180, 363 MCButton10 162, 55 @@ -1013,8 +1013,8 @@ Red DarkGray - 0.00 - 黑体, 36pt, style=Bold + 0.000 + 黑体, 26.25pt, style=Bold 1172, 759 MCBtn1 162, 55 @@ -1035,11 +1035,11 @@ True False - CWSS_PLC.DB104.net1/100 + CWSS_PLC.DB104.net1/1000 Red DarkGray - 0.00 - 黑体, 36pt, style=Bold + 0.000 + 黑体, 26.25pt, style=Bold 1172, 814 MCButton9 162, 55 @@ -1063,8 +1063,8 @@ Red DarkGray - 0.00 - 黑体, 36pt, style=Bold + 0.000 + 黑体, 26.25pt, style=Bold 1011, 759 MCBtn2 162, 55 @@ -1085,11 +1085,11 @@ True False - CWSS_PLC.DB104.net2/100 + CWSS_PLC.DB104.net2/1000 Red DarkGray - 0.00 - 黑体, 36pt, style=Bold + 0.000 + 黑体, 26.25pt, style=Bold 1011, 814 MCButton8 162, 55 @@ -1113,8 +1113,8 @@ Red DarkGray - 0.00 - 黑体, 36pt, style=Bold + 0.000 + 黑体, 26.25pt, style=Bold 850, 759 MCBtn3 162, 55 @@ -1135,11 +1135,11 @@ True False - CWSS_PLC.DB104.net3/100 + CWSS_PLC.DB104.net3/1000 Red DarkGray - 0.00 - 黑体, 36pt, style=Bold + 0.000 + 黑体, 26.25pt, style=Bold 850, 814 MCButton7 162, 55 @@ -1163,8 +1163,8 @@ Red DarkGray - 0.00 - 黑体, 36pt, style=Bold + 0.000 + 黑体, 26.25pt, style=Bold 689, 759 MCBtn4 162, 55 @@ -1185,11 +1185,11 @@ True False - CWSS_PLC.DB104.net4/100 + CWSS_PLC.DB104.net4/1000 Red DarkGray - 0.00 - 黑体, 36pt, style=Bold + 0.000 + 黑体, 26.25pt, style=Bold 690, 812 MCButton6 162, 55 @@ -1213,8 +1213,8 @@ Red DarkGray - 0.00 - 黑体, 36pt, style=Bold + 0.000 + 黑体, 26.25pt, style=Bold 527, 760 MCBtn5 162, 55 @@ -1235,11 +1235,11 @@ True False - CWSS_PLC.DB104.net5/100 + CWSS_PLC.DB104.net5/1000 Red DarkGray - 0.00 - 黑体, 36pt, style=Bold + 0.000 + 黑体, 26.25pt, style=Bold 528, 814 MCButton1 162, 55 @@ -1263,8 +1263,8 @@ Red DarkGray - 0.00 - 黑体, 36pt, style=Bold + 0.000 + 黑体, 26.25pt, style=Bold 366, 759 MCBtn6 162, 55 @@ -1285,11 +1285,11 @@ True False - CWSS_PLC.DB104.net6/100 + CWSS_PLC.DB104.net6/1000 Red DarkGray - 0.00 - 黑体, 36pt, style=Bold + 0.000 + 黑体, 26.25pt, style=Bold 367, 813 MCButton2 162, 55 @@ -1313,8 +1313,8 @@ Red DarkGray - 0.00 - 黑体, 36pt, style=Bold + 0.000 + 黑体, 26.25pt, style=Bold 204, 760 MCBtn7 162, 55 @@ -1335,11 +1335,11 @@ True False - CWSS_PLC.DB104.net7/100 + CWSS_PLC.DB104.net7/1000 Red DarkGray - 0.00 - 黑体, 36pt, style=Bold + 0.000 + 黑体, 26.25pt, style=Bold 205, 814 MCButton5 162, 55 @@ -5060,7 +5060,7 @@ - CWSS_PLC.DB104.T_checking/100 + CWSS_PLC.DB104.T_checking/1000 Red DarkGray diff --git a/Main/MCEdit/Data/MCProject/nodeForm/生产计划-小料.xml b/Main/MCEdit/Data/MCProject/nodeForm/生产计划-小料.xml index 8af2d2d..30437b3 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/生产计划-小料.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/生产计划-小料.xml @@ -3,7 +3,7 @@ False - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAADQAAAGwBAAAHAwAAAAABAAAAEAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAkIAAAACQkAAAAJCgAAAAkLAAAACQwAAAAJDQAAAAkOAAAACQ8AAAAJEAAAAA0DBQQAAAAoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAKX2ZpbGVkRGF0YQxfZGlzcGxheU5hbWUBAQIAAAAGEQAAAAtQbGFuX1NlcmlhbAYSAAAABuW6j+WPtwEFAAAABAAAAAYTAAAABUJhdGNoBhQAAAAG5om55qyhAQYAAAAEAAAABhUAAAALUHJvZHVjdE5hbWUGFgAAAAzkuqflk4HlkI3np7ABBwAAAAQAAAAGFwAAAAtSZWNpcGVfTmFtZQYYAAAADOmFjeaWueWQjeensAEIAAAABAAAAAYZAAAACkVxdWlwX0NvZGUGGgAAAAnmnLrlj7Dlj7cBCQAAAAQAAAAGGwAAAAdWZXJzaW9uBhwAAAAM6YWN5pa554mI5pysAQoAAAAEAAAABh0AAAAHUGxhbl9JZAYeAAAACeiuoeWIkuWPtwELAAAABAAAAAYfAAAACFBsYW5fTnVtBiAAAAAG6K6+5a6aAQwAAAAEAAAABiEAAAAIUmVhbF9OdW0GIgAAAAblrozmiJABDQAAAAQAAAAGIwAAAApQbGFuX1N0YXRlBiQAAAAM5omn6KGM54q25oCBAQ4AAAAEAAAABiUAAAAOUGxhbl9TdGF0ZVRleHQGJgAAAAbnirbmgIEBDwAAAAQAAAAGJwAAAApTdGFydF9EYXRlBigAAAAM5byA5aeL5pe26Ze0ARAAAAAEAAAABikAAAAIRW5kX0RhdGUGKgAAAAznu5PmnZ/ml7bpl7QL + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAACgAAAHcBAAAHAwAAAAABAAAAEAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAkIAAAACQkAAAAJCgAAAAkLAAAACQwAAAAJDQAAAA0GBQQAAAAoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAKX2ZpbGVkRGF0YQxfZGlzcGxheU5hbWUBAQIAAAAGDgAAAAtQbGFuX1NlcmlhbAYPAAAABuW6j+WPtwEFAAAABAAAAAYQAAAABUJhdGNoBhEAAAAG5om55qyhAQYAAAAEAAAABhIAAAALUHJvZHVjdE5hbWUGEwAAAAzkuqflk4HlkI3np7ABBwAAAAQAAAAGFAAAAAtSZWNpcGVfTmFtZQYVAAAADOmFjeaWueWQjeensAEIAAAABAAAAAYWAAAAB1BsYW5fSWQGFwAAAAnorqHliJLlj7cBCQAAAAQAAAAGGAAAAAhQbGFuX051bQYZAAAABuiuvuWumgEKAAAABAAAAAYaAAAACFJlYWxfTnVtBhsAAAAG5a6M5oiQAQsAAAAEAAAABhwAAAAOUGxhbl9TdGF0ZVRleHQGHQAAAAzmiafooYznirbmgIEBDAAAAAQAAAAGHgAAAApTdGFydF9EYXRlBh8AAAAM5byA5aeL5pe26Ze0AQ0AAAAEAAAABiAAAAAIRW5kX0RhdGUGIQAAAAznu5PmnZ/ml7bpl7QL AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL @@ -253,13 +253,13 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAUAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEUzNEFBOUIwODFGRThDMjE1MTZFMUFFRjJERTYwRUZBBgYAAAAP56qX5L2T5Yid5aeL5YyWBgcAAAAV6K6h5YiS56qX5L2T5Yid5aeL5YyWCw== - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAIAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAANBAs= + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAKAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDgwN0E1M0EzQTlGOTg5NzdERDExNzQwOTI1RjkyQjE1BgYAAAAM5Yi35paw6K6h5YiSBgcAAAAM5Yi35paw6K6h5YiSCw== AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAHAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAANBAs= - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAJAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAANBAs= + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAALAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDgwN0E1M0EzQTlGOTg5NzdERDExNzQwOTI1RjkyQjE1BgYAAAAM5Yi35paw6K6h5YiSBgcAAAAM5Yi35paw6K6h5YiSCw== True False @@ -275,10 +275,3 @@ ControlText 生产计划-小料 - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAEAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDgwN0E1M0EzQTlGOTg5NzdERDExNzQwOTI1RjkyQjE1BgYAAAAM5Yi35paw6K6h5YiSBgcAAAAM5Yi35paw6K6h5YiSCw== - - 500000 - False - diff --git a/Main/MCEdit/Data/MCProject/nodeForm/配方管理-小料.xml b/Main/MCEdit/Data/MCProject/nodeForm/配方管理-小料.xml index 1a9a392..88da56a 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/配方管理-小料.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/配方管理-小料.xml @@ -48,7 +48,7 @@ False - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAABQAAADEAAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAkIAAAADQMFBAAAAChNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zAgAAAApfZmlsZWREYXRhDF9kaXNwbGF5TmFtZQEBAgAAAAYJAAAAAklEBgoAAAAG57yW56CBAQUAAAAEAAAABgsAAAANTWF0ZXJpYWxfTmFtZQYMAAAADOeJqeaWmeWQjeensAEGAAAABAAAAAYNAAAACEJpbl9OYW1lBg4AAAAG5paZ5LuTAQcAAAAEAAAABg8AAAAKU2V0X1dlaWdodAYQAAAADOiuvuWumumHjemHjwEIAAAABAAAAAYRAAAACVNldF9FcnJvcgYSAAAADOiuvuWumuivr+W3rgs= + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAABQAAADcAAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAkIAAAADQMFBAAAAChNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zAgAAAApfZmlsZWREYXRhDF9kaXNwbGF5TmFtZQEBAgAAAAYJAAAAAklEBgoAAAAG57yW56CBAQUAAAAEAAAABgsAAAANTWF0ZXJpYWxfTmFtZQYMAAAADOeJqeaWmeWQjeensAEGAAAABAAAAAYNAAAACEJpbl9Db2RlBg4AAAAG5paZ5LuTAQcAAAAEAAAABg8AAAAKU2V0X1dlaWdodAYQAAAADOiuvuWumumHjemHjwEIAAAABAAAAAYRAAAACVNldF9FcnJvcgYSAAAADOiuvuWumuivr+W3rgs= AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL diff --git a/Main/MCRun/Data/MCProject/nodeDataSource.xml b/Main/MCRun/Data/MCProject/nodeDataSource.xml index 91d4223..479381b 100644 --- a/Main/MCRun/Data/MCProject/nodeDataSource.xml +++ b/Main/MCRun/Data/MCProject/nodeDataSource.xml @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/Main/MCRun/MCRun.csproj b/Main/MCRun/MCRun.csproj index 2c363b2..34d5389 100644 --- a/Main/MCRun/MCRun.csproj +++ b/Main/MCRun/MCRun.csproj @@ -6,7 +6,7 @@ 8.0.30703 2.0 {91C803A6-90D1-4361-8B92-9AFD9E766411} - WinExe + Exe Properties MCRun MCRun