From e15d9e6c8186d7c24695af49ff857c5cb281e3b2 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期四, 30 六月 2022 10:12:30 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs | 9
WebAPI/Controllers/BLL/Xt_UserController.cs | 86 +++++++++++
WorkM/报表分析/ProductionOrder_ExecutionReport.cs | 9 +
WebAPI/Models/Gy_User.cs | 20 ++
WorkM/报表分析/ProductionOrder_ExecutionReport.designer.cs | 257 ++++++++++++++++++++++--------------
WorkM/报表分析/ProductionOrder_ExecutionReport.resx | 22 ++
6 files changed, 289 insertions(+), 114 deletions(-)
diff --git a/WebAPI/Controllers/BLL/Xt_UserController.cs b/WebAPI/Controllers/BLL/Xt_UserController.cs
index 124559c..e3701a6 100644
--- a/WebAPI/Controllers/BLL/Xt_UserController.cs
+++ b/WebAPI/Controllers/BLL/Xt_UserController.cs
@@ -166,18 +166,94 @@
//淇濆瓨
if (msg3=="Add") //鏂板
{
- oCN.RunProc("insert into Gy_Czygl (Czybm,Czymc,Czmm,Explain,HEmpID) values ('" + lsmain[0].Czybm.ToString() + "','" + lsmain[0].Czymc.ToString() + "','" + ClsPub.StrToPsd(lsmain[0].Czmm.ToString()) + "','" + lsmain[0].Explain.ToString() + "','" + lsmain[0].HEmpID.ToString() + "')");
+ ds = oCN.RunProcReturn("select * from Gy_Czygl where Czybm='" + lsmain[0].Czybm.ToString() + "'", "Gy_Czygl");
+ if (ds.Tables[0].Rows.Count != 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "* 缂栫爜閲嶅锛侊紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from Gy_Czygl where Czymc='" + lsmain[0].Czymc.ToString() + "'", "Gy_Czygl");
+ if (ds.Tables[0].Rows.Count != 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "* 鐢ㄦ埛鍚嶉噸澶嶏紒锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.RunProc("insert into Gy_Czygl (Czybm,Czymc,Czmm,Explain,HempID,HK3UserID " +
+ ",HKeeperID,HKeeper,HSecManagerID,HSecManager " +
+ ",HSellManID,HSellMan,HDeptID,HDept " +
+ ",HWhID,HWHName,HSupID,HSupName " +
+ ",HSCWHID,HSCWHName " +
+ ",HCloudUserName,HCloudUserPsd,HUSEORGID) " +
+ "values ('" + lsmain[0].Czybm.ToString() + "','" + lsmain[0].Czymc.ToString() + "','" + ClsPub.StrToPsd(lsmain[0].Czmm.ToString()) + "','" + lsmain[0].Explain.ToString() + "','" + lsmain[0].HEmpID.ToString() + "',"+ lsmain[0].HK3UserID.ToString() + "" +
+ ","+ lsmain[0].HKeeperID.ToString() + ",'"+ lsmain[0].HKeeper.ToString() + "',"+ lsmain[0].HSecManagerID.ToString() + ",'"+ lsmain[0].HSecManager.ToString() + "'" +
+ "," + lsmain[0].HSellManID.ToString() + ",'" + lsmain[0].HSellMan.ToString() + "'," + lsmain[0].HDeptID.ToString() + ",'" + lsmain[0].HDept.ToString() + "'" +
+ "," + lsmain[0].HWhID.ToString() + ",'" + lsmain[0].HWHName.ToString() + "'," + lsmain[0].HSupID.ToString() + ",'" + lsmain[0].HSupName.ToString() + "'" +
+ "," + lsmain[0].HSCWHID.ToString() + ",'" + lsmain[0].HSCWHName.ToString() + "'" +
+ ",'" + lsmain[0].HCloudUserName.ToString() + "','" + lsmain[0].HCloudUserPsd.ToString() + "',"+ lsmain[0].HOrgID.ToString() + ")");
}
else //淇敼
{
- if (lsmain[0].Czyyz != "" && lsmain[0].Czmm == lsmain[0].Czyyz) //淇敼瀵嗙爜
+ ds = oCN.RunProcReturn("select * from Gy_Czygl where Czybm='" + lsmain[0].Czybm.ToString() + "'", "Gy_Czygl");
+ if (ds.Tables[0].Rows[0]["Czmm"].ToString() != lsmain[0].Czmm) //淇敼瀵嗙爜
{
- oCN.RunProc("update Gy_Czygl set Czymc='"+lsmain[0].Czymc.ToString()+ "',Czmm='"+ ClsPub.StrToPsd(lsmain[0].Czmm.ToString()) + "',Explain='" + lsmain[0].Explain.ToString() + "' ,HEmpID='" + lsmain[0].HEmpID.ToString() + "' where Czybm='" + lsmain[0].Czybm.ToString()+"'");
+ oCN.RunProc("update Gy_Czygl set Czymc='" + lsmain[0].Czymc.ToString() +
+ "',Czmm='" + ClsPub.StrToPsd(lsmain[0].Czmm.ToString()) +
+ "',Explain='" + lsmain[0].Explain.ToString() + "'" +
+ ",HEmpID=" + lsmain[0].HEmpID.ToString() +
+ ",HK3UserID=" + lsmain[0].HK3UserID.ToString() +
+ ",HKeeperID=" + lsmain[0].HKeeperID.ToString() +
+ ",HKeeper='" + lsmain[0].HKeeper.ToString() + "'" +
+ ",HSecManagerID=" + lsmain[0].HSecManagerID.ToString() +
+ ",HSecManager='" + lsmain[0].HSecManager.ToString() + "'" +
+ ",HSellManID=" + lsmain[0].HSellManID.ToString() +
+ ",HSellMan='" + lsmain[0].HSellMan.ToString() + "'" +
+ ",HDeptID=" + lsmain[0].HDeptID.ToString() +
+ ",HDept='" + lsmain[0].HDept.ToString() + "'" +
+ ",HWhID=" + lsmain[0].HWhID.ToString() +
+ ",HWHName='" + lsmain[0].HWHName.ToString() + "'" +
+ ",HSCWHID=" + lsmain[0].HSCWHID.ToString() +
+ ",HSCWHName='" + lsmain[0].HSCWHName.ToString() + "'" +
+ ",HSupID=" + lsmain[0].HSupID.ToString() +
+ ",HSupName='" + lsmain[0].HSupName.ToString() + "'" +
+ ",HCloudUserName='" + lsmain[0].HCloudUserName.ToString() + "'" +
+ ",HCloudUserPsd='" + lsmain[0].HCloudUserPsd.ToString() + "'" +
+ ",HUSEORGID=" + lsmain[0].HOrgID.ToString() +
+ " where Czybm='" + lsmain[0].Czybm.ToString() + "'");
}
- else
+ else
{
- oCN.RunProc("update Gy_Czygl set Czymc='" + lsmain[0].Czymc.ToString() + "',Explain='" + lsmain[0].Explain.ToString() + "',HEmpID='" + lsmain[0].HEmpID.ToString() + "' where Czybm='" + lsmain[0].Czybm.ToString() + "'");
+ oCN.RunProc("update Gy_Czygl set Czymc='" + lsmain[0].Czymc.ToString() +
+ "',Explain='" + lsmain[0].Explain.ToString() + "'" +
+ ",HEmpID=" + lsmain[0].HEmpID.ToString() +
+ ",HK3UserID=" + lsmain[0].HK3UserID.ToString() +
+ ",HKeeperID=" + lsmain[0].HKeeperID.ToString() +
+ ",HKeeper='" + lsmain[0].HKeeper.ToString() + "'" +
+ ",HSecManagerID=" + lsmain[0].HSecManagerID.ToString() +
+ ",HSecManager='" + lsmain[0].HSecManager.ToString() + "'" +
+ ",HSellManID=" + lsmain[0].HSellManID.ToString() +
+ ",HSellMan='" + lsmain[0].HSellMan.ToString() + "'" +
+ ",HDeptID=" + lsmain[0].HDeptID.ToString() +
+ ",HDept='" + lsmain[0].HDept.ToString() + "'" +
+ ",HWhID=" + lsmain[0].HWhID.ToString() +
+ ",HWHName='" + lsmain[0].HWHName.ToString() + "'" +
+ ",HSCWHID=" + lsmain[0].HSCWHID.ToString() +
+ ",HSCWHName='" + lsmain[0].HSCWHName.ToString() + "'" +
+ ",HSupID=" + lsmain[0].HSupID.ToString() +
+ ",HSupName='" + lsmain[0].HSupName.ToString() + "'" +
+ ",HCloudUserName='" + lsmain[0].HCloudUserName.ToString() + "'" +
+ ",HCloudUserPsd='" + lsmain[0].HCloudUserPsd.ToString() + "'" +
+ ",HUSEORGID=" + lsmain[0].HOrgID.ToString() +
+ " where Czybm='" + lsmain[0].Czybm.ToString() + "'");
}
+
}
objJsonResult.code = "1";
diff --git a/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs b/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
index 98c011a..9268d94 100644
--- a/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
+++ b/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
@@ -55,6 +55,7 @@
public string HTextHeight;
public string HSortFlag;
public string HSelTotal;
+ public string HColumnWidth;
}
public class grdAlignmentSub
@@ -114,11 +115,11 @@
oCN.RunProc("Delete from Xt_grdAlignment_WMES where HUserName='" + user + "' and HModName='" + HModName + "' ");
oCN.RunProc("insert into Xt_grdAlignment_WMES (HUserName,HModName,HGridString,HFixCols" +
- ",HFontSize,HHeadTextHeight,HTextHeight,HSortFlag,HSelTotal" +
+ ",HFontSize,HHeadTextHeight,HTextHeight,HSortFlag,HSelTotal,HColumnWidth" +
") values('" + user + "','" + HModName + "','" + HGridString + "'," + (omdelMian.HFixCols == "" ? "0" : omdelMian.HFixCols) +
- "," + (omdelMian.HFontSize == "" ? "0" : omdelMian.HFontSize) + "," + (omdelMian.HHeadTextHeight == "" ? "0" : omdelMian.HHeadTextHeight) +
- "," + (omdelMian.HTextHeight == "" ? "0" : omdelMian.HTextHeight) + ",'" + omdelMian.HSortFlag + "','" + omdelMian.HSelTotal + "'" +
- ")");
+ "," + (omdelMian.HFontSize == "" ? "0" : omdelMian.HFontSize) + ",0" +
+ ",0,'" + omdelMian.HSortFlag + "','" + omdelMian.HSelTotal + "'" +
+ ","+ (omdelMian.HColumnWidth == "" ? "0" : omdelMian.HColumnWidth) + ")");
objJsonResult.code = "1";
diff --git a/WebAPI/Models/Gy_User.cs b/WebAPI/Models/Gy_User.cs
index 9b1d83d..ec260cb 100644
--- a/WebAPI/Models/Gy_User.cs
+++ b/WebAPI/Models/Gy_User.cs
@@ -12,6 +12,24 @@
public string Czmm { get; set; }
public string Czyyz { get; set; }
public string Explain { get; set; }
- public string HEmpID { get; set; }
+ public int HEmpID { get; set; }
+ public string HCloudUserName { get; set; }
+ public string HCloudUserPsd { get; set; }
+ public int HOrgID;
+ public int HK3UserID;
+ public int HKeeperID;
+ public string HKeeper;
+ public int HSecManagerID;
+ public string HSecManager;
+ public int HSellManID;
+ public string HSellMan;
+ public int HDeptID;
+ public string HDept;
+ public int HWhID;
+ public string HWHName;
+ public int HSCWHID;
+ public string HSCWHName;
+ public int HSupID;
+ public string HSupName;
}
}
\ No newline at end of file
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionOrder_ExecutionReport.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionOrder_ExecutionReport.cs"
index 189b906..47cd5e4 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionOrder_ExecutionReport.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionOrder_ExecutionReport.cs"
@@ -338,5 +338,14 @@
BLL.ClsBaseSelect.SetTextByDept(textDept);
}
+ private void eXCELToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ DBUtility.Gy_BaseFun.DataToExcel(this.Text, grdMain);
+ }
+
+ private void cSVToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ DBUtility.Gy_BaseFun.DataGridViewToExcel2(grdMain, this.Text, this.Text);
+ }
}
}
\ No newline at end of file
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionOrder_ExecutionReport.designer.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionOrder_ExecutionReport.designer.cs"
index 66355dd..b5ba56c 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionOrder_ExecutionReport.designer.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionOrder_ExecutionReport.designer.cs"
@@ -44,6 +44,12 @@
this.bclk = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
this.pPic = new System.Windows.Forms.Panel();
+ this.label7 = new System.Windows.Forms.Label();
+ this.label6 = new System.Windows.Forms.Label();
+ this.txtUnit = new System.Windows.Forms.TextBox();
+ this.txtModel = new System.Windows.Forms.TextBox();
+ this.txtName = new System.Windows.Forms.TextBox();
+ this.cmbSourceBillType = new System.Windows.Forms.ComboBox();
this.button1 = new System.Windows.Forms.Button();
this.textDept = new System.Windows.Forms.TextBox();
this.label4 = new System.Windows.Forms.Label();
@@ -59,12 +65,9 @@
this.timer2 = new System.Windows.Forms.Timer(this.components);
this.grdMain = new System.Windows.Forms.DataGridView();
this.grdSum = new System.Windows.Forms.DataGridView();
- this.cmbSourceBillType = new System.Windows.Forms.ComboBox();
- this.txtName = new System.Windows.Forms.TextBox();
- this.txtModel = new System.Windows.Forms.TextBox();
- this.txtUnit = new System.Windows.Forms.TextBox();
- this.label6 = new System.Windows.Forms.Label();
- this.label7 = new System.Windows.Forms.Label();
+ this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripDropDownButton();
+ this.eXCELToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.cSVToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.Tool.SuspendLayout();
this.pPic.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
@@ -93,11 +96,12 @@
this.mrlk,
this.toolStripSeparator7,
this.bclk,
- this.toolStripSeparator9});
+ this.toolStripSeparator9,
+ this.toolStripDropDownButton1});
this.Tool.Location = new System.Drawing.Point(0, 0);
this.Tool.Name = "Tool";
this.Tool.Padding = new System.Windows.Forms.Padding(0);
- this.Tool.Size = new System.Drawing.Size(932, 47);
+ this.Tool.Size = new System.Drawing.Size(1243, 59);
this.Tool.Stretch = true;
this.Tool.TabIndex = 16;
this.Tool.Text = "toolStrip1";
@@ -120,7 +124,7 @@
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 47);
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 59);
//
// cx
//
@@ -139,7 +143,7 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 47);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 59);
//
// tc
//
@@ -158,13 +162,13 @@
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 47);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 59);
//
// toolStripSeparator8
//
this.toolStripSeparator8.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator8.Name = "toolStripSeparator8";
- this.toolStripSeparator8.Size = new System.Drawing.Size(6, 47);
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 59);
//
// mrlk
//
@@ -174,7 +178,7 @@
this.mrlk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.mrlk.ImageTransparentColor = System.Drawing.Color.White;
this.mrlk.Name = "mrlk";
- this.mrlk.Size = new System.Drawing.Size(60, 44);
+ this.mrlk.Size = new System.Drawing.Size(73, 56);
this.mrlk.Text = "榛樿鍒楀";
this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -184,7 +188,7 @@
//
this.toolStripSeparator7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator7.Name = "toolStripSeparator7";
- this.toolStripSeparator7.Size = new System.Drawing.Size(6, 47);
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 59);
//
// bclk
//
@@ -194,7 +198,7 @@
this.bclk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.bclk.ImageTransparentColor = System.Drawing.Color.White;
this.bclk.Name = "bclk";
- this.bclk.Size = new System.Drawing.Size(60, 44);
+ this.bclk.Size = new System.Drawing.Size(73, 56);
this.bclk.Text = "淇濆瓨鍒楀";
this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -204,7 +208,7 @@
//
this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(6, 47);
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 59);
//
// pPic
//
@@ -230,27 +234,93 @@
this.pPic.Controls.Add(this.dtpHBDate);
this.pPic.Controls.Add(this.lblCaption);
this.pPic.Dock = System.Windows.Forms.DockStyle.Top;
- this.pPic.Location = new System.Drawing.Point(0, 47);
+ this.pPic.Location = new System.Drawing.Point(0, 59);
+ this.pPic.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.pPic.Name = "pPic";
- this.pPic.Size = new System.Drawing.Size(932, 55);
+ this.pPic.Size = new System.Drawing.Size(1243, 69);
this.pPic.TabIndex = 17;
+ //
+ // label7
+ //
+ this.label7.AutoSize = true;
+ this.label7.BackColor = System.Drawing.Color.Transparent;
+ this.label7.Location = new System.Drawing.Point(1104, 9);
+ this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(67, 15);
+ this.label7.TabIndex = 113;
+ this.label7.Text = "瑙勬牸鍨嬪彿";
+ //
+ // label6
+ //
+ this.label6.AutoSize = true;
+ this.label6.BackColor = System.Drawing.Color.Transparent;
+ this.label6.Location = new System.Drawing.Point(819, 9);
+ this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(67, 15);
+ this.label6.TabIndex = 112;
+ this.label6.Text = "鐗╂枡鍚嶇О";
+ //
+ // txtUnit
+ //
+ this.txtUnit.Enabled = false;
+ this.txtUnit.Location = new System.Drawing.Point(1164, 38);
+ this.txtUnit.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtUnit.Name = "txtUnit";
+ this.txtUnit.Size = new System.Drawing.Size(73, 25);
+ this.txtUnit.TabIndex = 111;
+ this.txtUnit.Visible = false;
+ //
+ // txtModel
+ //
+ this.txtModel.Location = new System.Drawing.Point(1192, 2);
+ this.txtModel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtModel.Name = "txtModel";
+ this.txtModel.Size = new System.Drawing.Size(189, 25);
+ this.txtModel.TabIndex = 110;
+ //
+ // txtName
+ //
+ this.txtName.Location = new System.Drawing.Point(897, 4);
+ this.txtName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtName.Name = "txtName";
+ this.txtName.Size = new System.Drawing.Size(189, 25);
+ this.txtName.TabIndex = 109;
+ //
+ // cmbSourceBillType
+ //
+ this.cmbSourceBillType.FormattingEnabled = true;
+ this.cmbSourceBillType.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.cmbSourceBillType.Items.AddRange(new object[] {
+ "鍏ㄩ儴",
+ "寤鸿"});
+ this.cmbSourceBillType.Location = new System.Drawing.Point(897, 36);
+ this.cmbSourceBillType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmbSourceBillType.Name = "cmbSourceBillType";
+ this.cmbSourceBillType.Size = new System.Drawing.Size(189, 23);
+ this.cmbSourceBillType.TabIndex = 108;
+ this.cmbSourceBillType.Text = "鍏ㄩ儴";
+ this.cmbSourceBillType.SelectedIndexChanged += new System.EventHandler(this.cmbSourceBillType_SelectedIndexChanged);
//
// button1
//
this.button1.Image = ((System.Drawing.Image)(resources.GetObject("button1.Image")));
this.button1.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.button1.Location = new System.Drawing.Point(586, 28);
+ this.button1.Location = new System.Drawing.Point(781, 35);
+ this.button1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(22, 22);
+ this.button1.Size = new System.Drawing.Size(29, 28);
this.button1.TabIndex = 48;
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// textDept
//
- this.textDept.Location = new System.Drawing.Point(440, 28);
+ this.textDept.Location = new System.Drawing.Point(587, 35);
+ this.textDept.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textDept.Name = "textDept";
- this.textDept.Size = new System.Drawing.Size(143, 21);
+ this.textDept.Size = new System.Drawing.Size(189, 25);
this.textDept.TabIndex = 47;
this.textDept.TextChanged += new System.EventHandler(this.textDept_TextChanged);
this.textDept.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dept_KeyDown);
@@ -259,9 +329,10 @@
//
this.label4.AutoSize = true;
this.label4.BackColor = System.Drawing.Color.Transparent;
- this.label4.Location = new System.Drawing.Point(381, 31);
+ this.label4.Location = new System.Drawing.Point(508, 39);
+ this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(29, 12);
+ this.label4.Size = new System.Drawing.Size(37, 15);
this.label4.TabIndex = 46;
this.label4.Text = "閮ㄩ棬";
//
@@ -269,9 +340,10 @@
//
this.cmdHBSupID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHBSupID.Image")));
this.cmdHBSupID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHBSupID.Location = new System.Drawing.Point(586, 2);
+ this.cmdHBSupID.Location = new System.Drawing.Point(781, 2);
+ this.cmdHBSupID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHBSupID.Name = "cmdHBSupID";
- this.cmdHBSupID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHBSupID.Size = new System.Drawing.Size(29, 28);
this.cmdHBSupID.TabIndex = 45;
this.cmdHBSupID.UseVisualStyleBackColor = true;
this.cmdHBSupID.Click += new System.EventHandler(this.cmdHBSupID_Click_1);
@@ -280,17 +352,19 @@
//
this.label5.AutoSize = true;
this.label5.BackColor = System.Drawing.Color.Transparent;
- this.label5.Location = new System.Drawing.Point(614, 34);
+ this.label5.Location = new System.Drawing.Point(819, 42);
+ this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(53, 12);
+ this.label5.Size = new System.Drawing.Size(67, 15);
this.label5.TabIndex = 40;
this.label5.Text = "缁撴寤鸿";
//
// txtNumber
//
- this.txtNumber.Location = new System.Drawing.Point(440, 3);
+ this.txtNumber.Location = new System.Drawing.Point(587, 4);
+ this.txtNumber.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtNumber.Name = "txtNumber";
- this.txtNumber.Size = new System.Drawing.Size(143, 21);
+ this.txtNumber.Size = new System.Drawing.Size(189, 25);
this.txtNumber.TabIndex = 35;
this.txtNumber.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHBSupID_KeyDown);
//
@@ -298,27 +372,30 @@
//
this.label3.AutoSize = true;
this.label3.BackColor = System.Drawing.Color.Transparent;
- this.label3.Location = new System.Drawing.Point(381, 8);
+ this.label3.Location = new System.Drawing.Point(508, 10);
+ this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(29, 12);
+ this.label3.Size = new System.Drawing.Size(37, 15);
this.label3.TabIndex = 34;
this.label3.Text = "鐗╂枡";
//
// dtpHEDate
//
this.dtpHEDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHEDate.Location = new System.Drawing.Point(268, 27);
+ this.dtpHEDate.Location = new System.Drawing.Point(357, 34);
+ this.dtpHEDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.dtpHEDate.Name = "dtpHEDate";
- this.dtpHEDate.Size = new System.Drawing.Size(107, 21);
+ this.dtpHEDate.Size = new System.Drawing.Size(141, 25);
this.dtpHEDate.TabIndex = 10;
//
// label1
//
this.label1.AutoSize = true;
this.label1.BackColor = System.Drawing.Color.Transparent;
- this.label1.Location = new System.Drawing.Point(209, 8);
+ this.label1.Location = new System.Drawing.Point(279, 10);
+ this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(53, 12);
+ this.label1.Size = new System.Drawing.Size(67, 15);
this.label1.TabIndex = 7;
this.label1.Text = "寮�濮嬫棩鏈�";
//
@@ -326,18 +403,20 @@
//
this.label2.AutoSize = true;
this.label2.BackColor = System.Drawing.Color.Transparent;
- this.label2.Location = new System.Drawing.Point(209, 34);
+ this.label2.Location = new System.Drawing.Point(279, 42);
+ this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(53, 12);
+ this.label2.Size = new System.Drawing.Size(67, 15);
this.label2.TabIndex = 8;
this.label2.Text = "缁撴潫鏃ユ湡";
//
// dtpHBDate
//
this.dtpHBDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHBDate.Location = new System.Drawing.Point(268, 3);
+ this.dtpHBDate.Location = new System.Drawing.Point(357, 4);
+ this.dtpHBDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.dtpHBDate.Name = "dtpHBDate";
- this.dtpHBDate.Size = new System.Drawing.Size(107, 21);
+ this.dtpHBDate.Size = new System.Drawing.Size(141, 25);
this.dtpHBDate.TabIndex = 9;
//
// lblCaption
@@ -346,9 +425,10 @@
this.lblCaption.BackColor = System.Drawing.Color.Transparent;
this.lblCaption.Cursor = System.Windows.Forms.Cursors.No;
this.lblCaption.Font = new System.Drawing.Font("瀹嬩綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lblCaption.Location = new System.Drawing.Point(12, 16);
+ this.lblCaption.Location = new System.Drawing.Point(16, 20);
+ this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(189, 19);
+ this.lblCaption.Size = new System.Drawing.Size(235, 24);
this.lblCaption.TabIndex = 4;
this.lblCaption.Text = "鐢熶骇璁㈠崟鎵ц鎯呭喌琛�";
//
@@ -364,11 +444,13 @@
this.grdMain.BackgroundColor = System.Drawing.Color.White;
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.grdMain.Location = new System.Drawing.Point(0, 102);
+ this.grdMain.Location = new System.Drawing.Point(0, 128);
+ this.grdMain.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
+ this.grdMain.RowHeadersWidth = 51;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(932, 332);
+ this.grdMain.Size = new System.Drawing.Size(1243, 414);
this.grdMain.TabIndex = 48;
this.grdMain.CellMouseUp += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.grdMain_CellMouseUp);
this.grdMain.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.grdMain_ColumnWidthChanged);
@@ -382,81 +464,55 @@
this.grdSum.BackgroundColor = System.Drawing.SystemColors.Control;
this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.grdSum.Location = new System.Drawing.Point(0, 434);
+ this.grdSum.Location = new System.Drawing.Point(0, 542);
+ this.grdSum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.grdSum.Name = "grdSum";
this.grdSum.ReadOnly = true;
+ this.grdSum.RowHeadersWidth = 51;
this.grdSum.RowTemplate.Height = 23;
this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
- this.grdSum.Size = new System.Drawing.Size(932, 19);
+ this.grdSum.Size = new System.Drawing.Size(1243, 24);
this.grdSum.TabIndex = 49;
//
- // cmbSourceBillType
+ // toolStripDropDownButton1
//
- this.cmbSourceBillType.FormattingEnabled = true;
- this.cmbSourceBillType.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.cmbSourceBillType.Items.AddRange(new object[] {
- "鍏ㄩ儴",
- "寤鸿"});
- this.cmbSourceBillType.Location = new System.Drawing.Point(673, 29);
- this.cmbSourceBillType.Name = "cmbSourceBillType";
- this.cmbSourceBillType.Size = new System.Drawing.Size(143, 20);
- this.cmbSourceBillType.TabIndex = 108;
- this.cmbSourceBillType.Text = "鍏ㄩ儴";
- this.cmbSourceBillType.SelectedIndexChanged += new System.EventHandler(this.cmbSourceBillType_SelectedIndexChanged);
+ 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(53, 56);
+ this.toolStripDropDownButton1.Text = "寮曞嚭";
+ this.toolStripDropDownButton1.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.toolStripDropDownButton1.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
//
- // txtName
+ // eXCELToolStripMenuItem
//
- this.txtName.Location = new System.Drawing.Point(673, 3);
- this.txtName.Name = "txtName";
- this.txtName.Size = new System.Drawing.Size(143, 21);
- this.txtName.TabIndex = 109;
+ this.eXCELToolStripMenuItem.Name = "eXCELToolStripMenuItem";
+ this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(224, 26);
+ this.eXCELToolStripMenuItem.Text = "EXCEL";
+ this.eXCELToolStripMenuItem.Click += new System.EventHandler(this.eXCELToolStripMenuItem_Click);
//
- // txtModel
+ // cSVToolStripMenuItem
//
- this.txtModel.Location = new System.Drawing.Point(894, 2);
- this.txtModel.Name = "txtModel";
- this.txtModel.Size = new System.Drawing.Size(143, 21);
- this.txtModel.TabIndex = 110;
- //
- // txtUnit
- //
- this.txtUnit.Enabled = false;
- this.txtUnit.Location = new System.Drawing.Point(873, 30);
- this.txtUnit.Name = "txtUnit";
- this.txtUnit.Size = new System.Drawing.Size(56, 21);
- this.txtUnit.TabIndex = 111;
- this.txtUnit.Visible = false;
- //
- // label6
- //
- this.label6.AutoSize = true;
- this.label6.BackColor = System.Drawing.Color.Transparent;
- this.label6.Location = new System.Drawing.Point(614, 7);
- this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(53, 12);
- this.label6.TabIndex = 112;
- this.label6.Text = "鐗╂枡鍚嶇О";
- //
- // label7
- //
- this.label7.AutoSize = true;
- this.label7.BackColor = System.Drawing.Color.Transparent;
- this.label7.Location = new System.Drawing.Point(828, 7);
- this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(53, 12);
- this.label7.TabIndex = 113;
- this.label7.Text = "瑙勬牸鍨嬪彿";
+ this.cSVToolStripMenuItem.Name = "cSVToolStripMenuItem";
+ this.cSVToolStripMenuItem.Size = new System.Drawing.Size(224, 26);
+ this.cSVToolStripMenuItem.Text = "CSV";
+ this.cSVToolStripMenuItem.Click += new System.EventHandler(this.cSVToolStripMenuItem_Click);
//
// ProductionOrder_ExecutionReport
//
- 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(932, 453);
+ this.ClientSize = new System.Drawing.Size(1243, 566);
this.Controls.Add(this.grdMain);
this.Controls.Add(this.grdSum);
this.Controls.Add(this.pPic);
this.Controls.Add(this.Tool);
this.KeyPreview = true;
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "ProductionOrder_ExecutionReport";
this.Text = "鐢熶骇璁㈠崟鎵ц鎯呭喌琛�";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -509,5 +565,8 @@
public System.Windows.Forms.TextBox txtModel;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.Label label7;
+ private System.Windows.Forms.ToolStripDropDownButton toolStripDropDownButton1;
+ private System.Windows.Forms.ToolStripMenuItem eXCELToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem cSVToolStripMenuItem;
}
}
\ No newline at end of file
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionOrder_ExecutionReport.resx" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionOrder_ExecutionReport.resx"
index aeaa935..7f154b7 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionOrder_ExecutionReport.resx"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionOrder_ExecutionReport.resx"
@@ -256,7 +256,7 @@
<data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
ao0ImqppU39qSFVMtVZLrfQXFMlKFy4KbaXQTao7Cd1U3VSyFFQIqNXYZDKZTHJ8976ZTEZD6AcnL+/e
e857A08p5uX7MEgv3i4h9GYRE3MLJUW9sdlPMG0SKhCvP4Z5/R8cIVYA0dk/AkOsKT1fUmpWzvkCz+2A
4PQ7WRW0tnvR5unFvQ7vFVH9fvdjdPYNoccftANGJufZbOTyvJZjdOaD8/uJ4dAcNzO6ga3dPezEbNFe
@@ -270,7 +270,7 @@
<data name="cx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
UjJbCzQWk5EFRslEiUwZFNLo+lMaxWCIIUXIQhYzj/edc28NHUzzq1/v7Z7zPOee6/ybgMu3lhwP6NrO
F9q6blqaSDaETnOs3UIiCx2bUBuDmjmojpr5t0QWZ9KQfJSNkll5roxAxQRUTZn+LvBOH0vBQgbidzB0
KF+wCA1xaEyYqbVLPEG/CwMC9iShbQu69yEo0uFzM7V2QV2Y2E2e4Al07kGL3L/3CEKXsCRXSryaOZ3J
@@ -282,7 +282,7 @@
<data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
@@ -292,7 +292,7 @@
<data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
@@ -307,7 +307,7 @@
<data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
/QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
@@ -319,6 +319,18 @@
AAAASUVORK5CYII=
</value>
</data>
+ <data name="toolStripDropDownButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAE6SURBVDhPY0hOnvOfEgw2AAY6OjqA5Jn/v78f+P/tzYb/
+ 7+/P+f/iUsf/x8fK/t/Zmfz/2hr//xcW2v9PS0v7f+DAgf8MDAwIA2aeAWqdaYxiwDuoAY9gBqwFGWD3
+ v9AbqBGkGZ8BX1+vh7sAZMDdXSAXBIBdADIgNWMh8QY8PlYO9QLCgDR8BvwBewFiwMtLnfAwuAoNA4IG
+ QMIAZMBsoAGIMLhKrAvAXkByAaoBkEBMzcRiwPTjv8CShHBmwYr/abgMmHzgy//+7W/+d657/L91ya3/
+ DbMv/a+ZfOp/edfB/0WNO/7nlm/4n5kPNACbF6aBDfiMMGDpTagBJ8EGFAMNyAMZULAcezQaG6cRhUFe
+ wGkAWBALnjx5MhiD2CAvUGRAVv5yYBgsgMiRZwBSIII0IyskDTP8BwA/9nl6zExBggAAAABJRU5ErkJg
+ gg==
+</value>
+ </data>
<data name="pPic.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
Qk22QAMAAAAAADYAAAAoAAAAFQMAAFoAAAABABgAAAAAAAAAAADDDgAAww4AAAAAAAAAAAAA////////
--
Gitblit v1.9.1