dequan.zhang 3 years ago
parent
commit
5f8b80df0a
  1. 2
      APPQ5/QMAPP.FJC.DAL/Operation/ProductDAL.cs
  2. 2
      APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs
  3. 2
      APPQ5/QMAPP.WinForm/Forms/Mend/DPLabelReplace.cs
  4. 48
      APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmCarCardDetail.designer.cs
  5. 8
      APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmCarCardDetail.resx
  6. 4
      APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmCarCardPrintShow.cs
  7. 31
      APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmItemList.cs
  8. 186
      APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmItemList.designer.cs
  9. 116
      APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs
  10. 11
      AppCommon/QMAPP.ServicesAgent/ServiceEnums.cs
  11. 1
      AutoFileCopyNet/AutoFileCopyNet.csproj
  12. 4
      Service/Service.csproj
  13. 8
      ServicesCenter/WCF/QMFrameWork.WebServiceHost/QMFrameWork.WebServiceHost.csproj

2
APPQ5/QMAPP.FJC.DAL/Operation/ProductDAL.cs

@ -656,7 +656,7 @@ namespace QMAPP.FJC.DAL.Operation
//{
// whereBuilder.AppendFormat("AND A.PLAN_NO = '{0}'", code);
//}
else if (code.StartsWith("D01") || code.StartsWith("DP2"))
else if (code.StartsWith("D01") || code.StartsWith("DP2") || code.StartsWith("D04"))
{
whereBuilder.AppendFormat("AND A.PLAN_NO = '{0}'", code);
}

2
APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs

@ -305,7 +305,7 @@ namespace QMAPP.FJC.DAL.TianJin
DataTable returnDt = null;
List<DataParameter> parameters = new List<DataParameter>();
strSql.AppendLine("SELECT D.ROWINDEX ,F.SEQ as 'VWSEQ' ,F.ORDERPLAN_NO as 'vin' ,F.MATERIAL_CODE as 'PRODNO' ,F.MATERIAL_NAME as 'CARSETDESC_CN' ,CASE F.MOULD_CODE WHEN 'LF' THEN '左前' WHEN 'LR' THEN '左后' WHEN 'RF' THEN '右前' WHEN 'RR' THEN '右后' ELSE F.MOULD_CODE END AS 'CP5A', ");
strSql.AppendLine("SELECT D.ROWINDEX ,F.SEQ as 'VWSEQ' ,F.PRODUCTCODE as 'VIN' ,F.MATERIAL_CODE as 'PRODNO' ,F.MATERIAL_NAME as 'CARSETDESC_CN' ,CASE F.MOULD_CODE WHEN 'LF' THEN '左前' WHEN 'LR' THEN '左后' WHEN 'RF' THEN '右前' WHEN 'RR' THEN '右后' ELSE F.MOULD_CODE END AS 'CP5A', ");
strSql.AppendLine("F.[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");

2
APPQ5/QMAPP.WinForm/Forms/Mend/DPLabelReplace.cs

@ -72,7 +72,7 @@ namespace QMAPP.WinForm.Forms.Mend
txtNewFISCode.Focus();
return;
}
if (!(newfiscode.StartsWith("D01") || newfiscode.StartsWith("DP2")))
if (!(newfiscode.StartsWith("D01") || newfiscode.StartsWith("DP2") || newfiscode.StartsWith("D04")))
{
infolabel.Text = "输入条码格式不正确!";
txtNewFISCode.SelectAll();

48
APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmCarCardDetail.designer.cs

@ -35,13 +35,13 @@
this.statusStrip = new System.Windows.Forms.StatusStrip();
this.ITEMNO = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.PASTECARDNO = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.VIN = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.VIN = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.CODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.NAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.CP5A = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.LINENO = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@ -85,13 +85,13 @@
this.dgvMat.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.ITEMNO,
this.PASTECARDNO,
this.VIN,
this.Column1,
this.VIN,
this.CODE,
this.NAME,
this.CP5A,
this.Column2,
this.LINENO,
this.Column2,
this.Column4,
this.Column5,
this.Column6,
@ -134,20 +134,22 @@
this.PASTECARDNO.DataPropertyName = "PASTECARDNO";
this.PASTECARDNO.HeaderText = "运单号";
this.PASTECARDNO.Name = "PASTECARDNO";
//
// VIN
//
this.VIN.DataPropertyName = "VIN";
this.VIN.HeaderText = "绑定计划";
this.VIN.Name = "VIN";
this.VIN.ReadOnly = true;
this.VIN.Width = 200;
this.PASTECARDNO.Width = 130;
//
// Column1
//
this.Column1.DataPropertyName = "VWSEQ";
this.Column1.HeaderText = "顺序号";
this.Column1.Name = "Column1";
this.Column1.Width = 80;
//
// VIN
//
this.VIN.DataPropertyName = "VIN";
this.VIN.HeaderText = "扫描条码";
this.VIN.Name = "VIN";
this.VIN.ReadOnly = true;
this.VIN.Width = 180;
//
// CODE
//
@ -155,7 +157,7 @@
this.CODE.HeaderText = "零件号";
this.CODE.Name = "CODE";
this.CODE.ReadOnly = true;
this.CODE.Width = 150;
this.CODE.Width = 130;
//
// NAME
//
@ -163,6 +165,7 @@
this.NAME.HeaderText = "总成描述";
this.NAME.Name = "NAME";
this.NAME.ReadOnly = true;
this.NAME.Width = 160;
//
// CP5A
//
@ -170,7 +173,14 @@
this.CP5A.HeaderText = "位置";
this.CP5A.Name = "CP5A";
this.CP5A.ReadOnly = true;
this.CP5A.Width = 120;
this.CP5A.Width = 80;
//
// LINENO
//
this.LINENO.DataPropertyName = "LINENO";
this.LINENO.HeaderText = "车型";
this.LINENO.Name = "LINENO";
this.LINENO.Width = 80;
//
// Column2
//
@ -179,12 +189,6 @@
this.Column2.Name = "Column2";
this.Column2.Visible = false;
//
// LINENO
//
this.LINENO.DataPropertyName = "LINENO";
this.LINENO.HeaderText = "车型";
this.LINENO.Name = "LINENO";
//
// Column4
//
this.Column4.DataPropertyName = "SANBARCODE";
@ -263,13 +267,13 @@
private System.Windows.Forms.StatusStrip statusStrip;
private System.Windows.Forms.DataGridViewTextBoxColumn ITEMNO;
private System.Windows.Forms.DataGridViewTextBoxColumn PASTECARDNO;
private System.Windows.Forms.DataGridViewTextBoxColumn VIN;
private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
private System.Windows.Forms.DataGridViewTextBoxColumn VIN;
private System.Windows.Forms.DataGridViewTextBoxColumn CODE;
private System.Windows.Forms.DataGridViewTextBoxColumn NAME;
private System.Windows.Forms.DataGridViewTextBoxColumn CP5A;
private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
private System.Windows.Forms.DataGridViewTextBoxColumn LINENO;
private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
private System.Windows.Forms.DataGridViewTextBoxColumn Column4;
private System.Windows.Forms.DataGridViewTextBoxColumn Column5;
private System.Windows.Forms.DataGridViewTextBoxColumn Column6;

8
APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmCarCardDetail.resx

@ -123,10 +123,10 @@
<metadata name="PASTECARDNO.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="VIN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="VIN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="CODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@ -138,10 +138,10 @@
<metadata name="CP5A.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="LINENO.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="LINENO.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

4
APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmCarCardPrintShow.cs

@ -68,7 +68,7 @@ namespace QMAPP.WinForm.Forms.TianJin
int index = 1;
QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
DataTable tbl = agent.InvokeServiceFunction<DataTable>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_GetPastecardDeatis.ToString());
DataTable tbl = agent.InvokeServiceFunction<DataTable>(QMAPP.ServicesAgent.FrmPlaceManage.TJFrmPlaceBLL_GetPastecardDeatis.ToString());
for (var i = 0; i < dgvMat.Rows.Count; i++)
@ -155,7 +155,7 @@ namespace QMAPP.WinForm.Forms.TianJin
else
{
QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
DataTable tbl = agent.InvokeServiceFunction<DataTable>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_GetPasteDetails.ToString(), pasterkey);
DataTable tbl = agent.InvokeServiceFunction<DataTable>(QMAPP.ServicesAgent.FrmPlaceManage.TJFrmPlaceBLL_GetPascardDetailsByPid.ToString(), pasterkey);
dgvMat.DataSource = tbl;
}
}

31
APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmItemList.cs

@ -178,7 +178,7 @@ namespace QMAPP.WinForm.Forms.TianJin
for (var i = 0; i < tblCodes.Rows.Count; i++)
{
EProCodeInfo epci = new EProCodeInfo();
epci._Name = tblCodes.Rows[i][0].ToString();
epci._Name = tblCodes.Rows[i][1].ToString();
epci._Code = tblCodes.Rows[i][0].ToString();
proCodes.Add(epci);
@ -296,8 +296,8 @@ namespace QMAPP.WinForm.Forms.TianJin
string PASTECARDNO = dgvList.Rows[i].Cells["PASTECARDNO"].Value.ToString();
string PRODUCTIONNAME = dgvList.Rows[i].Cells["PRODUCTIONNAME"].Value.ToString();
QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
DataTable tbl = agent.InvokeServiceFunction<DataTable>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_GetPascardDetailsByPid.ToString(), fiskey);
int result = agent.InvokeServiceFunction<int>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_UpdatePasteCardPasteCardDate2Value.ToString(), PASTECARDNO, DateTime.Now.ToString(), ClientContext.LoginInfo.UserName.ToString());
DataTable tbl = agent.InvokeServiceFunction<DataTable>(QMAPP.ServicesAgent.FrmPlaceManage.TJFrmPlaceBLL_GetPascardDetailsByPid.ToString(), fiskey);
int result = agent.InvokeServiceFunction<int>(QMAPP.ServicesAgent.FrmPlaceManage.TJFrmPlaceBLL_UpdatePasteCardPasteCardDate2Value.ToString(), PASTECARDNO, DateTime.Now.ToString(), ClientContext.LoginInfo.UserName.ToString());
Print(tbl, PASTECARDNO, PRODUCTIONNAME);
if (result > 0)
{
@ -320,11 +320,12 @@ namespace QMAPP.WinForm.Forms.TianJin
/// <summary>
/// 手动打印功能
/// 手动打印功能--补打
/// </summary>
private void Print(DataTable tbl1, string PASTECARDNO, string PRODUCTIONNAME)
{
if (!string.IsNullOrEmpty(PRODUCTIONNAME) && PRODUCTIONNAME.Length > 3)
PRODUCTIONNAME = PRODUCTIONNAME.Substring(0, 1);
TJPrintPasteCard prin = new TJPrintPasteCard();
@ -343,23 +344,23 @@ namespace QMAPP.WinForm.Forms.TianJin
dt.Columns.Add("LINENO");
int index = 1;
QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
DataTable tbl = agent.InvokeServiceFunction<DataTable>(QMAPP.ServicesAgent.FrmPlaceManage.TJFrmPlaceBLL_GetPastecardDeatis.ToString());
//QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
//DataTable tbl = agent.InvokeServiceFunction<DataTable>(QMAPP.ServicesAgent.FrmPlaceManage.TJFrmPlaceBLL_GetPastecardDeatis.ToString());
// index = Convert.ToInt32(tbl.Rows[0][0].ToString());
for (var i = 0; i < tbl1.Rows.Count; i++)
{
DataRow ncsdr = dt.NewRow();
ncsdr["ROWINDEX"] = index.ToString(); ;
ncsdr["VWSEQ"] = tbl1.Rows[i]["VWSEQ"].ToString();
ncsdr["VIN"] = tbl1.Rows[i]["VIN"].ToString();
ncsdr["PRODNO"] = tbl1.Rows[i]["PRODNO"].ToString();
ncsdr["CARSETDESCCN"] = tbl1.Rows[i]["CARSETDESC_CN"].ToString();
ncsdr["CP5A"] = tbl1.Rows[i]["CP5A"].ToString();
ncsdr["PASTECARDNO"] = PASTECARDNO;
ncsdr["VWSEQ"] = tbl1.Rows[i]["VWSEQ"].ToString(); //顺序号
ncsdr["VIN"] = tbl1.Rows[i]["VIN"].ToString(); //扫描条码
ncsdr["PRODNO"] = tbl1.Rows[i]["PRODNO"].ToString(); //零件号
ncsdr["CARSETDESCCN"] = tbl1.Rows[i]["CARSETDESC_CN"].ToString(); //零件描述
ncsdr["CP5A"] = tbl1.Rows[i]["CP5A"].ToString(); //门板位置
ncsdr["PASTECARDNO"] = PASTECARDNO; // 发运单号
ncsdr["SCANDATE"] = DateTime.Now.ToString();
ncsdr["PRODUCTIONNAME"] = strprodtype;
ncsdr["LINENO"] = tbl1.Rows[i]["LINENO"].ToString();
ncsdr["PRODUCTIONNAME"] = strprodtype; //发运中心 左或右
ncsdr["LINENO"] = tbl1.Rows[i]["LINENO"].ToString(); //车型
dt.Rows.Add(ncsdr);
index++;
}

186
APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmItemList.designer.cs

@ -33,6 +33,15 @@
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
this.dgvList = new System.Windows.Forms.DataGridView();
this.PASTECARDNO = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.PLANTNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.PASTECARDDATE = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.PASTECARDDATE2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.OPERATOR = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.VINLACK = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.PRODUCTIONNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.CREATETIME = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.PID = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.txtPasteNO = new System.Windows.Forms.TextBox();
this.label4 = new System.Windows.Forms.Label();
this.btnSearch = new System.Windows.Forms.Button();
@ -50,15 +59,6 @@
this.cmenuDisplay = new System.Windows.Forms.ToolStripMenuItem();
this.cmenuFunctions = new System.Windows.Forms.ContextMenuStrip(this.components);
this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
this.PASTECARDNO = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.PLANTNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.PASTECARDDATE = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.PASTECARDDATE2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.OPERATOR = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.VINLACK = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.PRODUCTIONNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.CREATETIME = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.PID = new System.Windows.Forms.DataGridViewTextBoxColumn();
((System.ComponentModel.ISupportInitialize)(this.dgvList)).BeginInit();
this.groupBox3.SuspendLayout();
this.cmenuFunctions.SuspendLayout();
@ -103,6 +103,85 @@
this.dgvList.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dgvList_RowPostPaint);
this.dgvList.DoubleClick += new System.EventHandler(this.dgvList_DoubleClick);
//
// PASTECARDNO
//
this.PASTECARDNO.DataPropertyName = "PASTECARDNO";
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.PASTECARDNO.DefaultCellStyle = dataGridViewCellStyle2;
this.PASTECARDNO.HeaderText = "贴车单单号";
this.PASTECARDNO.Name = "PASTECARDNO";
this.PASTECARDNO.ReadOnly = true;
this.PASTECARDNO.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.PASTECARDNO.Width = 150;
//
// PLANTNAME
//
this.PLANTNAME.DataPropertyName = "PLANTNAME";
this.PLANTNAME.HeaderText = "发运中心";
this.PLANTNAME.Name = "PLANTNAME";
this.PLANTNAME.ReadOnly = true;
//
// PASTECARDDATE
//
this.PASTECARDDATE.DataPropertyName = "PASTECARDDATE";
dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.PASTECARDDATE.DefaultCellStyle = dataGridViewCellStyle3;
this.PASTECARDDATE.HeaderText = "打印时间";
this.PASTECARDDATE.Name = "PASTECARDDATE";
this.PASTECARDDATE.ReadOnly = true;
this.PASTECARDDATE.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.PASTECARDDATE.Width = 150;
//
// PASTECARDDATE2
//
this.PASTECARDDATE2.DataPropertyName = "PASTECARDDATE2";
this.PASTECARDDATE2.HeaderText = "补打时间";
this.PASTECARDDATE2.Name = "PASTECARDDATE2";
this.PASTECARDDATE2.ReadOnly = true;
this.PASTECARDDATE2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.PASTECARDDATE2.Width = 150;
//
// OPERATOR
//
this.OPERATOR.DataPropertyName = "OPERATOR";
this.OPERATOR.HeaderText = "操作者";
this.OPERATOR.Name = "OPERATOR";
this.OPERATOR.ReadOnly = true;
this.OPERATOR.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
//
// VINLACK
//
this.VINLACK.DataPropertyName = "VINLACK";
this.VINLACK.HeaderText = "底盘号间隔";
this.VINLACK.Name = "VINLACK";
this.VINLACK.ReadOnly = true;
//
// PRODUCTIONNAME
//
this.PRODUCTIONNAME.DataPropertyName = "PRODUCTIONNAME";
this.PRODUCTIONNAME.HeaderText = "生产线名称";
this.PRODUCTIONNAME.Name = "PRODUCTIONNAME";
this.PRODUCTIONNAME.ReadOnly = true;
this.PRODUCTIONNAME.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.PRODUCTIONNAME.Width = 80;
//
// CREATETIME
//
this.CREATETIME.DataPropertyName = "CREATETIME";
this.CREATETIME.HeaderText = "创建日期";
this.CREATETIME.Name = "CREATETIME";
this.CREATETIME.ReadOnly = true;
this.CREATETIME.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.CREATETIME.Width = 150;
//
// PID
//
this.PID.DataPropertyName = "PID";
this.PID.HeaderText = "Column4";
this.PID.Name = "PID";
this.PID.ReadOnly = true;
this.PID.Visible = false;
//
// txtPasteNO
//
this.txtPasteNO.Location = new System.Drawing.Point(67, 18);
@ -132,7 +211,7 @@
// datenddate
//
this.datenddate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
this.datenddate.Location = new System.Drawing.Point(747, 20);
this.datenddate.Location = new System.Drawing.Point(784, 20);
this.datenddate.Name = "datenddate";
this.datenddate.Size = new System.Drawing.Size(110, 21);
this.datenddate.TabIndex = 5;
@ -140,7 +219,7 @@
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(730, 25);
this.label2.Location = new System.Drawing.Point(767, 25);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(11, 12);
this.label2.TabIndex = 2;
@ -149,7 +228,7 @@
// datbegindate
//
this.datbegindate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
this.datbegindate.Location = new System.Drawing.Point(604, 19);
this.datbegindate.Location = new System.Drawing.Point(641, 19);
this.datbegindate.Name = "datbegindate";
this.datbegindate.Size = new System.Drawing.Size(111, 21);
this.datbegindate.TabIndex = 4;
@ -193,7 +272,7 @@
this.cmbtype.FormattingEnabled = true;
this.cmbtype.Location = new System.Drawing.Point(446, 17);
this.cmbtype.Name = "cmbtype";
this.cmbtype.Size = new System.Drawing.Size(83, 24);
this.cmbtype.Size = new System.Drawing.Size(130, 24);
this.cmbtype.TabIndex = 22;
this.cmbtype.SelectedIndexChanged += new System.EventHandler(this.comboBox2_SelectedIndexChanged);
//
@ -235,7 +314,7 @@
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(545, 25);
this.label1.Location = new System.Drawing.Point(582, 25);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(53, 12);
this.label1.TabIndex = 0;
@ -256,85 +335,6 @@
this.cmenuFunctions.Size = new System.Drawing.Size(101, 26);
this.cmenuFunctions.Text = "操作列表的功能";
//
// PASTECARDNO
//
this.PASTECARDNO.DataPropertyName = "PASTECARDNO";
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.PASTECARDNO.DefaultCellStyle = dataGridViewCellStyle2;
this.PASTECARDNO.HeaderText = "贴车单单号";
this.PASTECARDNO.Name = "PASTECARDNO";
this.PASTECARDNO.ReadOnly = true;
this.PASTECARDNO.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.PASTECARDNO.Width = 150;
//
// PLANTNAME
//
this.PLANTNAME.DataPropertyName = "PLANTNAME";
this.PLANTNAME.HeaderText = "发运中心";
this.PLANTNAME.Name = "PLANTNAME";
this.PLANTNAME.ReadOnly = true;
//
// PASTECARDDATE
//
this.PASTECARDDATE.DataPropertyName = "PASTECARDDATE";
dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.PASTECARDDATE.DefaultCellStyle = dataGridViewCellStyle3;
this.PASTECARDDATE.HeaderText = "打印时间";
this.PASTECARDDATE.Name = "PASTECARDDATE";
this.PASTECARDDATE.ReadOnly = true;
this.PASTECARDDATE.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.PASTECARDDATE.Width = 150;
//
// PASTECARDDATE2
//
this.PASTECARDDATE2.DataPropertyName = "PASTECARDDATE2";
this.PASTECARDDATE2.HeaderText = "补打时间";
this.PASTECARDDATE2.Name = "PASTECARDDATE2";
this.PASTECARDDATE2.ReadOnly = true;
this.PASTECARDDATE2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.PASTECARDDATE2.Width = 150;
//
// OPERATOR
//
this.OPERATOR.DataPropertyName = "OPERATOR";
this.OPERATOR.HeaderText = "操作者";
this.OPERATOR.Name = "OPERATOR";
this.OPERATOR.ReadOnly = true;
this.OPERATOR.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
//
// VINLACK
//
this.VINLACK.DataPropertyName = "VINLACK";
this.VINLACK.HeaderText = "底盘号间隔";
this.VINLACK.Name = "VINLACK";
this.VINLACK.ReadOnly = true;
//
// PRODUCTIONNAME
//
this.PRODUCTIONNAME.DataPropertyName = "PRODUCTIONNAME";
this.PRODUCTIONNAME.HeaderText = "生产线名称";
this.PRODUCTIONNAME.Name = "PRODUCTIONNAME";
this.PRODUCTIONNAME.ReadOnly = true;
this.PRODUCTIONNAME.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.PRODUCTIONNAME.Width = 80;
//
// CREATETIME
//
this.CREATETIME.DataPropertyName = "CREATETIME";
this.CREATETIME.HeaderText = "创建日期";
this.CREATETIME.Name = "CREATETIME";
this.CREATETIME.ReadOnly = true;
this.CREATETIME.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.CREATETIME.Width = 150;
//
// PID
//
this.PID.DataPropertyName = "PID";
this.PID.HeaderText = "Column4";
this.PID.Name = "PID";
this.PID.ReadOnly = true;
this.PID.Visible = false;
//
// TJFrmItemList
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);

116
APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs

@ -1392,26 +1392,7 @@ namespace QMAPP.WinForm.Forms.TianJin
}
if (signal != false)
{
//规则表里没有则去数据库里查找是否存在(VW371 bc316产品)
//if (System.Text.RegularExpressions.Regex.IsMatch(Code, "^DP\\w+(-\\w+)?-DF[LR][FR]\\w+$"))//扫描输入为门板计划标签
//{
// //从计划标签中截取产品码
// Code = Code.Substring(Code.LastIndexOf('-') + 1);
//}
#region 去数据库查询相关产品信息,外来零件忽略此步骤
//Product product = agent.InvokeServiceFunction<Product>(QMAPP.ServicesAgent.FrmPlaceManage.TJFrmPlaceBLL_GetProductByAssembleCode.ToString(), Code);
//if (product != null)
//{
// Code = string.IsNullOrEmpty(product.MAINCODE) ? product.PRODUCTCODE : product.MAINCODE;
//}
//else
//{
// Alert("未查询到该产品零件信息:" + Code + "。");
// //清理文本框
// ArragetxtCode();
// return;
//}
#region 校验是否有重复的扫过的条码
//------------------校验是否有重复的扫过的条码------
@ -1433,18 +1414,8 @@ namespace QMAPP.WinForm.Forms.TianJin
//-------------------------End-----------
#endregion
//int ExitResult = agent.InvokeServiceFunction<int>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_GetExitsCode.ToString(), Code);
//if ((product == null || string.IsNullOrEmpty(product.PID)))
//{
// SetContainerItem(nfindex, false);
// Alert("扫描的产品条码不存在,请重新扫描!");
// txtCode.Text = "";
// txtCode.Focus();
// return;
//}
//Object statusRuslt = agent.InvokeServiceFunction<object>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_GetExitsStatus.ToString(), Code);
#region 2.判断成品
#region 2.判断成品 下线时间校验
//if (product.STATUS != "0")
//{
// SetContainerItem(nfindex, false);
@ -1517,8 +1488,6 @@ namespace QMAPP.WinForm.Forms.TianJin
int vinNumber = 0;
if (scanSum > 0)
{
//lastvinNumber = Convert.ToInt32(dgvMATChange.Rows[scanSum - 1].Cells["VIN"].Value.ToString().Substring(10, 7));
//vinNumber = Convert.ToInt32(dgvMATChange.Rows[scanSum].Cells["VIN"].Value.ToString().Substring(10, 7));
lastvinNumber = Convert.ToInt32(dgvMATChange.Rows[scanSum - 1].Cells["REQUESTID"].Value.ToString());
vinNumber = Convert.ToInt32(dgvMATChange.Rows[scanSum].Cells["REQUESTID"].Value.ToString());
}
@ -1537,10 +1506,10 @@ namespace QMAPP.WinForm.Forms.TianJin
#region 判断当前扫描过的数据集合中是否有相同条码
//判断当前扫描过的数据集合中是否有相同条码
//if (outSourceProduct == "OP")
//{
// CheckDataBase(Code);
//}
if (outSourceProduct == "OP")
{
CheckDataBase(Code);
}
#endregion
#region 处理条码扫描文本框
@ -1690,66 +1659,13 @@ namespace QMAPP.WinForm.Forms.TianJin
{
barcodeidentification = "";
//特殊条码,当丢失条码或者条码损坏时,扫描一个特殊条码
string specialbarcode = "";
// BllFisOrder bllFisOrder = new BllFisOrder();
//根据条码标识获取零件信息
//DataTable tbl = GetSparepartsinfo(strbarcode);
//if (tbl.Rows.Count > 0)
//{
// barcodeidentification = tbl.Rows[0]["BARCODEIDENTIFICATION"].ToString();
//}
//else
//{
// PlaySound.PlaySounds.Play(@errorSoundPath);
// lberror.Text = "条码错误:无法根据条码识别零件号";
//}
//if (getTeShuBarcode(barcodeidentification) == strbarcode)
//{
// specialbarcode = "SPECIALBARCODE";
//}
//DataTable tblbarcode = bllFisOrder.ExistBarcode(BarcodeTime, strbarcode);
QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
DataTable tblbarcode = agent.InvokeServiceFunction<DataTable>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_ExistBarcode.ToString(), BarcodeTime, strbarcode);
DataTable tblbarcode = agent.InvokeServiceFunction<DataTable>(QMAPP.ServicesAgent.FrmPlaceManage.TJFrmPlaceBLL_ExistBarcode.ToString(), BarcodeTime, strbarcode);
if (tblbarcode.Rows.Count == 0 || specialbarcode == "SPECIALBARCODE")
if (tblbarcode.Rows.Count > 0)
{
//d.AddDays(-40)+"00:00:00";
#region "校验:根据条码获取零件号"
//if (tbl.Rows.Count > 0)
//{
//零件号
//string strkhprodno = tbl.Rows[0]["CUSTOMERSPAREPARTS"].ToString();
string strkhprodno = ProMaterial;
//01,02
//string templineno = tbl.Rows[0]["CODENAME"].ToString();
string templineno = "02";
//车型
//string vehicletype = tbl.Rows[0][1].ToString();
GetCruentFisData(strbarcode, strkhprodno, templineno, nfpastecard, ncspastecard);
//判断当前FIS队列中的零件号,是否等于条码标识获取的零件号。
//if (strkhprodno == strprodno)
if (strkhprodno.ToUpper().Replace(".", "").Contains(strprodno.ToUpper().Replace(".", "")))
{
SetContainerItem(nfindex, true);
CreateNFPaste(strbarcode);
}
else
{
Alert("条码错误:扫描的条码与FIS中的零件不符。");
}
//}
//else
//{
// PlaySound.PlaySounds.Play(@errorSoundPath);
// lberror.Text = "条码错误:无法根据条码识别零件号。";
//}
#endregion
}
else
{
Alert("扫描条码重复,请重新扫描。");
}
}
@ -2136,23 +2052,23 @@ namespace QMAPP.WinForm.Forms.TianJin
/// </summary>
private void Print()
{
//int PrintDisable = Convert.ToInt32(QMAPP.WinForm.Common.LocalSetting.Settings["PrintDisable", "1"]);
int PrintDisable = Convert.ToInt32(QMAPP.WinForm.Common.LocalSetting.Settings["PrintDisable", "1"]);
//if (PrintDisable == 1)
//{
// lberror.Text = "贴车单打印已禁用!";
// return;
//}
if (PrintDisable == 1)
{
lberror.Text = "贴车单打印已禁用!";
return;
}
TJPrintPasteCard prin = new TJPrintPasteCard();
string strprodtype = "";
if (pFisType == "01")
{
strprodtype = "( )";
strprodtype = "( )";
}
else if (pFisType == "02")
{
strprodtype = "( )";
strprodtype = "( )";
}
DataTable dt = new DataTable();
@ -2163,6 +2079,7 @@ namespace QMAPP.WinForm.Forms.TianJin
dt.Columns.Add("CARSETDESCCN");
dt.Columns.Add("PASTECARDNO");
dt.Columns.Add("SCANDATE");
dt.Columns.Add("CP5A");
dt.Columns.Add("PRODUCTIONNAME");
dt.Columns.Add("LINENO");
int index = 1;
@ -2179,6 +2096,7 @@ namespace QMAPP.WinForm.Forms.TianJin
ncsdr["VWSEQ"] = tbl.Rows[i]["VWSEQ"].ToString();
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();
ncsdr["PASTECARDNO"] = tbl.Rows[i]["PASTECARDNO"].ToString();;
ncsdr["SCANDATE"] = DateTime.Now.ToString();

11
AppCommon/QMAPP.ServicesAgent/ServiceEnums.cs

@ -2001,8 +2001,19 @@ namespace QMAPP.ServicesAgent
/// </summary>
[Description(" 获取工作中心")]
TJFrmPlaceBLL_GetWORKCENTERCODE,
/// <summary>
/// 修改补打时间
/// </summary>
[Description(" 修改补打时间")]
TJFrmPlaceBLL_UpdatePasteCardPasteCardDate2Value,
/// <summary>
/// 贴车单记录明细查询
/// </summary>
[Description("贴车单记录明细查询")]
TJFrmPlaceBLL_GetPasteDetails,
#endregion
/// <summary>
/// 发运模块列表查询
/// </summary>

1
AutoFileCopyNet/AutoFileCopyNet.csproj

@ -162,6 +162,7 @@
<ItemGroup>
<WCFMetadata Include="Service References\" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

4
Service/Service.csproj

@ -58,9 +58,7 @@
<Compile Include="LabelInfo.cs" />
<Compile Include="LogFileAccess.cs" />
<Compile Include="PrintUtil.cs" />
<Compile Include="Service.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Service.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="WriteLog.cs" />
</ItemGroup>

8
ServicesCenter/WCF/QMFrameWork.WebServiceHost/QMFrameWork.WebServiceHost.csproj

@ -24,6 +24,12 @@
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>4.0</OldToolsVersion>
<Use64BitIISExpress />
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@ -153,6 +159,7 @@
<Content Include="OpcService.svc" />
<Content Include="PrintTemplate\SlushBarCode.xml" />
<Content Include="PrintTemplate\InjectionBarCode.xml" />
<None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
<None Include="Service References\BarCodePrintService\service.disco" />
<None Include="Service References\BarCodePrintService\configuration91.svcinfo" />
<None Include="Service References\BarCodePrintService\configuration.svcinfo">
@ -293,7 +300,6 @@
<CustomServerUrl>
</CustomServerUrl>
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
<EnableWcfTestClientForSVCDefaultValue>True</EnableWcfTestClientForSVCDefaultValue>
</WebProjectProperties>
</FlavorProperties>
</VisualStudio>

Loading…
Cancel
Save