diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/BasePlcHelper.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/BasePlcHelper.cs index eacb775..19698fd 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/BasePlcHelper.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/BasePlcHelper.cs @@ -1827,7 +1827,7 @@ namespace Mesnac.Action.ChemicalWeighing public DataKeyValue RdyRpt_G8 { get; set; } /// - /// 报表数据准备好湿混机A + /// 报表数据准备好湿混机A /// public DataKeyValue RdyRpt_M1 { get; set; } @@ -2078,9 +2078,11 @@ namespace Mesnac.Action.ChemicalWeighing /// 设备编号 /// public DataKeyValue geler_dos_eqNo { get; set; } + /// /// 批次号 /// + public DataKeyValue geler_dos_batch { get; set; } /// /// 物料代码 diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FinishBatch/FinishBatchService.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FinishBatch/FinishBatchService.cs index fc56003..89a139b 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FinishBatch/FinishBatchService.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FinishBatch/FinishBatchService.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Text; using System.Windows.Forms; using System.Data; +using System.Threading.Tasks; using ICSharpCode.Core; using Mesnac.Equips; using Mesnac.Codd.Session; @@ -113,8 +114,8 @@ namespace Mesnac.Action.ChemicalWeighing.FinishBatch { #region 0、实时刷新自动保存报警 - - // ReportWetMixerSaveHelper.Instance.SaveWetMixerReport(); + + ReportWetMixerSaveHelper.Instance.SaveWetMixerReport(); #endregion } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/DelAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/DelAction.cs index 82f73d0..294b701 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/DelAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/DelAction.cs @@ -11,7 +11,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning private RuntimeParameter _runtime; - public static event EventHandler OnUpdate; + public static event EventHandler OnDelete; public void Run(RuntimeParameter runtime) { @@ -36,9 +36,12 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning var dataGridViewRow = clientGridView.SelectedRows[0]; var id = Convert.ToInt32(dataGridViewRow.Cells["Id"].Value); - - - + LjPlanningDb.SoftDel(id); + + if (OnDelete != null) + { + OnDelete(this._runtime.BaseControl.MCRoot, System.EventArgs.Empty); + } } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/DownloadAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/DownloadAction.cs index c10d803..07b4ca9 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/DownloadAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/DownloadAction.cs @@ -1,7 +1,161 @@ -namespace Mesnac.Action.ChemicalWeighing.LjPlanning +using System; +using System.Collections.Generic; +using System.Linq; +using System.Windows.Forms; +using Mesnac.Action.Base; +using Mesnac.Action.ChemicalWeighing.LjMixManager; +using Mesnac.Action.ChemicalWeighing.LjProdcutLine; + +namespace Mesnac.Action.ChemicalWeighing.LjPlanning { - public class DownloadAction + public class DownloadAction:ChemicalWeighingAction, IAction { + private DbMCControl _materialGridControl = null; //物料列表控件 + private RuntimeParameter _runtime; + + public void Run(RuntimeParameter runtime) + { + base.RunIni(runtime); //必须调用 + this._runtime = runtime; + DbMCControl materialGridControl = + this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "lj_planning") + .FirstOrDefault(); //获取物料数据控件 + this._materialGridControl = materialGridControl; + + DataGridView clientGridView = this._materialGridControl.BaseControl as DataGridView; + + //验证是否选中某物料 + if (clientGridView.SelectedRows.Count != 1) + { + + MessageBox.Show("请选择要下发的数据", Mesnac.Basic.LanguageHelper.Caption, + MessageBoxButtons.OK, MessageBoxIcon.Information); + this._runtime.IsReturn = true; + return; + } + + var dataGridViewRow = clientGridView.SelectedRows[0]; + var id = Convert.ToInt32(dataGridViewRow.Cells["Id"].Value); + var ljPlanningView = LjPlanningDb.GetById(id); + + LoadingHelper.ShowLoadingScreen(); + var watchDog = LjHelp.WatchDog; + if (watchDog == 0) + { + LoadingHelper.CloseForm(); + MessageBox.Show("PLC通讯失败"); + return; + } + + if (ljPlanningView != null) + { + var productLineView = ProductLineDb.GetById(ljPlanningView.ProductLineId); + var strings = productLineView.DryId.Split(',').ToArray(); + + List recipePlcViews = new List(); + List recipePlcViews2 = new List(); + List recipeSteps = new List(); + + List mixSteps = new List(); + foreach (var s in strings) + { + int i = Convert.ToInt32(s); + if (i < 5) + { + recipePlcViews = LjMixManagerDb.GetRecip(ljPlanningView.MetageAId); + recipeSteps=LjMixManagerDb.GetStep(ljPlanningView.MetageAId); + } + else + { + if (id < 13) + { + recipePlcViews = LjMixManagerDb.GetRecip(ljPlanningView.MetageB1Id); + recipePlcViews2 = LjMixManagerDb.GetRecip(ljPlanningView.MetageB2Id); + recipeSteps=LjMixManagerDb.GetStep( ljPlanningView.MixBId); + } + else + { + mixSteps = LjMixManagerDb.GetMixStep(ljPlanningView.MixBId); + } + } + switch (i) + { + + case 1 : + LjMixManagerPlc.DownD1Recipe(recipePlcViews, recipeSteps); + break; + case 2 : + LjMixManagerPlc.DownD2Recipe(recipePlcViews, recipeSteps); + break; + case 3 : + LjMixManagerPlc.DownD3Recipe(recipePlcViews, recipeSteps); + break; + case 4 : + LjMixManagerPlc.DownD4Recipe(recipePlcViews, recipeSteps); + break; + case 5 : + LjMixManagerPlc.DownG1Recipe(recipePlcViews,recipePlcViews2, recipeSteps); + break; + case 6 : + LjMixManagerPlc.DownG2Recipe(recipePlcViews,recipePlcViews2, recipeSteps); + break; + case 7 : + LjMixManagerPlc.DownG3Recipe(recipePlcViews,recipePlcViews2, recipeSteps); + break; + case 8 : + LjMixManagerPlc.DownG4Recipe(recipePlcViews,recipePlcViews2, recipeSteps); + break; + + case 9 : + LjMixManagerPlc.DownG5Recipe(recipePlcViews,recipePlcViews2, recipeSteps); + break; + case 10 : + LjMixManagerPlc.DownG6Recipe(recipePlcViews,recipePlcViews2, recipeSteps); + break; + case 11 : + LjMixManagerPlc.DownG7Recipe(recipePlcViews,recipePlcViews2, recipeSteps); + break; + case 12 : + LjMixManagerPlc.DownG8Recipe(recipePlcViews,recipePlcViews2, recipeSteps); + break; + case 13 : + LjMixManagerPlc.DownM1Recipe(mixSteps); + break; + case 14 : + LjMixManagerPlc.DownM2Recipe(mixSteps); + break; + case 15 : + LjMixManagerPlc.DownM3Recipe(mixSteps); + break; + case 16 : + LjMixManagerPlc.DownM4Recipe(mixSteps); + break; + case 17 : + LjMixManagerPlc.DownM5Recipe(mixSteps); + break; + case 18 : + LjMixManagerPlc.DownM6Recipe(mixSteps); + break; + case 19 : + LjMixManagerPlc.DownM7Recipe(mixSteps); + break; + case 20: + LjMixManagerPlc.DownM8Recipe(mixSteps); + break; + } + } + } + else + { + MessageBox.Show("数据下发失败"); + } + + + + + LoadingHelper.CloseForm(); + + } } } \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmPlanning.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmPlanning.Designer.cs index 17adfdb..b6e280d 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmPlanning.Designer.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmPlanning.Designer.cs @@ -82,7 +82,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(202, 15); + this.label1.Location = new System.Drawing.Point(222, 15); this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(41, 12); @@ -92,7 +92,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning // txtCarNumber // this.txtCarNumber.Location = new System.Drawing.Point(68, 40); - this.txtCarNumber.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.txtCarNumber.Margin = new System.Windows.Forms.Padding(5); this.txtCarNumber.MaxLength = 100; this.txtCarNumber.Name = "txtCarNumber"; this.txtCarNumber.Size = new System.Drawing.Size(129, 21); @@ -115,9 +115,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning this.groupBox1.Controls.Add(this.DrpMetageA); this.groupBox1.Controls.Add(this.label4); this.groupBox1.Location = new System.Drawing.Point(11, 68); - this.groupBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.groupBox1.Margin = new System.Windows.Forms.Padding(2); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.groupBox1.Padding = new System.Windows.Forms.Padding(2); this.groupBox1.Size = new System.Drawing.Size(240, 80); this.groupBox1.TabIndex = 56; this.groupBox1.TabStop = false; @@ -168,9 +168,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning this.groupBox2.Controls.Add(this.DrpMetageB1); this.groupBox2.Controls.Add(this.label7); this.groupBox2.Location = new System.Drawing.Point(11, 152); - this.groupBox2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.groupBox2.Margin = new System.Windows.Forms.Padding(2); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.groupBox2.Padding = new System.Windows.Forms.Padding(2); this.groupBox2.Size = new System.Drawing.Size(240, 106); this.groupBox2.TabIndex = 57; this.groupBox2.TabStop = false; @@ -235,9 +235,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning this.groupBox3.Controls.Add(this.DrpMixC); this.groupBox3.Controls.Add(this.label9); this.groupBox3.Location = new System.Drawing.Point(11, 262); - this.groupBox3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.groupBox3.Margin = new System.Windows.Forms.Padding(2); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.groupBox3.Padding = new System.Windows.Forms.Padding(2); this.groupBox3.Size = new System.Drawing.Size(240, 53); this.groupBox3.TabIndex = 58; this.groupBox3.TabStop = false; @@ -264,8 +264,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning // btnCancel // this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnCancel.Location = new System.Drawing.Point(241, 727); - this.btnCancel.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.btnCancel.Location = new System.Drawing.Point(153, 357); + this.btnCancel.Margin = new System.Windows.Forms.Padding(5); this.btnCancel.Name = "btnCancel"; this.btnCancel.Size = new System.Drawing.Size(98, 45); this.btnCancel.TabIndex = 60; @@ -275,8 +275,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning // // btnOK // - this.btnOK.Location = new System.Drawing.Point(69, 727); - this.btnOK.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.btnOK.Location = new System.Drawing.Point(11, 357); + this.btnOK.Margin = new System.Windows.Forms.Padding(5); this.btnOK.Name = "btnOK"; this.btnOK.Size = new System.Drawing.Size(98, 45); this.btnOK.TabIndex = 59; @@ -288,7 +288,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(263, 328); + this.ClientSize = new System.Drawing.Size(367, 422); this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnOK); this.Controls.Add(this.groupBox3); @@ -299,7 +299,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning this.Controls.Add(this.label1); this.Controls.Add(this.DrpProductLine); this.Controls.Add(this.label3); - this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.Margin = new System.Windows.Forms.Padding(2); this.Name = "FrmPlanning"; this.Text = "计划管理"; this.groupBox1.ResumeLayout(false); @@ -310,14 +310,13 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning this.groupBox3.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); - } #endregion private Label label3; - private ComboBox DrpProductLine; - private Label label1; + private System.Windows.Forms.ComboBox DrpProductLine; + private System.Windows.Forms.Label label1; private TextBox txtCarNumber; private Label label2; private GroupBox groupBox1; @@ -335,7 +334,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning private GroupBox groupBox3; private ComboBox DrpMixC; private Label label9; - private Button btnCancel; - private Button btnOK; + private System.Windows.Forms.Button btnCancel; + private System.Windows.Forms.Button btnOK; } } \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/InItDbAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/InItDbAction.cs index e0328c5..28305c2 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/InItDbAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/InItDbAction.cs @@ -18,6 +18,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning AddAction.OnAdd -= Process_Event; AddAction.OnAdd += Process_Event; + + UpdateAction.OnUpdate -= Process_Event; + UpdateAction.OnUpdate += Process_Event; DbMCControl materialGridControl = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "lj_planning") @@ -30,7 +33,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning { DataTable table = DBHelp.GetTable(@"select Id, No, Status, CreateTime, UpdateTime, BegTime, EndTime, NumCar, Share, MetageAId, MetageAName, MixAId, - MixAName, MetageB1Id, MetageB1Name, MetageB2Id, MetageB2Name, MixBId, MixBName, MixCId, MixCName, RecipeType, Remark, ProductLineId, ProductLineName from lj_planning"); + MixAName, MetageB1Id, MetageB1Name, MetageB2Id, MetageB2Name, MixBId, MixBName, MixCId, + MixCName, RecipeType, Remark, ProductLineId, ProductLineName from lj_planning where IsEnable=1"); if (this._materialGridControl != null && this._materialGridControl.BaseControl != null) { diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/LjPlanningDb.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/LjPlanningDb.cs index 3ede6c9..9b10cb9 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/LjPlanningDb.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/LjPlanningDb.cs @@ -14,7 +14,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning { string sql = $"insert into lj_planning " + $"values (@No,@Status,@CreateTime,@UpdateTime,@BegTime,@EndTime,@NumCar," + - $"@Share,@MetageAId,@MetageAName,@MixAId,@MixAName,@MetageB1Id,@MetageB1Name,@MetageB2Id,@MetageB2Name,@MixBId,@MixBName,@MixCId,@MixCName,@RecipeType,@Remark,@ProductLineId,@ProductLineName)"; + $"@Share,@MetageAId,@MetageAName,@MixAId,@MixAName,@MetageB1Id,@MetageB1Name,@MetageB2Id," + + $"@MetageB2Name,@MixBId,@MixBName,@MixCId,@MixCName,@RecipeType,@Remark,@ProductLineId,@ProductLineName,@IsEnable)"; IDictionary dic = new Dictionary(); @@ -47,7 +48,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning dic["@ProductLineId"] = view.ProductLineId; dic["@ProductLineName"] = view.ProductLineName; - + dic["@IsEnable"] = 1; ExecuteNonQuery(sql,dic); @@ -93,6 +94,13 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning ExecuteNonQuery(sb.ToString()); } + + public static void SoftDel(int id) + { + string sql = $"update lj_planning set IsEnable=0 where Id={id}"; + ExecuteNonQuery(sql); + } + public static LjPlanningView GetById(int id) { string sql = $"select Id, No, Status, CreateTime, UpdateTime, BegTime, EndTime, " + diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/UpdateAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/UpdateAction.cs index 5d16ece..d81689d 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/UpdateAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/UpdateAction.cs @@ -6,5 +6,57 @@ using Mesnac.Action.ChemicalWeighing.LjPressure; namespace Mesnac.Action.ChemicalWeighing.LjPlanning { - + public class UpdateAction:ChemicalWeighingAction, IAction + { + private DbMCControl _materialGridControl = null; //物料列表控件 + private RuntimeParameter _runtime; + + + public static event EventHandler OnUpdate; + + public void Run(RuntimeParameter runtime) + { + base.RunIni(runtime); //必须调用 + this._runtime = runtime; + DbMCControl materialGridControl = + this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "lj_planning") + .FirstOrDefault(); //获取物料数据控件 + this._materialGridControl = materialGridControl; + + DataGridView clientGridView = this._materialGridControl.BaseControl as DataGridView; + + //验证是否选中某物料 + if (clientGridView.SelectedRows.Count != 1) + { + + MessageBox.Show("请选择要修改的数据", Mesnac.Basic.LanguageHelper.Caption, + MessageBoxButtons.OK, MessageBoxIcon.Information); + this._runtime.IsReturn = true; + return; + } + + var dataGridViewRow = clientGridView.SelectedRows[0]; + var id = Convert.ToInt32(dataGridViewRow.Cells["Id"].Value); + + DialogResult result = DialogResult.OK; + + FrmPlanning frmPlanning = new FrmPlanning(id); + result= frmPlanning.ShowDialog(); + + this._runtime.BaseControl.MCEnabled = false; + if (result == DialogResult.OK) + { + if (OnUpdate != null) + { + OnUpdate(this._runtime.BaseControl.MCRoot, System.EventArgs.Empty); + } + + } + + this._runtime.BaseControl.MCEnabled = true; + + } + + + } } \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/DelAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/DelAction.cs index 6e0089a..3c66086 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/DelAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/DelAction.cs @@ -38,7 +38,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjProdcutLine var dataGridViewRow = clientGridView.SelectedRows[0]; var id = dataGridViewRow.Cells["Id"].Value.ToString(); this._runtime.BaseControl.MCEnabled = false; - if (MessageBox.Show("确定删除配方", Mesnac.Basic.LanguageHelper.Caption, MessageBoxButtons.YesNo, + if (MessageBox.Show("确定删除数据", Mesnac.Basic.LanguageHelper.Caption, MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { ProductLineDb.Del(Convert.ToInt32(id)); diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/FrmProductLine.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/FrmProductLine.cs index 57a3ddc..2918522 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/FrmProductLine.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/FrmProductLine.cs @@ -92,6 +92,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjProdcutLine ProductLineView view = new ProductLineView() { + Id = _id, Name = name, DryName = names, CreateTime = DateTime.Now, diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/ProductLineDb.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/ProductLineDb.cs index 237006b..dc23887 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/ProductLineDb.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/ProductLineDb.cs @@ -76,7 +76,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjProdcutLine /// public static void Update(ProductLineView view) { - string sql = $"update lj_product_line set Name='{view.Name}',DryId='{view.DryId}',DryName='{view.DryName}' from lj_product_line where Id={view.Id}"; + string sql = $"update lj_product_line set Name='{view.Name}',DryId='{view.DryId}',DryName='{view.DryName}' " + + $"from lj_product_line where Id={view.Id}"; ExecuteNonQuery(sql); } diff --git a/Main/MCEdit/Data/EventConfig/小料称量/榄菊生产计划管理.xml b/Main/MCEdit/Data/EventConfig/小料称量/榄菊生产计划管理.xml index b81d3a8..25dad42 100644 --- a/Main/MCEdit/Data/EventConfig/小料称量/榄菊生产计划管理.xml +++ b/Main/MCEdit/Data/EventConfig/小料称量/榄菊生产计划管理.xml @@ -21,9 +21,17 @@ 删除计划管理 + + 下发计划管理 + 下发计划管理 + + + + + @@ -41,6 +49,11 @@ + + + + + @@ -51,6 +64,8 @@ + + diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormPlan.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormPlan.xml index 0a1337e..99e5fbd 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/FormPlan.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/FormPlan.xml @@ -26,7 +26,6 @@ True True False - ControlLightLight 30 False Fill @@ -36,6 +35,212 @@ 7 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAQAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDk4NUMwMjhDNjNBNjM1NTZEMTlFMzAwMDJBMEE3QjMwBgYAAAAS5Yid5aeL6K6h5YiS566h55CGBgcAAAAS5Yid5aeL6K6h5YiS566h55CGCw== + + + + False + + + + None + True + True + True + + + Red + DarkGray + 重传 + 宋体, 14.25pt, style=Bold + 457, 3 + MCButton12 + 70, 40 + 6 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAASAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEYzN0E4NzFDQzhFNjIyMkYyQkE0RkQ4RjEyRTVFMUUxBgYAAAAS5LiL5Y+R6K6h5YiS566h55CGBgcAAAAS5LiL5Y+R6K6h5YiS566h55CGCw== + + + + False + + + + None + True + True + True + + + Red + DarkGray + 下传 + 宋体, 14.25pt, style=Bold + 381, 3 + MCButton11 + 70, 40 + 5 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAQAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDk4NUMwMjhDNjNBNjM1NTZEMTlFMzAwMDJBMEE3QjMwBgYAAAAS5Yid5aeL6K6h5YiS566h55CGBgcAAAAS5Yid5aeL6K6h5YiS566h55CGCw== + + + + False + + + + None + True + True + True + + + Red + DarkGray + 暂停 + 宋体, 14.25pt, style=Bold + 305, 3 + MCButton6 + 70, 40 + 4 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAQAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDk4NUMwMjhDNjNBNjM1NTZEMTlFMzAwMDJBMEE3QjMwBgYAAAAS5Yid5aeL6K6h5YiS566h55CGBgcAAAAS5Yid5aeL6K6h5YiS566h55CGCw== + + + + False + + + + None + True + True + True + + + Red + DarkGray + 刷新 + 宋体, 14.25pt, style=Bold + 229, 3 + MCButton7 + 70, 40 + 3 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAALAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDg2NjRDNjYzNTkzOTk4Q0ZBNTkzQTg0REYxOEU0QzREBgYAAAAS5Yig6Zmk6K6h5YiS566h55CGBgcAAAAS5Yig6Zmk6K6h5YiS566h55CGCw== + + + + False + + + + None + True + True + True + + + Red + DarkGray + 删除 + 宋体, 14.25pt, style=Bold + 155, 3 + MCButton8 + 70, 40 + 2 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAALAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDZDNzNFQjM0NTczOEUyNTE5Mzk3NzU3NzBBQUE0RkMxBgYAAAAS5L+u5pS56K6h5YiS566h55CGBgcAAAAS5L+u5pS56K6h5YiS566h55CGCw== + + + + False + + + + None + True + True + True + + + Red + DarkGray + 修改 + 宋体, 14.25pt, style=Bold + 81, 3 + MCButton9 + 70, 40 + 1 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAJAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDZBMzg1M0E0MTRGMTU4QTcwREZENjU0QjhEQUExMEJFBgYAAAAS5re75Yqg6K6h5YiS566h55CGBgcAAAAS5re75Yqg6K6h5YiS566h55CGCw== + + + + False + + + + None + True + True + True + + + Red + DarkGray + 新增 + 宋体, 14.25pt, style=Bold + 7, 3 + MCButton10 + 70, 40 + 0 + + Top + 0, 0 + Panel2 + 1007, 48 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAQAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDk4NUMwMjhDNjNBNjM1NTZEMTlFMzAwMDJBMEE3QjMwBgYAAAAS5Yid5aeL6K6h5YiS566h55CGBgcAAAAS5Yid5aeL6K6h5YiS566h55CGCw== + + + + False + + + + None + True + True + True + + + Red + DarkGray + 暂停 + 宋体, 14.25pt, style=Bold + 305, 3 + MCButton5 + 70, 40 + 4 + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAQAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDk4NUMwMjhDNjNBNjM1NTZEMTlFMzAwMDJBMEE3QjMwBgYAAAAS5Yid5aeL6K6h5YiS566h55CGBgcAAAAS5Yid5aeL6K6h5YiS566h55CGCw==