diff --git a/APPMD/QMAPP.MD.DAL/MaterialDAL.cs b/APPMD/QMAPP.MD.DAL/MaterialDAL.cs
index 2bd360b..23533b2 100644
--- a/APPMD/QMAPP.MD.DAL/MaterialDAL.cs
+++ b/APPMD/QMAPP.MD.DAL/MaterialDAL.cs
@@ -603,7 +603,7 @@ namespace QMAPP.MD.DAL
}
if (string.IsNullOrEmpty(condition.REMARK) == false)
{
- whereBuilder.Append(" AND M.REMARK is not null ");
+ whereBuilder.Append($" AND M.REMARK LIKE '%{condition.REMARK}%' ");
}
if (string.IsNullOrEmpty(condition.MATERIAL_ATTRIBUTE) == false)
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.cs
index d7e1c17..b2f80a5 100644
--- a/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.cs
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.cs
@@ -29,6 +29,8 @@ namespace QMAPP.WinForm.Forms.TianJin
infolabel.Text = "";
infolabel.ForeColor = Color.Red;
_parentForm = parentForm;
+
+ LoadAssyMaterial();
}
#region 打印按钮
@@ -233,12 +235,17 @@ namespace QMAPP.WinForm.Forms.TianJin
///
private void PrintForm_Load(object sender, EventArgs e)
{
- _Material = _agent.InvokeServiceFunction>("MaterialBLL_GetMaterialList", new Material { REMARK = "REMARK" });
+
+ _Material = _agent.InvokeServiceFunction>("MaterialBLL_GetMaterialList", new Material { REMARK = Lines.Text });
foreach (var t in _Material)
{
t.MATERIAL_NAME = t.MATERIAL_CODE + "|" + t.MATERIAL_NAME;
}
- LoadAssyMaterial();
+ //模腔号
+ this.cbMaterial.DataSource = _Material;
+ this.cbMaterial.DisplayMember = "MATERIAL_NAME";
+ this.cbMaterial.ValueMember = "MATERIAL_CODE";
+ //
}
#endregion
@@ -250,20 +257,28 @@ namespace QMAPP.WinForm.Forms.TianJin
///
private void LoadAssyMaterial()
{
-
- //模腔号
- this.cbMaterial.DataSource = _Material;
- this.cbMaterial.DisplayMember = "MATERIAL_NAME";
- this.cbMaterial.ValueMember = "MATERIAL_CODE";
+ var list = new List();
+ list.Add(new Linese() { NAME = "018D", CODE = "018D" });
+ list.Add(new Linese() { NAME = "770B", CODE = "770B" });
+ this.Lines.DataSource = list;
+ this.Lines.DisplayMember = "NAME";
+ this.Lines.ValueMember = "CODE";
}
+ public class Linese
+ {
+ public string NAME { get; set; }
+ public string CODE { get; set; }
+ }
+
+ #endregion
- #endregion
private void label2_Click(object sender, EventArgs e)
{
}
+
}
}
\ No newline at end of file
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.designer.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.designer.cs
index 59e4e3d..6e03d34 100644
--- a/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.designer.cs
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.designer.cs
@@ -35,24 +35,28 @@ namespace QMAPP.WinForm.Forms.TianJin
this.infolabel = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.cbMaterial = new System.Windows.Forms.ComboBox();
+ this.Lines = new System.Windows.Forms.ComboBox();
+ this.label2 = new System.Windows.Forms.Label();
this.SuspendLayout();
//
// label1
//
this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("宋体", 27.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label1.Location = new System.Drawing.Point(258, 58);
+ this.label1.Location = new System.Drawing.Point(344, 72);
+ this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(169, 37);
+ this.label1.Size = new System.Drawing.Size(212, 47);
this.label1.TabIndex = 0;
this.label1.Text = "条码补打";
//
// button1
//
this.button1.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button1.Location = new System.Drawing.Point(233, 257);
+ this.button1.Location = new System.Drawing.Point(311, 375);
+ this.button1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(221, 35);
+ this.button1.Size = new System.Drawing.Size(295, 44);
this.button1.TabIndex = 5;
this.button1.Text = "打印";
this.button1.UseVisualStyleBackColor = true;
@@ -63,18 +67,20 @@ namespace QMAPP.WinForm.Forms.TianJin
this.infolabel.AutoSize = true;
this.infolabel.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.infolabel.ForeColor = System.Drawing.Color.Red;
- this.infolabel.Location = new System.Drawing.Point(63, 328);
+ this.infolabel.Location = new System.Drawing.Point(84, 410);
+ this.infolabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.infolabel.Name = "infolabel";
- this.infolabel.Size = new System.Drawing.Size(0, 31);
+ this.infolabel.Size = new System.Drawing.Size(0, 39);
this.infolabel.TabIndex = 6;
//
// label5
//
this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label5.Location = new System.Drawing.Point(27, 164);
+ this.label5.Location = new System.Drawing.Point(37, 285);
+ this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(130, 24);
+ this.label5.Size = new System.Drawing.Size(163, 30);
this.label5.TabIndex = 2;
this.label5.Text = "门板物料号";
//
@@ -83,21 +89,48 @@ namespace QMAPP.WinForm.Forms.TianJin
this.cbMaterial.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cbMaterial.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cbMaterial.FormattingEnabled = true;
- this.cbMaterial.Location = new System.Drawing.Point(173, 152);
+ this.cbMaterial.Location = new System.Drawing.Point(232, 270);
+ this.cbMaterial.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cbMaterial.Name = "cbMaterial";
- this.cbMaterial.Size = new System.Drawing.Size(470, 36);
+ this.cbMaterial.Size = new System.Drawing.Size(625, 43);
this.cbMaterial.TabIndex = 7;
//
+ // Lines
+ //
+ this.Lines.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.Lines.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.Lines.FormattingEnabled = true;
+ this.Lines.Location = new System.Drawing.Point(232, 167);
+ this.Lines.Margin = new System.Windows.Forms.Padding(4);
+ this.Lines.Name = "Lines";
+ this.Lines.Size = new System.Drawing.Size(306, 43);
+ this.Lines.TabIndex = 9;
+ this.Lines.SelectedIndexChanged += new System.EventHandler(this.PrintForm_Load);
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label2.Location = new System.Drawing.Point(86, 180);
+ this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(73, 30);
+ this.label2.TabIndex = 8;
+ this.label2.Text = "产线";
+ //
// PlanRePrintForm
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(665, 399);
+ this.ClientSize = new System.Drawing.Size(887, 499);
+ this.Controls.Add(this.Lines);
+ this.Controls.Add(this.label2);
this.Controls.Add(this.cbMaterial);
this.Controls.Add(this.infolabel);
this.Controls.Add(this.button1);
this.Controls.Add(this.label5);
this.Controls.Add(this.label1);
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "PlanRePrintForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "条码补打";
@@ -114,5 +147,7 @@ namespace QMAPP.WinForm.Forms.TianJin
private System.Windows.Forms.Label infolabel;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.ComboBox cbMaterial;
+ private System.Windows.Forms.ComboBox Lines;
+ private System.Windows.Forms.Label label2;
}
}
\ No newline at end of file
diff --git a/APPQ5/QMAPP.WinForm/Properties/app.manifest b/APPQ5/QMAPP.WinForm/Properties/app.manifest
new file mode 100644
index 0000000..8981e8d
--- /dev/null
+++ b/APPQ5/QMAPP.WinForm/Properties/app.manifest
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/APPQ5/QMAPP.WinForm/QMAPP.WinForm.csproj b/APPQ5/QMAPP.WinForm/QMAPP.WinForm.csproj
index 97a3cc4..7bf0ade 100644
--- a/APPQ5/QMAPP.WinForm/QMAPP.WinForm.csproj
+++ b/APPQ5/QMAPP.WinForm/QMAPP.WinForm.csproj
@@ -73,7 +73,7 @@
- true
+ false
false
@@ -88,6 +88,12 @@
QMSetupKey.pfx
+
+ LocalIntranet
+
+
+ Properties\app.manifest
+
True
@@ -95,9 +101,15 @@
..\..\DLL\BarcodeLib.dll
-
-
-
+
+ ..\..\DLL\CrystalDecisions.CrystalReports.Engine.dll
+
+
+ ..\..\DLL\CrystalDecisions.ReportSource.dll
+
+
+ ..\..\DLL\CrystalDecisions.Shared.dll
+
False
..\..\DLL\FastReport\FastReport.dll
@@ -1513,6 +1525,7 @@
Always
+
SettingsSingleFileGenerator
Settings.Designer.cs
diff --git a/DLL/CrystalDecisions.CrystalReports.Engine.dll b/DLL/CrystalDecisions.CrystalReports.Engine.dll
new file mode 100644
index 0000000..1d62c24
Binary files /dev/null and b/DLL/CrystalDecisions.CrystalReports.Engine.dll differ
diff --git a/DLL/CrystalDecisions.ReportSource.dll b/DLL/CrystalDecisions.ReportSource.dll
new file mode 100644
index 0000000..2d2b9f8
Binary files /dev/null and b/DLL/CrystalDecisions.ReportSource.dll differ
diff --git a/DLL/CrystalDecisions.Shared.dll b/DLL/CrystalDecisions.Shared.dll
new file mode 100644
index 0000000..fbb8dac
Binary files /dev/null and b/DLL/CrystalDecisions.Shared.dll differ