Browse Source

天津补打增加产线功能

master
songnan.zhang 2 years ago
parent
commit
365ec0356d
  1. 2
      APPMD/QMAPP.MD.DAL/MaterialDAL.cs
  2. 31
      APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.cs
  3. 59
      APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.designer.cs
  4. 69
      APPQ5/QMAPP.WinForm/Properties/app.manifest
  5. 21
      APPQ5/QMAPP.WinForm/QMAPP.WinForm.csproj
  6. BIN
      DLL/CrystalDecisions.CrystalReports.Engine.dll
  7. BIN
      DLL/CrystalDecisions.ReportSource.dll
  8. BIN
      DLL/CrystalDecisions.Shared.dll

2
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)

31
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
/// <param name="e"></param>
private void PrintForm_Load(object sender, EventArgs e)
{
_Material = _agent.InvokeServiceFunction<List<Material>>("MaterialBLL_GetMaterialList", new Material { REMARK = "REMARK" });
_Material = _agent.InvokeServiceFunction<List<Material>>("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
/// </summary>
private void LoadAssyMaterial()
{
//模腔号
this.cbMaterial.DataSource = _Material;
this.cbMaterial.DisplayMember = "MATERIAL_NAME";
this.cbMaterial.ValueMember = "MATERIAL_CODE";
var list = new List<Linese>();
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)
{
}
}
}

59
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;
}
}

69
APPQ5/QMAPP.WinForm/Properties/app.manifest

@ -0,0 +1,69 @@
<?xml version="1.0" encoding="utf-8"?>
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
<assemblyIdentity version="1.0.0.0" name="MyApplication.app" />
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
<security>
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
<!-- UAC 清单选项
如果想要更改 Windows 用户帐户控制级别,请使用
以下节点之一替换 requestedExecutionLevel 节点。n
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
<requestedExecutionLevel level="highestAvailable" uiAccess="false" />
指定 requestedExecutionLevel 元素将禁用文件和注册表虚拟化。
如果你的应用程序需要此虚拟化来实现向后兼容性,则删除此
元素。
-->
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
</requestedPrivileges>
<applicationRequestMinimum>
<PermissionSet class="System.Security.PermissionSet" version="1" Unrestricted="true" ID="Custom" SameSite="site" />
<defaultAssemblyRequest permissionSetReference="Custom" />
</applicationRequestMinimum>
</security>
</trustInfo>
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application>
<!-- 设计此应用程序与其一起工作且已针对此应用程序进行测试的
Windows 版本的列表。取消评论适当的元素,
Windows 将自动选择最兼容的环境。 -->
<!-- Windows Vista -->
<!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
<!-- Windows 7 -->
<!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
<!-- Windows 8 -->
<!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
<!-- Windows 8.1 -->
<!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
<!-- Windows 10 -->
<!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
</application>
</compatibility>
<!-- 指示该应用程序可以感知 DPI 且 Windows 在 DPI 较高时将不会对其进行
自动缩放。Windows Presentation Foundation (WPF)应用程序自动感知 DPI,无需
选择加入。选择加入此设置的 Windows 窗体应用程序(目标设定为 .NET Framework 4.6 )还应
在其 app.config 中将 "EnableWindowsFormsHighDpiAutoResizing" 设置设置为 "true"。-->
<!--
<application xmlns="urn:schemas-microsoft-com:asm.v3">
<windowsSettings>
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
</windowsSettings>
</application>
-->
<!-- 启用 Windows 公共控件和对话框的主题(Windows XP 和更高版本) -->
<!--
<dependency>
<dependentAssembly>
<assemblyIdentity
type="win32"
name="Microsoft.Windows.Common-Controls"
version="6.0.0.0"
processorArchitecture="*"
publicKeyToken="6595b64144ccf1df"
language="*"
/>
</dependentAssembly>
</dependency>
-->
</assembly>

21
APPQ5/QMAPP.WinForm/QMAPP.WinForm.csproj

@ -73,7 +73,7 @@
</ManifestKeyFile>
</PropertyGroup>
<PropertyGroup>
<GenerateManifests>true</GenerateManifests>
<GenerateManifests>false</GenerateManifests>
</PropertyGroup>
<PropertyGroup>
<SignManifests>false</SignManifests>
@ -88,6 +88,12 @@
<PropertyGroup>
<AssemblyOriginatorKeyFile>QMSetupKey.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup>
<TargetZone>LocalIntranet</TargetZone>
</PropertyGroup>
<PropertyGroup>
<ApplicationManifest>Properties\app.manifest</ApplicationManifest>
</PropertyGroup>
<ItemGroup>
<Reference Include="Accessibility">
<EmbedInteropTypes>True</EmbedInteropTypes>
@ -95,9 +101,15 @@
<Reference Include="BarcodeLib">
<HintPath>..\..\DLL\BarcodeLib.dll</HintPath>
</Reference>
<Reference Include="CrystalDecisions.CrystalReports.Engine, Version=13.0.2000.0, Culture=neutral, PublicKeyToken=692fbea5521e1304, processorArchitecture=MSIL" />
<Reference Include="CrystalDecisions.ReportSource, Version=13.0.2000.0, Culture=neutral, PublicKeyToken=692fbea5521e1304, processorArchitecture=MSIL" />
<Reference Include="CrystalDecisions.Shared, Version=13.0.2000.0, Culture=neutral, PublicKeyToken=692fbea5521e1304, processorArchitecture=MSIL" />
<Reference Include="CrystalDecisions.CrystalReports.Engine, Version=13.0.2000.0, Culture=neutral, PublicKeyToken=692fbea5521e1304, processorArchitecture=MSIL">
<HintPath>..\..\DLL\CrystalDecisions.CrystalReports.Engine.dll</HintPath>
</Reference>
<Reference Include="CrystalDecisions.ReportSource, Version=13.0.2000.0, Culture=neutral, PublicKeyToken=692fbea5521e1304, processorArchitecture=MSIL">
<HintPath>..\..\DLL\CrystalDecisions.ReportSource.dll</HintPath>
</Reference>
<Reference Include="CrystalDecisions.Shared, Version=13.0.2000.0, Culture=neutral, PublicKeyToken=692fbea5521e1304, processorArchitecture=MSIL">
<HintPath>..\..\DLL\CrystalDecisions.Shared.dll</HintPath>
</Reference>
<Reference Include="FastReport, Version=2018.4.2.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\DLL\FastReport\FastReport.dll</HintPath>
@ -1513,6 +1525,7 @@
<Content Include="PrintTemplate\InjectLabel_NCB.frx">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<None Include="Properties\app.manifest" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>

BIN
DLL/CrystalDecisions.CrystalReports.Engine.dll

Binary file not shown.

BIN
DLL/CrystalDecisions.ReportSource.dll

Binary file not shown.

BIN
DLL/CrystalDecisions.Shared.dll

Binary file not shown.
Loading…
Cancel
Save