diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj index b472c0b..47893a5 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj @@ -399,6 +399,7 @@ + diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/XlPlan/FrmXl.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/XlPlan/FrmXl.Designer.cs index 9b7a5ca..d9cef9b 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/XlPlan/FrmXl.Designer.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/XlPlan/FrmXl.Designer.cs @@ -29,52 +29,44 @@ private void InitializeComponent() { this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.cmbRecipeVersion = new System.Windows.Forms.ComboBox(); this.label6 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.label7 = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); this.txtPlanNum = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); this.cmbRecipeMaterial = new System.Windows.Forms.ComboBox(); this.btnCancel = new System.Windows.Forms.Button(); this.btnOk = new System.Windows.Forms.Button(); + this.txtBatch = new System.Windows.Forms.TextBox(); + this.label5 = new System.Windows.Forms.Label(); + this.txtProductName = new System.Windows.Forms.TextBox(); + this.label4 = new System.Windows.Forms.Label(); this.groupBox1.SuspendLayout(); this.SuspendLayout(); // // groupBox1 // - this.groupBox1.Controls.Add(this.cmbRecipeVersion); this.groupBox1.Controls.Add(this.label6); + this.groupBox1.Controls.Add(this.label5); + this.groupBox1.Controls.Add(this.label4); this.groupBox1.Controls.Add(this.label2); this.groupBox1.Controls.Add(this.label7); - this.groupBox1.Controls.Add(this.label5); + this.groupBox1.Controls.Add(this.txtProductName); + this.groupBox1.Controls.Add(this.txtBatch); this.groupBox1.Controls.Add(this.txtPlanNum); - this.groupBox1.Controls.Add(this.label1); this.groupBox1.Controls.Add(this.label3); this.groupBox1.Controls.Add(this.cmbRecipeMaterial); this.groupBox1.Location = new System.Drawing.Point(9, 11); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(424, 142); + this.groupBox1.Size = new System.Drawing.Size(424, 208); this.groupBox1.TabIndex = 11; this.groupBox1.TabStop = false; // - // cmbRecipeVersion - // - this.cmbRecipeVersion.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmbRecipeVersion.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.cmbRecipeVersion.FormattingEnabled = true; - this.cmbRecipeVersion.Location = new System.Drawing.Point(122, 60); - this.cmbRecipeVersion.Name = "cmbRecipeVersion"; - this.cmbRecipeVersion.Size = new System.Drawing.Size(278, 27); - this.cmbRecipeVersion.TabIndex = 5; - // // label6 // this.label6.AutoSize = true; this.label6.ForeColor = System.Drawing.Color.Red; - this.label6.Location = new System.Drawing.Point(105, 69); + this.label6.Location = new System.Drawing.Point(105, 127); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(11, 12); this.label6.TabIndex = 6; @@ -84,57 +76,37 @@ // 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(10, 63); + this.label2.Location = new System.Drawing.Point(10, 121); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(89, 19); this.label2.TabIndex = 5; - this.label2.Text = "配方版本"; + this.label2.Text = "配方名称"; // // label7 // this.label7.AutoSize = true; this.label7.ForeColor = System.Drawing.Color.Red; - this.label7.Location = new System.Drawing.Point(105, 108); + this.label7.Location = new System.Drawing.Point(105, 173); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(11, 12); this.label7.TabIndex = 4; this.label7.Text = "*"; // - // label5 - // - this.label5.AutoSize = true; - this.label5.ForeColor = System.Drawing.Color.Red; - this.label5.Location = new System.Drawing.Point(105, 30); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(11, 12); - this.label5.TabIndex = 3; - this.label5.Text = "*"; - // // txtPlanNum // this.txtPlanNum.Enabled = false; this.txtPlanNum.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtPlanNum.Location = new System.Drawing.Point(122, 99); + this.txtPlanNum.Location = new System.Drawing.Point(122, 164); this.txtPlanNum.Name = "txtPlanNum"; this.txtPlanNum.Size = new System.Drawing.Size(278, 29); this.txtPlanNum.TabIndex = 2; this.txtPlanNum.Text = "1"; // - // 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(10, 24); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(89, 19); - this.label1.TabIndex = 0; - this.label1.Text = "配方名称"; - // // 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(10, 102); + this.label3.Location = new System.Drawing.Point(10, 167); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(82, 19); this.label3.TabIndex = 1; @@ -144,7 +116,7 @@ // this.cmbRecipeMaterial.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cmbRecipeMaterial.FormattingEnabled = true; - this.cmbRecipeMaterial.Location = new System.Drawing.Point(122, 21); + this.cmbRecipeMaterial.Location = new System.Drawing.Point(122, 115); this.cmbRecipeMaterial.Name = "cmbRecipeMaterial"; this.cmbRecipeMaterial.Size = new System.Drawing.Size(278, 27); this.cmbRecipeMaterial.TabIndex = 1; @@ -154,7 +126,7 @@ // 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(361, 158); + this.btnCancel.Location = new System.Drawing.Point(361, 225); this.btnCancel.Name = "btnCancel"; this.btnCancel.Size = new System.Drawing.Size(72, 32); this.btnCancel.TabIndex = 10; @@ -164,7 +136,7 @@ // 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(273, 158); + this.btnOk.Location = new System.Drawing.Point(273, 225); this.btnOk.Name = "btnOk"; this.btnOk.Size = new System.Drawing.Size(72, 32); this.btnOk.TabIndex = 9; @@ -172,16 +144,53 @@ this.btnOk.UseVisualStyleBackColor = true; this.btnOk.Click += new System.EventHandler(this.btnOk_Click); // + // txtBatch + // + this.txtBatch.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.txtBatch.Location = new System.Drawing.Point(122, 24); + this.txtBatch.Name = "txtBatch"; + this.txtBatch.Size = new System.Drawing.Size(278, 29); + this.txtBatch.TabIndex = 2; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label5.Location = new System.Drawing.Point(10, 71); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(89, 19); + this.label5.TabIndex = 5; + this.label5.Text = "产品名称"; + // + // txtProductName + // + this.txtProductName.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.txtProductName.Location = new System.Drawing.Point(122, 70); + this.txtProductName.Name = "txtProductName"; + this.txtProductName.Size = new System.Drawing.Size(278, 29); + this.txtProductName.TabIndex = 2; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label4.Location = new System.Drawing.Point(17, 27); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(82, 19); + this.label4.TabIndex = 5; + this.label4.Text = "批 次"; + this.label4.Click += new System.EventHandler(this.label4_Click); + // // FrmXl // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(447, 205); + this.ClientSize = new System.Drawing.Size(447, 275); this.Controls.Add(this.groupBox1); this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnOk); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; - this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.Margin = new System.Windows.Forms.Padding(2); this.Name = "FrmXl"; this.Text = "新增小料计划"; this.Activated += new System.EventHandler(this.FrmXl_Activated); @@ -195,16 +204,17 @@ #endregion private System.Windows.Forms.GroupBox groupBox1; - private System.Windows.Forms.ComboBox cmbRecipeVersion; private System.Windows.Forms.Label label6; private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label7; - private System.Windows.Forms.Label label5; private System.Windows.Forms.TextBox txtPlanNum; - private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label3; private System.Windows.Forms.ComboBox cmbRecipeMaterial; private System.Windows.Forms.Button btnCancel; private System.Windows.Forms.Button btnOk; + private System.Windows.Forms.TextBox txtBatch; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.TextBox txtProductName; + private System.Windows.Forms.Label label4; } } \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/XlPlan/FrmXl.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/XlPlan/FrmXl.cs index 4ab2029..969ca29 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/XlPlan/FrmXl.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/XlPlan/FrmXl.cs @@ -11,7 +11,6 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -using Mesnac.Action.ChemicalWeighing.Technical; using Mesnac.Action.ChemicalWeighing.Technical.XlRecipe; namespace Mesnac.Action.ChemicalWeighing.Product.XlPlan @@ -75,7 +74,8 @@ namespace Mesnac.Action.ChemicalWeighing.Product.XlPlan { get { - return this.cmbRecipeVersion.SelectedItem as string; + return "1"; + //return this.cmbRecipeVersion.SelectedItem as string; } } @@ -86,7 +86,14 @@ namespace Mesnac.Action.ChemicalWeighing.Product.XlPlan { get { return this._planNum; } } - + /// + /// 批次 + /// + public string Batch { set; get; } + /// + /// 批次 + /// + public string ProductName { set; get; } #endregion #region 方法定义 @@ -105,9 +112,9 @@ namespace Mesnac.Action.ChemicalWeighing.Product.XlPlan { this.Text = StringParser.Parse(ResourceService.GetString("Mesnac_Action_ChemicalWeighing_Product_PptPlan_FrmPlan_Text_Modify")); //修改计划 } - this.label1.Text = StringParser.Parse(ResourceService.GetString("Mesnac_Action_ChemicalWeighing_Product_PptPlan_FrmPlan_label1_Text")); //配方名称 - this.label2.Text = StringParser.Parse(ResourceService.GetString("Mesnac_Action_ChemicalWeighing_Product_PptPlan_FrmPlan_label2_Text")); //配方版本 - this.label3.Text = StringParser.Parse(ResourceService.GetString("Mesnac_Action_ChemicalWeighing_Product_PptPlan_FrmPlan_label3_Text")); //份 数 + //this.label1.Text = StringParser.Parse(ResourceService.GetString("Mesnac_Action_ChemicalWeighing_Product_PptPlan_FrmPlan_label1_Text")); //配方名称 + //this.label2.Text = StringParser.Parse(ResourceService.GetString("Mesnac_Action_ChemicalWeighing_Product_PptPlan_FrmPlan_label2_Text")); //配方版本 + //this.label3.Text = StringParser.Parse(ResourceService.GetString("Mesnac_Action_ChemicalWeighing_Product_PptPlan_FrmPlan_label3_Text")); //份 数 this.btnOk.Text = StringParser.Parse(ResourceService.GetString("Mesnac_Dialog_btnOK")); this.btnCancel.Text = StringParser.Parse(ResourceService.GetString("Mesnac_Dialog_btnCancel")); } @@ -143,10 +150,10 @@ namespace Mesnac.Action.ChemicalWeighing.Product.XlPlan { this.cmbRecipeMaterial.Text = this._recipe.Content; } - this.cmbRecipeMaterial.Enabled = false; + //this.cmbRecipeMaterial.Enabled = false; - this.cmbRecipeVersion.SelectedItem = this._recipe.Version; - this.cmbRecipeVersion.Enabled = false; + //this.cmbRecipeVersion.SelectedItem = this._recipe.Version; + //this.cmbRecipeVersion.Enabled = false; } } @@ -155,12 +162,12 @@ namespace Mesnac.Action.ChemicalWeighing.Product.XlPlan /// public void InitRecipeVersionData() { - if (this.cmbRecipeMaterial.SelectedItem != null) - { - SimplePmtRecipe recipe = this.cmbRecipeMaterial.SelectedItem as SimplePmtRecipe; - List recipeVersionList = TechnicalHelper.GetXlRecipeVersionList(recipe.Recipe_Name); - this.cmbRecipeVersion.DataSource = recipeVersionList; - } + //if (this.cmbRecipeMaterial.SelectedItem != null) + //{ + // SimplePmtRecipe recipe = this.cmbRecipeMaterial.SelectedItem as SimplePmtRecipe; + // List recipeVersionList = TechnicalHelper.GetXlRecipeVersionList(recipe.Recipe_Name); + // this.cmbRecipeVersion.DataSource = recipeVersionList; + //} } #endregion @@ -230,13 +237,13 @@ namespace Mesnac.Action.ChemicalWeighing.Product.XlPlan this.cmbRecipeMaterial.Focus(); return; } - if (String.IsNullOrEmpty(this.cmbRecipeVersion.SelectedItem as string)) - { - string msg1_1 = StringParser.Parse(ResourceService.GetString("Mesnac_Action_ChemicalWeighing_Product_PptPlan_FrmPlan_msg1_1")); //请选择配方版本! - MessageBox.Show(msg1_1, Mesnac.Basic.LanguageHelper.Caption, MessageBoxButtons.OK, MessageBoxIcon.Information); - this.cmbRecipeVersion.Focus(); - return; - } + //if (String.IsNullOrEmpty(this.cmbRecipeVersion.SelectedItem as string)) + //{ + // string msg1_1 = StringParser.Parse(ResourceService.GetString("Mesnac_Action_ChemicalWeighing_Product_PptPlan_FrmPlan_msg1_1")); //请选择配方版本! + // MessageBox.Show(msg1_1, Mesnac.Basic.LanguageHelper.Caption, MessageBoxButtons.OK, MessageBoxIcon.Information); + // this.cmbRecipeVersion.Focus(); + // return; + //} if (String.IsNullOrEmpty(this.txtPlanNum.Text)) { string msg2 = StringParser.Parse(ResourceService.GetString("Mesnac_Action_ChemicalWeighing_Product_PptPlan_FrmPlan_msg2")); //请输入份数! @@ -268,9 +275,11 @@ namespace Mesnac.Action.ChemicalWeighing.Product.XlPlan // return; //} recipe.ID = recipe2.ID; - recipe.Version= this.cmbRecipeVersion.SelectedItem as string; + recipe.Version= "1"; this._recipe = recipe; this._planNum = planNum; + Batch = this.txtBatch.Text; + ProductName = this.txtProductName.Text; this.DialogResult = System.Windows.Forms.DialogResult.OK; } @@ -283,5 +292,10 @@ namespace Mesnac.Action.ChemicalWeighing.Product.XlPlan #endregion + + private void label4_Click(object sender, EventArgs e) + { + + } } } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/XlPlan/InitFormAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/XlPlan/InitFormAction.cs index 498b745..2ebffd4 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/XlPlan/InitFormAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/XlPlan/InitFormAction.cs @@ -119,8 +119,6 @@ namespace Mesnac.Action.ChemicalWeighing.Product.XlPlan timer.AutoReset = true; timer.Enabled = true; timer.Start(); - - } private void StartServer1(object sender, ElapsedEventArgs e) diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/XlPlan/InsertAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/XlPlan/InsertAction.cs index 6fe7697..790b52b 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/XlPlan/InsertAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/XlPlan/InsertAction.cs @@ -81,14 +81,16 @@ namespace Mesnac.Action.ChemicalWeighing.Product.XlPlan { SimplePmtRecipe recipe = frmPlan.Recipe; int planNum = frmPlan.PlanNum; - + string batch = frmPlan.Batch; + string productName = frmPlan.ProductName; + //在本地数据库中添加计划 string equipCode = string.Empty; if (String.IsNullOrEmpty(equipCode)) { equipCode = ConfigurationManager.AppSettings["EquipCode"]; } - string planID = PlanHelper.AddPlan(equipCode, planDate, shiftID, recipe.ID, planNum); + string planID = PlanHelper.AddPlan(equipCode, planDate, shiftID, recipe.ID, planNum,batch, productName); #region 触发事件 diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/XlPlan/PlanHelper.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/XlPlan/PlanHelper.cs index f5f3974..df26a68 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/XlPlan/PlanHelper.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/XlPlan/PlanHelper.cs @@ -1658,9 +1658,9 @@ namespace Mesnac.Action.ChemicalWeighing.Product.XlPlan /// 配方GUID /// 计划数 /// 返回新加计划的计划号 - public static string AddPlan(string equipCode, DateTime planDate, int shiftID, string recipeGUID, int planNum) + public static string AddPlan(string equipCode, DateTime planDate, int shiftID, string recipeGUID, int planNum, string batch, string productName) { - return AddPlan(equipCode, planDate, shiftID, recipeGUID, 0, planNum, String.Empty); + return AddPlan(equipCode, planDate, shiftID, recipeGUID, 0, planNum, String.Empty, batch, productName); } /// @@ -1674,9 +1674,9 @@ namespace Mesnac.Action.ChemicalWeighing.Product.XlPlan /// 计划数 /// 备注 /// 返回新加计划的计划号 - public static string AddPlan(string equipCode, DateTime planDate, int shiftID, string recipeGUID, int planNum, string remark) + public static string AddPlan(string equipCode, DateTime planDate, int shiftID, string recipeGUID, int planNum, string remark, string batch, string productName) { - return AddPlan(equipCode, planDate, shiftID, recipeGUID, 0, planNum, remark); + return AddPlan(equipCode, planDate, shiftID, recipeGUID, 0, planNum, remark, batch, productName); } /// @@ -1691,7 +1691,7 @@ namespace Mesnac.Action.ChemicalWeighing.Product.XlPlan /// 计划数 /// 备注 /// 返回新加计划的计划号 - public static string AddPlan(string equipCode, DateTime planDate, int shiftID, string recipeGUID, int recipeVersion, int planNum, string remark) + public static string AddPlan(string equipCode, DateTime planDate, int shiftID, string recipeGUID, int recipeVersion, int planNum, string remark,string batch, string productName) { DbHelper dbHelper = Mesnac.Basic.DataSourceFactory.Instance.GetDbHelper(Mesnac.Basic.DataSourceFactory.MCDbType.Local); if (dbHelper == null) @@ -1744,10 +1744,12 @@ namespace Mesnac.Action.ChemicalWeighing.Product.XlPlan dbHelper.ClearParameter(); dbHelper.CommandType = CommandType.Text; //添加计划的SQL语句 - string strSql3 = @"INSERT INTO xl_plan(Dosing_Id,Plan_Id,Equip_Code,Plan_Serial,Recipe_ID,Recipe_Code,Recipe_Name,Version,Mixer_Line,Recipe_Type,Shift_Id,Shift_Class,Plan_Num,Real_Num,Duration_Time,End_Date,Weight_Man,Stock_Man,Plan_Batch,Plan_State,Plan_StateText,Plan_Date,IF_FLAG,IsPrenatalTest) - VALUES(@Dosing_Id,@Plan_Id,@Equip_Code,@Plan_Serial,@Recipe_ID,@Recipe_Code,@Recipe_Name,@Version,@Mixer_Line,@Recipe_Type,@Shift_Id,@Shift_Class,@Plan_Num,@Real_Num,@Duration_Time,@End_Date,@Weight_Man,@Stock_Man,@Plan_Batch,@Plan_State,@Plan_StateText,@Plan_Date,@IF_FLAG,@IsPrenatalTest)"; + string strSql3 = @"INSERT INTO xl_plan(Dosing_Id,Plan_Id,Equip_Code,Batch,ProductName,Plan_Serial,Recipe_ID,Recipe_Code,Recipe_Name,Version,Mixer_Line,Recipe_Type,Shift_Id,Shift_Class,Plan_Num,Real_Num,Duration_Time,End_Date,Weight_Man,Stock_Man,Plan_Batch,Plan_State,Plan_StateText,Plan_Date,IF_FLAG,IsPrenatalTest) + VALUES(@Dosing_Id,@Plan_Id,@Equip_Code,@Batch,@ProductName,@Plan_Serial,@Recipe_ID,@Recipe_Code,@Recipe_Name,@Version,@Mixer_Line,@Recipe_Type,@Shift_Id,@Shift_Class,@Plan_Num,@Real_Num,@Duration_Time,@End_Date,@Weight_Man,@Stock_Man,@Plan_Batch,@Plan_State,@Plan_StateText,@Plan_Date,@IF_FLAG,@IsPrenatalTest)"; dbHelper.CommandText = strSql3; + dbHelper.AddParameter("@Batch", batch); + dbHelper.AddParameter("@ProductName", productName); dbHelper.AddParameter("@Dosing_Id", 0); dbHelper.AddParameter("@Plan_Id", planID); //计划号 dbHelper.AddParameter("@Equip_Code", equipCode); //机台号 diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/XlPlan/RefreshAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/XlPlan/RefreshAction.cs index 186e343..82fd726 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/XlPlan/RefreshAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/XlPlan/RefreshAction.cs @@ -149,7 +149,7 @@ namespace Mesnac.Action.ChemicalWeighing.Product.XlPlan //DataTable table = PlanHelper.GetPlanData(selectedDate); //DataTable table = PlanHelper.GetPlanData(); IFreeSql fsql = FreeHelper.Instance; - string sql = @"SELECT 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 + 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("*"); diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/BinReport/BinAlarmAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/BinReport/BinAlarmAction.cs index 9978ef9..2641ce0 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/BinReport/BinAlarmAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/BinReport/BinAlarmAction.cs @@ -11,7 +11,7 @@ using System.Windows.Forms; namespace Mesnac.Action.ChemicalWeighing.Report.ProductionAnalysisReport { /// - /// 生产质量分析 + /// 料仓告警 /// class BinAlarmAction : ChemicalWeighingAction, IAction { diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/BinReport/InitFormAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/BinReport/InitFormAction.cs index db4e255..fbb84e3 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/BinReport/InitFormAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/BinReport/InitFormAction.cs @@ -9,6 +9,7 @@ using System.Drawing; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Timers; using System.Windows.Forms; namespace Mesnac.Action.ChemicalWeighing.Report.BinReport @@ -19,9 +20,15 @@ namespace Mesnac.Action.ChemicalWeighing.Report.BinReport class InitFormAction : ChemicalWeighingAction, IAction { private DbMCControl _dg = null; + public static event EventHandler OnRefreshBinEvent;//刷新料仓 + private RuntimeParameter _runtime; + bool flag=true; + public void Run(RuntimeParameter runtime) { base.RunIni(runtime); //必须要调用的 + this._runtime = runtime; + ICSharpCode.Core.LoggingService.Debug("仓库报警报表-窗体初始化..."); this._dg = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "Pmt_Bin").FirstOrDefault(); @@ -31,20 +38,10 @@ namespace Mesnac.Action.ChemicalWeighing.Report.BinReport runtime.IsReturn = false; return; } - - IFreeSql fsql = FreeHelper.Instance; - 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,Weights,TypeName - ) e on b.Bin_Serial=e.BinId - 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,Weights,TypeName - ) o on b.Bin_Serial=o.BinId"; - - DataTable dt1 = fsql.Select().WithSql(sql).ToDataTable("*"); - - _dg.BaseControl.BindDataSource = null; - _dg.BaseControl.BindDataSource = dt1; + + #region 触发事件, 刷新客户端计划 + this.InitData(); + #endregion #region 根据状态处理背景色 @@ -54,6 +51,27 @@ namespace Mesnac.Action.ChemicalWeighing.Report.BinReport #endregion } + private void InitData() + { + if (flag) + { + flag = false; + 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 (OnRefreshBinEvent != null) + { + OnRefreshBinEvent(this._runtime.BaseControl.MCRoot, System.EventArgs.Empty); + } + } + #region 设置（网格控件）计划状态背景色 /// /// 设置计划状态背景色 diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/BinReport/RefreshAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/BinReport/RefreshAction.cs new file mode 100644 index 0000000..86222c8 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/BinReport/RefreshAction.cs @@ -0,0 +1,192 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using System.Data; +using ICSharpCode.Core; +using Mesnac.Controls.Base; +using Mesnac.Action.Base; +using Mesnac.Codd.Session; +using Mesnac.Action.ChemicalWeighing.Entity; +using Mesnac.Action.ChemicalWeighing.Technical; +using Mesnac.Action.ChemicalWeighing.DBHelper; + +namespace Mesnac.Action.ChemicalWeighing.Report.BinReport +{ + public class RefreshAction : ChemicalWeighingAction, IAction + { + #region 事件定义 + + /// + /// 刷新料仓 + /// + public static event EventHandler OnRefreshBin; + + #endregion + + #region 字段定义 + + private static bool IsFirstRun = true; //是否首次执行 + private RuntimeParameter _runtime; + private DbMCControl _clientGridControl = null; //网格计划控件 + + #endregion + + #region IAction接口实现 + + public void Run(RuntimeParameter runtime) + { + base.RunIni(runtime); //必须要调用的 + this._runtime = runtime; + + ICSharpCode.Core.LoggingService.Debug("料仓报表—刷新报表业务..."); + + #region 事件订阅 + + if (true) + { + //通用调用刷新计划事件订阅 + InitFormAction.OnRefreshBinEvent -= Process_Event; + InitFormAction.OnRefreshBinEvent += Process_Event; + IsFirstRun = false; + } + + #endregion + + DbMCControl clientGridControl = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "xl_plan").FirstOrDefault(); //获取本机台计划控件 + + if (clientGridControl == null || !(clientGridControl.BaseControl is DataGridView)) + { + ICSharpCode.Core.LoggingService.Error("｛料仓报表｝缺少本机台计划网格控件..."); + return; + } + this._clientGridControl = clientGridControl; + + this.DoWork(); + } + + #endregion + + #region 方法定义 + /// + /// 刷新计划 + /// + protected void DoWork() + { + #region 业务实现 + + IFreeSql fsql = FreeHelper.Instance; + 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,Weights,TypeName + ) e on b.Bin_Serial=e.BinId + 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,Weights,TypeName + ) o on b.Bin_Serial=o.BinId"; + + + + lock (String.Empty) + { + //本地计划 + if (this._clientGridControl != null && this._clientGridControl.BaseControl != null) + { + DataTable table = fsql.Select().WithSql(sql).ToDataTable("*"); + if (table.Rows.Count > 0) + { + _clientGridControl.BaseControl.BindDataSource = null; + _clientGridControl.BaseControl.BindDataSource = table; + } + else + { + _clientGridControl.BaseControl.BindDataSource = null; + } + + #region 根据计划状态处理背景色 + + DataGridView clientGrid = this._clientGridControl.BaseControl as DataGridView; + SetBackColor(clientGrid); + + #endregion + } + else + { + ICSharpCode.Core.LoggingService.Warn("刷新本地计划失败：本地计划控件为Null..."); + } + } + #endregion + + #region 触发事件, 刷新客户端计划 + + + if (OnRefreshBin != null) + { + OnRefreshBin(this._runtime.BaseControl.MCRoot, System.EventArgs.Empty); + } + + #endregion + } + + #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 + + #region 设置（网格控件）计划状态背景色 + /// + /// 设置计划状态背景色 + /// + /// + public static void SetBackColor(DataGridView grid) + { + lock (String.Empty) + { + try + { + if (grid == null || grid.Visible == false) + { + ICSharpCode.Core.LoggingService.Warn("设置料仓报警背景色失败：网格控件为null或不可见"); + return; + } + + grid.ClearSelection(); //清空选中行 + grid.ColumnHeadersHeight = 25; + grid.ColumnHeadersDefaultCellStyle.Font = new System.Drawing.Font("宋体", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + grid.RowHeadersVisible = false; + grid.RowTemplate.Height = 28; + grid.RowsDefaultCellStyle.Font = new System.Drawing.Font("宋体", 12, System.Drawing.FontStyle.Bold); + foreach (DataGridViewRow row in grid.Rows) + { + decimal limitWeight = Convert.ToDecimal(row.Cells["LimitWeight"].Value.ToString()); + decimal binWeight = Convert.ToDecimal(row.Cells["BinWeight"].Value.ToString()); + if (limitWeight > binWeight) + { + row.DefaultCellStyle.BackColor = System.Drawing.Color.FromArgb(255, 0, 0); //灰色 + } + } + } + catch (Exception ex) + { + ICSharpCode.Core.LoggingService.Error("设置料仓报警背景色失败：" + ex.Message); + } + } + } + #endregion + + } +} diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Show/XlInitAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Show/XlInitAction.cs index c0758eb..08ecb39 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Show/XlInitAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Show/XlInitAction.cs @@ -53,9 +53,6 @@ namespace Mesnac.Action.ChemicalWeighing.Show ICSharpCode.Core.LoggingService.Error("｛首页展示｝缺少本机台计划网格控件..."); return; } - - - #region 初始化 #region 获取界面控件 @@ -98,8 +95,13 @@ namespace Mesnac.Action.ChemicalWeighing.Show #endregion #endregion - ServerStart(); - //timer = new System.Threading.Timer(ServerStart, null, 5000, Timeout.Infinite); + //ServerStart(); + + System.Timers.Timer timer = new System.Timers.Timer(5000); + timer.Elapsed += new ElapsedEventHandler(ServerStart); + timer.AutoReset = true; + timer.Enabled = true; + timer.Start(); } #region 方法定义 @@ -132,7 +134,7 @@ namespace Mesnac.Action.ChemicalWeighing.Show #endregion - private void ServerStart()//Object source + private void ServerStart(object sender, ElapsedEventArgs e)// { try { diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/XlRecipe/FrmRecipMag.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/XlRecipe/FrmRecipMag.Designer.cs index 3ef3281..64f5173 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/XlRecipe/FrmRecipMag.Designer.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/XlRecipe/FrmRecipMag.Designer.cs @@ -29,37 +29,32 @@ private void InitializeComponent() { this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.cmbRecipeVersion = new System.Windows.Forms.ComboBox(); + this.chcWeight = new System.Windows.Forms.CheckBox(); this.chcIsEnable = new System.Windows.Forms.CheckBox(); this.txtRecipeName = new System.Windows.Forms.TextBox(); this.label6 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); this.label21 = new System.Windows.Forms.Label(); this.textRecipeCode = new System.Windows.Forms.TextBox(); + this.txtTotalWeight = new System.Windows.Forms.TextBox(); this.txtTotalError = new System.Windows.Forms.TextBox(); + this.label7 = new System.Windows.Forms.Label(); this.txtRemark = new System.Windows.Forms.TextBox(); this.label2 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); - this.lblVersion = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.checkBox1 = new System.Windows.Forms.CheckBox(); this.btnOk = new System.Windows.Forms.Button(); this.btnCancel = new System.Windows.Forms.Button(); - this.label7 = new System.Windows.Forms.Label(); - this.txtTotalWeight = new System.Windows.Forms.TextBox(); - this.chcWeight = new System.Windows.Forms.CheckBox(); this.groupBox1.SuspendLayout(); this.SuspendLayout(); // // groupBox1 // - this.groupBox1.Controls.Add(this.cmbRecipeVersion); this.groupBox1.Controls.Add(this.chcWeight); this.groupBox1.Controls.Add(this.chcIsEnable); this.groupBox1.Controls.Add(this.txtRecipeName); this.groupBox1.Controls.Add(this.label6); - this.groupBox1.Controls.Add(this.label3); this.groupBox1.Controls.Add(this.label21); this.groupBox1.Controls.Add(this.textRecipeCode); this.groupBox1.Controls.Add(this.txtTotalWeight); @@ -68,57 +63,36 @@ this.groupBox1.Controls.Add(this.txtRemark); this.groupBox1.Controls.Add(this.label2); this.groupBox1.Controls.Add(this.label5); - this.groupBox1.Controls.Add(this.lblVersion); this.groupBox1.Controls.Add(this.label4); this.groupBox1.Controls.Add(this.label1); - this.groupBox1.Location = new System.Drawing.Point(35, 18); - this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBox1.Location = new System.Drawing.Point(23, 12); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.groupBox1.Size = new System.Drawing.Size(1004, 412); + this.groupBox1.Size = new System.Drawing.Size(669, 256); this.groupBox1.TabIndex = 10; this.groupBox1.TabStop = false; // - // cmbRecipeVersion - // - this.cmbRecipeVersion.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmbRecipeVersion.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.cmbRecipeVersion.FormattingEnabled = true; - this.cmbRecipeVersion.Items.AddRange(new object[] { - "1", - "2", - "3", - "4", - "5", - "6", - "7", - "8", - "9", - "10", - "11", - "12", - "13", - "14", - "14", - "15", - "17", - "18", - "19", - "20"}); - this.cmbRecipeVersion.Location = new System.Drawing.Point(219, 91); - this.cmbRecipeVersion.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.cmbRecipeVersion.Name = "cmbRecipeVersion"; - this.cmbRecipeVersion.Size = new System.Drawing.Size(401, 37); - this.cmbRecipeVersion.TabIndex = 10; + // chcWeight + // + this.chcWeight.AutoSize = true; + this.chcWeight.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold); + this.chcWeight.ForeColor = System.Drawing.Color.Red; + this.chcWeight.Location = new System.Drawing.Point(426, 101); + this.chcWeight.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1); + this.chcWeight.Name = "chcWeight"; + this.chcWeight.Size = new System.Drawing.Size(230, 23); + this.chcWeight.TabIndex = 10; + this.chcWeight.Text = "修改总重量(产前检测)"; + this.chcWeight.UseVisualStyleBackColor = true; + this.chcWeight.CheckedChanged += new System.EventHandler(this.chcWeight_CheckedChanged); // // chcIsEnable // this.chcIsEnable.AutoSize = true; this.chcIsEnable.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold); - this.chcIsEnable.Location = new System.Drawing.Point(638, 255); - this.chcIsEnable.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.chcIsEnable.Location = new System.Drawing.Point(425, 136); + this.chcIsEnable.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1); this.chcIsEnable.Name = "chcIsEnable"; - this.chcIsEnable.Size = new System.Drawing.Size(189, 33); + this.chcIsEnable.Size = new System.Drawing.Size(128, 23); this.chcIsEnable.TabIndex = 10; this.chcIsEnable.Text = "修改总误差"; this.chcIsEnable.UseVisualStyleBackColor = true; @@ -127,86 +101,87 @@ // txtRecipeName // this.txtRecipeName.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtRecipeName.Location = new System.Drawing.Point(219, 41); - this.txtRecipeName.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.txtRecipeName.Location = new System.Drawing.Point(146, 27); this.txtRecipeName.Name = "txtRecipeName"; - this.txtRecipeName.Size = new System.Drawing.Size(401, 40); + this.txtRecipeName.Size = new System.Drawing.Size(269, 29); this.txtRecipeName.TabIndex = 7; // // label6 // this.label6.AutoSize = true; this.label6.ForeColor = System.Drawing.Color.Red; - this.label6.Location = new System.Drawing.Point(181, 151); - this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label6.Location = new System.Drawing.Point(121, 67); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(17, 18); + this.label6.Size = new System.Drawing.Size(11, 12); this.label6.TabIndex = 3; this.label6.Text = "*"; this.label6.Click += new System.EventHandler(this.label3_Click); // - // label3 - // - this.label3.AutoSize = true; - this.label3.ForeColor = System.Drawing.Color.Red; - this.label3.Location = new System.Drawing.Point(181, 100); - this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(17, 18); - this.label3.TabIndex = 3; - this.label3.Text = "*"; - this.label3.Click += new System.EventHandler(this.label3_Click); - // // label21 // this.label21.AutoSize = true; this.label21.ForeColor = System.Drawing.Color.Red; - this.label21.Location = new System.Drawing.Point(181, 54); - this.label21.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label21.Location = new System.Drawing.Point(121, 36); this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(17, 18); + this.label21.Size = new System.Drawing.Size(11, 12); this.label21.TabIndex = 3; this.label21.Text = "*"; // // textRecipeCode // this.textRecipeCode.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textRecipeCode.Location = new System.Drawing.Point(219, 142); - this.textRecipeCode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.textRecipeCode.Location = new System.Drawing.Point(146, 61); this.textRecipeCode.Name = "textRecipeCode"; - this.textRecipeCode.Size = new System.Drawing.Size(401, 40); + this.textRecipeCode.Size = new System.Drawing.Size(269, 29); this.textRecipeCode.TabIndex = 2; this.textRecipeCode.TextChanged += new System.EventHandler(this.txtTotalError_TextChanged); // + // txtTotalWeight + // + this.txtTotalWeight.Enabled = false; + this.txtTotalWeight.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.txtTotalWeight.Location = new System.Drawing.Point(146, 97); + this.txtTotalWeight.Name = "txtTotalWeight"; + this.txtTotalWeight.Size = new System.Drawing.Size(269, 29); + this.txtTotalWeight.TabIndex = 2; + this.txtTotalWeight.TextChanged += new System.EventHandler(this.txtTotalError_TextChanged); + // // txtTotalError // this.txtTotalError.Enabled = false; this.txtTotalError.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtTotalError.Location = new System.Drawing.Point(219, 246); - this.txtTotalError.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.txtTotalError.Location = new System.Drawing.Point(146, 130); this.txtTotalError.Name = "txtTotalError"; - this.txtTotalError.Size = new System.Drawing.Size(401, 40); + this.txtTotalError.Size = new System.Drawing.Size(269, 29); this.txtTotalError.TabIndex = 2; this.txtTotalError.TextChanged += new System.EventHandler(this.txtTotalError_TextChanged); // + // label7 + // + this.label7.AutoSize = true; + this.label7.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label7.Location = new System.Drawing.Point(11, 101); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(109, 19); + this.label7.TabIndex = 1; + this.label7.Text = "设置总重量"; + // // txtRemark // this.txtRemark.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtRemark.Location = new System.Drawing.Point(219, 295); - this.txtRemark.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.txtRemark.Location = new System.Drawing.Point(146, 163); this.txtRemark.Multiline = true; this.txtRemark.Name = "txtRemark"; - this.txtRemark.Size = new System.Drawing.Size(401, 96); + this.txtRemark.Size = new System.Drawing.Size(269, 65); this.txtRemark.TabIndex = 2; // // 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, 252); - this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label2.Location = new System.Drawing.Point(11, 134); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(163, 29); + this.label2.Size = new System.Drawing.Size(109, 19); this.label2.TabIndex = 1; this.label2.Text = "设置总误差"; // @@ -214,32 +189,19 @@ // this.label5.AutoSize = true; this.label5.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(42, 145); - this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label5.Location = new System.Drawing.Point(28, 63); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(133, 29); + this.label5.Size = new System.Drawing.Size(89, 19); this.label5.TabIndex = 1; this.label5.Text = "配方编码"; // - // lblVersion - // - this.lblVersion.AutoSize = true; - this.lblVersion.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lblVersion.Location = new System.Drawing.Point(102, 90); - this.lblVersion.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.lblVersion.Name = "lblVersion"; - this.lblVersion.Size = new System.Drawing.Size(73, 29); - this.lblVersion.TabIndex = 1; - this.lblVersion.Text = "版本"; - // // label4 // this.label4.AutoSize = true; this.label4.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(46, 295); - this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label4.Location = new System.Drawing.Point(31, 163); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(133, 29); + this.label4.Size = new System.Drawing.Size(89, 19); this.label4.TabIndex = 1; this.label4.Text = "备注信息"; // @@ -247,10 +209,9 @@ // 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(17, 46); - this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label1.Location = new System.Drawing.Point(11, 31); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(163, 29); + this.label1.Size = new System.Drawing.Size(109, 19); this.label1.TabIndex = 0; this.label1.Text = "新配方名称"; // @@ -260,10 +221,10 @@ this.checkBox1.Checked = true; this.checkBox1.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBox1.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold); - this.checkBox1.Location = new System.Drawing.Point(57, 443); - this.checkBox1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.checkBox1.Location = new System.Drawing.Point(38, 285); + this.checkBox1.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1); this.checkBox1.Name = "checkBox1"; - this.checkBox1.Size = new System.Drawing.Size(159, 33); + this.checkBox1.Size = new System.Drawing.Size(108, 23); this.checkBox1.TabIndex = 13; this.checkBox1.Text = "是否启用"; this.checkBox1.UseVisualStyleBackColor = true; @@ -272,10 +233,9 @@ // 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(423, 443); - this.btnOk.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.btnOk.Location = new System.Drawing.Point(282, 285); this.btnOk.Name = "btnOk"; - this.btnOk.Size = new System.Drawing.Size(176, 48); + this.btnOk.Size = new System.Drawing.Size(117, 32); this.btnOk.TabIndex = 11; this.btnOk.Text = "确定"; this.btnOk.UseVisualStyleBackColor = true; @@ -285,60 +245,22 @@ // 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(622, 443); - this.btnCancel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.btnCancel.Location = new System.Drawing.Point(415, 285); this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(150, 48); + this.btnCancel.Size = new System.Drawing.Size(100, 32); this.btnCancel.TabIndex = 12; this.btnCancel.Text = "取消"; this.btnCancel.UseVisualStyleBackColor = true; // - // label7 - // - this.label7.AutoSize = true; - this.label7.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label7.Location = new System.Drawing.Point(17, 202); - this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(163, 29); - this.label7.TabIndex = 1; - this.label7.Text = "设置总重量"; - // - // txtTotalWeight - // - this.txtTotalWeight.Enabled = false; - this.txtTotalWeight.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtTotalWeight.Location = new System.Drawing.Point(219, 196); - this.txtTotalWeight.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtTotalWeight.Name = "txtTotalWeight"; - this.txtTotalWeight.Size = new System.Drawing.Size(401, 40); - this.txtTotalWeight.TabIndex = 2; - this.txtTotalWeight.TextChanged += new System.EventHandler(this.txtTotalError_TextChanged); - // - // chcWeight - // - this.chcWeight.AutoSize = true; - this.chcWeight.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold); - this.chcWeight.ForeColor = System.Drawing.Color.Red; - this.chcWeight.Location = new System.Drawing.Point(639, 202); - this.chcWeight.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.chcWeight.Name = "chcWeight"; - this.chcWeight.Size = new System.Drawing.Size(341, 33); - this.chcWeight.TabIndex = 10; - this.chcWeight.Text = "修改总重量(产前检测)"; - this.chcWeight.UseVisualStyleBackColor = true; - this.chcWeight.CheckedChanged += new System.EventHandler(this.chcWeight_CheckedChanged); - // // FrmRecipMag // - 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(1073, 524); + this.ClientSize = new System.Drawing.Size(715, 349); this.Controls.Add(this.checkBox1); this.Controls.Add(this.btnOk); this.Controls.Add(this.btnCancel); this.Controls.Add(this.groupBox1); - this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.Name = "FrmRecipMag"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "配方管理"; @@ -353,15 +275,12 @@ #endregion private System.Windows.Forms.GroupBox groupBox1; - private System.Windows.Forms.ComboBox cmbRecipeVersion; private System.Windows.Forms.CheckBox chcIsEnable; private System.Windows.Forms.TextBox txtRecipeName; - private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label21; private System.Windows.Forms.TextBox txtTotalError; private System.Windows.Forms.TextBox txtRemark; private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label lblVersion; private System.Windows.Forms.Label label4; private System.Windows.Forms.Label label1; private System.Windows.Forms.CheckBox checkBox1; diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/XlRecipe/FrmRecipMag.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/XlRecipe/FrmRecipMag.cs index 2ad144a..960ccc4 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/XlRecipe/FrmRecipMag.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/XlRecipe/FrmRecipMag.cs @@ -75,11 +75,11 @@ namespace Mesnac.Action.ChemicalWeighing.Technical.XlRecipe MessageBox.Show("请输入新配方的名称!", Mesnac.Basic.LanguageHelper.Caption, MessageBoxButtons.OK, MessageBoxIcon.Information); return; } - if (String.IsNullOrEmpty(this.cmbRecipeVersion.Text)) - { - MessageBox.Show("请选择新配方的版本!", Mesnac.Basic.LanguageHelper.Caption, MessageBoxButtons.OK, MessageBoxIcon.Information); - return; - } + //if (String.IsNullOrEmpty(this.cmbRecipeVersion.Text)) + //{ + // MessageBox.Show("请选择新配方的版本!", Mesnac.Basic.LanguageHelper.Caption, MessageBoxButtons.OK, MessageBoxIcon.Information); + // return; + //} if (String.IsNullOrEmpty(this.textRecipeCode.Text)) { MessageBox.Show("请添加新配方编码!", Mesnac.Basic.LanguageHelper.Caption, MessageBoxButtons.OK, MessageBoxIcon.Information); @@ -88,7 +88,7 @@ namespace Mesnac.Action.ChemicalWeighing.Technical.XlRecipe #endregion - if (_actionType == ActionType.Add && RecipeHelper.IsExistsName(this.txtRecipeName.Text, this.cmbRecipeVersion.Text)) + if (_actionType == ActionType.Add && RecipeHelper.IsExistsName(this.txtRecipeName.Text, "1")) { MessageBox.Show("新配方的名称重复!请使用其他名称", Mesnac.Basic.LanguageHelper.Caption, MessageBoxButtons.OK, MessageBoxIcon.Information); return; @@ -98,7 +98,7 @@ namespace Mesnac.Action.ChemicalWeighing.Technical.XlRecipe if (_actionType == ActionType.Add) { - if (RecipeHelper.IsExists(this.txtRecipeName.Text, this.cmbRecipeVersion.Text)) + if (RecipeHelper.IsExists(this.txtRecipeName.Text, "1")) { MessageBox.Show("新配方的版本已存在,请修改.", Mesnac.Basic.LanguageHelper.Caption, MessageBoxButtons.OK, MessageBoxIcon.Information); return; @@ -119,7 +119,7 @@ namespace Mesnac.Action.ChemicalWeighing.Technical.XlRecipe private void FrmRecipMag_Load(object sender, EventArgs e) { this.txtRecipeName.Text = recipeName; - this.cmbRecipeVersion.Text = version; + //this.cmbRecipeVersion.Text = version; this.txtTotalWeight.Text = totalWeight.ToString("f3"); this.txtTotalError.Text = totalError.ToString("f3"); this.textRecipeCode.Text = recipeCode; @@ -148,7 +148,7 @@ namespace Mesnac.Action.ChemicalWeighing.Technical.XlRecipe pmt_Recipe.Recipe_Code = textRecipeCode.Text; pmt_Recipe.Recipe_Name = txtRecipeName.Text; pmt_Recipe.Equip_Code = ConfigurationManager.AppSettings["EquipCode"]; - pmt_Recipe.Version = this.cmbRecipeVersion.Text; + pmt_Recipe.Version = "1"; pmt_Recipe.GroupBags = null; pmt_Recipe.Remark = txtRemark.Text; pmt_Recipe.End_datetime = DateTime.Now.ToString(); diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/XlRecipe/TechnicalHelper.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/XlRecipe/TechnicalHelper.cs index 1f222ea..bc54278 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/XlRecipe/TechnicalHelper.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/XlRecipe/TechnicalHelper.cs @@ -455,7 +455,7 @@ namespace Mesnac.Action.ChemicalWeighing.Technical.XlRecipe } dbHelper.ClearParameter(); dbHelper.CommandType = CommandType.Text; - string sqlstr = "SELECT distinct Recipe_Name FROM xl_recipe where Recipe_Verify = 1 and IsCheck<>1"; + string sqlstr = "SELECT distinct Recipe_Name,IsCheck FROM xl_recipe where Recipe_Verify = 1 and IsCheck=0 or IsCheck is null"; dbHelper.CommandText = sqlstr; DataTable table = dbHelper.ToDataTable(); List lst = new List(); diff --git a/Main/MCEdit/Data/EventConfig/小料称量/料仓管理.xml b/Main/MCEdit/Data/EventConfig/小料称量/料仓管理.xml index ab2cc88..afd02c6 100644 --- a/Main/MCEdit/Data/EventConfig/小料称量/料仓管理.xml +++ b/Main/MCEdit/Data/EventConfig/小料称量/料仓管理.xml @@ -26,6 +26,10 @@ 料仓报警报表 料仓报警报表 + + 刷新料仓报警报表 + 刷新料仓报警报表 + @@ -48,16 +52,20 @@ + + + - + + \ 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 91bda5e..3ab8651 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/BinAlarm.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/BinAlarm.xml @@ -1,4 +1,3 @@ - @@ -43,16 +42,16 @@ 3 - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAACAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIENBRURBODFCREQwNDZEMUYwQkQyMjkzRUMxMjhGOENGBgYAAAAS5paZ5LuT5oql6K2m5oql6KGoBgcAAAAS5paZ5LuT5oql6K2m5oql6KGoCw== + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAEAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIENEQzlDMEM2Q0I1N0NDRkIzNjExMjFEN0E3NUY5RjY2BgYAAAAM5Yi35paw5paZ5LuTBgcAAAAM5Yi35paw5paZ5LuTCw== - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAACAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIENBRURBODFCREQwNDZEMUYwQkQyMjkzRUMxMjhGOENGBgYAAAAS5paZ5LuT5oql6K2m5oql6KGoBgcAAAAS5paZ5LuT5oql6K2m5oql6KGoCw== + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAEAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIENBRURBODFCREQwNDZEMUYwQkQyMjkzRUMxMjhGOENGBgYAAAAS5paZ5LuT5oql6K2m5oql6KGoBgcAAAAS5paZ5LuT5oql6K2m5oql6KGoCw== - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAACAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIENBRURBODFCREQwNDZEMUYwQkQyMjkzRUMxMjhGOENGBgYAAAAS5paZ5LuT5oql6K2m5oql6KGoBgcAAAAS5paZ5LuT5oql6K2m5oql6KGoCw== + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAEAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIENBRURBODFCREQwNDZEMUYwQkQyMjkzRUMxMjhGOENGBgYAAAAS5paZ5LuT5oql6K2m5oql6KGoBgcAAAAS5paZ5LuT5oql6K2m5oql6KGoCw== - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAACAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIENBRURBODFCREQwNDZEMUYwQkQyMjkzRUMxMjhGOENGBgYAAAAS5paZ5LuT5oql6K2m5oql6KGoBgcAAAAS5paZ5LuT5oql6K2m5oql6KGoCw== + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAEAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIENBRURBODFCREQwNDZEMUYwQkQyMjkzRUMxMjhGOENGBgYAAAAS5paZ5LuT5oql6K2m5oql6KGoBgcAAAAS5paZ5LuT5oql6K2m5oql6KGoCw== False False diff --git a/Main/MCEdit/Data/MCProject/nodeForm/生产计划-小料.xml b/Main/MCEdit/Data/MCProject/nodeForm/生产计划-小料.xml index c05b73b..3eca695 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/生产计划-小料.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/生产计划-小料.xml @@ -3,7 +3,7 @@ False - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAACwAAADUBAAAHAwAAAAABAAAAEAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAkIAAAACQkAAAAJCgAAAAkLAAAACQwAAAAJDQAAAAkOAAAADQUFBAAAAChNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zAgAAAApfZmlsZWREYXRhDF9kaXNwbGF5TmFtZQEBAgAAAAYPAAAAC1BsYW5fU2VyaWFsBhAAAAAG5bqP5Y+3AQUAAAAEAAAABhEAAAALUmVjaXBlX05hbWUGEgAAAAzphY3mlrnlkI3np7ABBgAAAAQAAAAGEwAAAApFcXVpcF9Db2RlBhQAAAAJ5py65Y+w5Y+3AQcAAAAEAAAABhUAAAAHVmVyc2lvbgYWAAAADOmFjeaWueeJiOacrAEIAAAABAAAAAYXAAAAB1BsYW5fSWQGGAAAAAnorqHliJLlj7cBCQAAAAQAAAAGGQAAAAhQbGFuX051bQYaAAAABuiuvuWumgEKAAAABAAAAAYbAAAACFJlYWxfTnVtBhwAAAAG5a6M5oiQAQsAAAAEAAAABh0AAAAKUGxhbl9TdGF0ZQYeAAAADOaJp+ihjOeKtuaAgQEMAAAABAAAAAYfAAAADlBsYW5fU3RhdGVUZXh0BiAAAAAG54q25oCBAQ0AAAAEAAAABiEAAAAKU3RhcnRfRGF0ZQYiAAAADOW8gOWni+aXtumXtAEOAAAABAAAAAYjAAAACEVuZF9EYXRlBiQAAAAM57uT5p2f5pe26Ze0Cw== + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAADQAAAGwBAAAHAwAAAAABAAAAEAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAkIAAAACQkAAAAJCgAAAAkLAAAACQwAAAAJDQAAAAkOAAAACQ8AAAAJEAAAAA0DBQQAAAAoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAKX2ZpbGVkRGF0YQxfZGlzcGxheU5hbWUBAQIAAAAGEQAAAAtQbGFuX1NlcmlhbAYSAAAABuW6j+WPtwEFAAAABAAAAAYTAAAABUJhdGNoBhQAAAAG5om55qyhAQYAAAAEAAAABhUAAAALUHJvZHVjdE5hbWUGFgAAAAzkuqflk4HlkI3np7ABBwAAAAQAAAAGFwAAAAtSZWNpcGVfTmFtZQYYAAAADOmFjeaWueWQjeensAEIAAAABAAAAAYZAAAACkVxdWlwX0NvZGUGGgAAAAnmnLrlj7Dlj7cBCQAAAAQAAAAGGwAAAAdWZXJzaW9uBhwAAAAM6YWN5pa554mI5pysAQoAAAAEAAAABh0AAAAHUGxhbl9JZAYeAAAACeiuoeWIkuWPtwELAAAABAAAAAYfAAAACFBsYW5fTnVtBiAAAAAG6K6+5a6aAQwAAAAEAAAABiEAAAAIUmVhbF9OdW0GIgAAAAblrozmiJABDQAAAAQAAAAGIwAAAApQbGFuX1N0YXRlBiQAAAAM5omn6KGM54q25oCBAQ4AAAAEAAAABiUAAAAOUGxhbl9TdGF0ZVRleHQGJgAAAAbnirbmgIEBDwAAAAQAAAAGJwAAAApTdGFydF9EYXRlBigAAAAM5byA5aeL5pe26Ze0ARAAAAAEAAAABikAAAAIRW5kX0RhdGUGKgAAAAznu5PmnZ/ml7bpl7QL AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL @@ -83,7 +83,7 @@ DarkGray 刷新 宋体, 14.25pt, style=Bold - 593, 0 + 495, 0 MCButton9 100, 30 8 @@ -109,7 +109,7 @@ Transparent 下发计划任务 宋体, 14.25pt, style=Bold - 692, 0 + 594, 0 MCButton8 100, 30 5 @@ -135,7 +135,7 @@ Transparent 下移 宋体, 14.25pt, style=Bold - 495, 0 + 396, 0 MCButton7 100, 30 5 @@ -161,7 +161,7 @@ Transparent 上移 宋体, 14.25pt, style=Bold - 396, 0 + 297, 0 MCButton6 100, 30 5 @@ -187,7 +187,7 @@ Transparent 终止 宋体, 14.25pt, style=Bold - 297, 0 + 198, 0 MCButton5 100, 30 5 @@ -213,34 +213,8 @@ Transparent 删除 宋体, 14.25pt, style=Bold - 198, 0 - MCButton4 - 100, 30 - 5 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDBEOUNEOTRBODZEOTM5MjEyOEYwRkM4Q0JFQjJDMjczBgYAAAAP5L+u5pS56K6h5YiS5pWwBgcAAAAV5L+u5pS555Sf5Lqn6K6h5YiS5pWwCw== - - - - False - - - - None - True - True - False - - - Red - DarkGray - Transparent - 修改 - 宋体, 14.25pt, style=Bold 99, 0 - MCButton1 + MCButton4 100, 30 5