From 98ffd76b42337f3455982adbf384d648f8fef8bd Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 21 四月 2022 21:08:20 +0800
Subject: [PATCH] 1
---
PlanM/ClassDiagram1.cd | 2
PlanM/数据导入/Gy_StdWorkTimes_RoutingBill.cs | 198 ++++
WorkM/流转卡管理/MES_StationEntrustInBillList.designer.cs | 218 ++--
LMES/ClsShowMod.cs | 14
WebAPI/Controllers/SCGL/日计划管理/JIT_CompleteController..cs | 83 +
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 36
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 42
WorkM/流转卡管理/MES_StationOutBillList.cs | 6
WorkM/流转卡管理/MES_StationInBillList.cs | 6
WorkM/流转卡管理/MES_StationEntrustOutBillList.resx | 34
PlanM/数据导入/Gy_StdWorkTimes_RoutingBill.Designer.cs | 179 +++
WebAPI/Controllers/Kf_EntrustInBillController.cs | 139 +++
WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs | 20
WorkM/流转卡管理/MES_StationInBillList.designer.cs | 149 +-
PlanM/数据导入/Gy_DataIn_RoutingBill.resx | 3
WorkM/流转卡管理/MES_StationOutBillList.resx | 28
WorkM/流转卡管理/MES_StationOutBillList.designer.cs | 177 +-
BaseSet/公用资料/其他基础资料/Gy_StdWorkTimesList.cs | 209 ++-
BaseSet/公用资料/其他基础资料/Gy_StdWorkTimesList.Designer.cs | 137 +-
PlanM/数据导入/Gy_StdWorkTimes_RoutingBill.resx | 5
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | 8
WorkM/流转卡管理/MES_StationOutBillList_Bad.cs | 9
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs | 2
BaseSet/公用资料/其他基础资料/Gy_StdWorkTimesList.resx | 131 +-
BaseSet/公用资料/其他基础资料/Gy_StdWorkTimes.cs | 278 +++--
WebAPI/Controllers/生产管理/生产任务单/Sc_ICMOBillController.cs | 2
WorkM/流转卡管理/MES_StationEntrustOutBillList.cs | 6
Model/基础资料/其他基础资料/ClsGy_StdWorkTimes_Model.cs | 4
WorkM/流转卡管理/MES_StationInBillList.resx | 28
DAL/基础资料/其他基础资料/ClsGy_StdWorkTimes_Ctl.cs | 26
WorkM/流转卡管理/MES_StationEntrustInBillList.cs | 5
WorkM/流转卡管理/MES_StationEntrustOutBillList.designer.cs | 269 ++---
WebAPI/WebAPI.csproj | 1
BaseSet/公用资料/其他基础资料/Gy_StdWorkTimes.Designer.cs | 170 ++-
WorkM/流转卡管理/MES_StationEntrustInBillList.resx | 38
PlanM/PlanM.csproj | 22
36 files changed, 1,749 insertions(+), 935 deletions(-)
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimes.Designer.cs" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimes.Designer.cs"
index 7fcc134..46ba23b 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimes.Designer.cs"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimes.Designer.cs"
@@ -34,12 +34,6 @@
this.P1 = new System.Windows.Forms.Panel();
this.lblCaption = new System.Windows.Forms.Label();
this.gbUp = new System.Windows.Forms.GroupBox();
- this.txtHStdWorkTimes = new System.Windows.Forms.TextBox();
- this.txtHLowerlimit = new System.Windows.Forms.TextBox();
- this.txtHUpperlimit = new System.Windows.Forms.TextBox();
- this.label12 = new System.Windows.Forms.Label();
- this.label10 = new System.Windows.Forms.Label();
- this.label9 = new System.Windows.Forms.Label();
this.rbHSelectCusNone = new System.Windows.Forms.RadioButton();
this.rbHSelectMater = new System.Windows.Forms.RadioButton();
this.label7 = new System.Windows.Forms.Label();
@@ -87,12 +81,22 @@
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
this.bclk = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
+ this.grdMain1 = new System.Windows.Forms.DataGridView();
+ this.label1 = new System.Windows.Forms.Label();
+ this.txtHStdWorkTimes = new System.Windows.Forms.TextBox();
+ this.label9 = new System.Windows.Forms.Label();
+ this.txtHUpperlimit = new System.Windows.Forms.TextBox();
+ this.label10 = new System.Windows.Forms.Label();
+ this.txtHLowerlimit = new System.Windows.Forms.TextBox();
+ this.textBox1 = new System.Windows.Forms.TextBox();
+ this.textBox2 = new System.Windows.Forms.TextBox();
this.P1.SuspendLayout();
this.gbUp.SuspendLayout();
this.panel2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.grdSum)).BeginInit();
this.Tool.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdMain1)).BeginInit();
this.SuspendLayout();
//
// P1
@@ -120,12 +124,12 @@
// gbUp
//
this.gbUp.BackColor = System.Drawing.Color.Transparent;
- this.gbUp.Controls.Add(this.txtHStdWorkTimes);
this.gbUp.Controls.Add(this.txtHLowerlimit);
this.gbUp.Controls.Add(this.txtHUpperlimit);
- this.gbUp.Controls.Add(this.label12);
+ this.gbUp.Controls.Add(this.txtHStdWorkTimes);
this.gbUp.Controls.Add(this.label10);
this.gbUp.Controls.Add(this.label9);
+ this.gbUp.Controls.Add(this.label1);
this.gbUp.Controls.Add(this.rbHSelectCusNone);
this.gbUp.Controls.Add(this.rbHSelectMater);
this.gbUp.Controls.Add(this.label7);
@@ -141,6 +145,8 @@
this.gbUp.Controls.Add(this.txtHMaterID);
this.gbUp.Controls.Add(this.label5);
this.gbUp.Controls.Add(this.label4);
+ this.gbUp.Controls.Add(this.textBox2);
+ this.gbUp.Controls.Add(this.textBox1);
this.gbUp.Controls.Add(this.txtHProcID);
this.gbUp.Location = new System.Drawing.Point(19, 49);
this.gbUp.Margin = new System.Windows.Forms.Padding(4);
@@ -149,54 +155,6 @@
this.gbUp.Size = new System.Drawing.Size(1064, 176);
this.gbUp.TabIndex = 33;
this.gbUp.TabStop = false;
- //
- // txtHStdWorkTimes
- //
- this.txtHStdWorkTimes.Location = new System.Drawing.Point(128, 130);
- this.txtHStdWorkTimes.Name = "txtHStdWorkTimes";
- this.txtHStdWorkTimes.Size = new System.Drawing.Size(221, 25);
- this.txtHStdWorkTimes.TabIndex = 49;
- //
- // txtHLowerlimit
- //
- this.txtHLowerlimit.Location = new System.Drawing.Point(805, 130);
- this.txtHLowerlimit.Name = "txtHLowerlimit";
- this.txtHLowerlimit.Size = new System.Drawing.Size(221, 25);
- this.txtHLowerlimit.TabIndex = 49;
- //
- // txtHUpperlimit
- //
- this.txtHUpperlimit.Location = new System.Drawing.Point(484, 130);
- this.txtHUpperlimit.Name = "txtHUpperlimit";
- this.txtHUpperlimit.Size = new System.Drawing.Size(221, 25);
- this.txtHUpperlimit.TabIndex = 49;
- //
- // label12
- //
- this.label12.AutoSize = true;
- this.label12.Location = new System.Drawing.Point(36, 135);
- this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(67, 15);
- this.label12.TabIndex = 48;
- this.label12.Text = "鏍囧噯宸ユ椂";
- //
- // label10
- //
- this.label10.AutoSize = true;
- this.label10.Location = new System.Drawing.Point(727, 135);
- this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(67, 15);
- this.label10.TabIndex = 48;
- this.label10.Text = "涓嬮檺姣斾緥";
- //
- // label9
- //
- this.label9.AutoSize = true;
- this.label9.Location = new System.Drawing.Point(407, 135);
- this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(67, 15);
- this.label9.TabIndex = 48;
- this.label9.Text = "涓婇檺姣斾緥";
//
// rbHSelectCusNone
//
@@ -383,6 +341,7 @@
// timer1
//
this.timer1.Enabled = true;
+ this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// panel2
//
@@ -744,11 +703,102 @@
this.toolStripSeparator7.Name = "toolStripSeparator7";
this.toolStripSeparator7.Size = new System.Drawing.Size(6, 62);
//
+ // grdMain1
+ //
+ this.grdMain1.AllowUserToAddRows = false;
+ this.grdMain1.AllowUserToDeleteRows = false;
+ this.grdMain1.BackgroundColor = System.Drawing.Color.WhiteSmoke;
+ this.grdMain1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+ this.grdMain1.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable;
+ this.grdMain1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.grdMain1.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.grdMain1.Location = new System.Drawing.Point(52, 291);
+ this.grdMain1.Margin = new System.Windows.Forms.Padding(4);
+ this.grdMain1.Name = "grdMain1";
+ this.grdMain1.ReadOnly = true;
+ this.grdMain1.RowHeadersWidth = 30;
+ this.grdMain1.RowTemplate.Height = 23;
+ this.grdMain1.Size = new System.Drawing.Size(1109, 497);
+ this.grdMain1.TabIndex = 59;
+ this.grdMain1.RowHeadersWidthChanged += new System.EventHandler(this.grdMain_RowHeadersWidthChanged);
+ this.grdMain1.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdMain_CellEndEdit);
+ this.grdMain1.CellLeave += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdMain_CellLeave);
+ this.grdMain1.EditingControlShowing += new System.Windows.Forms.DataGridViewEditingControlShowingEventHandler(this.grdMain_EditingControlShowing);
+ this.grdMain1.Scroll += new System.Windows.Forms.ScrollEventHandler(this.grdMain_Scroll);
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(38, 135);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(67, 15);
+ this.label1.TabIndex = 45;
+ this.label1.Text = "鏍囧噯宸ユ椂";
+ //
+ // txtHStdWorkTimes
+ //
+ this.txtHStdWorkTimes.Location = new System.Drawing.Point(128, 130);
+ this.txtHStdWorkTimes.Name = "txtHStdWorkTimes";
+ this.txtHStdWorkTimes.Size = new System.Drawing.Size(221, 25);
+ this.txtHStdWorkTimes.TabIndex = 46;
+ //
+ // label9
+ //
+ this.label9.AutoSize = true;
+ this.label9.Location = new System.Drawing.Point(727, 135);
+ this.label9.Name = "label9";
+ this.label9.Size = new System.Drawing.Size(67, 15);
+ this.label9.TabIndex = 45;
+ this.label9.Text = "涓嬮檺姣斾緥";
+ //
+ // txtHUpperlimit
+ //
+ this.txtHUpperlimit.Location = new System.Drawing.Point(484, 130);
+ this.txtHUpperlimit.Name = "txtHUpperlimit";
+ this.txtHUpperlimit.Size = new System.Drawing.Size(221, 25);
+ this.txtHUpperlimit.TabIndex = 46;
+ //
+ // label10
+ //
+ this.label10.AutoSize = true;
+ this.label10.Location = new System.Drawing.Point(411, 135);
+ this.label10.Name = "label10";
+ this.label10.Size = new System.Drawing.Size(67, 15);
+ this.label10.TabIndex = 45;
+ this.label10.Text = "涓婇檺姣斾緥";
+ //
+ // txtHLowerlimit
+ //
+ this.txtHLowerlimit.Location = new System.Drawing.Point(805, 130);
+ this.txtHLowerlimit.Name = "txtHLowerlimit";
+ this.txtHLowerlimit.Size = new System.Drawing.Size(221, 25);
+ this.txtHLowerlimit.TabIndex = 46;
+ //
+ // textBox1
+ //
+ this.textBox1.Location = new System.Drawing.Point(485, 26);
+ this.textBox1.Margin = new System.Windows.Forms.Padding(4);
+ this.textBox1.Name = "textBox1";
+ this.textBox1.Size = new System.Drawing.Size(220, 25);
+ this.textBox1.TabIndex = 24;
+ this.textBox1.Tag = "0";
+ //
+ // textBox2
+ //
+ this.textBox2.Location = new System.Drawing.Point(730, 26);
+ this.textBox2.Margin = new System.Windows.Forms.Padding(4);
+ this.textBox2.Name = "textBox2";
+ this.textBox2.Size = new System.Drawing.Size(220, 25);
+ this.textBox2.TabIndex = 24;
+ this.textBox2.Tag = "0";
+ //
// Gy_StdWorkTimes
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1216, 928);
+ this.Controls.Add(this.grdMain1);
this.Controls.Add(this.P1);
this.Controls.Add(this.panel3);
this.Controls.Add(this.panel2);
@@ -773,6 +823,7 @@
((System.ComponentModel.ISupportInitialize)(this.grdSum)).EndInit();
this.Tool.ResumeLayout(false);
this.Tool.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdMain1)).EndInit();
this.ResumeLayout(false);
}
@@ -829,11 +880,14 @@
private System.Windows.Forms.ToolStripSeparator toolStripSeparator9;
private System.Windows.Forms.ToolStripButton bclk;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;
- private System.Windows.Forms.TextBox txtHStdWorkTimes;
+ private System.Windows.Forms.DataGridView grdMain1;
private System.Windows.Forms.TextBox txtHLowerlimit;
private System.Windows.Forms.TextBox txtHUpperlimit;
- private System.Windows.Forms.Label label12;
+ private System.Windows.Forms.TextBox txtHStdWorkTimes;
private System.Windows.Forms.Label label10;
private System.Windows.Forms.Label label9;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.TextBox textBox2;
+ private System.Windows.Forms.TextBox textBox1;
}
}
\ No newline at end of file
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimes.cs" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimes.cs"
index fd7b77f..1df1c1a 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimes.cs"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimes.cs"
@@ -46,8 +46,9 @@
public DAL.ClsGy_StdWorkTimes_Ctl BillNew = new DAL.ClsGy_StdWorkTimes_Ctl();
public Model.ClsGy_StdWorkTimes_Model BillOld = new Model.ClsGy_StdWorkTimes_Model();
ClsGridViewSum oSumGrid = new ClsGridViewSum();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
-
+
#region 鍥哄畾浠ｇ爜
//鍚堣
private void Total()
@@ -58,12 +59,12 @@
private void bclk_Click(object sender, EventArgs e)
{
//淇濆瓨鍒楀
- DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
+ DBUtility.Xt_BaseBillFun.SaveGrid(grdMain1, this.Name);
}
private void mrlk_Click(object sender, EventArgs e)
{
- DBUtility.Xt_BaseBillFun.DefaultGridView(grdMain, this.Name);
+ DBUtility.Xt_BaseBillFun.DefaultGridView(grdMain1, this.Name);
}
//娓呯┖鐣岄潰
@@ -184,10 +185,13 @@
{
//鎵撳嵃鍒濆鍖�
oSumGrid.NoCol = HSnoCol;
- oSumGrid.ogrdMain = grdMain;
+ oSumGrid.ogrdMain = grdMain1;
oSumGrid.oGridsum = grdSum;
lblCaption.Text = ModName;
+ textBox1.Hide();
+ textBox2.Hide();
this.Text = ModName;
+
}
@@ -236,7 +240,44 @@
//淇敼鎸夌航
private void xg_Click(object sender, EventArgs e)
{
- this.Sub_EditBill();
+ try
+ {
+ if (int.Parse(txtHStdWorkTimes.Text)<=0)
+ {
+ MessageBox.Show("鏍囧噯宸ユ椂蹇呴』澶т簬0", "鎻愮ず");
+ }
+ if (int.Parse(txtHUpperlimit.Text) <= 0)
+ {
+ MessageBox.Show("涓婇檺姣斾緥蹇呴』澶т簬0", "鎻愮ず");
+ }
+ if (int.Parse(txtHLowerlimit.Text) <= 0)
+ {
+ MessageBox.Show("涓嬬嚎姣斾緥蹇呴』澶т簬0", "鎻愮ず");
+ }
+ oCn.BeginTran();
+ string sql = string.Format(@"Update Gy_StdWorkTimes set" +
+ " HMaterID=" + textBox1.Text +
+ ",HProcID=" + textBox2.Text +
+ ",HStdWorkTimes=" + txtHStdWorkTimes.Text +
+ ",HUpperlimit=" + txtHUpperlimit.Text +
+ ",HLowerlimit=" + txtHLowerlimit.Text +
+ ",HMaker='" + DBUtility.ClsPub.CurUserName + "'" +
+ ",HMakeDate='" + DateTime.Now + "'" +
+ ",HUSEORGID=" + DBUtility.ClsPub.HOrgID +
+ " where HItemID=" + BillOld.HItemID);
+ oCn.RunProc(sql);
+ oCn.Commit();
+ MessageBox.Show("淇敼鎴愬姛,璇烽��鍑哄苟鍒锋柊", "鎻愮ず");
+ }
+ catch (Exception)
+ {
+ oCn.RollBack();
+ MessageBox.Show("淇敼澶辫触", "鎻愮ず");
+ throw;
+ }
+
+
+
}
//鍒犻櫎鎸夐挳
private void sc_Click(object sender, EventArgs e)
@@ -293,7 +334,7 @@
{
timer1.Enabled = false;
Sub_ControlLocation();
- if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_View)//|| BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_Viewonly
+ if (BillOld.HItemID.ToString()!=null)//|| BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_Viewonly
{
this.Sub_ShowBill();
}
@@ -387,60 +428,65 @@
DAL.ClsIF_Material_View oMater = new DAL.ClsIF_Material_View();
DAL.ClsIF_Process_View oProc = new DAL.ClsIF_Process_View();
//鍒ゆ柇鏄惁瀛樺湪鍗曟嵁
- if (BillNew.ShowBill(BillOld.HItemID, ref ClsPub.sExeReturnInfo) == false)
- {
- MessageBox.Show(ClsPub.sExeReturnInfo, "鎻愮ず");
- return;
- }
+ DataSet DsSub = oCn.RunProcReturn("Select * from h_v_Gy_StdWorkTimesListNew Where HitemID=" + BillOld.HItemID.ToString(), "Gy_StdWorkTimes");
+ DataRow dr = DsSub.Tables[0].Rows[0];
+
//娓呯┖
Sub_ClearBill();
-
+
//
- this.txtHMaker.Text = BillOld.HMaker;
- this.txtHMakeDate.Text = BillOld.HMakeDate;
- this.txtHChecker.Text = BillOld.HChecker;
+ this.textBox1.Text = dr["HMaterID"].ToString();
+ this.txtHMaterID.Text = dr["鐗╂枡浠ｇ爜"].ToString();
+ this.txtHMaterName.Text = dr["鐗╂枡鍚嶇О"].ToString();
+ this.txtHMaterModel.Text = dr["瑙勬牸鍨嬪彿"].ToString();
+ this.textBox2.Text = dr["HProcID"].ToString();
+ this.txtHProcID.Text = dr["宸ュ簭浠ｇ爜"].ToString();
+ this.txtHProcName.Text = dr["宸ュ簭鍚嶇О"].ToString();
+ this.txtHStdWorkTimes.Text = dr["鏍囧噯宸ユ椂"].ToString();
+ this.txtHUpperlimit.Text = dr["涓婄嚎姣斾緥"].ToString();
+ this.txtHLowerlimit.Text = dr["涓嬬嚎姣斾緥"].ToString();
//鍔犺浇琛ㄤ綋
- initGrid();
- int i = 0;
- foreach (Model.ClsGy_StdWorkTimes_Model oSub in BillNew.DetailColl)
- {
- //
- if (i >= grdMain.RowCount - 1)
- grdMain.Rows.Add();
- grdMain.Rows[i].Cells[HTagCol].Value = "*";
- grdMain.Rows[i].Cells[HMaterIDCol].Value = oSub.HMaterID.ToString();
- if (oMater.GetInfoByID(oSub.HMaterID))
- {
- grdMain.Rows[i].Cells[HMaterNumberCol].Value = oMater.omodel.HNumber;
- grdMain.Rows[i].Cells[HMaterNameCol].Value = oMater.omodel.HName;
- grdMain.Rows[i].Cells[HMaterModelCol].Value = oMater.omodel.HModel;
- }
- else
- {
- grdMain.Rows[i].Cells[HMaterNumberCol].Value = "";
- grdMain.Rows[i].Cells[HMaterNameCol].Value = "";
- grdMain.Rows[i].Cells[HMaterModelCol].Value = "";
- }
- grdMain.Rows[i].Cells[HProcIDCol].Value = oSub.HProcID.ToString();
- if (oProc.GetInfoByID(oSub.HProcID))
- {
- grdMain.Rows[i].Cells[HProcNumberCol].Value = oProc.omodel.HNumber;
- grdMain.Rows[i].Cells[HProcNameCol].Value = oProc.omodel.HName;
- }
- else
- {
- grdMain.Rows[i].Cells[HProcNumberCol].Value = "";
- grdMain.Rows[i].Cells[HProcNameCol].Value = "";
- }
-
- grdMain.Rows[i].Cells[HStdWorkTimes].Value = oSub.HStdWorkTimes.ToString();
- grdMain.Rows[i].Cells[HUpperlimit].Value = oSub.HUpperlimit.ToString();
- grdMain.Rows[i].Cells[HLowerlimit].Value = oSub.HLowerlimit.ToString();
- grdMain.Rows[i].Cells[HUSEORGID].Value = oSub.HUSEORGID.ToString();
- grdMain.Rows[i].Cells[HRemarkCol].Value = oSub.HRemark;
- i = i + 1;
- }
+ //initGrid();
+ //int i = 0;
+ //foreach (Model.ClsGy_StdWorkTimes_Model oSub in BillNew.DetailColl)
+ //{
+ // //
+ // if (i >= grdMain1.RowCount - 1)
+ // grdMain1.Rows.Add();
+ // grdMain1.Rows[i].Cells[HTagCol].Value = "*";
+ // grdMain1.Rows[i].Cells[HMaterIDCol].Value = oSub.HMaterID.ToString();
+ // if (oMater.GetInfoByID(oSub.HMaterID))
+ // {
+ // grdMain1.Rows[i].Cells[HMaterNumberCol].Value = oMater.omodel.HNumber;
+ // grdMain1.Rows[i].Cells[HMaterNameCol].Value = oMater.omodel.HName;
+ // grdMain1.Rows[i].Cells[HMaterModelCol].Value = oMater.omodel.HModel;
+ // }
+ // else
+ // {
+ // grdMain1.Rows[i].Cells[HMaterNumberCol].Value = "";
+ // grdMain1.Rows[i].Cells[HMaterNameCol].Value = "";
+ // grdMain1.Rows[i].Cells[HMaterModelCol].Value = "";
+ // }
+ // grdMain1.Rows[i].Cells[HProcIDCol].Value = oSub.HProcID.ToString();
+ // if (oProc.GetInfoByID(oSub.HProcID))
+ // {
+ // grdMain1.Rows[i].Cells[HProcNumberCol].Value = oProc.omodel.HNumber;
+ // grdMain1.Rows[i].Cells[HProcNameCol].Value = oProc.omodel.HName;
+ // }
+ // else
+ // {
+ // grdMain1.Rows[i].Cells[HProcNumberCol].Value = "";
+ // grdMain1.Rows[i].Cells[HProcNameCol].Value = "";
+ // }
+
+ // grdMain1.Rows[i].Cells[HStdWorkTimes].Value = oSub.HStdWorkTimes.ToString();
+ // grdMain1.Rows[i].Cells[HUpperlimit].Value = oSub.HUpperlimit.ToString();
+ // grdMain1.Rows[i].Cells[HLowerlimit].Value = oSub.HLowerlimit.ToString();
+ // grdMain1.Rows[i].Cells[HUSEORGID].Value = oSub.HUSEORGID.ToString();
+ // grdMain1.Rows[i].Cells[HRemarkCol].Value = oSub.HRemark;
+ // i = i + 1;
+ //}
//GRID鍏佽鍒锋柊
DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
//鍚堣
@@ -462,21 +508,16 @@
//}
//鏄庣粏琛ㄦ槸鍚︿负闆惰
- bool b = false;
- for (int i = 0; i < grdMain.RowCount; i++)
- {
- if (!IsNullRow(i))
- {
- b = true;
- break;
- }
- }
- if (b == false)
+
+ if (!IsNullRow(0))
{
MessageBox.Show("琛ㄤ綋鏄庣粏琛屼笉瀛樺湪锛佽褰曞叆锛�", "鎻愮ず");
return false;
}
- return true;
+ else
+ {
+ return true;
+ }
}
//淇濆瓨鍗曟嵁
private bool Sub_SaveBill()
@@ -494,26 +535,35 @@
lblCaption.Focus();
//
if (!Sub_AllowSave())//鍗曟嵁瀹屾暣鎬у垽鏂�
- return false;
+ { return false; }
+
//
//鏄庣粏绫昏祴鍊�
BillNew.DetailColl = new List<Model.ClsGy_StdWorkTimes_Model>();
- for (i = 0; i <= grdMain.RowCount - 1; i++)
+ for (i = 0; i <= grdMain1.RowCount - 1; i++)
{
- if (DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HMaterIDCol].Value) != 0 && DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HProcIDCol].Value) != 0)
+ if (DBUtility.ClsPub.isLong(grdMain1.Rows[i].Cells[HMaterIDCol].Value) != 0 && DBUtility.ClsPub.isLong(grdMain1.Rows[i].Cells[HProcIDCol].Value) != 0)
{
- Model.ClsGy_StdWorkTimes_Model oSub = new Model.ClsGy_StdWorkTimes_Model();
- oSub.HMaterID = ClsPub.isLong(grdMain.Rows[i].Cells[HMaterIDCol].Value);
- oSub.HProcID = ClsPub.isLong(grdMain.Rows[i].Cells[HProcIDCol].Value);
- oSub.HStdWorkTimes = ClsPub.isDoule(grdMain.Rows[i].Cells[HStdWorkTimes].Value);
- oSub.HUpperlimit = ClsPub.isDoule(grdMain.Rows[i].Cells[HUpperlimit].Value);
- oSub.HLowerlimit = ClsPub.isDoule(grdMain.Rows[i].Cells[HLowerlimit].Value);
- oSub.HUSEORGID = ClsPub.HOrgID;
- oSub.HStopflag = true;
- oSub.HMaker = ClsPub.CurUserName;
- oSub.HMakeDate = DateTime.Today.ToString();
- oSub.HRemark = ClsPub.isStrNull(grdMain.Rows[i].Cells[HRemarkCol].Value);
- BillNew.DetailColl.Add(oSub);
+ if (DBUtility.ClsPub.isLong(grdMain1.Rows[i].Cells[HStdWorkTimes].Value)>0&& DBUtility.ClsPub.isLong(grdMain1.Rows[i].Cells[HUpperlimit].Value) > 0&& DBUtility.ClsPub.isLong(grdMain1.Rows[i].Cells[HLowerlimit].Value) > 0)
+ {
+ Model.ClsGy_StdWorkTimes_Model oSub = new Model.ClsGy_StdWorkTimes_Model();
+ oSub.HMaterID = ClsPub.isLong(grdMain1.Rows[i].Cells[HMaterIDCol].Value);
+ oSub.HProcID = ClsPub.isLong(grdMain1.Rows[i].Cells[HProcIDCol].Value);
+ oSub.HStdWorkTimes = ClsPub.isDoule(grdMain1.Rows[i].Cells[HStdWorkTimes].Value);
+ oSub.HUpperlimit = ClsPub.isDoule(grdMain1.Rows[i].Cells[HUpperlimit].Value);
+ oSub.HLowerlimit = ClsPub.isDoule(grdMain1.Rows[i].Cells[HLowerlimit].Value);
+ oSub.HUSEORGID = ClsPub.HOrgID;
+ oSub.HStopflag = false;
+ oSub.HMaker = ClsPub.CurUserName;
+ oSub.HMakeDate = DateTime.Today.ToString();
+ oSub.HRemark = ClsPub.isStrNull(grdMain1.Rows[i].Cells[HRemarkCol].Value);
+ BillNew.DetailColl.Add(oSub);
+ }
+ else
+ {
+ MessageBox.Show("绗�" + (i+1) + "琛�,鏍囧噯宸ユ椂,涓婇檺姣斾緥鍜屼笅闄愭瘮渚嬮兘搴斿ぇ浜�0", "鎻愮ず");
+ return false;
+ }
}
}
//淇濆瓨瀹屾瘯鍚庡鐞�
@@ -568,28 +618,28 @@
//鍒濆鍖朑RID
private void initGrid()
{
- grdMain.ColumnCount = 22; //鎬诲垪鏁�
- DBUtility.Xt_BaseBillFun.initGridFst(grdMain, this.Name);
+ grdMain1.ColumnCount = 22; //鎬诲垪鏁�
+ DBUtility.Xt_BaseBillFun.initGridFst(grdMain1, this.Name);
//
- grdMain.Columns[HMaterIDCol].HeaderText = "鐗╂枡ID";
- grdMain.Columns[HMaterNumberCol].HeaderText = "鐗╂枡浠ｇ爜";
- grdMain.Columns[HMaterNameCol].HeaderText = "鐗╂枡鍚嶇О";
- grdMain.Columns[HMaterModelCol].HeaderText = "瑙勬牸鍨嬪彿";
- grdMain.Columns[HProcIDCol].HeaderText = "宸ュ簭ID";
- grdMain.Columns[HProcNumberCol].HeaderText = "宸ュ簭浠ｇ爜";
- grdMain.Columns[HProcNameCol].HeaderText = "宸ュ簭鍚嶇О";
+ grdMain1.Columns[HMaterIDCol].HeaderText = "鐗╂枡ID";
+ grdMain1.Columns[HMaterNumberCol].HeaderText = "鐗╂枡浠ｇ爜";
+ grdMain1.Columns[HMaterNameCol].HeaderText = "鐗╂枡鍚嶇О";
+ grdMain1.Columns[HMaterModelCol].HeaderText = "瑙勬牸鍨嬪彿";
+ grdMain1.Columns[HProcIDCol].HeaderText = "宸ュ簭ID";
+ grdMain1.Columns[HProcNumberCol].HeaderText = "宸ュ簭浠ｇ爜";
+ grdMain1.Columns[HProcNameCol].HeaderText = "宸ュ簭鍚嶇О";
- grdMain.Columns[HStdWorkTimes].HeaderText = "鏍囧噯宸ユ椂";
- grdMain.Columns[HUpperlimit].HeaderText = "涓婇檺姣斾緥";
- grdMain.Columns[HLowerlimit].HeaderText = "涓嬮檺姣斾緥";
- grdMain.Columns[HUSEORGID].HeaderText = "缁勭粐ID";
- grdMain.Columns[HRemarkCol].HeaderText = "澶囨敞";
+ grdMain1.Columns[HStdWorkTimes].HeaderText = "鏍囧噯宸ユ椂";
+ grdMain1.Columns[HUpperlimit].HeaderText = "涓婇檺姣斾緥";
+ grdMain1.Columns[HLowerlimit].HeaderText = "涓嬮檺姣斾緥";
+ grdMain1.Columns[HUSEORGID].HeaderText = "缁勭粐ID";
+ grdMain1.Columns[HRemarkCol].HeaderText = "澶囨敞";
//
//闅愯棌鍒�
- grdMain.Columns[HTagCol].Visible = false;
- grdMain.Columns[HProcIDCol].Visible = false;
- grdMain.Columns[HMaterIDCol].Visible = false;
- grdMain.Columns[HUSEORGID].Visible = false;
+ grdMain1.Columns[HTagCol].Visible = false;
+ grdMain1.Columns[HProcIDCol].Visible = false;
+ grdMain1.Columns[HMaterIDCol].Visible = false;
+ grdMain1.Columns[HUSEORGID].Visible = false;
//鍙紪杈戝垪
string sAllowCol = HMaterNumberCol.ToString() +
"," + HProcNumberCol.ToString() +
@@ -664,7 +714,7 @@
//鏄惁鏄┖琛�
private bool IsNullRow(int Row)
{
- if (ClsPub.isInt(grdMain.Rows[Row].Cells[HMaterIDCol].Value) == 0)
+ if (ClsPub.isInt(grdMain1.Rows[Row].Cells[HMaterIDCol].Value) == 0)
{
return true;
}
@@ -708,26 +758,26 @@
{
case HMaterNumberCol:
//BLL.ClsBaseSelect_K3.SetGridByMater_K3(grdMain, sRow, HMaterIDCol, HMaterNumberCol, HMaterNameCol, HMaterModelCol, 0, 0, 0);
- BLL.ClsBaseSelect_InterFace.SetGridByMater(grdMain, sRow, HMaterIDCol, HMaterNumberCol, HMaterNameCol, HMaterModelCol, 0, 0, 0);
+ BLL.ClsBaseSelect_InterFace.SetGridByMater(grdMain1, sRow, HMaterIDCol, HMaterNumberCol, HMaterNameCol, HMaterModelCol, 0, 0, 0);
if (rbHSelectCus.Checked)
{
- grdMain.Rows[sRow].Cells[HProcIDCol].Value = txtHProcID.Tag.ToString();
- grdMain.Rows[sRow].Cells[HProcNameCol].Value = txtHProcName.Text.Trim();
- grdMain.Rows[sRow].Cells[HProcNumberCol].Value = txtHProcID.Text.Trim();
+ grdMain1.Rows[sRow].Cells[HProcIDCol].Value = txtHProcID.Tag.ToString();
+ grdMain1.Rows[sRow].Cells[HProcNameCol].Value = txtHProcName.Text.Trim();
+ grdMain1.Rows[sRow].Cells[HProcNumberCol].Value = txtHProcID.Text.Trim();
}
- oEdit.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[sRow].Cells[HMaterNumberCol].Value);
+ oEdit.Text = DBUtility.ClsPub.isStrNull(grdMain1.Rows[sRow].Cells[HMaterNumberCol].Value);
break;
case HProcNumberCol:
//BLL.ClsBaseSelect.SetGridByProc(grdMain, sRow, HProcIDCol, HProcNumberCol, HProcNameCol);
- BLL.ClsBaseSelect_InterFace.SetGridByProc(grdMain, sRow, HProcIDCol, HProcNumberCol, HProcNameCol);
+ BLL.ClsBaseSelect_InterFace.SetGridByProc(grdMain1, sRow, HProcIDCol, HProcNumberCol, HProcNameCol);
if (rbHSelectMater.Checked)
{
- grdMain.Rows[sRow].Cells[HMaterIDCol].Value = txtHMaterID.Tag.ToString();
- grdMain.Rows[sRow].Cells[HMaterNumberCol].Value = txtHMaterID.Text.Trim();
- grdMain.Rows[sRow].Cells[HMaterNameCol].Value = txtHMaterName.Text.Trim();
- grdMain.Rows[sRow].Cells[HMaterModelCol].Value = txtHMaterModel.Text.Trim();
+ grdMain1.Rows[sRow].Cells[HMaterIDCol].Value = txtHMaterID.Tag.ToString();
+ grdMain1.Rows[sRow].Cells[HMaterNumberCol].Value = txtHMaterID.Text.Trim();
+ grdMain1.Rows[sRow].Cells[HMaterNameCol].Value = txtHMaterName.Text.Trim();
+ grdMain1.Rows[sRow].Cells[HMaterModelCol].Value = txtHMaterModel.Text.Trim();
}
- oEdit.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[sRow].Cells[HProcNumberCol].Value);
+ oEdit.Text = DBUtility.ClsPub.isStrNull(grdMain1.Rows[sRow].Cells[HProcNumberCol].Value);
break;
default:
break;
@@ -745,7 +795,7 @@
DataGridViewTextBoxEditingControl EditingControl;
private void grdMain_CellBeginEdit(object sender, DataGridViewCellCancelEventArgs e)
{
- int i = grdMain.CurrentCell.ColumnIndex;
+ int i = grdMain1.CurrentCell.ColumnIndex;
if (DBUtility.Xt_BaseBillFun.AllowEdit(grdStatus, oSumGrid, i))
{
e.Cancel = true;
@@ -783,7 +833,7 @@
private void grdMain_EditingControlShowing(object sender, DataGridViewEditingControlShowingEventArgs e)
{
- if (grdMain.CurrentCell != null)
+ if (grdMain1.CurrentCell != null)
{
if (e.Control is DataGridViewTextBoxEditingControl)
{
@@ -797,7 +847,7 @@
private void EditingControl_KeyDown(object sender, KeyEventArgs e)
{
//涓氬姟澶勭悊
- Sub_GridKey(e.KeyValue, grdMain.CurrentRow.Index, grdMain.CurrentCell.ColumnIndex, EditingControl);
+ Sub_GridKey(e.KeyValue, grdMain1.CurrentRow.Index, grdMain1.CurrentCell.ColumnIndex, EditingControl);
}
private void grdMain_RowHeadersWidthChanged(object sender, EventArgs e)
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.Designer.cs" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.Designer.cs"
index a1e024f..c4312df 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.Designer.cs"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.Designer.cs"
@@ -48,9 +48,9 @@
this.sh = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
this.ToolBar = new System.Windows.Forms.ToolStrip();
- this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
- this.yl = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
+ this.gs = new System.Windows.Forms.ToolStripButton();
+ this.wl = new System.Windows.Forms.ToolStripButton();
this.xz = new System.Windows.Forms.ToolStripButton();
this.xg = new System.Windows.Forms.ToolStripButton();
this.sc = new System.Windows.Forms.ToolStripButton();
@@ -62,8 +62,8 @@
this.mrlk = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
this.bclk = new System.Windows.Forms.ToolStripButton();
- this.wl = new System.Windows.Forms.ToolStripButton();
- this.gs = new System.Windows.Forms.ToolStripButton();
+ this.jy = new System.Windows.Forms.ToolStripButton();
+ this.fjy = new System.Windows.Forms.ToolStripButton();
this.tabPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
@@ -118,6 +118,7 @@
this.fsh.Text = "鍙嶅";
this.fsh.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.fsh.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.fsh.Click += new System.EventHandler(this.fsh_Click);
//
// toolStripSeparator3
//
@@ -136,6 +137,7 @@
this.tc.Text = "閫�鍑�";
this.tc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.tc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.tc.Click += new System.EventHandler(this.tc_Click);
//
// toolStripSeparator5
//
@@ -196,6 +198,7 @@
this.tv.SelectedImageIndex = 1;
this.tv.Size = new System.Drawing.Size(195, 595);
this.tv.TabIndex = 16;
+ this.tv.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.tv_NodeMouseClick);
//
// panel1
//
@@ -241,6 +244,7 @@
this.sh.Text = "瀹℃牳";
this.sh.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.sh.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.sh.Click += new System.EventHandler(this.sh_Click);
//
// toolStripSeparator9
//
@@ -255,8 +259,6 @@
this.ToolBar.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.ToolBar.ImageScalingSize = new System.Drawing.Size(22, 22);
this.ToolBar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.toolStripButton1,
- this.yl,
this.toolStripSeparator6,
this.gs,
this.wl,
@@ -276,7 +278,9 @@
this.fsh,
this.toolStripSeparator3,
this.tc,
- this.toolStripSeparator5});
+ this.toolStripSeparator5,
+ this.jy,
+ this.fjy});
this.ToolBar.Location = new System.Drawing.Point(0, 0);
this.ToolBar.Name = "ToolBar";
this.ToolBar.Padding = new System.Windows.Forms.Padding(0);
@@ -285,36 +289,43 @@
this.ToolBar.TabIndex = 17;
this.ToolBar.Text = "toolStrip1";
//
- // toolStripButton1
- //
- this.toolStripButton1.AutoSize = false;
- this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
- this.toolStripButton1.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.toolStripButton1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.toolStripButton1.Name = "toolStripButton1";
- this.toolStripButton1.Size = new System.Drawing.Size(35, 47);
- this.toolStripButton1.Text = "棰勮";
- this.toolStripButton1.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.toolStripButton1.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- //
- // yl
- //
- this.yl.AutoSize = false;
- this.yl.Image = ((System.Drawing.Image)(resources.GetObject("yl.Image")));
- this.yl.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.yl.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.yl.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.yl.Name = "yl";
- this.yl.Size = new System.Drawing.Size(35, 47);
- this.yl.Text = "鎷疯礉";
- this.yl.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.yl.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- //
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
this.toolStripSeparator6.Size = new System.Drawing.Size(6, 62);
+ //
+ // gs
+ //
+ this.gs.AutoSize = false;
+ this.gs.Image = ((System.Drawing.Image)(resources.GetObject("gs.Image")));
+ this.gs.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.gs.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.gs.ImageTransparentColor = System.Drawing.Color.White;
+ this.gs.Name = "gs";
+ this.gs.Size = new System.Drawing.Size(35, 47);
+ this.gs.Text = "宸ュ簭";
+ this.gs.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.gs.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.gs.ToolTipText = "宸ユ椂";
+ this.gs.Click += new System.EventHandler(this.gs_Click);
+ this.gs.LocationChanged += new System.EventHandler(this.gs_Click);
+ //
+ // wl
+ //
+ this.wl.AutoSize = false;
+ this.wl.Checked = true;
+ this.wl.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.wl.ForeColor = System.Drawing.SystemColors.ControlText;
+ this.wl.Image = ((System.Drawing.Image)(resources.GetObject("wl.Image")));
+ this.wl.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.wl.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.wl.ImageTransparentColor = System.Drawing.Color.White;
+ this.wl.Name = "wl";
+ this.wl.Size = new System.Drawing.Size(35, 47);
+ this.wl.Text = "鐗╂枡";
+ this.wl.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.wl.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.wl.Click += new System.EventHandler(this.wl_Click);
//
// xz
//
@@ -329,6 +340,7 @@
this.xz.Text = "鏂板";
this.xz.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.xz.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.xz.Click += new System.EventHandler(this.xz_Click);
//
// xg
//
@@ -342,6 +354,7 @@
this.xg.Text = "淇敼";
this.xg.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.xg.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.xg.Click += new System.EventHandler(this.xg_Click);
//
// sc
//
@@ -355,6 +368,7 @@
this.sc.Text = "鍒犻櫎";
this.sc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.sc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.sc.Click += new System.EventHandler(this.sc_Click);
//
// toolStripSeparator2
//
@@ -373,6 +387,7 @@
this.cx.Text = "鏌ヨ";
this.cx.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.cx.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.cx.Click += new System.EventHandler(this.cx_Click);
//
// xs
//
@@ -386,6 +401,7 @@
this.xs.Text = "鍒锋柊";
this.xs.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.xs.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.xs.Click += new System.EventHandler(this.xs_Click);
//
// toolStripSeparator1
//
@@ -430,36 +446,33 @@
this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
//
- // wl
+ // jy
//
- this.wl.AutoSize = false;
- this.wl.Checked = true;
- this.wl.CheckState = System.Windows.Forms.CheckState.Checked;
- this.wl.ForeColor = System.Drawing.SystemColors.ControlText;
- this.wl.Image = ((System.Drawing.Image)(resources.GetObject("wl.Image")));
- this.wl.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.wl.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.wl.ImageTransparentColor = System.Drawing.Color.White;
- this.wl.Name = "wl";
- this.wl.Size = new System.Drawing.Size(35, 47);
- this.wl.Text = "鐗╂枡";
- this.wl.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.wl.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.jy.AutoSize = false;
+ this.jy.Image = ((System.Drawing.Image)(resources.GetObject("jy.Image")));
+ this.jy.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.jy.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.jy.ImageTransparentColor = System.Drawing.Color.White;
+ this.jy.Name = "jy";
+ this.jy.Size = new System.Drawing.Size(35, 47);
+ this.jy.Text = "绂佺敤";
+ this.jy.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.jy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.jy.Click += new System.EventHandler(this.jy_Click);
//
- // gs
+ // fjy
//
- this.gs.AutoSize = false;
- this.gs.Image = ((System.Drawing.Image)(resources.GetObject("gs.Image")));
- this.gs.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.gs.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.gs.ImageTransparentColor = System.Drawing.Color.White;
- this.gs.Name = "gs";
- this.gs.Size = new System.Drawing.Size(35, 47);
- this.gs.Text = "宸ュ簭";
- this.gs.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.gs.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.gs.ToolTipText = "宸ユ椂";
- this.gs.LocationChanged += new System.EventHandler(this.gs_Click);
+ this.fjy.AutoSize = false;
+ this.fjy.Image = ((System.Drawing.Image)(resources.GetObject("fjy.Image")));
+ this.fjy.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.fjy.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.fjy.ImageTransparentColor = System.Drawing.Color.White;
+ this.fjy.Name = "fjy";
+ this.fjy.Size = new System.Drawing.Size(35, 47);
+ this.fjy.Text = "鍙嶇";
+ this.fjy.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.fjy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.fjy.Click += new System.EventHandler(this.fjy_Click);
//
// Gy_StdWorkTimesList
//
@@ -505,8 +518,6 @@
private System.Windows.Forms.ToolStripButton sh;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator9;
private System.Windows.Forms.ToolStrip ToolBar;
- private System.Windows.Forms.ToolStripButton toolStripButton1;
- private System.Windows.Forms.ToolStripButton yl;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;
private System.Windows.Forms.ToolStripButton xz;
private System.Windows.Forms.ToolStripButton xg;
@@ -521,5 +532,7 @@
private System.Windows.Forms.ToolStripButton bclk;
private System.Windows.Forms.ToolStripButton gs;
private System.Windows.Forms.ToolStripButton wl;
+ private System.Windows.Forms.ToolStripButton jy;
+ private System.Windows.Forms.ToolStripButton fjy;
}
}
\ No newline at end of file
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.cs" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.cs"
index 5c8a9e7..c50d4bd 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.cs"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.cs"
@@ -118,40 +118,45 @@
//鍒犻櫎椤圭洰
public void Delete()
{
+ Int64 lngBillKey = 0;
+ if (grdMain.SelectedRows.Count == 0)
+ {
+ MessageBox.Show("璇疯嚦灏戦�夋嫨涓�琛岋紒", "鎻愮ず");
+ return;
+ }
//鍒犻櫎鏉冮檺
if (!DBUtility.ClsPub.Security_Log(ModRightNameEdit, 1, true, DBUtility.ClsPub.CurUserName))
{
return;
}
- //
if (AllowRow())
{
if (MessageBox.Show("纭畾瑕佸垹闄ゅ綋鍓嶉」鐩紵", "鎻愮ず", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK)
{
- //寰楀埌HITEMID
- long sItemID;
- sItemID = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[HItemIDCol].Value);
- //鍒ゆ柇瀛樺湪鎬�
- if (oMatePrce.ShowBill(sItemID, ref DBUtility.ClsPub.sExeReturnInfo))
+ oCn.BeginTran();
+ for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
{
- foreach (Model.ClsGy_StdWorkTimes_Model oSub in oMatePrce.DetailColl)
+ lngBillKey = DBUtility.ClsPub.isLong(grdMain.SelectedRows[i].Cells[Fun_GetCol("HItemID")].Value);
+ if (lngBillKey == 0)
+ return;
+ DAL.ClsGy_StdWorkTimes_Ctl oItem = new DAL.ClsGy_StdWorkTimes_Ctl();
+ //瀹℃牳
+ //鏌ョ湅鏄惁宸插鏍�,鍏抽棴,浣滃簾
+ DataSet DsSub = oCn.RunProcReturn("Select * from Gy_StdWorkTimes Where HitemID=" + lngBillKey.ToString(), "Gy_StdWorkTimes");
+ if (!string.IsNullOrEmpty(DsSub.Tables[0].Rows[0]["HChecker"].ToString()))
{
- if (oSub.HChecker.Trim() != "")
- {
- MessageBox.Show("鍗曟嵁宸插鏍�!涓嶈兘鍒犻櫎", "鎻愮ず");
- return;
- }
- }
-
- if (oMatePrce.DeleteByID(sItemID))
- {
-
- MessageBox.Show("鍒犻櫎椤圭洰鎴愬姛锛�", "鎻愮ず");
- Display();
+ oCn.RollBack();
+ MessageBox.Show("鏍囧噯宸ユ椂锛�"+ DsSub.Tables[0].Rows[0]["HStdWorkTimes"].ToString() + "鐨勫崟鎹凡瀹℃牳锛屾棤娉曞垹闄�", "鎻愮ず");
+ return;
}
else
- MessageBox.Show("鍒犻櫎椤圭洰鎴愬姛锛�", "鎻愮ず");
+ {
+ oCn.RunProc(" delete Gy_StdWorkTimes where HItemID=" + lngBillKey.ToString());
+ }
}
+ oCn.Commit();
+ MessageBox.Show("鍒犻櫎鎴愬姛锛岃鍒锋柊锛�", "鎻愮ず");
+ return;
}
}
@@ -181,14 +186,7 @@
if (oBillMain.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
{
oFrm = new Gy_StdWorkTimes();
- oFrm.BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_View;
- foreach (Model.ClsGy_StdWorkTimes_Model oSub in oBillMain.DetailColl)
- {
- if (oSub.HChecker.Trim() != "")
- {
- oFrm.BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_View;
- }
- }
+
oBill.HItemID = lngBillKey;
oFrm.BillOld = oBill;
oFrm.BillNew = oBillMain;
@@ -266,28 +264,21 @@
HParentID = sr[0].ToString();
}
//杩囨护鏉′欢
- if (frmCondition.SqlStr.Trim().Length == 0)
+ if (HParentID == "" || HParentID == "鐗╂枡璧勬枡" || HParentID == "宸ュ簭璧勬枡")
{
- if (HParentID == "" || HParentID == "鐗╂枡璧勬枡" || HParentID == "宸ュ簭璧勬枡")
- {
- sSql = "Select top 10000 * from " + ViewName + " order by HItemID Desc";
- }
- else
- {
- if (wl.Checked == false)
- {
- sSql = "Select top 10000 * from " + ViewName + " where 宸ュ簭浠ｇ爜 like '%" + HParentID.ToString() + "%' order by HItemID Desc" ;
- }
- else
- {
- sSql = "Select top 10000 * from " + ViewName + " where 鐗╂枡浠ｇ爜 like '%" + HParentID.ToString() + "%' order by HItemID Desc ";
- }
-
- }
+ sSql = "Select top 10000 * from " + ViewName + " order by HItemID Desc";
}
else
{
- sSql = frmCondition.SqlStr + sWhere + " order by HItemID Desc";
+ if (wl.Checked == false)
+ {
+ sSql = "Select top 10000 * from " + ViewName + " where 宸ュ簭浠ｇ爜 like '%" + HParentID.ToString() + "%' order by HItemID Desc";
+ }
+ else
+ {
+ sSql = "Select top 10000 * from " + ViewName + " where 鐗╂枡浠ｇ爜 like '%" + HParentID.ToString() + "%' order by HItemID Desc ";
+ }
+
}
//鎵цSQL
DSet = SubCn.RunProcReturn(sSql, ViewName);
@@ -310,12 +301,12 @@
oSumGrid.BuildTotalCols(sT);
//
//鍐荤粨
- int FrCol = DBUtility.ClsPub.isInt(frmCondition.txtFrozenCol.Text);
- string s = frmCondition.cmbHComplete.Text;
- DBUtility.Xt_BaseBillFun.DisplayGrid(grdMain, this.Name, s, FrCol);
+ //int FrCol = DBUtility.ClsPub.isInt(frmCondition.txtFrozenCol.Text);
+ //string s = frmCondition.cmbHComplete.Text;
+ //DBUtility.Xt_BaseBillFun.DisplayGrid(grdMain, this.Name, s, FrCol);
//鐢荤嚎
//
- Total();
+ //Total();
}
//鍚堣 new
@@ -395,24 +386,24 @@
DAL.ClsGy_StdWorkTimes_Ctl oItem = new DAL.ClsGy_StdWorkTimes_Ctl();
//瀹℃牳
//鏌ョ湅鏄惁宸插鏍�,鍏抽棴,浣滃簾
- if (oItem.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ DataSet DsSub = oCn.RunProcReturn("Select * from Gy_StdWorkTimes Where HitemID=" + lngBillKey.ToString(), "Gy_StdWorkTimes");
+ if (!string.IsNullOrEmpty(DsSub.Tables[0].Rows[0]["HChecker"].ToString()))
{
-
+ MessageBox.Show("鍗曟嵁宸插鏍革紝鏃犻渶瀹℃牳", "鎻愮ず");
+ return;
}
else
{
- MessageBox.Show("椤圭洰涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
- return;
- }
- //瀹℃牳
- if (oItem.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
- {
- MessageBox.Show("瀹℃牳鎴愬姛!绗�"+i.ToString()+"琛�", "鎻愮ず");
- }
- else
- {
- MessageBox.Show("瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
- return;
+ //瀹℃牳
+ if (oItem.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ MessageBox.Show("瀹℃牳鎴愬姛!", "鎻愮ず");
+ }
+ else
+ {
+ MessageBox.Show("瀹℃牳澶辫触!", "鎻愮ず");
+ return;
+ }
}
}
MessageBox.Show("瀹℃牳鎴愬姛锛岃鍒锋柊锛�", "鎻愮ず");
@@ -435,34 +426,96 @@
DAL.ClsGy_StdWorkTimes_Ctl oItem = new DAL.ClsGy_StdWorkTimes_Ctl();
//瀹℃牳
//鏌ョ湅鏄惁宸插鏍�,鍏抽棴,浣滃簾
- if (oItem.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ DataSet DsSub = oCn.RunProcReturn("Select * from Gy_StdWorkTimes Where HitemID=" + lngBillKey.ToString(), "Gy_StdWorkTimes");
+ if (string.IsNullOrEmpty(DsSub.Tables[0].Rows[0]["HChecker"].ToString()))
{
-
+ MessageBox.Show("鍗曟嵁鏈鏍革紝鏃犻渶鍙嶅鏍�", "鎻愮ず");
+ return;
}
else
{
- MessageBox.Show("椤圭洰涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
- return;
- }
- //瀹℃牳
- if (oItem.AbandonCheck(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
- {
- MessageBox.Show("瀹℃牳鎴愬姛!绗�"+i.ToString()+"琛�", "鎻愮ず");
- }
- else
- {
- MessageBox.Show("瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
- return;
+ //瀹℃牳
+ if (oItem.AbandonCheck(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ MessageBox.Show("瀹℃牳鎴愬姛!", "鎻愮ず");
+ }
+ else
+ {
+ MessageBox.Show("瀹℃牳澶辫触!", "鎻愮ず");
+ return;
+ }
}
}
MessageBox.Show("瀹℃牳鎴愬姛锛岃鍒锋柊锛�", "鎻愮ず");
return;
}
+
//鑰冭礉
private void yl_Click(object sender, EventArgs e)
{
DBUtility.Gy_BaseFun.DataToExcel(this.Text, grdMain);
}
+ private void jy_Click(object sender, EventArgs e)
+ {
+ Int64 lngBillKey = 0;
+ if (grdMain.SelectedRows.Count == 0)
+ {
+ MessageBox.Show("璇疯嚦灏戦�夋嫨涓�琛岋紒", "鎻愮ず");
+ return;
+ }
+ for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
+ {
+ lngBillKey = DBUtility.ClsPub.isLong(grdMain.SelectedRows[i].Cells[Fun_GetCol("HItemID")].Value);
+ if (lngBillKey == 0)
+ return;
+ DAL.ClsGy_StdWorkTimes_Ctl oItem = new DAL.ClsGy_StdWorkTimes_Ctl();
+ //瀹℃牳
+ //鏌ョ湅鏄惁宸插鏍�,鍏抽棴,浣滃簾
+ DataSet DsSub = oCn.RunProcReturn("Select * from Gy_StdWorkTimes Where HitemID=" + lngBillKey.ToString(), "Gy_StdWorkTimes");
+ if (DsSub.Tables[0].Rows[0]["HStopflag"].ToString() == "1")
+ {
+ MessageBox.Show("鍗曟嵁宸茬鐢�,鏃犻渶绂佺敤" , "鎻愮ず");
+ return;
+ }
+ else
+ {
+ oCn.RunProc(" Update Gy_StdWorkTimes set HStopflag=1 Where HItemID=" + lngBillKey.ToString());
+ }
+ }
+ MessageBox.Show("绂佺敤鎴愬姛锛岃鍒锋柊锛�", "鎻愮ず");
+ return;
+ }
+
+ private void fjy_Click(object sender, EventArgs e)
+ {
+ Int64 lngBillKey = 0;
+ if (grdMain.SelectedRows.Count == 0)
+ {
+ MessageBox.Show("璇疯嚦灏戦�夋嫨涓�琛岋紒", "鎻愮ず");
+ return;
+ }
+ for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
+ {
+ lngBillKey = DBUtility.ClsPub.isLong(grdMain.SelectedRows[i].Cells[Fun_GetCol("HItemID")].Value);
+ if (lngBillKey == 0)
+ return;
+ DAL.ClsGy_StdWorkTimes_Ctl oItem = new DAL.ClsGy_StdWorkTimes_Ctl();
+ //瀹℃牳
+ //鏌ョ湅鏄惁宸插鏍�,鍏抽棴,浣滃簾
+ DataSet DsSub = oCn.RunProcReturn("Select * from Gy_StdWorkTimes Where HitemID=" + lngBillKey.ToString(), "Gy_StdWorkTimes");
+ if (DsSub.Tables[0].Rows[0]["HStopflag"].ToString() == "0")
+ {
+ MessageBox.Show("鍗曟嵁鏆傛湭绂佺敤锛屾棤闇�鍙嶇鐢�", "鎻愮ず");
+ return;
+ }
+ else
+ {
+ oCn.RunProc(" Update Gy_StdWorkTimes set HStopflag=0 Where HItemID=" + lngBillKey.ToString());
+ }
+ }
+ MessageBox.Show("瀹℃牳鎴愬姛锛岃鍒锋柊锛�", "鎻愮ず");
+ return;
+ }
}
}
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.resx" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.resx"
index 36db665..d78f16d 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.resx"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.resx"
@@ -146,51 +146,51 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACE
- CgAAAk1TRnQBSQFMAgEBAgEAASQBAQEkAQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+ CgAAAk1TRnQBSQFMAgEBAgEAATwBAQE8AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
AwABEAMAAQEBAAEgBgABEBIAgP+AAAj/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
AwAB/wMAAf8DAAH/AwAB/wMADf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
- AwAB/wMAAf8DAAH/gAAE/wEAAUEBigH/AQwBkAG5Af8BDAGQAbkB/wEMAZABuQH/AQwBkAG5Af8BDAGQ
- AbkB/wEMAZABuQH/AQwBkAG5Af8BDAGQAbkB/wEMAZABuQH/AQwBkAG5Af8BDAGQAbkB/wEMAZABuQH/
- AQwBkAG5Af8DAAn/AQABQQGKAf8BAAFBAYoB/wEAAUEBigH/AQABQQGKAf8BAAFBAYoB/wEAAUEBigH/
- AQABQQGKAf8BAAFBAYoB/wEAAUEBigH/AQABQQGKAf8BAAFBAYoB/wEAAUEBigH/AwAB/wMAAf+AAAT/
- AQABQQGKAf8B0QH2Av8BUwHaAfQB/wFIAdMB8QH/AT0BywHvAf8BMwHEAe0B/wEpAb4B6wH/AR8BuAHo
- Af8BEwGwAecB/wEJAakB5AH/AQABowHiAf8BAAGeAeAB/wEAAZoB3wH/AQwBkAG5Af8DAAn/AQABQQGK
- Af8B0QH2Av8BKAG+AesB/wEiAbkB6QH/ARoBtAHnAf8BEgGwAeYB/wELAasB5AH/AQQBpwHjAf8BAAGi
- AeEB/wEAAZ8B4QH/AQwBkAG5Af8BAAFBAYoB/wMAAf8DAAH/gAAE/wEAAUEBigH/AdEB9gL/AVkB3gH1
- Af8BTgHWAfMB/wFEAdAB8QH/ATkByQHuAf8BLwHCAewB/wEkAbwB6gH/ARoBtAHnAf8BDwGtAeUB/wEF
- AaYB4wH/AQABoQHhAf8BAAGdAeAB/wEMAZABuQH/AwAF/wEAAUEBigH/AdEB9gL/ATMBxQHuAf8BLQHB
- AesB/wEmAbwB6wH/AR4BtwHoAf8BFwGyAecB/wEPAa4B5QH/AQgBqQHkAf8BAQGlAeIB/wEAAaEB4QH/
- AQwBkAG5Af8DAAH/AQABQQGKAf8DAAH/gAAE/wEAAUEBigH/AdEB9gL/AYEB4QH3Af8BVQHaAfQB/wFK
- AdQB8gH/AT8BzAHvAf8BNQHGAe4B/wErAcAB6wH/ASABuQHpAf8BFgGyAeYB/wELAasB5QH/AQEBpQHi
- Af8BAAGfAeEB/wEMAZABuQH/AwAF/wEAAUEBigH/AdEB9gL/ATgByAHuAf8BMQHEAewB/wEqAb8B6wH/
- ASMBuwHqAf8BHAG2AegB/wEUAbAB5wH/AQ0BrAHlAf8BBgGnAeMB/wEAAaMB4gH/AQABQQGKAf8DAAH/
- AQABQQGKAf8DAAH/gAAE/wEAAUEBigH/AdEB9gL/AYYB5QH3Af8BWwHfAfUB/wFQAdgB8wH/AUYB0QHx
- Af8BOwHKAe8B/wExAcQB7QH/AScBvQHqAf8BHAG2AegB/wERAa8B5QH/AQYBqAHjAf8BAAGiAeEB/wEM
- AZABuQH/AwAB/wEAAUEBigH/AdEB9gL/AUQBzwHxAf8BPQHLAe8B/wE1AccB7gH/AS8BwgHsAf8BKAG9
- AeoB/wEgAbkB6QH/ARkBtAHnAf8BEgGwAeYB/wEKAaoB5QH/AQwBkAG5Af8DAAH/AQwBkAG5Af8BDAGQ
- AbkB/wMAAf+AAAT/AQABQQGKAf8B0QH2Av8BjAHoAfkB/wGDAeIB9wH/AVcB3AH1Af8BTQHVAfIB/wFB
- Ac4B8AH/ATcByAHuAf8BLQHBAewB/wEjAboB6gH/ARcBswHnAf8BDQGsAeUB/wEDAaYB4wH/AQwBkAG5
- Af8DAAH/AQABQQGKAf8B0QH2Av8BSQHTAfIB/wFBAc4B8AH/AToBygHuAf8BMwHFAe0B/wEtAcEB6wH/
- ASUBvAHqAf8BHgG3AegB/wEWAbIB5gH/AQ8BrgHlAf8BDAGQAbkB/wMAAf8BDAGQAbkB/wEMAZABuQH/
- AwAB/4AABP8BAAFBAYoB/wHRAfYC/wGQAesB+QH/AYgB5gH4Af8BXQHgAfYB/wFTAdkB8wH/AUgB0wHy
- Af8BPQHLAe8B/wEzAcUB7QH/ASkBvgHrAf8BHwG4AekB/wETAbAB5gH/AQgBqQHkAf8BDAGQAbkB/wMA
- Af8BAAFBAYoB/wEAAUEBigH/AQABQQGKAf8BAAFBAYoB/wEAAUEBigH/AQABQQGKAf8BAAFBAYoB/wEA
- AUEBigH/AQABQQGKAf8BAAFBAYoB/wEAAUEBigH/AQABQQGKAf8BDAGQAbkB/wE6AckB7gH/AQwBkAG5
- Af8DAAH/gAAE/wEAAUEBigH/AdEB9gL/AZMB7QH6Af8BjQHpAfkB/wGFAeQB9wH/AVoB3gH1Af8BTgHW
- AfMB/wFEAc8B8QH/ATkByQHvAf8BLwHCAewB/wElAbsB6QH/ARoBtQHnAf8BDwGtAeYB/wEMAZABuQH/
- AwAF/wEAAUEBigH/AdEB9gL/AZEB7AH6Af8BjQHpAfkB/wGKAecB+AH/AYYB5AH4Af8BgAHhAfcB/wFa
- Ad0B9QH/AVQB2gHzAf8BTgHXAfMB/wFJAdMB8QH/AUMBzwHxAf8BPQHLAe8B/wEMAZABuQH/AwAB/4AA
- BP8BAAFBAYoB/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHR
- AfYC/wHRAfYC/wHRAfYC/wHRAfYC/wEMAZABuQH/AwAF/wEAAUEBigH/AdEB9gL/AZMB7QH6Af8BkAHr
- AfkB/wGMAekB+QH/AYgB5gH4Af8BhAHjAfcB/wFdAeAB9gH/AVgB3AH1Af8B0QH2Av8B0QH2Av8B0QH2
- Av8B0QH2Av8BDAGQAbkB/wMAAf+AAAT/AQABQQGKAf8BHwGoAdMB/wEfAagB0wH/AR8BqAHTAf8BHwGo
- AdMB/wEfAagB0wH/AR8BqAHTAf8BHwGoAdMB/wEAAUEBigH/AQABQQGKAf8BAAFBAYoB/wEAAUEBigH/
- AQABQQGKAf8BAAFBAYoJ/wEAAUEBigH/AdEB9gL/AZMB7QH6Af8BkgHsAfoB/wGPAesB+QH/AYsB6AH4
- Af8BhwHlAfcB/wHRAfYC/wEAAUEBigH/AQABQQGKAf8BAAFBAYoB/wEAAUEBigH/AQABQQGKAf8BAAFB
- AYoF/4AACP8BAAFBAYoB/wG4AegB9QH/Ac4D/wHOA/8BnAP/AZwD/wEAAUEBigH/AwAh/wEAAUEBigH/
- AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AQABQQGKHf+AAAz/AQABQQGKAf8BAAFBAYoB/wEA
- AUEBigH/AQABQQGKAf8BAAFBAYoB/wMAKf8BAAFBAYoB/wEAAUEBigH/AQABQQGKAf8BAAFBAYoB/wEA
- AUEBiiH/gACA/4AAgP+AAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/gQAL
+ AwAB/wMAAf8DAAH/gAAE/wEAAT4BigH/AQkBkAG5Af8BCQGQAbkB/wEJAZABuQH/AQkBkAG5Af8BCQGQ
+ AbkB/wEJAZABuQH/AQkBkAG5Af8BCQGQAbkB/wEJAZABuQH/AQkBkAG5Af8BCQGQAbkB/wEJAZABuQH/
+ AQkBkAG5Af8DAAn/AQABPgGKAf8BAAE+AYoB/wEAAT4BigH/AQABPgGKAf8BAAE+AYoB/wEAAT4BigH/
+ AQABPgGKAf8BAAE+AYoB/wEAAT4BigH/AQABPgGKAf8BAAE+AYoB/wEAAT4BigH/AwAB/wMAAf+AAAT/
+ AQABPgGKAf8B0QH2Av8BUAHaAfQB/wFFAdMB8QH/AToBywHvAf8BMAHEAe0B/wEmAb4B6wH/ARwBuAHo
+ Af8BEAGwAecB/wEGAakB5AH/AQABowHiAf8BAAGeAeAB/wEAAZoB3wH/AQkBkAG5Af8DAAn/AQABPgGK
+ Af8B0QH2Av8BJQG+AesB/wEfAbkB6QH/ARcBtAHnAf8BDwGwAeYB/wEIAasB5AH/AQEBpwHjAf8BAAGi
+ AeEB/wEAAZ8B4QH/AQkBkAG5Af8BAAE+AYoB/wMAAf8DAAH/gAAE/wEAAT4BigH/AdEB9gL/AVYB3gH1
+ Af8BSwHWAfMB/wFBAdAB8QH/ATYByQHuAf8BLAHCAewB/wEhAbwB6gH/ARcBtAHnAf8BDAGtAeUB/wEC
+ AaYB4wH/AQABoQHhAf8BAAGdAeAB/wEJAZABuQH/AwAF/wEAAT4BigH/AdEB9gL/ATABxQHuAf8BKgHB
+ AesB/wEjAbwB6wH/ARsBtwHoAf8BFAGyAecB/wEMAa4B5QH/AQUBqQHkAf8BAAGlAeIB/wEAAaEB4QH/
+ AQkBkAG5Af8DAAH/AQABPgGKAf8DAAH/gAAE/wEAAT4BigH/AdEB9gL/AYEB4QH3Af8BUgHaAfQB/wFH
+ AdQB8gH/ATwBzAHvAf8BMgHGAe4B/wEoAcAB6wH/AR0BuQHpAf8BEwGyAeYB/wEIAasB5QH/AQABpQHi
+ Af8BAAGfAeEB/wEJAZABuQH/AwAF/wEAAT4BigH/AdEB9gL/ATUByAHuAf8BLgHEAewB/wEnAb8B6wH/
+ ASABuwHqAf8BGQG2AegB/wERAbAB5wH/AQoBrAHlAf8BAwGnAeMB/wEAAaMB4gH/AQABPgGKAf8DAAH/
+ AQABPgGKAf8DAAH/gAAE/wEAAT4BigH/AdEB9gL/AYYB5QH3Af8BWAHfAfUB/wFNAdgB8wH/AUMB0QHx
+ Af8BOAHKAe8B/wEuAcQB7QH/ASQBvQHqAf8BGQG2AegB/wEOAa8B5QH/AQMBqAHjAf8BAAGiAeEB/wEJ
+ AZABuQH/AwAB/wEAAT4BigH/AdEB9gL/AUEBzwHxAf8BOgHLAe8B/wEyAccB7gH/ASwBwgHsAf8BJQG9
+ AeoB/wEdAbkB6QH/ARYBtAHnAf8BDwGwAeYB/wEHAaoB5QH/AQkBkAG5Af8DAAH/AQkBkAG5Af8BCQGQ
+ AbkB/wMAAf+AAAT/AQABPgGKAf8B0QH2Av8BjAHoAfkB/wGDAeIB9wH/AVQB3AH1Af8BSgHVAfIB/wE+
+ Ac4B8AH/ATQByAHuAf8BKgHBAewB/wEgAboB6gH/ARQBswHnAf8BCgGsAeUB/wEAAaYB4wH/AQkBkAG5
+ Af8DAAH/AQABPgGKAf8B0QH2Av8BRgHTAfIB/wE+Ac4B8AH/ATcBygHuAf8BMAHFAe0B/wEqAcEB6wH/
+ ASIBvAHqAf8BGwG3AegB/wETAbIB5gH/AQwBrgHlAf8BCQGQAbkB/wMAAf8BCQGQAbkB/wEJAZABuQH/
+ AwAB/4AABP8BAAE+AYoB/wHRAfYC/wGQAesB+QH/AYgB5gH4Af8BWgHgAfYB/wFQAdkB8wH/AUUB0wHy
+ Af8BOgHLAe8B/wEwAcUB7QH/ASYBvgHrAf8BHAG4AekB/wEQAbAB5gH/AQUBqQHkAf8BCQGQAbkB/wMA
+ Af8BAAE+AYoB/wEAAT4BigH/AQABPgGKAf8BAAE+AYoB/wEAAT4BigH/AQABPgGKAf8BAAE+AYoB/wEA
+ AT4BigH/AQABPgGKAf8BAAE+AYoB/wEAAT4BigH/AQABPgGKAf8BCQGQAbkB/wE3AckB7gH/AQkBkAG5
+ Af8DAAH/gAAE/wEAAT4BigH/AdEB9gL/AZMB7QH6Af8BjQHpAfkB/wGFAeQB9wH/AVcB3gH1Af8BSwHW
+ AfMB/wFBAc8B8QH/ATYByQHvAf8BLAHCAewB/wEiAbsB6QH/ARcBtQHnAf8BDAGtAeYB/wEJAZABuQH/
+ AwAF/wEAAT4BigH/AdEB9gL/AZEB7AH6Af8BjQHpAfkB/wGKAecB+AH/AYYB5AH4Af8BgAHhAfcB/wFX
+ Ad0B9QH/AVEB2gHzAf8BSwHXAfMB/wFGAdMB8QH/AUABzwHxAf8BOgHLAe8B/wEJAZABuQH/AwAB/4AA
+ BP8BAAE+AYoB/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHR
+ AfYC/wHRAfYC/wHRAfYC/wHRAfYC/wEJAZABuQH/AwAF/wEAAT4BigH/AdEB9gL/AZMB7QH6Af8BkAHr
+ AfkB/wGMAekB+QH/AYgB5gH4Af8BhAHjAfcB/wFaAeAB9gH/AVUB3AH1Af8B0QH2Av8B0QH2Av8B0QH2
+ Av8B0QH2Av8BCQGQAbkB/wMAAf+AAAT/AQABPgGKAf8BHAGoAdMB/wEcAagB0wH/ARwBqAHTAf8BHAGo
+ AdMB/wEcAagB0wH/ARwBqAHTAf8BHAGoAdMB/wEAAT4BigH/AQABPgGKAf8BAAE+AYoB/wEAAT4BigH/
+ AQABPgGKAf8BAAE+AYoJ/wEAAT4BigH/AdEB9gL/AZMB7QH6Af8BkgHsAfoB/wGPAesB+QH/AYsB6AH4
+ Af8BhwHlAfcB/wHRAfYC/wEAAT4BigH/AQABPgGKAf8BAAE+AYoB/wEAAT4BigH/AQABPgGKAf8BAAE+
+ AYoF/4AACP8BAAE+AYoB/wG4AegB9QH/Ac4D/wHOA/8BnAP/AZwD/wEAAT4BigH/AwAh/wEAAT4BigH/
+ AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AQABPgGKHf+AAAz/AQABPgGKAf8BAAE+AYoB/wEA
+ AT4BigH/AQABPgGKAf8BAAE+AYoB/wMAKf8BAAE+AYoB/wEAAT4BigH/AQABPgGKAf8BAAE+AYoB/wEA
+ AT4BiiH/gACA/4AAgP+AAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/gQAL
</value>
</data>
<metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -444,32 +444,6 @@
+VGD6H8q/ID/AIW14r/6GbxD/wCDGb/4qj/hbXiv/oZvEP8A4MZv/iqPYeY1M//Z
</value>
</data>
- <data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
- UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
- V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
- 9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
- f7HKuoh2wcgCX7FfROMpZvmw7V68mxSHTx4gm0DXCbAYEefyyNSsgQXeowl8RDmmPMAnEhg7BzS34ss8
- NghoSgE55YDvFRCSSahvgMM34El8YX+8JjAyrka/Yhh9iiHJcuA49IxA4BquF+DsG3hoFGiKwsP+4ioN
- BMV7oHO6NqcawJG+u/2IXN1kL/JBgsgOwZ6up82IDNUgQdhDwF12GKDQCLXjQAVC/gBsYdYbXS03WwAA
- AABJRU5ErkJggg==
-</value>
- </data>
- <data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
- UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
- V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
- 9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
- f7HKuoh2wcgCX7FfROMpZvmw7V68mxSHTx4gm0DXCbAYEefyyNSsgQXeowl8RDmmPMAnEhg7BzS34ss8
- NghoSgE55YDvFRCSSahvgMM34El8YX+8JjAyrka/Yhh9iiHJcuA49IxA4BquF+DsG3hoFGiKwsP+4ioN
- BMV7oHO6NqcawJG+u/2IXN1kL/JBgsgOwZ6up82IDNUgQdhDwF12GKDQCLXjQAVC/gBsYdYbXS03WwAA
- AABJRU5ErkJggg==
-</value>
- </data>
<data name="gs.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -594,4 +568,23 @@
AAAASUVORK5CYII=
</value>
</data>
+ <data name="jy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACYSURBVDhPpY+7DYAwEEOzEzvR0bEMQ1DRMAQjILagDvIF
+ H/kRIvIkK/eJHTAV2Pv8hT2PBQG/QsRMoXfjOmJjrCJq7odZDOwpzORmBr3km7epE3EHYScOD13STCNq
+ 9mHAhFNIzBkBqZ8QFxCbib6I2u+p0hcQu6/jq/wAkIQUfudWGACCENaYu3VCdq7GD3ORJjNpMldizAWG
+ +xR5VXbRDwAAAABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="fjy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADhSURBVDhPrZIxDoMwDEU5D/fgBowZ2VjZGBlzBAYGRhbE
+ yC16obp9KE4DCQVV/ZIVKfb/33Gc/QXPohCNZVnEXZ9iznNZ1/VTB1GGQR7vBDGOY1KEOsjkdzW4kiDO
+ RJTcdZ1Ya2Wapr0JhLZtkyJKJk8cxT3opO97LwKR8xY5BEUqwlnX9X0yCJ1ViHe79HeEZGOMVFXlRS47
+ OJKbptlmEs7lVCRFDot1LnxjtGwQWSQKCNrG1aU9VCTqAgF1L8tym7hLRWCBENitMi0hkGo9BYyiZ0Di
+ q67IAPdolX9Dlr0AQBMgR1ZRHL4AAAAASUVORK5CYII=
+</value>
+ </data>
</root>
\ No newline at end of file
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_StdWorkTimes_Ctl.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_StdWorkTimes_Ctl.cs"
index 3f42556..9d3177c 100644
--- "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_StdWorkTimes_Ctl.cs"
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_StdWorkTimes_Ctl.cs"
@@ -11,6 +11,7 @@
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
//鍘熶唬鐮� 鐢ㄤ簬 鏇挎崲瀛愰」鐩�
public string HOldNumber;
+ public Model.ClsGy_StdWorkTimes_Model omodel = new Model.ClsGy_StdWorkTimes_Model();
public List<Model.ClsGy_StdWorkTimes_Model> DetailColl = new List<Model.ClsGy_StdWorkTimes_Model>();
//鍙嶅鏍�
@@ -85,20 +86,19 @@
oCn.BeginTran();
//鎻掑叆琛�
- foreach (Model.ClsGy_StdWorkTimes_Model oSub in DetailColl)
+ foreach (Model.ClsGy_StdWorkTimes_Model oSub in DetailColl)
{
string sql = string.Format(@"Update Gy_StdWorkTimes set" +
- "HMaterID=" + oSub.HMaterID.ToString() +
- "HProcID=" + oSub.HProcID.ToString() +
- "HStdWorkTimes=" + oSub.HStdWorkTimes.ToString() +
- "HUpperlimit=" + oSub.HUpperlimit.ToString() +
- "HLowerlimit=" + oSub.HLowerlimit.ToString() +
- "HStopflag=" + Convert.ToString(oSub.HStopflag ? 1 : 0) +
- "HMaker='" + oSub.HMaker + "'" +
- "HMakeDate='" + oSub.HMakeDate + "'" +
- "HRemark='" + oSub.HRemark.ToString() + "'" +
- "HUSEORGID=" + oSub.HUSEORGID +
- " where HInterID=" + sItemID);
+ " HMaterID=" + oSub.HMaterID.ToString() +
+ ",HProcID=" + oSub.HProcID.ToString() +
+ ",HStdWorkTimes=" + oSub.HStdWorkTimes.ToString() +
+ ",HUpperlimit=" + oSub.HUpperlimit.ToString() +
+ ",HLowerlimit=" + oSub.HLowerlimit.ToString() +
+ ",HMaker='" + oSub.HMaker + "'" +
+ ",HMakeDate='" + oSub.HMakeDate + "'" +
+ ",HRemark='" + oSub.HRemark.ToString() + "'" +
+ ",HUSEORGID=" + oSub.HUSEORGID +
+ " where HItemID=" + sItemID);
oCn.RunProc(sql);
}
oCn.Commit();
@@ -131,7 +131,7 @@
oSub.HRemark = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HRemark"]);
oSub.HMaker = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HMaker"]);
oSub.HMakeDate = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HMakeDate"]);
- oSub.HStopflag = (bool)DsSub.Tables[0].Rows[i]["HStopflag"];
+ oSub.HStopflag = ((DsSub.Tables[0].Rows[i]["HStopflag"].ToString() == "1")?true:false);
oSub.HUSEORGID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HUSEORGID"]);
DetailColl.Add(oSub);
diff --git a/LMES/ClsShowMod.cs b/LMES/ClsShowMod.cs
index e779c9b..3c10a04 100644
--- a/LMES/ClsShowMod.cs
+++ b/LMES/ClsShowMod.cs
@@ -25,6 +25,7 @@
using Kanban;
using Demo;
using ProM.委外管理;
+using BaseSet.公用资料.其他基础资料;
namespace LMES
{
@@ -6692,6 +6693,13 @@
//MessageBox.Show("gnsy:"+gnsy + "gnmc:"+ gnmc);
switch (gnsy.ToLower())
{
+ case "gy_stdworktimeslist":
+ //权限
+ Gy_StdWorkTimesList oGy_StdWorkTimesList = new Gy_StdWorkTimesList();
+ oGy_StdWorkTimesList.MdiParent = oMain;
+ oGy_StdWorkTimesList.Show();
+ oMainForm.AddTabPage(oGy_StdWorkTimesList);
+ break;
case "gy_dotcheck"://点检项目
Gy_DotCheck oGy_DotCheck = new Gy_DotCheck();
oGy_DotCheck.MdiParent = oMain;
@@ -8078,6 +8086,12 @@
oGy_DataIn_ProcessPrice.Show();
oMainForm.AddTabPage(oGy_DataIn_ProcessPrice);
break;
+ case "gy_stdworktimes_routingbill":
+ Gy_StdWorkTimes_RoutingBill oGy_StdWorkTimes_RoutingBill = new Gy_StdWorkTimes_RoutingBill();
+ oGy_StdWorkTimes_RoutingBill.MdiParent = oMain;
+ oGy_StdWorkTimes_RoutingBill.Show();
+ oMainForm.AddTabPage(oGy_StdWorkTimes_RoutingBill);
+ break;
case "gy_datain_process":
Gy_DataIn_Process oGy_DataIn_Process = new Gy_DataIn_Process();
oGy_DataIn_Process.MdiParent = oMain;
diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_StdWorkTimes_Model.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_StdWorkTimes_Model.cs"
index 61c6b37..77270c0 100644
--- "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_StdWorkTimes_Model.cs"
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_StdWorkTimes_Model.cs"
@@ -16,7 +16,11 @@
public string HRemark;
public long HUSEORGID; //缁勭粐ID
public long HProcID; //宸ュ簭ID
+ public string HProcNum; //宸ュ簭ID
+ public string HProcName; //宸ュ簭ID
public long HMaterID; //鐗╂枡ID
+ public string HMaterNum; //宸ュ簭ID
+ public string HMaterName; //宸ュ簭ID
public double HStdWorkTimes; //鏍囧噯宸ユ椂
public double HUpperlimit; //涓婇檺姣斾緥
public double HLowerlimit; //涓嬮檺姣斾緥
diff --git a/PlanM/ClassDiagram1.cd b/PlanM/ClassDiagram1.cd
new file mode 100644
index 0000000..7b89419
--- /dev/null
+++ b/PlanM/ClassDiagram1.cd
@@ -0,0 +1,2 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<ClassDiagram />
\ No newline at end of file
diff --git a/PlanM/PlanM.csproj b/PlanM/PlanM.csproj
index 0a55294..0bf7d26 100644
--- a/PlanM/PlanM.csproj
+++ b/PlanM/PlanM.csproj
@@ -183,17 +183,17 @@
<Compile Include="鏁版嵁瀵煎叆\Gy_DataIn_RoutingBill.designer.cs">
<DependentUpon>Gy_DataIn_RoutingBill.cs</DependentUpon>
</Compile>
+ <Compile Include="鏁版嵁瀵煎叆\Gy_StdWorkTimes_RoutingBill.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鏁版嵁瀵煎叆\Gy_StdWorkTimes_RoutingBill.designer.cs">
+ <DependentUpon>Gy_StdWorkTimes_RoutingBill.cs</DependentUpon>
+ </Compile>
<Compile Include="鏁版嵁瀵煎叆\Gy_DataIn_RoutingBill_New.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="鏁版嵁瀵煎叆\Gy_DataIn_RoutingBill_New.designer.cs">
<DependentUpon>Gy_DataIn_RoutingBill_New.cs</DependentUpon>
- </Compile>
- <Compile Include="鏁版嵁瀵煎叆\Gy_StdWorkTimes_RoutingBill.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="鏁版嵁瀵煎叆\Gy_StdWorkTimes_RoutingBill.Designer.cs">
- <DependentUpon>Gy_StdWorkTimes_RoutingBill.cs</DependentUpon>
</Compile>
<Compile Include="璁″垝绠＄悊\Gy_ICBomBill.cs">
<SubType>Form</SubType>
@@ -287,12 +287,13 @@
<DependentUpon>Gy_DataIn_RoutingBill.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
+ <EmbeddedResource Include="鏁版嵁瀵煎叆\Gy_StdWorkTimes_RoutingBill.resx">
+ <DependentUpon>Gy_StdWorkTimes_RoutingBill.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
<EmbeddedResource Include="鏁版嵁瀵煎叆\Gy_DataIn_RoutingBill_New.resx">
<DependentUpon>Gy_DataIn_RoutingBill_New.cs</DependentUpon>
<SubType>Designer</SubType>
- </EmbeddedResource>
- <EmbeddedResource Include="鏁版嵁瀵煎叆\Gy_StdWorkTimes_RoutingBill.resx">
- <DependentUpon>Gy_StdWorkTimes_RoutingBill.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="璁″垝绠＄悊\Gy_ICBomBill.resx">
<DependentUpon>Gy_ICBomBill.cs</DependentUpon>
@@ -360,6 +361,9 @@
<Name>SQLHelper</Name>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <None Include="ClassDiagram1.cd" />
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\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.
diff --git "a/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_DataIn_RoutingBill.resx" "b/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_DataIn_RoutingBill.resx"
index d55421f..228ea52 100644
--- "a/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_DataIn_RoutingBill.resx"
+++ "b/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_DataIn_RoutingBill.resx"
@@ -120,4 +120,7 @@
<metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>25</value>
+ </metadata>
</root>
\ No newline at end of file
diff --git "a/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_StdWorkTimes_RoutingBill.Designer.cs" "b/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_StdWorkTimes_RoutingBill.Designer.cs"
index 0094fff..3eea509 100644
--- "a/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_StdWorkTimes_RoutingBill.Designer.cs"
+++ "b/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_StdWorkTimes_RoutingBill.Designer.cs"
@@ -1,17 +1,16 @@
-锘�
-namespace PlanM.鏁版嵁瀵煎叆
+namespace PlanM
{
partial class Gy_StdWorkTimes_RoutingBill
{
/// <summary>
- /// Required designer variable.
+ /// 必需的设计器变量。
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
- /// Clean up any resources being used.
+ /// 清理所有正在使用的资源。
/// </summary>
- /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
@@ -21,27 +20,183 @@
base.Dispose(disposing);
}
- #region Windows Form Designer generated code
+ #region Windows 窗体设计器生成的代码
/// <summary>
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
+ /// 设计器支持所需的方法 - 不要
+ /// 使用代码编辑器修改此方法的内容。
/// </summary>
private void InitializeComponent()
{
+ this.label1 = new System.Windows.Forms.Label();
+ this.cmbHYear = new System.Windows.Forms.ComboBox();
+ this.cmbHPeriod = new System.Windows.Forms.ComboBox();
+ this.label2 = new System.Windows.Forms.Label();
+ this.checkadd = new System.Windows.Forms.CheckBox();
+ this.txtHSheetName = new System.Windows.Forms.TextBox();
+ this.label3 = new System.Windows.Forms.Label();
+ this.pPic.SuspendLayout();
+ this.panel1.SuspendLayout();
this.SuspendLayout();
+ //
+ // pPic
+ //
+ this.pPic.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+ this.pPic.Size = new System.Drawing.Size(1544, 56);
+ //
+ // panel1
+ //
+ this.panel1.Controls.Add(this.label3);
+ this.panel1.Controls.Add(this.txtHSheetName);
+ this.panel1.Controls.Add(this.checkadd);
+ this.panel1.Controls.Add(this.cmbHPeriod);
+ this.panel1.Controls.Add(this.label2);
+ this.panel1.Controls.Add(this.cmbHYear);
+ this.panel1.Controls.Add(this.label1);
+ this.panel1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+ this.panel1.Size = new System.Drawing.Size(1544, 52);
+ this.panel1.Controls.SetChildIndex(this.cmdHPath, 0);
+ this.panel1.Controls.SetChildIndex(this.label4, 0);
+ this.panel1.Controls.SetChildIndex(this.txtHPath, 0);
+ this.panel1.Controls.SetChildIndex(this.label1, 0);
+ this.panel1.Controls.SetChildIndex(this.cmbHYear, 0);
+ this.panel1.Controls.SetChildIndex(this.label2, 0);
+ this.panel1.Controls.SetChildIndex(this.cmbHPeriod, 0);
+ this.panel1.Controls.SetChildIndex(this.checkadd, 0);
+ this.panel1.Controls.SetChildIndex(this.txtHSheetName, 0);
+ this.panel1.Controls.SetChildIndex(this.label3, 0);
+ //
+ // lblCaption
+ //
+ this.lblCaption.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.lblCaption.Size = new System.Drawing.Size(160, 24);
+ this.lblCaption.Text = "数据导入模块";
+ //
+ // cmdHPath
+ //
+ this.cmdHPath.Location = new System.Drawing.Point(1043, 9);
+ this.cmdHPath.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+ //
+ // txtHPath
+ //
+ this.txtHPath.Location = new System.Drawing.Point(615, 4);
+ this.txtHPath.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+ this.txtHPath.Size = new System.Drawing.Size(419, 39);
+ //
+ // label4
+ //
+ this.label4.Location = new System.Drawing.Point(520, 15);
+ this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(35, 11);
+ this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(67, 15);
+ this.label1.TabIndex = 104;
+ this.label1.Text = "会计年：";
+ //
+ // cmbHYear
+ //
+ this.cmbHYear.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cmbHYear.FormattingEnabled = true;
+ this.cmbHYear.Location = new System.Drawing.Point(112, 10);
+ this.cmbHYear.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmbHYear.Name = "cmbHYear";
+ this.cmbHYear.Size = new System.Drawing.Size(124, 23);
+ this.cmbHYear.TabIndex = 105;
+ //
+ // cmbHPeriod
+ //
+ this.cmbHPeriod.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cmbHPeriod.FormattingEnabled = true;
+ this.cmbHPeriod.Items.AddRange(new object[] {
+ "1",
+ "2",
+ "3",
+ "4",
+ "5",
+ "6",
+ "7",
+ "8",
+ "9",
+ "10",
+ "11",
+ "12"});
+ this.cmbHPeriod.Location = new System.Drawing.Point(359, 12);
+ this.cmbHPeriod.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmbHPeriod.Name = "cmbHPeriod";
+ this.cmbHPeriod.Size = new System.Drawing.Size(112, 23);
+ this.cmbHPeriod.TabIndex = 107;
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(264, 12);
+ this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(82, 15);
+ this.label2.TabIndex = 106;
+ this.label2.Text = "会计期间：";
+ //
+ // checkadd
+ //
+ this.checkadd.AutoSize = true;
+ this.checkadd.Checked = true;
+ this.checkadd.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.checkadd.Location = new System.Drawing.Point(1447, 12);
+ this.checkadd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.checkadd.Name = "checkadd";
+ this.checkadd.Size = new System.Drawing.Size(59, 19);
+ this.checkadd.TabIndex = 108;
+ this.checkadd.Text = "追加";
+ this.checkadd.UseVisualStyleBackColor = true;
+ //
+ // txtHSheetName
+ //
+ this.txtHSheetName.Location = new System.Drawing.Point(1265, 11);
+ this.txtHSheetName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHSheetName.Name = "txtHSheetName";
+ this.txtHSheetName.Size = new System.Drawing.Size(132, 25);
+ this.txtHSheetName.TabIndex = 109;
+ this.txtHSheetName.Text = "Sheet1";
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.Location = new System.Drawing.Point(1203, 12);
+ this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(52, 15);
+ this.label3.TabIndex = 110;
+ this.label3.Text = "工作簿";
//
// Gy_StdWorkTimes_RoutingBill
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1170, 712);
+ this.ClientSize = new System.Drawing.Size(1544, 789);
+ this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.Name = "Gy_StdWorkTimes_RoutingBill";
- this.Text = "鏍囧噯宸ユ椂鏁版嵁瀵煎叆";
+ this.Text = "数据导入模块";
+ this.Load += new System.EventHandler(this.Gy_StdWorkTimes_RoutingBill_Load);
+ this.pPic.ResumeLayout(false);
+ this.pPic.PerformLayout();
+ this.panel1.ResumeLayout(false);
+ this.panel1.PerformLayout();
this.ResumeLayout(false);
}
#endregion
+
+ private System.Windows.Forms.ComboBox cmbHPeriod;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.ComboBox cmbHYear;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.CheckBox checkadd;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.TextBox txtHSheetName;
}
-}
\ No newline at end of file
+}
diff --git "a/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_StdWorkTimes_RoutingBill.cs" "b/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_StdWorkTimes_RoutingBill.cs"
index 40db531..0f8ee76 100644
--- "a/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_StdWorkTimes_RoutingBill.cs"
+++ "b/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_StdWorkTimes_RoutingBill.cs"
@@ -1,19 +1,209 @@
-锘縰sing System;
+using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
-using System.Linq;
using System.Text;
using System.Windows.Forms;
+using Pub_Class;
+using SQLHelper;
-namespace PlanM.鏁版嵁瀵煎叆
+namespace PlanM
{
- public partial class Gy_StdWorkTimes_RoutingBill : Form
+ public partial class Gy_StdWorkTimes_RoutingBill : BLL.Gy_DataInTmp
{
public Gy_StdWorkTimes_RoutingBill()
{
InitializeComponent();
}
+ public int HItemID =0;
+ public int HMaker = 0; //制单人
+ public int HMakeDate = 0; //制单日期
+ public int HChecker = 0; //审核人
+ public int HCheckDate = 0; //审核日期
+ public int HStopflag = 0;
+ public int HRemark = 0;
+ public int HUSEORGName = 0; //组织ID
+ public int HProcName = 0; //
+ public int HMaterName = 0; //物料ID
+ public int HProcNum = 0; //
+ public int HMaterNum = 0; //物料ID
+ public int HStdWorkTimes = 0; //标准工时
+ public int HUpperlimit = 0; //上限比例
+ public int HLowerlimit = 0; //下限比例
+ //
+ public const int HBeginRow = 2; //有效数据，开始行数
+
+
+ //
+ public DAL.ClsGy_Process_View oProcHlp = new DAL.ClsGy_Process_View();
+ public DAL.ClsGy_StdWorkTimes_Ctl BillNew = new DAL.ClsGy_StdWorkTimes_Ctl();
+ DAL.ClsIF_Material_View oMaterHlp = new DAL.ClsIF_Material_View();
+
+
+
+ public override bool OpenExcelData()
+ {
+ base.sSheetName = txtHSheetName.Text;
+ return base.OpenExcelData();
+ }
+
+
+ /// <summary>
+ /// 初始化界面
+ /// </summary>
+ public override void initData()
+ {
+ base.initData();
+ base.sSheetName = "标准工时";
+ base.ModRightName = "Gy_StdWorkTimes_RoutingBill";
+ base.ModRightNameCheck = base.ModRightName + base.ModRightNameCheck;
+ base.ModRightNameClose = base.ModRightName + base.ModRightNameClose;
+ base.ModRightNameDelete = base.ModRightName + base.ModRightNameDelete;
+ base.ModRightNameEdit = base.ModRightName + base.ModRightNameEdit;
+ base.ModRightNameMoney = base.ModRightName + base.ModRightNameMoney;
+ base.ModRightNameQty = base.ModRightName + base.ModRightNameQty;
+ base.ModCaption = "标准工时";
+ this.Text = base.ModCaption;
+ lblCaption.Text = base.ModCaption;
+ //
+ DBUtility.Gy_BaseFun.SetComboxYear(cmbHYear);
+ DBUtility.Gy_BaseFun.SetComboxPeriod(cmbHPeriod);
+ //
+ }
+
+ public override void Sub_DataIn()
+ {
+ int sHStdWorkTimesCol = DBUtility.Gy_BaseFun.Fun_GetCol("标准工时", grdMain);
+ int sHProcNumCol = DBUtility.Gy_BaseFun.Fun_GetCol("工序代码", grdMain);
+ int sHProcNameCol = DBUtility.Gy_BaseFun.Fun_GetCol("工序", grdMain);
+ int sHMaterNumCol = DBUtility.Gy_BaseFun.Fun_GetCol("物料代码", grdMain);
+ int sHMaterNameCol = DBUtility.Gy_BaseFun.Fun_GetCol("物料", grdMain);
+ int sHUpperlimitCol = DBUtility.Gy_BaseFun.Fun_GetCol("上线比例", grdMain);
+ int sHLowerlimitCol = DBUtility.Gy_BaseFun.Fun_GetCol("下线比例", grdMain);
+ int sHUSEORGNameCol = DBUtility.Gy_BaseFun.Fun_GetCol("组织", grdMain);
+ int sHMakerCol = DBUtility.Gy_BaseFun.Fun_GetCol("制单人", grdMain);
+ int sHMakeDateCol = DBUtility.Gy_BaseFun.Fun_GetCol("制单日期", grdMain);
+
+ for (int i = 0; i <= grdMain.Rows.Count - 1; i++)
+ {
+ if (DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[sHMaterNumCol].Value) != "" && DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[sHProcNumCol].Value) != "")
+ {
+ //写入类
+ if (WriteClass(i))
+ {
+ //保存记录
+ if (!BillNew.AddNew())
+ {
+ MessageBox.Show("导入失败!原因:" + DBUtility.ClsPub.sExeReturnInfo, "提示");
+ return;
+ }
+ }
+ }
+ else
+ {
+ MessageBox.Show("工序代码或物料代码为空!原因:" + DBUtility.ClsPub.sExeReturnInfo, "提示");
+ return;
+ }
+ }
+ MessageBox.Show("导入完毕");
+ grdMain.DataSource = null;
+ }
+
+ //写入类 从控件
+ private bool WriteClass(int row)
+ {
+ BillNew.DetailColl.Clear();
+ string sMaterNumber = "";
+ string sMaterName = "";
+ string sProcNumber = "";
+ string sProcName = "";
+ double sStdWorkTimes = 0;
+ double sUpperlimit = 0;
+ double sLowerlimit = 0;
+ int sUSEORGName = 0;
+ DateTime sHMakeDate = DateTime.Today.Date;
+ string sHMaker = DBUtility.ClsPub.CurUserName;
+
+ int sHStdWorkTimesCol = DBUtility.Gy_BaseFun.Fun_GetCol("标准工时", grdMain);
+ int sHProcNumCol = DBUtility.Gy_BaseFun.Fun_GetCol("工序代码", grdMain);
+ int sHProcNameCol = DBUtility.Gy_BaseFun.Fun_GetCol("工序", grdMain);
+ int sHMaterNumCol = DBUtility.Gy_BaseFun.Fun_GetCol("物料代码", grdMain);
+ int sHMaterNameCol = DBUtility.Gy_BaseFun.Fun_GetCol("物料", grdMain);
+ int sHUpperlimitCol = DBUtility.Gy_BaseFun.Fun_GetCol("上线比例", grdMain);
+ int sHLowerlimitCol = DBUtility.Gy_BaseFun.Fun_GetCol("下线比例", grdMain);
+ int sHUSEORGNameCol = DBUtility.Gy_BaseFun.Fun_GetCol("组织", grdMain);
+ int sHMakerCol = DBUtility.Gy_BaseFun.Fun_GetCol("制单人", grdMain);
+ int sHMakeDateCol = DBUtility.Gy_BaseFun.Fun_GetCol("制单日期", grdMain);
+ //
+ sMaterNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[sHMaterNumCol].Value);
+ //sMaterName = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[sHMaterNameCol].Value);
+ sProcNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[sHProcNumCol].Value);
+ //sProcName = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[sHProcNameCol].Value);
+ sStdWorkTimes = DBUtility.ClsPub.isDoule(grdMain.Rows[row].Cells[sHStdWorkTimesCol].Value);
+ sUpperlimit = DBUtility.ClsPub.isDoule(grdMain.Rows[row].Cells[sHUpperlimitCol].Value);
+ sLowerlimit = DBUtility.ClsPub.isDoule(grdMain.Rows[row].Cells[sHLowerlimitCol].Value);
+ //sUSEORGName = DBUtility.ClsPub.isInt(grdMain.Rows[row].Cells[sHUSEORGNameCol].Value);
+ //sHMakeDate = DBUtility.ClsPub.isDate(grdMain.Rows[row].Cells[sHMakeDateCol].Value);
+ //sHMaker = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[sHMakerCol].Value);
+
+ //判断是否允许 保存
+ //审核代码是否合理
+ if (!DBUtility.ClsPub.AllowNumber(sMaterNumber))
+ {
+ MessageBox.Show("产品代码中不能出现连续‘.’并且首位末位不能为‘.’！", "提示");
+ return false;
+ }
+ if (!DBUtility.ClsPub.AllowNumber(sProcNumber))
+ {
+ MessageBox.Show("工序代码中不能出现连续‘.’并且首位末位不能为‘.’！", "提示");
+ return false;
+ }
+
+ Model.ClsGy_StdWorkTimes_Model oSub = new Model.ClsGy_StdWorkTimes_Model();
+ //得到物料内码
+ if (oMaterHlp.GetInfoByNumber(sMaterNumber))
+ {
+ oSub.HMaterID = oMaterHlp.omodel.HItemID;
+ }
+ else
+ {
+ oSub.HMaterID = 0;
+ MessageBox.Show("第" + row.ToString() + "行," + sMaterNumber + "没有找到对应的物料！");
+ return false;
+ }
+ //得到工序内码
+ if (oProcHlp.GetInfoByNumber(sProcNumber))
+ {
+ oSub.HProcID = oProcHlp.omodel.HItemID;
+ }
+ else
+ {
+ oSub.HProcID = 0;
+ MessageBox.Show("第" + row.ToString() + "行," + sProcNumber + "没有找到对应的工序！");
+ return false;
+ }
+
+ //写入信息
+
+ oSub.HRemark = "";
+ oSub.HStdWorkTimes = sStdWorkTimes;
+ oSub.HUpperlimit = sUpperlimit;
+ oSub.HLowerlimit = sLowerlimit;
+ oSub.HUSEORGID = DBUtility.ClsPub.HOrgID;
+ oSub.HMaker = DBUtility.ClsPub.CurUserName;
+ oSub.HMakeDate = DateTime.Today.ToShortDateString();
+ BillNew.DetailColl.Add(oSub);
+ //oProc.oModel.HBillSubType = DBUtility.ClsPub.isStrNull(txtHBillSubType.Text);
+
+ return true;
+ }
+
+
+ private void Gy_StdWorkTimes_RoutingBill_Load(object sender, EventArgs e)
+ {
+
+ }
}
}
+
diff --git "a/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_StdWorkTimes_RoutingBill.resx" "b/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_StdWorkTimes_RoutingBill.resx"
index 1af7de1..d55421f 100644
--- "a/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_StdWorkTimes_RoutingBill.resx"
+++ "b/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_StdWorkTimes_RoutingBill.resx"
@@ -1,4 +1,4 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
@@ -117,4 +117,7 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
</root>
\ No newline at end of file
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index 53e96b7..4a18d08 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -164,6 +164,10 @@
{
omodel.Kf_MateOutBill_SimpleMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_MustQtyCtl")
+ {
+ omodel.Kf_MateOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//生产退料单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_AutoCheck")
{
@@ -440,6 +444,10 @@
{
omodel.Kf_MoveStockBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_MustQtyCtl")
+ {
+ omodel.Kf_MoveStockBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//补料单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_AutoCheck")
{
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
index c7e69f1..4d9f633 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -28,6 +28,7 @@
public string Kf_MateOutBill_MulSourceBill; //多源单模式
public string Kf_MateOutBill_SimpleMode; //简洁模式（不显示源单列表，只显示扫码记录，但后台仍控制）
public string Kf_MateOutBill_BillTypeOneScan;//本单据类型内只允许一次扫码（唯一码，含缓存列表）
+ public string Kf_MateOutBillCheck_MustQtyCtl; //校验数量控制
//生产退料
public string Kf_MateOutBackBill_AutoCheck;
public string Kf_MateOutBackBill_ERPMode;
@@ -110,6 +111,7 @@
public string Kf_MoveStockBill_MulSourceBill; //多源单模式
public string Kf_MoveStockBill_BarCodeMustSameSourceBill; // 条码必须同源单一致
public string Kf_MoveStockBill_BillTypeOneScan;//本单据类型内只允许一次扫码（唯一码，含缓存列表）
+ public string Kf_MoveStockBillCheck_MustQtyCtl; //校验数量控制
//补料单
public string Kf_MateReplenishOutBill_AutoCheck;
public string Kf_MateReplenishOutBill_ERPMode;
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index 3f5cc87..1f2dd60 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -1207,17 +1207,39 @@
{
int StarNum1 = int.Parse(StarNum);
int EndNum1 = int.Parse(EndNum);
+ string j;
+ List<object> list = new List<object>();
try
{
DataSet ds = new DataSet();
ds = oCN.RunProcReturn("select * from Gy_MouldFileMain where HInterID=" + HInterID, "Gy_MouldFileMain");
DataRow dr = ds.Tables[0].Rows[0];
string Num = dr["HBillNo"].ToString();
- string Num1 = Num.Substring(0,(Num.Length)-3);
+ string Num1 = Num.Substring(0,(Num.Length)-5);
oCN.BeginTran();
for (int i = StarNum1; i <= EndNum1; i++)
{
- DataSet ds1= oCN.RunProcReturn("select * from Gy_MouldFileMain where hbillno='" + (Num1 + i)+"'", "Gy_MouldFileMain");
+ if (i<10)
+ {
+ j = "0000" + i;
+ }
+ else if (i<100)
+ {
+ j = "000" + i;
+ }
+ else if (i<1000)
+ {
+ j = "00" + i;
+ }
+ else if (i < 10000)
+ {
+ j = "0" + i;
+ }
+ else
+ {
+ j = ""+i;
+ }
+ DataSet ds1= oCN.RunProcReturn("select * from Gy_MouldFileMain where hbillno='" + (Num1 + j)+"'", "Gy_MouldFileMain");
if (ds1.Tables[0].Rows.Count == 0 || ds1 == null)
{
long HItemID = DBUtility.ClsPub.CreateBillID("3899", ref DBUtility.ClsPub.sExeReturnInfo);
@@ -1226,17 +1248,17 @@
",HYear,HPeriod,HRemark,HMaker,HMakeDate,HBarCode" +
",HMouldNo,HName,HModel,HModel2,HDiameter" +
",HSubjoin,HSubjoin2,HPICNo,HWorkMaterModel" +
- ",HMaterID,HMaterNumber,HUnitID" +
+ ",HMaterID,HMaterNumber,HMouldType,HUnitID" +
",HOutComDate,HOutComNo,HDeptID,HSupID,HSupNumber" +
",HPrintQty,HMouldStatus,HWhID,HRoutingID,HCaveQty" +
",HBomID,HVersion,HSPGroupID,HSPID,HDesignLife,HNowSupID,HNowSupTypeID" +
",HUseLife,HLeaveLife,HProdQty,HProdWeight,HMouldOWNER,HSaveLife,HMouldDotCheckRuleInterID,HMouldMaintainRuleInterID" +
") " +
- " values('3899','3899'," + HItemID + ",'" + Num1 + i + "',getdate()" +
- "," + dr["HYear"] + "," + dr["HPeriod"] + ",'" + dr["HRemark"] + "','" + dr["HMaker"] + "',getdate(),'" + Num1 + i +
- "','" + dr["HMouldNo"] + "','" + dr["HName"] + "','" + dr["HModel"] + "','" + dr["HModel2"] + "','" + dr["HDiameter"] + "'" +
+ " values('3899','3899'," + HItemID + ",'" + Num1 + j + "',getdate()" +
+ "," + dr["HYear"] + "," + dr["HPeriod"] + ",'" + dr["HRemark"] + "','" + dr["HMaker"] + "',getdate(),'" + dr["HBarCode"] +
+ "','" + Num1 + j + "','" + dr["HName"] + "','" + dr["HModel"] + "','" + dr["HModel2"] + "','" + dr["HDiameter"] + "'" +
",'" + dr["HSubjoin"] + "','" + dr["HSubjoin2"] + "','" + dr["HPICNo"] + "','" + dr["HWorkMaterModel"] + "'" +
- "," + dr["HMaterID"] + ",'" + dr["HMaterNumber"] + "'," + dr["HUnitID"] +
+ "," + dr["HMaterID"] + ",'" + dr["HMaterNumber"] + "',0," + dr["HUnitID"] +
",'" + dr["HOutComDate"] + "','" + dr["HOutComNo"] + "'," + dr["HDeptID"] + "," + dr["HSupID"] + ",'" + dr["HSupNumber"] + "'" +
"," + dr["HPrintQty"] + ",'" + dr["HMouldStatus"] + "'," + dr["HWHID"] + "," + dr["HRoutingID"] + ",'" + dr["HCaveQty"] +
"'," + dr["HBOMID"] + ",'" + dr["HVersion"] + "'," + dr["HSPGroupID"] + "," + dr["HSPID"] + ",'" + dr["HDesignLife"] + "','" + dr["HNowSupID"] + "','" + dr["HNowSupTypeID"] + "'" +
@@ -1253,12 +1275,16 @@
",0,0,'','',0,0 " +
") ");
}
+ else
+ {
+ list.Add(ds1.Tables[0].Rows[0]["HBillNo"].ToString());
+ }
}
oCN.Commit();
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "鎵归噺鐢熸垚鎴愬姛锛�";
- objJsonResult.data = null;
+ objJsonResult.list = list;
return objJsonResult;
}
catch (Exception e)
diff --git a/WebAPI/Controllers/Kf_EntrustInBillController.cs b/WebAPI/Controllers/Kf_EntrustInBillController.cs
index a3059f5..807dcc9 100644
--- a/WebAPI/Controllers/Kf_EntrustInBillController.cs
+++ b/WebAPI/Controllers/Kf_EntrustInBillController.cs
@@ -44,6 +44,7 @@
private JsonResult objJsonResult = new JsonResult();
public WebS.WebService1 oWebs = new WebS.WebService1();
public WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
+ public SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
/// <summary>
/// 濮斿鍏ュ簱/鎵潯鐮�/鐩存帴璋僿ebservice
@@ -436,5 +437,143 @@
return objJsonResult;
}
}
+
+
+ #region 濮斿鍑哄簱
+ /// <summary>
+ /// 濮斿鍑哄簱/鎻愪氦/鐩存帴璋冪敤webservice
+ /// </summary>
+ /// <returns></returns>
+ [Route("Kf_EntrustInBill/set_SaveEntrustOutBill_Json")]
+ [HttpPost]
+ public object set_SaveEntrustOutBill_Json([FromBody] JObject oMain)
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ try
+ {
+ List<Model.ClsKf_EntrustInBillMain> lsmain = new List<Model.ClsKf_EntrustInBillMain>();
+ ListModels oListModels = new ListModels();
+ lsmain = oListModels.getEntrustInBillMainByJson(msg1);
+ lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
+ lsmain[0].HBillType = "1211";
+
+ WebAPI.WebS.ClsKf_EntrustInBillMain websLsmain = new WebS.ClsKf_EntrustInBillMain();
+
+ websLsmain.HInterID = lsmain[0].HInterID;
+ websLsmain.HInnerBillNo = "";
+ websLsmain.HDate = lsmain[0].HDate;
+ websLsmain.HBillNo = lsmain[0].HBillNo;
+ websLsmain.HBillType = lsmain[0].HBillType;
+ websLsmain.HBillerID = DBUtility.ClsPub.isLong(DBUtility.ClsPub.CurUserID);
+ websLsmain.HDeptID = lsmain[0].HDeptID;
+ websLsmain.HEmpID = lsmain[0].HEmpID;
+ websLsmain.HRemark = "";
+ websLsmain.HRedBlueFlag = lsmain[0].HRedBlueFlag;
+ websLsmain.HMaker = lsmain[0].HMaker;
+ websLsmain.HSupID = lsmain[0].HSupID;
+ websLsmain.HSecManagerID = lsmain[0].HSecManagerID;
+ websLsmain.HSCWHID = lsmain[0].HSCWHID;
+ websLsmain.HKeeperID = lsmain[0].HKeeperID;
+ websLsmain.HMainSourceBillType = "1604";
+ websLsmain.HMangerID = lsmain[0].HMangerID;
+ websLsmain.HWHID = lsmain[0].HWHID;
+ websLsmain.HExplanation = lsmain[0].HExplanation;
+
+ string sSourceBillType = "1604";
+
+ if (webserver.set_SaveEntrustInBill_New(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鐢熸垚濮斿鍑哄簱鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "涓婁紶澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = websLsmain;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "涓婁紶澶辫触锛佸紓甯�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 濮斿鍑哄簱 鎵弿婧愬崟锛屽皢婧愬崟淇℃伅鍐欏叆鏉＄爜涓存椂琛�
+ /// </summary>
+ /// <param name="HSourceBillNo"></param>
+ /// <returns></returns>
+ [Route("Kf_EntrustInBill/GetWW_PPBomBillMainByHSourceBillNo")]
+ [HttpGet]
+ public object GetWW_PPBomBillMainByHSourceBillNo(string HSourceBillType, string HSourceBillNo, Int64 sInterID, string sBillNo)
+ {
+ try
+ {
+ string sWhere = " Where 鍗曟嵁鍙� like '%" + HSourceBillNo.Trim() + "%'";
+ if (HSourceBillType == "1604")
+ {
+ ds = oCn.RunProcReturn("Select HBillNo,HSupID,s.HName HSupName from WW_PPBomBillMain a left join Gy_Supplier s on a.HSupID=s.HItemID Where HBillNo='" + HSourceBillNo+"'", "WW_PPBomBillMain");
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍,婧愬崟绫诲瀷鏈夐敊璇紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
+ }
+ else
+ {
+ if (webserver.set_SavePonderationBillMain_Temp_Source_Fast(sInterID, sBillNo, "1211", HSourceBillNo, HSourceBillType, "钃濆瓧", ref DBUtility.ClsPub.sErrInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍐欏叆涓存椂琛ㄥけ璐ワ紒" + DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
diff --git a/WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs b/WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs
index 9f72f76..392da67 100644
--- a/WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs
@@ -322,6 +322,8 @@
sheet.SetColumnWidth(9, 5000);
sheet.SetColumnWidth(10, 5000);
sheet.SetColumnWidth(11, 5000);
+ sheet.SetColumnWidth(12, 5000);
+ sheet.SetColumnWidth(13, 5000);
DataSet ds = oCn.RunProcReturn("select * from h_v_Sc_StationInBillListMain" + sWhere + " order by hmainid desc", "h_v_Sc_StationInBillListMain");
for (var i = 0; i < ds.Tables[0].Rows.Count; i++)
@@ -331,15 +333,15 @@
row1.CreateCell(1).SetCellValue(ds.Tables[0].Rows[i]["娴佽浆鍗″彿"].ToString());
row1.CreateCell(2).SetCellValue(ds.Tables[0].Rows[i]["杩涘嚭绔欐墍鐢ㄦ椂闂�"].ToString());
row1.CreateCell(3).SetCellValue(ds.Tables[0].Rows[i]["宸ユ椂"].ToString());
- row1.CreateCell(3).SetCellValue(ds.Tables[0].Rows[i]["宸ュ簭鍚�"].ToString());
- row1.CreateCell(4).SetCellValue(ds.Tables[0].Rows[i]["涓嶈壇鏁伴噺"].ToString());
- row1.CreateCell(5).SetCellValue(ds.Tables[0].Rows[i]["鎶ュ簾鏁伴噺"].ToString());
- row1.CreateCell(6).SetCellValue(ds.Tables[0].Rows[i]["杩涚珯鏁伴噺"].ToString());
- row1.CreateCell(7).SetCellValue(ds.Tables[0].Rows[i]["鍑虹珯鏁伴噺"].ToString());
- row1.CreateCell(8).SetCellValue(ds.Tables[0].Rows[i]["鍑虹珯鏃堕棿"].ToString());
- row1.CreateCell(9).SetCellValue(ds.Tables[0].Rows[i]["杩涚珯鏃堕棿"].ToString());
- row1.CreateCell(10).SetCellValue(ds.Tables[0].Rows[i]["鍒跺崟浜�"].ToString());
- row1.CreateCell(11).SetCellValue(ds.Tables[0].Rows[i]["鍒跺崟鏃ユ湡"].ToString());
+ row1.CreateCell(4).SetCellValue(ds.Tables[0].Rows[i]["宸ュ簭鍚�"].ToString());
+ row1.CreateCell(5).SetCellValue(ds.Tables[0].Rows[i]["涓嶈壇鏁伴噺"].ToString());
+ row1.CreateCell(6).SetCellValue(ds.Tables[0].Rows[i]["鎶ュ簾鏁伴噺"].ToString());
+ row1.CreateCell(7).SetCellValue(ds.Tables[0].Rows[i]["杩涚珯鏁伴噺"].ToString());
+ row1.CreateCell(8).SetCellValue(ds.Tables[0].Rows[i]["鍑虹珯鏁伴噺"].ToString());
+ row1.CreateCell(9).SetCellValue(ds.Tables[0].Rows[i]["鍑虹珯鏃堕棿"].ToString());
+ row1.CreateCell(10).SetCellValue(ds.Tables[0].Rows[i]["杩涚珯鏃堕棿"].ToString());
+ row1.CreateCell(11).SetCellValue(ds.Tables[0].Rows[i]["鍒跺崟浜�"].ToString());
+ row1.CreateCell(12).SetCellValue(ds.Tables[0].Rows[i]["鍒跺崟鏃ユ湡"].ToString());
}
System.IO.MemoryStream ms = new System.IO.MemoryStream();
workbook.Write(ms);
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_CompleteController..cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_CompleteController..cs"
new file mode 100644
index 0000000..f5b247d
--- /dev/null
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_CompleteController..cs"
@@ -0,0 +1,83 @@
+锘縰sing DBUtility;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.SCGL
+{
+ public class JIT_CompleteController : ApiController
+ {
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+ #region 榻愬鍒嗘瀽淇℃伅鏄庣粏鍒楄〃
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="sWhere">鏌ヨ鏉′欢</param>
+ /// <param name="HMainICMOEntryID">鐢熶骇璁㈠崟鏄庣粏琛╥d</param>
+ /// <returns></returns>
+ [Route("JIT_Complete/JIT_CompleteDetailList")]
+ [HttpGet]
+ public object JIT_CompleteDetailList(string sWhere, string HMainICMOEntryID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from h_v_JIT_MOMaterReadysBill where 涓荤敓浜ц鍗曞瓙鍐呯爜 = '" + HMainICMOEntryID + "' " + sWhere + " order by 鏃ヨ鍒掓棩鏈�,鐗╂枡ID desc ", "h_v_JIT_Gy_WorkWarehouseBillList");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 榻愬鍒嗘瀽鐗╂枡鍗犵敤鏄庣粏鍒楄〃
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="sWhere">鏌ヨ鏉′欢</param>
+ /// <param name="HMaterID">鐗╂枡ID</param>
+ /// <returns></returns>
+ [Route("JIT_Complete/JIT_CompleteMaterialDetailList")]
+ [HttpGet]
+ public object JIT_CompleteMaterialDetailList(string sWhere, string HMaterID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from h_v_JIT_MOMaterReadysBill where 鐗╂枡ID = '" + HMaterID + "' " + sWhere + " ORDER BY 鏃ヨ鍒掓棩鏈� ASC,鍙敤鏁伴噺 DESC,鐢熶骇杞﹂棿 ", "h_v_JIT_Gy_WorkWarehouseBillList");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
index f672993..c00d86e 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
@@ -90,7 +90,7 @@
left join Gy_Customer c on a.HCusID=c.HItemID
left join Gy_Employee e on a.HEmpID=e.HItemID
left join Gy_Department d on a.HDeptID=d.HItemID
- where b.HSeOrderInterID=(select HSeOrderInterID from Sc_ICMOBillMain where HBillNo='" + HBillNo + "')");
+ where b.HSeOrderInterID=(select HSeOrderInterID from Sc_PPBomBillMain where HBillNo='" + HBillNo + "')");
ds = oCN.RunProcReturn(sql, "Sc_ICMOBillMain");
if (ds.Tables[0].Rows.Count != 0 || ds != null)
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index b8c5c29..5852142 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2022-04-12T02:36:02.1779173Z;True|2022-04-12T10:05:31.0222037+08:00;True|2022-04-12T09:47:49.3724819+08:00;True|2022-04-09T15:08:54.5697468+08:00;True|2022-04-08T17:31:31.0046258+08:00;True|2022-04-08T16:50:41.3018422+08:00;True|2022-04-08T10:35:36.5029980+08:00;True|2022-03-31T09:38:37.3646053+08:00;True|2022-03-29T13:57:45.4410942+08:00;True|2022-03-10T18:59:23.7994337+08:00;True|2022-03-10T18:52:39.5019082+08:00;True|2022-03-10T18:51:12.7949284+08:00;True|2022-03-10T18:50:47.2024177+08:00;True|2022-03-10T18:45:08.8409380+08:00;True|2022-03-10T18:41:17.0102564+08:00;True|2022-03-10T18:35:49.0742353+08:00;True|2022-03-10T17:57:47.4196965+08:00;True|2022-03-10T17:34:27.5723245+08:00;True|2022-03-10T16:13:59.3829164+08:00;True|2022-03-09T14:50:49.1222033+08:00;True|2022-03-09T11:21:03.0073651+08:00;False|2022-03-09T11:16:56.1792896+08:00;False|2022-03-09T11:16:49.7923320+08:00;True|2022-03-08T15:47:47.4722336+08:00;True|2022-03-08T15:47:28.5397115+08:00;True|2022-03-08T15:37:08.7379870+08:00;True|2022-03-02T17:37:54.4659976+08:00;True|2022-03-02T17:34:12.2949726+08:00;True|2022-03-02T17:26:38.7070673+08:00;True|2022-03-02T17:07:49.7024316+08:00;True|2022-03-02T17:05:22.4177336+08:00;True|2022-03-02T16:14:57.9880587+08:00;True|2022-03-01T17:52:52.6766959+08:00;True|2022-02-28T14:36:22.6449303+08:00;True|2022-02-24T15:43:36.8244163+08:00;True|2022-02-23T17:57:14.3693224+08:00;True|2022-02-23T17:46:42.1078183+08:00;False|2022-02-23T17:41:06.5886724+08:00;True|2022-02-23T16:59:45.5533581+08:00;True|2022-02-23T16:57:43.3328895+08:00;True|2022-02-21T09:09:37.2601134+08:00;True|2022-02-21T09:03:32.4071009+08:00;True|2022-02-21T08:59:59.0172082+08:00;True|2022-02-18T14:05:39.1358825+08:00;True|2022-02-18T10:23:02.4391239+08:00;True|2022-02-18T10:21:31.0559267+08:00;True|2022-02-17T16:50:11.7192509+08:00;True|2022-02-17T13:19:13.7697894+08:00;True|2022-02-11T10:36:12.7757100+08:00;True|2022-02-10T10:54:25.2685040+08:00;True|2022-02-10T10:37:02.1034768+08:00;True|2022-02-09T17:32:45.6511283+08:00;True|2022-02-09T17:24:32.5115193+08:00;True|2022-02-09T17:00:24.0662114+08:00;True|2022-02-09T16:56:42.3364622+08:00;True|2022-02-09T14:17:25.8688855+08:00;True|2022-02-09T14:11:51.6149822+08:00;True|2022-02-07T23:29:26.2842648+08:00;True|2022-02-07T23:28:58.8242274+08:00;False|2022-02-07T23:25:29.0647793+08:00;True|2022-02-07T13:06:37.5515985+08:00;True|2022-02-07T12:42:19.5220491+08:00;True|2022-02-07T09:52:59.6728595+08:00;True|2022-02-01T11:32:10.5831557+08:00;True|2022-01-29T14:09:02.9178986+08:00;True|2022-01-28T12:01:45.1416438+08:00;True|2022-01-28T11:03:41.6361866+08:00;True|2022-01-28T10:44:53.5367862+08:00;True|2022-01-28T10:40:41.6697563+08:00;True|2022-01-28T10:25:56.7093616+08:00;True|2022-01-28T09:58:13.0733060+08:00;True|2022-01-27T09:26:29.6568807+08:00;True|2022-01-27T00:47:57.9102528+08:00;True|2022-01-27T00:46:52.8845001+08:00;True|2022-01-27T00:36:34.5330938+08:00;True|2022-01-27T00:35:19.5439329+08:00;True|2022-01-27T00:33:38.5701950+08:00;True|2022-01-27T00:32:00.9028982+08:00;True|2022-01-27T00:30:13.2390921+08:00;True|2022-01-27T00:28:23.2989144+08:00;True|2022-01-27T00:16:01.3789455+08:00;True|2022-01-27T00:09:58.8112352+08:00;True|2022-01-27T00:00:40.8353538+08:00;True|2022-01-26T23:37:50.9494735+08:00;True|2022-01-26T23:29:39.8647473+08:00;True|2022-01-26T23:20:49.3274392+08:00;True|2022-01-26T23:15:53.7037293+08:00;True|2022-01-26T23:06:28.8595953+08:00;True|2022-01-26T23:02:12.9882299+08:00;True|2022-01-26T22:55:33.2535730+08:00;True|2022-01-26T22:51:01.8427947+08:00;True|2022-01-26T22:47:44.0715387+08:00;True|2022-01-26T22:20:21.7217039+08:00;True|2022-01-26T22:13:39.5372069+08:00;True|2022-01-26T22:01:31.2113177+08:00;True|2022-01-26T21:55:26.5478921+08:00;True|2022-01-26T21:50:18.2700369+08:00;True|2022-01-26T21:48:52.0020233+08:00;True|2022-01-26T19:19:29.4530523+08:00;True|2022-01-26T19:07:21.6474231+08:00;True|2022-01-26T18:25:42.2933291+08:00;True|2022-01-26T12:39:02.0149050+08:00;True|2022-01-26T12:13:43.9149452+08:00;True|2022-01-26T11:24:33.5742248+08:00;True|2022-01-26T08:51:10.8105076+08:00;True|2022-01-25T21:07:32.9069261+08:00;True|2022-01-24T01:35:12.3309466+08:00;True|2022-01-23T23:19:15.9702821+08:00;True|2022-01-23T21:50:41.6903353+08:00;True|2022-01-23T21:25:57.6084267+08:00;True|2022-01-23T21:16:10.1516535+08:00;True|2022-01-23T20:52:08.3745284+08:00;True|2022-01-23T18:19:32.2386502+08:00;True|2022-01-23T18:11:42.0830325+08:00;True|2022-01-23T18:00:01.3239547+08:00;True|2022-01-23T12:18:48.2466943+08:00;True|2022-01-22T00:48:50.4531647+08:00;True|2022-01-21T13:10:32.8173598+08:00;True|2022-01-21T13:04:01.6388059+08:00;True|2022-01-21T12:51:40.5304103+08:00;True|2022-01-21T12:44:06.3059885+08:00;True|2022-01-21T12:34:33.9314010+08:00;True|2022-01-21T11:39:20.1088577+08:00;True|2022-01-20T11:33:49.0516846+08:00;True|2022-01-20T10:02:12.0295471+08:00;True|2022-01-20T10:02:03.3535503+08:00;True|2022-01-19T23:56:18.7293193+08:00;True|2022-01-19T22:30:14.6986228+08:00;True|2022-01-19T22:15:08.8608795+08:00;True|2022-01-19T21:57:55.2295030+08:00;True|2022-01-19T13:50:37.8588759+08:00;True|2022-01-19T13:42:52.9761531+08:00;True|2022-01-19T00:26:36.9722917+08:00;True|2022-01-19T00:15:30.8583143+08:00;True|2022-01-18T21:19:30.6193048+08:00;True|2022-01-18T21:12:07.1453825+08:00;True|2022-01-18T20:35:27.3779956+08:00;True|2022-01-18T17:44:45.2318570+08:00;True|2022-01-18T14:45:29.0299640+08:00;True|2022-01-17T22:23:20.8214203+08:00;True|2022-01-17T21:49:15.7740045+08:00;True|2022-01-17T21:47:24.6997598+08:00;True|2022-01-17T21:44:00.1942787+08:00;True|2022-01-17T21:43:15.5992687+08:00;True|2022-01-17T21:33:16.8034756+08:00;True|2022-01-17T21:25:39.9909343+08:00;True|2022-01-17T21:13:03.9659338+08:00;True|2022-01-17T20:32:14.8869091+08:00;True|2022-01-17T19:01:46.5753686+08:00;True|2022-01-17T18:31:24.1032169+08:00;True|2022-01-17T18:21:39.2918684+08:00;True|2022-01-17T18:12:07.4859038+08:00;True|2022-01-17T18:09:26.6989718+08:00;True|2022-01-17T18:04:36.7564997+08:00;True|2022-01-17T17:57:44.7814863+08:00;True|2022-01-17T17:51:50.1516107+08:00;True|2022-01-17T17:39:29.2918799+08:00;True|2022-01-17T14:55:21.5859341+08:00;True|2022-01-17T14:38:06.5091500+08:00;True|2022-01-17T14:30:25.5378436+08:00;True|2022-01-16T19:15:24.5874858+08:00;True|2022-01-16T19:07:49.0613424+08:00;True|2022-01-16T16:10:47.3112741+08:00;False|2022-01-14T19:09:41.9296709+08:00;False|2022-01-14T18:56:11.0569808+08:00;False|2022-01-14T18:28:20.1376762+08:00;False|2022-01-14T18:27:30.8678130+08:00;False|2022-01-14T18:22:45.4436504+08:00;False|2022-01-14T18:19:37.0374753+08:00;False|2022-01-14T18:18:48.5868254+08:00;False|2022-01-14T18:14:02.5810257+08:00;False|2022-01-14T18:09:51.1730754+08:00;False|2022-01-14T18:09:17.8940754+08:00;True|2022-01-13T20:08:16.2937608+08:00;True|2022-01-13T20:07:30.1505466+08:00;True|2022-01-13T13:39:42.0146294+08:00;True|2022-01-13T13:38:07.5062471+08:00;True|2022-01-13T11:29:49.3751232+08:00;True|2022-01-13T11:05:43.9574142+08:00;True|2022-01-13T10:33:23.1921058+08:00;True|2022-01-12T20:38:16.9165651+08:00;True|2022-01-12T20:24:46.3779264+08:00;True|2022-01-12T20:03:06.5030626+08:00;True|2022-01-12T19:44:55.4294326+08:00;True|2022-01-12T12:58:45.9548600+08:00;True|2022-01-12T11:28:44.7797749+08:00;True|2022-01-11T18:07:30.9151356+08:00;True|2022-01-11T15:06:32.7301609+08:00;True|2022-01-11T09:27:00.1766442+08:00;True|2021-12-30T14:41:56.8541015+08:00;True|2021-12-30T13:45:00.6130694+08:00;True|2021-12-30T13:44:18.7370780+08:00;True|2021-12-30T13:36:52.8171136+08:00;True|2021-12-28T19:14:22.5979649+08:00;True|2021-12-28T13:13:39.3543252+08:00;True|2021-12-27T15:31:26.6037782+08:00;True|2021-12-27T15:28:54.4824480+08:00;True|2021-12-27T15:22:47.8436108+08:00;True|2021-12-27T15:04:37.0711590+08:00;True|2021-12-27T15:03:52.0932499+08:00;True|2021-12-27T15:03:33.0172733+08:00;True|2021-12-27T13:28:27.4252747+08:00;True|2021-12-25T19:38:33.6784042+08:00;True|2021-12-24T20:47:43.3471563+08:00;True|2021-12-24T20:14:57.6946814+08:00;True|2021-12-24T19:55:21.1843105+08:00;True|2021-12-24T19:49:54.6719726+08:00;True|2021-12-24T19:38:14.1180741+08:00;True|2021-12-22T13:51:37.1082523+08:00;True|2021-12-21T15:38:59.8015096+08:00;True|2021-12-21T15:29:54.8095063+08:00;False|2021-12-21T15:29:21.7006531+08:00;False|2021-12-21T15:16:18.2218025+08:00;False|2021-12-21T15:11:38.1215841+08:00;False|2021-12-21T15:08:27.0590078+08:00;True|2021-12-10T14:12:36.4065298+08:00;True|2021-12-10T13:54:03.4921778+08:00;True|2021-12-10T13:25:49.0439086+08:00;True|2021-12-10T13:19:58.9494477+08:00;True|2021-12-10T13:10:45.3929017+08:00;True|2021-12-10T11:06:53.2416794+08:00;True|2021-12-07T17:23:28.9380484+08:00;True|2021-12-07T17:13:52.4384814+08:00;True|2021-12-07T16:39:49.2020208+08:00;True|2021-12-07T15:18:20.9024533+08:00;True|2021-12-07T15:07:35.4428035+08:00;True|2021-12-07T15:01:02.0445043+08:00;True|2021-12-07T14:50:08.9019705+08:00;True|2021-12-07T14:34:50.4993666+08:00;False|2021-12-07T14:32:56.0408332+08:00;True|2021-12-06T17:11:41.4004606+08:00;True|2021-12-06T16:48:07.6029757+08:00;True|2021-12-06T13:46:35.9437718+08:00;True|2021-12-06T13:45:07.6622615+08:00;True|2021-12-06T11:25:04.3483155+08:00;True|2021-12-06T11:18:24.5804187+08:00;True|2021-11-22T16:27:05.4241947+08:00;True|2021-11-22T13:40:17.6768280+08:00;True|2021-11-19T16:15:19.9085104+08:00;True|2021-11-09T10:34:21.1623512+08:00;True|2021-11-07T16:57:59.7380254+08:00;True|2021-11-07T16:53:47.4198852+08:00;True|2021-11-07T16:42:05.5096826+08:00;True|2021-11-07T16:37:21.0729013+08:00;True|2021-11-05T20:51:17.6170717+08:00;True|2021-11-05T20:35:14.6250333+08:00;True|2021-11-05T19:30:19.8374158+08:00;True|2021-11-05T19:22:46.2276569+08:00;True|2021-11-05T19:20:30.8253213+08:00;True|2021-11-05T19:16:45.7553310+08:00;True|2021-11-05T19:16:00.4532689+08:00;True|2021-11-05T19:12:25.9022478+08:00;False|2021-11-05T19:11:26.5753529+08:00;True|2021-11-05T19:09:30.0085433+08:00;True|2021-11-05T18:48:19.9395153+08:00;True|2021-11-05T18:45:34.3437897+08:00;True|2021-11-05T18:43:43.4558159+08:00;True|2021-11-05T18:40:40.9948500+08:00;True|2021-11-05T18:34:18.4440455+08:00;True|2021-11-05T15:54:51.6037132+08:00;True|2021-10-28T16:27:53.9728270+08:00;True|2021-10-28T16:03:59.5629998+08:00;True|2021-10-28T08:51:04.2549186+08:00;True|2021-10-27T15:14:53.5506098+08:00;True|2021-10-27T15:00:44.9100320+08:00;True|2021-10-27T13:14:46.7921647+08:00;True|2021-10-27T11:24:49.4550753+08:00;True|2021-10-27T10:10:10.3545125+08:00;True|2021-10-27T10:02:24.9248610+08:00;True|2021-10-27T09:59:40.3795897+08:00;True|2021-10-27T09:56:30.6629207+08:00;True|2021-10-27T09:10:48.3883432+08:00;True|2021-10-27T09:03:31.9191991+08:00;True|2021-10-27T08:59:59.7651159+08:00;True|2021-10-27T08:36:11.8620997+08:00;True|2021-10-27T08:26:40.2533014+08:00;True|2021-10-26T09:19:35.5674748+08:00;True|2021-10-26T09:17:17.6900747+08:00;True|2021-10-26T09:14:32.3999220+08:00;True|2021-10-25T15:08:21.2581763+08:00;True|2021-10-25T10:01:57.8524903+08:00;True|2021-10-25T09:28:51.6294879+08:00;True|2021-10-25T09:25:50.3373336+08:00;True|2021-10-25T09:23:37.0203978+08:00;True|2021-10-25T09:18:23.3380608+08:00;True|2021-10-25T09:15:10.5292071+08:00;True|2021-10-25T08:56:30.4632027+08:00;True|2021-10-25T08:50:11.4697392+08:00;True|2021-10-22T13:46:49.7207066+08:00;True|2021-10-22T10:06:33.3130089+08:00;True|2021-10-20T14:32:10.1235516+08:00;True|2021-10-20T14:16:18.6496291+08:00;True|2021-10-20T14:08:49.2443715+08:00;True|2021-10-20T14:05:14.6847950+08:00;True|2021-10-20T13:30:21.6057636+08:00;True|2021-10-20T10:55:22.2151716+08:00;True|2021-10-19T10:42:13.4198267+08:00;True|2021-10-19T10:01:41.0018108+08:00;True|2021-10-19T09:59:11.2127619+08:00;True|2021-10-19T09:54:04.8472874+08:00;True|2021-10-15T11:19:15.5327495+08:00;True|2021-10-15T11:17:41.0686485+08:00;True|2021-10-15T11:12:11.8295042+08:00;True|2021-10-15T10:33:31.5670079+08:00;True|2021-10-15T10:27:45.0815146+08:00;True|2021-10-14T14:51:28.5331025+08:00;True|2021-10-14T14:37:28.3276051+08:00;True|2021-10-14T14:23:39.0606792+08:00;True|2021-10-14T14:21:03.8140347+08:00;True|2021-10-13T10:31:10.6628977+08:00;True|2021-10-13T10:12:24.4238027+08:00;True|2021-10-13T08:47:43.9314486+08:00;True|2021-10-12T14:07:18.6065183+08:00;True|2021-10-12T10:34:10.1682362+08:00;True|2021-10-12T10:27:14.3073332+08:00;True|2021-10-12T10:22:08.0004619+08:00;True|2021-10-12T10:21:03.0275378+08:00;True|2021-10-12T10:11:54.9812692+08:00;True|2021-10-11T16:59:07.3568342+08:00;True|2021-10-11T16:53:14.2016138+08:00;True|2021-10-11T16:21:35.0133775+08:00;True|2021-10-11T15:34:19.5731935+08:00;True|2021-10-11T15:31:07.5780983+08:00;True|2021-10-11T15:06:47.1145237+08:00;True|2021-10-11T15:03:25.5000280+08:00;True|2021-10-11T10:12:57.6416898+08:00;True|2021-10-09T10:15:17.9235165+08:00;True|2021-10-09T10:13:51.3318441+08:00;True|2021-10-09T10:01:21.6661542+08:00;True|2021-10-09T09:58:41.9225837+08:00;True|2021-10-08T14:56:49.7935800+08:00;True|2021-10-08T14:35:41.4490063+08:00;True|2021-10-08T14:02:42.6990656+08:00;True|2021-09-29T15:48:55.1547397+08:00;True|2021-09-29T15:48:23.5567191+08:00;True|2021-09-27T16:17:35.7180978+08:00;True|2021-09-27T15:51:50.4240134+08:00;True|2021-09-23T20:55:27.3554447+08:00;True|2021-09-23T14:14:44.0572017+08:00;True|2021-09-23T13:51:56.2344673+08:00;True|2021-09-23T10:46:16.7417007+08:00;True|2021-09-23T10:42:23.2117537+08:00;True|2021-09-22T15:21:22.9615672+08:00;True|2021-09-22T14:23:32.7907754+08:00;True|2021-09-22T13:48:03.4780947+08:00;True|2021-09-22T11:05:24.5249356+08:00;True|2021-09-22T10:00:19.0962943+08:00;True|2021-09-22T09:30:26.2686514+08:00;True|2021-09-17T11:22:34.5692792+08:00;True|2021-09-16T16:11:27.5372277+08:00;True|2021-09-16T14:53:40.8396557+08:00;True|2021-09-16T14:32:29.7905500+08:00;True|2021-09-16T14:26:46.2224219+08:00;True|2021-09-16T10:32:24.4244440+08:00;True|2021-09-15T11:10:35.3529360+08:00;True|2021-09-15T11:08:30.0857376+08:00;True|2021-09-15T11:05:56.7191571+08:00;True|2021-09-14T01:24:39.8041136+08:00;True|2021-09-14T01:05:01.1593327+08:00;True|2021-09-14T00:44:14.7233198+08:00;True|2021-09-13T23:48:19.4506233+08:00;True|2021-09-13T20:30:31.3243872+08:00;True|2021-09-13T19:45:35.9108911+08:00;False|2021-09-13T19:44:59.2779092+08:00;True|2021-09-13T18:09:22.4994381+08:00;True|2021-09-10T14:18:27.5788854+08:00;True|2021-09-09T15:57:01.7407207+08:00;True|2021-09-09T15:49:34.2598998+08:00;True|2021-09-09T11:32:10.7853024+08:00;True|2021-09-09T11:10:48.6840025+08:00;True|2021-09-09T10:35:37.3883078+08:00;True|2021-09-07T14:11:49.8497588+08:00;True|2021-09-07T13:34:48.4693349+08:00;True|2021-09-06T14:33:48.7549675+08:00;True|2021-09-03T16:27:51.1888520+08:00;True|2021-09-03T16:19:35.9003465+08:00;True|2021-09-03T15:46:28.1828032+08:00;True|2021-09-03T15:34:21.9362871+08:00;True|2021-09-03T11:24:49.8749819+08:00;True|2021-09-03T11:21:17.8373159+08:00;True|2021-09-03T11:16:53.2208136+08:00;True|2021-09-03T11:12:23.9063804+08:00;True|2021-09-03T09:11:09.2435721+08:00;True|2021-09-02T11:16:15.1370453+08:00;True|2021-09-02T10:35:39.1171879+08:00;True|2021-09-01T10:17:09.4536285+08:00;True|2021-09-01T09:46:28.4581776+08:00;True|2021-08-31T08:54:26.8588887+08:00;True|2021-08-31T08:39:08.3685693+08:00;True|2021-08-30T17:11:56.8438985+08:00;True|2021-08-30T15:59:42.0820292+08:00;True|2021-08-30T15:45:18.1868510+08:00;True|2021-08-30T14:56:08.3958863+08:00;True|2021-08-30T14:37:11.5379830+08:00;True|2021-08-30T14:35:34.8775934+08:00;True|2021-08-30T14:24:36.5111821+08:00;True|2021-08-30T10:05:49.6945200+08:00;True|2021-08-30T10:03:28.4064538+08:00;True|2021-08-30T10:00:16.8360929+08:00;True|2021-08-30T09:56:09.4434379+08:00;True|2021-08-30T09:55:36.1725334+08:00;True|2021-08-30T09:52:04.8600054+08:00;True|2021-08-30T09:47:46.4225655+08:00;True|2021-08-30T09:45:20.4894962+08:00;False|2021-08-27T17:17:34.2646751+08:00;False|2021-08-27T16:01:21.2791979+08:00;False|2021-08-27T15:58:06.9667160+08:00;False|2021-08-27T15:38:37.4818036+08:00;False|2021-08-27T15:21:02.8863114+08:00;False|2021-08-27T15:20:28.6828668+08:00;True|2021-08-26T16:00:44.3162145+08:00;True|2021-08-26T08:57:31.3842587+08:00;True|2021-08-23T08:43:41.1549775+08:00;True|2021-08-22T09:24:12.7210871+08:00;True|2021-08-22T09:19:53.8300229+08:00;True|2021-08-20T20:00:52.0140407+08:00;True|2021-08-20T19:40:14.7712765+08:00;True|2021-08-19T17:37:54.9748049+08:00;True|2021-08-19T17:20:11.0515687+08:00;True|2021-08-19T16:12:35.4392809+08:00;True|2021-08-19T16:06:50.6204587+08:00;True|2021-08-19T16:03:53.0824286+08:00;True|2021-08-19T15:56:01.3498791+08:00;True|2021-08-19T10:18:50.8113630+08:00;True|2021-08-19T09:58:06.2784035+08:00;True|2021-08-19T09:56:54.0619777+08:00;True|2021-08-19T00:32:08.3503093+08:00;True|2021-08-19T00:11:18.3150227+08:00;True|2021-08-19T00:02:49.4827718+08:00;True|2021-08-18T23:54:45.4845900+08:00;True|2021-08-18T23:39:51.6147977+08:00;True|2021-08-18T23:16:42.7214379+08:00;True|2021-08-18T22:38:57.4681929+08:00;True|2021-08-18T21:41:58.7560707+08:00;True|2021-08-18T21:11:52.2369249+08:00;True|2021-08-18T21:01:49.5669106+08:00;True|2021-08-18T20:47:46.5352688+08:00;False|2021-08-18T20:46:36.7956141+08:00;False|2021-08-18T20:46:01.0502138+08:00;True|2021-08-18T19:39:12.8186242+08:00;False|2021-08-18T19:38:12.6839708+08:00;True|2021-08-18T19:15:51.4626694+08:00;True|2021-08-18T16:07:20.4350886+08:00;True|2021-08-18T14:29:41.7171934+08:00;True|2021-08-18T14:20:36.3647361+08:00;True|2021-08-16T09:08:58.3617662+08:00;True|2021-08-15T20:44:29.9214083+08:00;True|2021-08-15T20:36:17.0958549+08:00;True|2021-08-15T20:29:34.3879773+08:00;True|2021-08-15T20:23:47.4052038+08:00;True|2021-08-15T15:01:19.7830862+08:00;True|2021-08-15T12:15:18.3433782+08:00;True|2021-08-13T20:59:11.3947130+08:00;True|2021-08-06T22:49:09.9538339+08:00;True|2021-08-06T22:35:19.0418168+08:00;True|2021-08-06T20:29:47.4241975+08:00;True|2021-08-06T14:08:16.4791827+08:00;True|2021-08-06T13:59:28.9874611+08:00;True|2021-08-06T13:57:34.3723977+08:00;True|2021-08-06T13:36:03.4816652+08:00;True|2021-08-06T12:22:52.5055221+08:00;True|2021-08-06T09:31:58.1272499+08:00;True|2021-08-06T09:26:51.6310039+08:00;True|2021-08-06T09:24:22.2899244+08:00;True|2021-08-06T09:06:30.6477912+08:00;True|2021-08-06T09:00:55.5101612+08:00;True|2021-08-06T08:49:59.9616490+08:00;True|2021-08-06T08:45:18.8586902+08:00;True|2021-08-05T20:09:25.8861998+08:00;True|2021-08-04T19:14:27.2396953+08:00;True|2021-08-04T19:11:47.5849093+08:00;True|2021-08-04T16:42:54.0149043+08:00;True|2021-08-04T15:02:11.5056561+08:00;True|2021-08-04T14:58:37.1435509+08:00;True|2021-08-04T14:55:34.7380132+08:00;True|2021-08-04T14:47:42.5933921+08:00;True|2021-08-04T14:45:17.9911874+08:00;True|2021-08-04T13:52:20.9601351+08:00;True|2021-08-04T09:48:28.8796992+08:00;True|2021-08-03T18:14:13.1894998+08:00;True|2021-08-03T17:45:35.1349721+08:00;True|2021-08-03T17:21:52.6028977+08:00;True|2021-08-03T17:20:35.4423020+08:00;True|2021-08-03T17:03:33.1667669+08:00;True|2021-08-03T17:01:54.2656787+08:00;True|2021-08-03T17:00:22.2778374+08:00;True|2021-08-03T16:56:58.8902582+08:00;True|2021-08-03T15:02:21.8601533+08:00;True|2021-08-03T14:57:34.0186758+08:00;True|2021-08-03T14:28:47.2242515+08:00;True|2021-08-03T14:22:22.4554236+08:00;True|2021-08-03T14:21:51.1339715+08:00;True|2021-08-03T13:37:33.9697131+08:00;True|2021-08-03T13:28:29.7591095+08:00;True|2021-08-03T11:35:09.5118324+08:00;True|2021-08-03T11:11:23.3051573+08:00;True|2021-08-02T13:14:42.3663755+08:00;True|2021-07-30T22:50:19.9749878+08:00;True|2021-07-30T22:49:31.2150970+08:00;True|2021-07-28T19:12:05.8381075+08:00;True|2021-07-28T18:59:45.4808797+08:00;True|2021-07-28T18:15:58.8301509+08:00;True|2021-07-28T18:04:54.8613546+08:00;True|2021-07-28T17:53:48.6225611+08:00;True|2021-07-28T17:42:50.9171563+08:00;True|2021-07-28T17:17:16.3137677+08:00;True|2021-07-28T17:11:46.8925200+08:00;True|2021-07-28T16:28:27.6823943+08:00;True|2021-07-28T16:23:00.3385836+08:00;True|2021-07-28T09:57:55.4237411+08:00;True|2021-07-28T08:38:29.6691541+08:00;True|2021-07-27T23:16:32.0331671+08:00;True|2021-07-27T23:06:08.1947249+08:00;True|2021-07-27T23:05:58.4619176+08:00;True|2021-07-27T18:42:09.5358261+08:00;True|2021-07-27T18:30:04.8532823+08:00;True|2021-07-27T18:29:43.5775092+08:00;True|2021-07-27T15:16:49.8356224+08:00;True|2021-07-27T15:05:27.8453220+08:00;True|2021-07-27T14:59:15.9519440+08:00;True|2021-07-27T09:23:32.6111337+08:00;True|2021-07-27T08:27:41.6395353+08:00;True|2021-07-27T08:25:56.7378296+08:00;True|2021-07-26T11:18:46.0856966+08:00;True|2021-07-26T11:18:02.0751924+08:00;True|2021-07-26T11:13:49.6285395+08:00;True|2021-07-21T21:08:25.9898902+08:00;True|2021-07-21T20:09:26.2258104+08:00;True|2021-07-13T16:17:25.8407435+08:00;True|2021-07-13T13:46:13.4309531+08:00;True|2021-07-13T12:29:04.5082461+08:00;True|2021-06-29T13:55:01.6864637+08:00;True|2021-06-29T10:38:52.2206472+08:00;True|2021-06-29T10:10:13.1540749+08:00;True|2021-06-28T14:37:56.3853273+08:00;False|2021-06-28T14:36:57.5726124+08:00;True|2021-06-25T14:17:57.5196108+08:00;True|2021-06-25T13:56:38.9522535+08:00;True|2021-06-24T19:38:32.8766933+08:00;True|2021-06-24T18:26:35.6118833+08:00;True|2021-06-24T18:02:52.8136877+08:00;True|2021-06-24T17:48:49.5851948+08:00;True|2021-06-24T17:45:46.7527572+08:00;True|2021-06-24T15:05:20.1592723+08:00;True|2021-06-23T16:18:15.6814625+08:00;True|2021-06-23T16:05:24.6112343+08:00;True|2021-06-23T15:14:08.2489658+08:00;True|2021-06-23T13:52:58.6029788+08:00;True|2021-06-22T16:11:20.4726923+08:00;True|2021-06-22T16:04:53.7231389+08:00;True|2021-06-22T15:50:59.2583262+08:00;True|2021-06-22T15:38:15.3016140+08:00;True|2021-06-22T15:34:42.9185543+08:00;True|2021-06-22T15:21:55.1419108+08:00;True|2021-06-22T15:07:21.5357494+08:00;True|2021-06-22T15:03:35.0535733+08:00;True|2021-06-22T14:54:47.8802969+08:00;True|2021-06-22T11:19:38.7303011+08:00;True|2021-06-22T08:53:49.2882695+08:00;True|2021-06-22T08:47:54.8286530+08:00;True|2021-06-21T16:27:19.3017700+08:00;True|2021-06-21T15:32:28.7237952+08:00;True|2021-06-21T12:34:02.6329555+08:00;True|2021-06-21T12:24:17.5427495+08:00;True|2021-06-21T10:47:30.6423502+08:00;True|2021-06-21T08:43:20.3026558+08:00;True|2021-06-19T15:10:06.8335499+08:00;True|2021-06-18T15:37:29.5009930+08:00;True|2021-06-18T13:46:35.6283432+08:00;True|2021-06-18T10:00:37.1474954+08:00;True|2021-06-18T09:55:21.8551780+08:00;True|2021-06-18T09:22:27.8432927+08:00;True|2021-06-17T11:17:43.2166430+08:00;True|2021-06-17T09:24:09.8350403+08:00;True|2021-06-16T16:10:47.8564888+08:00;True|2021-06-16T16:04:09.8286582+08:00;True|2021-06-16T15:12:29.9427169+08:00;True|2021-06-16T14:58:45.6801892+08:00;True|2021-06-16T14:46:01.6873221+08:00;True|2021-06-16T11:02:06.1272477+08:00;True|2021-06-16T09:33:56.0223915+08:00;True|2021-06-16T08:50:07.6995413+08:00;True|2021-06-16T08:28:38.7692635+08:00;True|2021-06-16T01:04:19.6282474+08:00;True|2021-06-16T01:03:50.5058323+08:00;False|2021-06-16T01:02:15.3819672+08:00;False|2021-06-16T01:01:38.6171098+08:00;True|2021-06-16T00:34:54.9902044+08:00;True|2021-06-15T23:55:36.2003828+08:00;True|2021-06-15T22:47:17.2192750+08:00;True|2021-06-15T22:42:41.1512585+08:00;True|2021-06-15T22:38:01.7390462+08:00;True|2021-06-15T22:14:11.2060782+08:00;True|2021-06-15T22:12:27.0615357+08:00;True|2021-06-15T22:07:59.9280871+08:00;True|2021-06-15T22:04:21.5051427+08:00;True|2021-06-15T21:25:55.0099814+08:00;True|2021-06-15T19:13:51.3494172+08:00;True|2021-06-15T19:02:17.6844742+08:00;True|2021-06-15T18:47:37.1629411+08:00;False|2021-06-15T18:47:11.0828111+08:00;True|2021-06-15T18:38:26.6620668+08:00;True|2021-06-15T18:33:45.2069831+08:00;True|2021-06-15T18:24:52.0550838+08:00;True|2021-06-15T18:19:43.6999796+08:00;True|2021-06-15T18:08:17.2464506+08:00;True|2021-06-15T18:03:51.3952624+08:00;True|2021-06-15T18:01:20.6141766+08:00;True|2021-06-15T17:59:04.4479416+08:00;True|2021-06-15T17:41:44.6389379+08:00;True|2021-06-15T17:39:03.1565124+08:00;True|2021-06-15T17:34:41.0634638+08:00;True|2021-06-15T17:33:50.4853178+08:00;True|2021-06-15T17:25:38.5914037+08:00;True|2021-06-15T17:22:21.3611360+08:00;True|2021-06-15T17:16:49.4970813+08:00;True|2021-06-15T17:05:28.9389484+08:00;True|2021-06-15T16:52:54.6372199+08:00;True|2021-06-15T16:51:23.9081030+08:00;True|2021-06-15T16:45:40.6017997+08:00;True|2021-06-15T16:41:05.0218887+08:00;True|2021-06-15T16:38:02.8541862+08:00;True|2021-06-15T16:22:10.3118721+08:00;True|2021-06-15T16:12:11.1552506+08:00;True|2021-06-15T15:33:42.0100494+08:00;True|2021-06-15T15:28:39.7145659+08:00;True|2021-06-15T15:15:02.7939125+08:00;True|2021-06-15T14:49:14.2300396+08:00;True|2021-06-15T14:42:28.1198064+08:00;True|2021-06-15T13:30:12.7997686+08:00;True|2021-06-15T13:25:37.7284670+08:00;True|2021-06-15T13:23:43.6207813+08:00;False|2021-06-15T13:23:19.4190232+08:00;True|2021-06-15T13:16:38.5062674+08:00;True|2021-06-15T13:03:31.2055635+08:00;True|2021-06-15T12:58:43.1653215+08:00;True|2021-06-15T12:39:22.8442109+08:00;True|2021-06-15T12:35:09.1288556+08:00;False|2021-06-15T12:33:50.0723143+08:00;True|2021-06-15T11:28:01.9733727+08:00;True|2021-06-15T11:26:26.6569392+08:00;True|2021-06-15T11:22:43.0366435+08:00;True|2021-06-15T11:07:50.1610580+08:00;True|2021-06-15T10:32:59.1925931+08:00;True|2021-06-10T17:16:57.9552310+08:00;True|2021-06-10T16:44:42.2731836+08:00;True|2021-06-10T14:39:27.6745737+08:00;True|2021-06-10T12:15:05.1524413+08:00;True|2021-06-09T18:19:24.1005606+08:00;True|2021-06-09T17:56:09.5646288+08:00;True|2021-06-09T13:34:06.1882292+08:00;True|2021-06-09T13:29:54.5924933+08:00;True|2021-06-09T13:25:55.7520662+08:00;True|2021-06-09T13:07:47.6686811+08:00;True|2021-06-09T12:59:41.2595048+08:00;True|2021-06-09T12:45:27.1305548+08:00;True|2021-06-09T12:29:52.1418191+08:00;True|2021-06-09T12:24:12.7610588+08:00;True|2021-06-09T11:31:25.3409568+08:00;True|2021-06-09T09:57:44.4387175+08:00;True|2021-06-09T09:54:26.5161307+08:00;True|2021-06-09T09:14:14.7288045+08:00;True|2021-06-09T09:10:25.1812139+08:00;True|2021-06-09T08:46:21.6585123+08:00;True|2021-06-08T19:56:55.7192062+08:00;True|2021-06-08T19:52:59.0326821+08:00;True|2021-06-08T19:49:13.6274217+08:00;True|2021-06-08T19:09:22.1038939+08:00;True|2021-06-08T15:28:41.3716247+08:00;True|2021-06-08T15:26:47.2621178+08:00;True|2021-06-08T13:49:45.8936617+08:00;True|2021-06-08T13:43:18.8115502+08:00;True|2021-06-08T10:04:06.2200731+08:00;True|2021-06-08T09:17:10.0470792+08:00;True|2021-06-08T08:44:37.4395849+08:00;True|2021-06-08T00:01:09.3745613+08:00;True|2021-06-07T23:49:31.5196888+08:00;True|2021-06-07T23:41:00.8017855+08:00;True|2021-06-07T23:21:53.1371134+08:00;True|2021-06-07T23:01:27.5712153+08:00;True|2021-06-07T22:36:12.9274014+08:00;True|2021-06-07T22:23:00.6545134+08:00;True|2021-06-07T17:44:47.5686346+08:00;True|2021-06-07T17:17:01.3431233+08:00;True|2021-06-07T16:53:28.9989587+08:00;True|2021-06-07T16:41:10.4975607+08:00;True|2021-06-07T14:21:06.8176477+08:00;True|2021-06-07T14:10:39.0355659+08:00;True|2021-06-07T12:34:31.4562732+08:00;True|2021-06-07T12:28:44.9629488+08:00;True|2021-06-07T10:30:26.9387988+08:00;True|2021-06-07T09:12:14.7658099+08:00;True|2021-06-07T08:37:19.6353792+08:00;True|2021-06-07T08:35:25.2031954+08:00;True|2021-06-05T07:07:32.0541266+08:00;True|2021-06-05T06:44:35.9475270+08:00;True|2021-06-05T06:37:27.4595197+08:00;True|2021-06-05T06:26:59.7663998+08:00;True|2021-06-05T05:43:12.8699318+08:00;True|2021-06-04T17:00:41.2426007+08:00;True|2021-06-04T16:08:03.8078072+08:00;True|2021-06-04T15:47:21.6412616+08:00;True|2021-06-04T15:21:02.4239800+08:00;True|2021-06-04T15:20:37.8641854+08:00;True|2021-06-04T13:38:51.5088395+08:00;True|2021-06-04T10:20:01.7784282+08:00;True|2021-06-04T10:13:50.3548857+08:00;True|2021-06-04T10:11:25.5017821+08:00;True|2021-06-04T10:09:51.6792228+08:00;True|2021-06-04T10:02:39.5851057+08:00;True|2021-06-04T09:30:40.4495494+08:00;True|2021-06-03T13:16:36.0317546+08:00;True|2021-06-03T13:12:47.0402047+08:00;True|2021-06-02T14:37:08.9683351+08:00;True|2021-06-02T14:10:15.7439829+08:00;True|2021-06-02T13:59:46.5841931+08:00;True|2021-06-02T13:25:18.7962660+08:00;True|2021-06-02T13:23:16.2261980+08:00;True|2021-06-01T15:37:32.2495085+08:00;True|2021-06-01T15:21:01.2856122+08:00;True|2021-06-01T15:13:36.7262365+08:00;True|2021-06-01T15:10:26.8905629+08:00;True|2021-06-01T14:56:17.5231551+08:00;True|2021-06-01T14:38:39.7895927+08:00;True|2021-06-01T14:23:12.3265287+08:00;True|2021-03-01T09:11:31.3226422+08:00;True|2021-05-26T14:54:56.9426462+08:00;True|2021-05-26T13:57:33.7780451+08:00;True|2021-05-26T13:39:02.8043358+08:00;True|2021-02-25T16:01:40.2917200+08:00;True|2021-02-25T15:49:46.6681205+08:00;True|2021-02-25T15:16:30.9372640+08:00;True|2021-05-25T13:10:21.7831921+08:00;True|2021-05-25T11:21:38.5224475+08:00;True|2021-05-25T11:12:52.0637175+08:00;True|2021-05-25T11:02:18.4164663+08:00;True|2021-05-25T10:52:06.8998521+08:00;True|2021-05-25T10:50:45.0929606+08:00;True|2021-05-25T10:45:54.1498313+08:00;True|2021-05-25T10:39:27.8602249+08:00;True|2021-05-25T10:34:49.5771162+08:00;True|2021-05-25T10:17:30.3009163+08:00;True|2021-05-25T10:14:03.8512581+08:00;True|2021-05-25T10:05:33.4343836+08:00;True|2021-05-24T17:01:23.3221168+08:00;True|2021-05-24T10:11:24.0197347+08:00;False|2021-05-24T10:11:07.6338995+08:00;</History>
+ <History>True|2022-04-19T11:13:40.8312746Z;True|2022-04-19T15:40:16.0022040+08:00;True|2022-04-19T15:13:32.9767736+08:00;False|2022-04-19T15:08:33.6507639+08:00;True|2022-04-19T15:02:51.9580210+08:00;True|2022-04-19T13:54:18.7579131+08:00;True|2022-04-12T10:36:02.1779173+08:00;True|2022-04-12T10:05:31.0222037+08:00;True|2022-04-12T09:47:49.3724819+08:00;True|2022-04-09T15:08:54.5697468+08:00;True|2022-04-08T17:31:31.0046258+08:00;True|2022-04-08T16:50:41.3018422+08:00;True|2022-04-08T10:35:36.5029980+08:00;True|2022-03-31T09:38:37.3646053+08:00;True|2022-03-29T13:57:45.4410942+08:00;True|2022-03-10T18:59:23.7994337+08:00;True|2022-03-10T18:52:39.5019082+08:00;True|2022-03-10T18:51:12.7949284+08:00;True|2022-03-10T18:50:47.2024177+08:00;True|2022-03-10T18:45:08.8409380+08:00;True|2022-03-10T18:41:17.0102564+08:00;True|2022-03-10T18:35:49.0742353+08:00;True|2022-03-10T17:57:47.4196965+08:00;True|2022-03-10T17:34:27.5723245+08:00;True|2022-03-10T16:13:59.3829164+08:00;True|2022-03-09T14:50:49.1222033+08:00;True|2022-03-09T11:21:03.0073651+08:00;False|2022-03-09T11:16:56.1792896+08:00;False|2022-03-09T11:16:49.7923320+08:00;True|2022-03-08T15:47:47.4722336+08:00;True|2022-03-08T15:47:28.5397115+08:00;True|2022-03-08T15:37:08.7379870+08:00;True|2022-03-02T17:37:54.4659976+08:00;True|2022-03-02T17:34:12.2949726+08:00;True|2022-03-02T17:26:38.7070673+08:00;True|2022-03-02T17:07:49.7024316+08:00;True|2022-03-02T17:05:22.4177336+08:00;True|2022-03-02T16:14:57.9880587+08:00;True|2022-03-01T17:52:52.6766959+08:00;True|2022-02-28T14:36:22.6449303+08:00;True|2022-02-24T15:43:36.8244163+08:00;True|2022-02-23T17:57:14.3693224+08:00;True|2022-02-23T17:46:42.1078183+08:00;False|2022-02-23T17:41:06.5886724+08:00;True|2022-02-23T16:59:45.5533581+08:00;True|2022-02-23T16:57:43.3328895+08:00;True|2022-02-21T09:09:37.2601134+08:00;True|2022-02-21T09:03:32.4071009+08:00;True|2022-02-21T08:59:59.0172082+08:00;True|2022-02-18T14:05:39.1358825+08:00;True|2022-02-18T10:23:02.4391239+08:00;True|2022-02-18T10:21:31.0559267+08:00;True|2022-02-17T16:50:11.7192509+08:00;True|2022-02-17T13:19:13.7697894+08:00;True|2022-02-11T10:36:12.7757100+08:00;True|2022-02-10T10:54:25.2685040+08:00;True|2022-02-10T10:37:02.1034768+08:00;True|2022-02-09T17:32:45.6511283+08:00;True|2022-02-09T17:24:32.5115193+08:00;True|2022-02-09T17:00:24.0662114+08:00;True|2022-02-09T16:56:42.3364622+08:00;True|2022-02-09T14:17:25.8688855+08:00;True|2022-02-09T14:11:51.6149822+08:00;True|2022-02-07T23:29:26.2842648+08:00;True|2022-02-07T23:28:58.8242274+08:00;False|2022-02-07T23:25:29.0647793+08:00;True|2022-02-07T13:06:37.5515985+08:00;True|2022-02-07T12:42:19.5220491+08:00;True|2022-02-07T09:52:59.6728595+08:00;True|2022-02-01T11:32:10.5831557+08:00;True|2022-01-29T14:09:02.9178986+08:00;True|2022-01-28T12:01:45.1416438+08:00;True|2022-01-28T11:03:41.6361866+08:00;True|2022-01-28T10:44:53.5367862+08:00;True|2022-01-28T10:40:41.6697563+08:00;True|2022-01-28T10:25:56.7093616+08:00;True|2022-01-28T09:58:13.0733060+08:00;True|2022-01-27T09:26:29.6568807+08:00;True|2022-01-27T00:47:57.9102528+08:00;True|2022-01-27T00:46:52.8845001+08:00;True|2022-01-27T00:36:34.5330938+08:00;True|2022-01-27T00:35:19.5439329+08:00;True|2022-01-27T00:33:38.5701950+08:00;True|2022-01-27T00:32:00.9028982+08:00;True|2022-01-27T00:30:13.2390921+08:00;True|2022-01-27T00:28:23.2989144+08:00;True|2022-01-27T00:16:01.3789455+08:00;True|2022-01-27T00:09:58.8112352+08:00;True|2022-01-27T00:00:40.8353538+08:00;True|2022-01-26T23:37:50.9494735+08:00;True|2022-01-26T23:29:39.8647473+08:00;True|2022-01-26T23:20:49.3274392+08:00;True|2022-01-26T23:15:53.7037293+08:00;True|2022-01-26T23:06:28.8595953+08:00;True|2022-01-26T23:02:12.9882299+08:00;True|2022-01-26T22:55:33.2535730+08:00;True|2022-01-26T22:51:01.8427947+08:00;True|2022-01-26T22:47:44.0715387+08:00;True|2022-01-26T22:20:21.7217039+08:00;True|2022-01-26T22:13:39.5372069+08:00;True|2022-01-26T22:01:31.2113177+08:00;True|2022-01-26T21:55:26.5478921+08:00;True|2022-01-26T21:50:18.2700369+08:00;True|2022-01-26T21:48:52.0020233+08:00;True|2022-01-26T19:19:29.4530523+08:00;True|2022-01-26T19:07:21.6474231+08:00;True|2022-01-26T18:25:42.2933291+08:00;True|2022-01-26T12:39:02.0149050+08:00;True|2022-01-26T12:13:43.9149452+08:00;True|2022-01-26T11:24:33.5742248+08:00;True|2022-01-26T08:51:10.8105076+08:00;True|2022-01-25T21:07:32.9069261+08:00;True|2022-01-24T01:35:12.3309466+08:00;True|2022-01-23T23:19:15.9702821+08:00;True|2022-01-23T21:50:41.6903353+08:00;True|2022-01-23T21:25:57.6084267+08:00;True|2022-01-23T21:16:10.1516535+08:00;True|2022-01-23T20:52:08.3745284+08:00;True|2022-01-23T18:19:32.2386502+08:00;True|2022-01-23T18:11:42.0830325+08:00;True|2022-01-23T18:00:01.3239547+08:00;True|2022-01-23T12:18:48.2466943+08:00;True|2022-01-22T00:48:50.4531647+08:00;True|2022-01-21T13:10:32.8173598+08:00;True|2022-01-21T13:04:01.6388059+08:00;True|2022-01-21T12:51:40.5304103+08:00;True|2022-01-21T12:44:06.3059885+08:00;True|2022-01-21T12:34:33.9314010+08:00;True|2022-01-21T11:39:20.1088577+08:00;True|2022-01-20T11:33:49.0516846+08:00;True|2022-01-20T10:02:12.0295471+08:00;True|2022-01-20T10:02:03.3535503+08:00;True|2022-01-19T23:56:18.7293193+08:00;True|2022-01-19T22:30:14.6986228+08:00;True|2022-01-19T22:15:08.8608795+08:00;True|2022-01-19T21:57:55.2295030+08:00;True|2022-01-19T13:50:37.8588759+08:00;True|2022-01-19T13:42:52.9761531+08:00;True|2022-01-19T00:26:36.9722917+08:00;True|2022-01-19T00:15:30.8583143+08:00;True|2022-01-18T21:19:30.6193048+08:00;True|2022-01-18T21:12:07.1453825+08:00;True|2022-01-18T20:35:27.3779956+08:00;True|2022-01-18T17:44:45.2318570+08:00;True|2022-01-18T14:45:29.0299640+08:00;True|2022-01-17T22:23:20.8214203+08:00;True|2022-01-17T21:49:15.7740045+08:00;True|2022-01-17T21:47:24.6997598+08:00;True|2022-01-17T21:44:00.1942787+08:00;True|2022-01-17T21:43:15.5992687+08:00;True|2022-01-17T21:33:16.8034756+08:00;True|2022-01-17T21:25:39.9909343+08:00;True|2022-01-17T21:13:03.9659338+08:00;True|2022-01-17T20:32:14.8869091+08:00;True|2022-01-17T19:01:46.5753686+08:00;True|2022-01-17T18:31:24.1032169+08:00;True|2022-01-17T18:21:39.2918684+08:00;True|2022-01-17T18:12:07.4859038+08:00;True|2022-01-17T18:09:26.6989718+08:00;True|2022-01-17T18:04:36.7564997+08:00;True|2022-01-17T17:57:44.7814863+08:00;True|2022-01-17T17:51:50.1516107+08:00;True|2022-01-17T17:39:29.2918799+08:00;True|2022-01-17T14:55:21.5859341+08:00;True|2022-01-17T14:38:06.5091500+08:00;True|2022-01-17T14:30:25.5378436+08:00;True|2022-01-16T19:15:24.5874858+08:00;True|2022-01-16T19:07:49.0613424+08:00;True|2022-01-16T16:10:47.3112741+08:00;False|2022-01-14T19:09:41.9296709+08:00;False|2022-01-14T18:56:11.0569808+08:00;False|2022-01-14T18:28:20.1376762+08:00;False|2022-01-14T18:27:30.8678130+08:00;False|2022-01-14T18:22:45.4436504+08:00;False|2022-01-14T18:19:37.0374753+08:00;False|2022-01-14T18:18:48.5868254+08:00;False|2022-01-14T18:14:02.5810257+08:00;False|2022-01-14T18:09:51.1730754+08:00;False|2022-01-14T18:09:17.8940754+08:00;True|2022-01-13T20:08:16.2937608+08:00;True|2022-01-13T20:07:30.1505466+08:00;True|2022-01-13T13:39:42.0146294+08:00;True|2022-01-13T13:38:07.5062471+08:00;True|2022-01-13T11:29:49.3751232+08:00;True|2022-01-13T11:05:43.9574142+08:00;True|2022-01-13T10:33:23.1921058+08:00;True|2022-01-12T20:38:16.9165651+08:00;True|2022-01-12T20:24:46.3779264+08:00;True|2022-01-12T20:03:06.5030626+08:00;True|2022-01-12T19:44:55.4294326+08:00;True|2022-01-12T12:58:45.9548600+08:00;True|2022-01-12T11:28:44.7797749+08:00;True|2022-01-11T18:07:30.9151356+08:00;True|2022-01-11T15:06:32.7301609+08:00;True|2022-01-11T09:27:00.1766442+08:00;True|2021-12-30T14:41:56.8541015+08:00;True|2021-12-30T13:45:00.6130694+08:00;True|2021-12-30T13:44:18.7370780+08:00;True|2021-12-30T13:36:52.8171136+08:00;True|2021-12-28T19:14:22.5979649+08:00;True|2021-12-28T13:13:39.3543252+08:00;True|2021-12-27T15:31:26.6037782+08:00;True|2021-12-27T15:28:54.4824480+08:00;True|2021-12-27T15:22:47.8436108+08:00;True|2021-12-27T15:04:37.0711590+08:00;True|2021-12-27T15:03:52.0932499+08:00;True|2021-12-27T15:03:33.0172733+08:00;True|2021-12-27T13:28:27.4252747+08:00;True|2021-12-25T19:38:33.6784042+08:00;True|2021-12-24T20:47:43.3471563+08:00;True|2021-12-24T20:14:57.6946814+08:00;True|2021-12-24T19:55:21.1843105+08:00;True|2021-12-24T19:49:54.6719726+08:00;True|2021-12-24T19:38:14.1180741+08:00;True|2021-12-22T13:51:37.1082523+08:00;True|2021-12-21T15:38:59.8015096+08:00;True|2021-12-21T15:29:54.8095063+08:00;False|2021-12-21T15:29:21.7006531+08:00;False|2021-12-21T15:16:18.2218025+08:00;False|2021-12-21T15:11:38.1215841+08:00;False|2021-12-21T15:08:27.0590078+08:00;True|2021-12-10T14:12:36.4065298+08:00;True|2021-12-10T13:54:03.4921778+08:00;True|2021-12-10T13:25:49.0439086+08:00;True|2021-12-10T13:19:58.9494477+08:00;True|2021-12-10T13:10:45.3929017+08:00;True|2021-12-10T11:06:53.2416794+08:00;True|2021-12-07T17:23:28.9380484+08:00;True|2021-12-07T17:13:52.4384814+08:00;True|2021-12-07T16:39:49.2020208+08:00;True|2021-12-07T15:18:20.9024533+08:00;True|2021-12-07T15:07:35.4428035+08:00;True|2021-12-07T15:01:02.0445043+08:00;True|2021-12-07T14:50:08.9019705+08:00;True|2021-12-07T14:34:50.4993666+08:00;False|2021-12-07T14:32:56.0408332+08:00;True|2021-12-06T17:11:41.4004606+08:00;True|2021-12-06T16:48:07.6029757+08:00;True|2021-12-06T13:46:35.9437718+08:00;True|2021-12-06T13:45:07.6622615+08:00;True|2021-12-06T11:25:04.3483155+08:00;True|2021-12-06T11:18:24.5804187+08:00;True|2021-11-22T16:27:05.4241947+08:00;True|2021-11-22T13:40:17.6768280+08:00;True|2021-11-19T16:15:19.9085104+08:00;True|2021-11-09T10:34:21.1623512+08:00;True|2021-11-07T16:57:59.7380254+08:00;True|2021-11-07T16:53:47.4198852+08:00;True|2021-11-07T16:42:05.5096826+08:00;True|2021-11-07T16:37:21.0729013+08:00;True|2021-11-05T20:51:17.6170717+08:00;True|2021-11-05T20:35:14.6250333+08:00;True|2021-11-05T19:30:19.8374158+08:00;True|2021-11-05T19:22:46.2276569+08:00;True|2021-11-05T19:20:30.8253213+08:00;True|2021-11-05T19:16:45.7553310+08:00;True|2021-11-05T19:16:00.4532689+08:00;True|2021-11-05T19:12:25.9022478+08:00;False|2021-11-05T19:11:26.5753529+08:00;True|2021-11-05T19:09:30.0085433+08:00;True|2021-11-05T18:48:19.9395153+08:00;True|2021-11-05T18:45:34.3437897+08:00;True|2021-11-05T18:43:43.4558159+08:00;True|2021-11-05T18:40:40.9948500+08:00;True|2021-11-05T18:34:18.4440455+08:00;True|2021-11-05T15:54:51.6037132+08:00;True|2021-10-28T16:27:53.9728270+08:00;True|2021-10-28T16:03:59.5629998+08:00;True|2021-10-28T08:51:04.2549186+08:00;True|2021-10-27T15:14:53.5506098+08:00;True|2021-10-27T15:00:44.9100320+08:00;True|2021-10-27T13:14:46.7921647+08:00;True|2021-10-27T11:24:49.4550753+08:00;True|2021-10-27T10:10:10.3545125+08:00;True|2021-10-27T10:02:24.9248610+08:00;True|2021-10-27T09:59:40.3795897+08:00;True|2021-10-27T09:56:30.6629207+08:00;True|2021-10-27T09:10:48.3883432+08:00;True|2021-10-27T09:03:31.9191991+08:00;True|2021-10-27T08:59:59.7651159+08:00;True|2021-10-27T08:36:11.8620997+08:00;True|2021-10-27T08:26:40.2533014+08:00;True|2021-10-26T09:19:35.5674748+08:00;True|2021-10-26T09:17:17.6900747+08:00;True|2021-10-26T09:14:32.3999220+08:00;True|2021-10-25T15:08:21.2581763+08:00;True|2021-10-25T10:01:57.8524903+08:00;True|2021-10-25T09:28:51.6294879+08:00;True|2021-10-25T09:25:50.3373336+08:00;True|2021-10-25T09:23:37.0203978+08:00;True|2021-10-25T09:18:23.3380608+08:00;True|2021-10-25T09:15:10.5292071+08:00;True|2021-10-25T08:56:30.4632027+08:00;True|2021-10-25T08:50:11.4697392+08:00;True|2021-10-22T13:46:49.7207066+08:00;True|2021-10-22T10:06:33.3130089+08:00;True|2021-10-20T14:32:10.1235516+08:00;True|2021-10-20T14:16:18.6496291+08:00;True|2021-10-20T14:08:49.2443715+08:00;True|2021-10-20T14:05:14.6847950+08:00;True|2021-10-20T13:30:21.6057636+08:00;True|2021-10-20T10:55:22.2151716+08:00;True|2021-10-19T10:42:13.4198267+08:00;True|2021-10-19T10:01:41.0018108+08:00;True|2021-10-19T09:59:11.2127619+08:00;True|2021-10-19T09:54:04.8472874+08:00;True|2021-10-15T11:19:15.5327495+08:00;True|2021-10-15T11:17:41.0686485+08:00;True|2021-10-15T11:12:11.8295042+08:00;True|2021-10-15T10:33:31.5670079+08:00;True|2021-10-15T10:27:45.0815146+08:00;True|2021-10-14T14:51:28.5331025+08:00;True|2021-10-14T14:37:28.3276051+08:00;True|2021-10-14T14:23:39.0606792+08:00;True|2021-10-14T14:21:03.8140347+08:00;True|2021-10-13T10:31:10.6628977+08:00;True|2021-10-13T10:12:24.4238027+08:00;True|2021-10-13T08:47:43.9314486+08:00;True|2021-10-12T14:07:18.6065183+08:00;True|2021-10-12T10:34:10.1682362+08:00;True|2021-10-12T10:27:14.3073332+08:00;True|2021-10-12T10:22:08.0004619+08:00;True|2021-10-12T10:21:03.0275378+08:00;True|2021-10-12T10:11:54.9812692+08:00;True|2021-10-11T16:59:07.3568342+08:00;True|2021-10-11T16:53:14.2016138+08:00;True|2021-10-11T16:21:35.0133775+08:00;True|2021-10-11T15:34:19.5731935+08:00;True|2021-10-11T15:31:07.5780983+08:00;True|2021-10-11T15:06:47.1145237+08:00;True|2021-10-11T15:03:25.5000280+08:00;True|2021-10-11T10:12:57.6416898+08:00;True|2021-10-09T10:15:17.9235165+08:00;True|2021-10-09T10:13:51.3318441+08:00;True|2021-10-09T10:01:21.6661542+08:00;True|2021-10-09T09:58:41.9225837+08:00;True|2021-10-08T14:56:49.7935800+08:00;True|2021-10-08T14:35:41.4490063+08:00;True|2021-10-08T14:02:42.6990656+08:00;True|2021-09-29T15:48:55.1547397+08:00;True|2021-09-29T15:48:23.5567191+08:00;True|2021-09-27T16:17:35.7180978+08:00;True|2021-09-27T15:51:50.4240134+08:00;True|2021-09-23T20:55:27.3554447+08:00;True|2021-09-23T14:14:44.0572017+08:00;True|2021-09-23T13:51:56.2344673+08:00;True|2021-09-23T10:46:16.7417007+08:00;True|2021-09-23T10:42:23.2117537+08:00;True|2021-09-22T15:21:22.9615672+08:00;True|2021-09-22T14:23:32.7907754+08:00;True|2021-09-22T13:48:03.4780947+08:00;True|2021-09-22T11:05:24.5249356+08:00;True|2021-09-22T10:00:19.0962943+08:00;True|2021-09-22T09:30:26.2686514+08:00;True|2021-09-17T11:22:34.5692792+08:00;True|2021-09-16T16:11:27.5372277+08:00;True|2021-09-16T14:53:40.8396557+08:00;True|2021-09-16T14:32:29.7905500+08:00;True|2021-09-16T14:26:46.2224219+08:00;True|2021-09-16T10:32:24.4244440+08:00;True|2021-09-15T11:10:35.3529360+08:00;True|2021-09-15T11:08:30.0857376+08:00;True|2021-09-15T11:05:56.7191571+08:00;True|2021-09-14T01:24:39.8041136+08:00;True|2021-09-14T01:05:01.1593327+08:00;True|2021-09-14T00:44:14.7233198+08:00;True|2021-09-13T23:48:19.4506233+08:00;True|2021-09-13T20:30:31.3243872+08:00;True|2021-09-13T19:45:35.9108911+08:00;False|2021-09-13T19:44:59.2779092+08:00;True|2021-09-13T18:09:22.4994381+08:00;True|2021-09-10T14:18:27.5788854+08:00;True|2021-09-09T15:57:01.7407207+08:00;True|2021-09-09T15:49:34.2598998+08:00;True|2021-09-09T11:32:10.7853024+08:00;True|2021-09-09T11:10:48.6840025+08:00;True|2021-09-09T10:35:37.3883078+08:00;True|2021-09-07T14:11:49.8497588+08:00;True|2021-09-07T13:34:48.4693349+08:00;True|2021-09-06T14:33:48.7549675+08:00;True|2021-09-03T16:27:51.1888520+08:00;True|2021-09-03T16:19:35.9003465+08:00;True|2021-09-03T15:46:28.1828032+08:00;True|2021-09-03T15:34:21.9362871+08:00;True|2021-09-03T11:24:49.8749819+08:00;True|2021-09-03T11:21:17.8373159+08:00;True|2021-09-03T11:16:53.2208136+08:00;True|2021-09-03T11:12:23.9063804+08:00;True|2021-09-03T09:11:09.2435721+08:00;True|2021-09-02T11:16:15.1370453+08:00;True|2021-09-02T10:35:39.1171879+08:00;True|2021-09-01T10:17:09.4536285+08:00;True|2021-09-01T09:46:28.4581776+08:00;True|2021-08-31T08:54:26.8588887+08:00;True|2021-08-31T08:39:08.3685693+08:00;True|2021-08-30T17:11:56.8438985+08:00;True|2021-08-30T15:59:42.0820292+08:00;True|2021-08-30T15:45:18.1868510+08:00;True|2021-08-30T14:56:08.3958863+08:00;True|2021-08-30T14:37:11.5379830+08:00;True|2021-08-30T14:35:34.8775934+08:00;True|2021-08-30T14:24:36.5111821+08:00;True|2021-08-30T10:05:49.6945200+08:00;True|2021-08-30T10:03:28.4064538+08:00;True|2021-08-30T10:00:16.8360929+08:00;True|2021-08-30T09:56:09.4434379+08:00;True|2021-08-30T09:55:36.1725334+08:00;True|2021-08-30T09:52:04.8600054+08:00;True|2021-08-30T09:47:46.4225655+08:00;True|2021-08-30T09:45:20.4894962+08:00;False|2021-08-27T17:17:34.2646751+08:00;False|2021-08-27T16:01:21.2791979+08:00;False|2021-08-27T15:58:06.9667160+08:00;False|2021-08-27T15:38:37.4818036+08:00;False|2021-08-27T15:21:02.8863114+08:00;False|2021-08-27T15:20:28.6828668+08:00;True|2021-08-26T16:00:44.3162145+08:00;True|2021-08-26T08:57:31.3842587+08:00;True|2021-08-23T08:43:41.1549775+08:00;True|2021-08-22T09:24:12.7210871+08:00;True|2021-08-22T09:19:53.8300229+08:00;True|2021-08-20T20:00:52.0140407+08:00;True|2021-08-20T19:40:14.7712765+08:00;True|2021-08-19T17:37:54.9748049+08:00;True|2021-08-19T17:20:11.0515687+08:00;True|2021-08-19T16:12:35.4392809+08:00;True|2021-08-19T16:06:50.6204587+08:00;True|2021-08-19T16:03:53.0824286+08:00;True|2021-08-19T15:56:01.3498791+08:00;True|2021-08-19T10:18:50.8113630+08:00;True|2021-08-19T09:58:06.2784035+08:00;True|2021-08-19T09:56:54.0619777+08:00;True|2021-08-19T00:32:08.3503093+08:00;True|2021-08-19T00:11:18.3150227+08:00;True|2021-08-19T00:02:49.4827718+08:00;True|2021-08-18T23:54:45.4845900+08:00;True|2021-08-18T23:39:51.6147977+08:00;True|2021-08-18T23:16:42.7214379+08:00;True|2021-08-18T22:38:57.4681929+08:00;True|2021-08-18T21:41:58.7560707+08:00;True|2021-08-18T21:11:52.2369249+08:00;True|2021-08-18T21:01:49.5669106+08:00;True|2021-08-18T20:47:46.5352688+08:00;False|2021-08-18T20:46:36.7956141+08:00;False|2021-08-18T20:46:01.0502138+08:00;True|2021-08-18T19:39:12.8186242+08:00;False|2021-08-18T19:38:12.6839708+08:00;True|2021-08-18T19:15:51.4626694+08:00;True|2021-08-18T16:07:20.4350886+08:00;True|2021-08-18T14:29:41.7171934+08:00;True|2021-08-18T14:20:36.3647361+08:00;True|2021-08-16T09:08:58.3617662+08:00;True|2021-08-15T20:44:29.9214083+08:00;True|2021-08-15T20:36:17.0958549+08:00;True|2021-08-15T20:29:34.3879773+08:00;True|2021-08-15T20:23:47.4052038+08:00;True|2021-08-15T15:01:19.7830862+08:00;True|2021-08-15T12:15:18.3433782+08:00;True|2021-08-13T20:59:11.3947130+08:00;True|2021-08-06T22:49:09.9538339+08:00;True|2021-08-06T22:35:19.0418168+08:00;True|2021-08-06T20:29:47.4241975+08:00;True|2021-08-06T14:08:16.4791827+08:00;True|2021-08-06T13:59:28.9874611+08:00;True|2021-08-06T13:57:34.3723977+08:00;True|2021-08-06T13:36:03.4816652+08:00;True|2021-08-06T12:22:52.5055221+08:00;True|2021-08-06T09:31:58.1272499+08:00;True|2021-08-06T09:26:51.6310039+08:00;True|2021-08-06T09:24:22.2899244+08:00;True|2021-08-06T09:06:30.6477912+08:00;True|2021-08-06T09:00:55.5101612+08:00;True|2021-08-06T08:49:59.9616490+08:00;True|2021-08-06T08:45:18.8586902+08:00;True|2021-08-05T20:09:25.8861998+08:00;True|2021-08-04T19:14:27.2396953+08:00;True|2021-08-04T19:11:47.5849093+08:00;True|2021-08-04T16:42:54.0149043+08:00;True|2021-08-04T15:02:11.5056561+08:00;True|2021-08-04T14:58:37.1435509+08:00;True|2021-08-04T14:55:34.7380132+08:00;True|2021-08-04T14:47:42.5933921+08:00;True|2021-08-04T14:45:17.9911874+08:00;True|2021-08-04T13:52:20.9601351+08:00;True|2021-08-04T09:48:28.8796992+08:00;True|2021-08-03T18:14:13.1894998+08:00;True|2021-08-03T17:45:35.1349721+08:00;True|2021-08-03T17:21:52.6028977+08:00;True|2021-08-03T17:20:35.4423020+08:00;True|2021-08-03T17:03:33.1667669+08:00;True|2021-08-03T17:01:54.2656787+08:00;True|2021-08-03T17:00:22.2778374+08:00;True|2021-08-03T16:56:58.8902582+08:00;True|2021-08-03T15:02:21.8601533+08:00;True|2021-08-03T14:57:34.0186758+08:00;True|2021-08-03T14:28:47.2242515+08:00;True|2021-08-03T14:22:22.4554236+08:00;True|2021-08-03T14:21:51.1339715+08:00;True|2021-08-03T13:37:33.9697131+08:00;True|2021-08-03T13:28:29.7591095+08:00;True|2021-08-03T11:35:09.5118324+08:00;True|2021-08-03T11:11:23.3051573+08:00;True|2021-08-02T13:14:42.3663755+08:00;True|2021-07-30T22:50:19.9749878+08:00;True|2021-07-30T22:49:31.2150970+08:00;True|2021-07-28T19:12:05.8381075+08:00;True|2021-07-28T18:59:45.4808797+08:00;True|2021-07-28T18:15:58.8301509+08:00;True|2021-07-28T18:04:54.8613546+08:00;True|2021-07-28T17:53:48.6225611+08:00;True|2021-07-28T17:42:50.9171563+08:00;True|2021-07-28T17:17:16.3137677+08:00;True|2021-07-28T17:11:46.8925200+08:00;True|2021-07-28T16:28:27.6823943+08:00;True|2021-07-28T16:23:00.3385836+08:00;True|2021-07-28T09:57:55.4237411+08:00;True|2021-07-28T08:38:29.6691541+08:00;True|2021-07-27T23:16:32.0331671+08:00;True|2021-07-27T23:06:08.1947249+08:00;True|2021-07-27T23:05:58.4619176+08:00;True|2021-07-27T18:42:09.5358261+08:00;True|2021-07-27T18:30:04.8532823+08:00;True|2021-07-27T18:29:43.5775092+08:00;True|2021-07-27T15:16:49.8356224+08:00;True|2021-07-27T15:05:27.8453220+08:00;True|2021-07-27T14:59:15.9519440+08:00;True|2021-07-27T09:23:32.6111337+08:00;True|2021-07-27T08:27:41.6395353+08:00;True|2021-07-27T08:25:56.7378296+08:00;True|2021-07-26T11:18:46.0856966+08:00;True|2021-07-26T11:18:02.0751924+08:00;True|2021-07-26T11:13:49.6285395+08:00;True|2021-07-21T21:08:25.9898902+08:00;True|2021-07-21T20:09:26.2258104+08:00;True|2021-07-13T16:17:25.8407435+08:00;True|2021-07-13T13:46:13.4309531+08:00;True|2021-07-13T12:29:04.5082461+08:00;True|2021-06-29T13:55:01.6864637+08:00;True|2021-06-29T10:38:52.2206472+08:00;True|2021-06-29T10:10:13.1540749+08:00;True|2021-06-28T14:37:56.3853273+08:00;False|2021-06-28T14:36:57.5726124+08:00;True|2021-06-25T14:17:57.5196108+08:00;True|2021-06-25T13:56:38.9522535+08:00;True|2021-06-24T19:38:32.8766933+08:00;True|2021-06-24T18:26:35.6118833+08:00;True|2021-06-24T18:02:52.8136877+08:00;True|2021-06-24T17:48:49.5851948+08:00;True|2021-06-24T17:45:46.7527572+08:00;True|2021-06-24T15:05:20.1592723+08:00;True|2021-06-23T16:18:15.6814625+08:00;True|2021-06-23T16:05:24.6112343+08:00;True|2021-06-23T15:14:08.2489658+08:00;True|2021-06-23T13:52:58.6029788+08:00;True|2021-06-22T16:11:20.4726923+08:00;True|2021-06-22T16:04:53.7231389+08:00;True|2021-06-22T15:50:59.2583262+08:00;True|2021-06-22T15:38:15.3016140+08:00;True|2021-06-22T15:34:42.9185543+08:00;True|2021-06-22T15:21:55.1419108+08:00;True|2021-06-22T15:07:21.5357494+08:00;True|2021-06-22T15:03:35.0535733+08:00;True|2021-06-22T14:54:47.8802969+08:00;True|2021-06-22T11:19:38.7303011+08:00;True|2021-06-22T08:53:49.2882695+08:00;True|2021-06-22T08:47:54.8286530+08:00;True|2021-06-21T16:27:19.3017700+08:00;True|2021-06-21T15:32:28.7237952+08:00;True|2021-06-21T12:34:02.6329555+08:00;True|2021-06-21T12:24:17.5427495+08:00;True|2021-06-21T10:47:30.6423502+08:00;True|2021-06-21T08:43:20.3026558+08:00;True|2021-06-19T15:10:06.8335499+08:00;True|2021-06-18T15:37:29.5009930+08:00;True|2021-06-18T13:46:35.6283432+08:00;True|2021-06-18T10:00:37.1474954+08:00;True|2021-06-18T09:55:21.8551780+08:00;True|2021-06-18T09:22:27.8432927+08:00;True|2021-06-17T11:17:43.2166430+08:00;True|2021-06-17T09:24:09.8350403+08:00;True|2021-06-16T16:10:47.8564888+08:00;True|2021-06-16T16:04:09.8286582+08:00;True|2021-06-16T15:12:29.9427169+08:00;True|2021-06-16T14:58:45.6801892+08:00;True|2021-06-16T14:46:01.6873221+08:00;True|2021-06-16T11:02:06.1272477+08:00;True|2021-06-16T09:33:56.0223915+08:00;True|2021-06-16T08:50:07.6995413+08:00;True|2021-06-16T08:28:38.7692635+08:00;True|2021-06-16T01:04:19.6282474+08:00;True|2021-06-16T01:03:50.5058323+08:00;False|2021-06-16T01:02:15.3819672+08:00;False|2021-06-16T01:01:38.6171098+08:00;True|2021-06-16T00:34:54.9902044+08:00;True|2021-06-15T23:55:36.2003828+08:00;True|2021-06-15T22:47:17.2192750+08:00;True|2021-06-15T22:42:41.1512585+08:00;True|2021-06-15T22:38:01.7390462+08:00;True|2021-06-15T22:14:11.2060782+08:00;True|2021-06-15T22:12:27.0615357+08:00;True|2021-06-15T22:07:59.9280871+08:00;True|2021-06-15T22:04:21.5051427+08:00;True|2021-06-15T21:25:55.0099814+08:00;True|2021-06-15T19:13:51.3494172+08:00;True|2021-06-15T19:02:17.6844742+08:00;True|2021-06-15T18:47:37.1629411+08:00;False|2021-06-15T18:47:11.0828111+08:00;True|2021-06-15T18:38:26.6620668+08:00;True|2021-06-15T18:33:45.2069831+08:00;True|2021-06-15T18:24:52.0550838+08:00;True|2021-06-15T18:19:43.6999796+08:00;True|2021-06-15T18:08:17.2464506+08:00;True|2021-06-15T18:03:51.3952624+08:00;True|2021-06-15T18:01:20.6141766+08:00;True|2021-06-15T17:59:04.4479416+08:00;True|2021-06-15T17:41:44.6389379+08:00;True|2021-06-15T17:39:03.1565124+08:00;True|2021-06-15T17:34:41.0634638+08:00;True|2021-06-15T17:33:50.4853178+08:00;True|2021-06-15T17:25:38.5914037+08:00;True|2021-06-15T17:22:21.3611360+08:00;True|2021-06-15T17:16:49.4970813+08:00;True|2021-06-15T17:05:28.9389484+08:00;True|2021-06-15T16:52:54.6372199+08:00;True|2021-06-15T16:51:23.9081030+08:00;True|2021-06-15T16:45:40.6017997+08:00;True|2021-06-15T16:41:05.0218887+08:00;True|2021-06-15T16:38:02.8541862+08:00;True|2021-06-15T16:22:10.3118721+08:00;True|2021-06-15T16:12:11.1552506+08:00;True|2021-06-15T15:33:42.0100494+08:00;True|2021-06-15T15:28:39.7145659+08:00;True|2021-06-15T15:15:02.7939125+08:00;True|2021-06-15T14:49:14.2300396+08:00;True|2021-06-15T14:42:28.1198064+08:00;True|2021-06-15T13:30:12.7997686+08:00;True|2021-06-15T13:25:37.7284670+08:00;True|2021-06-15T13:23:43.6207813+08:00;False|2021-06-15T13:23:19.4190232+08:00;True|2021-06-15T13:16:38.5062674+08:00;True|2021-06-15T13:03:31.2055635+08:00;True|2021-06-15T12:58:43.1653215+08:00;True|2021-06-15T12:39:22.8442109+08:00;True|2021-06-15T12:35:09.1288556+08:00;False|2021-06-15T12:33:50.0723143+08:00;True|2021-06-15T11:28:01.9733727+08:00;True|2021-06-15T11:26:26.6569392+08:00;True|2021-06-15T11:22:43.0366435+08:00;True|2021-06-15T11:07:50.1610580+08:00;True|2021-06-15T10:32:59.1925931+08:00;True|2021-06-10T17:16:57.9552310+08:00;True|2021-06-10T16:44:42.2731836+08:00;True|2021-06-10T14:39:27.6745737+08:00;True|2021-06-10T12:15:05.1524413+08:00;True|2021-06-09T18:19:24.1005606+08:00;True|2021-06-09T17:56:09.5646288+08:00;True|2021-06-09T13:34:06.1882292+08:00;True|2021-06-09T13:29:54.5924933+08:00;True|2021-06-09T13:25:55.7520662+08:00;True|2021-06-09T13:07:47.6686811+08:00;True|2021-06-09T12:59:41.2595048+08:00;True|2021-06-09T12:45:27.1305548+08:00;True|2021-06-09T12:29:52.1418191+08:00;True|2021-06-09T12:24:12.7610588+08:00;True|2021-06-09T11:31:25.3409568+08:00;True|2021-06-09T09:57:44.4387175+08:00;True|2021-06-09T09:54:26.5161307+08:00;True|2021-06-09T09:14:14.7288045+08:00;True|2021-06-09T09:10:25.1812139+08:00;True|2021-06-09T08:46:21.6585123+08:00;True|2021-06-08T19:56:55.7192062+08:00;True|2021-06-08T19:52:59.0326821+08:00;True|2021-06-08T19:49:13.6274217+08:00;True|2021-06-08T19:09:22.1038939+08:00;True|2021-06-08T15:28:41.3716247+08:00;True|2021-06-08T15:26:47.2621178+08:00;True|2021-06-08T13:49:45.8936617+08:00;True|2021-06-08T13:43:18.8115502+08:00;True|2021-06-08T10:04:06.2200731+08:00;True|2021-06-08T09:17:10.0470792+08:00;True|2021-06-08T08:44:37.4395849+08:00;True|2021-06-08T00:01:09.3745613+08:00;True|2021-06-07T23:49:31.5196888+08:00;True|2021-06-07T23:41:00.8017855+08:00;True|2021-06-07T23:21:53.1371134+08:00;True|2021-06-07T23:01:27.5712153+08:00;True|2021-06-07T22:36:12.9274014+08:00;True|2021-06-07T22:23:00.6545134+08:00;True|2021-06-07T17:44:47.5686346+08:00;True|2021-06-07T17:17:01.3431233+08:00;True|2021-06-07T16:53:28.9989587+08:00;True|2021-06-07T16:41:10.4975607+08:00;True|2021-06-07T14:21:06.8176477+08:00;True|2021-06-07T14:10:39.0355659+08:00;True|2021-06-07T12:34:31.4562732+08:00;True|2021-06-07T12:28:44.9629488+08:00;True|2021-06-07T10:30:26.9387988+08:00;True|2021-06-07T09:12:14.7658099+08:00;True|2021-06-07T08:37:19.6353792+08:00;True|2021-06-07T08:35:25.2031954+08:00;True|2021-06-05T07:07:32.0541266+08:00;True|2021-06-05T06:44:35.9475270+08:00;True|2021-06-05T06:37:27.4595197+08:00;True|2021-06-05T06:26:59.7663998+08:00;True|2021-06-05T05:43:12.8699318+08:00;True|2021-06-04T17:00:41.2426007+08:00;True|2021-06-04T16:08:03.8078072+08:00;True|2021-06-04T15:47:21.6412616+08:00;True|2021-06-04T15:21:02.4239800+08:00;True|2021-06-04T15:20:37.8641854+08:00;True|2021-06-04T13:38:51.5088395+08:00;True|2021-06-04T10:20:01.7784282+08:00;True|2021-06-04T10:13:50.3548857+08:00;True|2021-06-04T10:11:25.5017821+08:00;True|2021-06-04T10:09:51.6792228+08:00;True|2021-06-04T10:02:39.5851057+08:00;True|2021-06-04T09:30:40.4495494+08:00;True|2021-06-03T13:16:36.0317546+08:00;True|2021-06-03T13:12:47.0402047+08:00;True|2021-06-02T14:37:08.9683351+08:00;True|2021-06-02T14:10:15.7439829+08:00;True|2021-06-02T13:59:46.5841931+08:00;True|2021-06-02T13:25:18.7962660+08:00;True|2021-06-02T13:23:16.2261980+08:00;True|2021-06-01T15:37:32.2495085+08:00;True|2021-06-01T15:21:01.2856122+08:00;True|2021-06-01T15:13:36.7262365+08:00;True|2021-06-01T15:10:26.8905629+08:00;True|2021-06-01T14:56:17.5231551+08:00;True|2021-06-01T14:38:39.7895927+08:00;True|2021-06-01T14:23:12.3265287+08:00;True|2021-03-01T09:11:31.3226422+08:00;True|2021-05-26T14:54:56.9426462+08:00;True|2021-05-26T13:57:33.7780451+08:00;True|2021-05-26T13:39:02.8043358+08:00;True|2021-02-25T16:01:40.2917200+08:00;True|2021-02-25T15:49:46.6681205+08:00;True|2021-02-25T15:16:30.9372640+08:00;True|2021-05-25T13:10:21.7831921+08:00;True|2021-05-25T11:21:38.5224475+08:00;True|2021-05-25T11:12:52.0637175+08:00;True|2021-05-25T11:02:18.4164663+08:00;True|2021-05-25T10:52:06.8998521+08:00;True|2021-05-25T10:50:45.0929606+08:00;True|2021-05-25T10:45:54.1498313+08:00;True|2021-05-25T10:39:27.8602249+08:00;True|2021-05-25T10:34:49.5771162+08:00;True|2021-05-25T10:17:30.3009163+08:00;True|2021-05-25T10:14:03.8512581+08:00;True|2021-05-25T10:05:33.4343836+08:00;True|2021-05-24T17:01:23.3221168+08:00;True|2021-05-24T10:11:24.0197347+08:00;False|2021-05-24T10:11:07.6338995+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
@@ -18,28 +18,28 @@
<publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>04/08/2022 10:35:28</publishTime>
+ <publishTime>04/19/2022 18:59:47</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>04/08/2022 10:35:28</publishTime>
+ <publishTime>04/19/2022 18:59:47</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>04/08/2022 10:35:24</publishTime>
+ <publishTime>04/19/2022 18:59:45</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>04/08/2022 10:35:24</publishTime>
+ <publishTime>04/19/2022 18:59:45</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 14:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>03/30/2022 17:10:56</publishTime>
+ <publishTime>04/19/2022 18:59:41</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>03/30/2022 17:10:56</publishTime>
+ <publishTime>04/19/2022 18:59:41</publishTime>
</File>
<File Include="bin/ICSharpCode.SharpZipLib.dll">
<publishTime>05/09/2021 01:08:30</publishTime>
@@ -69,10 +69,10 @@
<publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>03/30/2022 17:10:57</publishTime>
+ <publishTime>04/19/2022 18:59:42</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>03/30/2022 17:10:57</publishTime>
+ <publishTime>04/19/2022 18:59:42</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>08/16/2021 17:23:15</publishTime>
@@ -105,22 +105,22 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>03/30/2022 17:10:54</publishTime>
+ <publishTime>04/19/2022 18:59:39</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>03/30/2022 17:10:54</publishTime>
+ <publishTime>04/19/2022 18:59:39</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>03/30/2022 17:10:55</publishTime>
+ <publishTime>04/19/2022 18:59:40</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>03/30/2022 17:10:55</publishTime>
+ <publishTime>04/19/2022 18:59:40</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>03/30/2022 17:10:55</publishTime>
+ <publishTime>04/19/2022 18:59:40</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>03/30/2022 17:10:55</publishTime>
+ <publishTime>04/19/2022 18:59:40</publishTime>
</File>
<File Include="bin/stdole.dll">
<publishTime>05/09/2021 13:35:37</publishTime>
@@ -222,13 +222,13 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>04/12/2022 10:35:36</publishTime>
+ <publishTime>04/19/2022 18:59:52</publishTime>
</File>
<File Include="bin/WebAPI.dll.config">
<publishTime>12/15/2021 17:59:43</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>04/12/2022 10:35:36</publishTime>
+ <publishTime>04/19/2022 18:59:52</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/17/2013 17:03:52</publishTime>
@@ -411,7 +411,7 @@
<publishTime>12/20/2021 13:19:56</publishTime>
</File>
<File Include="Web.config">
- <publishTime>03/31/2022 09:38:35</publishTime>
+ <publishTime>04/19/2022 19:13:39</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index d202e5e..fbd7ae6 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -365,6 +365,7 @@
<Compile Include="Controllers\SCGL\Sc_ComplementGoodsController.cs" />
<Compile Include="Controllers\SCGL\Sc_ICBomBillController.cs" />
<Compile Include="Controllers\SCGL\Sc_JIT_ComplementGoodBillController.cs" />
+ <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_CompleteController..cs" />
<Compile Include="Controllers\SCGL\Sc_WorkBillSortBillController.cs" />
<Compile Include="Controllers\Sc_PckSplitBillController.cs" />
<Compile Include="Controllers\GZGL\Gy_DuSubsidyItemBillController.cs" />
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBillList.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBillList.cs"
index b105873..ec5b2b8 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBillList.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBillList.cs"
@@ -52,6 +52,10 @@
string sSql = "";
string sWhere = "";
+ if (chkWJieAn.Checked == true)
+ {
+ sWhere = " and HBillStatus<>3 ";
+ }
if (frmCondition.SqlStr.Trim().Length == 0)
{
@@ -202,6 +206,7 @@
oSumGrid.ogrdMain = grdMain; //鍒濆鍖� new
oSumGrid.oGridsum = grdSum;
initGrid();
+ chkWJieAn.Checked = true;
}
private void grdMain_DblClick(object sender, EventArgs e)
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBillList.designer.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBillList.designer.cs"
index 51d39ff..5835a09 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBillList.designer.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBillList.designer.cs"
@@ -47,6 +47,9 @@
this.label4 = new System.Windows.Forms.Label();
this.lblCaption = new System.Windows.Forms.Label();
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.dc = new System.Windows.Forms.ToolStripButton();
this.yc = new System.Windows.Forms.ToolStripButton();
this.dy = new System.Windows.Forms.ToolStripButton();
@@ -82,9 +85,7 @@
this.grdSum = new System.Windows.Forms.DataGridView();
this.grdSub1 = new System.Windows.Forms.DataGridView();
this.grdSumPrint = 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.chkWJieAn = new System.Windows.Forms.CheckBox();
this.pPic.SuspendLayout();
this.panel1.SuspendLayout();
this.Tool.SuspendLayout();
@@ -100,30 +101,29 @@
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.btnOK);
this.pPic.Controls.Add(this.txtHOrderProcNO);
+ this.pPic.Controls.Add(this.txtHMaterID);
+ this.pPic.Controls.Add(this.txtHLotNo);
+ this.pPic.Controls.Add(this.txtHBillNo);
+ this.pPic.Controls.Add(this.chkWJieAn);
+ this.pPic.Controls.Add(this.btnOK);
this.pPic.Controls.Add(this.label5);
this.pPic.Controls.Add(this.label3);
- this.pPic.Controls.Add(this.txtHMaterID);
this.pPic.Controls.Add(this.label2);
- this.pPic.Controls.Add(this.txtHLotNo);
this.pPic.Controls.Add(this.label1);
- this.pPic.Controls.Add(this.txtHBillNo);
this.pPic.Controls.Add(this.panel1);
this.pPic.Controls.Add(this.lblCaption);
this.pPic.Dock = System.Windows.Forms.DockStyle.Top;
- this.pPic.Location = new System.Drawing.Point(0, 62);
- this.pPic.Margin = new System.Windows.Forms.Padding(4);
+ this.pPic.Location = new System.Drawing.Point(0, 50);
this.pPic.Name = "pPic";
- this.pPic.Size = new System.Drawing.Size(1686, 66);
+ this.pPic.Size = new System.Drawing.Size(1264, 53);
this.pPic.TabIndex = 15;
//
// btnOK
//
- this.btnOK.Location = new System.Drawing.Point(1283, 17);
- this.btnOK.Margin = new System.Windows.Forms.Padding(4);
+ this.btnOK.Location = new System.Drawing.Point(885, 12);
this.btnOK.Name = "btnOK";
- this.btnOK.Size = new System.Drawing.Size(83, 30);
+ this.btnOK.Size = new System.Drawing.Size(62, 24);
this.btnOK.TabIndex = 31;
this.btnOK.Text = "蹇�熸煡璇�";
this.btnOK.UseVisualStyleBackColor = true;
@@ -131,10 +131,9 @@
//
// txtHOrderProcNO
//
- this.txtHOrderProcNO.Location = new System.Drawing.Point(555, 17);
- this.txtHOrderProcNO.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHOrderProcNO.Location = new System.Drawing.Point(339, 14);
this.txtHOrderProcNO.Name = "txtHOrderProcNO";
- this.txtHOrderProcNO.Size = new System.Drawing.Size(119, 25);
+ this.txtHOrderProcNO.Size = new System.Drawing.Size(90, 21);
this.txtHOrderProcNO.TabIndex = 27;
this.txtHOrderProcNO.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHOrderProcNO_KeyDown);
//
@@ -142,10 +141,9 @@
//
this.label5.AutoSize = true;
this.label5.BackColor = System.Drawing.Color.Transparent;
- this.label5.Location = new System.Drawing.Point(448, 17);
- this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label5.Location = new System.Drawing.Point(263, 18);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(97, 15);
+ this.label5.Size = new System.Drawing.Size(77, 12);
this.label5.TabIndex = 26;
this.label5.Text = "璁㈠崟璺熻釜鍙凤細";
//
@@ -153,19 +151,17 @@
//
this.label3.AutoSize = true;
this.label3.BackColor = System.Drawing.Color.Transparent;
- this.label3.Location = new System.Drawing.Point(682, 17);
- this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label3.Location = new System.Drawing.Point(436, 18);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(52, 15);
+ this.label3.Size = new System.Drawing.Size(53, 12);
this.label3.TabIndex = 23;
- this.label3.Text = "浜у搧锛�";
+ this.label3.Text = "浜� 鍝侊細";
//
// txtHMaterID
//
- this.txtHMaterID.Location = new System.Drawing.Point(737, 17);
- this.txtHMaterID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHMaterID.Location = new System.Drawing.Point(489, 14);
this.txtHMaterID.Name = "txtHMaterID";
- this.txtHMaterID.Size = new System.Drawing.Size(119, 25);
+ this.txtHMaterID.Size = new System.Drawing.Size(90, 21);
this.txtHMaterID.TabIndex = 22;
this.txtHMaterID.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHMaterID_KeyDown);
//
@@ -173,19 +169,17 @@
//
this.label2.AutoSize = true;
this.label2.BackColor = System.Drawing.Color.Transparent;
- this.label2.Location = new System.Drawing.Point(864, 17);
- this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label2.Location = new System.Drawing.Point(587, 18);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(67, 15);
+ this.label2.Size = new System.Drawing.Size(53, 12);
this.label2.TabIndex = 16;
this.label2.Text = "鍗曟嵁鍙凤細";
//
// txtHLotNo
//
- this.txtHLotNo.Location = new System.Drawing.Point(1156, 17);
- this.txtHLotNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHLotNo.Location = new System.Drawing.Point(789, 14);
this.txtHLotNo.Name = "txtHLotNo";
- this.txtHLotNo.Size = new System.Drawing.Size(119, 25);
+ this.txtHLotNo.Size = new System.Drawing.Size(90, 21);
this.txtHLotNo.TabIndex = 17;
this.txtHLotNo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHLotNo_KeyDown);
//
@@ -193,19 +187,17 @@
//
this.label1.AutoSize = true;
this.label1.BackColor = System.Drawing.Color.Transparent;
- this.label1.Location = new System.Drawing.Point(1066, 17);
- this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label1.Location = new System.Drawing.Point(731, 18);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(82, 15);
+ this.label1.Size = new System.Drawing.Size(65, 12);
this.label1.TabIndex = 14;
this.label1.Text = "娴佽浆鍗″彿锛�";
//
// txtHBillNo
//
- this.txtHBillNo.Location = new System.Drawing.Point(939, 17);
- this.txtHBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHBillNo.Location = new System.Drawing.Point(639, 14);
this.txtHBillNo.Name = "txtHBillNo";
- this.txtHBillNo.Size = new System.Drawing.Size(119, 25);
+ this.txtHBillNo.Size = new System.Drawing.Size(90, 21);
this.txtHBillNo.TabIndex = 15;
this.txtHBillNo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHBillNo_KeyDown);
//
@@ -216,37 +208,33 @@
this.panel1.Controls.Add(this.txtHInnerBillNo);
this.panel1.Controls.Add(this.label4);
this.panel1.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel1.Location = new System.Drawing.Point(1401, 0);
- this.panel1.Margin = new System.Windows.Forms.Padding(4);
+ this.panel1.Location = new System.Drawing.Point(1050, 0);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(285, 66);
+ this.panel1.Size = new System.Drawing.Size(214, 53);
this.panel1.TabIndex = 7;
//
// lbljl
//
this.lbljl.AutoSize = true;
- this.lbljl.Location = new System.Drawing.Point(32, 38);
- this.lbljl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbljl.Location = new System.Drawing.Point(24, 30);
this.lbljl.Name = "lbljl";
- this.lbljl.Size = new System.Drawing.Size(15, 15);
+ this.lbljl.Size = new System.Drawing.Size(11, 12);
this.lbljl.TabIndex = 1;
this.lbljl.Text = " ";
//
// lbldj
//
this.lbldj.AutoSize = true;
- this.lbldj.Location = new System.Drawing.Point(32, 15);
- this.lbldj.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbldj.Location = new System.Drawing.Point(24, 12);
this.lbldj.Name = "lbldj";
- this.lbldj.Size = new System.Drawing.Size(0, 15);
+ this.lbldj.Size = new System.Drawing.Size(0, 12);
this.lbldj.TabIndex = 0;
//
// txtHInnerBillNo
//
- this.txtHInnerBillNo.Location = new System.Drawing.Point(175, 19);
- this.txtHInnerBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHInnerBillNo.Location = new System.Drawing.Point(131, 15);
this.txtHInnerBillNo.Name = "txtHInnerBillNo";
- this.txtHInnerBillNo.Size = new System.Drawing.Size(119, 25);
+ this.txtHInnerBillNo.Size = new System.Drawing.Size(90, 21);
this.txtHInnerBillNo.TabIndex = 25;
this.txtHInnerBillNo.Visible = false;
this.txtHInnerBillNo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHInnerBillNo_KeyDown);
@@ -255,10 +243,9 @@
//
this.label4.AutoSize = true;
this.label4.BackColor = System.Drawing.Color.Transparent;
- this.label4.Location = new System.Drawing.Point(85, 24);
- this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label4.Location = new System.Drawing.Point(64, 19);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(82, 15);
+ this.label4.Size = new System.Drawing.Size(65, 12);
this.label4.TabIndex = 24;
this.label4.Text = "閫佽揣鍗曞彿锛�";
this.label4.Visible = false;
@@ -269,10 +256,9 @@
this.lblCaption.BackColor = System.Drawing.Color.Transparent;
this.lblCaption.Cursor = System.Windows.Forms.Cursors.No;
this.lblCaption.Font = new System.Drawing.Font("瀹嬩綋", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lblCaption.Location = new System.Drawing.Point(16, 19);
- this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lblCaption.Location = new System.Drawing.Point(12, 15);
this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(180, 27);
+ this.lblCaption.Size = new System.Drawing.Size(142, 21);
this.lblCaption.TabIndex = 4;
this.lblCaption.Text = "濮斿鍙戝嚭鍒楄〃";
this.lblCaption.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -316,10 +302,38 @@
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(1686, 62);
+ this.Tool.Size = new System.Drawing.Size(1264, 50);
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, 47);
+ 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);
//
// dc
//
@@ -382,7 +396,7 @@
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 50);
//
// cx
//
@@ -415,7 +429,7 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
//
// xz
//
@@ -463,7 +477,7 @@
// toolStripSeparator10
//
this.toolStripSeparator10.Name = "toolStripSeparator10";
- this.toolStripSeparator10.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator10.Size = new System.Drawing.Size(6, 50);
//
// fahuo
//
@@ -498,7 +512,7 @@
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
- this.toolStripSeparator5.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator5.Size = new System.Drawing.Size(6, 50);
this.toolStripSeparator5.Visible = false;
//
// sh
@@ -534,7 +548,7 @@
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
- this.toolStripSeparator6.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator6.Size = new System.Drawing.Size(6, 50);
this.toolStripSeparator6.Visible = false;
//
// gb
@@ -570,7 +584,7 @@
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
//
// tc
//
@@ -589,13 +603,13 @@
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50);
//
// toolStripSeparator9
//
this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 50);
//
// mrlk
//
@@ -605,7 +619,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(73, 59);
+ this.mrlk.Size = new System.Drawing.Size(60, 47);
this.mrlk.Text = "榛樿鍒楀";
this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -615,7 +629,7 @@
//
this.toolStripSeparator7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator7.Name = "toolStripSeparator7";
- this.toolStripSeparator7.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 50);
//
// bclk
//
@@ -625,7 +639,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(73, 59);
+ this.bclk.Size = new System.Drawing.Size(60, 47);
this.bclk.Text = "淇濆瓨鍒楀";
this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -635,7 +649,7 @@
//
this.toolStripSeparator8.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator8.Name = "toolStripSeparator8";
- this.toolStripSeparator8.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 50);
//
// timer1
//
@@ -653,12 +667,11 @@
this.grdMain.BackgroundColor = System.Drawing.SystemColors.InactiveCaption;
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.grdMain.Location = new System.Drawing.Point(0, 128);
- this.grdMain.Margin = new System.Windows.Forms.Padding(4);
+ this.grdMain.Location = new System.Drawing.Point(0, 103);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(1686, 676);
+ this.grdMain.Size = new System.Drawing.Size(1264, 540);
this.grdMain.TabIndex = 19;
this.grdMain.CellMouseUp += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.grdMain_CellMouseUp);
this.grdMain.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.grdMain_ColumnWidthChanged);
@@ -669,11 +682,10 @@
// grdPrint
//
this.grdPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdPrint.Location = new System.Drawing.Point(1029, 182);
- this.grdPrint.Margin = new System.Windows.Forms.Padding(4);
+ this.grdPrint.Location = new System.Drawing.Point(772, 146);
this.grdPrint.Name = "grdPrint";
this.grdPrint.RowTemplate.Height = 23;
- this.grdPrint.Size = new System.Drawing.Size(33, 30);
+ this.grdPrint.Size = new System.Drawing.Size(25, 24);
this.grdPrint.TabIndex = 8;
this.grdPrint.Visible = false;
//
@@ -684,70 +696,50 @@
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, 804);
- this.grdSum.Margin = new System.Windows.Forms.Padding(4);
+ this.grdSum.Location = new System.Drawing.Point(0, 643);
this.grdSum.Name = "grdSum";
this.grdSum.ReadOnly = true;
this.grdSum.RowTemplate.Height = 23;
this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
- this.grdSum.Size = new System.Drawing.Size(1686, 24);
+ this.grdSum.Size = new System.Drawing.Size(1264, 19);
this.grdSum.TabIndex = 47;
//
// grdSub1
//
this.grdSub1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdSub1.Location = new System.Drawing.Point(1076, 499);
- this.grdSub1.Margin = new System.Windows.Forms.Padding(4);
+ this.grdSub1.Location = new System.Drawing.Point(807, 399);
this.grdSub1.Name = "grdSub1";
this.grdSub1.RowTemplate.Height = 23;
- this.grdSub1.Size = new System.Drawing.Size(89, 75);
+ this.grdSub1.Size = new System.Drawing.Size(67, 60);
this.grdSub1.TabIndex = 49;
this.grdSub1.Visible = false;
//
// grdSumPrint
//
this.grdSumPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdSumPrint.Location = new System.Drawing.Point(905, 400);
- this.grdSumPrint.Margin = new System.Windows.Forms.Padding(4);
+ this.grdSumPrint.Location = new System.Drawing.Point(679, 320);
this.grdSumPrint.Name = "grdSumPrint";
this.grdSumPrint.RowTemplate.Height = 23;
- this.grdSumPrint.Size = new System.Drawing.Size(260, 116);
+ this.grdSumPrint.Size = new System.Drawing.Size(195, 93);
this.grdSumPrint.TabIndex = 50;
this.grdSumPrint.Visible = false;
//
- // toolStripDropDownButton1
+ // chkWJieAn
//
- 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, 59);
- 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(181, 26);
- 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(181, 26);
- this.cSVToolStripMenuItem.Text = "CSV";
- this.cSVToolStripMenuItem.Click += new System.EventHandler(this.cSVToolStripMenuItem_Click);
+ this.chkWJieAn.AutoSize = true;
+ this.chkWJieAn.Location = new System.Drawing.Point(957, 18);
+ this.chkWJieAn.Margin = new System.Windows.Forms.Padding(2);
+ this.chkWJieAn.Name = "chkWJieAn";
+ this.chkWJieAn.Size = new System.Drawing.Size(60, 16);
+ this.chkWJieAn.TabIndex = 106;
+ this.chkWJieAn.Text = "鏈粨妗�";
+ this.chkWJieAn.UseVisualStyleBackColor = true;
//
// MES_StationEntrustInBillList
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1686, 828);
+ this.ClientSize = new System.Drawing.Size(1264, 662);
this.Controls.Add(this.grdSumPrint);
this.Controls.Add(this.grdSub1);
this.Controls.Add(this.grdMain);
@@ -755,7 +747,6 @@
this.Controls.Add(this.pPic);
this.Controls.Add(this.Tool);
this.Controls.Add(this.grdPrint);
- this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "MES_StationEntrustInBillList";
this.Text = "濮斿鍙戝嚭鍒楄〃";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -832,5 +823,6 @@
private System.Windows.Forms.ToolStripDropDownButton toolStripDropDownButton1;
private System.Windows.Forms.ToolStripMenuItem eXCELToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem cSVToolStripMenuItem;
+ private System.Windows.Forms.CheckBox chkWJieAn;
}
}
\ No newline at end of file
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBillList.resx" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBillList.resx"
index 4a40898..af7d8c0 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBillList.resx"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBillList.resx"
@@ -3917,7 +3917,7 @@
<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/
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE6SURBVDhPY0hOnvOfEgw2AAY6OjqA5Jn/v78f+P/tzYb/
7+/P+f/iUsf/x8fK/t/Zmfz/2hr//xcW2v9PS0v7f+DAgf8MDAwIA2aeAWqdaYxiwDuoAY9gBqwFGWD3
v9AbqBGkGZ8BX1+vh7sAZMDdXSAXBIBdADIgNWMh8QY8PlYO9QLCgDR8BvwBewFiwMtLnfAwuAoNA4IG
QMIAZMBsoAGIMLhKrAvAXkByAaoBkEBMzcRiwPTjv8CShHBmwYr/abgMmHzgy//+7W/+d657/L91ya3/
@@ -3929,7 +3929,7 @@
<data name="dc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADoSURBVDhPrZMvD4MwEMXvm6Jn5uaWtGIGMUXmKHKgJvBo
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADoSURBVDhPrZMvD4MwEMXvm6Jn5uaWtGIGMUXmKHKgJvBo
asEiqeQ73O4glHb8C9uaPNFr+su7dy0EQYBHBQCsYXGh6zpsjcGmabCqKixLjUVRYJ7nmKUZKqUwiiIM
wxCFlD0gjuMBMgKMBygnQOYDpNgB1AzQEyAlwIUuWMCWgycdJKQH6U66ka4kBpxJm4AXFccWtOOAW3Ad
iLUWLKCet+BnIJYBNsS/AJwppFlqASe6KOQOQNGhP0Yf8PMUVkM07eCAAbMWkgMP6TNEHmPihLjrgAHa
@@ -3939,7 +3939,7 @@
<data name="yc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADoSURBVDhPrZMvD4MwEMXvm6Jn5uaWtGIGMUXmKHKgJvBo
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADoSURBVDhPrZMvD4MwEMXvm6Jn5uaWtGIGMUXmKHKgJvBo
asEiqeQ73O4glHb8C9uaPNFr+su7dy0EQYBHBQCsYXGh6zpsjcGmabCqKixLjUVRYJ7nmKUZKqUwiiIM
wxCFlD0gjuMBMgKMBygnQOYDpNgB1AzQEyAlwIUuWMCWgycdJKQH6U66ka4kBpxJm4AXFccWtOOAW3Ad
iLUWLKCet+BnIJYBNsS/AJwppFlqASe6KOQOQNGhP0Yf8PMUVkM07eCAAbMWkgMP6TNEHmPihLjrgAHa
@@ -3949,7 +3949,7 @@
<data name="dy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
jo6OzvH7yVk/OFHg0MnC/vfuhzOq6zrK76vzIrRtm3nf92sgBpdlieu6ZgCe5xmAXEot0zTZMABBXLiU
grRUVRWHYTATYpOfYR9kiGbMnQelUTu5wzmsoDWk796GOI6jGRDDzH0BxAyQ1Z5e4xhuGUSQWbkAaE2B
FMRN05h9uAD4JoHato1d9yjCOjOAH9Y+QggDOW5gwZdfEgR7iAf4YG53yq0eBADzjlWk/+QP2WXf9xmk
@@ -3959,7 +3959,7 @@
<data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
@@ -3972,7 +3972,7 @@
<data name="cx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
UjJbCzQWk5EFRslEiUwZFNLo+lMaxWCIIUXIQhYzj/edc28NHUzzq1/v7Z7zPOee6/ybgMu3lhwP6NrO
F9q6blqaSDaETnOs3UIiCx2bUBuDmjmojpr5t0QWZ9KQfJSNkll5roxAxQRUTZn+LvBOH0vBQgbidzB0
KF+wCA1xaEyYqbVLPEG/CwMC9iShbQu69yEo0uFzM7V2QV2Y2E2e4Al07kGL3L/3CEKXsCRXSryaOZ3J
@@ -3984,7 +3984,7 @@
<data name="sx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
ao0ImqppU39qSFVMtVZLrfQXFMlKFy4KbaXQTao7Cd1U3VSyFFQIqNXYZDKZTHJ8976ZTEZD6AcnL+/e
e857A08p5uX7MEgv3i4h9GYRE3MLJUW9sdlPMG0SKhCvP4Z5/R8cIVYA0dk/AkOsKT1fUmpWzvkCz+2A
4PQ7WRW0tnvR5unFvQ7vFVH9fvdjdPYNoccftANGJufZbOTyvJZjdOaD8/uJ4dAcNzO6ga3dPezEbNFe
@@ -3998,7 +3998,7 @@
<data name="xz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGySURBVDhPhZLNKwRxGMefUlLc5D9wUE5eolyUo5PkomhJ
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGySURBVDhPhZLNKwRxGMefUlLc5D9wUE5eolyUo5PkomhJ
ybZE5D2ippYty7Ic1NgclOLiqhAlym44yF3JuzW7s2tedvcxzzO7jbWDT337PfN7nu935vdrYH51EwXf
BgpLor18Is75A+gP7CDYMetdx/9Y9l3wahsy7VnjZiqVshXh9Z7xSuSETLpXuJFIJm1FLC6e85ohK2Rc
WOJNTU/Yir5B3DjEptZObGnrxv2DY57PACOzC1woqm4rVdMxaaRIchzfwhLPhioL8bQYuIbBaQ8XcUX7
@@ -4012,7 +4012,7 @@
<data name="sc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAG5SURBVDhPlZDrK4NhGMafP8BHf4BPwkfmq8NnvhKlUHxw
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG5SURBVDhPlZDrK4NhGMafP8BHf4BPwkfmq8NnvhKlUHxw
iEgSIsQKqcVyPjQ2Z9mS0ooSlqElQ07RaGRib6zmeHmf27O3zSZcdbXnfp77+r33PRZKZdXN8Le4/pt4
wO15g0vykvn5V4j/1/5iEfsSv/iPbPbjQAgvHp5ecXrlwv6ZE7bDC1h2j7BitWNpzYZ5swUG0zL6Jxag
GZxCe68+GFBe14rjkzOMjs9iSD+DPt0ktAN6dHQPQ63pR0N7N+pbtdBNL6KmRRNijVo1jWexHcLjfcbN
@@ -4026,7 +4026,7 @@
<data name="dj.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
BqCzorNiABgABnjme+GFBPlR3znfSUJy7yMJdorG0S2KY1r6/lE0PBMcdA8z3NZEd9VtSmiolU7iSjwY
CcNyUUL0UhzMIcK4An8IPFjGr2F0s3CTmrFOLbgN67vK79LQsOCqQhaIxIE9AfXVxT4Wwzp1NsGYQ4b9
tjhSe4smiVKma19NL+4KBEQA85hH1OQH+T6T6MgagaArThys0V3g8ZwpgbryzBuIXAfB3iosZSUP3VEH
@@ -4036,7 +4036,7 @@
<data name="fahuo.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
BqCzorNiABgABnjme+GFBPlR3znfSUJy7yMJdorG0S2KY1r6/lE0PBMcdA8z3NZEd9VtSmiolU7iSjwY
CcNyUUL0UhzMIcK4An8IPFjGr2F0s3CTmrFOLbgN67vK79LQsOCqQhaIxIE9AfXVxT4Wwzp1NsGYQ4b9
tjhSe4smiVKma19NL+4KBEQA85hH1OQH+T6T6MgagaArThys0V3g8ZwpgbryzBuIXAfB3iosZSUP3VEH
@@ -4046,7 +4046,7 @@
<data name="fhdy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
BqCzorNiABgABnjme+GFBPlR3znfSUJy7yMJdorG0S2KY1r6/lE0PBMcdA8z3NZEd9VtSmiolU7iSjwY
CcNyUUL0UhzMIcK4An8IPFjGr2F0s3CTmrFOLbgN67vK79LQsOCqQhaIxIE9AfXVxT4Wwzp1NsGYQ4b9
tjhSe4smiVKma19NL+4KBEQA85hH1OQH+T6T6MgagaArThys0V3g8ZwpgbryzBuIXAfB3iosZSUP3VEH
@@ -4056,7 +4056,7 @@
<data name="sh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc
d1EcjEwytSiH4SZcRHLQ7FemtlJDOPiZml8XSzMWMz9mK7Xevs/z7DvDzLzr9X2253k+r8+nvn0pM10t
hGykjnMndRE1ZWJlVKvF+qdErytIF/1G6k72sMPTBULIRcCF4H2bcOMknC8SNsb/IXheJ8R8hAfPPwUH
M4Qz6fKVlXBtJwRWxP99aX/NnKfgcJZwMkfwS9OwdW86TwFLc6MGmxPE2Zok+CwCzwjB5XDkLpbDJHYj
@@ -4069,7 +4069,7 @@
<data name="qsh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGPSURBVDhPlZLLK0RhGMbfsrVRtkp2k4UFsUOxsPAn2NoI
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGPSURBVDhPlZLLK0RhGMbfsrVRtkp2k4UFsUOxsPAn2NoI
C0MzEmpQFi4LpWEjUhaGMYqyUINQjEtqGEqkcZkY4zLO1CGP73vPN2cujdtTv97vPd/7PL2ncyhZTTWE
TKjrn6UGUVRgVElhnlF/DamvzjJN36FmMkteHk8RbhYJODXQNwnXHkJgmrA2+I+A51VC1Et4WPlnwN4Y
4UQMX7gIV27C5ZzR+8TzZccfA/bHCUcTBL/YRtZd5x8DpKoqyrE+RMzGMME7YHDlG4WUGvtZMsRtJ8bV
@@ -4082,7 +4082,7 @@
<data name="gb.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
BqCzorNiABgABnjme+GFBPlR3znfSUJy7yMJdorG0S2KY1r6/lE0PBMcdA8z3NZEd9VtSmiolU7iSjwY
CcNyUUL0UhzMIcK4An8IPFjGr2F0s3CTmrFOLbgN67vK79LQsOCqQhaIxIE9AfXVxT4Wwzp1NsGYQ4b9
tjhSe4smiVKma19NL+4KBEQA85hH1OQH+T6T6MgagaArThys0V3g8ZwpgbryzBuIXAfB3iosZSUP3VEH
@@ -4092,7 +4092,7 @@
<data name="hf.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAFtSURBVDhPtVPLTsJAFOUj+kV+gWv9CaAWBApoITzER6UJ
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFtSURBVDhPtVPLTsJAFOUj+kV+gWv9CaAWBApoITzER6UJ
EYMuNLIiigkaCKAGEhWN78ToQqMLTTS60I3GzXHu2CpxCsGFJ5l0eu8959y50zr+DcrYAPoH+4RFcbOk
M6jQaIXReDFQf9JRuptA4SqJhfMYAqUhSJLUWYTIe28ZHHzM8GeTiVQedRRvUli6iCN3rCHNxG1FqD1y
JvIZZvmeCq1F7nMnER6nvXAccm+8Gmi9Z77JZorDEknvhhDfCohdkED9eZqfXUiaoBp9O4jYhs9eoHQ/
@@ -4104,7 +4104,7 @@
<data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
@@ -4114,7 +4114,7 @@
<data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
@@ -4129,7 +4129,7 @@
<data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
/QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBillList.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBillList.cs"
index f683154..602f3a2 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBillList.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBillList.cs"
@@ -51,6 +51,11 @@
string sSql = "";
string sWhere = "";
+ if (chkWJieAn.Checked == true)
+ {
+ sWhere = " and HBillStatus<>3 ";
+ }
+
if (frmCondition.SqlStr.Trim().Length == 0)
{
sSql = "Select top 5000 * from " + ViewName + " Where 1=1 " + sWhere + sDlgWhere + " order by 鏃ユ湡 desc,鍗曟嵁鍙� desc ";
@@ -200,6 +205,7 @@
oSumGrid.ogrdMain = grdMain; //鍒濆鍖� new
oSumGrid.oGridsum = grdSum;
initGrid();
+ chkWJieAn.Checked = true;
}
private void grdMain_DblClick(object sender, EventArgs e)
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBillList.designer.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBillList.designer.cs"
index e8c41ea..224bd49 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBillList.designer.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBillList.designer.cs"
@@ -31,15 +31,16 @@
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MES_StationEntrustOutBillList));
this.pPic = new System.Windows.Forms.Panel();
- this.btnOK = new System.Windows.Forms.Button();
this.txtHOrderProcNO = new System.Windows.Forms.TextBox();
- this.label5 = new System.Windows.Forms.Label();
this.txtHLotNo = new System.Windows.Forms.TextBox();
- this.label3 = new System.Windows.Forms.Label();
this.txtHMaterID = new System.Windows.Forms.TextBox();
+ this.txtHBillNo = new System.Windows.Forms.TextBox();
+ this.chkWJieAn = new System.Windows.Forms.CheckBox();
+ this.btnOK = new System.Windows.Forms.Button();
+ this.label5 = new System.Windows.Forms.Label();
+ this.label3 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
- this.txtHBillNo = new System.Windows.Forms.TextBox();
this.panel1 = new System.Windows.Forms.Panel();
this.lbljl = new System.Windows.Forms.Label();
this.lbldj = new System.Windows.Forms.Label();
@@ -47,6 +48,9 @@
this.txtHInnerBillNo = new System.Windows.Forms.TextBox();
this.label4 = new System.Windows.Forms.Label();
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.dc = new System.Windows.Forms.ToolStripButton();
this.yc = new System.Windows.Forms.ToolStripButton();
this.dy = new System.Windows.Forms.ToolStripButton();
@@ -78,9 +82,6 @@
this.grdPrint = new System.Windows.Forms.DataGridView();
this.grdSum = new System.Windows.Forms.DataGridView();
this.grdSub1 = 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.pPic.SuspendLayout();
this.panel1.SuspendLayout();
this.Tool.SuspendLayout();
@@ -95,141 +96,140 @@
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.btnOK);
this.pPic.Controls.Add(this.txtHOrderProcNO);
- this.pPic.Controls.Add(this.label5);
this.pPic.Controls.Add(this.txtHLotNo);
- this.pPic.Controls.Add(this.label3);
this.pPic.Controls.Add(this.txtHMaterID);
+ this.pPic.Controls.Add(this.txtHBillNo);
+ this.pPic.Controls.Add(this.chkWJieAn);
+ this.pPic.Controls.Add(this.btnOK);
+ this.pPic.Controls.Add(this.label5);
+ this.pPic.Controls.Add(this.label3);
this.pPic.Controls.Add(this.label2);
this.pPic.Controls.Add(this.label1);
- this.pPic.Controls.Add(this.txtHBillNo);
this.pPic.Controls.Add(this.panel1);
this.pPic.Controls.Add(this.lblCaption);
this.pPic.Dock = System.Windows.Forms.DockStyle.Top;
- this.pPic.Location = new System.Drawing.Point(0, 62);
- this.pPic.Margin = new System.Windows.Forms.Padding(4);
+ this.pPic.Location = new System.Drawing.Point(0, 50);
this.pPic.Name = "pPic";
- this.pPic.Size = new System.Drawing.Size(1637, 66);
+ this.pPic.Size = new System.Drawing.Size(1228, 53);
this.pPic.TabIndex = 15;
+ //
+ // txtHOrderProcNO
+ //
+ this.txtHOrderProcNO.Location = new System.Drawing.Point(338, 18);
+ this.txtHOrderProcNO.Name = "txtHOrderProcNO";
+ this.txtHOrderProcNO.Size = new System.Drawing.Size(95, 21);
+ this.txtHOrderProcNO.TabIndex = 29;
+ //
+ // txtHLotNo
+ //
+ this.txtHLotNo.Location = new System.Drawing.Point(812, 18);
+ this.txtHLotNo.Name = "txtHLotNo";
+ this.txtHLotNo.Size = new System.Drawing.Size(95, 21);
+ this.txtHLotNo.TabIndex = 19;
+ this.txtHLotNo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHLotNo_KeyDown);
+ //
+ // txtHMaterID
+ //
+ this.txtHMaterID.Location = new System.Drawing.Point(496, 18);
+ this.txtHMaterID.Name = "txtHMaterID";
+ this.txtHMaterID.Size = new System.Drawing.Size(95, 21);
+ this.txtHMaterID.TabIndex = 20;
+ this.txtHMaterID.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHMaterID_KeyDown);
+ //
+ // txtHBillNo
+ //
+ this.txtHBillNo.Location = new System.Drawing.Point(654, 18);
+ this.txtHBillNo.Name = "txtHBillNo";
+ this.txtHBillNo.Size = new System.Drawing.Size(95, 21);
+ this.txtHBillNo.TabIndex = 13;
+ this.txtHBillNo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHBillNo_KeyDown);
+ //
+ // chkWJieAn
+ //
+ this.chkWJieAn.AutoSize = true;
+ this.chkWJieAn.Location = new System.Drawing.Point(997, 22);
+ this.chkWJieAn.Margin = new System.Windows.Forms.Padding(2);
+ this.chkWJieAn.Name = "chkWJieAn";
+ this.chkWJieAn.Size = new System.Drawing.Size(60, 16);
+ this.chkWJieAn.TabIndex = 105;
+ this.chkWJieAn.Text = "鏈粨妗�";
+ this.chkWJieAn.UseVisualStyleBackColor = true;
//
// btnOK
//
- this.btnOK.Location = new System.Drawing.Point(1118, 20);
- this.btnOK.Margin = new System.Windows.Forms.Padding(4);
+ this.btnOK.Location = new System.Drawing.Point(911, 16);
this.btnOK.Name = "btnOK";
- this.btnOK.Size = new System.Drawing.Size(97, 30);
+ this.btnOK.Size = new System.Drawing.Size(73, 24);
this.btnOK.TabIndex = 30;
this.btnOK.Text = "蹇�熸煡璇�";
this.btnOK.UseVisualStyleBackColor = true;
this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
//
- // txtHOrderProcNO
- //
- this.txtHOrderProcNO.Location = new System.Drawing.Point(353, 21);
- this.txtHOrderProcNO.Margin = new System.Windows.Forms.Padding(4);
- this.txtHOrderProcNO.Name = "txtHOrderProcNO";
- this.txtHOrderProcNO.Size = new System.Drawing.Size(125, 25);
- this.txtHOrderProcNO.TabIndex = 29;
- //
// label5
//
this.label5.AutoSize = true;
this.label5.BackColor = System.Drawing.Color.Transparent;
- this.label5.Location = new System.Drawing.Point(247, 26);
- this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label5.Location = new System.Drawing.Point(263, 22);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(97, 15);
+ this.label5.Size = new System.Drawing.Size(77, 12);
this.label5.TabIndex = 28;
this.label5.Text = "璁㈠崟璺熻釜鍙凤細";
- //
- // txtHLotNo
- //
- this.txtHLotNo.Location = new System.Drawing.Point(985, 23);
- this.txtHLotNo.Margin = new System.Windows.Forms.Padding(4);
- this.txtHLotNo.Name = "txtHLotNo";
- this.txtHLotNo.Size = new System.Drawing.Size(125, 25);
- this.txtHLotNo.TabIndex = 19;
- this.txtHLotNo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHLotNo_KeyDown);
//
// label3
//
this.label3.AutoSize = true;
this.label3.BackColor = System.Drawing.Color.Transparent;
- this.label3.Location = new System.Drawing.Point(488, 24);
- this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label3.Location = new System.Drawing.Point(439, 22);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(52, 15);
+ this.label3.Size = new System.Drawing.Size(59, 12);
this.label3.TabIndex = 21;
- this.label3.Text = "浜у搧锛�";
- //
- // txtHMaterID
- //
- this.txtHMaterID.Location = new System.Drawing.Point(550, 21);
- this.txtHMaterID.Margin = new System.Windows.Forms.Padding(4);
- this.txtHMaterID.Name = "txtHMaterID";
- this.txtHMaterID.Size = new System.Drawing.Size(125, 25);
- this.txtHMaterID.TabIndex = 20;
- this.txtHMaterID.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHMaterID_KeyDown);
+ this.label3.Text = "浜� 鍝侊細";
//
// label2
//
this.label2.AutoSize = true;
this.label2.BackColor = System.Drawing.Color.Transparent;
- this.label2.Location = new System.Drawing.Point(689, 25);
- this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label2.Location = new System.Drawing.Point(602, 22);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(67, 15);
+ this.label2.Size = new System.Drawing.Size(53, 12);
this.label2.TabIndex = 18;
this.label2.Text = "鍗曟嵁鍙凤細";
//
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(910, 26);
- this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label1.Location = new System.Drawing.Point(754, 22);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(82, 15);
+ this.label1.Size = new System.Drawing.Size(65, 12);
this.label1.TabIndex = 12;
this.label1.Text = "娴佽浆鍗″彿锛�";
- //
- // txtHBillNo
- //
- this.txtHBillNo.Location = new System.Drawing.Point(770, 21);
- this.txtHBillNo.Margin = new System.Windows.Forms.Padding(4);
- this.txtHBillNo.Name = "txtHBillNo";
- this.txtHBillNo.Size = new System.Drawing.Size(125, 25);
- this.txtHBillNo.TabIndex = 13;
- this.txtHBillNo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHBillNo_KeyDown);
//
// panel1
//
this.panel1.Controls.Add(this.lbljl);
this.panel1.Controls.Add(this.lbldj);
this.panel1.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel1.Location = new System.Drawing.Point(1352, 0);
- this.panel1.Margin = new System.Windows.Forms.Padding(4);
+ this.panel1.Location = new System.Drawing.Point(1014, 0);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(285, 66);
+ this.panel1.Size = new System.Drawing.Size(214, 53);
this.panel1.TabIndex = 7;
//
// lbljl
//
this.lbljl.AutoSize = true;
- this.lbljl.Location = new System.Drawing.Point(32, 38);
- this.lbljl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbljl.Location = new System.Drawing.Point(24, 30);
this.lbljl.Name = "lbljl";
- this.lbljl.Size = new System.Drawing.Size(15, 15);
+ this.lbljl.Size = new System.Drawing.Size(11, 12);
this.lbljl.TabIndex = 1;
this.lbljl.Text = " ";
//
// lbldj
//
this.lbldj.AutoSize = true;
- this.lbldj.Location = new System.Drawing.Point(32, 15);
- this.lbldj.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbldj.Location = new System.Drawing.Point(24, 12);
this.lbldj.Name = "lbldj";
- this.lbldj.Size = new System.Drawing.Size(0, 15);
+ this.lbldj.Size = new System.Drawing.Size(0, 12);
this.lbldj.TabIndex = 0;
//
// lblCaption
@@ -238,20 +238,18 @@
this.lblCaption.BackColor = System.Drawing.Color.Transparent;
this.lblCaption.Cursor = System.Windows.Forms.Cursors.No;
this.lblCaption.Font = new System.Drawing.Font("瀹嬩綋", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lblCaption.Location = new System.Drawing.Point(16, 19);
- this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lblCaption.Location = new System.Drawing.Point(12, 15);
this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(180, 27);
+ this.lblCaption.Size = new System.Drawing.Size(142, 21);
this.lblCaption.TabIndex = 4;
this.lblCaption.Text = "濮斿鎺ユ敹鍒楄〃";
this.lblCaption.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// txtHInnerBillNo
//
- this.txtHInnerBillNo.Location = new System.Drawing.Point(901, 285);
- this.txtHInnerBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHInnerBillNo.Location = new System.Drawing.Point(676, 228);
this.txtHInnerBillNo.Name = "txtHInnerBillNo";
- this.txtHInnerBillNo.Size = new System.Drawing.Size(125, 25);
+ this.txtHInnerBillNo.Size = new System.Drawing.Size(95, 21);
this.txtHInnerBillNo.TabIndex = 27;
this.txtHInnerBillNo.Visible = false;
this.txtHInnerBillNo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHInnerBillNo_KeyDown);
@@ -260,10 +258,9 @@
//
this.label4.AutoSize = true;
this.label4.BackColor = System.Drawing.Color.Transparent;
- this.label4.Location = new System.Drawing.Point(830, 163);
- this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label4.Location = new System.Drawing.Point(622, 130);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(82, 15);
+ this.label4.Size = new System.Drawing.Size(65, 12);
this.label4.TabIndex = 26;
this.label4.Text = "閫佽揣鍗曞彿锛�";
this.label4.Visible = false;
@@ -304,10 +301,38 @@
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(1637, 62);
+ this.Tool.Size = new System.Drawing.Size(1228, 50);
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, 47);
+ 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);
//
// dc
//
@@ -370,7 +395,7 @@
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 50);
this.toolStripSeparator2.Visible = false;
//
// cx
@@ -404,7 +429,7 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
//
// sc
//
@@ -452,7 +477,7 @@
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
- this.toolStripSeparator5.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator5.Size = new System.Drawing.Size(6, 50);
//
// sh
//
@@ -487,7 +512,7 @@
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
- this.toolStripSeparator6.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator6.Size = new System.Drawing.Size(6, 50);
this.toolStripSeparator6.Visible = false;
//
// zf
@@ -523,7 +548,7 @@
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
//
// tc
//
@@ -542,13 +567,13 @@
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50);
//
// toolStripSeparator9
//
this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 50);
//
// mrlk
//
@@ -558,7 +583,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(73, 59);
+ this.mrlk.Size = new System.Drawing.Size(60, 47);
this.mrlk.Text = "榛樿鍒楀";
this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -568,7 +593,7 @@
//
this.toolStripSeparator7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator7.Name = "toolStripSeparator7";
- this.toolStripSeparator7.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 50);
//
// bclk
//
@@ -578,7 +603,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(73, 59);
+ this.bclk.Size = new System.Drawing.Size(60, 47);
this.bclk.Text = "淇濆瓨鍒楀";
this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -588,7 +613,7 @@
//
this.toolStripSeparator8.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator8.Name = "toolStripSeparator8";
- this.toolStripSeparator8.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 50);
//
// timer1
//
@@ -606,12 +631,11 @@
this.grdMain.BackgroundColor = System.Drawing.SystemColors.InactiveCaption;
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.grdMain.Location = new System.Drawing.Point(0, 128);
- this.grdMain.Margin = new System.Windows.Forms.Padding(4);
+ this.grdMain.Location = new System.Drawing.Point(0, 103);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(1637, 507);
+ this.grdMain.Size = new System.Drawing.Size(1228, 405);
this.grdMain.TabIndex = 19;
this.grdMain.CellMouseUp += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.grdMain_CellMouseUp);
this.grdMain.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.grdMain_ColumnWidthChanged);
@@ -622,11 +646,10 @@
// grdPrint
//
this.grdPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdPrint.Location = new System.Drawing.Point(1029, 182);
- this.grdPrint.Margin = new System.Windows.Forms.Padding(4);
+ this.grdPrint.Location = new System.Drawing.Point(772, 146);
this.grdPrint.Name = "grdPrint";
this.grdPrint.RowTemplate.Height = 23;
- this.grdPrint.Size = new System.Drawing.Size(33, 30);
+ this.grdPrint.Size = new System.Drawing.Size(25, 24);
this.grdPrint.TabIndex = 8;
this.grdPrint.Visible = false;
//
@@ -637,59 +660,29 @@
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, 635);
- this.grdSum.Margin = new System.Windows.Forms.Padding(4);
+ this.grdSum.Location = new System.Drawing.Point(0, 508);
this.grdSum.Name = "grdSum";
this.grdSum.ReadOnly = true;
this.grdSum.RowTemplate.Height = 23;
this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
- this.grdSum.Size = new System.Drawing.Size(1637, 24);
+ this.grdSum.Size = new System.Drawing.Size(1228, 19);
this.grdSum.TabIndex = 47;
//
// grdSub1
//
this.grdSub1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdSub1.Location = new System.Drawing.Point(725, 471);
- this.grdSub1.Margin = new System.Windows.Forms.Padding(4);
+ this.grdSub1.Location = new System.Drawing.Point(544, 377);
this.grdSub1.Name = "grdSub1";
this.grdSub1.RowTemplate.Height = 23;
- this.grdSub1.Size = new System.Drawing.Size(61, 50);
+ this.grdSub1.Size = new System.Drawing.Size(46, 40);
this.grdSub1.TabIndex = 48;
this.grdSub1.Visible = false;
//
- // 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(53, 59);
- 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(181, 26);
- 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(181, 26);
- this.cSVToolStripMenuItem.Text = "CSV";
- this.cSVToolStripMenuItem.Click += new System.EventHandler(this.cSVToolStripMenuItem_Click);
- //
// MES_StationEntrustOutBillList
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1637, 659);
+ this.ClientSize = new System.Drawing.Size(1228, 527);
this.Controls.Add(this.grdSub1);
this.Controls.Add(this.txtHInnerBillNo);
this.Controls.Add(this.grdMain);
@@ -698,7 +691,6 @@
this.Controls.Add(this.pPic);
this.Controls.Add(this.Tool);
this.Controls.Add(this.grdPrint);
- this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "MES_StationEntrustOutBillList";
this.Text = "濮斿鎺ユ敹鍒楄〃";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -771,5 +763,6 @@
private System.Windows.Forms.ToolStripDropDownButton toolStripDropDownButton1;
private System.Windows.Forms.ToolStripMenuItem eXCELToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem cSVToolStripMenuItem;
+ private System.Windows.Forms.CheckBox chkWJieAn;
}
}
\ No newline at end of file
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBillList.resx" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBillList.resx"
index ebc663d..0ef4c9a 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBillList.resx"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBillList.resx"
@@ -3917,7 +3917,7 @@
<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/
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE6SURBVDhPY0hOnvOfEgw2AAY6OjqA5Jn/v78f+P/tzYb/
7+/P+f/iUsf/x8fK/t/Zmfz/2hr//xcW2v9PS0v7f+DAgf8MDAwIA2aeAWqdaYxiwDuoAY9gBqwFGWD3
v9AbqBGkGZ8BX1+vh7sAZMDdXSAXBIBdADIgNWMh8QY8PlYO9QLCgDR8BvwBewFiwMtLnfAwuAoNA4IG
QMIAZMBsoAGIMLhKrAvAXkByAaoBkEBMzcRiwPTjv8CShHBmwYr/abgMmHzgy//+7W/+d657/L91ya3/
@@ -3929,7 +3929,7 @@
<data name="dc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADoSURBVDhPrZMvD4MwEMXvm6Jn5uaWtGIGMUXmKHKgJvBo
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADoSURBVDhPrZMvD4MwEMXvm6Jn5uaWtGIGMUXmKHKgJvBo
asEiqeQ73O4glHb8C9uaPNFr+su7dy0EQYBHBQCsYXGh6zpsjcGmabCqKixLjUVRYJ7nmKUZKqUwiiIM
wxCFlD0gjuMBMgKMBygnQOYDpNgB1AzQEyAlwIUuWMCWgycdJKQH6U66ka4kBpxJm4AXFccWtOOAW3Ad
iLUWLKCet+BnIJYBNsS/AJwppFlqASe6KOQOQNGhP0Yf8PMUVkM07eCAAbMWkgMP6TNEHmPihLjrgAHa
@@ -3939,7 +3939,7 @@
<data name="yc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADoSURBVDhPrZMvD4MwEMXvm6Jn5uaWtGIGMUXmKHKgJvBo
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADoSURBVDhPrZMvD4MwEMXvm6Jn5uaWtGIGMUXmKHKgJvBo
asEiqeQ73O4glHb8C9uaPNFr+su7dy0EQYBHBQCsYXGh6zpsjcGmabCqKixLjUVRYJ7nmKUZKqUwiiIM
wxCFlD0gjuMBMgKMBygnQOYDpNgB1AzQEyAlwIUuWMCWgycdJKQH6U66ka4kBpxJm4AXFccWtOOAW3Ad
iLUWLKCet+BnIJYBNsS/AJwppFlqASe6KOQOQNGhP0Yf8PMUVkM07eCAAbMWkgMP6TNEHmPihLjrgAHa
@@ -3949,7 +3949,7 @@
<data name="dy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
jo6OzvH7yVk/OFHg0MnC/vfuhzOq6zrK76vzIrRtm3nf92sgBpdlieu6ZgCe5xmAXEot0zTZMABBXLiU
grRUVRWHYTATYpOfYR9kiGbMnQelUTu5wzmsoDWk796GOI6jGRDDzH0BxAyQ1Z5e4xhuGUSQWbkAaE2B
FMRN05h9uAD4JoHato1d9yjCOjOAH9Y+QggDOW5gwZdfEgR7iAf4YG53yq0eBADzjlWk/+QP2WXf9xmk
@@ -3959,7 +3959,7 @@
<data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
@@ -3972,7 +3972,7 @@
<data name="cx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
UjJbCzQWk5EFRslEiUwZFNLo+lMaxWCIIUXIQhYzj/edc28NHUzzq1/v7Z7zPOee6/ybgMu3lhwP6NrO
F9q6blqaSDaETnOs3UIiCx2bUBuDmjmojpr5t0QWZ9KQfJSNkll5roxAxQRUTZn+LvBOH0vBQgbidzB0
KF+wCA1xaEyYqbVLPEG/CwMC9iShbQu69yEo0uFzM7V2QV2Y2E2e4Al07kGL3L/3CEKXsCRXSryaOZ3J
@@ -3984,7 +3984,7 @@
<data name="sx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
ao0ImqppU39qSFVMtVZLrfQXFMlKFy4KbaXQTao7Cd1U3VSyFFQIqNXYZDKZTHJ8976ZTEZD6AcnL+/e
e857A08p5uX7MEgv3i4h9GYRE3MLJUW9sdlPMG0SKhCvP4Z5/R8cIVYA0dk/AkOsKT1fUmpWzvkCz+2A
4PQ7WRW0tnvR5unFvQ7vFVH9fvdjdPYNoccftANGJufZbOTyvJZjdOaD8/uJ4dAcNzO6ga3dPezEbNFe
@@ -3998,7 +3998,7 @@
<data name="sc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAG5SURBVDhPlZDrK4NhGMafP8BHf4BPwkfmq8NnvhKlUHxw
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG5SURBVDhPlZDrK4NhGMafP8BHf4BPwkfmq8NnvhKlUHxw
iEgSIsQKqcVyPjQ2Z9mS0ooSlqElQ07RaGRib6zmeHmf27O3zSZcdbXnfp77+r33PRZKZdXN8Le4/pt4
wO15g0vykvn5V4j/1/5iEfsSv/iPbPbjQAgvHp5ecXrlwv6ZE7bDC1h2j7BitWNpzYZ5swUG0zL6Jxag
GZxCe68+GFBe14rjkzOMjs9iSD+DPt0ktAN6dHQPQ63pR0N7N+pbtdBNL6KmRRNijVo1jWexHcLjfcbN
@@ -4012,7 +4012,7 @@
<data name="xz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGySURBVDhPhZLNKwRxGMefUlLc5D9wUE5eolyUo5PkomhJ
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGySURBVDhPhZLNKwRxGMefUlLc5D9wUE5eolyUo5PkomhJ
ybZE5D2ippYty7Ic1NgclOLiqhAlym44yF3JuzW7s2tedvcxzzO7jbWDT337PfN7nu935vdrYH51EwXf
BgpLor18Is75A+gP7CDYMetdx/9Y9l3wahsy7VnjZiqVshXh9Z7xSuSETLpXuJFIJm1FLC6e85ohK2Rc
WOJNTU/Yir5B3DjEptZObGnrxv2DY57PACOzC1woqm4rVdMxaaRIchzfwhLPhioL8bQYuIbBaQ8XcUX7
@@ -4026,7 +4026,7 @@
<data name="dj.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
BqCzorNiABgABnjme+GFBPlR3znfSUJy7yMJdorG0S2KY1r6/lE0PBMcdA8z3NZEd9VtSmiolU7iSjwY
CcNyUUL0UhzMIcK4An8IPFjGr2F0s3CTmrFOLbgN67vK79LQsOCqQhaIxIE9AfXVxT4Wwzp1NsGYQ4b9
tjhSe4smiVKma19NL+4KBEQA85hH1OQH+T6T6MgagaArThys0V3g8ZwpgbryzBuIXAfB3iosZSUP3VEH
@@ -4036,7 +4036,7 @@
<data name="sh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc
d1EcjEwytSiH4SZcRHLQ7FemtlJDOPiZml8XSzMWMz9mK7Xevs/z7DvDzLzr9X2253k+r8+nvn0pM10t
hGykjnMndRE1ZWJlVKvF+qdErytIF/1G6k72sMPTBULIRcCF4H2bcOMknC8SNsb/IXheJ8R8hAfPPwUH
M4Qz6fKVlXBtJwRWxP99aX/NnKfgcJZwMkfwS9OwdW86TwFLc6MGmxPE2Zok+CwCzwjB5XDkLpbDJHYj
@@ -4049,7 +4049,7 @@
<data name="qsh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGPSURBVDhPlZLLK0RhGMbfsrVRtkp2k4UFsUOxsPAn2NoI
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGPSURBVDhPlZLLK0RhGMbfsrVRtkp2k4UFsUOxsPAn2NoI
C0MzEmpQFi4LpWEjUhaGMYqyUINQjEtqGEqkcZkY4zLO1CGP73vPN2cujdtTv97vPd/7PL2ncyhZTTWE
TKjrn6UGUVRgVElhnlF/DamvzjJN36FmMkteHk8RbhYJODXQNwnXHkJgmrA2+I+A51VC1Et4WPlnwN4Y
4UQMX7gIV27C5ZzR+8TzZccfA/bHCUcTBL/YRtZd5x8DpKoqyrE+RMzGMME7YHDlG4WUGvtZMsRtJ8bV
@@ -4062,7 +4062,7 @@
<data name="zf.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHASURBVDhPjVK5TgJRFH0fYOkH2Blrez/AWGioVDQkgiKK
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHASURBVDhPjVK5TgJRFH0fYOkH2Blrez/AWGioVDQkgiKK
4kJQjLjgEpe4JhpDb2NjLF06QoxRtDJ0WqAhLigIwzAMc51735sZicR4kpP77nLO3Jd57CcWtiKAnN84
gNDaPkyv7lUl9oJLuyBkHFhArOxEKP4HFSaGAaK7fxxUPeYVrSqlEp/z+Gcsg0B4k1d1tHa4wNbVB212
1y9ivb1nELrdI+D0BiyD8dl1EqtljeJfmFzcrrw/YjS0Ss2iokL8/hHuEhYxV0oqyEW+O84KmQVfcJma
@@ -4076,7 +4076,7 @@
<data name="zc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
ao0ImqppU39qSFVMtVZLrfQXFMlKFy4KbaXQTao7Cd1U3VSyFFQIqNXYZDKZTHJ8976ZTEZD6AcnL+/e
e857A08p5uX7MEgv3i4h9GYRE3MLJUW9sdlPMG0SKhCvP4Z5/R8cIVYA0dk/AkOsKT1fUmpWzvkCz+2A
4PQ7WRW0tnvR5unFvQ7vFVH9fvdjdPYNoccftANGJufZbOTyvJZjdOaD8/uJ4dAcNzO6ga3dPezEbNFe
@@ -4090,7 +4090,7 @@
<data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
@@ -4100,7 +4100,7 @@
<data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
@@ -4115,7 +4115,7 @@
<data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
/QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBillList.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBillList.cs"
index b4e0cac..a1de99a 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBillList.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBillList.cs"
@@ -47,6 +47,11 @@
string sSql = "";
string sWhere = "";
+ if ( chkWJieAn.Checked == true)
+ {
+ sWhere = " and HBillStatus<>3 ";
+ }
+
if (frmCondition.SqlStr.Trim().Length == 0)
{
sSql = "Select top 5000 * from " + ViewName + " Where 1=1 " + sWhere + sDlgWhere + " order by hmainid desc ";
@@ -154,6 +159,7 @@
oSumGrid.ogrdMain = grdMain; //鍒濆鍖� new
oSumGrid.oGridsum = grdSum;
initGrid();
+ chkWJieAn.Checked = true;
}
private void grdMain_DblClick(object sender, EventArgs e)
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBillList.designer.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBillList.designer.cs"
index 97dfe71..4dcbf6c 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBillList.designer.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBillList.designer.cs"
@@ -57,6 +57,7 @@
this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
this.sh = new System.Windows.Forms.ToolStripButton();
this.qsh = new System.Windows.Forms.ToolStripButton();
+ this.fsqc = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
this.tc = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
@@ -70,7 +71,7 @@
this.grdMain = new System.Windows.Forms.DataGridView();
this.grdPrint = new System.Windows.Forms.DataGridView();
this.grdSum = new System.Windows.Forms.DataGridView();
- this.fsqc = new System.Windows.Forms.ToolStripButton();
+ this.chkWJieAn = new System.Windows.Forms.CheckBox();
this.pPic.SuspendLayout();
this.panel1.SuspendLayout();
this.Tool.SuspendLayout();
@@ -84,38 +85,36 @@
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.label3);
this.pPic.Controls.Add(this.txtHOrderProcNO);
- this.pPic.Controls.Add(this.label2);
this.pPic.Controls.Add(this.txtHCenterID);
- this.pPic.Controls.Add(this.label1);
this.pPic.Controls.Add(this.txtHBillNo);
+ this.pPic.Controls.Add(this.chkWJieAn);
+ this.pPic.Controls.Add(this.label3);
+ this.pPic.Controls.Add(this.label2);
+ this.pPic.Controls.Add(this.label1);
this.pPic.Controls.Add(this.panel1);
this.pPic.Controls.Add(this.lblCaption);
this.pPic.Dock = System.Windows.Forms.DockStyle.Top;
- this.pPic.Location = new System.Drawing.Point(0, 62);
- this.pPic.Margin = new System.Windows.Forms.Padding(4);
+ this.pPic.Location = new System.Drawing.Point(0, 50);
this.pPic.Name = "pPic";
- this.pPic.Size = new System.Drawing.Size(1525, 66);
+ this.pPic.Size = new System.Drawing.Size(1144, 53);
this.pPic.TabIndex = 15;
//
// label3
//
this.label3.AutoSize = true;
this.label3.BackColor = System.Drawing.Color.Transparent;
- this.label3.Location = new System.Drawing.Point(303, 19);
- this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label3.Location = new System.Drawing.Point(232, 18);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(97, 15);
+ this.label3.Size = new System.Drawing.Size(77, 12);
this.label3.TabIndex = 14;
this.label3.Text = "璁㈠崟璺熻釜鍙凤細";
//
// txtHOrderProcNO
//
- this.txtHOrderProcNO.Location = new System.Drawing.Point(407, 14);
- this.txtHOrderProcNO.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHOrderProcNO.Location = new System.Drawing.Point(305, 14);
this.txtHOrderProcNO.Name = "txtHOrderProcNO";
- this.txtHOrderProcNO.Size = new System.Drawing.Size(153, 25);
+ this.txtHOrderProcNO.Size = new System.Drawing.Size(142, 21);
this.txtHOrderProcNO.TabIndex = 15;
this.txtHOrderProcNO.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHOrderProcNO_KeyDown);
//
@@ -123,38 +122,34 @@
//
this.label2.AutoSize = true;
this.label2.BackColor = System.Drawing.Color.Transparent;
- this.label2.Location = new System.Drawing.Point(565, 19);
- this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label2.Location = new System.Drawing.Point(450, 18);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(82, 15);
+ this.label2.Size = new System.Drawing.Size(65, 12);
this.label2.TabIndex = 12;
this.label2.Text = "宸ヤ綔涓績锛�";
//
// txtHCenterID
//
- this.txtHCenterID.Location = new System.Drawing.Point(660, 15);
- this.txtHCenterID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHCenterID.Location = new System.Drawing.Point(512, 14);
this.txtHCenterID.Name = "txtHCenterID";
- this.txtHCenterID.Size = new System.Drawing.Size(188, 25);
+ this.txtHCenterID.Size = new System.Drawing.Size(142, 21);
this.txtHCenterID.TabIndex = 13;
this.txtHCenterID.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHCenterID_KeyDown);
//
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(872, 20);
- this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label1.Location = new System.Drawing.Point(660, 18);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(82, 15);
+ this.label1.Size = new System.Drawing.Size(65, 12);
this.label1.TabIndex = 10;
this.label1.Text = "娴佽浆鍗″彿锛�";
//
// txtHBillNo
//
- this.txtHBillNo.Location = new System.Drawing.Point(959, 17);
- this.txtHBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHBillNo.Location = new System.Drawing.Point(719, 14);
this.txtHBillNo.Name = "txtHBillNo";
- this.txtHBillNo.Size = new System.Drawing.Size(208, 25);
+ this.txtHBillNo.Size = new System.Drawing.Size(142, 21);
this.txtHBillNo.TabIndex = 11;
this.txtHBillNo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHBillNo_KeyDown);
//
@@ -163,29 +158,26 @@
this.panel1.Controls.Add(this.lbljl);
this.panel1.Controls.Add(this.lbldj);
this.panel1.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel1.Location = new System.Drawing.Point(1281, 0);
- this.panel1.Margin = new System.Windows.Forms.Padding(4);
+ this.panel1.Location = new System.Drawing.Point(961, 0);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(244, 66);
+ this.panel1.Size = new System.Drawing.Size(183, 53);
this.panel1.TabIndex = 7;
//
// lbljl
//
this.lbljl.AutoSize = true;
- this.lbljl.Location = new System.Drawing.Point(32, 38);
- this.lbljl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbljl.Location = new System.Drawing.Point(24, 30);
this.lbljl.Name = "lbljl";
- this.lbljl.Size = new System.Drawing.Size(15, 15);
+ this.lbljl.Size = new System.Drawing.Size(11, 12);
this.lbljl.TabIndex = 1;
this.lbljl.Text = " ";
//
// lbldj
//
this.lbldj.AutoSize = true;
- this.lbldj.Location = new System.Drawing.Point(32, 15);
- this.lbldj.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbldj.Location = new System.Drawing.Point(24, 12);
this.lbldj.Name = "lbldj";
- this.lbldj.Size = new System.Drawing.Size(0, 15);
+ this.lbldj.Size = new System.Drawing.Size(0, 12);
this.lbldj.TabIndex = 0;
//
// lblCaption
@@ -194,10 +186,9 @@
this.lblCaption.BackColor = System.Drawing.Color.Transparent;
this.lblCaption.Cursor = System.Windows.Forms.Cursors.No;
this.lblCaption.Font = new System.Drawing.Font("瀹嬩綋", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lblCaption.Location = new System.Drawing.Point(16, 19);
- this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lblCaption.Location = new System.Drawing.Point(12, 15);
this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(180, 27);
+ this.lblCaption.Size = new System.Drawing.Size(142, 21);
this.lblCaption.TabIndex = 4;
this.lblCaption.Text = "杩涚珯鎵弿鍒楄〃";
this.lblCaption.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -234,7 +225,7 @@
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(1525, 62);
+ this.Tool.Size = new System.Drawing.Size(1144, 50);
this.Tool.Stretch = true;
this.Tool.TabIndex = 16;
this.Tool.Text = "toolStrip1";
@@ -248,7 +239,7 @@
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, 59);
+ this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 47);
this.toolStripDropDownButton1.Text = "寮曞嚭";
this.toolStripDropDownButton1.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.toolStripDropDownButton1.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -256,14 +247,14 @@
// eXCELToolStripMenuItem
//
this.eXCELToolStripMenuItem.Name = "eXCELToolStripMenuItem";
- this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(136, 26);
+ 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(136, 26);
+ this.cSVToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
this.cSVToolStripMenuItem.Text = "CSV";
this.cSVToolStripMenuItem.Click += new System.EventHandler(this.cSVToolStripMenuItem_Click);
//
@@ -299,7 +290,7 @@
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 50);
//
// cx
//
@@ -332,7 +323,7 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
//
// xz
//
@@ -380,7 +371,7 @@
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
- this.toolStripSeparator5.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator5.Size = new System.Drawing.Size(6, 50);
//
// sh
//
@@ -412,10 +403,24 @@
this.qsh.Visible = false;
this.qsh.Click += new System.EventHandler(this.qsh_Click);
//
+ // fsqc
+ //
+ this.fsqc.AutoSize = false;
+ this.fsqc.Image = ((System.Drawing.Image)(resources.GetObject("fsqc.Image")));
+ this.fsqc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.fsqc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.fsqc.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.fsqc.Name = "fsqc";
+ this.fsqc.Size = new System.Drawing.Size(36, 47);
+ this.fsqc.Text = "棣栦欢";
+ this.fsqc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.fsqc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.fsqc.Click += new System.EventHandler(this.fsqc_Click);
+ //
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
//
// tc
//
@@ -434,13 +439,13 @@
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50);
//
// toolStripSeparator9
//
this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 50);
//
// mrlk
//
@@ -450,7 +455,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(73, 59);
+ this.mrlk.Size = new System.Drawing.Size(60, 47);
this.mrlk.Text = "榛樿鍒楀";
this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -460,7 +465,7 @@
//
this.toolStripSeparator7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator7.Name = "toolStripSeparator7";
- this.toolStripSeparator7.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 50);
//
// bclk
//
@@ -470,7 +475,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(73, 59);
+ this.bclk.Size = new System.Drawing.Size(60, 47);
this.bclk.Text = "淇濆瓨鍒楀";
this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -480,7 +485,7 @@
//
this.toolStripSeparator8.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator8.Name = "toolStripSeparator8";
- this.toolStripSeparator8.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 50);
//
// timer1
//
@@ -498,13 +503,12 @@
this.grdMain.BackgroundColor = System.Drawing.SystemColors.InactiveCaption;
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.grdMain.Location = new System.Drawing.Point(0, 128);
- this.grdMain.Margin = new System.Windows.Forms.Padding(4);
+ this.grdMain.Location = new System.Drawing.Point(0, 103);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
this.grdMain.RowHeadersWidth = 51;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(1525, 512);
+ this.grdMain.Size = new System.Drawing.Size(1144, 409);
this.grdMain.TabIndex = 19;
this.grdMain.CellMouseUp += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.grdMain_CellMouseUp);
this.grdMain.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.grdMain_ColumnWidthChanged);
@@ -515,12 +519,11 @@
// grdPrint
//
this.grdPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdPrint.Location = new System.Drawing.Point(1029, 182);
- this.grdPrint.Margin = new System.Windows.Forms.Padding(4);
+ this.grdPrint.Location = new System.Drawing.Point(772, 146);
this.grdPrint.Name = "grdPrint";
this.grdPrint.RowHeadersWidth = 51;
this.grdPrint.RowTemplate.Height = 23;
- this.grdPrint.Size = new System.Drawing.Size(33, 30);
+ this.grdPrint.Size = new System.Drawing.Size(25, 24);
this.grdPrint.TabIndex = 8;
this.grdPrint.Visible = false;
//
@@ -531,41 +534,36 @@
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, 640);
- this.grdSum.Margin = new System.Windows.Forms.Padding(4);
+ this.grdSum.Location = new System.Drawing.Point(0, 512);
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(1525, 24);
+ this.grdSum.Size = new System.Drawing.Size(1144, 19);
this.grdSum.TabIndex = 47;
//
- // fsqc
+ // chkWJieAn
//
- this.fsqc.AutoSize = false;
- this.fsqc.Image = ((System.Drawing.Image)(resources.GetObject("fsqc.Image")));
- this.fsqc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.fsqc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.fsqc.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.fsqc.Name = "fsqc";
- this.fsqc.Size = new System.Drawing.Size(36, 47);
- this.fsqc.Text = "棣栦欢";
- this.fsqc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.fsqc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.fsqc.Click += new System.EventHandler(this.fsqc_Click);
+ this.chkWJieAn.AutoSize = true;
+ this.chkWJieAn.Location = new System.Drawing.Point(872, 18);
+ this.chkWJieAn.Margin = new System.Windows.Forms.Padding(2);
+ this.chkWJieAn.Name = "chkWJieAn";
+ this.chkWJieAn.Size = new System.Drawing.Size(60, 16);
+ this.chkWJieAn.TabIndex = 103;
+ this.chkWJieAn.Text = "鏈粨妗�";
+ this.chkWJieAn.UseVisualStyleBackColor = true;
//
// MES_StationInBillList
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1525, 664);
+ this.ClientSize = new System.Drawing.Size(1144, 531);
this.Controls.Add(this.grdMain);
this.Controls.Add(this.grdSum);
this.Controls.Add(this.pPic);
this.Controls.Add(this.Tool);
this.Controls.Add(this.grdPrint);
- this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "MES_StationInBillList";
this.Text = "杩涚珯鎵弿鍒楄〃";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -626,5 +624,6 @@
private System.Windows.Forms.ToolStripMenuItem eXCELToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem cSVToolStripMenuItem;
private System.Windows.Forms.ToolStripButton fsqc;
+ private System.Windows.Forms.CheckBox chkWJieAn;
}
}
\ No newline at end of file
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBillList.resx" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBillList.resx"
index 9ce4a7e..0571554 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBillList.resx"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBillList.resx"
@@ -3917,7 +3917,7 @@
<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/
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE6SURBVDhPY0hOnvOfEgw2AAY6OjqA5Jn/v78f+P/tzYb/
7+/P+f/iUsf/x8fK/t/Zmfz/2hr//xcW2v9PS0v7f+DAgf8MDAwIA2aeAWqdaYxiwDuoAY9gBqwFGWD3
v9AbqBGkGZ8BX1+vh7sAZMDdXSAXBIBdADIgNWMh8QY8PlYO9QLCgDR8BvwBewFiwMtLnfAwuAoNA4IG
QMIAZMBsoAGIMLhKrAvAXkByAaoBkEBMzcRiwPTjv8CShHBmwYr/abgMmHzgy//+7W/+d657/L91ya3/
@@ -3929,7 +3929,7 @@
<data name="dc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADoSURBVDhPrZMvD4MwEMXvm6Jn5uaWtGIGMUXmKHKgJvBo
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADoSURBVDhPrZMvD4MwEMXvm6Jn5uaWtGIGMUXmKHKgJvBo
asEiqeQ73O4glHb8C9uaPNFr+su7dy0EQYBHBQCsYXGh6zpsjcGmabCqKixLjUVRYJ7nmKUZKqUwiiIM
wxCFlD0gjuMBMgKMBygnQOYDpNgB1AzQEyAlwIUuWMCWgycdJKQH6U66ka4kBpxJm4AXFccWtOOAW3Ad
iLUWLKCet+BnIJYBNsS/AJwppFlqASe6KOQOQNGhP0Yf8PMUVkM07eCAAbMWkgMP6TNEHmPihLjrgAHa
@@ -3939,7 +3939,7 @@
<data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
@@ -3952,7 +3952,7 @@
<data name="cx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
UjJbCzQWk5EFRslEiUwZFNLo+lMaxWCIIUXIQhYzj/edc28NHUzzq1/v7Z7zPOee6/ybgMu3lhwP6NrO
F9q6blqaSDaETnOs3UIiCx2bUBuDmjmojpr5t0QWZ9KQfJSNkll5roxAxQRUTZn+LvBOH0vBQgbidzB0
KF+wCA1xaEyYqbVLPEG/CwMC9iShbQu69yEo0uFzM7V2QV2Y2E2e4Al07kGL3L/3CEKXsCRXSryaOZ3J
@@ -3964,7 +3964,7 @@
<data name="sx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
ao0ImqppU39qSFVMtVZLrfQXFMlKFy4KbaXQTao7Cd1U3VSyFFQIqNXYZDKZTHJ8976ZTEZD6AcnL+/e
e857A08p5uX7MEgv3i4h9GYRE3MLJUW9sdlPMG0SKhCvP4Z5/R8cIVYA0dk/AkOsKT1fUmpWzvkCz+2A
4PQ7WRW0tnvR5unFvQ7vFVH9fvdjdPYNoccftANGJufZbOTyvJZjdOaD8/uJ4dAcNzO6ga3dPezEbNFe
@@ -3978,7 +3978,7 @@
<data name="xz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGySURBVDhPhZLNKwRxGMefUlLc5D9wUE5eolyUo5PkomhJ
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGySURBVDhPhZLNKwRxGMefUlLc5D9wUE5eolyUo5PkomhJ
ybZE5D2ippYty7Ic1NgclOLiqhAlym44yF3JuzW7s2tedvcxzzO7jbWDT337PfN7nu935vdrYH51EwXf
BgpLor18Is75A+gP7CDYMetdx/9Y9l3wahsy7VnjZiqVshXh9Z7xSuSETLpXuJFIJm1FLC6e85ohK2Rc
WOJNTU/Yir5B3DjEptZObGnrxv2DY57PACOzC1woqm4rVdMxaaRIchzfwhLPhioL8bQYuIbBaQ8XcUX7
@@ -3992,7 +3992,7 @@
<data name="dj.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
BqCzorNiABgABnjme+GFBPlR3znfSUJy7yMJdorG0S2KY1r6/lE0PBMcdA8z3NZEd9VtSmiolU7iSjwY
CcNyUUL0UhzMIcK4An8IPFjGr2F0s3CTmrFOLbgN67vK79LQsOCqQhaIxIE9AfXVxT4Wwzp1NsGYQ4b9
tjhSe4smiVKma19NL+4KBEQA85hH1OQH+T6T6MgagaArThys0V3g8ZwpgbryzBuIXAfB3iosZSUP3VEH
@@ -4002,7 +4002,7 @@
<data name="sc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAG5SURBVDhPlZDrK4NhGMafP8BHf4BPwkfmq8NnvhKlUHxw
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG5SURBVDhPlZDrK4NhGMafP8BHf4BPwkfmq8NnvhKlUHxw
iEgSIsQKqcVyPjQ2Z9mS0ooSlqElQ07RaGRib6zmeHmf27O3zSZcdbXnfp77+r33PRZKZdXN8Le4/pt4
wO15g0vykvn5V4j/1/5iEfsSv/iPbPbjQAgvHp5ecXrlwv6ZE7bDC1h2j7BitWNpzYZ5swUG0zL6Jxag
GZxCe68+GFBe14rjkzOMjs9iSD+DPt0ktAN6dHQPQ63pR0N7N+pbtdBNL6KmRRNijVo1jWexHcLjfcbN
@@ -4016,7 +4016,7 @@
<data name="sh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc
d1EcjEwytSiH4SZcRHLQ7FemtlJDOPiZml8XSzMWMz9mK7Xevs/z7DvDzLzr9X2253k+r8+nvn0pM10t
hGykjnMndRE1ZWJlVKvF+qdErytIF/1G6k72sMPTBULIRcCF4H2bcOMknC8SNsb/IXheJ8R8hAfPPwUH
M4Qz6fKVlXBtJwRWxP99aX/NnKfgcJZwMkfwS9OwdW86TwFLc6MGmxPE2Zok+CwCzwjB5XDkLpbDJHYj
@@ -4029,7 +4029,7 @@
<data name="qsh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGPSURBVDhPlZLLK0RhGMbfsrVRtkp2k4UFsUOxsPAn2NoI
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGPSURBVDhPlZLLK0RhGMbfsrVRtkp2k4UFsUOxsPAn2NoI
C0MzEmpQFi4LpWEjUhaGMYqyUINQjEtqGEqkcZkY4zLO1CGP73vPN2cujdtTv97vPd/7PL2ncyhZTTWE
TKjrn6UGUVRgVElhnlF/DamvzjJN36FmMkteHk8RbhYJODXQNwnXHkJgmrA2+I+A51VC1Et4WPlnwN4Y
4UQMX7gIV27C5ZzR+8TzZccfA/bHCUcTBL/YRtZd5x8DpKoqyrE+RMzGMME7YHDlG4WUGvtZMsRtJ8bV
@@ -4042,7 +4042,7 @@
<data name="fsqc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGySURBVDhPhZLNKwRxGMefUlLc5D9wUE5eolyUo5PkomhJ
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGySURBVDhPhZLNKwRxGMefUlLc5D9wUE5eolyUo5PkomhJ
ybZE5D2ippYty7Ic1NgclOLiqhAlym44yF3JuzW7s2tedvcxzzO7jbWDT337PfN7nu935vdrYH51EwXf
BgpLor18Is75A+gP7CDYMetdx/9Y9l3wahsy7VnjZiqVshXh9Z7xSuSETLpXuJFIJm1FLC6e85ohK2Rc
WOJNTU/Yir5B3DjEptZObGnrxv2DY57PACOzC1woqm4rVdMxaaRIchzfwhLPhioL8bQYuIbBaQ8XcUX7
@@ -4056,7 +4056,7 @@
<data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
@@ -4066,7 +4066,7 @@
<data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
@@ -4081,7 +4081,7 @@
<data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
/QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList.cs"
index efa4015..2bb87a6 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList.cs"
@@ -47,6 +47,11 @@
string sSql = "";
string sWhere = "";
+ if (chkWJieAn.Checked == true)
+ {
+ sWhere = " and HBillStatus<>3 ";
+ }
+
if (frmCondition.SqlStr.Trim().Length == 0)
{
sSql = "Select top 5000 * from " + ViewName + " Where 1=1 " + sWhere + sDlgWhere + " order by hmainid desc ";
@@ -153,6 +158,7 @@
oSumGrid.ogrdMain = grdMain; //鍒濆鍖� new
oSumGrid.oGridsum = grdSum;
initGrid();
+ chkWJieAn.Checked = true;
}
private void grdMain_DblClick(object sender, EventArgs e)
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList.designer.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList.designer.cs"
index 62042df..55b90d4 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList.designer.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList.designer.cs"
@@ -42,6 +42,9 @@
this.lbldj = new System.Windows.Forms.Label();
this.lblCaption = new System.Windows.Forms.Label();
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.dc = new System.Windows.Forms.ToolStripButton();
this.yl = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
@@ -69,9 +72,7 @@
this.grdMain = new System.Windows.Forms.DataGridView();
this.grdPrint = 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.chkWJieAn = new System.Windows.Forms.CheckBox();
this.pPic.SuspendLayout();
this.panel1.SuspendLayout();
this.Tool.SuspendLayout();
@@ -85,38 +86,36 @@
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.label3);
this.pPic.Controls.Add(this.txtHOrderProcNO);
- this.pPic.Controls.Add(this.label2);
this.pPic.Controls.Add(this.txtHCenterID);
- this.pPic.Controls.Add(this.label1);
this.pPic.Controls.Add(this.txtHBillNo);
+ this.pPic.Controls.Add(this.chkWJieAn);
+ this.pPic.Controls.Add(this.label3);
+ this.pPic.Controls.Add(this.label2);
+ this.pPic.Controls.Add(this.label1);
this.pPic.Controls.Add(this.panel1);
this.pPic.Controls.Add(this.lblCaption);
this.pPic.Dock = System.Windows.Forms.DockStyle.Top;
- this.pPic.Location = new System.Drawing.Point(0, 62);
- this.pPic.Margin = new System.Windows.Forms.Padding(4);
+ this.pPic.Location = new System.Drawing.Point(0, 50);
this.pPic.Name = "pPic";
- this.pPic.Size = new System.Drawing.Size(1661, 66);
+ this.pPic.Size = new System.Drawing.Size(1246, 53);
this.pPic.TabIndex = 15;
//
// label3
//
this.label3.AutoSize = true;
this.label3.BackColor = System.Drawing.Color.Transparent;
- this.label3.Location = new System.Drawing.Point(293, 18);
- this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label3.Location = new System.Drawing.Point(222, 19);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(97, 15);
+ this.label3.Size = new System.Drawing.Size(77, 12);
this.label3.TabIndex = 18;
this.label3.Text = "璁㈠崟璺熻釜鍙凤細";
//
// txtHOrderProcNO
//
- this.txtHOrderProcNO.Location = new System.Drawing.Point(399, 13);
- this.txtHOrderProcNO.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHOrderProcNO.Location = new System.Drawing.Point(299, 15);
this.txtHOrderProcNO.Name = "txtHOrderProcNO";
- this.txtHOrderProcNO.Size = new System.Drawing.Size(215, 25);
+ this.txtHOrderProcNO.Size = new System.Drawing.Size(162, 21);
this.txtHOrderProcNO.TabIndex = 17;
this.txtHOrderProcNO.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHOrderProcNO_KeyDown);
//
@@ -124,38 +123,34 @@
//
this.label2.AutoSize = true;
this.label2.BackColor = System.Drawing.Color.Transparent;
- this.label2.Location = new System.Drawing.Point(630, 19);
- this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label2.Location = new System.Drawing.Point(472, 19);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(82, 15);
+ this.label2.Size = new System.Drawing.Size(65, 12);
this.label2.TabIndex = 14;
this.label2.Text = "宸ヤ綔涓績锛�";
//
// txtHCenterID
//
- this.txtHCenterID.Location = new System.Drawing.Point(720, 15);
- this.txtHCenterID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHCenterID.Location = new System.Drawing.Point(537, 15);
this.txtHCenterID.Name = "txtHCenterID";
- this.txtHCenterID.Size = new System.Drawing.Size(215, 25);
+ this.txtHCenterID.Size = new System.Drawing.Size(162, 21);
this.txtHCenterID.TabIndex = 15;
this.txtHCenterID.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHCenterID_KeyDown);
//
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(944, 19);
- this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label1.Location = new System.Drawing.Point(708, 19);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(82, 15);
+ this.label1.Size = new System.Drawing.Size(65, 12);
this.label1.TabIndex = 8;
this.label1.Text = "娴佽浆鍗″彿锛�";
//
// txtHBillNo
//
- this.txtHBillNo.Location = new System.Drawing.Point(1034, 15);
- this.txtHBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHBillNo.Location = new System.Drawing.Point(775, 15);
this.txtHBillNo.Name = "txtHBillNo";
- this.txtHBillNo.Size = new System.Drawing.Size(215, 25);
+ this.txtHBillNo.Size = new System.Drawing.Size(162, 21);
this.txtHBillNo.TabIndex = 9;
this.txtHBillNo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHBillNo_KeyDown);
//
@@ -164,29 +159,26 @@
this.panel1.Controls.Add(this.lbljl);
this.panel1.Controls.Add(this.lbldj);
this.panel1.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel1.Location = new System.Drawing.Point(1398, 0);
- this.panel1.Margin = new System.Windows.Forms.Padding(4);
+ this.panel1.Location = new System.Drawing.Point(1049, 0);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(263, 66);
+ this.panel1.Size = new System.Drawing.Size(197, 53);
this.panel1.TabIndex = 7;
//
// lbljl
//
this.lbljl.AutoSize = true;
- this.lbljl.Location = new System.Drawing.Point(32, 38);
- this.lbljl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbljl.Location = new System.Drawing.Point(24, 30);
this.lbljl.Name = "lbljl";
- this.lbljl.Size = new System.Drawing.Size(15, 15);
+ this.lbljl.Size = new System.Drawing.Size(11, 12);
this.lbljl.TabIndex = 1;
this.lbljl.Text = " ";
//
// lbldj
//
this.lbldj.AutoSize = true;
- this.lbldj.Location = new System.Drawing.Point(32, 15);
- this.lbldj.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbldj.Location = new System.Drawing.Point(24, 12);
this.lbldj.Name = "lbldj";
- this.lbldj.Size = new System.Drawing.Size(0, 15);
+ this.lbldj.Size = new System.Drawing.Size(0, 12);
this.lbldj.TabIndex = 0;
//
// lblCaption
@@ -195,10 +187,9 @@
this.lblCaption.BackColor = System.Drawing.Color.Transparent;
this.lblCaption.Cursor = System.Windows.Forms.Cursors.No;
this.lblCaption.Font = new System.Drawing.Font("瀹嬩綋", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lblCaption.Location = new System.Drawing.Point(16, 19);
- this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lblCaption.Location = new System.Drawing.Point(12, 15);
this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(180, 27);
+ this.lblCaption.Size = new System.Drawing.Size(142, 21);
this.lblCaption.TabIndex = 4;
this.lblCaption.Text = "姹囨姤鎵弿鍒楄〃";
this.lblCaption.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -236,10 +227,38 @@
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(1661, 62);
+ this.Tool.Size = new System.Drawing.Size(1246, 50);
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, 47);
+ 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);
//
// dc
//
@@ -272,7 +291,7 @@
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 50);
//
// cx
//
@@ -305,7 +324,7 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
//
// xz
//
@@ -352,7 +371,7 @@
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
- this.toolStripSeparator5.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator5.Size = new System.Drawing.Size(6, 50);
//
// sh
//
@@ -385,7 +404,7 @@
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
- this.toolStripSeparator6.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator6.Size = new System.Drawing.Size(6, 50);
//
// bzd
//
@@ -404,7 +423,7 @@
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
//
// tc
//
@@ -423,13 +442,13 @@
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50);
//
// toolStripSeparator9
//
this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 50);
//
// mrlk
//
@@ -439,7 +458,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(73, 59);
+ this.mrlk.Size = new System.Drawing.Size(60, 47);
this.mrlk.Text = "榛樿鍒楀";
this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -449,7 +468,7 @@
//
this.toolStripSeparator7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator7.Name = "toolStripSeparator7";
- this.toolStripSeparator7.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 50);
//
// bclk
//
@@ -459,7 +478,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(73, 59);
+ this.bclk.Size = new System.Drawing.Size(60, 47);
this.bclk.Text = "淇濆瓨鍒楀";
this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -469,7 +488,7 @@
//
this.toolStripSeparator8.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator8.Name = "toolStripSeparator8";
- this.toolStripSeparator8.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 50);
//
// timer1
//
@@ -487,12 +506,11 @@
this.grdMain.BackgroundColor = System.Drawing.SystemColors.InactiveCaption;
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.grdMain.Location = new System.Drawing.Point(0, 128);
- this.grdMain.Margin = new System.Windows.Forms.Padding(4);
+ this.grdMain.Location = new System.Drawing.Point(0, 103);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(1661, 512);
+ this.grdMain.Size = new System.Drawing.Size(1246, 409);
this.grdMain.TabIndex = 19;
this.grdMain.CellMouseUp += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.grdMain_CellMouseUp);
this.grdMain.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.grdMain_ColumnWidthChanged);
@@ -503,11 +521,10 @@
// grdPrint
//
this.grdPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdPrint.Location = new System.Drawing.Point(1029, 182);
- this.grdPrint.Margin = new System.Windows.Forms.Padding(4);
+ this.grdPrint.Location = new System.Drawing.Point(772, 146);
this.grdPrint.Name = "grdPrint";
this.grdPrint.RowTemplate.Height = 23;
- this.grdPrint.Size = new System.Drawing.Size(33, 30);
+ this.grdPrint.Size = new System.Drawing.Size(25, 24);
this.grdPrint.TabIndex = 8;
this.grdPrint.Visible = false;
//
@@ -518,54 +535,35 @@
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, 640);
- this.grdSum.Margin = new System.Windows.Forms.Padding(4);
+ this.grdSum.Location = new System.Drawing.Point(0, 512);
this.grdSum.Name = "grdSum";
this.grdSum.ReadOnly = true;
this.grdSum.RowTemplate.Height = 23;
this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
- this.grdSum.Size = new System.Drawing.Size(1661, 24);
+ this.grdSum.Size = new System.Drawing.Size(1246, 19);
this.grdSum.TabIndex = 47;
//
- // toolStripDropDownButton1
+ // chkWJieAn
//
- 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, 59);
- 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(181, 26);
- 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(181, 26);
- this.cSVToolStripMenuItem.Text = "CSV";
- this.cSVToolStripMenuItem.Click += new System.EventHandler(this.cSVToolStripMenuItem_Click);
+ this.chkWJieAn.AutoSize = true;
+ this.chkWJieAn.Location = new System.Drawing.Point(956, 19);
+ this.chkWJieAn.Margin = new System.Windows.Forms.Padding(2);
+ this.chkWJieAn.Name = "chkWJieAn";
+ this.chkWJieAn.Size = new System.Drawing.Size(60, 16);
+ this.chkWJieAn.TabIndex = 104;
+ this.chkWJieAn.Text = "鏈粨妗�";
+ this.chkWJieAn.UseVisualStyleBackColor = true;
//
// MES_StationOutBillList
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1661, 664);
+ this.ClientSize = new System.Drawing.Size(1246, 531);
this.Controls.Add(this.grdMain);
this.Controls.Add(this.grdSum);
this.Controls.Add(this.pPic);
this.Controls.Add(this.Tool);
this.Controls.Add(this.grdPrint);
- this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "MES_StationOutBillList";
this.Text = "姹囨姤鎵弿鍒楄〃";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -627,5 +625,6 @@
private System.Windows.Forms.ToolStripDropDownButton toolStripDropDownButton1;
private System.Windows.Forms.ToolStripMenuItem eXCELToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem cSVToolStripMenuItem;
+ private System.Windows.Forms.CheckBox chkWJieAn;
}
}
\ No newline at end of file
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList.resx" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList.resx"
index df0c72c..bc1bb78 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList.resx"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList.resx"
@@ -3917,7 +3917,7 @@
<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/
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE6SURBVDhPY0hOnvOfEgw2AAY6OjqA5Jn/v78f+P/tzYb/
7+/P+f/iUsf/x8fK/t/Zmfz/2hr//xcW2v9PS0v7f+DAgf8MDAwIA2aeAWqdaYxiwDuoAY9gBqwFGWD3
v9AbqBGkGZ8BX1+vh7sAZMDdXSAXBIBdADIgNWMh8QY8PlYO9QLCgDR8BvwBewFiwMtLnfAwuAoNA4IG
QMIAZMBsoAGIMLhKrAvAXkByAaoBkEBMzcRiwPTjv8CShHBmwYr/abgMmHzgy//+7W/+d657/L91ya3/
@@ -3929,7 +3929,7 @@
<data name="dc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADoSURBVDhPrZMvD4MwEMXvm6Jn5uaWtGIGMUXmKHKgJvBo
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADoSURBVDhPrZMvD4MwEMXvm6Jn5uaWtGIGMUXmKHKgJvBo
asEiqeQ73O4glHb8C9uaPNFr+su7dy0EQYBHBQCsYXGh6zpsjcGmabCqKixLjUVRYJ7nmKUZKqUwiiIM
wxCFlD0gjuMBMgKMBygnQOYDpNgB1AzQEyAlwIUuWMCWgycdJKQH6U66ka4kBpxJm4AXFccWtOOAW3Ad
iLUWLKCet+BnIJYBNsS/AJwppFlqASe6KOQOQNGhP0Yf8PMUVkM07eCAAbMWkgMP6TNEHmPihLjrgAHa
@@ -3939,7 +3939,7 @@
<data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
@@ -3952,7 +3952,7 @@
<data name="cx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
UjJbCzQWk5EFRslEiUwZFNLo+lMaxWCIIUXIQhYzj/edc28NHUzzq1/v7Z7zPOee6/ybgMu3lhwP6NrO
F9q6blqaSDaETnOs3UIiCx2bUBuDmjmojpr5t0QWZ9KQfJSNkll5roxAxQRUTZn+LvBOH0vBQgbidzB0
KF+wCA1xaEyYqbVLPEG/CwMC9iShbQu69yEo0uFzM7V2QV2Y2E2e4Al07kGL3L/3CEKXsCRXSryaOZ3J
@@ -3964,7 +3964,7 @@
<data name="sx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
ao0ImqppU39qSFVMtVZLrfQXFMlKFy4KbaXQTao7Cd1U3VSyFFQIqNXYZDKZTHJ8976ZTEZD6AcnL+/e
e857A08p5uX7MEgv3i4h9GYRE3MLJUW9sdlPMG0SKhCvP4Z5/R8cIVYA0dk/AkOsKT1fUmpWzvkCz+2A
4PQ7WRW0tnvR5unFvQ7vFVH9fvdjdPYNoccftANGJufZbOTyvJZjdOaD8/uJ4dAcNzO6ga3dPezEbNFe
@@ -3978,7 +3978,7 @@
<data name="xz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGySURBVDhPhZLNKwRxGMefUlLc5D9wUE5eolyUo5PkomhJ
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGySURBVDhPhZLNKwRxGMefUlLc5D9wUE5eolyUo5PkomhJ
ybZE5D2ippYty7Ic1NgclOLiqhAlym44yF3JuzW7s2tedvcxzzO7jbWDT337PfN7nu935vdrYH51EwXf
BgpLor18Is75A+gP7CDYMetdx/9Y9l3wahsy7VnjZiqVshXh9Z7xSuSETLpXuJFIJm1FLC6e85ohK2Rc
WOJNTU/Yir5B3DjEptZObGnrxv2DY57PACOzC1woqm4rVdMxaaRIchzfwhLPhioL8bQYuIbBaQ8XcUX7
@@ -3992,7 +3992,7 @@
<data name="dj.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
BqCzorNiABgABnjme+GFBPlR3znfSUJy7yMJdorG0S2KY1r6/lE0PBMcdA8z3NZEd9VtSmiolU7iSjwY
CcNyUUL0UhzMIcK4An8IPFjGr2F0s3CTmrFOLbgN67vK79LQsOCqQhaIxIE9AfXVxT4Wwzp1NsGYQ4b9
tjhSe4smiVKma19NL+4KBEQA85hH1OQH+T6T6MgagaArThys0V3g8ZwpgbryzBuIXAfB3iosZSUP3VEH
@@ -4002,7 +4002,7 @@
<data name="sc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAG5SURBVDhPlZDrK4NhGMafP8BHf4BPwkfmq8NnvhKlUHxw
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG5SURBVDhPlZDrK4NhGMafP8BHf4BPwkfmq8NnvhKlUHxw
iEgSIsQKqcVyPjQ2Z9mS0ooSlqElQ07RaGRib6zmeHmf27O3zSZcdbXnfp77+r33PRZKZdXN8Le4/pt4
wO15g0vykvn5V4j/1/5iEfsSv/iPbPbjQAgvHp5ecXrlwv6ZE7bDC1h2j7BitWNpzYZ5swUG0zL6Jxag
GZxCe68+GFBe14rjkzOMjs9iSD+DPt0ktAN6dHQPQ63pR0N7N+pbtdBNL6KmRRNijVo1jWexHcLjfcbN
@@ -4016,7 +4016,7 @@
<data name="sh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc
d1EcjEwytSiH4SZcRHLQ7FemtlJDOPiZml8XSzMWMz9mK7Xevs/z7DvDzLzr9X2253k+r8+nvn0pM10t
hGykjnMndRE1ZWJlVKvF+qdErytIF/1G6k72sMPTBULIRcCF4H2bcOMknC8SNsb/IXheJ8R8hAfPPwUH
M4Qz6fKVlXBtJwRWxP99aX/NnKfgcJZwMkfwS9OwdW86TwFLc6MGmxPE2Zok+CwCzwjB5XDkLpbDJHYj
@@ -4029,7 +4029,7 @@
<data name="qsh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGPSURBVDhPlZLLK0RhGMbfsrVRtkp2k4UFsUOxsPAn2NoI
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGPSURBVDhPlZLLK0RhGMbfsrVRtkp2k4UFsUOxsPAn2NoI
C0MzEmpQFi4LpWEjUhaGMYqyUINQjEtqGEqkcZkY4zLO1CGP73vPN2cujdtTv97vPd/7PL2ncyhZTTWE
TKjrn6UGUVRgVElhnlF/DamvzjJN36FmMkteHk8RbhYJODXQNwnXHkJgmrA2+I+A51VC1Et4WPlnwN4Y
4UQMX7gIV27C5ZzR+8TzZccfA/bHCUcTBL/YRtZd5x8DpKoqyrE+RMzGMME7YHDlG4WUGvtZMsRtJ8bV
@@ -4042,7 +4042,7 @@
<data name="bzd.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
jo6OzvH7yVk/OFHg0MnC/vfuhzOq6zrK76vzIrRtm3nf92sgBpdlieu6ZgCe5xmAXEot0zTZMABBXLiU
grRUVRWHYTATYpOfYR9kiGbMnQelUTu5wzmsoDWk796GOI6jGRDDzH0BxAyQ1Z5e4xhuGUSQWbkAaE2B
FMRN05h9uAD4JoHato1d9yjCOjOAH9Y+QggDOW5gwZdfEgR7iAf4YG53yq0eBADzjlWk/+QP2WXf9xmk
@@ -4052,7 +4052,7 @@
<data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
@@ -4062,7 +4062,7 @@
<data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
@@ -4077,7 +4077,7 @@
<data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
/QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList_Bad.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList_Bad.cs"
index 1756635..5effe0d 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList_Bad.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList_Bad.cs"
@@ -47,6 +47,7 @@
string sSql = "";
string sWhere = "";
+ bzd.Enabled = true;
if (frmCondition.SqlStr.Trim().Length == 0)
{
sSql = "Select top 5000 * from " + ViewName + " Where 1=1 " + sWhere + sDlgWhere + " order by hmainid desc ";
@@ -614,6 +615,8 @@
private void bzd_Click(object sender, EventArgs e)
{
+ //鐐瑰嚮鍚庡叆搴撴寜閽彉鐏�
+ bzd.Enabled = false;
//鏍规嵁閫変腑鐨勬暟鎹敓鎴愬寘瑁呭崟
int MainIDCol = Fun_GetCol("hmainid");
int SubIDCol = Fun_GetCol("hsubid");
@@ -629,6 +632,7 @@
if (oSystemParameter.ShowBill(ref DBUtility.ClsPub.sExeReturnInfo) == false)
{
MessageBox.Show("鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + DBUtility.ClsPub.sExeReturnInfo);
+ bzd.Enabled = true;
return;
}
//鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
@@ -638,6 +642,7 @@
if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(DateTime.Today, ref sYear, ref sPeriod, ref s) == false)
{
MessageBox.Show("浼氳鏈熼棿鏈夐敊璇紒 " + DBUtility.ClsPub.sExeReturnInfo);
+ bzd.Enabled = true;
return;
}
string sHInterID = "";
@@ -648,6 +653,7 @@
if (sHInterID=="")
{
MessageBox.Show("娌℃湁閫変腑鐨勫崟鎹槑缁嗚锛岃鍏堥�夋嫨瑕佸叆搴撶殑鍗曟嵁锛�", "鎻愮ず");
+ bzd.Enabled = true;
return;
}
else
@@ -656,6 +662,7 @@
if (DS == null || DS.Tables[0].Rows.Count == 0)
{
MessageBox.Show("鍏ュ簱鍓嶅垽鏂け璐ワ紒", "鎻愮ず");
+ bzd.Enabled = true;
return;
}
else
@@ -663,6 +670,7 @@
if (DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0][0]) == "1")
{
MessageBox.Show(DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0]["HRemark"]));
+ bzd.Enabled = true;
return;
}
}
@@ -707,6 +715,7 @@
System.Threading.Thread.Sleep(2000);
//
}
+ bzd.Enabled = true;
//
if (n > 0)
{
--
Gitblit v1.9.1