From b590f1374c4e48133a17c77bac8e9797811975ee Mon Sep 17 00:00:00 2001
From: 杨乐 <杨乐@DESKTOP-5CU1TNO>
Date: 星期二, 15 三月 2022 08:26:06 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
BaseSet/公用资料/生产基础资料/Gy_Process.cs | 73 +
WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs | 28
WebAPI/Properties/Settings.settings | 2
WebAPI/Web References/WebS/WebService1.wsdl | 103 +
WarM/条码打印/Sc_ICMOToBarCode.cs | 740 ++++++++++-
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 74
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 2
WebAPI/WebAPI.csproj.user | 2
WarM/WarM.csproj.user | 1
DAL/车间管理/ClsSc_ProcessExchangeBill.cs | 4
BaseSet/公用资料/生产基础资料/Gy_Process.resx | 116 +
WarM/仓库管理/Kf_MoveStockRequestBillList.cs | 27
WarM/仓库管理/Kf_MoveStockRequestBillList.resx | 584 +++-----
WebAPI/Web References/WebS/Reference.cs | 164 ++
WebAPI/Web.config | 6
WarM/条码打印/Gy_BarCodeBill.resx | 32
Model/基础资料/基础资料/ClsGy_Process_Model.cs | 4
WebAPI/Properties/Settings.Designer.cs | 4
BaseSet/公用资料/生产基础资料/Gy_Process.designer.cs | 186 ++
WorkM/报表分析/Mes_WIPSumReportDateReport.Designer.cs | 53
WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs | 1
WarM/条码打印/Sc_ICMOToBarCode.designer.cs | 386 +++--
WarM/仓库管理/Kf_MoveStockRequestBillList.designer.cs | 191 ++-
WebAPI/Controllers/Sc_PckSplitBillController.cs | 120 +
WebAPI/Controllers/基础资料/基础资料/Gy_StockCheckItemBillController.cs | 8
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs | 8
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs | 2
WebAPI/Controllers/WebAPIController.cs | 150 ++
WebAPI/InvokeHelper.cs | 20
WebAPI/Web References/WebS/Reference.map | 4
WebAPI/Controllers/POStockInBillController.cs | 63
WebAPI/Controllers/生产管理/报工台工序/Sc_MESBeginStepWorkBillController.cs | 195 +++
WebAPI/Web References/WebS/WebService1.disco | 6
WarM/条码打印/Sc_ICMOToBarCode.resx | 8
WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs | 6
WebAPI/Controllers/工资管理/Pay_WorkTimesBillController.cs | 45
WorkM/报表分析/Mes_WIPSumReportDateReport.resx | 8
WebAPI/Controllers/工资管理/Pay_SingleBalBillController.cs | 31
WarM/条码打印/Gy_BarCodeBill.designer.cs | 284 ++--
DAL/基础资料/公用基础资料/ClsGy_Process_Ctl.cs | 6
DAL/基础资料/公用基础资料/ClsGy_Process_View.cs | 2
WebAPI/WebAPI.csproj | 4
42 files changed, 2,718 insertions(+), 1,035 deletions(-)
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.cs" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.cs"
index bc9b30b..85ab8e1 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.cs"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.cs"
@@ -513,6 +513,26 @@
txtHBadCountDevelopWHID.Text = "";
}
//
+ if (oWH.GetInfoByID(oProcHlp.omodel.HWWBadWHID))
+ {
+ txtHWWBadWHID.Text = oWH.omodel.HName;
+ txtHWWBadWHID.Tag = oWH.omodel.HItemID.ToString();
+ }
+ else
+ {
+ txtHWWBadWHID.Text = "";
+ }
+ //
+ if (oWH.GetInfoByID(oProcHlp.omodel.HWWWasterWHID))
+ {
+ txtHWWWasterWHID.Text = oWH.omodel.HName;
+ txtHWWWasterWHID.Tag = oWH.omodel.HItemID.ToString();
+ }
+ else
+ {
+ txtHWWWasterWHID.Text = "";
+ }
+ //
txtHNumber.Text = oProcHlp.omodel.HNumber.ToString();
txtHRemark.Text = oProcHlp.omodel.HRemark;
txtHProcCheckNote.Text = oProcHlp.omodel.HProcCheckNote;
@@ -620,6 +640,8 @@
oProc.oModel.HBadWHID = DBUtility.ClsPub.isLong(txtHBadWHID.Tag.ToString());
oProc.oModel.HWasterWHID = DBUtility.ClsPub.isLong(txtHWasterWHID.Tag.ToString());
oProc.oModel.HBadCountDevelopWHID = DBUtility.ClsPub.isLong(txtHBadCountDevelopWHID.Tag.ToString());
+ oProc.oModel.HWWBadWHID = DBUtility.ClsPub.isLong(txtHWWBadWHID.Tag.ToString());
+ oProc.oModel.HWWWasterWHID = DBUtility.ClsPub.isLong(txtHWWWasterWHID.Tag.ToString());
oProc.oModel.HTypeFlow = chkHTypeFlow.Checked;
oProc.oModel.HTypeCount = chkHTypeCount.Checked;
oProc.oModel.HAutoTrunFlag = chkHAutoTrunFlag.Checked;
@@ -785,5 +807,56 @@
}
}
+ //濮斿涓嶈壇鍝佷粨
+ private void cmdHWWBadWHID_Click(object sender, EventArgs e)
+ {
+ DAL.ClsGy_Warehouse_View oWare = new DAL.ClsGy_Warehouse_View();
+ if (oWare.RefreshView())
+ {
+ this.txtHWWBadWHID.Text = oWare.oModel.HName;
+ this.txtHWWBadWHID.Tag = oWare.oModel.HItemID.ToString();
+ }
+ else
+ {
+ this.txtHWWBadWHID.Text = "";
+ }
+ }
+
+ private void txtHWWBadWHID_TextChanged(object sender, EventArgs e)
+ {
+ if (txtHWWBadWHID.Text.Length == 0)
+ {
+ txtHWWBadWHID.Tag = "0";
+ }
+ }
+
+ //濮斿鎶ュ簾浠�
+ private void cmdHWWWasterWHID_Click(object sender, EventArgs e)
+ {
+ DAL.ClsGy_Warehouse_View oWare = new DAL.ClsGy_Warehouse_View();
+ if (oWare.RefreshView())
+ {
+ this.txtHWWWasterWHID.Text = oWare.oModel.HName;
+ this.txtHWWWasterWHID.Tag = oWare.oModel.HItemID.ToString();
+ }
+ else
+ {
+ this.txtHWWWasterWHID.Text = "";
+ }
+ }
+
+ private void txtHWWWasterWHID_TextChanged(object sender, EventArgs e)
+ {
+ if (txtHWWWasterWHID.Text.Length == 0)
+ {
+ txtHWWWasterWHID.Tag = "0";
+ }
+ }
+
+
+
+
+
+
}
}
\ No newline at end of file
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.designer.cs" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.designer.cs"
index 9a3c0cb..35b5ee5 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.designer.cs"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.designer.cs"
@@ -30,7 +30,7 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Gy_Process));
- System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("椤圭洰");
+ System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("椤圭洰");
this.ToolBar = new System.Windows.Forms.ToolStrip();
this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
this.dc = new System.Windows.Forms.ToolStripButton();
@@ -58,6 +58,9 @@
this.tabPage1 = new System.Windows.Forms.TabPage();
this.grdMain = new System.Windows.Forms.DataGridView();
this.tabPage2 = new System.Windows.Forms.TabPage();
+ this.txtHBadCountDevelopWHID = new System.Windows.Forms.TextBox();
+ this.cmdHBadCountDevelopWHID = new System.Windows.Forms.Button();
+ this.label17 = new System.Windows.Forms.Label();
this.cmdHWasterWHID = new System.Windows.Forms.Button();
this.label16 = new System.Windows.Forms.Label();
this.txtHWasterWHID = new System.Windows.Forms.TextBox();
@@ -107,9 +110,12 @@
this.panel1 = new System.Windows.Forms.Panel();
this.cmdLoadTree = new System.Windows.Forms.Button();
this.label3 = new System.Windows.Forms.Label();
- this.cmdHBadCountDevelopWHID = new System.Windows.Forms.Button();
- this.label17 = new System.Windows.Forms.Label();
- this.txtHBadCountDevelopWHID = new System.Windows.Forms.TextBox();
+ this.cmdHWWWasterWHID = new System.Windows.Forms.Button();
+ this.label18 = new System.Windows.Forms.Label();
+ this.txtHWWWasterWHID = new System.Windows.Forms.TextBox();
+ this.cmdHWWBadWHID = new System.Windows.Forms.Button();
+ this.label19 = new System.Windows.Forms.Label();
+ this.txtHWWBadWHID = new System.Windows.Forms.TextBox();
this.ToolBar.SuspendLayout();
this.stTab.SuspendLayout();
this.tabPage1.SuspendLayout();
@@ -399,7 +405,7 @@
this.tabPage1.Controls.Add(this.grdMain);
this.tabPage1.Location = new System.Drawing.Point(4, 22);
this.tabPage1.Name = "tabPage1";
- this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(729, 469);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "鍒楄〃瑙嗗浘";
@@ -425,6 +431,12 @@
//
this.tabPage2.BackColor = System.Drawing.SystemColors.Control;
this.tabPage2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.tabPage2.Controls.Add(this.txtHWWBadWHID);
+ this.tabPage2.Controls.Add(this.cmdHWWWasterWHID);
+ this.tabPage2.Controls.Add(this.label18);
+ this.tabPage2.Controls.Add(this.txtHWWWasterWHID);
+ this.tabPage2.Controls.Add(this.cmdHWWBadWHID);
+ this.tabPage2.Controls.Add(this.label19);
this.tabPage2.Controls.Add(this.txtHBadCountDevelopWHID);
this.tabPage2.Controls.Add(this.cmdHBadCountDevelopWHID);
this.tabPage2.Controls.Add(this.label17);
@@ -473,10 +485,43 @@
this.tabPage2.Controls.Add(this.label1);
this.tabPage2.Location = new System.Drawing.Point(4, 22);
this.tabPage2.Name = "tabPage2";
- this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(729, 469);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "鍗曞紶瑙嗗浘";
+ //
+ // txtHBadCountDevelopWHID
+ //
+ this.txtHBadCountDevelopWHID.BackColor = System.Drawing.SystemColors.Window;
+ this.txtHBadCountDevelopWHID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHBadCountDevelopWHID.Location = new System.Drawing.Point(77, 199);
+ this.txtHBadCountDevelopWHID.Name = "txtHBadCountDevelopWHID";
+ this.txtHBadCountDevelopWHID.Size = new System.Drawing.Size(144, 21);
+ this.txtHBadCountDevelopWHID.TabIndex = 226;
+ this.txtHBadCountDevelopWHID.Tag = "0";
+ this.txtHBadCountDevelopWHID.TextChanged += new System.EventHandler(this.txtHBadCountDevelopWHID_TextChanged);
+ //
+ // cmdHBadCountDevelopWHID
+ //
+ this.cmdHBadCountDevelopWHID.BackColor = System.Drawing.Color.Transparent;
+ this.cmdHBadCountDevelopWHID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHBadCountDevelopWHID.Image")));
+ this.cmdHBadCountDevelopWHID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
+ this.cmdHBadCountDevelopWHID.Location = new System.Drawing.Point(221, 198);
+ this.cmdHBadCountDevelopWHID.Name = "cmdHBadCountDevelopWHID";
+ this.cmdHBadCountDevelopWHID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHBadCountDevelopWHID.TabIndex = 227;
+ this.cmdHBadCountDevelopWHID.UseVisualStyleBackColor = false;
+ this.cmdHBadCountDevelopWHID.Click += new System.EventHandler(this.cmdHBadCountDevelopWHID_Click);
+ //
+ // label17
+ //
+ this.label17.AutoSize = true;
+ this.label17.ForeColor = System.Drawing.Color.Black;
+ this.label17.Location = new System.Drawing.Point(2, 203);
+ this.label17.Name = "label17";
+ this.label17.Size = new System.Drawing.Size(77, 12);
+ this.label17.TabIndex = 225;
+ this.label17.Text = "鐮斿彂涓嶈壇鍝佷粨";
//
// cmdHWasterWHID
//
@@ -494,7 +539,7 @@
//
this.label16.AutoSize = true;
this.label16.ForeColor = System.Drawing.Color.Black;
- this.label16.Location = new System.Drawing.Point(284, 176);
+ this.label16.Location = new System.Drawing.Point(296, 176);
this.label16.Name = "label16";
this.label16.Size = new System.Drawing.Size(41, 12);
this.label16.TabIndex = 222;
@@ -547,7 +592,7 @@
// txtHProcCheckNote
//
this.txtHProcCheckNote.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHProcCheckNote.Location = new System.Drawing.Point(77, 294);
+ this.txtHProcCheckNote.Location = new System.Drawing.Point(77, 321);
this.txtHProcCheckNote.Multiline = true;
this.txtHProcCheckNote.Name = "txtHProcCheckNote";
this.txtHProcCheckNote.Size = new System.Drawing.Size(431, 60);
@@ -556,7 +601,7 @@
// label14
//
this.label14.AutoSize = true;
- this.label14.Location = new System.Drawing.Point(19, 298);
+ this.label14.Location = new System.Drawing.Point(19, 325);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(53, 36);
this.label14.TabIndex = 217;
@@ -654,7 +699,7 @@
// chkHAutoTrunFlag
//
this.chkHAutoTrunFlag.AutoSize = true;
- this.chkHAutoTrunFlag.Location = new System.Drawing.Point(335, 361);
+ this.chkHAutoTrunFlag.Location = new System.Drawing.Point(335, 388);
this.chkHAutoTrunFlag.Name = "chkHAutoTrunFlag";
this.chkHAutoTrunFlag.Size = new System.Drawing.Size(72, 16);
this.chkHAutoTrunFlag.TabIndex = 205;
@@ -677,7 +722,7 @@
//
this.label9.AutoSize = true;
this.label9.ForeColor = System.Drawing.Color.Black;
- this.label9.Location = new System.Drawing.Point(284, 149);
+ this.label9.Location = new System.Drawing.Point(278, 149);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(59, 12);
this.label9.TabIndex = 202;
@@ -731,7 +776,7 @@
// chkHTypeCount
//
this.chkHTypeCount.AutoSize = true;
- this.chkHTypeCount.Location = new System.Drawing.Point(250, 361);
+ this.chkHTypeCount.Location = new System.Drawing.Point(250, 388);
this.chkHTypeCount.Name = "chkHTypeCount";
this.chkHTypeCount.Size = new System.Drawing.Size(72, 16);
this.chkHTypeCount.TabIndex = 197;
@@ -741,7 +786,7 @@
// chkHTypeFlow
//
this.chkHTypeFlow.AutoSize = true;
- this.chkHTypeFlow.Location = new System.Drawing.Point(164, 361);
+ this.chkHTypeFlow.Location = new System.Drawing.Point(164, 388);
this.chkHTypeFlow.Name = "chkHTypeFlow";
this.chkHTypeFlow.Size = new System.Drawing.Size(72, 16);
this.chkHTypeFlow.TabIndex = 196;
@@ -818,7 +863,7 @@
//
// cmdCancel
//
- this.cmdCancel.Location = new System.Drawing.Point(457, 390);
+ this.cmdCancel.Location = new System.Drawing.Point(457, 417);
this.cmdCancel.Name = "cmdCancel";
this.cmdCancel.Size = new System.Drawing.Size(52, 23);
this.cmdCancel.TabIndex = 16;
@@ -828,7 +873,7 @@
//
// cmdOK
//
- this.cmdOK.Location = new System.Drawing.Point(398, 390);
+ this.cmdOK.Location = new System.Drawing.Point(398, 417);
this.cmdOK.Name = "cmdOK";
this.cmdOK.Size = new System.Drawing.Size(52, 23);
this.cmdOK.TabIndex = 15;
@@ -839,7 +884,7 @@
// chkHStopflag
//
this.chkHStopflag.AutoSize = true;
- this.chkHStopflag.Location = new System.Drawing.Point(77, 361);
+ this.chkHStopflag.Location = new System.Drawing.Point(77, 388);
this.chkHStopflag.Name = "chkHStopflag";
this.chkHStopflag.Size = new System.Drawing.Size(72, 16);
this.chkHStopflag.TabIndex = 12;
@@ -849,7 +894,7 @@
// txtHRemark
//
this.txtHRemark.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHRemark.Location = new System.Drawing.Point(77, 227);
+ this.txtHRemark.Location = new System.Drawing.Point(77, 254);
this.txtHRemark.Multiline = true;
this.txtHRemark.Name = "txtHRemark";
this.txtHRemark.Size = new System.Drawing.Size(431, 60);
@@ -858,7 +903,7 @@
// label5
//
this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(19, 227);
+ this.label5.Location = new System.Drawing.Point(19, 254);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(53, 12);
this.label5.TabIndex = 9;
@@ -934,13 +979,13 @@
this.tv.LineColor = System.Drawing.Color.Navy;
this.tv.Location = new System.Drawing.Point(0, 23);
this.tv.Name = "tv";
- treeNode2.ForeColor = System.Drawing.Color.Black;
- treeNode2.Name = "tjbb";
- treeNode2.NodeFont = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- treeNode2.StateImageKey = "鏂囦欢澶�1.ico";
- treeNode2.Text = "椤圭洰";
+ treeNode1.ForeColor = System.Drawing.Color.Black;
+ treeNode1.Name = "tjbb";
+ treeNode1.NodeFont = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ treeNode1.StateImageKey = "鏂囦欢澶�1.ico";
+ treeNode1.Text = "椤圭洰";
this.tv.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
- treeNode2});
+ treeNode1});
this.tv.SelectedImageIndex = 1;
this.tv.Size = new System.Drawing.Size(136, 472);
this.tv.TabIndex = 16;
@@ -977,38 +1022,71 @@
this.label3.TabIndex = 0;
this.label3.Text = "宸ュ簭璧勬枡-姝ｅ湪娴忚";
//
- // cmdHBadCountDevelopWHID
+ // cmdHWWWasterWHID
//
- this.cmdHBadCountDevelopWHID.BackColor = System.Drawing.Color.Transparent;
- this.cmdHBadCountDevelopWHID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHBadCountDevelopWHID.Image")));
- this.cmdHBadCountDevelopWHID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHBadCountDevelopWHID.Location = new System.Drawing.Point(221, 198);
- this.cmdHBadCountDevelopWHID.Name = "cmdHBadCountDevelopWHID";
- this.cmdHBadCountDevelopWHID.Size = new System.Drawing.Size(22, 22);
- this.cmdHBadCountDevelopWHID.TabIndex = 227;
- this.cmdHBadCountDevelopWHID.UseVisualStyleBackColor = false;
- this.cmdHBadCountDevelopWHID.Click += new System.EventHandler(this.cmdHBadCountDevelopWHID_Click);
+ this.cmdHWWWasterWHID.BackColor = System.Drawing.Color.Transparent;
+ this.cmdHWWWasterWHID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHWWWasterWHID.Image")));
+ this.cmdHWWWasterWHID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
+ this.cmdHWWWasterWHID.Location = new System.Drawing.Point(487, 225);
+ this.cmdHWWWasterWHID.Name = "cmdHWWWasterWHID";
+ this.cmdHWWWasterWHID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHWWWasterWHID.TabIndex = 233;
+ this.cmdHWWWasterWHID.UseVisualStyleBackColor = false;
+ this.cmdHWWWasterWHID.Click += new System.EventHandler(this.cmdHWWWasterWHID_Click);
//
- // label17
+ // label18
//
- this.label17.AutoSize = true;
- this.label17.ForeColor = System.Drawing.Color.Black;
- this.label17.Location = new System.Drawing.Point(1, 203);
- this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(77, 12);
- this.label17.TabIndex = 225;
- this.label17.Text = "鐮斿彂涓嶈壇鍝佷粨";
+ this.label18.AutoSize = true;
+ this.label18.ForeColor = System.Drawing.Color.Black;
+ this.label18.Location = new System.Drawing.Point(272, 230);
+ this.label18.Name = "label18";
+ this.label18.Size = new System.Drawing.Size(65, 12);
+ this.label18.TabIndex = 231;
+ this.label18.Text = "濮斿鎶ュ簾浠�";
//
- // txtHBadCountDevelopWHID
+ // txtHWWWasterWHID
//
- this.txtHBadCountDevelopWHID.BackColor = System.Drawing.SystemColors.Window;
- this.txtHBadCountDevelopWHID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHBadCountDevelopWHID.Location = new System.Drawing.Point(77, 199);
- this.txtHBadCountDevelopWHID.Name = "txtHBadCountDevelopWHID";
- this.txtHBadCountDevelopWHID.Size = new System.Drawing.Size(144, 21);
- this.txtHBadCountDevelopWHID.TabIndex = 226;
- this.txtHBadCountDevelopWHID.Tag = "0";
- this.txtHBadCountDevelopWHID.TextChanged += new System.EventHandler(this.txtHBadCountDevelopWHID_TextChanged);
+ this.txtHWWWasterWHID.BackColor = System.Drawing.SystemColors.Window;
+ this.txtHWWWasterWHID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHWWWasterWHID.Location = new System.Drawing.Point(343, 226);
+ this.txtHWWWasterWHID.Name = "txtHWWWasterWHID";
+ this.txtHWWWasterWHID.Size = new System.Drawing.Size(144, 21);
+ this.txtHWWWasterWHID.TabIndex = 232;
+ this.txtHWWWasterWHID.Tag = "0";
+ this.txtHWWWasterWHID.TextChanged += new System.EventHandler(this.txtHWWWasterWHID_TextChanged);
+ //
+ // cmdHWWBadWHID
+ //
+ this.cmdHWWBadWHID.BackColor = System.Drawing.Color.Transparent;
+ this.cmdHWWBadWHID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHWWBadWHID.Image")));
+ this.cmdHWWBadWHID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
+ this.cmdHWWBadWHID.Location = new System.Drawing.Point(221, 225);
+ this.cmdHWWBadWHID.Name = "cmdHWWBadWHID";
+ this.cmdHWWBadWHID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHWWBadWHID.TabIndex = 230;
+ this.cmdHWWBadWHID.UseVisualStyleBackColor = false;
+ this.cmdHWWBadWHID.Click += new System.EventHandler(this.cmdHWWBadWHID_Click);
+ //
+ // label19
+ //
+ this.label19.AutoSize = true;
+ this.label19.ForeColor = System.Drawing.Color.Black;
+ this.label19.Location = new System.Drawing.Point(2, 230);
+ this.label19.Name = "label19";
+ this.label19.Size = new System.Drawing.Size(77, 12);
+ this.label19.TabIndex = 228;
+ this.label19.Text = "濮斿涓嶈壇鍝佷粨";
+ //
+ // txtHWWBadWHID
+ //
+ this.txtHWWBadWHID.BackColor = System.Drawing.SystemColors.Window;
+ this.txtHWWBadWHID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHWWBadWHID.Location = new System.Drawing.Point(77, 226);
+ this.txtHWWBadWHID.Name = "txtHWWBadWHID";
+ this.txtHWWBadWHID.Size = new System.Drawing.Size(144, 21);
+ this.txtHWWBadWHID.TabIndex = 229;
+ this.txtHWWBadWHID.Tag = "0";
+ this.txtHWWBadWHID.TextChanged += new System.EventHandler(this.txtHWWBadWHID_TextChanged);
//
// Gy_Process
//
@@ -1121,5 +1199,11 @@
private System.Windows.Forms.TextBox txtHBadCountDevelopWHID;
private System.Windows.Forms.Button cmdHBadCountDevelopWHID;
private System.Windows.Forms.Label label17;
+ private System.Windows.Forms.TextBox txtHWWBadWHID;
+ private System.Windows.Forms.Button cmdHWWWasterWHID;
+ private System.Windows.Forms.Label label18;
+ private System.Windows.Forms.TextBox txtHWWWasterWHID;
+ private System.Windows.Forms.Button cmdHWWBadWHID;
+ private System.Windows.Forms.Label label19;
}
}
\ No newline at end of file
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.resx" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.resx"
index fe1e873..e5d29aa 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.resx"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.resx"
@@ -409,51 +409,81 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACE
- CgAAAk1TRnQBSQFMAgEBAgEAAXQBAQF0AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+ CgAAAk1TRnQBSQFMAgEBAgEAAXwBAQF8AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
AwABEAMAAQEBAAEgBgABEBIAgP+AAAj/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
AwAB/wMAAf8DAAH/AwAB/wMADf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
- AwAB/wMAAf8DAAH/gAAE/wEAATgBigH/AQMBkAG5Af8BAwGQAbkB/wEDAZABuQH/AQMBkAG5Af8BAwGQ
- AbkB/wEDAZABuQH/AQMBkAG5Af8BAwGQAbkB/wEDAZABuQH/AQMBkAG5Af8BAwGQAbkB/wEDAZABuQH/
- AQMBkAG5Af8DAAn/AQABOAGKAf8BAAE4AYoB/wEAATgBigH/AQABOAGKAf8BAAE4AYoB/wEAATgBigH/
- AQABOAGKAf8BAAE4AYoB/wEAATgBigH/AQABOAGKAf8BAAE4AYoB/wEAATgBigH/AwAB/wMAAf+AAAT/
- AQABOAGKAf8B0QH2Av8BSgHaAfQB/wE/AdMB8QH/ATQBywHvAf8BKgHEAe0B/wEgAb4B6wH/ARYBuAHo
- Af8BCgGwAecB/wEAAakB5AH/AQABowHiAf8BAAGeAeAB/wEAAZoB3wH/AQMBkAG5Af8DAAn/AQABOAGK
- Af8B0QH2Av8BHwG+AesB/wEZAbkB6QH/AREBtAHnAf8BCQGwAeYB/wECAasB5AH/AQABpwHjAf8BAAGi
- AeEB/wEAAZ8B4QH/AQMBkAG5Af8BAAE4AYoB/wMAAf8DAAH/gAAE/wEAATgBigH/AdEB9gL/AVAB3gH1
- Af8BRQHWAfMB/wE7AdAB8QH/ATAByQHuAf8BJgHCAewB/wEbAbwB6gH/AREBtAHnAf8BBgGtAeUB/wEA
- AaYB4wH/AQABoQHhAf8BAAGdAeAB/wEDAZABuQH/AwAF/wEAATgBigH/AdEB9gL/ASoBxQHuAf8BJAHB
- AesB/wEdAbwB6wH/ARUBtwHoAf8BDgGyAecB/wEGAa4B5QH/AQABqQHkAf8BAAGlAeIB/wEAAaEB4QH/
- AQMBkAG5Af8DAAH/AQABOAGKAf8DAAH/gAAE/wEAATgBigH/AdEB9gL/AYEB4QH3Af8BTAHaAfQB/wFB
- AdQB8gH/ATYBzAHvAf8BLAHGAe4B/wEiAcAB6wH/ARcBuQHpAf8BDQGyAeYB/wECAasB5QH/AQABpQHi
- Af8BAAGfAeEB/wEDAZABuQH/AwAF/wEAATgBigH/AdEB9gL/AS8ByAHuAf8BKAHEAewB/wEhAb8B6wH/
- ARoBuwHqAf8BEwG2AegB/wELAbAB5wH/AQQBrAHlAf8BAAGnAeMB/wEAAaMB4gH/AQABOAGKAf8DAAH/
- AQABOAGKAf8DAAH/gAAE/wEAATgBigH/AdEB9gL/AYYB5QH3Af8BUgHfAfUB/wFHAdgB8wH/AT0B0QHx
- Af8BMgHKAe8B/wEoAcQB7QH/AR4BvQHqAf8BEwG2AegB/wEIAa8B5QH/AQABqAHjAf8BAAGiAeEB/wED
- AZABuQH/AwAB/wEAATgBigH/AdEB9gL/ATsBzwHxAf8BNAHLAe8B/wEsAccB7gH/ASYBwgHsAf8BHwG9
- AeoB/wEXAbkB6QH/ARABtAHnAf8BCQGwAeYB/wEBAaoB5QH/AQMBkAG5Af8DAAH/AQMBkAG5Af8BAwGQ
- AbkB/wMAAf+AAAT/AQABOAGKAf8B0QH2Av8BjAHoAfkB/wGDAeIB9wH/AU4B3AH1Af8BRAHVAfIB/wE4
- Ac4B8AH/AS4ByAHuAf8BJAHBAewB/wEaAboB6gH/AQ4BswHnAf8BBAGsAeUB/wEAAaYB4wH/AQMBkAG5
- Af8DAAH/AQABOAGKAf8B0QH2Av8BQAHTAfIB/wE4Ac4B8AH/ATEBygHuAf8BKgHFAe0B/wEkAcEB6wH/
- ARwBvAHqAf8BFQG3AegB/wENAbIB5gH/AQYBrgHlAf8BAwGQAbkB/wMAAf8BAwGQAbkB/wEDAZABuQH/
- AwAB/4AABP8BAAE4AYoB/wHRAfYC/wGQAesB+QH/AYgB5gH4Af8BVAHgAfYB/wFKAdkB8wH/AT8B0wHy
- Af8BNAHLAe8B/wEqAcUB7QH/ASABvgHrAf8BFgG4AekB/wEKAbAB5gH/AQABqQHkAf8BAwGQAbkB/wMA
- Af8BAAE4AYoB/wEAATgBigH/AQABOAGKAf8BAAE4AYoB/wEAATgBigH/AQABOAGKAf8BAAE4AYoB/wEA
- ATgBigH/AQABOAGKAf8BAAE4AYoB/wEAATgBigH/AQABOAGKAf8BAwGQAbkB/wExAckB7gH/AQMBkAG5
- Af8DAAH/gAAE/wEAATgBigH/AdEB9gL/AZMB7QH6Af8BjQHpAfkB/wGFAeQB9wH/AVEB3gH1Af8BRQHW
- AfMB/wE7Ac8B8QH/ATAByQHvAf8BJgHCAewB/wEcAbsB6QH/AREBtQHnAf8BBgGtAeYB/wEDAZABuQH/
- AwAF/wEAATgBigH/AdEB9gL/AZEB7AH6Af8BjQHpAfkB/wGKAecB+AH/AYYB5AH4Af8BgQHhAfcB/wFR
- Ad0B9QH/AUsB2gHzAf8BRQHXAfMB/wFAAdMB8QH/AToBzwHxAf8BNAHLAe8B/wEDAZABuQH/AwAB/4AA
- BP8BAAE4AYoB/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHR
- AfYC/wHRAfYC/wHRAfYC/wHRAfYC/wEDAZABuQH/AwAF/wEAATgBigH/AdEB9gL/AZMB7QH6Af8BkAHr
- AfkB/wGMAekB+QH/AYgB5gH4Af8BhAHjAfcB/wFUAeAB9gH/AU8B3AH1Af8B0QH2Av8B0QH2Av8B0QH2
- Av8B0QH2Av8BAwGQAbkB/wMAAf+AAAT/AQABOAGKAf8BFgGoAdMB/wEWAagB0wH/ARYBqAHTAf8BFgGo
- AdMB/wEWAagB0wH/ARYBqAHTAf8BFgGoAdMB/wEAATgBigH/AQABOAGKAf8BAAE4AYoB/wEAATgBigH/
- AQABOAGKAf8BAAE4AYoJ/wEAATgBigH/AdEB9gL/AZMB7QH6Af8BkgHsAfoB/wGPAesB+QH/AYsB6AH4
- Af8BhwHlAfcB/wHRAfYC/wEAATgBigH/AQABOAGKAf8BAAE4AYoB/wEAATgBigH/AQABOAGKAf8BAAE4
- AYoF/4AACP8BAAE4AYoB/wG4AegB9QH/Ac4D/wHOA/8BnAP/AZwD/wEAATgBigH/AwAh/wEAATgBigH/
- AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AQABOAGKHf+AAAz/AQABOAGKAf8BAAE4AYoB/wEA
- ATgBigH/AQABOAGKAf8BAAE4AYoB/wMAKf8BAAE4AYoB/wEAATgBigH/AQABOAGKAf8BAAE4AYoB/wEA
- ATgBiiH/gACA/4AAgP+AAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/gQAL
+ AwAB/wMAAf8DAAH/gAAE/wEAATcBigH/AQIBkAG5Af8BAgGQAbkB/wECAZABuQH/AQIBkAG5Af8BAgGQ
+ AbkB/wECAZABuQH/AQIBkAG5Af8BAgGQAbkB/wECAZABuQH/AQIBkAG5Af8BAgGQAbkB/wECAZABuQH/
+ AQIBkAG5Af8DAAn/AQABNwGKAf8BAAE3AYoB/wEAATcBigH/AQABNwGKAf8BAAE3AYoB/wEAATcBigH/
+ AQABNwGKAf8BAAE3AYoB/wEAATcBigH/AQABNwGKAf8BAAE3AYoB/wEAATcBigH/AwAB/wMAAf+AAAT/
+ AQABNwGKAf8B0QH2Av8BSQHaAfQB/wE+AdMB8QH/ATMBywHvAf8BKQHEAe0B/wEfAb4B6wH/ARUBuAHo
+ Af8BCQGwAecB/wEAAakB5AH/AQABowHiAf8BAAGeAeAB/wEAAZoB3wH/AQIBkAG5Af8DAAn/AQABNwGK
+ Af8B0QH2Av8BHgG+AesB/wEYAbkB6QH/ARABtAHnAf8BCAGwAeYB/wEBAasB5AH/AQABpwHjAf8BAAGi
+ AeEB/wEAAZ8B4QH/AQIBkAG5Af8BAAE3AYoB/wMAAf8DAAH/gAAE/wEAATcBigH/AdEB9gL/AU8B3gH1
+ Af8BRAHWAfMB/wE6AdAB8QH/AS8ByQHuAf8BJQHCAewB/wEaAbwB6gH/ARABtAHnAf8BBQGtAeUB/wEA
+ AaYB4wH/AQABoQHhAf8BAAGdAeAB/wECAZABuQH/AwAF/wEAATcBigH/AdEB9gL/ASkBxQHuAf8BIwHB
+ AesB/wEcAbwB6wH/ARQBtwHoAf8BDQGyAecB/wEFAa4B5QH/AQABqQHkAf8BAAGlAeIB/wEAAaEB4QH/
+ AQIBkAG5Af8DAAH/AQABNwGKAf8DAAH/gAAE/wEAATcBigH/AdEB9gL/AYEB4QH3Af8BSwHaAfQB/wFA
+ AdQB8gH/ATUBzAHvAf8BKwHGAe4B/wEhAcAB6wH/ARYBuQHpAf8BDAGyAeYB/wEBAasB5QH/AQABpQHi
+ Af8BAAGfAeEB/wECAZABuQH/AwAF/wEAATcBigH/AdEB9gL/AS4ByAHuAf8BJwHEAewB/wEgAb8B6wH/
+ ARkBuwHqAf8BEgG2AegB/wEKAbAB5wH/AQMBrAHlAf8BAAGnAeMB/wEAAaMB4gH/AQABNwGKAf8DAAH/
+ AQABNwGKAf8DAAH/gAAE/wEAATcBigH/AdEB9gL/AYYB5QH3Af8BUQHfAfUB/wFGAdgB8wH/ATwB0QHx
+ Af8BMQHKAe8B/wEnAcQB7QH/AR0BvQHqAf8BEgG2AegB/wEHAa8B5QH/AQABqAHjAf8BAAGiAeEB/wEC
+ AZABuQH/AwAB/wEAATcBigH/AdEB9gL/AToBzwHxAf8BMwHLAe8B/wErAccB7gH/ASUBwgHsAf8BHgG9
+ AeoB/wEWAbkB6QH/AQ8BtAHnAf8BCAGwAeYB/wEAAaoB5QH/AQIBkAG5Af8DAAH/AQIBkAG5Af8BAgGQ
+ AbkB/wMAAf+AAAT/AQABNwGKAf8B0QH2Av8BjAHoAfkB/wGDAeIB9wH/AU0B3AH1Af8BQwHVAfIB/wE3
+ Ac4B8AH/AS0ByAHuAf8BIwHBAewB/wEZAboB6gH/AQ0BswHnAf8BAwGsAeUB/wEAAaYB4wH/AQIBkAG5
+ Af8DAAH/AQABNwGKAf8B0QH2Av8BPwHTAfIB/wE3Ac4B8AH/ATABygHuAf8BKQHFAe0B/wEjAcEB6wH/
+ ARsBvAHqAf8BFAG3AegB/wEMAbIB5gH/AQUBrgHlAf8BAgGQAbkB/wMAAf8BAgGQAbkB/wECAZABuQH/
+ AwAB/4AABP8BAAE3AYoB/wHRAfYC/wGQAesB+QH/AYgB5gH4Af8BUwHgAfYB/wFJAdkB8wH/AT4B0wHy
+ Af8BMwHLAe8B/wEpAcUB7QH/AR8BvgHrAf8BFQG4AekB/wEJAbAB5gH/AQABqQHkAf8BAgGQAbkB/wMA
+ Af8BAAE3AYoB/wEAATcBigH/AQABNwGKAf8BAAE3AYoB/wEAATcBigH/AQABNwGKAf8BAAE3AYoB/wEA
+ ATcBigH/AQABNwGKAf8BAAE3AYoB/wEAATcBigH/AQABNwGKAf8BAgGQAbkB/wEwAckB7gH/AQIBkAG5
+ Af8DAAH/gAAE/wEAATcBigH/AdEB9gL/AZMB7QH6Af8BjQHpAfkB/wGFAeQB9wH/AVAB3gH1Af8BRAHW
+ AfMB/wE6Ac8B8QH/AS8ByQHvAf8BJQHCAewB/wEbAbsB6QH/ARABtQHnAf8BBQGtAeYB/wECAZABuQH/
+ AwAF/wEAATcBigH/AdEB9gL/AZEB7AH6Af8BjQHpAfkB/wGKAecB+AH/AYYB5AH4Af8BgQHhAfcB/wFQ
+ Ad0B9QH/AUoB2gHzAf8BRAHXAfMB/wE/AdMB8QH/ATkBzwHxAf8BMwHLAe8B/wECAZABuQH/AwAB/4AA
+ BP8BAAE3AYoB/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHR
+ AfYC/wHRAfYC/wHRAfYC/wHRAfYC/wECAZABuQH/AwAF/wEAATcBigH/AdEB9gL/AZMB7QH6Af8BkAHr
+ AfkB/wGMAekB+QH/AYgB5gH4Af8BhAHjAfcB/wFTAeAB9gH/AU4B3AH1Af8B0QH2Av8B0QH2Av8B0QH2
+ Av8B0QH2Av8BAgGQAbkB/wMAAf+AAAT/AQABNwGKAf8BFQGoAdMB/wEVAagB0wH/ARUBqAHTAf8BFQGo
+ AdMB/wEVAagB0wH/ARUBqAHTAf8BFQGoAdMB/wEAATcBigH/AQABNwGKAf8BAAE3AYoB/wEAATcBigH/
+ AQABNwGKAf8BAAE3AYoJ/wEAATcBigH/AdEB9gL/AZMB7QH6Af8BkgHsAfoB/wGPAesB+QH/AYsB6AH4
+ Af8BhwHlAfcB/wHRAfYC/wEAATcBigH/AQABNwGKAf8BAAE3AYoB/wEAATcBigH/AQABNwGKAf8BAAE3
+ AYoF/4AACP8BAAE3AYoB/wG4AegB9QH/Ac4D/wHOA/8BnAP/AZwD/wEAATcBigH/AwAh/wEAATcBigH/
+ AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AQABNwGKHf+AAAz/AQABNwGKAf8BAAE3AYoB/wEA
+ ATcBigH/AQABNwGKAf8BAAE3AYoB/wMAKf8BAAE3AYoB/wEAATcBigH/AQABNwGKAf8BAAE3AYoB/wEA
+ ATcBiiH/gACA/4AAgP+AAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/gQAL
+</value>
+ </data>
+ <data name="cmdHWWWasterWHID.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ R0lGODlhEAAQAIYAAAAzmQBmzP///1o7AJlmAOazAMTz/9mmAEW5//nNT+W5ToPV/5TW/cyZAAyf/7Dp
+ /yOn/2jD/q3h/le8/sz3/5zg/7bt/73l/7Xs/2fH/4DT///bnZXb/97//2rK/wWb/8np/6zf/1S//77x
+ /73w/8Xv/1+//wmc/1jA/5Db/5LV/6rn/6Xb/zCt/33O/9X3/4LO/7jj/4PT/x+m/7nk/3XP/3PJ/3bQ
+ /6Tb/5Td/zCv/3fM/029/4za/6Pf/ZHc/6Pk/////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
+ AABBACwAAAAAEAAQAAAIqACDCBwoMIDBAAQTBjEYIcKECQYVLmQQ44KJFhBmQECYMAAOEAJYnPjgwAHH
+ gQEYqAhBA4YOBDwQIDg5cYcLGyg8LOixYAFNABJkZBBRI8cDEg98ACAIlIOGGylWGOhgwMBSphUq/ACC
+ wQAFClcFEiAAQICAEhZGvDAbloCCDQUAlDUrQO5AtwkKHBgQRK7duwryHmjAV2IQAoIJGxY4QK/ixYwH
+ FIYcEAA7
+</value>
+ </data>
+ <data name="cmdHWWBadWHID.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ R0lGODlhEAAQAIYAAAAzmQBmzP///1o7AJlmAOazAMTz/9mmAEW5//nNT+W5ToPV/5TW/cyZAAyf/7Dp
+ /yOn/2jD/q3h/le8/sz3/5zg/7bt/73l/7Xs/2fH/4DT///bnZXb/97//2rK/wWb/8np/6zf/1S//77x
+ /73w/8Xv/1+//wmc/1jA/5Db/5LV/6rn/6Xb/zCt/33O/9X3/4LO/7jj/4PT/x+m/7nk/3XP/3PJ/3bQ
+ /6Tb/5Td/zCv/3fM/029/4za/6Pf/ZHc/6Pk/////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
+ AABBACwAAAAAEAAQAAAIqACDCBwoMIDBAAQTBjEYIcKECQYVLmQQ44KJFhBmQECYMAAOEAJYnPjgwAHH
+ gQEYqAhBA4YOBDwQIDg5cYcLGyg8LOixYAFNABJkZBBRI8cDEg98ACAIlIOGGylWGOhgwMBSphUq/ACC
+ wQAFClcFEiAAQICAEhZGvDAbloCCDQUAlDUrQO5AtwkKHBgQRK7duwryHmjAV2IQAoIJGxY4QK/ixYwH
+ FIYcEAA7
</value>
</data>
<data name="cmdHBadCountDevelopWHID.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Process_Ctl.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Process_Ctl.cs"
index 723e722..26e5b5d 100644
--- "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Process_Ctl.cs"
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Process_Ctl.cs"
@@ -21,12 +21,12 @@
oCn.RunProc("Insert into " + MvarItemKey + " " +
" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
",HTypeFlow,HTypeCount,HDeptNumber,HSNo,HBadWHID,HWasterWHID" +
- ",HBadCountDevelopWHID" +
+ ",HBadCountDevelopWHID,HWWBadWHID,HWWWasterWHID" +
",HLevel,HEndFlag,HStopflag,HRemark,HDeptID,HBarCodeForBase,HProcessID_K3,HBillSubType,HAutoTrunFlag" +
",HFixPrice,HOverFixPrice,HProcMulID,HProcCheckNote) " +
" Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
"," + Convert.ToString(oModel.HTypeFlow ? 1 : 0) + "," + Convert.ToString(oModel.HTypeCount ? 1 : 0) + ",'" + oModel.HDeptNumber + "'," + oModel.HSNo.ToString() + "," + oModel.HBadWHID.ToString() + "," + oModel.HWasterWHID.ToString() +
- "," + oModel.HBadCountDevelopWHID.ToString() +
+ "," + oModel.HBadCountDevelopWHID.ToString() + "," + oModel.HWWBadWHID.ToString() + "," + oModel.HWWWasterWHID.ToString() +
"," + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'," + oModel.HDeptID +
",'" + oModel.HBarCode + "'," + oModel.HProcessID_K3 + ",'" + oModel.HBillSubType + "'," + Convert.ToString(oModel.HAutoTrunFlag ? 1 : 0) +
"," + oModel.HFixPrice.ToString() + "," + oModel.HOverFixPrice.ToString() + "," + oModel.HProcMulID.ToString() +",'"+ oModel.HProcCheckNote.ToString() + "')", ref DBUtility.ClsPub.sExeReturnInfo);
@@ -60,6 +60,8 @@
",HBadWHID=" + oModel.HBadWHID.ToString() +
",HWasterWHID=" + oModel.HWasterWHID.ToString() +
",HBadCountDevelopWHID=" + oModel.HBadCountDevelopWHID.ToString() +
+ ",HWWBadWHID=" + oModel.HWWBadWHID.ToString() +
+ ",HWWWasterWHID=" + oModel.HWWWasterWHID.ToString() +
",HProcessID_K3=" +oModel.HProcessID_K3+
",HBillSubType='" + oModel.HBillSubType + "'" +
",HDeptNumber='" + oModel.HDeptNumber + "'" +
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Process_View.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Process_View.cs"
index 6f51657..e56d16e 100644
--- "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Process_View.cs"
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Process_View.cs"
@@ -124,6 +124,8 @@
omodel.HBadWHID = DBUtility.ClsPub.isLong(DS.Tables[0].Rows[0]["HBadWHID"]);
omodel.HWasterWHID = DBUtility.ClsPub.isLong(DS.Tables[0].Rows[0]["HWasterWHID"]);
omodel.HBadCountDevelopWHID = DBUtility.ClsPub.isLong(DS.Tables[0].Rows[0]["HBadCountDevelopWHID"]);
+ omodel.HWWBadWHID = DBUtility.ClsPub.isLong(DS.Tables[0].Rows[0]["HWWBadWHID"]);
+ omodel.HWWWasterWHID = DBUtility.ClsPub.isLong(DS.Tables[0].Rows[0]["HWWWasterWHID"]);
return true;
}
catch (Exception e)
diff --git "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs" "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs"
index 59e7baa..d627869 100644
--- "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs"
+++ "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs"
@@ -288,7 +288,7 @@
",HProdMaterName,HCusName,HWorkRemark,HImportNote,HMaterNumber_A" +
",HMaterNumber_B,HMaterNumber_C,HMaterNumber_D,HProdType,HMaterShortName" +
",HMaterIDA,HMaterIDB,HMaterIDC,HMaterIDD,HICMOEntryID" +
- ",HPicNumVer,HPicNumAssemble,HMaterTexture,HProductNum,HVerNum,HPRDORGID" +
+ ",HPicNumVer,HPicNumAssemble,HMaterTexture,HProductNum,HVerNum,HPRDORGID,HBLFlag" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMaker + "',getdate()," + "" + (omodel.HPrevMainSourceInterID == 0 ? omodel.HInterID : omodel.HPrevMainSourceInterID) +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HBatchNo + "'," + omodel.HMainMaterID.ToString() + "," + omodel.HKeyMaterID.ToString() + "," + omodel.HNo.ToString() + ",'" + omodel.HOrderProcNO + "'" +
@@ -300,7 +300,7 @@
",'" + omodel.HProdMaterName + "','" + omodel.HCusName + "','" + omodel.HWorkRemark + "','" + omodel.HImportNote + "','" + omodel.HMaterNumber_A + "'" +
",'" + omodel.HMaterNumber_B + "','" + omodel.HMaterNumber_C + "','" + omodel.HMaterNumber_D + "','" + omodel.HProdType + "','" + omodel.HMaterShortName + "'" +
",'" + omodel.HMaterIDA + "','" + omodel.HMaterIDB + "','" + omodel.HMaterIDC + "','" + omodel.HMaterIDD + "'," + omodel.HICMOEntryID +
- ",'" + omodel.HPicNumVer + "','" + omodel.HPicNumAssemble + "','" + omodel.HMaterTexture + "','" + omodel.HProductNum + "','" + omodel.HVerNum + "','"+ omodel.HPRDORGID+ "'" +
+ ",'" + omodel.HPicNumVer + "','" + omodel.HPicNumAssemble + "','" + omodel.HMaterTexture + "','" + omodel.HProductNum + "','" + omodel.HVerNum + "','"+ omodel.HPRDORGID+ "','"+omodel.HBLFlag+"'" +
") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsSc_ProcessExchangeBillSub oSub in DetailColl)
diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Process_Model.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Process_Model.cs"
index fb350d8..e28bbfc 100644
--- "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Process_Model.cs"
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Process_Model.cs"
@@ -23,6 +23,8 @@
public string HProcCheckNote = "";//本工序确认记录
public Int64 HBadWHID;//New
public Int64 HWasterWHID;//New
- public Int64 HBadCountDevelopWHID;//研发不良品仓库New
+ public Int64 HBadCountDevelopWHID; //研发不良品仓库New
+ public Int64 HWWBadWHID; //委外不良品仓New
+ public Int64 HWWWasterWHID; //委外报废仓New
}
}
diff --git a/WarM/WarM.csproj.user b/WarM/WarM.csproj.user
index b159ef0..eca3abc 100644
--- a/WarM/WarM.csproj.user
+++ b/WarM/WarM.csproj.user
@@ -9,5 +9,6 @@
<ErrorReportUrlHistory />
<FallbackCulture>zh-CN</FallbackCulture>
<VerifyUploadedFiles>false</VerifyUploadedFiles>
+ <ProjectView>ShowAllFiles</ProjectView>
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_MoveStockRequestBillList.cs" "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_MoveStockRequestBillList.cs"
index f8c65f3..6c3972f 100644
--- "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_MoveStockRequestBillList.cs"
+++ "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_MoveStockRequestBillList.cs"
@@ -933,8 +933,31 @@
sDlgWhere = "";
}
-
+ private void label1_Click(object sender, EventArgs e)
+ {
-
+ }
+
+ private void btnTB_Click(object sender, EventArgs e)
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ DataSet DS = oCn.RunProcReturn("exec h_p_WMS_ERPSourceBillToLocal '" + txtHBillNo2.Text.Trim() + "','" + ModName + "'", "h_p_WMS_ERPSourceBillToLocal");
+ if (DS == null)
+ {
+ MessageBox.Show("鍚屾鍗曟嵁澶辫触锛�");
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0]["HBack"]) == "2")
+ {
+ MessageBox.Show(DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0]["HBackRemark"]));
+ }
+ else
+ {
+ MessageBox.Show("鍚屾鍗曟嵁鎴愬姛锛�");
+ Display();
+ }
+ }
+ }
}
}
\ No newline at end of file
diff --git "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_MoveStockRequestBillList.designer.cs" "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_MoveStockRequestBillList.designer.cs"
index ba42459..45a8ce0 100644
--- "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_MoveStockRequestBillList.designer.cs"
+++ "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_MoveStockRequestBillList.designer.cs"
@@ -86,6 +86,9 @@
this.btnOK = new System.Windows.Forms.Button();
this.txtHBillNo = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label();
+ this.label6 = new System.Windows.Forms.Label();
+ this.txtHBillNo2 = new System.Windows.Forms.TextBox();
+ this.btnTB = new System.Windows.Forms.Button();
this.pPic.SuspendLayout();
this.panel1.SuspendLayout();
this.Tool.SuspendLayout();
@@ -103,9 +106,10 @@
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, 50);
+ this.pPic.Location = new System.Drawing.Point(0, 62);
+ this.pPic.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.pPic.Name = "pPic";
- this.pPic.Size = new System.Drawing.Size(1154, 53);
+ this.pPic.Size = new System.Drawing.Size(1728, 66);
this.pPic.TabIndex = 15;
//
// panel1
@@ -113,26 +117,29 @@
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(940, 0);
+ this.panel1.Location = new System.Drawing.Point(1443, 0);
+ this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(214, 53);
+ this.panel1.Size = new System.Drawing.Size(285, 66);
this.panel1.TabIndex = 7;
//
// lbljl
//
this.lbljl.AutoSize = true;
- this.lbljl.Location = new System.Drawing.Point(24, 30);
+ this.lbljl.Location = new System.Drawing.Point(32, 38);
+ this.lbljl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbljl.Name = "lbljl";
- this.lbljl.Size = new System.Drawing.Size(11, 12);
+ this.lbljl.Size = new System.Drawing.Size(15, 15);
this.lbljl.TabIndex = 1;
this.lbljl.Text = " ";
//
// lbldj
//
this.lbldj.AutoSize = true;
- this.lbldj.Location = new System.Drawing.Point(24, 12);
+ this.lbldj.Location = new System.Drawing.Point(32, 15);
+ this.lbldj.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbldj.Name = "lbldj";
- this.lbldj.Size = new System.Drawing.Size(0, 12);
+ this.lbldj.Size = new System.Drawing.Size(0, 15);
this.lbldj.TabIndex = 0;
//
// lblCaption
@@ -141,9 +148,10 @@
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(12, 15);
+ this.lblCaption.Location = new System.Drawing.Point(16, 19);
+ this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(98, 21);
+ this.lblCaption.Size = new System.Drawing.Size(124, 27);
this.lblCaption.TabIndex = 4;
this.lblCaption.Text = "鍗曟嵁鍒楄〃";
this.lblCaption.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -182,7 +190,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(1154, 50);
+ this.Tool.Size = new System.Drawing.Size(1728, 62);
this.Tool.Stretch = true;
this.Tool.TabIndex = 16;
this.Tool.Text = "toolStrip1";
@@ -204,7 +212,7 @@
// toolStripSeparator10
//
this.toolStripSeparator10.Name = "toolStripSeparator10";
- this.toolStripSeparator10.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator10.Size = new System.Drawing.Size(6, 62);
//
// set
//
@@ -254,7 +262,7 @@
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 62);
this.toolStripSeparator2.Visible = false;
//
// xz
@@ -288,7 +296,7 @@
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
- this.toolStripSeparator5.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator5.Size = new System.Drawing.Size(6, 62);
//
// cx
//
@@ -321,7 +329,7 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62);
//
// shc
//
@@ -357,7 +365,7 @@
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
- this.toolStripSeparator6.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator6.Size = new System.Drawing.Size(6, 62);
this.toolStripSeparator6.Visible = false;
//
// qt
@@ -377,7 +385,7 @@
this.qt.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.qt.ImageTransparentColor = System.Drawing.Color.White;
this.qt.Name = "qt";
- this.qt.Size = new System.Drawing.Size(45, 47);
+ this.qt.Size = new System.Drawing.Size(53, 59);
this.qt.Text = "鍏朵粬";
this.qt.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.qt.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -385,14 +393,14 @@
// 鍏抽棴ToolStripMenuItem
//
this.鍏抽棴ToolStripMenuItem.Name = "鍏抽棴ToolStripMenuItem";
- this.鍏抽棴ToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.鍏抽棴ToolStripMenuItem.Size = new System.Drawing.Size(152, 26);
this.鍏抽棴ToolStripMenuItem.Text = "鍏抽棴";
this.鍏抽棴ToolStripMenuItem.Click += new System.EventHandler(this.鍏抽棴ToolStripMenuItem_Click);
//
// 鍙嶅叧闂璗oolStripMenuItem
//
this.鍙嶅叧闂璗oolStripMenuItem.Name = "鍙嶅叧闂璗oolStripMenuItem";
- this.鍙嶅叧闂璗oolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.鍙嶅叧闂璗oolStripMenuItem.Size = new System.Drawing.Size(152, 26);
this.鍙嶅叧闂璗oolStripMenuItem.Text = "鍙嶅叧闂�";
this.鍙嶅叧闂璗oolStripMenuItem.Click += new System.EventHandler(this.鍙嶅叧闂璗oolStripMenuItem_Click);
//
@@ -404,14 +412,14 @@
// 瀹℃牳ToolStripMenuItem
//
this.瀹℃牳ToolStripMenuItem.Name = "瀹℃牳ToolStripMenuItem";
- this.瀹℃牳ToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.瀹℃牳ToolStripMenuItem.Size = new System.Drawing.Size(152, 26);
this.瀹℃牳ToolStripMenuItem.Text = "瀹℃牳";
this.瀹℃牳ToolStripMenuItem.Click += new System.EventHandler(this.瀹℃牳ToolStripMenuItem_Click);
//
// 鍙嶅鏍窽oolStripMenuItem
//
this.鍙嶅鏍窽oolStripMenuItem.Name = "鍙嶅鏍窽oolStripMenuItem";
- this.鍙嶅鏍窽oolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.鍙嶅鏍窽oolStripMenuItem.Size = new System.Drawing.Size(152, 26);
this.鍙嶅鏍窽oolStripMenuItem.Text = "鍙嶅鏍�";
this.鍙嶅鏍窽oolStripMenuItem.Click += new System.EventHandler(this.鍙嶅鏍窽oolStripMenuItem_Click);
//
@@ -423,14 +431,14 @@
// 浣滃簾ToolStripMenuItem
//
this.浣滃簾ToolStripMenuItem.Name = "浣滃簾ToolStripMenuItem";
- this.浣滃簾ToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.浣滃簾ToolStripMenuItem.Size = new System.Drawing.Size(152, 26);
this.浣滃簾ToolStripMenuItem.Text = "浣滃簾";
this.浣滃簾ToolStripMenuItem.Click += new System.EventHandler(this.浣滃簾ToolStripMenuItem_Click);
//
// 鎾ら攢浣滃簾ToolStripMenuItem
//
this.鎾ら攢浣滃簾ToolStripMenuItem.Name = "鎾ら攢浣滃簾ToolStripMenuItem";
- this.鎾ら攢浣滃簾ToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.鎾ら攢浣滃簾ToolStripMenuItem.Size = new System.Drawing.Size(152, 26);
this.鎾ら攢浣滃簾ToolStripMenuItem.Text = "鎾ら攢浣滃簾";
this.鎾ら攢浣滃簾ToolStripMenuItem.Click += new System.EventHandler(this.鎾ら攢浣滃簾ToolStripMenuItem_Click);
//
@@ -442,7 +450,7 @@
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 62);
//
// tc
//
@@ -461,13 +469,13 @@
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 62);
//
// toolStripSeparator9
//
this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 62);
//
// mrlk
//
@@ -477,7 +485,7 @@
this.mrlk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.mrlk.ImageTransparentColor = System.Drawing.Color.White;
this.mrlk.Name = "mrlk";
- this.mrlk.Size = new System.Drawing.Size(60, 47);
+ this.mrlk.Size = new System.Drawing.Size(73, 59);
this.mrlk.Text = "榛樿鍒楀";
this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -487,7 +495,7 @@
//
this.toolStripSeparator7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator7.Name = "toolStripSeparator7";
- this.toolStripSeparator7.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 62);
//
// bclk
//
@@ -497,7 +505,7 @@
this.bclk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.bclk.ImageTransparentColor = System.Drawing.Color.White;
this.bclk.Name = "bclk";
- this.bclk.Size = new System.Drawing.Size(60, 47);
+ this.bclk.Size = new System.Drawing.Size(73, 59);
this.bclk.Text = "淇濆瓨鍒楀";
this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -507,7 +515,7 @@
//
this.toolStripSeparator8.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator8.Name = "toolStripSeparator8";
- this.toolStripSeparator8.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 62);
//
// timer1
//
@@ -526,24 +534,28 @@
this.grdMain.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable;
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.grdMain.Location = new System.Drawing.Point(0, 144);
+ this.grdMain.Location = new System.Drawing.Point(0, 179);
+ this.grdMain.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
+ this.grdMain.RowHeadersWidth = 51;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(1154, 368);
+ this.grdMain.Size = new System.Drawing.Size(1728, 461);
this.grdMain.TabIndex = 19;
this.grdMain.CellMouseUp += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.grdMain_CellMouseUp);
- this.grdMain.DoubleClick += new System.EventHandler(this.grdMain_DblClick);
- this.grdMain.Paint += new System.Windows.Forms.PaintEventHandler(this.grdMain_Paint);
this.grdMain.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.grdMain_ColumnWidthChanged);
+ this.grdMain.Paint += new System.Windows.Forms.PaintEventHandler(this.grdMain_Paint);
+ this.grdMain.DoubleClick += new System.EventHandler(this.grdMain_DblClick);
//
// grdPrint
//
this.grdPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdPrint.Location = new System.Drawing.Point(772, 146);
+ this.grdPrint.Location = new System.Drawing.Point(1029, 182);
+ this.grdPrint.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.grdPrint.Name = "grdPrint";
+ this.grdPrint.RowHeadersWidth = 51;
this.grdPrint.RowTemplate.Height = 23;
- this.grdPrint.Size = new System.Drawing.Size(25, 24);
+ this.grdPrint.Size = new System.Drawing.Size(33, 30);
this.grdPrint.TabIndex = 8;
this.grdPrint.Visible = false;
//
@@ -554,17 +566,22 @@
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, 512);
+ this.grdSum.Location = new System.Drawing.Point(0, 640);
+ this.grdSum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.grdSum.Name = "grdSum";
this.grdSum.ReadOnly = true;
+ this.grdSum.RowHeadersWidth = 51;
this.grdSum.RowTemplate.Height = 23;
this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
- this.grdSum.Size = new System.Drawing.Size(1154, 19);
+ this.grdSum.Size = new System.Drawing.Size(1728, 24);
this.grdSum.TabIndex = 47;
//
// groupBox1
//
this.groupBox1.BackColor = System.Drawing.Color.Lavender;
+ this.groupBox1.Controls.Add(this.btnTB);
+ this.groupBox1.Controls.Add(this.txtHBillNo2);
+ this.groupBox1.Controls.Add(this.label6);
this.groupBox1.Controls.Add(this.cmbHStatus);
this.groupBox1.Controls.Add(this.label5);
this.groupBox1.Controls.Add(this.dtpHBDate);
@@ -577,9 +594,11 @@
this.groupBox1.Controls.Add(this.txtHBillNo);
this.groupBox1.Controls.Add(this.label3);
this.groupBox1.Dock = System.Windows.Forms.DockStyle.Top;
- this.groupBox1.Location = new System.Drawing.Point(0, 103);
+ this.groupBox1.Location = new System.Drawing.Point(0, 128);
+ this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(1154, 41);
+ this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.groupBox1.Size = new System.Drawing.Size(1728, 51);
this.groupBox1.TabIndex = 51;
this.groupBox1.TabStop = false;
//
@@ -593,17 +612,19 @@
"宸插鏍�",
"鏈叧闂�",
"宸插叧闂�"});
- this.cmbHStatus.Location = new System.Drawing.Point(48, 15);
+ this.cmbHStatus.Location = new System.Drawing.Point(63, 15);
+ this.cmbHStatus.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmbHStatus.Name = "cmbHStatus";
- this.cmbHStatus.Size = new System.Drawing.Size(81, 20);
+ this.cmbHStatus.Size = new System.Drawing.Size(107, 23);
this.cmbHStatus.TabIndex = 10;
//
// label5
//
this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(13, 15);
+ this.label5.Location = new System.Drawing.Point(17, 19);
+ this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(41, 12);
+ this.label5.Size = new System.Drawing.Size(52, 15);
this.label5.TabIndex = 9;
this.label5.Text = "鐘舵�侊細";
//
@@ -611,61 +632,69 @@
//
this.dtpHBDate.Checked = false;
this.dtpHBDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHBDate.Location = new System.Drawing.Point(217, 15);
+ this.dtpHBDate.Location = new System.Drawing.Point(259, 14);
+ this.dtpHBDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.dtpHBDate.Name = "dtpHBDate";
this.dtpHBDate.ShowCheckBox = true;
- this.dtpHBDate.Size = new System.Drawing.Size(122, 21);
+ this.dtpHBDate.Size = new System.Drawing.Size(161, 25);
this.dtpHBDate.TabIndex = 3;
//
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(146, 15);
+ this.label2.Location = new System.Drawing.Point(183, 19);
+ this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(65, 12);
+ this.label2.Size = new System.Drawing.Size(82, 15);
this.label2.TabIndex = 2;
this.label2.Text = "寮�濮嬫棩鏈燂細";
//
// txtHSupID
//
- this.txtHSupID.Location = new System.Drawing.Point(884, 14);
+ this.txtHSupID.Location = new System.Drawing.Point(1011, 14);
+ this.txtHSupID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHSupID.Name = "txtHSupID";
- this.txtHSupID.Size = new System.Drawing.Size(200, 21);
+ this.txtHSupID.Size = new System.Drawing.Size(174, 25);
this.txtHSupID.TabIndex = 8;
//
// dtpHEDate
//
this.dtpHEDate.Checked = false;
this.dtpHEDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHEDate.Location = new System.Drawing.Point(417, 14);
+ this.dtpHEDate.Location = new System.Drawing.Point(509, 14);
+ this.dtpHEDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.dtpHEDate.Name = "dtpHEDate";
this.dtpHEDate.ShowCheckBox = true;
- this.dtpHEDate.Size = new System.Drawing.Size(122, 21);
+ this.dtpHEDate.Size = new System.Drawing.Size(161, 25);
this.dtpHEDate.TabIndex = 5;
//
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(818, 14);
+ this.label4.Location = new System.Drawing.Point(935, 19);
+ this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(65, 12);
+ this.label4.Size = new System.Drawing.Size(82, 15);
this.label4.TabIndex = 7;
this.label4.Text = "鍔犲伐鍗曚綅锛�";
//
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(558, 14);
+ this.label1.Location = new System.Drawing.Point(686, 19);
+ this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(53, 12);
+ this.label1.Size = new System.Drawing.Size(60, 15);
this.label1.TabIndex = 0;
- this.label1.Text = "鍗曟嵁鍙凤細";
+ this.label1.Text = "鍗曟嵁鍙�:";
+ this.label1.Click += new System.EventHandler(this.label1_Click);
//
// btnOK
//
- this.btnOK.Location = new System.Drawing.Point(1104, 10);
+ this.btnOK.Location = new System.Drawing.Point(1203, 11);
+ this.btnOK.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnOK.Name = "btnOK";
- this.btnOK.Size = new System.Drawing.Size(73, 24);
+ this.btnOK.Size = new System.Drawing.Size(97, 30);
this.btnOK.TabIndex = 6;
this.btnOK.Text = "蹇�熻繃婊�";
this.btnOK.UseVisualStyleBackColor = true;
@@ -673,31 +702,60 @@
//
// txtHBillNo
//
- this.txtHBillNo.Location = new System.Drawing.Point(622, 14);
+ this.txtHBillNo.Location = new System.Drawing.Point(746, 14);
+ this.txtHBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHBillNo.Name = "txtHBillNo";
- this.txtHBillNo.Size = new System.Drawing.Size(162, 21);
+ this.txtHBillNo.Size = new System.Drawing.Size(170, 25);
this.txtHBillNo.TabIndex = 1;
//
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(345, 14);
+ this.label3.Location = new System.Drawing.Point(433, 19);
+ this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(65, 12);
+ this.label3.Size = new System.Drawing.Size(82, 15);
this.label3.TabIndex = 4;
this.label3.Text = "缁撴潫鏃ユ湡锛�";
//
+ // label6
+ //
+ this.label6.AutoSize = true;
+ this.label6.Location = new System.Drawing.Point(1320, 19);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(60, 15);
+ this.label6.TabIndex = 52;
+ this.label6.Text = "鍗曟嵁鍙�:";
+ //
+ // txtHBillNo2
+ //
+ this.txtHBillNo2.Location = new System.Drawing.Point(1380, 14);
+ this.txtHBillNo2.Name = "txtHBillNo2";
+ this.txtHBillNo2.Size = new System.Drawing.Size(171, 25);
+ this.txtHBillNo2.TabIndex = 53;
+ //
+ // btnTB
+ //
+ this.btnTB.Location = new System.Drawing.Point(1558, 12);
+ this.btnTB.Name = "btnTB";
+ this.btnTB.Size = new System.Drawing.Size(93, 29);
+ this.btnTB.TabIndex = 54;
+ this.btnTB.Text = "閲嶆柊鍚屾";
+ this.btnTB.UseVisualStyleBackColor = true;
+ this.btnTB.Click += new System.EventHandler(this.btnTB_Click);
+ //
// Kf_MoveStockRequestBillList
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1154, 531);
+ this.ClientSize = new System.Drawing.Size(1728, 664);
this.Controls.Add(this.grdMain);
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.grdPrint);
this.Controls.Add(this.grdSum);
this.Controls.Add(this.pPic);
this.Controls.Add(this.Tool);
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "Kf_MoveStockRequestBillList";
this.Text = "璋冩嫧鐢宠鍗曞垪琛�";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -775,5 +833,8 @@
private System.Windows.Forms.Button btnOK;
private System.Windows.Forms.TextBox txtHBillNo;
private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.Label label6;
+ private System.Windows.Forms.Button btnTB;
+ private System.Windows.Forms.TextBox txtHBillNo2;
}
}
\ No newline at end of file
diff --git "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_MoveStockRequestBillList.resx" "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_MoveStockRequestBillList.resx"
index 20c8c6c..3e9f438 100644
--- "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_MoveStockRequestBillList.resx"
+++ "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_MoveStockRequestBillList.resx"
@@ -112,12 +112,12 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="pPic.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
Qk22QAMAAAAAADYAAAAoAAAAFQMAAFoAAAABABgAAAAAAAAAAADDDgAAww4AAAAAAAAAAAAA////////
@@ -3675,7 +3675,7 @@
//////////////////////////////////////////////////////////////////////8A
</value>
</data>
- <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<data name="Tool.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -3699,343 +3699,225 @@
cUf8IBZf8/lz+lH1n+6HsPMP+EAsv+fy5/Oj/hALL/n8uKPrP90PYeYf8IBZf8/lxR/wgFl/z+XFH1n+
6HsPMP8AhALL/n8uKP8AhX9j/wA/lxR9Z/uh7B9w/wCFf2P/AD+XFH/CAWP/AD+XFH1n+6HsH3D/AIQC
x/5/Lij/AIQCy/5/Lij6z/dD2HmH/CAWX/P5cUf8K/sf+fy4o+tf3Q9h5h/wgFj/AM/lxR/wgFl/z+XF
- H1r+6HsPMP8AhALL/n8uKP8AhALL/n8uKPrX90PYeZ//2f/tCS5QaG90b3Nob3AgMy4wADhCSU0EJQAA
- AAAAEAAAAAAAAAAAAAAAAAAAAAA4QklNA+0AAAAAABAASAAAAAEAAgBIAAAAAQACOEJJTQQmAAAAAAAO
- AAAAAAAAAAAAAD+AAAA4QklNBA0AAAAAAAQAAAB4OEJJTQQZAAAAAAAEAAAAHjhCSU0D8wAAAAAACQAA
- AAAAAAAAAQA4QklNBAoAAAAAAAEAADhCSU0nEAAAAAAACgABAAAAAAAAAAI4QklNA/UAAAAAAEgAL2Zm
- AAEAbGZmAAYAAAAAAAEAL2ZmAAEAoZmaAAYAAAAAAAEAMgAAAAEAWgAAAAYAAAAAAAEANQAAAAEALQAA
- AAYAAAAAAAE4QklNA/gAAAAAAHAAAP////////////////////////////8D6AAAAAD/////////////
- ////////////////A+gAAAAA/////////////////////////////wPoAAAAAP//////////////////
- //////////8D6AAAOEJJTQQAAAAAAAACAAE4QklNBAIAAAAAAAQAAAAAOEJJTQQIAAAAAAAQAAAAAQAA
- AkAAAAJAAAAAADhCSU0EHgAAAAAABAAAAAA4QklNBBoAAAAAAz8AAAAGAAAAAAAAAAAAAABoAAAEAAAA
- AAVnKmgHmJgALQAxAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAQAAAAAaAAAAAAAAAAA
- AAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAABAAAAABAAAAAAAAbnVsbAAAAAIAAAAGYm91bmRzT2Jq
- YwAAAAEAAAAAAABSY3QxAAAABAAAAABUb3AgbG9uZwAAAAAAAAAATGVmdGxvbmcAAAAAAAAAAEJ0b21s
- b25nAAAAaAAAAABSZ2h0bG9uZwAABAAAAAAGc2xpY2VzVmxMcwAAAAFPYmpjAAAAAQAAAAAABXNsaWNl
- AAAAEgAAAAdzbGljZUlEbG9uZwAAAAAAAAAHZ3JvdXBJRGxvbmcAAAAAAAAABm9yaWdpbmVudW0AAAAM
- RVNsaWNlT3JpZ2luAAAADWF1dG9HZW5lcmF0ZWQAAAAAVHlwZWVudW0AAAAKRVNsaWNlVHlwZQAAAABJ
- bWcgAAAABmJvdW5kc09iamMAAAABAAAAAAAAUmN0MQAAAAQAAAAAVG9wIGxvbmcAAAAAAAAAAExlZnRs
- b25nAAAAAAAAAABCdG9tbG9uZwAAAGgAAAAAUmdodGxvbmcAAAQAAAAAA3VybFRFWFQAAAABAAAAAAAA
- bnVsbFRFWFQAAAABAAAAAAAATXNnZVRFWFQAAAABAAAAAAAGYWx0VGFnVEVYVAAAAAEAAAAAAA5jZWxs
- VGV4dElzSFRNTGJvb2wBAAAACGNlbGxUZXh0VEVYVAAAAAEAAAAAAAlob3J6QWxpZ25lbnVtAAAAD0VT
- bGljZUhvcnpBbGlnbgAAAAdkZWZhdWx0AAAACXZlcnRBbGlnbmVudW0AAAAPRVNsaWNlVmVydEFsaWdu
- AAAAB2RlZmF1bHQAAAALYmdDb2xvclR5cGVlbnVtAAAAEUVTbGljZUJHQ29sb3JUeXBlAAAAAE5vbmUA
- AAAJdG9wT3V0c2V0bG9uZwAAAAAAAAAKbGVmdE91dHNldGxvbmcAAAAAAAAADGJvdHRvbU91dHNldGxv
- bmcAAAAAAAAAC3JpZ2h0T3V0c2V0bG9uZwAAAAAAOEJJTQQRAAAAAAABAQA4QklNBBQAAAAAAAQAAAAC
- OEJJTQQMAAAAAANsAAAAAQAAAIAAAAANAAABgAAAE4AAAANQABgAAf/Y/+AAEEpGSUYAAQIBAEgASAAA
- /+0ADEFkb2JlX0NNAAL/7gAOQWRvYmUAZIAAAAAB/9sAhAAMCAgICQgMCQkMEQsKCxEVDwwMDxUYExMV
- ExMYEQwMDAwMDBEMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAQ0LCw0ODRAODhAUDg4OFBQODg4O
- FBEMDAwMDBERDAwMDAwMEQwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAz/wAARCAANAIADASIAAhEB
- AxEB/90ABAAI/8QBPwAAAQUBAQEBAQEAAAAAAAAAAwABAgQFBgcICQoLAQABBQEBAQEBAQAAAAAAAAAB
- AAIDBAUGBwgJCgsQAAEEAQMCBAIFBwYIBQMMMwEAAhEDBCESMQVBUWETInGBMgYUkaGxQiMkFVLBYjM0
- coLRQwclklPw4fFjczUWorKDJkSTVGRFwqN0NhfSVeJl8rOEw9N14/NGJ5SkhbSVxNTk9KW1xdXl9VZm
- doaWprbG1ub2N0dXZ3eHl6e3x9fn9xEAAgIBAgQEAwQFBgcHBgU1AQACEQMhMRIEQVFhcSITBTKBkRSh
- sUIjwVLR8DMkYuFygpJDUxVjczTxJQYWorKDByY1wtJEk1SjF2RFVTZ0ZeLys4TD03Xj80aUpIW0lcTU
- 5PSltcXV5fVWZnaGlqa2xtbm9ic3R1dnd4eXp7fH/9oADAMBAAIRAxEAPwDsv+a+D+5mf9u1/wDkkv8A
- mvg/uZn/AG7X/wCSW+kpeLN4/Yx8OPw+1wP+a+D+5mf9u1/+SS/5r4P7mZ/27X/5Jb6SXFm8fsVWPw+1
- wP8Amvg/uZn/AG7X/wCSS/5r4P7mZ/27V/5Jb6SXFm8fsVw4/D7XA/5r4P7mZ/27V/5JL/mvg/uZn/bt
- X/klvpJcWbx+xXDj8PtcD/mvg/uZn/btX/kkv+a+D+5mf9u1f+SW+klxZvH7FcOPw+1wP+a+D+5mf9u1
- /wDkkv8Amvg/uZn/AG7X/wCSW+klxZvH7FVj8PtcD/mvg/uZn/btX/kkv+a+D+5mf9u1/wDklvpJcWbx
- +xXDj8PtcD/mvg/uZn/btf8A5JL/AJr4P7mZ/wBu1/8AklvpJcWbx+xXDj8Ptf/ZOEJJTQQhAAAAAABV
- AAAAAQEAAAAPAEEAZABvAGIAZQAgAFAAaABvAHQAbwBzAGgAbwBwAAAAEwBBAGQAbwBiAGUAIABQAGgA
- bwB0AG8AcwBoAG8AcAAgADcALgAwAAAAAQA4QklNBAYAAAAAAAcACAAAAAEBAP/hEkhodHRwOi8vbnMu
- YWRvYmUuY29tL3hhcC8xLjAvADw/eHBhY2tldCBiZWdpbj0n77u/JyBpZD0nVzVNME1wQ2VoaUh6cmVT
- ek5UY3prYzlkJz8+DQo8P2Fkb2JlLXhhcC1maWx0ZXJzIGVzYz0iQ1IiPz4NCjx4OnhhcG1ldGEgeG1s
- bnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eGFwdGs9IlhNUCB0b29sa2l0IDIuOC4yLTMzLCBmcmFtZXdv
- cmsgMS41Ij4NCgk8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjIt
- cmRmLXN5bnRheC1ucyMiIHhtbG5zOmlYPSJodHRwOi8vbnMuYWRvYmUuY29tL2lYLzEuMC8iPg0KCQk8
- cmRmOkRlc2NyaXB0aW9uIGFib3V0PSIiIHhtbG5zOnhhcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hh
- cC8xLjAvbW0vIj4NCgkJCTx4YXBNTTpEb2N1bWVudElEPmFkb2JlOmRvY2lkOnBob3Rvc2hvcDozOWZj
- MWM4NC0xZGIyLTExZDktYTU2YS1lOGQ1YmIxNTEyYjU8L3hhcE1NOkRvY3VtZW50SUQ+DQoJCTwvcmRm
- OkRlc2NyaXB0aW9uPg0KCTwvcmRmOlJERj4NCjwveDp4YXBtZXRhPg0KICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAK
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAog
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- IAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8P3hwYWNrZXQgZW5kPSd3Jz8+/9sAQwACAQECAQEC
- AgICAgICAgMFAwMDAwMGBAQDBQcGBwcHBgcHCAkLCQgICggHBwoNCgoLDAwMDAcJDg8NDA4LDAwM/9sA
- QwECAgIDAwMGAwMGDAgHCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwM
- DAwMDAwM/8AAEQgAKgQAAwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//E
- ALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYX
- GBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SV
- lpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5
- +v/EAB8BAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMR
- BAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJ
- SlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5
- usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A9YH7anicf8w3
- RB/3DbT/AOM0v/Da3ig/8w/Rf/Bbaf8AxmuL/wCEOHpR/wAIcPSv1/8As+n/ACn5x9cn3OyP7anig5B0
- 7RT/ANwy0/8AjNH/AA2l4n76boo/7hlp/wDGa43/AIQ4f3cUf8IcPSmsvh/KH1yf8x2X/DaPib/oHaJ/
- 4LLT/wCM0f8ADafiZeum6IR/2DbT/wCM1xv/AAhw9KP+EOH900v7Pp/yoFjJ/wAx2R/bV8S/9A3RP/Bb
- af8Axmj/AIbV8S/9A3RP/BbZ/wDxmuM/4Q0f3KX/AIQ4DopFH1Cn/KP67P8AmZ2X/DaviX/oG6J/4LbP
- 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
+ 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
+ BgQEAwUHBgcHBwYHBwgJCwkICAoIBwcKDQoKCwwMDAwHCQ4PDQwOCwwMDP/bAEMBAgICAwMDBgMDBgwI
+ BwgMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDP/AABEIACoE
+ AAMBIgACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUE
+ BAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4
+ OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmq
+ srO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEB
+ AQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIy
+ gQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZn
+ aGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV
+ 1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APWB+2p4nH/MN0Qf9w20/wDjNL/w2t4o
+ P/MP0X/wW2n/AMZri/8AhDh6Uf8ACHD0r9f/ALPp/wAp+cfXJ9zsj+2p4oOQdO0U/wDcMtP/AIzR/wAN
+ peJ++m6KP+4Zaf8AxmuN/wCEOH93FH/CHD0prL4fyh9cn/Mdl/w2j4m/6B2if+Cy0/8AjNH/AA2n4mXr
+ puiEf9g20/8AjNcb/wAIcPSj/hDh/dNL+z6f8qBYyf8AMdkf21fEv/QN0T/wW2n/AMZo/wCG1fEv/QN0
+ T/wW2f8A8ZrjP+ENH9yl/wCEOA6KRR9Qp/yj+uz/AJmdl/w2r4l/6Buif+C2z/8AjNH/AA2r4l/6Buif
+ +C2z/wDjNcb/AMIcP7po/wCEOH900/7Ph/KL65P+Y7Mftq+JMf8AIO0Uf9w20/8AjNB/bU8S5407RD/3
+ DbT/AOM1xZ8HqOq0f8Iiv900v7Pp/wAofXZ/zHZf8NqeJe+m6L/4LbT/AOM0q/to+Je+naKP+4baf/Ga
+ 4z/hEV/umgeEAeimj+z4fyh9cn/Mdn/w2n4l/wCgdon/AILbT/4zR/w2n4l/6B2if+C20/8AjNcb/wAI
+ cP7po/4Q4f3TR/Z8P5UH1yf8x2P/AA2p4l/6Bui/+C20/wDjNH/DaniX/oG6L/4LbT/4zXHf8IcP7ppP
+ +ENH9yj+z4fyh9cn/MdmP21vEo66do3/AILbT/4zSj9tbxKemm6MT/2DbT/4zXF/8IcB/Cfyo/4RAf3T
+ +VCy+n/KH1uf8x2g/bT8SnrpmiD/ALhtp/8AGaD+2n4lH/MN0QY/6htn/wDGa4z/AIQ9f7rflSHwcp/h
+ P5U/7Pp/yjWMqfzM7Q/tp+Juo0zRP/BZZ/8AxmlX9tLxNj/kHaIP+4bZ/wDxmuK/4Q8eh/Kj/hDx6H8q
+ X9n0/wCUFjJ92ds37aPiY8HTtEx/2DbP/wCM0L+2l4lLZOnaJ/4LbP8A+M1xP/CHj0P5UDweOPlb8qP7
+ Pp/yieMn3Z2zftp+JP8AoG6Kf+4bZ/8Axmm/8Nq+Jf8AoF6L/wCC20/+M1xf/CID+435Uf8ACID+435U
+ f2fT/lD65PuztP8AhtXxJ/0DdG/8Ftp/8Zo/4bU8Rj/mG6MP+4Zaf/Ga4v8A4RH0Q4+lH/CI/wCyw+go
+ /s+n/Kg+tz7s7MftqeJP+gfop/7htp/8ZoP7aviUDjT9D/HTLT/4zXGDwgfRvypR4NY9FYj3WhZfT/lH
+ 9cn3Oy/4bU8Tf9A7Q/8AwWWn/wAZo/4bU8Tf9A7Q/wDwWWn/AMZrjv8AhDW/uH/vmk/4Q4/3f0oWX0/5
+ QWNn/Mzsv+G1fEv/AED9Fx7abaf/ABmj/htbxN/0D9F/8Ftn/wDGa40+Dj/dP5Un/CHH+6fyp/2fT/lF
+ 9bn3Oy/4bV8Tf9A7Rf8AwW2f/wAZpf8AhtXxP/0DtF/8Ftn/APGa4z/hDx/dP5Uf8IgP7p/Kl/Z9P+Uf
+ 1yp3Oz/4bU8S/wDQP0b/AMFtn/8AGaP+G1vE3bTtFx/2DbP/AOM1xn/CID+6fypR4OB/hIoWX0/5RfW5
+ 92dkf21fEx66fog/7hln/wDGaP8AhtbxP/0D9E/8Ftp/8Zrjf+EOHpS/8Id/s/pQsvp/yoFjJ/zHY/8A
+ Da3if/oH6J/4LbT/AOM0f8NqeJv+gfon/gttP/jNcePBuf4QPwo/4Qz2H5Uf2fT/AJR/XZ/zHXn9tXxL
+ 307RSf8AsG2n/wAZpR+2r4k/6B2ig/8AYNtP/jNcefBn+zTf+EOHpQsvp/yh9cqfzHZn9tPxKOPsGi/+
+ C20/+M0H9tLxKQSLDRCR2/s20/8AjNcZ/wAIcPSl/wCEOH90flR/Z9P+UX1up/Mzsf8AhtTxN/0DtD/8
+ Flp/8Zo/4bU8S99O0Q/TTbT/AOM1x3/CHj+6Pypf+ENH90/lQsvp/wAoLGVP5mdgf21PEo/5h2i/+C20
+ /wDjNJ/w2r4m3Z/s7RT9NMtP/jNcefBo/un8qP8AhDB/dYfhR/Z9P+UPrlT+Y7H/AIbW8S9Dp2igf9gy
+ 0/8AjNJ/w2r4l/6B2i/+Cyz/APjNcd/whwzjaRR/whw9KP7Ph/KCxlTudl/w2r4l/wCgdon/AILbT/4z
+ R/w2p4l/6B2if+C20/8AjNcb/wAIcPSl/wCEPH90flQsvp/ygsXU7nZf8Nq+JT007Rh/3DbT/wCM0f8A
+ Danic9NP0U5/6hlp/wDGa43/AIQ8f3R+VJ/who67Cc0LL6f8o/rlT+Y7M/tp+Jz00/RT/wBwy0H/ALRp
+ P+G0/E//AED9F/8ABZaf/Ga43/hDf9g0f8Ib/sGn/Z9P+VAsbP8AmZ2X/DaXif8A6B+in/uGWn/xmlH7
+ anicDjTtE/8ABXaf/Ga43/hDP9k0f8IZ/sml/Z8P5UL67P8AmOw/4bS8T/8AQO0X/wAFlp/8Zpf+G0/E
+ 46afon/grtP/AIzXHf8ACGf7Jo/4Qz/ZNP6hD+VB9dqfzHY/8NpeJ/8AoG6L/wCCu0/+M0v/AA2p4n/6
+ B+if+Cy0/wDjNcb/AMIZ/smj/hDP9k0ll9P+VB9dn/Mdl/w2l4nzn+ztEP8A3C7T/wCM0f8ADaXiftp2
+ iH/uF2n/AMZrjP8AhDf9g0f8Ib/sGhZfT/lQfXJ/zHZf8NpeJiMf2douf+wZaf8Axmj/AIbT8T/9A7Rf
+ /BZaf/Ga43/hDf8AYNH/AAhv+waay+H8qD65P+Y7H/htHxP/ANA3RP8AwW2n/wAZp3/DafifnOnaL/4L
+ bT/4zXF/8IkP7h/KlHhEHqhA+lDy+n/Kh/XKnc7P/htTxP207Rf/AAWWn/xmlP7anicgf6Boo/7hlp/8
+ ZrjP+EQX0P8A3zSf8Iev90n8KX9n0/5RfXKnc7P/AIbU8Tgc6fo2D/1DLT/4zSL+2n4l/wCfDRR/3C7T
+ /wCM1xv/AAh6/wB1vypf+ENX0P5Uf2fT/lQ/rlTuzsv+G1fEo/5cNF/8Flnj/wBE0p/bV8Sn/lw0XH/Y
+ Ms//AIzXGf8ACGr6H8qT/hDl9Dj6Uf2fT/lQvrdTuzs/+G0PEv8A0D9EI99MtP8A4zQf20PEwGRp2iE/
+ 9g20/wDjNcYfB6+hP4Uf8Iev91vyo/s+n/Kg+uVO7Oy/4bU8T/8AQO0X/wAFtp/8Zo/4bT8T/wDQO0X/
+ AMFtp/8AGa43/hER/dP5Uf8ACIjsp/Kj+z6f8ofXKnc7L/htLxP1Om6L/wCC20/+M0n/AA2p4l76foo/
+ 7h1p/wDGa43/AIREf3Dz7Uf8IgP7jflT/s+n/KCxlTuzs/8AhtTxKemn6If+4dZ//GaP+G0vEv8A0DtE
+ /wDBdaf/ABmuMHg8H+Aij/hEB/dP5Uv7Pp/yoPrdTudn/wANq+Jv+gdov/gttP8A4zR/w2p4m76fohH/
+ AGDbT/4zXGf8IgP7p/Kj/hEB/dP5U1l9P+UFjKnc7P8A4bW8Tf8AQO0X/wAFtp/8ZoH7aviYf8w7RR/3
+ DbT/AOM1xn/CID+6fypR4OB/hIpf2dT/AJUNYyp/Mzsx+2n4mPA07RMf9g20/wDjNB/bU8S9Dp+iZ/7B
+ tn/8ZrjP+EOHpR/whw9KP7Pp/wAqB4yf8zOy/wCG1vE//QP0T/wWWf8A8ZpT+2r4m76foo/7hln/APGa
+ 4z/hDQOi0f8ACHD+6aP7Pp9IoHjJ/wAzOzP7afiY9dP0Xj/qGWf/AMZpB+2n4m3f8g/RM/8AYNtP/jNc
+ aPBoPUYpf+ENHoKP7Ph/KhLGT/mOw/4bS8T5407RP/Bbaf8AxmlP7aXifHOn6Jj/ALBtp/8AGa43/hDh
+ 6Uf8IcPSj+z6f8qH9bqd2dl/w2n4m/6B2i49f7MtP/jNH/DafiXp/Z+iY/7Blp/8Zrjf+EOHpR/whw9K
+ f9n0/wCUPrlTudl/w2l4l/6B+if+Cy0/+M0f8NpeJP8AoH6J/wCCy0/+M1xv/CHD0o/4Q4elH1Cn/KH1
+ up3Z2Y/bV8Sr00/RP/BZaf8Axml/4bX8TdrDRef+oZaf/Ga4v/hDh6Uf8IcPShZfT/lD63U7s7P/AIbV
+ 8Tf9A/RP/BZaf/GaD+2r4mPA0/RSf+wbaf8AxmuM/wCEOHpR/wAIcPSj+z6f8ofW6ndnZf8ADanif/oH
+ aL/4LbT/AOM0f8NqeKP+gdon/gstP/jNcb/whw9KP+EOHpS/s+n/ACoFi6ndnZD9tPxOM507RB/3DbT/
+ AOM07/htTxMB/wAg7Rf/AAW2n/xmuLPg4dlo/wCEOHofyoeAp/yoPrlTudn/AMNp+Jcc6foo/wC4baf/
+ ABmg/to+JT107Rv/AAW2n/xmuMHg0Htj8KP+ENHpn8KFl9P+VCWMqfzHZ/8ADaHiT/oH6L/4LbT/AOM0
+ f8NpeJRnGnaKf+4Zaf8AxmuN/wCENX0P5Un/AAhw/un8qP7Pp/yoPrlT+Y7M/tqeJv8AoHaKf+4Zaf8A
+ xmk/4bU8T/8AQN0b/wAFtp/8Zrjf+EOH90/lSjwaPQCj+z6f8qGsZPuzsh+2n4mI507Rh/3DbT/4zTv+
+ G0fEpOf7P0Uf9wy0P/tGuL/4Q0ego/4Q0ego/s+n/Kg+t1O7Oz/4bT8Sj/mHaN/4LLQf+0aQ/to+Je2n
+ aKf+4Zaf/Ga4z/hDh6Uf8IcPSj+z6f8AKg+uVO7OzP7afiftp2ikf9gy0/8AjNJ/w2p4mHXTtFH/AHDL
+ T/4zXG/8IcPSg+DgP4SaP7Pp/wAqD65Puzsv+G1vEY66foo/7hlp/wDGaP8AhtbxIeP7P0Xn/qG2n/xm
+ uM/4RAf3T+VH/CID+6fyprL6f8oLGVO7OyP7a3iQH/kH6N/4LLT/AOM0f8Nq+Jf+gdov/gss/wD4zXG/
+ 8IgP7p/Kl/4RAf3f0pfUKf8AKH1yfdnY/wDDa3iUZP8AZ+ijH/UMs/8A4zSf8Nq+Jf8AoHaN/wCC20/+
+ M1x//CID+7+lH/CID+7+lNYCn/KCxk+7PVv+FeX/APz4T/mv+NH/AAr6+/58J/zX/Gv1p/4QTQ/+gLpH
+ /gJH/hR/wgmh/wDQF0j/AMBI/wDCvDfGlD/ny/8AwJf5Hp/6sVf+fi+5/wCZ+S3/AAr6+/58J/zX/Gj/
+ AIV9ff8APhP+a/41+tP/AAgmh/8AQF0j/wABI/8ACj/hBND/AOgLpH/gJH/hS/10of8APl/+BL/IP9WK
+ v/P1fc/8z8lv+FfX3/PhP+a/40h+Hl9jmwn/ADX/ABr9av8AhBND/wCgLpH/AICR/wCFH/CCaH/0BdI/
+ 8BI/8KFxpQ/58v8A8CX+Qf6sVf8An6vuf+Z+So+HV8RkWE/5r/jS/wDCvL5ePsE/5r/jX60/8IJof/QF
+ 0j/wEj/wo/4QTQ/+gLpH/gJH/hT/ANdKH/Pl/wDgS/yF/qxV/wCfq+5/5n5Lf8K+vv8Anwn/ADX/ABo/
+ 4V9ff8+E/wCa/wCNfrT/AMIJof8A0BdI/wDASP8Awo/4QTQ/+gLpH/gJH/hS/wBdKH/Pl/ev8g/1Yq/8
+ /V9z/wAz8lv+FfX3/PhP+a/40f8ACvr7/nwn/Nf8a/Wn/hBND/6Aukf+Akf+FH/CCaH/ANAXSP8AwEj/
+ AMKP9dKH/Pl/ev8AIP8AVir/AM/V9z/zPyW/4V9ff8+E/wCa/wCNH/Cvr7/nwn/Nf8a/Wn/hBND/AOgL
+ pH/gJH/hR/wgmh/9AXSP/ASP/Cj/AF0of8+X96/yD/Vir/z9X3P/ADPyW/4V9ff8+E/5r/jR/wAK+vv+
+ fCf81/xr9af+EE0P/oC6R/4CR/4Uf8IJof8A0BdI/wDASP8Awo/10of8+X96/wAg/wBWKv8Az9X3P/M/
+ JUfDy/IOdPnP4r/jR/wru+/6B9x/47/jX61f8IJof/QF0j/wEj/wo/4QTQ/+gLpH/gJH/hQuNKH/AD5f
+ 3r/IP9WKv/P1fc/8z8lR8O77tp9x+a/40v8Awru//wCfC4/Nf8a/Wn/hBND/AOgLpH/gJH/hR/wgmh/9
+ AXSP/ASP/Cn/AK6UP+fL/wDAl/kP/Vir/wA/V9z/AMz8lv8AhXd//wA+FwfxX/Gk/wCFd33/AD43H/fS
+ /wCNfrV/wgmh/wDQF0j/AMBI/wDCj/hBND/6Aukf+Akf+FH+ulD/AJ8v/wACX+Qv9WKv/P1fc/8AM/JX
+ /hXd9/z43H/fS/40f8K6viP+PCc/iv8AjX61f8IJof8A0BdI/wDASP8Awo/4QTQ/+gLpH/gJH/hR/rpQ
+ /wCfL/8AAl/kH+rFX/n6vuf+Z+Sv/Cur7/oHz/mv+NA+HeoDgWEwH1X/ABr9av8AhBND/wCgLpH/AICR
+ /wCFH/CCaH/0BdI/8BI/8KP9dKH/AD5f/gS/yGuGKv8Az9X3P/M/Jb/hXd//AM+M3/jv+NH/AAry/wD+
+ fCf81/xr9af+EE0P/oC6R/4CR/4Uf8IJof8A0BdI/wDASP8Awo/10of8+X/4Ev8AIP8AVmr/AM/V9z/z
+ PyWPw6vyedPn/Nf8aT/hXd8Dxp8+f+AnP61+tX/CCaH/ANAXSP8AwEj/AMKP+EE0P/oC6R/4CR/4Uf66
+ UP8Any//AAJf5D/1Zq/8/V9z/wAz8lf+Fe3/APz4T8f7v+NH/Cvb/wD58J//AB3/ABr9av8AhBND/wCg
+ LpH/AICR/wCFH/CCaH/0BdI/8BI/8KFxpQ/58v8A8CX+Qv8AVmr/AM/V9z/zPyV/4V7f/wDPhP8A+O/4
+ 0v8Awr+//wCgfN/47/jX60/8IJof/QF0j/wEj/wo/wCEE0P/AKAukf8AgJH/AIUf66UP+fL/APAl/kH+
+ rFX/AJ+L7n/mfkt/wr+//wCgfN/47/jR/wAK/v8A/oHzf+O/41+tP/CCaH/0BdI/8BI/8KP+EE0P/oC6
+ R/4CR/4Uf66UP+fL/wDAl/kH+rFX/n4vuf8Amfkt/wAK/v8A/oHzf+O/40f8K/v/APoHzf8Ajv8AjX60
+ /wDCCaH/ANAXSP8AwEj/AMKP+EE0P/oC6R/4CR/4Uf66UP8Any//AAJf5B/qxV/5+L7n/mfkt/wr+/8A
+ +gfN/wCO/wCNH/Cv7/8A58Jh/wB8/wCNfrT/AMIJof8A0BdI/wDASP8Awo/4QTQ/+gLpH/gJH/hS/wBd
+ KH/Pl/8AgS/yD/Vir/z9X3P/ADPyW/4V9fn/AJcZh/3yf60n/Cu9QPIsrgf98/41+tX/AAgmh/8AQF0j
+ /wABI/8ACj/hBND/AOgLpH/gJH/hTXGlD/ny/wDwJf5CXDFX/n6vuf8Amfkr/wAK71D/AJ8Z/wDx3/Gk
+ /wCFd3//AD4T/wDjv+NfrX/wgmh/9AXSP/ASP/Cj/hBND/6Aukf+Akf+FH+ulD/ny/8AwJf5D/1Yq/8A
+ P1fc/wDM/JQfDq/6/YJ8f8B/xpf+Fe32P+QfN+a/41+tX/CCaH/0BdI/8BI/8KP+EE0P/oC6R/4CR/4U
+ f66UP+fL/wDAl/kL/Vir/wA/V9z/AMz8lv8AhXt/n/jwnz/wH/Gj/hXl/wD8+E/5r/jX60/8IJof/QF0
+ j/wEj/wo/wCEE0P/AKAukf8AgJH/AIUf66UP+fL/APAl/kH+rFX/AJ+r7n/mfkt/wry//wCfCf8ANf8A
+ Gj/hXl//AM+E/wCa/wCNfrT/AMIJof8A0BdI/wDASP8Awo/4QTQ/+gLpH/gJH/hR/rpQ/wCfL/8AAl/k
+ H+rFX/n6vuf+Z+S3/CvL/wD58J/zX/Gj/hXl/wD8+E/5r/jX60/8IJof/QF0j/wEj/wo/wCEE0P/AKAu
+ kf8AgJH/AIUf66UP+fL/APAl/kH+rFX/AJ+r7n/mfkt/wry//wCfCf8ANf8AGj/hXl//AM+E/wCa/wCN
+ frT/AMIJof8A0BdI/wDASP8Awo/4QTQ/+gLpH/gJH/hR/rpQ/wCfL/8AAl/kH+rFX/n6vuf+Z+S3/CvL
+ /wD58J/zX/Gj/hXd9/0D5/8Ax3/Gv1p/4QTQ/wDoC6R/4CR/4Uf8IJof/QF0j/wEj/wo/wBdKH/Pl/8A
+ gS/yD/Vir/z9X3P/ADPyW/4V3ff9A+f/AMd/xpP+FfX/AEFhOMe6/wCNfrV/wgmh/wDQF0j/AMBI/wDC
+ j/hBND/6Aukf+Akf+FC40of8+X/4Ev8AIf8AqxV/5+L7n/mfkr/wr2//AOfGb81/xo/4V7f/APPjN+a/
+ 41+tX/CCaH/0BdI/8BI/8KP+EE0P/oC6R/4CR/4Uf660P+fL+9f5B/qxV/5+L7n/AJn5K/8ACvb/AP58
+ ZvzX/Gj/AIV7f/8APjN+a/41+tX/AAgmh/8AQF0j/wABI/8ACj/hBND/AOgLpH/gJH/hR/rrQ/58v71/
+ kH+rFX/n4vuf+Z+Sv/Cvb/8A58ZvzX/Gj/hXt/8A8+M35r/jX61f8IJof/QF0j/wEj/wo/4QTQ/+gLpH
+ /gJH/hR/rrQ/58v71/kH+rFX/n4vuf8Amfkr/wAK9v8A/nxm/Nf8aP8AhXt//wA+M35r/jX61f8ACCaH
+ /wBAXSP/AAEj/wAKP+EE0P8A6Aukf+Akf+FH+utD/ny/vX+Qf6sVf+fi+5/5n5K/8K9v/wDnxm/Nf8aP
+ +Fe3/wDz4zfmv+NfrV/wgmh/9AXSP/ASP/Cj/hBND/6Aukf+Akf+FH+utD/ny/vX+Qf6sVf+fi+5/wCZ
+ +Sv/AAr2/wD+fGb81/xo/wCFe3//AD4zfmv+NfrV/wAIJof/AEBdI/8AASP/AAo/4QTQ/wDoC6R/4CR/
+ 4Uf660P+fL+9f5B/qxV/5+L7n/mfkt/wr+//AOgfN/47/jSH4f3/AE+wTf8Ajv8AjX61f8IJof8A0BdI
+ /wDASP8Awo/4QTQ/+gLpH/gJH/hR/rpQ/wCfL/8AAl/kH+rFX/n4vuf+Z+Sv/Cvb/wD58ZvzX/Gj/hXt
+ /wD8+M35r/jX61f8IJof/QF0j/wEj/wo/wCEE0P/AKAukf8AgJH/AIULjSh/z5f3r/IP9WKv/Pxfc/8A
+ M/JX/hXt/wD8+M35r/jR/wAK9v8A/nxm/Nf8a/Wr/hBND/6Aukf+Akf+FH/CCaH/ANAXSP8AwEj/AMKP
+ 9daH/Pl/ev8AIP8AVir/AM/F9z/zPyV/4V7f/wDPjN+a/wCNH/Cvb/8A58ZvzX/Gv1q/4QTQ/wDoC6R/
+ 4CR/4Uf8IJof/QF0j/wEj/wo/wBdaH/Pl/ev8g/1Yq/8/F9z/wAz8lf+Fe3/APz4zfmv+NH/AAr2/wD+
+ fGb81/xr9av+EE0P/oC6R/4CR/4Uf8IJof8A0BdI/wDASP8Awo/11of8+X96/wAg/wBWKv8Az8X3P/M/
+ JX/hXt//AM+M35r/AI07/hXt/wD8+Ev/AI7/AI1+tH/CCaH/ANAXSP8AwEj/AMKP+EE0P/oC6R/4CR/4
+ Uf66UP8Any/vX+Qf6sVf+fi+5/5n5L/8K81DnNjNj/gP+NN/4V9ff8+E5/Ff8a/Wn/hBND/6Auk/+Acf
+ +FH/AAgmh/8AQF0n/wAA4/8ACk+NKH/Pl/8AgS/yF/qxV/5+L7n/AJn5Lf8ACv77/nwn/Nf8aD8Pr/8A
+ 58Jx/wB8/wCNfrV/wguh/wDQF0j/AMA4/wDCj/hBdD/6Aukf+Acf+FH+ulD/AJ8v/wACX+QLhir/AM/F
+ 9z/zPyW/4V5f/wDPjP8A+O/40n/Cvr//AJ8Zv/Hf8a/Wr/hBdD/6Aukf+Acf+FH/AAguh/8AQF0j/wAA
+ 4/8ACj/XSh/z5f8A4Ev8g/1Yq/8AP1fd/wAE/JX/AIV9f/8APjN/47/jR/wr6/8A+fGb/wAd/wAa/Wr/
+ AIQXQ/8AoC6R/wCAcf8AhR/wguh/9AXSP/AOP/Cj/XSh/wA+X/4Ev8g/1Yq/8/V93/BPyV/4V9f/APPj
+ N/47/jR/wr6//wCfGb/x3/Gv1q/4QXQ/+gLpH/gHH/hR/wAILof/AEBdI/8AAOP/AAo/10of8+X/AOBL
+ /IP9WKv/AD9X3f8ABPyVPw71Dp9huB/3yP60f8K8vxx9inP4r/jX61f8ILof/QF0j/wDj/wo/wCEF0P/
+ AKAukf8AgHH/AIUf660P+fL/APAl/kC4Yq/8/V9z/wAz8lf+Fe34/wCXGf8A8d/xpP8AhX1//wA+M/8A
+ 47/jX61/8ILof/QF0j/wDj/wpP8AhBND/wCgLpP/AIBx/wCFNca0P+fL+9f5AuGKv/Pxfc/8z8lv+Ff3
+ /wDz4T/+O/40f8K9v/8Anxm/Nf8AGv1q/wCEE0P/AKAukf8AgJH/AIUf8IJof/QF0j/wEj/woXGlD/ny
+ /vX+Q/8AVir/AM/F9z/zPyV/4V7f/wDPjN+a/wCNH/Cvb/8A58ZvzX/Gv1q/4QTQ/wDoC6R/4CR/4Uf8
+ IJof/QF0j/wEj/wo/wBdaH/Pl/ev8g/1Yq/8/F9z/wAz8lf+Fe3/APz4zfmv+NH/AAr2/wD+fGb81/xr
+ 9av+EE0P/oC6R/4CR/4Uf8IJof8A0BdI/wDASP8Awo/11of8+X96/wAg/wBWKv8Az8X3P/M/JX/hXt//
+ AM+M35r/AI0f8K9v/wDnxm/Nf8a/Wr/hBND/AOgLpH/gJH/hR/wgmh/9AXSP/ASP/Cj/AF1of8+X96/y
+ D/Vir/z8X3P/ADPyV/4V7f8A/PjN+a/40f8ACvb/AP58ZvzX/Gv1q/4QTQ/+gLpH/gJH/hR/wgmh/wDQ
+ F0j/AMBI/wDCj/XWh/z5f3r/ACD/AFYq/wDPxfc/8z8lf+Fe3/8Az4zfmv8AjR/wr2//AOfGb81/xr9a
+ v+EE0P8A6Aukf+Akf+FH/CCaH/0BdI/8BI/8KP8AXWh/z5f3r/IP9WKv/Pxfc/8AM/JX/hXmof8APhN+
+ a/40v/Cvb/vYT5/4D/jX60/8IJof/QF0j/wEj/wo/wCEE0P/AKAukf8AgJH/AIUf66UP+fL/APAl/kH+
+ rFX/AJ+L7n/mfkt/wr2//wCfCf8A8d/xo/4V7f8A/PhP/wCO/wCNfrT/AMIJof8A0BdI/wDASP8Awo/4
+ QTQ/+gLpH/gJH/hR/rrR/wCfL/8AAl/kL/Vir/z9X3P/ADPyW/4V5f8A/PhP/wCO/wCNH/Cvr7/nwn/N
+ f8a/Wn/hBND/AOgLpH/gJH/hR/wgmh/9AXSP/ASP/Cj/AF0of8+X/wCBL/IP9WKv/P1fc/8AM/Jb/hX1
+ 9/z4T/mv+NH/AAr2/wCMWE+Pqv8AjX60/wDCCaH/ANAXSP8AwEj/AMKP+EE0P/oC6R/4CR/4Uf66UP8A
+ ny//AAJf5B/qxV/5+L7n/mfkt/wry/8A+fCf81/xo/4V5f8A/PhP+a/41+tP/CCaH/0BdI/8BI/8KP8A
+ hBND/wCgLpH/AICR/wCFH+ulD/ny/wDwJf5B/qxV/wCfq+5/5n5Lf8K8v/8Anwn/ADX/ABo/4V5qBGDY
T/mv+NfrT/wgmh/9AXSP/ASP/Cj/AIQTQ/8AoC6R/wCAkf8AhR/rpQ/58v8A8CX+Qf6sVf8An6vuf+Z+
- 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
- /9k=
+ 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
</value>
</data>
<data name="dc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADoSURBVDhPrZMvD4MwEMXvm6Jn5uaWtGIGMUXmKHKgJvBo
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADoSURBVDhPrZMvD4MwEMXvm6Jn5uaWtGIGMUXmKHKgJvBo
asEiqeQ73O4glHb8C9uaPNFr+su7dy0EQYBHBQCsYXGh6zpsjcGmabCqKixLjUVRYJ7nmKUZKqUwiiIM
wxCFlD0gjuMBMgKMBygnQOYDpNgB1AzQEyAlwIUuWMCWgycdJKQH6U66ka4kBpxJm4AXFccWtOOAW3Ad
iLUWLKCet+BnIJYBNsS/AJwppFlqASe6KOQOQNGhP0Yf8PMUVkM07eCAAbMWkgMP6TNEHmPihLjrgAHa
@@ -4045,7 +3927,7 @@
<data name="set.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADwSURBVDhPhY+xDYUwDESz09/pr8ACiBGQ6Cj+IFRU6akY
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADwSURBVDhPhY+xDYUwDESz09/pr8ACiBGQ6Cj+IFRU6akY
go7OP2dzliGROOkp2Pgucer7XkC6xDr0ZRgGx6aCaA6GluQ4DjnPsw6KAeu66jdOEkI1AOz7jp4RjErD
TKBodvkQngYTQW9ZlvuNxl3cC88rpYNe13UaAtDDiR4otZm5F2/iSjln2bZNhzGH3iNAPIBo0yQ5fTQE
wIhZUgXwmXkqpoIGXOZxHJVorgJ02IwqrjHPv8rME/81AAV2ZYDkr79imqbqBWo0TAyBCeZWQDT67UG+
@@ -4055,7 +3937,7 @@
<data name="dy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
jo6OzvH7yVk/OFHg0MnC/vfuhzOq6zrK76vzIrRtm3nf92sgBpdlieu6ZgCe5xmAXEot0zTZMABBXLiU
grRUVRWHYTATYpOfYR9kiGbMnQelUTu5wzmsoDWk796GOI6jGRDDzH0BxAyQ1Z5e4xhuGUSQWbkAaE2B
FMRN05h9uAD4JoHato1d9yjCOjOAH9Y+QggDOW5gwZdfEgR7iAf4YG53yq0eBADzjlWk/+QP2WXf9xmk
@@ -4065,7 +3947,7 @@
<data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
@@ -4078,7 +3960,7 @@
<data name="xz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGySURBVDhPhZLNKwRxGMefUlLc5D9wUE5eolyUo5PkomhJ
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGySURBVDhPhZLNKwRxGMefUlLc5D9wUE5eolyUo5PkomhJ
ybZE5D2ippYty7Ic1NgclOLiqhAlym44yF3JuzW7s2tedvcxzzO7jbWDT337PfN7nu935vdrYH51EwXf
BgpLor18Is75A+gP7CDYMetdx/9Y9l3wahsy7VnjZiqVshXh9Z7xSuSETLpXuJFIJm1FLC6e85ohK2Rc
WOJNTU/Yir5B3DjEptZObGnrxv2DY57PACOzC1woqm4rVdMxaaRIchzfwhLPhioL8bQYuIbBaQ8XcUX7
@@ -4092,7 +3974,7 @@
<data name="dj.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
BqCzorNiABgABnjme+GFBPlR3znfSUJy7yMJdorG0S2KY1r6/lE0PBMcdA8z3NZEd9VtSmiolU7iSjwY
CcNyUUL0UhzMIcK4An8IPFjGr2F0s3CTmrFOLbgN67vK79LQsOCqQhaIxIE9AfXVxT4Wwzp1NsGYQ4b9
tjhSe4smiVKma19NL+4KBEQA85hH1OQH+T6T6MgagaArThys0V3g8ZwpgbryzBuIXAfB3iosZSUP3VEH
@@ -4102,7 +3984,7 @@
<data name="cx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
UjJbCzQWk5EFRslEiUwZFNLo+lMaxWCIIUXIQhYzj/edc28NHUzzq1/v7Z7zPOee6/ybgMu3lhwP6NrO
F9q6blqaSDaETnOs3UIiCx2bUBuDmjmojpr5t0QWZ9KQfJSNkll5roxAxQRUTZn+LvBOH0vBQgbidzB0
KF+wCA1xaEyYqbVLPEG/CwMC9iShbQu69yEo0uFzM7V2QV2Y2E2e4Al07kGL3L/3CEKXsCRXSryaOZ3J
@@ -4114,7 +3996,7 @@
<data name="sx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
ao0ImqppU39qSFVMtVZLrfQXFMlKFy4KbaXQTao7Cd1U3VSyFFQIqNXYZDKZTHJ8976ZTEZD6AcnL+/e
e857A08p5uX7MEgv3i4h9GYRE3MLJUW9sdlPMG0SKhCvP4Z5/R8cIVYA0dk/AkOsKT1fUmpWzvkCz+2A
4PQ7WRW0tnvR5unFvQ7vFVH9fvdjdPYNoccftANGJufZbOTyvJZjdOaD8/uJ4dAcNzO6ga3dPezEbNFe
@@ -4128,7 +4010,7 @@
<data name="shc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACcSURBVDhPtZPBCcQgEEXtNVUFBI+WYAlewl4twxJm88RZ
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACcSURBVDhPtZPBCcQgEEXtNVUFBI+WYAlewl4twxJm88RZ
xDUbDeyDQWf4805q/o3U02yblbbq+JoakhhjCdPvIrIfUuYhhGsJ4TNXgt77ocA5NxboMuGz/QSnBO1y
H7wV9MtLgtHykiDnXIbWvp4JIKX0JaGfFkAv4b4kgFbCuSwAlVCPBKCS9iXSa90KAIn+BeD9s0j9/Avz
GPMGIZpkvqVDGAQAAAAASUVORK5CYII=
@@ -4137,7 +4019,7 @@
<data name="xc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACYSURBVDhPrZMxDsMgEAT5qx9DSW0pEiVPoKSkSc9zNlmL
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACYSURBVDhPrZMxDsMgEAT5qx9DSW0pEiVPoKSkSc9zNlmL
i+wUezjKSifB6mZEYYe/ZNseOM+sj34edbi4A9ifIIBa6wFOAcYYWvQtyDl/BNZJiRK8K1/iCjzJyguk
ZEkwJey4c5GsCgxOKaG1dk9gcIwRpZR7L5AwowQuzCgB7xJmbNHGBDwTlLCF3z9Bjv0LTO/dh39PCC/T
8HpVcPCyWAAAAABJRU5ErkJggg==
@@ -4146,7 +4028,7 @@
<data name="qt.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADvSURBVDhPzVLBCoJAEPUT/A5P/oh/4Vd19VBdig6egwg8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADvSURBVDhPzVLBCoJAEPUT/A5P/oh/4Vd19VBdig6egwg8
SZCIeIgIIYTIIiKiw752ZlcMS43q0IPB2dmZ994OGj+F53lwXRemaXJQTjV93Q5qlh/Yto1JkKM3XnJe
EqmuBmgVHop2QLIHZmsBPxFcI5JWJ6RAaukByM5AflEk05XAKBJ81+qCFMh2dgKKK3C8VSR+XLnQ7c8o
CdJCOpAk25qDToLyCWEO3kFMO9ioHfTDN57wuMR5JhBk0rocHiyUOt3paIZWYDUaoqCcahQYmnAcp53k
@@ -4156,7 +4038,7 @@
<data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
@@ -4166,7 +4048,7 @@
<data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
@@ -4181,7 +4063,7 @@
<data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
/QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
@@ -4193,13 +4075,13 @@
AAAASUVORK5CYII=
</value>
</data>
- <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>102, 16</value>
</metadata>
- <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>191, 16</value>
</metadata>
- <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>37</value>
</metadata>
</root>
\ No newline at end of file
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
index bdf497c..c5abf71 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
@@ -164,7 +164,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(1526, 74);
+ this.Tool.Size = new System.Drawing.Size(1356, 62);
this.Tool.Stretch = true;
this.Tool.TabIndex = 17;
this.Tool.Text = "toolStrip1";
@@ -214,7 +214,7 @@
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 74);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 62);
//
// AddRow
//
@@ -262,7 +262,7 @@
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 74);
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 62);
//
// bc
//
@@ -281,7 +281,7 @@
// toolStripSeparator8
//
this.toolStripSeparator8.Name = "toolStripSeparator8";
- this.toolStripSeparator8.Size = new System.Drawing.Size(6, 74);
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 62);
//
// wxm
//
@@ -300,7 +300,7 @@
// toolStripSeparator9
//
this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(6, 74);
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 62);
//
// cz
//
@@ -319,7 +319,7 @@
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
- this.toolStripSeparator5.Size = new System.Drawing.Size(6, 74);
+ this.toolStripSeparator5.Size = new System.Drawing.Size(6, 62);
//
// kc
//
@@ -338,13 +338,13 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 74);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62);
//
// toolStripSeparator12
//
this.toolStripSeparator12.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator12.Name = "toolStripSeparator12";
- this.toolStripSeparator12.Size = new System.Drawing.Size(6, 74);
+ this.toolStripSeparator12.Size = new System.Drawing.Size(6, 62);
//
// mrlk
//
@@ -354,7 +354,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(86, 69);
+ this.mrlk.Size = new System.Drawing.Size(73, 59);
this.mrlk.Text = "榛樿鍒楀";
this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -364,7 +364,7 @@
//
this.toolStripSeparator11.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator11.Name = "toolStripSeparator11";
- this.toolStripSeparator11.Size = new System.Drawing.Size(6, 74);
+ this.toolStripSeparator11.Size = new System.Drawing.Size(6, 62);
//
// bclk
//
@@ -374,7 +374,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(86, 69);
+ this.bclk.Size = new System.Drawing.Size(73, 59);
this.bclk.Text = "淇濆瓨鍒楀";
this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -384,7 +384,7 @@
//
this.toolStripSeparator10.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator10.Name = "toolStripSeparator10";
- this.toolStripSeparator10.Size = new System.Drawing.Size(6, 74);
+ this.toolStripSeparator10.Size = new System.Drawing.Size(6, 62);
//
// tb
//
@@ -404,7 +404,7 @@
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
- this.toolStripSeparator6.Size = new System.Drawing.Size(6, 74);
+ this.toolStripSeparator6.Size = new System.Drawing.Size(6, 62);
//
// gl
//
@@ -423,7 +423,7 @@
// toolStripSeparator7
//
this.toolStripSeparator7.Name = "toolStripSeparator7";
- this.toolStripSeparator7.Size = new System.Drawing.Size(6, 74);
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 62);
//
// BatchNo
//
@@ -442,7 +442,7 @@
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 74);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 62);
//
// tc
//
@@ -462,10 +462,10 @@
//
this.lblCaption.AutoSize = true;
this.lblCaption.Font = new System.Drawing.Font("瀹嬩綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lblCaption.Location = new System.Drawing.Point(752, 18);
+ this.lblCaption.Location = new System.Drawing.Point(668, 15);
this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(133, 29);
+ this.lblCaption.Size = new System.Drawing.Size(110, 24);
this.lblCaption.TabIndex = 18;
this.lblCaption.Text = "鍗曟嵁缂栬緫";
//
@@ -476,18 +476,18 @@
this.P1.Controls.Add(this.lblCaption);
this.P1.Controls.Add(this.gbUp);
this.P1.Dock = System.Windows.Forms.DockStyle.Top;
- this.P1.Location = new System.Drawing.Point(62, 74);
- this.P1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.P1.Location = new System.Drawing.Point(55, 62);
+ this.P1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.P1.Name = "P1";
- this.P1.Size = new System.Drawing.Size(1406, 205);
+ this.P1.Size = new System.Drawing.Size(1249, 171);
this.P1.TabIndex = 31;
//
// pic1
//
- this.pic1.Location = new System.Drawing.Point(469, 5);
- this.pic1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.pic1.Location = new System.Drawing.Point(417, 4);
+ this.pic1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.pic1.Name = "pic1";
- this.pic1.Size = new System.Drawing.Size(117, 61);
+ this.pic1.Size = new System.Drawing.Size(104, 51);
this.pic1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pic1.TabIndex = 36;
this.pic1.TabStop = false;
@@ -510,11 +510,11 @@
this.gbUp.Controls.Add(this.label14);
this.gbUp.Controls.Add(this.cmbSourceBillType);
this.gbUp.Controls.Add(this.label10);
- this.gbUp.Location = new System.Drawing.Point(21, 59);
- this.gbUp.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.gbUp.Location = new System.Drawing.Point(19, 49);
+ this.gbUp.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gbUp.Name = "gbUp";
- this.gbUp.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
- this.gbUp.Size = new System.Drawing.Size(1338, 120);
+ this.gbUp.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.gbUp.Size = new System.Drawing.Size(1189, 100);
this.gbUp.TabIndex = 33;
this.gbUp.TabStop = false;
//
@@ -522,38 +522,38 @@
//
this.cmbHWorksNumber.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbHWorksNumber.FormattingEnabled = true;
- this.cmbHWorksNumber.Location = new System.Drawing.Point(591, 25);
- this.cmbHWorksNumber.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.cmbHWorksNumber.Location = new System.Drawing.Point(525, 21);
+ this.cmbHWorksNumber.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmbHWorksNumber.Name = "cmbHWorksNumber";
- this.cmbHWorksNumber.Size = new System.Drawing.Size(280, 26);
+ this.cmbHWorksNumber.Size = new System.Drawing.Size(249, 23);
this.cmbHWorksNumber.TabIndex = 98;
//
// label4
//
this.label4.AutoSize = true;
this.label4.ForeColor = System.Drawing.Color.Black;
- this.label4.Location = new System.Drawing.Point(490, 31);
+ this.label4.Location = new System.Drawing.Point(436, 26);
this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(80, 18);
+ this.label4.Size = new System.Drawing.Size(67, 15);
this.label4.TabIndex = 97;
this.label4.Text = "宸ュ巶浠ｇ爜";
//
// dtpHDate
//
this.dtpHDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHDate.Location = new System.Drawing.Point(1014, 25);
+ this.dtpHDate.Location = new System.Drawing.Point(901, 21);
this.dtpHDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.dtpHDate.Name = "dtpHDate";
- this.dtpHDate.Size = new System.Drawing.Size(280, 28);
+ this.dtpHDate.Size = new System.Drawing.Size(249, 25);
this.dtpHDate.TabIndex = 96;
//
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(914, 31);
+ this.label2.Location = new System.Drawing.Point(812, 26);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(80, 18);
+ this.label2.Size = new System.Drawing.Size(69, 15);
this.label2.TabIndex = 95;
this.label2.Text = "鏃� 鏈�";
//
@@ -561,20 +561,20 @@
//
this.cmbHOrgID.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbHOrgID.FormattingEnabled = true;
- this.cmbHOrgID.Location = new System.Drawing.Point(152, 25);
- this.cmbHOrgID.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.cmbHOrgID.Location = new System.Drawing.Point(135, 21);
+ this.cmbHOrgID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmbHOrgID.Name = "cmbHOrgID";
- this.cmbHOrgID.Size = new System.Drawing.Size(280, 26);
+ this.cmbHOrgID.Size = new System.Drawing.Size(249, 23);
this.cmbHOrgID.TabIndex = 85;
//
// label3
//
this.label3.AutoSize = true;
this.label3.ForeColor = System.Drawing.Color.Black;
- this.label3.Location = new System.Drawing.Point(53, 31);
+ this.label3.Location = new System.Drawing.Point(47, 26);
this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(80, 18);
+ this.label3.Size = new System.Drawing.Size(69, 15);
this.label3.TabIndex = 84;
this.label3.Text = "缁� 缁�";
//
@@ -582,20 +582,20 @@
//
this.cmbHBarCodeType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbHBarCodeType.FormattingEnabled = true;
- this.cmbHBarCodeType.Location = new System.Drawing.Point(1014, 70);
- this.cmbHBarCodeType.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.cmbHBarCodeType.Location = new System.Drawing.Point(901, 58);
+ this.cmbHBarCodeType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmbHBarCodeType.Name = "cmbHBarCodeType";
- this.cmbHBarCodeType.Size = new System.Drawing.Size(280, 26);
+ this.cmbHBarCodeType.Size = new System.Drawing.Size(249, 23);
this.cmbHBarCodeType.TabIndex = 81;
//
// label1
//
this.label1.AutoSize = true;
this.label1.ForeColor = System.Drawing.Color.Black;
- this.label1.Location = new System.Drawing.Point(914, 74);
+ this.label1.Location = new System.Drawing.Point(812, 62);
this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(80, 18);
+ this.label1.Size = new System.Drawing.Size(67, 15);
this.label1.TabIndex = 80;
this.label1.Text = "鏉＄爜绫诲瀷";
//
@@ -604,10 +604,10 @@
this.cmdHEmpID.BackColor = System.Drawing.Color.Transparent;
this.cmdHEmpID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHEmpID.Image")));
this.cmdHEmpID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHEmpID.Location = new System.Drawing.Point(1338, -11);
- this.cmdHEmpID.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.cmdHEmpID.Location = new System.Drawing.Point(1189, -9);
+ this.cmdHEmpID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHEmpID.Name = "cmdHEmpID";
- this.cmdHEmpID.Size = new System.Drawing.Size(33, 34);
+ this.cmdHEmpID.Size = new System.Drawing.Size(29, 28);
this.cmdHEmpID.TabIndex = 79;
this.cmdHEmpID.UseVisualStyleBackColor = false;
this.cmdHEmpID.Visible = false;
@@ -616,10 +616,10 @@
//
this.cmdSourceBillNo.Image = ((System.Drawing.Image)(resources.GetObject("cmdSourceBillNo.Image")));
this.cmdSourceBillNo.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdSourceBillNo.Location = new System.Drawing.Point(840, 67);
- this.cmdSourceBillNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.cmdSourceBillNo.Location = new System.Drawing.Point(747, 56);
+ this.cmdSourceBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdSourceBillNo.Name = "cmdSourceBillNo";
- this.cmdSourceBillNo.Size = new System.Drawing.Size(33, 34);
+ this.cmdSourceBillNo.Size = new System.Drawing.Size(29, 28);
this.cmdSourceBillNo.TabIndex = 42;
this.cmdSourceBillNo.UseVisualStyleBackColor = true;
this.cmdSourceBillNo.Click += new System.EventHandler(this.cmdSourceBillNo_Click);
@@ -627,10 +627,10 @@
// txtHSourceBillNo
//
this.txtHSourceBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSourceBillNo.Location = new System.Drawing.Point(591, 70);
- this.txtHSourceBillNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.txtHSourceBillNo.Location = new System.Drawing.Point(525, 58);
+ this.txtHSourceBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHSourceBillNo.Name = "txtHSourceBillNo";
- this.txtHSourceBillNo.Size = new System.Drawing.Size(247, 28);
+ this.txtHSourceBillNo.Size = new System.Drawing.Size(220, 25);
this.txtHSourceBillNo.TabIndex = 41;
this.txtHSourceBillNo.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtHSourceBillNo_KeyPress);
//
@@ -638,10 +638,10 @@
//
this.label14.AutoSize = true;
this.label14.ForeColor = System.Drawing.Color.Black;
- this.label14.Location = new System.Drawing.Point(490, 74);
+ this.label14.Location = new System.Drawing.Point(436, 62);
this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(80, 18);
+ this.label14.Size = new System.Drawing.Size(68, 15);
this.label14.TabIndex = 40;
this.label14.Text = "閫� 鍗� 鍙�";
//
@@ -650,20 +650,20 @@
this.cmbSourceBillType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbSourceBillType.FormattingEnabled = true;
this.cmbSourceBillType.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.cmbSourceBillType.Location = new System.Drawing.Point(152, 70);
- this.cmbSourceBillType.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.cmbSourceBillType.Location = new System.Drawing.Point(135, 58);
+ this.cmbSourceBillType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmbSourceBillType.Name = "cmbSourceBillType";
- this.cmbSourceBillType.Size = new System.Drawing.Size(280, 26);
+ this.cmbSourceBillType.Size = new System.Drawing.Size(249, 23);
this.cmbSourceBillType.TabIndex = 36;
//
// label10
//
this.label10.AutoSize = true;
this.label10.ForeColor = System.Drawing.Color.Black;
- this.label10.Location = new System.Drawing.Point(53, 74);
+ this.label10.Location = new System.Drawing.Point(47, 62);
this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(80, 18);
+ this.label10.Size = new System.Drawing.Size(67, 15);
this.label10.TabIndex = 35;
this.label10.Text = "婧愬崟绫诲瀷";
//
@@ -691,20 +691,20 @@
this.panel2.Controls.Add(this.txtHMaker);
this.panel2.Controls.Add(this.label8);
this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panel2.Location = new System.Drawing.Point(62, 760);
- this.panel2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.panel2.Location = new System.Drawing.Point(55, 633);
+ this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(1406, 139);
+ this.panel2.Size = new System.Drawing.Size(1249, 116);
this.panel2.TabIndex = 32;
//
// txtHDeleteDate
//
this.txtHDeleteDate.BackColor = System.Drawing.Color.Transparent;
this.txtHDeleteDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHDeleteDate.Location = new System.Drawing.Point(1088, 71);
+ this.txtHDeleteDate.Location = new System.Drawing.Point(967, 59);
this.txtHDeleteDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.txtHDeleteDate.Name = "txtHDeleteDate";
- this.txtHDeleteDate.Size = new System.Drawing.Size(147, 23);
+ this.txtHDeleteDate.Size = new System.Drawing.Size(131, 19);
this.txtHDeleteDate.TabIndex = 19;
//
// label25
@@ -712,10 +712,10 @@
this.label25.AutoSize = true;
this.label25.BackColor = System.Drawing.Color.Transparent;
this.label25.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label25.Location = new System.Drawing.Point(999, 74);
+ this.label25.Location = new System.Drawing.Point(888, 62);
this.label25.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label25.Name = "label25";
- this.label25.Size = new System.Drawing.Size(80, 18);
+ this.label25.Size = new System.Drawing.Size(67, 15);
this.label25.TabIndex = 18;
this.label25.Text = "浣滃簾鏃ユ湡";
//
@@ -723,10 +723,10 @@
//
this.txtHDeleteMan.BackColor = System.Drawing.Color.Transparent;
this.txtHDeleteMan.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHDeleteMan.Location = new System.Drawing.Point(1088, 18);
+ this.txtHDeleteMan.Location = new System.Drawing.Point(967, 15);
this.txtHDeleteMan.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.txtHDeleteMan.Name = "txtHDeleteMan";
- this.txtHDeleteMan.Size = new System.Drawing.Size(147, 23);
+ this.txtHDeleteMan.Size = new System.Drawing.Size(131, 19);
this.txtHDeleteMan.TabIndex = 17;
//
// label27
@@ -734,10 +734,10 @@
this.label27.AutoSize = true;
this.label27.BackColor = System.Drawing.Color.Transparent;
this.label27.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label27.Location = new System.Drawing.Point(999, 18);
+ this.label27.Location = new System.Drawing.Point(888, 15);
this.label27.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label27.Name = "label27";
- this.label27.Size = new System.Drawing.Size(62, 18);
+ this.label27.Size = new System.Drawing.Size(52, 15);
this.label27.TabIndex = 16;
this.label27.Text = "浣滃簾浜�";
//
@@ -745,10 +745,10 @@
//
this.txtHUpDateDate.BackColor = System.Drawing.Color.Transparent;
this.txtHUpDateDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHUpDateDate.Location = new System.Drawing.Point(843, 71);
+ this.txtHUpDateDate.Location = new System.Drawing.Point(749, 59);
this.txtHUpDateDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.txtHUpDateDate.Name = "txtHUpDateDate";
- this.txtHUpDateDate.Size = new System.Drawing.Size(147, 23);
+ this.txtHUpDateDate.Size = new System.Drawing.Size(131, 19);
this.txtHUpDateDate.TabIndex = 15;
//
// label23
@@ -756,10 +756,10 @@
this.label23.AutoSize = true;
this.label23.BackColor = System.Drawing.Color.Transparent;
this.label23.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label23.Location = new System.Drawing.Point(755, 71);
+ this.label23.Location = new System.Drawing.Point(671, 59);
this.label23.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label23.Name = "label23";
- this.label23.Size = new System.Drawing.Size(80, 18);
+ this.label23.Size = new System.Drawing.Size(67, 15);
this.label23.TabIndex = 14;
this.label23.Text = "淇敼鏃ユ湡";
//
@@ -767,10 +767,10 @@
//
this.txtHUpDater.BackColor = System.Drawing.Color.Transparent;
this.txtHUpDater.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHUpDater.Location = new System.Drawing.Point(843, 18);
+ this.txtHUpDater.Location = new System.Drawing.Point(749, 15);
this.txtHUpDater.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.txtHUpDater.Name = "txtHUpDater";
- this.txtHUpDater.Size = new System.Drawing.Size(147, 23);
+ this.txtHUpDater.Size = new System.Drawing.Size(131, 19);
this.txtHUpDater.TabIndex = 13;
//
// label21
@@ -778,10 +778,10 @@
this.label21.AutoSize = true;
this.label21.BackColor = System.Drawing.Color.Transparent;
this.label21.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label21.Location = new System.Drawing.Point(755, 18);
+ this.label21.Location = new System.Drawing.Point(671, 15);
this.label21.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label21.Name = "label21";
- this.label21.Size = new System.Drawing.Size(62, 18);
+ this.label21.Size = new System.Drawing.Size(52, 15);
this.label21.TabIndex = 12;
this.label21.Text = "淇敼浜�";
//
@@ -789,10 +789,10 @@
//
this.txtHCloseDate.BackColor = System.Drawing.Color.Transparent;
this.txtHCloseDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHCloseDate.Location = new System.Drawing.Point(595, 71);
+ this.txtHCloseDate.Location = new System.Drawing.Point(529, 59);
this.txtHCloseDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.txtHCloseDate.Name = "txtHCloseDate";
- this.txtHCloseDate.Size = new System.Drawing.Size(147, 23);
+ this.txtHCloseDate.Size = new System.Drawing.Size(131, 19);
this.txtHCloseDate.TabIndex = 11;
//
// label19
@@ -800,10 +800,10 @@
this.label19.AutoSize = true;
this.label19.BackColor = System.Drawing.Color.Transparent;
this.label19.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label19.Location = new System.Drawing.Point(507, 74);
+ this.label19.Location = new System.Drawing.Point(451, 62);
this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label19.Name = "label19";
- this.label19.Size = new System.Drawing.Size(80, 18);
+ this.label19.Size = new System.Drawing.Size(67, 15);
this.label19.TabIndex = 10;
this.label19.Text = "鍏抽棴鏃ユ湡";
//
@@ -811,10 +811,10 @@
//
this.txtHCloseMan.BackColor = System.Drawing.Color.Transparent;
this.txtHCloseMan.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHCloseMan.Location = new System.Drawing.Point(594, 19);
+ this.txtHCloseMan.Location = new System.Drawing.Point(528, 16);
this.txtHCloseMan.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.txtHCloseMan.Name = "txtHCloseMan";
- this.txtHCloseMan.Size = new System.Drawing.Size(147, 23);
+ this.txtHCloseMan.Size = new System.Drawing.Size(131, 19);
this.txtHCloseMan.TabIndex = 9;
//
// label17
@@ -822,10 +822,10 @@
this.label17.AutoSize = true;
this.label17.BackColor = System.Drawing.Color.Transparent;
this.label17.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label17.Location = new System.Drawing.Point(507, 24);
+ this.label17.Location = new System.Drawing.Point(451, 20);
this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(62, 18);
+ this.label17.Size = new System.Drawing.Size(52, 15);
this.label17.TabIndex = 8;
this.label17.Text = "鍏抽棴浜�";
//
@@ -833,10 +833,10 @@
//
this.txtHCheckDate.BackColor = System.Drawing.Color.Transparent;
this.txtHCheckDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHCheckDate.Location = new System.Drawing.Point(351, 71);
+ this.txtHCheckDate.Location = new System.Drawing.Point(312, 59);
this.txtHCheckDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.txtHCheckDate.Name = "txtHCheckDate";
- this.txtHCheckDate.Size = new System.Drawing.Size(147, 23);
+ this.txtHCheckDate.Size = new System.Drawing.Size(131, 19);
this.txtHCheckDate.TabIndex = 7;
//
// label15
@@ -844,10 +844,10 @@
this.label15.AutoSize = true;
this.label15.BackColor = System.Drawing.Color.Transparent;
this.label15.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label15.Location = new System.Drawing.Point(262, 74);
+ this.label15.Location = new System.Drawing.Point(233, 62);
this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label15.Name = "label15";
- this.label15.Size = new System.Drawing.Size(80, 18);
+ this.label15.Size = new System.Drawing.Size(67, 15);
this.label15.TabIndex = 6;
this.label15.Text = "瀹℃牳鏃ユ湡";
//
@@ -855,10 +855,10 @@
//
this.txtHChecker.BackColor = System.Drawing.Color.Transparent;
this.txtHChecker.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHChecker.Location = new System.Drawing.Point(351, 19);
+ this.txtHChecker.Location = new System.Drawing.Point(312, 16);
this.txtHChecker.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.txtHChecker.Name = "txtHChecker";
- this.txtHChecker.Size = new System.Drawing.Size(147, 23);
+ this.txtHChecker.Size = new System.Drawing.Size(131, 19);
this.txtHChecker.TabIndex = 5;
//
// label13
@@ -866,10 +866,10 @@
this.label13.AutoSize = true;
this.label13.BackColor = System.Drawing.Color.Transparent;
this.label13.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label13.Location = new System.Drawing.Point(262, 24);
+ this.label13.Location = new System.Drawing.Point(233, 20);
this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(62, 18);
+ this.label13.Size = new System.Drawing.Size(52, 15);
this.label13.TabIndex = 4;
this.label13.Text = "瀹℃牳浜�";
//
@@ -877,10 +877,10 @@
//
this.txtHMakeDate.BackColor = System.Drawing.Color.Transparent;
this.txtHMakeDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHMakeDate.Location = new System.Drawing.Point(107, 71);
+ this.txtHMakeDate.Location = new System.Drawing.Point(95, 59);
this.txtHMakeDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.txtHMakeDate.Name = "txtHMakeDate";
- this.txtHMakeDate.Size = new System.Drawing.Size(147, 23);
+ this.txtHMakeDate.Size = new System.Drawing.Size(131, 19);
this.txtHMakeDate.TabIndex = 3;
//
// label11
@@ -888,10 +888,10 @@
this.label11.AutoSize = true;
this.label11.BackColor = System.Drawing.Color.Transparent;
this.label11.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label11.Location = new System.Drawing.Point(18, 74);
+ this.label11.Location = new System.Drawing.Point(16, 62);
this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(80, 18);
+ this.label11.Size = new System.Drawing.Size(67, 15);
this.label11.TabIndex = 2;
this.label11.Text = "鍒跺崟鏃ユ湡";
//
@@ -899,10 +899,10 @@
//
this.txtHMaker.BackColor = System.Drawing.Color.Transparent;
this.txtHMaker.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHMaker.Location = new System.Drawing.Point(107, 19);
+ this.txtHMaker.Location = new System.Drawing.Point(95, 16);
this.txtHMaker.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.txtHMaker.Name = "txtHMaker";
- this.txtHMaker.Size = new System.Drawing.Size(147, 23);
+ this.txtHMaker.Size = new System.Drawing.Size(131, 19);
this.txtHMaker.TabIndex = 1;
//
// label8
@@ -910,10 +910,10 @@
this.label8.AutoSize = true;
this.label8.BackColor = System.Drawing.Color.Transparent;
this.label8.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label8.Location = new System.Drawing.Point(18, 24);
+ this.label8.Location = new System.Drawing.Point(16, 20);
this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(62, 18);
+ this.label8.Size = new System.Drawing.Size(52, 15);
this.label8.TabIndex = 0;
this.label8.Text = "鍒跺崟浜�";
//
@@ -925,19 +925,19 @@
// panel1
//
this.panel1.Dock = System.Windows.Forms.DockStyle.Left;
- this.panel1.Location = new System.Drawing.Point(0, 74);
- this.panel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.panel1.Location = new System.Drawing.Point(0, 62);
+ this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(62, 825);
+ this.panel1.Size = new System.Drawing.Size(55, 687);
this.panel1.TabIndex = 33;
//
// panel3
//
this.panel3.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel3.Location = new System.Drawing.Point(1468, 74);
- this.panel3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.panel3.Location = new System.Drawing.Point(1304, 62);
+ this.panel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(58, 825);
+ this.panel3.Size = new System.Drawing.Size(52, 687);
this.panel3.TabIndex = 34;
//
// grdMain
@@ -949,13 +949,13 @@
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
this.grdMain.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.grdMain.Location = new System.Drawing.Point(4, 5);
- this.grdMain.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.grdMain.Location = new System.Drawing.Point(4, 4);
+ this.grdMain.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
this.grdMain.RowHeadersWidth = 30;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(1390, 410);
+ this.grdMain.Size = new System.Drawing.Size(1233, 339);
this.grdMain.TabIndex = 44;
this.grdMain.RowHeadersWidthChanged += new System.EventHandler(this.grdMain_RowHeadersWidthChanged);
this.grdMain.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdMain_CellBeginEdit);
@@ -972,25 +972,25 @@
this.grdSum.BackgroundColor = System.Drawing.Color.Khaki;
this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.grdSum.Location = new System.Drawing.Point(62, 731);
- this.grdSum.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.grdSum.Location = new System.Drawing.Point(55, 609);
+ this.grdSum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.grdSum.Name = "grdSum";
this.grdSum.ReadOnly = true;
this.grdSum.RowHeadersWidth = 51;
this.grdSum.RowTemplate.Height = 23;
this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
- this.grdSum.Size = new System.Drawing.Size(1406, 29);
+ this.grdSum.Size = new System.Drawing.Size(1249, 24);
this.grdSum.TabIndex = 45;
//
// grdPrint
//
this.grdPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdPrint.Location = new System.Drawing.Point(1214, 815);
- this.grdPrint.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.grdPrint.Location = new System.Drawing.Point(1079, 679);
+ this.grdPrint.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.grdPrint.Name = "grdPrint";
this.grdPrint.RowHeadersWidth = 51;
this.grdPrint.RowTemplate.Height = 23;
- this.grdPrint.Size = new System.Drawing.Size(37, 36);
+ this.grdPrint.Size = new System.Drawing.Size(33, 30);
this.grdPrint.TabIndex = 46;
this.grdPrint.Visible = false;
//
@@ -1000,21 +1000,21 @@
this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Controls.Add(this.tabPage3);
this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabControl1.Location = new System.Drawing.Point(62, 279);
- this.tabControl1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.tabControl1.Location = new System.Drawing.Point(55, 233);
+ this.tabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(1406, 452);
+ this.tabControl1.Size = new System.Drawing.Size(1249, 376);
this.tabControl1.TabIndex = 47;
//
// tabPage1
//
this.tabPage1.Controls.Add(this.grdMain);
- this.tabPage1.Location = new System.Drawing.Point(4, 28);
- this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.tabPage1.Location = new System.Drawing.Point(4, 25);
+ this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage1.Name = "tabPage1";
- this.tabPage1.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
- this.tabPage1.Size = new System.Drawing.Size(1398, 420);
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabPage1.Size = new System.Drawing.Size(1241, 347);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "鐗╂枡淇℃伅";
this.tabPage1.UseVisualStyleBackColor = true;
@@ -1022,11 +1022,11 @@
// tabPage2
//
this.tabPage2.Controls.Add(this.grdSub);
- this.tabPage2.Location = new System.Drawing.Point(4, 28);
- this.tabPage2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.tabPage2.Location = new System.Drawing.Point(4, 25);
+ this.tabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage2.Name = "tabPage2";
- this.tabPage2.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
- this.tabPage2.Size = new System.Drawing.Size(1398, 420);
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabPage2.Size = new System.Drawing.Size(1241, 347);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "鏉＄爜淇℃伅";
this.tabPage2.UseVisualStyleBackColor = true;
@@ -1040,13 +1040,13 @@
this.grdSub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdSub.Dock = System.Windows.Forms.DockStyle.Fill;
this.grdSub.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.grdSub.Location = new System.Drawing.Point(4, 5);
- this.grdSub.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.grdSub.Location = new System.Drawing.Point(4, 4);
+ this.grdSub.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.grdSub.Name = "grdSub";
this.grdSub.ReadOnly = true;
this.grdSub.RowHeadersWidth = 30;
this.grdSub.RowTemplate.Height = 23;
- this.grdSub.Size = new System.Drawing.Size(1390, 410);
+ this.grdSub.Size = new System.Drawing.Size(1233, 339);
this.grdSub.TabIndex = 45;
this.grdSub.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdSub_CellBeginEdit);
this.grdSub.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdSub_CellContentClick);
@@ -1055,10 +1055,10 @@
// tabPage3
//
this.tabPage3.Controls.Add(this.grdList);
- this.tabPage3.Location = new System.Drawing.Point(4, 28);
- this.tabPage3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.tabPage3.Location = new System.Drawing.Point(4, 25);
+ this.tabPage3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage3.Name = "tabPage3";
- this.tabPage3.Size = new System.Drawing.Size(1398, 420);
+ this.tabPage3.Size = new System.Drawing.Size(1242, 348);
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = "妗ｆ鍒楄〃";
this.tabPage3.UseVisualStyleBackColor = true;
@@ -1073,20 +1073,20 @@
this.grdList.Dock = System.Windows.Forms.DockStyle.Fill;
this.grdList.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.grdList.Location = new System.Drawing.Point(0, 0);
- this.grdList.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.grdList.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.grdList.Name = "grdList";
this.grdList.ReadOnly = true;
this.grdList.RowHeadersWidth = 30;
this.grdList.RowTemplate.Height = 23;
- this.grdList.Size = new System.Drawing.Size(1398, 420);
+ this.grdList.Size = new System.Drawing.Size(1242, 348);
this.grdList.TabIndex = 46;
//
// Gy_BarCodeBill
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.Lavender;
- this.ClientSize = new System.Drawing.Size(1526, 899);
+ this.ClientSize = new System.Drawing.Size(1356, 749);
this.Controls.Add(this.tabControl1);
this.Controls.Add(this.grdSum);
this.Controls.Add(this.panel2);
@@ -1097,7 +1097,7 @@
this.Controls.Add(this.grdPrint);
this.ForeColor = System.Drawing.Color.Black;
this.KeyPreview = true;
- this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "Gy_BarCodeBill";
this.Text = "鍗曟嵁缂栬緫";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.resx" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.resx"
index 3150f0d..804bb7a 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.resx"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.resx"
@@ -360,7 +360,7 @@
<data name="dy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
jo6OzvH7yVk/OFHg0MnC/vfuhzOq6zrK76vzIrRtm3nf92sgBpdlieu6ZgCe5xmAXEot0zTZMABBXLiU
grRUVRWHYTATYpOfYR9kiGbMnQelUTu5wzmsoDWk796GOI6jGRDDzH0BxAyQ1Z5e4xhuGUSQWbkAaE2B
FMRN05h9uAD4JoHato1d9yjCOjOAH9Y+QggDOW5gwZdfEgR7iAf4YG53yq0eBADzjlWk/+QP2WXf9xmk
@@ -370,7 +370,7 @@
<data name="sdy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
@@ -383,7 +383,7 @@
<data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
@@ -396,7 +396,7 @@
<data name="AddRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
9N9w6cv/mnMf/FeYeuO/eN/5/3xtx/4z1+wBY9oYUJCfTzTGasCqlSv/v3n9mihM0IDLly7937N79/+t
W7aAxZcuWQLHCgoKcAwDWA04evHY/1U7VmNgkMaSuw3/ra2todqRDIDZvHD9ov996yf+r1pa/z9rct7/
mOZEuK0S7Wr/rc75gGmYGIoBIJu3nt/xf+n5Vf9nnZv/f8r52f9b93XDbQbhkGspYHrS09mYBsBcMHXD
@@ -407,7 +407,7 @@
<data name="spRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
9N9w6cv/mnMf/FeYeuO/eN/5/3xtx/4z1+wBY9oYUJCfTzTGasCqlSv/v3n9mihM0IDLly7937N79/+t
W7aAxZcuWQLHCgoKcAwDWA04evHY/1U7VmNgkMaSuw3/ra2todqRDIDZvHD9ov996yf+r1pa/z9rct7/
mOZEuK0S7Wr/rc75gGmYGIoBIJu3nt/xf+n5Vf9nnZv/f8r52f9b93XDbQbhkGspYHrS09mYBsBcMHXD
@@ -418,7 +418,7 @@
<data name="DelRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAADSSURBVDhPlZPRDYQgEERpxgaswlCGv/ZBSXwbC6AAC7AA
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADSSURBVDhPlZPRDYQgEERpxgaswlCGv/ZBSXwbC6AAC7AA
G9hj1huCuMS7SUYi8l4IqhvHUf5tHRWc59ntcRy3dgXrusq2baUppUf3fe8L3mD0J0EPZLsCC0Sdcw8B
5hgV4HBaEIt14bIUCYUyTUViCmpYhqFICLM61wq41YcEbeDbDmqwbpEYMKICC0QhRhUwYMQUEGxhS6KC
EIJ472We51dYm8+DEr1Cgm8BkhijCeNe575vhZJLk8OdQMCvkhKM+FfwjBIdc4oAgaQtFlpzV0Q+Xg/P
@@ -428,7 +428,7 @@
<data name="bc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAH1SURBVDhPjZPNSxRxGMcfI+jQLTxYIKLoQQsjvEadEoRO
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH1SURBVDhPjZPNSxRxGMcfI+jQLTxYIKLoQQsjvEadEoRO
/gO+awReIiGty97sRQtbPSmoB8FFMSwKDx3VXdvcfGErt9YlpWUJF/dFV2d0v36fHc0XdPALX2bmme/z
mec38xuRBi+kahqRVmD5yfmsWe3J9ErtDD6tAQkAv85pzWqP9oo0foVcbWcJMEwDpmnaWjMqyWlHplfq
ZlD2IVPD5CTgnra3ZlTN3oMJaj24NWYVk6kUNrbsrRlV+QQBNZ7jgKkpPsVtb82oCl06wQnAv1gCa/Gk
@@ -443,7 +443,7 @@
<data name="wxm.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAH1SURBVDhPjZPNSxRxGMcfI+jQLTxYIKLoQQsjvEadEoRO
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH1SURBVDhPjZPNSxRxGMcfI+jQLTxYIKLoQQsjvEadEoRO
/gO+awReIiGty97sRQtbPSmoB8FFMSwKDx3VXdvcfGErt9YlpWUJF/dFV2d0v36fHc0XdPALX2bmme/z
mec38xuRBi+kahqRVmD5yfmsWe3J9ErtDD6tAQkAv85pzWqP9oo0foVcbWcJMEwDpmnaWjMqyWlHplfq
ZlD2IVPD5CTgnra3ZlTN3oMJaj24NWYVk6kUNrbsrRlV+QQBNZ7jgKkpPsVtb82oCl06wQnAv1gCa/Gk
@@ -458,7 +458,7 @@
<data name="cz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAACfSURBVDhPYyAGsGWf/Q9lkglSz/xnSANiskHCqf9///8n
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACfSURBVDhPYyAGsGWf/Q9lkglSz/xnSANiskHCqf9///8n
wxCQBhAOPfp/ytn/JBgCUpQIsRWGQQYQZwhQ8ilQEQj3XwAqnokFG8/EbwDMNrhiUCCSohluM0wxzAC8
mkEAagBYMbI/QQYQ1AwCuAwgSjMI4DKAaIBkwD2C0YULAJ2LYQgMEwWgBiAbAsMkGQLGoLBAxyR5C2YQ
OoYDBgYA9kn+I3B8Li4AAAAASUVORK5CYII=
@@ -467,7 +467,7 @@
<data name="kc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAEwSURBVDhPlZKxSgNBEIb3Qa66V7ha6xS+glgErvURzBNE
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEwSURBVDhPlZKxSgNBEIb3Qa66V7ha6xS+glgErvURzBNE
2wOLaKet2NlEsFtIiohgJR6xEdQ0Gojwu/9k59xdL1z84Ye73Z1vZmfWpLJVgeMD02l//K8IACy+l2N8
vl1h8XyO14cTzO0RnsaHEgxbEhBDer0B6CzLkOc5CPp6d4B6DXixgwYgSUIIA+/qWjZWy1vJTBD/+/1T
8dwDfNCvNTgEDIc3YkIW9Vl0hcfrfdxf7GE62tkMkLu70gnQClJPRrvbAdIesILZZUcF4RXastMTBVBt
@@ -478,7 +478,7 @@
<data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
@@ -493,7 +493,7 @@
<data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
/QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
@@ -508,7 +508,7 @@
<data name="tb.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAHvSURBVDhPnZJNSFRRGIYPCBHYLl24d9EiKsuN48KNBbUo
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHvSURBVDhPnZJNSFRRGIYPCBHYLl24d9EiKsuN48KNBbUo
EGSEmEwXoo0iRkR/ZBkSaC3m74qmC3/GjS7Edv5RTQNCMzUyNMWUWFaTo6AIaqjQ2/d999id61SLXnjh
cr73ec8991yVqXZPLzq9PfD6e+AL2M1rnZ4n4IyO29Xa0YUf27twhwDlJfv3mdaawz8lw1mNWbrV7sHa
6jrcUxsYTOOPbprelAxnNWbp+r1HWF1ZhnoMDHwFKp8BeYO0s0+b38IDyXBWY5au3nmIdOqbhC6HgYIh
@@ -523,7 +523,7 @@
<data name="gl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAG3SURBVDhPfVLdK0NhHH5LSXGn/QculCsfUbtRLl1JbhQh
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAG3SURBVDhPfVLdK0NhHH5LSXGn/QculCsfUbtRLl1JbhQh
taxNNPnOolY+yhjjQo12oRQ3bhWiZGULF3Kv5Nucbeacs4/HeX/HnJ289tRT7+/5/Z7nfc+vw+bXgvD4
NuFZDojpC2DOvwX/1i6YCDPeDXEjDyu+C5oRhrgX1knMZrMQkfe83vNf45+QydlVEtKZDETkvaWlkMlk
Chn3LFOhptIQMQsgsHmElvYetHXYcHB4YgpjIzOLJMhKCiIqagoZLUVKJPEWlWg2UlOKs3KmB7ncC3RI
@@ -537,7 +537,7 @@
<data name="BatchNo.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
BqCzorNiABgABnjme+GFBPlR3znfSUJy7yMJdorG0S2KY1r6/lE0PBMcdA8z3NZEd9VtSmiolU7iSjwY
CcNyUUL0UhzMIcK4An8IPFjGr2F0s3CTmrFOLbgN67vK79LQsOCqQhaIxIE9AfXVxT4Wwzp1NsGYQ4b9
tjhSe4smiVKma19NL+4KBEQA85hH1OQH+T6T6MgagaArThys0V3g8ZwpgbryzBuIXAfB3iosZSUP3VEH
@@ -547,7 +547,7 @@
<data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
index 7e1192c..5f5cfa8 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
@@ -37,6 +37,10 @@
public string sDlgWhere = ""; //澶栫獥浣撻�掑叆
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
public Int64 HInterID = 0;
+ public const string ModName1 = "3783";
+ public Int64 HInterID_TTM = 0;
+ public string HBillNo_TTM = "";
+ ClsCN SubCn = new ClsCN();
//
private void initGrid()
{
@@ -46,7 +50,6 @@
private void Display()
{
- ClsCN SubCn = new ClsCN();
DataSet DSet;
string sSql = "";
string sFastSQL = "";
@@ -66,7 +69,7 @@
// sFastSQL = sFastSQL + " and HMaterName like '%" + txtHMaterID.Text + "%'";
//}
string HMaterName = "";
- HMaterName = txtHMaterID.Text.Trim().ToString();
+ HMaterName = txtHMaterID.Text.Trim().ToString(); //鐗╂枡浠ｇ爜
//鏈哄彴
//if (txtHSourceID.Text.Trim() != "")
//{
@@ -90,8 +93,8 @@
//{
// sFastSQL = sFastSQL + " and 鏃ユ湡<='" + dtpHEndDate.Value.ToShortDateString() + "'";
//}
- string HEndDate = "";
- HEndDate = dtpHEndDate.Value.ToShortDateString();
+ //string HEndDate = "";
+ //HEndDate = dtpHEndDate.Value.ToShortDateString();
//if (sFastSQL.Trim() == "")
//{
// MessageBox.Show("娌℃湁杈撳叆鏉′欢!");
@@ -101,7 +104,7 @@
//杩囨护鏉′欢
//
- DSet = SubCn.RunProcReturn("exec h_p_KSTMSC '" + HSeOrderBillNo + "' ,'" + HICMOBillNo + "' , '" + HMaterName + "' , '" + HSourceName + "' ,'" + HEmpName + "' ,'" + HBeginDate + "', '" + HEndDate + "'", "h_p_KSTMSC", ref DBUtility.ClsPub.sExeReturnInfo);
+ DSet = SubCn.RunProcReturn("exec h_p_KSTMSC '" + HSeOrderBillNo + "' ,'" + HICMOBillNo + "' , '" + HMaterName + "' , '" + HSourceName + "' ,'" + HEmpName + "' ,'" + HBeginDate + "'", "h_p_KSTMSC", ref DBUtility.ClsPub.sExeReturnInfo);
//鐢熸垚棣栬鏍囬
if (DSet == null)
{
@@ -110,7 +113,7 @@
}
//
grdMain.DataSource = DSet.Tables[0].DefaultView;
-
+
//鏍囧噯瑁呯
//for (int i = 0; i < grdMain.SelectedRows.Count; i++)
//{
@@ -126,15 +129,15 @@
//DBUtility.Xt_BaseBillFun.DisplayGrid(grdMain, this.Name, s,FrCol);
//鐢荤嚎
GraphLine();
-
-
+
+
//
}
//
private void timer1_Tick(object sender, EventArgs e)
{
- timer1.Enabled=false;
+ timer1.Enabled = false;
initGrid();
Display();
}
@@ -201,6 +204,8 @@
this.Text = ModCaption;
//lblCaption.Text = ModCaption;
initGrid();
+ cmbHBarCodeType.SelectedIndex = 0;
+ dtpHBeginDate.Value = DateTime.Today;
}
private void grdMain_DblClick(object sender, EventArgs e)
@@ -240,7 +245,7 @@
//鍒犻櫎
private void Sub_DeleteBill()
{
- // //缂栬緫鏉冮檺
+ // //缂栬緫鏉冮檺
if (!DBUtility.ClsPub.Security_Log(ModRightNameEdit, 1, true, DBUtility.ClsPub.CurUserName))
{
return;
@@ -328,7 +333,7 @@
//}
}
-
+
private void bclk_Click(object sender, EventArgs e)
{
@@ -362,7 +367,7 @@
private void Sub_CheckBill()
{
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true,DBUtility.ClsPub.CurUserName))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, DBUtility.ClsPub.CurUserName))
{
return;
}
@@ -373,7 +378,7 @@
lngBillKey = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.CurrentRow.Index].Cells[Fun_GetCol("hmainid")].Value);
if (lngBillKey == 0)
return;
- DAL.ClsGy_ICBomBill oBill = new DAL.ClsGy_ICBomBill();
+ DAL.ClsGy_ICBomBill oBill = new DAL.ClsGy_ICBomBill();
//鏌ョ湅鏄惁宸插鏍�,鍏抽棴,浣滃簾
if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
{
@@ -404,7 +409,7 @@
private void Sub_AbandonCheck()
{
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true,DBUtility.ClsPub.CurUserName))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, DBUtility.ClsPub.CurUserName))
{
return;
}
@@ -415,7 +420,7 @@
lngBillKey = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.CurrentRow.Index].Cells[Fun_GetCol("hmainid")].Value);
if (lngBillKey == 0)
return;
- DAL.ClsGy_ICBomBill oBill = new DAL.ClsGy_ICBomBill();
+ DAL.ClsGy_ICBomBill oBill = new DAL.ClsGy_ICBomBill();
//鏌ョ湅鏄惁宸插鏍�,鍏抽棴,浣滃簾
if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
{
@@ -754,100 +759,388 @@
private void cmdHSaveBill_Click(object sender, EventArgs e)
{
-
+
Display();
+ }
+
+ string TTM = ""; //鎵樻潯鐮�
+ string HTTMNumber = "";
+ string HICMOBillNo = ""; //鐢熶骇璁㈠崟鍙�
+ int TLSH = 0;
+ string TLSH2 = "";
+ string HOrgNumber = "";
+
+
+
+ //=======鐢熸垚 鍞竴鐮� 鍜� 鎵樻潯鐮� 銆佺粍鎵樺崟
+ private void Sub_SaveBarCode()//鍒嗛厤鏃� 瑕佽�冭檻 璁㈠崟鍓╀綑鏁伴噺宸茬粡鏄� 璐熸暟鐨勬儏鍐�
+ {
+ try
+ {
+ string HMaterNumber = "";
+ string HBatchNo = "";
+ string HDate = "";
+ string HYear = "";
+ string HPeriod = "";
+ string HDay = "";
+ string HTMNumber = "";
+ string HOrgNumber = "";
+ DataSet Ds;
+ int LSH = 0; //娴佹按鍙�
+ string LSH2 = ""; //娴佹按鍙疯浆鎹㈡垚瀛楃
+ double HZXQty = 0; //瑁呯鏁伴噺
+ double HDDQty = 0; //璁㈠崟鏁伴噺
+ double HBQty = 0; //绠辨暟
+ int k = 0;
+ int n = 0; //鍚屼竴鎵圭敓鎴愭潯鐮佷腑鐨勭鍑犳潯
+ string WeiShu = ""; //灏炬暟
+ int LSHlen = 6; //娴佹按鍙烽暱搴�
+ string TM = ""; //鏉＄爜
+
+ HDate = DateTime.Now.ToShortDateString();
+ HYear = ClsPub.isDate(HDate).Year.ToString().Substring(2, 2);
+ HPeriod = "0" + ClsPub.isDate(HDate).Month.ToString();
+ HPeriod = HPeriod.Substring(HPeriod.Length - 2, 2);
+ HDay = "0" + ClsPub.isDate(HDate).Day.ToString();
+ HDay = HDay.Substring(HDay.Length - 2, 2);
+
+ //=============鏍规嵁鐣岄潰涓婂凡缁忓垎閰嶇殑鏁版嵁杩涜鏉＄爜鐢熸垚鍜屾墦鍗般��
+ //鑾峰彇鏈鐢熸垚鐨� 涓诲唴鐮�
+ Int64 HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
+ HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
+ Int64 HInterID_TTM = DBUtility.ClsPub.CreateBillID_Prod(ModName1, ref DBUtility.ClsPub.sExeReturnInfo); //缁勬墭鍗曞唴鐮�
+ string HBillNo_TTM = DBUtility.ClsPub.CreateBillCode_Prod(ModName1, ref DBUtility.ClsPub.sExeReturnInfo, true);//缁勬墭鍗曞崟鍙�
+
+ //0 寮�鍚簨鍔�
+ oCn.BeginTran();
+ //00 鍏堢敓鎴� 鍞竴鐨� 鎵樻潯鐮�
+
+ //鐢熸垚涓�涓绠辩爜
+ string sPackStr = "ZXM" + HYear + HPeriod + HDay; //澶栫鐮� 鍓嶇紑
+ DataSet DsTM = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sPackStr + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿 //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+ Int64 TTM_LSH = ClsPub.isLong(DsTM.Tables[0].Rows[0][0]) + 1;
+ string sPackBarCode = sPackStr + LSH.ToString();
+ oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sPackStr + "'");
+
+ //1.寰幆缃戞牸锛屾牴鎹� 鏈鏁伴噺 鍒� 鐢熸垚 鍞竴鐮�
+
+ for (int j = 0; j < grdMain.Rows.Count; j++)
+ {
+ if (DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[Fun_GetCol("鏈鏁伴噺")].Value) > 0)
+ {
+ HMaterNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("鐗╂枡浠ｇ爜")].Value);
+ HBatchNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("鎵规")].Value);
+
+ HOrgNumber = ClsPub.HOrgNumber;
+
+
+ //HBQty = HBQty + ClsPub.isInt(txtHBQty.Text);
+ HZXQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[Fun_GetCol("鏈鏁伴噺")].Value);
+ HDDQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[Fun_GetCol("璁㈠崟鏁伴噺")].Value);
+ HICMOBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("鐢熶骇璁㈠崟鍙�")].Value);
+
+ HTMNumber = HOrgNumber + HMaterNumber + HYear + HPeriod + HDay;
+ Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + HTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ n = 0;
+ LSH2 = LSH.ToString();
+ while (LSH2.Length < LSHlen) //濡傛灉娴佹按鍙峰皬浜�6浣嶆暟鍓嶉潰琛�0
+ {
+ LSH2 = "0" + LSH2;
+ }
+ //鏉＄爜缂栧彿 = 鏉＄爜鍓嶇紑 + 娴佹按鍙�
+ TM = HTMNumber + LSH2;
+ if (TM.Trim() == "")
+ {
+ MessageBox.Show("鏉″舰鐮佷笉鑳戒负绌猴紝涓嶈兘鐢熸垚鏉＄爜锛�");
+ return;
+ }
+ string HWei = ""; //灏炬暟
+ string HBarCode = "";
+ string HBarCodeType = "";
+ Int64 HMaterID1 = 0;
+ Int64 HAuxPropID = 0;
+ Int64 HUnitID = 0;
+ double HQty2 = 0;
+ string HBatchNo2 = "";
+ Int64 HSupID = 0;
+ Int64 HGroupID = 0;
+ int HPrintQty = 0;
+ Int64 HSourceInterID = 0;
+ Int64 HSourceEntryID = 0;
+ string HSourceBillNo = "";
+ string HSourceBillType = "";
+ Int64 HBarcodeNo = 0; //鎵樺彿
+ Int64 HBarcodeQtys = 0; //鎬绘墭鏁�
+ Int64 HDeptID = 0;
+ Int64 HWhID = 0;
+ Int64 HSPID = 0;
+ string HRemark = "";
+ string HMaterName = "";
+ string HMaterModel = "";
+ string HPinfan = "";
+ string HMTONo = "";
+ Int64 HCusID = 0;
+ string HCusType = "";
+ DateTime HEndDate;
+ string HWorkLineName = "";
+ string HSeOrderBillNo = "";
+ string HInnerBillNo = "";
+ HWei = WeiShu;
+ HBarCode = TM;
+ HBarCodeType = ClsPub.isStrNull(cmbHBarCodeType.Text);
+ HMaterID1 = ClsPub.isLong(grdMain.Rows[j].Cells[Fun_GetCol("HMaterID")].Value);
+ HAuxPropID = 0;
+ HUnitID = 0;
+ HQty2 = HZXQty;
+ HBatchNo2 = ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("鎵规")].Value);
+ HSourceInterID = ClsPub.isLong(grdMain.Rows[j].Cells[Fun_GetCol("HSourceInterID")].Value);
+ HSourceEntryID = ClsPub.isLong(grdMain.Rows[j].Cells[Fun_GetCol("HSourceEntryID")].Value);
+ HSourceBillNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("鐢熶骇璁㈠崟鍙�")].Value);
+ HSourceBillType = "3710";
+ HBarcodeQtys = 0;
+ HBarcodeNo = 0;
+ HSupID = 0;
+ HDeptID = 0;
+ HWhID = 0;
+ HSPID = 0;
+ HRemark = "";
+ HMaterName = ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("鐗╂枡鍚嶇О")].Value);
+ HMaterModel = ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("瑙勬牸鍨嬪彿")].Value);
+ HPinfan = "";
+ HMTONo = "";
+ HCusID = 0;
+ HCusType = "";
+ HEndDate = ClsPub.isDate(grdMain.Rows[j].Cells[Fun_GetCol("鏃ユ湡")].Value);
+ HWorkLineName = "";
+ HSeOrderBillNo = "";
+ HInnerBillNo = sPackBarCode;
+ oCn.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
+ ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
+ ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
+ ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate " +
+ ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID " +
+ ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " +
+ ") values ("
+ + "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID1.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()
+ + ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString()
+ + ", " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HWei + "'"
+ + ", " + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + "," + HDeptID.ToString() + "," + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HRemark + "'"
+ + ", " + HCusID.ToString() + ",'" + HCusType + "','" + HEndDate.ToShortDateString() + "','" + HWorkLineName + "','" + HDate + "'"
+ + ", " + ClsPub.HOrgID.ToString() + "," + ClsPub.HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HInterID.ToString()
+ + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "')");
+
+ oCn.RunProc("exec h_p_WMS_SetMaxNo '" + HTMNumber + "'");
+ }
+ }
+ //2.寰幆缁撴潫鍚庯紝鏍规嵁 鏈鐢熸垚鐨� 涓诲唴鐮侊紝浠庡悗鍙版暟鎹簱鑾峰彇 鏉＄爜鍒楄〃锛岀敓鎴� 缁勬墭鍗� 鍜� 鎵樻潯鐮侊紝 鐩存帴璋冪敤瀛樺偍杩囩▼
+ //鏍规嵁澶栫鐮� 鍐欏叆 缁勬墭鍗曚富琛紝缁勬墭鍗曞瓙琛紝SUM锛屽绠辩爜妗ｆ锛孲UM妗ｆ
+ oCn.RunProc("exec h_p_WMS_PackUnionBill_AddNew '" + sPackBarCode + "'," + HInterID_TTM.ToString() + ",'" + DBUtility.ClsPub.CurUserName + "'," + HInterID.ToString()); //鏍规嵁绠辨潯鐮侊紝鍐欏叆 涓昏〃锛屽瓙琛� 锛岀鏉＄爜妗ｆ
+ oCn.RunProc("exec h_p_WMS_PackUnionBill_SumSubBill " + HInterID_TTM.ToString() + ",'" + sPackBarCode + "','3783','" + DBUtility.ClsPub.CurUserName + "'," + HInterID.ToString()); //鏍规嵁绠辨潯鐮侊紝鍐欏叆 SUM琛紝SUM鏉＄爜妗ｆ
+
+
+
+
+
+
+ oCn.Commit();
+ MessageBox.Show("鏉＄爜鐢熸垚瀹屾瘯锛�");
+
+
+
+
+
+
+
+
+ //0缁撴潫浜嬪姟
+
+ //
+ Display();
+
+ }
+ catch(Exception e )
+ {
+ //鍥炴粴浜嬪姟
+
+ MessageBox.Show("鐢熸垚鏉＄爜澶辫触锛�" + e.Message);
+ Display();
+ }
}
private void button4_Click(object sender, EventArgs e)
{
- //1.鑾峰彇鐣岄潰涓婇潰鏁寸鏁伴噺妗嗚緭鍏ョ殑鏁伴噺 璧嬪�肩粰鍙橀噺 骞跺埛鏂扮綉鏍�
- double HBarCodeQty = 0;
- double HZXQty = 0;
+ //鏍规嵁鏈鏁伴噺 鏉� 鍒嗛厤鍒� 姣忎釜鐢熶骇璁㈠崟涓婏紙鍒嗛厤鏃� 瑕佽�冭檻 璁㈠崟鍓╀綑鏁伴噺宸茬粡鏄� 璐熸暟鐨勬儏鍐碉級
+ //1.鍒ゆ柇鏈鏁伴噺 蹇呴』澶т簬0
+ double HZXQty = 0;//鏁寸鏁伴噺
HZXQty = ClsPub.isDoule(txtHZXQty.Text);
- if (HZXQty ==0)
+ if (HZXQty <= 0)
{
MessageBox.Show("璇疯緭鍏ユ暣绠辨暟閲忥紒");
return;
}
+ //2.鍒锋柊缃戞牸
Display();
- //2.鑾峰彇缃戞牸閫変腑琛岀墿鏂橧D
- int a = grdMain.CurrentRow.Index;
- long HMaterID = 0;
- HMaterID = DBUtility.ClsPub.isLong(grdMain.Rows[a].Cells[Fun_GetCol("HMaterID")].Value);
- if (HMaterID == 0)
- {
- MessageBox.Show("娌℃湁閫変腑浠讳綍璁板綍锛�");
- return;
- }
- //3.瀹氫箟鏄惁缁勬墭鐨勫彉閲�
- int Mul = 0;
- //4.鏍规嵁鍗曟嵁绫诲瀷鑾峰彇鏈鏉＄爜涓诲唴鐮丠InterID
- HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
- //5.浠庣綉鏍肩涓�琛屽惊鐜嚦鏈�鍚庝竴琛� 鍒ゆ柇I琛岀殑鐗╂枡鍐呯爜涓嶮鏄惁涓�鑷达紱濡傛灉涓嶄竴鑷村垯寰幆涓嬩竴琛岋紱
- for (int i = 0; i < grdMain.Rows.Count; i++)
+ //3.鎶婃暣绠辨暟閲� 鍒嗛厤鍒� 缃戞牸涓嬮潰鐨勬瘡涓�涓� 鐢熶骇璁㈠崟涓婂幓銆� 寰幆缃戞牸
+ for(int i =0;i<grdMain.Rows.Count;i++)
{
- long HGrdMaterID = 0;
- HGrdMaterID = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.Rows[i].Index].Cells[Fun_GetCol("HMaterID")].Value);
- if (HMaterID == HGrdMaterID)
+ if(HZXQty>0)
{
- double HDDQty = 0;
- HDDQty = DBUtility.ClsPub.isDoule(grdMain.Rows[grdMain.Rows[i].Index].Cells[Fun_GetCol("璁㈠崟鏁伴噺")].Value);
- if (HDDQty >= HZXQty)
+ if(HZXQty>DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value))
{
- HBarCodeQty = HZXQty;
- this.Sub_SaveBill();
- Display();
- Mul = Mul + 1;
+ HZXQty = HZXQty - DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
+ grdMain.Rows[i].Cells["鏈鏁伴噺"].Value = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
+ }
+ else
+ {
+ grdMain.Rows[i].Cells["鏈鏁伴噺"].Value = HZXQty;
break;
}
- else if(HDDQty < HZXQty)
- {
- HBarCodeQty = HDDQty;
- HZXQty = HZXQty - HDDQty;
- this.Sub_SaveBill();
- Mul = Mul + 1;
- continue;
- }
+ }
+ else
+ {
+ break;
}
}
-
-
- //3.鍏堝垽鏂墿鏂欐槸鍚︿竴鑷� 濡傛灉涓�鑷村紑濮嬪惊鐜綉鏍�
- for (int i = 0; i < grdMain.Rows.Count; i++)
- {
- //long HGrdMaterID = 0;
- //HGrdMaterID = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.Rows[i].Index].Cells[Fun_GetCol("HMaterID")].Value);
- //if (HGrdMaterID == HMaterID)
- //{
- // double HDDQty = 0;
- // HDDQty = DBUtility.ClsPub.isDoule(grdMain.Rows[grdMain.Rows[i].Index].Cells[Fun_GetCol("璁㈠崟鏁伴噺")].Value);
- // //濡傛灉寰幆鐨勮琛岃褰曠殑璁㈠崟鏁伴噺宸茬粡澶т簬绛変簬鏈瑁呯鏁伴噺 鍒欑洿鎺ョ敓鎴愬敮涓�鐮� 骞朵笖鍒锋柊缃戞牸 鍒锋柊鏉＄爜淇℃伅椤�
- // if (HDDQty >= HZXQty)
- // {
- // double HBarCodeQty = 0;
- // HBarCodeQty = HZXQty;
- // this.Sub_SaveBill();
- // Display();
- // }
- // //濡傛灉鏀硅璁板綍璁㈠崟鏁伴噺灏忎簬鏈瑁呯鏁伴噺 鍒欑户缁惊鐜� 璧扮敓鎴愭墭鏉＄爜鏂规硶
- // else
- // {
- // //鏌ュ嚭绗﹀悎鏉′欢鐨勯�変腑杩欐潯鏁伴噺璺熻绠辨暟閲忕殑宸紓鍊�
- // double HCYQty = 0;
- // HCYQty = HZXQty - DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.Rows[i].Index].Cells[Fun_GetCol("璁㈠崟鏁伴噺")].Value);
-
- // }
-
- //}
- //else
- //{
-
- //}
- }
+ Sub_SaveBarCode();
+ //
-
+
+
+ ////1.鑾峰彇鐣岄潰涓婇潰鏁寸鏁伴噺妗嗚緭鍏ョ殑鏁伴噺 璧嬪�肩粰鍙橀噺 骞跺埛鏂扮綉鏍�
+ //double HBarCodeQty = 0;
+ //double HZXQty = 0;
+ //HZXQty = ClsPub.isDoule(txtHZXQty.Text);
+ //if (HZXQty ==0)
+ //{
+ // MessageBox.Show("璇疯緭鍏ユ暣绠辨暟閲忥紒");
+ // return;
+ //}
+ //Display();
+ ////2.鑾峰彇缃戞牸閫変腑琛岀墿鏂橧D
+ ////int a = grdMain.CurrentRow.Index;
+ ////long HMaterID = 0;
+ //////HMaterID = DBUtility.ClsPub.isLong(grdMain.Rows[a].Cells[Fun_GetCol("HMaterID")].Value);
+ //// if (HMaterID == 0)
+ //// {
+ //// MessageBox.Show("娌℃湁閫変腑浠讳綍璁板綍锛�");
+ //// return;
+ //// }
+ ////3.瀹氫箟鏄惁缁勬墭鐨勫彉閲�
+ //int Mul = 0;
+ ////4.鏍规嵁鍗曟嵁绫诲瀷鑾峰彇鏈鏉＄爜涓诲唴鐮丠InterID
+ //HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
+
+
+ //for (int i = 0; i < grdMain.Rows.Count; i++)
+ //{
+
+ // //鑾峰彇缃戞牸閲岄潰姣忎竴琛岃鍗曞搴旂殑璁㈠崟鏁伴噺
+ // double HDDQty = 0;
+ // HDDQty = DBUtility.ClsPub.isDoule(grdMain.Rows[grdMain.Rows[i].Index].Cells[Fun_GetCol("璁㈠崟鏁伴噺")].Value);
+
+
+ // //鑾峰彇褰撳墠绯荤粺鐧婚檰缁勭粐浠ｇ爜
+ // HOrgNumber = ClsPub.HOrgNumber;
+
+
+
+
+ // //鑷姩鍖归厤閫昏緫 鍒ゆ柇璁㈠崟鏁伴噺鏄惁澶т簬鏁寸鏁伴噺 濡傛灉璁㈠崟鏁伴噺澶т簬鏁寸鏁伴噺 鐩存帴鐢熸垚鍞竴鐮�
+ // //濡傛灉璁㈠崟鏁伴噺灏忎簬鏁寸鏁伴噺 鍒欏惊鐜敓鎴愬敮涓�鐮� 鐢熸垚瀵瑰簲鐨勬墭鏉＄爜
+ // if (HDDQty >= HZXQty)
+ // {
+ // HBarCodeQty = HZXQty;
+ // this.Sub_SaveBill_TTM();
+ // Display();
+ // Mul = Mul + 1;
+ // break;
+ // }
+ // else if(HDDQty < HZXQty)
+ // {
+ // HBarCodeQty = HDDQty;
+ // HZXQty = HZXQty - HDDQty;
+ // this.Sub_SaveBill_TTM();
+ // Mul = Mul + 1;
+ // continue;
+ // }
+
+ // //濡傛灉Mul>1 鏂板缁勬墭鍗曚富琛�
+
+ //}
+
+ //if (Mul > 1)
+ //{
+ // //HICMOBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[Fun_GetCol("鐢熶骇璁㈠崟鍙�")].Value);
+ // DataSet DS1;
+ // HTTMNumber = HOrgNumber + HICMOBillNo;
+ // DS1 = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + HTTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ // TLSH = ClsPub.isInt(DS1.Tables[0].Rows[0][0]);
+ // TLSH2 = TLSH.ToString();
+ // TTM = HTTMNumber + TLSH2;
+ // HInterID_TTM = DBUtility.ClsPub.CreateBillID_Prod(ModName1, ref DBUtility.ClsPub.sExeReturnInfo);
+ // HBillNo_TTM = DBUtility.ClsPub.CreateBillCode_Prod(ModName1, ref DBUtility.ClsPub.sExeReturnInfo, true);//寰楀埌鏂板崟鍙�
+
+ // string HDate = "";
+ // string HYear = "";
+ // string HPeriod = "";
+ // string HDay = "";
+ // HDate = DateTime.Now.ToShortDateString();
+ // HYear = ClsPub.isDate(HDate).Year.ToString().Substring(2, 2);
+ // HPeriod = "0" + ClsPub.isDate(HDate).Month.ToString();
+ // HPeriod = HPeriod.Substring(HPeriod.Length - 2, 2);
+ // HDay = "0" + ClsPub.isDate(HDate).Day.ToString();
+ // HDay = HDay.Substring(HDay.Length - 2, 2);
+
+ // oCn.RunProc("insert into Sc_PackUnionBillMain (HYear,HPeriod,HBillType,HInterID,HDate" +
+ // ",HBillNo,HBillStatus,HICMOBillNo,HBarCode_Pack,HMaterID,HUnitID,HWeight" +
+ // ",HPWeight,HProdOrgID,HDeptID,HEmpID,HSNum,HPackNum,HBarCode_Cus,HBatchNo " +
+ // ") values ("
+ // + HYear + "," + HPeriod + ",'3783'," + HInterID_TTM + ",'" + HDate + "'"
+ // + ", " + HBillNo_TTM.ToString() + ",1,''," + TTM.ToString() + ",0,0,0"
+ // + ",0,1,0,0,0,0,'','')");
+ //}
+
+
+ ////3.鍏堝垽鏂墿鏂欐槸鍚︿竴鑷� 濡傛灉涓�鑷村紑濮嬪惊鐜綉鏍�
+ //for (int i = 0; i < grdMain.Rows.Count; i++)
+ //{
+ // //long HGrdMaterID = 0;
+ // //HGrdMaterID = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.Rows[i].Index].Cells[Fun_GetCol("HMaterID")].Value);
+ // //if (HGrdMaterID == HMaterID)
+ // //{
+ // // double HDDQty = 0;
+ // // HDDQty = DBUtility.ClsPub.isDoule(grdMain.Rows[grdMain.Rows[i].Index].Cells[Fun_GetCol("璁㈠崟鏁伴噺")].Value);
+ // // //濡傛灉寰幆鐨勮琛岃褰曠殑璁㈠崟鏁伴噺宸茬粡澶т簬绛変簬鏈瑁呯鏁伴噺 鍒欑洿鎺ョ敓鎴愬敮涓�鐮� 骞朵笖鍒锋柊缃戞牸 鍒锋柊鏉＄爜淇℃伅椤�
+ // // if (HDDQty >= HZXQty)
+ // // {
+ // // double HBarCodeQty = 0;
+ // // HBarCodeQty = HZXQty;
+ // // this.Sub_SaveBill();
+ // // Display();
+ // // }
+ // // //濡傛灉鏀硅璁板綍璁㈠崟鏁伴噺灏忎簬鏈瑁呯鏁伴噺 鍒欑户缁惊鐜� 璧扮敓鎴愭墭鏉＄爜鏂规硶
+ // // else
+ // // {
+ // // //鏌ュ嚭绗﹀悎鏉′欢鐨勯�変腑杩欐潯鏁伴噺璺熻绠辨暟閲忕殑宸紓鍊�
+ // // double HCYQty = 0;
+ // // HCYQty = HZXQty - DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.Rows[i].Index].Cells[Fun_GetCol("璁㈠崟鏁伴噺")].Value);
+
+ // // }
+
+ // //}
+ // //else
+ // //{
+
+ // //}
+ //}
+
+
+
+
}
private void Sub_SaveBill()
@@ -872,10 +1165,10 @@
string WeiShu = ""; //灏炬暟
int LSHlen = 6; //娴佹按鍙烽暱搴�
string TM = ""; //鏉＄爜
- for (int j = 0; j < grdMain.SelectedRows.Count; j++)
+ for (int j = 0; j < grdMain.Rows.Count; j++)
{
- HMaterNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.SelectedRows[j].Index].Cells[Fun_GetCol("鐗╂枡浠ｇ爜")].Value);
- HBatchNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.SelectedRows[j].Index].Cells[Fun_GetCol("鎵规")].Value);
+ HMaterNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("鐗╂枡浠ｇ爜")].Value);
+ HBatchNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("鎵规")].Value);
HDate = DateTime.Now.ToShortDateString();
HYear = ClsPub.isDate(HDate).Year.ToString().Substring(2, 2);
HPeriod = "0" + ClsPub.isDate(HDate).Month.ToString();
@@ -887,7 +1180,7 @@
//HBQty = HBQty + ClsPub.isInt(txtHBQty.Text);
HZXQty = ClsPub.isDoule(txtHZXQty.Text);
- HDDQty = DBUtility.ClsPub.isDoule(grdMain.Rows[grdMain.SelectedRows[j].Index].Cells[Fun_GetCol("璁㈠崟鏁伴噺")].Value);
+ HDDQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[Fun_GetCol("璁㈠崟鏁伴噺")].Value);
if (cmbHBarCodeType.Text == "鍞竴鏉＄爜")
@@ -954,14 +1247,14 @@
HWei = WeiShu;
HBarCode = TM;
HBarCodeType = ClsPub.isStrNull(cmbHBarCodeType.Text);
- HMaterID1 = ClsPub.isLong(grdMain.SelectedRows[j].Cells[Fun_GetCol("HMaterID")].Value);
+ HMaterID1 = ClsPub.isLong(grdMain.Rows[j].Cells[Fun_GetCol("HMaterID")].Value);
HAuxPropID = 0;
HUnitID = 0;
HQty2 = HZXQty;
- HBatchNo2 = ClsPub.isStrNull(grdMain.SelectedRows[j].Cells[Fun_GetCol("鎵规")].Value);
+ HBatchNo2 = ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("鎵规")].Value);
HSourceInterID = 0;
HSourceEntryID = 0;
- HSourceBillNo = ClsPub.isStrNull(grdMain.SelectedRows[j].Cells[Fun_GetCol("鐢熶骇璁㈠崟鍙�")].Value);
+ HSourceBillNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("鐢熶骇璁㈠崟鍙�")].Value);
HSourceBillType = "3710";
HBarcodeQtys = 0;
HBarcodeNo = 0;
@@ -970,13 +1263,13 @@
HWhID = 0;
HSPID = 0;
HRemark = "";
- HMaterName = ClsPub.isStrNull(grdMain.SelectedRows[j].Cells[Fun_GetCol("鐗╂枡鍚嶇О")].Value);
- HMaterModel = ClsPub.isStrNull(grdMain.SelectedRows[j].Cells[Fun_GetCol("瑙勬牸鍨嬪彿")].Value);
+ HMaterName = ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("鐗╂枡鍚嶇О")].Value);
+ HMaterModel = ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("瑙勬牸鍨嬪彿")].Value);
HPinfan = "";
HMTONo = "";
HCusID = 0;
HCusType = "";
- HEndDate = ClsPub.isDate(grdMain.SelectedRows[j].Cells[Fun_GetCol("鏃ユ湡")].Value);
+ HEndDate = ClsPub.isDate(grdMain.Rows[j].Cells[Fun_GetCol("鏃ユ湡")].Value);
HWorkLineName = "";
HSeOrderBillNo = "";
HInnerBillNo = "";
@@ -1006,6 +1299,178 @@
oCn.RollBack();
MessageBox.Show("鏉＄爜鐢熸垚澶辫触锛�" + e1.Message);
}
+ }
+ }
+
+
+
+ private void Sub_SaveBill_TTM()
+ {
+ HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
+ HInterID_TTM = DBUtility.ClsPub.CreateBillID_Prod(ModName1, ref DBUtility.ClsPub.sExeReturnInfo);
+ HBillNo_TTM = DBUtility.ClsPub.CreateBillCode_Prod(ModName1, ref DBUtility.ClsPub.sExeReturnInfo, true);//寰楀埌鏂板崟鍙�
+ string HMaterNumber = "";
+ string HBatchNo = "";
+ string HDate = "";
+ string HYear = "";
+ string HPeriod = "";
+ string HDay = "";
+ string HTMNumber = "";
+ string HOrgNumber = "";
+ DataSet Ds;
+ int LSH = 0; //娴佹按鍙�
+ string LSH2 = ""; //娴佹按鍙疯浆鎹㈡垚瀛楃
+ double HZXQty = 0; //瑁呯鏁伴噺
+ double HDDQty = 0; //璁㈠崟鏁伴噺
+ double HBQty = 0; //绠辨暟
+ int k = 0;
+ int n = 0; //鍚屼竴鎵圭敓鎴愭潯鐮佷腑鐨勭鍑犳潯
+ string WeiShu = ""; //灏炬暟
+ int LSHlen = 6; //娴佹按鍙烽暱搴�
+ string TM = ""; //鏉＄爜
+ for (int j = 0; j < grdMain.Rows.Count; j++)
+ {
+ HMaterNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("鐗╂枡浠ｇ爜")].Value);
+ HBatchNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("鎵规")].Value);
+ HDate = DateTime.Now.ToShortDateString();
+ HYear = ClsPub.isDate(HDate).Year.ToString().Substring(2, 2);
+ HPeriod = "0" + ClsPub.isDate(HDate).Month.ToString();
+ HPeriod = HPeriod.Substring(HPeriod.Length - 2, 2);
+ HDay = "0" + ClsPub.isDate(HDate).Day.ToString();
+ HDay = HDay.Substring(HDay.Length - 2, 2);
+ HOrgNumber = ClsPub.HOrgNumber;
+
+
+ //HBQty = HBQty + ClsPub.isInt(txtHBQty.Text);
+ HZXQty = ClsPub.isDoule(txtHZXQty.Text);
+ HDDQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[Fun_GetCol("璁㈠崟鏁伴噺")].Value);
+ HICMOBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("鐢熶骇璁㈠崟鍙�")].Value);
+
+ if (cmbHBarCodeType.Text == "鍞竴鏉＄爜")
+ {
+ HTMNumber = HOrgNumber + HMaterNumber + HYear + HPeriod + HDay;
+ Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + HTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ }
+ else if (cmbHBarCodeType.Text == "鎵规鏉＄爜")
+ {
+ TM = HOrgNumber + HMaterNumber + HBatchNo;
+ }
+
+
+ n = 0;
+
+ LSH2 = LSH.ToString();
+ while (LSH2.Length < LSHlen) //濡傛灉娴佹按鍙峰皬浜�6浣嶆暟鍓嶉潰琛�0
+ {
+ LSH2 = "0" + LSH2;
+ }
+ if (cmbHBarCodeType.Text == "鍞竴鏉＄爜")
+ {
+ //鏉＄爜缂栧彿 = 鏉＄爜鍓嶇紑 + 娴佹按鍙�
+ TM = HTMNumber + LSH2;
+ }
+ if (TM.Trim() == "")
+ {
+ MessageBox.Show("鏉″舰鐮佷笉鑳戒负绌猴紝涓嶈兘鐢熸垚鏉＄爜锛�");
+ return;
+ }
+ string HWei = ""; //灏炬暟
+ string HBarCode = "";
+ string HBarCodeType = "";
+ Int64 HMaterID1 = 0;
+ Int64 HAuxPropID = 0;
+ Int64 HUnitID = 0;
+ double HQty2 = 0;
+ string HBatchNo2 = "";
+ Int64 HSupID = 0;
+ Int64 HGroupID = 0;
+ int HPrintQty = 0;
+ Int64 HSourceInterID = 0;
+ Int64 HSourceEntryID = 0;
+ string HSourceBillNo = "";
+ string HSourceBillType = "";
+ Int64 HBarcodeNo = 0; //鎵樺彿
+ Int64 HBarcodeQtys = 0; //鎬绘墭鏁�
+ Int64 HDeptID = 0;
+ Int64 HWhID = 0;
+ Int64 HSPID = 0;
+ string HRemark = "";
+ string HMaterName = "";
+ string HMaterModel = "";
+ string HPinfan = "";
+ string HMTONo = "";
+ Int64 HCusID = 0;
+ string HCusType = "";
+ DateTime HEndDate;
+ string HWorkLineName = "";
+ string HSeOrderBillNo = "";
+ string HInnerBillNo = "";
+ try
+ {
+ oCn.BeginTran();
+ HWei = WeiShu;
+ HBarCode = TM;
+ HBarCodeType = ClsPub.isStrNull(cmbHBarCodeType.Text);
+ HMaterID1 = ClsPub.isLong(grdMain.Rows[j].Cells[Fun_GetCol("HMaterID")].Value);
+ HAuxPropID = 0;
+ HUnitID = 0;
+ HQty2 = HZXQty;
+ HBatchNo2 = ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("鎵规")].Value);
+ HSourceInterID = 0;
+ HSourceEntryID = 0;
+ HSourceBillNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("鐢熶骇璁㈠崟鍙�")].Value);
+ HSourceBillType = "3710";
+ HBarcodeQtys = 0;
+ HBarcodeNo = 0;
+ HSupID = 0;
+ HDeptID = 0;
+ HWhID = 0;
+ HSPID = 0;
+ HRemark = "";
+ HMaterName = ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("鐗╂枡鍚嶇О")].Value);
+ HMaterModel = ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("瑙勬牸鍨嬪彿")].Value);
+ HPinfan = "";
+ HMTONo = "";
+ HCusID = 0;
+ HCusType = "";
+ HEndDate = ClsPub.isDate(grdMain.Rows[j].Cells[Fun_GetCol("鏃ユ湡")].Value);
+ HWorkLineName = "";
+ HSeOrderBillNo = "";
+ HInnerBillNo = "";
+ oCn.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
+ ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
+ ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
+ ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate " +
+ ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID " +
+ ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " +
+ ") values ("
+ + "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID1.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()
+ + ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString()
+ + ", " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HWei + "'"
+ + ", " + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + "," + HDeptID.ToString() + "," + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HRemark + "'"
+ + ", " + HCusID.ToString() + ",'" + HCusType + "','" + HEndDate.ToShortDateString() + "','" + HWorkLineName + "','" + HDate + "'"
+ + ", " + ClsPub.HOrgID.ToString() + "," + ClsPub.HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HInterID.ToString()
+ + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "')");
+ oCn.RunProc("insert into Sc_PackUnionBillSub (HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo" +
+ ",HSourceBillType,HMaterID,HUnitID,HQty,HSourceID,HEquipID,HGroupID" +
+ ",HWorkerID,HScanDate,HBarCode,HBarCode_Pack,HStatus,HICMOEntryID " +
+ ") values ("
+ + HInterID_TTM + "," + j + ",0,0,''"
+ + ",'3710'," + HMaterID1.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString() + ",0,0,0"
+ + ", 0,getdate(),'" + HBarCode + "','" + TTM + "',0,0)");
+
+ oCn.Commit();
+ MessageBox.Show("鏉＄爜鐢熸垚瀹屾瘯锛�");
+ //grdSub.RowCount = 0;
+ DisplayTM();
+ }
+ catch (Exception e1)
+ {
+ oCn.RollBack();
+ MessageBox.Show("鏉＄爜鐢熸垚澶辫触锛�" + e1.Message);
+ }
}
}
@@ -1189,6 +1654,9 @@
{
this.txtHSourceID.Text = oWork.oModel.HName;
this.txtHSourceID.Tag = oWork.oModel.HItemID.ToString();
+ //
+ Display();
+ //
}
else
{
@@ -1365,5 +1833,81 @@
grdSub.DataSource = null;
grdMain.DataSource = null;
}
+
+ private void button2_Click(object sender, EventArgs e)
+ {
+ //鑾峰彇缃戞牸绗竴琛孒InterID鐨勫��
+ Int64 HInterID = 0;
+ HInterID = DBUtility.ClsPub.isInt(grdMain.Rows[0].Cells[Fun_GetCol("HInterID")].Value);
+ DataSet DSBefore;
+ DSBefore = SubCn.RunProcReturn("exec h_p_PreviousMater "+ HInterID, "h_p_PreviousMater", ref DBUtility.ClsPub.sExeReturnInfo);
+ grdMain.DataSource = DSBefore.Tables[0].DefaultView;
+ }
+
+ private void button3_Click(object sender, EventArgs e)
+ {
+ //鏍规嵁
+ Int64 HInterID = 0;
+ HInterID = DBUtility.ClsPub.isInt(grdMain.Rows[0].Cells[Fun_GetCol("HInterID")].Value);
+ DataSet DSBefore;
+ DSBefore = SubCn.RunProcReturn("exec h_p_NextMater " + HInterID, "h_p_NextMater", ref DBUtility.ClsPub.sExeReturnInfo);
+ grdMain.DataSource = DSBefore.Tables[0].DefaultView;
+ }
+
+ //瓒呴鎵撳嵃
+ private void button7_Click(object sender, EventArgs e)
+ {
+ //鏍规嵁鏈鏁伴噺 鏉� 鍒嗛厤鍒� 姣忎釜鐢熶骇璁㈠崟涓婏紝骞朵笖鍏佽瓒呰繃璁㈠崟鏁伴噺 锛堝垎閰嶆椂 瑕佽�冭檻 璁㈠崟鍓╀綑鏁伴噺宸茬粡鏄� 璐熸暟鐨勬儏鍐碉級
+ //1.鍒ゆ柇鏈鏁伴噺 蹇呴』澶т簬0
+ double HZXQty = 0;//鏁寸鏁伴噺
+ HZXQty = ClsPub.isDoule(txtHZXQty.Text);
+ if (HZXQty <= 0)
+ {
+ MessageBox.Show("璇疯緭鍏ユ暣绠辨暟閲忥紒");
+ return;
+ }
+ //2.鍒锋柊缃戞牸
+ Display();
+ //3.寰幆缃戞牸锛岀疮璁″叏閮ㄥ墿浣欐暟閲忥紝鍒ゆ柇鏄惁 鍓╀綑鏁伴噺 灏忎簬 鏈鏁伴噺锛涘鏋� 澶т簬鍒欐姤閿� 閫�鍑恒��
+ double sumLeftQty = 0;
+ for (int i = 0; i < grdMain.Rows.Count; i++)
+ {
+ if ( DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value)>0)
+ {
+ sumLeftQty = sumLeftQty + DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
+ }
+ else
+ {
+ }
+ }
+ if(sumLeftQty>= HZXQty )
+ {
+ MessageBox.Show("鍓╀綑鏁伴噺澶т簬鏈鏁伴噺锛屼笉鑳借秴棰濇墦鍗帮紝璇风敤鏅�氭墦鍗板姛鑳姐��");
+ return;
+ }
+ //4.鎶婃暣绠辨暟閲� 鍒嗛厤鍒� 缃戞牸涓嬮潰鐨勬瘡涓�涓� 鐢熶骇璁㈠崟涓婂幓銆� 寰幆缃戞牸
+ for (int i = 0; i < grdMain.Rows.Count; i++)
+ {
+ if (HZXQty > DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value))
+ {
+ if (i == grdMain.Rows.Count - 1)
+ {
+ grdMain.Rows[i].Cells["鏈鏁伴噺"].Value = HZXQty;
+ }
+ else
+ {
+ HZXQty = HZXQty - DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
+ grdMain.Rows[i].Cells["鏈鏁伴噺"].Value = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
+ }
+ }
+ else
+ {
+ //grdMain.Rows[i].Cells["鏈鏁伴噺"].Value = HZXQty;
+ break;
+ }
+ }
+ Sub_SaveBarCode();
+ //
+ }
}
}
\ No newline at end of file
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.designer.cs"
index 8001f74..51aa034 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.designer.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.designer.cs"
@@ -54,11 +54,11 @@
this.txtHMaterID = new System.Windows.Forms.TextBox();
this.cmdHMaterID = new System.Windows.Forms.Button();
this.gbUp = new System.Windows.Forms.GroupBox();
+ this.txtHSeOrderBillNo = new System.Windows.Forms.TextBox();
+ this.label9 = new System.Windows.Forms.Label();
this.cmbHBarCodeType = new System.Windows.Forms.ComboBox();
this.label8 = new System.Windows.Forms.Label();
this.cmdHSaveBill = new System.Windows.Forms.Button();
- this.dtpHEndDate = new System.Windows.Forms.DateTimePicker();
- this.label5 = new System.Windows.Forms.Label();
this.dtpHBeginDate = new System.Windows.Forms.DateTimePicker();
this.label6 = new System.Windows.Forms.Label();
this.button4 = new System.Windows.Forms.Button();
@@ -87,8 +87,9 @@
this.tabPage1 = new System.Windows.Forms.TabPage();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.grdList = new System.Windows.Forms.DataGridView();
- this.txtHSeOrderBillNo = new System.Windows.Forms.TextBox();
- this.label9 = new System.Windows.Forms.Label();
+ this.button2 = new System.Windows.Forms.Button();
+ this.button3 = new System.Windows.Forms.Button();
+ this.button7 = new System.Windows.Forms.Button();
this.Tool.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
this.gbUp.SuspendLayout();
@@ -118,7 +119,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(1172, 50);
+ this.Tool.Size = new System.Drawing.Size(1563, 62);
this.Tool.Stretch = true;
this.Tool.TabIndex = 16;
this.Tool.Text = "toolStrip1";
@@ -140,13 +141,13 @@
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 62);
//
// toolStripSeparator9
//
this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 62);
//
// mrlk
//
@@ -156,7 +157,7 @@
this.mrlk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.mrlk.ImageTransparentColor = System.Drawing.Color.White;
this.mrlk.Name = "mrlk";
- this.mrlk.Size = new System.Drawing.Size(60, 47);
+ this.mrlk.Size = new System.Drawing.Size(73, 59);
this.mrlk.Text = "榛樿鍒楀";
this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -166,7 +167,7 @@
//
this.toolStripSeparator7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator7.Name = "toolStripSeparator7";
- this.toolStripSeparator7.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 62);
//
// bclk
//
@@ -176,7 +177,7 @@
this.bclk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.bclk.ImageTransparentColor = System.Drawing.Color.White;
this.bclk.Name = "bclk";
- this.bclk.Size = new System.Drawing.Size(60, 47);
+ this.bclk.Size = new System.Drawing.Size(73, 59);
this.bclk.Text = "淇濆瓨鍒楀";
this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -186,7 +187,7 @@
//
this.toolStripSeparator8.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator8.Name = "toolStripSeparator8";
- this.toolStripSeparator8.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 62);
//
// cz
//
@@ -217,12 +218,13 @@
this.grdMain.AllowUserToDeleteRows = false;
this.grdMain.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdMain.Location = new System.Drawing.Point(4, 6);
+ this.grdMain.Location = new System.Drawing.Point(5, 8);
this.grdMain.Margin = new System.Windows.Forms.Padding(0);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
+ this.grdMain.RowHeadersWidth = 51;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(866, 263);
+ this.grdMain.Size = new System.Drawing.Size(1155, 329);
this.grdMain.TabIndex = 19;
this.grdMain.Paint += new System.Windows.Forms.PaintEventHandler(this.grdMain_Paint);
this.grdMain.DoubleClick += new System.EventHandler(this.grdMain_DblClick);
@@ -232,9 +234,10 @@
this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ForeColor = System.Drawing.Color.Black;
- this.label1.Location = new System.Drawing.Point(19, 35);
+ this.label1.Location = new System.Drawing.Point(25, 44);
+ this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(88, 16);
+ this.label1.Size = new System.Drawing.Size(109, 20);
this.label1.TabIndex = 46;
this.label1.Text = "鐢熶骇璁㈠崟鍙�";
//
@@ -242,10 +245,11 @@
//
this.txtHICMOBillNo.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHICMOBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHICMOBillNo.Location = new System.Drawing.Point(112, 29);
+ this.txtHICMOBillNo.Location = new System.Drawing.Point(149, 36);
+ this.txtHICMOBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHICMOBillNo.Name = "txtHICMOBillNo";
this.txtHICMOBillNo.ReadOnly = true;
- this.txtHICMOBillNo.Size = new System.Drawing.Size(166, 30);
+ this.txtHICMOBillNo.Size = new System.Drawing.Size(220, 36);
this.txtHICMOBillNo.TabIndex = 47;
//
// label2
@@ -253,9 +257,10 @@
this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.ForeColor = System.Drawing.Color.Black;
- this.label2.Location = new System.Drawing.Point(312, 34);
+ this.label2.Location = new System.Drawing.Point(416, 42);
+ this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(40, 16);
+ this.label2.Size = new System.Drawing.Size(49, 20);
this.label2.TabIndex = 49;
this.label2.Text = "鏈哄彴";
//
@@ -263,18 +268,20 @@
//
this.txtHSourceID.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHSourceID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSourceID.Location = new System.Drawing.Point(364, 28);
+ this.txtHSourceID.Location = new System.Drawing.Point(485, 35);
+ this.txtHSourceID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHSourceID.Name = "txtHSourceID";
this.txtHSourceID.ReadOnly = true;
- this.txtHSourceID.Size = new System.Drawing.Size(166, 30);
+ this.txtHSourceID.Size = new System.Drawing.Size(220, 36);
this.txtHSourceID.TabIndex = 50;
//
// cmdHSourceID
//
this.cmdHSourceID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSourceID.Image")));
- this.cmdHSourceID.Location = new System.Drawing.Point(527, 27);
+ this.cmdHSourceID.Location = new System.Drawing.Point(703, 34);
+ this.cmdHSourceID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHSourceID.Name = "cmdHSourceID";
- this.cmdHSourceID.Size = new System.Drawing.Size(32, 32);
+ this.cmdHSourceID.Size = new System.Drawing.Size(43, 40);
this.cmdHSourceID.TabIndex = 51;
this.cmdHSourceID.UseVisualStyleBackColor = true;
this.cmdHSourceID.Click += new System.EventHandler(this.cmdHSourceID_Click);
@@ -284,9 +291,10 @@
this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.ForeColor = System.Drawing.Color.Black;
- this.label3.Location = new System.Drawing.Point(599, 34);
+ this.label3.Location = new System.Drawing.Point(799, 42);
+ this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(40, 16);
+ this.label3.Size = new System.Drawing.Size(49, 20);
this.label3.TabIndex = 52;
this.label3.Text = "鑱屽憳";
//
@@ -294,18 +302,20 @@
//
this.txtHEmpID.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHEmpID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHEmpID.Location = new System.Drawing.Point(651, 28);
+ this.txtHEmpID.Location = new System.Drawing.Point(868, 35);
+ this.txtHEmpID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHEmpID.Name = "txtHEmpID";
this.txtHEmpID.ReadOnly = true;
- this.txtHEmpID.Size = new System.Drawing.Size(166, 30);
+ this.txtHEmpID.Size = new System.Drawing.Size(220, 36);
this.txtHEmpID.TabIndex = 53;
//
// cmdHEmpID
//
this.cmdHEmpID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHEmpID.Image")));
- this.cmdHEmpID.Location = new System.Drawing.Point(814, 27);
+ this.cmdHEmpID.Location = new System.Drawing.Point(1089, 34);
+ this.cmdHEmpID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHEmpID.Name = "cmdHEmpID";
- this.cmdHEmpID.Size = new System.Drawing.Size(32, 32);
+ this.cmdHEmpID.Size = new System.Drawing.Size(43, 40);
this.cmdHEmpID.TabIndex = 54;
this.cmdHEmpID.UseVisualStyleBackColor = true;
this.cmdHEmpID.Click += new System.EventHandler(this.cmdHEmpID_Click);
@@ -315,30 +325,36 @@
this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.ForeColor = System.Drawing.Color.Black;
- this.label4.Location = new System.Drawing.Point(875, 34);
+ this.label4.Location = new System.Drawing.Point(1167, 42);
+ this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(40, 16);
+ this.label4.Size = new System.Drawing.Size(49, 20);
this.label4.TabIndex = 55;
this.label4.Text = "鐗╂枡";
+ this.label4.Visible = false;
//
// txtHMaterID
//
this.txtHMaterID.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHMaterID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterID.Location = new System.Drawing.Point(927, 28);
+ this.txtHMaterID.Location = new System.Drawing.Point(1236, 35);
+ this.txtHMaterID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHMaterID.Name = "txtHMaterID";
this.txtHMaterID.ReadOnly = true;
- this.txtHMaterID.Size = new System.Drawing.Size(166, 30);
+ this.txtHMaterID.Size = new System.Drawing.Size(220, 36);
this.txtHMaterID.TabIndex = 56;
+ this.txtHMaterID.Visible = false;
//
// cmdHMaterID
//
this.cmdHMaterID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHMaterID.Image")));
- this.cmdHMaterID.Location = new System.Drawing.Point(1090, 27);
+ this.cmdHMaterID.Location = new System.Drawing.Point(1453, 34);
+ this.cmdHMaterID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHMaterID.Name = "cmdHMaterID";
- this.cmdHMaterID.Size = new System.Drawing.Size(32, 32);
+ this.cmdHMaterID.Size = new System.Drawing.Size(43, 40);
this.cmdHMaterID.TabIndex = 57;
this.cmdHMaterID.UseVisualStyleBackColor = true;
+ this.cmdHMaterID.Visible = false;
this.cmdHMaterID.Click += new System.EventHandler(this.cmdHMaterID_Click);
//
// gbUp
@@ -349,8 +365,6 @@
this.gbUp.Controls.Add(this.cmbHBarCodeType);
this.gbUp.Controls.Add(this.label8);
this.gbUp.Controls.Add(this.cmdHSaveBill);
- this.gbUp.Controls.Add(this.dtpHEndDate);
- this.gbUp.Controls.Add(this.label5);
this.gbUp.Controls.Add(this.dtpHBeginDate);
this.gbUp.Controls.Add(this.label6);
this.gbUp.Controls.Add(this.label4);
@@ -364,23 +378,47 @@
this.gbUp.Controls.Add(this.txtHEmpID);
this.gbUp.Controls.Add(this.label2);
this.gbUp.Controls.Add(this.cmdHEmpID);
- this.gbUp.Location = new System.Drawing.Point(11, 55);
+ this.gbUp.Location = new System.Drawing.Point(15, 69);
+ this.gbUp.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gbUp.Name = "gbUp";
- this.gbUp.Size = new System.Drawing.Size(1149, 126);
+ this.gbUp.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.gbUp.Size = new System.Drawing.Size(1532, 158);
this.gbUp.TabIndex = 58;
this.gbUp.TabStop = false;
+ //
+ // txtHSeOrderBillNo
+ //
+ this.txtHSeOrderBillNo.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHSeOrderBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHSeOrderBillNo.Location = new System.Drawing.Point(149, 99);
+ this.txtHSeOrderBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHSeOrderBillNo.Name = "txtHSeOrderBillNo";
+ this.txtHSeOrderBillNo.ReadOnly = true;
+ this.txtHSeOrderBillNo.Size = new System.Drawing.Size(163, 36);
+ this.txtHSeOrderBillNo.TabIndex = 141;
+ //
+ // label9
+ //
+ this.label9.AutoSize = true;
+ this.label9.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label9.ForeColor = System.Drawing.Color.Black;
+ this.label9.Location = new System.Drawing.Point(25, 106);
+ this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label9.Name = "label9";
+ this.label9.Size = new System.Drawing.Size(109, 20);
+ this.label9.TabIndex = 140;
+ this.label9.Text = "閿�鍞鍗曞彿";
//
// cmbHBarCodeType
//
this.cmbHBarCodeType.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbHBarCodeType.FormattingEnabled = true;
this.cmbHBarCodeType.Items.AddRange(new object[] {
- "鍞竴鏉＄爜",
- "鎵规鏉＄爜"});
- this.cmbHBarCodeType.Location = new System.Drawing.Point(871, 77);
- this.cmbHBarCodeType.Margin = new System.Windows.Forms.Padding(2);
+ "鍞竴鏉＄爜"});
+ this.cmbHBarCodeType.Location = new System.Drawing.Point(856, 99);
+ this.cmbHBarCodeType.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.cmbHBarCodeType.Name = "cmbHBarCodeType";
- this.cmbHBarCodeType.Size = new System.Drawing.Size(140, 28);
+ this.cmbHBarCodeType.Size = new System.Drawing.Size(185, 33);
this.cmbHBarCodeType.TabIndex = 139;
//
// label8
@@ -388,9 +426,10 @@
this.label8.AutoSize = true;
this.label8.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.ForeColor = System.Drawing.Color.Black;
- this.label8.Location = new System.Drawing.Point(793, 84);
+ this.label8.Location = new System.Drawing.Point(743, 108);
+ this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(72, 16);
+ this.label8.Size = new System.Drawing.Size(89, 20);
this.label8.TabIndex = 138;
this.label8.Text = "鏉＄爜绫诲瀷";
//
@@ -398,44 +437,23 @@
//
this.cmdHSaveBill.BackColor = System.Drawing.Color.White;
this.cmdHSaveBill.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.cmdHSaveBill.Location = new System.Drawing.Point(1026, 66);
- this.cmdHSaveBill.Margin = new System.Windows.Forms.Padding(2);
+ this.cmdHSaveBill.Location = new System.Drawing.Point(1149, 85);
+ this.cmdHSaveBill.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.cmdHSaveBill.Name = "cmdHSaveBill";
- this.cmdHSaveBill.Size = new System.Drawing.Size(112, 50);
+ this.cmdHSaveBill.Size = new System.Drawing.Size(149, 62);
this.cmdHSaveBill.TabIndex = 137;
this.cmdHSaveBill.Text = "鏌ヨ";
this.cmdHSaveBill.UseVisualStyleBackColor = false;
this.cmdHSaveBill.Click += new System.EventHandler(this.cmdHSaveBill_Click);
//
- // dtpHEndDate
- //
- this.dtpHEndDate.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.dtpHEndDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHEndDate.Location = new System.Drawing.Point(602, 76);
- this.dtpHEndDate.Margin = new System.Windows.Forms.Padding(2);
- this.dtpHEndDate.Name = "dtpHEndDate";
- this.dtpHEndDate.Size = new System.Drawing.Size(154, 30);
- this.dtpHEndDate.TabIndex = 102;
- //
- // label5
- //
- this.label5.AutoSize = true;
- this.label5.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label5.ForeColor = System.Drawing.Color.Black;
- this.label5.Location = new System.Drawing.Point(523, 84);
- this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(72, 16);
- this.label5.TabIndex = 101;
- this.label5.Text = "缁撴潫鏃ユ湡";
- //
// dtpHBeginDate
//
this.dtpHBeginDate.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.dtpHBeginDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHBeginDate.Location = new System.Drawing.Point(336, 77);
- this.dtpHBeginDate.Margin = new System.Windows.Forms.Padding(2);
+ this.dtpHBeginDate.Location = new System.Drawing.Point(448, 96);
+ this.dtpHBeginDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.dtpHBeginDate.Name = "dtpHBeginDate";
- this.dtpHBeginDate.Size = new System.Drawing.Size(154, 30);
+ this.dtpHBeginDate.Size = new System.Drawing.Size(204, 36);
this.dtpHBeginDate.TabIndex = 100;
//
// label6
@@ -443,20 +461,21 @@
this.label6.AutoSize = true;
this.label6.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.ForeColor = System.Drawing.Color.Black;
- this.label6.Location = new System.Drawing.Point(257, 85);
+ this.label6.Location = new System.Drawing.Point(343, 106);
+ this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(72, 16);
+ this.label6.Size = new System.Drawing.Size(89, 20);
this.label6.TabIndex = 99;
- this.label6.Text = "寮�濮嬫棩鏈�";
+ this.label6.Text = "鏃� 鏈�";
//
// button4
//
this.button4.BackColor = System.Drawing.Color.White;
this.button4.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button4.Location = new System.Drawing.Point(1036, 218);
- this.button4.Margin = new System.Windows.Forms.Padding(2);
+ this.button4.Location = new System.Drawing.Point(1381, 236);
+ this.button4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button4.Name = "button4";
- this.button4.Size = new System.Drawing.Size(112, 50);
+ this.button4.Size = new System.Drawing.Size(149, 62);
this.button4.TabIndex = 138;
this.button4.Text = "鐢熸垚鏉＄爜";
this.button4.UseVisualStyleBackColor = false;
@@ -466,34 +485,38 @@
//
this.button5.BackColor = System.Drawing.Color.White;
this.button5.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button5.Location = new System.Drawing.Point(1036, 297);
- this.button5.Margin = new System.Windows.Forms.Padding(2);
+ this.button5.Location = new System.Drawing.Point(1381, 309);
+ this.button5.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button5.Name = "button5";
- this.button5.Size = new System.Drawing.Size(112, 42);
+ this.button5.Size = new System.Drawing.Size(149, 52);
this.button5.TabIndex = 139;
this.button5.Text = "棰勮";
this.button5.UseVisualStyleBackColor = false;
+ this.button5.Visible = false;
this.button5.Click += new System.EventHandler(this.button5_Click);
//
// button6
//
this.button6.BackColor = System.Drawing.Color.White;
this.button6.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button6.Location = new System.Drawing.Point(1036, 379);
- this.button6.Margin = new System.Windows.Forms.Padding(2);
+ this.button6.Location = new System.Drawing.Point(1381, 370);
+ this.button6.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button6.Name = "button6";
- this.button6.Size = new System.Drawing.Size(112, 44);
+ this.button6.Size = new System.Drawing.Size(149, 55);
this.button6.TabIndex = 140;
this.button6.Text = "鎵撳嵃";
this.button6.UseVisualStyleBackColor = false;
+ this.button6.Visible = false;
this.button6.Click += new System.EventHandler(this.button6_Click);
//
// txtHMiniQty
//
- this.txtHMiniQty.Location = new System.Drawing.Point(898, 296);
+ this.txtHMiniQty.Location = new System.Drawing.Point(1197, 370);
+ this.txtHMiniQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHMiniQty.Multiline = true;
this.txtHMiniQty.Name = "txtHMiniQty";
- this.txtHMiniQty.Size = new System.Drawing.Size(112, 42);
+ this.txtHMiniQty.ReadOnly = true;
+ this.txtHMiniQty.Size = new System.Drawing.Size(148, 52);
this.txtHMiniQty.TabIndex = 141;
this.txtHMiniQty.TextChanged += new System.EventHandler(this.txtHMiniQty_TextChanged);
//
@@ -501,9 +524,10 @@
//
this.鏍囧噯瑁呯.AutoSize = true;
this.鏍囧噯瑁呯.Font = new System.Drawing.Font("瀹嬩綋", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.鏍囧噯瑁呯.Location = new System.Drawing.Point(894, 265);
+ this.鏍囧噯瑁呯.Location = new System.Drawing.Point(1192, 331);
+ this.鏍囧噯瑁呯.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.鏍囧噯瑁呯.Name = "鏍囧噯瑁呯";
- this.鏍囧噯瑁呯.Size = new System.Drawing.Size(120, 27);
+ this.鏍囧噯瑁呯.Size = new System.Drawing.Size(151, 34);
this.鏍囧噯瑁呯.TabIndex = 142;
this.鏍囧噯瑁呯.Text = "鏍囧噯瑁呯";
//
@@ -511,19 +535,23 @@
//
this.label7.AutoSize = true;
this.label7.Font = new System.Drawing.Font("瀹嬩綋", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label7.Location = new System.Drawing.Point(877, 349);
+ this.label7.Location = new System.Drawing.Point(1177, 436);
+ this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(174, 27);
+ this.label7.Size = new System.Drawing.Size(219, 34);
this.label7.TabIndex = 144;
this.label7.Text = "鏈鐢熸垚鏁伴噺";
+ this.label7.Visible = false;
//
// txtHBQty
//
- this.txtHBQty.Location = new System.Drawing.Point(901, 380);
+ this.txtHBQty.Location = new System.Drawing.Point(1201, 475);
+ this.txtHBQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHBQty.Multiline = true;
this.txtHBQty.Name = "txtHBQty";
- this.txtHBQty.Size = new System.Drawing.Size(112, 42);
+ this.txtHBQty.Size = new System.Drawing.Size(148, 52);
this.txtHBQty.TabIndex = 143;
+ this.txtHBQty.Visible = false;
this.txtHBQty.TextChanged += new System.EventHandler(this.txtHBQty_TextChanged);
//
// groupBox1
@@ -539,9 +567,11 @@
this.groupBox1.Controls.Add(this.txtHMaterID1);
this.groupBox1.Controls.Add(this.label13);
this.groupBox1.Controls.Add(this.cmdHMaterID1);
- this.groupBox1.Location = new System.Drawing.Point(10, 485);
+ this.groupBox1.Location = new System.Drawing.Point(13, 606);
+ this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(1148, 126);
+ this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.groupBox1.Size = new System.Drawing.Size(1531, 158);
this.groupBox1.TabIndex = 140;
this.groupBox1.TabStop = false;
//
@@ -549,10 +579,10 @@
//
this.cmdHSaveBill1.BackColor = System.Drawing.Color.White;
this.cmdHSaveBill1.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.cmdHSaveBill1.Location = new System.Drawing.Point(771, 35);
- this.cmdHSaveBill1.Margin = new System.Windows.Forms.Padding(2);
+ this.cmdHSaveBill1.Location = new System.Drawing.Point(1028, 44);
+ this.cmdHSaveBill1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.cmdHSaveBill1.Name = "cmdHSaveBill1";
- this.cmdHSaveBill1.Size = new System.Drawing.Size(112, 50);
+ this.cmdHSaveBill1.Size = new System.Drawing.Size(149, 62);
this.cmdHSaveBill1.TabIndex = 137;
this.cmdHSaveBill1.Text = "鏌ヨ";
this.cmdHSaveBill1.UseVisualStyleBackColor = false;
@@ -562,10 +592,10 @@
//
this.dtpHEndDate1.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.dtpHEndDate1.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHEndDate1.Location = new System.Drawing.Point(478, 75);
- this.dtpHEndDate1.Margin = new System.Windows.Forms.Padding(2);
+ this.dtpHEndDate1.Location = new System.Drawing.Point(637, 94);
+ this.dtpHEndDate1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.dtpHEndDate1.Name = "dtpHEndDate1";
- this.dtpHEndDate1.Size = new System.Drawing.Size(213, 30);
+ this.dtpHEndDate1.Size = new System.Drawing.Size(283, 36);
this.dtpHEndDate1.TabIndex = 102;
//
// label10
@@ -573,9 +603,10 @@
this.label10.AutoSize = true;
this.label10.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label10.ForeColor = System.Drawing.Color.Black;
- this.label10.Location = new System.Drawing.Point(399, 83);
+ this.label10.Location = new System.Drawing.Point(532, 104);
+ this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(72, 16);
+ this.label10.Size = new System.Drawing.Size(89, 20);
this.label10.TabIndex = 101;
this.label10.Text = "缁撴潫鏃ユ湡";
//
@@ -583,10 +614,10 @@
//
this.dtpHBeginDate1.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.dtpHBeginDate1.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHBeginDate1.Location = new System.Drawing.Point(112, 77);
- this.dtpHBeginDate1.Margin = new System.Windows.Forms.Padding(2);
+ this.dtpHBeginDate1.Location = new System.Drawing.Point(149, 96);
+ this.dtpHBeginDate1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.dtpHBeginDate1.Name = "dtpHBeginDate1";
- this.dtpHBeginDate1.Size = new System.Drawing.Size(213, 30);
+ this.dtpHBeginDate1.Size = new System.Drawing.Size(283, 36);
this.dtpHBeginDate1.TabIndex = 100;
//
// label11
@@ -594,9 +625,10 @@
this.label11.AutoSize = true;
this.label11.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label11.ForeColor = System.Drawing.Color.Black;
- this.label11.Location = new System.Drawing.Point(33, 85);
+ this.label11.Location = new System.Drawing.Point(44, 106);
+ this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(72, 16);
+ this.label11.Size = new System.Drawing.Size(89, 20);
this.label11.TabIndex = 99;
this.label11.Text = "寮�濮嬫棩鏈�";
//
@@ -605,9 +637,10 @@
this.label12.AutoSize = true;
this.label12.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label12.ForeColor = System.Drawing.Color.Black;
- this.label12.Location = new System.Drawing.Point(427, 35);
+ this.label12.Location = new System.Drawing.Point(569, 44);
+ this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(40, 16);
+ this.label12.Size = new System.Drawing.Size(49, 20);
this.label12.TabIndex = 55;
this.label12.Text = "鐗╂枡";
//
@@ -615,20 +648,22 @@
//
this.txtHICMOBillNo1.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHICMOBillNo1.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHICMOBillNo1.Location = new System.Drawing.Point(112, 29);
+ this.txtHICMOBillNo1.Location = new System.Drawing.Point(149, 36);
+ this.txtHICMOBillNo1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHICMOBillNo1.Name = "txtHICMOBillNo1";
this.txtHICMOBillNo1.ReadOnly = true;
- this.txtHICMOBillNo1.Size = new System.Drawing.Size(214, 30);
+ this.txtHICMOBillNo1.Size = new System.Drawing.Size(284, 36);
this.txtHICMOBillNo1.TabIndex = 47;
//
// txtHMaterID1
//
this.txtHMaterID1.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHMaterID1.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterID1.Location = new System.Drawing.Point(477, 29);
+ this.txtHMaterID1.Location = new System.Drawing.Point(636, 36);
+ this.txtHMaterID1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHMaterID1.Name = "txtHMaterID1";
this.txtHMaterID1.ReadOnly = true;
- this.txtHMaterID1.Size = new System.Drawing.Size(184, 30);
+ this.txtHMaterID1.Size = new System.Drawing.Size(244, 36);
this.txtHMaterID1.TabIndex = 56;
//
// label13
@@ -636,18 +671,20 @@
this.label13.AutoSize = true;
this.label13.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label13.ForeColor = System.Drawing.Color.Black;
- this.label13.Location = new System.Drawing.Point(19, 35);
+ this.label13.Location = new System.Drawing.Point(25, 44);
+ this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(88, 16);
+ this.label13.Size = new System.Drawing.Size(109, 20);
this.label13.TabIndex = 46;
this.label13.Text = "鐢熶骇璁㈠崟鍙�";
//
// cmdHMaterID1
//
this.cmdHMaterID1.Image = ((System.Drawing.Image)(resources.GetObject("cmdHMaterID1.Image")));
- this.cmdHMaterID1.Location = new System.Drawing.Point(660, 27);
+ this.cmdHMaterID1.Location = new System.Drawing.Point(880, 34);
+ this.cmdHMaterID1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHMaterID1.Name = "cmdHMaterID1";
- this.cmdHMaterID1.Size = new System.Drawing.Size(32, 32);
+ this.cmdHMaterID1.Size = new System.Drawing.Size(43, 40);
this.cmdHMaterID1.TabIndex = 57;
this.cmdHMaterID1.UseVisualStyleBackColor = true;
this.cmdHMaterID1.Click += new System.EventHandler(this.cmdHMaterID1_Click);
@@ -658,21 +695,23 @@
this.grdSub.AllowUserToDeleteRows = false;
this.grdSub.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
this.grdSub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdSub.Location = new System.Drawing.Point(9, 618);
+ this.grdSub.Location = new System.Drawing.Point(12, 772);
+ this.grdSub.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.grdSub.Name = "grdSub";
this.grdSub.ReadOnly = true;
+ this.grdSub.RowHeadersWidth = 51;
this.grdSub.RowTemplate.Height = 23;
- this.grdSub.Size = new System.Drawing.Size(866, 228);
+ this.grdSub.Size = new System.Drawing.Size(1155, 285);
this.grdSub.TabIndex = 145;
//
// button1
//
this.button1.BackColor = System.Drawing.Color.White;
this.button1.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button1.Location = new System.Drawing.Point(901, 688);
- this.button1.Margin = new System.Windows.Forms.Padding(2);
+ this.button1.Location = new System.Drawing.Point(1200, 782);
+ this.button1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(112, 50);
+ this.button1.Size = new System.Drawing.Size(149, 62);
this.button1.TabIndex = 146;
this.button1.Text = "琛ユ墦鏉＄爜";
this.button1.UseVisualStyleBackColor = false;
@@ -682,37 +721,41 @@
//
this.鏁寸鏁伴噺.AutoSize = true;
this.鏁寸鏁伴噺.Font = new System.Drawing.Font("瀹嬩綋", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.鏁寸鏁伴噺.Location = new System.Drawing.Point(900, 190);
+ this.鏁寸鏁伴噺.Location = new System.Drawing.Point(1200, 238);
+ this.鏁寸鏁伴噺.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.鏁寸鏁伴噺.Name = "鏁寸鏁伴噺";
- this.鏁寸鏁伴噺.Size = new System.Drawing.Size(120, 27);
+ this.鏁寸鏁伴噺.Size = new System.Drawing.Size(151, 34);
this.鏁寸鏁伴噺.TabIndex = 148;
- this.鏁寸鏁伴噺.Text = "鏁寸鏁伴噺";
+ this.鏁寸鏁伴噺.Text = "鏈鏁伴噺";
//
// txtHZXQty
//
- this.txtHZXQty.Location = new System.Drawing.Point(900, 221);
+ this.txtHZXQty.Location = new System.Drawing.Point(1200, 276);
+ this.txtHZXQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHZXQty.Multiline = true;
this.txtHZXQty.Name = "txtHZXQty";
- this.txtHZXQty.Size = new System.Drawing.Size(112, 42);
+ this.txtHZXQty.Size = new System.Drawing.Size(148, 52);
this.txtHZXQty.TabIndex = 147;
//
// tabControl1
//
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage2);
- this.tabControl1.Location = new System.Drawing.Point(9, 181);
+ this.tabControl1.Location = new System.Drawing.Point(12, 226);
+ this.tabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(879, 298);
+ this.tabControl1.Size = new System.Drawing.Size(1172, 372);
this.tabControl1.TabIndex = 149;
//
// tabPage1
//
this.tabPage1.Controls.Add(this.grdMain);
- this.tabPage1.Location = new System.Drawing.Point(4, 22);
+ this.tabPage1.Location = new System.Drawing.Point(4, 25);
+ this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage1.Name = "tabPage1";
- this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage1.Size = new System.Drawing.Size(871, 272);
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabPage1.Size = new System.Drawing.Size(1164, 343);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "鐗╂枡淇℃伅";
this.tabPage1.UseVisualStyleBackColor = true;
@@ -720,10 +763,11 @@
// tabPage2
//
this.tabPage2.Controls.Add(this.grdList);
- this.tabPage2.Location = new System.Drawing.Point(4, 22);
+ this.tabPage2.Location = new System.Drawing.Point(4, 25);
+ this.tabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage2.Name = "tabPage2";
- this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage2.Size = new System.Drawing.Size(871, 272);
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabPage2.Size = new System.Drawing.Size(1164, 343);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "鏉＄爜淇℃伅";
this.tabPage2.UseVisualStyleBackColor = true;
@@ -734,41 +778,63 @@
this.grdList.AllowUserToDeleteRows = false;
this.grdList.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
this.grdList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdList.Location = new System.Drawing.Point(3, 3);
+ this.grdList.Location = new System.Drawing.Point(4, 4);
this.grdList.Margin = new System.Windows.Forms.Padding(0);
this.grdList.Name = "grdList";
this.grdList.ReadOnly = true;
+ this.grdList.RowHeadersWidth = 51;
this.grdList.RowTemplate.Height = 23;
- this.grdList.Size = new System.Drawing.Size(866, 269);
+ this.grdList.Size = new System.Drawing.Size(1155, 336);
this.grdList.TabIndex = 20;
//
- // txtHSeOrderBillNo
+ // button2
//
- this.txtHSeOrderBillNo.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.txtHSeOrderBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSeOrderBillNo.Location = new System.Drawing.Point(112, 79);
- this.txtHSeOrderBillNo.Name = "txtHSeOrderBillNo";
- this.txtHSeOrderBillNo.ReadOnly = true;
- this.txtHSeOrderBillNo.Size = new System.Drawing.Size(123, 30);
- this.txtHSeOrderBillNo.TabIndex = 141;
+ this.button2.BackColor = System.Drawing.Color.White;
+ this.button2.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.button2.Location = new System.Drawing.Point(1200, 545);
+ this.button2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button2.Name = "button2";
+ this.button2.Size = new System.Drawing.Size(149, 55);
+ this.button2.TabIndex = 150;
+ this.button2.Text = "涓婁竴涓墿鏂�";
+ this.button2.UseVisualStyleBackColor = false;
+ this.button2.Click += new System.EventHandler(this.button2_Click);
//
- // label9
+ // button3
//
- this.label9.AutoSize = true;
- this.label9.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label9.ForeColor = System.Drawing.Color.Black;
- this.label9.Location = new System.Drawing.Point(19, 85);
- this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(88, 16);
- this.label9.TabIndex = 140;
- this.label9.Text = "閿�鍞鍗曞彿";
+ this.button3.BackColor = System.Drawing.Color.White;
+ this.button3.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.button3.Location = new System.Drawing.Point(1381, 472);
+ this.button3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button3.Name = "button3";
+ this.button3.Size = new System.Drawing.Size(149, 55);
+ this.button3.TabIndex = 151;
+ this.button3.Text = "涓嬩竴涓墿鏂�";
+ this.button3.UseVisualStyleBackColor = false;
+ this.button3.Click += new System.EventHandler(this.button3_Click);
+ //
+ // button7
+ //
+ this.button7.BackColor = System.Drawing.Color.White;
+ this.button7.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.button7.Location = new System.Drawing.Point(1381, 545);
+ this.button7.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button7.Name = "button7";
+ this.button7.Size = new System.Drawing.Size(149, 55);
+ this.button7.TabIndex = 152;
+ this.button7.Text = "瓒呴鐢熶骇";
+ this.button7.UseVisualStyleBackColor = false;
+ this.button7.Click += new System.EventHandler(this.button7_Click);
//
// Sc_ICMOToBarCode
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.ActiveCaption;
- this.ClientSize = new System.Drawing.Size(1172, 869);
+ this.ClientSize = new System.Drawing.Size(1563, 1055);
+ this.Controls.Add(this.button7);
+ this.Controls.Add(this.button3);
+ this.Controls.Add(this.button2);
this.Controls.Add(this.tabControl1);
this.Controls.Add(this.鏁寸鏁伴噺);
this.Controls.Add(this.txtHZXQty);
@@ -784,6 +850,7 @@
this.Controls.Add(this.button4);
this.Controls.Add(this.gbUp);
this.Controls.Add(this.Tool);
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "Sc_ICMOToBarCode";
this.Text = "蹇�熺敓鎴愭潯鐮�";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -830,8 +897,6 @@
private System.Windows.Forms.Button cmdHMaterID;
private System.Windows.Forms.GroupBox gbUp;
private System.Windows.Forms.Button cmdHSaveBill;
- private System.Windows.Forms.DateTimePicker dtpHEndDate;
- private System.Windows.Forms.Label label5;
private System.Windows.Forms.DateTimePicker dtpHBeginDate;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.Button button4;
@@ -865,5 +930,8 @@
private System.Windows.Forms.ToolStripButton cz;
private System.Windows.Forms.TextBox txtHSeOrderBillNo;
private System.Windows.Forms.Label label9;
+ private System.Windows.Forms.Button button2;
+ private System.Windows.Forms.Button button3;
+ private System.Windows.Forms.Button button7;
}
}
\ No newline at end of file
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.resx" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.resx"
index 19878a1..646138a 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.resx"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.resx"
@@ -360,7 +360,7 @@
<data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
@@ -370,7 +370,7 @@
<data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
@@ -385,7 +385,7 @@
<data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
/QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
@@ -400,7 +400,7 @@
<data name="cz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACfSURBVDhPYyAGsGWf/Q9lkglSz/xnSANiskHCqf9///8n
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACfSURBVDhPYyAGsGWf/Q9lkglSz/xnSANiskHCqf9///8n
wxCQBhAOPfp/ytn/JBgCUpQIsRWGQQYQZwhQ8ilQEQj3XwAqnokFG8/EbwDMNrhiUCCSohluM0wxzAC8
mkEAagBYMbI/QQYQ1AwCuAwgSjMI4DKAaIBkwD2C0YULAJ2LYQgMEwWgBiAbAsMkGQLGoLBAxyR5C2YQ
OoYDBgYA9kn+I3B8Li4AAAAASUVORK5CYII=
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index 0fade22..0c2fd61 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -1044,7 +1044,7 @@
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "鍒濆鍖栨垚鍔燂紒";
+ objJsonResult.Message = "鍒濆鍖栨垚鍔燂紝鍗曟嵁鍙蜂负"+ HBillNo;
//WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
objJsonResult.data = 1;
return objJsonResult;
diff --git a/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs b/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
index 96fde3d..f06833c 100644
--- a/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
@@ -350,6 +350,7 @@
Ids = ""
};
var loginRet = InvokeHelper.Login();
+
var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
if (isSuccess == 0)
{
diff --git a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
index f550ae7..f7f8008 100644
--- a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
+++ b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -280,7 +280,7 @@
/// <returns>object</returns>
[Route("Sc_ProcessExchangeBill/GetICMOBillList")]
[HttpGet]
- public object GetICMOBillList(int hmainid,int OrganizationID)
+ public object GetICMOBillList(int hmainid,int HEntryID, int OrganizationID)
{
try
{
@@ -292,7 +292,7 @@
objJsonResult.data = null;
return objJsonResult;
}
- ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOBillListDetail where hmainid=" + hmainid, "h_v_Sc_ICMOBillListDetail");
+ ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOBillListDetail where hmainid=" + hmainid + " and HEntryID=" + HEntryID, "h_v_S_Sc_ICMOBillList");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -327,7 +327,7 @@
/// <returns>object</returns>
[Route("Sc_ProcessExchangeBill/GetICMOBillDetail")]
[HttpGet]
- public object GetICMOBillDetail(int hmainid, int OrganizationID)
+ public object GetICMOBillDetail(int hmainid,int HEntryID, int OrganizationID)
{
try
{
@@ -339,7 +339,7 @@
objJsonResult.data = null;
return objJsonResult;
}
- ds = oCN.RunProcReturn("select * from h_v_S_Sc_ICMOBillList where hmainid=" + hmainid, "h_v_S_Sc_ICMOBillList");
+ ds = oCN.RunProcReturn("select * from h_v_S_Sc_ICMOBillList where hmainid=" + hmainid + " and HEntryID=" + HEntryID, "h_v_S_Sc_ICMOBillList");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs
index 9992ce8..96b346d 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs
@@ -7,6 +7,7 @@
using System.Net;
using System.Net.Http;
using System.Web.Http;
+using ViewAPI;
using WebAPI.Models;
namespace WebAPI.Controllers.MJGL
@@ -28,6 +29,7 @@
{
try
{
+ Log.LogInfo("鎴愬姛锛�"); //璁板綍鎻愪氦鏁版嵁
//缂栬緫鏉冮檺
if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBillList", 1, false, user))
{
@@ -37,7 +39,7 @@
objJsonResult.data = null;
return objJsonResult;
}
-
+ Log.LogInfo("鏈夋潈闄�");
ds = Sc_GetMouldProdInHouseBill(sWhere,Organization);
//if (ds.Tables[0].Rows.Count != 0 || ds != null)
@@ -69,6 +71,7 @@
public static DataSet Sc_GetMouldProdInHouseBill(string sWhere, string Organization)
{
+ LogService.Write(sWhere+";"+ Organization);
string sql1 = string.Format(@"select * from h_v_Sc_MouldProdInHouseBillList where 搴撳瓨缁勭粐='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
@@ -77,6 +80,7 @@
else
{
string sql = sql1 + sWhere+ "order by hmainid desc";
+ Log.LogInfo(sql);
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldProdInHouseBillList");
}
}
diff --git a/WebAPI/Controllers/POStockInBillController.cs b/WebAPI/Controllers/POStockInBillController.cs
index 36659de..8391864 100644
--- a/WebAPI/Controllers/POStockInBillController.cs
+++ b/WebAPI/Controllers/POStockInBillController.cs
@@ -114,6 +114,59 @@
}
}
+
+
+
+
+ /// <summary>
+ /// 鐢熶骇姹囨姤/鎵潯鐮�/鐩存帴璋冪敤webservice
+ /// </summary>
+ /// <returns></returns>
+ [Route("ICMOReportBill/get_CheckTypeByBarCode_Json1")]
+ [HttpGet]
+ public Object get_CheckTypeByBarCode_Json1(string sCode, Int64 sInterID, string sBillType, string sBillNo, string sMaker, Int64 WhID, Int64 SPID, Double sQty, bool sRedBlue, bool SourceFlag, string sSourceBillNo, string sSourceType, Int64 HOWNERID)
+ {
+ try
+ {
+ //if (sRedBlue == true)
+ //{
+ // HBillType = "1239";
+ //}
+ //oBar = webserver.get_CheckTypeByBarCode(sCode, sInterID, sBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
+ string sExpressNumber = "";
+ WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, sBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
+ if (WebSoBar == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = WebSoBar;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = e.Message + ";" + e.StackTrace;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+
+
+
/// <summary>
/// 涓�閿壂鐮佺孩瀛�
/// </summary>
@@ -288,12 +341,13 @@
/// </summary>
/// <param name="HSourceBillNo"></param>
/// <returns></returns>
- [Route("ICMOReportBill/set_SaveICMOReportBill")]
+ [Route("ICMOReportBill/set_SavePonderationBillMain_Temp_Source_Fast_Json_New")]
[HttpGet]
- public object set_SaveICMOReportBill(string HSourceBillType, string HSourceBillNo, Int64 sInterID, string sBillNo)
+ public object set_SavePonderationBillMain_Temp_Source_Fast_Json_New(string HSourceBillType, string HSourceBillNo, Int64 sInterID, string sBillNo)
{
try
{
+ LogService.Write("鎵ц鎴愬姛!");
// DataSet ds = new DataSet();
// WebServer webserver = new WebServer();
string sWhere = " Where 鍗曟嵁鍙� like '%" + HSourceBillNo.Trim() + "'";
@@ -324,7 +378,7 @@
{
HDeptID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HDeptID"]);
HDeptName = Convert.ToString(ds.Tables[0].Rows[0]["HDeptName"]);
- if (webserver.set_SavePonderationBillMain_Temp_Source_Fast(sInterID, sBillNo, HBillType, HSourceBillNo, HSourceBillType, "钃濆瓧", ref DBUtility.ClsPub.sErrInfo))
+ if (webserver.set_SavePonderationBillMain_Temp_Source_Fast(sInterID, sBillNo, "3711", HSourceBillNo, HSourceBillType, "钃濆瓧", ref DBUtility.ClsPub.sErrInfo))
{
objJsonResult.code = "0";
objJsonResult.count = 1;
@@ -716,7 +770,7 @@
websLsmain.HInterID = lsmain[0].HInterID;
websLsmain.HBillNo = lsmain[0].HBillNo;
- websLsmain.HBillType = "1201";//鍥哄畾鍊�
+ websLsmain.HBillType = "3711";//鍥哄畾鍊�
websLsmain.HDate = lsmain[0].HDate;
websLsmain.HDeptID = lsmain[0].HDeptID;
websLsmain.HEmpID = 0;
@@ -761,7 +815,6 @@
ds = webserver.GetSPInfoByIDandHWHIDandOrg(HSpID, HWHID, HStockOrgID, ref sErrMsg);
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
-
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
index a6a6aad..a90c3b5 100644
--- a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
@@ -4,6 +4,7 @@
using System.Collections.Generic;
using System.Data;
using System.Web.Http;
+using ViewAPI;
using WebAPI.Models;
namespace WebAPI.Controllers
{
@@ -5028,6 +5029,7 @@
string sql1 = string.Format(@"select * from h_v_Sc_MouldProdOutHouseBillList where 搴撳瓨缁勭粐='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
+ Log.LogInfo(sql1);
return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by hmainid desc", "h_v_Sc_MouldProdOutHouseBillList");
}
else
diff --git a/WebAPI/Controllers/Sc_PckSplitBillController.cs b/WebAPI/Controllers/Sc_PckSplitBillController.cs
index bf1050a..57ec188 100644
--- a/WebAPI/Controllers/Sc_PckSplitBillController.cs
+++ b/WebAPI/Controllers/Sc_PckSplitBillController.cs
@@ -60,9 +60,89 @@
}
+ /// <summary>
+ /// 瑁呯鍗曟壂鎻忔墭鏉＄爜/鐩存帴璋冪敤webservice
+ /// </summary>
+ /// <returns></returns>
+ [Route("PackUnionBill/SetPackBarCode_Webs1")]
+ [HttpGet]
+ public Object SetPackBarCode_Webs1(Int64 sInterID, string sBillNo, string sBillType, string HTBarCode, string sMaker, Int64 HOWNERID)
+ {
+ try
+ {
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
+ //string sExpressNumber = "";
+ WebSoBar = oWebs.get_CheckTypeByPackBarCode_Pack(sInterID, sBillNo, sBillType, HTBarCode, sMaker, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
+ if (WebSoBar == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = WebSoBar;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = e.Message + ";" + e.StackTrace;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+
[Route("PackSplitBill/GetBillEntry_TmpList_Pack")]
[HttpGet]
public object GetBillEntry_TmpList_Pack(Int64 HBillID, string HBillNo, string HBillType)
+ {
+ try
+ {
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ ds = oWebs.GetBillEntry_TmpList_Pack(HBillID, HBillNo, HBillType, ref DBUtility.ClsPub.sErrInfo);
+ 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
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ 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;
+ }
+ }
+
+ [Route("PackUnionBill/GetBillEntry_TmpList_Pack1")]
+ [HttpGet]
+ public object GetBillEntry_TmpList_Pack1(Int64 HBillID, string HBillNo, string HBillType)
{
try
{
@@ -139,6 +219,46 @@
}
+ /// <summary>
+ /// 鎷嗙鍗曟壂鎻忔媶绠辨潯鐮�/鐩存帴璋冪敤webservice
+ /// </summary>
+ /// <returns></returns>
+ [Route("PackUnionBill/get_CheckTypeByBarCode_Json1")]
+ [HttpGet]
+ public Object get_CheckTypeByBarCode_Json1(string HBarCode, Int64 sInterID, string HBillType, string sBillNo, string HTBarCode, string sMaker, Int64 HOWNERID)
+ {
+ try
+ {
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ if (oWebs.get_CheckTypeByBarCode_PackUnion(HBarCode, sInterID, HBillType, sBillNo, HTBarCode, sMaker, HOWNERID, ref DBUtility.ClsPub.sErrInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵爜鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = e.Message + ";" + e.StackTrace;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+
+
[Route("PackSplit/Delete")]
[HttpGet]
public object Delete(long HInterID, string HBarCode,string HBillType)
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 472c157..54b55ab 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -25,6 +25,7 @@
public DataSet ds = new DataSet();
private json objjson = new json();
private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
//public static string sUrl = "http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx";
// private POInStockBillServices oclscg_poinstockbillmain = new POInStockBillServices();
/// <summary>
@@ -1940,6 +1941,155 @@
}
}
+ [Route("Web/GetClassTimePrjGroupBillList_Json")]
+ [HttpGet]
+ public object GetClassTimePrjGroupBillList_Json(string sWhere,string user)
+ {
+ if (!DBUtility.ClsPub.Security_Log("Gy_ClassTimePrj", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ string sql = "Select a.HItemID ,HNumber 鏍哥畻鏂瑰紡缁勪唬鐮�,HName 鏍哥畻鏂瑰紡缁勫悕绉�,HDeptID,b.閮ㄩ棬鍚嶇О 閮ㄩ棬 from Gy_ClassTimePrjGroup a left join h_v_Gy_Department b on a.HDeptID=b.HItemID";
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn(sql, "Gy_ClassTimePrjGroup");
+ }
+ else
+ {
+ sql = sql + sWhere;
+ ds = oCN.RunProcReturn(sql, "Gy_ClassTimePrjGroup");
+ }
+
+ //ds = webserver.GetUnitList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+
+
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "0";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception ex)
+ {
+
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+ #region 鍒犻櫎鏍哥畻鏂瑰紡缁�
+ /// <summary>
+ /// 鏍哥畻鏂瑰紡鍒楄〃鍒犻櫎鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Web/DeleteClassTimePrjGroupBillList")]
+ [HttpGet]
+ public object DeleteClassTimePrjGroupBillList(long HItemID, string User)
+ {
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Gy_ClassTimePrj_Delete", 1, false, User))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鍒犻櫎鏉冮檺";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.BeginTran();
+ string sql = "delete from Gy_ClassTimePrjGroup where HItemID =" + HItemID;
+ oCN.RunProc(sql);
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ /// <summary>
+ /// 淇濆瓨鑾峰彇鏍哥畻鏂瑰紡缁�
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("Web/SaveGetClassTimePrjGroupList")]
+ [HttpGet]
+ public object SaveGetClassTimePrjGroupList(string HNumber,string HName,string HDeptID,string refSav,string user,string HItem)
+ {
+
+ try
+ {
+ int HItemID = int.Parse(HItem);
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_ClassTimePrj", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ string sql="";
+ if (refSav== "Add")
+ {
+ sql = "Insert Into Gy_ClassTimePrjGroup " +
+ "(HNumber,HName,HStopflag,HRemark,HShortNumber,HParentID,HLevel" +
+ ",HEndFlag,HHelpCode,HDeptID,HGroupID,HUseFlag" +
+ ") " +
+ " values('" + HNumber + "','" + HName + "','','',0,0,0,0,''," + HDeptID + ",0,'鏈娇鐢�'" + ") ";
+ }
+ else
+ {
+ sql = "UpDate Gy_ClassTimePrjGroup set HNumber='" + HNumber + "',HName='" + HName + "',HDeptID=" + HDeptID+ " where HItemID="+ HItemID;
+ }
+ oCN.RunProc(sql);
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+
/// <summary>
/// 鑾峰彇宀椾綅鍒楄〃
/// </summary>
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
index 044e63c..b415d2e 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
@@ -1066,6 +1066,34 @@
}
#endregion
+ #region[鏉＄爜鎵撳嵃鏇存柊鎵撳嵃娆℃暟]
+ /// <summary>
+ /// 鏇存柊鎵撳嵃娆℃暟
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <param name="msg2"></param>
+ /// <returns></returns>
+ [Route("Sc_BarCode/UpdateBarcodePrintQty")]
+ [HttpPost]
+ public object UpdateBarcodePrintQty(string msg)
+ {
+ try
+ {
+ oCN.RunProc("update Gy_BarCodeBill set HPrintQty=isnull(HPrintQty,0)+1 where HitemID in("+msg+")", ref DBUtility.ClsPub.sExeReturnInfo);
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏇存柊鎵撳嵃娆℃暟鎴愬姛";
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵撳嵃澶辫触!鎵撳嵃缁撴潫 锛�" + e.ToString();
+ return objJsonResult;
+ }
+ }
+ #endregion
#endregion
}
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemBillController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemBillController.cs"
index d51e4b3..86da5b8 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemBillController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemBillController.cs"
@@ -506,16 +506,18 @@
") " +
" values('3827','3827'," + HInterID + ",'" + HBillNo + "','2022-01-02'" +
", '" + user + "',getdate()" +
- ", " + dr1["HCorrespondentID"].ToString() + "," + dr1["HCorrespondentTypeID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
- ", 0," + dr["HDeptID"].ToString() + ",' ',0" +
+ ", " + dr1["HCorrespondentID"].ToString() + "," + dr1["HCorrespondentTypeID"].ToString() + ",isnull('" + dr["HNowSupID"].ToString() + "',0),0,0,0,0" +
+ ", 0," + dr["HDeptID"].ToString() + ",'',0" +
") ";
+
string sql1 = string.Format(@"Insert Into Sc_MouldStockBillSub (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,
HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HPropertyID,HSecUnitRate,HSecUnitID,HUnitID,
HBatchNo,HQtyMust,HQty,HPrice,HMoney,HDesignLife,HLeaveLife,HUseLife,HWHID,HSCWHID,HSPID,HSCSPID,HSPGroupID,HCorrespondentTypeID,HCorrespondentID,
HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'',0,0,'',''," +
"0,0," + dr["HInterID"].ToString() + ",0," + dr["HSecUnitRate"].ToString() + ",0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr1["HQty"].ToString() + ",0," +
- "0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr1["HCorrespondentID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0"
+ "0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + ",'" + dr1["HCorrespondentID"].ToString() + "',isnull('" + dr["HNowSupID"].ToString() + "',0),0,0"
+ ",0,0,0," + userID + ",0,100005,'')");
+
//涓昏〃
oCn.BeginTran();
oCn.RunProc(sql);
diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_SingleBalBillController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_SingleBalBillController.cs"
index da27308..53f0361 100644
--- "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_SingleBalBillController.cs"
+++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_SingleBalBillController.cs"
@@ -382,6 +382,37 @@
return objJsonResult;
}
}
+
+ /// <summary>
+ /// 鐢熸垚宸ヨ祫缁撶畻
+ /// </summary>
+ /// <param name="HBeginDate">寮�濮嬫棩鏈�</param>
+ /// <param name="HEndDate">缁撴潫鏃ユ湡</param>
+ /// <param name="HDeptID">閮ㄩ棬ID</param>
+ /// <returns></returns>
+ [Route("Pay_SingleBalBill/GenerateSalary")]
+ [HttpGet]
+ public object GenerateSalary(string HBeginDate, string HEndDate,int HDeptID)
+ {
+ try
+ {
+ string sql = $"exec h_p_Gy_GenerateSalary '{HBeginDate}','{HEndDate}','{HDeptID}' ";
+ oCN.RunProc(sql);
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鐢熸垚鎴愬姛";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
//
}
}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_WorkTimesBillController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_WorkTimesBillController.cs"
index 212ed83..1f8d012 100644
--- "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_WorkTimesBillController.cs"
+++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_WorkTimesBillController.cs"
@@ -329,5 +329,50 @@
}
}
//
+
+ /// <summary>
+ /// 閫氳繃鐝粍鏌ヨ鑱屽憳淇℃伅
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Pay_WorkTimesBill/GetEmployeeByHGroup")]
+ [HttpGet]
+ public object GetEmployeeByHGroup(int HGroupID)
+ {
+ if (HGroupID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浜у搧鍣ㄥ叿鏈�夋嫨";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ List<object> list = new List<object>();
+ DataSet ds1;
+ string sql1 = string.Format(@"select a.HItemID HEmpID,a.HNumber HEmpNumber,a.HName HEmpName,a.HEmpRate HEmpRate,a.HCTPrjID,b.HName HCTPrjName from Gy_Employee a
+ left join Gy_ClassTimePrjGroup b on a.HCTPrjID=b.HItemID
+ where a.HGroupID=" + HGroupID);
+ ds1 = oCN.RunProcReturn(sql1, "Gy_Employee");
+ list.Add(ds1.Tables[0]);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.list = list;
+ return objJsonResult;
+
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
}
}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs"
index 408fac2..94f9e76 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs"
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using NPOI.HSSF.UserModel;
using NPOI.SS.UserModel;
using Pub_Class;
@@ -1457,5 +1458,197 @@
}
}
#endregion
+
+ #region 鎶ュ伐骞冲彴寮�宸ュ崟鎵簩缁寸爜鏌ヨ
+ [Route("Sc_MESBeginStepWorkBill/GetMESBeginStepWorkBillByEWM")]
+ [HttpGet]
+ public object GetMESBeginStepWorkBillByEWM(string sBillBarCode)
+ {
+ try
+ {
+ //鏍规嵁閫夋嫨璧勬簮ID鑾峰彇褰撳墠鐢熶骇宸ュ崟銆佽矗浠讳汉
+ ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillList where 鍗曟嵁鍙�='"+ sBillBarCode + "'", "h_v_IF_ICMOBillList");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "姝ゆ簮鍗曚笉瀛樺湪锛�";
+ objJsonResult.data = ds;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏆傛棤璧勬簮缁戝畾锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.Message.ToString();
+ objJsonResult.data = null;
+
+ }
+ return objJsonResult;
+ }
+ #endregion
+
+ #region 鎶ュ伐骞冲彴寮�宸ュ崟鏃犳簮鍗曚繚瀛�
+ [Route("Sc_MESBeginStepWorkBill/SaveGetMESBeginStepWorkBillByEWM")]
+ [HttpPost]
+ public object SaveGetMESBeginStepWorkBillByEWM([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string UserName = sArray[1].ToString();
+ string refSav = sArray[2].ToString();
+ DBUtility.ClsPub.CurUserName = UserName;
+ //淇濆瓨鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("MES_MESBeginWorkBill_Edit", 1, false, DBUtility.ClsPub.CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ string BillNo = "";
+ long MainId = 0;
+ long EntyID = 0;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(DateTime.Now, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ListModels oListModels = new ListModels();
+ try
+ {
+ DLL.ClsSc_MESBeginWorkBill oBill = new DLL.ClsSc_MESBeginWorkBill();
+ List<Models.ClsSc_MESBeginWorkBillMain> lsmain = new List<Models.ClsSc_MESBeginWorkBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Gy_MESBeginWorkFrom(msg2);
+ foreach (Models.ClsSc_MESBeginWorkBillMain oItem in lsmain)
+ {
+ if (refSav == "Add")
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ if (BillNew.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld.omodel.HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+
+ BillNo = oItem.HMainSourceBillNo;
+ MainId = oItem.HMainSourceInterID;
+ EntyID = oItem.HMainSourceEntryID;
+ DBUtility.ClsPub.CurUserName = oItem.HMaker;
+ oItem.HBillType = "3787";
+ oItem.HBillSubType = "3787";
+ oItem.HBillStatus = 1; //鍗曟嵁鐘舵�侊紙1鏈锛�2瀹℃牳閫氳繃锛�3鍏抽棴锛�4浣滃簾锛�5瀹℃牳閫�鍥�,6瀹℃牳涓�,7宸查槄锛�8宸插洖澶嶏紝9缁撴锛�10楠岃瘉,11涓嬭揪锛�12寮�宸�,13鐢宠瀹℃壒,15鐢宠妫�楠岋紝16 鍒ゅ畾鍚堟牸锛�17鍒ゅ畾涓嶅悎鏍硷級
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ oItem.HBarCodeMakeDate = Convert.ToDateTime(DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"))); //鎵弿鏃ユ湡锛堝勾-鏈�-鏃�-鏃�-鍒�-绉掞級
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oBill.omodel.HInterID == 0)
+ {
+ oCN.BeginTran();
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ //璁块棶閲戣澏
+ var loginRet = InvokeHelper.Login();
+ var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
+ if (isSuccess == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎿嶄綔澶辫触,閲戣澏璐﹀彿鐧诲綍寮傚父銆�" + loginRet;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ var json = new
+ {
+ //CreateOrgId = 0,
+ Numbers = BillNo,
+ Ids = MainId,
+ PkEntryIds = EntyID
+ };
+ var result = InvokeHelper.ExcuteOperation("PRD_MO", "ToStart", JsonConvert.SerializeObject(json));
+ if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀵瑰簲閲戣澏浜戠敓浜ц鍗曟洿鏀瑰紑宸ョ姸鎬佸け璐ワ紒" + result;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (bResult)
+ {
+ objJsonResult.HInterID = DBUtility.ClsPub.sExeReturnInfo; //杩斿洖涓籌D
+ //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.Sc_ICMOBillWorkQtyStatus_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ {
+ objJsonResult.Verify = "Y";
+ }
+ else
+ {
+ objJsonResult.Verify = "N";
+ }
+ }
+ }
+ }
+ oCN.Commit();
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.Message;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/WebAPI/InvokeHelper.cs b/WebAPI/InvokeHelper.cs
index 1ba49f0..59d764c 100644
--- a/WebAPI/InvokeHelper.cs
+++ b/WebAPI/InvokeHelper.cs
@@ -186,6 +186,7 @@
return httpClient.SyncRequest();
}
+ //鍙嶅鏍�
public static string UnAudit(string formId, string content)
{
HttpClient httpClient = new HttpClient();
@@ -199,7 +200,7 @@
httpClient.Content = JsonConvert.SerializeObject(Parameters);
return httpClient.SyncRequest();
}
-
+ //涓嬫帹
public static string Push(string formId, string content)
{
HttpClient httpClient = new HttpClient();
@@ -241,5 +242,22 @@
httpClient.Content = JsonConvert.SerializeObject(args);
return httpClient.SyncRequest();
}
+
+ //鐢熶骇璁㈠崟 鎵ц
+ public static string ExcuteOperation(string formId, string opNumber, string content)
+ {
+ HttpClient httpClient = new HttpClient();
+ httpClient.Url = string.Concat(CloudUrl, "Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.ExcuteOperation.common.kdsvc");
+
+ List<object> Parameters = new List<object>();
+ //涓氬姟瀵硅薄Id
+ Parameters.Add(formId);
+ //鎿嶄綔 寮�宸�"ToStart"
+ Parameters.Add(opNumber);
+ //Json瀛椾覆
+ Parameters.Add(content);
+ httpClient.Content = JsonConvert.SerializeObject(Parameters);
+ return httpClient.SyncRequest();
+ }
}
}
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 398cc29..7d5d6a1 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-02-28T06:36:22.6449303Z;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-03-10T10:59:23.7994337Z;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>02/28/2022 14:36:13</publishTime>
+ <publishTime>03/10/2022 18:59:16</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>02/28/2022 14:36:13</publishTime>
+ <publishTime>03/10/2022 18:59:16</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>02/28/2022 14:36:12</publishTime>
+ <publishTime>03/10/2022 18:59:15</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>02/28/2022 14:36:12</publishTime>
+ <publishTime>03/10/2022 18:59:15</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 14:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>02/28/2022 14:36:11</publishTime>
+ <publishTime>03/10/2022 18:59:13</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>02/28/2022 14:36:11</publishTime>
+ <publishTime>03/10/2022 18:59:13</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>02/28/2022 14:36:11</publishTime>
+ <publishTime>03/10/2022 18:59:13</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>02/28/2022 14:36:11</publishTime>
+ <publishTime>03/10/2022 18:59:13</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>01/16/2022 20:46:29</publishTime>
@@ -105,22 +105,22 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>02/28/2022 14:36:10</publishTime>
+ <publishTime>03/10/2022 18:59:12</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>02/28/2022 14:36:10</publishTime>
+ <publishTime>03/10/2022 18:59:12</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>02/28/2022 14:36:10</publishTime>
+ <publishTime>03/10/2022 18:59:13</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>02/28/2022 14:36:10</publishTime>
+ <publishTime>03/10/2022 18:59:13</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>02/28/2022 14:36:10</publishTime>
+ <publishTime>03/10/2022 18:59:13</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>02/28/2022 14:36:10</publishTime>
+ <publishTime>03/10/2022 18:59:13</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>02/28/2022 14:36:15</publishTime>
+ <publishTime>03/10/2022 18:59:18</publishTime>
</File>
<File Include="bin/WebAPI.dll.config">
<publishTime>12/15/2021 17:59:43</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>02/28/2022 14:36:15</publishTime>
+ <publishTime>03/10/2022 18:59:18</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/17/2013 17:03:52</publishTime>
@@ -342,61 +342,61 @@
<publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>01/16/2022 23:02:58</publishTime>
+ <publishTime>03/10/2022 16:13:35</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>01/16/2022 23:02:58</publishTime>
+ <publishTime>03/10/2022 16:13:35</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>01/16/2022 23:02:58</publishTime>
+ <publishTime>03/10/2022 16:13:35</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>01/16/2022 23:02:58</publishTime>
+ <publishTime>03/10/2022 16:13:35</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>01/16/2022 23:02:58</publishTime>
+ <publishTime>03/10/2022 16:13:35</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>01/16/2022 23:02:58</publishTime>
+ <publishTime>03/10/2022 16:13:35</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>01/16/2022 23:02:58</publishTime>
+ <publishTime>03/10/2022 16:13:35</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>01/16/2022 23:02:58</publishTime>
+ <publishTime>03/10/2022 16:13:35</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>01/16/2022 23:02:58</publishTime>
+ <publishTime>03/10/2022 16:13:35</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>01/16/2022 23:02:58</publishTime>
+ <publishTime>03/10/2022 16:13:35</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>01/16/2022 23:02:58</publishTime>
+ <publishTime>03/10/2022 16:13:35</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>01/16/2022 23:02:58</publishTime>
+ <publishTime>03/10/2022 16:13:35</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>01/16/2022 23:02:58</publishTime>
+ <publishTime>03/10/2022 16:13:35</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>01/16/2022 23:02:58</publishTime>
+ <publishTime>03/10/2022 16:13:35</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>01/16/2022 23:02:58</publishTime>
+ <publishTime>03/10/2022 16:13:35</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>01/16/2022 23:02:58</publishTime>
+ <publishTime>03/10/2022 16:13:35</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>01/16/2022 23:02:58</publishTime>
+ <publishTime>03/10/2022 16:13:35</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
- <publishTime>01/16/2022 23:02:58</publishTime>
+ <publishTime>03/10/2022 16:13:35</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>01/16/2022 23:02:58</publishTime>
+ <publishTime>03/10/2022 16:13:35</publishTime>
</File>
<File Include="Web References/WebS/Reference.cs">
<publishTime>12/20/2021 13:19:56</publishTime>
@@ -411,7 +411,7 @@
<publishTime>12/20/2021 13:19:56</publishTime>
</File>
<File Include="Web.config">
- <publishTime>02/28/2022 14:36:21</publishTime>
+ <publishTime>03/10/2022 18:59:23</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/Settings.Designer.cs b/WebAPI/Properties/Settings.Designer.cs
index 4f8006d..c8fd941 100644
--- a/WebAPI/Properties/Settings.Designer.cs
+++ b/WebAPI/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -26,7 +26,7 @@
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.WebServiceUrl)]
- [global::System.Configuration.DefaultSettingValueAttribute("http://localhost/WEBS-WMS/WebService1.asmx")]
+ [global::System.Configuration.DefaultSettingValueAttribute("http://localhost:8098/WebService1.asmx")]
public string WebAPI_WebS_WebService1 {
get {
return ((string)(this["WebAPI_WebS_WebService1"]));
diff --git a/WebAPI/Properties/Settings.settings b/WebAPI/Properties/Settings.settings
index e0334fe..d37166d 100644
--- a/WebAPI/Properties/Settings.settings
+++ b/WebAPI/Properties/Settings.settings
@@ -3,7 +3,7 @@
<Profiles />
<Settings>
<Setting Name="WebAPI_WebS_WebService1" Type="(Web Service URL)" Scope="Application">
- <Value Profile="(Default)">http://localhost/WEBS-WMS/WebService1.asmx</Value>
+ <Value Profile="(Default)">http://localhost:8098/WebService1.asmx</Value>
</Setting>
</Settings>
</SettingsFile>
\ No newline at end of file
diff --git a/WebAPI/Web References/WebS/Reference.cs b/WebAPI/Web References/WebS/Reference.cs
index 8c9a66f..00cf2b2 100644
--- a/WebAPI/Web References/WebS/Reference.cs
+++ b/WebAPI/Web References/WebS/Reference.cs
@@ -55,9 +55,13 @@
private System.Threading.SendOrPostCallback get_CheckTypeByPackBarCode_PackOperationCompleted;
+ private System.Threading.SendOrPostCallback get_CheckTypeByBarCode_PackUnionOperationCompleted;
+
private System.Threading.SendOrPostCallback get_CheckTypeByBarCode_PackSplitOperationCompleted;
private System.Threading.SendOrPostCallback GetBillEntry_TmpList_PackOperationCompleted;
+
+ private System.Threading.SendOrPostCallback set_SavePackUnionBill_NewOperationCompleted;
private System.Threading.SendOrPostCallback set_SavePackSplitBill_NewOperationCompleted;
@@ -1034,10 +1038,16 @@
public event get_CheckTypeByPackBarCode_PackCompletedEventHandler get_CheckTypeByPackBarCode_PackCompleted;
/// <remarks/>
+ public event get_CheckTypeByBarCode_PackUnionCompletedEventHandler get_CheckTypeByBarCode_PackUnionCompleted;
+
+ /// <remarks/>
public event get_CheckTypeByBarCode_PackSplitCompletedEventHandler get_CheckTypeByBarCode_PackSplitCompleted;
/// <remarks/>
public event GetBillEntry_TmpList_PackCompletedEventHandler GetBillEntry_TmpList_PackCompleted;
+
+ /// <remarks/>
+ public event set_SavePackUnionBill_NewCompletedEventHandler set_SavePackUnionBill_NewCompleted;
/// <remarks/>
public event set_SavePackSplitBill_NewCompletedEventHandler set_SavePackSplitBill_NewCompleted;
@@ -2780,6 +2790,50 @@
}
/// <remarks/>
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/get_CheckTypeByBarCode_PackUnion", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ public bool get_CheckTypeByBarCode_PackUnion(string HBarCode, long HInterID, string HBillType, string HBillNo, string HBarCode_Pack, string HMaker, long HOWNERID, ref string sErrMsg) {
+ object[] results = this.Invoke("get_CheckTypeByBarCode_PackUnion", new object[] {
+ HBarCode,
+ HInterID,
+ HBillType,
+ HBillNo,
+ HBarCode_Pack,
+ HMaker,
+ HOWNERID,
+ sErrMsg});
+ sErrMsg = ((string)(results[1]));
+ return ((bool)(results[0]));
+ }
+
+ /// <remarks/>
+ public void get_CheckTypeByBarCode_PackUnionAsync(string HBarCode, long HInterID, string HBillType, string HBillNo, string HBarCode_Pack, string HMaker, long HOWNERID, string sErrMsg) {
+ this.get_CheckTypeByBarCode_PackUnionAsync(HBarCode, HInterID, HBillType, HBillNo, HBarCode_Pack, HMaker, HOWNERID, sErrMsg, null);
+ }
+
+ /// <remarks/>
+ public void get_CheckTypeByBarCode_PackUnionAsync(string HBarCode, long HInterID, string HBillType, string HBillNo, string HBarCode_Pack, string HMaker, long HOWNERID, string sErrMsg, object userState) {
+ if ((this.get_CheckTypeByBarCode_PackUnionOperationCompleted == null)) {
+ this.get_CheckTypeByBarCode_PackUnionOperationCompleted = new System.Threading.SendOrPostCallback(this.Onget_CheckTypeByBarCode_PackUnionOperationCompleted);
+ }
+ this.InvokeAsync("get_CheckTypeByBarCode_PackUnion", new object[] {
+ HBarCode,
+ HInterID,
+ HBillType,
+ HBillNo,
+ HBarCode_Pack,
+ HMaker,
+ HOWNERID,
+ sErrMsg}, this.get_CheckTypeByBarCode_PackUnionOperationCompleted, userState);
+ }
+
+ private void Onget_CheckTypeByBarCode_PackUnionOperationCompleted(object arg) {
+ if ((this.get_CheckTypeByBarCode_PackUnionCompleted != null)) {
+ System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+ this.get_CheckTypeByBarCode_PackUnionCompleted(this, new get_CheckTypeByBarCode_PackUnionCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+ }
+ }
+
+ /// <remarks/>
[System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/get_CheckTypeByBarCode_PackSplit", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
public bool get_CheckTypeByBarCode_PackSplit(string HBarCode, long HInterID, string HBillType, string HBillNo, string HBarCode_Pack, string HMaker, long HOWNERID, ref string sErrMsg) {
object[] results = this.Invoke("get_CheckTypeByBarCode_PackSplit", new object[] {
@@ -2856,6 +2910,48 @@
if ((this.GetBillEntry_TmpList_PackCompleted != null)) {
System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
this.GetBillEntry_TmpList_PackCompleted(this, new GetBillEntry_TmpList_PackCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+ }
+ }
+
+ /// <remarks/>
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_SavePackUnionBill_New", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ public bool set_SavePackUnionBill_New(long HInterID, string HBillType, string HBillNo, string HBarCode_Pack, string HMaker, long HOWNERID, ref string sErrMsg) {
+ object[] results = this.Invoke("set_SavePackUnionBill_New", new object[] {
+ HInterID,
+ HBillType,
+ HBillNo,
+ HBarCode_Pack,
+ HMaker,
+ HOWNERID,
+ sErrMsg});
+ sErrMsg = ((string)(results[1]));
+ return ((bool)(results[0]));
+ }
+
+ /// <remarks/>
+ public void set_SavePackUnionBill_NewAsync(long HInterID, string HBillType, string HBillNo, string HBarCode_Pack, string HMaker, long HOWNERID, string sErrMsg) {
+ this.set_SavePackUnionBill_NewAsync(HInterID, HBillType, HBillNo, HBarCode_Pack, HMaker, HOWNERID, sErrMsg, null);
+ }
+
+ /// <remarks/>
+ public void set_SavePackUnionBill_NewAsync(long HInterID, string HBillType, string HBillNo, string HBarCode_Pack, string HMaker, long HOWNERID, string sErrMsg, object userState) {
+ if ((this.set_SavePackUnionBill_NewOperationCompleted == null)) {
+ this.set_SavePackUnionBill_NewOperationCompleted = new System.Threading.SendOrPostCallback(this.Onset_SavePackUnionBill_NewOperationCompleted);
+ }
+ this.InvokeAsync("set_SavePackUnionBill_New", new object[] {
+ HInterID,
+ HBillType,
+ HBillNo,
+ HBarCode_Pack,
+ HMaker,
+ HOWNERID,
+ sErrMsg}, this.set_SavePackUnionBill_NewOperationCompleted, userState);
+ }
+
+ private void Onset_SavePackUnionBill_NewOperationCompleted(object arg) {
+ if ((this.set_SavePackUnionBill_NewCompleted != null)) {
+ System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+ this.set_SavePackUnionBill_NewCompleted(this, new set_SavePackUnionBill_NewCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
}
}
@@ -40670,6 +40766,40 @@
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+ public delegate void get_CheckTypeByBarCode_PackUnionCompletedEventHandler(object sender, get_CheckTypeByBarCode_PackUnionCompletedEventArgs e);
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ public partial class get_CheckTypeByBarCode_PackUnionCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+
+ private object[] results;
+
+ internal get_CheckTypeByBarCode_PackUnionCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+ base(exception, cancelled, userState) {
+ this.results = results;
+ }
+
+ /// <remarks/>
+ public bool Result {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((bool)(this.results[0]));
+ }
+ }
+
+ /// <remarks/>
+ public string sErrMsg {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((string)(this.results[1]));
+ }
+ }
+ }
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
public delegate void get_CheckTypeByBarCode_PackSplitCompletedEventHandler(object sender, get_CheckTypeByBarCode_PackSplitCompletedEventArgs e);
/// <remarks/>
@@ -40738,6 +40868,40 @@
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+ public delegate void set_SavePackUnionBill_NewCompletedEventHandler(object sender, set_SavePackUnionBill_NewCompletedEventArgs e);
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ public partial class set_SavePackUnionBill_NewCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+
+ private object[] results;
+
+ internal set_SavePackUnionBill_NewCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+ base(exception, cancelled, userState) {
+ this.results = results;
+ }
+
+ /// <remarks/>
+ public bool Result {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((bool)(this.results[0]));
+ }
+ }
+
+ /// <remarks/>
+ public string sErrMsg {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((string)(this.results[1]));
+ }
+ }
+ }
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
public delegate void set_SavePackSplitBill_NewCompletedEventHandler(object sender, set_SavePackSplitBill_NewCompletedEventArgs e);
/// <remarks/>
diff --git a/WebAPI/Web References/WebS/Reference.map b/WebAPI/Web References/WebS/Reference.map
index d3cb9d0..952b627 100644
--- a/WebAPI/Web References/WebS/Reference.map
+++ b/WebAPI/Web References/WebS/Reference.map
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<DiscoveryClientResultsFile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Results>
- <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://localhost/WEBS-WMS/WebService1.asmx?disco" filename="WebService1.disco" />
- <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://localhost/WEBS-WMS/WebService1.asmx?wsdl" filename="WebService1.wsdl" />
+ <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://localhost:8098/WebService1.asmx?wsdl" filename="WebService1.wsdl" />
+ <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://localhost:8098/WebService1.asmx?disco" filename="WebService1.disco" />
</Results>
</DiscoveryClientResultsFile>
\ No newline at end of file
diff --git a/WebAPI/Web References/WebS/WebService1.disco b/WebAPI/Web References/WebS/WebService1.disco
index 22b350a..9475a15 100644
--- a/WebAPI/Web References/WebS/WebService1.disco
+++ b/WebAPI/Web References/WebS/WebService1.disco
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<discovery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/disco/">
- <contractRef ref="http://localhost/WEBS-WMS/WebService1.asmx?wsdl" docRef="http://localhost/WEBS-WMS/WebService1.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
- <soap address="http://localhost/WEBS-WMS/WebService1.asmx" xmlns:q1="http://tempuri.org/" binding="q1:WebService1Soap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
- <soap address="http://localhost/WEBS-WMS/WebService1.asmx" xmlns:q2="http://tempuri.org/" binding="q2:WebService1Soap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
+ <contractRef ref="http://localhost:8098/WebService1.asmx?wsdl" docRef="http://localhost:8098/WebService1.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
+ <soap address="http://localhost:8098/WebService1.asmx" xmlns:q1="http://tempuri.org/" binding="q1:WebService1Soap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
+ <soap address="http://localhost:8098/WebService1.asmx" xmlns:q2="http://tempuri.org/" binding="q2:WebService1Soap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
</discovery>
\ No newline at end of file
diff --git a/WebAPI/Web References/WebS/WebService1.wsdl b/WebAPI/Web References/WebS/WebService1.wsdl
index adcf90c..791bed6 100644
--- a/WebAPI/Web References/WebS/WebService1.wsdl
+++ b/WebAPI/Web References/WebS/WebService1.wsdl
@@ -315,6 +315,28 @@
<s:element minOccurs="0" maxOccurs="1" name="HStockOutOrgName" type="s:string" />
</s:sequence>
</s:complexType>
+ <s:element name="get_CheckTypeByBarCode_PackUnion">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="HBarCode" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="HInterID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="HBillType" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HBillNo" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HBarCode_Pack" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HMaker" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="HOWNERID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="get_CheckTypeByBarCode_PackUnionResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="get_CheckTypeByBarCode_PackUnionResult" type="s:boolean" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
<s:element name="get_CheckTypeByBarCode_PackSplit">
<s:complexType>
<s:sequence>
@@ -358,6 +380,27 @@
</s:sequence>
</s:complexType>
</s:element>
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="set_SavePackUnionBill_New">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="HInterID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="HBillType" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HBillNo" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HBarCode_Pack" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HMaker" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="HOWNERID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="set_SavePackUnionBill_NewResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="set_SavePackUnionBill_NewResult" type="s:boolean" />
<s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
</s:sequence>
</s:complexType>
@@ -11448,6 +11491,12 @@
<wsdl:message name="get_CheckTypeByPackBarCode_PackSoapOut">
<wsdl:part name="parameters" element="tns:get_CheckTypeByPackBarCode_PackResponse" />
</wsdl:message>
+ <wsdl:message name="get_CheckTypeByBarCode_PackUnionSoapIn">
+ <wsdl:part name="parameters" element="tns:get_CheckTypeByBarCode_PackUnion" />
+ </wsdl:message>
+ <wsdl:message name="get_CheckTypeByBarCode_PackUnionSoapOut">
+ <wsdl:part name="parameters" element="tns:get_CheckTypeByBarCode_PackUnionResponse" />
+ </wsdl:message>
<wsdl:message name="get_CheckTypeByBarCode_PackSplitSoapIn">
<wsdl:part name="parameters" element="tns:get_CheckTypeByBarCode_PackSplit" />
</wsdl:message>
@@ -11459,6 +11508,12 @@
</wsdl:message>
<wsdl:message name="GetBillEntry_TmpList_PackSoapOut">
<wsdl:part name="parameters" element="tns:GetBillEntry_TmpList_PackResponse" />
+ </wsdl:message>
+ <wsdl:message name="set_SavePackUnionBill_NewSoapIn">
+ <wsdl:part name="parameters" element="tns:set_SavePackUnionBill_New" />
+ </wsdl:message>
+ <wsdl:message name="set_SavePackUnionBill_NewSoapOut">
+ <wsdl:part name="parameters" element="tns:set_SavePackUnionBill_NewResponse" />
</wsdl:message>
<wsdl:message name="set_SavePackSplitBill_NewSoapIn">
<wsdl:part name="parameters" element="tns:set_SavePackSplitBill_New" />
@@ -14219,6 +14274,10 @@
<wsdl:input message="tns:get_CheckTypeByPackBarCode_PackSoapIn" />
<wsdl:output message="tns:get_CheckTypeByPackBarCode_PackSoapOut" />
</wsdl:operation>
+ <wsdl:operation name="get_CheckTypeByBarCode_PackUnion">
+ <wsdl:input message="tns:get_CheckTypeByBarCode_PackUnionSoapIn" />
+ <wsdl:output message="tns:get_CheckTypeByBarCode_PackUnionSoapOut" />
+ </wsdl:operation>
<wsdl:operation name="get_CheckTypeByBarCode_PackSplit">
<wsdl:input message="tns:get_CheckTypeByBarCode_PackSplitSoapIn" />
<wsdl:output message="tns:get_CheckTypeByBarCode_PackSplitSoapOut" />
@@ -14226,6 +14285,10 @@
<wsdl:operation name="GetBillEntry_TmpList_Pack">
<wsdl:input message="tns:GetBillEntry_TmpList_PackSoapIn" />
<wsdl:output message="tns:GetBillEntry_TmpList_PackSoapOut" />
+ </wsdl:operation>
+ <wsdl:operation name="set_SavePackUnionBill_New">
+ <wsdl:input message="tns:set_SavePackUnionBill_NewSoapIn" />
+ <wsdl:output message="tns:set_SavePackUnionBill_NewSoapOut" />
</wsdl:operation>
<wsdl:operation name="set_SavePackSplitBill_New">
<wsdl:input message="tns:set_SavePackSplitBill_NewSoapIn" />
@@ -16132,6 +16195,15 @@
<soap:body use="literal" />
</wsdl:output>
</wsdl:operation>
+ <wsdl:operation name="get_CheckTypeByBarCode_PackUnion">
+ <soap:operation soapAction="http://tempuri.org/get_CheckTypeByBarCode_PackUnion" style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
<wsdl:operation name="get_CheckTypeByBarCode_PackSplit">
<soap:operation soapAction="http://tempuri.org/get_CheckTypeByBarCode_PackSplit" style="document" />
<wsdl:input>
@@ -16143,6 +16215,15 @@
</wsdl:operation>
<wsdl:operation name="GetBillEntry_TmpList_Pack">
<soap:operation soapAction="http://tempuri.org/GetBillEntry_TmpList_Pack" style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="set_SavePackUnionBill_New">
+ <soap:operation soapAction="http://tempuri.org/set_SavePackUnionBill_New" style="document" />
<wsdl:input>
<soap:body use="literal" />
</wsdl:input>
@@ -20320,6 +20401,15 @@
<soap12:body use="literal" />
</wsdl:output>
</wsdl:operation>
+ <wsdl:operation name="get_CheckTypeByBarCode_PackUnion">
+ <soap12:operation soapAction="http://tempuri.org/get_CheckTypeByBarCode_PackUnion" style="document" />
+ <wsdl:input>
+ <soap12:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
<wsdl:operation name="get_CheckTypeByBarCode_PackSplit">
<soap12:operation soapAction="http://tempuri.org/get_CheckTypeByBarCode_PackSplit" style="document" />
<wsdl:input>
@@ -20331,6 +20421,15 @@
</wsdl:operation>
<wsdl:operation name="GetBillEntry_TmpList_Pack">
<soap12:operation soapAction="http://tempuri.org/GetBillEntry_TmpList_Pack" style="document" />
+ <wsdl:input>
+ <soap12:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="set_SavePackUnionBill_New">
+ <soap12:operation soapAction="http://tempuri.org/set_SavePackUnionBill_New" style="document" />
<wsdl:input>
<soap12:body use="literal" />
</wsdl:input>
@@ -24418,10 +24517,10 @@
</wsdl:binding>
<wsdl:service name="WebService1">
<wsdl:port name="WebService1Soap" binding="tns:WebService1Soap">
- <soap:address location="http://localhost/WEBS-WMS/WebService1.asmx" />
+ <soap:address location="http://localhost:8098/WebService1.asmx" />
</wsdl:port>
<wsdl:port name="WebService1Soap12" binding="tns:WebService1Soap12">
- <soap12:address location="http://localhost/WEBS-WMS/WebService1.asmx" />
+ <soap12:address location="http://localhost:8098/WebService1.asmx" />
</wsdl:port>
</wsdl:service>
</wsdl:definitions>
\ No newline at end of file
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 254f457..06a4d3d 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -21,8 +21,8 @@
<add key="FileIP" value="http://localhost:8080/" />
<!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/> -->
<!--<add key="sUrl" value="http://192.168.63.195/WEBS-WMS/WebService1.asmx"/> 棰滃彴寮忔満-->
- <add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> <!--澶忓疂-->
-
+ <!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> 澶忓疂-->
+ <add key="sUrl" value="http://47.96.97.237:8018/Web_WJ/WebService1.asmx" />
<!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/> 鍗氭棩绉戞妧-->
<add key="webpages:Version" value="3.0.0.0" />
<add key="webpages:Enabled" value="false" />
@@ -86,7 +86,7 @@
<applicationSettings>
<WebAPI.Properties.Settings>
<setting name="WebAPI_WebS_WebService1" serializeAs="String">
- <value>http://localhost/WEBS-WMS/WebService1.asmx</value>
+ <value>http://localhost:8098/WebService1.asmx</value>
</setting>
</WebAPI.Properties.Settings>
</applicationSettings>
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 97e032f..c644126 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -817,10 +817,10 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
- <WebReferenceUrl Include="http://localhost/WEBS-WMS/WebService1.asmx">
+ <WebReferenceUrl Include="http://localhost:8098/WebService1.asmx">
<UrlBehavior>Dynamic</UrlBehavior>
<RelPath>Web References\WebS\</RelPath>
- <UpdateFromURL>http://localhost/WEBS-WMS/WebService1.asmx</UpdateFromURL>
+ <UpdateFromURL>http://localhost:8098/WebService1.asmx</UpdateFromURL>
<ServiceLocationURL>
</ServiceLocationURL>
<CachedDynamicPropName>
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index a3179f3..16d95e2 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -9,7 +9,7 @@
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\鏅轰簯MES\Lay-Api\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>false</UseIISExpress>
<Use64BitIISExpress />
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_WIPSumReportDateReport.Designer.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_WIPSumReportDateReport.Designer.cs"
index 69df391..ce520ed 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_WIPSumReportDateReport.Designer.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_WIPSumReportDateReport.Designer.cs"
@@ -32,6 +32,7 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Mes_WIPSumReportDateReport));
this.grdMain = new System.Windows.Forms.DataGridView();
this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.dtpHFDate = new System.Windows.Forms.DateTimePicker();
this.label8 = new System.Windows.Forms.Label();
this.Tool = new System.Windows.Forms.ToolStrip();
this.yl = new System.Windows.Forms.ToolStripButton();
@@ -41,7 +42,6 @@
this.tc = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
- this.dtpHFDate = new System.Windows.Forms.DateTimePicker();
((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
this.groupBox1.SuspendLayout();
this.Tool.SuspendLayout();
@@ -54,13 +54,13 @@
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, 139);
- this.grdMain.Margin = new System.Windows.Forms.Padding(4);
+ this.grdMain.Location = new System.Drawing.Point(0, 167);
+ this.grdMain.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
this.grdMain.RowHeadersWidth = 51;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(1214, 453);
+ this.grdMain.Size = new System.Drawing.Size(1366, 543);
this.grdMain.TabIndex = 67;
//
// groupBox1
@@ -69,22 +69,31 @@
this.groupBox1.Controls.Add(this.dtpHFDate);
this.groupBox1.Controls.Add(this.label8);
this.groupBox1.Dock = System.Windows.Forms.DockStyle.Top;
- this.groupBox1.Location = new System.Drawing.Point(0, 58);
- this.groupBox1.Margin = new System.Windows.Forms.Padding(4);
+ this.groupBox1.Location = new System.Drawing.Point(0, 70);
+ this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Padding = new System.Windows.Forms.Padding(4);
- this.groupBox1.Size = new System.Drawing.Size(1214, 81);
+ this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.groupBox1.Size = new System.Drawing.Size(1366, 97);
this.groupBox1.TabIndex = 66;
this.groupBox1.TabStop = false;
this.groupBox1.Enter += new System.EventHandler(this.groupBox1_Enter);
//
+ // dtpHFDate
+ //
+ this.dtpHFDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
+ this.dtpHFDate.Location = new System.Drawing.Point(230, 25);
+ this.dtpHFDate.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.dtpHFDate.Name = "dtpHFDate";
+ this.dtpHFDate.Size = new System.Drawing.Size(165, 28);
+ this.dtpHFDate.TabIndex = 60;
+ //
// label8
//
this.label8.AutoSize = true;
- this.label8.Location = new System.Drawing.Point(114, 27);
+ this.label8.Location = new System.Drawing.Point(128, 32);
this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(82, 15);
+ this.label8.Size = new System.Drawing.Size(98, 18);
this.label8.TabIndex = 34;
this.label8.Text = "缁撴潫鏃堕棿锛�";
//
@@ -105,7 +114,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(1214, 58);
+ this.Tool.Size = new System.Drawing.Size(1366, 70);
this.Tool.Stretch = true;
this.Tool.TabIndex = 65;
this.Tool.Text = "toolStrip1";
@@ -127,7 +136,7 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 58);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 70);
//
// cx
//
@@ -146,7 +155,7 @@
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 58);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 70);
//
// tc
//
@@ -166,7 +175,7 @@
//
this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(6, 58);
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 70);
//
// toolStripButton1
//
@@ -174,26 +183,18 @@
this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton1.Name = "toolStripButton1";
- this.toolStripButton1.Size = new System.Drawing.Size(29, 55);
+ this.toolStripButton1.Size = new System.Drawing.Size(34, 65);
this.toolStripButton1.Text = "toolStripButton1";
- //
- // dtpHFDate
- //
- this.dtpHFDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHFDate.Location = new System.Drawing.Point(204, 21);
- this.dtpHFDate.Margin = new System.Windows.Forms.Padding(4);
- this.dtpHFDate.Name = "dtpHFDate";
- this.dtpHFDate.Size = new System.Drawing.Size(147, 25);
- this.dtpHFDate.TabIndex = 60;
//
// Mes_WIPSumReportDateReport
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1214, 592);
+ this.ClientSize = new System.Drawing.Size(1366, 710);
this.Controls.Add(this.grdMain);
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.Tool);
+ this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.Name = "Mes_WIPSumReportDateReport";
this.Text = "鍦ㄥ埗鍝佹姤琛�";
((System.ComponentModel.ISupportInitialize)(this.grdMain)).EndInit();
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_WIPSumReportDateReport.resx" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_WIPSumReportDateReport.resx"
index e1b8735..cea10fc 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_WIPSumReportDateReport.resx"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_WIPSumReportDateReport.resx"
@@ -360,7 +360,7 @@
<data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
ao0ImqppU39qSFVMtVZLrfQXFMlKFy4KbaXQTao7Cd1U3VSyFFQIqNXYZDKZTHJ8976ZTEZD6AcnL+/e
e857A08p5uX7MEgv3i4h9GYRE3MLJUW9sdlPMG0SKhCvP4Z5/R8cIVYA0dk/AkOsKT1fUmpWzvkCz+2A
4PQ7WRW0tnvR5unFvQ7vFVH9fvdjdPYNoccftANGJufZbOTyvJZjdOaD8/uJ4dAcNzO6ga3dPezEbNFe
@@ -374,7 +374,7 @@
<data name="cx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
UjJbCzQWk5EFRslEiUwZFNLo+lMaxWCIIUXIQhYzj/edc28NHUzzq1/v7Z7zPOee6/ybgMu3lhwP6NrO
F9q6blqaSDaETnOs3UIiCx2bUBuDmjmojpr5t0QWZ9KQfJSNkll5roxAxQRUTZn+LvBOH0vBQgbidzB0
KF+wCA1xaEyYqbVLPEG/CwMC9iShbQu69yEo0uFzM7V2QV2Y2E2e4Al07kGL3L/3CEKXsCRXSryaOZ3J
@@ -386,7 +386,7 @@
<data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
@@ -396,7 +396,7 @@
<data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
--
Gitblit v1.9.1