diff --git a/APP/QMAPP.Web/App_Data/Menu.xml b/APP/QMAPP.Web/App_Data/Menu.xml index bd86060..e72f1d0 100644 --- a/APP/QMAPP.Web/App_Data/Menu.xml +++ b/APP/QMAPP.Web/App_Data/Menu.xml @@ -304,36 +304,36 @@ - + - 查询 - 添加 - 整车添加 - 修改 - 修改计划顺序号 - 插单 - 删除 - 发布 - 导入 - 导出 - 下载模板 + 查询 + 添加 + 整车添加 + 修改 + 修改计划顺序号 + 插单 + 删除 + 发布 + 导入 + 导出 + 下载模板 - + - 查询 - 添加 - 整车添加 - 修改 - 修改计划顺序号 - 插单 - 删除 - 发布 - 导入 - 导出 - 下载模板 + 查询 + 添加 + 整车添加 + 修改 + 修改计划顺序号 + 插单 + 删除 + 发布 + 导入 + 导出 + 下载模板 @@ -535,24 +535,8 @@ 删除 - - - 查询 - 添加 - 修改 - 删除 - - - - - 查询 - - - - - 查询 - - + + + - 查询 + 查询 - + - 查询 + 查询 - + - 查询 + 查询 - + - 查询 + 查询 - + - 查询 + 查询 - + - 查询 + 查询 - + - 查询 + 查询 + 添加 + 修改 + 删除 diff --git a/APP/QMAPP.Web/App_Data/PCPower.xml b/APP/QMAPP.Web/App_Data/PCPower.xml index 718ee8d..e6a5e79 100644 --- a/APP/QMAPP.Web/App_Data/PCPower.xml +++ b/APP/QMAPP.Web/App_Data/PCPower.xml @@ -103,7 +103,7 @@ - + diff --git a/APP/QMAPP.Web/Web.config b/APP/QMAPP.Web/Web.config index 3c6b42c..d5a580a 100644 --- a/APP/QMAPP.Web/Web.config +++ b/APP/QMAPP.Web/Web.config @@ -40,7 +40,7 @@ - + @@ -67,12 +67,12 @@ --> - + + - - +--> + + + <%=QMAPP.Common.Web.AppConfig.QMEChartPageConfig()%> + <%--异步获取数据生成图表--%> +
+ +
+ +
+
+
+ + <%=Html.QPEnd() %> + <%=Html.Hidden("selectKey")%> + <%=Html.Hidden("PID")%> + + + + + + + +
+ <%-- <%=Html.QTButtonSearch("InjectionCount", "QTYShipmentCount", "refreshEChartbar2()", QMAPP.Common.Web.SystemLimit.isLimt)%>--%> + <%=Html.QTButton("InjectionCount", "QTYInjectionCount", QMFrameWork.WebUI.IconCls.redo, "refreshEChartbar2()", QMAPP.Common.Web.SystemLimit.isLimt)%> + <%=Html.QTButton("export", "ExportBanCi", QMFrameWork.WebUI.IconCls.redo, "Export()", QMAPP.Common.Web.SystemLimit.isLimt)%> + <%-- <%=Html.QTButton("export", "ExportExcel", QMFrameWork.WebUI.IconCls.redo, "Export()", QMAPP.Common.Web.SystemLimit.isLimt)%>--%> +
+ diff --git a/APPQ5/QMAPP.FJC.Web/Views/TJPaoMoPlan/TJPaoMoPlanEdit.aspx b/APPQ5/QMAPP.FJC.Web/Views/TJPaoMoPlan/TJPaoMoPlanEdit.aspx new file mode 100644 index 0000000..b68b3c3 --- /dev/null +++ b/APPQ5/QMAPP.FJC.Web/Views/TJPaoMoPlan/TJPaoMoPlanEdit.aspx @@ -0,0 +1,106 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/AppMaster.Master" + Inherits="System.Web.Mvc.ViewPage" %> + + + 门板订单计划信息编辑 + + + <%=Html.QPEdit("信息", string.IsNullOrEmpty(Model.PID) ? QMFrameWork.WebUI.panelType.Add : QMFrameWork.WebUI.panelType.Update)%> + <% + var editable = false; + if (string.IsNullOrEmpty(Model.PLAN_STATE) || string.Equals(Model.PLAN_STATE, "0")) + { + editable = true; + } + %> + + + + +
+ + + + + + + + + + + + + + + + + + + + + + +
+ <%=Html.QV(p => p.PLAN_DATE)%> + + " + style=" width:200px" type="text" class="easyui-datebox" required="required" <%=editable?"":"readonly =\"readonly\"" %> /> +
+ <%=Html.QV(p => p.MATERIAL_CODE)%> + + <%=Html.QC(p => p.MATERIAL_CODE, editable ? null : new { Readonly = "readonly" })%> + +
+ <%=Html.QV(p => p.QTY)%> + + <%=Html.QC(p => p.QTY)%> +
+ <%=Html.QV(p => p.COMPLETE_QTY)%> + + <%=Html.QC(p => p.COMPLETE_QTY)%> +
+ <%=Html.QV(p => p.REMARK)%> + + <%=Html.QC(p => p.REMARK)%> +
+
+ <%=Html.HiddenFor(p=>p.PID) %> + <%=Html.HiddenFor(p=>p.CREATEDATE) %> + <%=Html.HiddenFor(p=>p.CREATEUSER) %> + <%=Html.HiddenFor(p => p.PLAN_STATE)%> + <%=Html.HiddenFor(p => p.PLAN_NO)%> + <%=Html.QPEnd() %> + + + + + + +
+ <%=Html.QTButtonSave("User", "Save", "return Save();")%> + <%=Html.QTButtonBack("close", "DashBoardPlanList", "parent.closeAppWindow1();return false;")%> +
+ + diff --git a/APPQ5/QMAPP.FJC.Web/Views/TJPaoMoPlan/TJPaoMoPlanList.aspx b/APPQ5/QMAPP.FJC.Web/Views/TJPaoMoPlan/TJPaoMoPlanList.aspx new file mode 100644 index 0000000..47cadff --- /dev/null +++ b/APPQ5/QMAPP.FJC.Web/Views/TJPaoMoPlan/TJPaoMoPlanList.aspx @@ -0,0 +1,198 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/AppMaster.Master" + Inherits="System.Web.Mvc.ViewPage" %> + + + 订单生产计划列表 + + + + <%=Html.QPSeach(80, true)%> + + + + + + + + + + + + + + + +
+ <%=Html.QV(p => p.PLAN_NO)%> + + <%=Html.QC(p => p.PLAN_NO)%> + + <%=Html.QV(p => p.PLAN_STATE)%> + + <%=Html.QC(p => p.PLAN_STATE)%> + + <%=Html.QV(p => p.MATERIAL_CODE)%> + + <%=Html.QC(p => p.MATERIAL_CODE)%> + + <%=Html.QV(p => p.PLANTIMESTART)%> + + <%=Html.QC(p => p.PLANTIMESTART)%> + + <%=Html.QV(p => p.PLANTIMEEND)%> + + <%=Html.QC(p => p.PLANTIMEEND)%> +
+ <%=Html.QPEnd()%> + <%=Html.QPList() %> + <%=Html.QDateGrid(Model)%> + <%=Html.QPEnd() %> + <%=Html.Hidden("selectKey")%> + <%=Html.Hidden("fileName")%> + <%=Html.Hidden("ORDER_TYPE")%> + + + + + + + + +
+ <%=Html.QTButtonSearch("TJPaoMoPlan", "List", "Search()", QMAPP.Common.Web.SystemLimit.isLimt)%> + <%=Html.QTButtonAdd("TJPaoMoPlan", "Add", "Add()", QMAPP.Common.Web.SystemLimit.isLimt)%> + <%-- <%=Html.QTButton("AddWholeDoor", "AddWholeDoor", QMFrameWork.WebUI.IconCls.add, "AddWholeDoor()", QMAPP.Common.Web.SystemLimit.isLimt)%>--%> + <%=Html.QTButtonUpdate("TJPaoMoPlan", "Edit", "Update()", QMAPP.Common.Web.SystemLimit.isLimt)%> + <%-- <%=Html.QTButton("EditSeq", "EditDoorPlankPlanSeq", QMFrameWork.WebUI.IconCls.edit, "EditDoorPlankPlanSeq()", QMAPP.Common.Web.SystemLimit.isLimt)%> + <%=Html.QTButton("insertorder","Insert",QMFrameWork.WebUI.IconCls.add,"Insert()", QMAPP.Common.Web.SystemLimit.isLimt)%> --%> + <%=Html.QTButtonDelete("TJPaoMoPlan", "Delete", "Delete()", QMAPP.Common.Web.SystemLimit.isLimt)%> + <%=Html.QTButton("publish", "PutOut", "detail", "Publish()", QMAPP.Common.Web.SystemLimit.isLimt)%> + <%=Html.QTButton("import", "ImportExcel", QMFrameWork.WebUI.IconCls.undo, "Import()", QMAPP.Common.Web.SystemLimit.isLimt)%> + <%-- <%=Html.QTButton("export", "ExportExcel", QMFrameWork.WebUI.IconCls.redo, "Export()", QMAPP.Common.Web.SystemLimit.isLimt)%>--%> + <%=Html.QTButton("template", "TemplateExcel", QMFrameWork.WebUI.IconCls.template, "getTemplate()", QMAPP.Common.Web.SystemLimit.isLimt)%> +
+ + diff --git a/APPQ5/QMAPP.FJC.Web/Views/TJZhuSuPlan/TJZhuSuPlanEdit.aspx b/APPQ5/QMAPP.FJC.Web/Views/TJZhuSuPlan/TJZhuSuPlanEdit.aspx new file mode 100644 index 0000000..718765a --- /dev/null +++ b/APPQ5/QMAPP.FJC.Web/Views/TJZhuSuPlan/TJZhuSuPlanEdit.aspx @@ -0,0 +1,106 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/AppMaster.Master" + Inherits="System.Web.Mvc.ViewPage" %> + + + 门板订单计划信息编辑 + + + <%=Html.QPEdit("信息", string.IsNullOrEmpty(Model.PID) ? QMFrameWork.WebUI.panelType.Add : QMFrameWork.WebUI.panelType.Update)%> + <% + var editable = false; + if (string.IsNullOrEmpty(Model.PLAN_STATE) || string.Equals(Model.PLAN_STATE, "0")) + { + editable = true; + } + %> + + + + +
+ + + + + + + + + + + + + + + + + + + + + + +
+ <%=Html.QV(p => p.PLAN_DATE)%> + + " + style=" width:200px" type="text" class="easyui-datebox" required="required" <%=editable?"":"readonly =\"readonly\"" %> /> +
+ <%=Html.QV(p => p.MATERIAL_CODE)%> + + <%=Html.QC(p => p.MATERIAL_CODE, editable ? null : new { Readonly = "readonly" })%> + +
+ <%=Html.QV(p => p.QTY)%> + + <%=Html.QC(p => p.QTY)%> +
+ <%=Html.QV(p => p.COMPLETE_QTY)%> + + <%=Html.QC(p => p.COMPLETE_QTY)%> +
+ <%=Html.QV(p => p.REMARK)%> + + <%=Html.QC(p => p.REMARK)%> +
+
+ <%=Html.HiddenFor(p=>p.PID) %> + <%=Html.HiddenFor(p=>p.CREATEDATE) %> + <%=Html.HiddenFor(p=>p.CREATEUSER) %> + <%=Html.HiddenFor(p => p.PLAN_STATE)%> + <%=Html.HiddenFor(p => p.PLAN_NO)%> + <%=Html.QPEnd() %> + + + + + + +
+ <%=Html.QTButtonSave("User", "Save", "return Save();")%> + <%=Html.QTButtonBack("close", "DashBoardPlanList", "parent.closeAppWindow1();return false;")%> +
+ + diff --git a/APPQ5/QMAPP.FJC.Web/Views/TJZhuSuPlan/TJZhuSuPlanList.aspx b/APPQ5/QMAPP.FJC.Web/Views/TJZhuSuPlan/TJZhuSuPlanList.aspx new file mode 100644 index 0000000..0634d3f --- /dev/null +++ b/APPQ5/QMAPP.FJC.Web/Views/TJZhuSuPlan/TJZhuSuPlanList.aspx @@ -0,0 +1,198 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/AppMaster.Master" + Inherits="System.Web.Mvc.ViewPage" %> + + + 订单生产计划列表 + + + + <%=Html.QPSeach(80, true)%> + + + + + + + + + + + + + + + +
+ <%=Html.QV(p => p.PLAN_NO)%> + + <%=Html.QC(p => p.PLAN_NO)%> + + <%=Html.QV(p => p.PLAN_STATE)%> + + <%=Html.QC(p => p.PLAN_STATE)%> + + <%=Html.QV(p => p.MATERIAL_CODE)%> + + <%=Html.QC(p => p.MATERIAL_CODE)%> + + <%=Html.QV(p => p.PLANTIMESTART)%> + + <%=Html.QC(p => p.PLANTIMESTART)%> + + <%=Html.QV(p => p.PLANTIMEEND)%> + + <%=Html.QC(p => p.PLANTIMEEND)%> +
+ <%=Html.QPEnd()%> + <%=Html.QPList() %> + <%=Html.QDateGrid(Model)%> + <%=Html.QPEnd() %> + <%=Html.Hidden("selectKey")%> + <%=Html.Hidden("fileName")%> + <%=Html.Hidden("ORDER_TYPE")%> + + + + + + + + +
+ <%=Html.QTButtonSearch("TJZhuSuPlan", "List", "Search()", QMAPP.Common.Web.SystemLimit.isLimt)%> + <%=Html.QTButtonAdd("TJZhuSuPlan", "Add", "Add()", QMAPP.Common.Web.SystemLimit.isLimt)%> + <%-- <%=Html.QTButton("AddWholeDoor", "AddWholeDoor", QMFrameWork.WebUI.IconCls.add, "AddWholeDoor()", QMAPP.Common.Web.SystemLimit.isLimt)%>--%> + <%=Html.QTButtonUpdate("TJZhuSuPlan", "Edit", "Update()", QMAPP.Common.Web.SystemLimit.isLimt)%> + <%-- <%=Html.QTButton("EditSeq", "EditDoorPlankPlanSeq", QMFrameWork.WebUI.IconCls.edit, "EditDoorPlankPlanSeq()", QMAPP.Common.Web.SystemLimit.isLimt)%> + <%=Html.QTButton("insertorder","Insert",QMFrameWork.WebUI.IconCls.add,"Insert()", QMAPP.Common.Web.SystemLimit.isLimt)%> --%> + <%=Html.QTButtonDelete("TJZhuSuPlan", "Delete", "Delete()", QMAPP.Common.Web.SystemLimit.isLimt)%> + <%=Html.QTButton("publish", "PutOut", "detail", "Publish()", QMAPP.Common.Web.SystemLimit.isLimt)%> + <%=Html.QTButton("import", "ImportExcel", QMFrameWork.WebUI.IconCls.undo, "Import()", QMAPP.Common.Web.SystemLimit.isLimt)%> + <%-- <%=Html.QTButton("export", "ExportExcel", QMFrameWork.WebUI.IconCls.redo, "Export()", QMAPP.Common.Web.SystemLimit.isLimt)%>--%> + <%=Html.QTButton("template", "TemplateExcel", QMFrameWork.WebUI.IconCls.template, "getTemplate()", QMAPP.Common.Web.SystemLimit.isLimt)%> +
+ + diff --git a/APPQ5/QMAPP.FJC.Web/Web.config b/APPQ5/QMAPP.FJC.Web/Web.config index f3a14b5..982b6d8 100644 --- a/APPQ5/QMAPP.FJC.Web/Web.config +++ b/APPQ5/QMAPP.FJC.Web/Web.config @@ -43,11 +43,12 @@ + - + diff --git a/APPQ5/QMAPP.WinForm/App.config b/APPQ5/QMAPP.WinForm/App.config index bd36f3e..8c309c6 100644 --- a/APPQ5/QMAPP.WinForm/App.config +++ b/APPQ5/QMAPP.WinForm/App.config @@ -10,12 +10,12 @@ --> - - - - + + diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs index a808bdd..3c726d7 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs @@ -18,6 +18,7 @@ using QMAPP.FJC.Entity.Basic; using QMAPP.FJC.Entity.TianJin; using QMAPP.ServicesAgent; using QMAPP.MD.Entity.TianJin; +using QMAPP.FJC.Entity.CompleteStatistics; namespace QMAPP.WinForm.Forms.TianJin { @@ -2148,17 +2149,27 @@ namespace QMAPP.WinForm.Forms.TianJin dt.Columns.Add("MbConfig"); dt.Columns.Add("MbOrientation"); dt.Columns.Add("CreateTime"); + dt.Columns.Add("PLAN_NO"); int index = 1; QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent(); //DataTable tbl = agent.InvokeServiceFunction(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_GetPastecardDeatis.ToString()); DataTable tbl = agent.InvokeServiceFunction(QMAPP.ServicesAgent.FrmPlaceManage.TJFrmPlaceBLL_GetPascardDetailsByPid.ToString(), nfpastecard.PASTE_CARD_KEY); - + //index = Convert.ToInt32(tbl.Rows[0][0].ToString()); + + + //var TYPE1 = dgvMATChange.Rows[0].Cells[PLAN_NO.Name].Value.ToString(); + //var TYPE2 = dgvMATChange.Rows[12].Cells[PLAN_NO.Name].Value.ToString(); + //int defaultNum = Convert.ToInt32(QMAPP.WinForm.Common.LocalSetting.Settings["ShowDataCount"]); + //var materialcode1 = dgvNF.Rows[0].Cells[PRODNO_NF.Name].Value.ToString(); + //var materialcode2 = dgvNF.Rows[12].Cells[PRODNO_NF.Name].Value.ToString(); + + //var count = defaultNum / 2; for (var i = 0; i < tbl.Rows.Count; i++) { DataRow ncsdr = dt.NewRow(); - ncsdr["ROWINDEX"] = index.ToString(); ; + ncsdr["ROWINDEX"] = index.ToString(); ncsdr["VWSEQ"] = tbl.Rows[i]["VWSEQ"].ToString(); ncsdr["VIN"] = tbl.Rows[i]["VIN"].ToString(); ncsdr["PRODNO"] = tbl.Rows[i]["PRODNO"].ToString(); @@ -2202,21 +2213,27 @@ namespace QMAPP.WinForm.Forms.TianJin lberror.Text = "贴车单已打印;"; } + + #region 针对贴车单上的条码进行出库操作 var nor = string.Empty; for (var i = 0; i < tbl.Rows.Count; i++) { + #region 发运数据回冲 + SaveCOMPLETE(tbl.Rows[i]["PRODNO"].ToString(), tbl.Rows[i]["VIN"].ToString()); + + #endregion if (string.IsNullOrEmpty(nor)) nor += tbl.Rows[i]["VIN"].ToString() + ","; else { if (!nor.Contains(tbl.Rows[i]["VIN"].ToString())) { - var count = agent.InvokeServiceFunction>("StorageBLL_SelectCount", tbl.Rows[i]["VIN"].ToString()); + var DataResult = agent.InvokeServiceFunction>("StorageBLL_SelectCount", tbl.Rows[i]["VIN"].ToString()); //如果条码未入库，先进行入库操作 - if (count.Result <= 0) + if (DataResult.Result <= 0) { Storage pi = new Storage(); pi.ProductCode = tbl.Rows[i]["VIN"].ToString(); @@ -2535,7 +2552,31 @@ namespace QMAPP.WinForm.Forms.TianJin window.Owner = this; window.Show(); } - #endregion + #endregion + + #region 回冲 + + /// + /// 处理回冲数据 + /// + public void SaveCOMPLETE(string MaterialCode,string ORDERNO) + { + QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent(); + + CompleteStatisticsEntity model = new CompleteStatisticsEntity(); + model.MATERIALNO = MaterialCode; + model.SYSCOMPLETECOUNT = 1; + model.COMPLETECOUNT = 1; + model.STARTTIME = DateTime.Now; + model.ENDTIME = DateTime.Now; + model.ORDERNO = ORDERNO; + + var ss = agent.InvokeServiceFunction>("CompleteStatisticsBLL_Insert", model); + } + + + + #endregion /// /// diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.designer.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.designer.cs index 957df4e..015be2e 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.designer.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.designer.cs @@ -29,8 +29,8 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.groupBox2 = new System.Windows.Forms.GroupBox(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.panel1 = new System.Windows.Forms.FlowLayoutPanel(); @@ -45,15 +45,6 @@ this.ra_hx = new System.Windows.Forms.RadioButton(); this.ra_dx = new System.Windows.Forms.RadioButton(); this.dgvMATChange = new System.Windows.Forms.DataGridView(); - this.PLAN_DATE = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.REQUESTID = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.MATERIAL_CODE = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.MATERIAL_NAME = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.LINENO = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.MOULD_CODE = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.PID = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.clscanstate = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.STATE = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panel6 = new System.Windows.Forms.Panel(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.panel4 = new System.Windows.Forms.Panel(); @@ -90,6 +81,16 @@ this.timeRefew = new System.Windows.Forms.Timer(this.components); this.panel7 = new System.Windows.Forms.Panel(); this.panel8 = new System.Windows.Forms.Panel(); + this.PLAN_DATE = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.REQUESTID = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.MATERIAL_CODE = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.MATERIAL_NAME = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.LINENO = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.MOULD_CODE = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.PID = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.clscanstate = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.STATE = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.PLAN_NO = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.groupBox2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); @@ -114,8 +115,10 @@ this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox2.Font = new System.Drawing.Font("宋体", 9F); this.groupBox2.Location = new System.Drawing.Point(0, 0); + this.groupBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(770, 692); + this.groupBox2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox2.Size = new System.Drawing.Size(1155, 1038); this.groupBox2.TabIndex = 10; this.groupBox2.TabStop = false; this.groupBox2.Text = "FIS数据"; @@ -123,7 +126,8 @@ // splitContainer1 // this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer1.Location = new System.Drawing.Point(3, 17); + this.splitContainer1.Location = new System.Drawing.Point(4, 25); + this.splitContainer1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.splitContainer1.Name = "splitContainer1"; this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; // @@ -134,8 +138,9 @@ // splitContainer1.Panel2 // this.splitContainer1.Panel2.Controls.Add(this.dgvMATChange); - this.splitContainer1.Size = new System.Drawing.Size(764, 672); - this.splitContainer1.SplitterDistance = 70; + this.splitContainer1.Size = new System.Drawing.Size(1147, 1009); + this.splitContainer1.SplitterDistance = 105; + this.splitContainer1.SplitterWidth = 6; this.splitContainer1.TabIndex = 8; // // panel1 @@ -152,16 +157,18 @@ this.panel1.Controls.Add(this.ra_dx); this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(0, 0); + this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(764, 70); + this.panel1.Size = new System.Drawing.Size(1147, 105); this.panel1.TabIndex = 7; // // btnLineSetting // this.btnLineSetting.AutoSize = true; - this.btnLineSetting.Location = new System.Drawing.Point(3, 3); + this.btnLineSetting.Location = new System.Drawing.Point(4, 4); + this.btnLineSetting.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnLineSetting.Name = "btnLineSetting"; - this.btnLineSetting.Size = new System.Drawing.Size(91, 23); + this.btnLineSetting.Size = new System.Drawing.Size(136, 42); this.btnLineSetting.TabIndex = 11; this.btnLineSetting.Text = "发运设置"; this.btnLineSetting.UseVisualStyleBackColor = true; @@ -170,9 +177,10 @@ // btnSetDatagroupType // this.btnSetDatagroupType.AutoSize = true; - this.btnSetDatagroupType.Location = new System.Drawing.Point(100, 3); + this.btnSetDatagroupType.Location = new System.Drawing.Point(148, 4); + this.btnSetDatagroupType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnSetDatagroupType.Name = "btnSetDatagroupType"; - this.btnSetDatagroupType.Size = new System.Drawing.Size(107, 23); + this.btnSetDatagroupType.Size = new System.Drawing.Size(189, 42); this.btnSetDatagroupType.TabIndex = 13; this.btnSetDatagroupType.Text = "设置器具容量"; this.btnSetDatagroupType.UseVisualStyleBackColor = true; @@ -181,9 +189,10 @@ // btnSearch // this.btnSearch.AutoSize = true; - this.btnSearch.Location = new System.Drawing.Point(213, 3); + this.btnSearch.Location = new System.Drawing.Point(345, 4); + this.btnSearch.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnSearch.Name = "btnSearch"; - this.btnSearch.Size = new System.Drawing.Size(75, 23); + this.btnSearch.Size = new System.Drawing.Size(162, 42); this.btnSearch.TabIndex = 8; this.btnSearch.Text = "贴车单查询"; this.btnSearch.UseVisualStyleBackColor = true; @@ -192,9 +201,10 @@ // btnJZ // this.btnJZ.AutoSize = true; - this.btnJZ.Location = new System.Drawing.Point(294, 3); + this.btnJZ.Location = new System.Drawing.Point(515, 4); + this.btnJZ.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnJZ.Name = "btnJZ"; - this.btnJZ.Size = new System.Drawing.Size(96, 23); + this.btnJZ.Size = new System.Drawing.Size(144, 42); this.btnJZ.TabIndex = 9; this.btnJZ.Text = "计划挂起"; this.btnJZ.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; @@ -204,9 +214,10 @@ // btnRef // this.btnRef.AutoSize = true; - this.btnRef.Location = new System.Drawing.Point(396, 3); + this.btnRef.Location = new System.Drawing.Point(667, 4); + this.btnRef.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnRef.Name = "btnRef"; - this.btnRef.Size = new System.Drawing.Size(105, 23); + this.btnRef.Size = new System.Drawing.Size(176, 42); this.btnRef.TabIndex = 9; this.btnRef.Text = "刷新FIS数据"; this.btnRef.UseVisualStyleBackColor = true; @@ -216,9 +227,10 @@ // this.rb_hx.AutoSize = true; this.rb_hx.Checked = true; - this.rb_hx.Location = new System.Drawing.Point(507, 3); + this.rb_hx.Location = new System.Drawing.Point(851, 4); + this.rb_hx.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.rb_hx.Name = "rb_hx"; - this.rb_hx.Size = new System.Drawing.Size(71, 16); + this.rb_hx.Size = new System.Drawing.Size(105, 22); this.rb_hx.TabIndex = 7; this.rb_hx.TabStop = true; this.rb_hx.Text = "左侧门板"; @@ -228,9 +240,10 @@ // rb_dx // this.rb_dx.AutoSize = true; - this.rb_dx.Location = new System.Drawing.Point(584, 3); + this.rb_dx.Location = new System.Drawing.Point(964, 4); + this.rb_dx.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.rb_dx.Name = "rb_dx"; - this.rb_dx.Size = new System.Drawing.Size(71, 16); + this.rb_dx.Size = new System.Drawing.Size(105, 22); this.rb_dx.TabIndex = 6; this.rb_dx.Text = "右侧门板"; this.rb_dx.UseVisualStyleBackColor = true; @@ -241,19 +254,20 @@ this.lblCount.AutoSize = true; this.lblCount.Dock = System.Windows.Forms.DockStyle.Left; this.lblCount.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lblCount.Location = new System.Drawing.Point(663, 0); - this.lblCount.Margin = new System.Windows.Forms.Padding(5, 0, 0, 0); + this.lblCount.Location = new System.Drawing.Point(1081, 0); + this.lblCount.Margin = new System.Windows.Forms.Padding(8, 0, 0, 0); this.lblCount.Name = "lblCount"; - this.lblCount.Size = new System.Drawing.Size(0, 29); + this.lblCount.Size = new System.Drawing.Size(0, 50); this.lblCount.TabIndex = 21; this.lblCount.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // ra_hx // this.ra_hx.AutoSize = true; - this.ra_hx.Location = new System.Drawing.Point(666, 3); + this.ra_hx.Location = new System.Drawing.Point(4, 54); + this.ra_hx.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.ra_hx.Name = "ra_hx"; - this.ra_hx.Size = new System.Drawing.Size(77, 16); + this.ra_hx.Size = new System.Drawing.Size(114, 22); this.ra_hx.TabIndex = 22; this.ra_hx.Text = "018前门板"; this.ra_hx.UseVisualStyleBackColor = true; @@ -262,9 +276,10 @@ // ra_dx // this.ra_dx.AutoSize = true; - this.ra_dx.Location = new System.Drawing.Point(3, 32); + this.ra_dx.Location = new System.Drawing.Point(126, 54); + this.ra_dx.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.ra_dx.Name = "ra_dx"; - this.ra_dx.Size = new System.Drawing.Size(77, 16); + this.ra_dx.Size = new System.Drawing.Size(114, 22); this.ra_dx.TabIndex = 23; this.ra_dx.Text = "018后门板"; this.ra_dx.UseVisualStyleBackColor = true; @@ -287,18 +302,20 @@ this.MOULD_CODE, this.PID, this.clscanstate, - this.STATE}); - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F); - dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle5.Padding = new System.Windows.Forms.Padding(0, 0, 15, 0); - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvMATChange.DefaultCellStyle = dataGridViewCellStyle5; + this.STATE, + this.PLAN_NO}); + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.Padding = new System.Windows.Forms.Padding(0, 0, 15, 0); + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvMATChange.DefaultCellStyle = dataGridViewCellStyle1; this.dgvMATChange.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvMATChange.Location = new System.Drawing.Point(0, 0); + this.dgvMATChange.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.dgvMATChange.Name = "dgvMATChange"; this.dgvMATChange.ReadOnly = true; this.dgvMATChange.RowHeadersWidth = 40; @@ -306,102 +323,19 @@ this.dgvMATChange.RowTemplate.DefaultCellStyle.Padding = new System.Windows.Forms.Padding(0, 0, 15, 0); this.dgvMATChange.RowTemplate.Height = 23; this.dgvMATChange.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvMATChange.Size = new System.Drawing.Size(764, 598); + this.dgvMATChange.Size = new System.Drawing.Size(1147, 898); this.dgvMATChange.TabIndex = 5; this.dgvMATChange.TabStop = false; this.dgvMATChange.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dgvMATChange_RowPostPaint); // - // PLAN_DATE - // - this.PLAN_DATE.DataPropertyName = "PLAN_DATE"; - this.PLAN_DATE.HeaderText = "计划时间"; - this.PLAN_DATE.Name = "PLAN_DATE"; - this.PLAN_DATE.ReadOnly = true; - this.PLAN_DATE.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.PLAN_DATE.Width = 74; - // - // REQUESTID - // - this.REQUESTID.DataPropertyName = "SEQ"; - this.REQUESTID.HeaderText = "顺序号"; - this.REQUESTID.Name = "REQUESTID"; - this.REQUESTID.ReadOnly = true; - this.REQUESTID.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.REQUESTID.Width = 62; - // - // MATERIAL_CODE - // - this.MATERIAL_CODE.DataPropertyName = "MATERIAL_CODE"; - this.MATERIAL_CODE.HeaderText = "零件号"; - this.MATERIAL_CODE.Name = "MATERIAL_CODE"; - this.MATERIAL_CODE.ReadOnly = true; - this.MATERIAL_CODE.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.MATERIAL_CODE.Width = 62; - // - // MATERIAL_NAME - // - this.MATERIAL_NAME.DataPropertyName = "MATERIAL_NAME"; - this.MATERIAL_NAME.HeaderText = "总成描述"; - this.MATERIAL_NAME.Name = "MATERIAL_NAME"; - this.MATERIAL_NAME.ReadOnly = true; - this.MATERIAL_NAME.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.MATERIAL_NAME.Width = 74; - // - // LINENO - // - this.LINENO.DataPropertyName = "LINENO"; - this.LINENO.HeaderText = "车型"; - this.LINENO.Name = "LINENO"; - this.LINENO.ReadOnly = true; - this.LINENO.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.LINENO.Width = 50; - // - // MOULD_CODE - // - this.MOULD_CODE.DataPropertyName = "MOULD_CODE"; - this.MOULD_CODE.HeaderText = "位置"; - this.MOULD_CODE.Name = "MOULD_CODE"; - this.MOULD_CODE.ReadOnly = true; - this.MOULD_CODE.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.MOULD_CODE.Width = 50; - // - // PID - // - this.PID.DataPropertyName = "PID"; - this.PID.HeaderText = "PID"; - this.PID.Name = "PID"; - this.PID.ReadOnly = true; - this.PID.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.PID.Visible = false; - this.PID.Width = 44; - // - // clscanstate - // - this.clscanstate.DataPropertyName = "SCANSTATE"; - this.clscanstate.HeaderText = "扫描状态"; - this.clscanstate.Name = "clscanstate"; - this.clscanstate.ReadOnly = true; - this.clscanstate.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.clscanstate.Visible = false; - this.clscanstate.Width = 74; - // - // STATE - // - this.STATE.DataPropertyName = "STATE"; - this.STATE.HeaderText = "STATE"; - this.STATE.Name = "STATE"; - this.STATE.ReadOnly = true; - this.STATE.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.STATE.Visible = false; - this.STATE.Width = 56; - // // panel6 // this.panel6.Controls.Add(this.groupBox1); this.panel6.Dock = System.Windows.Forms.DockStyle.Right; - this.panel6.Location = new System.Drawing.Point(773, 0); + this.panel6.Location = new System.Drawing.Point(1159, 0); + this.panel6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(466, 692); + this.panel6.Size = new System.Drawing.Size(699, 1038); this.panel6.TabIndex = 18; // // groupBox1 @@ -410,8 +344,10 @@ this.groupBox1.Controls.Add(this.panel3); this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox1.Location = new System.Drawing.Point(0, 0); + this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(466, 692); + this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox1.Size = new System.Drawing.Size(699, 1038); this.groupBox1.TabIndex = 9; this.groupBox1.TabStop = false; this.groupBox1.Text = "已扫描数据"; @@ -421,9 +357,10 @@ this.panel4.Controls.Add(this.dgvNF); this.panel4.Controls.Add(this.tpContainer); this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel4.Location = new System.Drawing.Point(3, 87); + this.panel4.Location = new System.Drawing.Point(4, 130); + this.panel4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(460, 602); + this.panel4.Size = new System.Drawing.Size(691, 904); this.panel4.TabIndex = 15; // // dgvNF @@ -449,24 +386,25 @@ this.Column11, this.Column13, this.dgcPRODUCT_PID}); - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle6.Padding = new System.Windows.Forms.Padding(0, 0, 10, 0); - dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvNF.DefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle2.Padding = new System.Windows.Forms.Padding(0, 0, 10, 0); + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvNF.DefaultCellStyle = dataGridViewCellStyle2; this.dgvNF.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvNF.Location = new System.Drawing.Point(0, 0); + this.dgvNF.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.dgvNF.Name = "dgvNF"; this.dgvNF.ReadOnly = true; this.dgvNF.RowHeadersWidth = 50; this.dgvNF.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; this.dgvNF.RowTemplate.Height = 27; this.dgvNF.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvNF.Size = new System.Drawing.Size(460, 364); + this.dgvNF.Size = new System.Drawing.Size(691, 547); this.dgvNF.TabIndex = 0; // // CODE_NF @@ -476,7 +414,7 @@ this.CODE_NF.Name = "CODE_NF"; this.CODE_NF.ReadOnly = true; this.CODE_NF.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.CODE_NF.Width = 57; + this.CODE_NF.Width = 78; // // PRODNO_NF // @@ -485,7 +423,7 @@ this.PRODNO_NF.Name = "PRODNO_NF"; this.PRODNO_NF.ReadOnly = true; this.PRODNO_NF.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.PRODNO_NF.Width = 57; + this.PRODNO_NF.Width = 78; // // CARSETDESC_CN_NF // @@ -494,7 +432,7 @@ this.CARSETDESC_CN_NF.Name = "CARSETDESC_CN_NF"; this.CARSETDESC_CN_NF.ReadOnly = true; this.CARSETDESC_CN_NF.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.CARSETDESC_CN_NF.Width = 69; + this.CARSETDESC_CN_NF.Width = 96; // // MOULDCODE // @@ -503,7 +441,7 @@ this.MOULDCODE.Name = "MOULDCODE"; this.MOULDCODE.ReadOnly = true; this.MOULDCODE.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.MOULDCODE.Width = 45; + this.MOULDCODE.Width = 60; // // CREATEDATE_NF // @@ -512,7 +450,7 @@ this.CREATEDATE_NF.Name = "CREATEDATE_NF"; this.CREATEDATE_NF.ReadOnly = true; this.CREATEDATE_NF.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.CREATEDATE_NF.Width = 69; + this.CREATEDATE_NF.Width = 96; // // Column1 // @@ -593,14 +531,15 @@ this.tpContainer.ColumnCount = 1; this.tpContainer.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.tpContainer.Dock = System.Windows.Forms.DockStyle.Bottom; - this.tpContainer.Location = new System.Drawing.Point(0, 364); + this.tpContainer.Location = new System.Drawing.Point(0, 547); + this.tpContainer.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tpContainer.Name = "tpContainer"; this.tpContainer.RowCount = 1; this.tpContainer.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tpContainer.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 235F)); - this.tpContainer.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 235F)); - this.tpContainer.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 235F)); - this.tpContainer.Size = new System.Drawing.Size(460, 238); + this.tpContainer.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 352F)); + this.tpContainer.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 352F)); + this.tpContainer.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 352F)); + this.tpContainer.Size = new System.Drawing.Size(691, 357); this.tpContainer.TabIndex = 0; // // panel3 @@ -614,16 +553,18 @@ this.panel3.Controls.Add(this.lblLastPastNO); this.panel3.Controls.Add(this.pbPastNoConfirmed); this.panel3.Dock = System.Windows.Forms.DockStyle.Top; - this.panel3.Location = new System.Drawing.Point(3, 17); + this.panel3.Location = new System.Drawing.Point(4, 25); + this.panel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(460, 70); + this.panel3.Size = new System.Drawing.Size(691, 105); this.panel3.TabIndex = 14; // // btnPrint_NF // - this.btnPrint_NF.Location = new System.Drawing.Point(3, 3); + this.btnPrint_NF.Location = new System.Drawing.Point(4, 4); + this.btnPrint_NF.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnPrint_NF.Name = "btnPrint_NF"; - this.btnPrint_NF.Size = new System.Drawing.Size(75, 26); + this.btnPrint_NF.Size = new System.Drawing.Size(112, 39); this.btnPrint_NF.TabIndex = 11; this.btnPrint_NF.Text = "贴车单打印"; this.btnPrint_NF.UseVisualStyleBackColor = true; @@ -632,9 +573,10 @@ // // btnResetIndex // - this.btnResetIndex.Location = new System.Drawing.Point(84, 3); + this.btnResetIndex.Location = new System.Drawing.Point(124, 4); + this.btnResetIndex.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnResetIndex.Name = "btnResetIndex"; - this.btnResetIndex.Size = new System.Drawing.Size(102, 26); + this.btnResetIndex.Size = new System.Drawing.Size(153, 39); this.btnResetIndex.TabIndex = 15; this.btnResetIndex.Text = "贴车单顺序校正"; this.btnResetIndex.UseVisualStyleBackColor = true; @@ -642,9 +584,10 @@ // // btnResetCart // - this.btnResetCart.Location = new System.Drawing.Point(192, 3); + this.btnResetCart.Location = new System.Drawing.Point(285, 4); + this.btnResetCart.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnResetCart.Name = "btnResetCart"; - this.btnResetCart.Size = new System.Drawing.Size(95, 26); + this.btnResetCart.Size = new System.Drawing.Size(142, 39); this.btnResetCart.TabIndex = 18; this.btnResetCart.Text = "重扫当前器具"; this.btnResetCart.UseVisualStyleBackColor = true; @@ -652,9 +595,10 @@ // // btnCloseCart // - this.btnCloseCart.Location = new System.Drawing.Point(293, 3); + this.btnCloseCart.Location = new System.Drawing.Point(435, 4); + this.btnCloseCart.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnCloseCart.Name = "btnCloseCart"; - this.btnCloseCart.Size = new System.Drawing.Size(95, 26); + this.btnCloseCart.Size = new System.Drawing.Size(142, 39); this.btnCloseCart.TabIndex = 19; this.btnCloseCart.Text = "强制提交"; this.btnCloseCart.UseVisualStyleBackColor = true; @@ -662,9 +606,10 @@ // // btnFirstPlace // - this.btnFirstPlace.Location = new System.Drawing.Point(3, 35); + this.btnFirstPlace.Location = new System.Drawing.Point(4, 51); + this.btnFirstPlace.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnFirstPlace.Name = "btnFirstPlace"; - this.btnFirstPlace.Size = new System.Drawing.Size(75, 26); + this.btnFirstPlace.Size = new System.Drawing.Size(112, 39); this.btnFirstPlace.TabIndex = 17; this.btnFirstPlace.Text = "1号位打印"; this.btnFirstPlace.UseVisualStyleBackColor = true; @@ -675,10 +620,10 @@ this.label1.AutoSize = true; this.label1.Dock = System.Windows.Forms.DockStyle.Right; this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(85, 32); - this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 3, 0); + this.label1.Location = new System.Drawing.Point(126, 47); + this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 4, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(94, 34); + this.label1.Size = new System.Drawing.Size(140, 50); this.label1.TabIndex = 20; this.label1.Text = "前车贴车单:"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -688,18 +633,20 @@ this.lblLastPastNO.AutoSize = true; this.lblLastPastNO.Dock = System.Windows.Forms.DockStyle.Left; this.lblLastPastNO.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lblLastPastNO.Location = new System.Drawing.Point(185, 32); + this.lblLastPastNO.Location = new System.Drawing.Point(274, 47); + this.lblLastPastNO.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblLastPastNO.Name = "lblLastPastNO"; - this.lblLastPastNO.Size = new System.Drawing.Size(0, 34); + this.lblLastPastNO.Size = new System.Drawing.Size(0, 50); this.lblLastPastNO.TabIndex = 23; this.lblLastPastNO.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // pbPastNoConfirmed // this.pbPastNoConfirmed.Image = global::QMAPP.WinForm.Resource1.help; - this.pbPastNoConfirmed.Location = new System.Drawing.Point(191, 35); + this.pbPastNoConfirmed.Location = new System.Drawing.Point(282, 51); + this.pbPastNoConfirmed.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pbPastNoConfirmed.Name = "pbPastNoConfirmed"; - this.pbPastNoConfirmed.Size = new System.Drawing.Size(28, 28); + this.pbPastNoConfirmed.Size = new System.Drawing.Size(42, 42); this.pbPastNoConfirmed.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.pbPastNoConfirmed.TabIndex = 22; this.pbPastNoConfirmed.TabStop = false; @@ -710,9 +657,10 @@ this.lberror.BackColor = System.Drawing.Color.Red; this.lberror.Font = new System.Drawing.Font("微软雅黑", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lberror.ForeColor = System.Drawing.Color.White; - this.lberror.Location = new System.Drawing.Point(476, 6); + this.lberror.Location = new System.Drawing.Point(714, 9); + this.lberror.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lberror.Name = "lberror"; - this.lberror.Size = new System.Drawing.Size(0, 36); + this.lberror.Size = new System.Drawing.Size(0, 52); this.lberror.TabIndex = 13; // // label2 @@ -720,9 +668,10 @@ this.label2.AutoSize = true; this.label2.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label2.ForeColor = System.Drawing.Color.Red; - this.label2.Location = new System.Drawing.Point(378, 17); + this.label2.Location = new System.Drawing.Point(567, 26); + this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(114, 20); + this.label2.Size = new System.Drawing.Size(168, 30); this.label2.TabIndex = 14; this.label2.Text = "消息区域："; // @@ -730,9 +679,10 @@ // this.txtCode.Font = new System.Drawing.Font("宋体", 20F); this.txtCode.ImeMode = System.Windows.Forms.ImeMode.Disable; - this.txtCode.Location = new System.Drawing.Point(108, 6); + this.txtCode.Location = new System.Drawing.Point(162, 9); + this.txtCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtCode.Name = "txtCode"; - this.txtCode.Size = new System.Drawing.Size(264, 38); + this.txtCode.Size = new System.Drawing.Size(394, 53); this.txtCode.TabIndex = 1; this.txtCode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtCode_KeyDown); this.txtCode.Leave += new System.EventHandler(this.txtCode_Leave); @@ -741,18 +691,20 @@ // this.label4.AutoSize = true; this.label4.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(9, 17); + this.label4.Location = new System.Drawing.Point(14, 26); + this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(93, 20); + this.label4.Size = new System.Drawing.Size(137, 30); this.label4.TabIndex = 12; this.label4.Text = "扫描条码"; // // splitter1 // this.splitter1.Dock = System.Windows.Forms.DockStyle.Right; - this.splitter1.Location = new System.Drawing.Point(770, 0); + this.splitter1.Location = new System.Drawing.Point(1155, 0); + this.splitter1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.splitter1.Name = "splitter1"; - this.splitter1.Size = new System.Drawing.Size(3, 692); + this.splitter1.Size = new System.Drawing.Size(4, 1038); this.splitter1.TabIndex = 17; this.splitter1.TabStop = false; // @@ -761,8 +713,9 @@ this.panel5.Controls.Add(this.groupBox2); this.panel5.Dock = System.Windows.Forms.DockStyle.Fill; this.panel5.Location = new System.Drawing.Point(0, 0); + this.panel5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(770, 692); + this.panel5.Size = new System.Drawing.Size(1155, 1038); this.panel5.TabIndex = 16; // // timeRefew @@ -776,9 +729,10 @@ this.panel7.Controls.Add(this.splitter1); this.panel7.Controls.Add(this.panel6); this.panel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel7.Location = new System.Drawing.Point(0, 50); + this.panel7.Location = new System.Drawing.Point(0, 75); + this.panel7.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.panel7.Name = "panel7"; - this.panel7.Size = new System.Drawing.Size(1239, 692); + this.panel7.Size = new System.Drawing.Size(1858, 1038); this.panel7.TabIndex = 9; // // panel8 @@ -789,17 +743,112 @@ this.panel8.Controls.Add(this.txtCode); this.panel8.Dock = System.Windows.Forms.DockStyle.Top; this.panel8.Location = new System.Drawing.Point(0, 0); + this.panel8.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.panel8.Name = "panel8"; - this.panel8.Size = new System.Drawing.Size(1239, 50); + this.panel8.Size = new System.Drawing.Size(1858, 75); this.panel8.TabIndex = 19; // + // PLAN_DATE + // + this.PLAN_DATE.DataPropertyName = "PLAN_DATE"; + this.PLAN_DATE.HeaderText = "计划时间"; + this.PLAN_DATE.Name = "PLAN_DATE"; + this.PLAN_DATE.ReadOnly = true; + this.PLAN_DATE.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.PLAN_DATE.Width = 101; + // + // REQUESTID + // + this.REQUESTID.DataPropertyName = "SEQ"; + this.REQUESTID.HeaderText = "顺序号"; + this.REQUESTID.Name = "REQUESTID"; + this.REQUESTID.ReadOnly = true; + this.REQUESTID.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.REQUESTID.Width = 83; + // + // MATERIAL_CODE + // + this.MATERIAL_CODE.DataPropertyName = "MATERIAL_CODE"; + this.MATERIAL_CODE.HeaderText = "零件号"; + this.MATERIAL_CODE.Name = "MATERIAL_CODE"; + this.MATERIAL_CODE.ReadOnly = true; + this.MATERIAL_CODE.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.MATERIAL_CODE.Width = 83; + // + // MATERIAL_NAME + // + this.MATERIAL_NAME.DataPropertyName = "MATERIAL_NAME"; + this.MATERIAL_NAME.HeaderText = "总成描述"; + this.MATERIAL_NAME.Name = "MATERIAL_NAME"; + this.MATERIAL_NAME.ReadOnly = true; + this.MATERIAL_NAME.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.MATERIAL_NAME.Width = 101; + // + // LINENO + // + this.LINENO.DataPropertyName = "LINENO"; + this.LINENO.HeaderText = "车型"; + this.LINENO.Name = "LINENO"; + this.LINENO.ReadOnly = true; + this.LINENO.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.LINENO.Width = 65; + // + // MOULD_CODE + // + this.MOULD_CODE.DataPropertyName = "MOULD_CODE"; + this.MOULD_CODE.HeaderText = "位置"; + this.MOULD_CODE.Name = "MOULD_CODE"; + this.MOULD_CODE.ReadOnly = true; + this.MOULD_CODE.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.MOULD_CODE.Width = 65; + // + // PID + // + this.PID.DataPropertyName = "PID"; + this.PID.HeaderText = "PID"; + this.PID.Name = "PID"; + this.PID.ReadOnly = true; + this.PID.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.PID.Visible = false; + this.PID.Width = 56; + // + // clscanstate + // + this.clscanstate.DataPropertyName = "SCANSTATE"; + this.clscanstate.HeaderText = "扫描状态"; + this.clscanstate.Name = "clscanstate"; + this.clscanstate.ReadOnly = true; + this.clscanstate.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.clscanstate.Visible = false; + this.clscanstate.Width = 101; + // + // STATE + // + this.STATE.DataPropertyName = "STATE"; + this.STATE.HeaderText = "STATE"; + this.STATE.Name = "STATE"; + this.STATE.ReadOnly = true; + this.STATE.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.STATE.Visible = false; + this.STATE.Width = 74; + // + // PLAN_NO + // + this.PLAN_NO.DataPropertyName = "PLAN_NO"; + this.PLAN_NO.HeaderText = "PLAN_NO"; + this.PLAN_NO.Name = "PLAN_NO"; + this.PLAN_NO.ReadOnly = true; + this.PLAN_NO.Visible = false; + this.PLAN_NO.Width = 122; + // // TJFrmPlace // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1239, 742); + this.ClientSize = new System.Drawing.Size(1858, 1113); this.Controls.Add(this.panel7); this.Controls.Add(this.panel8); + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.Name = "TJFrmPlace"; this.Text = "发运终端"; this.Activated += new System.EventHandler(this.FrmPlace_Activated); @@ -864,15 +913,6 @@ private System.Windows.Forms.Panel panel7; private System.Windows.Forms.Panel panel8; private System.Windows.Forms.Label lblCount; - private System.Windows.Forms.DataGridViewTextBoxColumn PLAN_DATE; - private System.Windows.Forms.DataGridViewTextBoxColumn REQUESTID; - private System.Windows.Forms.DataGridViewTextBoxColumn MATERIAL_CODE; - private System.Windows.Forms.DataGridViewTextBoxColumn MATERIAL_NAME; - private System.Windows.Forms.DataGridViewTextBoxColumn LINENO; - private System.Windows.Forms.DataGridViewTextBoxColumn MOULD_CODE; - private System.Windows.Forms.DataGridViewTextBoxColumn PID; - private System.Windows.Forms.DataGridViewTextBoxColumn clscanstate; - private System.Windows.Forms.DataGridViewTextBoxColumn STATE; private System.Windows.Forms.DataGridViewTextBoxColumn CODE_NF; private System.Windows.Forms.DataGridViewTextBoxColumn PRODNO_NF; private System.Windows.Forms.DataGridViewTextBoxColumn CARSETDESC_CN_NF; @@ -888,5 +928,15 @@ private System.Windows.Forms.DataGridViewTextBoxColumn dgcPRODUCT_PID; private System.Windows.Forms.RadioButton ra_hx; private System.Windows.Forms.RadioButton ra_dx; + private System.Windows.Forms.DataGridViewTextBoxColumn PLAN_DATE; + private System.Windows.Forms.DataGridViewTextBoxColumn REQUESTID; + private System.Windows.Forms.DataGridViewTextBoxColumn MATERIAL_CODE; + private System.Windows.Forms.DataGridViewTextBoxColumn MATERIAL_NAME; + private System.Windows.Forms.DataGridViewTextBoxColumn LINENO; + private System.Windows.Forms.DataGridViewTextBoxColumn MOULD_CODE; + private System.Windows.Forms.DataGridViewTextBoxColumn PID; + private System.Windows.Forms.DataGridViewTextBoxColumn clscanstate; + private System.Windows.Forms.DataGridViewTextBoxColumn STATE; + private System.Windows.Forms.DataGridViewTextBoxColumn PLAN_NO; } } \ No newline at end of file diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.resx b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.resx index 1f3dbcf..2213fff 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.resx +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.resx @@ -144,6 +144,9 @@ True + + True + True diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs index 5f62859..0fe9c93 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs @@ -702,6 +702,8 @@ namespace QMAPP.WinForm.Forms.TianJin else count = dgvPlan.Rows.Count; + List labels = new List(); + for (var i = 0; i < count; i++) { System.Threading.Thread.Sleep(1000); @@ -723,9 +725,7 @@ namespace QMAPP.WinForm.Forms.TianJin } toolStripButton1.Enabled = false; - - List labels = new List(); - + var data = DateTime.Now.ToString("yyyyMMddHHmmssfff"); data = data.Substring(2, data.Length - 2); @@ -763,25 +763,23 @@ namespace QMAPP.WinForm.Forms.TianJin labeldata.CarModel = material.PROJECTCODE; } labels.Add(labeldata); - - WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " 开始打印" + labeldata.OrderNo); - - PrintLabel(labels); - - WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " 开始变成打印状态" + labeldata.OrderNo); + //变更打印状态 0=>1 _agent.InvokeServiceFunction("WorkOrderBLL_SetOrderPrinted", orders[0].PID); - - WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " 开始插入记录" + labeldata.OrderNo); + InsertProduct(labeldata.OrderNo, orders[0].MATERIAL_CODE, comboBox1.SelectedValue.ToString()); if (orders[0].MATERIAL_NAME.Contains("前")) FR = "后"; else if (orders[0].MATERIAL_NAME.Contains("后")) FR = "前"; - WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " 插入结束" + labeldata.OrderNo); } + PrintLabel(labels); + BindPlanView(); + + labels = new List(); + toolStripButton1.Enabled = true; } diff --git a/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs b/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs index 1dd7a4c..928508f 100644 --- a/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs +++ b/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值， // 方法是按如下所示使用“*”: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2024.05.16.01")] -[assembly: AssemblyFileVersion("2024.05.16.01")] +[assembly: AssemblyVersion("2024.07.05.01")] +[assembly: AssemblyFileVersion("2024.07.05.01")] diff --git a/ServicesCenter/Task/QMTask.Host/App.config b/ServicesCenter/Task/QMTask.Host/App.config index 0a79fb4..f77d18c 100644 --- a/ServicesCenter/Task/QMTask.Host/App.config +++ b/ServicesCenter/Task/QMTask.Host/App.config @@ -6,10 +6,16 @@ - + + + + + + + + diff --git a/ServicesCenter/Task/QMTask.Host/PlanConfig.xml b/ServicesCenter/Task/QMTask.Host/PlanConfig.xml index b0d0f95..06896ae 100644 --- a/ServicesCenter/Task/QMTask.Host/PlanConfig.xml +++ b/ServicesCenter/Task/QMTask.Host/PlanConfig.xml @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/ServicesCenter/Task/QMTask.Host/QMTask.Host.csproj b/ServicesCenter/Task/QMTask.Host/QMTask.Host.csproj index c977819..af8c715 100644 --- a/ServicesCenter/Task/QMTask.Host/QMTask.Host.csproj +++ b/ServicesCenter/Task/QMTask.Host/QMTask.Host.csproj @@ -18,6 +18,21 @@ Svn Svn SubversionScc + false + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + true x86 @@ -125,6 +140,13 @@ Designer + + + False + .NET Framework 3.5 SP1 + false + + - + - - + \ No newline at end of file diff --git a/ServicesCenter/Task/QMTask.WindowService/QMTask.WindowService.csproj b/ServicesCenter/Task/QMTask.WindowService/QMTask.WindowService.csproj index eb444a7..370f7b3 100644 --- a/ServicesCenter/Task/QMTask.WindowService/QMTask.WindowService.csproj +++ b/ServicesCenter/Task/QMTask.WindowService/QMTask.WindowService.csproj @@ -18,6 +18,21 @@ Svn Svn SubversionScc + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true x86 @@ -116,6 +131,13 @@ + + + False + .NET Framework 3.5 SP1 + false + + + + --> + + + + + + +