From 718742f68f222461586a2da986d3d2cc085715d0 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期二, 17 五月 2022 10:50:23 +0800
Subject: [PATCH] nothing
---
WebAPI/Sc_MouldProdInBill/Log/637880486996635039.log | 3
WebAPI/Sc_MouldProdInBill/Log/637880489053087606.log | 3
LMES/ClsShowMod.cs | 11
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 36
WebAPI/Sc_MouldProdInBill/Log/637880489053097665.log | 3
WebAPI/Sc_MouldProdInBill/Log/637879637531386497.log | 3
WebAPI/WebAPI.csproj.user | 2
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormImportController.cs | 368 ++++++
WebAPI/Sc_MouldProdInBill/Log/637880489052667576.log | 3
WorkM/报表分析/DefectiveDetailedYieldReport.resx | 12
WorkM/报表分析/DefectiveDetailedYieldReport.cs | 8
WebAPI/Sc_MouldProdInBill/Log/637879637531326475.log | 3
WebAPI/Sc_MouldProdInBill/Log/637879637530646434.log | 3
WebAPI/Sc_MouldProdInBill/Log/637880486996675048.log | 3
WebAPI/Sc_MouldProdInBill/Log/637880486996165006.log | 3
BaseSet/BaseSet.csproj | 10
WorkM/车间管理/QC_NoPassProdCheckBill.cs | 15
BaseSet/公用资料/其他基础资料/Gy_StdWorkTimesList.cs | 8
BaseSet/公用资料/其他基础资料/Gy_StdWorkTimesList.Designer.cs | 116 +
WebAPI/Sc_MouldProdOutBill/Log/637879637552458053.log | 3
WorkM/车间管理/QC_NoPassProdCheckBill.designer.cs | 2
WebAPI/packages.config | 5
WebAPI/Sc_MouldProdOutBill/Log/637880487100073561.log | 3
BaseSet/导入模板/Gy_DataIn_StdWorkTimes.cs | 294 +++++
WebAPI/Vlog/webapi20220512.txt | 1
BaseSet/公用资料/其他基础资料/Gy_StdWorkTimesList.resx | 124 +-
BaseSet/公用资料/其他基础资料/Gy_StdWorkTimes.cs | 2
WebAPI/Controllers/生产管理/生产任务单/Sc_ICMOBillController.cs | 318 +++--
BaseSet/导入模板/Gy_DataIn_StdWorkTimes.resx | 0
WebAPI/Controllers/SCGL/日计划管理/NpoiHelper.cs | 1328 ++++++++++++++++++++++++
/dev/null | 230 ----
WorkM/报表分析/DefectiveDetailedYieldReport.designer.cs | 130 +
Model/基础资料/其他基础资料/ClsGy_StdWorkTimes_Model.cs | 4
BaseSet/导入模板/Gy_DataIn_StdWorkTimes.Designer.cs | 79
WebAPI/Vlog/webapi20220513.txt | 3
WebAPI/Controllers/SCGL/日计划管理/Sc_WorkBillSortBillController.cs | 2
WebAPI/Sc_MouldProdOutBill/Log/637880489108808963.log | 3
DAL/基础资料/其他基础资料/ClsGy_StdWorkTimes_Ctl.cs | 14
WebAPI/Models/ClsQK_PackingBill.cs | 3
WebAPI/WebAPI.csproj | 27
BaseSet/公用资料/其他基础资料/Gy_StdWorkTimes.Designer.cs | 2
PlanM/PlanM.csproj | 10
42 files changed, 2,585 insertions(+), 615 deletions(-)
diff --git a/BaseSet/BaseSet.csproj b/BaseSet/BaseSet.csproj
index 4751d46..239fba4 100644
--- a/BaseSet/BaseSet.csproj
+++ b/BaseSet/BaseSet.csproj
@@ -1564,6 +1564,12 @@
<Compile Include="瀵煎叆妯℃澘\Gy_DataIn_WorkCenter.designer.cs">
<DependentUpon>Gy_DataIn_WorkCenter.cs</DependentUpon>
</Compile>
+ <Compile Include="瀵煎叆妯℃澘\Gy_DataIn_StdWorkTimes.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="瀵煎叆妯℃澘\Gy_DataIn_StdWorkTimes.Designer.cs">
+ <DependentUpon>Gy_DataIn_StdWorkTimes.cs</DependentUpon>
+ </Compile>
</ItemGroup>
<ItemGroup>
<COMReference Include="stdole">
@@ -2551,6 +2557,10 @@
<SubType>Designer</SubType>
<DependentUpon>Gy_DataIn_WorkCenter.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="瀵煎叆妯℃澘\Gy_DataIn_StdWorkTimes.resx">
+ <DependentUpon>Gy_DataIn_StdWorkTimes.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
</ItemGroup>
<ItemGroup>
<Folder Include="CLOUD鍩虹璧勬枡\" />
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimes.Designer.cs" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimes.Designer.cs"
index a8afed8..2e4b36b 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimes.Designer.cs"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimes.Designer.cs"
@@ -1,5 +1,5 @@
锘�
-namespace BaseSet.鍏敤璧勬枡.鍏朵粬鍩虹璧勬枡
+namespace BaseSet
{
partial class Gy_StdWorkTimes
{
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimes.cs" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimes.cs"
index 58c8379..757f566 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimes.cs"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimes.cs"
@@ -8,7 +8,7 @@
using System.Text;
using System.Windows.Forms;
-namespace BaseSet.鍏敤璧勬枡.鍏朵粬鍩虹璧勬枡
+namespace BaseSet
{
public partial class Gy_StdWorkTimes : Form
{
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.Designer.cs" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.Designer.cs"
index 2f5305c..54674e5 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.Designer.cs"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.Designer.cs"
@@ -1,5 +1,5 @@
锘�
-namespace BaseSet.鍏敤璧勬枡.鍏朵粬鍩虹璧勬枡
+namespace BaseSet
{
partial class Gy_StdWorkTimesList
{
@@ -31,7 +31,7 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Gy_StdWorkTimesList));
- System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("椤圭洰");
+ System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("椤圭洰");
this.tabPage1 = new System.Windows.Forms.TabPage();
this.grdMain = new System.Windows.Forms.DataGridView();
this.fsh = new System.Windows.Forms.ToolStripButton();
@@ -48,9 +48,9 @@
this.sh = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
this.ToolBar = new System.Windows.Forms.ToolStrip();
- this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
this.gs = new System.Windows.Forms.ToolStripButton();
this.wl = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
this.xz = new System.Windows.Forms.ToolStripButton();
this.xg = new System.Windows.Forms.ToolStripButton();
this.sc = new System.Windows.Forms.ToolStripButton();
@@ -64,6 +64,8 @@
this.bclk = new System.Windows.Forms.ToolStripButton();
this.jy = new System.Windows.Forms.ToolStripButton();
this.fjy = new System.Windows.Forms.ToolStripButton();
+ this.dc = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
this.tabPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
@@ -80,11 +82,10 @@
this.tabPage1.BackColor = System.Drawing.Color.Transparent;
this.tabPage1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.tabPage1.Controls.Add(this.grdMain);
- this.tabPage1.Location = new System.Drawing.Point(4, 25);
- this.tabPage1.Margin = new System.Windows.Forms.Padding(4);
+ this.tabPage1.Location = new System.Drawing.Point(4, 22);
this.tabPage1.Name = "tabPage1";
- this.tabPage1.Padding = new System.Windows.Forms.Padding(4);
- this.tabPage1.Size = new System.Drawing.Size(1041, 590);
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
+ this.tabPage1.Size = new System.Drawing.Size(779, 469);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "鍒楄〃瑙嗗浘";
this.tabPage1.UseVisualStyleBackColor = true;
@@ -97,13 +98,12 @@
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(4, 4);
- this.grdMain.Margin = new System.Windows.Forms.Padding(4);
+ this.grdMain.Location = new System.Drawing.Point(3, 3);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
this.grdMain.RowHeadersWidth = 51;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(1031, 580);
+ this.grdMain.Size = new System.Drawing.Size(771, 461);
this.grdMain.TabIndex = 21;
//
// fsh
@@ -123,7 +123,7 @@
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50);
//
// tc
//
@@ -142,7 +142,7 @@
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
- this.toolStripSeparator5.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator5.Size = new System.Drawing.Size(6, 50);
//
// imageList1
//
@@ -158,8 +158,7 @@
// splitContainer1
//
this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.splitContainer1.Location = new System.Drawing.Point(0, 62);
- this.splitContainer1.Margin = new System.Windows.Forms.Padding(4);
+ this.splitContainer1.Location = new System.Drawing.Point(0, 50);
this.splitContainer1.Name = "splitContainer1";
//
// splitContainer1.Panel1
@@ -170,9 +169,8 @@
// splitContainer1.Panel2
//
this.splitContainer1.Panel2.Controls.Add(this.stTab);
- this.splitContainer1.Size = new System.Drawing.Size(1249, 619);
- this.splitContainer1.SplitterDistance = 195;
- this.splitContainer1.SplitterWidth = 5;
+ this.splitContainer1.Size = new System.Drawing.Size(937, 495);
+ this.splitContainer1.SplitterDistance = 146;
this.splitContainer1.TabIndex = 18;
//
// tv
@@ -185,18 +183,17 @@
this.tv.Indent = 18;
this.tv.ItemHeight = 18;
this.tv.LineColor = System.Drawing.Color.Navy;
- this.tv.Location = new System.Drawing.Point(0, 24);
- this.tv.Margin = new System.Windows.Forms.Padding(4);
+ this.tv.Location = new System.Drawing.Point(0, 20);
this.tv.Name = "tv";
- 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 = "椤圭洰";
+ 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 = "椤圭洰";
this.tv.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
- treeNode1});
+ treeNode2});
this.tv.SelectedImageIndex = 1;
- this.tv.Size = new System.Drawing.Size(195, 595);
+ this.tv.Size = new System.Drawing.Size(146, 475);
this.tv.TabIndex = 16;
this.tv.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.tv_NodeMouseClick);
//
@@ -206,18 +203,16 @@
this.panel1.Controls.Add(this.lblCaption);
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
this.panel1.Location = new System.Drawing.Point(0, 0);
- this.panel1.Margin = new System.Windows.Forms.Padding(4);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(195, 24);
+ this.panel1.Size = new System.Drawing.Size(146, 20);
this.panel1.TabIndex = 15;
//
// lblCaption
//
this.lblCaption.AutoSize = true;
- this.lblCaption.Location = new System.Drawing.Point(0, 4);
- this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lblCaption.Location = new System.Drawing.Point(0, 3);
this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(37, 15);
+ this.lblCaption.Size = new System.Drawing.Size(29, 12);
this.lblCaption.TabIndex = 0;
this.lblCaption.Text = "璧勬枡";
//
@@ -226,10 +221,9 @@
this.stTab.Controls.Add(this.tabPage1);
this.stTab.Dock = System.Windows.Forms.DockStyle.Fill;
this.stTab.Location = new System.Drawing.Point(0, 0);
- this.stTab.Margin = new System.Windows.Forms.Padding(4);
this.stTab.Name = "stTab";
this.stTab.SelectedIndex = 0;
- this.stTab.Size = new System.Drawing.Size(1049, 619);
+ this.stTab.Size = new System.Drawing.Size(787, 495);
this.stTab.TabIndex = 15;
//
// sh
@@ -250,7 +244,7 @@
//
this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 50);
//
// ToolBar
//
@@ -259,6 +253,8 @@
this.ToolBar.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.ToolBar.ImageScalingSize = new System.Drawing.Size(22, 22);
this.ToolBar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.dc,
+ this.toolStripSeparator5,
this.gs,
this.wl,
this.toolStripSeparator6,
@@ -279,20 +275,15 @@
this.toolStripSeparator3,
this.jy,
this.fjy,
- this.toolStripSeparator5,
+ this.toolStripSeparator4,
this.tc});
this.ToolBar.Location = new System.Drawing.Point(0, 0);
this.ToolBar.Name = "ToolBar";
this.ToolBar.Padding = new System.Windows.Forms.Padding(0);
- this.ToolBar.Size = new System.Drawing.Size(1249, 62);
+ this.ToolBar.Size = new System.Drawing.Size(937, 50);
this.ToolBar.Stretch = true;
this.ToolBar.TabIndex = 17;
this.ToolBar.Text = "toolStrip1";
- //
- // toolStripSeparator6
- //
- this.toolStripSeparator6.Name = "toolStripSeparator6";
- this.toolStripSeparator6.Size = new System.Drawing.Size(6, 62);
//
// gs
//
@@ -326,6 +317,11 @@
this.wl.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.wl.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.wl.Click += new System.EventHandler(this.wl_Click);
+ //
+ // toolStripSeparator6
+ //
+ this.toolStripSeparator6.Name = "toolStripSeparator6";
+ this.toolStripSeparator6.Size = new System.Drawing.Size(6, 50);
//
// xz
//
@@ -373,7 +369,7 @@
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 50);
//
// cx
//
@@ -406,13 +402,13 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
//
// toolStripSeparator8
//
this.toolStripSeparator8.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator8.Name = "toolStripSeparator8";
- this.toolStripSeparator8.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 50);
//
// mrlk
//
@@ -422,7 +418,7 @@
this.mrlk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.mrlk.ImageTransparentColor = System.Drawing.Color.White;
this.mrlk.Name = "mrlk";
- this.mrlk.Size = new System.Drawing.Size(73, 59);
+ this.mrlk.Size = new System.Drawing.Size(60, 47);
this.mrlk.Text = "榛樿鍒楀";
this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -431,7 +427,7 @@
//
this.toolStripSeparator7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator7.Name = "toolStripSeparator7";
- this.toolStripSeparator7.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 50);
//
// bclk
//
@@ -441,7 +437,7 @@
this.bclk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.bclk.ImageTransparentColor = System.Drawing.Color.White;
this.bclk.Name = "bclk";
- this.bclk.Size = new System.Drawing.Size(73, 59);
+ this.bclk.Size = new System.Drawing.Size(60, 47);
this.bclk.Text = "淇濆瓨鍒楀";
this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -474,13 +470,33 @@
this.fjy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.fjy.Click += new System.EventHandler(this.fjy_Click);
//
+ // dc
+ //
+ this.dc.AutoSize = false;
+ this.dc.Image = ((System.Drawing.Image)(resources.GetObject("dc.Image")));
+ this.dc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.dc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.dc.ImageTransparentColor = System.Drawing.Color.White;
+ this.dc.Name = "dc";
+ this.dc.Size = new System.Drawing.Size(36, 47);
+ this.dc.Text = "寮曞嚭";
+ this.dc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.dc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.dc.Click += new System.EventHandler(this.dc_Click);
+ //
+ // toolStripSeparator4
+ //
+ this.toolStripSeparator4.Name = "toolStripSeparator4";
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
+ //
// Gy_StdWorkTimesList
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1249, 681);
+ this.ClientSize = new System.Drawing.Size(937, 545);
this.Controls.Add(this.splitContainer1);
this.Controls.Add(this.ToolBar);
+ this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.Name = "Gy_StdWorkTimesList";
this.Text = "鏍囧噯宸ユ椂";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -534,5 +550,7 @@
private System.Windows.Forms.ToolStripButton wl;
private System.Windows.Forms.ToolStripButton jy;
private System.Windows.Forms.ToolStripButton fjy;
+ private System.Windows.Forms.ToolStripButton dc;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
}
}
\ No newline at end of file
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.cs" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.cs"
index 248b672..50433e7 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.cs"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.cs"
@@ -7,7 +7,7 @@
using System.Text;
using System.Windows.Forms;
-namespace BaseSet.鍏敤璧勬枡.鍏朵粬鍩虹璧勬枡
+namespace BaseSet
{
public partial class Gy_StdWorkTimesList : Form
{
@@ -523,5 +523,11 @@
Display();
return;
}
+
+ //瀵煎嚭
+ private void dc_Click(object sender, EventArgs e)
+ {
+ DBUtility.Gy_BaseFun.DataToExcel(this.Text, grdMain);
+ }
}
}
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.resx" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.resx"
index 97c1fc6..545b962 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.resx"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.resx"
@@ -121,7 +121,7 @@
<data name="fsh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADhSURBVDhPrZIxDoMwDEU5D/fgBowZ2VjZGBlzBAYGRhbE
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADhSURBVDhPrZIxDoMwDEU5D/fgBowZ2VjZGBlzBAYGRhbE
yC16obp9KE4DCQVV/ZIVKfb/33Gc/QXPohCNZVnEXZ9iznNZ1/VTB1GGQR7vBDGOY1KEOsjkdzW4kiDO
RJTcdZ1Ya2Wapr0JhLZtkyJKJk8cxT3opO97LwKR8xY5BEUqwlnX9X0yCJ1ViHe79HeEZGOMVFXlRS47
OJKbptlmEs7lVCRFDot1LnxjtGwQWSQKCNrG1aU9VCTqAgF1L8tym7hLRWCBENitMi0hkGo9BYyiZ0Di
@@ -131,7 +131,7 @@
<data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
@@ -146,51 +146,51 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACE
- CgAAAk1TRnQBSQFMAgEBAgEAAUQBAQFEAQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+ CgAAAk1TRnQBSQFMAgEBAgEAAUwBAQFMAQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
AwABEAMAAQEBAAEgBgABEBIAgP+AAAj/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
AwAB/wMAAf8DAAH/AwAB/wMADf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
- AwAB/wMAAf8DAAH/gAAE/wEAAT0BigH/AQgBkAG5Af8BCAGQAbkB/wEIAZABuQH/AQgBkAG5Af8BCAGQ
- AbkB/wEIAZABuQH/AQgBkAG5Af8BCAGQAbkB/wEIAZABuQH/AQgBkAG5Af8BCAGQAbkB/wEIAZABuQH/
- AQgBkAG5Af8DAAn/AQABPQGKAf8BAAE9AYoB/wEAAT0BigH/AQABPQGKAf8BAAE9AYoB/wEAAT0BigH/
- AQABPQGKAf8BAAE9AYoB/wEAAT0BigH/AQABPQGKAf8BAAE9AYoB/wEAAT0BigH/AwAB/wMAAf+AAAT/
- AQABPQGKAf8B0QH2Av8BTwHaAfQB/wFEAdMB8QH/ATkBywHvAf8BLwHEAe0B/wElAb4B6wH/ARsBuAHo
- Af8BDwGwAecB/wEFAakB5AH/AQABowHiAf8BAAGeAeAB/wEAAZoB3wH/AQgBkAG5Af8DAAn/AQABPQGK
- Af8B0QH2Av8BJAG+AesB/wEeAbkB6QH/ARYBtAHnAf8BDgGwAeYB/wEHAasB5AH/AQABpwHjAf8BAAGi
- AeEB/wEAAZ8B4QH/AQgBkAG5Af8BAAE9AYoB/wMAAf8DAAH/gAAE/wEAAT0BigH/AdEB9gL/AVUB3gH1
- Af8BSgHWAfMB/wFAAdAB8QH/ATUByQHuAf8BKwHCAewB/wEgAbwB6gH/ARYBtAHnAf8BCwGtAeUB/wEB
- AaYB4wH/AQABoQHhAf8BAAGdAeAB/wEIAZABuQH/AwAF/wEAAT0BigH/AdEB9gL/AS8BxQHuAf8BKQHB
- AesB/wEiAbwB6wH/ARoBtwHoAf8BEwGyAecB/wELAa4B5QH/AQQBqQHkAf8BAAGlAeIB/wEAAaEB4QH/
- AQgBkAG5Af8DAAH/AQABPQGKAf8DAAH/gAAE/wEAAT0BigH/AdEB9gL/AYEB4QH3Af8BUQHaAfQB/wFG
- AdQB8gH/ATsBzAHvAf8BMQHGAe4B/wEnAcAB6wH/ARwBuQHpAf8BEgGyAeYB/wEHAasB5QH/AQABpQHi
- Af8BAAGfAeEB/wEIAZABuQH/AwAF/wEAAT0BigH/AdEB9gL/ATQByAHuAf8BLQHEAewB/wEmAb8B6wH/
- AR8BuwHqAf8BGAG2AegB/wEQAbAB5wH/AQkBrAHlAf8BAgGnAeMB/wEAAaMB4gH/AQABPQGKAf8DAAH/
- AQABPQGKAf8DAAH/gAAE/wEAAT0BigH/AdEB9gL/AYYB5QH3Af8BVwHfAfUB/wFMAdgB8wH/AUIB0QHx
- Af8BNwHKAe8B/wEtAcQB7QH/ASMBvQHqAf8BGAG2AegB/wENAa8B5QH/AQIBqAHjAf8BAAGiAeEB/wEI
- AZABuQH/AwAB/wEAAT0BigH/AdEB9gL/AUABzwHxAf8BOQHLAe8B/wExAccB7gH/ASsBwgHsAf8BJAG9
- AeoB/wEcAbkB6QH/ARUBtAHnAf8BDgGwAeYB/wEGAaoB5QH/AQgBkAG5Af8DAAH/AQgBkAG5Af8BCAGQ
- AbkB/wMAAf+AAAT/AQABPQGKAf8B0QH2Av8BjAHoAfkB/wGDAeIB9wH/AVMB3AH1Af8BSQHVAfIB/wE9
- Ac4B8AH/ATMByAHuAf8BKQHBAewB/wEfAboB6gH/ARMBswHnAf8BCQGsAeUB/wEAAaYB4wH/AQgBkAG5
- Af8DAAH/AQABPQGKAf8B0QH2Av8BRQHTAfIB/wE9Ac4B8AH/ATYBygHuAf8BLwHFAe0B/wEpAcEB6wH/
- ASEBvAHqAf8BGgG3AegB/wESAbIB5gH/AQsBrgHlAf8BCAGQAbkB/wMAAf8BCAGQAbkB/wEIAZABuQH/
- AwAB/4AABP8BAAE9AYoB/wHRAfYC/wGQAesB+QH/AYgB5gH4Af8BWQHgAfYB/wFPAdkB8wH/AUQB0wHy
- Af8BOQHLAe8B/wEvAcUB7QH/ASUBvgHrAf8BGwG4AekB/wEPAbAB5gH/AQQBqQHkAf8BCAGQAbkB/wMA
- Af8BAAE9AYoB/wEAAT0BigH/AQABPQGKAf8BAAE9AYoB/wEAAT0BigH/AQABPQGKAf8BAAE9AYoB/wEA
- AT0BigH/AQABPQGKAf8BAAE9AYoB/wEAAT0BigH/AQABPQGKAf8BCAGQAbkB/wE2AckB7gH/AQgBkAG5
- Af8DAAH/gAAE/wEAAT0BigH/AdEB9gL/AZMB7QH6Af8BjQHpAfkB/wGFAeQB9wH/AVYB3gH1Af8BSgHW
- AfMB/wFAAc8B8QH/ATUByQHvAf8BKwHCAewB/wEhAbsB6QH/ARYBtQHnAf8BCwGtAeYB/wEIAZABuQH/
- AwAF/wEAAT0BigH/AdEB9gL/AZEB7AH6Af8BjQHpAfkB/wGKAecB+AH/AYYB5AH4Af8BgAHhAfcB/wFW
- Ad0B9QH/AVAB2gHzAf8BSgHXAfMB/wFFAdMB8QH/AT8BzwHxAf8BOQHLAe8B/wEIAZABuQH/AwAB/4AA
- BP8BAAE9AYoB/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHR
- AfYC/wHRAfYC/wHRAfYC/wHRAfYC/wEIAZABuQH/AwAF/wEAAT0BigH/AdEB9gL/AZMB7QH6Af8BkAHr
- AfkB/wGMAekB+QH/AYgB5gH4Af8BhAHjAfcB/wFZAeAB9gH/AVQB3AH1Af8B0QH2Av8B0QH2Av8B0QH2
- Av8B0QH2Av8BCAGQAbkB/wMAAf+AAAT/AQABPQGKAf8BGwGoAdMB/wEbAagB0wH/ARsBqAHTAf8BGwGo
- AdMB/wEbAagB0wH/ARsBqAHTAf8BGwGoAdMB/wEAAT0BigH/AQABPQGKAf8BAAE9AYoB/wEAAT0BigH/
- AQABPQGKAf8BAAE9AYoJ/wEAAT0BigH/AdEB9gL/AZMB7QH6Af8BkgHsAfoB/wGPAesB+QH/AYsB6AH4
- Af8BhwHlAfcB/wHRAfYC/wEAAT0BigH/AQABPQGKAf8BAAE9AYoB/wEAAT0BigH/AQABPQGKAf8BAAE9
- AYoF/4AACP8BAAE9AYoB/wG4AegB9QH/Ac4D/wHOA/8BnAP/AZwD/wEAAT0BigH/AwAh/wEAAT0BigH/
- AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AQABPQGKHf+AAAz/AQABPQGKAf8BAAE9AYoB/wEA
- AT0BigH/AQABPQGKAf8BAAE9AYoB/wMAKf8BAAE9AYoB/wEAAT0BigH/AQABPQGKAf8BAAE9AYoB/wEA
- AT0BiiH/gACA/4AAgP+AAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/gQAL
+ AwAB/wMAAf8DAAH/gAAE/wEAATwBigH/AQcBkAG5Af8BBwGQAbkB/wEHAZABuQH/AQcBkAG5Af8BBwGQ
+ AbkB/wEHAZABuQH/AQcBkAG5Af8BBwGQAbkB/wEHAZABuQH/AQcBkAG5Af8BBwGQAbkB/wEHAZABuQH/
+ AQcBkAG5Af8DAAn/AQABPAGKAf8BAAE8AYoB/wEAATwBigH/AQABPAGKAf8BAAE8AYoB/wEAATwBigH/
+ AQABPAGKAf8BAAE8AYoB/wEAATwBigH/AQABPAGKAf8BAAE8AYoB/wEAATwBigH/AwAB/wMAAf+AAAT/
+ AQABPAGKAf8B0QH2Av8BTgHaAfQB/wFDAdMB8QH/ATgBywHvAf8BLgHEAe0B/wEkAb4B6wH/ARoBuAHo
+ Af8BDgGwAecB/wEEAakB5AH/AQABowHiAf8BAAGeAeAB/wEAAZoB3wH/AQcBkAG5Af8DAAn/AQABPAGK
+ Af8B0QH2Av8BIwG+AesB/wEdAbkB6QH/ARUBtAHnAf8BDQGwAeYB/wEGAasB5AH/AQABpwHjAf8BAAGi
+ AeEB/wEAAZ8B4QH/AQcBkAG5Af8BAAE8AYoB/wMAAf8DAAH/gAAE/wEAATwBigH/AdEB9gL/AVQB3gH1
+ Af8BSQHWAfMB/wE/AdAB8QH/ATQByQHuAf8BKgHCAewB/wEfAbwB6gH/ARUBtAHnAf8BCgGtAeUB/wEA
+ AaYB4wH/AQABoQHhAf8BAAGdAeAB/wEHAZABuQH/AwAF/wEAATwBigH/AdEB9gL/AS4BxQHuAf8BKAHB
+ AesB/wEhAbwB6wH/ARkBtwHoAf8BEgGyAecB/wEKAa4B5QH/AQMBqQHkAf8BAAGlAeIB/wEAAaEB4QH/
+ AQcBkAG5Af8DAAH/AQABPAGKAf8DAAH/gAAE/wEAATwBigH/AdEB9gL/AYEB4QH3Af8BUAHaAfQB/wFF
+ AdQB8gH/AToBzAHvAf8BMAHGAe4B/wEmAcAB6wH/ARsBuQHpAf8BEQGyAeYB/wEGAasB5QH/AQABpQHi
+ Af8BAAGfAeEB/wEHAZABuQH/AwAF/wEAATwBigH/AdEB9gL/ATMByAHuAf8BLAHEAewB/wElAb8B6wH/
+ AR4BuwHqAf8BFwG2AegB/wEPAbAB5wH/AQgBrAHlAf8BAQGnAeMB/wEAAaMB4gH/AQABPAGKAf8DAAH/
+ AQABPAGKAf8DAAH/gAAE/wEAATwBigH/AdEB9gL/AYYB5QH3Af8BVgHfAfUB/wFLAdgB8wH/AUEB0QHx
+ Af8BNgHKAe8B/wEsAcQB7QH/ASIBvQHqAf8BFwG2AegB/wEMAa8B5QH/AQEBqAHjAf8BAAGiAeEB/wEH
+ AZABuQH/AwAB/wEAATwBigH/AdEB9gL/AT8BzwHxAf8BOAHLAe8B/wEwAccB7gH/ASoBwgHsAf8BIwG9
+ AeoB/wEbAbkB6QH/ARQBtAHnAf8BDQGwAeYB/wEFAaoB5QH/AQcBkAG5Af8DAAH/AQcBkAG5Af8BBwGQ
+ AbkB/wMAAf+AAAT/AQABPAGKAf8B0QH2Av8BjAHoAfkB/wGDAeIB9wH/AVIB3AH1Af8BSAHVAfIB/wE8
+ Ac4B8AH/ATIByAHuAf8BKAHBAewB/wEeAboB6gH/ARIBswHnAf8BCAGsAeUB/wEAAaYB4wH/AQcBkAG5
+ Af8DAAH/AQABPAGKAf8B0QH2Av8BRAHTAfIB/wE8Ac4B8AH/ATUBygHuAf8BLgHFAe0B/wEoAcEB6wH/
+ ASABvAHqAf8BGQG3AegB/wERAbIB5gH/AQoBrgHlAf8BBwGQAbkB/wMAAf8BBwGQAbkB/wEHAZABuQH/
+ AwAB/4AABP8BAAE8AYoB/wHRAfYC/wGQAesB+QH/AYgB5gH4Af8BWAHgAfYB/wFOAdkB8wH/AUMB0wHy
+ Af8BOAHLAe8B/wEuAcUB7QH/ASQBvgHrAf8BGgG4AekB/wEOAbAB5gH/AQMBqQHkAf8BBwGQAbkB/wMA
+ Af8BAAE8AYoB/wEAATwBigH/AQABPAGKAf8BAAE8AYoB/wEAATwBigH/AQABPAGKAf8BAAE8AYoB/wEA
+ ATwBigH/AQABPAGKAf8BAAE8AYoB/wEAATwBigH/AQABPAGKAf8BBwGQAbkB/wE1AckB7gH/AQcBkAG5
+ Af8DAAH/gAAE/wEAATwBigH/AdEB9gL/AZMB7QH6Af8BjQHpAfkB/wGFAeQB9wH/AVUB3gH1Af8BSQHW
+ AfMB/wE/Ac8B8QH/ATQByQHvAf8BKgHCAewB/wEgAbsB6QH/ARUBtQHnAf8BCgGtAeYB/wEHAZABuQH/
+ AwAF/wEAATwBigH/AdEB9gL/AZEB7AH6Af8BjQHpAfkB/wGKAecB+AH/AYYB5AH4Af8BgAHhAfcB/wFV
+ Ad0B9QH/AU8B2gHzAf8BSQHXAfMB/wFEAdMB8QH/AT4BzwHxAf8BOAHLAe8B/wEHAZABuQH/AwAB/4AA
+ BP8BAAE8AYoB/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHR
+ AfYC/wHRAfYC/wHRAfYC/wHRAfYC/wEHAZABuQH/AwAF/wEAATwBigH/AdEB9gL/AZMB7QH6Af8BkAHr
+ AfkB/wGMAekB+QH/AYgB5gH4Af8BhAHjAfcB/wFYAeAB9gH/AVMB3AH1Af8B0QH2Av8B0QH2Av8B0QH2
+ Av8B0QH2Av8BBwGQAbkB/wMAAf+AAAT/AQABPAGKAf8BGgGoAdMB/wEaAagB0wH/ARoBqAHTAf8BGgGo
+ AdMB/wEaAagB0wH/ARoBqAHTAf8BGgGoAdMB/wEAATwBigH/AQABPAGKAf8BAAE8AYoB/wEAATwBigH/
+ AQABPAGKAf8BAAE8AYoJ/wEAATwBigH/AdEB9gL/AZMB7QH6Af8BkgHsAfoB/wGPAesB+QH/AYsB6AH4
+ Af8BhwHlAfcB/wHRAfYC/wEAATwBigH/AQABPAGKAf8BAAE8AYoB/wEAATwBigH/AQABPAGKAf8BAAE8
+ AYoF/4AACP8BAAE8AYoB/wG4AegB9QH/Ac4D/wHOA/8BnAP/AZwD/wEAATwBigH/AwAh/wEAATwBigH/
+ AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AQABPAGKHf+AAAz/AQABPAGKAf8BAAE8AYoB/wEA
+ ATwBigH/AQABPAGKAf8BAAE8AYoB/wMAKf8BAAE8AYoB/wEAATwBigH/AQABPAGKAf8BAAE8AYoB/wEA
+ ATwBiiH/gACA/4AAgP+AAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/gQAL
</value>
</data>
<metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -199,7 +199,7 @@
<data name="sh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACYSURBVDhPpY+7DYAwEEOzEzvR0bEMQ1DRMAQjILagDvIF
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACYSURBVDhPpY+7DYAwEEOzEzvR0bEMQ1DRMAQjILagDvIF
H/kRIvIkK/eJHTAV2Pv8hT2PBQG/QsRMoXfjOmJjrCJq7odZDOwpzORmBr3km7epE3EHYScOD13STCNq
9mHAhFNIzBkBqZ8QFxCbib6I2u+p0hcQu6/jq/wAkIQUfudWGACCENaYu3VCdq7GD3ORJjNpMldizAWG
+xR5VXbRDwAAAABJRU5ErkJggg==
@@ -444,10 +444,20 @@
+VGD6H8q/ID/AIW14r/6GbxD/wCDGb/4qj/hbXiv/oZvEP8A4MZv/iqPYeY1M//Z
</value>
</data>
+ <data name="dc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADoSURBVDhPrZMvD4MwEMXvm6Jn5uaWtGIGMUXmKHKgJvBo
+ asEiqeQ73O4glHb8C9uaPNFr+su7dy0EQYBHBQCsYXGh6zpsjcGmabCqKixLjUVRYJ7nmKUZKqUwiiIM
+ wxCFlD0gjuMBMgKMBygnQOYDpNgB1AzQEyAlwIUuWMCWgycdJKQH6U66ka4kBpxJm4AXFccWtOOAW3Ad
+ iLUWLKCet+BnIJYBNsS/AJwppFlqASe6KOQOQNGhP0Yf8PMUVkM07eCAAbMWkgMP6TNEHmPihLjrgAHa
+ /QtOBosOaPWFo3IBwJtvBADwBiAtZRNHCGN5AAAAAElFTkSuQmCC
+</value>
+ </data>
<data name="gs.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGcSURBVDhPlZPPK8NxGMefcp92ooYDB+SwkriNcODmD+C4
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGcSURBVDhPlZPPK8NxGMefcp92ooYDB+SwkriNcODmD+C4
i+JgNJIpUQ5jN+GiSQ7aL0JZKSwc/EyNzYXEEPNztlLr7fPjO5ux2d716tP38zzP+3nXpy8lqqOJ8BdK
Ob2URmiL5cmpKJTnvyb6xpzvoVQoPX+LF09nCYElAvySz23CzSLBN0fYHMvC4HWdENogPK5laXAwRThj
zRc2wpWTcGmX3/vsfnUoQ4PDacLJDMHL0vBzbzJDA66GWh22xkngsRA2zJK1YcKSy5V+OCZu4uwlga1H
@@ -460,7 +470,7 @@
<data name="wl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIJSURBVDhPhY/tS1NhGMaffyL8KwrRfEmsT4Xi50QNIsJE
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIJSURBVDhPhY/tS1NhGMaffyL8KwrRfEmsT4Xi50QNIsJE
ap2JuXkMN447M5vD7bg2T1CtDNum5mYlhvhBUFBEHa6gD/YCsSK0BUZQFklXz/2cs7HFtAsurnM953ff
5zyM5NXH4AtFERyJI6QnDjS9J454MZiVZ/ghutZlsAADu2U6yB3iHskz73LSAeLNUUMebRT2SQfe7i9j
5XcEEUgI/TgP14cGSJuVsKaqhKWX5eidcoN4c9SQV+O/1Miw8GcSMfjg+NIMy1Y9mlcqcG61KufWVDVY
@@ -475,7 +485,7 @@
<data name="xz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAG3SURBVDhPfVLdK0NhHH5LSXGn/QculCsfUbtRLl1JbhQh
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG3SURBVDhPfVLdK0NhHH5LSXGn/QculCsfUbtRLl1JbhQh
taxNNPnOolY+yhjjQo12oRQ3bhWiZGULF3Kv5Nucbeacs4/HeX/HnJ289tRT7+/5/Z7nfc+vw+bXgvD4
NuFZDojpC2DOvwX/1i6YCDPeDXEjDyu+C5oRhrgX1knMZrMQkfe83vNf45+QydlVEtKZDETkvaWlkMlk
Chn3LFOhptIQMQsgsHmElvYetHXYcHB4YgpjIzOLJMhKCiIqagoZLUVKJPEWlWg2UlOKs3KmB7ncC3RI
@@ -489,7 +499,7 @@
<data name="xg.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHoSURBVDhPnZJfSFNhGMY/CESwO/PCey+6iLLsxnXRTQV5
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHoSURBVDhPnZJfSFNhGMY/CESwO/PCey+6iLLsxnXRTQV5
USCIQiyti2iuMYoQS8n+IMLUi/07kq4L03WzLiTvahvVGghtujFashLLzNqEiTCNGfT0ve/OOufICPSB
h3P4zu/3nu98HKHPoNOHYdc4XJ5xuL3G0tqwcwLEqLgxA44x/Cr+hjUCCJesZ1flmj36hxliVU3L3UEn
NvKbsAYLmMqiYm2hLWaIVTUtPfdHkF/PQYwCT1eBttfAoSn5Zrda2oUTzBCralpu9Q8hu/adoa4oUD8t
@@ -503,7 +513,7 @@
<data name="sc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGwSURBVDhPjU/rK0NxGD5/gI/+AJ9kPrp8ZT7zlSiF4oNL
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGwSURBVDhPjU/rK0NxGD5/gI/+AJ9kPrp8ZT7zlSiF4oNL
ZElChFAstVguc2tsLhshKa0oYRk6yUFu0ayRaXaa1Vwf+/0cZ2fOYZ56Oud5zvs8530ZJVTXt0NKwf4f
SMAXeIOHD1KS96gl0r/9h0LsCzIjCljuLLKEiMenV1y4PDi6dIM9uYb94BTrDg6rmywWbHaYl9ZgmF6G
bmQW2kGTvEDT1IWz80tMTM1h1GTFkHEG+mETevrH0KkzoEXbj+YuPYyWFTR06BTOaOykhp09QSD4jLvH
@@ -516,7 +526,7 @@
<data name="cx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
UjJbCzQWk5EFRslEiUwZFNLo+lMaxWCIIUXIQhYzj/edc28NHUzzq1/v7Z7zPOee6/ybgMu3lhwP6NrO
F9q6blqaSDaETnOs3UIiCx2bUBuDmjmojpr5t0QWZ9KQfJSNkll5roxAxQRUTZn+LvBOH0vBQgbidzB0
KF+wCA1xaEyYqbVLPEG/CwMC9iShbQu69yEo0uFzM7V2QV2Y2E2e4Al07kGL3L/3CEKXsCRXSryaOZ3J
@@ -528,7 +538,7 @@
<data name="xs.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
@@ -541,7 +551,7 @@
<data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
@@ -556,7 +566,7 @@
<data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
/QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
@@ -571,7 +581,7 @@
<data name="jy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACYSURBVDhPpY+7DYAwEEOzEzvR0bEMQ1DRMAQjILagDvIF
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACYSURBVDhPpY+7DYAwEEOzEzvR0bEMQ1DRMAQjILagDvIF
H/kRIvIkK/eJHTAV2Pv8hT2PBQG/QsRMoXfjOmJjrCJq7odZDOwpzORmBr3km7epE3EHYScOD13STCNq
9mHAhFNIzBkBqZ8QFxCbib6I2u+p0hcQu6/jq/wAkIQUfudWGACCENaYu3VCdq7GD3ORJjNpMldizAWG
+xR5VXbRDwAAAABJRU5ErkJggg==
@@ -580,7 +590,7 @@
<data name="fjy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADhSURBVDhPrZIxDoMwDEU5D/fgBowZ2VjZGBlzBAYGRhbE
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADhSURBVDhPrZIxDoMwDEU5D/fgBowZ2VjZGBlzBAYGRhbE
yC16obp9KE4DCQVV/ZIVKfb/33Gc/QXPohCNZVnEXZ9iznNZ1/VTB1GGQR7vBDGOY1KEOsjkdzW4kiDO
RJTcdZ1Ya2Wapr0JhLZtkyJKJk8cxT3opO97LwKR8xY5BEUqwlnX9X0yCJ1ViHe79HeEZGOMVFXlRS47
OJKbptlmEs7lVCRFDot1LnxjtGwQWSQKCNrG1aU9VCTqAgF1L8tym7hLRWCBENitMi0hkGo9BYyiZ0Di
diff --git "a/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_StdWorkTimes_RoutingBill.Designer.cs" "b/BaseSet/\345\257\274\345\205\245\346\250\241\346\235\277/Gy_DataIn_StdWorkTimes.Designer.cs"
similarity index 70%
rename from "PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_StdWorkTimes_RoutingBill.Designer.cs"
rename to "BaseSet/\345\257\274\345\205\245\346\250\241\346\235\277/Gy_DataIn_StdWorkTimes.Designer.cs"
index 3eea509..c5564ae 100644
--- "a/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_StdWorkTimes_RoutingBill.Designer.cs"
+++ "b/BaseSet/\345\257\274\345\205\245\346\250\241\346\235\277/Gy_DataIn_StdWorkTimes.Designer.cs"
@@ -1,6 +1,6 @@
-namespace PlanM
+namespace BaseSet
{
- partial class Gy_StdWorkTimes_RoutingBill
+ partial class Gy_DataIn_StdWorkTimes
{
/// <summary>
/// 必需的设计器变量。
@@ -41,8 +41,8 @@
//
// pPic
//
- this.pPic.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
- this.pPic.Size = new System.Drawing.Size(1544, 56);
+ this.pPic.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.pPic.Size = new System.Drawing.Size(1158, 45);
//
// panel1
//
@@ -53,8 +53,8 @@
this.panel1.Controls.Add(this.label2);
this.panel1.Controls.Add(this.cmbHYear);
this.panel1.Controls.Add(this.label1);
- this.panel1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
- this.panel1.Size = new System.Drawing.Size(1544, 52);
+ this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.panel1.Size = new System.Drawing.Size(1158, 42);
this.panel1.Controls.SetChildIndex(this.cmdHPath, 0);
this.panel1.Controls.SetChildIndex(this.label4, 0);
this.panel1.Controls.SetChildIndex(this.txtHPath, 0);
@@ -68,33 +68,32 @@
//
// lblCaption
//
- this.lblCaption.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
- this.lblCaption.Size = new System.Drawing.Size(160, 24);
+ this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lblCaption.Size = new System.Drawing.Size(129, 19);
this.lblCaption.Text = "数据导入模块";
//
// cmdHPath
//
- this.cmdHPath.Location = new System.Drawing.Point(1043, 9);
- this.cmdHPath.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+ this.cmdHPath.Location = new System.Drawing.Point(782, 7);
+ this.cmdHPath.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
//
// txtHPath
//
- this.txtHPath.Location = new System.Drawing.Point(615, 4);
- this.txtHPath.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
- this.txtHPath.Size = new System.Drawing.Size(419, 39);
+ this.txtHPath.Location = new System.Drawing.Point(461, 3);
+ this.txtHPath.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHPath.Size = new System.Drawing.Size(315, 32);
//
// label4
//
- this.label4.Location = new System.Drawing.Point(520, 15);
- this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.label4.Location = new System.Drawing.Point(390, 12);
+ this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
//
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(35, 11);
- this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label1.Location = new System.Drawing.Point(26, 9);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(67, 15);
+ this.label1.Size = new System.Drawing.Size(53, 12);
this.label1.TabIndex = 104;
this.label1.Text = "会计年：";
//
@@ -102,10 +101,9 @@
//
this.cmbHYear.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbHYear.FormattingEnabled = true;
- this.cmbHYear.Location = new System.Drawing.Point(112, 10);
- this.cmbHYear.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmbHYear.Location = new System.Drawing.Point(84, 8);
this.cmbHYear.Name = "cmbHYear";
- this.cmbHYear.Size = new System.Drawing.Size(124, 23);
+ this.cmbHYear.Size = new System.Drawing.Size(94, 20);
this.cmbHYear.TabIndex = 105;
//
// cmbHPeriod
@@ -125,62 +123,55 @@
"10",
"11",
"12"});
- this.cmbHPeriod.Location = new System.Drawing.Point(359, 12);
- this.cmbHPeriod.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmbHPeriod.Location = new System.Drawing.Point(269, 10);
this.cmbHPeriod.Name = "cmbHPeriod";
- this.cmbHPeriod.Size = new System.Drawing.Size(112, 23);
+ this.cmbHPeriod.Size = new System.Drawing.Size(85, 20);
this.cmbHPeriod.TabIndex = 107;
//
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(264, 12);
- this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label2.Location = new System.Drawing.Point(198, 10);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(82, 15);
+ this.label2.Size = new System.Drawing.Size(65, 12);
this.label2.TabIndex = 106;
this.label2.Text = "会计期间：";
//
// checkadd
//
this.checkadd.AutoSize = true;
- this.checkadd.Checked = true;
- this.checkadd.CheckState = System.Windows.Forms.CheckState.Checked;
- this.checkadd.Location = new System.Drawing.Point(1447, 12);
- this.checkadd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.checkadd.Location = new System.Drawing.Point(1085, 10);
this.checkadd.Name = "checkadd";
- this.checkadd.Size = new System.Drawing.Size(59, 19);
+ this.checkadd.Size = new System.Drawing.Size(48, 16);
this.checkadd.TabIndex = 108;
this.checkadd.Text = "追加";
this.checkadd.UseVisualStyleBackColor = true;
//
// txtHSheetName
//
- this.txtHSheetName.Location = new System.Drawing.Point(1265, 11);
- this.txtHSheetName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHSheetName.Location = new System.Drawing.Point(949, 9);
this.txtHSheetName.Name = "txtHSheetName";
- this.txtHSheetName.Size = new System.Drawing.Size(132, 25);
+ this.txtHSheetName.Size = new System.Drawing.Size(100, 21);
this.txtHSheetName.TabIndex = 109;
this.txtHSheetName.Text = "Sheet1";
//
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(1203, 12);
- this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label3.Location = new System.Drawing.Point(902, 10);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(52, 15);
+ this.label3.Size = new System.Drawing.Size(41, 12);
this.label3.TabIndex = 110;
this.label3.Text = "工作簿";
//
- // Gy_StdWorkTimes_RoutingBill
+ // Gy_DataIn_StdWorkTimes
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
- this.ClientSize = new System.Drawing.Size(1544, 789);
- this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
- this.Name = "Gy_StdWorkTimes_RoutingBill";
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.ClientSize = new System.Drawing.Size(1158, 631);
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.Name = "Gy_DataIn_StdWorkTimes";
this.Text = "数据导入模块";
- this.Load += new System.EventHandler(this.Gy_StdWorkTimes_RoutingBill_Load);
+ this.Load += new System.EventHandler(this.Gy_DataIn_StdWorkTimes_Load);
this.pPic.ResumeLayout(false);
this.pPic.PerformLayout();
this.panel1.ResumeLayout(false);
diff --git "a/BaseSet/\345\257\274\345\205\245\346\250\241\346\235\277/Gy_DataIn_StdWorkTimes.cs" "b/BaseSet/\345\257\274\345\205\245\346\250\241\346\235\277/Gy_DataIn_StdWorkTimes.cs"
new file mode 100644
index 0000000..85d088f
--- /dev/null
+++ "b/BaseSet/\345\257\274\345\205\245\346\250\241\346\235\277/Gy_DataIn_StdWorkTimes.cs"
@@ -0,0 +1,294 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using Pub_Class;
+using SQLHelper;
+
+namespace BaseSet
+{
+ public partial class Gy_DataIn_StdWorkTimes : BLL.Gy_DataInTmp
+ {
+ public Gy_DataIn_StdWorkTimes()
+ {
+ InitializeComponent();
+ }
+ public int HItemIDCol = 0;
+ public int HMaterNumberCol = 0; //物料代码
+ public int HProcNumberCol = 0; //工序代码
+ public int HStdWorkTimesCol = 0; //标准工时
+ public int HUpperlimitCol = 0; //上限比例
+ public int HLowerlimitCol = 0; //下限比例
+ public int HStdPieceCol = 0; //标准计件
+ public int HStdPricCol = 0; //标准计价
+ public int HUSEORGIDCol = 0; //组织ID
+ public int HMakerCol = 0; //制单人
+ public int HMakeDateCol = 0; //制单日期
+ //
+ public DAL.ClsGy_Process_View oProcHlp = new DAL.ClsGy_Process_View();
+ public DAL.ClsGy_StdWorkTimes_Ctl BillNew = new DAL.ClsGy_StdWorkTimes_Ctl();
+ DAL.ClsIF_Material_View oMaterHlp = new DAL.ClsIF_Material_View();
+ int c = 0;
+
+ public override bool OpenExcelData()
+ {
+ base.sSheetName = txtHSheetName.Text;
+ return base.OpenExcelData();
+ }
+
+ /// <summary>
+ /// 初始化界面
+ /// </summary>
+ public override void initData()
+ {
+ base.initData();
+ base.sSheetName = "标准工时导入";
+ base.ModRightName = "Gy_DataIn_StdWorkTimes";
+ base.ModRightNameCheck = base.ModRightName + base.ModRightNameCheck;
+ base.ModRightNameClose = base.ModRightName + base.ModRightNameClose;
+ base.ModRightNameDelete = base.ModRightName + base.ModRightNameDelete;
+ base.ModRightNameEdit = base.ModRightName + base.ModRightNameEdit;
+ base.ModRightNameMoney = base.ModRightName + base.ModRightNameMoney;
+ base.ModRightNameQty = base.ModRightName + base.ModRightNameQty;
+ base.ModCaption = "标准工时导入";
+ this.Text = base.ModCaption;
+ lblCaption.Text = base.ModCaption;
+ //
+ DBUtility.Gy_BaseFun.SetComboxYear(cmbHYear);
+ DBUtility.Gy_BaseFun.SetComboxPeriod(cmbHPeriod);
+ }
+
+ public override void Sub_DataIn()
+ {
+ HStdWorkTimesCol = DBUtility.Gy_BaseFun.Fun_GetCol("标准工时", grdMain);
+ HProcNumberCol = DBUtility.Gy_BaseFun.Fun_GetCol("工序代码", grdMain);
+ HMaterNumberCol = DBUtility.Gy_BaseFun.Fun_GetCol("物料代码", grdMain);
+ HUpperlimitCol = DBUtility.Gy_BaseFun.Fun_GetCol("上线比例", grdMain);
+ HLowerlimitCol = DBUtility.Gy_BaseFun.Fun_GetCol("下线比例", grdMain);
+ HStdPieceCol = DBUtility.Gy_BaseFun.Fun_GetCol("标准计件", grdMain);
+ HStdPricCol = DBUtility.Gy_BaseFun.Fun_GetCol("标准计价", grdMain);
+
+ //判断导入文档中是否存在以下标题列
+ if (HStdWorkTimesCol == -1)
+ {
+ MessageBox.Show("没有找到【标准工时】的标题", "提示");
+ return;
+ }
+ if (HProcNumberCol == -1)
+ {
+ MessageBox.Show("没有找到【工序代码】的标题", "提示");
+ return;
+ }
+ if (HMaterNumberCol == -1)
+ {
+ MessageBox.Show("没有找到【物料代码】的标题", "提示");
+ return;
+ }
+ if (HUpperlimitCol == -1)
+ {
+ MessageBox.Show("没有找到【上线比例】的标题", "提示");
+ return;
+ }
+ if (HLowerlimitCol == -1)
+ {
+ MessageBox.Show("没有找到【下线比例】的标题", "提示");
+ return;
+ }
+ if (HStdPieceCol == -1)
+ {
+ MessageBox.Show("没有找到【标准计件】的标题", "提示");
+ return;
+ }
+ if (HStdPricCol == -1)
+ {
+ MessageBox.Show("没有找到【标准计价】的标题", "提示");
+ return;
+ }
+ //导入前数据是否合理判断
+ if (!Checkdata())
+ {
+ return;
+ }
+
+ for (int i = 0; i <= grdMain.Rows.Count - 1; i++)
+ {
+ //写入类
+ if (WriteClass(i))
+ {
+ bool b = false;
+ //保存记录
+ b = BillNew.AddNew();
+ if (b == false) return;
+ c++;
+ }
+ }
+ MessageBox.Show("导入完毕:共" + c.ToString() + "条数据！");
+ grdMain.DataSource = null;
+ c = 0;
+ }
+
+ //写入类 从控件
+ private bool WriteClass(int row)
+ {
+ Model.ClsGy_StdWorkTimes_Model oSub = new Model.ClsGy_StdWorkTimes_Model();
+ BillNew.DetailColl.Clear();
+ string sHMaterNumber = "";
+ string sHProcNumber = "";
+ //
+ sHMaterNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[HMaterNumberCol].Value);
+ sHProcNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[HProcNumberCol].Value);
+
+ //写入信息
+ //得到物料内码
+ if (oMaterHlp.GetInfoByNumber(sHMaterNumber))
+ {
+ oSub.HMaterID = oMaterHlp.omodel.HItemID;
+ }
+ //得到工序内码
+ if (oProcHlp.GetInfoByNumber(sHProcNumber))
+ {
+ oSub.HProcID = oProcHlp.omodel.HItemID;
+ }
+ oSub.HRemark = "";
+ oSub.HStdWorkTimes = DBUtility.ClsPub.isDoule(grdMain.Rows[row].Cells[HStdWorkTimesCol].Value);
+ oSub.HUpperlimit = DBUtility.ClsPub.isDoule(grdMain.Rows[row].Cells[HUpperlimitCol].Value);
+ oSub.HLowerlimit = DBUtility.ClsPub.isDoule(grdMain.Rows[row].Cells[HLowerlimitCol].Value);
+ oSub.HStdPiece = DBUtility.ClsPub.isDoule(grdMain.Rows[row].Cells[HStdPieceCol].Value);
+ oSub.HStdPric = DBUtility.ClsPub.isDoule(grdMain.Rows[row].Cells[HStdPricCol].Value);
+ oSub.HUSEORGID = DBUtility.ClsPub.HOrgID;
+ oSub.HMaker = DBUtility.ClsPub.CurUserName;
+ oSub.HMakeDate = DateTime.Today.ToShortDateString();
+ BillNew.DetailColl.Add(oSub);
+
+ //非追加模式，导入前根据物料ID、工序ID查找删除对应记录
+ if (checkadd.Checked == false)
+ {
+ BillNew.DeleteByMaterIDAndHProcID(oSub.HMaterID, oSub.HProcID);
+ }
+ return true;
+ }
+
+ //检查导入数据是否合理
+ private bool Checkdata()
+ {
+ bool b = false;
+ string sErrMsg = "";
+ string sMsg = "";
+ for (int i = 0; i <= grdMain.Rows.Count - 1; i++)
+ {
+ string sHMaterNumber = "";
+ string sHProcNumber = "";
+ double sHStdWorkTimes = 0;
+ double sHUpperlimit = 0;
+ double sHLowerlimit = 0;
+ double sHStdPiece = 0;
+ double sHStdPric = 0;
+ //
+ sHMaterNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HMaterNumberCol].Value);
+ sHProcNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HProcNumberCol].Value);
+ sHStdWorkTimes = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HStdWorkTimesCol].Value);
+ sHUpperlimit = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HUpperlimitCol].Value);
+ sHLowerlimit = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HLowerlimitCol].Value);
+ sHStdPiece = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HStdPieceCol].Value);
+ sHStdPric = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HStdPricCol].Value);
+ //
+ //审核代码是否合理
+ if (!DBUtility.ClsPub.AllowNumber(sHMaterNumber))
+ {
+ sErrMsg = sErrMsg + "第" + (i + 1).ToString() + "行,物料代码中不能出现连续‘.’并且首位末位不能为‘.’！\r\n";
+ b = true;
+ }
+ if (!DBUtility.ClsPub.AllowNumber(sHProcNumber))
+ {
+ sErrMsg = sErrMsg + "第" + (i + 1).ToString() + "行,工序代码中不能出现连续‘.’并且首位末位不能为‘.’！\r\n";
+ b = true;
+ }
+
+ //判断所导入数据是否正确
+ if (sHStdWorkTimes<=0)
+ {
+ sErrMsg = sErrMsg + "第" + (i + 1).ToString() + "行,标准工时不能小于或等于0！\r\n";
+ b = true;
+ }
+ if (sHUpperlimit < 0)
+ {
+ sErrMsg = sErrMsg + "第" + (i + 1).ToString() + "行,上限比例不能小于0！\r\n";
+ b = true;
+ }
+ if (sHLowerlimit < 0)
+ {
+ sErrMsg = sErrMsg + "第" + (i + 1).ToString() + "行,下限比例不能小于0！\r\n";
+ b = true;
+ }
+ if (sHStdPiece < 0)
+ {
+ sErrMsg = sErrMsg + "第" + (i + 1).ToString() + "行,标准计件不能小于0！\r\n";
+ b = true;
+ }
+ if (sHStdPric < 0)
+ {
+ sErrMsg = sErrMsg + "第" + (i + 1).ToString() + "行,标准计价不能小于0！\r\n";
+ b = true;
+ }
+
+ if (sHMaterNumber == "")
+ {
+ sErrMsg = sErrMsg + "第" + (i + 1).ToString() + "行,物料代码不能为空！\r\n";
+ b = true;
+ }
+ else
+ {
+ //得到物料内码
+ if (!oMaterHlp.GetInfoByNumber(sHMaterNumber))
+ {
+ sMsg = "[" + sHMaterNumber + "]物料不存在";
+ if (sErrMsg.Contains(sMsg) == false)
+ {
+ sErrMsg = sErrMsg + "[" + sHMaterNumber + "]物料不存在\r\n";
+ }
+ b = true;
+ }
+ }
+
+ if (sHProcNumber == "")
+ {
+ sErrMsg = sErrMsg + "第" + (i + 1).ToString() + "行,工序代码不能为空！\r\n";
+ b = true;
+ }
+ else
+ {
+ //得到工序内码
+ if (!oProcHlp.GetInfoByNumber(sHProcNumber))
+ {
+ sMsg = "[" + sHProcNumber + "]工序不存在";
+ if (sErrMsg.Contains(sMsg) == false)
+ {
+ sErrMsg = sErrMsg + "[" + sHProcNumber + "]工序不存在\r\n";
+ }
+ b = true;
+ }
+ }
+ }
+ if (b == true)
+ {
+ Pub_Control.ErrMsgBox oMsgbox = new Pub_Control.ErrMsgBox();
+ oMsgbox.txtHErrMsg.Text = sErrMsg;
+ oMsgbox.ShowDialog();
+ return false;
+ }
+ else
+ {
+ return true;
+ }
+ }
+
+ private void Gy_DataIn_StdWorkTimes_Load(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
+
diff --git "a/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_StdWorkTimes_RoutingBill.resx" "b/BaseSet/\345\257\274\345\205\245\346\250\241\346\235\277/Gy_DataIn_StdWorkTimes.resx"
similarity index 100%
rename from "PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_StdWorkTimes_RoutingBill.resx"
rename to "BaseSet/\345\257\274\345\205\245\346\250\241\346\235\277/Gy_DataIn_StdWorkTimes.resx"
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_StdWorkTimes_Ctl.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_StdWorkTimes_Ctl.cs"
index 42260f2..30aa5ff 100644
--- "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_StdWorkTimes_Ctl.cs"
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_StdWorkTimes_Ctl.cs"
@@ -146,6 +146,20 @@
}
}
+ //鏍规嵁鐗╂枡ID銆佸伐搴廔D 鍒犻櫎 鏍囧噯宸ユ椂
+ public bool DeleteByMaterIDAndHProcID(Int64 HMaterID, Int64 HProcID)
+ {
+ try
+ {
+ oCn.RunProc("Delete from Gy_StdWorkTimes where HMaterID=" + HMaterID.ToString() + " and HProcID=" + HProcID.ToString());
+ return true;
+ }
+ catch (Exception e)
+ {
+ return false;
+ }
+ }
+
public ClsGy_StdWorkTimes_Ctl()
{
MvarItemKey = "Gy_StdWorkTimes";
diff --git a/LMES/ClsShowMod.cs b/LMES/ClsShowMod.cs
index 3c10a04..12493be 100644
--- a/LMES/ClsShowMod.cs
+++ b/LMES/ClsShowMod.cs
@@ -25,7 +25,6 @@
using Kanban;
using Demo;
using ProM.委外管理;
-using BaseSet.公用资料.其他基础资料;
namespace LMES
{
@@ -8086,11 +8085,11 @@
oGy_DataIn_ProcessPrice.Show();
oMainForm.AddTabPage(oGy_DataIn_ProcessPrice);
break;
- case "gy_stdworktimes_routingbill":
- Gy_StdWorkTimes_RoutingBill oGy_StdWorkTimes_RoutingBill = new Gy_StdWorkTimes_RoutingBill();
- oGy_StdWorkTimes_RoutingBill.MdiParent = oMain;
- oGy_StdWorkTimes_RoutingBill.Show();
- oMainForm.AddTabPage(oGy_StdWorkTimes_RoutingBill);
+ case "gy_datain_stdworktimes":
+ Gy_DataIn_StdWorkTimes oGy_DataIn_StdWorkTimes = new Gy_DataIn_StdWorkTimes();
+ oGy_DataIn_StdWorkTimes.MdiParent = oMain;
+ oGy_DataIn_StdWorkTimes.Show();
+ oMainForm.AddTabPage(oGy_DataIn_StdWorkTimes);
break;
case "gy_datain_process":
Gy_DataIn_Process oGy_DataIn_Process = new Gy_DataIn_Process();
diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_StdWorkTimes_Model.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_StdWorkTimes_Model.cs"
index 1ff276e..a965b48 100644
--- "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_StdWorkTimes_Model.cs"
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_StdWorkTimes_Model.cs"
@@ -24,7 +24,7 @@
public double HStdWorkTimes; //鏍囧噯宸ユ椂
public double HUpperlimit; //涓婇檺姣斾緥
public double HLowerlimit; //涓嬮檺姣斾緥
- public double HStdPiece; //涓婇檺姣斾緥
- public double HStdPric; //涓嬮檺姣斾緥
+ public double HStdPiece; //鏍囧噯璁′欢
+ public double HStdPric; //鏍囧噯璁′环
}
}
diff --git a/PlanM/PlanM.csproj b/PlanM/PlanM.csproj
index 0bf7d26..026fa9a 100644
--- a/PlanM/PlanM.csproj
+++ b/PlanM/PlanM.csproj
@@ -183,12 +183,6 @@
<Compile Include="鏁版嵁瀵煎叆\Gy_DataIn_RoutingBill.designer.cs">
<DependentUpon>Gy_DataIn_RoutingBill.cs</DependentUpon>
</Compile>
- <Compile Include="鏁版嵁瀵煎叆\Gy_StdWorkTimes_RoutingBill.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="鏁版嵁瀵煎叆\Gy_StdWorkTimes_RoutingBill.designer.cs">
- <DependentUpon>Gy_StdWorkTimes_RoutingBill.cs</DependentUpon>
- </Compile>
<Compile Include="鏁版嵁瀵煎叆\Gy_DataIn_RoutingBill_New.cs">
<SubType>Form</SubType>
</Compile>
@@ -285,10 +279,6 @@
</EmbeddedResource>
<EmbeddedResource Include="鏁版嵁瀵煎叆\Gy_DataIn_RoutingBill.resx">
<DependentUpon>Gy_DataIn_RoutingBill.cs</DependentUpon>
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <EmbeddedResource Include="鏁版嵁瀵煎叆\Gy_StdWorkTimes_RoutingBill.resx">
- <DependentUpon>Gy_StdWorkTimes_RoutingBill.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="鏁版嵁瀵煎叆\Gy_DataIn_RoutingBill_New.resx">
diff --git "a/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_StdWorkTimes_RoutingBill.cs" "b/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_StdWorkTimes_RoutingBill.cs"
deleted file mode 100644
index 095e1cd..0000000
--- "a/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_StdWorkTimes_RoutingBill.cs"
+++ /dev/null
@@ -1,230 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
-using Pub_Class;
-using SQLHelper;
-
-namespace PlanM
-{
- public partial class Gy_StdWorkTimes_RoutingBill : BLL.Gy_DataInTmp
- {
- public Gy_StdWorkTimes_RoutingBill()
- {
- InitializeComponent();
- }
- public int HItemID =0;
- public int HMaker = 0; //制单人
- public int HMakeDate = 0; //制单日期
- public int HChecker = 0; //审核人
- public int HCheckDate = 0; //审核日期
- public int HStopflag = 0;
- public int HRemark = 0;
- public int HUSEORGName = 0; //组织ID
- public int HProcName = 0; //
- public int HMaterName = 0; //物料ID
- public int HProcNum = 0; //
- public int HMaterNum = 0; //物料ID
- public int HStdWorkTimes = 0; //标准工时
- public int HUpperlimit = 0; //上限比例
- public int HLowerlimit = 0; //下限比例
- public int HStdPiece = 0; //上限比例
- public int HStdPric = 0; //下限比例
- //
- public const int HBeginRow = 2; //有效数据，开始行数
-
-
- //
- public DAL.ClsGy_Process_View oProcHlp = new DAL.ClsGy_Process_View();
- public DAL.ClsGy_StdWorkTimes_Ctl BillNew = new DAL.ClsGy_StdWorkTimes_Ctl();
- DAL.ClsIF_Material_View oMaterHlp = new DAL.ClsIF_Material_View();
-
-
-
- public override bool OpenExcelData()
- {
- base.sSheetName = txtHSheetName.Text;
- return base.OpenExcelData();
- }
-
-
- /// <summary>
- /// 初始化界面
- /// </summary>
- public override void initData()
- {
- base.initData();
- base.sSheetName = "标准工时";
- base.ModRightName = "Gy_StdWorkTimes_RoutingBill";
- base.ModRightNameCheck = base.ModRightName + base.ModRightNameCheck;
- base.ModRightNameClose = base.ModRightName + base.ModRightNameClose;
- base.ModRightNameDelete = base.ModRightName + base.ModRightNameDelete;
- base.ModRightNameEdit = base.ModRightName + base.ModRightNameEdit;
- base.ModRightNameMoney = base.ModRightName + base.ModRightNameMoney;
- base.ModRightNameQty = base.ModRightName + base.ModRightNameQty;
- base.ModCaption = "标准工时";
- this.Text = base.ModCaption;
- lblCaption.Text = base.ModCaption;
- //
- DBUtility.Gy_BaseFun.SetComboxYear(cmbHYear);
- DBUtility.Gy_BaseFun.SetComboxPeriod(cmbHPeriod);
- //
- }
-
- public override void Sub_DataIn()
- {
- int sHStdWorkTimesCol = DBUtility.Gy_BaseFun.Fun_GetCol("标准工时", grdMain);
- int sHProcNumCol = DBUtility.Gy_BaseFun.Fun_GetCol("工序代码", grdMain);
- int sHProcNameCol = DBUtility.Gy_BaseFun.Fun_GetCol("工序", grdMain);
- int sHMaterNumCol = DBUtility.Gy_BaseFun.Fun_GetCol("物料代码", grdMain);
- int sHMaterNameCol = DBUtility.Gy_BaseFun.Fun_GetCol("物料", grdMain);
- int sHUpperlimitCol = DBUtility.Gy_BaseFun.Fun_GetCol("上线比例", grdMain);
- int sHLowerlimitCol = DBUtility.Gy_BaseFun.Fun_GetCol("下线比例", grdMain);
- int sHStdPieceCol = DBUtility.Gy_BaseFun.Fun_GetCol("标准计件", grdMain);
- int sHStdPricCol = DBUtility.Gy_BaseFun.Fun_GetCol("标准计价", grdMain);
- int sHUSEORGNameCol = DBUtility.Gy_BaseFun.Fun_GetCol("组织", grdMain);
- int sHMakerCol = DBUtility.Gy_BaseFun.Fun_GetCol("制单人", grdMain);
- int sHMakeDateCol = DBUtility.Gy_BaseFun.Fun_GetCol("制单日期", grdMain);
-
- for (int i = 0; i <= grdMain.Rows.Count - 1; i++)
- {
- if (DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[sHMaterNumCol].Value) != "" && DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[sHProcNumCol].Value) != ""&& DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[sHStdWorkTimesCol].Value) != "")
- {
- if (DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[sHStdWorkTimesCol].Value)>0&& DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[sHUpperlimitCol].Value) > 0&& DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[sHLowerlimitCol].Value) > 0)
- {
- //写入类
- if (WriteClass(i))
- {
- //保存记录
- if (!BillNew.AddNew())
- {
- MessageBox.Show("导入失败!原因:" + DBUtility.ClsPub.sExeReturnInfo, "提示");
- return;
- }
- }
- }
- else
- {
- MessageBox.Show("第" + (i + 1) + "行,标准工时、上限比例和下限比例不能小于0", "提示");
- return;
- }
- }
- else
- {
- MessageBox.Show("第"+(i+1)+"行,工序代码、物料代码和标准工时不能为空!原因:" + DBUtility.ClsPub.sExeReturnInfo, "提示");
- return;
- }
- }
- MessageBox.Show("导入完毕");
- grdMain.DataSource = null;
- }
-
- //写入类 从控件
- private bool WriteClass(int row)
- {
- BillNew.DetailColl.Clear();
- string sMaterNumber = "";
- string sMaterName = "";
- string sProcNumber = "";
- string sProcName = "";
- double sStdWorkTimes = 0;
- double sUpperlimit = 0;
- double sLowerlimit = 0;
- double sStdPiece = 0;
- double sStdPric= 0;
- int sUSEORGName = 0;
- DateTime sHMakeDate = DateTime.Today.Date;
- string sHMaker = DBUtility.ClsPub.CurUserName;
-
- int sHStdWorkTimesCol = DBUtility.Gy_BaseFun.Fun_GetCol("标准工时", grdMain);
- int sHProcNumCol = DBUtility.Gy_BaseFun.Fun_GetCol("工序代码", grdMain);
- int sHProcNameCol = DBUtility.Gy_BaseFun.Fun_GetCol("工序", grdMain);
- int sHMaterNumCol = DBUtility.Gy_BaseFun.Fun_GetCol("物料代码", grdMain);
- int sHMaterNameCol = DBUtility.Gy_BaseFun.Fun_GetCol("物料", grdMain);
- int sHUpperlimitCol = DBUtility.Gy_BaseFun.Fun_GetCol("上线比例", grdMain);
- int sHLowerlimitCol = DBUtility.Gy_BaseFun.Fun_GetCol("下线比例", grdMain);
- int sHStdPieceCol = DBUtility.Gy_BaseFun.Fun_GetCol("标准计件", grdMain);
- int sHStdPricCol = DBUtility.Gy_BaseFun.Fun_GetCol("标准计价", grdMain);
- int sHUSEORGNameCol = DBUtility.Gy_BaseFun.Fun_GetCol("组织", grdMain);
- int sHMakerCol = DBUtility.Gy_BaseFun.Fun_GetCol("制单人", grdMain);
- int sHMakeDateCol = DBUtility.Gy_BaseFun.Fun_GetCol("制单日期", grdMain);
- //
- sMaterNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[sHMaterNumCol].Value);
- //sMaterName = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[sHMaterNameCol].Value);
- sProcNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[sHProcNumCol].Value);
- //sProcName = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[sHProcNameCol].Value);
- sStdWorkTimes = DBUtility.ClsPub.isDoule(grdMain.Rows[row].Cells[sHStdWorkTimesCol].Value);
- sUpperlimit = DBUtility.ClsPub.isDoule(grdMain.Rows[row].Cells[sHUpperlimitCol].Value);
- sLowerlimit = DBUtility.ClsPub.isDoule(grdMain.Rows[row].Cells[sHLowerlimitCol].Value);
- sStdPiece = DBUtility.ClsPub.isDoule(grdMain.Rows[row].Cells[sHStdPieceCol].Value);
- sStdPric = DBUtility.ClsPub.isDoule(grdMain.Rows[row].Cells[sHStdPricCol].Value);
- //sUSEORGName = DBUtility.ClsPub.isInt(grdMain.Rows[row].Cells[sHUSEORGNameCol].Value);
- //sHMakeDate = DBUtility.ClsPub.isDate(grdMain.Rows[row].Cells[sHMakeDateCol].Value);
- //sHMaker = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[sHMakerCol].Value);
-
- //判断是否允许 保存
-
- //审核代码是否合理
- if (!DBUtility.ClsPub.AllowNumber(sMaterNumber))
- {
- MessageBox.Show("产品代码中不能出现连续‘.’并且首位末位不能为‘.’！", "提示");
- return false;
- }
- if (!DBUtility.ClsPub.AllowNumber(sProcNumber))
- {
- MessageBox.Show("工序代码中不能出现连续‘.’并且首位末位不能为‘.’！", "提示");
- return false;
- }
-
- Model.ClsGy_StdWorkTimes_Model oSub = new Model.ClsGy_StdWorkTimes_Model();
- //得到物料内码
- if (oMaterHlp.GetInfoByNumber(sMaterNumber))
- {
- oSub.HMaterID = oMaterHlp.omodel.HItemID;
- }
- else
- {
- oSub.HMaterID = 0;
- MessageBox.Show("第" + row.ToString() + "行," + sMaterNumber + "没有找到对应的物料！");
- return false;
- }
- //得到工序内码
- if (oProcHlp.GetInfoByNumber(sProcNumber))
- {
- oSub.HProcID = oProcHlp.omodel.HItemID;
- }
- else
- {
- oSub.HProcID = 0;
- MessageBox.Show("第" + row.ToString() + "行," + sProcNumber + "没有找到对应的工序！");
- return false;
- }
-
- //写入信息
-
- oSub.HRemark = "";
- oSub.HStdWorkTimes = sStdWorkTimes;
- oSub.HUpperlimit = sUpperlimit;
- oSub.HLowerlimit = sLowerlimit;
- oSub.HStdPiece = sStdPiece;
- oSub.HStdPric = sStdPric;
- oSub.HUSEORGID = DBUtility.ClsPub.HOrgID;
- oSub.HMaker = DBUtility.ClsPub.CurUserName;
- oSub.HMakeDate = DateTime.Today.ToShortDateString();
- BillNew.DetailColl.Add(oSub);
- //oProc.oModel.HBillSubType = DBUtility.ClsPub.isStrNull(txtHBillSubType.Text);
-
- return true;
- }
-
-
- private void Gy_StdWorkTimes_RoutingBill_Load(object sender, EventArgs e)
- {
-
- }
- }
-}
-
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs"
new file mode 100644
index 0000000..97763d2
--- /dev/null
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs"
@@ -0,0 +1,368 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Linq;
+using System.Web;
+using System.Web.Http;
+using System.Web.Script.Serialization;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�
+{
+ public class JIT_DayPlanPlatFormImportController : ApiController
+ {
+ private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+ public WebServer webserver = new WebServer();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ public static string BillType = "4610";
+ Sc_WorkBillSortBillMain omdelMian = new Sc_WorkBillSortBillMain();
+
+ #region 鐢熶骇鏃ヨ鍒� 鏂囦欢涓婁紶
+ [Route("JIT_DayPlanPlatFormImport/JIT_DayPlanPlatFormImport_DR")]
+ [HttpPost]
+ public object JIT_DayPlanPlatFormImport_DR()
+ {
+ try
+ {
+ //鑾峰彇鏂囦欢鍚嶇О
+ var file = HttpContext.Current.Request.Files[0];
+ //鑾峰彇鏂囦欢鐗╃悊璺緞
+ string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
+ //淇濆瓨鏂囦欢
+ file.SaveAs(ExcelPath);
+
+ NpoiHelper np = new NpoiHelper();
+ DataSet ExcelDs = np.ReadExcel(ExcelPath, 1);
+
+ //鍒犻櫎鏂囦欢
+ File.Delete(ExcelPath);
+
+ //鍒涘缓涓存椂琛�
+ DataTable tb2 = new DataTable("dt2");
+ DataTable tb3 = new DataTable("dt3");
+
+ //娣诲姞鍒楀悕
+ for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
+ {
+ tb2.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
+ }
+ //妯℃澘缂哄皯鍒� 浣嗛渶瑕佷粠鏁版嵁搴撲腑鏌ヨ鍑烘潵鏄剧ず鍦ㄩ〉闈㈢殑瀛楁
+ tb2.Columns.Add("hmainid", typeof(Int32));
+ tb2.Columns.Add("HMaterID", typeof(Int32));//鐗╂枡ID
+ tb2.Columns.Add("鍗曟嵁鍙�", typeof(string));
+ tb2.Columns.Add("HWorkShopID", typeof(Int32));//鐢熶骇杞﹂棿
+ tb2.Columns.Add("HEmpID", typeof(Int32));//鑱屽憳
+ tb2.Columns.Add("HUnitID", typeof(Int32));//璁￠噺鍗曚綅
+ tb2.Columns.Add("HSourceID", typeof(Int32));//鐢熶骇璧勬簮id
+
+ //娣诲姞鏁版嵁
+ for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
+ {
+ DataRow row = tb2.NewRow();
+ for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
+ {
+ row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
+ }
+ tb2.Rows.Add(row);
+ }
+
+ ExcelDs.Tables.Add(tb2);
+
+ var error = "";
+ var ErrorResult = "";
+
+ //鏌ヨ鐢熶骇璁㈠崟琛ㄥ垽鏂湁娌℃湁鐢熶骇璁㈠崟淇℃伅
+ for (int i = 0; i < tb2.Rows.Count; i++)
+ {
+ if (tb2.Rows[i]["缁勭粐缂栫爜*"].ToString() == "")
+ error += "缁勭粐缂栫爜涓嶈兘涓虹┖;";
+ if (tb2.Rows[i]["鐢熶骇璁㈠崟鍙�*"].ToString() == "")
+ error += "鐢熶骇璁㈠崟鍙蜂笉鑳戒负绌�;\n";
+ if (tb2.Rows[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿*"].ToString() == "")
+ error += "鐢熶骇璁㈠崟鏄庣粏琛屽彿涓嶈兘涓虹┖;";
+ if (tb2.Rows[i]["鐢熶骇杞﹂棿缂栫爜*"].ToString() == "")
+ error += "鐢熶骇杞﹂棿缂栫爜涓嶈兘涓虹┖;";
+ if (tb2.Rows[i]["鐢熶骇璧勬簮缂栫爜*"].ToString() == "")
+ error += "鐢熶骇璧勬簮缂栫爜涓嶈兘涓虹┖;";
+ if (tb2.Rows[i]["鐗╂枡缂栫爜*"].ToString() == "")
+ error += "鐗╂枡缂栫爜涓嶈兘涓虹┖;";
+
+ if (error.Length > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = ErrorResult += $"Excel妯℃澘瀛樺湪閿欒锛岃鏁皗i + 1}:{error}\r\n"; ;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ string sql1 = string.Format("select * from h_v_IF_ICMOBillList where 鍗曟嵁鍙�='{0}' and 鐢熶骇杞﹂棿浠ｇ爜='{1}' and 浜у搧浠ｇ爜='{2}' and 鏄庣粏琛屽彿={3} ",
+ tb2.Rows[i]["鐢熶骇璁㈠崟鍙�*"].ToString(), tb2.Rows[i]["鐢熶骇杞﹂棿缂栫爜*"].ToString(), tb2.Rows[i]["鐗╂枡缂栫爜*"].ToString(), tb2.Rows[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿*"].ToString());
+ ds = oCN.RunProcReturn(sql1, "h_v_IF_ICMOBillList");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ error += $"娌℃湁鐢熶骇璁㈠崟淇℃伅锛岀敓浜ц鍗曞彿:{ tb2.Rows[i]["鐢熶骇璁㈠崟鍙�*"].ToString()},鐢熶骇杞﹂棿缂栫爜:{tb2.Rows[i]["鐢熶骇杞﹂棿缂栫爜*"].ToString()}" +
+ $",鐢熶骇璁㈠崟鏄庣粏琛屽彿:{ tb2.Rows[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿*"].ToString()},鐗╂枡缂栫爜:{ tb2.Rows[i]["鐗╂枡缂栫爜*"].ToString()}";
+
+ if (error.Length > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = ErrorResult += $"Excel妯℃澘瀛樺湪閿欒锛岃鏁皗i + 1}:{error}\r\n"; ;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ tb2.Rows[i]["HMaterID"] = ds.Tables[0].Rows[0]["HMaterID"].ToString();
+ tb2.Rows[i]["鐗╂枡鍚嶇О"] = ds.Tables[0].Rows[0]["浜у搧鍚嶇О"].ToString();
+ tb2.Rows[i]["瑙勬牸鍨嬪彿"] = ds.Tables[0].Rows[0]["瑙勬牸鍨嬪彿"].ToString();
+ tb2.Rows[i]["HWorkShopID"] = ds.Tables[0].Rows[0]["HDeptID"].ToString();
+ }
+
+ ds = oCN.RunProcReturn("select * from h_v_JIT_Sc_WorkBillSortBillList " +
+ $"where 鐢熶骇璁㈠崟鍙�='{tb2.Rows[i]["鐢熶骇璁㈠崟鍙�*"].ToString()}' and 鐢熶骇璁㈠崟鏄庣粏琛屽彿='{tb2.Rows[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿*"].ToString()}' " +
+ $"and 鐢熶骇杞﹂棿缂栫爜='{tb2.Rows[i]["鐢熶骇杞﹂棿缂栫爜*"].ToString()}' and 鐗╂枡浠ｇ爜='{tb2.Rows[i]["鐗╂枡缂栫爜*"].ToString()}' " +
+ $"and 鐢熶骇璧勬簮缂栫爜='{tb2.Rows[i]["鐢熶骇璧勬簮缂栫爜*"].ToString()}' ", "h_v_JIT_Sc_WorkBillSortBillList");
+ //缁勭粐缂栫爜='{tb2.Rows[i]["缁勭粐缂栫爜*"].ToString()}' and
+ //and 鐢熶骇璧勬簮缂栫爜='{tb2.Rows[i]["鐢熶骇璧勬簮缂栫爜*"].ToString()}'
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ tb2.Rows[i]["hmainid"] = ds.Tables[0].Rows[0]["hmainid"].ToString();
+ tb2.Rows[i]["鍗曟嵁鍙�"] = ds.Tables[0].Rows[0]["鍗曟嵁鍙�"].ToString();
+ tb2.Rows[i]["浼樺厛绾�"] = ds.Tables[0].Rows[0]["浼樺厛绾�"].ToString();
+ tb2.Rows[i]["HSourceID"] = ds.Tables[0].Rows[0]["HSourceID"].ToString();
+ tb2.Rows[i]["HEmpID"] = ds.Tables[0].Rows[0]["HEmpID"].ToString();
+ tb2.Rows[i]["鍛樺伐缂栫爜"] = ds.Tables[0].Rows[0]["鑱屽憳浠ｇ爜"].ToString();
+ tb2.Rows[i]["HUnitID"] = ds.Tables[0].Rows[0]["HUnitID"].ToString();
+ tb2.Rows[i]["璁￠噺鍗曚綅"] = ds.Tables[0].Rows[0]["璁￠噺鍗曚綅"].ToString();
+ tb2.Rows[i]["鎵规鍙�"] = ds.Tables[0].Rows[0]["鎵规"].ToString();
+ tb2.Rows[i]["閿�鍞鍗曟暟閲�"] = ds.Tables[0].Rows[0]["閿�鍞鍗曟暟閲�"].ToString();
+ tb2.Rows[i]["鐢熶骇璁㈠崟鏁伴噺"] = ds.Tables[0].Rows[0]["璁㈠崟闇�姹傛暟閲�"].ToString();
+ tb2.Rows[i]["鎬婚綈濂楁暟閲�"] = ds.Tables[0].Rows[0]["榻愬鏁伴噺"].ToString();
+ }
+ else
+ {
+ //鍛樺伐
+ ds = oCN.RunProcReturn($"select * from Gy_Employee where HNumber='{tb2.Rows[i]["鍛樺伐缂栫爜"].ToString()}'", "Gy_Employee");
+ if (ds.Tables[0].Rows.Count > 0)
+ tb2.Rows[i]["鍛樺伐缂栫爜"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
+
+ //璁￠噺鍗曚綅
+ ds = oCN.RunProcReturn($"select * from Gy_Unit where HNumber='{tb2.Rows[i]["璁￠噺鍗曚綅"].ToString()}'", "Gy_Unit");
+ if (ds.Tables[0].Rows.Count > 0)
+ tb2.Rows[i]["HUnitID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
+
+ //鐢熶骇璧勬簮
+ ds = oCN.RunProcReturn($"select * from Gy_Source where HNumber='{tb2.Rows[i]["鐢熶骇璧勬簮缂栫爜*"].ToString()}'", "Gy_Source");
+ if (ds.Tables[0].Rows.Count > 0)
+ tb2.Rows[i]["HSourceID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = ErrorResult;
+ objJsonResult.data = tb2;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐢熶骇鏃ヨ鍒� 瀵煎叆(淇濆瓨)
+ [Route("JIT_DayPlanPlatFormImport/JIT_DayPlanPlatFormImport_btnSave")]
+ [HttpPost]
+ public object JIT_DayPlanPlatFormImport_btnSave([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ oCN.BeginTran();
+ //淇濆瓨涓昏〃
+ objJsonResult = AddBillMain(msg1);
+ if (objJsonResult.code == "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ public json AddBillMain(string msg1)
+ {
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+ string user = sArray[2].ToString();
+
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Sc_WorkBillSortBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //琛ㄥご瀛楁
+ omdelMian = Newtonsoft.Json.JsonConvert.DeserializeObject<Sc_WorkBillSortBillMain>(msg2);
+
+ //JSON搴忓垪鍖栬浆鎹㈠瓧鍏搁泦鍚�
+ List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();
+ List<object> jb = JsonConvert.DeserializeObject<List<object>>(msg3);
+ foreach (JObject item in jb)
+ {
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ foreach (var itm in item.Properties())
+ {
+ dic.Add(itm.Name, itm.Value.ToString());
+ }
+ list.Add(dic);
+ }
+
+
+ int TrueCount = 0, SumCount = 0;
+
+ for (int i = 0; i < list.Count; i++)
+ {
+ long HInterID = 0;
+ var HBillNo = "";
+ if (list[i]["鍗曟嵁鍙�"].ToString() == "" && list[i]["hmainid"].ToString() == "")
+ {
+ HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);//鑾峰緱涓�涓柊鐨勫崟鎹彿
+ HInterID = DBUtility.ClsPub.CreateBillID_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo);//鑾峰緱涓�涓柊鐨刬d
+ var HICMOBillNo = list[i]["鐢熶骇璁㈠崟鍙�*"].ToString();
+ var HICMOEntrySEQ = list[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿*"].ToString();
+ var HWorkShopID = list[i]["HWorkShopID"].ToString();
+ var HSourceID = list[i]["HSourceID"].ToString();
+ var HYX = list[i]["浼樺厛绾�"].ToString();
+ var HEmpID = list[i]["HEmpID"].ToString();
+ var HMaterID = list[i]["HMaterID"].ToString();
+ var HMaterName = list[i]["鐗╂枡鍚嶇О"].ToString();
+ var HMaterModel = list[i]["瑙勬牸鍨嬪彿"].ToString();
+ var HUnitID = list[i]["HUnitID"].ToString();
+ var HBatchNo = list[i]["鎵规鍙�"].ToString();
+ var HSeOrderBillQty = list[i]["閿�鍞鍗曟暟閲�"].ToString();
+ var HOrderNeedQty = list[i]["鐢熶骇璁㈠崟鏁伴噺"].ToString();
+ var HCompleteQty = list[i]["鎬婚綈濂楁暟閲�"].ToString();
+ var HOrderType = omdelMian.HOrderType;
+ var HDate = omdelMian.HDate;
+
+ //涓昏〃
+ oCN.RunProc("insert into Sc_WorkBillSortBillMain(HInterID,HBillNo,HYear,HPeriod,HBillType," +
+ "HBillSubType,HDate,HBillStatus,HMaker,HMakeDate,HICMOBillNo,HOrderType," +
+ "HICMOEntrySEQ,HWorkShopID,HSourceID, HYX, HEmpID," +
+ " HMaterID, HMaterName, HMaterModel, HUnitID, HBatchNo," +
+ " HSeOrderBillQty, HOrderNeedQty, HCompleteQty)values" +
+ $"({HInterID},'{HBillNo}',{DateTime.Now.Year},{DateTime.Now.Month},'{BillType}'," +
+ $"'{BillType}',GETDATE(),1,'{user}','{HDate}','{HICMOBillNo}','{HOrderType}'," +
+ $"{(HICMOEntrySEQ == "" ? 0.ToString() : HICMOEntrySEQ)},{(HWorkShopID == "" ? 0.ToString() : HWorkShopID)},{(HSourceID == "" ? 0.ToString() : HSourceID)}, {(HYX == "" ? 0.ToString() : HYX)}, {(HEmpID == "" ? 0.ToString() : HEmpID)}," +
+ $" {(HMaterID == "" ? 0.ToString() : HMaterID)}, '{HMaterName}', '{HMaterModel}', {(HUnitID == "" ? 0.ToString() : HUnitID)}, '{HBatchNo}'," +
+ $" {(HSeOrderBillQty == "" ? 0.ToString() : HSeOrderBillQty)}, {(HOrderNeedQty == "" ? 0.ToString() : HOrderNeedQty)}, {(HCompleteQty == "" ? 0.ToString() : HCompleteQty)})");
+ }
+
+ for (int j = 0; j < 30; j++)
+ {
+ if (list[i][DateTime.Now.AddDays(j).ToString("yyyy-MM-dd")].ToString() != "")
+ {
+ SumCount += 1;
+ ////淇濆瓨瀛愯〃
+ objJsonResult = AddBillSub(HInterID == 0 ? list[i]["hmainid"].ToString() : HInterID.ToString()
+ , HBillNo == "" ? list[i]["鍗曟嵁鍙�"].ToString() : HBillNo
+ , DateTime.Parse(DateTime.Now.AddDays(j).ToString("yyyy-MM-dd").ToString())
+ , int.Parse(list[i][DateTime.Now.AddDays(j).ToString("yyyy-MM-dd")].ToString()));
+
+ if (objJsonResult.count == 1)
+ {
+ TrueCount += 1;
+ }
+ }
+ }
+ }
+
+ if (TrueCount != SumCount)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ public json AddBillSub(string HInterID,string HBillNo, DateTime date, int HQTY)
+ {
+ //鑾峰彇琛ㄦ牸鏁版嵁
+ ds = oCN.RunProcReturn($"select * from h_v_JIT_Sc_WorkBillSortBillList where 鍗曟嵁鍙�='{HBillNo}'", "h_v_JIT_Sc_WorkBillSortBillList");
+
+ int count = 0;
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ //鍒ゆ柇瀛愯〃鏄惁鏈夊綋鏃ョ殑鏃ユ湡浠ュ強鏃ユ湡鎵�瀵瑰簲鐨勬暟閲�
+ for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+ {
+ if (DateTime.Parse(ds.Tables[0].Rows[i]["鏃ヨ鍒掔敓浜ф棩鏈�"].ToString()) == date)
+ {
+ oCN.RunProc($"update Sc_WorkBillSortBillSub set HMasterDate='{date}',HQty={HQTY}" +
+ $" where HInterID={HInterID} and HEntryID={ds.Tables[0].Rows[i]["hsubid"].ToString()}");
+ count += 1;
+ }
+ }
+ }
+
+ if (count != 1)
+ {
+ //鎻掑叆瀛愯〃
+ oCN.RunProc("insert into Sc_WorkBillSortBillSub(HInterID,HEntryID," +
+ "HMasterDate,HQty)" +
+ $"values({HInterID}, {(ds.Tables[0].Rows.Count + 1)}," +
+ $" '{date}', {HQTY})");
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/NpoiHelper.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/NpoiHelper.cs"
new file mode 100644
index 0000000..8f66487
--- /dev/null
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/NpoiHelper.cs"
@@ -0,0 +1,1328 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.IO;
+using NPOI.HSSF.UserModel;
+using System.Data;
+using System.Drawing;
+using NPOI.HSSF.Util;
+using NPOI.SS.UserModel;
+using NPOI.HPSF;
+using NPOI.XSSF.UserModel;
+
+namespace WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�
+{
+ /// <summary>
+ /// Excel鏂囦欢鍒癉ataSet鐨勮浆鎹㈢被
+ /// </summary>
+ public class NpoiHelper
+ {
+ #region 璇诲彇Excel鏂囦欢鍐呭杞崲涓篋ataSet
+
+ int ReadExcelEndRow = 0;
+ /// <summary>
+ /// 璇诲彇Excel鏂囦欢鍐呭杞崲涓篋ataSet,鍒楀悕渚濇涓� "c0"鈥︹�[columnlength-1]
+ /// </summary>
+ /// <param name="FileName">鏂囦欢缁濆璺緞</param>
+ /// <param name="startRow">鏁版嵁寮�濮嬭鏁�(1涓虹涓�琛�)</param>
+ /// <param name="ColumnDataType">姣忓垪鐨勬暟鎹被鍨�</param>
+ /// <returns></returns>
+ public DataSet ReadExcel(string FileName, int startRow, params NpoiDataType[] ColumnDataType)
+ {
+ string colNamePix = "F";
+ int ertime = 0;
+ int intime = 0;
+ DataSet ds = new DataSet("ds");
+ DataTable dt = new DataTable("dt");
+ DataRow dr;
+ StringBuilder sb = new StringBuilder();
+ using (FileStream stream = new FileStream(@FileName, FileMode.Open, FileAccess.Read))
+ {
+ IWorkbook workbook = WorkbookFactory.Create(stream);//浣跨敤鎺ュ彛锛岃嚜鍔ㄨ瘑鍒玡xcel2003/2007鏍煎紡
+ //for (int k = 0; k < 14; k++)
+ //{
+ ISheet sheet = workbook.GetSheetAt(0);//寰楀埌閲岄潰绗竴涓猻heet
+ int j;
+ IRow row;
+ #region ColumnDataType璧嬪��
+ if (ColumnDataType.Length <= 0)
+ {
+ row = sheet.GetRow(startRow - 1);//寰楀埌绗琲琛�
+ ColumnDataType = new NpoiDataType[row.LastCellNum];
+ for (int i = 0; i < row.LastCellNum; i++)
+ {
+ ICell hs = row.GetCell(i, MissingCellPolicy.CREATE_NULL_AS_BLANK);
+ ColumnDataType[i] = GetCellDataType(hs); //NpoiDataType.Blank;
+ //if (i == 6)
+ //{
+ // ColumnDataType[i] = NpoiDataType.Numeric;
+ //}
+ }
+ }
+ #endregion
+ for (j = 0; j < ColumnDataType.Length; j++)
+ {
+ Type tp = GetDataTableType(ColumnDataType[j]);
+ //if (j == 6)
+ //{
+ // tp = typeof(double);
+ //}
+ dt.Columns.Add(colNamePix + (j + 1), tp);
+ }
+
+ ReadExcelEndRow = ReadExcelEndRow == 0 ? sheet.PhysicalNumberOfRows : ReadExcelEndRow;
+ for (int i = startRow - 1; i <= ReadExcelEndRow; i++)
+ {
+ row = sheet.GetRow(i);//寰楀埌绗琲琛�
+ if (row == null) continue;
+ try
+ {
+ dr = dt.NewRow();
+
+ for (j = 0; j < ColumnDataType.Length; j++)
+ {
+ dr[colNamePix + (j + 1)] = GetCellData(ColumnDataType[j], row, j);
+ }
+ dt.Rows.Add(dr);
+ intime++;
+ }
+ catch (Exception er)
+ {
+ ertime++;
+ sb.Append(string.Format("绗瑊0}琛屽嚭閿欙細{1}\r\n", i + 1, er.Message));
+ continue;
+ }
+ }
+ ds.Tables.Add(dt);
+ //}
+ }
+ if (ds.Tables[0].Rows.Count == 0 && sb.ToString() != "") throw new Exception(sb.ToString());
+ return ds;
+ }
+ #endregion
+ #region//璇诲彇澶氫釜sheet
+ public DataSet ReadExcelSub(string FileName, int startRow, params NpoiDataType[] ColumnDataType)
+ {
+ string colNamePix = "F";
+ int ertime = 0;
+ int intime = 0;
+ DataSet ds = new DataSet("ds");
+ DataTable dt0 = new DataTable("dt0");
+ DataTable dt1 = new DataTable("dt1");
+ DataTable dt2 = new DataTable("dt2");
+ DataTable dt3 = new DataTable("dt3");
+ DataTable dt4 = new DataTable("dt4");
+ DataTable dt5 = new DataTable("dt5");
+ DataTable dt6 = new DataTable("dt6");
+ DataTable dt7 = new DataTable("dt7");
+ DataTable dt8 = new DataTable("dt8");
+ DataTable dt9 = new DataTable("dt9");
+ DataTable dt10 = new DataTable("dt10");
+ DataTable dt11 = new DataTable("dt11");
+ DataTable dt12 = new DataTable("dt12");
+ DataTable dt13 = new DataTable("dt13");
+
+
+ DataRow dr;
+ StringBuilder sb = new StringBuilder();
+ using (FileStream stream = new FileStream(@FileName, FileMode.Open, FileAccess.Read))
+ {
+
+
+ //鏍规嵁璺緞閫氳繃宸插瓨鍦ㄧ殑excel鏉ュ垱寤篐SSFWorkbook锛屽嵆鏁翠釜excel鏂囨。
+
+ HSSFWorkbook workbook = new HSSFWorkbook(stream);
+ //XSSFWorkbook workbook = new XSSFWorkbook(stream);
+ int x = workbook.NumberOfSheets;
+
+ List<string> sheetNames = new List<string>();
+
+ for (int i = 0; i < x; i++)
+ {
+
+ //sheetNames.Add(workbook.Workbook.GetSheetName(i));
+ ISheet sheet = workbook.GetSheetAt(i);
+ int j;
+ IRow row;
+ #region ColumnDataType璧嬪��
+ if (ColumnDataType.Length <= 0)
+ {
+ row = sheet.GetRow(startRow - 1);//寰楀埌绗琲琛�
+ ColumnDataType = new NpoiDataType[row.LastCellNum];
+ for (int a = 0; x < row.LastCellNum; a++)
+ {
+ ICell hs = row.GetCell(a, MissingCellPolicy.CREATE_NULL_AS_BLANK);
+ ColumnDataType[a] = GetCellDataType(hs); //NpoiDataType.Blank;
+
+ }
+ }
+ #endregion
+
+ for (j = 0; j < ColumnDataType.Length; j++)
+ {
+ Type tp = GetDataTableType(ColumnDataType[j]);//寰楀埌姣忎竴鍒楃殑绫诲瀷
+ ReadExcelEndRow = 0;
+ if (i == 0)
+ {
+ dt0.Columns.Add(colNamePix + (j + 1), tp);
+ }
+ else if (i == 1)
+ {
+ dt1.Columns.Add(colNamePix + (j + 1), tp);
+ }
+ else if (i == 2)
+ {
+ dt2.Columns.Add(colNamePix + (j + 1), tp);
+ }
+ else if (i == 3)
+ {
+ dt3.Columns.Add(colNamePix + (j + 1), tp);
+ }
+ else if (i == 4)
+ {
+ dt4.Columns.Add(colNamePix + (j + 1), tp);
+ }
+ else if (i == 5)
+ {
+ dt5.Columns.Add(colNamePix + (j + 1), tp);
+ }
+ else if (i == 6)
+ {
+ dt6.Columns.Add(colNamePix + (j + 1), tp);
+ }
+ else if (i == 7)
+ {
+ dt7.Columns.Add(colNamePix + (j + 1), tp);
+ }
+ else if (i == 8)
+ {
+ dt8.Columns.Add(colNamePix + (j + 1), tp);
+ }
+ else if (i == 9)
+ {
+ dt9.Columns.Add(colNamePix + (j + 1), tp);
+ }
+ else if (i == 10)
+ {
+ dt10.Columns.Add(colNamePix + (j + 1), tp);
+ }
+ else if (i == 11)
+ {
+ dt11.Columns.Add(colNamePix + (j + 1), tp);
+ }
+ else if (i == 12)
+ {
+ dt12.Columns.Add(colNamePix + (j + 1), tp);
+ }
+ else if (i == 13)
+ {
+ dt13.Columns.Add(colNamePix + (j + 1), tp);
+ }
+ }
+
+ ReadExcelEndRow = ReadExcelEndRow == 0 ? sheet.PhysicalNumberOfRows : ReadExcelEndRow;
+ for (int a = startRow - 1; a <= ReadExcelEndRow; a++)
+ {
+ row = sheet.GetRow(a);//寰楀埌绗琲琛�
+ if (row == null) continue;
+ try
+ {
+ if (i == 0)
+ {
+ dr = dt0.NewRow();
+ for (j = 0; j < ColumnDataType.Length; j++)
+ {
+ dr[colNamePix + (j + 1)] = GetCellData(ColumnDataType[j], row, j);
+ }
+
+ dt0.Rows.Add(dr);
+ intime++;
+ }
+ else if (i == 1)
+ {
+ dr = dt1.NewRow();
+
+ for (j = 0; j < ColumnDataType.Length; j++)
+ {
+ dr[colNamePix + (j + 1)] = GetCellData(ColumnDataType[j], row, j);
+ }
+
+ dt1.Rows.Add(dr);
+ intime++;
+ }
+ else if (i == 2)
+ {
+ dr = dt2.NewRow();
+
+
+
+ for (j = 0; j < ColumnDataType.Length; j++)
+ {
+ dr[colNamePix + (j + 1)] = GetCellData(ColumnDataType[j], row, j);
+ }
+
+ dt2.Rows.Add(dr);
+ intime++;
+ }
+ else if (i == 3)
+ {
+ dr = dt3.NewRow();
+
+ for (j = 0; j < ColumnDataType.Length; j++)
+ {
+ dr[colNamePix + (j + 1)] = GetCellData(ColumnDataType[j], row, j);
+ }
+
+ dt3.Rows.Add(dr);
+ intime++;
+ }
+ else if (i == 4)
+ {
+ dr = dt4.NewRow();
+ for (j = 0; j < ColumnDataType.Length; j++)
+ {
+ dr[colNamePix + (j + 1)] = GetCellData(ColumnDataType[j], row, j);
+ }
+
+ dt4.Rows.Add(dr);
+ intime++;
+ }
+ else if (i == 5)
+ {
+ dr = dt5.NewRow();
+ for (j = 0; j < ColumnDataType.Length; j++)
+ {
+ dr[colNamePix + (j + 1)] = GetCellData(ColumnDataType[j], row, j);
+ }
+
+ dt5.Rows.Add(dr);
+ intime++;
+ }
+ else if (i == 6)
+ {
+ dr = dt6.NewRow();
+ for (j = 0; j < ColumnDataType.Length; j++)
+ {
+ dr[colNamePix + (j + 1)] = GetCellData(ColumnDataType[j], row, j);
+ }
+
+ dt6.Rows.Add(dr);
+ intime++;
+ }
+ else if (i == 7)
+ {
+ dr = dt7.NewRow();
+ for (j = 0; j < ColumnDataType.Length; j++)
+ {
+ dr[colNamePix + (j + 1)] = GetCellData(ColumnDataType[j], row, j);
+ }
+
+ dt7.Rows.Add(dr);
+ intime++;
+ }
+ else if (i == 8)
+ {
+ dr = dt8.NewRow();
+ for (j = 0; j < ColumnDataType.Length; j++)
+ {
+ dr[colNamePix + (j + 1)] = GetCellData(ColumnDataType[j], row, j);
+ }
+
+ dt8.Rows.Add(dr);
+ intime++;
+ }
+ else if (i == 9)
+ {
+ dr = dt9.NewRow();
+ for (j = 0; j < ColumnDataType.Length; j++)
+ {
+ dr[colNamePix + (j + 1)] = GetCellData(ColumnDataType[j], row, j);
+ }
+
+ dt9.Rows.Add(dr);
+ intime++;
+ }
+ else if (i == 10)
+ {
+ dr = dt10.NewRow();
+ for (j = 0; j < ColumnDataType.Length; j++)
+ {
+ dr[colNamePix + (j + 1)] = GetCellData(ColumnDataType[j], row, j);
+ }
+
+ dt10.Rows.Add(dr);
+ intime++;
+ }
+ else if (i == 11)
+ {
+ dr = dt11.NewRow();
+ for (j = 0; j < ColumnDataType.Length; j++)
+ {
+ dr[colNamePix + (j + 1)] = GetCellData(ColumnDataType[j], row, j);
+ }
+
+ dt11.Rows.Add(dr);
+ intime++;
+ }
+ else if (i == 12)
+ {
+ dr = dt12.NewRow();
+ for (j = 0; j < ColumnDataType.Length; j++)
+ {
+ dr[colNamePix + (j + 1)] = GetCellData(ColumnDataType[j], row, j);
+ }
+
+ dt12.Rows.Add(dr);
+ intime++;
+ }
+ else if (i == 13)
+ {
+ dr = dt13.NewRow();
+ for (j = 0; j < ColumnDataType.Length; j++)
+ {
+ dr[colNamePix + (j + 1)] = GetCellData(ColumnDataType[j], row, j);
+ }
+
+ dt13.Rows.Add(dr);
+ intime++;
+ }
+
+ }
+ catch (Exception er)
+ {
+ ertime++;
+ sb.Append(string.Format("绗瑊0}琛屽嚭閿欙細{1}\r\n", i + 1, er.Message));
+ continue;
+ }
+ }
+ if (i == 0)
+ {
+ ds.Tables.Add(dt0);
+ }
+ else if (i == 1)
+ {
+ ds.Tables.Add(dt1);
+ }
+ else if (i == 2)
+ {
+ ds.Tables.Add(dt2);
+ }
+ else if (i == 3)
+ {
+ ds.Tables.Add(dt3);
+ }
+ else if (i == 4)
+ {
+ ds.Tables.Add(dt4);
+ }
+ else if (i == 5)
+ {
+ ds.Tables.Add(dt5);
+ }
+ else if (i == 6)
+ {
+ ds.Tables.Add(dt6);
+ }
+ else if (i == 7)
+ {
+ ds.Tables.Add(dt7);
+ }
+ else if (i == 8)
+ {
+ ds.Tables.Add(dt8);
+ }
+ else if (i == 9)
+ {
+ ds.Tables.Add(dt9);
+ }
+ else if (i == 10)
+ {
+ ds.Tables.Add(dt10);
+ }
+ else if (i == 11)
+ {
+ ds.Tables.Add(dt11);
+ }
+ else if (i == 12)
+ {
+ ds.Tables.Add(dt12);
+ }
+ else if (i == 13)
+ {
+ ds.Tables.Add(dt13);
+ }
+
+ }
+ //IWorkbook workbook = WorkbookFactory.Create(stream);//浣跨敤鎺ュ彛锛岃嚜鍔ㄨ瘑鍒玡xcel2003/2007鏍煎紡
+ //ISheet sheet = workbook.GetSheetAt(0);//寰楀埌閲岄潰绗竴涓猻heet
+
+ }
+ //if (ds.Tables[0].Rows.Count == 0 && sb.ToString() != "") throw new Exception(sb.ToString());
+ return ds;
+ }
+ #endregion
+ Color LevelOneColor = Color.Green;
+ Color LevelTwoColor = Color.FromArgb(201, 217, 243);
+ Color LevelThreeColor = Color.FromArgb(231, 238, 248);
+ Color LevelFourColor = Color.FromArgb(232, 230, 231);
+ Color LevelFiveColor = Color.FromArgb(250, 252, 213);
+ public List<DataSet> ReadExcelBySheetIndex(string FileName, int startRow, string str)
+ {
+ List<DataSet> listDs = new List<DataSet>();
+
+ StringBuilder sb = new StringBuilder();
+ using (FileStream stream = new FileStream(@FileName, FileMode.Open, FileAccess.Read))
+ {
+ IWorkbook workbook = WorkbookFactory.Create(stream);//浣跨敤鎺ュ彛锛岃嚜鍔ㄨ瘑鍒玡xcel2003/2007鏍煎紡
+ // ISheet sheet = workbook.GetSheetAt(SheetIndex);//寰楀埌閲岄潰绗竴涓猻heet
+
+ List<string> listSheet = GetSheetNames(workbook);
+ ISheet sheet;
+
+ foreach (string sheetName in listSheet)
+ {
+ DataSet ds = new DataSet("ds");
+ DataTable dt = new DataTable("dt");
+ sheet = workbook.GetSheet(sheetName);
+ if (!sheetName.Contains(str))
+ {
+ continue;
+ }
+ NPOI.SS.UserModel.IRow headerRow = sheet.GetRow(0);
+ int cellCount = headerRow.LastCellNum;
+
+ for (int j = 0; j < cellCount; j++)
+ {
+ NPOI.SS.UserModel.ICell cell = headerRow.GetCell(j);
+ dt.Columns.Add("F" + j.ToString());
+ }
+
+ int r = sheet.PhysicalNumberOfRows;
+ for (int i = (sheet.FirstRowNum); i <= 2900; i++)
+ {
+ NPOI.SS.UserModel.IRow row = null;
+ try
+ {
+ row = sheet.GetRow(i);
+ int ex = row.FirstCellNum;
+ }
+ catch (Exception)
+ {
+ continue;
+ }
+ DataRow dataRow = dt.NewRow();
+
+ for (int j = row.FirstCellNum; j < cellCount; j++)
+ {
+ try
+ {
+ if (row.GetCell(j) != null || row.GetCell(j).ToString() != "")
+ //dataRow[j] = row.GetCell(j).ToString();
+ dataRow[j] = GetCellData(row, j);
+ }
+ catch (Exception ex)
+ {
+ string s = ex.ToString();
+ }
+ }
+ dt.Rows.Add(dataRow);
+ }
+ ds.Tables.Add(dt);
+ listDs.Add(ds);
+ }
+ // if (ds.Tables[0].Rows.Count == 0 && sb.ToString() != "") throw new Exception(sb.ToString());
+ }
+
+ return listDs;
+
+ }
+ public List<string> GetSheetNames(IWorkbook workbook)
+ {
+ int x = workbook.NumberOfSheets;
+ List<string> sheetNames = new List<string>();
+ for (int i = 0; i < x; i++)
+ {
+ sheetNames.Add(workbook.GetSheetName(i));
+ }
+ return sheetNames;
+ }
+ public object GetCellData(IRow row, int column)
+ {
+ try
+ {
+ ICell hs = row.GetCell(column);
+ NpoiDataType datatype = GetCellDataType(hs); //NpoiDataType.Blank;
+ object obj = row.GetCell(column) ?? null;
+ if (datatype == NpoiDataType.Datetime)
+ {
+ string v = "";
+ try
+ {
+ v = row.GetCell(column).StringCellValue;
+ }
+ catch (Exception e1)
+ {
+ v = row.GetCell(column).DateCellValue.ToString("yyyy-MM-dd hh:mm:ss");
+ }
+ if (v != "")
+ {
+ try
+ {
+ obj = row.GetCell(column).DateCellValue.ToString("yyyy-MM-dd hh:mm:ss");
+
+ }
+ catch (Exception e2)
+ {
+ obj = Convert.ToDateTime(v).ToString("yyyy-MM-dd hh:mm:ss");
+ }
+ }
+ else
+ obj = DBNull.Value;
+
+
+ }
+ else if (datatype == NpoiDataType.Numeric)
+ {
+ obj = DBNull.Value;
+ try
+ {
+ //if (row.GetCell(column).StringCellValue != "")
+ obj = row.GetCell(column).NumericCellValue;
+ }
+ catch (Exception e3)
+ {
+ obj = row.GetCell(column).StringCellValue;
+ }
+
+ }
+ else if (datatype == NpoiDataType.String && hs.CellType == CellType.Formula)
+ {
+ obj = row.GetCell(column).StringCellValue;
+ }
+ return obj;
+ }
+ catch (Exception e22)
+ {
+ return "";
+ }
+ }
+ #region 浠嶥ataSet瀵煎嚭鍒癕emoryStream娴�2003
+ /// <summary>
+ /// 浠嶥ataSet瀵煎嚭鍒癕emoryStream娴�2003
+ /// </summary>
+ /// <param name="SaveFileName">鏂囦欢淇濆瓨璺緞</param>
+ /// <param name="SheetName">Excel鏂囦欢涓殑Sheet鍚嶇О</param>
+ /// <param name="ds">瀛樺偍鏁版嵁鐨凞ataSet</param>
+ /// <param name="startRow">浠庡摢涓�琛屽紑濮嬪啓鍏ワ紝浠�0寮�濮�</param>
+ /// <param name="datatypes">DataSet涓殑鍚勫垪瀵瑰簲鐨勬暟鎹被鍨�</param>
+ public bool CreateExcel2003(string SaveFileName, string SheetName, DataSet ds, int startRow, params NpoiDataType[] datatypes)
+ {
+ try
+ {
+ if (startRow < 0) startRow = 0;
+ HSSFWorkbook wb = new HSSFWorkbook();
+ wb = new HSSFWorkbook();
+ DocumentSummaryInformation dsi = PropertySetFactory.CreateDocumentSummaryInformation();
+ dsi.Company = "pkm";
+ SummaryInformation si = PropertySetFactory.CreateSummaryInformation();
+ si.Title =
+ si.Subject = "automatic genereted document";
+ si.Author = "pkm";
+ wb.DocumentSummaryInformation = dsi;
+ wb.SummaryInformation = si;
+ ISheet sheet = wb.CreateSheet(SheetName);
+ //sheet.SetColumnWidth(0, 50 * 256);
+ //sheet.SetColumnWidth(1, 100 * 256);
+ IRow row;
+ ICell cell;
+ DataRow dr;
+ int j;
+ int maxLength = 0;
+ int curLength = 0;
+ object columnValue;
+ DataTable dt = ds.Tables[0];
+ if (datatypes.Length < dt.Columns.Count)
+ {
+ datatypes = new NpoiDataType[dt.Columns.Count];
+ for (int i = 0; i < dt.Columns.Count; i++)
+ {
+ string dtcolumntype = dt.Columns[i].DataType.Name.ToLower();
+ switch (dtcolumntype)
+ {
+ case "string":
+ datatypes[i] = NpoiDataType.String;
+ break;
+ case "datetime":
+ datatypes[i] = NpoiDataType.Datetime;
+ break;
+ case "boolean":
+ datatypes[i] = NpoiDataType.Bool;
+ break;
+ case "double":
+ datatypes[i] = NpoiDataType.Numeric;
+ break;
+ default:
+ datatypes[i] = NpoiDataType.String;
+ break;
+ }
+ }
+ }
+
+ #region 鍒涘缓琛ㄥご
+ row = sheet.CreateRow(0);//鍒涘缓绗琲琛�
+ ICellStyle style1 = wb.CreateCellStyle();//鏍峰紡
+ IFont font1 = wb.CreateFont();//瀛椾綋
+
+ font1.Color = HSSFColor.White.Index;//瀛椾綋棰滆壊
+ font1.Boldweight = (short)FontBoldWeight.Bold;//瀛椾綋鍔犵矖鏍峰紡
+ //style1.FillBackgroundColor = HSSFColor.WHITE.index;//GetXLColour(wb, LevelOneColor);// 璁剧疆鍥炬鑹�
+ style1.FillForegroundColor = HSSFColor.Green.Index;//GetXLColour(wb, LevelOneColor);// 璁剧疆鑳屾櫙鑹�
+ style1.FillPattern = FillPattern.SolidForeground;
+ style1.SetFont(font1);//鏍峰紡閲岀殑瀛椾綋璁剧疆鍏蜂綋鐨勫瓧浣撴牱寮�
+ style1.Alignment = HorizontalAlignment.Center;//鏂囧瓧姘村钩瀵归綈鏂瑰紡
+ style1.VerticalAlignment = VerticalAlignment.Center;//鏂囧瓧鍨傜洿瀵归綈鏂瑰紡
+ row.HeightInPoints = 25;
+ for (j = 0; j < dt.Columns.Count; j++)
+ {
+ columnValue = dt.Columns[j].ColumnName;
+ curLength = Encoding.Default.GetByteCount(columnValue.ToString());
+ maxLength = (maxLength < curLength ? curLength : maxLength);
+ int colounwidth = 256 * maxLength;
+ sheet.SetColumnWidth(j, colounwidth);
+ try
+ {
+ cell = row.CreateCell(j);//鍒涘缓绗�0琛岀殑绗琷鍒�
+ cell.CellStyle = style1;//鍗曞厓鏍煎紡璁剧疆鏍峰紡
+
+ cell.SetCellType(CellType.String);
+ cell.SetCellValue(columnValue.ToString());
+
+
+ }
+ catch
+ {
+ continue;
+ }
+ }
+ #endregion
+
+ #region 鍒涘缓姣忎竴琛�
+ for (int i = startRow; i < ds.Tables[0].Rows.Count; i++)
+ {
+ dr = ds.Tables[0].Rows[i];
+ row = sheet.CreateRow(i + 1);//鍒涘缓绗琲琛�
+ for (j = 0; j < dt.Columns.Count; j++)
+ {
+ columnValue = dr[j];
+ curLength = Encoding.Default.GetByteCount(columnValue.ToString());
+ maxLength = (maxLength < curLength ? curLength : maxLength);
+ int colounwidth = 256 * maxLength;
+ sheet.SetColumnWidth(j, colounwidth);
+ try
+ {
+ cell = row.CreateCell(j);//鍒涘缓绗琲琛岀殑绗琷鍒�
+ #region 鎻掑叆绗琷鍒楃殑鏁版嵁
+ try
+ {
+ NpoiDataType dtype = datatypes[j];
+ switch (dtype)
+ {
+ case NpoiDataType.String:
+ {
+ cell.SetCellType(CellType.String);
+ cell.SetCellValue(columnValue.ToString());
+ }
+ break;
+ case NpoiDataType.Datetime:
+ {
+ cell.SetCellType(CellType.String);
+ cell.SetCellValue(columnValue.ToString());
+ }
+ break;
+ case NpoiDataType.Numeric:
+ {
+ cell.SetCellType(CellType.Numeric);
+ cell.SetCellValue(Convert.ToDouble(columnValue));
+ }
+ break;
+ case NpoiDataType.Bool:
+ {
+ cell.SetCellType(CellType.Boolean);
+ cell.SetCellValue(Convert.ToBoolean(columnValue));
+ }
+ break;
+ case NpoiDataType.Richtext:
+ {
+ cell.SetCellType(CellType.Formula);
+ cell.SetCellValue(columnValue.ToString());
+ }
+ break;
+ }
+ }
+ catch
+ {
+ cell.SetCellType(CellType.String);
+ cell.SetCellValue(columnValue.ToString());
+ }
+ #endregion
+
+ }
+ catch
+ {
+ continue;
+ }
+ }
+ }
+ #endregion
+
+ //using (FileStream fs = new FileStream(@SaveFileName, FileMode.OpenOrCreate))//鐢熸垚鏂囦欢鍦ㄦ湇鍔″櫒涓�
+ //{
+ // wb.Write(fs);
+ //}
+ //string SaveFileName = "output.xls";
+ using (FileStream fs = new FileStream(@SaveFileName, FileMode.OpenOrCreate, FileAccess.Write))//鐢熸垚鏂囦欢鍦ㄦ湇鍔″櫒涓�
+ {
+ wb.Write(fs);
+ Console.WriteLine("鏂囦欢淇濆瓨鎴愬姛锛�" + SaveFileName);
+ }
+
+ return true;
+ }
+ catch (Exception er)
+ {
+ Console.WriteLine("鏂囦欢淇濆瓨鎴愬姛锛�" + SaveFileName);
+ return false;
+ }
+
+ }
+ #endregion
+
+ #region 浠嶥ataSet瀵煎嚭鍒癕emoryStream娴�2007
+ /// <summary>
+ /// 浠嶥ataSet瀵煎嚭鍒癕emoryStream娴�2007
+ /// </summary>
+ /// <param name="SaveFileName">鏂囦欢淇濆瓨璺緞</param>
+ /// <param name="SheetName">Excel鏂囦欢涓殑Sheet鍚嶇О</param>
+ /// <param name="ds">瀛樺偍鏁版嵁鐨凞ataSet</param>
+ /// <param name="startRow">浠庡摢涓�琛屽紑濮嬪啓鍏ワ紝浠�0寮�濮�</param>
+ /// <param name="datatypes">DataSet涓殑鍚勫垪瀵瑰簲鐨勬暟鎹被鍨�</param>
+ public bool CreateExcel2007(string SaveFileName, string SheetName, DataSet ds, int startRow, params NpoiDataType[] datatypes)
+ {
+ try
+ {
+ if (startRow < 0) startRow = 0;
+ XSSFWorkbook wb = new XSSFWorkbook();
+ ISheet sheet = wb.CreateSheet(SheetName);
+ //sheet.SetColumnWidth(0, 50 * 256);
+ //sheet.SetColumnWidth(1, 100 * 256);
+ IRow row;
+ ICell cell;
+ DataRow dr;
+ int j;
+ int maxLength = 0;
+ int curLength = 0;
+ object columnValue;
+ DataTable dt = ds.Tables[0];
+ if (datatypes.Length < dt.Columns.Count)
+ {
+ datatypes = new NpoiDataType[dt.Columns.Count];
+ for (int i = 0; i < dt.Columns.Count; i++)
+ {
+ string dtcolumntype = dt.Columns[i].DataType.Name.ToLower();
+ switch (dtcolumntype)
+ {
+ case "string":
+ datatypes[i] = NpoiDataType.String;
+ break;
+ case "datetime":
+ datatypes[i] = NpoiDataType.Datetime;
+ break;
+ case "boolean":
+ datatypes[i] = NpoiDataType.Bool;
+ break;
+ case "double":
+ datatypes[i] = NpoiDataType.Numeric;
+ break;
+ default:
+ datatypes[i] = NpoiDataType.String;
+ break;
+ }
+ }
+ }
+
+ #region 鍒涘缓琛ㄥご
+ row = sheet.CreateRow(0);//鍒涘缓绗琲琛�
+ ICellStyle style1 = wb.CreateCellStyle();//鏍峰紡
+ IFont font1 = wb.CreateFont();//瀛椾綋
+
+ font1.Color = HSSFColor.White.Index;//瀛椾綋棰滆壊
+ font1.Boldweight = (short)FontBoldWeight.Bold;//瀛椾綋鍔犵矖鏍峰紡
+ //style1.FillBackgroundColor = HSSFColor.WHITE.index;//GetXLColour(wb, LevelOneColor);// 璁剧疆鍥炬鑹�
+ style1.FillForegroundColor = HSSFColor.Green.Index;//GetXLColour(wb, LevelOneColor);// 璁剧疆鑳屾櫙鑹�
+ style1.FillPattern = FillPattern.SolidForeground;
+ style1.SetFont(font1);//鏍峰紡閲岀殑瀛椾綋璁剧疆鍏蜂綋鐨勫瓧浣撴牱寮�
+ style1.Alignment = HorizontalAlignment.Center;//鏂囧瓧姘村钩瀵归綈鏂瑰紡
+ style1.VerticalAlignment = VerticalAlignment.Center;//鏂囧瓧鍨傜洿瀵归綈鏂瑰紡
+ //row.HeightInPoints = 25;
+ row.HeightInPoints = 15;
+ for (j = 0; j < dt.Columns.Count; j++)
+ {
+ columnValue = dt.Columns[j].ColumnName;
+ curLength = Encoding.Default.GetByteCount(columnValue.ToString());
+ maxLength = (maxLength < curLength ? curLength : maxLength);
+ int colounwidth = 256 * maxLength;
+ sheet.SetColumnWidth(j, colounwidth);
+ try
+ {
+ cell = row.CreateCell(j);//鍒涘缓绗�0琛岀殑绗琷鍒�
+ cell.CellStyle = style1;//鍗曞厓鏍煎紡璁剧疆鏍峰紡
+
+ //cell.SetCellType(CellType.STRING);
+ cell.SetCellValue(columnValue.ToString());
+ }
+ catch
+ {
+ continue;
+ }
+ }
+ #endregion
+
+ #region 鍒涘缓姣忎竴琛�
+ for (int i = startRow; i < ds.Tables[0].Rows.Count; i++)
+ {
+ dr = ds.Tables[0].Rows[i];
+ row = sheet.CreateRow(i + 1);//鍒涘缓绗琲琛�
+ for (j = 0; j < dt.Columns.Count; j++)
+ {
+ columnValue = dr[j];
+ curLength = Encoding.Default.GetByteCount(columnValue.ToString());
+ maxLength = (maxLength < curLength ? curLength : maxLength);
+ //int colounwidth = 256 * maxLength;
+ int colounwidth = 3000;
+ sheet.SetColumnWidth(j, colounwidth);
+ try
+ {
+ cell = row.CreateCell(j);//鍒涘缓绗琲琛岀殑绗琷鍒�
+ #region 鎻掑叆绗琷鍒楃殑鏁版嵁
+ try
+ {
+ NpoiDataType dtype = datatypes[j];
+ switch (dtype)
+ {
+ case NpoiDataType.String:
+ {
+ //cell.SetCellType(CellType.STRING);
+ cell.SetCellValue(columnValue.ToString());
+ }
+ break;
+ case NpoiDataType.Datetime:
+ {
+ // cell.SetCellType(CellType.STRING);
+ cell.SetCellValue(columnValue.ToString());
+ }
+ break;
+ case NpoiDataType.Numeric:
+ {
+ //cell.SetCellType(CellType.NUMERIC);
+ cell.SetCellValue(Convert.ToDouble(columnValue));
+ }
+ break;
+ case NpoiDataType.Bool:
+ {
+ //cell.SetCellType(CellType.BOOLEAN);
+ cell.SetCellValue(Convert.ToBoolean(columnValue));
+ }
+ break;
+ case NpoiDataType.Richtext:
+ {
+ // cell.SetCellType(CellType.FORMULA);
+ cell.SetCellValue(columnValue.ToString());
+ }
+ break;
+ }
+ }
+ catch
+ {
+ //cell.SetCellType(HSSFCell.CELL_TYPE_STRING);
+ cell.SetCellValue(columnValue.ToString());
+ }
+ #endregion
+
+ }
+ catch
+ {
+ continue;
+ }
+ }
+ }
+ #endregion
+
+ //using (FileStream fs = new FileStream(@SaveFileName, FileMode.OpenOrCreate))//鐢熸垚鏂囦欢鍦ㄦ湇鍔″櫒涓�
+ //{
+ // wb.Write(fs);
+ //}
+ //string SaveFileName = "output.xlsx";
+ using (FileStream fs = new FileStream(SaveFileName, FileMode.OpenOrCreate, FileAccess.Write))//鐢熸垚鏂囦欢鍦ㄦ湇鍔″櫒涓�
+ {
+ wb.Write(fs);
+ Console.WriteLine("鏂囦欢淇濆瓨鎴愬姛锛�" + SaveFileName);
+ }
+ return true;
+ }
+ catch (Exception er)
+ {
+ Console.WriteLine("鏂囦欢淇濆瓨澶辫触锛�" + SaveFileName);
+ return false;
+ }
+
+ }
+ #endregion
+
+ private short GetXLColour(HSSFWorkbook workbook, System.Drawing.Color SystemColour)
+ {
+ short s = 0;
+ HSSFPalette XlPalette = workbook.GetCustomPalette();
+ HSSFColor XlColour = XlPalette.FindColor(SystemColour.R, SystemColour.G, SystemColour.B);
+ if (XlColour == null)
+ {
+ if (NPOI.HSSF.Record.PaletteRecord.STANDARD_PALETTE_SIZE < 255)
+ {
+ if (NPOI.HSSF.Record.PaletteRecord.STANDARD_PALETTE_SIZE < 64)
+ {
+ //NPOI.HSSF.Record.PaletteRecord.STANDARD_PALETTE_SIZE= 64;
+ //NPOI.HSSF.Record.PaletteRecord.STANDARD_PALETTE_SIZE += 1;
+ XlColour = XlPalette.AddColor(SystemColour.R, SystemColour.G, SystemColour.B);
+ }
+ else
+ {
+ XlColour = XlPalette.FindSimilarColor(SystemColour.R, SystemColour.G, SystemColour.B);
+ }
+ s = XlColour.Indexed;
+ }
+ }
+ else
+ s = XlColour.Indexed;
+ return s;
+ }
+
+ #region 璇籈xcel-鏍规嵁NpoiDataType鍒涘缓鐨凞ataTable鍒楃殑鏁版嵁绫诲瀷
+ /// <summary>
+ /// 璇籈xcel-鏍规嵁NpoiDataType鍒涘缓鐨凞ataTable鍒楃殑鏁版嵁绫诲瀷
+ /// </summary>
+ /// <param name="datatype"></param>
+ /// <returns></returns>
+ private Type GetDataTableType(NpoiDataType datatype)
+ {
+ Type tp = typeof(string);//Type.GetType("System.String")
+ switch (datatype)
+ {
+ case NpoiDataType.Bool:
+ tp = typeof(bool);
+ break;
+ case NpoiDataType.Datetime:
+ tp = typeof(DateTime);
+ break;
+ case NpoiDataType.Numeric:
+ tp = typeof(double);
+ break;
+ case NpoiDataType.Error:
+ tp = typeof(string);
+ break;
+ case NpoiDataType.Blank:
+ tp = typeof(string);
+ break;
+ }
+ return tp;
+ }
+ #endregion
+
+ #region 璇籈xcel-寰楀埌涓嶅悓鏁版嵁绫诲瀷鍗曞厓鏍肩殑鏁版嵁
+ /// <summary>
+ /// 璇籈xcel-寰楀埌涓嶅悓鏁版嵁绫诲瀷鍗曞厓鏍肩殑鏁版嵁
+ /// </summary>
+ /// <param name="datatype">鏁版嵁绫诲瀷</param>
+ /// <param name="row">鏁版嵁涓殑涓�琛�</param>
+ /// <param name="column">鍝垪</param>
+ /// <returns></returns>
+ private object GetCellData(NpoiDataType datatype, IRow row, int column)
+ {
+ var objcell = row.GetCell(column);
+
+ object obj = objcell ?? null;
+ if (obj == null)
+ {
+ return null;
+ }
+
+ if (obj.ToString().Contains("鏈�") && obj.ToString().Contains("-") && objcell.DateCellValue != null)
+ {
+ datatype = NpoiDataType.Datetime;
+ }
+ else if (objcell.CellType == CellType.Numeric && (obj.ToString().Contains("-") || obj.ToString().Contains("/")) && objcell.DateCellValue != null)
+ {
+ datatype = NpoiDataType.Datetime;
+ }
+
+
+ if (datatype == NpoiDataType.Datetime)
+ {
+ string v = "";
+ try
+ {
+ v = row.GetCell(column).StringCellValue.Trim();
+ }
+ catch (Exception e1)
+ {
+ v = row.GetCell(column).DateCellValue.ToString("yyyy-MM-dd hh:mm:ss");
+ }
+ if (v != "")
+ {
+ try
+ {
+ obj = row.GetCell(column).DateCellValue.ToString("yyyy-MM-dd hh:mm:ss");
+
+ }
+ catch (Exception e2)
+ {
+ obj = Convert.ToDateTime(v).ToString("yyyy-MM-dd hh:mm:ss");
+ }
+ }
+ else
+ obj = DBNull.Value;
+
+ }
+ else if (datatype == NpoiDataType.Numeric)
+ {
+ obj = DBNull.Value;
+ try
+ {
+ //if (row.GetCell(column).StringCellValue != "")
+ obj = row.GetCell(column).NumericCellValue;
+ }
+ catch (Exception e3)
+ {
+ obj = row.GetCell(column).StringCellValue.Trim();
+ }
+
+ }
+ else
+ {
+ if (obj != null)
+ {
+ obj = obj.ToString().Trim().Replace("\n", "");//鍘绘帀鍥炶溅锛宭igerui tree涓嶆敮鎸佸洖杞�
+ if (obj.ToString().StartsWith("."))
+ {
+
+ decimal.Parse("0" + obj.ToString());
+ obj = "0" + obj.ToString();
+ }
+ }
+ }
+ return obj;
+ }
+
+ private object GetCellData_double(NpoiDataType datatype, IRow row, int column)
+ {
+ return (object)(row.GetCell(column).NumericCellValue) ?? null;
+ }
+ #endregion
+
+ #region 鑾峰彇鍗曞厓鏍兼暟鎹被鍨�
+ /// <summary>
+ /// 鑾峰彇鍗曞厓鏍兼暟鎹被鍨�
+ /// </summary>
+ /// <param name="hs"></param>
+ /// <returns></returns>
+ private NpoiDataType GetCellDataType(ICell hs)
+ {
+ NpoiDataType dtype;
+ DateTime t1;
+ string cellvalue = "";
+
+ switch (hs.CellType)
+ {
+ case CellType.Blank:
+ dtype = NpoiDataType.String;
+ cellvalue = hs.StringCellValue;
+ break;
+ case CellType.Boolean:
+ dtype = NpoiDataType.Bool;
+ break;
+ case CellType.Numeric:
+ dtype = NpoiDataType.String;
+ if (hs.NumericCellValue.ToString().Contains("-") || hs.NumericCellValue.ToString().Contains("/") || hs.ToString().Contains("-") || hs.ToString().Contains("/"))
+ {
+ hs.DateCellValue.ToString();
+ dtype = NpoiDataType.Datetime;
+ }
+ cellvalue = hs.NumericCellValue.ToString();
+ break;
+ case CellType.String:
+ dtype = NpoiDataType.String;
+ cellvalue = hs.StringCellValue;
+ break;
+ case CellType.Error:
+ dtype = NpoiDataType.Error;
+ break;
+ case CellType.Formula:
+ {
+ dtype = NpoiDataType.String;
+ try
+ {
+ if (hs.CachedFormulaResultType == CellType.Numeric && hs.NumericCellValue.ToString() != "")
+ {
+ dtype = NpoiDataType.Numeric;
+ cellvalue = hs.NumericCellValue.ToString();
+ }
+ else if (hs.CachedFormulaResultType == CellType.Numeric && hs.DateCellValue.ToString() != "")
+ {
+ dtype = NpoiDataType.Datetime;
+ cellvalue = hs.DateCellValue.ToString();
+ }
+ else if (hs.RichStringCellValue.ToString() != "")
+ {
+ dtype = NpoiDataType.String;
+ cellvalue = hs.RichStringCellValue.ToString();
+ }
+ }
+ catch
+ {
+ try
+ {
+ if (hs.CachedFormulaResultType == CellType.Numeric && hs.NumericCellValue.ToString() != "")
+ {
+ dtype = NpoiDataType.Numeric;
+ cellvalue = hs.NumericCellValue.ToString();
+ }
+ }
+ catch
+ {
+ //cellvalue = hs.StringCellValue;
+ }
+ }
+
+ break;
+ }
+ default:
+ dtype = NpoiDataType.Datetime;
+ break;
+ }
+ //if (cellvalue != "" && DateTime.TryParse(cellvalue, out t1)) dtype = NpoiDataType.Datetime;
+ return dtype;
+ }
+ #endregion
+
+
+ #region 娴嬭瘯浠ｇ爜
+
+
+ #endregion
+
+
+ public DataSet ReadExcel_ByColNum(string FileName, int startRow, int LastCellNum, params NpoiDataType[] ColumnDataType)
+ {
+ string colNamePix = "F";
+ int ertime = 0;
+ int intime = 0;
+ DataSet ds = new DataSet("ds");
+ DataTable dt = new DataTable("dt");
+ DataRow dr;
+ StringBuilder sb = new StringBuilder();
+ using (FileStream stream = new FileStream(@FileName, FileMode.Open, FileAccess.Read))
+ {
+ IWorkbook workbook = WorkbookFactory.Create(stream);//浣跨敤鎺ュ彛锛岃嚜鍔ㄨ瘑鍒玡xcel2003/2007鏍煎紡
+ ISheet sheet = workbook.GetSheetAt(0);//寰楀埌閲岄潰绗竴涓猻heet
+ int j;
+ IRow row;
+ #region ColumnDataType璧嬪��
+ if (ColumnDataType.Length <= 0)
+ {
+ row = sheet.GetRow(startRow - 1);//寰楀埌绗琲琛�
+ ColumnDataType = new NpoiDataType[LastCellNum];
+ for (int i = 0; i < LastCellNum; i++)
+ {
+ ICell hs = row.GetCell(i, MissingCellPolicy.CREATE_NULL_AS_BLANK);
+ ColumnDataType[i] = GetCellDataType(hs); //NpoiDataType.Blank;
+ }
+ }
+ #endregion
+ for (j = 0; j < ColumnDataType.Length; j++)
+ {
+ Type tp = GetDataTableType(ColumnDataType[j]);
+ dt.Columns.Add(colNamePix + j, tp);
+ }
+
+ ReadExcelEndRow = ReadExcelEndRow == 0 ? sheet.PhysicalNumberOfRows : ReadExcelEndRow;
+ int ss = sheet.LastRowNum + 1;
+ if (ReadExcelEndRow < ss && ReadExcelEndRow > 0)
+ {
+ ReadExcelEndRow = ss;
+ }
+ for (int i = startRow - 1; i <= ReadExcelEndRow; i++)
+ {
+ row = sheet.GetRow(i);//寰楀埌绗琲琛�
+ if (row == null) continue;
+ try
+ {
+ dr = dt.NewRow();
+
+ for (j = 0; j < ColumnDataType.Length; j++)
+ {
+ dr[colNamePix + (j)] = GetCellData(ColumnDataType[j], row, j);
+ }
+ dt.Rows.Add(dr);
+ intime++;
+ }
+ catch (Exception er)
+ {
+ ertime++;
+ sb.Append(string.Format("绗瑊0}琛屽嚭閿欙細{1}\r\n", i + 1, er.Message));
+ continue;
+ }
+ }
+ ds.Tables.Add(dt);
+ }
+ if (ds.Tables[0].Rows.Count == 0 && sb.ToString() != "") throw new Exception(sb.ToString());
+ return ds;
+ }
+
+ }
+
+ #region 鏋氫妇(Excel鍗曞厓鏍兼暟鎹被鍨�)
+ /// <summary>
+ /// 鏋氫妇(Excel鍗曞厓鏍兼暟鎹被鍨�)
+ /// </summary>
+ public enum NpoiDataType
+ {
+ /// <summary>
+ /// 瀛楃涓茬被鍨�-鍊间负1
+ /// </summary>
+ String,
+ /// <summary>
+ /// 甯冨皵绫诲瀷-鍊间负2
+ /// </summary>
+ Bool,
+ /// <summary>
+ /// 鏃堕棿绫诲瀷-鍊间负3
+ /// </summary>
+ Datetime,
+ /// <summary>
+ /// 鏁板瓧绫诲瀷-鍊间负4
+ /// </summary>
+ Numeric,
+ /// <summary>
+ /// 澶嶆潅鏂囨湰绫诲瀷-鍊间负5
+ /// </summary>
+ Richtext,
+ /// <summary>
+ /// 绌虹櫧
+ /// </summary>
+ Blank,
+ /// <summary>
+ /// 閿欒
+ /// </summary>
+ Error
+ }
+ #endregion
+
+}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_WorkBillSortBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_WorkBillSortBillController.cs"
index 1d23b35..6d480b1 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_WorkBillSortBillController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_WorkBillSortBillController.cs"
@@ -92,7 +92,7 @@
string user = sArray[4].ToString();
try
{
- if (!DBUtility.ClsPub.Security_Log("JIT_ComplementGoodBill_Edit", 1, false, user))
+ if (!DBUtility.ClsPub.Security_Log("Sc_WorkBillSortBill_Edit", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
index ccdeb43..363fc92 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
@@ -16,14 +16,14 @@
public class Sc_ICMOBillController : ApiController
{
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
- private json objJsonResult = new json();
+ private json objJsonResult = new json();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
#region 鐢熶骇浠诲姟鍗曞垹闄ゅ姛鑳�
[Route("Sc_ICMOBill/DeltetSc_ICMOReportBill")]
[HttpGet]
- public object DeltetSc_ICMOReportBill(string HInterID,string user)
+ public object DeltetSc_ICMOReportBill(string HInterID, string user)
{
try
{
@@ -75,6 +75,33 @@
}
#endregion
+ #region 鐢熶骇浠诲姟鍗曡幏鍙栬溅闂�
+ [Route("Sc_ICMOBill/GetHDeptList")]
+ [HttpGet]
+ public object GetHDeptList()
+ {
+ try
+ {
+ DataSet oDs = new DataSet();
+ //==========
+ oDs = oCN.RunProcReturn("select HItemID,HName from Gy_Department", "Gy_Department");
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇鎴愬姛锛�";
+ objJsonResult.data = oDs.Tables[0];
+ return objJsonResult; ;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 澧欏挃瑁呯鍗曞洖杞︿簨浠�
[Route("Sc_ICMOBill/QK_PackingBillByXSBill")]
[HttpGet]
@@ -82,7 +109,7 @@
{
try
{
- string sql = string.Format(@"select a.HInterID,a.HBillNo,a.HMaterID,m.HName HMaterName, a.HUnitID,u.HName HUnitName,b.HQty HPlanQty,a.HCusID, c.HName HCusName,a.HEmpID,e.HName HEmpName,a.HDeptID,d.HName HDeptName,a.HPlanEndDate,0 HMinQty,0 HTotalQty,0 HSpsQty
+ string sql = string.Format(@"select a.HInterID,a.HBillNo,b.HEntryID,a.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName, a.HUnitID,u.HName HUnitName,b.HQty HPlanQty,a.HCusID, c.HName HCusName,a.HEmpID,e.HName HEmpName,a.HDeptID,d.HName HDeptName,a.HPlanEndDate,0 HMinQty,0 HTotalQty,0 HSpsQty,a.HSeOrderBillNo
from Sc_ICMOBillMain a
left join Sc_ICMOBillSub b on a.HInterID=b.HInterID
left join Gy_Material m on b.HMaterID=m.HItemID
@@ -90,8 +117,26 @@
left join Gy_Customer c on a.HCusID=c.HItemID
left join Gy_Employee e on a.HEmpID=e.HItemID
left join Gy_Department d on a.HDeptID=d.HItemID
- where b.HDEPTID='113546' and b.HSeOrderInterID=(select HSeOrderInterID from Sc_PPBomBillMain where HBillNo='" + HBillNo + "')");
-
+ where b.HInterID=(select HICMOInterID from Sc_PPBomBillMain where HBillNo='" + HBillNo + "')");
+ //string sql = string.Format(@" select a.HInterID,a.HBillNo,b.HEntryID,a.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName, a.HUnitID,u.HName HUnitName,b.HQty HPlanQty,a.HCusID,
+ // c.HName HCusName,a.HEmpID,e.HName HEmpName,a.HDeptID,d.HName HDeptName,a.HPlanEndDate,0 HMinQty,0 HTotalQty,0 HSpsQty,a.HSeOrderBillNo
+ // ,fo.FBILLNO FBillNo,fo.F_ZZZZ_TEXT7 FLXName,fo.FRECEIVEADDRESS FInAddress,fm1.FOLDNUMBER FMaterName,fo.F_ZZZZ_TEXT FBZFS,fu.FDATAVALUE FHX,
+ // fu1.FDATAVALUE FQK,fo.F_ZZZZ_WBBZ FWBBZ
+ // from Sc_ICMOBillMain a
+ // left join Sc_ICMOBillSub b on a.HInterID=b.HInterID
+ // left join Gy_Material m on b.HMaterID=m.HItemID
+ // left join Gy_Unit u on b.HUnitID=u.HItemID
+ // left join Gy_Customer c on a.HCusID=c.HItemID
+ // left join Gy_Employee e on a.HEmpID=e.HItemID
+ // left join Gy_Department d on a.HDeptID=d.HItemID
+ // left join AIS20200908101915zs..T_PRD_MOENTRY f1 on b.HERPEntryID=f1.FENTRYID
+ // left join AIS20200908101915zs..T_SAL_ORDER fo on f1.FSaleOrderId =fo.FID
+ // left join AIS20200908101915zs..T_SAL_ORDERENTRY fo1 on fo.FID=fo1.FID
+ // left join AIS20200908101915zs..T_BD_MATERIAL fm1 on fo1.FSUBMATERIALNUMBER=fm1.FMATERIALID
+ // LEFT JOIN AIS20200908101915zs..T_BAS_ASSISTANTDATAENTRY_L fu1 on fo1.F_ZZZZ_ASSISTANT1=fu1.FENTRYID
+ // LEFT JOIN AIS20200908101915zs..T_BAS_ASSISTANTDATAENTRY_L fu on fo1.F_ZZZZ_ASSISTANT2=fu.FENTRYID
+ // where b.HInterID=(select HICMOInterID from Sc_PPBomBillMain where HBillNo='" + HBillNo + "')");
+
ds = oCN.RunProcReturn(sql, "Sc_ICMOBillMain");
if (ds.Tables[0].Rows.Count != 0 || ds != null)
{
@@ -152,67 +197,31 @@
string month = DateTime.Now.Month.ToString();
string day = DateTime.Now.Day.ToString();
string nowDate = year + month + day;
- string materid = "";
- long sum = 0;
- if (msg4=="ZZ")
+ //string materid = "";
+ //long sum = 0;
+ //if (msg4 == "ZZ")
+ //{
+ string FID = "";
+ int LSH;
+ string LSH2;
+ string TM = "";
+ foreach (Models.ClsQK_PackingBill oItemSub in ls)
{
- oCN.BeginTran();
- foreach (Models.ClsQK_PackingBill oItemSub in ls)
+ //鏍规嵁鐢熸垚鏉℃暟鐢熸垚鐩稿簲鏁伴噺鏉＄爜
+ for (int i = 0; i < oItemSub.HTotalQty; i++)
{
- //鏍规嵁鐢熸垚鏉℃暟鐢熸垚鐩稿簲鏁伴噺鏉＄爜
- foreach (var item in oItemSub.HTotalQty.ToString())
- {
- //鐢熸垚鍞竴鏉＄爜 鏉＄爜鍓嶇紑 = 缁勭粐浠ｇ爜 + 鐗╂枡浠ｇ爜 + 骞� + 鏈� + 鏃�
- string sTMNumber = OrgNum + oItemSub.HMaterNumber + nowDate;
- Ds1 = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
- int LSH = ClsPub.isInt(Ds1.Tables[0].Rows[0][0]);//鍞竴鐮�
- //鑾峰彇鍐呯爜
- long HInterID = DBUtility.ClsPub.CreateBillID_Prod("85", ref DBUtility.ClsPub.sExeReturnInfo);
- 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 " +
- ",HGiveAwayFlag " +
- ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " +
- ") values ("
- + "'" + LSH + "','鍞竴鏉＄爜'," + oItemSub.HMaterID.ToString() + "," + oItemSub.HUnitID.ToString() + "," + oItemSub.HMinQty.ToString()
- + ",'',0,0,'" + msg3 + "',getdate(),0," + oItemSub.HMinQty.ToString()
- + ", " + oItemSub.HInterID.ToString() + "," + oItemSub.HInterID.ToString() + ",'" + oItemSub.HBillNo + "','3710',''"
- + ",1,1," + oItemSub.HDeptID.ToString() + ",0,0,''"
- + ", " + oItemSub.HCusID.ToString() + ",'',getdate(),'',getdate()"
- + ", " + msg5.ToString() + "," + OrgNum.ToString() + ",''," + HInterID.ToString()
- + ",0"
- + ",'" + oItemSub.HMaterName + "','','',0,'','')");
-
- string sql1 = string.Format(@"update Sc_ICMOBillSub set HQty=" + oItemSub.HSpsQty + " where HInterID=" + oItemSub.HInterID);
- oCN.RunProc(sql1);
- }
- }
- oCN.Commit();
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "鏁磋鐢熸垚鎴愬姛锛�";
- objJsonResult.data = 1;
- return objJsonResult;
- }
- else
- {
- var HInterID = DBUtility.ClsPub.CreateBillID("3783", ref DBUtility.ClsPub.sExeReturnInfo);
- var HBillNo = DBUtility.ClsPub.CreateBillCode("3783", ref DBUtility.ClsPub.sExeReturnInfo, true);
- oCN.BeginTran();
- foreach (Models.ClsQK_PackingBill oItemSub in ls)
- {
- sum += oItemSub.HMinQty;
- materid = oItemSub.HMaterNumber;
- //鑾峰彇鍐呯爜
- long HInterID2 = DBUtility.ClsPub.CreateBillID_Prod("85", ref DBUtility.ClsPub.sExeReturnInfo);
- //鐢熸垚鍞竴鏉＄爜 鏉＄爜鍓嶇紑 = 缁勭粐浠ｇ爜 + 鐗╂枡浠ｇ爜 + 骞� + 鏈� + 鏃�
+ long HInterID = DBUtility.ClsPub.CreateBillID_Prod("85", ref DBUtility.ClsPub.sExeReturnInfo);
string sTMNumber = OrgNum + oItemSub.HMaterNumber + nowDate;
Ds1 = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
- int LSH = ClsPub.isInt(Ds1.Tables[0].Rows[0][0]);//鍞竴鐮�
- //鎻掑叆鏉＄爜妗ｆ
+ LSH = ClsPub.isInt(Ds1.Tables[0].Rows[0][0]);//
+ LSH = LSH + 1;
+ LSH2 = LSH.ToString();
+ while (LSH2.Length < 6)
+ {
+ LSH2 = "0" + LSH2;
+ }
+ TM = sTMNumber + LSH2;
+ //鑾峰彇鍐呯爜
oCN.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
@@ -222,76 +231,119 @@
",HGiveAwayFlag " +
",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " +
") values ("
- + "'" + LSH + "','鍞竴鏉＄爜'," + oItemSub.HMaterID.ToString() + "," + oItemSub.HUnitID.ToString() + "," + oItemSub.HMinQty.ToString()
+ + "'" + TM + "','鍞竴鏉＄爜'," + oItemSub.HMaterID.ToString() + "," + oItemSub.HUnitID.ToString() + "," + oItemSub.HMinQty.ToString()
+ ",'',0,0,'" + msg3 + "',getdate(),0," + oItemSub.HMinQty.ToString()
+ ", " + oItemSub.HInterID.ToString() + "," + oItemSub.HInterID.ToString() + ",'" + oItemSub.HBillNo + "','3710',''"
+ ",1,1," + oItemSub.HDeptID.ToString() + ",0,0,''"
+ ", " + oItemSub.HCusID.ToString() + ",'',getdate(),'',getdate()"
- + ", " + msg5.ToString() + "," + OrgNum.ToString() + ",''," + HInterID2.ToString()
+ + ", " + msg5.ToString() + "," + OrgNum.ToString() + ",'" + oItemSub.HSeOrderBillNo.ToString() + "'," + HInterID.ToString()
+ ",0"
+ ",'" + oItemSub.HMaterName + "','','',0,'','')");
- //鎻掑叆缁勬墭鍗曞瓙琛�
- string sql = string.Format(@"insert into Sc_PackUnionBillSub(HInterID,HEntryID,HCloseMan,HCloseType,HRemark,
- HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,
- HRelationQty,HRelationMoney,HMaterID,HUnitID,HQty,HSourceID,HEquipID,HGroupID,HWorkerID,
- HScanDate,HBarCode,HBarCode_Pack)
- values("+HInterID+",'','',0,'鑷姩缁戝畾',"+oItemSub.HInterID+",'','"+oItemSub.HBillNo+"','3710',"+
- "0,0,"+ oItemSub.HMaterID+","+ oItemSub.HUnitID+","+ oItemSub.HPlanQty+", 0,0,0,0,"+
- "getdate(),'"+ LSH + "','" +HBillNo+"')");
- //鏇存敼鐢熶骇璁㈠崟鐨勬暟閲�
- string sql1 = string.Format(@"update Sc_ICMOBillSub set HQty=" + oItemSub.HSpsQty + " where HInterID=" + oItemSub.HInterID);
-
- oCN.RunProc(sql);
- oCN.RunProc(sql1);
+ oCN.RunProc("update Sc_ICMOBillSub set HQty=" + (oItemSub.HPlanQty- oItemSub.HMinQty).ToString() + " where HEntryID=" + oItemSub.HEntryID);
+ oCN.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+ FID = FID + HInterID + ",";
}
- //鐢熸垚缁勬墭鍗曚富琛�
- string sql2 = string.Format(@"Insert Sc_PackUnionBillMain(HYear,HPeriod,HBillType,HInterID,HDate,HBillNo,HBillStatus,HCheckItemNowID,HCheckItemNextID,
- HRemark,HBacker,HChecker,HMaker,HMakeDate,HUpDater,HCloseMan,HCloseType,HDeleteMan,HICMOInterID,HICMOBillNo,
- HBarCode_Pack,HMaterID,HUnitID,HWeight,HMWeight,HPWeight,
- HProdOrgID,HDeptID,HEmpID,HSNum,HPackNum,HBarCode_Cus,HBatchNo,HBillSubType)
- values('2022',1,'3783'," + HInterID + ",getdate(),'" + HBillNo + "',1,0,0," +
- "'鑷姩缁戝畾','','', '" + msg3 + "',getdate(),'','',0,'',0,0,'" +
- HBillNo + "',0,0,0,0,0," +
- "0,0,0,0,0,'','','')");
- oCN.RunProc(sql2);
- //鍐嶆鐢熸垚鍞竴鐮�
- //鑾峰彇鍐呯爜
- long HInterID3 = DBUtility.ClsPub.CreateBillID_Prod("85", ref DBUtility.ClsPub.sExeReturnInfo);
- //鐢熸垚鍞竴鏉＄爜 鏉＄爜鍓嶇紑 = 缁勭粐浠ｇ爜 + 鐗╂枡浠ｇ爜 + 骞� + 鏈� + 鏃�
- string sTMNumber1 = OrgNum + materid+nowDate;
- Ds1 = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber1 + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
- int LSH1 = ClsPub.isInt(Ds1.Tables[0].Rows[0][0]);//鍞竴鐮�
- string sql3 = string.Format(@"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 " +
- ",HGiveAwayFlag " +
- ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " +
- ") values ("
- + "'" + LSH1 + "','鍞竴鏉＄爜','" + materid.ToString() + "',0," + sum.ToString()
- + ",'',0,0,'" + msg3 + "',getdate(),0," + sum.ToString()
- + ", 0,0,'" + HBillNo + "','3710','',"
- + sum.ToString() + "," + HInterID.ToString() + ",0,0,0,''"
- + ",0,'',getdate(),'',getdate()"
- + ", " + msg5.ToString() + "," + OrgNum.ToString() + ",''," + HInterID3.ToString()
- + ",0"
- + ",'','','',0,'','')");
-
- oCN.RunProc(sql3);
- oCN.Commit();
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "鎷艰鐢熸垚鎴愬姛";
- objJsonResult.data = null;
- return objJsonResult;
}
-
+ objJsonResult.code = FID;
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏁磋鐢熸垚鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ //}
+ //else
+ //{
+ // var HInterID = DBUtility.ClsPub.CreateBillID("3783", ref DBUtility.ClsPub.sExeReturnInfo);
+ // var HBillNo = DBUtility.ClsPub.CreateBillCode("3783", ref DBUtility.ClsPub.sExeReturnInfo, true);
+ // oCN.BeginTran();
+ // foreach (Models.ClsQK_PackingBill oItemSub in ls)
+ // {
+ // sum += oItemSub.HMinQty;
+ // materid = oItemSub.HMaterNumber;
+ // //鑾峰彇鍐呯爜
+ // long HInterID2 = DBUtility.ClsPub.CreateBillID_Prod("85", ref DBUtility.ClsPub.sExeReturnInfo);
+ // //鐢熸垚鍞竴鏉＄爜 鏉＄爜鍓嶇紑 = 缁勭粐浠ｇ爜 + 鐗╂枡浠ｇ爜 + 骞� + 鏈� + 鏃�
+ // string sTMNumber = OrgNum + oItemSub.HMaterNumber + nowDate;
+ // Ds1 = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ // LSH = ClsPub.isInt(Ds1.Tables[0].Rows[0][0]);//鍞竴鐮�
+ // //鎻掑叆鏉＄爜妗ｆ
+ // 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 " +
+ // ",HGiveAwayFlag " +
+ // ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " +
+ // ") values ("
+ // + "'" + LSH + "','鍞竴鏉＄爜'," + oItemSub.HMaterID.ToString() + "," + oItemSub.HUnitID.ToString() + "," + oItemSub.HMinQty.ToString()
+ // + ",'',0,0,'" + msg3 + "',getdate(),0," + oItemSub.HMinQty.ToString()
+ // + ", " + oItemSub.HInterID.ToString() + "," + oItemSub.HInterID.ToString() + ",'" + oItemSub.HBillNo + "','3710',''"
+ // + ",1,1," + oItemSub.HDeptID.ToString() + ",0,0,''"
+ // + ", " + oItemSub.HCusID.ToString() + ",'',getdate(),'',getdate()"
+ // + ", " + msg5.ToString() + "," + OrgNum.ToString() + ",''," + HInterID2.ToString()
+ // + ",0"
+ // + ",'" + oItemSub.HMaterName + "','','',0,'','')");
+ // //鎻掑叆缁勬墭鍗曞瓙琛�
+ // string sql = string.Format(@"insert into Sc_PackUnionBillSub(HInterID,HEntryID,HCloseMan,HCloseType,HRemark,
+ // HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,
+ // HRelationQty,HRelationMoney,HMaterID,HUnitID,HQty,HSourceID,HEquipID,HGroupID,HWorkerID,
+ // HScanDate,HBarCode,HBarCode_Pack)
+ // values(" + HInterID + ",'','',0,'鑷姩缁戝畾'," + oItemSub.HInterID + ",'','" + oItemSub.HBillNo + "','3710'," +
+ // "0,0," + oItemSub.HMaterID + "," + oItemSub.HUnitID + "," + oItemSub.HPlanQty + ", 0,0,0,0," +
+ // "getdate(),'" + LSH + "','" + HBillNo + "')");
+ // //鏇存敼鐢熶骇璁㈠崟鐨勬暟閲�
+ // string sql1 = string.Format(@"update Sc_ICMOBillSub set HQty=" + oItemSub.HSpsQty + " where HInterID=" + oItemSub.HInterID);
+
+ // oCN.RunProc(sql);
+ // oCN.RunProc(sql1);
+ // }
+ // //鐢熸垚缁勬墭鍗曚富琛�
+ // string sql2 = string.Format(@"Insert Sc_PackUnionBillMain(HYear,HPeriod,HBillType,HInterID,HDate,HBillNo,HBillStatus,HCheckItemNowID,HCheckItemNextID,
+ // HRemark,HBacker,HChecker,HMaker,HMakeDate,HUpDater,HCloseMan,HCloseType,HDeleteMan,HICMOInterID,HICMOBillNo,
+ // HBarCode_Pack,HMaterID,HUnitID,HWeight,HMWeight,HPWeight,
+ // HProdOrgID,HDeptID,HEmpID,HSNum,HPackNum,HBarCode_Cus,HBatchNo,HBillSubType)
+ // values('2022',1,'3783'," + HInterID + ",getdate(),'" + HBillNo + "',1,0,0," +
+ // "'鑷姩缁戝畾','','', '" + msg3 + "',getdate(),'','',0,'',0,0,'" +
+ // HBillNo + "',0,0,0,0,0," +
+ // "0,0,0,0,0,'','','')");
+ // oCN.RunProc(sql2);
+ // //鍐嶆鐢熸垚鍞竴鐮�
+ // //鑾峰彇鍐呯爜
+ // long HInterID3 = DBUtility.ClsPub.CreateBillID_Prod("85", ref DBUtility.ClsPub.sExeReturnInfo);
+ // //鐢熸垚鍞竴鏉＄爜 鏉＄爜鍓嶇紑 = 缁勭粐浠ｇ爜 + 鐗╂枡浠ｇ爜 + 骞� + 鏈� + 鏃�
+ // string sTMNumber1 = OrgNum + materid + nowDate;
+ // Ds1 = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber1 + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ // int LSH1 = ClsPub.isInt(Ds1.Tables[0].Rows[0][0]);//鍞竴鐮�
+ // string sql3 = string.Format(@"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 " +
+ // ",HGiveAwayFlag " +
+ // ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " +
+ // ") values ("
+ // + "'" + LSH1 + "','鍞竴鏉＄爜','" + materid.ToString() + "',0," + sum.ToString()
+ // + ",'',0,0,'" + msg3 + "',getdate(),0," + sum.ToString()
+ // + ", 0,0,'" + HBillNo + "','3710','',"
+ // + sum.ToString() + "," + HInterID.ToString() + ",0,0,0,''"
+ // + ",0,'',getdate(),'',getdate()"
+ // + ", " + msg5.ToString() + "," + OrgNum.ToString() + ",''," + HInterID3.ToString()
+ // + ",0"
+ // + ",'','','',0,'','')");
+
+ // oCN.RunProc(sql3);
+ // 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 = "鑾峰彇澶辫触锛�" + e.ToString();
@@ -322,10 +374,10 @@
left join Gy_Employee e on a.HEmpID=e.HItemID
left join Gy_Department d on a.HDeptID=d.HItemID
left join Sc_PackUnionBillMain p on a.HSourceInterID=p.HInterID
- where a.HBarCode=(select HBarCode from Sc_PackUnionBillSub where HInterID=
- (select HBarcodeNo from Gy_BarCodeBill where HBarCode='" + HInterID + "'))");
+ where a.HBarCode in(select HBarCode from Sc_PackUnionBillSub where HInterID=
+ (select HBarcodeNo from Gy_BarCodeBill where HItemID='" + HInterID + "'))");
ds = oCN.RunProcReturn(sql, "Sc_PackUnionBillSub");
-
+
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
@@ -353,7 +405,7 @@
{
try
{
-
+
ds = QK_GetPackingBillList_s(sWhere);
//if (ds.Tables[0].Rows.Count != 0 || ds != null)
@@ -412,18 +464,18 @@
/// <returns></returns>
[Route("Sc_ICMOBillController/DeleteQK_GetPackingBillList")]
[HttpGet]
- public object DeleteQK_GetPackingBillList(string HInterID,string Flag)
+ public object DeleteQK_GetPackingBillList(string HInterID, string Flag)
{
try
{
oCN.BeginTran();
- if (Flag=="0")
+ if (Flag == "0")
{
DataSet ds = new DataSet();
ds = oCN.RunProcReturn("select * from Gy_BarCodeBill where HItemID=" + HInterID, "Gy_BarCodeBill");
DataRow dr = ds.Tables[0].Rows[0];
string sql = string.Format(@"delete from Gy_BarCodeBill where HItemID=" + HInterID);
- string sql1 = string.Format(@"update Sc_ICMOBillSub set HQty=HPlanQty+" + dr["HQty"] +" where HInterID=(select HSourceInterID from Gy_BarCodeBill where HItemID="+ HInterID + ")");
+ string sql1 = string.Format(@"update Sc_ICMOBillSub set HQty=HPlanQty+" + dr["HQty"] + " where HInterID=(select HSourceInterID from Gy_BarCodeBill where HItemID=" + HInterID + ")");
oCN.RunProc(sql);
oCN.RunProc(sql1);
}
@@ -440,18 +492,18 @@
foreach (DataRow dr in dt.Rows)
{
DataSet ds = new DataSet();
- ds = oCN.RunProcReturn("select * from Gy_BarCodeBill where HBarCode='" + dr["HBarCode"].ToString()+"'", "Gy_BarCodeBill");
+ ds = oCN.RunProcReturn("select * from Gy_BarCodeBill where HBarCode='" + dr["HBarCode"].ToString() + "'", "Gy_BarCodeBill");
DataRow dr1 = ds.Tables[0].Rows[0];
- string sql = string.Format(@"delete from Gy_BarCodeBill where HBarCode='" + dr["HBarCode"].ToString()+"'");
+ string sql = string.Format(@"delete from Gy_BarCodeBill where HBarCode='" + dr["HBarCode"].ToString() + "'");
string sql1 = string.Format(@"update Sc_ICMOBillSub set HQty=HPlanQty+" + dr1["HQty"] + " where HInterID=(select HSourceInterID from Gy_BarCodeBill where HBarCode='" + dr["HBarCode"].ToString() + "')");
oCN.RunProc(sql);
oCN.RunProc(sql1);
}
}
-
+
//閬嶅巻瀹屽悗鍒犻櫎閫氳繃鏉＄爜id鎵惧埌鎵樻潯鐮侊紝閫氳繃鎵樻潯鐮佹壘鍒扮粍鎵樺崟瀛愯〃鐨勬暟鎹紝浠ュ強涓昏〃鏁版嵁
- string sql3 = string.Format(@"delect from Sc_PackUnionBillSub where HInterID=(select HBarcodeNo from Gy_BarCodeBill where HItemID="+ HInterID);
+ string sql3 = string.Format(@"delect from Sc_PackUnionBillSub where HInterID=(select HBarcodeNo from Gy_BarCodeBill where HItemID=" + HInterID);
string sql4 = string.Format(@"delect from Sc_PackUnionBillMain where HInterID=(select HBarcodeNo from Gy_BarCodeBill where HItemID=" + HInterID);
//鍒犻櫎鏈�澶х殑鍚堟垚鐨勫敮涓�鐮�
string sql5 = string.Format(@"delete from Gy_BarCodeBill where HItemID=" + HInterID);
@@ -478,5 +530,7 @@
}
}
#endregion
+
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Models/ClsQK_PackingBill.cs b/WebAPI/Models/ClsQK_PackingBill.cs
index 2884ea9..27c273e 100644
--- a/WebAPI/Models/ClsQK_PackingBill.cs
+++ b/WebAPI/Models/ClsQK_PackingBill.cs
@@ -24,6 +24,9 @@
public string HDeptName;
public string HPlanEndDate;
public Int64 HInterID;
+ public Int64 HEntryID;
public string HBillNo;
+ public string HSeOrderBillNo;
+ public string FBillNo;
}
}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 9f5f825..727a446 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2022-04-22T09:07:44.8823529Z;True|2022-04-19T19:13:40.8312746+08:00;True|2022-04-19T15:40:16.0022040+08:00;True|2022-04-19T15:13:32.9767736+08:00;False|2022-04-19T15:08:33.6507639+08:00;True|2022-04-19T15:02:51.9580210+08:00;True|2022-04-19T13:54:18.7579131+08:00;True|2022-04-12T10:36:02.1779173+08:00;True|2022-04-12T10:05:31.0222037+08:00;True|2022-04-12T09:47:49.3724819+08:00;True|2022-04-09T15:08:54.5697468+08:00;True|2022-04-08T17:31:31.0046258+08:00;True|2022-04-08T16:50:41.3018422+08:00;True|2022-04-08T10:35:36.5029980+08:00;True|2022-03-31T09:38:37.3646053+08:00;True|2022-03-29T13:57:45.4410942+08:00;True|2022-03-10T18:59:23.7994337+08:00;True|2022-03-10T18:52:39.5019082+08:00;True|2022-03-10T18:51:12.7949284+08:00;True|2022-03-10T18:50:47.2024177+08:00;True|2022-03-10T18:45:08.8409380+08:00;True|2022-03-10T18:41:17.0102564+08:00;True|2022-03-10T18:35:49.0742353+08:00;True|2022-03-10T17:57:47.4196965+08:00;True|2022-03-10T17:34:27.5723245+08:00;True|2022-03-10T16:13:59.3829164+08:00;True|2022-03-09T14:50:49.1222033+08:00;True|2022-03-09T11:21:03.0073651+08:00;False|2022-03-09T11:16:56.1792896+08:00;False|2022-03-09T11:16:49.7923320+08:00;True|2022-03-08T15:47:47.4722336+08:00;True|2022-03-08T15:47:28.5397115+08:00;True|2022-03-08T15:37:08.7379870+08:00;True|2022-03-02T17:37:54.4659976+08:00;True|2022-03-02T17:34:12.2949726+08:00;True|2022-03-02T17:26:38.7070673+08:00;True|2022-03-02T17:07:49.7024316+08:00;True|2022-03-02T17:05:22.4177336+08:00;True|2022-03-02T16:14:57.9880587+08:00;True|2022-03-01T17:52:52.6766959+08:00;True|2022-02-28T14:36:22.6449303+08:00;True|2022-02-24T15:43:36.8244163+08:00;True|2022-02-23T17:57:14.3693224+08:00;True|2022-02-23T17:46:42.1078183+08:00;False|2022-02-23T17:41:06.5886724+08:00;True|2022-02-23T16:59:45.5533581+08:00;True|2022-02-23T16:57:43.3328895+08:00;True|2022-02-21T09:09:37.2601134+08:00;True|2022-02-21T09:03:32.4071009+08:00;True|2022-02-21T08:59:59.0172082+08:00;True|2022-02-18T14:05:39.1358825+08:00;True|2022-02-18T10:23:02.4391239+08:00;True|2022-02-18T10:21:31.0559267+08:00;True|2022-02-17T16:50:11.7192509+08:00;True|2022-02-17T13:19:13.7697894+08:00;True|2022-02-11T10:36:12.7757100+08:00;True|2022-02-10T10:54:25.2685040+08:00;True|2022-02-10T10:37:02.1034768+08:00;True|2022-02-09T17:32:45.6511283+08:00;True|2022-02-09T17:24:32.5115193+08:00;True|2022-02-09T17:00:24.0662114+08:00;True|2022-02-09T16:56:42.3364622+08:00;True|2022-02-09T14:17:25.8688855+08:00;True|2022-02-09T14:11:51.6149822+08:00;True|2022-02-07T23:29:26.2842648+08:00;True|2022-02-07T23:28:58.8242274+08:00;False|2022-02-07T23:25:29.0647793+08:00;True|2022-02-07T13:06:37.5515985+08:00;True|2022-02-07T12:42:19.5220491+08:00;True|2022-02-07T09:52:59.6728595+08:00;True|2022-02-01T11:32:10.5831557+08:00;True|2022-01-29T14:09:02.9178986+08:00;True|2022-01-28T12:01:45.1416438+08:00;True|2022-01-28T11:03:41.6361866+08:00;True|2022-01-28T10:44:53.5367862+08:00;True|2022-01-28T10:40:41.6697563+08:00;True|2022-01-28T10:25:56.7093616+08:00;True|2022-01-28T09:58:13.0733060+08:00;True|2022-01-27T09:26:29.6568807+08:00;True|2022-01-27T00:47:57.9102528+08:00;True|2022-01-27T00:46:52.8845001+08:00;True|2022-01-27T00:36:34.5330938+08:00;True|2022-01-27T00:35:19.5439329+08:00;True|2022-01-27T00:33:38.5701950+08:00;True|2022-01-27T00:32:00.9028982+08:00;True|2022-01-27T00:30:13.2390921+08:00;True|2022-01-27T00:28:23.2989144+08:00;True|2022-01-27T00:16:01.3789455+08:00;True|2022-01-27T00:09:58.8112352+08:00;True|2022-01-27T00:00:40.8353538+08:00;True|2022-01-26T23:37:50.9494735+08:00;True|2022-01-26T23:29:39.8647473+08:00;True|2022-01-26T23:20:49.3274392+08:00;True|2022-01-26T23:15:53.7037293+08:00;True|2022-01-26T23:06:28.8595953+08:00;True|2022-01-26T23:02:12.9882299+08:00;True|2022-01-26T22:55:33.2535730+08:00;True|2022-01-26T22:51:01.8427947+08:00;True|2022-01-26T22:47:44.0715387+08:00;True|2022-01-26T22:20:21.7217039+08:00;True|2022-01-26T22:13:39.5372069+08:00;True|2022-01-26T22:01:31.2113177+08:00;True|2022-01-26T21:55:26.5478921+08:00;True|2022-01-26T21:50:18.2700369+08:00;True|2022-01-26T21:48:52.0020233+08:00;True|2022-01-26T19:19:29.4530523+08:00;True|2022-01-26T19:07:21.6474231+08:00;True|2022-01-26T18:25:42.2933291+08:00;True|2022-01-26T12:39:02.0149050+08:00;True|2022-01-26T12:13:43.9149452+08:00;True|2022-01-26T11:24:33.5742248+08:00;True|2022-01-26T08:51:10.8105076+08:00;True|2022-01-25T21:07:32.9069261+08:00;True|2022-01-24T01:35:12.3309466+08:00;True|2022-01-23T23:19:15.9702821+08:00;True|2022-01-23T21:50:41.6903353+08:00;True|2022-01-23T21:25:57.6084267+08:00;True|2022-01-23T21:16:10.1516535+08:00;True|2022-01-23T20:52:08.3745284+08:00;True|2022-01-23T18:19:32.2386502+08:00;True|2022-01-23T18:11:42.0830325+08:00;True|2022-01-23T18:00:01.3239547+08:00;True|2022-01-23T12:18:48.2466943+08:00;True|2022-01-22T00:48:50.4531647+08:00;True|2022-01-21T13:10:32.8173598+08:00;True|2022-01-21T13:04:01.6388059+08:00;True|2022-01-21T12:51:40.5304103+08:00;True|2022-01-21T12:44:06.3059885+08:00;True|2022-01-21T12:34:33.9314010+08:00;True|2022-01-21T11:39:20.1088577+08:00;True|2022-01-20T11:33:49.0516846+08:00;True|2022-01-20T10:02:12.0295471+08:00;True|2022-01-20T10:02:03.3535503+08:00;True|2022-01-19T23:56:18.7293193+08:00;True|2022-01-19T22:30:14.6986228+08:00;True|2022-01-19T22:15:08.8608795+08:00;True|2022-01-19T21:57:55.2295030+08:00;True|2022-01-19T13:50:37.8588759+08:00;True|2022-01-19T13:42:52.9761531+08:00;True|2022-01-19T00:26:36.9722917+08:00;True|2022-01-19T00:15:30.8583143+08:00;True|2022-01-18T21:19:30.6193048+08:00;True|2022-01-18T21:12:07.1453825+08:00;True|2022-01-18T20:35:27.3779956+08:00;True|2022-01-18T17:44:45.2318570+08:00;True|2022-01-18T14:45:29.0299640+08:00;True|2022-01-17T22:23:20.8214203+08:00;True|2022-01-17T21:49:15.7740045+08:00;True|2022-01-17T21:47:24.6997598+08:00;True|2022-01-17T21:44:00.1942787+08:00;True|2022-01-17T21:43:15.5992687+08:00;True|2022-01-17T21:33:16.8034756+08:00;True|2022-01-17T21:25:39.9909343+08:00;True|2022-01-17T21:13:03.9659338+08:00;True|2022-01-17T20:32:14.8869091+08:00;True|2022-01-17T19:01:46.5753686+08:00;True|2022-01-17T18:31:24.1032169+08:00;True|2022-01-17T18:21:39.2918684+08:00;True|2022-01-17T18:12:07.4859038+08:00;True|2022-01-17T18:09:26.6989718+08:00;True|2022-01-17T18:04:36.7564997+08:00;True|2022-01-17T17:57:44.7814863+08:00;True|2022-01-17T17:51:50.1516107+08:00;True|2022-01-17T17:39:29.2918799+08:00;True|2022-01-17T14:55:21.5859341+08:00;True|2022-01-17T14:38:06.5091500+08:00;True|2022-01-17T14:30:25.5378436+08:00;True|2022-01-16T19:15:24.5874858+08:00;True|2022-01-16T19:07:49.0613424+08:00;True|2022-01-16T16:10:47.3112741+08:00;False|2022-01-14T19:09:41.9296709+08:00;False|2022-01-14T18:56:11.0569808+08:00;False|2022-01-14T18:28:20.1376762+08:00;False|2022-01-14T18:27:30.8678130+08:00;False|2022-01-14T18:22:45.4436504+08:00;False|2022-01-14T18:19:37.0374753+08:00;False|2022-01-14T18:18:48.5868254+08:00;False|2022-01-14T18:14:02.5810257+08:00;False|2022-01-14T18:09:51.1730754+08:00;False|2022-01-14T18:09:17.8940754+08:00;True|2022-01-13T20:08:16.2937608+08:00;True|2022-01-13T20:07:30.1505466+08:00;True|2022-01-13T13:39:42.0146294+08:00;True|2022-01-13T13:38:07.5062471+08:00;True|2022-01-13T11:29:49.3751232+08:00;True|2022-01-13T11:05:43.9574142+08:00;True|2022-01-13T10:33:23.1921058+08:00;True|2022-01-12T20:38:16.9165651+08:00;True|2022-01-12T20:24:46.3779264+08:00;True|2022-01-12T20:03:06.5030626+08:00;True|2022-01-12T19:44:55.4294326+08:00;True|2022-01-12T12:58:45.9548600+08:00;True|2022-01-12T11:28:44.7797749+08:00;True|2022-01-11T18:07:30.9151356+08:00;True|2022-01-11T15:06:32.7301609+08:00;True|2022-01-11T09:27:00.1766442+08:00;True|2021-12-30T14:41:56.8541015+08:00;True|2021-12-30T13:45:00.6130694+08:00;True|2021-12-30T13:44:18.7370780+08:00;True|2021-12-30T13:36:52.8171136+08:00;True|2021-12-28T19:14:22.5979649+08:00;True|2021-12-28T13:13:39.3543252+08:00;True|2021-12-27T15:31:26.6037782+08:00;True|2021-12-27T15:28:54.4824480+08:00;True|2021-12-27T15:22:47.8436108+08:00;True|2021-12-27T15:04:37.0711590+08:00;True|2021-12-27T15:03:52.0932499+08:00;True|2021-12-27T15:03:33.0172733+08:00;True|2021-12-27T13:28:27.4252747+08:00;True|2021-12-25T19:38:33.6784042+08:00;True|2021-12-24T20:47:43.3471563+08:00;True|2021-12-24T20:14:57.6946814+08:00;True|2021-12-24T19:55:21.1843105+08:00;True|2021-12-24T19:49:54.6719726+08:00;True|2021-12-24T19:38:14.1180741+08:00;True|2021-12-22T13:51:37.1082523+08:00;True|2021-12-21T15:38:59.8015096+08:00;True|2021-12-21T15:29:54.8095063+08:00;False|2021-12-21T15:29:21.7006531+08:00;False|2021-12-21T15:16:18.2218025+08:00;False|2021-12-21T15:11:38.1215841+08:00;False|2021-12-21T15:08:27.0590078+08:00;True|2021-12-10T14:12:36.4065298+08:00;True|2021-12-10T13:54:03.4921778+08:00;True|2021-12-10T13:25:49.0439086+08:00;True|2021-12-10T13:19:58.9494477+08:00;True|2021-12-10T13:10:45.3929017+08:00;True|2021-12-10T11:06:53.2416794+08:00;True|2021-12-07T17:23:28.9380484+08:00;True|2021-12-07T17:13:52.4384814+08:00;True|2021-12-07T16:39:49.2020208+08:00;True|2021-12-07T15:18:20.9024533+08:00;True|2021-12-07T15:07:35.4428035+08:00;True|2021-12-07T15:01:02.0445043+08:00;True|2021-12-07T14:50:08.9019705+08:00;True|2021-12-07T14:34:50.4993666+08:00;False|2021-12-07T14:32:56.0408332+08:00;True|2021-12-06T17:11:41.4004606+08:00;True|2021-12-06T16:48:07.6029757+08:00;True|2021-12-06T13:46:35.9437718+08:00;True|2021-12-06T13:45:07.6622615+08:00;True|2021-12-06T11:25:04.3483155+08:00;True|2021-12-06T11:18:24.5804187+08:00;True|2021-11-22T16:27:05.4241947+08:00;True|2021-11-22T13:40:17.6768280+08:00;True|2021-11-19T16:15:19.9085104+08:00;True|2021-11-09T10:34:21.1623512+08:00;True|2021-11-07T16:57:59.7380254+08:00;True|2021-11-07T16:53:47.4198852+08:00;True|2021-11-07T16:42:05.5096826+08:00;True|2021-11-07T16:37:21.0729013+08:00;True|2021-11-05T20:51:17.6170717+08:00;True|2021-11-05T20:35:14.6250333+08:00;True|2021-11-05T19:30:19.8374158+08:00;True|2021-11-05T19:22:46.2276569+08:00;True|2021-11-05T19:20:30.8253213+08:00;True|2021-11-05T19:16:45.7553310+08:00;True|2021-11-05T19:16:00.4532689+08:00;True|2021-11-05T19:12:25.9022478+08:00;False|2021-11-05T19:11:26.5753529+08:00;True|2021-11-05T19:09:30.0085433+08:00;True|2021-11-05T18:48:19.9395153+08:00;True|2021-11-05T18:45:34.3437897+08:00;True|2021-11-05T18:43:43.4558159+08:00;True|2021-11-05T18:40:40.9948500+08:00;True|2021-11-05T18:34:18.4440455+08:00;True|2021-11-05T15:54:51.6037132+08:00;True|2021-10-28T16:27:53.9728270+08:00;True|2021-10-28T16:03:59.5629998+08:00;True|2021-10-28T08:51:04.2549186+08:00;True|2021-10-27T15:14:53.5506098+08:00;True|2021-10-27T15:00:44.9100320+08:00;True|2021-10-27T13:14:46.7921647+08:00;True|2021-10-27T11:24:49.4550753+08:00;True|2021-10-27T10:10:10.3545125+08:00;True|2021-10-27T10:02:24.9248610+08:00;True|2021-10-27T09:59:40.3795897+08:00;True|2021-10-27T09:56:30.6629207+08:00;True|2021-10-27T09:10:48.3883432+08:00;True|2021-10-27T09:03:31.9191991+08:00;True|2021-10-27T08:59:59.7651159+08:00;True|2021-10-27T08:36:11.8620997+08:00;True|2021-10-27T08:26:40.2533014+08:00;True|2021-10-26T09:19:35.5674748+08:00;True|2021-10-26T09:17:17.6900747+08:00;True|2021-10-26T09:14:32.3999220+08:00;True|2021-10-25T15:08:21.2581763+08:00;True|2021-10-25T10:01:57.8524903+08:00;True|2021-10-25T09:28:51.6294879+08:00;True|2021-10-25T09:25:50.3373336+08:00;True|2021-10-25T09:23:37.0203978+08:00;True|2021-10-25T09:18:23.3380608+08:00;True|2021-10-25T09:15:10.5292071+08:00;True|2021-10-25T08:56:30.4632027+08:00;True|2021-10-25T08:50:11.4697392+08:00;True|2021-10-22T13:46:49.7207066+08:00;True|2021-10-22T10:06:33.3130089+08:00;True|2021-10-20T14:32:10.1235516+08:00;True|2021-10-20T14:16:18.6496291+08:00;True|2021-10-20T14:08:49.2443715+08:00;True|2021-10-20T14:05:14.6847950+08:00;True|2021-10-20T13:30:21.6057636+08:00;True|2021-10-20T10:55:22.2151716+08:00;True|2021-10-19T10:42:13.4198267+08:00;True|2021-10-19T10:01:41.0018108+08:00;True|2021-10-19T09:59:11.2127619+08:00;True|2021-10-19T09:54:04.8472874+08:00;True|2021-10-15T11:19:15.5327495+08:00;True|2021-10-15T11:17:41.0686485+08:00;True|2021-10-15T11:12:11.8295042+08:00;True|2021-10-15T10:33:31.5670079+08:00;True|2021-10-15T10:27:45.0815146+08:00;True|2021-10-14T14:51:28.5331025+08:00;True|2021-10-14T14:37:28.3276051+08:00;True|2021-10-14T14:23:39.0606792+08:00;True|2021-10-14T14:21:03.8140347+08:00;True|2021-10-13T10:31:10.6628977+08:00;True|2021-10-13T10:12:24.4238027+08:00;True|2021-10-13T08:47:43.9314486+08:00;True|2021-10-12T14:07:18.6065183+08:00;True|2021-10-12T10:34:10.1682362+08:00;True|2021-10-12T10:27:14.3073332+08:00;True|2021-10-12T10:22:08.0004619+08:00;True|2021-10-12T10:21:03.0275378+08:00;True|2021-10-12T10:11:54.9812692+08:00;True|2021-10-11T16:59:07.3568342+08:00;True|2021-10-11T16:53:14.2016138+08:00;True|2021-10-11T16:21:35.0133775+08:00;True|2021-10-11T15:34:19.5731935+08:00;True|2021-10-11T15:31:07.5780983+08:00;True|2021-10-11T15:06:47.1145237+08:00;True|2021-10-11T15:03:25.5000280+08:00;True|2021-10-11T10:12:57.6416898+08:00;True|2021-10-09T10:15:17.9235165+08:00;True|2021-10-09T10:13:51.3318441+08:00;True|2021-10-09T10:01:21.6661542+08:00;True|2021-10-09T09:58:41.9225837+08:00;True|2021-10-08T14:56:49.7935800+08:00;True|2021-10-08T14:35:41.4490063+08:00;True|2021-10-08T14:02:42.6990656+08:00;True|2021-09-29T15:48:55.1547397+08:00;True|2021-09-29T15:48:23.5567191+08:00;True|2021-09-27T16:17:35.7180978+08:00;True|2021-09-27T15:51:50.4240134+08:00;True|2021-09-23T20:55:27.3554447+08:00;True|2021-09-23T14:14:44.0572017+08:00;True|2021-09-23T13:51:56.2344673+08:00;True|2021-09-23T10:46:16.7417007+08:00;True|2021-09-23T10:42:23.2117537+08:00;True|2021-09-22T15:21:22.9615672+08:00;True|2021-09-22T14:23:32.7907754+08:00;True|2021-09-22T13:48:03.4780947+08:00;True|2021-09-22T11:05:24.5249356+08:00;True|2021-09-22T10:00:19.0962943+08:00;True|2021-09-22T09:30:26.2686514+08:00;True|2021-09-17T11:22:34.5692792+08:00;True|2021-09-16T16:11:27.5372277+08:00;True|2021-09-16T14:53:40.8396557+08:00;True|2021-09-16T14:32:29.7905500+08:00;True|2021-09-16T14:26:46.2224219+08:00;True|2021-09-16T10:32:24.4244440+08:00;True|2021-09-15T11:10:35.3529360+08:00;True|2021-09-15T11:08:30.0857376+08:00;True|2021-09-15T11:05:56.7191571+08:00;True|2021-09-14T01:24:39.8041136+08:00;True|2021-09-14T01:05:01.1593327+08:00;True|2021-09-14T00:44:14.7233198+08:00;True|2021-09-13T23:48:19.4506233+08:00;True|2021-09-13T20:30:31.3243872+08:00;True|2021-09-13T19:45:35.9108911+08:00;False|2021-09-13T19:44:59.2779092+08:00;True|2021-09-13T18:09:22.4994381+08:00;True|2021-09-10T14:18:27.5788854+08:00;True|2021-09-09T15:57:01.7407207+08:00;True|2021-09-09T15:49:34.2598998+08:00;True|2021-09-09T11:32:10.7853024+08:00;True|2021-09-09T11:10:48.6840025+08:00;True|2021-09-09T10:35:37.3883078+08:00;True|2021-09-07T14:11:49.8497588+08:00;True|2021-09-07T13:34:48.4693349+08:00;True|2021-09-06T14:33:48.7549675+08:00;True|2021-09-03T16:27:51.1888520+08:00;True|2021-09-03T16:19:35.9003465+08:00;True|2021-09-03T15:46:28.1828032+08:00;True|2021-09-03T15:34:21.9362871+08:00;True|2021-09-03T11:24:49.8749819+08:00;True|2021-09-03T11:21:17.8373159+08:00;True|2021-09-03T11:16:53.2208136+08:00;True|2021-09-03T11:12:23.9063804+08:00;True|2021-09-03T09:11:09.2435721+08:00;True|2021-09-02T11:16:15.1370453+08:00;True|2021-09-02T10:35:39.1171879+08:00;True|2021-09-01T10:17:09.4536285+08:00;True|2021-09-01T09:46:28.4581776+08:00;True|2021-08-31T08:54:26.8588887+08:00;True|2021-08-31T08:39:08.3685693+08:00;True|2021-08-30T17:11:56.8438985+08:00;True|2021-08-30T15:59:42.0820292+08:00;True|2021-08-30T15:45:18.1868510+08:00;True|2021-08-30T14:56:08.3958863+08:00;True|2021-08-30T14:37:11.5379830+08:00;True|2021-08-30T14:35:34.8775934+08:00;True|2021-08-30T14:24:36.5111821+08:00;True|2021-08-30T10:05:49.6945200+08:00;True|2021-08-30T10:03:28.4064538+08:00;True|2021-08-30T10:00:16.8360929+08:00;True|2021-08-30T09:56:09.4434379+08:00;True|2021-08-30T09:55:36.1725334+08:00;True|2021-08-30T09:52:04.8600054+08:00;True|2021-08-30T09:47:46.4225655+08:00;True|2021-08-30T09:45:20.4894962+08:00;False|2021-08-27T17:17:34.2646751+08:00;False|2021-08-27T16:01:21.2791979+08:00;False|2021-08-27T15:58:06.9667160+08:00;False|2021-08-27T15:38:37.4818036+08:00;False|2021-08-27T15:21:02.8863114+08:00;False|2021-08-27T15:20:28.6828668+08:00;True|2021-08-26T16:00:44.3162145+08:00;True|2021-08-26T08:57:31.3842587+08:00;True|2021-08-23T08:43:41.1549775+08:00;True|2021-08-22T09:24:12.7210871+08:00;True|2021-08-22T09:19:53.8300229+08:00;True|2021-08-20T20:00:52.0140407+08:00;True|2021-08-20T19:40:14.7712765+08:00;True|2021-08-19T17:37:54.9748049+08:00;True|2021-08-19T17:20:11.0515687+08:00;True|2021-08-19T16:12:35.4392809+08:00;True|2021-08-19T16:06:50.6204587+08:00;True|2021-08-19T16:03:53.0824286+08:00;True|2021-08-19T15:56:01.3498791+08:00;True|2021-08-19T10:18:50.8113630+08:00;True|2021-08-19T09:58:06.2784035+08:00;True|2021-08-19T09:56:54.0619777+08:00;True|2021-08-19T00:32:08.3503093+08:00;True|2021-08-19T00:11:18.3150227+08:00;True|2021-08-19T00:02:49.4827718+08:00;True|2021-08-18T23:54:45.4845900+08:00;True|2021-08-18T23:39:51.6147977+08:00;True|2021-08-18T23:16:42.7214379+08:00;True|2021-08-18T22:38:57.4681929+08:00;True|2021-08-18T21:41:58.7560707+08:00;True|2021-08-18T21:11:52.2369249+08:00;True|2021-08-18T21:01:49.5669106+08:00;True|2021-08-18T20:47:46.5352688+08:00;False|2021-08-18T20:46:36.7956141+08:00;False|2021-08-18T20:46:01.0502138+08:00;True|2021-08-18T19:39:12.8186242+08:00;False|2021-08-18T19:38:12.6839708+08:00;True|2021-08-18T19:15:51.4626694+08:00;True|2021-08-18T16:07:20.4350886+08:00;True|2021-08-18T14:29:41.7171934+08:00;True|2021-08-18T14:20:36.3647361+08:00;True|2021-08-16T09:08:58.3617662+08:00;True|2021-08-15T20:44:29.9214083+08:00;True|2021-08-15T20:36:17.0958549+08:00;True|2021-08-15T20:29:34.3879773+08:00;True|2021-08-15T20:23:47.4052038+08:00;True|2021-08-15T15:01:19.7830862+08:00;True|2021-08-15T12:15:18.3433782+08:00;True|2021-08-13T20:59:11.3947130+08:00;True|2021-08-06T22:49:09.9538339+08:00;True|2021-08-06T22:35:19.0418168+08:00;True|2021-08-06T20:29:47.4241975+08:00;True|2021-08-06T14:08:16.4791827+08:00;True|2021-08-06T13:59:28.9874611+08:00;True|2021-08-06T13:57:34.3723977+08:00;True|2021-08-06T13:36:03.4816652+08:00;True|2021-08-06T12:22:52.5055221+08:00;True|2021-08-06T09:31:58.1272499+08:00;True|2021-08-06T09:26:51.6310039+08:00;True|2021-08-06T09:24:22.2899244+08:00;True|2021-08-06T09:06:30.6477912+08:00;True|2021-08-06T09:00:55.5101612+08:00;True|2021-08-06T08:49:59.9616490+08:00;True|2021-08-06T08:45:18.8586902+08:00;True|2021-08-05T20:09:25.8861998+08:00;True|2021-08-04T19:14:27.2396953+08:00;True|2021-08-04T19:11:47.5849093+08:00;True|2021-08-04T16:42:54.0149043+08:00;True|2021-08-04T15:02:11.5056561+08:00;True|2021-08-04T14:58:37.1435509+08:00;True|2021-08-04T14:55:34.7380132+08:00;True|2021-08-04T14:47:42.5933921+08:00;True|2021-08-04T14:45:17.9911874+08:00;True|2021-08-04T13:52:20.9601351+08:00;True|2021-08-04T09:48:28.8796992+08:00;True|2021-08-03T18:14:13.1894998+08:00;True|2021-08-03T17:45:35.1349721+08:00;True|2021-08-03T17:21:52.6028977+08:00;True|2021-08-03T17:20:35.4423020+08:00;True|2021-08-03T17:03:33.1667669+08:00;True|2021-08-03T17:01:54.2656787+08:00;True|2021-08-03T17:00:22.2778374+08:00;True|2021-08-03T16:56:58.8902582+08:00;True|2021-08-03T15:02:21.8601533+08:00;True|2021-08-03T14:57:34.0186758+08:00;True|2021-08-03T14:28:47.2242515+08:00;True|2021-08-03T14:22:22.4554236+08:00;True|2021-08-03T14:21:51.1339715+08:00;True|2021-08-03T13:37:33.9697131+08:00;True|2021-08-03T13:28:29.7591095+08:00;True|2021-08-03T11:35:09.5118324+08:00;True|2021-08-03T11:11:23.3051573+08:00;True|2021-08-02T13:14:42.3663755+08:00;True|2021-07-30T22:50:19.9749878+08:00;True|2021-07-30T22:49:31.2150970+08:00;True|2021-07-28T19:12:05.8381075+08:00;True|2021-07-28T18:59:45.4808797+08:00;True|2021-07-28T18:15:58.8301509+08:00;True|2021-07-28T18:04:54.8613546+08:00;True|2021-07-28T17:53:48.6225611+08:00;True|2021-07-28T17:42:50.9171563+08:00;True|2021-07-28T17:17:16.3137677+08:00;True|2021-07-28T17:11:46.8925200+08:00;True|2021-07-28T16:28:27.6823943+08:00;True|2021-07-28T16:23:00.3385836+08:00;True|2021-07-28T09:57:55.4237411+08:00;True|2021-07-28T08:38:29.6691541+08:00;True|2021-07-27T23:16:32.0331671+08:00;True|2021-07-27T23:06:08.1947249+08:00;True|2021-07-27T23:05:58.4619176+08:00;True|2021-07-27T18:42:09.5358261+08:00;True|2021-07-27T18:30:04.8532823+08:00;True|2021-07-27T18:29:43.5775092+08:00;True|2021-07-27T15:16:49.8356224+08:00;True|2021-07-27T15:05:27.8453220+08:00;True|2021-07-27T14:59:15.9519440+08:00;True|2021-07-27T09:23:32.6111337+08:00;True|2021-07-27T08:27:41.6395353+08:00;True|2021-07-27T08:25:56.7378296+08:00;True|2021-07-26T11:18:46.0856966+08:00;True|2021-07-26T11:18:02.0751924+08:00;True|2021-07-26T11:13:49.6285395+08:00;True|2021-07-21T21:08:25.9898902+08:00;True|2021-07-21T20:09:26.2258104+08:00;True|2021-07-13T16:17:25.8407435+08:00;True|2021-07-13T13:46:13.4309531+08:00;True|2021-07-13T12:29:04.5082461+08:00;True|2021-06-29T13:55:01.6864637+08:00;True|2021-06-29T10:38:52.2206472+08:00;True|2021-06-29T10:10:13.1540749+08:00;True|2021-06-28T14:37:56.3853273+08:00;False|2021-06-28T14:36:57.5726124+08:00;True|2021-06-25T14:17:57.5196108+08:00;True|2021-06-25T13:56:38.9522535+08:00;True|2021-06-24T19:38:32.8766933+08:00;True|2021-06-24T18:26:35.6118833+08:00;True|2021-06-24T18:02:52.8136877+08:00;True|2021-06-24T17:48:49.5851948+08:00;True|2021-06-24T17:45:46.7527572+08:00;True|2021-06-24T15:05:20.1592723+08:00;True|2021-06-23T16:18:15.6814625+08:00;True|2021-06-23T16:05:24.6112343+08:00;True|2021-06-23T15:14:08.2489658+08:00;True|2021-06-23T13:52:58.6029788+08:00;True|2021-06-22T16:11:20.4726923+08:00;True|2021-06-22T16:04:53.7231389+08:00;True|2021-06-22T15:50:59.2583262+08:00;True|2021-06-22T15:38:15.3016140+08:00;True|2021-06-22T15:34:42.9185543+08:00;True|2021-06-22T15:21:55.1419108+08:00;True|2021-06-22T15:07:21.5357494+08:00;True|2021-06-22T15:03:35.0535733+08:00;True|2021-06-22T14:54:47.8802969+08:00;True|2021-06-22T11:19:38.7303011+08:00;True|2021-06-22T08:53:49.2882695+08:00;True|2021-06-22T08:47:54.8286530+08:00;True|2021-06-21T16:27:19.3017700+08:00;True|2021-06-21T15:32:28.7237952+08:00;True|2021-06-21T12:34:02.6329555+08:00;True|2021-06-21T12:24:17.5427495+08:00;True|2021-06-21T10:47:30.6423502+08:00;True|2021-06-21T08:43:20.3026558+08:00;True|2021-06-19T15:10:06.8335499+08:00;True|2021-06-18T15:37:29.5009930+08:00;True|2021-06-18T13:46:35.6283432+08:00;True|2021-06-18T10:00:37.1474954+08:00;True|2021-06-18T09:55:21.8551780+08:00;True|2021-06-18T09:22:27.8432927+08:00;True|2021-06-17T11:17:43.2166430+08:00;True|2021-06-17T09:24:09.8350403+08:00;True|2021-06-16T16:10:47.8564888+08:00;True|2021-06-16T16:04:09.8286582+08:00;True|2021-06-16T15:12:29.9427169+08:00;True|2021-06-16T14:58:45.6801892+08:00;True|2021-06-16T14:46:01.6873221+08:00;True|2021-06-16T11:02:06.1272477+08:00;True|2021-06-16T09:33:56.0223915+08:00;True|2021-06-16T08:50:07.6995413+08:00;True|2021-06-16T08:28:38.7692635+08:00;True|2021-06-16T01:04:19.6282474+08:00;True|2021-06-16T01:03:50.5058323+08:00;False|2021-06-16T01:02:15.3819672+08:00;False|2021-06-16T01:01:38.6171098+08:00;True|2021-06-16T00:34:54.9902044+08:00;True|2021-06-15T23:55:36.2003828+08:00;True|2021-06-15T22:47:17.2192750+08:00;True|2021-06-15T22:42:41.1512585+08:00;True|2021-06-15T22:38:01.7390462+08:00;True|2021-06-15T22:14:11.2060782+08:00;True|2021-06-15T22:12:27.0615357+08:00;True|2021-06-15T22:07:59.9280871+08:00;True|2021-06-15T22:04:21.5051427+08:00;True|2021-06-15T21:25:55.0099814+08:00;True|2021-06-15T19:13:51.3494172+08:00;True|2021-06-15T19:02:17.6844742+08:00;True|2021-06-15T18:47:37.1629411+08:00;False|2021-06-15T18:47:11.0828111+08:00;True|2021-06-15T18:38:26.6620668+08:00;True|2021-06-15T18:33:45.2069831+08:00;True|2021-06-15T18:24:52.0550838+08:00;True|2021-06-15T18:19:43.6999796+08:00;True|2021-06-15T18:08:17.2464506+08:00;True|2021-06-15T18:03:51.3952624+08:00;True|2021-06-15T18:01:20.6141766+08:00;True|2021-06-15T17:59:04.4479416+08:00;True|2021-06-15T17:41:44.6389379+08:00;True|2021-06-15T17:39:03.1565124+08:00;True|2021-06-15T17:34:41.0634638+08:00;True|2021-06-15T17:33:50.4853178+08:00;True|2021-06-15T17:25:38.5914037+08:00;True|2021-06-15T17:22:21.3611360+08:00;True|2021-06-15T17:16:49.4970813+08:00;True|2021-06-15T17:05:28.9389484+08:00;True|2021-06-15T16:52:54.6372199+08:00;True|2021-06-15T16:51:23.9081030+08:00;True|2021-06-15T16:45:40.6017997+08:00;True|2021-06-15T16:41:05.0218887+08:00;True|2021-06-15T16:38:02.8541862+08:00;True|2021-06-15T16:22:10.3118721+08:00;True|2021-06-15T16:12:11.1552506+08:00;True|2021-06-15T15:33:42.0100494+08:00;True|2021-06-15T15:28:39.7145659+08:00;True|2021-06-15T15:15:02.7939125+08:00;True|2021-06-15T14:49:14.2300396+08:00;True|2021-06-15T14:42:28.1198064+08:00;True|2021-06-15T13:30:12.7997686+08:00;True|2021-06-15T13:25:37.7284670+08:00;True|2021-06-15T13:23:43.6207813+08:00;False|2021-06-15T13:23:19.4190232+08:00;True|2021-06-15T13:16:38.5062674+08:00;True|2021-06-15T13:03:31.2055635+08:00;True|2021-06-15T12:58:43.1653215+08:00;True|2021-06-15T12:39:22.8442109+08:00;True|2021-06-15T12:35:09.1288556+08:00;False|2021-06-15T12:33:50.0723143+08:00;True|2021-06-15T11:28:01.9733727+08:00;True|2021-06-15T11:26:26.6569392+08:00;True|2021-06-15T11:22:43.0366435+08:00;True|2021-06-15T11:07:50.1610580+08:00;True|2021-06-15T10:32:59.1925931+08:00;True|2021-06-10T17:16:57.9552310+08:00;True|2021-06-10T16:44:42.2731836+08:00;True|2021-06-10T14:39:27.6745737+08:00;True|2021-06-10T12:15:05.1524413+08:00;True|2021-06-09T18:19:24.1005606+08:00;True|2021-06-09T17:56:09.5646288+08:00;True|2021-06-09T13:34:06.1882292+08:00;True|2021-06-09T13:29:54.5924933+08:00;True|2021-06-09T13:25:55.7520662+08:00;True|2021-06-09T13:07:47.6686811+08:00;True|2021-06-09T12:59:41.2595048+08:00;True|2021-06-09T12:45:27.1305548+08:00;True|2021-06-09T12:29:52.1418191+08:00;True|2021-06-09T12:24:12.7610588+08:00;True|2021-06-09T11:31:25.3409568+08:00;True|2021-06-09T09:57:44.4387175+08:00;True|2021-06-09T09:54:26.5161307+08:00;True|2021-06-09T09:14:14.7288045+08:00;True|2021-06-09T09:10:25.1812139+08:00;True|2021-06-09T08:46:21.6585123+08:00;True|2021-06-08T19:56:55.7192062+08:00;True|2021-06-08T19:52:59.0326821+08:00;True|2021-06-08T19:49:13.6274217+08:00;True|2021-06-08T19:09:22.1038939+08:00;True|2021-06-08T15:28:41.3716247+08:00;True|2021-06-08T15:26:47.2621178+08:00;True|2021-06-08T13:49:45.8936617+08:00;True|2021-06-08T13:43:18.8115502+08:00;True|2021-06-08T10:04:06.2200731+08:00;True|2021-06-08T09:17:10.0470792+08:00;True|2021-06-08T08:44:37.4395849+08:00;True|2021-06-08T00:01:09.3745613+08:00;True|2021-06-07T23:49:31.5196888+08:00;True|2021-06-07T23:41:00.8017855+08:00;True|2021-06-07T23:21:53.1371134+08:00;True|2021-06-07T23:01:27.5712153+08:00;True|2021-06-07T22:36:12.9274014+08:00;True|2021-06-07T22:23:00.6545134+08:00;True|2021-06-07T17:44:47.5686346+08:00;True|2021-06-07T17:17:01.3431233+08:00;True|2021-06-07T16:53:28.9989587+08:00;True|2021-06-07T16:41:10.4975607+08:00;True|2021-06-07T14:21:06.8176477+08:00;True|2021-06-07T14:10:39.0355659+08:00;True|2021-06-07T12:34:31.4562732+08:00;True|2021-06-07T12:28:44.9629488+08:00;True|2021-06-07T10:30:26.9387988+08:00;True|2021-06-07T09:12:14.7658099+08:00;True|2021-06-07T08:37:19.6353792+08:00;True|2021-06-07T08:35:25.2031954+08:00;True|2021-06-05T07:07:32.0541266+08:00;True|2021-06-05T06:44:35.9475270+08:00;True|2021-06-05T06:37:27.4595197+08:00;True|2021-06-05T06:26:59.7663998+08:00;True|2021-06-05T05:43:12.8699318+08:00;True|2021-06-04T17:00:41.2426007+08:00;True|2021-06-04T16:08:03.8078072+08:00;True|2021-06-04T15:47:21.6412616+08:00;True|2021-06-04T15:21:02.4239800+08:00;True|2021-06-04T15:20:37.8641854+08:00;True|2021-06-04T13:38:51.5088395+08:00;True|2021-06-04T10:20:01.7784282+08:00;True|2021-06-04T10:13:50.3548857+08:00;True|2021-06-04T10:11:25.5017821+08:00;True|2021-06-04T10:09:51.6792228+08:00;True|2021-06-04T10:02:39.5851057+08:00;True|2021-06-04T09:30:40.4495494+08:00;True|2021-06-03T13:16:36.0317546+08:00;True|2021-06-03T13:12:47.0402047+08:00;True|2021-06-02T14:37:08.9683351+08:00;True|2021-06-02T14:10:15.7439829+08:00;True|2021-06-02T13:59:46.5841931+08:00;True|2021-06-02T13:25:18.7962660+08:00;True|2021-06-02T13:23:16.2261980+08:00;True|2021-06-01T15:37:32.2495085+08:00;True|2021-06-01T15:21:01.2856122+08:00;True|2021-06-01T15:13:36.7262365+08:00;True|2021-06-01T15:10:26.8905629+08:00;True|2021-06-01T14:56:17.5231551+08:00;True|2021-06-01T14:38:39.7895927+08:00;True|2021-06-01T14:23:12.3265287+08:00;True|2021-03-01T09:11:31.3226422+08:00;True|2021-05-26T14:54:56.9426462+08:00;True|2021-05-26T13:57:33.7780451+08:00;True|2021-05-26T13:39:02.8043358+08:00;True|2021-02-25T16:01:40.2917200+08:00;True|2021-02-25T15:49:46.6681205+08:00;True|2021-02-25T15:16:30.9372640+08:00;True|2021-05-25T13:10:21.7831921+08:00;True|2021-05-25T11:21:38.5224475+08:00;True|2021-05-25T11:12:52.0637175+08:00;True|2021-05-25T11:02:18.4164663+08:00;True|2021-05-25T10:52:06.8998521+08:00;True|2021-05-25T10:50:45.0929606+08:00;True|2021-05-25T10:45:54.1498313+08:00;True|2021-05-25T10:39:27.8602249+08:00;True|2021-05-25T10:34:49.5771162+08:00;True|2021-05-25T10:17:30.3009163+08:00;True|2021-05-25T10:14:03.8512581+08:00;True|2021-05-25T10:05:33.4343836+08:00;True|2021-05-24T17:01:23.3221168+08:00;True|2021-05-24T10:11:24.0197347+08:00;False|2021-05-24T10:11:07.6338995+08:00;</History>
+ <History>True|2022-05-06T07:13:12.2438900Z;True|2022-05-06T14:49:39.8536594+08:00;True|2022-04-22T17:07:44.8823529+08:00;True|2022-04-19T19:13:40.8312746+08:00;True|2022-04-19T15:40:16.0022040+08:00;True|2022-04-19T15:13:32.9767736+08:00;False|2022-04-19T15:08:33.6507639+08:00;True|2022-04-19T15:02:51.9580210+08:00;True|2022-04-19T13:54:18.7579131+08:00;True|2022-04-12T10:36:02.1779173+08:00;True|2022-04-12T10:05:31.0222037+08:00;True|2022-04-12T09:47:49.3724819+08:00;True|2022-04-09T15:08:54.5697468+08:00;True|2022-04-08T17:31:31.0046258+08:00;True|2022-04-08T16:50:41.3018422+08:00;True|2022-04-08T10:35:36.5029980+08:00;True|2022-03-31T09:38:37.3646053+08:00;True|2022-03-29T13:57:45.4410942+08:00;True|2022-03-10T18:59:23.7994337+08:00;True|2022-03-10T18:52:39.5019082+08:00;True|2022-03-10T18:51:12.7949284+08:00;True|2022-03-10T18:50:47.2024177+08:00;True|2022-03-10T18:45:08.8409380+08:00;True|2022-03-10T18:41:17.0102564+08:00;True|2022-03-10T18:35:49.0742353+08:00;True|2022-03-10T17:57:47.4196965+08:00;True|2022-03-10T17:34:27.5723245+08:00;True|2022-03-10T16:13:59.3829164+08:00;True|2022-03-09T14:50:49.1222033+08:00;True|2022-03-09T11:21:03.0073651+08:00;False|2022-03-09T11:16:56.1792896+08:00;False|2022-03-09T11:16:49.7923320+08:00;True|2022-03-08T15:47:47.4722336+08:00;True|2022-03-08T15:47:28.5397115+08:00;True|2022-03-08T15:37:08.7379870+08:00;True|2022-03-02T17:37:54.4659976+08:00;True|2022-03-02T17:34:12.2949726+08:00;True|2022-03-02T17:26:38.7070673+08:00;True|2022-03-02T17:07:49.7024316+08:00;True|2022-03-02T17:05:22.4177336+08:00;True|2022-03-02T16:14:57.9880587+08:00;True|2022-03-01T17:52:52.6766959+08:00;True|2022-02-28T14:36:22.6449303+08:00;True|2022-02-24T15:43:36.8244163+08:00;True|2022-02-23T17:57:14.3693224+08:00;True|2022-02-23T17:46:42.1078183+08:00;False|2022-02-23T17:41:06.5886724+08:00;True|2022-02-23T16:59:45.5533581+08:00;True|2022-02-23T16:57:43.3328895+08:00;True|2022-02-21T09:09:37.2601134+08:00;True|2022-02-21T09:03:32.4071009+08:00;True|2022-02-21T08:59:59.0172082+08:00;True|2022-02-18T14:05:39.1358825+08:00;True|2022-02-18T10:23:02.4391239+08:00;True|2022-02-18T10:21:31.0559267+08:00;True|2022-02-17T16:50:11.7192509+08:00;True|2022-02-17T13:19:13.7697894+08:00;True|2022-02-11T10:36:12.7757100+08:00;True|2022-02-10T10:54:25.2685040+08:00;True|2022-02-10T10:37:02.1034768+08:00;True|2022-02-09T17:32:45.6511283+08:00;True|2022-02-09T17:24:32.5115193+08:00;True|2022-02-09T17:00:24.0662114+08:00;True|2022-02-09T16:56:42.3364622+08:00;True|2022-02-09T14:17:25.8688855+08:00;True|2022-02-09T14:11:51.6149822+08:00;True|2022-02-07T23:29:26.2842648+08:00;True|2022-02-07T23:28:58.8242274+08:00;False|2022-02-07T23:25:29.0647793+08:00;True|2022-02-07T13:06:37.5515985+08:00;True|2022-02-07T12:42:19.5220491+08:00;True|2022-02-07T09:52:59.6728595+08:00;True|2022-02-01T11:32:10.5831557+08:00;True|2022-01-29T14:09:02.9178986+08:00;True|2022-01-28T12:01:45.1416438+08:00;True|2022-01-28T11:03:41.6361866+08:00;True|2022-01-28T10:44:53.5367862+08:00;True|2022-01-28T10:40:41.6697563+08:00;True|2022-01-28T10:25:56.7093616+08:00;True|2022-01-28T09:58:13.0733060+08:00;True|2022-01-27T09:26:29.6568807+08:00;True|2022-01-27T00:47:57.9102528+08:00;True|2022-01-27T00:46:52.8845001+08:00;True|2022-01-27T00:36:34.5330938+08:00;True|2022-01-27T00:35:19.5439329+08:00;True|2022-01-27T00:33:38.5701950+08:00;True|2022-01-27T00:32:00.9028982+08:00;True|2022-01-27T00:30:13.2390921+08:00;True|2022-01-27T00:28:23.2989144+08:00;True|2022-01-27T00:16:01.3789455+08:00;True|2022-01-27T00:09:58.8112352+08:00;True|2022-01-27T00:00:40.8353538+08:00;True|2022-01-26T23:37:50.9494735+08:00;True|2022-01-26T23:29:39.8647473+08:00;True|2022-01-26T23:20:49.3274392+08:00;True|2022-01-26T23:15:53.7037293+08:00;True|2022-01-26T23:06:28.8595953+08:00;True|2022-01-26T23:02:12.9882299+08:00;True|2022-01-26T22:55:33.2535730+08:00;True|2022-01-26T22:51:01.8427947+08:00;True|2022-01-26T22:47:44.0715387+08:00;True|2022-01-26T22:20:21.7217039+08:00;True|2022-01-26T22:13:39.5372069+08:00;True|2022-01-26T22:01:31.2113177+08:00;True|2022-01-26T21:55:26.5478921+08:00;True|2022-01-26T21:50:18.2700369+08:00;True|2022-01-26T21:48:52.0020233+08:00;True|2022-01-26T19:19:29.4530523+08:00;True|2022-01-26T19:07:21.6474231+08:00;True|2022-01-26T18:25:42.2933291+08:00;True|2022-01-26T12:39:02.0149050+08:00;True|2022-01-26T12:13:43.9149452+08:00;True|2022-01-26T11:24:33.5742248+08:00;True|2022-01-26T08:51:10.8105076+08:00;True|2022-01-25T21:07:32.9069261+08:00;True|2022-01-24T01:35:12.3309466+08:00;True|2022-01-23T23:19:15.9702821+08:00;True|2022-01-23T21:50:41.6903353+08:00;True|2022-01-23T21:25:57.6084267+08:00;True|2022-01-23T21:16:10.1516535+08:00;True|2022-01-23T20:52:08.3745284+08:00;True|2022-01-23T18:19:32.2386502+08:00;True|2022-01-23T18:11:42.0830325+08:00;True|2022-01-23T18:00:01.3239547+08:00;True|2022-01-23T12:18:48.2466943+08:00;True|2022-01-22T00:48:50.4531647+08:00;True|2022-01-21T13:10:32.8173598+08:00;True|2022-01-21T13:04:01.6388059+08:00;True|2022-01-21T12:51:40.5304103+08:00;True|2022-01-21T12:44:06.3059885+08:00;True|2022-01-21T12:34:33.9314010+08:00;True|2022-01-21T11:39:20.1088577+08:00;True|2022-01-20T11:33:49.0516846+08:00;True|2022-01-20T10:02:12.0295471+08:00;True|2022-01-20T10:02:03.3535503+08:00;True|2022-01-19T23:56:18.7293193+08:00;True|2022-01-19T22:30:14.6986228+08:00;True|2022-01-19T22:15:08.8608795+08:00;True|2022-01-19T21:57:55.2295030+08:00;True|2022-01-19T13:50:37.8588759+08:00;True|2022-01-19T13:42:52.9761531+08:00;True|2022-01-19T00:26:36.9722917+08:00;True|2022-01-19T00:15:30.8583143+08:00;True|2022-01-18T21:19:30.6193048+08:00;True|2022-01-18T21:12:07.1453825+08:00;True|2022-01-18T20:35:27.3779956+08:00;True|2022-01-18T17:44:45.2318570+08:00;True|2022-01-18T14:45:29.0299640+08:00;True|2022-01-17T22:23:20.8214203+08:00;True|2022-01-17T21:49:15.7740045+08:00;True|2022-01-17T21:47:24.6997598+08:00;True|2022-01-17T21:44:00.1942787+08:00;True|2022-01-17T21:43:15.5992687+08:00;True|2022-01-17T21:33:16.8034756+08:00;True|2022-01-17T21:25:39.9909343+08:00;True|2022-01-17T21:13:03.9659338+08:00;True|2022-01-17T20:32:14.8869091+08:00;True|2022-01-17T19:01:46.5753686+08:00;True|2022-01-17T18:31:24.1032169+08:00;True|2022-01-17T18:21:39.2918684+08:00;True|2022-01-17T18:12:07.4859038+08:00;True|2022-01-17T18:09:26.6989718+08:00;True|2022-01-17T18:04:36.7564997+08:00;True|2022-01-17T17:57:44.7814863+08:00;True|2022-01-17T17:51:50.1516107+08:00;True|2022-01-17T17:39:29.2918799+08:00;True|2022-01-17T14:55:21.5859341+08:00;True|2022-01-17T14:38:06.5091500+08:00;True|2022-01-17T14:30:25.5378436+08:00;True|2022-01-16T19:15:24.5874858+08:00;True|2022-01-16T19:07:49.0613424+08:00;True|2022-01-16T16:10:47.3112741+08:00;False|2022-01-14T19:09:41.9296709+08:00;False|2022-01-14T18:56:11.0569808+08:00;False|2022-01-14T18:28:20.1376762+08:00;False|2022-01-14T18:27:30.8678130+08:00;False|2022-01-14T18:22:45.4436504+08:00;False|2022-01-14T18:19:37.0374753+08:00;False|2022-01-14T18:18:48.5868254+08:00;False|2022-01-14T18:14:02.5810257+08:00;False|2022-01-14T18:09:51.1730754+08:00;False|2022-01-14T18:09:17.8940754+08:00;True|2022-01-13T20:08:16.2937608+08:00;True|2022-01-13T20:07:30.1505466+08:00;True|2022-01-13T13:39:42.0146294+08:00;True|2022-01-13T13:38:07.5062471+08:00;True|2022-01-13T11:29:49.3751232+08:00;True|2022-01-13T11:05:43.9574142+08:00;True|2022-01-13T10:33:23.1921058+08:00;True|2022-01-12T20:38:16.9165651+08:00;True|2022-01-12T20:24:46.3779264+08:00;True|2022-01-12T20:03:06.5030626+08:00;True|2022-01-12T19:44:55.4294326+08:00;True|2022-01-12T12:58:45.9548600+08:00;True|2022-01-12T11:28:44.7797749+08:00;True|2022-01-11T18:07:30.9151356+08:00;True|2022-01-11T15:06:32.7301609+08:00;True|2022-01-11T09:27:00.1766442+08:00;True|2021-12-30T14:41:56.8541015+08:00;True|2021-12-30T13:45:00.6130694+08:00;True|2021-12-30T13:44:18.7370780+08:00;True|2021-12-30T13:36:52.8171136+08:00;True|2021-12-28T19:14:22.5979649+08:00;True|2021-12-28T13:13:39.3543252+08:00;True|2021-12-27T15:31:26.6037782+08:00;True|2021-12-27T15:28:54.4824480+08:00;True|2021-12-27T15:22:47.8436108+08:00;True|2021-12-27T15:04:37.0711590+08:00;True|2021-12-27T15:03:52.0932499+08:00;True|2021-12-27T15:03:33.0172733+08:00;True|2021-12-27T13:28:27.4252747+08:00;True|2021-12-25T19:38:33.6784042+08:00;True|2021-12-24T20:47:43.3471563+08:00;True|2021-12-24T20:14:57.6946814+08:00;True|2021-12-24T19:55:21.1843105+08:00;True|2021-12-24T19:49:54.6719726+08:00;True|2021-12-24T19:38:14.1180741+08:00;True|2021-12-22T13:51:37.1082523+08:00;True|2021-12-21T15:38:59.8015096+08:00;True|2021-12-21T15:29:54.8095063+08:00;False|2021-12-21T15:29:21.7006531+08:00;False|2021-12-21T15:16:18.2218025+08:00;False|2021-12-21T15:11:38.1215841+08:00;False|2021-12-21T15:08:27.0590078+08:00;True|2021-12-10T14:12:36.4065298+08:00;True|2021-12-10T13:54:03.4921778+08:00;True|2021-12-10T13:25:49.0439086+08:00;True|2021-12-10T13:19:58.9494477+08:00;True|2021-12-10T13:10:45.3929017+08:00;True|2021-12-10T11:06:53.2416794+08:00;True|2021-12-07T17:23:28.9380484+08:00;True|2021-12-07T17:13:52.4384814+08:00;True|2021-12-07T16:39:49.2020208+08:00;True|2021-12-07T15:18:20.9024533+08:00;True|2021-12-07T15:07:35.4428035+08:00;True|2021-12-07T15:01:02.0445043+08:00;True|2021-12-07T14:50:08.9019705+08:00;True|2021-12-07T14:34:50.4993666+08:00;False|2021-12-07T14:32:56.0408332+08:00;True|2021-12-06T17:11:41.4004606+08:00;True|2021-12-06T16:48:07.6029757+08:00;True|2021-12-06T13:46:35.9437718+08:00;True|2021-12-06T13:45:07.6622615+08:00;True|2021-12-06T11:25:04.3483155+08:00;True|2021-12-06T11:18:24.5804187+08:00;True|2021-11-22T16:27:05.4241947+08:00;True|2021-11-22T13:40:17.6768280+08:00;True|2021-11-19T16:15:19.9085104+08:00;True|2021-11-09T10:34:21.1623512+08:00;True|2021-11-07T16:57:59.7380254+08:00;True|2021-11-07T16:53:47.4198852+08:00;True|2021-11-07T16:42:05.5096826+08:00;True|2021-11-07T16:37:21.0729013+08:00;True|2021-11-05T20:51:17.6170717+08:00;True|2021-11-05T20:35:14.6250333+08:00;True|2021-11-05T19:30:19.8374158+08:00;True|2021-11-05T19:22:46.2276569+08:00;True|2021-11-05T19:20:30.8253213+08:00;True|2021-11-05T19:16:45.7553310+08:00;True|2021-11-05T19:16:00.4532689+08:00;True|2021-11-05T19:12:25.9022478+08:00;False|2021-11-05T19:11:26.5753529+08:00;True|2021-11-05T19:09:30.0085433+08:00;True|2021-11-05T18:48:19.9395153+08:00;True|2021-11-05T18:45:34.3437897+08:00;True|2021-11-05T18:43:43.4558159+08:00;True|2021-11-05T18:40:40.9948500+08:00;True|2021-11-05T18:34:18.4440455+08:00;True|2021-11-05T15:54:51.6037132+08:00;True|2021-10-28T16:27:53.9728270+08:00;True|2021-10-28T16:03:59.5629998+08:00;True|2021-10-28T08:51:04.2549186+08:00;True|2021-10-27T15:14:53.5506098+08:00;True|2021-10-27T15:00:44.9100320+08:00;True|2021-10-27T13:14:46.7921647+08:00;True|2021-10-27T11:24:49.4550753+08:00;True|2021-10-27T10:10:10.3545125+08:00;True|2021-10-27T10:02:24.9248610+08:00;True|2021-10-27T09:59:40.3795897+08:00;True|2021-10-27T09:56:30.6629207+08:00;True|2021-10-27T09:10:48.3883432+08:00;True|2021-10-27T09:03:31.9191991+08:00;True|2021-10-27T08:59:59.7651159+08:00;True|2021-10-27T08:36:11.8620997+08:00;True|2021-10-27T08:26:40.2533014+08:00;True|2021-10-26T09:19:35.5674748+08:00;True|2021-10-26T09:17:17.6900747+08:00;True|2021-10-26T09:14:32.3999220+08:00;True|2021-10-25T15:08:21.2581763+08:00;True|2021-10-25T10:01:57.8524903+08:00;True|2021-10-25T09:28:51.6294879+08:00;True|2021-10-25T09:25:50.3373336+08:00;True|2021-10-25T09:23:37.0203978+08:00;True|2021-10-25T09:18:23.3380608+08:00;True|2021-10-25T09:15:10.5292071+08:00;True|2021-10-25T08:56:30.4632027+08:00;True|2021-10-25T08:50:11.4697392+08:00;True|2021-10-22T13:46:49.7207066+08:00;True|2021-10-22T10:06:33.3130089+08:00;True|2021-10-20T14:32:10.1235516+08:00;True|2021-10-20T14:16:18.6496291+08:00;True|2021-10-20T14:08:49.2443715+08:00;True|2021-10-20T14:05:14.6847950+08:00;True|2021-10-20T13:30:21.6057636+08:00;True|2021-10-20T10:55:22.2151716+08:00;True|2021-10-19T10:42:13.4198267+08:00;True|2021-10-19T10:01:41.0018108+08:00;True|2021-10-19T09:59:11.2127619+08:00;True|2021-10-19T09:54:04.8472874+08:00;True|2021-10-15T11:19:15.5327495+08:00;True|2021-10-15T11:17:41.0686485+08:00;True|2021-10-15T11:12:11.8295042+08:00;True|2021-10-15T10:33:31.5670079+08:00;True|2021-10-15T10:27:45.0815146+08:00;True|2021-10-14T14:51:28.5331025+08:00;True|2021-10-14T14:37:28.3276051+08:00;True|2021-10-14T14:23:39.0606792+08:00;True|2021-10-14T14:21:03.8140347+08:00;True|2021-10-13T10:31:10.6628977+08:00;True|2021-10-13T10:12:24.4238027+08:00;True|2021-10-13T08:47:43.9314486+08:00;True|2021-10-12T14:07:18.6065183+08:00;True|2021-10-12T10:34:10.1682362+08:00;True|2021-10-12T10:27:14.3073332+08:00;True|2021-10-12T10:22:08.0004619+08:00;True|2021-10-12T10:21:03.0275378+08:00;True|2021-10-12T10:11:54.9812692+08:00;True|2021-10-11T16:59:07.3568342+08:00;True|2021-10-11T16:53:14.2016138+08:00;True|2021-10-11T16:21:35.0133775+08:00;True|2021-10-11T15:34:19.5731935+08:00;True|2021-10-11T15:31:07.5780983+08:00;True|2021-10-11T15:06:47.1145237+08:00;True|2021-10-11T15:03:25.5000280+08:00;True|2021-10-11T10:12:57.6416898+08:00;True|2021-10-09T10:15:17.9235165+08:00;True|2021-10-09T10:13:51.3318441+08:00;True|2021-10-09T10:01:21.6661542+08:00;True|2021-10-09T09:58:41.9225837+08:00;True|2021-10-08T14:56:49.7935800+08:00;True|2021-10-08T14:35:41.4490063+08:00;True|2021-10-08T14:02:42.6990656+08:00;True|2021-09-29T15:48:55.1547397+08:00;True|2021-09-29T15:48:23.5567191+08:00;True|2021-09-27T16:17:35.7180978+08:00;True|2021-09-27T15:51:50.4240134+08:00;True|2021-09-23T20:55:27.3554447+08:00;True|2021-09-23T14:14:44.0572017+08:00;True|2021-09-23T13:51:56.2344673+08:00;True|2021-09-23T10:46:16.7417007+08:00;True|2021-09-23T10:42:23.2117537+08:00;True|2021-09-22T15:21:22.9615672+08:00;True|2021-09-22T14:23:32.7907754+08:00;True|2021-09-22T13:48:03.4780947+08:00;True|2021-09-22T11:05:24.5249356+08:00;True|2021-09-22T10:00:19.0962943+08:00;True|2021-09-22T09:30:26.2686514+08:00;True|2021-09-17T11:22:34.5692792+08:00;True|2021-09-16T16:11:27.5372277+08:00;True|2021-09-16T14:53:40.8396557+08:00;True|2021-09-16T14:32:29.7905500+08:00;True|2021-09-16T14:26:46.2224219+08:00;True|2021-09-16T10:32:24.4244440+08:00;True|2021-09-15T11:10:35.3529360+08:00;True|2021-09-15T11:08:30.0857376+08:00;True|2021-09-15T11:05:56.7191571+08:00;True|2021-09-14T01:24:39.8041136+08:00;True|2021-09-14T01:05:01.1593327+08:00;True|2021-09-14T00:44:14.7233198+08:00;True|2021-09-13T23:48:19.4506233+08:00;True|2021-09-13T20:30:31.3243872+08:00;True|2021-09-13T19:45:35.9108911+08:00;False|2021-09-13T19:44:59.2779092+08:00;True|2021-09-13T18:09:22.4994381+08:00;True|2021-09-10T14:18:27.5788854+08:00;True|2021-09-09T15:57:01.7407207+08:00;True|2021-09-09T15:49:34.2598998+08:00;True|2021-09-09T11:32:10.7853024+08:00;True|2021-09-09T11:10:48.6840025+08:00;True|2021-09-09T10:35:37.3883078+08:00;True|2021-09-07T14:11:49.8497588+08:00;True|2021-09-07T13:34:48.4693349+08:00;True|2021-09-06T14:33:48.7549675+08:00;True|2021-09-03T16:27:51.1888520+08:00;True|2021-09-03T16:19:35.9003465+08:00;True|2021-09-03T15:46:28.1828032+08:00;True|2021-09-03T15:34:21.9362871+08:00;True|2021-09-03T11:24:49.8749819+08:00;True|2021-09-03T11:21:17.8373159+08:00;True|2021-09-03T11:16:53.2208136+08:00;True|2021-09-03T11:12:23.9063804+08:00;True|2021-09-03T09:11:09.2435721+08:00;True|2021-09-02T11:16:15.1370453+08:00;True|2021-09-02T10:35:39.1171879+08:00;True|2021-09-01T10:17:09.4536285+08:00;True|2021-09-01T09:46:28.4581776+08:00;True|2021-08-31T08:54:26.8588887+08:00;True|2021-08-31T08:39:08.3685693+08:00;True|2021-08-30T17:11:56.8438985+08:00;True|2021-08-30T15:59:42.0820292+08:00;True|2021-08-30T15:45:18.1868510+08:00;True|2021-08-30T14:56:08.3958863+08:00;True|2021-08-30T14:37:11.5379830+08:00;True|2021-08-30T14:35:34.8775934+08:00;True|2021-08-30T14:24:36.5111821+08:00;True|2021-08-30T10:05:49.6945200+08:00;True|2021-08-30T10:03:28.4064538+08:00;True|2021-08-30T10:00:16.8360929+08:00;True|2021-08-30T09:56:09.4434379+08:00;True|2021-08-30T09:55:36.1725334+08:00;True|2021-08-30T09:52:04.8600054+08:00;True|2021-08-30T09:47:46.4225655+08:00;True|2021-08-30T09:45:20.4894962+08:00;False|2021-08-27T17:17:34.2646751+08:00;False|2021-08-27T16:01:21.2791979+08:00;False|2021-08-27T15:58:06.9667160+08:00;False|2021-08-27T15:38:37.4818036+08:00;False|2021-08-27T15:21:02.8863114+08:00;False|2021-08-27T15:20:28.6828668+08:00;True|2021-08-26T16:00:44.3162145+08:00;True|2021-08-26T08:57:31.3842587+08:00;True|2021-08-23T08:43:41.1549775+08:00;True|2021-08-22T09:24:12.7210871+08:00;True|2021-08-22T09:19:53.8300229+08:00;True|2021-08-20T20:00:52.0140407+08:00;True|2021-08-20T19:40:14.7712765+08:00;True|2021-08-19T17:37:54.9748049+08:00;True|2021-08-19T17:20:11.0515687+08:00;True|2021-08-19T16:12:35.4392809+08:00;True|2021-08-19T16:06:50.6204587+08:00;True|2021-08-19T16:03:53.0824286+08:00;True|2021-08-19T15:56:01.3498791+08:00;True|2021-08-19T10:18:50.8113630+08:00;True|2021-08-19T09:58:06.2784035+08:00;True|2021-08-19T09:56:54.0619777+08:00;True|2021-08-19T00:32:08.3503093+08:00;True|2021-08-19T00:11:18.3150227+08:00;True|2021-08-19T00:02:49.4827718+08:00;True|2021-08-18T23:54:45.4845900+08:00;True|2021-08-18T23:39:51.6147977+08:00;True|2021-08-18T23:16:42.7214379+08:00;True|2021-08-18T22:38:57.4681929+08:00;True|2021-08-18T21:41:58.7560707+08:00;True|2021-08-18T21:11:52.2369249+08:00;True|2021-08-18T21:01:49.5669106+08:00;True|2021-08-18T20:47:46.5352688+08:00;False|2021-08-18T20:46:36.7956141+08:00;False|2021-08-18T20:46:01.0502138+08:00;True|2021-08-18T19:39:12.8186242+08:00;False|2021-08-18T19:38:12.6839708+08:00;True|2021-08-18T19:15:51.4626694+08:00;True|2021-08-18T16:07:20.4350886+08:00;True|2021-08-18T14:29:41.7171934+08:00;True|2021-08-18T14:20:36.3647361+08:00;True|2021-08-16T09:08:58.3617662+08:00;True|2021-08-15T20:44:29.9214083+08:00;True|2021-08-15T20:36:17.0958549+08:00;True|2021-08-15T20:29:34.3879773+08:00;True|2021-08-15T20:23:47.4052038+08:00;True|2021-08-15T15:01:19.7830862+08:00;True|2021-08-15T12:15:18.3433782+08:00;True|2021-08-13T20:59:11.3947130+08:00;True|2021-08-06T22:49:09.9538339+08:00;True|2021-08-06T22:35:19.0418168+08:00;True|2021-08-06T20:29:47.4241975+08:00;True|2021-08-06T14:08:16.4791827+08:00;True|2021-08-06T13:59:28.9874611+08:00;True|2021-08-06T13:57:34.3723977+08:00;True|2021-08-06T13:36:03.4816652+08:00;True|2021-08-06T12:22:52.5055221+08:00;True|2021-08-06T09:31:58.1272499+08:00;True|2021-08-06T09:26:51.6310039+08:00;True|2021-08-06T09:24:22.2899244+08:00;True|2021-08-06T09:06:30.6477912+08:00;True|2021-08-06T09:00:55.5101612+08:00;True|2021-08-06T08:49:59.9616490+08:00;True|2021-08-06T08:45:18.8586902+08:00;True|2021-08-05T20:09:25.8861998+08:00;True|2021-08-04T19:14:27.2396953+08:00;True|2021-08-04T19:11:47.5849093+08:00;True|2021-08-04T16:42:54.0149043+08:00;True|2021-08-04T15:02:11.5056561+08:00;True|2021-08-04T14:58:37.1435509+08:00;True|2021-08-04T14:55:34.7380132+08:00;True|2021-08-04T14:47:42.5933921+08:00;True|2021-08-04T14:45:17.9911874+08:00;True|2021-08-04T13:52:20.9601351+08:00;True|2021-08-04T09:48:28.8796992+08:00;True|2021-08-03T18:14:13.1894998+08:00;True|2021-08-03T17:45:35.1349721+08:00;True|2021-08-03T17:21:52.6028977+08:00;True|2021-08-03T17:20:35.4423020+08:00;True|2021-08-03T17:03:33.1667669+08:00;True|2021-08-03T17:01:54.2656787+08:00;True|2021-08-03T17:00:22.2778374+08:00;True|2021-08-03T16:56:58.8902582+08:00;True|2021-08-03T15:02:21.8601533+08:00;True|2021-08-03T14:57:34.0186758+08:00;True|2021-08-03T14:28:47.2242515+08:00;True|2021-08-03T14:22:22.4554236+08:00;True|2021-08-03T14:21:51.1339715+08:00;True|2021-08-03T13:37:33.9697131+08:00;True|2021-08-03T13:28:29.7591095+08:00;True|2021-08-03T11:35:09.5118324+08:00;True|2021-08-03T11:11:23.3051573+08:00;True|2021-08-02T13:14:42.3663755+08:00;True|2021-07-30T22:50:19.9749878+08:00;True|2021-07-30T22:49:31.2150970+08:00;True|2021-07-28T19:12:05.8381075+08:00;True|2021-07-28T18:59:45.4808797+08:00;True|2021-07-28T18:15:58.8301509+08:00;True|2021-07-28T18:04:54.8613546+08:00;True|2021-07-28T17:53:48.6225611+08:00;True|2021-07-28T17:42:50.9171563+08:00;True|2021-07-28T17:17:16.3137677+08:00;True|2021-07-28T17:11:46.8925200+08:00;True|2021-07-28T16:28:27.6823943+08:00;True|2021-07-28T16:23:00.3385836+08:00;True|2021-07-28T09:57:55.4237411+08:00;True|2021-07-28T08:38:29.6691541+08:00;True|2021-07-27T23:16:32.0331671+08:00;True|2021-07-27T23:06:08.1947249+08:00;True|2021-07-27T23:05:58.4619176+08:00;True|2021-07-27T18:42:09.5358261+08:00;True|2021-07-27T18:30:04.8532823+08:00;True|2021-07-27T18:29:43.5775092+08:00;True|2021-07-27T15:16:49.8356224+08:00;True|2021-07-27T15:05:27.8453220+08:00;True|2021-07-27T14:59:15.9519440+08:00;True|2021-07-27T09:23:32.6111337+08:00;True|2021-07-27T08:27:41.6395353+08:00;True|2021-07-27T08:25:56.7378296+08:00;True|2021-07-26T11:18:46.0856966+08:00;True|2021-07-26T11:18:02.0751924+08:00;True|2021-07-26T11:13:49.6285395+08:00;True|2021-07-21T21:08:25.9898902+08:00;True|2021-07-21T20:09:26.2258104+08:00;True|2021-07-13T16:17:25.8407435+08:00;True|2021-07-13T13:46:13.4309531+08:00;True|2021-07-13T12:29:04.5082461+08:00;True|2021-06-29T13:55:01.6864637+08:00;True|2021-06-29T10:38:52.2206472+08:00;True|2021-06-29T10:10:13.1540749+08:00;True|2021-06-28T14:37:56.3853273+08:00;False|2021-06-28T14:36:57.5726124+08:00;True|2021-06-25T14:17:57.5196108+08:00;True|2021-06-25T13:56:38.9522535+08:00;True|2021-06-24T19:38:32.8766933+08:00;True|2021-06-24T18:26:35.6118833+08:00;True|2021-06-24T18:02:52.8136877+08:00;True|2021-06-24T17:48:49.5851948+08:00;True|2021-06-24T17:45:46.7527572+08:00;True|2021-06-24T15:05:20.1592723+08:00;True|2021-06-23T16:18:15.6814625+08:00;True|2021-06-23T16:05:24.6112343+08:00;True|2021-06-23T15:14:08.2489658+08:00;True|2021-06-23T13:52:58.6029788+08:00;True|2021-06-22T16:11:20.4726923+08:00;True|2021-06-22T16:04:53.7231389+08:00;True|2021-06-22T15:50:59.2583262+08:00;True|2021-06-22T15:38:15.3016140+08:00;True|2021-06-22T15:34:42.9185543+08:00;True|2021-06-22T15:21:55.1419108+08:00;True|2021-06-22T15:07:21.5357494+08:00;True|2021-06-22T15:03:35.0535733+08:00;True|2021-06-22T14:54:47.8802969+08:00;True|2021-06-22T11:19:38.7303011+08:00;True|2021-06-22T08:53:49.2882695+08:00;True|2021-06-22T08:47:54.8286530+08:00;True|2021-06-21T16:27:19.3017700+08:00;True|2021-06-21T15:32:28.7237952+08:00;True|2021-06-21T12:34:02.6329555+08:00;True|2021-06-21T12:24:17.5427495+08:00;True|2021-06-21T10:47:30.6423502+08:00;True|2021-06-21T08:43:20.3026558+08:00;True|2021-06-19T15:10:06.8335499+08:00;True|2021-06-18T15:37:29.5009930+08:00;True|2021-06-18T13:46:35.6283432+08:00;True|2021-06-18T10:00:37.1474954+08:00;True|2021-06-18T09:55:21.8551780+08:00;True|2021-06-18T09:22:27.8432927+08:00;True|2021-06-17T11:17:43.2166430+08:00;True|2021-06-17T09:24:09.8350403+08:00;True|2021-06-16T16:10:47.8564888+08:00;True|2021-06-16T16:04:09.8286582+08:00;True|2021-06-16T15:12:29.9427169+08:00;True|2021-06-16T14:58:45.6801892+08:00;True|2021-06-16T14:46:01.6873221+08:00;True|2021-06-16T11:02:06.1272477+08:00;True|2021-06-16T09:33:56.0223915+08:00;True|2021-06-16T08:50:07.6995413+08:00;True|2021-06-16T08:28:38.7692635+08:00;True|2021-06-16T01:04:19.6282474+08:00;True|2021-06-16T01:03:50.5058323+08:00;False|2021-06-16T01:02:15.3819672+08:00;False|2021-06-16T01:01:38.6171098+08:00;True|2021-06-16T00:34:54.9902044+08:00;True|2021-06-15T23:55:36.2003828+08:00;True|2021-06-15T22:47:17.2192750+08:00;True|2021-06-15T22:42:41.1512585+08:00;True|2021-06-15T22:38:01.7390462+08:00;True|2021-06-15T22:14:11.2060782+08:00;True|2021-06-15T22:12:27.0615357+08:00;True|2021-06-15T22:07:59.9280871+08:00;True|2021-06-15T22:04:21.5051427+08:00;True|2021-06-15T21:25:55.0099814+08:00;True|2021-06-15T19:13:51.3494172+08:00;True|2021-06-15T19:02:17.6844742+08:00;True|2021-06-15T18:47:37.1629411+08:00;False|2021-06-15T18:47:11.0828111+08:00;True|2021-06-15T18:38:26.6620668+08:00;True|2021-06-15T18:33:45.2069831+08:00;True|2021-06-15T18:24:52.0550838+08:00;True|2021-06-15T18:19:43.6999796+08:00;True|2021-06-15T18:08:17.2464506+08:00;True|2021-06-15T18:03:51.3952624+08:00;True|2021-06-15T18:01:20.6141766+08:00;True|2021-06-15T17:59:04.4479416+08:00;True|2021-06-15T17:41:44.6389379+08:00;True|2021-06-15T17:39:03.1565124+08:00;True|2021-06-15T17:34:41.0634638+08:00;True|2021-06-15T17:33:50.4853178+08:00;True|2021-06-15T17:25:38.5914037+08:00;True|2021-06-15T17:22:21.3611360+08:00;True|2021-06-15T17:16:49.4970813+08:00;True|2021-06-15T17:05:28.9389484+08:00;True|2021-06-15T16:52:54.6372199+08:00;True|2021-06-15T16:51:23.9081030+08:00;True|2021-06-15T16:45:40.6017997+08:00;True|2021-06-15T16:41:05.0218887+08:00;True|2021-06-15T16:38:02.8541862+08:00;True|2021-06-15T16:22:10.3118721+08:00;True|2021-06-15T16:12:11.1552506+08:00;True|2021-06-15T15:33:42.0100494+08:00;True|2021-06-15T15:28:39.7145659+08:00;True|2021-06-15T15:15:02.7939125+08:00;True|2021-06-15T14:49:14.2300396+08:00;True|2021-06-15T14:42:28.1198064+08:00;True|2021-06-15T13:30:12.7997686+08:00;True|2021-06-15T13:25:37.7284670+08:00;True|2021-06-15T13:23:43.6207813+08:00;False|2021-06-15T13:23:19.4190232+08:00;True|2021-06-15T13:16:38.5062674+08:00;True|2021-06-15T13:03:31.2055635+08:00;True|2021-06-15T12:58:43.1653215+08:00;True|2021-06-15T12:39:22.8442109+08:00;True|2021-06-15T12:35:09.1288556+08:00;False|2021-06-15T12:33:50.0723143+08:00;True|2021-06-15T11:28:01.9733727+08:00;True|2021-06-15T11:26:26.6569392+08:00;True|2021-06-15T11:22:43.0366435+08:00;True|2021-06-15T11:07:50.1610580+08:00;True|2021-06-15T10:32:59.1925931+08:00;True|2021-06-10T17:16:57.9552310+08:00;True|2021-06-10T16:44:42.2731836+08:00;True|2021-06-10T14:39:27.6745737+08:00;True|2021-06-10T12:15:05.1524413+08:00;True|2021-06-09T18:19:24.1005606+08:00;True|2021-06-09T17:56:09.5646288+08:00;True|2021-06-09T13:34:06.1882292+08:00;True|2021-06-09T13:29:54.5924933+08:00;True|2021-06-09T13:25:55.7520662+08:00;True|2021-06-09T13:07:47.6686811+08:00;True|2021-06-09T12:59:41.2595048+08:00;True|2021-06-09T12:45:27.1305548+08:00;True|2021-06-09T12:29:52.1418191+08:00;True|2021-06-09T12:24:12.7610588+08:00;True|2021-06-09T11:31:25.3409568+08:00;True|2021-06-09T09:57:44.4387175+08:00;True|2021-06-09T09:54:26.5161307+08:00;True|2021-06-09T09:14:14.7288045+08:00;True|2021-06-09T09:10:25.1812139+08:00;True|2021-06-09T08:46:21.6585123+08:00;True|2021-06-08T19:56:55.7192062+08:00;True|2021-06-08T19:52:59.0326821+08:00;True|2021-06-08T19:49:13.6274217+08:00;True|2021-06-08T19:09:22.1038939+08:00;True|2021-06-08T15:28:41.3716247+08:00;True|2021-06-08T15:26:47.2621178+08:00;True|2021-06-08T13:49:45.8936617+08:00;True|2021-06-08T13:43:18.8115502+08:00;True|2021-06-08T10:04:06.2200731+08:00;True|2021-06-08T09:17:10.0470792+08:00;True|2021-06-08T08:44:37.4395849+08:00;True|2021-06-08T00:01:09.3745613+08:00;True|2021-06-07T23:49:31.5196888+08:00;True|2021-06-07T23:41:00.8017855+08:00;True|2021-06-07T23:21:53.1371134+08:00;True|2021-06-07T23:01:27.5712153+08:00;True|2021-06-07T22:36:12.9274014+08:00;True|2021-06-07T22:23:00.6545134+08:00;True|2021-06-07T17:44:47.5686346+08:00;True|2021-06-07T17:17:01.3431233+08:00;True|2021-06-07T16:53:28.9989587+08:00;True|2021-06-07T16:41:10.4975607+08:00;True|2021-06-07T14:21:06.8176477+08:00;True|2021-06-07T14:10:39.0355659+08:00;True|2021-06-07T12:34:31.4562732+08:00;True|2021-06-07T12:28:44.9629488+08:00;True|2021-06-07T10:30:26.9387988+08:00;True|2021-06-07T09:12:14.7658099+08:00;True|2021-06-07T08:37:19.6353792+08:00;True|2021-06-07T08:35:25.2031954+08:00;True|2021-06-05T07:07:32.0541266+08:00;True|2021-06-05T06:44:35.9475270+08:00;True|2021-06-05T06:37:27.4595197+08:00;True|2021-06-05T06:26:59.7663998+08:00;True|2021-06-05T05:43:12.8699318+08:00;True|2021-06-04T17:00:41.2426007+08:00;True|2021-06-04T16:08:03.8078072+08:00;True|2021-06-04T15:47:21.6412616+08:00;True|2021-06-04T15:21:02.4239800+08:00;True|2021-06-04T15:20:37.8641854+08:00;True|2021-06-04T13:38:51.5088395+08:00;True|2021-06-04T10:20:01.7784282+08:00;True|2021-06-04T10:13:50.3548857+08:00;True|2021-06-04T10:11:25.5017821+08:00;True|2021-06-04T10:09:51.6792228+08:00;True|2021-06-04T10:02:39.5851057+08:00;True|2021-06-04T09:30:40.4495494+08:00;True|2021-06-03T13:16:36.0317546+08:00;True|2021-06-03T13:12:47.0402047+08:00;True|2021-06-02T14:37:08.9683351+08:00;True|2021-06-02T14:10:15.7439829+08:00;True|2021-06-02T13:59:46.5841931+08:00;True|2021-06-02T13:25:18.7962660+08:00;True|2021-06-02T13:23:16.2261980+08:00;True|2021-06-01T15:37:32.2495085+08:00;True|2021-06-01T15:21:01.2856122+08:00;True|2021-06-01T15:13:36.7262365+08:00;True|2021-06-01T15:10:26.8905629+08:00;True|2021-06-01T14:56:17.5231551+08:00;True|2021-06-01T14:38:39.7895927+08:00;True|2021-06-01T14:23:12.3265287+08:00;True|2021-03-01T09:11:31.3226422+08:00;True|2021-05-26T14:54:56.9426462+08:00;True|2021-05-26T13:57:33.7780451+08:00;True|2021-05-26T13:39:02.8043358+08:00;True|2021-02-25T16:01:40.2917200+08:00;True|2021-02-25T15:49:46.6681205+08:00;True|2021-02-25T15:16:30.9372640+08:00;True|2021-05-25T13:10:21.7831921+08:00;True|2021-05-25T11:21:38.5224475+08:00;True|2021-05-25T11:12:52.0637175+08:00;True|2021-05-25T11:02:18.4164663+08:00;True|2021-05-25T10:52:06.8998521+08:00;True|2021-05-25T10:50:45.0929606+08:00;True|2021-05-25T10:45:54.1498313+08:00;True|2021-05-25T10:39:27.8602249+08:00;True|2021-05-25T10:34:49.5771162+08:00;True|2021-05-25T10:17:30.3009163+08:00;True|2021-05-25T10:14:03.8512581+08:00;True|2021-05-25T10:05:33.4343836+08:00;True|2021-05-24T17:01:23.3221168+08:00;True|2021-05-24T10:11:24.0197347+08:00;False|2021-05-24T10:11:07.6338995+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
@@ -18,28 +18,28 @@
<publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>04/22/2022 17:19:45</publishTime>
+ <publishTime>05/06/2022 15:12:57</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>04/22/2022 17:19:45</publishTime>
+ <publishTime>05/06/2022 15:12:57</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>04/22/2022 17:19:43</publishTime>
+ <publishTime>05/06/2022 15:12:54</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>04/22/2022 17:19:43</publishTime>
+ <publishTime>05/06/2022 15:12:54</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 14:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>04/22/2022 17:19:39</publishTime>
+ <publishTime>05/06/2022 15:12:48</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>04/22/2022 17:19:39</publishTime>
+ <publishTime>05/06/2022 15:12:48</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>04/22/2022 17:19:39</publishTime>
+ <publishTime>05/06/2022 15:12:49</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>04/22/2022 17:19:39</publishTime>
+ <publishTime>05/06/2022 15:12:49</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>08/16/2021 17:23:15</publishTime>
@@ -105,22 +105,22 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>04/22/2022 17:19:37</publishTime>
+ <publishTime>05/06/2022 15:12:46</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>04/22/2022 17:19:37</publishTime>
+ <publishTime>05/06/2022 15:12:46</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>04/22/2022 17:19:38</publishTime>
+ <publishTime>05/06/2022 15:12:47</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>04/22/2022 17:19:38</publishTime>
+ <publishTime>05/06/2022 15:12:47</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>04/22/2022 17:19:38</publishTime>
+ <publishTime>05/06/2022 15:12:47</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>04/22/2022 17:19:38</publishTime>
+ <publishTime>05/06/2022 15:12:47</publishTime>
</File>
<File Include="bin/stdole.dll">
<publishTime>05/09/2021 13:35:37</publishTime>
@@ -222,13 +222,13 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>04/22/2022 17:19:50</publishTime>
+ <publishTime>05/06/2022 15:13:03</publishTime>
</File>
<File Include="bin/WebAPI.dll.config">
<publishTime>12/15/2021 17:59:43</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>04/22/2022 17:19:50</publishTime>
+ <publishTime>05/06/2022 15:13:03</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/17/2013 17:03:52</publishTime>
@@ -411,7 +411,7 @@
<publishTime>12/20/2021 13:19:56</publishTime>
</File>
<File Include="Web.config">
- <publishTime>04/22/2022 17:20:11</publishTime>
+ <publishTime>05/06/2022 15:13:11</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Sc_MouldProdInBill/Log/637879637530646434.log b/WebAPI/Sc_MouldProdInBill/Log/637879637530646434.log
new file mode 100644
index 0000000..4eedde0
--- /dev/null
+++ b/WebAPI/Sc_MouldProdInBill/Log/637879637530646434.log
@@ -0,0 +1,3 @@
+------------------------2022/5/12 14:49:13------------------------------
+鎴愬姛锛�
+
diff --git a/WebAPI/Sc_MouldProdInBill/Log/637879637531326475.log b/WebAPI/Sc_MouldProdInBill/Log/637879637531326475.log
new file mode 100644
index 0000000..2232611
--- /dev/null
+++ b/WebAPI/Sc_MouldProdInBill/Log/637879637531326475.log
@@ -0,0 +1,3 @@
+------------------------2022/5/12 14:49:13------------------------------
+鏈夋潈闄�
+
diff --git a/WebAPI/Sc_MouldProdInBill/Log/637879637531386497.log b/WebAPI/Sc_MouldProdInBill/Log/637879637531386497.log
new file mode 100644
index 0000000..a132c7a
--- /dev/null
+++ b/WebAPI/Sc_MouldProdInBill/Log/637879637531386497.log
@@ -0,0 +1,3 @@
+------------------------2022/5/12 14:49:13------------------------------
+select * from h_v_Sc_MouldProdInHouseBillList where 搴撳瓨缁勭粐='钃濇捣瀹炰笟闆嗗洟' and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-04-12' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-05-12'order by hmainid desc
+
diff --git a/WebAPI/Sc_MouldProdInBill/Log/637880486996165006.log b/WebAPI/Sc_MouldProdInBill/Log/637880486996165006.log
new file mode 100644
index 0000000..ac2ac0c
--- /dev/null
+++ b/WebAPI/Sc_MouldProdInBill/Log/637880486996165006.log
@@ -0,0 +1,3 @@
+------------------------2022/5/13 14:24:59------------------------------
+鎴愬姛锛�
+
diff --git a/WebAPI/Sc_MouldProdInBill/Log/637880486996635039.log b/WebAPI/Sc_MouldProdInBill/Log/637880486996635039.log
new file mode 100644
index 0000000..14c8866
--- /dev/null
+++ b/WebAPI/Sc_MouldProdInBill/Log/637880486996635039.log
@@ -0,0 +1,3 @@
+------------------------2022/5/13 14:24:59------------------------------
+鏈夋潈闄�
+
diff --git a/WebAPI/Sc_MouldProdInBill/Log/637880486996675048.log b/WebAPI/Sc_MouldProdInBill/Log/637880486996675048.log
new file mode 100644
index 0000000..f7dc08e
--- /dev/null
+++ b/WebAPI/Sc_MouldProdInBill/Log/637880486996675048.log
@@ -0,0 +1,3 @@
+------------------------2022/5/13 14:24:59------------------------------
+select * from h_v_Sc_MouldProdInHouseBillList where 搴撳瓨缁勭粐='鎵嬫満浜嬩笟閮�' and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-04-13' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-05-13'order by hmainid desc
+
diff --git a/WebAPI/Sc_MouldProdInBill/Log/637880489052667576.log b/WebAPI/Sc_MouldProdInBill/Log/637880489052667576.log
new file mode 100644
index 0000000..9500820
--- /dev/null
+++ b/WebAPI/Sc_MouldProdInBill/Log/637880489052667576.log
@@ -0,0 +1,3 @@
+------------------------2022/5/13 14:28:25------------------------------
+鎴愬姛锛�
+
diff --git a/WebAPI/Sc_MouldProdInBill/Log/637880489053087606.log b/WebAPI/Sc_MouldProdInBill/Log/637880489053087606.log
new file mode 100644
index 0000000..82ba330
--- /dev/null
+++ b/WebAPI/Sc_MouldProdInBill/Log/637880489053087606.log
@@ -0,0 +1,3 @@
+------------------------2022/5/13 14:28:25------------------------------
+鏈夋潈闄�
+
diff --git a/WebAPI/Sc_MouldProdInBill/Log/637880489053097665.log b/WebAPI/Sc_MouldProdInBill/Log/637880489053097665.log
new file mode 100644
index 0000000..3daae83
--- /dev/null
+++ b/WebAPI/Sc_MouldProdInBill/Log/637880489053097665.log
@@ -0,0 +1,3 @@
+------------------------2022/5/13 14:28:25------------------------------
+select * from h_v_Sc_MouldProdInHouseBillList where 搴撳瓨缁勭粐='鎵嬫満浜嬩笟閮�' and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-04-13' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-05-13'order by hmainid desc
+
diff --git a/WebAPI/Sc_MouldProdOutBill/Log/637879637552458053.log b/WebAPI/Sc_MouldProdOutBill/Log/637879637552458053.log
new file mode 100644
index 0000000..e86ebbd
--- /dev/null
+++ b/WebAPI/Sc_MouldProdOutBill/Log/637879637552458053.log
@@ -0,0 +1,3 @@
+------------------------2022/5/12 14:49:15------------------------------
+select * from h_v_Sc_MouldProdOutHouseBillList where 搴撳瓨缁勭粐='钃濇捣瀹炰笟闆嗗洟'
+
diff --git a/WebAPI/Sc_MouldProdOutBill/Log/637880487100073561.log b/WebAPI/Sc_MouldProdOutBill/Log/637880487100073561.log
new file mode 100644
index 0000000..6845db5
--- /dev/null
+++ b/WebAPI/Sc_MouldProdOutBill/Log/637880487100073561.log
@@ -0,0 +1,3 @@
+------------------------2022/5/13 14:25:10------------------------------
+select * from h_v_Sc_MouldProdOutHouseBillList where 搴撳瓨缁勭粐='鎵嬫満浜嬩笟閮�'
+
diff --git a/WebAPI/Sc_MouldProdOutBill/Log/637880489108808963.log b/WebAPI/Sc_MouldProdOutBill/Log/637880489108808963.log
new file mode 100644
index 0000000..3c4849a
--- /dev/null
+++ b/WebAPI/Sc_MouldProdOutBill/Log/637880489108808963.log
@@ -0,0 +1,3 @@
+------------------------2022/5/13 14:28:30------------------------------
+select * from h_v_Sc_MouldProdOutHouseBillList where 搴撳瓨缁勭粐='鎵嬫満浜嬩笟閮�'
+
diff --git a/WebAPI/Vlog/webapi20220512.txt b/WebAPI/Vlog/webapi20220512.txt
new file mode 100644
index 0000000..f431049
--- /dev/null
+++ b/WebAPI/Vlog/webapi20220512.txt
@@ -0,0 +1 @@
+2022/5/12 14:49:13 and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-04-12' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-05-12';钃濇捣瀹炰笟闆嗗洟
diff --git a/WebAPI/Vlog/webapi20220513.txt b/WebAPI/Vlog/webapi20220513.txt
new file mode 100644
index 0000000..7aac2ff
--- /dev/null
+++ b/WebAPI/Vlog/webapi20220513.txt
@@ -0,0 +1,3 @@
+2022/5/13 14:24:59 and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-04-13' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-05-13';鎵嬫満浜嬩笟閮�
+
+2022/5/13 14:28:25 and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-04-13' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-05-13';鎵嬫満浜嬩笟閮�
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index e0c7b1e..8aca390 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -22,6 +22,8 @@
<TargetFrameworkProfile />
<Use64BitIISExpress />
<UseGlobalApplicationHostFile />
+ <NuGetPackageImportStamp>
+ </NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -53,6 +55,12 @@
</Reference>
<Reference Include="Dapper, Version=1.50.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapper.1.50.2\lib\net45\Dapper.dll</HintPath>
+ </Reference>
+ <Reference Include="Grpc.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=d754f35622e28bad, processorArchitecture=MSIL">
+ <HintPath>..\packages\Grpc.Core.2.45.0\lib\net45\Grpc.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="Grpc.Core.Api, Version=2.0.0.0, Culture=neutral, PublicKeyToken=d754f35622e28bad, processorArchitecture=MSIL">
+ <HintPath>..\packages\Grpc.Core.Api.2.45.0\lib\net45\Grpc.Core.Api.dll</HintPath>
</Reference>
<Reference Include="ICSharpCode.SharpZipLib, Version=1.3.2.10, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<HintPath>..\packages\SharpZipLib.1.3.2\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
@@ -87,6 +95,9 @@
<HintPath>..\packages\Swashbuckle.Core.5.0.0\lib\net40\Swashbuckle.Core.dll</HintPath>
<Private>True</Private>
</Reference>
+ <Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+ <HintPath>..\packages\System.Buffers.4.4.0\lib\netstandard1.1\System.Buffers.dll</HintPath>
+ </Reference>
<Reference Include="System.Data.DataSetExtensions">
<Private>True</Private>
</Reference>
@@ -94,11 +105,17 @@
<HintPath>..\packages\System.IdentityModel.Tokens.Jwt.4.0.0\lib\net45\System.IdentityModel.Tokens.Jwt.dll</HintPath>
<Private>True</Private>
</Reference>
+ <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+ <HintPath>..\packages\System.Memory.4.5.3\lib\netstandard1.1\System.Memory.dll</HintPath>
+ </Reference>
<Reference Include="System.Net.Http">
<Private>True</Private>
</Reference>
<Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization">
<Private>True</Private>
@@ -364,6 +381,8 @@
<Compile Include="Controllers\SCGL\Sc_ComplementGoodBillController.cs" />
<Compile Include="Controllers\SCGL\Sc_ComplementGoodsController.cs" />
<Compile Include="Controllers\SCGL\Sc_ICBomBillController.cs" />
+ <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_DayPlanPlatFormImportController.cs" />
+ <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱NpoiHelper.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱Sc_JIT_ComplementGoodBillController.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_CompleteController..cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱Sc_WorkBillSortBillController.cs" />
@@ -804,6 +823,7 @@
<Folder Include="Views\Gy_EquipType\" />
<Folder Include="Views\Gy_ICBomBill\" />
<Folder Include="Views\Gy_RoutingGroup\" />
+ <Folder Include="Views\JIT_DayPlanPlatFormImport\" />
<Folder Include="Views\KF_ICInventoryList_WMSBill\" />
<Folder Include="Views\Kf_ICStockBillMain\" />
<Folder Include="Views\Kf_ICStockInOutBill\" />
@@ -914,6 +934,13 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
+ <Import Project="..\packages\Grpc.Core.2.45.0\build\net45\Grpc.Core.targets" Condition="Exists('..\packages\Grpc.Core.2.45.0\build\net45\Grpc.Core.targets')" />
+ <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>杩欏彴璁＄畻鏈轰笂缂哄皯姝ら」鐩紩鐢ㄧ殑 NuGet 绋嬪簭鍖呫�備娇鐢ㄢ�淣uGet 绋嬪簭鍖呰繕鍘熲�濆彲涓嬭浇杩欎簺绋嬪簭鍖呫�傛湁鍏虫洿澶氫俊鎭紝璇峰弬瑙� http://go.microsoft.com/fwlink/?LinkID=322105銆傜己灏戠殑鏂囦欢鏄� {0}銆�</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('..\packages\Grpc.Core.2.45.0\build\net45\Grpc.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Grpc.Core.2.45.0\build\net45\Grpc.Core.targets'))" />
+ </Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
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/WebAPI/packages.config b/WebAPI/packages.config
index d3c9a5a..185dd60 100644
--- a/WebAPI/packages.config
+++ b/WebAPI/packages.config
@@ -3,6 +3,8 @@
<package id="Antlr" version="3.4.1.9004" targetFramework="net45" />
<package id="bootstrap" version="3.0.0" targetFramework="net45" />
<package id="Dapper" version="1.50.2" targetFramework="net45" />
+ <package id="Grpc.Core" version="2.45.0" targetFramework="net45" />
+ <package id="Grpc.Core.Api" version="2.45.0" targetFramework="net45" />
<package id="jQuery" version="1.10.2" targetFramework="net45" />
<package id="jQuery.Validation" version="1.11.1" targetFramework="net45" />
<package id="Microsoft.AspNet.Cors" version="5.2.7" targetFramework="net45" />
@@ -28,7 +30,10 @@
<package id="SharpZipLib" version="1.3.2" targetFramework="net45" />
<package id="Swashbuckle" version="5.0.0" targetFramework="net45" />
<package id="Swashbuckle.Core" version="5.0.0" targetFramework="net45" />
+ <package id="System.Buffers" version="4.4.0" targetFramework="net45" />
<package id="System.IdentityModel.Tokens.Jwt" version="4.0.0" targetFramework="net45" />
+ <package id="System.Memory" version="4.5.3" targetFramework="net45" />
+ <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net45" />
<package id="WebActivatorEx" version="2.0.6" targetFramework="net45" />
<package id="WebGrease" version="1.5.2" targetFramework="net45" />
</packages>
\ No newline at end of file
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.cs"
index 673d207..06ff6d5 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.cs"
@@ -155,9 +155,13 @@
{
sDlgWhere = sDlgWhere + "and d.HName like '%" + textHprocName.Text + "%'";
}
- if (dtpHBDate.Value.ToShortDateString() != "")//鏃ユ湡
+ if (dtpHBDate.Value.ToShortDateString() != "")//寮�濮嬫棩鏈�
{
- sDlgWhere = sDlgWhere + "and a.HMakeDate <= '" + dtpHBDate.Value.ToShortDateString() + "'";
+ sDlgWhere = sDlgWhere + "and a.HMakeDate >= '" + dtpHBDate.Value.ToShortDateString() + "'";
+ }
+ if (dtpHEDate.Value.ToShortDateString() != "")//缁撴潫鏃ユ湡
+ {
+ sDlgWhere = sDlgWhere + "and a.HMakeDate <= '" + dtpHEDate.Value.ToShortDateString() + "'";
}
//杩囨护鏉′欢
//string sWhere = "";
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.designer.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.designer.cs"
index 2040c36..0d563cc 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.designer.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.designer.cs"
@@ -61,6 +61,8 @@
this.timer2 = new System.Windows.Forms.Timer(this.components);
this.grdMain = new System.Windows.Forms.DataGridView();
this.grdSum = new System.Windows.Forms.DataGridView();
+ this.label5 = new System.Windows.Forms.Label();
+ this.dtpHEDate = new System.Windows.Forms.DateTimePicker();
this.Tool.SuspendLayout();
this.pPic.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
@@ -94,7 +96,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(1785, 71);
+ this.Tool.Size = new System.Drawing.Size(1587, 59);
this.Tool.Stretch = true;
this.Tool.TabIndex = 16;
this.Tool.Text = "toolStrip1";
@@ -108,7 +110,7 @@
this.toolStripDropDownButton1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripDropDownButton1.Name = "toolStripDropDownButton1";
- this.toolStripDropDownButton1.Size = new System.Drawing.Size(64, 66);
+ this.toolStripDropDownButton1.Size = new System.Drawing.Size(53, 56);
this.toolStripDropDownButton1.Text = "寮曞嚭";
this.toolStripDropDownButton1.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.toolStripDropDownButton1.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -116,14 +118,14 @@
// eXCELToolStripMenuItem
//
this.eXCELToolStripMenuItem.Name = "eXCELToolStripMenuItem";
- this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(163, 34);
+ this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(136, 26);
this.eXCELToolStripMenuItem.Text = "EXCEL";
this.eXCELToolStripMenuItem.Click += new System.EventHandler(this.eXCELToolStripMenuItem_Click);
//
// cSVToolStripMenuItem
//
this.cSVToolStripMenuItem.Name = "cSVToolStripMenuItem";
- this.cSVToolStripMenuItem.Size = new System.Drawing.Size(163, 34);
+ this.cSVToolStripMenuItem.Size = new System.Drawing.Size(136, 26);
this.cSVToolStripMenuItem.Text = "CSV";
this.cSVToolStripMenuItem.Click += new System.EventHandler(this.cSVToolStripMenuItem_Click);
//
@@ -145,7 +147,7 @@
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 71);
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 59);
//
// cx
//
@@ -164,7 +166,7 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 71);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 59);
//
// tc
//
@@ -183,13 +185,13 @@
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 71);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 59);
//
// toolStripSeparator8
//
this.toolStripSeparator8.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator8.Name = "toolStripSeparator8";
- this.toolStripSeparator8.Size = new System.Drawing.Size(6, 71);
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 59);
//
// mrlk
//
@@ -199,7 +201,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, 66);
+ this.mrlk.Size = new System.Drawing.Size(73, 56);
this.mrlk.Text = "榛樿鍒楀";
this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -209,7 +211,7 @@
//
this.toolStripSeparator7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator7.Name = "toolStripSeparator7";
- this.toolStripSeparator7.Size = new System.Drawing.Size(6, 71);
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 59);
//
// bclk
//
@@ -219,7 +221,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, 66);
+ this.bclk.Size = new System.Drawing.Size(73, 56);
this.bclk.Text = "淇濆瓨鍒楀";
this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -229,13 +231,15 @@
//
this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(6, 71);
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 59);
//
// pPic
//
this.pPic.BackColor = System.Drawing.Color.White;
this.pPic.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pPic.BackgroundImage")));
this.pPic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
+ this.pPic.Controls.Add(this.label5);
+ this.pPic.Controls.Add(this.dtpHEDate);
this.pPic.Controls.Add(this.label4);
this.pPic.Controls.Add(this.textHprocName);
this.pPic.Controls.Add(this.label2);
@@ -248,85 +252,85 @@
this.pPic.Controls.Add(this.dtpHBDate);
this.pPic.Controls.Add(this.lblCaption);
this.pPic.Dock = System.Windows.Forms.DockStyle.Top;
- this.pPic.Location = new System.Drawing.Point(0, 71);
- this.pPic.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.pPic.Location = new System.Drawing.Point(0, 59);
+ this.pPic.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.pPic.Name = "pPic";
- this.pPic.Size = new System.Drawing.Size(1785, 83);
+ this.pPic.Size = new System.Drawing.Size(1587, 69);
this.pPic.TabIndex = 17;
//
// label4
//
this.label4.AutoSize = true;
this.label4.BackColor = System.Drawing.Color.Transparent;
- this.label4.Location = new System.Drawing.Point(636, 50);
+ this.label4.Location = new System.Drawing.Point(565, 42);
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 = 116;
this.label4.Text = "宸ュ簭鍚嶇О";
//
// textHprocName
//
- this.textHprocName.Location = new System.Drawing.Point(739, 44);
- this.textHprocName.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.textHprocName.Location = new System.Drawing.Point(657, 37);
+ this.textHprocName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textHprocName.Name = "textHprocName";
- this.textHprocName.Size = new System.Drawing.Size(212, 28);
+ this.textHprocName.Size = new System.Drawing.Size(189, 25);
this.textHprocName.TabIndex = 115;
//
// label2
//
this.label2.AutoSize = true;
this.label2.BackColor = System.Drawing.Color.Transparent;
- this.label2.Location = new System.Drawing.Point(298, 50);
+ this.label2.Location = new System.Drawing.Point(265, 42);
this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(80, 18);
+ this.label2.Size = new System.Drawing.Size(67, 15);
this.label2.TabIndex = 114;
this.label2.Text = "鐗╂枡鍚嶇О";
//
// textHmaterName
//
- this.textHmaterName.Location = new System.Drawing.Point(402, 44);
- this.textHmaterName.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.textHmaterName.Location = new System.Drawing.Point(357, 37);
+ this.textHmaterName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textHmaterName.Name = "textHmaterName";
- this.textHmaterName.Size = new System.Drawing.Size(212, 28);
+ this.textHmaterName.Size = new System.Drawing.Size(189, 25);
this.textHmaterName.TabIndex = 113;
//
// label6
//
this.label6.AutoSize = true;
this.label6.BackColor = System.Drawing.Color.Transparent;
- this.label6.Location = new System.Drawing.Point(980, 13);
+ this.label6.Location = new System.Drawing.Point(1174, 13);
this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(80, 18);
+ this.label6.Size = new System.Drawing.Size(67, 15);
this.label6.TabIndex = 112;
this.label6.Text = "娴佽浆鍗″彿";
//
// txtHProcessExchangeBillNo
//
- this.txtHProcessExchangeBillNo.Location = new System.Drawing.Point(1087, 5);
- this.txtHProcessExchangeBillNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.txtHProcessExchangeBillNo.Location = new System.Drawing.Point(1269, 6);
+ this.txtHProcessExchangeBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHProcessExchangeBillNo.Name = "txtHProcessExchangeBillNo";
- this.txtHProcessExchangeBillNo.Size = new System.Drawing.Size(212, 28);
+ this.txtHProcessExchangeBillNo.Size = new System.Drawing.Size(189, 25);
this.txtHProcessExchangeBillNo.TabIndex = 109;
//
// txtHICMOBillNo
//
- this.txtHICMOBillNo.Location = new System.Drawing.Point(739, 5);
- this.txtHICMOBillNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.txtHICMOBillNo.Location = new System.Drawing.Point(960, 6);
+ this.txtHICMOBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHICMOBillNo.Name = "txtHICMOBillNo";
- this.txtHICMOBillNo.Size = new System.Drawing.Size(212, 28);
+ this.txtHICMOBillNo.Size = new System.Drawing.Size(189, 25);
this.txtHICMOBillNo.TabIndex = 35;
//
// label3
//
this.label3.AutoSize = true;
this.label3.BackColor = System.Drawing.Color.Transparent;
- this.label3.Location = new System.Drawing.Point(642, 11);
+ this.label3.Location = new System.Drawing.Point(874, 11);
this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(62, 18);
+ this.label3.Size = new System.Drawing.Size(52, 15);
this.label3.TabIndex = 34;
this.label3.Text = "宸ュ崟鍙�";
//
@@ -334,20 +338,20 @@
//
this.label1.AutoSize = true;
this.label1.BackColor = System.Drawing.Color.Transparent;
- this.label1.Location = new System.Drawing.Point(314, 11);
+ this.label1.Location = new System.Drawing.Point(265, 9);
this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(44, 18);
+ this.label1.Size = new System.Drawing.Size(67, 15);
this.label1.TabIndex = 7;
- this.label1.Text = "鏃ユ湡";
+ this.label1.Text = "寮�濮嬫棩鏈�";
//
// dtpHBDate
//
this.dtpHBDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHBDate.Location = new System.Drawing.Point(402, 5);
- this.dtpHBDate.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.dtpHBDate.Location = new System.Drawing.Point(357, 4);
+ this.dtpHBDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.dtpHBDate.Name = "dtpHBDate";
- this.dtpHBDate.Size = new System.Drawing.Size(158, 28);
+ this.dtpHBDate.Size = new System.Drawing.Size(189, 25);
this.dtpHBDate.TabIndex = 9;
//
// lblCaption
@@ -356,10 +360,10 @@
this.lblCaption.BackColor = System.Drawing.Color.Transparent;
this.lblCaption.Cursor = System.Windows.Forms.Cursors.No;
this.lblCaption.Font = new System.Drawing.Font("瀹嬩綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lblCaption.Location = new System.Drawing.Point(18, 24);
+ this.lblCaption.Location = new System.Drawing.Point(16, 20);
this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(253, 29);
+ this.lblCaption.Size = new System.Drawing.Size(210, 24);
this.lblCaption.TabIndex = 4;
this.lblCaption.Text = "涓嶈壇鏄庣粏鑹巼鎶ヨ〃";
//
@@ -375,13 +379,13 @@
this.grdMain.BackgroundColor = System.Drawing.Color.White;
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.grdMain.Location = new System.Drawing.Point(0, 154);
- this.grdMain.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.grdMain.Location = new System.Drawing.Point(0, 128);
+ this.grdMain.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
this.grdMain.RowHeadersWidth = 51;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(1785, 496);
+ this.grdMain.Size = new System.Drawing.Size(1587, 414);
this.grdMain.TabIndex = 48;
this.grdMain.CellMouseUp += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.grdMain_CellMouseUp);
this.grdMain.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.grdMain_ColumnWidthChanged);
@@ -394,27 +398,47 @@
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, 650);
- this.grdSum.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.grdSum.Location = new System.Drawing.Point(0, 542);
+ this.grdSum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.grdSum.Name = "grdSum";
this.grdSum.ReadOnly = true;
this.grdSum.RowHeadersWidth = 51;
this.grdSum.RowTemplate.Height = 23;
this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
- this.grdSum.Size = new System.Drawing.Size(1785, 29);
+ this.grdSum.Size = new System.Drawing.Size(1587, 24);
this.grdSum.TabIndex = 49;
+ //
+ // label5
+ //
+ this.label5.AutoSize = true;
+ this.label5.BackColor = System.Drawing.Color.Transparent;
+ this.label5.Location = new System.Drawing.Point(565, 9);
+ this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(67, 15);
+ this.label5.TabIndex = 117;
+ this.label5.Text = "缁撴潫鏃ユ湡";
+ //
+ // dtpHEDate
+ //
+ this.dtpHEDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
+ this.dtpHEDate.Location = new System.Drawing.Point(657, 6);
+ this.dtpHEDate.Margin = new System.Windows.Forms.Padding(4);
+ this.dtpHEDate.Name = "dtpHEDate";
+ this.dtpHEDate.Size = new System.Drawing.Size(189, 25);
+ this.dtpHEDate.TabIndex = 118;
//
// DefectiveDetailedYieldReport
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1785, 679);
+ this.ClientSize = new System.Drawing.Size(1587, 566);
this.Controls.Add(this.grdMain);
this.Controls.Add(this.grdSum);
this.Controls.Add(this.pPic);
this.Controls.Add(this.Tool);
this.KeyPreview = true;
- this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "DefectiveDetailedYieldReport";
this.Text = "涓嶈壇鏄庣粏鑹巼鎶ヨ〃";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -463,5 +487,7 @@
public System.Windows.Forms.TextBox textHmaterName;
private System.Windows.Forms.Label label4;
public System.Windows.Forms.TextBox textHprocName;
+ private System.Windows.Forms.Label label5;
+ public System.Windows.Forms.DateTimePicker dtpHEDate;
}
}
\ No newline at end of file
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.resx" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.resx"
index 6a1e7e6..af83a43 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.resx"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.resx"
@@ -256,7 +256,7 @@
<data name="toolStripDropDownButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAE6SURBVDhPY0hOnvOfEgw2AAY6OjqA5Jn/v78f+P/tzYb/
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAE6SURBVDhPY0hOnvOfEgw2AAY6OjqA5Jn/v78f+P/tzYb/
7+/P+f/iUsf/x8fK/t/Zmfz/2hr//xcW2v9PS0v7f+DAgf8MDAwIA2aeAWqdaYxiwDuoAY9gBqwFGWD3
v9AbqBGkGZ8BX1+vh7sAZMDdXSAXBIBdADIgNWMh8QY8PlYO9QLCgDR8BvwBewFiwMtLnfAwuAoNA4IG
QMIAZMBsoAGIMLhKrAvAXkByAaoBkEBMzcRiwPTjv8CShHBmwYr/abgMmHzgy//+7W/+d657/L91ya3/
@@ -268,7 +268,7 @@
<data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
ao0ImqppU39qSFVMtVZLrfQXFMlKFy4KbaXQTao7Cd1U3VSyFFQIqNXYZDKZTHJ8976ZTEZD6AcnL+/e
e857A08p5uX7MEgv3i4h9GYRE3MLJUW9sdlPMG0SKhCvP4Z5/R8cIVYA0dk/AkOsKT1fUmpWzvkCz+2A
4PQ7WRW0tnvR5unFvQ7vFVH9fvdjdPYNoccftANGJufZbOTyvJZjdOaD8/uJ4dAcNzO6ga3dPezEbNFe
@@ -282,7 +282,7 @@
<data name="cx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
UjJbCzQWk5EFRslEiUwZFNLo+lMaxWCIIUXIQhYzj/edc28NHUzzq1/v7Z7zPOee6/ybgMu3lhwP6NrO
F9q6blqaSDaETnOs3UIiCx2bUBuDmjmojpr5t0QWZ9KQfJSNkll5roxAxQRUTZn+LvBOH0vBQgbidzB0
KF+wCA1xaEyYqbVLPEG/CwMC9iShbQu69yEo0uFzM7V2QV2Y2E2e4Al07kGL3L/3CEKXsCRXSryaOZ3J
@@ -294,7 +294,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
@@ -304,7 +304,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
@@ -319,7 +319,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
diff --git "a/WorkM/\350\275\246\351\227\264\347\256\241\347\220\206/QC_NoPassProdCheckBill.cs" "b/WorkM/\350\275\246\351\227\264\347\256\241\347\220\206/QC_NoPassProdCheckBill.cs"
index 8aa6b15..5a1499e 100644
--- "a/WorkM/\350\275\246\351\227\264\347\256\241\347\220\206/QC_NoPassProdCheckBill.cs"
+++ "b/WorkM/\350\275\246\351\227\264\347\256\241\347\220\206/QC_NoPassProdCheckBill.cs"
@@ -1141,6 +1141,19 @@
}
}
+ else
+ {
+ if (DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HBadQtyCol].Value) != 0)
+ {
+ MessageBox.Show("绗�" + (i + 1) + "琛岋紝娌℃湁涓嶈壇鍘熷洜涓嶈兘濉啓涓嶈壇鏁伴噺锛�");
+ return false;
+ }
+ if (DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HBadPCSQtyCol].Value) != 0)
+ {
+ MessageBox.Show("绗�" + (i + 1) + "琛岋紝娌℃湁涓嶈壇鍘熷洜涓嶈兘濉啓涓嶈壇PCS鏁伴噺锛�");
+ return false;
+ }
+ }
}
//if (ClsPub.isDoule(txtHBadPNL.Text) != sPNLQty)
//{
@@ -1149,7 +1162,7 @@
//}
if (ClsPub.isDoule(txtHBadQty.Text) != sPCSQty)
{
- MessageBox.Show("鏄庣粏鎶ュ簾PCS鏁颁笉绛変簬鎬绘姤搴烶CS锛屼笉鍏佽淇濆瓨锛�");
+ MessageBox.Show("琛ㄤ綋鏄庣粏涓嶈壇鏁颁笉绛変簬琛ㄥご鎬讳笉鑹暟閲忥紝涓嶅厑璁镐繚瀛橈紒");
return false;
}
}
diff --git "a/WorkM/\350\275\246\351\227\264\347\256\241\347\220\206/QC_NoPassProdCheckBill.designer.cs" "b/WorkM/\350\275\246\351\227\264\347\256\241\347\220\206/QC_NoPassProdCheckBill.designer.cs"
index 746681c..55333bd 100644
--- "a/WorkM/\350\275\246\351\227\264\347\256\241\347\220\206/QC_NoPassProdCheckBill.designer.cs"
+++ "b/WorkM/\350\275\246\351\227\264\347\256\241\347\220\206/QC_NoPassProdCheckBill.designer.cs"
@@ -1094,7 +1094,7 @@
//
this.label16.AutoSize = true;
this.label16.ForeColor = System.Drawing.Color.Black;
- this.label16.Location = new System.Drawing.Point(377, 136);
+ this.label16.Location = new System.Drawing.Point(390, 136);
this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label16.Name = "label16";
this.label16.Size = new System.Drawing.Size(67, 15);
--
Gitblit v1.9.1