From 6a0a795ed76be6e3c360e1bcad1ea2ff43f6102a Mon Sep 17 00:00:00 2001 From: "songnan.zhang" Date: Wed, 26 Jan 2022 14:21:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=90=AA=E5=A1=91=E7=A7=B0=E9=87=8D?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=95=8C=E9=9D=A2=EF=BC=8C=E4=B8=8A=E6=AC=A1?= =?UTF-8?q?=E5=BF=98=E8=AE=B0=E6=8F=90=E4=BA=A4=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- APP/QMAPP.Web/Web.config | 5 +- .../QMAPP.FJC.BLL/Bucket/TSWeighRecoreBLL.cs | 22 ++++- .../QMAPP.FJC.DAL/Bucket/TSWeighRecoreDAL.cs | 82 ++++++++++++++++++- .../QMAPP.FJC.Entity/Bucket/TSWeighRecore.cs | 5 ++ .../QMAPP.FJC.Web/Content/Xml/Dictionary.xml | 1 + .../Controllers/TSWeighRecoreController.cs | 50 ++++++++++- .../Models/Bucket/TSWeighRecoreModel.cs | 52 ++++++++---- APPQ5/QMAPP.FJC.Web/QMAPP.FJC.Web.csproj | 1 + .../TSWeighRecore/TSWeighRecoreList.aspx | 43 +++++++++- APPQ5/QMAPP.FJC.Web/Web.config | 4 +- APPQ5/QMAPP.WinForm/App.config | 6 +- AppCommon/QMAPP.ServicesAgent/ServiceEnums.cs | 6 ++ .../WCF/QMFrameWork.WebServiceHost/Web.config | 4 +- 13 files changed, 244 insertions(+), 37 deletions(-) diff --git a/APP/QMAPP.Web/Web.config b/APP/QMAPP.Web/Web.config index 0357f34..8f958f7 100644 --- a/APP/QMAPP.Web/Web.config +++ b/APP/QMAPP.Web/Web.config @@ -40,12 +40,13 @@ - + - + + diff --git a/APPQ5/QMAPP.FJC.BLL/Bucket/TSWeighRecoreBLL.cs b/APPQ5/QMAPP.FJC.BLL/Bucket/TSWeighRecoreBLL.cs index f8451e2..1fa19ee 100644 --- a/APPQ5/QMAPP.FJC.BLL/Bucket/TSWeighRecoreBLL.cs +++ b/APPQ5/QMAPP.FJC.BLL/Bucket/TSWeighRecoreBLL.cs @@ -140,6 +140,26 @@ namespace QMAPP.FJC.BLL.Bucket } } #endregion - + + #region 统计 + + /// + /// 统计 + /// + /// 信息 + /// 删除个数 + public TSWeighRecore Statistics(TSWeighRecore Info) + { + int count = 0; + try + { + return new TSWeighRecoreDAL().Statistics(Info); + } + catch (Exception ex) + { + throw ex; + } + } + #endregion } } diff --git a/APPQ5/QMAPP.FJC.DAL/Bucket/TSWeighRecoreDAL.cs b/APPQ5/QMAPP.FJC.DAL/Bucket/TSWeighRecoreDAL.cs index b3f3102..a9cbfb2 100644 --- a/APPQ5/QMAPP.FJC.DAL/Bucket/TSWeighRecoreDAL.cs +++ b/APPQ5/QMAPP.FJC.DAL/Bucket/TSWeighRecoreDAL.cs @@ -154,6 +154,33 @@ namespace QMAPP.FJC.DAL.Bucket whereBuilder.Append(" AND MATERIAL_CODE = @MATERIAL_CODE"); parameters.Add(new DataParameter { ParameterName = "MATERIAL_CODE", DataType = DbType.String, Value = condition.MATERIAL_CODE }); } + if (string.IsNullOrEmpty(condition.PColour) == false) + { + whereBuilder.Append(" AND PColour = @PColour"); + parameters.Add(new DataParameter { ParameterName = "PColour", DataType = DbType.String, Value = condition.PColour }); + } + if (!string.IsNullOrEmpty(condition.BeginWeigh)) + { + whereBuilder.Append(" AND Weigh >= @BeginWeigh"); + parameters.Add(new DataParameter { ParameterName = "BeginWeigh", DataType = DbType.String, Value = condition.BeginWeigh }); + } + + if (!string.IsNullOrEmpty(condition.EndWeigh)) + { + whereBuilder.Append(" AND Weigh <= @EndWeigh"); + parameters.Add(new DataParameter { ParameterName = "EndWeigh", DataType = DbType.String, Value = condition.EndWeigh }); + } + var sss = DateTime.MinValue.ToString(); + if (condition.BeginTime != DateTime.MinValue) + { + whereBuilder.Append(" AND CREATEDATE >= @BeginTime"); + parameters.Add(new DataParameter { ParameterName = "BeginTime", DataType = DbType.String, Value = condition.BeginTime }); + } + if (condition.EndTime != DateTime.MinValue) + { + whereBuilder.Append(" AND CREATEDATE <= @EndTime"); + parameters.Add(new DataParameter { ParameterName = "EndTime", DataType = DbType.String, Value = condition.EndTime }); + } //查询条件 if (whereBuilder.Length > 0) { @@ -259,8 +286,59 @@ namespace QMAPP.FJC.DAL.Bucket } #endregion - - + + #region 统计 + /// + /// 统计 + /// + /// + /// 删除个数 + public TSWeighRecore Statistics(TSWeighRecore Info) + { + StringBuilder sqlBuilder = new StringBuilder(); + List parameters = new List(); + int count = 0; + try + { + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + //删除基本信息 + sqlBuilder.Append("select sum([Weigh]) as 'SUM',count(*) as 'Weigh' from T_AW_TSWeighRecore "); + sqlBuilder.Append("WHERE 1 = 1 "); + if (Info.BeginTime != DateTime.MinValue) + sqlBuilder.Append($" and CREATEDATE >= '{Info.BeginTime}' "); + if (Info.EndTime != DateTime.MinValue) + sqlBuilder.Append($" and CREATEDATE <= '{Info.EndTime}' "); + if (string.IsNullOrEmpty(Info.ProductCode) == false) + { + sqlBuilder.Append($" AND ProductCode = '{Info.ProductCode}'"); + } + if (string.IsNullOrEmpty(Info.MATERIAL_CODE) == false) + { + sqlBuilder.Append($" AND MATERIAL_CODE = '{Info.MATERIAL_CODE}'"); + } + if (string.IsNullOrEmpty(Info.PColour) == false) + { + sqlBuilder.Append($" AND PColour = '{Info.PColour}'"); + } + if (!string.IsNullOrEmpty(Info.BeginWeigh)) + { + sqlBuilder.Append($" AND Weigh >= '{Info.BeginWeigh}'"); + } + if (!string.IsNullOrEmpty(Info.EndWeigh)) + { + sqlBuilder.Append($" AND Weigh <= {Info.EndWeigh}"); + } + return session.Get(sqlBuilder.ToString(), parameters.ToArray()); + + } + } + catch (Exception ex) + { + throw ex; + } + } + #endregion } } diff --git a/APPQ5/QMAPP.FJC.Entity/Bucket/TSWeighRecore.cs b/APPQ5/QMAPP.FJC.Entity/Bucket/TSWeighRecore.cs index f103fad..1565e21 100644 --- a/APPQ5/QMAPP.FJC.Entity/Bucket/TSWeighRecore.cs +++ b/APPQ5/QMAPP.FJC.Entity/Bucket/TSWeighRecore.cs @@ -51,6 +51,9 @@ namespace QMAPP.MD.Entity.Bucket [Description("重量")] [DBColumn(ColumnName = "Weigh", DataType = DbType.String)] public string Weigh { get; set; } + public string BeginWeigh { get; set; } + public string EndWeigh { get; set; } + public int SUM { get; set; } /// /// 创建用户 @@ -80,5 +83,7 @@ namespace QMAPP.MD.Entity.Bucket [DBColumn(ColumnName = "UPDATEDATE", DataType = DbType.String)] public string UPDATEDATE { get; set; } + public DateTime EndTime { get; set; } + public DateTime BeginTime { get; set; } } } diff --git a/APPQ5/QMAPP.FJC.Web/Content/Xml/Dictionary.xml b/APPQ5/QMAPP.FJC.Web/Content/Xml/Dictionary.xml index 380ba35..3258920 100644 --- a/APPQ5/QMAPP.FJC.Web/Content/Xml/Dictionary.xml +++ b/APPQ5/QMAPP.FJC.Web/Content/Xml/Dictionary.xml @@ -553,5 +553,6 @@ [Description("创建用户")] + [DGColumn(frozenColumns = false, Sortable = true, Width = 80, DataAlign = DataAlign.center, Hidden = true)] public string CREATEUSER { get; set; } @@ -119,7 +120,7 @@ namespace QMAPP.FJC.Web.Models.TianJin /// 创建用户 /// [Description("创建用户")] - [DGColumn(Sortable = true, Width = 100, DataAlign = DataAlign.left)] + [DGColumn(Sortable = true, Width = 100, DataAlign = DataAlign.left,Hidden = true)] public string CREATEUSERNAME { get; set; } diff --git a/APPQ5/QMAPP.FJC.Web/QMAPP.FJC.Web.csproj b/APPQ5/QMAPP.FJC.Web/QMAPP.FJC.Web.csproj index d8dcb07..544f2f9 100644 --- a/APPQ5/QMAPP.FJC.Web/QMAPP.FJC.Web.csproj +++ b/APPQ5/QMAPP.FJC.Web/QMAPP.FJC.Web.csproj @@ -428,6 +428,9 @@ Always + + Always + Always @@ -1302,6 +1305,9 @@ Always + + Always + Always diff --git a/APPQ5/QMAPP.FJC.Web/Temp/5fcea1f9-ea55-4d23-8b98-78541fafab73.xlsx b/APPQ5/QMAPP.FJC.Web/Temp/5fcea1f9-ea55-4d23-8b98-78541fafab73.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..b61d00d5d242a07ec086a3a435646413e12b4788 GIT binary patch literal 9422 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 literal 0 HcmV?d00001 diff --git a/APPQ5/QMAPP.FJC.Web/Temp/f3271430-e5e1-4ca8-b78b-2351c788f148.xlsx b/APPQ5/QMAPP.FJC.Web/Temp/f3271430-e5e1-4ca8-b78b-2351c788f148.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..9325c473e235a8eac293ac091948a85d3f20628b GIT binary patch literal 9376 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 --%> <%=Html.QTButtonDelete("DoorPlankPlan", "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)%> --%> + <%=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 4818090..1038834 100644 --- a/APPQ5/QMAPP.FJC.Web/Web.config +++ b/APPQ5/QMAPP.FJC.Web/Web.config @@ -36,7 +36,10 @@ - + + + + diff --git a/APPQ5/QMAPP.WinForm/App.config b/APPQ5/QMAPP.WinForm/App.config index 84a3205..c6bfd5c 100644 --- a/APPQ5/QMAPP.WinForm/App.config +++ b/APPQ5/QMAPP.WinForm/App.config @@ -8,8 +8,11 @@ - - + + + + @@ -123,6 +126,7 @@ + diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/RerportModel.ttx b/APPQ5/QMAPP.WinForm/Forms/TianJin/RerportModel.ttx index 4c3e338..18752d5 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/RerportModel.ttx +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/RerportModel.ttx @@ -8,3 +8,4 @@ CARSETDESCCN String 100 CP5A String 100 PASTECARDNO String 100 SCANDATE String 100 +PRODUCTCODE String 100 diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs index ee270df..7684142 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs @@ -45,6 +45,9 @@ namespace QMAPP.WinForm.Forms.TianJin QMAPP.ServicesAgent.ServiceAgent _agent = ClientContext.GetServiceAgent(); List _barcodeRules = null; public delegate void myMethodDelegate(); + + private string PlaceFirstPositionType = string.Empty; + #endregion #region 变量 @@ -67,6 +70,9 @@ namespace QMAPP.WinForm.Forms.TianJin public TJFrmPlace() { InitializeComponent(); + + PlaceFirstPositionType = System.Configuration.ConfigurationManager.AppSettings["PlaceFirstPositionType"].ToString(); + _barcodeRules = _agent.InvokeServiceFunction>("BarcodeRulesBLL_GetListForSend"); } #endregion @@ -754,11 +760,11 @@ namespace QMAPP.WinForm.Forms.TianJin //#region "隐藏了rb_hx 和rb_dx，全部根据pFisType判断，生产线的设置使用按钮进行设置" if (pFisType == "01") { - strprodtype = "( 混 )"; + strprodtype = "( 左 )"; } else if (pFisType == "02") { - strprodtype = "( 单 )"; + strprodtype = "( 右 )"; } //提交数据处理 foreach (DataRow dr in tbl.Rows) @@ -805,7 +811,7 @@ namespace QMAPP.WinForm.Forms.TianJin nfpastecard.OPERATOR = ClientContext.LoginInfo.UserName.ToString(); // nfpastecard. } - int rowindex = agent.InvokeServiceFunction(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_AddNewPasteCard.ToString(), nfpastecard); + int rowindex = agent.InvokeServiceFunction(QMAPP.ServicesAgent.FrmPlaceManage.TJFrmPlaceBLL_AddNewPasteCard.ToString(), nfpastecard); // 打印处理 TJFrmCarCardPrintShow frm = new TJFrmCarCardPrintShow(nfpastecard, strprodtype, "手动"); frm.Owner = this; @@ -813,23 +819,6 @@ namespace QMAPP.WinForm.Forms.TianJin frm.ShowDialog(); isprint = frm.isprint; } - //if (isprint) - //{ - // nfpastecard.DetailsCardlist = nflist; - // nfindex = 0; - // // BllFisOrder bllFisOrder = new BllFisOrder(); - // //int strindex = bllFisOrder.AddPasteCard(nfpastecard); - // //QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent(); - // int strindex = agent.InvokeServiceFunction(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_AddNewPasteCard.ToString(), nfpastecard); - // TJPrintPasteCard prin = new TJPrintPasteCard(); - // prin.Print(strindex, nfpastecard, strprodtype); - // GetInitData(); - // DGVRemoveRow(nflist, ref ncslist); - // nflist = new List(); - // dgvNF.DataMember = null; - // dgvNF.DataSource = nflist; - // //computenfncs(); - //} } else { @@ -980,7 +969,7 @@ namespace QMAPP.WinForm.Forms.TianJin nfpastecard.FailLog = log; nfindex = 0; QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent(); - int rowindex = agent.InvokeServiceFunction(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_AddPasteCard.ToString(), nfpastecard); + int rowindex = agent.InvokeServiceFunction(QMAPP.ServicesAgent.FrmPlaceManage.TJFrmPlaceBLL_AddNewPasteCard.ToString(), nfpastecard); //BllFisOrder bllFisOrder = new BllFisOrder(); //int rowindex = bllFisOrder.AddPasteCard(nfpastecard); TJPrintPasteCard prin = new TJPrintPasteCard(); @@ -1040,7 +1029,7 @@ namespace QMAPP.WinForm.Forms.TianJin if (openConfirmDialog && string.Equals(QMAPP.WinForm.Common.LocalSetting.Settings["AlertConfirmEnable", "0"], "1")) { - Common.frmAlertConfirm alertconfirm = new Common.frmAlertConfirm(message, "CD85010800"); + Common.frmAlertConfirm alertconfirm = new Common.frmAlertConfirm(message, "85010800"); alertconfirm.StartPosition = FormStartPosition.CenterScreen; alertconfirm.ShowDialog(); } @@ -1126,21 +1115,20 @@ namespace QMAPP.WinForm.Forms.TianJin dgvMATChange.Rows[temprowindex].Cells["STATE"].Value = "1"; - - break; + temprowindex = dgvMATChange.Rows.Count; } else { SetContainerItem(nfindex, false); Alert("条码错误：条码的零件号与FIS队列零件号不符合。"); - break; + return; } } else { SetContainerItem(nfindex, false); Alert("条码错误：条码已扫描或车型不符合。"); - break; + return; } } @@ -1148,9 +1136,11 @@ namespace QMAPP.WinForm.Forms.TianJin else { Alert("扫描条码重复，请重新扫描。"); + return; } - SetContainerItem(nfindex, true); + CreateNFPaste(Code); //创建NF的贴车单以及明细 + SetContainerItem(nfindex, true); if (dgvMATChange.RowCount > 0) { dgvMATChange.FirstDisplayedScrollingRowIndex = nfindex - nfindex % 4; @@ -1177,74 +1167,7 @@ namespace QMAPP.WinForm.Forms.TianJin } inputstring = txtCode.Text.ToUpper(); this.lberror.Text = null; - #region 使用登录码快速切换用户 - //使用登录码快速切换用户 - //if (System.Text.RegularExpressions.Regex.IsMatch(txtCode.Text, "^<\\w+::\\w+>$")) - //{ - // var ret = ClientContext.CodeLogin(txtCode.Text); - // if (string.Equals(ret, "登录成功！")) - // { - // ClientContext.SetUserAuth(this); - // } - // lberror.Text = ret; - // ArragetxtCode(); - // return; - //} - - - //if (System.Text.RegularExpressions.Regex.IsMatch(txtCode.Text.ToUpper(), "^>CMD:\\w+$"))//扫描输入为指令码 - //{ - // ExcuteCMDCode(); - // txtCode.Text = ""; - // txtCode.Focus(); - // return; - //} - - _CMDConfirm = ""; - #endregion - - //#region 原校验 - //string PastNOConfirmEnable = QMAPP.WinForm.Common.LocalSetting.Settings["PastNOConfirmEnable", "0"]; - //if (System.Text.RegularExpressions.Regex.IsMatch(txtCode.Text.ToUpper(), "^" + WORKCENTER_CODE + "\\w+$"))//扫描输入为贴车单号 - //{ - // if (string.Equals("1", PastNOConfirmEnable)) //贴车单确认功能开启 - // { - // GetLastPastCard(); - // if (string.Equals(txtCode.Text.ToUpper(), lblLastPastNO.Text.ToUpper())) - // { - // lberror.Text = "前车贴车单号确认完成！"; - // SetPastNOConfirm(1); - // ArragetxtCode(); - // return; - // } - // else - // { - // lberror.Text = "前车贴车单号确认失败！"; - // SetPastNOConfirm(2); - // ArragetxtCode(); - // return; - // } - // } - // else - // { - // lberror.Text = "贴车单号确认功能未开启,无需扫描贴车单号！"; - // SetPastNOConfirm(0); - // ArragetxtCode(); - // return; - // } - //} - - //if (string.Equals("1", PastNOConfirmEnable)) //贴车单确认功能开启 - //{ - // if (!pbPastNoConfirmed.Enabled) - // { - // Alert("请先扫描前车贴车单号进行贴车单确认！"); - // ArragetxtCode(); - // return; - // } - //} - //#endregion - + #region fis区是否有记录 if (dgvMATChange.Rows.Count == 0) { @@ -1260,10 +1183,8 @@ namespace QMAPP.WinForm.Forms.TianJin if (this.dgvNF.Rows.Count == 0) //第一个码必须先扫描1号位 { string placeCode = txtCode.Text.Trim(); - var sss = System.Configuration.ConfigurationManager.AppSettings["PlaceFirstPositionCode"].ToString(); if (placeCode.Equals(System.Configuration.ConfigurationManager.AppSettings["PlaceFirstPositionCode"].ToString())) - { - + { this.placeFirstPosition = placeCode; this.placeFirstPositionTime = DateTime.Now; this.txtCode.Text = ""; @@ -1274,39 +1195,7 @@ namespace QMAPP.WinForm.Forms.TianJin } #endregion - - #region 一号位时间校验 - - //if (this.dgvNF.Rows.Count == 0 && !string.IsNullOrEmpty(this.placeFirstPosition))//超时判断 - //{ - // double timeOutSecond = 0; - // //获取超时时间设定值 - // //DataTable dtTimeOut = new BllTimeOutSet().GetList(); - // DataTable dtTimeOut = agent.InvokeServiceFunction(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_GetTimeOutSet.ToString()); - // if (dtTimeOut.Rows.Count > 0) - // { - // timeOutSecond = Convert.ToDouble(dtTimeOut.Rows[0]["TIMEOUT_VALUE"].ToString()); - // } - - // //获取超时时间设定值 - // if (timeOutSecond > 0) - // { - // TimeSpan ts = DateTime.Now - this.placeFirstPositionTime; - // if (ts.TotalSeconds > timeOutSecond) - // { - // this.placeFirstPosition = ""; - // this.txtCode.Text = ""; - // this.placeFirstPositionTime = DateTime.MinValue; - // lberror.Text = "扫描本体件超时，请重新扫描1号位！"; - // //处理条码扫描文本框 - // ArragetxtCode(); - // return; - // } - // } - //} - - #endregion - + #region 请先扫描1号位 if (string.IsNullOrEmpty(this.placeFirstPosition)) { @@ -1315,31 +1204,87 @@ namespace QMAPP.WinForm.Forms.TianJin lberror.Text = "请先扫描1号位！"; return; } - #endregion + #endregion - #region FIS区域数据全部扫描完成，请获取数据后再扫描 - if (dgvNF.Rows.Count >= dgvMATChange.Rows.Count) + #region 计划外发运 + + if (inputstring.Equals("FIRSTPOSITIONTYPE")) { - Alert("当前计划数据全部扫描完成，请下达计划后再扫描!"); + if (PlaceFirstPositionType == "False") + { + PlaceFirstPositionType = "True"; + lberror.Text = "关闭验证！"; + } + else + { + PlaceFirstPositionType = "False"; + lberror.Text = "打开验证！"; + } + this.txtCode.Text = ""; + //处理条码扫描文本框 ArragetxtCode(); return; } - #endregion - #region 长度校验 - //string pp = System.Configuration.ConfigurationManager.AppSettings["UpperBarcodeLen"].ToString(); - //Int32 ul = int.Parse(System.Configuration.ConfigurationManager.AppSettings["UpperBarcodeLen"].ToString()); - //Int32 ll = int.Parse(System.Configuration.ConfigurationManager.AppSettings["LowerBarcodeLen"].ToString()); + if (PlaceFirstPositionType == "True") + { + #region 校验是否有重复的扫过的条码 + if (dgvNF.Rows.Count > 0) + { + for (var i = 0; i < dgvNF.Rows.Count; i++) + { + if (dgvNF.Rows[i].Cells[CODE_NF.Name].Value.ToString().ToUpper() == inputstring) + { + SetContainerItem(nfindex, false); + Alert("该条码已扫描!"); + txtCode.Text = ""; + txtCode.Focus(); + return; + } + } + } + CheckDataBase(inputstring); //检查T_PP_TJFY_WORKORDER 是否存在条码记录 + + foreach (var rule in _barcodeRules) + { + if (System.Text.RegularExpressions.Regex.IsMatch(inputstring, rule.REGEX)) + { + strprodno = rule.MATERIAL_CODE; + strmouldcode = rule.REMARK; + strcarsetdesc_cn = rule.MATERIAL_TYPE; + } + } + + //主键 + strFiskey = Guid.NewGuid().ToString(); + + CreateNFPaste(inputstring); //创建NF的贴车单以及明细 + + //CreateNFPaste__(); + + SetContainerItem(nfindex, true); //变更右下角位置颜色 + + txtCode.Text = ""; + txtCode.Focus(); + return; + + #endregion + + + } - //if (txtCode.Text.Length <= ll || txtCode.Text.Length >= ul) - //{ - // Alert("条码错误：条码长度不符合要求（" + ll.ToString() + "-" + ul.ToString() + "）。"); - // ArragetxtCode(); - // return; - //} #endregion + #region FIS区域数据全部扫描完成，请获取数据后再扫描 + if (dgvNF.Rows.Count >= dgvMATChange.Rows.Count) + { + Alert("当前计划数据全部扫描完成，请下达计划后再扫描!"); + ArragetxtCode(); + return; + } + #endregion + #region 校验位计算 if (txtCode.Text.StartsWith("052")) @@ -1374,11 +1319,43 @@ namespace QMAPP.WinForm.Forms.TianJin } } } + + #region 底盘号间隔校验 + + //2016-10-31 闫永刚 + int scanSum = dgvNF.Rows.Count; + int lastvinNumber = 0; + int vinNumber = 0; + if (scanSum > 0) + { + lastvinNumber = Convert.ToInt32(dgvMATChange.Rows[scanSum - 1].Cells["REQUESTID"].Value.ToString()); + vinNumber = Convert.ToInt32(dgvMATChange.Rows[scanSum].Cells["REQUESTID"].Value.ToString()); + } + + if ((vinNumber - lastvinNumber) > 1) + { + var dresult = MessageBox.Show("出现顺序号间隔,是否继续发货?", "提示", MessageBoxButtons.YesNo); + if (dresult == DialogResult.No) + { + ArragetxtCode(); + return; + } + } + + #endregion + + #region 判断当前扫描过的数据集合中是否有相同条码 + + //判断当前扫描过的数据集合中是否有相同条码 + CheckDataBase(Code); + + #endregion + #endregion //规则 bool signal = false; - string outSourceProduct = ""; + string MOULD_CODE = ""; foreach (var rule in _barcodeRules) { @@ -1386,7 +1363,7 @@ namespace QMAPP.WinForm.Forms.TianJin { signal = true; ProMaterial = rule.MATERIAL_CODE; - outSourceProduct = rule.DATA_TYPE; + MOULD_CODE = rule.REMARK; } } @@ -1415,56 +1392,8 @@ namespace QMAPP.WinForm.Forms.TianJin //-------------------------End----------- #endregion - #region 2.判断成品 下线时间校验 - //if (product.STATUS != "0") - //{ - // SetContainerItem(nfindex, false); - // Alert("扫描的不是合格成品,不能进行发运！"); - // txtCode.Text = ""; - // txtCode.Focus(); - // return; - //} - //if (product.OUTFLAG != "0") - //{ - // SetContainerItem(nfindex, false); - // Alert("扫描产品已出库,不能进行发运操作！"); - // txtCode.Text = ""; - // txtCode.Focus(); - // return; - //} - //var StorageTimeLimit=0d; - //double.TryParse(QMAPP.WinForm.Common.LocalSetting.Settings["StorageTimeLimit", "24"],out StorageTimeLimit); - //if ((DateTime.Now - product.CREATEDATE).TotalHours < StorageTimeLimit) - //{ - // SetContainerItem(nfindex, false); - // Alert("扫描产品下线时间不足"+StorageTimeLimit+"小时！,不能进行发运操作！"); - // txtCode.Text = ""; - // txtCode.Focus(); - // return; - //} - //var mcresult = agent.InvokeServiceFunction>("MaterialClassBLL_Get", new MaterialClass { MATERIAL_TYPE_CODE = product.MATERIAL_TYPE }); - //var mc = mcresult.IsSuccess ? mcresult.Result : new MaterialClass { }; - //if (!string.Equals(mc.MATERIAL_ATTRIBUTE, "2")) - //{ - // SetContainerItem(nfindex, false); - // Alert("扫描产品不是总成件！,不能进行发运操作！"); - // txtCode.Text = ""; - // txtCode.Focus(); - // return; - //} - //FJC.Entity.ProductIn.ProductIn inrecord = agent.InvokeServiceFunction("ProductInBLL_GetInRecord", Code); - //if (inrecord != null) - //{ - // SetContainerItem(nfindex, false); - // Alert("此产品为退返件,请更换总成标签后再发运！"); - // txtCode.Text = ""; - // txtCode.Focus(); - // return; - //} - #endregion - #region 4.与FIS数据匹配 - //4.与FIS数据匹配 + //4.与FIS数据匹配 匹配到计划后 开始生成贴车单 FISDataCompare(Code, ProMaterial, MOULD_CODE); #endregion @@ -1480,38 +1409,6 @@ namespace QMAPP.WinForm.Forms.TianJin #endregion - #region 底盘号间隔校验 - - //2016-10-31 闫永刚 - int scanSum = dgvNF.Rows.Count; - int lastvinNumber = 0; - int vinNumber = 0; - if (scanSum > 0) - { - lastvinNumber = Convert.ToInt32(dgvMATChange.Rows[scanSum - 1].Cells["REQUESTID"].Value.ToString()); - vinNumber = Convert.ToInt32(dgvMATChange.Rows[scanSum].Cells["REQUESTID"].Value.ToString()); - } - - if ((vinNumber - lastvinNumber) > 1) - { - var dresult = MessageBox.Show("出现顺序号间隔,是否继续发货?", "提示", MessageBoxButtons.YesNo); - if (dresult == DialogResult.No) - { - ArragetxtCode(); - return; - } - } - - #endregion - - #region 判断当前扫描过的数据集合中是否有相同条码 - //判断当前扫描过的数据集合中是否有相同条码 - if (outSourceProduct == "OP") - { - CheckDataBase(Code); - } - #endregion - #region 处理条码扫描文本框 ArragetxtCode(); #endregion @@ -1665,7 +1562,6 @@ namespace QMAPP.WinForm.Forms.TianJin if (tblbarcode.Rows.Count > 0) { - Alert("扫描条码重复，请重新扫描。"); } } @@ -1853,7 +1749,7 @@ namespace QMAPP.WinForm.Forms.TianJin dgvNF.DataSource = nflist; strprodno = ""; nfindex++; - + //int setdefaultSum = Convert.ToInt32(QM.Config.CustomConfig.GetItem("ShowDataCount")); int setdefaultSum = Convert.ToInt32(QMAPP.WinForm.Common.LocalSetting.Settings["ShowDataCount",""]); if (nfindex == setdefaultSum) @@ -2156,15 +2052,8 @@ namespace QMAPP.WinForm.Forms.TianJin } for (int i = 0; i < tpContainer.ColumnCount; i++) { - //tpContainer.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, tpContainer.ColumnCount > 8 ? 60 : 90)); tpContainer.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 50)); - - //Label lblno = new Label(); - //lblno.Text = (i + 1).ToString(); - //lblno.Font = new Font("微软雅黑", 20, FontStyle.Bold); - //lblno.Dock = DockStyle.Fill; - //lblno.TextAlign = ContentAlignment.MiddleCenter; - //tpContainer.Controls.Add(lblno, i, 0); + for (int j = 0; j < tpContainer.RowCount; j++) { Label lblItem = new Label(); @@ -2175,7 +2064,7 @@ namespace QMAPP.WinForm.Forms.TianJin tpContainer.Controls.Add(lblItem, i, j); } } - //tpContainer.Height = tpContainer.RowCount * (3 + (tpContainer.ColumnCount > 8 ? 60 : 90)); + for (int i = 0; i < nfindex; i++) { SetContainerItem(i, true); @@ -2190,13 +2079,23 @@ namespace QMAPP.WinForm.Forms.TianJin /// public void SetContainerItem(int itemindex, bool result) { - var columnindex = itemindex / (tpContainer.RowCount); - var rowindex = itemindex % (tpContainer.RowCount) ; - var label = tpContainer.GetControlFromPosition(columnindex, rowindex) as Label; - if (label != null) + if (itemindex == 1) { + var label = tpContainer.GetControlFromPosition(0, 0) as Label; label.BackColor = result ? Color.Lime : Color.Red; } + else + { + itemindex = itemindex - 1; + var columnindex = itemindex / (tpContainer.RowCount); + var rowindex = itemindex % (tpContainer.RowCount); + var label = tpContainer.GetControlFromPosition(columnindex, rowindex) as Label; + if (label != null) + { + label.BackColor = result ? Color.Lime : Color.Red; + } + } + } /// diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPastCard.rpt b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPastCard.rpt index f5bbbb452dbd0de4ae12dae86da456bebf34ae0c..9ec0d1c63cfd5ad249b386dabe555ddb153da4e4 100644 GIT binary patch delta 12490 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®SC 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 z z3D&AUHBTa5sWER>)TbxP0xr>@;^1b&i|_E$)djX)x4>UZ{xq)Yy6;WAa}|r zhL~?)$*Z{de~OHxZ{lImEBN#}zWG~T_?o|suL7hc6wUvnX1-2*Ee0a|(5$6~(g2l+ zipQPU0}X-#LR>Uaz;JJ!8&dzRrwEJ$cw6`XRa#A9LaD*~N9TO~=%1~g*DO7zDAK{|mb9RHuaNAUmZJ$gI!YU*YqT@+1({{Xx$?8pEB diff --git a/AppCommon/QMAPP.ServicesAgent/ServiceEnums.cs b/AppCommon/QMAPP.ServicesAgent/ServiceEnums.cs index cae55f2..e619dad 100644 --- a/AppCommon/QMAPP.ServicesAgent/ServiceEnums.cs +++ b/AppCommon/QMAPP.ServicesAgent/ServiceEnums.cs @@ -2017,6 +2017,11 @@ namespace QMAPP.ServicesAgent /// [Description("贴车单记录明细查询")] TJFrmPlaceBLL_GetPasteDetails, + /// + /// 添加贴车单 + /// + [Description(" 添加贴车单")] + TJFrmPlaceBLL_AddPasteCard, #endregion diff --git a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config index d10b552..d651a04 100644 --- a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config +++ b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config @@ -64,7 +64,10 @@ - + + + + From ff6e62eec678d6b9633a8385f588dfd1e906ab25 Mon Sep 17 00:00:00 2001 From: "songnan.zhang" Date: Mon, 14 Feb 2022 10:37:25 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=89=93=E5=8D=B0=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- APPQ5/QMAPP.FJC.BLL/TianJin/TJFrmPlaceBLL.cs | 4 +- APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs | 25 +- .../QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs | 42 +- .../TianJin/TJPrintPlanLabel.Designer.cs | 512 +++++++++++++++++ .../Forms/TianJin/TJPrintPlanLabel.cs | 513 ++++++++++++++++++ .../Forms/TianJin/TJPrintPlanLabel.resx | 234 ++++++++ APPQ5/QMAPP.WinForm/MainForm.Designer.cs | 10 + APPQ5/QMAPP.WinForm/MainForm.cs | 29 +- APPQ5/QMAPP.WinForm/QMAPP.WinForm.csproj | 9 + 9 files changed, 1353 insertions(+), 25 deletions(-) create mode 100644 APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.Designer.cs create mode 100644 APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs create mode 100644 APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.resx diff --git a/APPQ5/QMAPP.FJC.BLL/TianJin/TJFrmPlaceBLL.cs b/APPQ5/QMAPP.FJC.BLL/TianJin/TJFrmPlaceBLL.cs index c74c419..4449a29 100644 --- a/APPQ5/QMAPP.FJC.BLL/TianJin/TJFrmPlaceBLL.cs +++ b/APPQ5/QMAPP.FJC.BLL/TianJin/TJFrmPlaceBLL.cs @@ -175,7 +175,7 @@ namespace QMAPP.FJC.BLL.TianJin /// /// /// - public int AddPasteCard(EPasteCard ppastecard) + public int AddPasteCard(TJEPasteCard ppastecard) { @@ -406,7 +406,7 @@ namespace QMAPP.FJC.BLL.TianJin /// /// /// - public int AddNewPasteCard(EPasteCard ppastecard,int Count) + public int AddNewPasteCard(TJEPasteCard ppastecard,int Count) { try { diff --git a/APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs b/APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs index 53ae4cd..a7513ea 100644 --- a/APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs +++ b/APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs @@ -466,7 +466,7 @@ namespace QMAPP.FJC.DAL.TianJin /// /// /// - private string Insertdetailcard(int rowindex, EPasteDetailsCard pdecard) + private string Insertdetailcard(int rowindex, TJEPasteDetailsCard pdecard) { #region StringBuilder strSql = new StringBuilder(); @@ -630,11 +630,16 @@ namespace QMAPP.FJC.DAL.TianJin /// 更新FIS队列表。 /// /// - private string updateFisOrder(string pfiskey,string PRODUCTCODE) + private string updateFisOrder(TJEPasteDetailsCard Details) { #region StringBuilder strSql = new StringBuilder(); - strSql.Append(string.Format($" UPDATE T_PP_TJFY_WORKORDER SET STATE =2,PRODUCTCODE = '{PRODUCTCODE}' WHERE PID= '{pfiskey}' ")); + if (!string.IsNullOrEmpty(Details.FIS_KEY)) + strSql.Append(string.Format($" UPDATE T_PP_TJFY_WORKORDER SET STATE =2,PRODUCTCODE = '{Details.SANBARCODE}' WHERE PID= '{Details.FIS_KEY}' ")); + else + { + strSql.Append($"INSERT INTO[dbo].[T_PP_TJFY_WORKORDER] ([PID], [ORDERPLANID], [ORDERPLAN_NO], [SEQ], [MATERIAL_CODE], [MATERIAL_NAME], [PLAN_DATE], [PRODUCTCODE], [MOULD_CODE], [STATE], [UPDATEDATE], [LINENO]) VALUES('{Guid.NewGuid().ToString()}','','','','{Details.PRODNO}','{Details.CARSETDESC_CN}','{DateTime.Now}','{Details.SANBARCODE}','{Details.MOULDCODE}','2','{DateTime.Now}','{Details.LINENO}')"); + } return strSql.ToString(); #endregion @@ -713,7 +718,7 @@ namespace QMAPP.FJC.DAL.TianJin /// /// /// - public int AddPasteCard(EPasteCard ppastecard) + public int AddPasteCard(TJEPasteCard ppastecard) { #region try @@ -786,11 +791,11 @@ namespace QMAPP.FJC.DAL.TianJin sqllist.Add(strSqllog.ToString()); sqllist.Add(strSql.ToString()); - foreach (EPasteDetailsCard decard in ppastecard.DetailsCardlist) + foreach (TJEPasteDetailsCard decard in ppastecard.DetailsCardlist) { int rowindex = strindex; string strinsertsql = Insertdetailcard(rowindex, decard); - string updatesql = updateFisOrder(decard.FIS_KEY, decard.SANBARCODE); + string updatesql = updateFisOrder(decard); string deleteSql = DeleteSPFisOrder(decard.FIS_KEY); @@ -844,7 +849,7 @@ namespace QMAPP.FJC.DAL.TianJin /// /// /// - public int AddNewPasteCard(EPasteCard ppastecard,int Count) + public int AddNewPasteCard(TJEPasteCard ppastecard,int Count) { try { @@ -933,12 +938,12 @@ namespace QMAPP.FJC.DAL.TianJin sqllist.Add(strSql.ToString()); - foreach (EPasteDetailsCard decard in ppastecard.DetailsCardlist) + foreach (TJEPasteDetailsCard decard in ppastecard.DetailsCardlist) { int rowindex = strindex; string strinsertsql = Insertdetailcard(rowindex, decard); //string updatesql = UpdateFISORDERSENDDETAIL(decard.FIS_KEY); - string updatesql2 = updateFisOrder(decard.FIS_KEY, decard.SANBARCODE); + string updatesql2 = updateFisOrder(decard); //string updatesql3 = updateProduct(decard.PRODUCT_PID, decard.VIN, decard.KIN, decard.VWSEQ); sqllist.Add(strinsertsql.ToString()); //sqllist.Add(updatesql.ToString()); @@ -1263,7 +1268,7 @@ namespace QMAPP.FJC.DAL.TianJin strValues.Append("'" + ppastecard.PASTECARDNO + "',"); strValues.Append("'" + ppastecard.PASTECARDDATE + "',"); - strValues.Append("'" + ppastecard.PRODUCTIONNAME + "',"); + strValues.Append("'" + ppastecard.PRODUCTIONNAME + "'"); //strValues.Append("'" + ppastecard.PLANTNAME + "'"); strSql.Append(" INSERT INTO T_DAS_PASTE_CARDINDEX "); diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs index 7684142..edf8ac8 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs @@ -1225,6 +1225,8 @@ namespace QMAPP.WinForm.Forms.TianJin ArragetxtCode(); return; } + + inputstring += DateTime.Now.ToString("yyyyMMddHHmmssfff"); if (PlaceFirstPositionType == "True") { @@ -1243,8 +1245,15 @@ namespace QMAPP.WinForm.Forms.TianJin } } } - CheckDataBase(inputstring); //检查T_PP_TJFY_WORKORDER 是否存在条码记录 - + string msgs = ""; + CheckDataBase(inputstring,ref msgs); //检查T_PP_TJFY_WORKORDER 是否存在条码记录 + if (!string.IsNullOrEmpty(msgs)) + { + Alert("该条码已扫描!"); + txtCode.Text = ""; + txtCode.Focus(); + return; + } foreach (var rule in _barcodeRules) { if (System.Text.RegularExpressions.Regex.IsMatch(inputstring, rule.REGEX)) @@ -1254,10 +1263,7 @@ namespace QMAPP.WinForm.Forms.TianJin strcarsetdesc_cn = rule.MATERIAL_TYPE; } } - - //主键 - strFiskey = Guid.NewGuid().ToString(); - + CreateNFPaste(inputstring); //创建NF的贴车单以及明细 //CreateNFPaste__(); @@ -1347,8 +1353,15 @@ namespace QMAPP.WinForm.Forms.TianJin #region 判断当前扫描过的数据集合中是否有相同条码 //判断当前扫描过的数据集合中是否有相同条码 - CheckDataBase(Code); - + string msg = ""; + CheckDataBase(Code,ref msg); + if (!string.IsNullOrEmpty(msg)) + { + Alert("该条码已扫描!"); + txtCode.Text = ""; + txtCode.Focus(); + return; + } #endregion #endregion @@ -1552,8 +1565,9 @@ namespace QMAPP.WinForm.Forms.TianJin /// 判断数据库中是否有相同的条码 /// /// 扫描条码 - private void CheckDataBase(string strbarcode) + private void CheckDataBase(string strbarcode,ref string messages) { + var messagess = ""; barcodeidentification = ""; //特殊条码，当丢失条码或者条码损坏时，扫描一个特殊条码 @@ -1562,8 +1576,10 @@ namespace QMAPP.WinForm.Forms.TianJin if (tblbarcode.Rows.Count > 0) { + messagess = "扫描条码重复，请重新扫描。"; Alert("扫描条码重复，请重新扫描。"); } + messages = messagess; } #endregion @@ -1717,11 +1733,11 @@ namespace QMAPP.WinForm.Forms.TianJin nfpastecard.DetailsCardlist = new List(); nfpastecard.PASTE_CARD_KEY = nfpastcardkey; nfpastecard.PASTECARDNO = ""; - nfpastecard.PRODUCTIONNAME = pFisType; + nfpastecard.PRODUCTIONNAME = "DPFY" + pFisType; nfpastecard.PASTECARDDATE = DateTime.Now.ToString(); nfpastecard.OPERATOR = UserBuffer.UserCode; nfpastecard.CREATETIME = DateTime.Now.ToString(); - nfpastecard.PLANTNAME = pFisType.ToString(); + nfpastecard.PLANTNAME = "DPFY"+pFisType.ToString(); } TJEPasteDetailsCard pastdetail = new TJEPasteDetailsCard(); @@ -1770,7 +1786,7 @@ namespace QMAPP.WinForm.Forms.TianJin if (tbl.Rows.Count == 0) { - nfpastecard.PASTECARDNO = WORKCENTER_CODE + DateTime.Now.ToString("yyyyMMdd") + "0001"; + nfpastecard.PASTECARDNO = nfpastecard.PLANTNAME + DateTime.Now.ToString("yyyyMMdd") + "0001"; int delResult = agent.InvokeServiceFunction(QMAPP.ServicesAgent.FrmPlaceManage.TJFrmPlaceBLL_InsertDaspssteCarIndexByPlanName.ToString(), nfpastecard); } else @@ -2079,6 +2095,8 @@ namespace QMAPP.WinForm.Forms.TianJin /// public void SetContainerItem(int itemindex, bool result) { + if (itemindex == 0) + return; if (itemindex == 1) { var label = tpContainer.GetControlFromPosition(0, 0) as Label; diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.Designer.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.Designer.cs new file mode 100644 index 0000000..c31f116 --- /dev/null +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.Designer.cs @@ -0,0 +1,512 @@ +namespace QMAPP.WinForm.Forms.TianJin +{ + partial class TJPrintPlanLabel + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = 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.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.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TJPrintPlanLabel)); + this.dgvPlan = new System.Windows.Forms.DataGridView(); + this.dgcOrderNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dgcSeq = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dgcMaterialCode = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dgcMaterialName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dgcState = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dgcPlanDate = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dgcShift = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn11 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.tpContent = new System.Windows.Forms.TabControl(); + this.tpPlanList = new System.Windows.Forms.TabPage(); + this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.tsbPrint = new System.Windows.Forms.ToolStripButton(); + this.tsbOrderOperation = new System.Windows.Forms.ToolStripDropDownButton(); + this.tsmiSuspendOrder = new System.Windows.Forms.ToolStripMenuItem(); + this.tsmiCancelSuspend = new System.Windows.Forms.ToolStripMenuItem(); + this.tsmiDeleteOrder = new System.Windows.Forms.ToolStripMenuItem(); + this.tslblOrderCount = new System.Windows.Forms.ToolStripLabel(); + this.label1 = new System.Windows.Forms.Label(); + this.cbRoutes = new System.Windows.Forms.ComboBox(); + this.cbPlanFilter = new System.Windows.Forms.ComboBox(); + this.label10 = new System.Windows.Forms.Label(); + this.cbListRowcount = new System.Windows.Forms.ComboBox(); + this.cbRefreshRate = new System.Windows.Forms.ComboBox(); + this.label8 = new System.Windows.Forms.Label(); + this.label6 = new System.Windows.Forms.Label(); + this.timer1 = new System.Windows.Forms.Timer(this.components); + ((System.ComponentModel.ISupportInitialize)(this.dgvPlan)).BeginInit(); + this.tpContent.SuspendLayout(); + this.tpPlanList.SuspendLayout(); + this.toolStrip1.SuspendLayout(); + this.SuspendLayout(); + // + // dgvPlan + // + this.dgvPlan.AllowUserToAddRows = false; + this.dgvPlan.AllowUserToDeleteRows = false; + this.dgvPlan.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.dgvPlan.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells; + this.dgvPlan.BackgroundColor = System.Drawing.SystemColors.ButtonFace; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvPlan.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; + this.dgvPlan.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dgvPlan.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.dgcOrderNo, + this.dgcSeq, + this.dgcMaterialCode, + this.dgcMaterialName, + this.dgcState, + this.dgcPlanDate, + this.dgcShift, + this.dataGridViewTextBoxColumn8, + this.dataGridViewTextBoxColumn9, + this.dataGridViewTextBoxColumn10, + this.dataGridViewTextBoxColumn11}); + this.dgvPlan.Location = new System.Drawing.Point(6, 6); + this.dgvPlan.Name = "dgvPlan"; + this.dgvPlan.ReadOnly = true; + dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle9.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvPlan.RowHeadersDefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle10.Padding = new System.Windows.Forms.Padding(0, 0, 8, 0); + this.dgvPlan.RowsDefaultCellStyle = dataGridViewCellStyle10; + this.dgvPlan.RowTemplate.Height = 23; + this.dgvPlan.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.dgvPlan.Size = new System.Drawing.Size(852, 183); + this.dgvPlan.TabIndex = 7; + this.dgvPlan.RowPrePaint += new System.Windows.Forms.DataGridViewRowPrePaintEventHandler(this.dgvPlan_RowPrePaint); + this.dgvPlan.SelectionChanged += new System.EventHandler(this.dgvPlan_SelectionChanged); + // + // dgcOrderNo + // + this.dgcOrderNo.DataPropertyName = "ORDERPLAN_NO"; + dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.dgcOrderNo.DefaultCellStyle = dataGridViewCellStyle2; + this.dgcOrderNo.HeaderText = "订单号"; + this.dgcOrderNo.Name = "dgcOrderNo"; + this.dgcOrderNo.ReadOnly = true; + this.dgcOrderNo.Width = 94; + // + // dgcSeq + // + this.dgcSeq.DataPropertyName = "SEQ"; + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 15.75F); + this.dgcSeq.DefaultCellStyle = dataGridViewCellStyle3; + this.dgcSeq.HeaderText = "顺序号"; + this.dgcSeq.Name = "dgcSeq"; + this.dgcSeq.ReadOnly = true; + this.dgcSeq.Width = 94; + // + // dgcMaterialCode + // + this.dgcMaterialCode.DataPropertyName = "MATERIAL_CODE"; + dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 15.75F); + this.dgcMaterialCode.DefaultCellStyle = dataGridViewCellStyle4; + this.dgcMaterialCode.HeaderText = "零件号"; + this.dgcMaterialCode.Name = "dgcMaterialCode"; + this.dgcMaterialCode.ReadOnly = true; + this.dgcMaterialCode.Width = 94; + // + // dgcMaterialName + // + this.dgcMaterialName.DataPropertyName = "MATERIAL_NAME"; + dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 15.75F); + this.dgcMaterialName.DefaultCellStyle = dataGridViewCellStyle5; + this.dgcMaterialName.HeaderText = "零件描述"; + this.dgcMaterialName.Name = "dgcMaterialName"; + this.dgcMaterialName.ReadOnly = true; + this.dgcMaterialName.Width = 113; + // + // dgcState + // + dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.dgcState.DefaultCellStyle = dataGridViewCellStyle6; + this.dgcState.HeaderText = "工单状态"; + this.dgcState.MinimumWidth = 80; + this.dgcState.Name = "dgcState"; + this.dgcState.ReadOnly = true; + this.dgcState.Width = 113; + // + // dgcPlanDate + // + this.dgcPlanDate.DataPropertyName = "PLAN_DATE"; + dataGridViewCellStyle7.Font = new System.Drawing.Font("宋体", 15.75F); + this.dgcPlanDate.DefaultCellStyle = dataGridViewCellStyle7; + this.dgcPlanDate.HeaderText = "计划日期"; + this.dgcPlanDate.Name = "dgcPlanDate"; + this.dgcPlanDate.ReadOnly = true; + this.dgcPlanDate.Width = 113; + // + // dgcShift + // + this.dgcShift.DataPropertyName = "SHIFT_CODE"; + dataGridViewCellStyle8.Font = new System.Drawing.Font("宋体", 15.75F); + this.dgcShift.DefaultCellStyle = dataGridViewCellStyle8; + this.dgcShift.HeaderText = "计划类型"; + this.dgcShift.Name = "dgcShift"; + this.dgcShift.ReadOnly = true; + this.dgcShift.Width = 113; + // + // dataGridViewTextBoxColumn8 + // + this.dataGridViewTextBoxColumn8.DataPropertyName = "PID"; + this.dataGridViewTextBoxColumn8.HeaderText = "Pid"; + this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8"; + this.dataGridViewTextBoxColumn8.ReadOnly = true; + this.dataGridViewTextBoxColumn8.Visible = false; + this.dataGridViewTextBoxColumn8.Width = 66; + // + // dataGridViewTextBoxColumn9 + // + this.dataGridViewTextBoxColumn9.DataPropertyName = "PDID"; + this.dataGridViewTextBoxColumn9.HeaderText = "PROID"; + this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9"; + this.dataGridViewTextBoxColumn9.ReadOnly = true; + this.dataGridViewTextBoxColumn9.Visible = false; + this.dataGridViewTextBoxColumn9.Width = 96; + // + // dataGridViewTextBoxColumn10 + // + this.dataGridViewTextBoxColumn10.DataPropertyName = "PRODUCTTYPE"; + this.dataGridViewTextBoxColumn10.HeaderText = "PType"; + this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10"; + this.dataGridViewTextBoxColumn10.ReadOnly = true; + this.dataGridViewTextBoxColumn10.Visible = false; + this.dataGridViewTextBoxColumn10.Width = 93; + // + // dataGridViewTextBoxColumn11 + // + this.dataGridViewTextBoxColumn11.DataPropertyName = "OPERATESTATE"; + this.dataGridViewTextBoxColumn11.HeaderText = "OPERATESTATE"; + this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11"; + this.dataGridViewTextBoxColumn11.ReadOnly = true; + this.dataGridViewTextBoxColumn11.Visible = false; + this.dataGridViewTextBoxColumn11.Width = 176; + // + // tpContent + // + this.tpContent.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.tpContent.Controls.Add(this.tpPlanList); + this.tpContent.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.tpContent.ItemSize = new System.Drawing.Size(120, 45); + this.tpContent.Location = new System.Drawing.Point(5, 55); + this.tpContent.Name = "tpContent"; + this.tpContent.SelectedIndex = 0; + this.tpContent.Size = new System.Drawing.Size(872, 323); + this.tpContent.TabIndex = 0; + // + // tpPlanList + // + this.tpPlanList.Controls.Add(this.toolStrip1); + this.tpPlanList.Controls.Add(this.dgvPlan); + this.tpPlanList.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.tpPlanList.Location = new System.Drawing.Point(4, 49); + this.tpPlanList.Name = "tpPlanList"; + this.tpPlanList.Padding = new System.Windows.Forms.Padding(3); + this.tpPlanList.Size = new System.Drawing.Size(864, 270); + this.tpPlanList.TabIndex = 0; + this.tpPlanList.Text = "计划列表"; + this.tpPlanList.UseVisualStyleBackColor = true; + // + // toolStrip1 + // + this.toolStrip1.AutoSize = false; + this.toolStrip1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.toolStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); + this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.tsbPrint, + this.tsbOrderOperation, + this.tslblOrderCount}); + this.toolStrip1.Location = new System.Drawing.Point(3, 197); + this.toolStrip1.Name = "toolStrip1"; + this.toolStrip1.Size = new System.Drawing.Size(858, 70); + this.toolStrip1.Stretch = true; + this.toolStrip1.TabIndex = 0; + this.toolStrip1.Text = "toolStrip1"; + // + // tsbPrint + // + this.tsbPrint.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.tsbPrint.Font = new System.Drawing.Font("微软雅黑", 12F); + this.tsbPrint.Image = ((System.Drawing.Image)(resources.GetObject("tsbPrint.Image"))); + this.tsbPrint.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.tsbPrint.ImageTransparentColor = System.Drawing.Color.White; + this.tsbPrint.Name = "tsbPrint"; + this.tsbPrint.Size = new System.Drawing.Size(114, 67); + this.tsbPrint.Text = "打印(&P)"; + this.tsbPrint.Click += new System.EventHandler(this.tsbPrint_Click); + // + // tsbOrderOperation + // + this.tsbOrderOperation.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.tsbOrderOperation.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.tsmiSuspendOrder, + this.tsmiCancelSuspend, + this.tsmiDeleteOrder}); + this.tsbOrderOperation.Font = new System.Drawing.Font("微软雅黑", 12F); + this.tsbOrderOperation.Image = global::QMAPP.WinForm.Resource1.edit; + this.tsbOrderOperation.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.tsbOrderOperation.ImageTransparentColor = System.Drawing.Color.White; + this.tsbOrderOperation.Name = "tsbOrderOperation"; + this.tsbOrderOperation.Size = new System.Drawing.Size(135, 67); + this.tsbOrderOperation.Text = "工单操作"; + // + // tsmiSuspendOrder + // + this.tsmiSuspendOrder.Image = global::QMAPP.WinForm.Resource1.stop; + this.tsmiSuspendOrder.Margin = new System.Windows.Forms.Padding(0, 7, 0, 7); + this.tsmiSuspendOrder.Name = "tsmiSuspendOrder"; + this.tsmiSuspendOrder.Size = new System.Drawing.Size(144, 26); + this.tsmiSuspendOrder.Text = "挂起工单"; + this.tsmiSuspendOrder.TextAlign = System.Drawing.ContentAlignment.BottomCenter; + this.tsmiSuspendOrder.Click += new System.EventHandler(this.tsmiSuspendOrder_Click); + // + // tsmiCancelSuspend + // + this.tsmiCancelSuspend.Image = global::QMAPP.WinForm.Resource1.back; + this.tsmiCancelSuspend.Margin = new System.Windows.Forms.Padding(0, 7, 0, 7); + this.tsmiCancelSuspend.Name = "tsmiCancelSuspend"; + this.tsmiCancelSuspend.Size = new System.Drawing.Size(144, 26); + this.tsmiCancelSuspend.Text = "取消挂起"; + this.tsmiCancelSuspend.Click += new System.EventHandler(this.tsmiCancelSuspend_Click); + // + // tsmiDeleteOrder + // + this.tsmiDeleteOrder.Image = global::QMAPP.WinForm.Resource1.delete; + this.tsmiDeleteOrder.Margin = new System.Windows.Forms.Padding(0, 7, 0, 7); + this.tsmiDeleteOrder.Name = "tsmiDeleteOrder"; + this.tsmiDeleteOrder.Size = new System.Drawing.Size(144, 26); + this.tsmiDeleteOrder.Text = "删除工单"; + this.tsmiDeleteOrder.Click += new System.EventHandler(this.tsmiDeleteOrder_Click); + // + // tslblOrderCount + // + this.tslblOrderCount.Font = new System.Drawing.Font("微软雅黑", 14F); + this.tslblOrderCount.Name = "tslblOrderCount"; + this.tslblOrderCount.Size = new System.Drawing.Size(140, 67); + this.tslblOrderCount.Text = "计划总数：100"; + this.tslblOrderCount.Visible = false; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(12, 13); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(69, 25); + this.label1.TabIndex = 10; + this.label1.Text = "生产线"; + // + // cbRoutes + // + this.cbRoutes.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cbRoutes.FormattingEnabled = true; + this.cbRoutes.Location = new System.Drawing.Point(87, 10); + this.cbRoutes.Name = "cbRoutes"; + this.cbRoutes.Size = new System.Drawing.Size(359, 33); + this.cbRoutes.TabIndex = 1; + // + // cbPlanFilter + // + this.cbPlanFilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.cbPlanFilter.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cbPlanFilter.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.cbPlanFilter.FormattingEnabled = true; + this.cbPlanFilter.Items.AddRange(new object[] { + "显示全部工单", + "隐藏挂起工单", + "只看挂起工单"}); + this.cbPlanFilter.Location = new System.Drawing.Point(351, 66); + this.cbPlanFilter.Name = "cbPlanFilter"; + this.cbPlanFilter.Size = new System.Drawing.Size(175, 33); + this.cbPlanFilter.TabIndex = 2; + // + // label10 + // + this.label10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label10.AutoSize = true; + this.label10.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label10.Location = new System.Drawing.Point(283, 72); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(65, 20); + this.label10.TabIndex = 16; + this.label10.Text = "工单过滤"; + // + // cbListRowcount + // + this.cbListRowcount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.cbListRowcount.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cbListRowcount.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.cbListRowcount.FormattingEnabled = true; + this.cbListRowcount.Items.AddRange(new object[] { + "20", + "30", + "40", + "50", + "100"}); + this.cbListRowcount.Location = new System.Drawing.Point(625, 66); + this.cbListRowcount.Name = "cbListRowcount"; + this.cbListRowcount.Size = new System.Drawing.Size(78, 33); + this.cbListRowcount.TabIndex = 3; + // + // cbRefreshRate + // + this.cbRefreshRate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.cbRefreshRate.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cbRefreshRate.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.cbRefreshRate.FormattingEnabled = true; + this.cbRefreshRate.Items.AddRange(new object[] { + "1s", + "2s", + "5s", + "10s", + "15s", + "20s"}); + this.cbRefreshRate.Location = new System.Drawing.Point(802, 66); + this.cbRefreshRate.Name = "cbRefreshRate"; + this.cbRefreshRate.Size = new System.Drawing.Size(66, 33); + this.cbRefreshRate.TabIndex = 4; + // + // label8 + // + this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label8.AutoSize = true; + this.label8.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label8.Location = new System.Drawing.Point(529, 72); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(93, 20); + this.label8.TabIndex = 12; + this.label8.Text = "列表显示行数"; + // + // label6 + // + this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label6.AutoSize = true; + this.label6.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label6.Location = new System.Drawing.Point(706, 72); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(93, 20); + this.label6.TabIndex = 13; + this.label6.Text = "计划刷新频率"; + // + // timer1 + // + this.timer1.Enabled = true; + this.timer1.Interval = 1000; + this.timer1.Tick += new System.EventHandler(this.timer1_Tick); + // + // PrintPlanLabel + // + this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 25F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(880, 382); + this.Controls.Add(this.cbPlanFilter); + this.Controls.Add(this.label10); + this.Controls.Add(this.cbListRowcount); + this.Controls.Add(this.cbRefreshRate); + this.Controls.Add(this.label8); + this.Controls.Add(this.label6); + this.Controls.Add(this.cbRoutes); + this.Controls.Add(this.label1); + this.Controls.Add(this.tpContent); + this.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.Name = "PrintPlanLabel"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "门板计划标签打印"; + this.Load += new System.EventHandler(this.PrintPlanLabel_Load); + ((System.ComponentModel.ISupportInitialize)(this.dgvPlan)).EndInit(); + this.tpContent.ResumeLayout(false); + this.tpPlanList.ResumeLayout(false); + this.toolStrip1.ResumeLayout(false); + this.toolStrip1.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.DataGridView dgvPlan; + private System.Windows.Forms.DataGridViewTextBoxColumn dgcOrderNo; + private System.Windows.Forms.DataGridViewTextBoxColumn dgcSeq; + private System.Windows.Forms.DataGridViewTextBoxColumn dgcMaterialCode; + private System.Windows.Forms.DataGridViewTextBoxColumn dgcMaterialName; + private System.Windows.Forms.DataGridViewTextBoxColumn dgcState; + private System.Windows.Forms.DataGridViewTextBoxColumn dgcPlanDate; + private System.Windows.Forms.DataGridViewTextBoxColumn dgcShift; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn10; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn11; + private System.Windows.Forms.TabControl tpContent; + private System.Windows.Forms.TabPage tpPlanList; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.ComboBox cbRoutes; + private System.Windows.Forms.ToolStrip toolStrip1; + private System.Windows.Forms.ToolStripButton tsbPrint; + private System.Windows.Forms.ToolStripDropDownButton tsbOrderOperation; + private System.Windows.Forms.ToolStripMenuItem tsmiSuspendOrder; + private System.Windows.Forms.ToolStripMenuItem tsmiCancelSuspend; + private System.Windows.Forms.ToolStripMenuItem tsmiDeleteOrder; + private System.Windows.Forms.ToolStripLabel tslblOrderCount; + private System.Windows.Forms.ComboBox cbPlanFilter; + private System.Windows.Forms.Label label10; + private System.Windows.Forms.ComboBox cbListRowcount; + private System.Windows.Forms.ComboBox cbRefreshRate; + private System.Windows.Forms.Label label8; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.Timer timer1; + + } +} \ No newline at end of file diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs new file mode 100644 index 0000000..0df71d9 --- /dev/null +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs @@ -0,0 +1,513 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using QMAPP.FJC.Entity.Basic; +using QMAPP.FJC.Entity.Operation; +using QMAPP.ServicesAgent; +using QMAPP.MD.Entity; +using QMAPP.Entity; +using QMFrameWork.Data; +using System.Configuration; + +namespace QMAPP.WinForm.Forms.TianJin +{ + public partial class TJPrintPlanLabel : Form + { + QMAPP.ServicesAgent.ServiceAgent _agent = ClientContext.GetServiceAgent(); + List cbsource = null; + + + /// + /// + /// + public TJPrintPlanLabel() + { + InitializeComponent(); + } + + /// + /// 加载工艺路线 + /// + private void LoadProcessRoute() + { + var routes = _agent.InvokeServiceFunction>> + ("ProcessRouteBLL_GetProcessRouteList", new QMAPP.FJC.Entity.Basic.ProcessRoute { }).Result; + routes = routes.OrderBy(p => p.ROUTE_CODE).ToList(); + + cbsource = routes; + cbsource.Insert(0, new QMAPP.FJC.Entity.Basic.ProcessRoute { ROUTE_NAME = "", ROUTE_CODE = "" }); + cbRoutes.DisplayMember = "ROUTE_NAME"; + cbRoutes.ValueMember = "ROUTE_CODE"; + cbRoutes.DataSource = cbsource; + } + + #region 加载列表显示设置 + /// + /// 加载列表显示设置 + /// + private void LoadViewSetting() + { + #region 加载列表显示设置 + string filepath = ConfigurationManager.AppSettings["SaveFilePath"]; + filepath = string.Format("{0}ViewSetting.cfg", filepath); + + var setting = new { ListRowcount = 20, RefreshRate = 5 }; + if (System.IO.File.Exists(filepath)) + { + string settingstring = System.IO.File.ReadAllText(filepath); + setting = Newtonsoft.Json.JsonConvert.DeserializeAnonymousType(settingstring, setting); + } + cbListRowcount.Text = setting.ListRowcount.ToString(); + cbRefreshRate.Text = string.Format("{0}s", setting.RefreshRate); + cbPlanFilter.SelectedIndex = 1; + + cbListRowcount.SelectedIndexChanged += new EventHandler(cbListRowcount_SelectedIndexChanged); + cbRefreshRate.SelectedIndexChanged += new EventHandler(cbRefreshRate_SelectedIndexChanged); + cbPlanFilter.TextChanged += new EventHandler(cbPlanFilter_SelectedIndexChanged); + + #endregion + } + #endregion + #region 列表定时刷新 + private void cbListRowcount_SelectedIndexChanged(object sender, EventArgs e) + { + SaveSetting(); + BindPlanView(); + } + /// + /// 发送指令或者接受完成指令刷新列表 + /// + public void BindPlanView() + { + #region 刷新生产计划 + dgvPlan.AutoGenerateColumns = false; + this.dgvPlan.DataSource = new List(); + + + try + { + DataPage dataPage = new DataPage(); + dataPage.PageSize = int.Parse(cbListRowcount.Text); + dataPage.PageIndex = 1; + dataPage.SortExpression = " ROWVALUE ASC"; + #region 服务查询 + var orderlist = _agent.InvokeServiceFunction>("WorkOrderBLL_GetOrderUnPrinted", cbRoutes.SelectedValue.ToString(), cbPlanFilter.SelectedIndex, dataPage); + #endregion + this.dgvPlan.DataSource = orderlist; + } + catch (Exception ex) + { + WriteLog.WriteError(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " " + ex.Message); + } + finally + { + timecounter = 0; + } + #endregion + } + private void cbRefreshRate_SelectedIndexChanged(object sender, EventArgs e) + { + SaveSetting(); + } + private void cbPlanFilter_SelectedIndexChanged(object sender, EventArgs e) + { + BindPlanView(); + SaveSetting(); + } + + private void SaveSetting() + { + string filepath = ConfigurationManager.AppSettings["SaveFilePath"]; + filepath = string.Format("{0}ViewSetting.cfg", filepath); + var setting = new + { + ListRowcount = int.Parse(cbListRowcount.Text), + RefreshRate = int.Parse(cbRefreshRate.Text.Trim('s')), + //PlanFilter = cbPlanFilter.SelectedIndex + }; + string settingstring = Newtonsoft.Json.JsonConvert.SerializeObject(setting); + System.IO.File.WriteAllText(filepath, settingstring); + } + int timecounter = 0; + private void timer1_Tick(object sender, EventArgs e) + { + if (!tsbOrderOperation.DropDown.Visible) + { + timecounter += 1; + if (timecounter > int.Parse(cbRefreshRate.Text.Trim('s')))//计时达到刷新时间 + { + + BindPlanView(); + + } + } + } + #endregion + + private void PrintLabel(List labeldata) + { + #region 计划标签打印 + //string xmlPath = System.Configuration.ConfigurationSettings.AppSettings["XmlName"].ToString(); ; + //BarcodeLib.BarCodeGenerate g = new BarcodeLib.BarCodeGenerate( xmlPath); + //bool b = g.PrintBarCode(_operationServiceParam.main.MAINCODE); + QM.Assist.LabelInfo ll = new QM.Assist.LabelInfo(); + StringBuilder dataline=new StringBuilder(); + foreach (var label in labeldata) + { + string[] texts = new string[6]; + + var sourcetext = label.Description.Split(new string[] { "\r\n" }, StringSplitOptions.RemoveEmptyEntries); + + for (int i = 0; i < texts.Length && i < sourcetext.Length; i++) + { + texts[i] = sourcetext[i]; + } + + //OrderNo,OrderType,PlanDate,Name,Class,CarModel,Text1,Text2,Text3,Text4,Text5,Text6 + dataline.AppendFormat("\"{0}\",\"{1}\",\"{2:yyyy-MM-dd HH:mm:ss}\",\"{3}\",\"{4}\",\"{5}\",\"{6}\",\"{7}\",\"{8}\",\"{9}\",\"{10}\",\"{11}\"\r\n", + label.OrderNo,//计划号 + label.OrderType,//计划类型(0:FIS,1:STOCK,2:INSERT) + label.PlanDate,//计划日期 + label.MaterialName,//总成物料名称 + label.Class,// + label.CarModel,//车型 + texts[0],//装配详细信息 + texts[1],//装配详细信息 + texts[2],//装配详细信息 + texts[3],//装配详细信息 + texts[4],//装配详细信息 + texts[5]//装配详细信息 + ); + + + } + + ll.BarCode=dataline.ToString().TrimEnd('\r','\n'); + ll.PrinterName = ""; + QM.Assist.PrintUtil.LabelList2.Add(ll); + QM.Assist.PrintUtil pu = new QM.Assist.PrintUtil(); + pu.PrintLabel2(System.Configuration.ConfigurationManager.AppSettings["proPath"].ToString + (), System.Configuration.ConfigurationManager.AppSettings["PlanLabelTMPPath"].ToString + (), System.Configuration.ConfigurationManager.AppSettings["PlanLabelDATPath"].ToString + ()); + + #endregion + } + + private void PrintPlanLabel_Load(object sender, EventArgs e) + { + LoadViewSetting(); + LoadProcessRoute(); + //如果工位已设定 + if (ClientContext.MachineInfo != null && !string.IsNullOrEmpty(ClientContext.MachineInfo.PID)) + { + //this.comMachine.SelectedValue = ClientContext.MachineInfo.MACHINECODDE; + var route = _agent.InvokeServiceFunction + ("ProcessRouteBLL_GetRouteByMachine", ClientContext.MachineInfo.MACHINECODDE); + if (route != null) + { + this.cbRoutes.SelectedValue = route.ROUTE_CODE; + this.cbRoutes.Enabled = false; + } + else + { + this.cbRoutes.Enabled = true; + } + } + else + { + this.cbRoutes.Enabled = true; + } + BindPlanView(); + cbRoutes.SelectedIndexChanged += new EventHandler(cbRoutes_SelectedIndexChanged); + } + + void cbRoutes_SelectedIndexChanged(object sender, EventArgs e) + { + BindPlanView(); + } + #region 工单操作 + + #region 取消挂起 + /// + /// 取消挂起 + /// + /// + /// + private void tsmiCancelSuspend_Click(object sender, EventArgs e) + { + if (dgvPlan.SelectedRows.Count <= 0) + { + MessageBox.Show("请选择一条工单进行取消挂起操作！"); + return; + } + List ids = new List(); + foreach (System.Windows.Forms.DataGridViewRow row in dgvPlan.SelectedRows) + { + var order = (QMAPP.FJC.Entity.ProductionPlan.WorkOrder)row.DataBoundItem; + if (!int.Equals(order.STATE, 4)) + { + MessageBox.Show("只可取消状态为挂起的工单！"); + return; + } + ids.Add(order.PID); + } + _agent.InvokeServiceFunction(B9IPCService.WorkOrderBLL_CancelSuspend.ToString(), ids); + BindPlanView(); + } + #endregion + + #region 删除工单 + /// + /// 删除工单 + /// + /// + /// + private void tsmiDeleteOrder_Click(object sender, EventArgs e) + { + if (dgvPlan.SelectedRows.Count <= 0) + { + MessageBox.Show("请选择一条工单进行删除操作！"); + return; + } + List ids = new List(); + foreach (System.Windows.Forms.DataGridViewRow row in dgvPlan.SelectedRows) + { + var order = (QMAPP.FJC.Entity.ProductionPlan.WorkOrder)row.DataBoundItem; + if (!int.Equals(order.STATE, 4)) + { + MessageBox.Show("只可删除状态为挂起的工单！"); + return; + } + ids.Add(order.PID); + } + _agent.InvokeServiceFunction(B9IPCService.WorkOrderBLL_DeleteOrder.ToString(), ids); + BindPlanView(); + } + #endregion + + #region 重置工单 + /// + /// 重置工单 + /// + /// + /// + private void tsmiResetOrder_Click(object sender, EventArgs e) + { + if (dgvPlan.SelectedRows.Count <= 0) + { + MessageBox.Show("请选择一条工单进行重置操作！"); + return; + } + List ids = new List(); + foreach (System.Windows.Forms.DataGridViewRow row in dgvPlan.SelectedRows) + { + var order = (QMAPP.FJC.Entity.ProductionPlan.WorkOrder)row.DataBoundItem; + if (!int.Equals(order.STATE, 4)) + { + MessageBox.Show("只可重置状态为挂起的工单！"); + return; + } + ids.Add(order.PID); + } + _agent.InvokeServiceFunction(B9IPCService.WorkOrderBLL_ResetOrder.ToString(), ids); + BindPlanView(); + } + #endregion + + #region 挂起工单 + /// + /// 挂起工单 + /// + /// + /// + private void tsmiSuspendOrder_Click(object sender, EventArgs e) + { + if (dgvPlan.SelectedRows.Count <= 0) + { + MessageBox.Show("请选择一条工单进行挂起操作！"); + return; + } + List ids = new List(); + foreach (System.Windows.Forms.DataGridViewRow row in dgvPlan.SelectedRows) + { + var order = (QMAPP.FJC.Entity.ProductionPlan.WorkOrder)row.DataBoundItem; + if (int.Equals(order.STATE, 2)) + { + MessageBox.Show("不能挂起正在执行的工单！"); + return; + } + ids.Add(order.PID); + } + _agent.InvokeServiceFunction(B9IPCService.WorkOrderBLL_SuspendOrder.ToString(), ids); + BindPlanView(); + } + #endregion + + #region 回收工单 + /// + /// 回收工单 + /// + /// + /// + private void tsmiTakebackOrder_Click(object sender, EventArgs e) + { + if (dgvPlan.SelectedRows.Count <= 0) + { + MessageBox.Show("请选择一条工单进行回收操作！"); + return; + } + List ids = new List(); + foreach (System.Windows.Forms.DataGridViewRow row in dgvPlan.SelectedRows) + { + var order = (QMAPP.FJC.Entity.ProductionPlan.WorkOrder)row.DataBoundItem; + if (!int.Equals(order.STATE, 4)) + { + MessageBox.Show("只可回收状态为挂起的工单！"); + return; + } + ids.Add(order.PID); + } + _agent.InvokeServiceFunction(B9IPCService.WorkOrderBLL_TakeBack.ToString(), ids); + BindPlanView(); + } + #endregion + + #endregion + + #region 工单列表选择发送变化时延时自动刷新 + /// + /// 工单列表选择发送变化时延时自动刷新 + /// + /// + /// + private void dgvPlan_SelectionChanged(object sender, EventArgs e) + { + timecounter = -10; + } + #endregion + + #region 设置计划工单列状态、颜色 + /// + /// 设置计划工单列状态、颜色 + /// + /// + /// + private void dgvPlan_RowPrePaint(object sender, DataGridViewRowPrePaintEventArgs e) + { + var WORKORDER_STATE_TEXT = new string[] { "初始", "确认", "执行中", "完成", "挂起" }; + var row = dgvPlan.Rows[e.RowIndex]; + var order = (FJC.Entity.ProductionPlan.WorkOrder)row.DataBoundItem; + if (order.STATE >= 0 && order.STATE < WORKORDER_STATE_TEXT.Length) + { + row.Cells[dgcState.Name].Value = WORKORDER_STATE_TEXT[order.STATE]; + } + if (order.STATE == FJC.Entity.EnumGeter.WorkOrderState.Suspended.GetHashCode()) + { + row.DefaultCellStyle.BackColor = Color.LightGray; + row.DefaultCellStyle.ForeColor = Color.Gray; + } + if (order.STATE == FJC.Entity.EnumGeter.WorkOrderState.Executing.GetHashCode()) + { + row.DefaultCellStyle.BackColor = Color.YellowGreen; + dgvPlan.ClearSelection(); + } + } + #endregion + + private void tsbPrint_Click(object sender, EventArgs e) + { + if (dgvPlan.Rows.Count == 0) + { + MessageBox.Show("当前生产线没有未打印标签的计划工单！"); + } + tsbPrint.Enabled = false; + var order1 = (FJC.Entity.ProductionPlan.WorkOrder)dgvPlan.Rows[0].DataBoundItem; + var order2 = (FJC.Entity.ProductionPlan.WorkOrder)dgvPlan.Rows[1].DataBoundItem; + + var orders = new List(); + orders.Add(order1); + //if (string.Equals(order1.SEQ, order2.SEQ)) + //{ + // orders.Add(order2); + //} + + List labels = new List(); + + foreach (var order in orders) + { + var data = DateTime.Now.ToString("yyyyMMddHHmmssfff"); + //var codematch = System.Text.RegularExpressions.Regex.Match(order.PBOM_CODE, "_[LR][FR]_"); + string positioncode = GetNameCode(order.MATERIAL_NAME); + var book = _agent.InvokeServiceFunction("FISPhraseBLL_GetFisPhraseBook", order.MATERIAL_CODE + "", positioncode); + + LabelData labeldata = new LabelData(); + + + labeldata.PlanDate = order.PLAN_DATE; + if (book != null) + { + labeldata.Class = " " + book.Class.Substring(0, 2); + labeldata.Description = book.Text; + labeldata.OrderNo = book.CarModel+ positioncode+ data; + } + var mcresult = _agent.InvokeServiceFunction>("MaterialBLL_Get", new Material { MATERIAL_CODE = order.MATERIAL_CODE }); + var material = mcresult.IsSuccess ? mcresult.Result : null; + if (material != null) + { + labeldata.MaterialName = material.MATERIAL_SHORT; + labeldata.CarModel = material.PROJECTCODE; + } + labels.Add(labeldata); + } + PrintLabel(labels); + + //变更打印状态 0=>1 + foreach (var order in orders) + { + //agent.InvokeServiceFunction("WorkOrderBLL_SetOrderPrinted", order.PID); + } + BindPlanView(); + tsbPrint.Enabled = true; + } + public string GetNameCode(string Name) + { + var Code = ""; + if (!string.IsNullOrEmpty(Name)) + { + if(Name.Contains("左前")) + Code = "FL"; + else if(Name.Contains("左后")) + Code = "RL"; + else if (Name.Contains("右前")) + Code = "FR"; + else if (Name.Contains("右后")) + Code = "RR"; + return Code; + } + else + return null; + } + } + class LabelData + { + public string OrderNo { get; set; } + + public DateTime PlanDate { get; set; } + + public string Class { get; set; } + + public string Description { get; set; } + + public string MaterialName { get; set; } + + public string CarModel { get; set; } + + public object[] OrderType { get; set; } + } +} diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.resx b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.resx new file mode 100644 index 0000000..5cb6633 --- /dev/null +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.resx @@ -0,0 +1,234 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + 17, 17 + + + + + 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 + RK5CYII= + + + + 127, 17 + + + 63 + + \ No newline at end of file diff --git a/APPQ5/QMAPP.WinForm/MainForm.Designer.cs b/APPQ5/QMAPP.WinForm/MainForm.Designer.cs index cb67a7e..c6e15ae 100644 --- a/APPQ5/QMAPP.WinForm/MainForm.Designer.cs +++ b/APPQ5/QMAPP.WinForm/MainForm.Designer.cs @@ -46,6 +46,7 @@ this.btnOperateStation = new System.Windows.Forms.ToolStripMenuItem(); this.PrintCodeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiPrintPlanlabel = new System.Windows.Forms.ToolStripMenuItem(); + this.TJtsmiPrintPlanlabel = new System.Windows.Forms.ToolStripMenuItem(); this.tsmDPAssmblyItem = new System.Windows.Forms.ToolStripMenuItem(); this.btnMendGroup = new System.Windows.Forms.ToolStripMenuItem(); this.btnMendOperate = new System.Windows.Forms.ToolStripMenuItem(); @@ -189,6 +190,7 @@ this.btnOperateStation, this.PrintCodeToolStripMenuItem, this.tsmiPrintPlanlabel, + this.TJtsmiPrintPlanlabel, this.tsmDPAssmblyItem}); this.btnOperateGroup.Name = "btnOperateGroup"; this.btnOperateGroup.Size = new System.Drawing.Size(94, 28); @@ -215,6 +217,13 @@ this.tsmiPrintPlanlabel.Text = "门板计划标签打印"; this.tsmiPrintPlanlabel.Click += new System.EventHandler(this.tsmiPrintPlanlabel_Click); // + // TJtsmiPrintPlanlabel + // + this.TJtsmiPrintPlanlabel.Name = "TJtsmiPrintPlanlabel"; + this.TJtsmiPrintPlanlabel.Size = new System.Drawing.Size(224, 28); + this.TJtsmiPrintPlanlabel.Text = "TJ门板计划标签打印"; + this.TJtsmiPrintPlanlabel.Click += new System.EventHandler(this.TJtsmiPrintPlanlabel_Click); + // // tsmDPAssmblyItem // this.tsmDPAssmblyItem.Name = "tsmDPAssmblyItem"; @@ -480,6 +489,7 @@ private System.Windows.Forms.ToolStripMenuItem tsmiPutIn; private System.Windows.Forms.ToolStripStatusLabel tslServerHost; private System.Windows.Forms.ToolStripMenuItem tsmiPrintPlanlabel; + private System.Windows.Forms.ToolStripMenuItem TJtsmiPrintPlanlabel; private System.Windows.Forms.ToolStripMenuItem tsmiTakeOut; private System.Windows.Forms.ToolStripMenuItem tsmiPartReplace; private System.Windows.Forms.ToolStripMenuItem tsmiCheck; diff --git a/APPQ5/QMAPP.WinForm/MainForm.cs b/APPQ5/QMAPP.WinForm/MainForm.cs index fbc7f4b..f86615c 100644 --- a/APPQ5/QMAPP.WinForm/MainForm.cs +++ b/APPQ5/QMAPP.WinForm/MainForm.cs @@ -779,7 +779,11 @@ namespace QMAPP.WinForm f.Focus(); //打开过就让其获得焦点 } } - + /// + /// 门板计划标签打印 + /// + /// + /// private void tsmiPrintPlanlabel_Click(object sender, EventArgs e) { Form f = Application.OpenForms["PrintPlanLabel"]; //查找是否打开过Form1窗体 @@ -798,6 +802,29 @@ namespace QMAPP.WinForm } } + /// + /// 天津门板计划标签打印 + /// + /// + /// + private void TJtsmiPrintPlanlabel_Click(object sender, EventArgs e) + { + Form f = Application.OpenForms["TJPrintPlanLabel"]; //查找是否打开过Form1窗体 + if (f == null) //没打开过 + { + TJPrintPlanLabel form = new TJPrintPlanLabel(); + //new KeyEvent().SetKeyToTxt(form); + ClientContext.SetUserAuth(form); + form.MdiParent = this; + form.Show(); //重新new一个Show出来 + } + else + { + f.WindowState = FormWindowState.Normal; + f.Focus(); //打开过就让其获得焦点 + } + } + private void tsmiInspectSkipping_Click(object sender, EventArgs e) { Form f = Application.OpenForms["frmInspectSkipping"]; //查找是否打开过Form1窗体 diff --git a/APPQ5/QMAPP.WinForm/QMAPP.WinForm.csproj b/APPQ5/QMAPP.WinForm/QMAPP.WinForm.csproj index 754968d..c66fa77 100644 --- a/APPQ5/QMAPP.WinForm/QMAPP.WinForm.csproj +++ b/APPQ5/QMAPP.WinForm/QMAPP.WinForm.csproj @@ -801,6 +801,12 @@ ReprintForm.cs + + Form + + + TJPrintPlanLabel.cs + TJPastCard.rpt True @@ -1284,6 +1290,9 @@ ReprintForm.cs + + TJPrintPlanLabel.cs + TJDefaultDataSetNum.cs