diff --git a/APP/QMAPP.Web/Web.config b/APP/QMAPP.Web/Web.config index 7acb39c..810f3b8 100644 --- a/APP/QMAPP.Web/Web.config +++ b/APP/QMAPP.Web/Web.config @@ -49,8 +49,9 @@ - + + @@ -150,6 +151,14 @@ + + + diff --git a/APPMD/QMAPP.MD.Web/Web.config b/APPMD/QMAPP.MD.Web/Web.config index 450d9bc..8c98a17 100644 --- a/APPMD/QMAPP.MD.Web/Web.config +++ b/APPMD/QMAPP.MD.Web/Web.config @@ -34,10 +34,10 @@ - + + + - - @@ -105,10 +105,17 @@ - --> + + + diff --git a/APPQ5/QMAPP.FJC.DAL/TianJin/StorageDAL.cs b/APPQ5/QMAPP.FJC.DAL/TianJin/StorageDAL.cs index e6207f4..604dc13 100644 --- a/APPQ5/QMAPP.FJC.DAL/TianJin/StorageDAL.cs +++ b/APPQ5/QMAPP.FJC.DAL/TianJin/StorageDAL.cs @@ -165,30 +165,30 @@ namespace QMAPP.FJC.DAL.TianJin { //构成查询语句 - sqlBuilder.Append("SELECT PID,ProductCode,CASE State WHEN '1' THEN '入库' WHEN '2' THEN '出库' ELSE State END as 'StateName' ,OutStorageType,InStorageType,MATERIALCODE,MATERIALNAME,CREATEUSER,CREATEDATE,UPDATEUSER,UPDATEDATE "); - sqlBuilder.Append("FROM T_AW_Storage "); + sqlBuilder.Append("SELECT A.PID,A.ProductCode,CASE A.State WHEN '1' THEN '入库' WHEN '2' THEN '出库' ELSE A.State END as 'StateName' ,A.OutStorageType,A.InStorageType, P.MATERIAL_CODE AS 'MATERIALCODE', m.MATERIAL_NAME as 'MATERIALNAME',A.CREATEUSER,A.CREATEDATE,A.UPDATEUSER,A.UPDATEDATE "); + sqlBuilder.Append("FROM T_AW_Storage AS A LEFT JOIN T_AW_PRODUCT AS P ON P.ProductCode = A.ProductCode left join T_MD_MATERIAL as m on m.MATERIAL_CODE = P.MATERIAL_CODE "); if(!string.IsNullOrEmpty(condition.State)) { - whereBuilder.Append(" AND State = @State"); + whereBuilder.Append(" AND A.State = @State"); parameters.Add(new DataParameter { ParameterName = "State", DataType = DbType.String, Value = condition.State }); } if (string.IsNullOrEmpty(condition.MATERIALCODE) == false) { - whereBuilder.Append(" AND MATERIALCODE = @MATERIALCODE"); + whereBuilder.Append(" AND P.MATERIAL_CODE = @MATERIALCODE"); parameters.Add(new DataParameter { ParameterName = "MATERIALCODE", DataType = DbType.String, Value = condition.MATERIALCODE }); } if (string.IsNullOrEmpty(condition.ProductCode) == false) { - whereBuilder.Append(" AND ProductCode = @ProductCode"); + whereBuilder.Append(" AND A.ProductCode = @ProductCode"); parameters.Add(new DataParameter { ParameterName = "ProductCode", DataType = DbType.String, Value = condition.ProductCode }); } if (condition.BeginTime != DateTime.MinValue) - sqlBuilder.Append($" and CREATEDATE >= '{condition.BeginTime}' "); + whereBuilder.Append($" and A.CREATEDATE >= '{condition.BeginTime}' "); if (condition.EndTime != DateTime.MinValue) - sqlBuilder.Append($" and CREATEDATE <= '{condition.EndTime}' "); + whereBuilder.Append($" and A.CREATEDATE <= '{condition.EndTime}' "); //查询条件 if (whereBuilder.Length > 0) diff --git a/APPQ5/QMAPP.FJC.DAL/TianJin/StorageLogDAL.cs b/APPQ5/QMAPP.FJC.DAL/TianJin/StorageLogDAL.cs index 213cd67..482b02c 100644 --- a/APPQ5/QMAPP.FJC.DAL/TianJin/StorageLogDAL.cs +++ b/APPQ5/QMAPP.FJC.DAL/TianJin/StorageLogDAL.cs @@ -140,28 +140,28 @@ namespace QMAPP.FJC.DAL.TianJin { //构成查询语句 - sqlBuilder.Append("SELECT PID,ProductCode,CASE State WHEN '1' THEN '入库' WHEN '2' THEN '出库' ELSE State END as 'StateName' ,OutStorageType,State,InStorageType,MATERIALCODE,MATERIALNAME,CREATEUSER,CREATEDATE,UPDATEUSER,UPDATEDATE "); - sqlBuilder.Append("FROM T_AW_StorageLog "); + sqlBuilder.Append("SELECT A.PID,A.ProductCode,CASE A.State WHEN '1' THEN '入库' WHEN '2' THEN '出库' ELSE State END as 'StateName' ,A.OutStorageType,A.State,A.InStorageType,P.MATERIAL_CODE AS 'MATERIALCODE', m.MATERIAL_NAME AS 'MATERIALNAME', A.CREATEUSER,A.CREATEDATE,A.UPDATEUSER,A.UPDATEDATE "); + sqlBuilder.Append("FROM T_AW_StorageLog as A LEFT JOIN T_AW_PRODUCT AS P ON P.ProductCode = A.ProductCode LEFT JOIN T_MD_MATERIAL AS m ON m.MATERIAL_CODE = P.MATERIAL_CODE "); if (string.IsNullOrEmpty(condition.MATERIALCODE) == false) { - whereBuilder.Append(" AND MATERIALCODE = @MATERIALCODE"); + whereBuilder.Append(" AND P.MATERIAL_CODE = @MATERIALCODE"); parameters.Add(new DataParameter { ParameterName = "MATERIALCODE", DataType = DbType.String, Value = condition.MATERIALCODE }); } if (string.IsNullOrEmpty(condition.State) == false) { - whereBuilder.Append(" AND State = @State"); + whereBuilder.Append(" AND A.State = @State"); parameters.Add(new DataParameter { ParameterName = "State", DataType = DbType.String, Value = condition.State }); } if (string.IsNullOrEmpty(condition.ProductCode) == false) { - whereBuilder.Append(" AND ProductCode = @ProductCode"); + whereBuilder.Append(" AND A.ProductCode = @ProductCode"); parameters.Add(new DataParameter { ParameterName = "ProductCode", DataType = DbType.String, Value = condition.ProductCode }); } if (condition.BeginTime != DateTime.MinValue) - sqlBuilder.Append($" and CREATEDATE >= '{condition.BeginTime}' "); + whereBuilder.Append($" and A.CREATEDATE >= '{condition.BeginTime}' "); if (condition.EndTime != DateTime.MinValue) - sqlBuilder.Append($" and CREATEDATE <= '{condition.EndTime}' "); + whereBuilder.Append($" and A.CREATEDATE <= '{condition.EndTime}' "); //查询条件 if (whereBuilder.Length > 0) diff --git a/APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs b/APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs index e97d184..7acde66 100644 --- a/APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs +++ b/APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs @@ -310,7 +310,7 @@ namespace QMAPP.FJC.DAL.TianJin //strSql.AppendLine(" WHERE PASTECARDID='" + ppastercarKey.ToString() + "' "); //strSql.AppendLine(" ORDER BY D.ROWINDEX,F.SEQ,F.MATERIAL_CODE"); - strSql.AppendLine("SELECT D.ROWINDEX ,F.SEQ as 'VWSEQ' ,D.SANBARCODE as 'VIN' ,F.MATERIAL_CODE as 'PRODNO' ,(select MATERIAL_TYPE from T_MD_BARCODERULES where REGEX like '%'+ SUBSTRING(D.SANBARCODE,0,9) +'%') as 'CARSETDESC_CN' ,CASE SUBSTRING(D.SANBARCODE,7,2) WHEN 'FL' THEN '左前' WHEN 'RL' THEN '左后' WHEN 'FR' THEN '右前' WHEN 'RR' THEN '右后' ELSE F.MOULD_CODE END AS 'CP5A', "); + strSql.AppendLine("SELECT D.ROWINDEX ,F.SEQ as 'VWSEQ' ,D.SANBARCODE as 'VIN' ,F.MATERIAL_CODE as 'PRODNO' ,D.SANBARCODE AS 'CARSETDESC_CN' ,CASE SUBSTRING(D.SANBARCODE,7,2) WHEN 'FL' THEN '左前' WHEN 'RL' THEN '左后' WHEN 'FR' THEN '右前' WHEN 'RR' THEN '右后' ELSE F.MOULD_CODE END AS 'CP5A', "); strSql.AppendLine("SUBSTRING(D.SANBARCODE,0,4) as 'LINENO' ,C.PASTECARDNO FROM T_PP_PASCARDDETAILS AS D LEFT JOIN T_PP_TJFY_WORKORDER AS F ON F.PID = D.FISDETAILID LEFT JOIN T_PP_PASTECARD AS C ON C.PID = D.PASTECARDID "); strSql.AppendLine(" WHERE PASTECARDID='" + ppastercarKey.ToString() + "' "); strSql.AppendLine(" ORDER BY D.ROWINDEX,F.SEQ,F.MATERIAL_CODE"); diff --git a/APPQ5/QMAPP.FJC.Entity/TianJin/Storage.cs b/APPQ5/QMAPP.FJC.Entity/TianJin/Storage.cs index 667c72c..69418a5 100644 --- a/APPQ5/QMAPP.FJC.Entity/TianJin/Storage.cs +++ b/APPQ5/QMAPP.FJC.Entity/TianJin/Storage.cs @@ -81,7 +81,7 @@ namespace QMAPP.MD.Entity.TianJin /// 创建时间 /// [Description("创建时间")] - [DBColumn(ColumnName = "CREATEDATE", DataType = DbType.String)] + [DBColumn(ColumnName = "CREATEDATE", DataType = DbType.DateTime)] public string CREATEDATE { get; set; } /// @@ -95,7 +95,7 @@ namespace QMAPP.MD.Entity.TianJin /// 修改时间 /// [Description("修改时间")] - [DBColumn(ColumnName = "UPDATEDATE", DataType = DbType.String)] + [DBColumn(ColumnName = "UPDATEDATE", DataType = DbType.DateTime)] public string UPDATEDATE { get; set; } public DateTime EndTime { get; set; } diff --git a/APPQ5/QMAPP.FJC.Web/Models/TianJin/StorageLogModel.cs b/APPQ5/QMAPP.FJC.Web/Models/TianJin/StorageLogModel.cs index f2643b5..98fe253 100644 --- a/APPQ5/QMAPP.FJC.Web/Models/TianJin/StorageLogModel.cs +++ b/APPQ5/QMAPP.FJC.Web/Models/TianJin/StorageLogModel.cs @@ -91,7 +91,7 @@ namespace QMAPP.FJC.Web.Models.TianJin [Description("创建时间")] [HTMLInput(UpdateRead = true, MaxLength = 20)] [InputType(inputType.hidden)] - [DGColumn(Sortable = true, Width = 150, DataAlign = DataAlign.center, FormatDate = "yyyy-MM-dd hh:mm:ss")] + [DGColumn(Sortable = true, Width = 150, DataAlign = DataAlign.center)] public DateTime CREATEDATE { get; set; } /// @@ -106,7 +106,7 @@ namespace QMAPP.FJC.Web.Models.TianJin [Description("更新时间")] [HTMLInput(UpdateRead = true, MaxLength = 20)] [InputType(inputType.hidden)] - [DGColumn(Sortable = true, Width = 150, DataAlign = DataAlign.center, FormatDate = "yyyy-MM-dd hh:mm:ss")] + [DGColumn(Sortable = true, Width = 150, DataAlign = DataAlign.center)] public DateTime UPDATEDATE { get; set; } /// diff --git a/APPQ5/QMAPP.FJC.Web/Models/TianJin/StorageModel.cs b/APPQ5/QMAPP.FJC.Web/Models/TianJin/StorageModel.cs index 5a14d79..d9a71e6 100644 --- a/APPQ5/QMAPP.FJC.Web/Models/TianJin/StorageModel.cs +++ b/APPQ5/QMAPP.FJC.Web/Models/TianJin/StorageModel.cs @@ -80,7 +80,7 @@ namespace QMAPP.FJC.Web.Models.TianJin [Description("创建时间")] [HTMLInput(UpdateRead = true, MaxLength = 20)] [InputType(inputType.hidden)] - [DGColumn(Sortable = true, Width = 150, DataAlign = DataAlign.center, FormatDate = "yyyy-MM-dd hh:mm:ss")] + [DGColumn(Sortable = true, Width = 150, DataAlign = DataAlign.center)] public DateTime CREATEDATE { get; set; } /// @@ -95,7 +95,7 @@ namespace QMAPP.FJC.Web.Models.TianJin [Description("更新时间")] [HTMLInput(UpdateRead = true, MaxLength = 20)] [InputType(inputType.hidden)] - [DGColumn(Sortable = true, Width = 150, DataAlign = DataAlign.center, FormatDate = "yyyy-MM-dd hh:mm:ss")] + [DGColumn(Sortable = true, Width = 150, DataAlign = DataAlign.center)] public DateTime UPDATEDATE { get; set; } /// diff --git a/APPQ5/QMAPP.FJC.Web/Web.config b/APPQ5/QMAPP.FJC.Web/Web.config index c8b9020..41fdfbb 100644 --- a/APPQ5/QMAPP.FJC.Web/Web.config +++ b/APPQ5/QMAPP.FJC.Web/Web.config @@ -29,9 +29,9 @@ - - --> + @@ -43,7 +43,7 @@ - + @@ -118,6 +118,12 @@ + diff --git a/APPQ5/QMAPP.WinForm/App.config b/APPQ5/QMAPP.WinForm/App.config index 5cda615..5fbcefc 100644 --- a/APPQ5/QMAPP.WinForm/App.config +++ b/APPQ5/QMAPP.WinForm/App.config @@ -13,7 +13,7 @@ - + diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.cs index a93c06e..d7e1c17 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.cs @@ -98,9 +98,11 @@ namespace QMAPP.WinForm.Forms.TianJin //bool b = g.PrintBarCode(_operationServiceParam.main.MAINCODE); QM.Assist.LabelInfo ll = new QM.Assist.LabelInfo(); StringBuilder dataline = new StringBuilder(); + var TMPPath = string.Empty; + var DATPath = string.Empty; foreach (var label in labeldata) { - string[] texts = new string[6]; + string[] texts = new string[8]; var sourcetext = label.Description.Split(new string[] { "\r\n" }, StringSplitOptions.RemoveEmptyEntries); @@ -110,7 +112,7 @@ namespace QMAPP.WinForm.Forms.TianJin } //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}\",\"{12}\"\r\n", + dataline.AppendFormat("\"{0}\",\"{1}\",\"{2:yyyy-MM-dd HH:mm:ss}\",\"{3}\",\"{4}\",\"{5}\",\"{6}\",\"{7}\",\"{8}\",\"{9}\",\"{10}\",\"{11}\",\"{12}\",\"{13}\",\"{14}\"\r\n", label.OrderNo,//计划号 label.OrderType,//计划类型(0:FIS,1:STOCK,2:INSERT) label.PlanDate,//计划日期 @@ -123,9 +125,20 @@ namespace QMAPP.WinForm.Forms.TianJin texts[3],//装配详细信息 texts[4],//装配详细信息 texts[5],//装配详细信息 + texts[6],//装配详细信息 + texts[7],//装配详细信息 label.MATERIALCODE// ); - + if (label.OrderNo.Contains("018D")) + { + TMPPath = "PlanLabelTMPPath8D"; + DATPath = "PlanLabelDATPath8D"; + } + else + { + TMPPath = "PlanLabelTMPPath"; + DATPath = "PlanLabelDATPath"; + } } @@ -134,13 +147,64 @@ namespace QMAPP.WinForm.Forms.TianJin 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 + (), System.Configuration.ConfigurationManager.AppSettings[TMPPath].ToString + (), System.Configuration.ConfigurationManager.AppSettings[DATPath].ToString ()); #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}\",\"{12}\"\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],//装配详细信息 + // label.MATERIALCODE// + // ); + + + // } + + // 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 + //} + public string GetNameCode(string Name) { var Code = ""; diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs index d4f6904..125fe09 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs @@ -2066,7 +2066,16 @@ namespace QMAPP.WinForm.Forms.TianJin ncsdr["VIN"] = tbl.Rows[i]["VIN"].ToString(); ncsdr["PRODNO"] = tbl.Rows[i]["PRODNO"].ToString(); ncsdr["CP5A"] = tbl.Rows[i]["CP5A"].ToString(); //门板位置 - ncsdr["CARSETDESCCN"] = tbl.Rows[i]["CARSETDESC_CN"].ToString(); + for(var a = 0;a< dgvNF.Rows.Count;a++) + { + if (dgvNF.Rows[a].Cells[CODE_NF.Name].Value.ToString().ToUpper() == tbl.Rows[i]["VIN"].ToString()) + { + var sssss = dgvNF.Rows[a].Cells[CARSETDESC_CN_NF.Name].Value.ToString(); + ncsdr["CARSETDESCCN"] = sssss; + } + + } + //ncsdr["CARSETDESCCN"] = tbl.Rows[i]["CARSETDESC_CN"].ToString(); ncsdr["PASTECARDNO"] = tbl.Rows[i]["PASTECARDNO"].ToString(); ncsdr["SCANDATE"] = DateTime.Now.ToString(); ncsdr["PRODUCTIONNAME"] = strprodtype; diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJLinStorageForm.Designer.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJLinStorageForm.Designer.cs index e6cd6a6..aa096f1 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJLinStorageForm.Designer.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJLinStorageForm.Designer.cs @@ -29,14 +29,14 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TJLinStorageForm)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = 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 dataGridViewCellStyle13 = 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 dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = 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(); this.label3 = new System.Windows.Forms.Label(); this.txtProductCode = new System.Windows.Forms.TextBox(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); @@ -52,6 +52,7 @@ this.label5 = new System.Windows.Forms.Label(); this.panel1 = new System.Windows.Forms.Panel(); this.DGView = new System.Windows.Forms.DataGridView(); + this.pager1 = new QMAPP.WinForm.Controls.Pager(); this.条码 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.物料号 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.物料名称 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -59,7 +60,6 @@ this.操作人 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.入库时间 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Pid = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.pager1 = new QMAPP.WinForm.Controls.Pager(); this.toolStrip1.SuspendLayout(); this.panelSearchTitle.SuspendLayout(); this.panelSearch.SuspendLayout(); @@ -234,14 +234,14 @@ this.DGView.AllowUserToDeleteRows = false; this.DGView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.DGView.BackgroundColor = System.Drawing.SystemColors.ButtonFace; - dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle9.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, 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.DGView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, 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.DGView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; this.DGView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.DGView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.条码, @@ -255,66 +255,77 @@ this.DGView.Location = new System.Drawing.Point(0, 0); this.DGView.Name = "DGView"; this.DGView.ReadOnly = true; - dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle16.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.DGView.RowHeadersDefaultCellStyle = dataGridViewCellStyle16; + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle8.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.DGView.RowHeadersDefaultCellStyle = dataGridViewCellStyle8; this.DGView.RowTemplate.Height = 23; this.DGView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.DGView.Size = new System.Drawing.Size(998, 442); this.DGView.TabIndex = 4; this.DGView.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.DGView_RowPostPaint); // + // pager1 + // + this.pager1.DataPage = ((QMFrameWork.Data.DataPage)(resources.GetObject("pager1.DataPage"))); + this.pager1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.pager1.Location = new System.Drawing.Point(0, 607); + this.pager1.Name = "pager1"; + this.pager1.OSearch = null; + this.pager1.Size = new System.Drawing.Size(998, 35); + this.pager1.TabIndex = 7; + this.pager1.EventPaging += new QMAPP.WinForm.Controls.EventPagingHandler(this.pager1_EventPaging); + // // 条码 // this.条码.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.条码.DataPropertyName = "ProductCode"; - dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle10.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.条码.DefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.条码.DefaultCellStyle = dataGridViewCellStyle2; this.条码.FillWeight = 90F; this.条码.HeaderText = "条码"; this.条码.Name = "条码"; this.条码.ReadOnly = true; - this.条码.Width = 220; + this.条码.Width = 300; // // 物料号 // this.物料号.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.物料号.DataPropertyName = "MATERIALCODE"; - dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle11.Font = new System.Drawing.Font("宋体", 15.75F); - this.物料号.DefaultCellStyle = dataGridViewCellStyle11; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 15.75F); + this.物料号.DefaultCellStyle = dataGridViewCellStyle3; this.物料号.HeaderText = "物料号"; this.物料号.Name = "物料号"; this.物料号.ReadOnly = true; - this.物料号.Width = 220; + this.物料号.Width = 200; // // 物料名称 // this.物料名称.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.物料名称.DataPropertyName = "MATERIALNAME"; - dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle12.Font = new System.Drawing.Font("宋体", 15.75F); - this.物料名称.DefaultCellStyle = dataGridViewCellStyle12; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 15.75F); + this.物料名称.DefaultCellStyle = dataGridViewCellStyle4; this.物料名称.HeaderText = "物料名称"; this.物料名称.Name = "物料名称"; this.物料名称.ReadOnly = true; - this.物料名称.Width = 350; + this.物料名称.Width = 200; // // 入库类型 // this.入库类型.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.入库类型.DataPropertyName = "InStorageType"; - dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle13.Font = new System.Drawing.Font("宋体", 15.75F); - dataGridViewCellStyle13.Format = "f"; - dataGridViewCellStyle13.NullValue = null; - this.入库类型.DefaultCellStyle = dataGridViewCellStyle13; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 15.75F); + dataGridViewCellStyle5.Format = "f"; + dataGridViewCellStyle5.NullValue = null; + this.入库类型.DefaultCellStyle = dataGridViewCellStyle5; this.入库类型.HeaderText = "入库类型"; this.入库类型.Name = "入库类型"; this.入库类型.ReadOnly = true; @@ -323,21 +334,21 @@ // this.操作人.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.操作人.DataPropertyName = "CREATEUSER"; - dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle14.Font = new System.Drawing.Font("宋体", 15.75F); - this.操作人.DefaultCellStyle = dataGridViewCellStyle14; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 15.75F); + this.操作人.DefaultCellStyle = dataGridViewCellStyle6; this.操作人.HeaderText = "操作人"; this.操作人.Name = "操作人"; this.操作人.ReadOnly = true; - this.操作人.Width = 90; + this.操作人.Width = 150; // // 入库时间 // this.入库时间.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.入库时间.DataPropertyName = "CREATEDATE"; - dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle15.Font = new System.Drawing.Font("宋体", 15.75F); - this.入库时间.DefaultCellStyle = dataGridViewCellStyle15; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle7.Font = new System.Drawing.Font("宋体", 15.75F); + this.入库时间.DefaultCellStyle = dataGridViewCellStyle7; this.入库时间.HeaderText = "入库时间"; this.入库时间.Name = "入库时间"; this.入库时间.ReadOnly = true; @@ -351,17 +362,7 @@ this.Pid.Name = "Pid"; this.Pid.ReadOnly = true; this.Pid.Visible = false; - // - // pager1 - // - this.pager1.DataPage = ((QMFrameWork.Data.DataPage)(resources.GetObject("pager1.DataPage"))); - this.pager1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.pager1.Location = new System.Drawing.Point(0, 607); - this.pager1.Name = "pager1"; - this.pager1.OSearch = null; - this.pager1.Size = new System.Drawing.Size(998, 35); - this.pager1.TabIndex = 7; - this.pager1.EventPaging += new QMAPP.WinForm.Controls.EventPagingHandler(this.pager1_EventPaging); + this.Pid.Width = 60; // // TJLinStorageForm // @@ -405,6 +406,8 @@ private DateTimePickerA dtpCREATEDATESTART; private System.Windows.Forms.Label label4; private System.Windows.Forms.Label label5; + private Controls.Pager pager1; + private System.Windows.Forms.ToolStripButton toolStripButton1; private System.Windows.Forms.DataGridViewTextBoxColumn 条码; private System.Windows.Forms.DataGridViewTextBoxColumn 物料号; private System.Windows.Forms.DataGridViewTextBoxColumn 物料名称; @@ -412,7 +415,5 @@ private System.Windows.Forms.DataGridViewTextBoxColumn 操作人; private System.Windows.Forms.DataGridViewTextBoxColumn 入库时间; private System.Windows.Forms.DataGridViewTextBoxColumn Pid; - private Controls.Pager pager1; - private System.Windows.Forms.ToolStripButton toolStripButton1; } } \ No newline at end of file diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJLinStorageForm.resx b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJLinStorageForm.resx index 954f49f..15e895b 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJLinStorageForm.resx +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJLinStorageForm.resx @@ -124,90 +124,90 @@ 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 - iWo1AAAAAElFTkSuQmCC + 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 + upMNAAAAAElFTkSuQmCC diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJOutWarehouseForm.Designer.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJOutWarehouseForm.Designer.cs index 889d019..aad2aff 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJOutWarehouseForm.Designer.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJOutWarehouseForm.Designer.cs @@ -56,7 +56,7 @@ this.panel1 = new System.Windows.Forms.Panel(); this.pager1 = new QMAPP.WinForm.Controls.Pager(); this.bindingNavigator1 = new System.Windows.Forms.BindingNavigator(this.components); - this.零件号 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.条码 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.物料号 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.物料名称 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.出库类型 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -135,7 +135,7 @@ this.DGMendRecorder.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; this.DGMendRecorder.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.DGMendRecorder.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.零件号, + this.条码, this.物料号, this.物料名称, this.出库类型, @@ -321,18 +321,18 @@ this.bindingNavigator1.TabIndex = 3; this.bindingNavigator1.Text = "bindingNavigator1"; // - // 零件号 + // 条码 // - this.零件号.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; - this.零件号.DataPropertyName = "ProductCode"; + this.条码.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.条码.DataPropertyName = "ProductCode"; dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.零件号.DefaultCellStyle = dataGridViewCellStyle2; - this.零件号.FillWeight = 90F; - this.零件号.HeaderText = "零件号"; - this.零件号.Name = "零件号"; - this.零件号.ReadOnly = true; - this.零件号.Width = 110; + this.条码.DefaultCellStyle = dataGridViewCellStyle2; + this.条码.FillWeight = 90F; + this.条码.HeaderText = "条码"; + this.条码.Name = "条码"; + this.条码.ReadOnly = true; + this.条码.Width = 300; // // 物料号 // @@ -344,7 +344,7 @@ this.物料号.HeaderText = "物料号"; this.物料号.Name = "物料号"; this.物料号.ReadOnly = true; - this.物料号.Width = 120; + this.物料号.Width = 200; // // 物料名称 // @@ -358,7 +358,7 @@ this.物料名称.HeaderText = "物料名称"; this.物料名称.Name = "物料名称"; this.物料名称.ReadOnly = true; - this.物料名称.Width = 120; + this.物料名称.Width = 200; // // 出库类型 // @@ -382,7 +382,7 @@ this.CreateUser.HeaderText = "操作人"; this.CreateUser.Name = "CreateUser"; this.CreateUser.ReadOnly = true; - this.CreateUser.Width = 110; + this.CreateUser.Width = 150; // // CREATEDATE // @@ -394,7 +394,7 @@ this.CREATEDATE.HeaderText = "操作时间"; this.CREATEDATE.Name = "CREATEDATE"; this.CREATEDATE.ReadOnly = true; - this.CREATEDATE.Width = 180; + this.CREATEDATE.Width = 220; // // Pid // @@ -452,7 +452,7 @@ private System.Windows.Forms.Label label5; private Controls.Pager pager1; private System.Windows.Forms.BindingNavigator bindingNavigator1; - private System.Windows.Forms.DataGridViewTextBoxColumn 零件号; + private System.Windows.Forms.DataGridViewTextBoxColumn 条码; private System.Windows.Forms.DataGridViewTextBoxColumn 物料号; private System.Windows.Forms.DataGridViewTextBoxColumn 物料名称; private System.Windows.Forms.DataGridViewTextBoxColumn 出库类型; diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJOutWarehouseForm.resx b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJOutWarehouseForm.resx index 0edf7b5..1308e0a 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJOutWarehouseForm.resx +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJOutWarehouseForm.resx @@ -124,90 +124,90 @@ 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 - RK5CYII= + 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 + TkSuQmCC @@ -280,7 +280,7 @@ KmCyflHE75Rzn1uUbflSAsSi5/5P+aJrUwFflfUVFwD8N7/Nl0gJjQCoAAAAAElFTkSuQmCC - + True diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.Designer.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.Designer.cs index 98fd0f7..d0370f6 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.Designer.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.Designer.cs @@ -423,11 +423,11 @@ 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[] { + "6", + "10", "20", "30", - "40", - "50", - "100"}); + "40"}); this.cbListRowcount.Location = new System.Drawing.Point(1254, 66); this.cbListRowcount.Name = "cbListRowcount"; this.cbListRowcount.Size = new System.Drawing.Size(78, 33); diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs index 49cd7f2..55d81c8 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs @@ -61,6 +61,8 @@ namespace QMAPP.WinForm.Forms.TianJin comboBox2.DisplayMember = "Name"; comboBox2.ValueMember = "Code"; comboBox2.DataSource = listSHIFT; + + // tsbPrint.Enabled = false; } #region 加载列表显示设置 @@ -463,52 +465,61 @@ namespace QMAPP.WinForm.Forms.TianJin private void tsbPrint_Click(object sender, EventArgs e) { - if (dgvPlan.Rows.Count == 0) + try { - MessageBox.Show("当前生产线没有未打印标签的计划工单！"); - } - tsbPrint.Enabled = false; - var order1 = (FJC.Entity.ProductionPlan.WorkOrder)dgvPlan.Rows[0].DataBoundItem; + if (dgvPlan.Rows.Count == 0) + { + MessageBox.Show("当前生产线没有未打印标签的计划工单！"); + // return; + } + tsbPrint.Enabled = false; + var order1 = (FJC.Entity.ProductionPlan.WorkOrder)dgvPlan.Rows[0].DataBoundItem; - var orders = new List(); - orders.Add(order1); - - List labels = new List(); + var orders = new List(); + orders.Add(order1); + + List labels = new List(); - var data = DateTime.Now.ToString("yyyyMMddHHmmssfff"); - data = data.Substring(2, data.Length - 2); - //var codematch = System.Text.RegularExpressions.Regex.Match(order.PBOM_CODE, "_[LR][FR]_"); - string positioncode = GetNameCode(orders[0].MATERIAL_NAME); - var book = _agent.InvokeServiceFunction("FISPhraseBLL_GetFisPhraseBook", orders[0].MATERIAL_CODE + "", positioncode); + var data = DateTime.Now.ToString("yyyyMMddHHmmssfff"); + data = data.Substring(2, data.Length - 2); + //var codematch = System.Text.RegularExpressions.Regex.Match(order.PBOM_CODE, "_[LR][FR]_"); + string positioncode = GetNameCode(orders[0].MATERIAL_NAME); + var book = _agent.InvokeServiceFunction("FISPhraseBLL_GetFisPhraseBook", orders[0].MATERIAL_CODE + "", positioncode); - LabelData labeldata = new LabelData(); + LabelData labeldata = new LabelData(); - labeldata.MATERIALCODE = orders[0].MATERIAL_CODE; + labeldata.MATERIALCODE = orders[0].MATERIAL_CODE; - labeldata.PlanDate = orders[0].PLAN_DATE; - if (book != null) - { - labeldata.Class = " " + book.Class.Substring(0, 2); - labeldata.Description = book.Text; - labeldata.OrderNo = book.CarModel + positioncode + data; + labeldata.PlanDate = orders[0].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 = orders[0].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 + _agent.InvokeServiceFunction("WorkOrderBLL_SetOrderPrinted", orders[0].PID); + InsertProduct(labeldata.OrderNo, orders[0].MATERIAL_CODE, comboBox1.SelectedValue.ToString()); + + BindPlanView(); + tsbPrint.Enabled = true; } - var mcresult = _agent.InvokeServiceFunction>("MaterialBLL_Get", new Material { MATERIAL_CODE = orders[0].MATERIAL_CODE }); - var material = mcresult.IsSuccess ? mcresult.Result : null; - if (material != null) + catch (Exception ee) { - labeldata.MaterialName = material.MATERIAL_SHORT; - labeldata.CarModel = material.PROJECTCODE; + MessageBox.Show("打印出现异常！"+ee.Message); } - labels.Add(labeldata); - - PrintLabel(labels); - - //变更打印状态 0=>1 - _agent.InvokeServiceFunction("WorkOrderBLL_SetOrderPrinted", orders[0].PID); - InsertProduct(labeldata.OrderNo, orders[0].MATERIAL_CODE, comboBox1.SelectedValue.ToString()); - BindPlanView(); - tsbPrint.Enabled = true; } public string GetNameCode(string Name) { diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInForm.Designer.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInForm.Designer.cs index db95297..9dcfa0e 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInForm.Designer.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInForm.Designer.cs @@ -54,6 +54,7 @@ this.label5 = new System.Windows.Forms.Label(); this.panel1 = new System.Windows.Forms.Panel(); this.DGView = new System.Windows.Forms.DataGridView(); + this.pager1 = new QMAPP.WinForm.Controls.Pager(); this.条码 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.物料号 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.物料名称 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -61,7 +62,6 @@ this.操作人 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.入库时间 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Pid = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.pager1 = new QMAPP.WinForm.Controls.Pager(); this.toolStrip1.SuspendLayout(); this.panelSearchTitle.SuspendLayout(); this.panelSearch.SuspendLayout(); @@ -296,6 +296,17 @@ this.DGView.TabIndex = 4; this.DGView.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.DGView_RowPostPaint); // + // pager1 + // + this.pager1.DataPage = ((QMFrameWork.Data.DataPage)(resources.GetObject("pager1.DataPage"))); + this.pager1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.pager1.Location = new System.Drawing.Point(0, 607); + this.pager1.Name = "pager1"; + this.pager1.OSearch = null; + this.pager1.Size = new System.Drawing.Size(998, 35); + this.pager1.TabIndex = 7; + this.pager1.EventPaging += new QMAPP.WinForm.Controls.EventPagingHandler(this.pager1_EventPaging); + // // 条码 // this.条码.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; @@ -307,7 +318,7 @@ this.条码.HeaderText = "条码"; this.条码.Name = "条码"; this.条码.ReadOnly = true; - this.条码.Width = 220; + this.条码.Width = 300; // // 物料号 // @@ -319,7 +330,7 @@ this.物料号.HeaderText = "物料号"; this.物料号.Name = "物料号"; this.物料号.ReadOnly = true; - this.物料号.Width = 220; + this.物料号.Width = 200; // // 物料名称 // @@ -331,7 +342,7 @@ this.物料名称.HeaderText = "物料名称"; this.物料名称.Name = "物料名称"; this.物料名称.ReadOnly = true; - this.物料名称.Width = 350; + this.物料名称.Width = 200; // // 入库类型 // @@ -356,7 +367,7 @@ this.操作人.HeaderText = "操作人"; this.操作人.Name = "操作人"; this.操作人.ReadOnly = true; - this.操作人.Width = 90; + this.操作人.Width = 150; // // 入库时间 // @@ -378,17 +389,7 @@ this.Pid.Name = "Pid"; this.Pid.ReadOnly = true; this.Pid.Visible = false; - // - // pager1 - // - this.pager1.DataPage = ((QMFrameWork.Data.DataPage)(resources.GetObject("pager1.DataPage"))); - this.pager1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.pager1.Location = new System.Drawing.Point(0, 607); - this.pager1.Name = "pager1"; - this.pager1.OSearch = null; - this.pager1.Size = new System.Drawing.Size(998, 35); - this.pager1.TabIndex = 7; - this.pager1.EventPaging += new QMAPP.WinForm.Controls.EventPagingHandler(this.pager1_EventPaging); + this.Pid.Width = 60; // // TJProductInForm // @@ -434,6 +435,8 @@ private System.Windows.Forms.Label label7; private System.Windows.Forms.ComboBox comINTTYPE; private System.Windows.Forms.Label label5; + private Controls.Pager pager1; + private System.Windows.Forms.ToolStripButton toolStripButton1; private System.Windows.Forms.DataGridViewTextBoxColumn 条码; private System.Windows.Forms.DataGridViewTextBoxColumn 物料号; private System.Windows.Forms.DataGridViewTextBoxColumn 物料名称; @@ -441,7 +444,5 @@ private System.Windows.Forms.DataGridViewTextBoxColumn 操作人; private System.Windows.Forms.DataGridViewTextBoxColumn 入库时间; private System.Windows.Forms.DataGridViewTextBoxColumn Pid; - private Controls.Pager pager1; - private System.Windows.Forms.ToolStripButton toolStripButton1; } } \ No newline at end of file diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInForm.resx b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInForm.resx index d9fb669..fb5a1e5 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInForm.resx +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInForm.resx @@ -124,90 +124,90 @@ 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 - nOvthQdEy2UAAAAASUVORK5CYII= + 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 + 0xHqAAAAAElFTkSuQmCC diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInSendCodeForm.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInSendCodeForm.cs index c4684cc..75a33cc 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInSendCodeForm.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInSendCodeForm.cs @@ -44,19 +44,19 @@ namespace QMAPP.WinForm.Forms.TianJin txtCode.SelectAll(); return; } + if (string.IsNullOrEmpty(comINTTYPE.SelectedValue.ToString())) + { + lblError.ForeColor = Color.Red; + lblError.Text = "请选择入库类型"; + txtCode.Focus(); + txtCode.SelectAll(); + return; + } + QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent(); var scode = txtCode.Text.Trim().ToUpper(); - //增加返修入库，条码会有重复的情况 - //var count = agent.InvokeServiceFunction>("StorageBLL_SelectCount", scode); - //if (count.Result > 0) - //{ - // txtCode.Text = ""; - // txtCode.Focus(); - // lblError.ForeColor = Color.Red; - // lblError.Text = "库存中已存在此零件："+ scode; - // return; - //} + try { Storage pi = new Storage(); @@ -65,8 +65,10 @@ namespace QMAPP.WinForm.Forms.TianJin { pi.InStorageType = comINTTYPE.SelectedValue.ToString();//退返入库 } + if (comINTTYPE.SelectedValue.ToString() == "退返入库") pi.State = "3"; + var result =agent.InvokeServiceFunction>("StorageBLL_Insert", pi); //保存成功 diff --git a/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs b/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs index c2e2bf7..dde8162 100644 --- a/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs +++ b/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值， // 方法是按如下所示使用“*”: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2022.07.15.02")] -[assembly: AssemblyFileVersion("2022.07.15.02")] +[assembly: AssemblyVersion("2022.07.25.02")] +[assembly: AssemblyFileVersion("2022.07.25.02")] diff --git a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config index e6ef3b3..fa5bbec 100644 --- a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config +++ b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config @@ -73,8 +73,11 @@ - + + + +