diff --git a/APP/QMAPP.Web/App_Data/Menu.xml b/APP/QMAPP.Web/App_Data/Menu.xml index d58fbb7..775d271 100644 --- a/APP/QMAPP.Web/App_Data/Menu.xml +++ b/APP/QMAPP.Web/App_Data/Menu.xml @@ -442,6 +442,12 @@ 导出 + + + 查询 + 导出 + + - + - + diff --git a/APPQ5/QMAPP.FJC.BLL/Operation/SignInfoBLL.cs b/APPQ5/QMAPP.FJC.BLL/Operation/SignInfoBLL.cs index 14f76da..7bb024d 100644 --- a/APPQ5/QMAPP.FJC.BLL/Operation/SignInfoBLL.cs +++ b/APPQ5/QMAPP.FJC.BLL/Operation/SignInfoBLL.cs @@ -109,6 +109,29 @@ namespace QMAPP.FJC.BLL.Operation } } + /// + /// 获取列表 + /// + /// 条件 + /// 全部集合 + public SignInfo GetAllListByLoc(string Loc) + { + try + { + //获取信息列表 + return new SignInfoDAL().GetALLByLoc(Loc); + } + catch (Exception ex) + { + LogManager.LogHelper.Error(new LogInfo() + { + ErrorInfo = ex, + Tag = ex.StackTrace, + Info = "获取列表异常!" + }); + throw ex; + } + } #endregion diff --git a/APPQ5/QMAPP.FJC.DAL/Operation/SignInfoDAL.cs b/APPQ5/QMAPP.FJC.DAL/Operation/SignInfoDAL.cs index e2c53d8..41013bc 100644 --- a/APPQ5/QMAPP.FJC.DAL/Operation/SignInfoDAL.cs +++ b/APPQ5/QMAPP.FJC.DAL/Operation/SignInfoDAL.cs @@ -86,7 +86,7 @@ namespace QMAPP.FJC.DAL.Operation //分页关键字段及排序 page.KeyName = "PID"; if (string.IsNullOrEmpty(page.SortExpression)) - page.SortExpression = "UPDATEDATE DESC"; + page.SortExpression = "CREATEDATE DESC"; using (IDataSession session = AppDataFactory.CreateMainSession()) { page = session.GetDataPage(sql, parameters.ToArray(), page); @@ -125,6 +125,37 @@ namespace QMAPP.FJC.DAL.Operation throw ex; } } + + /// + /// 获取列表 + /// + /// 条件 + /// 数据页 + /// 数据页 + public SignInfo GetALLByLoc(string Loc) + { + string sql = null; + List parameters = new List(); + try + { + sql = $"SELECT * FROM T_AW_SignInfo WHERE WorkLoc = '{Loc}' order by CREATEDATE desc"; + //分页关键字段及排序 + var LIST = new List(); + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + LIST = session.GetList(sql, parameters.ToArray()).ToList(); + } + if (LIST.Count > 0) + return LIST[0]; + else + return new SignInfo(); + } + catch (Exception ex) + { + throw ex; + } + } + #endregion #region 获取查询语句 @@ -142,29 +173,47 @@ namespace QMAPP.FJC.DAL.Operation { //构成查询语句 - sqlBuilder.Append("SELECT PID,ProductCode,Type,WorkLoc,CREATEUSER,CREATEDATE "); - sqlBuilder.Append("FROM T_AW_SignInfo "); + sqlBuilder.Append("SELECT I.PID,I.ProductCode,I.Type,I.WorkLoc,L.WORKLOC_NAME AS 'WorkLocName',I.CREATEUSER,u.USERNAME as 'CREATEUSERNAME',I.CREATEDATE,I.SIGNDATE "); + sqlBuilder.Append("FROM T_AW_SignInfo as I LEFT JOIN T_QM_USER AS U ON I.CREATEUSER = U.USERID LEFT JOIN T_MD_WORKLOC AS L ON I.WorkLoc = L.WORKLOC_CODE "); if (string.IsNullOrEmpty(condition.ProductCode) == false) { - whereBuilder.Append(" AND ProductCode = @ProductCode"); + whereBuilder.Append(" AND I.ProductCode = @ProductCode"); parameters.Add(new DataParameter { ParameterName = "ProductCode", DataType = DbType.String, Value = condition.ProductCode }); } - if (string.IsNullOrEmpty(condition.Type) == false) + if (string.IsNullOrEmpty(condition.Type) == false && condition.Type == "停工复工") { - whereBuilder.Append(" AND Type = @Type"); + whereBuilder.Append(" AND I.Type in ('停工','复工')"); parameters.Add(new DataParameter { ParameterName = "Type", DataType = DbType.String, Value = condition.Type }); + + if (condition.BeginTime != DateTime.MinValue.ToString()) + { + whereBuilder.Append(" AND I.SIGNDATE >= @BeginTime"); + parameters.Add(new DataParameter { ParameterName = "BeginTime", DataType = DbType.String, Value = condition.BeginTime }); + } + if (condition.EndTime != DateTime.MinValue.ToString()) + { + whereBuilder.Append(" AND I.SIGNDATE <= @EndTime"); + parameters.Add(new DataParameter { ParameterName = "EndTime", DataType = DbType.String, Value = condition.EndTime }); + } } - if (condition.BeginTime != DateTime.MinValue.ToString()) - { - whereBuilder.Append(" AND CREATEDATE >= @BeginTime"); - parameters.Add(new DataParameter { ParameterName = "BeginTime", DataType = DbType.String, Value = condition.BeginTime }); - } - if (condition.EndTime != DateTime.MinValue.ToString()) + else if(string.IsNullOrEmpty(condition.Type) == false && condition.Type != "停工复工") { - whereBuilder.Append(" AND CREATEDATE <= @EndTime"); - parameters.Add(new DataParameter { ParameterName = "EndTime", DataType = DbType.String, Value = condition.EndTime }); + whereBuilder.Append(" AND I.Type = @Type"); + parameters.Add(new DataParameter { ParameterName = "Type", DataType = DbType.String, Value = condition.Type }); + + if (condition.BeginTime != DateTime.MinValue.ToString()) + { + whereBuilder.Append(" AND I.CREATEDATE >= @BeginTime"); + parameters.Add(new DataParameter { ParameterName = "BeginTime", DataType = DbType.String, Value = condition.BeginTime }); + } + if (condition.EndTime != DateTime.MinValue.ToString()) + { + whereBuilder.Append(" AND I.CREATEDATE <= @EndTime"); + parameters.Add(new DataParameter { ParameterName = "EndTime", DataType = DbType.String, Value = condition.EndTime }); + } } + //查询条件 if (whereBuilder.Length > 0) diff --git a/APPQ5/QMAPP.FJC.Entity/Operation/SignInfo.cs b/APPQ5/QMAPP.FJC.Entity/Operation/SignInfo.cs index 399d9f2..564af08 100644 --- a/APPQ5/QMAPP.FJC.Entity/Operation/SignInfo.cs +++ b/APPQ5/QMAPP.FJC.Entity/Operation/SignInfo.cs @@ -38,12 +38,14 @@ namespace QMAPP.FJC.Entity.Operation /// [DBColumn(ColumnName = "WorkLoc", DataType = DbType.String)] public string WorkLoc { get; set; } + public string WorkLocName { get; set; } /// ///标记用户 /// [DBColumn(ColumnName = "CREATEUSER", DataType = DbType.String)] public string CREATEUSER { get; set; } + public string CREATEUSERNAME { get; set; } /// ///标记时间 @@ -53,5 +55,10 @@ namespace QMAPP.FJC.Entity.Operation public string BeginTime { get; set; } public string EndTime { get; set; } + /// + ///停工、复工时间 + /// + [DBColumn(ColumnName = "SIGNDATE", DataType = DbType.DateTime2)] + public string SIGNDATE { get; set; } } } diff --git a/APPQ5/QMAPP.FJC.Web/Content/Xml/Dictionary.xml b/APPQ5/QMAPP.FJC.Web/Content/Xml/Dictionary.xml index f01d0d6..7001eda 100644 --- a/APPQ5/QMAPP.FJC.Web/Content/Xml/Dictionary.xml +++ b/APPQ5/QMAPP.FJC.Web/Content/Xml/Dictionary.xml @@ -187,6 +187,12 @@ + + + + + + diff --git a/APPQ5/QMAPP.FJC.Web/Controllers/SignInfoController.cs b/APPQ5/QMAPP.FJC.Web/Controllers/SignInfoController.cs new file mode 100644 index 0000000..94ac83f --- /dev/null +++ b/APPQ5/QMAPP.FJC.Web/Controllers/SignInfoController.cs @@ -0,0 +1,226 @@ +using System; +using System.Collections.Generic; +using System.Web.Mvc; +using QMAPP.Common.Web.Controllers; +using QMFrameWork.WebUI.Attribute; +using QMFrameWork.Data; +using QMAPP.ServicesAgent; +using QMFrameWork.WebUI.DataSource; +using QMFrameWork.Common.Serialization; +using QMAPP.Entity; +using QMAPP.FJC.Web.Models.Operation; +using QMAPP.FJC.Entity.Operation; + +namespace QMAPP.FJC.Web.Controllers +{ + /// + /// 模块名称：标记信息--佛山VW276 + /// 作 者：张松男 + /// 编写日期：2022年05月23日 + /// + public class SignInfoController : QController + { + #region 获取列表 + /// + /// 加载列表 + /// + /// 结果 + [HandleException] + public ActionResult List(bool? callBack) + { + SignInfoModel seachModel = new SignInfoModel(); + if (callBack == true) + TryGetSelectBuffer(out seachModel); + seachModel.rownumbers = false; + seachModel.url = "/SignInfo/GetList"; + seachModel.EndTime = DateTime.Now.AddDays(+1).ToString("yyyy-MM-dd"); + seachModel.BeginTime = DateTime.Now.AddDays(-5).ToString("yyyy-MM-dd"); + + return View("SignInfoList", seachModel); + } + /// + /// 获取列表 + /// + /// 是否回调 + /// 列表 + [HandleException] + public ActionResult GetList(bool? callBack) + { + SignInfoModel seachModel = null; + DataPage page = null; + ServiceAgent wcfAgent = this.GetServiceAgent(); + SignInfo condition = null; + DataResult pageResult = new DataResult(); + + try + { + //获取查询对象 + seachModel = GetModel(); + #region 获取缓存值 + if (callBack != null) + { + TryGetSelectBuffer(out seachModel); + } + else + { + //保存搜索条件 + SetSelectBuffer(seachModel); + } + #endregion + //获取前台分页设置信息 + page = this.GetDataPage(seachModel); + condition = CopyToModel(seachModel); + #region wcf服务统一接口 + pageResult = wcfAgent.InvokeServiceFunction>("SignInfoBLL_GetList", condition, page); + if (pageResult.IsSuccess == false) + { + SetMessage(pageResult.Msg); + return List(true); + } + DateGridResult result = new DateGridResult(); + result.Total = pageResult.Result.RecordCount; + result.Rows = JsonConvertHelper.GetDeserialize>(pageResult.Result.Result.ToString()); + #endregion + + string tempstr = ""; + tempstr = result.GetJsonSource(); + return Content(tempstr); + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + #region 编辑 + /// + /// 编辑载入 + /// + /// 处理结果 + [HandleException] + public ActionResult Edit() + { + SignInfoModel model = new SignInfoModel(); + string ID = Request.Params["PID"]; + SignInfo Entity = new SignInfo(); + ServiceAgent wcfAgent = this.GetServiceAgent(); + DataResult result = new DataResult(); + try + { + if (string.IsNullOrEmpty(ID) == false) + { + //修改获取原数据 + Entity.PID = ID; + result = wcfAgent.InvokeServiceFunction>(QMAPP.ServicesAgent.B9IPCService.SignInfoBLL_Get.ToString(), Entity); + if (result.IsSuccess == false) + { + SetMessage(result.Msg); + return View("SignInfoEdit", model); + } + model = CopyToModel(result.Result); + //根据工位信息获得工序信息 + + + //string kind = model.WORKLOC_CODE; + //var WORKCELL_CODE = ""; + //ServiceAgent wcfAgent1 = this.GetServiceAgent(); + //if (string.IsNullOrEmpty(kind) == false) + //{ + // var dataResult = wcfAgent1.InvokeServiceFunction> + // ("WorkLocBLL_GetWorkCellFromWorkLocList", new WorkLoc(), kind); + // foreach (WorkLoc item in dataResult) + // { + // WORKCELL_CODE = item.WORKCELL_CODE; + // } + //} + //model.WORKCELL_CODE = WORKCELL_CODE; + + } + return View("SignInfoEdit", model); + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + #region 保存 + /// + /// 保存 + /// + /// + /// 处理结果 + [HttpPost] + [HandleException] + [ValidateInput(false)] + public ActionResult Save(SignInfoModel saveModel) + { + SignInfo Entity = null; + ServiceAgent wcfAgent = this.GetServiceAgent(); + DataResult result = new DataResult(); + try + { + Entity = CopyToModel(saveModel); + if (string.IsNullOrEmpty(Entity.PID) == true) + { + //新增 + result = wcfAgent.InvokeServiceFunction>(QMAPP.ServicesAgent.B9IPCService.SignInfoBLL_Insert.ToString(), Entity); + } + else + { + //修改 + result = wcfAgent.InvokeServiceFunction>(QMAPP.ServicesAgent.B9IPCService.SignInfoBLL_Update.ToString(), Entity); + } + if (result.IsSuccess == false) + { + SetMessage(result.Msg); + return View("SignInfoEdit", saveModel); + } + return this.GetJsViewResult(string.Format("parent.List(1);parent.showTitle('{0}');parent.closeAppWindow1();", AppResource.SaveMessge)); + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + #region 删除 + /// + /// 删除 + /// + /// 结果 + [HttpPost] + [HandleException] + public ActionResult Delete(SignInfoModel saveModel) + { + string selectKey = Request.Form["selectKey"]; + SignInfo Entity = null; + Entity = CopyToModel(saveModel); + Entity.PID = selectKey; + ServiceAgent wcfAgent = this.GetServiceAgent(); + DataResult result = new DataResult(); + try + { + result = wcfAgent.InvokeServiceFunction>("SignInfoBLL_Delete", selectKey); + if (result.IsSuccess == false) + { + SetMessage(result.Msg); + return List(true); + } + SetMessage(AppResource.DeleteMessage); + return List(true); + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + + + } +} diff --git a/APPQ5/QMAPP.FJC.Web/Models/Operation/SignInfoModel.cs b/APPQ5/QMAPP.FJC.Web/Models/Operation/SignInfoModel.cs new file mode 100644 index 0000000..1d2e8d2 --- /dev/null +++ b/APPQ5/QMAPP.FJC.Web/Models/Operation/SignInfoModel.cs @@ -0,0 +1,135 @@ +using System; +using System.Web.Mvc.Html; +using QMFrameWork.WebUI; +using QMFrameWork.WebUI.Attribute; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.Mvc; +using System.Web.Mvc.Html; +using QMAPP.Web; +using QMFrameWork.WebUI; +using QMFrameWork.WebUI.Attribute; +namespace QMAPP.FJC.Web.Models.Operation +{ + /// + /// 模块名称：标记信息--佛山VW276 + /// 作 者：张松男 + /// 编写日期：2022年05月23日 + /// + public class SignInfoModel : QDGModel + { + /// + /// + /// + [Description("")] + [HTMLInput(UpdateRead = false, required = true, MaxLength = 36)] + [InputType(inputType.text)] + [DGColumn(Hidden = true, PrimaryKey = true)] + public string PID { get; set; } + + + /// + /// 类别 + /// + [Description("类别")] + [HTMLInput(UpdateRead = false, required = true, JsonUtl = "/Dict/GetFixedComboxSource?kind=SignType", MaxLength = 2)] + [InputType(inputType.combotree)] + [DGColumn(frozenColumns = true, Sortable = true, Width = 100, DataAlign = DataAlign.center)] + public string Type { get; set; } + + + /// + /// 登记条码 + /// + [Description("登记条码")] + [HTMLInput(UpdateRead = false, required = true, MaxLength = 30)] + [InputType(inputType.text)] + [DGColumn(frozenColumns = true, Sortable = true, Width = 200, DataAlign = DataAlign.center)] + public string ProductCode { get; set; } + + + /// + /// 工位 + /// + [Description("工位")] + [HTMLInput(UpdateRead = false, required = true, MaxLength = 1)] + [InputType(inputType.text)] + [DGColumn(frozenColumns = true, Sortable = true, Width = 200, DataAlign = DataAlign.center,Hidden = true)] + public string WorkLoc { get; set; } + + + /// + /// 工位 + /// + [Description("工位")] + [HTMLInput(UpdateRead = false, required = true, MaxLength = 1)] + [InputType(inputType.text)] + [DGColumn(frozenColumns = true, Sortable = true, Width = 200, DataAlign = DataAlign.center)] + public string WorkLocName { get; set; } + + /// + /// 登记用户 + /// + [Description("登记用户")] + [HTMLInput(UpdateRead = false, required = true, MaxLength = 50)] + [InputType(inputType.text)] + [DGColumn(frozenColumns = false, Sortable = true, Width = 200, DataAlign = DataAlign.center, Hidden = true)] + public string CREATEUSER { get; set; } + + /// + /// 登记用户 + /// + [Description("登记用户")] + [HTMLInput(UpdateRead = false, required = true, MaxLength = 50)] + [InputType(inputType.text)] + [DGColumn(frozenColumns = false, Sortable = true, Width = 200, DataAlign = DataAlign.center)] + public string CREATEUSERNAME { get; set; } + + /// + /// 创建时间 + /// + [Description("创建时间")] + [HTMLInput(UpdateRead = false, required = true, MaxLength = 50)] + [InputType(inputType.text)] + [DGColumn(frozenColumns = false, Sortable = true, Width = 200, DataAlign = DataAlign.center)] + public string CREATEDATE { get; set; } + + /// + /// 开始时间 + /// + [Description("开始时间")] + [HTMLInput(UpdateRead = false, required = true, MaxLength = 50)] + [InputType(inputType.dateTimeBox)] + [DGColumn(frozenColumns = false, Sortable = true, Width = 200, DataAlign = DataAlign.center, Hidden = true)] + public string BeginTime { get; set; } + + /// + /// 结束时间 + /// + [Description("结束时间")] + [HTMLInput(UpdateRead = false, required = true, MaxLength = 50)] + [InputType(inputType.dateTimeBox)] + [DGColumn(frozenColumns = false, Sortable = true, Width = 200, DataAlign = DataAlign.center,Hidden = true)] + public string EndTime { get; set; } + + /// + /// 标记时间 + /// + [Description("标记时间")] + [HTMLInput(UpdateRead = false, required = true, MaxLength = 50)] + [InputType(inputType.text)] + [DGColumn(frozenColumns = false, Sortable = false, Width = 200, DataAlign = DataAlign.center)] + public string SIGNDATE { get; set; } + + + + } +} + + + + + + diff --git a/APPQ5/QMAPP.FJC.Web/QMAPP.FJC.Web.csproj b/APPQ5/QMAPP.FJC.Web/QMAPP.FJC.Web.csproj index e4cf3ab..afbfb5b 100644 --- a/APPQ5/QMAPP.FJC.Web/QMAPP.FJC.Web.csproj +++ b/APPQ5/QMAPP.FJC.Web/QMAPP.FJC.Web.csproj @@ -163,6 +163,7 @@ + @@ -332,6 +333,7 @@ + @@ -914,6 +916,8 @@ + + diff --git a/APPQ5/QMAPP.FJC.Web/Views/SignInfo/SignInfoEdit.aspx b/APPQ5/QMAPP.FJC.Web/Views/SignInfo/SignInfoEdit.aspx new file mode 100644 index 0000000..8687e12 --- /dev/null +++ b/APPQ5/QMAPP.FJC.Web/Views/SignInfo/SignInfoEdit.aspx @@ -0,0 +1,62 @@ +<%@ 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)%> + + + + +
+ + + + + + + + + + + +
+ <%=Html.QV(p=>p.BucketCode) %> + + <%=Html.QC(p => p.BucketCode)%> +
+ <%=Html.QV(p => p.BucketName)%> + + <%=Html.QC(p => p.BucketName)%> +
+
+ <%=Html.HiddenFor(p=>p.PID) %> + <%=Html.HiddenFor(p => p.IsCheck)%> + <%=Html.HiddenFor(p=>p.CREATEDATE) %> + <%=Html.HiddenFor(p=>p.CREATEUSER) %> + <%=Html.HiddenFor(p=>p.UPDATEDATE)%> + <%=Html.HiddenFor(p=>p.UPDATEUSER) %> + <%=Html.QPEnd() %> + + + + + + + +
+ <%=Html.QTButtonSave("User", "Save", "return Save();")%> + <%=Html.QTButtonBack("close", "BucketInfo", "parent.closeAppWindow1();return false;")%> +
+ + diff --git a/APPQ5/QMAPP.FJC.Web/Views/SignInfo/SignInfoList.aspx b/APPQ5/QMAPP.FJC.Web/Views/SignInfo/SignInfoList.aspx new file mode 100644 index 0000000..ecdc82d --- /dev/null +++ b/APPQ5/QMAPP.FJC.Web/Views/SignInfo/SignInfoList.aspx @@ -0,0 +1,90 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/AppMaster.Master" + Inherits="System.Web.Mvc.ViewPage" %> + + + 工厂信息列表 + + + + <%=Html.QPSeach(80,true) %> + + + + + + + + + + + +
+ <%=Html.QV(p => p.ProductCode)%> + + <%=Html.QC(p => p.ProductCode)%> + + <%=Html.QV(p => p.Type)%> + + <%=Html.QC(p => p.Type)%> + + <%=Html.QV(p => p.BeginTime)%> + + <%=Html.QC(p => p.BeginTime)%> + + <%=Html.QV(p => p.EndTime)%> + + <%=Html.QC(p => p.EndTime)%> +
+ <%=Html.QPEnd()%> + <%=Html.QPList() %> + <%=Html.QDateGrid(Model)%> + <%=Html.QPEnd() %> + <%=Html.Hidden("selectKey")%> + <%=Html.Hidden("PID")%> + + + + + + + + +
+ <%=Html.QTButtonSearch("SignInfo", "List", "List(1)", QMAPP.Common.Web.SystemLimit.isLimt)%> + <%-- <%=Html.QTButtonAdd("SignInfo", "Add", "Add()", QMAPP.Common.Web.SystemLimit.isLimt)%> + <%=Html.QTButtonUpdate("SignInfo", "Edit", "Update()", QMAPP.Common.Web.SystemLimit.isLimt)%> + <%=Html.QTButtonDelete("SignInfo", "Delete", "Delete()", QMAPP.Common.Web.SystemLimit.isLimt)%>--%> +
+ diff --git a/APPQ5/QMAPP.FJC.Web/Web.config b/APPQ5/QMAPP.FJC.Web/Web.config index 9fb9983..bd1d5f3 100644 --- a/APPQ5/QMAPP.FJC.Web/Web.config +++ b/APPQ5/QMAPP.FJC.Web/Web.config @@ -36,9 +36,9 @@ - + - + diff --git a/APPQ5/QMAPP.WinForm/App.config b/APPQ5/QMAPP.WinForm/App.config index 6ed6c4e..d245a22 100644 --- a/APPQ5/QMAPP.WinForm/App.config +++ b/APPQ5/QMAPP.WinForm/App.config @@ -10,7 +10,7 @@ - + diff --git a/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.Designer.cs b/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.Designer.cs index 54903c5..e94d177 100644 --- a/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.Designer.cs +++ b/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.Designer.cs @@ -29,37 +29,37 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle41 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle42 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle39 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle40 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OperationForm)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle43 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle51 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle52 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle44 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle45 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle46 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle47 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle48 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle49 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle50 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle53 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle60 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle54 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle55 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle56 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle57 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle58 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle59 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle(); this.panel2 = new System.Windows.Forms.Panel(); this.tBMat = new System.Windows.Forms.TextBox(); this.cBoxVAN = new System.Windows.Forms.CheckBox(); @@ -107,10 +107,11 @@ this.tsmiIgnoreFISBreak = new System.Windows.Forms.ToolStripMenuItem(); this.tsbAndon = new System.Windows.Forms.ToolStripButton(); this.tsbSearch = new System.Windows.Forms.ToolStripButton(); + this.btnSignInfo = new System.Windows.Forms.ToolStripButton(); this.btnEditProduct = new System.Windows.Forms.ToolStripButton(); this.btnRefresh = new System.Windows.Forms.ToolStripButton(); this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); - this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); this.panel4 = new System.Windows.Forms.Panel(); this.plInfo = new System.Windows.Forms.Panel(); this.gbMlist = new System.Windows.Forms.GroupBox(); @@ -162,7 +163,6 @@ this.PType = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.OPERATESTATE = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.timer1 = new System.Windows.Forms.Timer(this.components); - this.btnSignInfo = new System.Windows.Forms.ToolStripButton(); this.panel2.SuspendLayout(); this.panelSearch.SuspendLayout(); this.plDAI.SuspendLayout(); @@ -415,14 +415,14 @@ this.DGView.AllowUserToDeleteRows = false; this.DGView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells; this.DGView.BackgroundColor = System.Drawing.SystemColors.ButtonFace; - dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle31.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle31.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold); - dataGridViewCellStyle31.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle31.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle31.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle31.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.DGView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle31; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.DGView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; this.DGView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.DGView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dgcMouldCode, @@ -435,28 +435,28 @@ this.davalue, this.daresult, this.Pid}); - dataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle41.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle41.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle41.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle41.Padding = new System.Windows.Forms.Padding(0, 0, 14, 0); - dataGridViewCellStyle41.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle41.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle41.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.DGView.DefaultCellStyle = dataGridViewCellStyle41; + dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle11.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle11.Padding = new System.Windows.Forms.Padding(0, 0, 14, 0); + dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.DGView.DefaultCellStyle = dataGridViewCellStyle11; this.DGView.Dock = System.Windows.Forms.DockStyle.Fill; this.DGView.GridColor = System.Drawing.SystemColors.ControlDarkDark; this.DGView.Location = new System.Drawing.Point(0, 0); this.DGView.Name = "DGView"; this.DGView.ReadOnly = true; - dataGridViewCellStyle42.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle42.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle42.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle42.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle42.SelectionBackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle42.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle42.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.DGView.RowHeadersDefaultCellStyle = dataGridViewCellStyle42; + dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle12.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.DGView.RowHeadersDefaultCellStyle = dataGridViewCellStyle12; this.DGView.RowTemplate.Height = 30; this.DGView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.DGView.Size = new System.Drawing.Size(1698, 127); @@ -467,9 +467,9 @@ // dgcMouldCode // this.dgcMouldCode.DataPropertyName = "MouldCode"; - dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle32.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold); - this.dgcMouldCode.DefaultCellStyle = dataGridViewCellStyle32; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold); + this.dgcMouldCode.DefaultCellStyle = dataGridViewCellStyle2; this.dgcMouldCode.HeaderText = "模架编号"; this.dgcMouldCode.Name = "dgcMouldCode"; this.dgcMouldCode.ReadOnly = true; @@ -479,8 +479,8 @@ // dgcMouldName // this.dgcMouldName.DataPropertyName = "MouldName"; - dataGridViewCellStyle33.Font = new System.Drawing.Font("微软雅黑", 15.25F, System.Drawing.FontStyle.Bold); - this.dgcMouldName.DefaultCellStyle = dataGridViewCellStyle33; + dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 15.25F, System.Drawing.FontStyle.Bold); + this.dgcMouldName.DefaultCellStyle = dataGridViewCellStyle3; this.dgcMouldName.HeaderText = "模架"; this.dgcMouldName.Name = "dgcMouldName"; this.dgcMouldName.ReadOnly = true; @@ -489,8 +489,8 @@ // daname // this.daname.DataPropertyName = "DAName"; - dataGridViewCellStyle34.Font = new System.Drawing.Font("宋体", 15.75F); - this.daname.DefaultCellStyle = dataGridViewCellStyle34; + dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 15.75F); + this.daname.DefaultCellStyle = dataGridViewCellStyle4; this.daname.HeaderText = "采集项名称"; this.daname.Name = "daname"; this.daname.ReadOnly = true; @@ -499,8 +499,8 @@ // statename // this.statename.DataPropertyName = "StateName"; - dataGridViewCellStyle35.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.statename.DefaultCellStyle = dataGridViewCellStyle35; + dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.statename.DefaultCellStyle = dataGridViewCellStyle5; this.statename.HeaderText = "采集时序"; this.statename.Name = "statename"; this.statename.ReadOnly = true; @@ -510,8 +510,8 @@ // datype // this.datype.DataPropertyName = "DAType"; - dataGridViewCellStyle36.Font = new System.Drawing.Font("宋体", 15.75F); - this.datype.DefaultCellStyle = dataGridViewCellStyle36; + dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 15.75F); + this.datype.DefaultCellStyle = dataGridViewCellStyle6; this.datype.HeaderText = "数据类型"; this.datype.Name = "datype"; this.datype.ReadOnly = true; @@ -521,8 +521,8 @@ // this.materialtypename.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; this.materialtypename.DataPropertyName = "MaterialCode"; - dataGridViewCellStyle37.Font = new System.Drawing.Font("宋体", 15.75F); - this.materialtypename.DefaultCellStyle = dataGridViewCellStyle37; + dataGridViewCellStyle7.Font = new System.Drawing.Font("宋体", 15.75F); + this.materialtypename.DefaultCellStyle = dataGridViewCellStyle7; this.materialtypename.FillWeight = 50F; this.materialtypename.HeaderText = "物料类型"; this.materialtypename.Name = "materialtypename"; @@ -532,8 +532,8 @@ // this.dgcDAMaterialCode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; this.dgcDAMaterialCode.DataPropertyName = "MaterialName"; - dataGridViewCellStyle38.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.dgcDAMaterialCode.DefaultCellStyle = dataGridViewCellStyle38; + dataGridViewCellStyle8.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.dgcDAMaterialCode.DefaultCellStyle = dataGridViewCellStyle8; this.dgcDAMaterialCode.FillWeight = 50F; this.dgcDAMaterialCode.HeaderText = "物料名称"; this.dgcDAMaterialCode.Name = "dgcDAMaterialCode"; @@ -543,8 +543,8 @@ // this.davalue.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; this.davalue.DataPropertyName = "DAValue"; - dataGridViewCellStyle39.Font = new System.Drawing.Font("宋体", 15.75F); - this.davalue.DefaultCellStyle = dataGridViewCellStyle39; + dataGridViewCellStyle9.Font = new System.Drawing.Font("宋体", 15.75F); + this.davalue.DefaultCellStyle = dataGridViewCellStyle9; this.davalue.HeaderText = "采集值"; this.davalue.Name = "davalue"; this.davalue.ReadOnly = true; @@ -552,8 +552,8 @@ // daresult // this.daresult.DataPropertyName = "DAResult"; - dataGridViewCellStyle40.Font = new System.Drawing.Font("宋体", 15.75F); - this.daresult.DefaultCellStyle = dataGridViewCellStyle40; + dataGridViewCellStyle10.Font = new System.Drawing.Font("宋体", 15.75F); + this.daresult.DefaultCellStyle = dataGridViewCellStyle10; this.daresult.HeaderText = "结果"; this.daresult.Name = "daresult"; this.daresult.ReadOnly = true; @@ -588,7 +588,7 @@ this.btnEditProduct, this.btnRefresh, this.toolStripButton1, - this.toolStripButton3}); + this.toolStripButton4}); this.toolStrip1.Location = new System.Drawing.Point(0, 380); this.toolStrip1.Name = "toolStrip1"; this.toolStrip1.Size = new System.Drawing.Size(1698, 70); @@ -768,6 +768,17 @@ this.tsbSearch.Text = "查询"; this.tsbSearch.Click += new System.EventHandler(this.tsbSearch_Click); // + // btnSignInfo + // + this.btnSignInfo.Font = new System.Drawing.Font("微软雅黑", 12F); + this.btnSignInfo.Image = global::QMAPP.WinForm.Resource1.edit; + this.btnSignInfo.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.btnSignInfo.ImageTransparentColor = System.Drawing.Color.White; + this.btnSignInfo.Name = "btnSignInfo"; + this.btnSignInfo.Size = new System.Drawing.Size(126, 67); + this.btnSignInfo.Text = "登记信息"; + this.btnSignInfo.Click += new System.EventHandler(this.btnSignInfo_Click); + // // btnEditProduct // this.btnEditProduct.Font = new System.Drawing.Font("微软雅黑", 12F); @@ -801,17 +812,16 @@ this.toolStripButton1.Text = "缺陷统计卡"; this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); // - // toolStripButton3 + // toolStripButton4 // - this.toolStripButton3.AutoSize = false; - this.toolStripButton3.Font = new System.Drawing.Font("微软雅黑", 12F); - this.toolStripButton3.Image = global::QMAPP.WinForm.Resource1.print1; - this.toolStripButton3.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; - this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.White; - this.toolStripButton3.Name = "toolStripButton3"; - this.toolStripButton3.Size = new System.Drawing.Size(140, 60); - this.toolStripButton3.Text = "补打总成码"; - this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click); + this.toolStripButton4.AutoSize = false; + this.toolStripButton4.Font = new System.Drawing.Font("微软雅黑", 12F); + this.toolStripButton4.Image = global::QMAPP.WinForm.Resource1.print1; + this.toolStripButton4.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.White; + this.toolStripButton4.Name = "toolStripButton4"; + this.toolStripButton4.Size = new System.Drawing.Size(140, 60); + this.toolStripButton4.Text = "补打总成码"; // // panel4 // @@ -1032,14 +1042,14 @@ this.dgvPlan.AllowUserToDeleteRows = false; this.dgvPlan.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells; this.dgvPlan.BackgroundColor = System.Drawing.SystemColors.ButtonFace; - dataGridViewCellStyle43.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle43.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle43.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle43.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle43.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle43.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle43.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvPlan.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle43; + dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle13.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvPlan.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle13; this.dgvPlan.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvPlan.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dgcOrderNo, @@ -1057,16 +1067,16 @@ this.dgvPlan.Location = new System.Drawing.Point(0, 0); this.dgvPlan.Name = "dgvPlan"; this.dgvPlan.ReadOnly = true; - dataGridViewCellStyle51.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle51.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle51.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle51.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle51.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle51.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle51.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvPlan.RowHeadersDefaultCellStyle = dataGridViewCellStyle51; - dataGridViewCellStyle52.Padding = new System.Windows.Forms.Padding(0, 0, 8, 0); - this.dgvPlan.RowsDefaultCellStyle = dataGridViewCellStyle52; + dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle21.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvPlan.RowHeadersDefaultCellStyle = dataGridViewCellStyle21; + dataGridViewCellStyle22.Padding = new System.Windows.Forms.Padding(0, 0, 8, 0); + this.dgvPlan.RowsDefaultCellStyle = dataGridViewCellStyle22; this.dgvPlan.RowTemplate.Height = 23; this.dgvPlan.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.dgvPlan.Size = new System.Drawing.Size(1525, 27); @@ -1077,8 +1087,8 @@ // dgcOrderNo // this.dgcOrderNo.DataPropertyName = "ORDERPLAN_NO"; - dataGridViewCellStyle44.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.dgcOrderNo.DefaultCellStyle = dataGridViewCellStyle44; + dataGridViewCellStyle14.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.dgcOrderNo.DefaultCellStyle = dataGridViewCellStyle14; this.dgcOrderNo.HeaderText = "订单号"; this.dgcOrderNo.Name = "dgcOrderNo"; this.dgcOrderNo.ReadOnly = true; @@ -1087,8 +1097,8 @@ // dgcSeq // this.dgcSeq.DataPropertyName = "SEQ"; - dataGridViewCellStyle45.Font = new System.Drawing.Font("宋体", 15.75F); - this.dgcSeq.DefaultCellStyle = dataGridViewCellStyle45; + dataGridViewCellStyle15.Font = new System.Drawing.Font("宋体", 15.75F); + this.dgcSeq.DefaultCellStyle = dataGridViewCellStyle15; this.dgcSeq.HeaderText = "顺序号"; this.dgcSeq.Name = "dgcSeq"; this.dgcSeq.ReadOnly = true; @@ -1097,8 +1107,8 @@ // dgcMaterialCode // this.dgcMaterialCode.DataPropertyName = "MATERIAL_CODE"; - dataGridViewCellStyle46.Font = new System.Drawing.Font("宋体", 15.75F); - this.dgcMaterialCode.DefaultCellStyle = dataGridViewCellStyle46; + dataGridViewCellStyle16.Font = new System.Drawing.Font("宋体", 15.75F); + this.dgcMaterialCode.DefaultCellStyle = dataGridViewCellStyle16; this.dgcMaterialCode.HeaderText = "零件号"; this.dgcMaterialCode.Name = "dgcMaterialCode"; this.dgcMaterialCode.ReadOnly = true; @@ -1107,8 +1117,8 @@ // dgcMaterialName // this.dgcMaterialName.DataPropertyName = "MATERIAL_NAME"; - dataGridViewCellStyle47.Font = new System.Drawing.Font("宋体", 15.75F); - this.dgcMaterialName.DefaultCellStyle = dataGridViewCellStyle47; + dataGridViewCellStyle17.Font = new System.Drawing.Font("宋体", 15.75F); + this.dgcMaterialName.DefaultCellStyle = dataGridViewCellStyle17; this.dgcMaterialName.HeaderText = "零件描述"; this.dgcMaterialName.Name = "dgcMaterialName"; this.dgcMaterialName.ReadOnly = true; @@ -1116,8 +1126,8 @@ // // dgcState // - dataGridViewCellStyle48.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.dgcState.DefaultCellStyle = dataGridViewCellStyle48; + dataGridViewCellStyle18.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.dgcState.DefaultCellStyle = dataGridViewCellStyle18; this.dgcState.HeaderText = "工单状态"; this.dgcState.MinimumWidth = 80; this.dgcState.Name = "dgcState"; @@ -1127,8 +1137,8 @@ // dgcPlanDate // this.dgcPlanDate.DataPropertyName = "PLAN_DATE"; - dataGridViewCellStyle49.Font = new System.Drawing.Font("宋体", 15.75F); - this.dgcPlanDate.DefaultCellStyle = dataGridViewCellStyle49; + dataGridViewCellStyle19.Font = new System.Drawing.Font("宋体", 15.75F); + this.dgcPlanDate.DefaultCellStyle = dataGridViewCellStyle19; this.dgcPlanDate.HeaderText = "计划日期"; this.dgcPlanDate.Name = "dgcPlanDate"; this.dgcPlanDate.ReadOnly = true; @@ -1137,8 +1147,8 @@ // dgcShift // this.dgcShift.DataPropertyName = "SHIFT_CODE"; - dataGridViewCellStyle50.Font = new System.Drawing.Font("宋体", 15.75F); - this.dgcShift.DefaultCellStyle = dataGridViewCellStyle50; + dataGridViewCellStyle20.Font = new System.Drawing.Font("宋体", 15.75F); + this.dgcShift.DefaultCellStyle = dataGridViewCellStyle20; this.dgcShift.HeaderText = "班次"; this.dgcShift.Name = "dgcShift"; this.dgcShift.ReadOnly = true; @@ -1312,14 +1322,14 @@ this.DGViewProList.AllowUserToDeleteRows = false; this.DGViewProList.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.DGViewProList.BackgroundColor = System.Drawing.SystemColors.ButtonFace; - dataGridViewCellStyle53.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle53.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle53.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle53.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle53.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle53.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle53.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.DGViewProList.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle53; + dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle23.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle23.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle23.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle23.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle23.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.DGViewProList.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle23; this.DGViewProList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.DGViewProList.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.PRODUCTCODE, @@ -1336,14 +1346,14 @@ this.DGViewProList.Location = new System.Drawing.Point(0, 0); this.DGViewProList.Name = "DGViewProList"; this.DGViewProList.ReadOnly = true; - dataGridViewCellStyle60.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle60.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle60.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle60.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle60.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle60.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle60.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.DGViewProList.RowHeadersDefaultCellStyle = dataGridViewCellStyle60; + dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle30.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle30.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle30.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle30.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle30.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle30.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.DGViewProList.RowHeadersDefaultCellStyle = dataGridViewCellStyle30; this.DGViewProList.RowTemplate.Height = 23; this.DGViewProList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.DGViewProList.Size = new System.Drawing.Size(1690, 27); @@ -1354,8 +1364,8 @@ // this.PRODUCTCODE.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.PRODUCTCODE.DataPropertyName = "PRODUCTCODE"; - dataGridViewCellStyle54.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.PRODUCTCODE.DefaultCellStyle = dataGridViewCellStyle54; + dataGridViewCellStyle24.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.PRODUCTCODE.DefaultCellStyle = dataGridViewCellStyle24; this.PRODUCTCODE.FillWeight = 29.82234F; this.PRODUCTCODE.HeaderText = "条码"; this.PRODUCTCODE.Name = "PRODUCTCODE"; @@ -1366,8 +1376,8 @@ // this.PRODUCTCODESTR.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.PRODUCTCODESTR.DataPropertyName = "PRODUCTCODESTR"; - dataGridViewCellStyle55.Font = new System.Drawing.Font("宋体", 15.75F); - this.PRODUCTCODESTR.DefaultCellStyle = dataGridViewCellStyle55; + dataGridViewCellStyle25.Font = new System.Drawing.Font("宋体", 15.75F); + this.PRODUCTCODESTR.DefaultCellStyle = dataGridViewCellStyle25; this.PRODUCTCODESTR.HeaderText = "骨架条码"; this.PRODUCTCODESTR.Name = "PRODUCTCODESTR"; this.PRODUCTCODESTR.ReadOnly = true; @@ -1378,8 +1388,8 @@ // this.MOLDNUMBER.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.MOLDNUMBER.DataPropertyName = "MOLDNUMBER"; - dataGridViewCellStyle56.Font = new System.Drawing.Font("宋体", 15.75F); - this.MOLDNUMBER.DefaultCellStyle = dataGridViewCellStyle56; + dataGridViewCellStyle26.Font = new System.Drawing.Font("宋体", 15.75F); + this.MOLDNUMBER.DefaultCellStyle = dataGridViewCellStyle26; this.MOLDNUMBER.FillWeight = 380.7106F; this.MOLDNUMBER.HeaderText = "模架号"; this.MOLDNUMBER.Name = "MOLDNUMBER"; @@ -1390,8 +1400,8 @@ // this.dataGridViewTextBoxColumn2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.dataGridViewTextBoxColumn2.DataPropertyName = "OPERATESTATETEXT"; - dataGridViewCellStyle57.Font = new System.Drawing.Font("宋体", 15.75F); - this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle57; + dataGridViewCellStyle27.Font = new System.Drawing.Font("宋体", 15.75F); + this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle27; this.dataGridViewTextBoxColumn2.FillWeight = 29.82234F; this.dataGridViewTextBoxColumn2.HeaderText = "加工状态"; this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; @@ -1402,8 +1412,8 @@ // this.Column5.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.Column5.DataPropertyName = "CREATEDATE"; - dataGridViewCellStyle58.Font = new System.Drawing.Font("宋体", 15.75F); - this.Column5.DefaultCellStyle = dataGridViewCellStyle58; + dataGridViewCellStyle28.Font = new System.Drawing.Font("宋体", 15.75F); + this.Column5.DefaultCellStyle = dataGridViewCellStyle28; this.Column5.FillWeight = 29.82234F; this.Column5.HeaderText = "加工时间"; this.Column5.Name = "Column5"; @@ -1414,8 +1424,8 @@ // this.OPERATEDDATE.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.OPERATEDDATE.DataPropertyName = "OPERATEDDATE"; - dataGridViewCellStyle59.Font = new System.Drawing.Font("宋体", 15.75F); - this.OPERATEDDATE.DefaultCellStyle = dataGridViewCellStyle59; + dataGridViewCellStyle29.Font = new System.Drawing.Font("宋体", 15.75F); + this.OPERATEDDATE.DefaultCellStyle = dataGridViewCellStyle29; this.OPERATEDDATE.FillWeight = 29.82234F; this.OPERATEDDATE.HeaderText = "加工完成时间"; this.OPERATEDDATE.Name = "OPERATEDDATE"; @@ -1460,17 +1470,6 @@ this.timer1.Interval = 1000; this.timer1.Tick += new System.EventHandler(this.timer1_Tick); // - // btnSignInfo - // - this.btnSignInfo.Font = new System.Drawing.Font("微软雅黑", 12F); - this.btnSignInfo.Image = global::QMAPP.WinForm.Resource1.edit; - this.btnSignInfo.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; - this.btnSignInfo.ImageTransparentColor = System.Drawing.Color.White; - this.btnSignInfo.Name = "btnSignInfo"; - this.btnSignInfo.Size = new System.Drawing.Size(126, 67); - this.btnSignInfo.Text = "标记信息"; - this.btnSignInfo.Click += new System.EventHandler(this.btnSignInfo_Click); - // // OperationForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -1613,10 +1612,9 @@ private System.Windows.Forms.DataGridViewTextBoxColumn daresult; private System.Windows.Forms.DataGridViewTextBoxColumn Pid; private System.Windows.Forms.ToolStripMenuItem tsmiIgnoreFISBreak; - - private System.Windows.Forms.ToolStripButton toolStripButton3; private System.Windows.Forms.CheckBox cBoxVAN; private System.Windows.Forms.TextBox tBMat; private System.Windows.Forms.ToolStripButton btnSignInfo; + private System.Windows.Forms.ToolStripButton toolStripButton4; } } \ No newline at end of file diff --git a/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs b/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs index f389a86..eb0eb8d 100644 --- a/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs +++ b/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs @@ -3639,12 +3639,12 @@ namespace QMAPP.WinForm.Forms.Operation /// private void btnSignInfo_Click(object sender, EventArgs e) { - if (string.IsNullOrEmpty(_operationServiceParam.machineInfo.MACHINECODDE)) + if (string.IsNullOrEmpty(_operationServiceParam.machineInfo.WORKLOC_CODE)) { MessageBox.Show("请先选择工位！"); return; } - SignInfoForm frm = new SignInfoForm(this); + SignInfoForm frm = new SignInfoForm(_operationServiceParam.machineInfo.WORKLOC_CODE); frm.ShowDialog(); } #endregion diff --git a/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.resx b/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.resx index 34c7216..883eec3 100644 --- a/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.resx +++ b/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.resx @@ -505,89 +505,89 @@ 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 - Jdm5yHQAAAAASUVORK5CYII= + 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 + AAAASUVORK5CYII= @@ -599,15 +599,6 @@ True - - True - - - True - - - True - True @@ -675,6 +666,6 @@ 127, 17 - 49 + 74 \ No newline at end of file diff --git a/APPQ5/QMAPP.WinForm/Forms/Operation/SignInfoForm.cs b/APPQ5/QMAPP.WinForm/Forms/Operation/SignInfoForm.cs index 2ee87c6..7230071 100644 --- a/APPQ5/QMAPP.WinForm/Forms/Operation/SignInfoForm.cs +++ b/APPQ5/QMAPP.WinForm/Forms/Operation/SignInfoForm.cs @@ -18,21 +18,24 @@ namespace QMAPP.WinForm.Forms.Operation //获取服务代理 QMAPP.ServicesAgent.ServiceAgent _agent = ClientContext.GetServiceAgent(); - List _bzdConfig = null; + List _bzdConfig = new List(); private SignInfo signInfo = new SignInfo(); - Product _CurrentProduct = null; - private OperationForm _parentForm; + private string Locs = string.Empty; + + + /// /// /// - /// - public SignInfoForm(OperationForm parentForm) + /// + public SignInfoForm(string loc) { InitializeComponent(); infolabel.Text = ""; infolabel.ForeColor = Color.Red; - _parentForm = parentForm; + Locs = loc; + PrintForm_Load(); } #region 打印按钮 @@ -46,7 +49,6 @@ namespace QMAPP.WinForm.Forms.Operation { try { - if (string.IsNullOrWhiteSpace(cbMaterial.Text)) { infolabel.Text = "请选择标记类型！"; @@ -55,42 +57,70 @@ namespace QMAPP.WinForm.Forms.Operation } signInfo.ProductCode = txtMainCode.Text; - signInfo.WorkLoc = _parentForm._SignMachineInfo.MACHINECODDE; + signInfo.WorkLoc = Locs; signInfo.Type = cbMaterial.Text; - var result = _agent.InvokeServiceFunction>(B9IPCService.SignInfoBLL_Insert.ToString(), signInfo); + var T = _agent.InvokeServiceFunction(B9IPCService.SignInfoBLL_GetAllListByLoc.ToString(), Locs); - if (result.Result > 0) + if (cbMaterial.Text == T.Type) { - infolabel.Text = "保存成功！"; - txtMainCode.Text = ""; + if (cbMaterial.Text == "配胶") + { + infolabel.Text = "请先进行清胶，才能配胶！"; + cbMaterial.Focus(); + return; + } + if (cbMaterial.Text == "清胶") + { + infolabel.Text = "请先进行配胶，才能清胶！"; + cbMaterial.Focus(); + return; + } + } + if (cbMaterial.Text == "表皮新料" && string.IsNullOrEmpty(txtMainCode.Text)) + { + infolabel.Text = "表皮新料,条码不能为空！"; + cbMaterial.Focus(); return; } - + if (cbMaterial.Text == "停工&复工") + { + signInfo.SIGNDATE = dtpCREATEDATESTART.Text; + signInfo.Type = "停工"; + _agent.InvokeServiceFunction>(B9IPCService.SignInfoBLL_Insert.ToString(), signInfo); + + signInfo.SIGNDATE = dtpCREATEDATEEND.Text; + signInfo.Type = "复工"; + _agent.InvokeServiceFunction>(B9IPCService.SignInfoBLL_Insert.ToString(), signInfo); + + infolabel.Text = "保存成功！"; + this.dtpCREATEDATESTART.Text = ""; + this.dtpCREATEDATEEND.Text = ""; + return; + + } + else + { + var result = _agent.InvokeServiceFunction>(B9IPCService.SignInfoBLL_Insert.ToString(), signInfo); + + if (result.Result > 0) + { + infolabel.Text = "保存成功！"; + txtMainCode.Text = ""; + return; + } + } } catch (Exception exception) { - MessageBox.Show("打印失败！"); + MessageBox.Show("提交失败！"); throw; } } #endregion - - #region 查找Product - /// - /// 查找Product - /// - /// - public Product SelectProduct(string Products) - { - var list = new List(); - var ProductList = _agent.InvokeServiceFunction(B9IPCService.ProductBLL_Get.ToString(), new Product() { PRODUCTCODE = Products }); - return ProductList; - } - #endregion - + #region 初始界面 /// @@ -98,11 +128,13 @@ namespace QMAPP.WinForm.Forms.Operation /// /// /// - private void PrintForm_Load(object sender, EventArgs e) + private void PrintForm_Load() { _bzdConfig.Add(new Config { PID = "配胶", MATERIALCODDE = "配胶" }); _bzdConfig.Add(new Config { PID = "清胶", MATERIALCODDE = "清胶" }); _bzdConfig.Add(new Config { PID = "表皮新料", MATERIALCODDE = "表皮新料" }); + //停工时间&复工 + _bzdConfig.Add(new Config { PID = "停工&复工", MATERIALCODDE = "停工&复工" }); LoadAssyMaterial(); } @@ -138,9 +170,38 @@ namespace QMAPP.WinForm.Forms.Operation #endregion - private void label2_Click(object sender, EventArgs e) + /// + /// 回车事件 + /// + /// + /// + private void txtCode_KeyDown(object sender, KeyEventArgs e) { + if (e.KeyCode == Keys.Enter)//如果输入的是回车键 + { + button1_Click(sender, e);//触发button事件 + } + + } + + private void cbMaterial_SelectedIndexChanged(object sender, EventArgs e) + { + if (cbMaterial.Text == "停工&复工") + { + this.txtMainCode.Enabled = false; + + this.dtpCREATEDATESTART.Enabled = true; + this.dtpCREATEDATEEND.Enabled = true; + this.dtpCREATEDATESTART.ShowUpDown = true; + } + else + { + this.txtMainCode.Enabled = true; + + this.dtpCREATEDATESTART.Enabled = false; + this.dtpCREATEDATEEND.Enabled = false; + } } } } \ No newline at end of file diff --git a/APPQ5/QMAPP.WinForm/Forms/Operation/SignInfoForm.designer.cs b/APPQ5/QMAPP.WinForm/Forms/Operation/SignInfoForm.designer.cs index 1085ee0..de486eb 100644 --- a/APPQ5/QMAPP.WinForm/Forms/Operation/SignInfoForm.designer.cs +++ b/APPQ5/QMAPP.WinForm/Forms/Operation/SignInfoForm.designer.cs @@ -37,6 +37,10 @@ namespace QMAPP.WinForm.Forms.Operation this.infolabel = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); this.cbMaterial = new System.Windows.Forms.ComboBox(); + this.label4 = new System.Windows.Forms.Label(); + this.label6 = new System.Windows.Forms.Label(); + this.dtpCREATEDATEEND = new DateTimePickerA(); + this.dtpCREATEDATESTART = new DateTimePickerA(); this.SuspendLayout(); // // label1 @@ -47,31 +51,32 @@ namespace QMAPP.WinForm.Forms.Operation this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(245, 37); this.label1.TabIndex = 0; - this.label1.Text = "标记信息登记"; + this.label1.Text = "信息登记"; // // label3 // this.label3.AutoSize = true; this.label3.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(27, 198); + this.label3.Location = new System.Drawing.Point(27, 164); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(106, 24); this.label3.TabIndex = 2; - this.label3.Text = "标记条码"; + this.label3.Text = "登记条码"; // // txtMainCode // this.txtMainCode.BackColor = System.Drawing.SystemColors.Window; this.txtMainCode.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtMainCode.Location = new System.Drawing.Point(172, 187); + this.txtMainCode.Location = new System.Drawing.Point(172, 153); this.txtMainCode.Name = "txtMainCode"; this.txtMainCode.Size = new System.Drawing.Size(416, 35); this.txtMainCode.TabIndex = 4; + this.txtMainCode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtCode_KeyDown); // // button1 // this.button1.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button1.Location = new System.Drawing.Point(262, 254); + this.button1.Location = new System.Drawing.Point(262, 337); this.button1.Name = "button1"; this.button1.Size = new System.Drawing.Size(206, 60); this.button1.TabIndex = 5; @@ -84,7 +89,7 @@ namespace QMAPP.WinForm.Forms.Operation this.infolabel.AutoSize = true; this.infolabel.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.infolabel.ForeColor = System.Drawing.Color.Red; - this.infolabel.Location = new System.Drawing.Point(50, 334); + this.infolabel.Location = new System.Drawing.Point(50, 444); this.infolabel.Name = "infolabel"; this.infolabel.Size = new System.Drawing.Size(0, 31); this.infolabel.TabIndex = 6; @@ -93,27 +98,79 @@ namespace QMAPP.WinForm.Forms.Operation // this.label5.AutoSize = true; this.label5.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(27, 110); + this.label5.Location = new System.Drawing.Point(27, 101); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(106, 24); this.label5.TabIndex = 2; - this.label5.Text = "标记类型"; + this.label5.Text = "登记类型"; // // cbMaterial // this.cbMaterial.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cbMaterial.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cbMaterial.FormattingEnabled = true; - this.cbMaterial.Location = new System.Drawing.Point(173, 98); + this.cbMaterial.Location = new System.Drawing.Point(173, 89); this.cbMaterial.Name = "cbMaterial"; this.cbMaterial.Size = new System.Drawing.Size(415, 36); this.cbMaterial.TabIndex = 7; + this.cbMaterial.SelectedIndexChanged += new System.EventHandler(this.cbMaterial_SelectedIndexChanged); + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label4.Location = new System.Drawing.Point(27, 218); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(106, 24); + this.label4.TabIndex = 28; + this.label4.Text = "停工时间"; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label6.Location = new System.Drawing.Point(27, 275); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(106, 24); + this.label6.TabIndex = 29; + this.label6.Text = "复工时间"; + // + // dtpCREATEDATEEND + // + this.dtpCREATEDATEEND.CustomFormat = " "; + this.dtpCREATEDATEEND.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold); + this.dtpCREATEDATEEND.Format = System.Windows.Forms.DateTimePickerFormat.Custom; + this.dtpCREATEDATEEND.FormatString = "yyyy-MM-dd HH:mm:ss"; + this.dtpCREATEDATEEND.Location = new System.Drawing.Point(227, 273); + this.dtpCREATEDATEEND.Name = "dtpCREATEDATEEND"; + this.dtpCREATEDATEEND.OriginalFormat = System.Windows.Forms.DateTimePickerFormat.Custom; + this.dtpCREATEDATEEND.Size = new System.Drawing.Size(295, 26); + this.dtpCREATEDATEEND.TabIndex = 27; + this.dtpCREATEDATEEND.ValueX = null; + // + // dtpCREATEDATESTART + // + this.dtpCREATEDATESTART.CustomFormat = " "; + this.dtpCREATEDATESTART.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold); + this.dtpCREATEDATESTART.Format = System.Windows.Forms.DateTimePickerFormat.Custom; + this.dtpCREATEDATESTART.FormatString = "yyyy-MM-dd HH:mm:ss"; + this.dtpCREATEDATESTART.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.dtpCREATEDATESTART.Location = new System.Drawing.Point(226, 216); + this.dtpCREATEDATESTART.Name = "dtpCREATEDATESTART"; + this.dtpCREATEDATESTART.OriginalFormat = System.Windows.Forms.DateTimePickerFormat.Custom; + this.dtpCREATEDATESTART.Size = new System.Drawing.Size(297, 26); + this.dtpCREATEDATESTART.TabIndex = 26; + this.dtpCREATEDATESTART.ValueX = null; // // SignInfoForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(665, 399); + this.ClientSize = new System.Drawing.Size(665, 515); + this.Controls.Add(this.label6); + this.Controls.Add(this.label4); + this.Controls.Add(this.dtpCREATEDATEEND); + this.Controls.Add(this.dtpCREATEDATESTART); this.Controls.Add(this.cbMaterial); this.Controls.Add(this.infolabel); this.Controls.Add(this.button1); @@ -123,8 +180,7 @@ namespace QMAPP.WinForm.Forms.Operation this.Controls.Add(this.label1); this.Name = "SignInfoForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "标记信息登记"; - this.Load += new System.EventHandler(this.PrintForm_Load); + this.Text = "信息登记"; this.ResumeLayout(false); this.PerformLayout(); @@ -139,5 +195,9 @@ namespace QMAPP.WinForm.Forms.Operation private System.Windows.Forms.Label infolabel; private System.Windows.Forms.Label label5; private System.Windows.Forms.ComboBox cbMaterial; + private DateTimePickerA dtpCREATEDATEEND; + private DateTimePickerA dtpCREATEDATESTART; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label label6; } } \ No newline at end of file diff --git a/AppCommon/QMAPP.ServicesAgent/ServiceEnums.cs b/AppCommon/QMAPP.ServicesAgent/ServiceEnums.cs index b12250c..0dbbe37 100644 --- a/AppCommon/QMAPP.ServicesAgent/ServiceEnums.cs +++ b/AppCommon/QMAPP.ServicesAgent/ServiceEnums.cs @@ -4109,6 +4109,12 @@ namespace QMAPP.ServicesAgent SignInfoBLL_Insert, + SignInfoBLL_GetAllListByLoc, + + SignInfoBLL_Get, + + SignInfoBLL_Update, + #endregion #region 时间验证 diff --git a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config index 0b3e916..16d8ddf 100644 --- a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config +++ b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config @@ -66,7 +66,7 @@ - +