From 75b7d411f66ac29d9439320ed7ce2783fd3f0dd4 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期日, 31 七月 2022 09:51:24 +0800
Subject: [PATCH] 修改了 生产订单结案报表 快速生成条码 条码生成规则
---
LMES/bin/x86/Debug.zip | 0
/dev/null | 0
WorkM/报表分析/MES_ICMOBillStatusReport.cs | 5 +
WarM/条码打印/Sc_ICMOToBarCode.cs | 6 +-
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 36 ++++++------
WorkM/报表分析/MES_ICMOBillStatusReport.designer.cs | 84 ++++++++++++++++++---------
6 files changed, 80 insertions(+), 51 deletions(-)
diff --git a/LMES/bin/x86/Debug.rar b/LMES/bin/x86/Debug.rar
deleted file mode 100644
index aa8ea7a..0000000
--- a/LMES/bin/x86/Debug.rar
+++ /dev/null
Binary files differ
diff --git a/LMES/bin/x86/Debug.zip b/LMES/bin/x86/Debug.zip
new file mode 100644
index 0000000..2dc4dd0
--- /dev/null
+++ b/LMES/bin/x86/Debug.zip
Binary files differ
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
index 83a651c..477733f 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
@@ -1047,7 +1047,7 @@
",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate " +
",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HSourceID,HInterID " +
- ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " +
+ ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HPrdDate,HBC,HInnerBillNo " +
") values ("
+ "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID1.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString() + ", " + HMZQty.ToString()
+ ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString()
@@ -1055,7 +1055,7 @@
+ ", " + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + "," + HDeptID.ToString() + "," + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HRemark + "'"
+ ", " + HCusID.ToString() + ",'" + HCusType + "','" + HEndDate.ToShortDateString() + "','" + HWorkLineName + "','" + HDate + "'"
+ ", " + ClsPub.HOrgID.ToString() + "," + ClsPub.HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HSourceID.ToString() + "," + HInterID.ToString()
- + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "')");
+ + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HPrdDate + "','" + HBC + "','" + HInnerBillNo + "')");
oCn.RunProc("exec h_p_WMS_SetMaxNo '" + HTMNumber + "'");
DisplayTM();
@@ -1603,7 +1603,7 @@
private void DisplayTM()
{
//HInterID = DBUtility.ClsPub.isInt(txtHMaterID.Tag);
- DataSet DSet = oCn.RunProcReturn("select * from h_v_IF_BarCodeBillList Where HinterID=" + HInterID.ToString() + " and 鏉＄爜绫诲瀷 = '鎵樼洏鏉＄爜' order by HItemID", "h_v_IF_BarCodeBillList", ref DBUtility.ClsPub.sExeReturnInfo);
+ DataSet DSet = oCn.RunProcReturn("select * from h_v_IF_BarCodeBillList_test Where HinterID=" + HInterID.ToString() + " and 鏉＄爜绫诲瀷 = '鎵樼洏鏉＄爜' order by HItemID", "h_v_IF_BarCodeBillList_test", ref DBUtility.ClsPub.sExeReturnInfo);
//鐢熸垚棣栬鏍囬
if (DSet == null)
{
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index c828f26..fe3cabf 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -18,28 +18,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>07/18/2022 18:17:10</publishTime>
+ <publishTime>07/29/2022 08:36:32</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>07/18/2022 18:17:10</publishTime>
+ <publishTime>07/29/2022 08:36:32</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>07/18/2022 18:17:09</publishTime>
+ <publishTime>07/29/2022 08:36:31</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>07/18/2022 18:17:09</publishTime>
+ <publishTime>07/29/2022 08:36:31</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>07/18/2022 18:17:07</publishTime>
+ <publishTime>07/29/2022 08:36:29</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>07/18/2022 18:17:07</publishTime>
+ <publishTime>07/29/2022 08:36:29</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -93,10 +93,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>07/18/2022 18:17:08</publishTime>
+ <publishTime>07/29/2022 08:36:29</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>07/18/2022 18:17:08</publishTime>
+ <publishTime>07/29/2022 08:36:29</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>03/15/2022 10:06:42</publishTime>
@@ -129,22 +129,22 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>07/18/2022 18:17:06</publishTime>
+ <publishTime>07/29/2022 08:36:28</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>07/18/2022 18:17:06</publishTime>
+ <publishTime>07/29/2022 08:36:28</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>07/18/2022 18:17:06</publishTime>
+ <publishTime>07/29/2022 08:36:28</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>07/18/2022 18:17:06</publishTime>
+ <publishTime>07/29/2022 08:36:28</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>07/18/2022 18:17:07</publishTime>
+ <publishTime>07/29/2022 08:36:29</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>07/18/2022 18:17:07</publishTime>
+ <publishTime>07/29/2022 08:36:29</publishTime>
</File>
<File Include="bin/stdole.dll">
<publishTime>05/09/2021 13:35:37</publishTime>
@@ -255,13 +255,13 @@
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>07/18/2022 18:17:15</publishTime>
+ <publishTime>07/29/2022 08:36:34</publishTime>
</File>
<File Include="bin/WebAPI.dll.config">
<publishTime>12/15/2021 17:59:43</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>07/18/2022 18:17:15</publishTime>
+ <publishTime>07/29/2022 08:36:34</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -273,7 +273,7 @@
<publishTime>11/29/2018 21:26:30</publishTime>
</File>
<File Include="Config/kdapi.config">
- <publishTime>06/28/2022 08:44:51</publishTime>
+ <publishTime>07/27/2022 08:46:55</publishTime>
</File>
<File Include="Content/bootstrap.css">
<publishTime>03/15/2022 10:06:42</publishTime>
@@ -459,7 +459,7 @@
<publishTime>12/20/2021 13:19:56</publishTime>
</File>
<File Include="Web.config">
- <publishTime>07/18/2022 18:17:23</publishTime>
+ <publishTime>07/29/2022 08:36:41</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/MES_ICMOBillStatusReport.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/MES_ICMOBillStatusReport.cs"
index e179de0..17ed8f1 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/MES_ICMOBillStatusReport.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/MES_ICMOBillStatusReport.cs"
@@ -140,8 +140,9 @@
DataSet DSet = new DataSet();
//杩囨护鏉′欢Dlg
string sDlgWhere = "";
- sDlgWhere = sDlgWhere + ",'" + dtpHBDate.Value.ToShortDateString() + "'";
- sDlgWhere = sDlgWhere + ",'" + dtpHEDate.Value.ToShortDateString() + "'";
+ //sDlgWhere = sDlgWhere + ",'" + dtpHBDate.Value.ToShortDateString() + "'";
+ //sDlgWhere = sDlgWhere + ",'" + dtpHEDate.Value.ToShortDateString() + "'";
+ sDlgWhere = sDlgWhere + ",'" + txtHMaterName.Text + "'";
sDlgWhere = sDlgWhere + ",'" + txtHICMOBillNo.Text + "'";
sDlgWhere = sDlgWhere + ",'" + txtHProcessExchangeBillNo.Text + "'";
sDlgWhere = sDlgWhere + ",'" + cmbHICMOBillStatus.Text.Trim() + "'";
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/MES_ICMOBillStatusReport.designer.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/MES_ICMOBillStatusReport.designer.cs"
index b8ea027..891f154 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/MES_ICMOBillStatusReport.designer.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/MES_ICMOBillStatusReport.designer.cs"
@@ -32,6 +32,9 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MES_ICMOBillStatusReport));
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.Tool = new System.Windows.Forms.ToolStrip();
+ this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripDropDownButton();
+ this.eXCELToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.cSVToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.yl = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
this.cx = new System.Windows.Forms.ToolStripButton();
@@ -58,9 +61,8 @@
this.timer2 = new System.Windows.Forms.Timer(this.components);
this.grdMain = new System.Windows.Forms.DataGridView();
this.grdSum = new System.Windows.Forms.DataGridView();
- this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripDropDownButton();
- this.eXCELToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.cSVToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.label4 = new System.Windows.Forms.Label();
+ this.txtHMaterName = new System.Windows.Forms.TextBox();
this.Tool.SuspendLayout();
this.pPic.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
@@ -98,6 +100,34 @@
this.Tool.Stretch = true;
this.Tool.TabIndex = 16;
this.Tool.Text = "toolStrip1";
+ //
+ // toolStripDropDownButton1
+ //
+ this.toolStripDropDownButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.eXCELToolStripMenuItem,
+ this.cSVToolStripMenuItem});
+ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image")));
+ this.toolStripDropDownButton1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.toolStripDropDownButton1.Name = "toolStripDropDownButton1";
+ this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 44);
+ this.toolStripDropDownButton1.Text = "寮曞嚭";
+ this.toolStripDropDownButton1.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.toolStripDropDownButton1.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ //
+ // eXCELToolStripMenuItem
+ //
+ this.eXCELToolStripMenuItem.Name = "eXCELToolStripMenuItem";
+ this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
+ this.eXCELToolStripMenuItem.Text = "EXCEL";
+ this.eXCELToolStripMenuItem.Click += new System.EventHandler(this.eXCELToolStripMenuItem_Click);
+ //
+ // cSVToolStripMenuItem
+ //
+ this.cSVToolStripMenuItem.Name = "cSVToolStripMenuItem";
+ this.cSVToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
+ this.cSVToolStripMenuItem.Text = "CSV";
+ this.cSVToolStripMenuItem.Click += new System.EventHandler(this.cSVToolStripMenuItem_Click);
//
// yl
//
@@ -208,6 +238,8 @@
this.pPic.BackColor = System.Drawing.Color.White;
this.pPic.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pPic.BackgroundImage")));
this.pPic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
+ this.pPic.Controls.Add(this.label4);
+ this.pPic.Controls.Add(this.txtHMaterName);
this.pPic.Controls.Add(this.label6);
this.pPic.Controls.Add(this.txtHProcessExchangeBillNo);
this.pPic.Controls.Add(this.cmbHICMOBillStatus);
@@ -249,7 +281,8 @@
this.cmbHICMOBillStatus.Items.AddRange(new object[] {
"鍏ㄩ儴",
"WMS缁撴",
- "鏈粨妗�"});
+ "鏈粨妗�",
+ "K3缁撴"});
this.cmbHICMOBillStatus.Location = new System.Drawing.Point(723, 3);
this.cmbHICMOBillStatus.Name = "cmbHICMOBillStatus";
this.cmbHICMOBillStatus.Size = new System.Drawing.Size(143, 20);
@@ -290,6 +323,7 @@
this.dtpHEDate.Name = "dtpHEDate";
this.dtpHEDate.Size = new System.Drawing.Size(107, 21);
this.dtpHEDate.TabIndex = 10;
+ this.dtpHEDate.Visible = false;
//
// label1
//
@@ -300,6 +334,7 @@
this.label1.Size = new System.Drawing.Size(53, 12);
this.label1.TabIndex = 7;
this.label1.Text = "寮�濮嬫棩鏈�";
+ this.label1.Visible = false;
//
// label2
//
@@ -310,6 +345,7 @@
this.label2.Size = new System.Drawing.Size(53, 12);
this.label2.TabIndex = 8;
this.label2.Text = "缁撴潫鏃ユ湡";
+ this.label2.Visible = false;
//
// dtpHBDate
//
@@ -318,6 +354,7 @@
this.dtpHBDate.Name = "dtpHBDate";
this.dtpHBDate.Size = new System.Drawing.Size(107, 21);
this.dtpHBDate.TabIndex = 9;
+ this.dtpHBDate.Visible = false;
//
// lblCaption
//
@@ -368,33 +405,22 @@
this.grdSum.Size = new System.Drawing.Size(1190, 19);
this.grdSum.TabIndex = 49;
//
- // toolStripDropDownButton1
+ // label4
//
- this.toolStripDropDownButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.eXCELToolStripMenuItem,
- this.cSVToolStripMenuItem});
- this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image")));
- this.toolStripDropDownButton1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.toolStripDropDownButton1.Name = "toolStripDropDownButton1";
- this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 44);
- this.toolStripDropDownButton1.Text = "寮曞嚭";
- this.toolStripDropDownButton1.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.toolStripDropDownButton1.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.label4.AutoSize = true;
+ this.label4.BackColor = System.Drawing.Color.Transparent;
+ this.label4.Location = new System.Drawing.Point(654, 32);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(53, 12);
+ this.label4.TabIndex = 114;
+ this.label4.Text = "浜у搧鍚嶇О";
//
- // eXCELToolStripMenuItem
+ // txtHMaterName
//
- this.eXCELToolStripMenuItem.Name = "eXCELToolStripMenuItem";
- this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
- this.eXCELToolStripMenuItem.Text = "EXCEL";
- this.eXCELToolStripMenuItem.Click += new System.EventHandler(this.eXCELToolStripMenuItem_Click);
- //
- // cSVToolStripMenuItem
- //
- this.cSVToolStripMenuItem.Name = "cSVToolStripMenuItem";
- this.cSVToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
- this.cSVToolStripMenuItem.Text = "CSV";
- this.cSVToolStripMenuItem.Click += new System.EventHandler(this.cSVToolStripMenuItem_Click);
+ this.txtHMaterName.Location = new System.Drawing.Point(723, 28);
+ this.txtHMaterName.Name = "txtHMaterName";
+ this.txtHMaterName.Size = new System.Drawing.Size(143, 21);
+ this.txtHMaterName.TabIndex = 113;
//
// MES_ICMOBillStatusReport
//
@@ -454,5 +480,7 @@
private System.Windows.Forms.ToolStripDropDownButton toolStripDropDownButton1;
private System.Windows.Forms.ToolStripMenuItem eXCELToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem cSVToolStripMenuItem;
+ private System.Windows.Forms.Label label4;
+ public System.Windows.Forms.TextBox txtHMaterName;
}
}
\ No newline at end of file
--
Gitblit v1.9.1