From 45900455b491ca9282f8debaeef06b1e258928ee Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 25 九月 2023 09:19:35 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
PlanM/计划管理/Gy_RoutingBillList.cs | 5
WarM/条码打印/Kf_WeighToBarCode_StationOutBill.cs | 26
WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs | 36
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 36
WebAPI/Controllers/项目管理/报表分析/PM_ReportController.cs | 188 ++
WebAPI/Models/ClsKf_MateOutBillMain.cs | 24
WebAPI/Controllers/条码管理/WEBSController.cs | 78
Model/Model.csproj | 1
WebAPI/Controllers/LMESController.cs | 204 ++
WebAPI/Controllers/BaseSet/Gy_SourceController.cs | 360 +++++
BLL/系统管理/用户管理/Xt_UserNew.cs | 12
WebAPI/Controllers/MateOutController.cs | 342 +++++
WebAPI/Controllers/OtherOutBillController.cs | 1
WebAPI/DLL/ClsKf_MateOutBill.cs | 281 ++++
WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs | 95 +
WebAPI/Models/ClsGy_Material_Model.cs | 1
BLL/系统管理/用户管理/Xt_User.designer.cs | 106 +
WebAPI/Controllers/品质管理/产线返修平台/Sc_SourceLineRepairBillController.cs | 2
BLL/系统管理/用户管理/Xt_User.resx | 434 +++---
Model/质检管理/ClsSc_ProcessExchangeBillMain_Note.cs | 25
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 192 ++
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs | 146 +
PlanM/计划管理/Gy_RoutingBill.designer.cs | 69
WebAPI/Controllers/CJGL/Cj_StationInBillController.cs | 191 ++
WebAPI/Controllers/项目管理/工作任务/PM_WorkTaskBillController.cs | 164 +-
WebAPI/Controllers/SCGL/日计划管理/Sc_JIT_ComplementGoodBillController.cs | 48
BLL/系统管理/用户管理/Xt_User.cs | 21
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormBillController.cs | 62
BLL/系统管理/用户管理/Xt_UserNew.designer.cs | 28
WebAPI/Controllers/仓存管理/领料发货/Kf_MateOutBillController.cs | 489 +++++++
WebAPI/WebAPI.csproj | 1
WebAPI/Controllers/项目管理/项目阶段/Gy_ProjectStageController.cs | 51
WebAPI/Models/ClsKf_MateOutBillSub.cs | 2
WebAPI/DLL/ClsGy_Material_Ctl.cs | 7
34 files changed, 2,986 insertions(+), 742 deletions(-)
diff --git "a/BLL/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_User.cs" "b/BLL/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_User.cs"
index 46fdffb..35a7379 100644
--- "a/BLL/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_User.cs"
+++ "b/BLL/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_User.cs"
@@ -78,7 +78,16 @@
{
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
DataSet oDs = new DataSet();
- oDs = oCn.RunProcReturn("select * from h_v_Gy_Czygl order by 用户", "h_v_Gy_Czygl", ref DBUtility.ClsPub.sExeReturnInfo);
+ string sWhere="";
+ if(rbHUserType1.Checked==true)
+ {
+ sWhere = "" + "用户类型 = '内部账号' ";
+ }
+ else
+ {
+ sWhere = "" + "用户类型 = '供应商账号' ";
+ }
+ oDs = oCn.RunProcReturn("select * from h_v_Gy_Czygl where " + sWhere + " order by 用户", "h_v_Gy_Czygl", ref DBUtility.ClsPub.sExeReturnInfo);
if (oDs == null)
{
MessageBox.Show("显示失败！原因：" + DBUtility.ClsPub.sExeReturnInfo);
@@ -363,7 +372,15 @@
}
}
-
+ private void rbHUserType1_CheckedChanged(object sender, EventArgs e)
+ {
+ Display1();
+ }
+ private void radioButton1_CheckedChanged(object sender, EventArgs e)
+ {
+
+ Display1();
+ }
}
}
\ No newline at end of file
diff --git "a/BLL/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_User.designer.cs" "b/BLL/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_User.designer.cs"
index c0c61d4..4cfa856 100644
--- "a/BLL/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_User.designer.cs"
+++ "b/BLL/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_User.designer.cs"
@@ -34,14 +34,15 @@
this.xzz = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
this.qx = new System.Windows.Forms.ToolStripButton();
- this.sc = new System.Windows.Forms.ToolStripButton();
- this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.shuax = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+ this.sc = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
this.mrlk = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
this.bclk = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
+ this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.tc = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
@@ -53,8 +54,10 @@
this.label10 = new System.Windows.Forms.Label();
this.cmdHUser = new System.Windows.Forms.Button();
this.txtHUser = new System.Windows.Forms.TextBox();
- this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+ this.rbHUserType1 = new System.Windows.Forms.RadioButton();
+ this.radioButton1 = new System.Windows.Forms.RadioButton();
this.ToolBar.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout();
@@ -87,7 +90,7 @@
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(842, 50);
+ this.ToolBar.Size = new System.Drawing.Size(1071, 50);
this.ToolBar.Stretch = true;
this.ToolBar.TabIndex = 15;
this.ToolBar.Text = "toolStrip1";
@@ -140,25 +143,6 @@
this.qx.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.qx.Click += new System.EventHandler(this.qx_Click);
//
- // sc
- //
- this.sc.AutoSize = false;
- this.sc.Image = ((System.Drawing.Image)(resources.GetObject("sc.Image")));
- this.sc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.sc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.sc.ImageTransparentColor = System.Drawing.Color.White;
- this.sc.Name = "sc";
- this.sc.Size = new System.Drawing.Size(35, 47);
- this.sc.Text = "鍒犻櫎";
- this.sc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.sc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.sc.Click += new System.EventHandler(this.sc_Click);
- //
- // toolStripSeparator2
- //
- this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 50);
- //
// shuax
//
this.shuax.AutoSize = false;
@@ -172,6 +156,25 @@
this.shuax.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.shuax.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.shuax.Click += new System.EventHandler(this.shuax_Click);
+ //
+ // toolStripSeparator2
+ //
+ this.toolStripSeparator2.Name = "toolStripSeparator2";
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 50);
+ //
+ // sc
+ //
+ this.sc.AutoSize = false;
+ this.sc.Image = ((System.Drawing.Image)(resources.GetObject("sc.Image")));
+ this.sc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.sc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.sc.ImageTransparentColor = System.Drawing.Color.White;
+ this.sc.Name = "sc";
+ this.sc.Size = new System.Drawing.Size(35, 47);
+ this.sc.Text = "鍒犻櫎";
+ this.sc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.sc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.sc.Click += new System.EventHandler(this.sc_Click);
//
// toolStripSeparator8
//
@@ -219,6 +222,11 @@
this.toolStripSeparator9.Name = "toolStripSeparator9";
this.toolStripSeparator9.Size = new System.Drawing.Size(6, 50);
//
+ // toolStripSeparator1
+ //
+ this.toolStripSeparator1.Name = "toolStripSeparator1";
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
+ //
// tc
//
this.tc.AutoSize = false;
@@ -256,8 +264,8 @@
this.splitContainer1.Panel2.Controls.Add(this.grdSub);
this.splitContainer1.Panel2.Controls.Add(this.panel2);
this.splitContainer1.Panel2.Controls.Add(this.label1);
- this.splitContainer1.Size = new System.Drawing.Size(842, 560);
- this.splitContainer1.SplitterDistance = 309;
+ this.splitContainer1.Size = new System.Drawing.Size(1071, 856);
+ this.splitContainer1.SplitterDistance = 472;
this.splitContainer1.TabIndex = 18;
//
// grdMain
@@ -269,17 +277,17 @@
this.grdMain.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None;
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.grdMain.Location = new System.Drawing.Point(16, 0);
+ this.grdMain.Location = new System.Drawing.Point(35, 0);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
this.grdMain.RowHeadersVisible = false;
this.grdMain.RowTemplate.DefaultCellStyle.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255)))));
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(826, 309);
+ this.grdMain.Size = new System.Drawing.Size(1036, 472);
this.grdMain.TabIndex = 19;
+ this.grdMain.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdMain_CellClick);
this.grdMain.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdMain_CellDoubleClick);
this.grdMain.DoubleClick += new System.EventHandler(this.grdMain_DoubleClick);
- this.grdMain.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdMain_CellClick);
//
// panel1
//
@@ -287,7 +295,7 @@
this.panel1.Dock = System.Windows.Forms.DockStyle.Left;
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(16, 309);
+ this.panel1.Size = new System.Drawing.Size(35, 472);
this.panel1.TabIndex = 20;
//
// grdSub
@@ -299,16 +307,16 @@
this.grdSub.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None;
this.grdSub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdSub.Dock = System.Windows.Forms.DockStyle.Top;
- this.grdSub.Location = new System.Drawing.Point(16, 0);
+ this.grdSub.Location = new System.Drawing.Point(35, 0);
this.grdSub.Name = "grdSub";
this.grdSub.ReadOnly = true;
this.grdSub.RowHeadersVisible = false;
this.grdSub.RowTemplate.DefaultCellStyle.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255)))));
this.grdSub.RowTemplate.Height = 23;
- this.grdSub.Size = new System.Drawing.Size(826, 214);
+ this.grdSub.Size = new System.Drawing.Size(1036, 214);
this.grdSub.TabIndex = 18;
- this.grdSub.DoubleClick += new System.EventHandler(this.grdSub_DoubleClick);
this.grdSub.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdSub_CellClick);
+ this.grdSub.DoubleClick += new System.EventHandler(this.grdSub_DoubleClick);
//
// panel2
//
@@ -316,7 +324,7 @@
this.panel2.Dock = System.Windows.Forms.DockStyle.Left;
this.panel2.Location = new System.Drawing.Point(0, 0);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(16, 247);
+ this.panel2.Size = new System.Drawing.Size(35, 380);
this.panel2.TabIndex = 20;
//
// label1
@@ -361,16 +369,37 @@
this.txtHUser.TabIndex = 60;
this.txtHUser.Tag = "0";
//
- // toolStripSeparator1
+ // rbHUserType1
//
- this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
+ this.rbHUserType1.AutoSize = true;
+ this.rbHUserType1.Checked = true;
+ this.rbHUserType1.Location = new System.Drawing.Point(552, 32);
+ this.rbHUserType1.Name = "rbHUserType1";
+ this.rbHUserType1.Size = new System.Drawing.Size(71, 16);
+ this.rbHUserType1.TabIndex = 0;
+ this.rbHUserType1.TabStop = true;
+ this.rbHUserType1.Text = "鍐呴儴璐﹀彿";
+ this.rbHUserType1.UseVisualStyleBackColor = true;
+ this.rbHUserType1.CheckedChanged += new System.EventHandler(this.rbHUserType1_CheckedChanged);
+ //
+ // radioButton1
+ //
+ this.radioButton1.AutoSize = true;
+ this.radioButton1.Location = new System.Drawing.Point(629, 33);
+ this.radioButton1.Name = "radioButton1";
+ this.radioButton1.Size = new System.Drawing.Size(83, 16);
+ this.radioButton1.TabIndex = 63;
+ this.radioButton1.Text = "渚涘簲鍟嗚处鍙�";
+ this.radioButton1.UseVisualStyleBackColor = true;
+ this.radioButton1.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged);
//
// Xt_User
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(842, 610);
+ this.ClientSize = new System.Drawing.Size(1071, 906);
+ this.Controls.Add(this.radioButton1);
+ this.Controls.Add(this.rbHUserType1);
this.Controls.Add(this.label10);
this.Controls.Add(this.cmdHUser);
this.Controls.Add(this.txtHUser);
@@ -386,6 +415,7 @@
this.splitContainer1.Panel1.ResumeLayout(false);
this.splitContainer1.Panel2.ResumeLayout(false);
this.splitContainer1.Panel2.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
this.splitContainer1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.grdMain)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.grdSub)).EndInit();
@@ -421,5 +451,7 @@
private System.Windows.Forms.Button cmdHUser;
private System.Windows.Forms.TextBox txtHUser;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
+ private System.Windows.Forms.RadioButton rbHUserType1;
+ private System.Windows.Forms.RadioButton radioButton1;
}
}
\ No newline at end of file
diff --git "a/BLL/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_User.resx" "b/BLL/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_User.resx"
index 434d682..6158275 100644
--- "a/BLL/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_User.resx"
+++ "b/BLL/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_User.resx"
@@ -112,289 +112,249 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <metadata name="ToolBar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="ToolBar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="ToolBar.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
- /9j/4AAQSkZJRgABAQEASABIAAD/7QkuUGhvdG9zaG9wIDMuMAA4QklNBCUAAAAAABAAAAAAAAAAAAAA
- AAAAAAAAOEJJTQPtAAAAAAAQAEgAAAABAAIASAAAAAEAAjhCSU0EJgAAAAAADgAAAAAAAAAAAAA/gAAA
- OEJJTQQNAAAAAAAEAAAAeDhCSU0EGQAAAAAABAAAAB44QklNA/MAAAAAAAkAAAAAAAAAAAEAOEJJTQQK
- AAAAAAABAAA4QklNJxAAAAAAAAoAAQAAAAAAAAACOEJJTQP1AAAAAABIAC9mZgABAGxmZgAGAAAAAAAB
- AC9mZgABAKGZmgAGAAAAAAABADIAAAABAFoAAAAGAAAAAAABADUAAAABAC0AAAAGAAAAAAABOEJJTQP4
- AAAAAABwAAD/////////////////////////////A+gAAAAA/////////////////////////////wPo
- AAAAAP////////////////////////////8D6AAAAAD/////////////////////////////A+gAADhC
- SU0EAAAAAAAAAgABOEJJTQQCAAAAAAAEAAAAADhCSU0ECAAAAAAAEAAAAAEAAAJAAAACQAAAAAA4QklN
- BB4AAAAAAAQAAAAAOEJJTQQaAAAAAAM/AAAABgAAAAAAAAAAAAAAaAAABAAAAAAFZypoB5iYAC0AMQAA
- AAEAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAEAAAAAGgAAAAAAAAAAAAAAAAAAAAAAQAAAAAA
- AAAAAAAAAAAAAAAAAAAQAAAAAQAAAAAAAG51bGwAAAACAAAABmJvdW5kc09iamMAAAABAAAAAAAAUmN0
- MQAAAAQAAAAAVG9wIGxvbmcAAAAAAAAAAExlZnRsb25nAAAAAAAAAABCdG9tbG9uZwAAAGgAAAAAUmdo
- dGxvbmcAAAQAAAAABnNsaWNlc1ZsTHMAAAABT2JqYwAAAAEAAAAAAAVzbGljZQAAABIAAAAHc2xpY2VJ
- RGxvbmcAAAAAAAAAB2dyb3VwSURsb25nAAAAAAAAAAZvcmlnaW5lbnVtAAAADEVTbGljZU9yaWdpbgAA
- AA1hdXRvR2VuZXJhdGVkAAAAAFR5cGVlbnVtAAAACkVTbGljZVR5cGUAAAAASW1nIAAAAAZib3VuZHNP
- YmpjAAAAAQAAAAAAAFJjdDEAAAAEAAAAAFRvcCBsb25nAAAAAAAAAABMZWZ0bG9uZwAAAAAAAAAAQnRv
- bWxvbmcAAABoAAAAAFJnaHRsb25nAAAEAAAAAAN1cmxURVhUAAAAAQAAAAAAAG51bGxURVhUAAAAAQAA
- AAAAAE1zZ2VURVhUAAAAAQAAAAAABmFsdFRhZ1RFWFQAAAABAAAAAAAOY2VsbFRleHRJc0hUTUxib29s
- AQAAAAhjZWxsVGV4dFRFWFQAAAABAAAAAAAJaG9yekFsaWduZW51bQAAAA9FU2xpY2VIb3J6QWxpZ24A
- AAAHZGVmYXVsdAAAAAl2ZXJ0QWxpZ25lbnVtAAAAD0VTbGljZVZlcnRBbGlnbgAAAAdkZWZhdWx0AAAA
- C2JnQ29sb3JUeXBlZW51bQAAABFFU2xpY2VCR0NvbG9yVHlwZQAAAABOb25lAAAACXRvcE91dHNldGxv
- bmcAAAAAAAAACmxlZnRPdXRzZXRsb25nAAAAAAAAAAxib3R0b21PdXRzZXRsb25nAAAAAAAAAAtyaWdo
- dE91dHNldGxvbmcAAAAAADhCSU0EEQAAAAAAAQEAOEJJTQQUAAAAAAAEAAAAAjhCSU0EDAAAAAADbAAA
- AAEAAACAAAAADQAAAYAAABOAAAADUAAYAAH/2P/gABBKRklGAAECAQBIAEgAAP/tAAxBZG9iZV9DTQAC
- /+4ADkFkb2JlAGSAAAAAAf/bAIQADAgICAkIDAkJDBELCgsRFQ8MDA8VGBMTFRMTGBEMDAwMDAwRDAwM
- DAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAENCwsNDg0QDg4QFA4ODhQUDg4ODhQRDAwMDAwREQwMDAwM
- DBEMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwM/8AAEQgADQCAAwEiAAIRAQMRAf/dAAQACP/EAT8A
- AAEFAQEBAQEBAAAAAAAAAAMAAQIEBQYHCAkKCwEAAQUBAQEBAQEAAAAAAAAAAQACAwQFBgcICQoLEAAB
- BAEDAgQCBQcGCAUDDDMBAAIRAwQhEjEFQVFhEyJxgTIGFJGhsUIjJBVSwWIzNHKC0UMHJZJT8OHxY3M1
- FqKygyZEk1RkRcKjdDYX0lXiZfKzhMPTdePzRieUpIW0lcTU5PSltcXV5fVWZnaGlqa2xtbm9jdHV2d3
- h5ent8fX5/cRAAICAQIEBAMEBQYHBwYFNQEAAhEDITESBEFRYXEiEwUygZEUobFCI8FS0fAzJGLhcoKS
- Q1MVY3M08SUGFqKygwcmNcLSRJNUoxdkRVU2dGXi8rOEw9N14/NGlKSFtJXE1OT0pbXF1eX1VmZ2hpam
- tsbW5vYnN0dXZ3eHl6e3x//aAAwDAQACEQMRAD8A7L/mvg/uZn/btf8A5JL/AJr4P7mZ/wBu1/8Aklvp
- KXizeP2MfDj8PtcD/mvg/uZn/btf/kkv+a+D+5mf9u1/+SW+klxZvH7FVj8PtcD/AJr4P7mZ/wBu1/8A
- kkv+a+D+5mf9u1f+SW+klxZvH7FcOPw+1wP+a+D+5mf9u1f+SS/5r4P7mZ/27V/5Jb6SXFm8fsVw4/D7
- XA/5r4P7mZ/27V/5JL/mvg/uZn/btX/klvpJcWbx+xXDj8PtcD/mvg/uZn/btf8A5JL/AJr4P7mZ/wBu
- 1/8AklvpJcWbx+xVY/D7XA/5r4P7mZ/27V/5JL/mvg/uZn/btf8A5Jb6SXFm8fsVw4/D7XA/5r4P7mZ/
- 27X/AOSS/wCa+D+5mf8Abtf/AJJb6SXFm8fsVw4/D7X/2ThCSU0EIQAAAAAAVQAAAAEBAAAADwBBAGQA
- bwBiAGUAIABQAGgAbwB0AG8AcwBoAG8AcAAAABMAQQBkAG8AYgBlACAAUABoAG8AdABvAHMAaABvAHAA
- IAA3AC4AMAAAAAEAOEJJTQQGAAAAAAAHAAgAAAABAQD/4QR8RXhpZgAATU0AKgAAAAgABwESAAMAAAAB
- AAEAAAEaAAUAAAABAAAAYgEbAAUAAAABAAAAagEoAAMAAAABAAIAAAExAAIAAAAUAAAAcgEyAAIAAAAU
- AAAAhodpAAQAAAABAAAAmgAAAMYAAABIAAAAAQAAAEgAAAABQWRvYmUgUGhvdG9zaG9wIDcuMAAyMDA0
- OjEwOjE0IDE1OjUwOjUwAAADoAEAAwAAAAH//wAAoAIABAAAAAEAAAQAoAMABAAAAAEAAABoAAAAAAAA
- AAYBAwADAAAAAQAGAAABGgAFAAAAAQAAARQBGwAFAAAAAQAAARwBKAADAAAAAQACAAACAQAEAAAAAQAA
- ASQCAgAEAAAAAQAAA1AAAAAAAAAASAAAAAEAAABIAAAAAf/Y/+AAEEpGSUYAAQIBAEgASAAA/+0ADEFk
- b2JlX0NNAAL/7gAOQWRvYmUAZIAAAAAB/9sAhAAMCAgICQgMCQkMEQsKCxEVDwwMDxUYExMVExMYEQwM
- DAwMDBEMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAQ0LCw0ODRAODhAUDg4OFBQODg4OFBEMDAwM
- DBERDAwMDAwMEQwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAz/wAARCAANAIADASIAAhEBAxEB/90A
- BAAI/8QBPwAAAQUBAQEBAQEAAAAAAAAAAwABAgQFBgcICQoLAQABBQEBAQEBAQAAAAAAAAABAAIDBAUG
- BwgJCgsQAAEEAQMCBAIFBwYIBQMMMwEAAhEDBCESMQVBUWETInGBMgYUkaGxQiMkFVLBYjM0coLRQwcl
- klPw4fFjczUWorKDJkSTVGRFwqN0NhfSVeJl8rOEw9N14/NGJ5SkhbSVxNTk9KW1xdXl9VZmdoaWprbG
- 1ub2N0dXZ3eHl6e3x9fn9xEAAgIBAgQEAwQFBgcHBgU1AQACEQMhMRIEQVFhcSITBTKBkRShsUIjwVLR
- 8DMkYuFygpJDUxVjczTxJQYWorKDByY1wtJEk1SjF2RFVTZ0ZeLys4TD03Xj80aUpIW0lcTU5PSltcXV
- 5fVWZnaGlqa2xtbm9ic3R1dnd4eXp7fH/9oADAMBAAIRAxEAPwDsv+a+D+5mf9u1/wDkkv8Amvg/uZn/
- AG7X/wCSW+kpeLN4/Yx8OPw+1wP+a+D+5mf9u1/+SS/5r4P7mZ/27X/5Jb6SXFm8fsVWPw+1wP8Amvg/
- uZn/AG7X/wCSS/5r4P7mZ/27V/5Jb6SXFm8fsVw4/D7XA/5r4P7mZ/27V/5JL/mvg/uZn/btX/klvpJc
- Wbx+xXDj8PtcD/mvg/uZn/btX/kkv+a+D+5mf9u1f+SW+klxZvH7FcOPw+1wP+a+D+5mf9u1/wDkkv8A
- mvg/uZn/AG7X/wCSW+klxZvH7FVj8PtcD/mvg/uZn/btX/kkv+a+D+5mf9u1/wDklvpJcWbx+xXDj8Pt
- cD/mvg/uZn/btf8A5JL/AJr4P7mZ/wBu1/8AklvpJcWbx+xXDj8Ptf/Z/9sAQwAIBgYHBgUIBwcHCQkI
- CgwUDQwLCwwZEhMPFB0aHx4dGhwcICQuJyAiLCMcHCg3KSwwMTQ0NB8nOT04MjwuMzQy/9sAQwEJCQkM
- CwwYDQ0YMiEcITIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy
- /8AAEQgAKQQAAwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIB
- AwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYn
- KCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqi
- o6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8B
- AAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYS
- QVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZX
- WFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXG
- x8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A1v8AhI7v/nlD/wB+k/8A
- iaP+Eku/+eUP/fpP/iapfZ6Ps9er7NHn87Lv/CR3f/PKH/v0n/xNH/CR3f8Azyh/79J/8TVL7PR9no5E
- HOy7/wAJHd/88of+/Sf/ABNH/CR3f/PKH/v0n/xNUvs9H2f2o5EHOy7/AMJHd/8APKH/AL9J/wDE0f8A
- CSXf/PKH/v0n/wATVL7P7UfZ/ajkQc7Lv/CSXf8Azyh/79J/8TR/wkl3/wA8of8Av0n/AMTVL7P7UfZ/
- ajkQc7Lv/CR3X/PKH/v0n/xNH/CR3X/PKH/v0n/xNUvs/tR9no5EHOy7/wAJHdf88of+/af/ABNH/CR3
- f/PKH/v0n/xNUvs9H2ejkQc7Lv8Awkd1/wA8of8Av2n/AMTR/wAJHdf88of+/af/ABNUvs/tR9n9qORB
- zsu/8JHd/wDPKH/v2n/xNH/CR3f/ADyh/wC/af8AxNUvs/tR9n9qORBzsu/8JJdf88of+/Sf4Uf8JJdf
- 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
- 6K5iiiwHT0VzFFFgOnormKKLAf/Z
+ /9j/4AAQSkZJRgABAQEASABIAAD/4QR8RXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAAB
+ AAAAYgEbAAUAAAABAAAAagEoAAMAAAABAAIAAAExAAIAAAAUAAAAcgEyAAIAAAAUAAAAhodpAAQAAAAB
+ AAAAmgAAAMYAAABIAAAAAQAAAEgAAAABQWRvYmUgUGhvdG9zaG9wIDcuMAAyMDA0OjEwOjE0IDE1OjUw
+ OjUwAAADoAEAAwAAAAH//wAAoAIABAAAAAEAAAQAoAMABAAAAAEAAABoAAAAAAAAAAYBAwADAAAAAQAG
+ AAABGgAFAAAAAQAAARQBGwAFAAAAAQAAARwBKAADAAAAAQACAAACAQAEAAAAAQAAASQCAgAEAAAAAQAA
+ A1AAAAAAAAAASAAAAAEAAABIAAAAAf/Y/+AAEEpGSUYAAQIBAEgASAAA/+0ADEFkb2JlX0NNAAL/7gAO
+ QWRvYmUAZIAAAAAB/9sAhAAMCAgICQgMCQkMEQsKCxEVDwwMDxUYExMVExMYEQwMDAwMDBEMDAwMDAwM
+ DAwMDAwMDAwMDAwMDAwMDAwMDAwMAQ0LCw0ODRAODhAUDg4OFBQODg4OFBEMDAwMDBERDAwMDAwMEQwM
+ DAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAz/wAARCAANAIADASIAAhEBAxEB/90ABAAI/8QBPwAAAQUB
+ AQEBAQEAAAAAAAAAAwABAgQFBgcICQoLAQABBQEBAQEBAQAAAAAAAAABAAIDBAUGBwgJCgsQAAEEAQMC
+ BAIFBwYIBQMMMwEAAhEDBCESMQVBUWETInGBMgYUkaGxQiMkFVLBYjM0coLRQwclklPw4fFjczUWorKD
+ JkSTVGRFwqN0NhfSVeJl8rOEw9N14/NGJ5SkhbSVxNTk9KW1xdXl9VZmdoaWprbG1ub2N0dXZ3eHl6e3
+ x9fn9xEAAgIBAgQEAwQFBgcHBgU1AQACEQMhMRIEQVFhcSITBTKBkRShsUIjwVLR8DMkYuFygpJDUxVj
+ czTxJQYWorKDByY1wtJEk1SjF2RFVTZ0ZeLys4TD03Xj80aUpIW0lcTU5PSltcXV5fVWZnaGlqa2xtbm
+ 9ic3R1dnd4eXp7fH/9oADAMBAAIRAxEAPwDsv+a+D+5mf9u1/wDkkv8Amvg/uZn/AG7X/wCSW+kpeLN4
+ /Yx8OPw+1wP+a+D+5mf9u1/+SS/5r4P7mZ/27X/5Jb6SXFm8fsVWPw+1wP8Amvg/uZn/AG7X/wCSS/5r
+ 4P7mZ/27V/5Jb6SXFm8fsVw4/D7XA/5r4P7mZ/27V/5JL/mvg/uZn/btX/klvpJcWbx+xXDj8PtcD/mv
+ g/uZn/btX/kkv+a+D+5mf9u1f+SW+klxZvH7FcOPw+1wP+a+D+5mf9u1/wDkkv8Amvg/uZn/AG7X/wCS
+ W+klxZvH7FVj8PtcD/mvg/uZn/btX/kkv+a+D+5mf9u1/wDklvpJcWbx+xXDj8PtcD/mvg/uZn/btf8A
+ 5JL/AJr4P7mZ/wBu1/8AklvpJcWbx+xXDj8Ptf/Z/9sAQwAIBgYHBgUIBwcHCQkICgwUDQwLCwwZEhMP
+ FB0aHx4dGhwcICQuJyAiLCMcHCg3KSwwMTQ0NB8nOT04MjwuMzQy/9sAQwEJCQkMCwwYDQ0YMiEcITIy
+ MjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy/8AAEQgAKQQAAwEi
+ AAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAAB
+ fQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNE
+ RUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1
+ tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEA
+ AAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRC
+ kaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpz
+ dHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ
+ 2uLj5OXm5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A1v8AhI7v/nlD/wB+k/8AiaP+Eku/+eUP/fpP
+ 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
+ OnormKKLAf/Z
</value>
</data>
<data name="xz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG6SURBVDhPfVLLK0RRGD+lpNjJf2ChrDyibJSllWSjyEhN
- JkQj70zUFKYMY4aFGrJQio2tQpRMISxkr+Rt3Jkx7r3z+Dnnu83cuRxO/er0/R7n+7572dzyBty+NbgX
- g3L4gpgNrCOwvg0mO9PeVTmRI17ynZFGGuLyrBCZTqchg+C83tPsI79CJmb8RCZTKcgguIWFkKVLS8iY
- e5FIPZGEDGkAwbUDNLV2oqXNjr39I+vIw9PzVFC1BGTQ9ARSPEWJxfEWVkh7UVmIk2JmBDldHrrEVR3/
- QYwndEW9F4iXMuAcuKwrARuYmCEiGtcQ+wN6wjRv3saMB3lIqIR30TfqpsLHpwpFAo3vRvAFjnMI87UO
- VATuqAsK6BmaIsF75AvhqBWqbpjzHVcWMwsCrHrD2EG3c5IurwpfUsSEypcn6nk9N3+bhcDeP07C5/An
- Xj5MiJq/g/1vFqKu3hEKeHyL4uk9RhBfIxOAs2aaObftw2Pzz2Q2xyCJ718U3L9GCFmz/gBoVxAh2Zk5
- mfHQDmzdRsDPI9oHD2ivY4Rc3uJpbOlAeW0DymtMCHFZVT1ESMa4tbNraLhWeDL1byFNGCxpuVuVAAAA
- AElFTkSuQmCC
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG3SURBVDhPfVLdK0NhHH5LSXGn/QculCsfUbtRLl1JbhQh
+ taxNNPnOolY+yhjjQo12oRQ3bhWiZGULF3Kv5Nucbeacs4/HeX/HnJ289tRT7+/5/Z7nfc+vw+bXgvD4
+ NuFZDojpC2DOvwX/1i6YCDPeDXEjDyu+C5oRhrgX1knMZrMQkfe83vNf45+QydlVEtKZDETkvaWlkMlk
+ Chn3LFOhptIQMQsgsHmElvYetHXYcHB4YgpjIzOLJMhKCiIqagoZLUVKJPEWlWg2UlOKs3KmB7ncC3RI
+ yioKMfc5Zc4IkhUMCAOXVgvY4OQsNeJJBYl/qKYM8/ZtQr9QCwlZtFf0j3lI+PiUIQmoaHvg/RJ7mMzX
+ KlDtv6NXUIBjeJoG3mNfiMbNlFXdXGy/MplZAGB1QeqxPtcUHV4lbUkxg7K2PK4XOW7+N3PYBiaoeI5+
+ 4uXDINdWu1hhM0evc5SEx7c4nt4TRL51rvEAXLT+MR+fGn8m67YPUXH/IuH+NUbkNZnVB0C5opD8m3Me
+ QndfXpGHXECnlRF/ZILJ09zWhaqGJlTVG+R6ZW0jeAgNadjZ29f72iz36Cpj3yFNGCz1c9N0AAAAAElF
+ TkSuQmCC
</value>
</data>
<data name="xzz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGnSURBVDhPlZPLK8RRFMdP2Y9mRQ0WLJCFktghLNj5A1jO
- RrHwaEioibLw2AkbkSw0T6EohQkLz9R4bUzyzJsxU2r6uufe+Y2feWSc+nR+v3vv93vOPb9+RLpoqiHE
- Q38m4TMLxSYKs1VmCjJVDu8l9jFXp0REmjg6h8/EN+HN42nCzTwBZ4qvTcK1m3A6Q1gfIiRt8LZK8K8R
- Hpf/abA3TjgR1S5shEsnwWdX77tifcmaRAdssD9BOJokeMV1OO+MJWnAk6kqL8PGMEk8I4S1QcVyH2He
- 5eIh/x1s4uwgia1dwWtS2SA+qZ5ou97BMSxOWeQ3ry9ReBZGoQWLAYU00kdn3wi2D8/xElDHjRafhENf
- lcUZ9qzYTlq7B7B1cIq7Zz8CwSC6nFfocV9FDLTKnPOcJuSu5PzupLnDKjo4w/3LJ94//Cjt90q0DliY
- MmWEYdqA9FkDTHOpSHMYf67S2NojDW6eRAeBAMi8K5EG/I9UqHvXectQtGhSwmpBbXgWWgds8PD0ihbb
- Ldoc9wiFQjFDLFzJjB0iDzS/uAKJiHRSGVVZ6L4BYiGPeVyVcksAAAAASUVORK5CYII=
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc
+ d1EcjEwytSiH4SZcRHLQ7FemtlJDOPiZml8XSzMWMz9mK7Xevs/z7DvDzLzr9X2253k+r8+nvn0pM10t
+ hGykjnMndRE1ZWJlVKvF+qdErytIF/1G6k72sMPTBULIRcCF4H2bcOMknC8SNsb/IXheJ8R8hAfPPwUH
+ M4Qz6fKVlXBtJwRWxP99aX/NnKfgcJZwMkfwS9OwdW86TwFLc6MGmxPE2Zok+CwCzwjB5XDkLpbDJHYj
+ cax9ArbHDzukt5HJ9wxbpuGe7+fvvL1esLU6BTmsSHpyfggGRiaxe3yJaJzfhbI/wGHJ7MqKS1ZKv+xx
+ gWFoDDtH57h7jCGeSGDQHoTJGUwL5M6MSrsKFd5y/jst6DaapQkuEI6+4eU1hoZRP4dFFhTMK6FYUKB4
+ SQHVciGKbMpPQafBxAWhiDRBPA7S73O4gH0HWtGtza9BrVslCnUSrSmBPAET3Eee0GO9Ra8tjGQyySUs
+ 8iQ1XvVn58xU1WnxG1zAJmn61pmIPgBiIY95z/CSIgAAAABJRU5ErkJggg==
</value>
</data>
<data name="qx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH9SURBVDhPjZPNS1RhFMaPErRoJy4qCDFyoYYRbqNWCUGr
- /gE/UwncREJpm9nZhx+UuVKwFoKDYpQULlyqMzY5mTGZU+OQ0jCEg/Oho/fqPD5n3mRM9OKBhzv33Of8
- 3nPe9x2Ruz5I9Qyij4DlhyeTerUmWyt1s/i4BiQB/Dyh1Ks1WivS+BlyroMpwLIt2LbtKPVoyNkOZGul
- fhaV49kcpqYAz4yz1KPR4tvvoM6Lq2MmmUqnsbHlLPVoVE0QUOvVPcgBpqe5usdZ6tG45NYODgH+xpNY
- S6QcpR6N/AEC6v8BKvdHiCewkUg6KkVPdhN7DwCuvQdO9zPxdBPStQ3psY+WfuvcxoXWb5AXFqRBj5Fz
- XOcpFAwS8GQdcmcSUvwccrHrfxV3suATpMYD10SK3vghwGsC2iNmh44JqeaKNV6MfKfXFT0C8CBs5jv/
- DNK6it+/zInM+XcRDu3w+hqAO0BP2wqvMjvStm584AhvmGxZNICSbgJCCHwB5r/uIvDDQuQP5z8IuB80
- gLybbhS5llA4xMLGeWQ2+SxiB00LCHIlLQ4upxGLpXMAHeHeAv36Z2KcqhrGmcchEv2IR4HwEhDhNKsr
- fEZ3EFu3kMls8eLw7jf48DZEQJMf0jxnABp5t0YhFa8g5b2Qspc5lfJdVUZd6TO6zN8V1O132APHwgBJ
- bClz8wAAAABJRU5ErkJggg==
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH1SURBVDhPjZPNSxRxGMcfI+jQLTxYIKLoQQsjvEadEoRO
+ /gO+awReIiGty97sRQtbPSmoB8FFMSwKDx3VXdvcfGErt9YlpWUJF/dFV2d0v36fHc0XdPALX2bmme/z
+ mec38xuRBi+kahqRVmD5yfmsWe3J9ErtDD6tAQkAv85pzWqP9oo0foVcbWcJMEwDpmnaWjMqyWlHplfq
+ ZlD2IVPD5CTgnra3ZlTN3oMJaj24NWYVk6kUNrbsrRlV+QQBNZ7jgKkpPsVtb82oCl06wQnAv1gCa/Gk
+ rTWjutBHQN0+oOxgCbE4NuIJW2tGJc4jgNvvgUu9LLzYhHRuQ96Yp1vvdWwjt2UR0mVA6vdf4h1+hSv9
+ BDxfh1R+huS/ghR0Hnd+Bxu+QKrdcEwkmY2dAAwQ8DScGe8sSRUbqj0Y+c5zR+QUwOOQFbz2EtKyij+/
+ rTc/69tFKLjzH+DyM9O2wq3MiXSsux8JGGSx+YcFKHpNQBD+b8Dc/C78Pw2E/3L9RwGPAhYg654LeY4l
+ ZA+x2DiH9CaPeZygaQEBBrU5sJxCNJo6BOgSHi4wrz8TdbF8GJefBUn0IRYBQktAmKtZXeExsoPouoF0
+ eosbh3u/3ot3QQKafJAHsxZAlVUxCinthlx3QkreHrqY1+oS+maP5Rs8L6Xvj2MPx8IASe80O9sAAAAA
+ SUVORK5CYII=
</value>
</data>
<data name="shuax.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFwSURBVDhPtVNLS0JBGPVH+Iv6Ba3rT/joar7rKprZ46Yg
- GdaiyJWUgYViVihUFr0halHUoqCoRW2KNqc5E7cuXh+1aGCYYeY75/vOd2Yslv8aymgfevt7TJPnXXMS
- mGqEUHtJofqkoXg3jvxVHPPnUfiKA7Bare1JCN57S+PgY1qudUFSftRQuElg8SKG7LGKpCBvScLymJng
- M8zIPQP1yeyzJ2F5zr1JDrPXXlNovKe/wUa9JCIwuRtEbMtnroIE1ecpqb2dTsZo2wFENzytCYr3Eyg/
- THYkGKv7Ea4MfsU0W5W/jmP5NiEvjXe6FJ6NbHoRKrl/kjA4cziMudMIFoRVOdHt3OWIXJulkEAV2U12
- MjC9P4TMkYqs6DS73QocWffAv6pAKTjNMgnQdgKyy0awLkWtuOFfU+ASYHvebraROnXPjfaRIFhywSss
- dBUcAmzr/Bqb3zoJ3CtOOJccsP0VTDIS6JX96jN1/W2GgE8Xey/mqymHugAAAABJRU5ErkJggg==
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFtSURBVDhPtVPLTsJAFOUj+kV+gWv9CaAWBApoITzER6UJ
+ EYMuNLIiigkaCKAGEhWN78ToQqMLTTS60I3GzXHu2CpxCsGFJ5l0eu8959y50zr+DcrYAPoH+4RFcbOk
+ M6jQaIXReDFQf9JRuptA4SqJhfMYAqUhSJLUWYTIe28ZHHzM8GeTiVQedRRvUli6iCN3rCHNxG1FqD1y
+ JvIZZvmeCq1F7nMnER6nvXAccm+8Gmi9Z77JZorDEknvhhDfCohdkED9eZqfXUiaoBp9O4jYhs9eoHQ/
+ icrDVFeB8aaKSHX4q4YC7atwncTKbYon2+Mmn9cnNv0Il70/JrTJHo5i/jSKRXZVeTbt/GWCP393QgIa
+ cxeuk14y+yPIHmnIsUnTtO3I0ZoP6poCpSgLeS6i7wT5lNuT1jG0qhfqugIPI7sKLvuvkoh2zqGyB37W
+ tqfoZmSn6N4NJOBdlSEvu+H8K5lAAlZnPf1MvcPh+AQXey/m/1+IkwAAAABJRU5ErkJggg==
</value>
</data>
<data name="sc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG4SURBVDhPhZHdK0NxGMfPH+DSH+BKuPRyy1xzS5RCcYFF
- kyRECDVSi+Vl89LYvMuWlFaUcDJ0koM2RKNZJnbi1Lx+7fdzdtrZC6e+9Xue3/P9PM/vOQwT49M0dyNc
- sWri5ojRL37CJwSoyJnk/oREdvwvVsD+pUe05niXciICeH79wOWdD6dXHnDnN2CPndhy8NjY4bBqZ2Gx
- bcIwtwbd+AL6R83RgPo2LVwXV5ieXcaEeQljpnnojWYMDE+iV2dAR/8w2rV6mBbX0dKji96JprWXLonl
- ziEG3uB9FmG02OC89sDO8hiaWoTVvkcnauzoi16ourGTJncOeAgvr7jzCRibWcXZpRvu+0fZ4Pb4sLt/
- FA2oqm+LCXgSXoDvbzhSGarQPiNjpqK2KSaAGEgxDkEVMobHFFpW3RAXMMgEAV1Jv5JAoZjcUUBJZV3c
- J5B7ClEnKiSbSUFRec2fAPqM/ASFwnfCFJZWUcC24wT+4F+4ffBjxLRCc/IOCCRDkrQXGVIsTUAMgS/g
- SXzHjVegADq+ZCZnGhNQMKd4Rm5eAZLTs5GSmYPUTBXSslSYW7LKkPDiEIg0+AGc9Nl3F3MsQQAAAABJ
- RU5ErkJggg==
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGwSURBVDhPjU/rK0NxGD5/gI/+AJ9kPrp8ZT7zlSiF4oNL
+ ZElChFAstVguc2tsLhshKa0oYRk6yUFu0ayRaXaa1Vwf+/0cZ2fOYZ56Oud5zvs8530ZJVTXt0NKwf4f
+ SMAXeIOHD1KS96gl0r/9h0LsCzIjCljuLLKEiMenV1y4PDi6dIM9uYb94BTrDg6rmywWbHaYl9ZgmF6G
+ bmQW2kGTvEDT1IWz80tMTM1h1GTFkHEG+mETevrH0KkzoEXbj+YuPYyWFTR06BTOaOykhp09QSD4jLvH
+ AIbNSzi9csNm59A3bsGibZtuVNvSLT+5oraVmpu7HHj/E1weHkOTCzi+cMJ5+yAGnG4Ptnb25QWlmibF
+ Ai/vBz4+4FAxlHQ4hJ+aKa6sUywgHhnEHii/g1JNZpjCsppfC3qZUKAt7otC8FuTb2SGyS+pUiwgJxCf
+ llTERlAME+QWlf9ZQNfOiomguD5BTkEpFRuOQ/hCBTf3PgwY58NhsjZ5JgsUPLEkT9iAIPgOeAMvuL7j
+ qUfXF8LknWqhJOKMjMxsxCelISElHaoUNRJT1Zi2Lool0uGwZphPnPTZd01KdgkAAAAASUVORK5CYII=
</value>
</data>
<data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIISURBVDhPfZLfS1NhHMZfkSSwu/A/8MK6ydIQFlg3dudN
- YBLDYtBF05XMMAoLL3bhRGF4zjzUUiKiG4mCgkCMiam5cqP9aO4YJlqIDmqh00KRHt/v92xnW7gdeHgP
- 7/t8nvd533OEyDxuZRQDymMoXh/U4cNFa+TpV58gy/Ho8vgwOR1A5ywgFClvEck15xzwbuoDiDFD7rtV
- bG2l4fDv4FkSJdU5uYO09BJjBtx1ebCZSkEMAjNpwL0IWKeBky9kE01KzYiaDYG9xJgB3b0D+JVMQngA
- bRm4OgPUvgLKfBJ4KPUoJy0m3/9/nD192Fhb43T7xxJw3IBDZyoxe1zkgm7dc+HHyipXbXhdZOcMfMwR
- wp9qAQSBz5YqI6S9uxfLS9/49o+MHFI7D36e2GaIQgJVmRY3nD3QE1+NC6OA0Zy0hFH7qD0IgiN7wGnv
- d25hBlx33EEoqsOqBCGuBCCshrSJDYYr7OECmDeof5q7A1t7Fz7FljAvQyJfdETjOn6mfrOhvCNeGiZT
- i60DNXWNOHH2gimaV6+JovC4/73R4PaDPmz+3S/Q7v4/XqQAzF/iM+fXpnViiOWAsL6CoeERczThvXVg
- N8wh2TNHYwuILK6ynwNuyk/YfNnGidkxP6DNIkCiubfj/gIfsYKgU5Ym1J67aIrMNXXnQUfI/rVjL98U
- eIhpbrXhAL2UTLYOQlZyAAAAAElFTkSuQmCC
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
+ oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
+ znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
+ vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
+ AG0RaJ0Gqp8A+0ICGBIZLkZLifXv8Xb3YnVlRdrdb23gtAHHjpdj5hAVRVdv+vBlaVkes+6pPVzhieHn
+ YQKiwHtHpSFp6+rB4sIn+Y37R+3hB5kNec2SSKV5isvebuiZj8YPxoKxYrSMAR90RyWc2AZqgp/lKSzB
+ Jc91xJI6nEoUdCECchrRJlZl4YA7XgJL+Yl7BszjauvEu9QCZoUk8UFHMq3jW+6HLJS1p+1hniZXO6pq
+ 63Hk5Bkr/Fy9SHvC4+FXhuTa7V6s/dopydbOriXA7Ll/YN7nHrNSENeXMDA4aq0WvP0V2IpLSQFOpuaQ
+ mF+WPSm4Iv7CxmaXNBbWPwUtDpLhZ8/HwyU9ZolvjjkaUH3qrBUuV9WeBkv4mufh42clHWYaz7vwG72U
+ TLZQdeFnAAAAAElFTkSuQmCC
</value>
</data>
<data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH/SURBVDhPjZPNS1RhFMaPIbRoFy4yEFFyoYkRbqNWCkIr
- /wE/G0VwEwmpbWbXh1+YtipQF0GDklQULlqqMzY5+cFYTo1DisMgDs6Xo3N1Hp/jbRgTvfjCw33ve5/z
- e89533NFHrghdbMIdQJrjy8m9WrMcaw0zuHLNhAD8PuCUq/GaKyI7Tsk/yknIikjBcMwLKUe9co1xmis
- NM2h8hNpHNPTgHPWWupRb7s7k0GjC7ffm4vxZBKJPWupR73VU4xpcOkZZAEzM9zdaS31KOCGQzM4BdiK
- xLAdjVtKPQq49IaApn+AykwJkSgS0Zil4vQcH+LQCcCdj8Dl11x4vgvp24cMGGdLv/Xuo6BjGTLI22jW
- a2Qdd3kLV0cIeLYDqf0KKeqBFPf9r6JeBnyD1Dthn4rTGzkFGCWgO2imd96o4471Loyv0GsPnQF4FDAB
- 119AOjbw9495I/OeQwT8B2xfE+DwEtC1zlZmRprWvc8sYYyL7T9NQEk/AX54fwALi4fw/kohuMn6TwIe
- +kxATpUDhfZV5L0lwLaA9C6fhcygZQk+7qTBvrUkwmE2UAagJbQt0a8/E0du9TtceeIn0YNICAisAsEA
- sLHOZ+gA4Z0U0uk9Ng57v9mNST8BLR5I63z2zHJqJiAVw5CbQ5Cyl1mV8l1VRt16Zaqc8wrq/gccAYEZ
- rI51LX54AAAAAElFTkSuQmCC
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+ /QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
+ 77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
+ aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
+ JWylHvVeGGCm+hBQnNlCNIatWNxW6lGv9B0D3PsIXOrnQts2pGsX0mOdLX3WuYsbjT8gvTyNmsOPeJ+n
+ cOUtAa2bkEdfIbkdkLyuk8rtZGAGUuGCYzxBb/QUYJCAlpAp73+jnIEKN979pNcRPgPQEDSA7HZI4xpW
+ /pgvP+vdRzCwx/Y1AKeP3uZVtjIr0rJKPhMwxMX6RQO41U1AAL45YP77Pny/Ugitc//HAc/8BpD1wIkc
+ xxKuDnOxdh7pbc45rKBuAX4aNexfTiISYQNlALqFpwv068/EcbF0BJdfBEj0IhoGgktAKAisrXIO7yGy
+ mUI6vcPGYe/XePA+QECdF/Jk1gB0ZJWNQgpfQ273QQpeHSmf96oCquiN0R1eF1IPP+AAgRmsjnCqFmoA
+ AAAASUVORK5CYII=
</value>
</data>
<data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADHSURBVDhPpZLNDcMgDIXZiZEiZQJzTs/JuZEiVUpGYYDs
- 9IoRppSfhrYRFgLlfdh+VqryaT2iN2p6xWJjCNN0w7zMWO8rjn2H+xnD8ABwujX6cxNAAbA4QC48Nw2O
- AsAvM9FnQNQUVgFBHAEUAJyuCPI9ZsBiV5V/MW0eny8BImZAHt2AjZv6KyDYAIaEmt52KcFaC460D7kL
- 0ZbUBQEI/BOAk3nZ6OagqwetUSYy/wEk5ZaNSb+q0yyXxRz0CgvAt8IIuBI+AZInmNFWdMJxAAAAAElF
- TkSuQmCC
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
+ rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
+ wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
+ gg==
</value>
</data>
<data name="cmdHUser.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -412,7 +372,7 @@
FIYcEAA7
</value>
</data>
- <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>39</value>
</metadata>
</root>
\ No newline at end of file
diff --git "a/BLL/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserNew.cs" "b/BLL/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserNew.cs"
index 32ea584..37a4d7d 100644
--- "a/BLL/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserNew.cs"
+++ "b/BLL/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserNew.cs"
@@ -27,6 +27,7 @@
lblError.Text = "";
LbYes.Items.Clear();
LbNo.Items.Clear();
+ cmbHUserType.SelectedIndex = 0;
//加载组织信息
Sub_AddOrdList();
Init();
@@ -185,7 +186,7 @@
DAL.ClsIF_Supplier_View oSup = new DAL.ClsIF_Supplier_View();
try
{
- oDs = oCn.RunProcReturn("select Czybm,Czymc,Explain,HEmpID,HK3UserID,HCloudUserName,HCloudUserPsd,HKeeperID,HKeeper,HSecManagerID,HSecManager,HSellManID,HSellMan,HDeptID,HDept,HWhID,HWHName,HSCWHID,HSCWHName,HSupID,HSupName,HUSEORGID from Gy_Czygl where Czybm='" + sCzybm + "'", "Gy_Czygl", ref ClsPub.sExeReturnInfo);
+ oDs = oCn.RunProcReturn("select Czybm,Czymc,Explain,HEmpID,HK3UserID,HCloudUserName,HCloudUserPsd,HKeeperID,HKeeper,HSecManagerID,HSecManager,HSellManID,HSellMan,HDeptID,HDept,HWhID,HWHName,HSCWHID,HSCWHName,HSupID,HSupName,HUSEORGID,HUserType from Gy_Czygl where Czybm='" + sCzybm + "'", "Gy_Czygl", ref ClsPub.sExeReturnInfo);
if (oDs == null)
{
MessageBox.Show("显示失败！原因：" + ClsPub.sExeReturnInfo);
@@ -299,6 +300,10 @@
}
txtHCloudUserName.Text = oDs.Tables[0].Rows[0]["HCloudUserName"].ToString().Trim();
txtHCloudUserPsd.Text = oDs.Tables[0].Rows[0]["HCloudUserPsd"].ToString().Trim();
+ if (oDs.Tables[0].Rows[0]["HUserType"].ToString() != "")
+ {
+ cmbHUserType.Text = oDs.Tables[0].Rows[0]["HUserType"].ToString().Trim();
+ }
}
}
catch (Exception e)
@@ -386,14 +391,14 @@
",HKeeperID,HKeeper,HSecManagerID,HSecManager " +
",HSellManID,HSellMan,HDeptID,HDept " +
",HWhID,HWHName,HSupID,HSupName " +
- ",HSCWHID,HSCWHName " +
+ ",HSCWHID,HSCWHName,HUserType " +
",HCloudUserName,HCloudUserPsd,HUSEORGID)" +
"values ("
+ "'" + txtCzybm.Text.ToString() + "','" + txtCzymc.Text.ToString() + "','" + ClsPub.StrToPsd(txtCzymm.Text.ToString()) + "','" + txtExplain.Text.ToString() + "'," + ClsPub.isLong(txtHEmpID.Tag).ToString() + "," + ClsPub.isLong(txtHK3UserID.Tag).ToString() +
"," + ClsPub.isLong(txtHKeeperID.Tag).ToString() + ",'" + txtHKeeperID.Text.ToString() + "'," + ClsPub.isLong(txtHSecManagerID.Tag).ToString() + ",'" + txtHSecManagerID.Text.ToString() + "'" +
"," + ClsPub.isLong(txtHSellManID.Tag).ToString() + ",'" + txtHSellManID.Text.ToString() + "'," + ClsPub.isLong(txtHDeptID.Tag).ToString() + ",'" + txtHDeptID.Text.ToString() + "'" +
"," + ClsPub.isLong(txtHWhID.Tag).ToString() + ",'" + txtHWhID.Text.ToString() + "'," + ClsPub.isLong(txtHSupID.Tag).ToString() + ",'" + txtHSupID.Text.ToString() + "'" +
- "," + ClsPub.isLong(txtHSCWH.Tag).ToString() + ",'" + txtHSCWH.Text.ToString() + "'" +
+ "," + ClsPub.isLong(txtHSCWH.Tag).ToString() + ",'" + txtHSCWH.Text.ToString() + "'" + ",'" + cmbHUserType.Text + "'" +
",'" + txtHCloudUserName.Text.ToString() + "','" + txtHCloudUserPsd.Text.ToString() + "'," + HOrgID +
")");
oDs = oCn.RunProcReturn("Select * from Gy_Czygl where Czybm='" + txtCzybm.Text.ToString()+"'", "Gy_Czygl");
@@ -433,6 +438,7 @@
",HSupName='" + txtHSupID.Text.ToString() + "'" +
",HCloudUserName='" + txtHCloudUserName.Text.ToString() + "'" +
",HCloudUserPsd='" + txtHCloudUserPsd.Text.ToString() + "'" +
+ ",HUserType='" + cmbHUserType.Text.ToString() + "'" +
",HUSEORGID=" + HOrgID.ToString() +
"where Czybm='" + Czybm + "'");
//
diff --git "a/BLL/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserNew.designer.cs" "b/BLL/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserNew.designer.cs"
index 027bdac..46c6eda 100644
--- "a/BLL/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserNew.designer.cs"
+++ "b/BLL/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserNew.designer.cs"
@@ -92,6 +92,8 @@
this.label18 = new System.Windows.Forms.Label();
this.txtHCloudUserName = new System.Windows.Forms.TextBox();
this.label19 = new System.Windows.Forms.Label();
+ this.label20 = new System.Windows.Forms.Label();
+ this.cmbHUserType = new System.Windows.Forms.ComboBox();
this.groupBox2.SuspendLayout();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
@@ -425,6 +427,8 @@
// tabPage1
//
this.tabPage1.BackColor = System.Drawing.Color.Transparent;
+ this.tabPage1.Controls.Add(this.cmbHUserType);
+ this.tabPage1.Controls.Add(this.label20);
this.tabPage1.Controls.Add(this.label1);
this.tabPage1.Controls.Add(this.label2);
this.tabPage1.Controls.Add(this.txtCzymc);
@@ -787,6 +791,28 @@
this.label19.TabIndex = 94;
this.label19.Text = "瀵瑰簲CLOUD璐﹀彿";
//
+ // label20
+ //
+ this.label20.AutoSize = true;
+ this.label20.ForeColor = System.Drawing.Color.Black;
+ this.label20.Location = new System.Drawing.Point(12, 186);
+ this.label20.Name = "label20";
+ this.label20.Size = new System.Drawing.Size(53, 12);
+ this.label20.TabIndex = 57;
+ this.label20.Text = "鐢ㄦ埛绫诲瀷";
+ //
+ // cmbHUserType
+ //
+ this.cmbHUserType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cmbHUserType.FormattingEnabled = true;
+ this.cmbHUserType.Items.AddRange(new object[] {
+ "鍐呴儴璐﹀彿",
+ "渚涘簲鍟嗚处鍙�"});
+ this.cmbHUserType.Location = new System.Drawing.Point(68, 183);
+ this.cmbHUserType.Name = "cmbHUserType";
+ this.cmbHUserType.Size = new System.Drawing.Size(172, 20);
+ this.cmbHUserType.TabIndex = 89;
+ //
// Xt_UserNew
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -883,5 +909,7 @@
private System.Windows.Forms.Label label18;
private System.Windows.Forms.TextBox txtHCloudUserName;
private System.Windows.Forms.Label label19;
+ private System.Windows.Forms.ComboBox cmbHUserType;
+ private System.Windows.Forms.Label label20;
}
}
\ No newline at end of file
diff --git a/Model/Model.csproj b/Model/Model.csproj
index 82dca5a..f8fd1c1 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -584,6 +584,7 @@
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldStockBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipConkBookBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipConkBookBillSub.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsSc_ProcessExchangeBillMain_Note.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_FirstPieceCheckBillSub_ValueGrid.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_PatrolProcCheckBillSub_BadReason.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_ProcessCheckBillSub_ValueGrid.cs" />
diff --git "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsSc_ProcessExchangeBillMain_Note.cs" "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsSc_ProcessExchangeBillMain_Note.cs"
new file mode 100644
index 0000000..0d4f6bf
--- /dev/null
+++ "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsSc_ProcessExchangeBillMain_Note.cs"
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class Sc_ProcessExchangeBillMain_Note : DBUtility.ClsXt_BaseBillMain
+ {
+ public Int64 HSouceID_Original;
+ public Int64 HSouceID_Now;
+ public Int64 HICMOInterID;
+ public String HICMOBillNo;
+ public Int64 HProcExchInterID;
+ public Int64 HProcExchEntryID;
+ public String HProcExchBillNo;
+ public Int64 HProcExchQty;
+ public Int64 HMaterID;
+ public String HBillNo_Note;
+ public Int64 HICMOEntryID;
+ public Int64 HUnitID;
+ public Int64 HProcID;
+ public Int64 HOrgID;
+
+ }
+}
diff --git "a/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBill.designer.cs" "b/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBill.designer.cs"
index 23d799a..483057e 100644
--- "a/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBill.designer.cs"
+++ "b/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBill.designer.cs"
@@ -81,6 +81,8 @@
this.P1 = new System.Windows.Forms.Panel();
this.pic1 = new System.Windows.Forms.PictureBox();
this.gbUp = new System.Windows.Forms.GroupBox();
+ this.cmbHOrgID = new System.Windows.Forms.ComboBox();
+ this.label39 = new System.Windows.Forms.Label();
this.textHVerNum = new System.Windows.Forms.TextBox();
this.label38 = new System.Windows.Forms.Label();
this.textHProductNum = new System.Windows.Forms.TextBox();
@@ -169,8 +171,6 @@
this.grdMain = new System.Windows.Forms.DataGridView();
this.grdSum = new System.Windows.Forms.DataGridView();
this.grdPrint = new System.Windows.Forms.DataGridView();
- this.cmbHOrgID = new System.Windows.Forms.ComboBox();
- this.label39 = new System.Windows.Forms.Label();
this.Tool.SuspendLayout();
this.P1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pic1)).BeginInit();
@@ -416,6 +416,7 @@
this.fsy.Text = "鍙栨秷";
this.fsy.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.fsy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.fsy.Visible = false;
this.fsy.Click += new System.EventHandler(this.fsy_Click);
//
// toolStripSeparator1
@@ -529,64 +530,70 @@
// 鍏抽棴ToolStripMenuItem
//
this.鍏抽棴ToolStripMenuItem.Name = "鍏抽棴ToolStripMenuItem";
- this.鍏抽棴ToolStripMenuItem.Size = new System.Drawing.Size(136, 22);
+ this.鍏抽棴ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.鍏抽棴ToolStripMenuItem.Text = "鍏抽棴";
+ this.鍏抽棴ToolStripMenuItem.Visible = false;
this.鍏抽棴ToolStripMenuItem.Click += new System.EventHandler(this.鍏抽棴ToolStripMenuItem_Click);
//
// 鍙嶅叧闂璗oolStripMenuItem
//
this.鍙嶅叧闂璗oolStripMenuItem.Name = "鍙嶅叧闂璗oolStripMenuItem";
- this.鍙嶅叧闂璗oolStripMenuItem.Size = new System.Drawing.Size(136, 22);
+ this.鍙嶅叧闂璗oolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.鍙嶅叧闂璗oolStripMenuItem.Text = "鍙嶅叧闂�";
+ this.鍙嶅叧闂璗oolStripMenuItem.Visible = false;
this.鍙嶅叧闂璗oolStripMenuItem.Click += new System.EventHandler(this.鍙嶅叧闂璗oolStripMenuItem_Click);
//
// toolStripSeparator15
//
this.toolStripSeparator15.Name = "toolStripSeparator15";
- this.toolStripSeparator15.Size = new System.Drawing.Size(133, 6);
+ this.toolStripSeparator15.Size = new System.Drawing.Size(177, 6);
//
// 瀹℃牳ToolStripMenuItem
//
this.瀹℃牳ToolStripMenuItem.Name = "瀹℃牳ToolStripMenuItem";
- this.瀹℃牳ToolStripMenuItem.Size = new System.Drawing.Size(136, 22);
+ this.瀹℃牳ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.瀹℃牳ToolStripMenuItem.Text = "瀹℃牳";
+ this.瀹℃牳ToolStripMenuItem.Visible = false;
this.瀹℃牳ToolStripMenuItem.Click += new System.EventHandler(this.瀹℃牳ToolStripMenuItem_Click);
//
// 鍙嶅鏍窽oolStripMenuItem
//
this.鍙嶅鏍窽oolStripMenuItem.Name = "鍙嶅鏍窽oolStripMenuItem";
- this.鍙嶅鏍窽oolStripMenuItem.Size = new System.Drawing.Size(136, 22);
+ this.鍙嶅鏍窽oolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.鍙嶅鏍窽oolStripMenuItem.Text = "鍙嶅鏍�";
+ this.鍙嶅鏍窽oolStripMenuItem.Visible = false;
this.鍙嶅鏍窽oolStripMenuItem.Click += new System.EventHandler(this.鍙嶅鏍窽oolStripMenuItem_Click);
//
// toolStripSeparator14
//
this.toolStripSeparator14.Name = "toolStripSeparator14";
- this.toolStripSeparator14.Size = new System.Drawing.Size(133, 6);
+ this.toolStripSeparator14.Size = new System.Drawing.Size(177, 6);
//
// 浣滃簾ToolStripMenuItem
//
this.浣滃簾ToolStripMenuItem.Name = "浣滃簾ToolStripMenuItem";
- this.浣滃簾ToolStripMenuItem.Size = new System.Drawing.Size(136, 22);
+ this.浣滃簾ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.浣滃簾ToolStripMenuItem.Text = "浣滃簾";
+ this.浣滃簾ToolStripMenuItem.Visible = false;
this.浣滃簾ToolStripMenuItem.Click += new System.EventHandler(this.浣滃簾ToolStripMenuItem_Click);
//
// 鎾ら攢浣滃簾ToolStripMenuItem
//
this.鎾ら攢浣滃簾ToolStripMenuItem.Name = "鎾ら攢浣滃簾ToolStripMenuItem";
- this.鎾ら攢浣滃簾ToolStripMenuItem.Size = new System.Drawing.Size(136, 22);
+ this.鎾ら攢浣滃簾ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.鎾ら攢浣滃簾ToolStripMenuItem.Text = "鎾ら攢浣滃簾";
+ this.鎾ら攢浣滃簾ToolStripMenuItem.Visible = false;
this.鎾ら攢浣滃簾ToolStripMenuItem.Click += new System.EventHandler(this.鎾ら攢浣滃簾ToolStripMenuItem_Click);
//
// toolStripMenuItem1
//
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
- this.toolStripMenuItem1.Size = new System.Drawing.Size(133, 6);
+ this.toolStripMenuItem1.Size = new System.Drawing.Size(177, 6);
//
// 闅愯棌鍒楄缃甌oolStripMenuItem
//
this.闅愯棌鍒楄缃甌oolStripMenuItem.Name = "闅愯棌鍒楄缃甌oolStripMenuItem";
- this.闅愯棌鍒楄缃甌oolStripMenuItem.Size = new System.Drawing.Size(136, 22);
+ this.闅愯棌鍒楄缃甌oolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.闅愯棌鍒楄缃甌oolStripMenuItem.Text = "闅愯棌鍒楄缃�";
this.闅愯棌鍒楄缃甌oolStripMenuItem.Click += new System.EventHandler(this.闅愯棌鍒楄缃甌oolStripMenuItem_Click);
//
@@ -792,6 +799,25 @@
this.gbUp.Size = new System.Drawing.Size(1199, 216);
this.gbUp.TabIndex = 33;
this.gbUp.TabStop = false;
+ //
+ // cmbHOrgID
+ //
+ this.cmbHOrgID.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cmbHOrgID.FormattingEnabled = true;
+ this.cmbHOrgID.Location = new System.Drawing.Point(966, 156);
+ this.cmbHOrgID.Name = "cmbHOrgID";
+ this.cmbHOrgID.Size = new System.Drawing.Size(188, 20);
+ this.cmbHOrgID.TabIndex = 146;
+ //
+ // label39
+ //
+ this.label39.AutoSize = true;
+ this.label39.ForeColor = System.Drawing.Color.Black;
+ this.label39.Location = new System.Drawing.Point(903, 160);
+ this.label39.Name = "label39";
+ this.label39.Size = new System.Drawing.Size(53, 12);
+ this.label39.TabIndex = 145;
+ this.label39.Text = "缁� 缁�";
//
// textHVerNum
//
@@ -1712,25 +1738,6 @@
this.grdPrint.Size = new System.Drawing.Size(25, 24);
this.grdPrint.TabIndex = 46;
this.grdPrint.Visible = false;
- //
- // cmbHOrgID
- //
- this.cmbHOrgID.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.cmbHOrgID.FormattingEnabled = true;
- this.cmbHOrgID.Location = new System.Drawing.Point(966, 156);
- this.cmbHOrgID.Name = "cmbHOrgID";
- this.cmbHOrgID.Size = new System.Drawing.Size(188, 20);
- this.cmbHOrgID.TabIndex = 146;
- //
- // label39
- //
- this.label39.AutoSize = true;
- this.label39.ForeColor = System.Drawing.Color.Black;
- this.label39.Location = new System.Drawing.Point(903, 160);
- this.label39.Name = "label39";
- this.label39.Size = new System.Drawing.Size(53, 12);
- this.label39.TabIndex = 145;
- this.label39.Text = "缁� 缁�";
//
// Gy_RoutingBill
//
diff --git "a/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBillList.cs" "b/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBillList.cs"
index 140dd54..f9032a6 100644
--- "a/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBillList.cs"
+++ "b/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBillList.cs"
@@ -438,6 +438,11 @@
private void sy_Click(object sender, EventArgs e)
{
long sOldInterID = 0;
+ //鍒ゆ柇鏉冮檺
+ if (!ClsPub.Security_Log(ModRightNameCheck, 1, true, DBUtility.ClsPub.CurUserName))
+ {
+ return;
+ }
for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
{
long HInterID = DBUtility.ClsPub.isLong(grdMain.SelectedRows[i].Cells[Fun_GetCol("HMainID")].Value);
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode_StationOutBill.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode_StationOutBill.cs"
index 11b1e6a..5822cc5 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode_StationOutBill.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode_StationOutBill.cs"
@@ -391,8 +391,10 @@
",0,0,0,0,0,0,0,0,0" +
",0,0,''," + sHBarCodeInterID.ToString() + "," + HStockOrgID.ToString() +
") ");
- }
+ ////鍥炲～娴佽浆鍗″叧鑱旀暟閲�
+ //oCn.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_Out " + sInterID + ",1");
+ }
//鍥炲～宸茬敓鍗曠姸鎬�
oCn.RunProc("Update KF_BCPWeighSource_Temp set HRelationInterID=1 where HInterID= " + HInterID.ToString());
MessageBox.Show("鐢熸垚宸ュ簭鍑虹珯姹囨姤鍗曟垚鍔燂紒", "鎻愮ず");
@@ -587,9 +589,19 @@
MessageBox.Show("璇疯緭鍏ュ寘鍙凤紒", "鎻愮ず");
return false;
}
- else if (DBUtility.ClsPub.isDoule(txtHProcID.Tag) == 0)
+ else if (DBUtility.ClsPub.isLong(txtHProcID.Tag) == 0)
{
- MessageBox.Show("璇峰厛閫夋嫨宸ュ簭锛�", "鎻愮ず");
+ MessageBox.Show("宸ュ簭涓嶅厑璁镐负绌猴紝璇峰厛杈撳叆娴佹按鍙峰悗鍥炶溅纭锛�", "鎻愮ず");
+ return false;
+ }
+ else if (DBUtility.ClsPub.isInt(txtHProcNo.Text) == 0)
+ {
+ MessageBox.Show("璇疯緭鍏ユ纭祦姘村彿锛�", "鎻愮ず");
+ return false;
+ }
+ else if (DBUtility.ClsPub.isLong(txtHSourceID.Tag) == 0)
+ {
+ MessageBox.Show("鐢熶骇璧勬簮涓嶅厑璁镐负绌猴紝璇峰厛閫夋嫨鐢熶骇璧勬簮锛�", "鎻愮ず");
return false;
}
@@ -966,13 +978,13 @@
{
if (e.KeyCode == Keys.Return)
{
- if (txtHProcNo.Text == "")
+ if (DBUtility.ClsPub.isLong(txtHProcNo.Text) == 0)
{
- MessageBox.Show("娴佹按鍙蜂负绌猴紝璇疯緭鍏ユ祦姘村彿锛�");
+ MessageBox.Show("娴佹按鍙蜂负绌烘垨鎵�杈撳叆娴佹按鍙蜂笉姝ｇ‘锛岃閲嶆柊杈撳叆娴佹按鍙凤紒");
return;
}
//鏍规嵁杞崱涓籌D銆佹祦姘村彿甯﹀嚭娴佽浆鍗′笂鐩稿簲宸ュ簭銆佺彮缁勩�佸伐浣滀腑蹇冦�佺敓浜ц祫婧�
- DataSet Ds = oCn.RunProcReturn("exec h_p_KF_GetBCPWeighSource_HProcNo " + HProcessExchangeInterID.ToString() + "," + txtHProcNo.Text, "h_p_KF_GetBCPWeighSource_HProcNo");
+ DataSet Ds = oCn.RunProcReturn("exec h_p_KF_GetBCPWeighSource_HProcNo2 " + HProcessExchangeInterID.ToString() + "," + DBUtility.ClsPub.isLong(txtHProcNo.Text) + ",'" + DBUtility.ClsPub.CurUserID + "'", "h_p_KF_GetBCPWeighSource_HProcNo2");
if (Ds == null || Ds.Tables[0].Rows.Count == 0)
{
txtHProcNo.Text = "";
@@ -984,7 +996,7 @@
txtHGroupID.Text = "";
txtHSourceID.Tag = 0;
txtHSourceID.Text = "";
- MessageBox.Show("鎵�杈撳叆娴佹按鍙蜂笉鍦ㄥ綋鍓嶅伐搴忔祦杞崱涓嬶紝璇烽噸鏂拌緭鍏ユ祦姘村彿锛�");
+ MessageBox.Show("鎵�杈撳叆娴佹按鍙蜂笉鍦ㄥ綋鍓嶅伐搴忔祦杞崱涓嬫垨鐢ㄦ埛鏈叧鑱旇娴佹按鍙锋墍瀵瑰簲鐩稿叧宸ュ簭锛岃閲嶆柊杈撳叆娴佹按鍙凤紒");
return;
}
else
diff --git a/WebAPI/Controllers/BaseSet/Gy_SourceController.cs b/WebAPI/Controllers/BaseSet/Gy_SourceController.cs
index 5956b12..e5bed9c 100644
--- a/WebAPI/Controllers/BaseSet/Gy_SourceController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_SourceController.cs
@@ -6,7 +6,10 @@
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
+using System.IO;
+using System.Web;
using System.Web.Http;
+using WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�;
using WebAPI.Models;
using WebAPI.Service;
@@ -307,6 +310,359 @@
return model;
}
+ #region 鐢熶骇璧勬簮 鏂囦欢涓婁紶
+ [Route("Gy_Source/Gy_Source_Excel")]
+ [HttpPost]
+ public object Gy_Source_Excel()
+ {
+ 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, 1, "0");
+
+ //鍒犻櫎鏂囦欢
+ File.Delete(ExcelPath);
+
+ //鍒涘缓涓存椂琛�
+ DataTable tb2 = new DataTable("dt2");
+
+ //娣诲姞鍒楀悕
+ for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
+ {
+ tb2.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
+ }
+
+ //妯℃澘缂哄皯鍒� 浣嗛渶瑕佷粠鏁版嵁搴撲腑鏌ヨ鍑烘潵鏄剧ず鍦ㄩ〉闈㈢殑瀛楁
+ tb2.Columns.Add("HOrgID", typeof(Int32));//缁勭粐ID
+ tb2.Columns.Add("HDeptID", typeof(Int32));//閮ㄩ棬ID
+ tb2.Columns.Add("HEmpID", typeof(Int32));//璐熻矗浜篒D
+ tb2.Columns.Add("HWorkCenterID", 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);
+ }
+
+
+ var error = "";
+
+ //鏌ヨ宸ヨ壓璺嚎娌℃湁鐨勫垪
+ if (!tb2.Columns.Contains("缁勭粐浠ｇ爜"))
+ error += "娌℃湁鎵惧埌銆愮粍缁囦唬鐮併�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("缁勭粐鍚嶇О"))
+ error += "娌℃湁鎵惧埌銆愮粍缁囧悕绉般�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鐢熶骇璧勬簮鍚嶇О"))
+ error += "娌℃湁鎵惧埌銆愮敓浜ц祫婧愬悕绉般�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鐢熶骇璧勬簮浠ｇ爜"))
+ error += "娌℃湁鎵惧埌銆愮敓浜ц祫婧愪唬鐮併�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("閮ㄩ棬浠ｇ爜"))
+ error += "娌℃湁鎵惧埌銆愰儴闂ㄤ唬鐮併�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("閮ㄩ棬鍚嶇О"))
+ error += "娌℃湁鎵惧埌銆愰儴闂ㄥ悕绉般�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("璐熻矗浜轰唬鐮�"))
+ error += "娌℃湁鎵惧埌銆愯礋璐ｄ汉浠ｇ爜銆戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("璐熻矗浜�"))
+ error += "娌℃湁鎵惧埌銆愯礋璐ｄ汉銆戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("宸ヤ綔涓績浠ｇ爜"))
+ error += "娌℃湁鎵惧埌銆愬伐浣滀腑蹇冧唬鐮併�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("宸ヤ綔涓績鍚嶇О"))
+ error += "娌℃湁鎵惧埌銆愬伐浣滀腑蹇冨悕绉般�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鍗曠彮宸ユ椂"))
+ error += "娌℃湁鎵惧埌銆愬崟鐝伐鏃躲�戠殑鏍囬,";
+
+ if (error.Length > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = $"Excel妯℃澘瀛樺湪閿欒,{error}\r\n";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ for (int i = 0; i <= tb2.Rows.Count - 1; i++)
+ {
+ string HSourceName = "";
+ string HSourceNum = "";
+ string HORGNumber = "";
+ string HORGName = "";
+ string HDeptNum = "";
+ string HDeptName = "";
+ string HEmpNum = "";
+ string HEmpName = "";
+ string HCentNum = "";
+ string HCentName = "";
+ string HWorkTime = "";
+
+ HSourceName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["鐢熶骇璧勬簮鍚嶇О"].ToString());
+ HSourceNum = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["鐢熶骇璧勬簮浠ｇ爜"].ToString());
+ HORGNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["缁勭粐浠ｇ爜"].ToString());
+ HORGName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["缁勭粐鍚嶇О"].ToString());
+ HDeptNum = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["閮ㄩ棬浠ｇ爜"].ToString());
+ HDeptName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["閮ㄩ棬鍚嶇О"].ToString());
+ HEmpNum = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["璐熻矗浜轰唬鐮�"].ToString());
+ HEmpName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["璐熻矗浜�"].ToString());
+ HCentNum = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["宸ヤ綔涓績浠ｇ爜"].ToString());
+ HCentName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["宸ヤ綔涓績鍚嶇О"].ToString());
+ HWorkTime = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["鍗曠彮宸ユ椂"].ToString());
+
+ //妫�鏌ョ墿鏂�
+ int index = i + 1;
+
+ if (HORGNumber != "")
+ {
+
+
+ //鏌ヨ缁勭粐
+ ds = oCN.RunProcReturn("select * from Xt_ORGANIZATIONS where HNumber='" + HORGNumber + "' and Hname='" + HORGName + "'", "Xt_ORGANIZATIONS");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + index + "琛�,缁勭粐涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ tb2.Rows[i]["HOrgID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+ string HORGid = ds.Tables[0].Rows[0]["HItemID"].ToString();
+
+
+ //鏌ヨ閮ㄩ棬
+ ds = oCN.RunProcReturn("select * from Gy_Department where HNumber='" + HDeptNum + "' and HUSEORGID=" + HORGid + "", "Gy_Department");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + index + "琛�,璇�" + HORGName + "缁勭粐,閮ㄩ棬:" + HDeptName + ",涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ tb2.Rows[i]["HDeptID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+
+ //鏌ヨ璐熻矗浜�
+ ds = oCN.RunProcReturn("select * from Gy_Employee where HNumber='" + HEmpNum + "' and HUSEORGID=" + HORGid + "", "Gy_Employee");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + index + "琛�,璇�" + HORGName + "缁勭粐,璐熻矗浜�:" + HEmpName + ",涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ tb2.Rows[i]["HEmpID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+
+ //鏌ヨ宸ヤ綔涓績
+ ds = oCN.RunProcReturn("select * from Gy_WorkCenter where HNumber='" + HCentNum + "' and HUSEORGID=" + HORGid + "", "Gy_WorkCenter"); //
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + index + "琛�,璇�" + HORGName + "缁勭粐,宸ヤ綔涓績:" + HCentName + ",涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ tb2.Rows[i]["HWorkCenterID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+
+ //鍗曠彮宸ユ椂
+ if (HWorkTime == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + index + "琛�,鍗曠彮宸ユ椂涓嶈兘涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鐢熶骇璧勬簮鍚嶇О
+ if (HSourceName == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + index + "琛�,鐢熶骇璧勬簮鍚嶇О涓嶈兘涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鐢熶骇璧勬簮浠ｇ爜
+ if (HSourceNum == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + index + "琛�,鐢熶骇璧勬簮浠ｇ爜涓嶈兘涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "绗�" + index + "琛�,缁勭粐浠ｇ爜涓虹┖";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = error;
+ 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("Gy_Source/Gy_Source_btnSave")]
+ [HttpPost]
+ public object Gy_Source_btnSave([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { "&鍜�" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string user = sArray[1].ToString();
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Gy_Source_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ List<object> Excel = Newtonsoft.Json.JsonConvert.DeserializeObject<List<object>>(msg2);
+ List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();
+
+ foreach (JObject item in Excel)
+ {
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ foreach (var itm in item.Properties())
+ {
+ dic.Add(itm.Name, itm.Value.ToString());
+ }
+ list.Add(dic);
+ }
+
+ oCN.BeginTran();
+ int i = 1;
+ foreach (Dictionary<string, string> item in list)
+ {
+ string HDeptID = item["HDeptID"].ToString();//閮ㄩ棬
+ string HEmpID = item["HEmpID"].ToString();//璐熻矗浜�
+ string HOrgID = item["HOrgID"].ToString();//缁勭粐ID
+ string HWorkCenterID = item["HWorkCenterID"].ToString();//宸ヤ綔涓績
+ string HsouceName = item["鐢熶骇璧勬簮鍚嶇О"].ToString();
+ string HsouceNum = item["鐢熶骇璧勬簮浠ｇ爜"].ToString();
+ string HWorkTime = item["鍗曠彮宸ユ椂"].ToString();
+ string sShortNumber;
+ sShortNumber = DBUtility.ClsPub.GetShortNumber(HsouceName);//鐭唬鐮�
+ if (sShortNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺煭浠ｇ爜涓虹┖锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ int HEndFlag = 1;//鏈骇鏍囧織
+ int HLevel = DBUtility.ClsPub.GetLevel(HsouceName); //绛夌骇
+
+
+ if (!DBUtility.ClsPub.AllowNumber(HsouceNum.Trim()))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷腑涓嶈兘鍑虹幇杩炵画鈥�.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from Gy_Source where HNumber='" + HsouceNum + "'", "Gy_Source");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+
+ string sql = "insert into Gy_Source(HName,HNumber,HDeptID,HEmpID,HUSEORGID,HCenterID,HWorkTimes,HShortNumber,HEndFlag,HLevel,HHelpCode,HParentID,HStopflag,HRemark,HType)" +
+ $"values('{HsouceName}', '{HsouceNum}',{HDeptID}, {HEmpID}, '{HOrgID}', '{HWorkCenterID}', {HWorkTime},'{sShortNumber}',{HEndFlag},{HLevel},'',0,0,'','')";
+ oCN.RunProc(sql);
+ }
+ else
+ {
+ oCN.RunProc(" update Gy_Source set HWorkTimes=" + HWorkTime + ",HDeptID="+ HDeptID + ",HEmpID="+ HEmpID + ",HCenterID="+HWorkCenterID+" where HNumber='" + HsouceNum +"'");
+ }
+
+ i++;
+ }
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀵煎叆鎴愬姛!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ LogService.Write(e);
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 鐢熶骇璧勬簮 鏍戝舰鍥�
public class TreeModel
{
@@ -316,11 +672,11 @@
}
[Route("Gy_Source/Gy_SourceTreeList")]
[HttpGet]
- public object Gy_SourceTreeList()
+ public object Gy_SourceTreeList(string sWhere)
{
try
{
- string sql1 = string.Format("select hitemid,hnumber,hname from Gy_Source order by hnumber");
+ string sql1 = string.Format("select hitemid,hnumber,hname from Gy_Source"+ sWhere + " order by hnumber");
ds = oCN.RunProcReturn(sql1, "Gy_Source");
diff --git a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
index 7d625ff..98940fd 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
@@ -772,7 +772,7 @@
#endregion
#region 瀵硅壊璁板綍鏂板淇濆瓨
- [Route("ColorRecord/ColorRecordAddBill")]
+ [Route("MES_SampleRecordBill_PDA/ColorRecordAddBill")]
[HttpPost]
public object ColorRecordAddBill([FromBody] JObject oMain)
{
@@ -1169,6 +1169,99 @@
}
#endregion
+ #region 鎸囧紩鍗″彉鏇村崟 鏂板淇濆瓨
+ [Route("MES_Sc_ProcessExchangeBillMain_Note_PDA/ProcessExchangeBillMain_NoteAddBill")]
+ [HttpPost]
+ public object ProcessExchangeBillMain_NoteAddBill([FromBody] JObject oMain)
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ try
+ {
+ //鍙嶅簭鍒楀寲
+ string msg2 = "[" + sArray[0].ToString() + "]";
+ string user = sArray[1].ToString();//鐢ㄦ埛鍚�
+ string OperationType = sArray[2].ToString();//绫诲瀷
+
+ //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Change", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲彉鏇存潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ List<Model.Sc_ProcessExchangeBillMain_Note> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.Sc_ProcessExchangeBillMain_Note>>(msg2);
+
+ long HSouceID_Original = list[0].HSouceID_Original;
+ long HSouceID_Now = list[0].HSouceID_Now;
+ long HOrgID = list[0].HOrgID;//缁勭粐ID
+ String HICMOBillNo = list[0].HICMOBillNo;//浠诲姟鍗�
+ long HICMOInterID = list[0].HICMOInterID;//浠诲姟鍗旾D
+ long HProcExchInterID = list[0].HProcExchInterID;
+ long HProcExchEntryID = list[0].HProcExchEntryID;
+ String HProcExchBillNo = list[0].HProcExchBillNo;
+ String HBillNo_Note = list[0].HBillNo_Note;//鎸囧紩鍗�
+ long HMaterID = list[0].HMaterID;//浜у搧ID
+ long HUnitID = list[0].HUnitID;//璁￠噺鍗曚綅
+ long HProcID = list[0].HProcID;//宸ュ簭ID
+ string HMaker = user;//鍒跺崟浜�
+ string HMakeDate = list[0].HMakeDate;//鍒跺崟鏃ユ湡
+
+ //鍗曟嵁瀹屾暣鎬у垽鏂�
+ if (HProcExchBillNo == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娴佽浆鍗℃病鏈夐�夋嫨锛佽鎵弿鏉″舰鐮佹垨杈撳叆鏉″舰鐮佸悗鍥炶溅";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();
+ if (OperationType == "1")
+ {
+ oCN.RunProc("Insert Into Sc_ProcessExchangeBillMain_Note " +
+ "(HBillNo_Note,HSouceID_Original,HSouceID_Now,HOrgID,HICMOInterID,HICMOBillNo,HProcExchBillNo,HProcExchInterID" +
+ ",HProcExchEntryID,HMaterID,HUnitID,HProcID,HMaker,HMakeDate)" +
+ " values('" + HBillNo_Note + "','" + HSouceID_Original + "'," + HSouceID_Now + ",'" + HOrgID + "'," + HICMOInterID + ",'"+ HICMOBillNo + "','" + HProcExchBillNo + "' ," + HProcExchInterID +
+ "," + HProcExchEntryID + ",'" + HMaterID + "','" + HUnitID + "'," + HProcID + ",'" + HMaker + "','" + HMakeDate + "')" );
+
+ oCN.RunProc("update Sc_ProcessExchangeBillSub set HSourceID=" + HSouceID_Now + " where HInterID=" + HProcExchInterID + " and HEntryID=" + HProcExchEntryID);
+ }
+ else
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎿嶄綔绫诲瀷鏃犳晥锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 鍑虹珯姹囨姤鍗曟樉绀鸿〃浣撴槑缁�
[Route("Cj_StationEntrustInBill/DisBillEntryList")]
diff --git a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
index 5cbd86a..705fbcc 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
@@ -42,15 +42,30 @@
string OperationType = sArray[2].ToString();
string HComputerName = SystemInformation.ComputerName; //璁惧鍚嶇О
- //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
- if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Edit", 1, false, user))
+ if (OperationType == "5")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犵紪杈戞潈闄�!";
- objJsonResult.data = null;
- return objJsonResult;
+ //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Sub_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "寮�宸ュ崟鏃犵紪杈戞潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
+ else {
+ //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "杩涚珯鍗曟棤缂栬緫鏉冮檺!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
List<StationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(msg2);
long HMainInterID = 0;
@@ -534,20 +549,36 @@
#region 杩斿洖宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛�
[Route("Cj_StationInBill/get_Display")]
[HttpGet]
- public object get_Display(string sWhere,string user)
+ public object get_Display(string sWhere,string user,string HBillSubType)
{
try
{
List<object> columnNameList = new List<object>();
- //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
- if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Query", 1, false, user))
+
+ if (HBillSubType == "SUB")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
- objJsonResult.data = null;
- return objJsonResult;
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Sub_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "寮�宸ュ崟鏃犳煡璇㈡潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
+ else {
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "杩涚珯鍗曟棤鏌ヨ鏉冮檺!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
if (sWhere == null || sWhere.Equals(""))
{
@@ -680,20 +711,36 @@
#region 瀹℃牳
[Route("Cj_StationInBill/set_CheckBill")]
[HttpGet]
- public object set_CheckBill(int HInterID,string CurUserName)
+ public object set_CheckBill(int HInterID,string CurUserName,string HBillSubType)
{
try
{
- string ModRightNameCheck = "Cj_StationInBill_Check";
- //瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false,CurUserName))
+ string ModRightNameCheck = "";
+
+ if (HBillSubType == "SUB")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
- objJsonResult.data = null;
- return objJsonResult;
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Sub_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "寮�宸ュ崟瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
+ else {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "杩涚珯鍗曞鏍稿け璐ワ紒鏃犳潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
if (HInterID == 0)
{
objJsonResult.code = "0";
@@ -797,20 +844,36 @@
#region 鍙嶅鏍�
[Route("Cj_StationInBill/set_AbandonCheck")]
[HttpGet]
- public object set_AbandonCheck(int HInterID, string CurUserName)
+ public object set_AbandonCheck(int HInterID, string CurUserName, string HBillSubType)
{
try
{
- string ModRightNameCheck = "Cj_StationInBill_Check";
- //瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
+ if (HBillSubType == "SUB")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍙嶅鏍稿け璐ワ紒鏃犳潈闄愶紒";
- objJsonResult.data = null;
- return objJsonResult;
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Sub_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "寮�宸ュ崟鍙嶅鏍稿け璐ワ紒鏃犳潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
+ else
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "杩涚珯鍗曞弽瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
if (HInterID == 0)
{
@@ -942,19 +1005,34 @@
#region 宸ュ簭杩涚珯鍏抽棴/鍙嶅叧闂姛鑳�
[Route("Cj_StationInBill/CloseCj_StationInBill")]
[HttpGet]
- public object CloseSc_StationInBill(string HInterID, int Type, string user)
+ public object CloseSc_StationInBill(string HInterID, int Type, string user,string HBillSubType)
{
try
{
- //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
- if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Close", 1, false, user))
+ if (HBillSubType == "SUB")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳潈闄愬叧闂�!";
- objJsonResult.data = null;
- return objJsonResult;
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Sub_Close", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "寮�宸ュ崟鏃犳潈闄愬叧闂�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
+ else {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Close", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "杩涚珯鍗曟棤鏉冮檺鍏抽棴!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
if (string.IsNullOrWhiteSpace(HInterID))
{
@@ -1094,20 +1172,35 @@
#region 鏍规嵁id鍒犻櫎杩涚珯鍗�
[Route("Cj_StationInBill/del_StationInBill")]
[HttpGet]
- public object del_StationInBill(long HInterID,string HDeleteMan)
+ public object del_StationInBill(long HInterID,string HDeleteMan,string HBillSubType)
{
try
{
string HComputerName = SystemInformation.ComputerName; //璁惧鍚嶇О
- //缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Drop", 1, false, HDeleteMan))
+ if (HBillSubType == "SUB")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳潈闄愶紒";
- objJsonResult.data = null;
- return objJsonResult;
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Sub_Drop", 1, false, HDeleteMan))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "寮�宸ュ崟鏃犳潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
+ else {
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Drop", 1, false, HDeleteMan))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "杩涚珯鎺ユ敹鍗曟棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
DAL.ClsSc_StationInBill oBill = new DAL.ClsSc_StationInBill();
if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
{
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index fbe4b72..21186e1 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -44,15 +44,30 @@
string OperationType = sArray[2].ToString();//绫诲瀷
string HComputerName = SystemInformation.ComputerName; //璁惧鍚嶇О
- //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
- if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Edit", 1, false, user))
+ if (OperationType == "5")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犵紪杈戞潈闄�!";
- objJsonResult.data = null;
- return objJsonResult;
+ //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Sub_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹屽伐鍗曟棤缂栬緫鏉冮檺!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
+ else {
+ //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍑虹珯鍗曟棤缂栬緫鏉冮檺!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
Stopwatch sw = new Stopwatch();
sw.Start();//寮�濮嬭鏃�
@@ -1409,12 +1424,12 @@
//閫掑叆鐗╂枡淇℃伅 杩斿洖鏈畬鍏ㄦ眹鎶ョ殑娴佽浆鍗�
[Route("LEMS/Sc_StationOutBill_Mul_RYQ")]
[HttpGet]
- public object Sc_StationOutBill_Mul_RYQ(String HMaterName, Int64 HOrgID)
+ public object Sc_StationOutBill_Mul_RYQ(String HMaterName,string HProcNumber, Int64 HOrgID)
{
try
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- DataSet ds = oCN.RunProcReturn("exec h_p_CJGXPLHB_Query '" + HMaterName + "'," + HOrgID + "", "h_p_CJGXPLHB_Query");
+ DataSet ds = oCN.RunProcReturn("exec h_p_CJGXPLHB_Query '" + HMaterName + "'," + HOrgID + ",'"+ HProcNumber + "'", "h_p_CJGXPLHB_Query");
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
@@ -1500,20 +1515,35 @@
#region 杩斿洖宸ュ簭鍑虹珯姹囨姤鍗曞垪琛�
[Route("Cj_StationOutBill/get_Display")]
[HttpGet]
- public object get_Display(string sWhere,string user)
+ public object get_Display(string sWhere,string user,string HBillSubType)
{
try
{
List<object> columnNameList = new List<object>();
- //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
- if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Query", 1, false, user))
+ if (HBillSubType == "SUB")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
- objJsonResult.data = null;
- return objJsonResult;
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Sub_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹屽伐鍗曟棤鏌ヨ鏉冮檺!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
+ else {
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍑虹珯鍗曟棤鏌ヨ鏉冮檺!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
//鑾峰彇绯荤粺鍙傛暟
string Ret = "";
@@ -1942,20 +1972,35 @@
#region 鏍规嵁id鍒犻櫎鍑虹珯鍗�
[Route("Cj_StationOutBill/del_StationOutBill")]
[HttpGet]
- public object del_StationOutBill(long HInterID, string HDeleteMan)
+ public object del_StationOutBill(long HInterID, string HDeleteMan,string HBillSubType)
{
try
{
string HComputerName = SystemInformation.ComputerName; //璁惧鍚嶇О
- //缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Drop", 1, false, HDeleteMan))
+ if (HBillSubType == "SUB")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳潈闄愶紒";
- objJsonResult.data = null;
- return objJsonResult;
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Sub_Drop", 1, false, HDeleteMan))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹屽伐鍗曟棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
+ else {
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Drop", 1, false, HDeleteMan))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍑虹珯鍗曟棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
DAL.ClsSc_StationOutBill oBill = new DAL.ClsSc_StationOutBill();
if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
{
@@ -2171,20 +2216,35 @@
#region 瀹℃牳
[Route("Cj_StationOutBill/set_CheckBill")]
[HttpGet]
- public object set_CheckBill(string HInterID, string CurUserName)
+ public object set_CheckBill(string HInterID, string CurUserName,string HBillSubType)
{
try
{
- string ModRightNameCheck = "Cj_StationOutBill_Check";
- ////瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
+ if (HBillSubType == "SUB")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
- objJsonResult.data = null;
- return objJsonResult;
+ ////瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Sub_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹屽伐鍗曞鏍稿け璐ワ紒鏃犳潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
+ else
+ { ////瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍑虹珯鍗曞鏍稿け璐ワ紒鏃犳潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
var HBillNo = HInterID.Split(',');
DAL.ClsSc_StationOutBill oBill = new DAL.ClsSc_StationOutBill();
@@ -2299,20 +2359,35 @@
#region 鍙嶅鏍�
[Route("Cj_StationOutBill/set_AbandonCheck")]
[HttpGet]
- public object set_AbandonCheck(string HInterID, string CurUserName)
+ public object set_AbandonCheck(string HInterID, string CurUserName,string HBillSubType)
{
try
{
- string ModRightNameCheck = "Cj_StationOutBill_Check";
- ////瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
+ if (HBillSubType == "SUB")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍙嶅鏍稿け璐ワ紒鏃犳潈闄愶紒";
- objJsonResult.data = null;
- return objJsonResult;
+ ////瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Sub_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹屽伐鍗曞弽瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
+ else
+ {
+ ////瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍑虹珯鍗曞弽瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
var HBillNo = HInterID.Split(',');
DAL.ClsSc_StationOutBill oBill = new DAL.ClsSc_StationOutBill();
@@ -2451,19 +2526,34 @@
#region 宸ュ簭鍑虹珯鍏抽棴/鍙嶅叧闂姛鑳�
[Route("Cj_StationOutBill/CloseCj_StationOutBill")]
[HttpGet]
- public object CloseCj_StationOutBill(string HInterID, int Type, string user)
+ public object CloseCj_StationOutBill(string HInterID, int Type, string user,string HBillSubType)
{
try
{
- //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
- if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Close", 1, false, user))
+ if (HBillSubType == "SUB")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳潈闄愬叧闂�!";
- objJsonResult.data = null;
- return objJsonResult;
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Sub_Close", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹屽伐鍗曟棤鏉冮檺鍏抽棴!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
+ else {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Close", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍑虹珯鍗曟棤鏉冮檺鍏抽棴!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
if (string.IsNullOrWhiteSpace(HInterID))
{
diff --git a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
index 22547e6..d38a608 100644
--- a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
+++ b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -40,7 +40,7 @@
string msg3 = sArray[1].ToString();
string msg4 = sArray[2].ToString();
string msg5 = sArray[3].ToString();
- string OperationType = sArray[4].ToString();
+ string HBillSubType = sArray[4].ToString();
string HComputerName = SystemInformation.ComputerName; //璁惧鍚嶇О
string UserName = "";
@@ -48,14 +48,28 @@
try
{
- if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Edit", 1, false, msg4))
+ if (HBillSubType == "SUB")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
- objJsonResult.data = null;
- return objJsonResult;
+ if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Sub_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎸囧紩鍗℃棤淇濆瓨鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
+ else {
+ if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娴佽浆鍗℃棤淇濆瓨鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
DBUtility.ClsPub.CurUserName = msg4;
DAL.ClsSc_ProcessExchangeBill oBill = new DAL.ClsSc_ProcessExchangeBill();
List<Model.ClsSc_ProcessExchangeBillMain> lsmain = new List<Model.ClsSc_ProcessExchangeBillMain>();
@@ -66,10 +80,10 @@
{
UserName = oItem.HMaker; //鍒跺崟浜�
oItem.HBillType = "3772";
- oItem.HBillSubType = OperationType=="5"?"SUB":"3772";
+ oItem.HBillSubType = HBillSubType == "SUB" ? HBillSubType : "3772";
oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
- oItem.HDate = OperationType == "5" ? DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd")) : oItem.HDate;
+ oItem.HDate = HBillSubType == "SUB" ? DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd")) : oItem.HDate;
if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
{
objJsonResult.code = "0";
@@ -831,17 +845,33 @@
/// <returns></returns>
[Route("Sc_ProcessExchangeBill/DeltetProcessExchangeBillByID")]
[HttpGet]
- public object DeltetProcessExchangeBillByID(string HInterID, int HPRDORGID, string user)
+ public object DeltetProcessExchangeBillByID(string HInterID, int HPRDORGID, string user, string HSouceBillType)
{
- //缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Drop", 1, false, user))
+
+ if (HSouceBillType == "SUB")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
- objJsonResult.data = null;
- return objJsonResult;
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Sub_Drop", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎸囧紩鍗℃棤鍒犻櫎鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
+ else {
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Drop", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娴佽浆鍗℃棤鍒犻櫎鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
string HComputerName = SystemInformation.ComputerName; //璁惧鍚嶇О
@@ -937,15 +967,34 @@
foreach (var item in HBillNo)
{
+ oCN.BeginTran();
+ if (HSouceBillType == "SUB") {
+ ds = oCN.RunProcReturn("select * from Sc_ProcessExchangeBillMain where HInterID=" + item, "Sc_ProcessExchangeBillMain");
+
+ if (ds.Tables[0].Rows.Count == 0) {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳祦杞崱鏁版嵁!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.RunProc("update Sc_ProcessExchangeBillSub set HSourceID=0 where HInterID=" + ds.Tables[0].Rows[0]["HMainSourceInterID"].ToString() + " and HEntryID=" + ds.Tables[0].Rows[0]["HMainSourceEntryID"].ToString());
+ }
+
bool IsDete = oBill.DeleteBill(long.Parse(item), ref DBUtility.ClsPub.sExeReturnInfo);
+
if (!IsDete)
{
+ oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
}
+ oCN.Commit();
}
if (oSystemParameter.omodel.WMS_CampanyName == "鐟炰笌绁�")
@@ -1277,19 +1326,34 @@
#region 宸ュ簭娴佽浆鍗″鏍�/鍙嶅鏍稿姛鑳�
[Route("Sc_ProcessExchangeBill/CheckSc_ProcessExchangeBill")]
[HttpGet]
- public object CheckSc_ProcessExchangeBill(string HInterID, int Type, string user)
+ public object CheckSc_ProcessExchangeBill(string HInterID, int Type, string user,string HBillSubType)
{
try
{
- //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
- if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Check", 1, false, user))
+ if (HBillSubType == "SUB")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳潈闄愬鏍�!";
- objJsonResult.data = null;
- return objJsonResult;
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Check", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎸囧紩鍗℃棤鏉冮檺瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
+ else {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Sub_Check", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娴佽浆鍗℃棤鏉冮檺瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
if (string.IsNullOrWhiteSpace(HInterID))
{
@@ -1396,19 +1460,35 @@
#region 宸ュ簭娴佽浆鍗″叧闂�/鍙嶅叧闂姛鑳�
[Route("Sc_ProcessExchangeBill/CloseSc_ProcessExchangeBill")]
[HttpGet]
- public object CloseSc_ProcessExchangeBill(string HInterID, int Type, string user)
+ public object CloseSc_ProcessExchangeBill(string HInterID, int Type, string user,string HBillSubType)
{
try
{
- //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
- if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Close", 1, false, user))
+ if (HBillSubType == "SUB")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳潈闄愬叧闂�!";
- objJsonResult.data = null;
- return objJsonResult;
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Sub_Close", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎸囧紩鍗℃棤鏉冮檺鍏抽棴!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
+ else
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Close", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娴佽浆鍗℃棤鏉冮檺鍏抽棴!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
if (string.IsNullOrWhiteSpace(HInterID))
{
diff --git a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
index 364928c..17c2d00 100644
--- a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
+++ b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
@@ -132,16 +132,32 @@
string user = sArray[3].ToString();//鐢ㄦ埛鍚�
string HComputerName = SystemInformation.ComputerName; //璁惧鍚嶇О
user_LongShan = sArray[3].ToString();//鐢ㄦ埛鍚�
+ string HBillSubType = sArray[4].ToString();//鍗曟嵁瀛愮被鍨�
try
{
- //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
- if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Edit", 1, false, user))
+ if (HBillSubType == "3301")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳潈闄愮紪杈�!";
- objJsonResult.data = null;
- return objJsonResult;
+ //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "宸ヨ壓璺嚎鏃犳潈闄愮紪杈�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+ else {
+ //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Sub_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀛愬伐鑹鸿矾绾挎棤鏉冮檺缂栬緫!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
msg2 = "[" + msg2.ToString() + "]";
@@ -241,7 +257,7 @@
ds = oCN.RunProcReturn("select * from h_v_Gy_RoutingBillList where hmainid=" + HInterID + " and 鍗曟嵁鍙�='" + HBillNo + "'", "h_v_Gy_RoutingBillList");
- if ((OperationType == 1 || OperationType == 2|| OperationType == 4) && ds.Tables[0].Rows.Count == 0)//鏂板
+ if ((OperationType == 1 || OperationType == 2) && ds.Tables[0].Rows.Count == 0)//鏂板
{
//涓昏〃
oCN.RunProc("Insert Into Gy_RoutingBillMain " +
@@ -251,7 +267,7 @@
",HMainGroupID,HMainProcID,HMainCenterID,HMainTimeUnit,HMainUnitTime,HMainWorkQty" +
",HMainPrice,HStdSourceQty,HAddSourceRate,HPRDORGID,HDelSourceRate" +
",HPicNumVer,HPicNumAssemble,HMaterTexture,HProductNum,HVerNum,HOrgID) " +
- " values('" + BillType + "','"+(OperationType==4?"SUB":"") +"'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
+ " values('" + BillType + "','"+ HBillSubType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
"," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()," + HMaterID + ",'" + HName + "'," + HMaterTypeID +
"," + HRoutingGroupID + "," + HUnitID + ",'" + HMaterNumber + "','" + HUnitNumber + "'," + Convert.ToString(HStandard ? 1 : 0) +
"," + HMainGroupID + "," + HMainProcID + "," + HMainCenterID + ",'" + HMainTimeUnit + "'," + HMainUnitTime + "," + HMainWorkQty +
@@ -310,7 +326,7 @@
oCN.RunProc("exec Gy_RoutingBill_LastProNo " + HInterID);
}
}
- else if (IsProNo == 1 && (OperationType == 1 || OperationType == 4))
+ else if (IsProNo == 1 && (OperationType == 1))
{
ds = oCN.RunProcReturn("select * from Gy_Process Where HTProcessFlag = 1 and HNumber='9999' ", "Gy_Process");
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index 12bc5d0..58bc4ee 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -58,20 +58,35 @@
/// </summary>
[Route("LEMS/MES_Sc_ProcessExchangeBillQuery_Json")]
[HttpGet]
- public object MES_Sc_ProcessExchangeBillList_Json(string sWhere, string user)
+ public object MES_Sc_ProcessExchangeBillList_Json(string sWhere, string user,string HBillSubType)
{
DataSet ds;
try
{
List<object> columnNameList = new List<object>();
- //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
- if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Query", 1, false, user))
+ if (HBillSubType == "SUB")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
- objJsonResult.data = null;
- return objJsonResult;
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_SubQuery", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎸囧紩鍗℃棤鏌ヨ鏉冮檺!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else {
+
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娴佽浆鍗℃棤鏌ヨ鏉冮檺!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
//鑾峰彇绯荤粺鍙傛暟
@@ -159,7 +174,7 @@
}
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeBillList where 1 = 1 " + sWhere + " order by hmainid desc ", "h_v_Sc_ProcessExchangeBillList");
+ ds = oCN.RunProcReturn("select top 1000 * from h_v_Sc_ProcessExchangeBillList where 1 = 1 " + sWhere + " order by hmainid desc ", "h_v_Sc_ProcessExchangeBillList");
}
else
{
@@ -211,11 +226,21 @@
{
DataSet ds;
DataSet ds1;
+ DataSet ds2;
try
{
+ if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Sub_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎸囧紩鍗℃棤缂栬緫鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
var HNum = HInterID_S.Split(',');
- oCN.BeginTran();
+
for (int j = 0; j < HNum.Length; j++)
{
@@ -236,12 +261,21 @@
string HMaterID = ds.Tables[0].Rows[0]["HMaterID"].ToString();
string HProcID = ds.Tables[0].Rows[0]["HProcID"].ToString();
+ ds2 = oCN.RunProcReturn(@"select a.HMaterID,a.HMainProcID,b.* from Gy_RoutingBillMain a inner join Gy_RoutingBillSub b on a.HInterID=b.HInterID where a.HMaterID=" + HMaterID + " and a.HMainProcID=" + HProcID + " and a.HBillSubType='SUB'", "Gy_RoutingBillMain");
+ if (ds2.Tables[0].Rows.Count == 0)
+ {
+ long HGYInterID = DBUtility.ClsPub.CreateBillID("3301", ref DBUtility.ClsPub.sExeReturnInfo);
+ string HGYBillNo = DBUtility.ClsPub.CreateBillCode("3301", ref DBUtility.ClsPub.sExeReturnInfo, true);
+ oCN.RunProc("exec h_p_gy_Materl_PG " + HGYInterID + ",'" + HGYBillNo + "'," + HMaterID);
+ }
+
+
ds1 = oCN.RunProcReturn(@"select a.HMaterID,a.HMainProcID,b.* from Gy_RoutingBillMain a inner join Gy_RoutingBillSub b on a.HInterID=b.HInterID where a.HMaterID=" + HMaterID + " and a.HMainProcID=" + HProcID + " and a.HBillSubType='SUB'", "Gy_RoutingBillMain");
if (ds1.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁鐩稿搴旂殑榛樿宸ヨ壓璺嚎,璇峰厛璁剧疆宸ヨ壓璺嚎锛�";
+ objJsonResult.Message = "鏃犻粯璁ゅ伐鑹鸿矾绾匡紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -250,6 +284,8 @@
string sReturn = "";
DBUtility.ClsPub.HOrgID = HOrgID;
oBill.ShowBill(HInterID, ref sReturn);
+
+ oCN.BeginTran();
long HInterID1 = DBUtility.ClsPub.CreateBillID(oBill.omodel.HBillType, ref DBUtility.ClsPub.sExeReturnInfo);
string HBillNo = DBUtility.ClsPub.CreateBillCode(oBill.omodel.HBillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
@@ -285,7 +321,6 @@
oBill.DetailColl.Add(oSub);
}
-
bool bResult = false;
bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
@@ -300,9 +335,10 @@
objJsonResult.data = null;
return objJsonResult;
}
+ oCN.Commit();
}
- oCN.Commit();
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "娲惧伐鎴愬姛锛�";
@@ -330,6 +366,15 @@
DataSet ds1;
try
{
+ if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Sub_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎸囧紩鍗℃棤缂栬緫鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
var HNum = HInterID_S.Split(',');
oCN.BeginTran();
@@ -658,20 +703,38 @@
/// </summary>
[Route("LEMS/MES_Gy_RoutingBillList_Json")]
[HttpGet]
- public object MES_Gy_RoutingBillList_Json(string sWhere, string user)
+ public object MES_Gy_RoutingBillList_Json(string sWhere, string user,string HBillSubType)
{
DataSet ds;
try
{
- //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
- if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Query", 1, false, user))
+ if (HBillSubType == "SUB")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
- objJsonResult.data = null;
- return objJsonResult;
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Sub_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀛愬伐鑹鸿矾绾挎棤鏉冮檺鏌ヨ!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
}
+ else {
+
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "宸ヨ壓璺嚎鏃犳潈闄愭煡璇�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+
//鑾峰彇绯荤粺鍙傛暟
string Ret = "";
@@ -885,22 +948,37 @@
/// <returns></returns>
[Route("LEMS/DeltetGy_RoutingBillSub")]
[HttpGet]
- public object DeltetGy_RoutingBillSub(Int64 lngBillKey, string user)
+ public object DeltetGy_RoutingBillSub(Int64 lngBillKey, string user,string HBillSubType)
{
DataSet ds;
- string ModRightNameCheck = "Gy_RoutingBill_Drop";
+
try
{
- string HComputerName = SystemInformation.ComputerName; //璁惧鍚嶇О
- //鍒犻櫎鏉冮檺
- if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, user))
+ if (HBillSubType == "SUB")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍒犻櫎澶辫触锛佹棤鏉冮檺锛�";
- objJsonResult.data = null;
- return objJsonResult;
+ //鍒犻櫎鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Sub_Drop", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀛愬伐鑹鸿矾绾垮垹闄ゅけ璐ワ紒鏃犳潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
+ else {
+ //鍒犻櫎鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Drop", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "宸ヨ壓璺嚎鍒犻櫎澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ string HComputerName = SystemInformation.ComputerName; //璁惧鍚嶇О
+
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (lngBillKey == 0)
@@ -2191,19 +2269,35 @@
#region 宸ヨ壓璺嚎瀹℃牳/鍙嶅鏍稿姛鑳�
[Route("Gy_RoutingBill/CheckGy_RoutingBill")]
[HttpGet]
- public object CheckGy_RoutingBill(string HInterID, int Type, string user)
+ public object CheckGy_RoutingBill(string HInterID, int Type, string user,string HBillSubType)
{
try
{
- //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
- if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Check", 1, false, user))
+ if (HBillSubType == "SUB")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳潈闄愬鏍�!";
- objJsonResult.data = null;
- return objJsonResult;
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Sub_Check", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀛愬伐鑹鸿矾绾挎棤鏉冮檺瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
+ else
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Check", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "宸ヨ壓璺嚎鏃犳潈闄愬鏍�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
if (string.IsNullOrWhiteSpace(HInterID))
{
@@ -2310,19 +2404,35 @@
#region 宸ヨ壓璺嚎鍗曞叧闂�/鍙嶅叧闂姛鑳�
[Route("Gy_RoutingBill/CloseGy_RoutingBill_1")]
[HttpGet]
- public object CloseGy_RoutingBill(string HInterID, int Type, string user)
+ public object CloseGy_RoutingBill(string HInterID, int Type, string user,string HBillSubType)
{
try
{
- //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
- if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Close", 1, false, user))
+ if (HBillSubType == "SUB")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳潈闄愬叧闂�!";
- objJsonResult.data = null;
- return objJsonResult;
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Sub_Close", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀛愬伐鑹鸿矾绾挎棤鏉冮檺鍏抽棴!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
+ else
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Close", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "宸ヨ壓璺嚎鏃犳潈闄愬叧闂�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
if (string.IsNullOrWhiteSpace(HInterID))
{
diff --git a/WebAPI/Controllers/MateOutController.cs b/WebAPI/Controllers/MateOutController.cs
index 65914a1..bb18344 100644
--- a/WebAPI/Controllers/MateOutController.cs
+++ b/WebAPI/Controllers/MateOutController.cs
@@ -1562,8 +1562,6 @@
#endregion
-
-
#region 鏌撳巶浜ч噺鎶ヨ〃
[Route("ProdProcessSumReport/ProdProcessSumReport_DyeColor_third")]
[HttpGet]
@@ -1611,7 +1609,230 @@
}
#endregion
+ #region 鐑樺共瀹氬瀷鍑虹珯
+ [Route("ProdProcessSumReport/Kf_DryFinalizeOutReport")]
+ [HttpGet]
+ public object Kf_DryFinalizeOutReport(string sWhere)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn($"select * from h_v_Kf_DryFinalizeOutReport where 1=1 "+sWhere, "h_v_Kf_DryFinalizeOutReport");
+ //鑾峰彇鍒楀悕
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 涓婃祮瀹氬瀷鍑虹珯
+ [Route("ProdProcessSumReport/Kf_SizingFinalizeOutReport")]
+ [HttpGet]
+ public object Kf_SizingFinalizeOutReport(string sWhere)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn($"select * from h_v_Kf_SizingFinalizeOutReport where 1=1 " + sWhere, "h_v_Kf_SizingFinalizeOutReport");
+
+ //鑾峰彇鍒楀悕
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍒锋瘺鍑虹珯
+ [Route("ProdProcessSumReport/Kf_BrushingOutReport")]
+ [HttpGet]
+ public object Kf_BrushingOutReport(string sWhere)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn($"select * from h_v_Kf_BrushingOutReport where 1=1 " + sWhere, "h_v_Kf_BrushingOutReport");
+
+ //鑾峰彇鍒楀悕
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鑹插澂鐑厜鍑虹珯
+ [Route("ProdProcessSumReport/Kf_ColorBlankLustringOutReport")]
+ [HttpGet]
+ public object Kf_ColorBlankLustringOutReport(string sWhere)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn($"select * from h_v_Kf_ColorBlankLustringOutReport where 1=1 " + sWhere, "h_v_Kf_ColorBlankLustringOutReport");
+
+ //鑾峰彇鍒楀悕
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
+ #region 鍘嬫按鍑虹珯 姣涘皷鍑虹珯
+ [Route("ProdProcessSumReport/Kf_PressurizedWaterOutReport")]
+ [HttpGet]
+ public object Kf_PressurizedWaterOutReport(string sWhere,string HBillType)
+ {
+ try
+ {
+ switch (HBillType)
+ {
+ case "Kf_PressurizedWaterOutReport":
+ ds = oCN.RunProcReturn($"select * from h_v_Kf_PressurizedWaterOutReport where 1=1 " + sWhere, "h_v_Kf_PressurizedWaterOutReport");
+ break;
+ case "Kf_HairtipReport":
+ ds = oCN.RunProcReturn($"select * from h_v_Kf_HairtipReport where 1=1 " + sWhere, "h_v_Kf_HairtipReport");
+ break;
+ case "Kf_DigitalSprayPaintingReport":
+ ds = oCN.RunProcReturn($"select * from h_v_Kf_DigitalSprayPaintingReport where 1=1 " + sWhere, "h_v_Kf_DigitalSprayPaintingReport");
+ break;
+ case "Kf_ShrinkBrushReport":
+ ds = oCN.RunProcReturn($"select * from h_v_Kf_ShrinkBrushReport where 1=1 " + sWhere, "h_v_Kf_ShrinkBrushReport");
+ break;
+ case "Kf_FinalizeTheDesignOutReport":
+ ds = oCN.RunProcReturn($"select * from h_v_Kf_FinalizeTheDesignOutReport where 1=1 " + sWhere, "h_v_Kf_FinalizeTheDesignOutReport");
+ break;
+ case "Kf_LustringOutReport":
+ ds = oCN.RunProcReturn($"select * from h_v_Kf_LustringOutReport where 1=1 " + sWhere, "h_v_Kf_LustringOutReport");
+ break;
+ case "Kf_ShrinkBrushOutReport":
+ ds = oCN.RunProcReturn($"select * from h_v_Kf_ShrinkBrushOutReport where 1=1 " + sWhere, "h_v_Kf_ShrinkBrushOutReport");
+ break;
+ case "Kf_FinalizeOutReport":
+ ds = oCN.RunProcReturn($"select * from h_v_Kf_FinalizeOutReport where 1=1 " + sWhere, "h_v_Kf_FinalizeOutReport");
+ break;
+ case "Kf_LustringReport":
+ ds = oCN.RunProcReturn($"select * from h_v_Kf_LustringReport where 1=1 " + sWhere, "h_v_Kf_LustringReport");
+ break;
+ case "Kf_ShrinkBrushTeReport":
+ ds = oCN.RunProcReturn($"select * from h_v_Kf_ShrinkBrushTeReport where 1=1 " + sWhere, "h_v_Kf_ShrinkBrushTeReport");
+ break;
+ case "Kf_EmbossingOutReport":
+ ds = oCN.RunProcReturn($"select * from h_v_Kf_EmbossingOutReport where 1=1 " + sWhere, "h_v_Kf_EmbossingOutReport");
+ break;
+ case "Kf_StereoscopicFlowerOutReport":
+ ds = oCN.RunProcReturn($"select * from h_v_Kf_StereoscopicFlowerOutReport where 1=1 " + sWhere, "h_v_Kf_StereoscopicFlowerOutReport");
+ break;
+ }
+
+
+ //鑾峰彇鍒楀悕
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
#endregion
@@ -1619,11 +1840,11 @@
#region (鐢熶骇璁㈠崟缁村害)瀹㈡埛璁㈠崟鎶ヨ〃
[Route("MaterOutEntryReport/sc_ICOMReportList")]
[HttpGet]
- public object sc_ICOMReportList(string sWhere)
+ public object sc_ICOMReportList(string sWhere,string HBeginDate,string HEndDate)
{
try
{
- string sql = "exec h_p_sc_ICOMReport '"+ sWhere + "'";
+ string sql = "exec h_p_sc_ICOMReport '"+ sWhere + "','"+ HBeginDate + "','"+ HEndDate + "'";
ds = oCN.RunProcReturn(sql, "h_p_sc_ICOMReport");
@@ -1739,6 +1960,47 @@
}
#endregion
+ #region 鐢熶骇鍏ュ簱鎶ヨ〃
+ [Route("MaterOutEntryReport/sc_ICOMRKBanReport")]
+ [HttpGet]
+ public object sc_ICOMRKBanReport(string sWhere)
+ {
+ try
+ {
+ string sql = "select * from h_v_sc_ICOMRKBanReport where 1=1 " + sWhere + " order by 鏃ユ湡 ";
+
+ ds = oCN.RunProcReturn(sql, "h_v_sc_ICOMRKBanReport");
+
+ DataTable dt = ds.Tables[0];
+
+ //鑾峰彇鍒楀悕
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = dt;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 鐢熶骇鏃ヨ鎶ヨ〃
public class DayRkReport {
public string HBeginDate { get; set; }
@@ -1810,6 +2072,78 @@
}
#endregion
+ #region 鍗婃垚鍝佹姤琛�
+ public class SemiFinishedProductsReport
+ {
+ public string HBeginDate { get; set; }
+ public string HEndDate { get; set; }
+ public string HMaterNumber { get; set; }
+ public string HCustomerName { get; set; }
+ public string HProductName { get; set; }
+ }
+ [Route("MaterOutEntryReport/SemiFinishedProductsReportList")]
+ [HttpGet]
+ public object SemiFinishedProductsReportList(string sWhere, int num)
+ {
+ try
+ {
+ SemiFinishedProductsReport DayRkReportList = JsonConvert.DeserializeObject<SemiFinishedProductsReport>(sWhere);
+
+ string sql = $"exec h_p_sc_SemiFinishedProductsReport '{DayRkReportList.HBeginDate}','{DayRkReportList.HEndDate}','{DayRkReportList.HMaterNumber}'" +
+ $",'{DayRkReportList.HProductName}','{DayRkReportList.HCustomerName}'";
+ ds = oCN.RunProcReturn(sql, "h_p_Gy_DayRkReport");
+
+ DataTable dt = null;
+ if (num == 1)
+ {
+ dt = ds.Tables[0];
+ }
+ else if (num == 2)
+ {
+ dt = ds.Tables[1];
+ }
+
+ //鑾峰彇鍒楀悕
+ List<object> columnNameList = new List<object>();
+ if (num == 1)
+ {
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+ }
+ else if (num == 2)
+ {
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[1].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = dt;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 浜х嚎鏌ヨ
[Route("MaterOutEntryReport/Gy_SourceList")]
[HttpGet]
diff --git a/WebAPI/Controllers/OtherOutBillController.cs b/WebAPI/Controllers/OtherOutBillController.cs
index d635875..d192e9c 100644
--- a/WebAPI/Controllers/OtherOutBillController.cs
+++ b/WebAPI/Controllers/OtherOutBillController.cs
@@ -480,6 +480,7 @@
websLsmain.HInterID = lsmain[0].HInterID;
websLsmain.HDate = lsmain[0].HDate;
websLsmain.HBillNo = lsmain[0].HBillNo;
+ websLsmain.HSupID = lsmain[0].HSupID;
websLsmain.HDeptID = lsmain[0].HDeptID;
websLsmain.HEmpID = lsmain[0].HEmpID;
websLsmain.HRemark = lsmain[0].HRemark;
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
index 2a7ef44..b1d5c3c 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
@@ -129,7 +129,7 @@
public json AddBillMain(string msg1)
{
- string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string[] sArray = msg1.Split(new string[] { "&鍜�" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string user = sArray[1].ToString();
@@ -144,6 +144,7 @@
return objJsonResult;
}
+ LogService.CustomWriteLog("1:"+msg2, DateTime.Now.ToString("yyyy-MM-dd"));
//JSON搴忓垪鍖栬浆鎹㈠瓧鍏搁泦鍚�
List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();
List<object> jb = JsonConvert.DeserializeObject<List<object>>(msg2);
@@ -157,6 +158,7 @@
list.Add(dic);
}
+ LogService.CustomWriteLog("2:", DateTime.Now.ToString("yyyy-MM-dd"));
int TrueCount = 0, SumCount = 0;
for (int i = 0; i < list.Count; i++)
@@ -729,7 +731,7 @@
omdelMian = JsonConvert.DeserializeObject<Sc_WorkBillSortBillMain>(sWhere);
string sql = $"exec JIT_qtfx {omdelMian.HProdORGID},{omdelMian.HWorkShopID},'{user}' ";
ds = oCN.RunProcReturn(sql, "JIT_qtfx");
- LogService.Write("榻愬鍒嗘瀽sql:" + sql);
+ //LogService.Write("榻愬鍒嗘瀽sql:" + sql);
List<PRD_PPBOM> BomList = new List<PRD_PPBOM>();
DataTable resulTable = ds.Tables[0];
if (resulTable.Rows[0][0].ToString().Contains("澶辫触"))
@@ -768,7 +770,7 @@
fDayPlanFids = string.Join(",", fidList);
fDayPlanFEntryids = string.Join(",", fentryidList);
}
- LogService.Write("鏃ヨ鍒掑伐鍗昳ds" + fDayPlanFids);
+ //LogService.Write("鏃ヨ鍒掑伐鍗昳ds" + fDayPlanFids);
sw.Start();//寮�濮嬭鏃�
@@ -789,24 +791,24 @@
//鍙栧簲鍙戞暟閲� FMustQty 涓嶈鍙栧�奸渶姹傛暟閲廎NeedQty 棰嗘枡鏁版嵁
string LLsql = string.Format(@"exec h_p_jit_PPBOMList '{0}'", fDayPlanFids);
List<DayPlanPickedModel> DayPlanPickedModel = new List<DayPlanPickedModel>();
- LogService.Write("LLsql:" + LLsql);
+ //LogService.Write("LLsql:" + LLsql);
ds = oCN.RunProcReturn(LLsql, "SC_WORKBILLSORTBILLMAIN");
- LogService.Write(JsonConvert.SerializeObject(ds));
+ //LogService.Write(JsonConvert.SerializeObject(ds));
DayPlanPickedModel = ds.ToModelList<DayPlanPickedModel>();
- LogService.Write(JsonConvert.SerializeObject(DayPlanPickedModel));
+ //LogService.Write(JsonConvert.SerializeObject(DayPlanPickedModel));
//CompleteAnalysisTempModel 鐢ㄤ簬瀛樺偍涓存椂闇�瑕佹彃鍏ユ暟鎹�
List<CompleteAnalysisTempModel> completeAnalysisTempModel = new List<CompleteAnalysisTempModel>();
//鍒涘缓瀛楀吀 鐢ㄤ簬鍌ㄥ瓨鐗╂枡 + 鍗犵敤鏁伴噺
Dictionary<string, decimal> occupyDic = new Dictionary<string, decimal>();
- LogService.Write($"榻愬鍒嗘瀽锛屾暟鎹噯澶囬樁娈碉紝鐢ㄦ椂" + sw.Elapsed + "鎬昏鏁帮細" + BomList.Count);
- LogService.Write($"榻愬鍒嗘瀽锛屾暟鎹噯澶囬樁娈碉紝鐢ㄦ椂" + sw.Elapsed + "鎬婚渶瑕佸惊鐜殑bom鏁伴噺锛�" + DatePlanList.Count);
+ //LogService.Write($"榻愬鍒嗘瀽锛屾暟鎹噯澶囬樁娈碉紝鐢ㄦ椂" + sw.Elapsed + "鎬昏鏁帮細" + BomList.Count);
+ //LogService.Write($"榻愬鍒嗘瀽锛屾暟鎹噯澶囬樁娈碉紝鐢ㄦ椂" + sw.Elapsed + "鎬婚渶瑕佸惊鐜殑bom鏁伴噺锛�" + DatePlanList.Count);
//绗竴涓惊鐜� 鏃ヨ鍒掑伐鍗曟槑缁� 涓�澶�+涓�涓伐鍗� 涓�涓惊鐜�
int o = 0;
foreach (var item in DatePlanList)
{
o++;
- LogService.Write("寰幆:" + o);
+ //LogService.Write("寰幆:" + o);
//鏃ヨ鍒掔敤鏂欐竻鍗曟槑缁� 姣忎竴澶╃殑瀹為檯鐢ㄦ枡鎯呭喌
var _BomList = BomList.Where(x => x.HMasterDate == item.HMasterDate && x.HICMOEntryID_Sec == item.HICMOEntryID_Sec).ToList();
//姣忎竴涓墿鏂欒繘琛屽簱瀛樿绠�
@@ -875,24 +877,24 @@
});
//鎵ｉ櫎鍓╀綑鍙敤棰嗘枡鏁伴噺
_DayPlanPickedModel.FRemainPickedQty -= need;
- LogService.Write($"h" + need);
+ //LogService.Write($"h" + need);
//寰幆涓嬩竴涓墿鏂�
continue;
}
else
{
- LogService.Write($"kxs" + need);
+ //LogService.Write($"kxs" + need);
need -= _DayPlanPickedModel.FRemainPickedQty; //鍓╀綑闇�姹傛暟閲�
- LogService.Write($"i1" + need);
+ //LogService.Write($"i1" + need);
FOccupyPickedCount = _DayPlanPickedModel.FRemainPickedQty;
_DayPlanPickedModel.FRemainPickedQty = 0;
- LogService.Write($"i" + need);
+ //LogService.Write($"i" + need);
}
if (_pRD_WorkHouseCompar.Count > 0)
{
//缂烘枡鏁伴噺 闇�姹傛暟閲� - 瀹為檯搴撳瓨 >0 ? 涓�涓墿鏂欎笉绠″崰鐢ㄥ灏戞潯 搴撳瓨+璐т富 鏁版嵁 缂烘枡鏁伴噺鏄悓涓�涓暟閲�
decimal _fLackCount = need > jskcQty ? (need - jskcQty) : 0;
- LogService.Write($"j" + _fLackCount);
+ //LogService.Write($"j" + _fLackCount);
//LogHelper.Info("缁勭粐锛�" + _item.FStockOrgId + " ,鍙婃椂搴撳瓨" + jskcQty);
//鎬诲簱瀛樹负0浜� 鐩存帴缁欏嚭 缂烘枡鏁伴噺
if (jskcQty == 0)
@@ -926,7 +928,7 @@
continue;
}
- LogService.Write($"k" + 2);
+ //LogService.Write($"k" + 2);
foreach (var WorkHouse in _pRD_WorkHouseCompar)
{
//搴撳瓨鏁版嵁鍖归厤
@@ -1027,7 +1029,7 @@
//Thread.Sleep(6000);
i++;
}
- LogService.Write($"榻愬鍒嗘瀽锛屾暟鎹噯澶囧畬鎴愶紝淇濆瓨鍒癕odel瀹炰綋锛屾�昏鏁帮細{completeAnalysisTempModel.Count}锛岃�楁椂锛�" + sw.Elapsed);
+ //LogService.Write($"榻愬鍒嗘瀽锛屾暟鎹噯澶囧畬鎴愶紝淇濆瓨鍒癕odel瀹炰綋锛屾�昏鏁帮細{completeAnalysisTempModel.Count}锛岃�楁椂锛�" + sw.Elapsed);
List<string> sqlList = new List<string>();
DataTable insertDT = new DataTable();
insertDT.TableName = "JIT_MOMaterReadysBill";
@@ -1117,7 +1119,7 @@
$", {item["FCOMPLETECOUNT1"].ToString()}, {item["FERPCLSID"].ToString()}, {item["FWORKSHOPID"].ToString()}, {item["FSTOCKID"].ToString()}, {item["FOCCUPYPICKEDCOUNT"].ToString()}, '{item["HMainICMOBillNo"].ToString()}'" +
$",{item["HLOT"].ToString()},'{item["HInventoryFID"].ToString()}')");
}
- LogService.Write("鎵归噺鎻掑叆鍒版暟鎹簱鐢ㄦ椂锛�" + sw.Elapsed);
+ //LogService.Write("鎵归噺鎻掑叆鍒版暟鎹簱鐢ㄦ椂锛�" + sw.Elapsed);
//鎵ц瀹屾垚鍚� 鏇存柊鏃ヨ鍒掑伐鍗曠姸鎬�
string updatesql = string.Format(@"
update Sc_WorkBillSortBillSub set HComplete = '鏈綈濂�' where HEntryID IN
@@ -1136,7 +1138,7 @@
//閲婃斁榻愬鎿嶄綔 閬垮厤澶氫汉鍚屾椂杩涜榻愬鍒嗘瀽
oCN.RunProc($"update T_PRD_QTFX set FSTATUS = 0 where FPRDORGID ={omdelMian.HProdORGID} and FSTATUS = 1 ");
sw.Stop();//缁撴潫璁℃椂
- LogService.Write("榻愬鍒嗘瀽杩愯鎬绘椂闀匡細" + sw.Elapsed);
+ //LogService.Write("榻愬鍒嗘瀽杩愯鎬绘椂闀匡細" + sw.Elapsed);
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -1602,7 +1604,7 @@
//sql闆嗗悎 鏇存柊閲囪喘璁㈠崟鍗犵敤鐨勬彁鏂欒鍒掓暟閲�
List<string> sqlList = new List<string>();
- LogService.Write("1");
+ //LogService.Write("1");
string Error = "";
foreach (var item in MaterialIDList)
{
@@ -1614,7 +1616,7 @@
continue;
}
- LogService.Write("1.1");
+ //LogService.Write("1.1");
////LogHelper.Info(item.FMATERIALID.ToString());
//褰撳墠鐗╂枡鍜屽簱瀛樼粍缁囧搴旂殑闇�杩涜鎻愭枡璁″垝鐨勬暟鎹�
@@ -1630,7 +1632,7 @@
int i = 0;
//璁板綍鍦ㄦ渶灏忛噰璐噺闇�姹備笅鐨勬棩璁″垝鏄庣粏FentyrID
- LogService.Write("1.2");
+ //LogService.Write("1.2");
List<int> FEntryIdList = new List<int>();
foreach (var _item in _DayPlanPpbom)
@@ -1642,7 +1644,7 @@
break;
}
- LogService.Write("1.2.1");
+ //LogService.Write("1.2.1");
if (NeedQty == 0)
{
@@ -1660,7 +1662,7 @@
continue;
}
- LogService.Write("1.2.2");
+ //LogService.Write("1.2.2");
foreach (var Purchase in _PurchaseInventory)
{
@@ -1699,13 +1701,14 @@
F_QIMB_NOTE = Purchase.F_QIMB_NOTE,
FNOTE = Purchase.FNOTE,
FPURCHASEQTY = Purchase.FPURCHASEQTY,
- FJOINQTY = Purchase.FJOINQTY
+ FJOINQTY = Purchase.FJOINQTY,
+ FDAYPLANBILLNO = _item.FDAYPLANBILLNO
});
//鎵ｉ櫎鏃ヨ鍒掓槑缁嗗凡琚垎閰嶇殑鏁伴噺
DayPlanPpbomls.NeedQty = 0;
}
- LogService.Write("1.2.3");
+ //LogService.Write("1.2.3");
FEntryIdList.Clear();
//鏇存柊閲囪喘璁㈠崟
@@ -1762,7 +1765,8 @@
F_QIMB_NOTE = Purchase.F_QIMB_NOTE,
FNOTE = Purchase.FNOTE,
FPURCHASEQTY = Purchase.FPURCHASEQTY,
- FJOINQTY = Purchase.FJOINQTY
+ FJOINQTY = Purchase.FJOINQTY,
+ FDAYPLANBILLNO = _item.FDAYPLANBILLNO
});
//鏇存柊璁″垝鏁伴噺锛堝墿浣欓渶瑕佹帓鐨勶級 缁х画鍘昏绠椾笅涓�涓噰璐鍗�
DayPlanPpbomls.NeedQty -= Qty;
@@ -1784,7 +1788,7 @@
}
}
- LogService.Write("1.2.4");
+ //LogService.Write("1.2.4");
NeedQty = 0;
@@ -1797,7 +1801,7 @@
int tlmmm = 0;
JArray FinalyResult = new JArray();
- LogService.Write("2");
+ //LogService.Write("2");
foreach (var item in PODemandPlanList)
{
@@ -1970,7 +1974,7 @@
// tlmmm++;
}
- LogService.Write("3");
+ //LogService.Write("3");
if (Error != "")
{
oCN.Commit();
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_JIT_ComplementGoodBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_JIT_ComplementGoodBillController.cs"
index b6b05a8..1763250 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_JIT_ComplementGoodBillController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_JIT_ComplementGoodBillController.cs"
@@ -909,12 +909,10 @@
int i = 1;
foreach (Dictionary<string, string> item in list)
{
- long HInterID = DBUtility.ClsPub.CreateBillID_Prod("4611", ref DBUtility.ClsPub.sExeReturnInfo);//鑾峰緱涓�涓柊鐨刬d
- string HBillNo = DBUtility.ClsPub.CreateBillCode_Prod("4611", ref DBUtility.ClsPub.sExeReturnInfo, true);//鑾峰緱涓�涓柊鐨勫崟鎹彿
- string HOrgID = item["HOrgID"].ToString();//缁勭粐ID
string HSupID = item["HSupID"].ToString();//渚涘簲鍟�
- string HSupplierName = item["渚涘簲鍟�"].ToString();
string HMaterID = item["HMaterID"].ToString();//鐗╂枡ID
+ string HOrgID = item["HOrgID"].ToString();//缁勭粐ID
+ string HSupplierName = item["渚涘簲鍟�"].ToString();
string HMaterName = item["鐗╂枡鍚嶇О"].ToString();
string HMaterModel = item["瑙勬牸鍨嬪彿"].ToString();
string HUnitID = item["HUnitID"].ToString();//璁￠噺鍗曚綅
@@ -929,21 +927,33 @@
string JIMLC = item["JIT鏈�灏忚捣閫侀噺"].ToString();
string HRemark = item["澶囨敞"].ToString();
-
- string sql = "insert into Cg_PODemandPlanConfigBillMain(HInterID,HBillNo,HYear,HPeriod,HBillType,HBillSubType,HDate,HBillStatus,HMaker,HMakeDate,HOrgId)" +
- $"values({HInterID}, '{HBillNo}',{DateTime.Now.Year}, {DateTime.Now.Month}, '4611', '4611', GETDATE(), 1, '{user}', GETDATE(), {HOrgID})";
- string sql1 = "insert into Cg_PODemandPlanConfigBillSub(HInterID,HEntryID,HRemark,HSupplierID,HSupplierName,HMaterID," +
- "HMaterName, HMaterModel, HJITMaterGroup, HJITSafeStock, HJITMaterDemand, HJITBatchQty, HDeliveryPeriod, " +
- "HLeadTime, HLeadTime_Sec, HDeliveryMode, HDeliveryDaysCtrl,HUnitID,HJITMinDeliveryQty)values" +
- $"({HInterID}, 1, '{HRemark}', {(HSupID == "" ? "0" : HSupID)}, '{HSupplierName}', {(HMaterID == "" ? "0" : HMaterID)}," +
- $" '{HMaterName}', '{HMaterModel}', '{JITType}', {(JITPSL == "" ? "0" : JITPSL)}, {(JITMDSC == "" ? "0" : JITMDSC)},{(JIPEB == "" ? "0" : JIPEB)},{(JITPBCC == "" ? "0" : JITPBCC)}," +
- $" {(JISLT == "" ? "0" : JISLT)}, {(JIDLT == "" ? "0" : JIDLT)}, '', {(JITDCD == "" ? "0" : JITDCD)} ,{HUnitID},{JIMLC})";
- LogService.Write("sql" + i + ":" + sql);
- LogService.Write("sql1" + i + ":" + sql1);
- //涓昏〃
- oCN.RunProc(sql);
- //瀛愯〃
- oCN.RunProc(sql1);
+ ds = oCN.RunProcReturn("select * from Cg_PODemandPlanConfigBillSub where HMaterID=" + HMaterID + " and HSupplierID=" + HSupID, "Cg_PODemandPlanConfigBillSub");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+
+ long HInterID = DBUtility.ClsPub.CreateBillID_Prod("4611", ref DBUtility.ClsPub.sExeReturnInfo);//鑾峰緱涓�涓柊鐨刬d
+ string HBillNo = DBUtility.ClsPub.CreateBillCode_Prod("4611", ref DBUtility.ClsPub.sExeReturnInfo, true);//鑾峰緱涓�涓柊鐨勫崟鎹彿
+
+
+ string sql = "insert into Cg_PODemandPlanConfigBillMain(HInterID,HBillNo,HYear,HPeriod,HBillType,HBillSubType,HDate,HBillStatus,HMaker,HMakeDate,HOrgId)" +
+ $"values({HInterID}, '{HBillNo}',{DateTime.Now.Year}, {DateTime.Now.Month}, '4611', '4611', GETDATE(), 1, '{user}', GETDATE(), {HOrgID})";
+ string sql1 = "insert into Cg_PODemandPlanConfigBillSub(HInterID,HEntryID,HRemark,HSupplierID,HSupplierName,HMaterID," +
+ "HMaterName, HMaterModel, HJITMaterGroup, HJITSafeStock, HJITMaterDemand, HJITBatchQty, HDeliveryPeriod, " +
+ "HLeadTime, HLeadTime_Sec, HDeliveryMode, HDeliveryDaysCtrl,HUnitID,HJITMinDeliveryQty)values" +
+ $"({HInterID}, 1, '{HRemark}', {(HSupID == "" ? "0" : HSupID)}, '{HSupplierName}', {(HMaterID == "" ? "0" : HMaterID)}," +
+ $" '{HMaterName}', '{HMaterModel}', '{JITType}', {(JITPSL == "" ? "0" : JITPSL)}, {(JITMDSC == "" ? "0" : JITMDSC)},{(JIPEB == "" ? "0" : JIPEB)},{(JITPBCC == "" ? "0" : JITPBCC)}," +
+ $" {(JISLT == "" ? "0" : JISLT)}, {(JIDLT == "" ? "0" : JIDLT)}, '', {(JITDCD == "" ? "0" : JITDCD)} ,{HUnitID},{JIMLC})";
+ //涓昏〃
+ oCN.RunProc(sql);
+ //瀛愯〃
+ oCN.RunProc(sql1);
+ }
+ else
+ {
+ oCN.RunProc(" update Cg_PODemandPlanConfigBillSub set HLeadTime=" + JISLT + " where HMaterID=" + HMaterID + " and HSupplierID=" + HSupID);
+ }
+
i++;
}
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBillController.cs"
index 10da004..0b43e50 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBillController.cs"
@@ -403,7 +403,7 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (sqlWhere == null || sqlWhere.Equals(""))
{
- ds = oCN.RunProcReturn(string.Format(@"select HMaterID ,鐗╂枡浠ｇ爜 HMaterCode ,鐗╂枡鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,HUnitID,璁￠噺鍗曚綅浠ｇ爜 HUnitCode,璁￠噺鍗曚綅 HUnitName,搴旀敹鏁伴噺 HQtyMust,瀹炴敹鏁伴噺 HQty,鍗曚环 HPrice,閲戦 HMoney,HWHID,棰嗘枡浠撳簱浠ｇ爜 HWHCode,棰嗘枡浠撳簱 HWHName,琛ㄤ綋澶囨敞 HRemark
+ ds = oCN.RunProcReturn(string.Format(@"select HMaterID ,鐗╂枡浠ｇ爜 HMaterCode ,鐗╂枡鍚嶇О HMaterName,鐗╂枡鍏紡 HMaterRuleType,瑙勬牸鍨嬪彿 HMaterSpec,鐢ㄩ噺 HRate,HUnitID,璁￠噺鍗曚綅浠ｇ爜 HUnitCode,璁￠噺鍗曚綅 HUnitName,搴旀敹鏁伴噺 HQtyMust,瀹炴敹鏁伴噺 HQty,鍗曚环 HPrice,閲戦 HMoney,HWHID,棰嗘枡浠撳簱浠ｇ爜 HWHCode,棰嗘枡浠撳簱 HWHName,琛ㄤ綋澶囨敞 HRemark
from h_v_IF_MateOutBillList"), "H_V_IF_MATEOUTBILLLIST");
}
@@ -411,7 +411,7 @@
{
//string sql1 = "select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark from Sc_MouldRepairCheckBillSub where 1 = 1 ";
- string sql1 = string.Format(@"select HMaterID ,鐗╂枡浠ｇ爜 HMaterCode ,鐗╂枡鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,HUnitID,璁￠噺鍗曚綅浠ｇ爜 HUnitCode,璁￠噺鍗曚綅 HUnitName,搴旀敹鏁伴噺 HQtyMust,瀹炴敹鏁伴噺 HQty,鍗曚环 HPrice,閲戦 HMoney,HWHID,棰嗘枡浠撳簱浠ｇ爜 HWHCode,棰嗘枡浠撳簱 HWHName,琛ㄤ綋澶囨敞 HRemark
+ string sql1 = string.Format(@"select HMaterID ,鐗╂枡浠ｇ爜 HMaterCode ,鐗╂枡鍚嶇О HMaterName,鐗╂枡鍏紡 HMaterRuleType,瑙勬牸鍨嬪彿 HMaterSpec,鐢ㄩ噺 HRate, HUnitID,璁￠噺鍗曚綅浠ｇ爜 HUnitCode,璁￠噺鍗曚綅 HUnitName,搴旀敹鏁伴噺 HQtyMust,瀹炴敹鏁伴噺 HQty,鍗曚环 HPrice,閲戦 HMoney,HWHID,棰嗘枡浠撳簱浠ｇ爜 HWHCode,棰嗘枡浠撳簱 HWHName,琛ㄤ綋澶囨敞 HRemark
from h_v_IF_MateOutBillList WHERE 1=1");
string sql = sql1 + sqlWhere;
ds = oCN.RunProcReturn(sql, "H_V_IF_MATEOUTBILLLIST");
@@ -457,6 +457,8 @@
string msg3 = sArray[1].ToString();
string refSav = sArray[2].ToString();
string msg4 = sArray[3].ToString();
+
+ DBUtility.ClsPub.CurUserName = msg4;
string UserName = "";
string s = "";
@@ -598,14 +600,18 @@
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
bool bResult;
- if (oBill.omodel.HInterID == 0)
+ if (refSav == "Add")
{
// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
}
- else
+ else if(refSav=="Update")
{
bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = false;
}
if (bResult)
{
@@ -633,6 +639,54 @@
objJsonResult.data = 1;
return objJsonResult;
}
+ }
+ #endregion
+
+ #region 鏍规嵁宸ヨ壓鍗曞彿(宸ュ簭娴佽浆鍗″彿)鑾峰彇淇℃伅
+ [Route("Kf_MateOutBill/getMainDataByHProcExchBillNo")]
+ [HttpGet]
+ public ApiResult<DataSet> getMainDataByHProcExchBillNo(string HProcExchBillNo)
+ {
+ if (string.IsNullOrEmpty(HProcExchBillNo))
+ return new ApiResult<DataSet> { code = -1, msg = "宸ヨ壓鍗曞彿涓嶈兘涓虹┖" };
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ string sql = "select top(1) " +
+ "a.HICMOInterID,a.HICMOEntryID,a.HICMOBillNo,a.HInterID HProcExchInterID,a.HMaterID,m1.HName HMaterName,a.HMaterModel HModel,a.HMaterModel2 HModel2,a.HCusID,c1.HName HCusName,a.HWeight" +
+ " from Sc_ProcessExchangeBillMain AS a " +
+ " LEFT OUTER JOIN Gy_Material AS m1 on a.HMaterID = m1.HItemID " +
+ " LEFT OUTER JOIN Gy_Customer AS c1 on a.HCusID = c1.HItemID " +
+ " where a.HBillNo = '" + HProcExchBillNo + "'";
+
+ var dataSet = oCN.RunProcReturn(sql, "h_v_Sc_ProcessExchangeBillList");
+
+
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄥ崟鍙�" };
+
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+ #endregion
+
+ #region 鏍规嵁鐗╂枡鍐呯爜鑾峰彇鐗╂枡淇℃伅
+ [Route("Kf_MateOutBill/getMaterialByMaterID")]
+ [HttpGet]
+ public ApiResult<DataTable> getMaterialByMaterID(Int64 HMaterID)
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ string sql = "select a.HItemID HMaterID,a.HNumber HMaterNumber,a.HName HMaterName,a.HMaterRuleType,a.HModel HMaterModel,a.HUnitID, b.HNumber HUnitNumber, b.HName HUnitName" +
+ " from Gy_Material AS a " +
+ " LEFT OUTER JOIN Gy_Unit AS b on a.HUnitID = b.HItemID " +
+ " where a.HItemID =" + HMaterID;
+
+ var dataSet = oCN.RunProcReturn(sql, "Gy_Material");
+
+
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataTable> { code = -1, msg = "涓嶅瓨鍦ㄨ鐗╂枡" };
+
+ return new ApiResult<DataTable> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet.Tables[0] };
}
#endregion
@@ -719,5 +773,432 @@
}
}
#endregion
+
+ #region 鐢熶骇棰嗘枡鍗� 瀹℃牳/鍙嶅鏍�
+ /// <summary>
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Kf_MateOutBill/AuditKf_MateOutBill")]
+ [HttpGet]
+ public object AuditKf_MateOutBill(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "Kf_MateOutBill_Check";
+ DBUtility.ClsPub.CurUserName = CurUserName;
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //HInterID鏁版嵁鍒ゆ柇
+ if (HInterID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID灏忎簬0锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID); //瀵笻InterID杩涜绫诲瀷鐨勮浆鎹�
+ DAL.ClsKf_MateOutBill oBill = new DAL.ClsKf_MateOutBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+ //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) //鏍规嵁HInterID鑾峰彇璇ュ崟鎹殑鏁版嵁
+ {
+ if (oBill.omodel.HCloseMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HDeleteMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ if (oBill.omodel.HChecker.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ if (oBill.omodel.HChecker.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ //杩涜闇�瑕佽繘琛岀殑瀹℃牳/鍙嶅鏍告搷浣�
+ if (IsAudit == 0) //瀹℃牳鎻愪氦
+ {
+ //瀹℃牳鎻愪氦
+ if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍告彁浜�
+ {
+ //鍙嶅鏍告彁浜bandonCheck
+ if (oBill.AbandonCheck(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐢熶骇棰嗘枡鍗� 鍏抽棴/鍙嶅叧闂�
+ /// <summary>
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">鍏抽棴(0),鍙嶅叧闂�(1)</param>
+ /// <param name="CurUserName">鍏抽棴浜�</param>
+ /// <returns></returns>
+ [Route("Kf_MateOutBill/CloseKf_MateOutBill")]
+ [HttpGet]
+ public object CloseKf_MateOutBill(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "Kf_MateOutBill_Close";
+ DBUtility.ClsPub.CurUserName = CurUserName;
+ try
+ {
+ //妫�鏌ユ潈闄�
+ if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍏抽棴澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //HInterID鏁版嵁鍒ゆ柇
+ if (HInterID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID灏忎簬0锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID); //瀵笻InterID杩涜绫诲瀷鐨勮浆鎹�
+ DAL.ClsKf_MateOutBill oBill = new DAL.ClsKf_MateOutBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+ //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) //鏍规嵁HInterID鑾峰彇璇ュ崟鎹殑鏁版嵁
+ {
+ if (oBill.omodel.HDeleteMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘杩涜鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HChecker.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶈兘杩涜鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (IsAudit == 0) //鍏抽棴鍒ゆ柇
+ {
+ if (oBill.omodel.HCloseMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅叧闂垽鏂�
+ {
+ if (oBill.omodel.HCloseMan.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈叧闂�!涓嶉渶瑕佸弽鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ //杩涜闇�瑕佽繘琛岀殑鍏抽棴/鍙嶅叧闂搷浣�
+ if (IsAudit == 0) //鍏抽棴鎻愪氦
+ {
+ //鍏抽棴鎻愪氦
+ if (oBill.CloseBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍏抽棴鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅叧闂彁浜�
+ {
+ //鍙嶅叧闂彁浜�
+ if (oBill.CancelClose(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅叧闂垚鍔�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍏抽棴澶辫触鎴栬�呭弽鍏抽棴澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐢熶骇棰嗘枡鍗� 浣滃簾/鍙嶄綔搴�
+ /// <summary>
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">浣滃簾(0),鍙嶄綔搴�(1)</param>
+ /// <param name="CurUserName">浣滃簾浜�</param>
+ /// <returns></returns>
+ [Route("Kf_MateOutBill/DeleteKf_MateOutBill")]
+ [HttpGet]
+ public object DeleteKf_MateOutBill(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "Kf_MateOutBill_Delete";
+ DBUtility.ClsPub.CurUserName = CurUserName;
+ try
+ {
+ //妫�鏌ユ潈闄�
+ if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浣滃簾澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //HInterID鏁版嵁鍒ゆ柇
+ if (HInterID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID灏忎簬0锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID); //瀵笻InterID杩涜绫诲瀷鐨勮浆鎹�
+ DAL.ClsKf_MateOutBill oBill = new DAL.ClsKf_MateOutBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+ //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) //鏍规嵁HInterID鑾峰彇璇ュ崟鎹殑鏁版嵁
+ {
+ if (oBill.omodel.HChecker.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜浣滃簾锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (IsAudit == 0) //浣滃簾鍒ゆ柇
+ {
+ if (oBill.omodel.HDeleteMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶄綔搴燂紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶄綔搴熷垽鏂�
+ {
+ if (oBill.omodel.HDeleteMan.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈綔搴�!涓嶉渶瑕佸弽浣滃簾锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ //杩涜闇�瑕佽繘琛岀殑浣滃簾/鍙嶄綔搴熸搷浣�
+ if (IsAudit == 0) //浣滃簾鎻愪氦
+ {
+ //浣滃簾鎻愪氦
+ if (oBill.Cancelltion(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "浣滃簾鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浣滃簾澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅叧闂彁浜�
+ {
+ //鍙嶅叧闂彁浜�
+ if (oBill.AbandonCancelltion(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶄綔搴熸垚鍔�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶄綔搴熷け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浣滃簾澶辫触鎴栬�呭弽浣滃簾澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\344\272\247\347\272\277\350\277\224\344\277\256\345\271\263\345\217\260/Sc_SourceLineRepairBillController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\344\272\247\347\272\277\350\277\224\344\277\256\345\271\263\345\217\260/Sc_SourceLineRepairBillController.cs"
index 82151c6..0b8a122 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\344\272\247\347\272\277\350\277\224\344\277\256\345\271\263\345\217\260/Sc_SourceLineRepairBillController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\344\272\247\347\272\277\350\277\224\344\277\256\345\271\263\345\217\260/Sc_SourceLineRepairBillController.cs"
@@ -118,7 +118,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏈壘鍒扮浉鍏虫暟鎹紒";
+ objJsonResult.Message = "褰撳墠鐢熶骇璧勬簮涓棤寮�宸ョ姸鎬佺殑浠诲姟鍗曪紒锛�";
objJsonResult.data = null;
return objJsonResult;
}
diff --git "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
index e7762e1..d5aec95 100644
--- "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
+++ "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
@@ -488,6 +488,44 @@
}
}
+ /// <summary>
+ /// 鑾峰彇瀹㈡埛鍒楄〃淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/GetCustomerList_Json")]
+ [HttpGet]
+ public object GetCustomerList_Json(string Customer, Int64 HStockOrgID)
+ {
+ try
+ {
+ ds = oCn.RunProcReturn("select HItemID,HNumber,HName from Gy_Customer with(nolock) where HStopflag=0 and HUSEORGID=" + HStockOrgID.ToString() + " and (HNumber like '%" + Customer + "%' or HName like '%" + Customer + "%')", "Gy_Customer");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍瀹㈡埛璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "杩斿洖瀹㈡埛淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
#endregion
#endregion
@@ -2028,51 +2066,17 @@
}
else
{
- //娣诲姞鐗╂枡鏄庣粏鍒楄〃鍒楀悕
List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
{
Type dataType = col.DataType;
string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
columnNameList.Add(JsonConvert.DeserializeObject(ColmString)); //鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
}
- //娣诲姞妯℃不鍏峰垪琛ㄥ垪鍚�
- List<object> MouldcolumnNameList = new List<object>();
- foreach (DataColumn col in ds.Tables[1].Columns)
- {
- Type dataType = col.DataType;
- string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
- MouldcolumnNameList.Add(JsonConvert.DeserializeObject(ColmString)); //鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
- }
- //娣诲姞鍏堣繘鍏堝嚭鍒楄〃鍒楀悕
- List<object> FIFOcolumnNameList = new List<object>();
- foreach (DataColumn col in ds.Tables[2].Columns)
- {
- Type dataType = col.DataType;
- string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
- FIFOcolumnNameList.Add(JsonConvert.DeserializeObject(ColmString)); //鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
- }
- //娣诲姞鏉＄爜鏄庣粏鍒楄〃鍒楀悕
- List<object> BarCodecolumnNameList = new List<object>();
- foreach (DataColumn col in ds.Tables[3].Columns)
- {
- Type dataType = col.DataType;
- string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
- BarCodecolumnNameList.Add(JsonConvert.DeserializeObject(ColmString)); //鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
- }
- //娣诲姞婧愬崟鐢熶骇姹囨姤鍗曟潯鐮佹槑缁嗗垪琛ㄥ垪鍚�
- List<object> ICMOReportcolumnNameList = new List<object>();
- foreach (DataColumn col in ds.Tables[4].Columns)
- {
- Type dataType = col.DataType;
- string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
- ICMOReportcolumnNameList.Add(JsonConvert.DeserializeObject(ColmString)); //鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
- }
-
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
objJsonResult.data = new
{
Materlist = ds.Tables[0], //杩斿洖鐗╂枡鏄庣粏鍒楄〃淇℃伅锛�0锛�
@@ -2083,10 +2087,6 @@
BarCodeDetailslist = ds.Tables[5] //杩斿洖褰撳墠鎵�鎵弿鏉＄爜鏄庣粏淇℃伅锛�5锛�
};
objJsonResult.list = columnNameList;
- objJsonResult.list = MouldcolumnNameList;
- objJsonResult.list = FIFOcolumnNameList;
- objJsonResult.list = BarCodecolumnNameList;
- objJsonResult.list = ICMOReportcolumnNameList;
return objJsonResult;
}
}
diff --git "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillController.cs" "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillController.cs"
index bd5d3b4..ce78f4e 100644
--- "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillController.cs"
+++ "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillController.cs"
@@ -29,6 +29,7 @@
{
public int HInterID;
public string HBillNo;
+ public int HProjectID;
public string HProNumber;
public string HProName;
public int HProjectStageID;
@@ -146,6 +147,7 @@
string HBillSubType = "";
int HInterID = mainList[0].HInterID;
string HBillNo = mainList[0].HBillNo;
+ int HProjectID = mainList[0].HProjectID;
string HProNumber = mainList[0].HProNumber;
string HProName = mainList[0].HProName;
int HProjectStageID = mainList[0].HProjectStageID;
@@ -199,8 +201,8 @@
if ((OperationType == 1 || OperationType == 2) && ds.Tables[0].Rows.Count == 0)//鏂板
{
string sql = "insert into PM_WorkTaskBillMain" +
- "(HYear,HPeriod,HBillType,HBillSubType,HInterID,HBillNo,HProNumber,HProjectStageID,HName,HDate,HTaskNote,HPlanTimes" +
- ",HSelfTimes,HLastDate,HSendEmp,HReceiveEmp,HType,HCopyEmp,HRemark,HOrgID,HMaker,HMakeDate)" +
+ "(HYear,HPeriod,HBillType,HBillSubType,HInterID,HBillNo,HProjectID,HProNumber,HProjectStageID,HName,HDate,HTaskNote,HPlanTimes" +
+ ",HSelfTimes,HLastDate,HSendEmp,HReceiveEmp,HType,HCopyEmp,HRemark,HOrgID,HMaker,HMakeDate,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType)" +
"values(" +
"" + HYear +
"," + HPeriod +
@@ -208,7 +210,8 @@
"','" + HBillSubType +
"'," + HInterID +
",'" + HBillNo +
- "','" + HProNumber +
+ "'," + HProjectID +
+ ",'" + HProNumber +
"'," + HProjectStageID +
",'" + HName +
"','" + HDate +
@@ -224,6 +227,10 @@
"'," + HOrgID +
",'" + HMaker +
"','" + HMakerDate +
+ "'," + HMainSourceInterID +
+ "," + HMainSourceEntryID +
+ ",'" + HMainSourceBillNo +
+ "','" + HMainSourceBillType +
"')";
//涓昏〃
@@ -239,7 +246,8 @@
",HBillType = '" + HBillType +
"',HBillSubType = '" + HBillSubType +
"',HBillNo = '" + HBillNo +
- "',HProNumber = '" + HProNumber +
+ "',HProjectID = " + HProjectID +
+ ",HProNumber = '" + HProNumber +
"',HProjectStageID = " + HProjectStageID +
",HName = '" + HName +
"',HDate = '" + HDate +
@@ -255,6 +263,10 @@
"',HOrgID = " + HOrgID +
",HUpdater = '" + HUpdater +
"',HUpdateDate = '" + HUpdaterDate +
+ "',HMainSourceInterID = " + HMainSourceInterID +
+ ",HMainSourceEntryID = " + HMainSourceEntryID +
+ ",HMainSourceBillNo = '" + HMainSourceBillNo +
+ "',HMainSourceBillType = '" + HMainSourceBillType +
"' where HInterID = " + HInterID;
oCN.RunProc(sql);
@@ -267,7 +279,7 @@
}else if (OperationType == 4 && ds.Tables[0].Rows.Count == 0) //涓嬫帹
{
string sql = "insert into PM_WorkTaskBillMain" +
- "(HYear,HPeriod,HBillType,HBillSubType,HInterID,HBillNo,HProNumber,HProjectStageID,HName,HDate,HTaskNote,HPlanTimes" +
+ "(HYear,HPeriod,HBillType,HBillSubType,HInterID,HBillNo,HProjectID,HProNumber,HProjectStageID,HName,HDate,HTaskNote,HPlanTimes" +
",HSelfTimes,HLastDate,HSendEmp,HReceiveEmp,HType,HCopyEmp,HRemark,HOrgID,HMaker,HMakeDate,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType)" +
"values(" +
"" + HYear +
@@ -276,7 +288,8 @@
"','" + HBillSubType +
"'," + HInterID +
",'" + HBillNo +
- "','" + HProNumber +
+ "'," + HProjectID +
+ ",'" + HProNumber +
"'," + HProjectStageID +
",'" + HName +
"','" + HDate +
@@ -982,6 +995,7 @@
public class PM_WorkTaskReportBill_Sub
{
public int RowID;
+ public int HProjectID;
public string HProNumber;
public int HProjectStageID;
public string HProjectStageName;
@@ -992,9 +1006,14 @@
public string HReportNote;
public string HAdv;
public string HRemarkSub;
+ public int HSourceInterID;
+ public int HSourceEntryID;
+ public string HSourceBillNo;
+ public string HSourceBillType;
+ public bool HFinishFlag;
}
#endregion
- #region 椤圭洰闃舵娓呭崟 鏂板/缂栬緫-淇濆瓨
+ #region 浠诲姟姹囨姤 鏂板/缂栬緫-淇濆瓨
/// <summary>
/// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
///鍙傛暟锛歴tring sql銆�
@@ -1028,7 +1047,7 @@
return objJsonResult;
}
#endregion
- #region 娣诲姞 椤圭洰闃舵娓呭崟 涓昏〃
+ #region 娣诲姞 浠诲姟姹囨姤 涓昏〃
public json AddBillMain_WorkTaskReportBill(string msg1)
{
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
@@ -1151,6 +1170,8 @@
oCN.RunProc(sql);
+ //鍒犻櫎瀛愯〃鏃� 鍥炲～宸ヤ綔浠诲姟鍗曞叧鑱旀暟閲忋�佸崟鎹姸鎬�
+ oCN.RunProc("exec h_p_PM_UpDateRelation_WorkTaskToWorkTaskReport_Delete " + HInterID.ToString());
//鍒犻櫎瀛愯〃
oCN.RunProc("delete from PM_WorkTaskReportBillSub where HInterID='" + HInterID + "'");
//璁板綍鏃ュ織
@@ -1186,7 +1207,7 @@
oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + user + "','" + HComputerName + "','" + "鏂板浠诲姟姹囨姤锛�" + HBillNo + "','LMES-浠诲姟姹囨姤妯″潡','" + DBUtility.ClsPub.IPAddress + "','鏂板鍗曟嵁'", ref DBUtility.ClsPub.sExeReturnInfo);
}
//淇濆瓨瀛愯〃
- objJsonResult = AddBillSub_WorkTaskReportBill(msg3, HInterID, HBillNo, OperationType, HProID, HProjectStageID, HMainSourceBillType, HMainSourceBillNo);
+ objJsonResult = AddBillSub_WorkTaskReportBill(msg3, HInterID, HBillNo, OperationType);
if (objJsonResult.code == "0")
{
@@ -1213,89 +1234,60 @@
}
}
#endregion
- #region 娣诲姞椤圭洰闃舵娓呭崟 瀛愯〃
- public json AddBillSub_WorkTaskReportBill(string msg3, long HInterID, string HBillNo, int OperationType, int HSourceInterID, int HSourceEntryID, string HSourceBillType, string HSourceBillNo)
+ #region 娣诲姞浠诲姟姹囨姤 瀛愯〃
+ public json AddBillSub_WorkTaskReportBill(string msg3, long HInterID, string HBillNo, int OperationType)
{
List<PM_WorkTaskReportBill_Sub> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<PM_WorkTaskReportBill_Sub>>(msg3);
int i = 0; //浣滀负瀛愯〃鍐呯爜
- if(OperationType == 4) {
- foreach (PM_WorkTaskReportBill_Sub oSub in DetailColl)
- {
- i++; //鍚屼竴涓富琛ㄤ笅鐨勫瓙琛ㄧ殑鍐呯爜鑷
-
- int HEntryID = i;
- string HProNumber = oSub.HProNumber;
- int HProjectStageID = oSub.HProjectStageID;
- string HName = oSub.HName;
- string HTaskNote = oSub.HTaskNote;
- string HType = oSub.HType;
- double HRelTimes = oSub.HRelTimes;
- string HReportNote = oSub.HReportNote;
- string HAdv = oSub.HAdv;
- string HRemark = oSub.HRemarkSub;
-
- string sql = "insert into PM_WorkTaskReportBillSub" +
- "(HInterID,HBillNo_bak,HEntryID,HRemark,HProNumber,HProjectStageID,HName,HTaskNote,HType,HRelTimes,HReportNote,HAdv,HSourceInterID,HSourceEntryID,HSourceBillType,HSourceBillNo) " +
- "values(" +
- "" + HInterID +
- ",'" + HBillNo +
- "'," + HEntryID +
- ",'" + HRemark +
- "','" + HProNumber +
- "'," + HProjectStageID +
- ",'" + HName +
- "','" + HTaskNote +
- "','" + HType +
- "'," + HRelTimes +
- ",'" + HReportNote +
- "','" + HAdv +
- "'," + HSourceInterID +
- "," + HSourceEntryID +
- ",'" + HSourceBillType +
- "','" + HSourceBillNo +
- "')";
-
- oCN.RunProc(sql);
- }
- }
- else
+ foreach (PM_WorkTaskReportBill_Sub oSub in DetailColl)
{
- foreach (PM_WorkTaskReportBill_Sub oSub in DetailColl)
- {
- i++; //鍚屼竴涓富琛ㄤ笅鐨勫瓙琛ㄧ殑鍐呯爜鑷
+ i++; //鍚屼竴涓富琛ㄤ笅鐨勫瓙琛ㄧ殑鍐呯爜鑷
- int HEntryID = i;
- string HProNumber = oSub.HProNumber;
- int HProjectStageID = oSub.HProjectStageID;
- string HName = oSub.HName;
- string HTaskNote = oSub.HTaskNote;
- string HType = oSub.HType;
- double HRelTimes = oSub.HRelTimes;
- string HReportNote = oSub.HReportNote;
- string HAdv = oSub.HAdv;
- string HRemark = oSub.HRemarkSub;
+ int HEntryID = i;
+ int HProjectID = oSub.HProjectID;
+ string HProNumber = oSub.HProNumber;
+ int HProjectStageID = oSub.HProjectStageID;
+ string HName = oSub.HName;
+ string HTaskNote = oSub.HTaskNote;
+ string HType = oSub.HType;
+ double HRelTimes = oSub.HRelTimes;
+ string HReportNote = oSub.HReportNote;
+ string HAdv = oSub.HAdv;
+ string HRemark = oSub.HRemarkSub;
+ int HSourceInterID = oSub.HSourceInterID;
+ int HSourceEntryID = oSub.HSourceEntryID;
+ string HSourceBillNo = oSub.HSourceBillNo;
+ string HSourceBillType = oSub.HSourceBillType;
+ bool HFinishFlag = oSub.HFinishFlag;
- string sql = "insert into PM_WorkTaskReportBillSub" +
- "(HInterID,HBillNo_bak,HEntryID,HRemark,HProNumber,HProjectStageID,HName,HTaskNote,HType,HRelTimes,HReportNote,HAdv) " +
- "values(" +
- "" + HInterID +
- ",'" + HBillNo +
- "'," + HEntryID +
- ",'" + HRemark +
- "','" + HProNumber +
- "'," + HProjectStageID +
- ",'" + HName +
- "','" + HTaskNote +
- "','" + HType +
- "'," + HRelTimes +
- ",'" + HReportNote +
- "','" + HAdv +
- "')";
+ string sql = "insert into PM_WorkTaskReportBillSub" +
+ "(HInterID,HBillNo_bak,HEntryID,HRemark,HProjectID,HProNumber,HProjectStageID,HName,HTaskNote,HType,HRelTimes,HReportNote,HAdv,HSourceInterID,HSourceEntryID,HSourceBillType,HSourceBillNo,HFinishFlag) " +
+ "values(" +
+ "" + HInterID +
+ ",'" + HBillNo +
+ "'," + HEntryID +
+ ",'" + HRemark +
+ "'," + HProjectID +
+ ",'" + HProNumber +
+ "'," + HProjectStageID +
+ ",'" + HName +
+ "','" + HTaskNote +
+ "','" + HType +
+ "'," + HRelTimes +
+ ",'" + HReportNote +
+ "','" + HAdv +
+ "'," + HSourceInterID +
+ "," + HSourceEntryID +
+ ",'" + HSourceBillType +
+ "','" + HSourceBillNo +
+ "'," + DBUtility.ClsPub.BoolToString(HFinishFlag) +
+ ")";
- oCN.RunProc(sql);
- }
+ oCN.RunProc(sql);
}
-
+
+ //鍥炲～宸ヤ綔浠诲姟鍗曞叧鑱旀暟閲忋�佸崟鎹姸鎬�
+ oCN.RunProc("exec h_p_PM_UpDateRelation_WorkTaskToWorkTaskReport_Add " + HInterID.ToString());
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -1451,6 +1443,8 @@
oCN.BeginTran();
+ //鍒犻櫎瀛愯〃鏃� 鍥炲～宸ヤ綔浠诲姟鍗曞叧鑱旀暟閲忋�佸崟鎹姸鎬�
+ oCN.RunProc("exec h_p_PM_UpDateRelation_WorkTaskToWorkTaskReport_Delete " + HInterID.ToString());
oCN.RunProc("delete from PM_WorkTaskReportBillMain where HInterID = " + HInterID);
oCN.RunProc("delete from PM_WorkTaskReportBillSub where HInterID='" + HInterID + "'");
@@ -1458,7 +1452,7 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
objJsonResult.data = null;
return objJsonResult;
}
diff --git "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/PM_ReportController.cs" "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/PM_ReportController.cs"
new file mode 100644
index 0000000..9ce5acf
--- /dev/null
+++ "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/PM_ReportController.cs"
@@ -0,0 +1,188 @@
+锘縰sing DAL;
+using DBUtility;
+using Model;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Linq;
+using SQLHelper;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using WebAPI;
+using WebAPI.Models;
+using WebAPI.Service;
+
+namespace WebAPI.Controllers
+{
+ public class PM_ReportController : ApiController
+ {
+ public string sWhere = "";
+ public DataSet ds = new DataSet();
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+
+ #region 鎶ヨ〃鏁版嵁鑾峰彇鏂规硶
+
+ #region 椤圭洰浜哄ぉ鑰楃敤鏄庣粏鍒嗘瀽鎶ヨ〃
+
+ /// <summary>
+ /// 椤圭洰浜哄ぉ鑰楃敤鏄庣粏鍒嗘瀽鎶ヨ〃
+ /// </summary>
+ /// <returns></returns>
+ [Route("PM_ReportController/GetPM_ProjectWorkDaysEntryReport_Json")]
+ [HttpGet]
+ public object GetPM_ProjectWorkDaysEntryReport_Json(string sWhere)
+ {
+ try
+ {
+ ds = oCn.RunProcReturn("exec h_p_PM_ProjectWorkDaysEntryReport " + sWhere, "h_p_PM_ProjectWorkDaysEntryReport");
+ //if (ds == null || ds.Tables[0].Rows.Count == 0)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "褰撳墠鎵�杈撳叆杩囨护鏉′欢锛屾病鏈夎繑鍥炰换浣曠粨鏋滐紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ //else
+ //{
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString)); //鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ //}
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "杩斿洖鎶ヨ〃淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #region 椤圭洰浜哄ぉ鑰楃敤缁熻鍒嗘瀽鎶ヨ〃
+
+ /// <summary>
+ /// 椤圭洰浜哄ぉ鑰楃敤缁熻鍒嗘瀽鎶ヨ〃
+ /// </summary>
+ /// <returns></returns>
+ [Route("PM_ReportController/GetPM_ProjectWorkDaysSumReport_Json")]
+ [HttpGet]
+ public object GetPM_ProjectWorkDaysSumReport_Json(string sWhere)
+ {
+ try
+ {
+ ds = oCn.RunProcReturn("exec h_p_PM_ProjectWorkDaysSumReport " + sWhere, "h_p_PM_ProjectWorkDaysSumReport");
+ //if (ds == null || ds.Tables[0].Rows.Count == 0)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "褰撳墠鎵�杈撳叆杩囨护鏉′欢锛屾病鏈夎繑鍥炰换浣曠粨鏋滐紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ //else
+ //{
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString)); //鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ //}
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "杩斿洖鎶ヨ〃淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #region 鏈堝害姹囨姤缁熻琛�
+
+ /// <summary>
+ /// 鏈堝害姹囨姤缁熻琛�
+ /// </summary>
+ /// <returns></returns>
+ [Route("PM_ReportController/GetPM_WorkTaskReportMonthSumReport_Json")]
+ [HttpGet]
+ public object GetPM_WorkTaskReportMonthSumReport_Json(string sWhere)
+ {
+ try
+ {
+ ds = oCn.RunProcReturn("exec h_p_PM_WorkTaskReportMonthSumReport " + sWhere, "h_p_PM_WorkTaskReportMonthSumReport");
+ //if (ds == null || ds.Tables[0].Rows.Count == 0)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "褰撳墠鎵�杈撳叆杩囨护鏉′欢锛屾病鏈夎繑鍥炰换浣曠粨鏋滐紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ //else
+ //{
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString)); //鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ //}
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "杩斿洖鎶ヨ〃淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+
+ #endregion
+
+
+ }
+}
diff --git "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/Gy_ProjectStageController.cs" "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/Gy_ProjectStageController.cs"
index e2a1b2b..9bf78e5 100644
--- "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/Gy_ProjectStageController.cs"
+++ "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/Gy_ProjectStageController.cs"
@@ -1426,10 +1426,8 @@
public int HInterID;
public string HBillNo;
public string HDate;
- public int HProID;
+ public int HProjectID;
public string HProNumber;
- public string HMainSourceBillNo;
- public string HMainSourceBillType;
public int HProjectStageID;
public string HProjectStageName;
public string HStageNote;
@@ -1445,6 +1443,12 @@
public int HOrgID;
public string HRemark;
public string HMaker;
+
+ public int HMainSourceInterID;
+ public int HMainSourceEntryID;
+ public string HMainSourceBillNo;
+ public string HMainSourceBillType;
+
public string HUpdater;
public string HChecker;
public string HMakerDate;
@@ -1559,10 +1563,8 @@
int HInterID = mainList[0].HInterID;
string HBillNo = mainList[0].HBillNo;
string HDate = mainList[0].HDate;
- int HProID = mainList[0].HProID;
+ int HProjectID = mainList[0].HProjectID;
string HProNumber = mainList[0].HProNumber;
- string HMainSourceBillNo = mainList[0].HMainSourceBillNo;
- string HMainSourceBillType = mainList[0].HMainSourceBillType;
int HProjectStageID = mainList[0].HProjectStageID;
string HStageNote = mainList[0].HStageNote;
string HRelationGoods = mainList[0].HRelationGoods;
@@ -1575,6 +1577,12 @@
double HRate = mainList[0].HRate;
int HOrgID = mainList[0].HOrgID;
string HRemark = mainList[0].HRemark;
+
+ int HMainSourceInterID = mainList[0].HMainSourceInterID;
+ int HMainSourceEntryID = mainList[0].HMainSourceEntryID;
+ string HMainSourceBillNo = mainList[0].HMainSourceBillNo;
+ string HMainSourceBillType = mainList[0].HMainSourceBillType;
+
string HMaker = mainList[0].HMaker;
string HMakerDate = mainList[0].HMakerDate;
string HUpdater = mainList[0].HUpdater;
@@ -1600,7 +1608,7 @@
{
string sql = "insert into PM_ProjectReportBillMain" +
"(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate,HBillNo,HBillStatus,HRemark,HMaker,HMakeDate" +
- ",HProNumber,HProjectStageID,HStageNote,HRelationGoods,HIsKey,HReportEmpID,HReportNote,HReportGoods,HReceiveEmp,HCopyEmp,HRate,HOrgID) " +
+ ",HProjectID,HProNumber,HProjectStageID,HStageNote,HRelationGoods,HIsKey,HReportEmpID,HReportNote,HReportGoods,HReceiveEmp,HCopyEmp,HRate,HOrgID,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType) " +
"values(" +
"" + HYear +
"," + HPeriod +
@@ -1613,7 +1621,8 @@
",'" + HRemark +
"','" + HMaker +
"','" + HMakerDate +
- "','" + HProNumber +
+ "'," + HProjectID +
+ ",'" + HProNumber +
"'," + HProjectStageID +
",'" + HStageNote +
"','" + HRelationGoods +
@@ -1625,7 +1634,11 @@
"','" + HCopyEmp +
"'," + HRate +
"," + HOrgID +
- ")";
+ "," + HMainSourceInterID +
+ "," + HMainSourceEntryID +
+ ",'" + HMainSourceBillNo +
+ "','" + HMainSourceBillType +
+ "')";
//涓昏〃
oCN.RunProc(sql);
@@ -1645,7 +1658,8 @@
",HRemark = '" + HRemark +
"',HUpdater = '" + HUpdater +
"',HUpdateDate = '" + HUpdaterDate +
- "',HProNumber = '" + HProNumber +
+ "',HProjectID = " + HProjectID +
+ ",HProNumber = '" + HProNumber +
"',HProjectStageID = " + HProjectStageID +
",HStageNote = '" + HStageNote +
"',HRelationGoods = '" + HRelationGoods +
@@ -1657,7 +1671,11 @@
"',HCopyEmp = '" + HCopyEmp +
"',HRate = " + HRate +
",HOrgID = " + HOrgID +
- " where HInterID = " + HInterID;
+ ",HMainSourceInterID = " + HMainSourceInterID +
+ ",HMainSourceEntryID = " + HMainSourceEntryID +
+ ",HMainSourceBillNo = '" + HMainSourceBillNo +
+ "',HMainSourceBillType = '" + HMainSourceBillType +
+ "' where HInterID = " + HInterID;
oCN.RunProc(sql);
@@ -1670,7 +1688,7 @@
{
string sql = "insert into PM_ProjectReportBillMain" +
"(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate,HBillNo,HBillStatus,HRemark,HMaker,HMakeDate" +
- ",HProNumber,HProjectStageID,HStageNote,HRelationGoods,HIsKey,HReportEmpID,HReportNote,HReportGoods,HReceiveEmp,HCopyEmp,HRate,HOrgID,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillType,HMainSourceBillNo) " +
+ ",HProjectID,HProNumber,HProjectStageID,HStageNote,HRelationGoods,HIsKey,HReportEmpID,HReportNote,HReportGoods,HReceiveEmp,HCopyEmp,HRate,HOrgID,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillType,HMainSourceBillNo) " +
"values(" +
"" + HYear +
"," + HPeriod +
@@ -1683,7 +1701,8 @@
",'" + HRemark +
"','" + HMaker +
"','" + HMakerDate +
- "','" + HProNumber +
+ "'," + HProjectID +
+ ",'" + HProNumber +
"'," + HProjectStageID +
",'" + HStageNote +
"','" + HRelationGoods +
@@ -1695,8 +1714,8 @@
"','" + HCopyEmp +
"'," + HRate +
"," + HOrgID +
- "," + HProID +
- "," + HProjectStageID +
+ "," + HMainSourceInterID +
+ "," + HMainSourceEntryID +
",'" + HMainSourceBillType +
"','" + HMainSourceBillNo +
"')";
@@ -1707,7 +1726,7 @@
oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + user + "','" + HComputerName + "','" + "鏂板椤圭洰闃舵姹囨姤锛�" + HBillNo + "','LMES-椤圭洰闃舵姹囨姤妯″潡','" + DBUtility.ClsPub.IPAddress + "','鏂板鍗曟嵁'", ref DBUtility.ClsPub.sExeReturnInfo);
}
//淇濆瓨瀛愯〃
- objJsonResult = AddBillSub_ProjectReportBill(msg3, HInterID, HBillNo, OperationType,HProID, HProjectStageID, HMainSourceBillType, HMainSourceBillNo);
+ objJsonResult = AddBillSub_ProjectReportBill(msg3, HInterID, HBillNo, OperationType,HMainSourceInterID, HMainSourceEntryID, HMainSourceBillType, HMainSourceBillNo);
if (objJsonResult.code == "0")
{
diff --git a/WebAPI/DLL/ClsGy_Material_Ctl.cs b/WebAPI/DLL/ClsGy_Material_Ctl.cs
index b2fd256..354d345 100644
--- a/WebAPI/DLL/ClsGy_Material_Ctl.cs
+++ b/WebAPI/DLL/ClsGy_Material_Ctl.cs
@@ -26,7 +26,8 @@
",HKeepDays,HPlanPrice,HstdPrice,HQtyMin,HQtyMax" +
",HSubjoin,HSubjoin2,HColor,HVersion,HEngName,HEngModel,HPropertyTypeID,HSPGroupID,HSPID,HMinPickQty,HUSEORGID,HERPItemID" +
",HSALEUNITID,HSALEPRICEUNITID,HBASEUNITID,HSTOREUNITID,HCHECKINCOMING,HCHECKPRODUCT,HPERUNITSTANDHOUR" +
- ",HSTDLABORPREPARETIME,HSTDMACHINEPREPARETIME,HWidth,HWeight,HColorRemark,HQCSchemeID_Fst,HQCSchemeID_Proc,HQCSchemeID_Patrol) " +
+ ",HSTDLABORPREPARETIME,HSTDMACHINEPREPARETIME,HWidth,HWeight,HColorRemark,HQCSchemeID_Fst,HQCSchemeID_Proc,HQCSchemeID_Patrol" +
+ ",HMaterRuleType) " +
" Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
", " + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'" +
",'" + oModel.HModel + "'," + oModel.HUnitID.ToString() + "," + oModel.HMaterClsID.ToString() + "," + oModel.HMaterTypeID.ToString() + "," + oModel.HUnitGroupID.ToString() +
@@ -34,7 +35,8 @@
", " + oModel.HHighStock.ToString() + "," + oModel.HLowStock.ToString() + "," + oModel.HSafeStock.ToString() + "," + oModel.HOrderPrice.ToString() + ",'" + oModel.HSalePrice + "'" +
", " + oModel.HKeepDays.ToString() + "," + oModel.HPlanPrice.ToString() + "," + oModel.HstdPrice.ToString() + "," + oModel.HQtyMin.ToString() + "," + oModel.HQtyMax.ToString() +
",'" + oModel.HSubjoin + "','" + oModel.HSubjoin2 + "','" + oModel.HColor + "','" + oModel.HVersion + "','" + oModel.HEngName + "','" + oModel.HEngModel + "'," + oModel.HPropertyTypeID.ToString() + "," + oModel.HSPGroupID.ToString() + "," + oModel.HSPID.ToString() + "," + oModel.HMinPickQty.ToString() + "," + oModel.HUSEORGID + "," + oModel.HERPItemID + "," + oModel.HSALEUNITID + "," + oModel.HSALEPRICEUNITID + "," + oModel.HBASEUNITID + "," + oModel.HSTOREUNITID + "," + oModel.HCHECKINCOMING + "," + oModel.HCHECKPRODUCT + "," + oModel.HPERUNITSTANDHOUR + "," + oModel.HSTDLABORPREPARETIME + "," + oModel.HSTDMACHINEPREPARETIME + ","+ oModel.HWidth + "," + oModel.HWeight + ",'"+ oModel.HColorRemark + "'," + oModel.HQCSchemeID_Fst + ","
- + oModel.HQCSchemeID_Proc + "," + oModel.HQCSchemeID_Patrol + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+ + oModel.HQCSchemeID_Proc + "," + oModel.HQCSchemeID_Patrol + "" +
+ ",'"+ oModel.HMaterRuleType + "')", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCn.Commit();
@@ -141,6 +143,7 @@
",HWeight=" + oModel.HWeight.ToString() +
",HWidth=" + oModel.HWidth.ToString() +
",HColorRemark='" + oModel.HColorRemark.ToString() + "'" +
+ ",HMaterRuleType='" + oModel.HMaterRuleType.ToString() + "'" +
",HQCSchemeID_Fst= " + oModel.HQCSchemeID_Fst +
",HQCSchemeID_Proc= " + oModel.HQCSchemeID_Proc +
",HQCSchemeID_Patrol= " + oModel.HQCSchemeID_Patrol +
diff --git a/WebAPI/DLL/ClsKf_MateOutBill.cs b/WebAPI/DLL/ClsKf_MateOutBill.cs
index 8deba8f..85dffab 100644
--- a/WebAPI/DLL/ClsKf_MateOutBill.cs
+++ b/WebAPI/DLL/ClsKf_MateOutBill.cs
@@ -39,8 +39,8 @@
{
//
oCn.BeginTran();
- //鏇存柊涓昏〃
- oCn.RunProc("UpDate Kf_ICStockBillMain set " +
+
+ string mainSql = "UpDate Kf_ICStockBillMain set " +
" HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
",HDate='" + omodel.HDate + "'" +
",HYear='" + omodel.HYear.ToString() + "'" +
@@ -60,16 +60,75 @@
",HExplanation='" + omodel.HExplanation + "'" +
",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
",HRedBlueFlag=" + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) +
- " where HInterID=" + lngBillKey.ToString());
+ " where HInterID=" + lngBillKey.ToString();
+
+
+ //鍒ゆ柇浣跨敤瀹㈡埛锛屾牴鎹鎴疯繘琛屼釜鎬у寲璋冩暣
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ string sErrMsg = "";
+ oSystemParameter.ShowBill(ref sErrMsg);
+ if (true ) //涔斾竴瀹㈡埛
+ {
+ mainSql = "UpDate Kf_ICStockBillMain set " +
+ " HBillNo='" + omodel.HBillNo +
+ "',HDate='" + omodel.HDate +
+ "',HYear='" + omodel.HYear.ToString() +
+ "',HPeriod='" + omodel.HPeriod.ToString() +
+ "',HRemark='" + omodel.HRemark +
+ "',HUpDater='" + DBUtility.ClsPub.CurUserName +
+ "',HUpDateDate=getdate()" +
+ //========================================
+ ",HSupID=" + omodel.HSupID.ToString() +
+ ",HWHID=" + omodel.HWHID.ToString() +
+ ",HSCWHID=" + omodel.HSCWHID.ToString() +
+ ",HEmpID=" + omodel.HEmpID.ToString() +
+ ",HManagerID=" + omodel.HManagerID.ToString() +
+ ",HSecManagerID=" + omodel.HSecManagerID.ToString() +
+ ",HKeeperID=" + omodel.HKeeperID.ToString() +
+ ",HDeptID=" + omodel.HDeptID.ToString() +
+ ",HExplanation='" + omodel.HExplanation +
+ "',HInnerBillNo='" + omodel.HInnerBillNo +
+ "',HRedBlueFlag=" + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) +
+
+ ",HICMOInterID=" + omodel.HICMOInterID +
+ ",HICMOEntryID=" + omodel.HICMOEntryID +
+ ",HICMOBillNo='" + omodel.HICMOBillNo +
+ "',HProcExchInterID=" + omodel.HProcExchInterID +
+ ",HProcExchEntryID=" + omodel.HProcExchEntryID +
+ ",HProcExchBillNo='" + omodel.HProcExchBillNo +
+ "',HMaterID=" + omodel.HMaterID +
+ ",HMaterName='" + omodel.HMaterName +
+ "',HVerNo='" + omodel.HVerNo +
+ "',HModel='" + omodel.HModel +
+ "',HModel2='" + omodel.HModel2 +
+ "',HPieceQty='" + omodel.HPieceQty +
+ "',HCusID=" + omodel.HCusID +
+ ",HWeight=" + omodel.HWeight +
+ ",HLong=" + omodel.HLong +
+ ",HSingleWeight=" + omodel.HSingleWeigth +
+ ",HMaterSumWeight=" + omodel.HMaterSumWeight +
+ ",HMaterEmpID=" + omodel.HMaterEmpID +
+ ",HMachineSpeed=" + omodel.HMachineSpeed +
+ ",HWaterRush=" + omodel.HWaterRush +
+ ",HWaterQty=" + omodel.HWaterQty +
+ ",HWaterRate=" + omodel.HWaterRate +
+ " where HInterID=" + lngBillKey.ToString();
+ }
+ //鏇存柊涓昏〃
+ oCn.RunProc(mainSql);
+
+
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
//鍒犻櫎瀛愯〃
DeleteBillSub(lngBillKey);
+
+
//鎻掑叆瀛愯〃
omodel.HInterID = lngBillKey;
foreach (Models.ClsKf_MateOutBillSub oSub in DetailColl)
{
- oCn.RunProc("Insert into Kf_ICStockBillSub " +
+ string subSql = "Insert into Kf_ICStockBillSub " +
" (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
",HMaterID,HPropertyID,HSecUnitID,HSecUnitRate,HUnitID,HQtyMust" +
@@ -83,7 +142,52 @@
"," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HSCWHID.ToString() + "," + oSub.HSPID.ToString() +
"," + oSub.HSCSPID.ToString() + "," + oSub.HSPGroupID.ToString() + ",'" + oSub.HBatchNo + "'," + oSub.HPOOrderInterID.ToString() + "," + oSub.HPOOrderEntryID.ToString() + ",'" + oSub.HPOOrderBillNo + "'" +
"," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
- ") ");
+ ") ";
+
+ if (true) //涔斾竴瀹㈡埛
+ {
+ subSql = "Insert into Kf_ICStockBillSub" +
+ "(HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HPropertyID,HSecUnitID,HSecUnitRate,HUnitID,HQtyMust" +
+ ",HRate,HQty,HPrice,HMoney,HWHID,HSCWHID,HSPID,HSCSPID,HSPGroupID,HBatchNo,HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo)" +
+ " values(" +
+ omodel.HInterID.ToString() +
+ "," + oSub.HEntryID.ToString() +
+ ",'" + oSub.HCloseMan +
+ "','" + oSub.HEntryCloseDate.ToShortDateString() +
+ "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) +
+ ",'" + oSub.HRemark +
+ "'," + oSub.HSourceInterID.ToString() +
+ "," + oSub.HSourceEntryID.ToString() +
+ ",'" + oSub.HSourceBillNo +
+ "','" + oSub.HSourceBillType +
+ "'," + oSub.HRelationQty.ToString() +
+ "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HMaterID.ToString() +
+ "," + oSub.HPropertyID.ToString() +
+ "," + oSub.HSecUnitID.ToString() +
+ "," + oSub.HSecUnitRate.ToString() +
+ "," + oSub.HUnitID.ToString() +
+ "," + oSub.HQtyMust.ToString() +
+ "," + oSub.HRate.ToString() +
+ "," + oSub.HQty.ToString() +
+ "," + oSub.HPrice.ToString() +
+ "," + oSub.HMoney.ToString() +
+ "," + oSub.HWHID.ToString() +
+ "," + oSub.HSCWHID.ToString() +
+ "," + oSub.HSPID.ToString() +
+ "," + oSub.HSCSPID.ToString() +
+ "," + oSub.HSPGroupID.ToString() +
+ ",'" + oSub.HBatchNo +
+ "'," + oSub.HPOOrderInterID.ToString() +
+ "," + oSub.HPOOrderEntryID.ToString() +
+ ",'" + oSub.HPOOrderBillNo +
+ "'," + oSub.HSeOrderInterID.ToString() +
+ "," + oSub.HSeOrderEntryID.ToString() +
+ ",'" + oSub.HSeOrderBillNo +
+ "') ";
+ }
+
+ oCn.RunProc(subSql);
}
//
//foreach (Model.ClsKf_MateOutBillSub oSub in DetailColl)
@@ -114,8 +218,8 @@
try
{
//寰楀埌mainid
- omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
- omodel.HBillNo = DBUtility.ClsPub.CreateBillCode(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
+ //omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ //omodel.HBillNo = DBUtility.ClsPub.CreateBillCode(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
if (IsExistBillNo(ref DBUtility.ClsPub.sExeReturnInfo, omodel.HBillNo, Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew, omodel.HInterID))
{
@@ -127,22 +231,86 @@
}
//
oCn.BeginTran();
- //涓昏〃
- oCn.RunProc("Insert Into Kf_ICStockBillMain " +
+
+ string mainSql = "Insert Into Kf_ICStockBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
",HSupID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
",HKeeperID,HDeptID,HExplanation,HInnerBillNo,HRedBlueFlag" +
") " +
- " values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
+ " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
", " + omodel.HSupID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HSCWHID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HSecManagerID.ToString() +
", " + omodel.HKeeperID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) +
- ") ");
+ ") ";
+
+
+ //鍒ゆ柇浣跨敤瀹㈡埛锛屾牴鎹鎴疯繘琛屼釜鎬у寲璋冩暣
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ string sErrMsg = "";
+ oSystemParameter.ShowBill(ref sErrMsg);
+ if (true) //涔斾竴瀹㈡埛
+ {
+ mainSql = "Insert Into Kf_ICStockBillMain" +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HYear,HPeriod,HRemark,HMainSourceInterID,HMainSourceBillNo,HMainSourceBillType,HMaker,HMakeDate,HSupID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID,HKeeperID,HDeptID,HExplanation,HInnerBillNo,HRedBlueFlag" +
+ ",HICMOInterID,HICMOEntryID,HICMOBillNo,HProcExchInterID,HProcExchEntryID,HProcExchBillNo,HMaterID,HMaterName,HVerNo,HModel,HModel2,HPieceQty,HCusID,HWeight,HLong,HSingleWeight,HMaterSumWeight,HMaterEmpID" +
+ ",HMachineSpeed,HWaterRush,HWaterQty,HWaterRate) " +
+ " values(" +
+ "'" + this.BillType +
+ "','" + this.HBillSubType +
+ "'," + omodel.HInterID.ToString() +
+ ",'" + omodel.HBillNo +
+ "','" + omodel.HDate +
+ "'," + omodel.HYear.ToString() +
+ "," + omodel.HPeriod.ToString() +
+ ",'" + omodel.HRemark +
+ "'," + omodel.HProcExchInterID +
+ ",'" + omodel.HProcExchBillNo +
+ "','" + "3772" +
+ "','" + DBUtility.ClsPub.CurUserName +
+ "',getdate()" +
+ "," + omodel.HSupID.ToString() +
+ "," + omodel.HWHID.ToString() +
+ "," + omodel.HSCWHID.ToString() +
+ "," + omodel.HEmpID.ToString() +
+ "," + omodel.HManagerID.ToString() +
+ "," + omodel.HSecManagerID.ToString() +
+ ", " + omodel.HKeeperID.ToString() +
+ "," + omodel.HDeptID.ToString() +
+ ",'" + omodel.HExplanation +
+ "','" + omodel.HInnerBillNo +
+ "'," + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) +
+ "," + omodel.HICMOInterID +
+ "," + omodel.HICMOEntryID +
+ ",'" + omodel.HICMOBillNo +
+ "'," + omodel.HProcExchInterID +
+ "," + omodel.HProcExchEntryID +
+ ",'" + omodel.HProcExchBillNo +
+ "'," + omodel.HMaterID +
+ ",'" + omodel.HMaterName +
+ "','" + omodel.HVerNo +
+ "','" + omodel.HModel +
+ "','" + omodel.HModel2 +
+ "','" + omodel.HPieceQty +
+ "'," + omodel.HCusID +
+ "," + omodel.HWeight +
+ "," + omodel.HLong +
+ "," + omodel.HSingleWeigth +
+ "," + omodel.HMaterSumWeight +
+ "," + omodel.HMaterEmpID +
+ "," + omodel.HMachineSpeed +
+ "," + omodel.HWaterRush +
+ "," + omodel.HWaterQty +
+ "," + omodel.HWaterRate +
+ ")";
+ }
+
+ //涓昏〃
+ oCn.RunProc(mainSql);
//鎻掑叆瀛愯〃
foreach (Models.ClsKf_MateOutBillSub oSub in DetailColl)
{
- oCn.RunProc("Insert into Kf_ICStockBillSub " +
+ string subSql = "Insert into Kf_ICStockBillSub " +
" (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
",HMaterID,HPropertyID,HSecUnitID,HSecUnitRate,HUnitID,HQtyMust" +
@@ -156,7 +324,51 @@
"," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HSCWHID.ToString() + "," + oSub.HSPID.ToString() +
"," + oSub.HSCSPID.ToString() + "," + oSub.HSPGroupID.ToString() + ",'" + oSub.HBatchNo + "'," + oSub.HPOOrderInterID.ToString() + "," + oSub.HPOOrderEntryID.ToString() + ",'" + oSub.HPOOrderBillNo + "'" +
"," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
- ") ");
+ ") ";
+
+ if (true) //涔斾竴瀹㈡埛
+ {
+ subSql = "Insert into Kf_ICStockBillSub" +
+ "(HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HPropertyID,HSecUnitID,HSecUnitRate,HUnitID,HQtyMust" +
+ ",HRate,HQty,HPrice,HMoney,HWHID,HSCWHID,HSPID,HSCSPID,HSPGroupID,HBatchNo,HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo)" +
+ " values(" +
+ omodel.HInterID.ToString() +
+ "," + oSub.HEntryID.ToString() +
+ ",'" + oSub.HCloseMan +
+ "','" + oSub.HEntryCloseDate.ToShortDateString() +
+ "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) +
+ ",'" + oSub.HRemark +
+ "'," + oSub.HSourceInterID.ToString() +
+ "," + oSub.HSourceEntryID.ToString() +
+ ",'" + oSub.HSourceBillNo +
+ "','" + oSub.HSourceBillType +
+ "'," + oSub.HRelationQty.ToString() +
+ "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HMaterID.ToString() +
+ "," + oSub.HPropertyID.ToString() +
+ "," + oSub.HSecUnitID.ToString() +
+ "," + oSub.HSecUnitRate.ToString() +
+ "," + oSub.HUnitID.ToString() +
+ "," + oSub.HQtyMust.ToString() +
+ "," + oSub.HRate.ToString() +
+ "," + oSub.HQty.ToString() +
+ "," + oSub.HPrice.ToString() +
+ "," + oSub.HMoney.ToString() +
+ "," + oSub.HWHID.ToString() +
+ "," + oSub.HSCWHID.ToString() +
+ "," + oSub.HSPID.ToString() +
+ "," + oSub.HSCSPID.ToString() +
+ "," + oSub.HSPGroupID.ToString() +
+ ",'" + oSub.HBatchNo +
+ "'," + oSub.HPOOrderInterID.ToString() +
+ "," + oSub.HPOOrderEntryID.ToString() +
+ ",'" + oSub.HPOOrderBillNo +
+ "'," + oSub.HSeOrderInterID.ToString() +
+ "," + oSub.HSeOrderEntryID.ToString() +
+ ",'" + oSub.HSeOrderBillNo +
+ "') ";
+ }
+ oCn.RunProc(subSql);
}
//
//foreach (Model.ClsKf_MateOutBillSub oSub in DetailColl)
@@ -233,8 +445,41 @@
omodel.HExplanation = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HExplanation"]);
omodel.HInnerBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HInnerBillNo"]);
omodel.HRedBlueFlag = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HRedBlueFlag"]);
- //
-
+
+
+ //鍒ゆ柇浣跨敤瀹㈡埛锛屾牴鎹鎴疯繘琛屼釜鎬у寲璋冩暣
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ string sErrMsg = "";
+ oSystemParameter.ShowBill(ref sErrMsg);
+ if (true) //涔斾竴瀹㈡埛
+ {
+ omodel.HICMOInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HICMOInterID"]);
+ omodel.HICMOEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HICMOEntryID"]);
+ omodel.HICMOBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HICMOBillNo"]);
+ omodel.HProcExchInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HProcExchInterID"]);
+ omodel.HProcExchEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HProcExchEntryID"]);
+ omodel.HProcExchBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HProcExchBillNo"]);
+ omodel.HMaterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMaterID"]);
+ omodel.HMaterName = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterName"]);
+ omodel.HVerNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HVerNo"]);
+ omodel.HModel = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HModel"]);
+ omodel.HModel2 = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HModel2"]);
+ omodel.HPieceQty = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HPieceQty"]);
+ omodel.HCusID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCusID"]);
+ omodel.HWeight = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HWeight"]);
+ omodel.HLong = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HLong"]);
+ omodel.HSingleWeigth = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HSingleWeight"]);
+ omodel.HMaterSumWeight = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HMaterSumWeight"]);
+ omodel.HMaterEmpID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMaterEmpID"]);
+
+ omodel.HMachineSpeed = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HMachineSpeed"]);
+ omodel.HWaterRush = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HWaterRush"]);
+ omodel.HWaterQty = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HWaterQty"]);
+ omodel.HWaterRate = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HWaterRate"]);
+ }
+
+ //
+
//寰幆
DataSet DsSub ;
DsSub = oCn.RunProcReturn("Select * from Kf_ICStockBillSub Where HInterID=" + lngBillKey.ToString(), "Kf_ICStockBillSub");
@@ -277,6 +522,12 @@
oSub.HSeOrderInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSeOrderInterID"]);
oSub.HSeOrderEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSeOrderEntryID"]);
oSub.HSeOrderBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HSeOrderBillNo"]);
+
+ if (true) //涔斾竴瀹㈡埛
+ {
+ oSub.HRate = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[0]["HRate"]);
+ }
+
DetailColl.Add(oSub);
}
sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
diff --git a/WebAPI/Models/ClsGy_Material_Model.cs b/WebAPI/Models/ClsGy_Material_Model.cs
index afabbda..359bdbe 100644
--- a/WebAPI/Models/ClsGy_Material_Model.cs
+++ b/WebAPI/Models/ClsGy_Material_Model.cs
@@ -57,6 +57,7 @@
public double HPERUNITSTANDHOUR; //鏍囧噯宸ユ椂
public double HSTDLABORPREPARETIME; //鏍囧噯浜哄憳鍑嗗宸ユ椂
public double HSTDMACHINEPREPARETIME; //鏍囧噯鏈哄櫒鍑嗗宸ユ椂
+ public string HMaterRuleType; //鐗╂枡鍏紡
public int HQCSchemeID_Fst;
public int HQCSchemeID_Proc;
diff --git a/WebAPI/Models/ClsKf_MateOutBillMain.cs b/WebAPI/Models/ClsKf_MateOutBillMain.cs
index f5b43d1..d8defbb 100644
--- a/WebAPI/Models/ClsKf_MateOutBillMain.cs
+++ b/WebAPI/Models/ClsKf_MateOutBillMain.cs
@@ -17,5 +17,29 @@
public string HExplanation;// varchar(200) --摘要
public string HInnerBillNo;// varchar(50) --内部单据号
public bool HRedBlueFlag;// bit --红蓝单
+
+ public Int64 HICMOInterID; //int --任务单内码
+ public Int64 HICMOEntryID; //int --任务单子内码
+ public string HICMOBillNo; //int --任务单号
+ public Int64 HProcExchInterID; //int --工序流转卡内码
+ public Int64 HProcExchEntryID; //int --工序流转卡子内码
+ public string HProcExchBillNo; //int --工序流转卡号
+ public Int64 HMaterID; //int --主产品内码
+ public string HMaterName; //varchar(100) --颜色
+ public string HVerNo; //varchar(50) --花版号
+ public string HModel; //varchar(100) --规格型号1
+ public string HModel2; //varchar(100) --规格型号2
+ public string HPieceQty; //varchar(20) --只数
+ public Int64 HCusID; //int --客户
+ public double HWeight; //dec(18,8) --重量
+ public double HLong; //dec(18,8) --米数
+ public double HSingleWeigth; //dec(18,8) --单桶重量
+ public double HMaterSumWeight; //dec(18,8) --总浆重量
+ public Int64 HMaterEmpID; //int --打浆人
+
+ public double HMachineSpeed; //dec(18,8) --机速
+ public double HWaterRush; //dec(18,8) --水冲
+ public double HWaterQty; //dec(18,8) --水量
+ public double HWaterRate; //dec(18,8) --水比
}
}
diff --git a/WebAPI/Models/ClsKf_MateOutBillSub.cs b/WebAPI/Models/ClsKf_MateOutBillSub.cs
index 6799a63..8f35bfc 100644
--- a/WebAPI/Models/ClsKf_MateOutBillSub.cs
+++ b/WebAPI/Models/ClsKf_MateOutBillSub.cs
@@ -30,5 +30,7 @@
public Int64 HSeOrderEntryID;// int --销售订单子内码
public string HSeOrderBillNo;// varchar(50) --销售订单号
+ public double HRate; //money --用量
+
}
}
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 058ab01..9ff5638 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|2023-09-05T00:28:44.6193871Z;True|2023-09-04T20:42:09.4672710+08:00;True|2023-09-03T14:06:37.5079909+08:00;True|2023-09-02T18:58:24.1492192+08:00;True|2023-09-01T13:19:28.2779978+08:00;True|2023-09-01T08:40:54.0577358+08:00;True|2023-08-31T16:47:34.8462721+08:00;True|2023-08-31T14:49:39.9056564+08:00;True|2023-08-31T14:20:01.4071384+08:00;True|2023-08-31T11:25:29.0233052+08:00;True|2023-08-31T10:28:13.4933678+08:00;True|2023-08-31T10:21:52.6638820+08:00;True|2023-08-31T08:46:57.8782261+08:00;True|2023-08-31T08:46:08.4791004+08:00;True|2023-08-30T09:06:17.4001684+08:00;True|2023-08-30T08:52:06.9481657+08:00;True|2023-08-29T17:11:33.7851914+08:00;True|2023-08-29T16:58:52.7298807+08:00;True|2023-08-29T15:58:23.4205277+08:00;True|2023-08-29T15:56:40.3534593+08:00;True|2023-08-29T15:54:29.1188567+08:00;True|2023-08-29T15:53:27.9719983+08:00;True|2023-08-29T15:52:38.7670005+08:00;True|2023-08-29T15:51:32.3703092+08:00;True|2023-08-29T15:47:38.5198946+08:00;True|2023-08-29T15:46:17.4698017+08:00;True|2023-08-29T15:42:04.1853400+08:00;True|2023-08-29T15:29:28.1098681+08:00;True|2023-08-29T15:18:40.8587286+08:00;True|2023-08-29T14:47:50.3088948+08:00;True|2023-08-29T14:47:27.6552611+08:00;False|2023-08-28T13:59:37.8725670+08:00;True|2023-08-18T13:23:38.9937084+08:00;True|2023-08-18T10:09:51.5247737+08:00;True|2023-08-18T08:26:21.8473123+08:00;True|2023-08-17T08:31:37.8696349+08:00;True|2023-08-17T08:23:59.5658185+08:00;True|2023-08-17T08:07:38.2174684+08:00;True|2023-08-16T16:49:44.2549852+08:00;True|2023-08-16T16:33:59.9298792+08:00;True|2023-08-16T15:35:29.6092783+08:00;True|2023-08-16T11:17:28.1086751+08:00;True|2023-08-16T11:17:22.3814672+08:00;True|2023-08-16T08:44:16.0941179+08:00;True|2023-08-15T15:29:15.8118269+08:00;True|2023-08-15T14:47:06.4963591+08:00;True|2023-08-11T16:49:35.8718314+08:00;True|2023-08-11T14:22:59.9440967+08:00;True|2023-08-11T14:16:25.0940743+08:00;True|2023-08-11T13:27:25.4148450+08:00;True|2023-08-11T09:08:31.5437265+08:00;True|2023-08-11T09:04:38.4540336+08:00;True|2023-08-10T14:11:07.0042283+08:00;True|2023-08-08T13:48:19.2402267+08:00;True|2023-08-08T13:44:15.6796969+08:00;True|2023-07-27T09:46:14.1491814+08:00;True|2023-07-21T11:13:10.0843656+08:00;True|2023-07-21T10:56:47.5835580+08:00;True|2023-07-21T10:30:33.0113443+08:00;True|2023-07-20T19:16:37.4936135+08:00;True|2023-07-20T19:00:41.0636578+08:00;True|2023-07-19T13:28:27.8671371+08:00;True|2023-07-19T13:23:42.1880500+08:00;True|2023-07-19T13:19:18.7201227+08:00;True|2023-07-19T13:06:38.9897249+08:00;True|2023-07-19T12:13:11.2061059+08:00;True|2023-07-19T11:45:20.0391356+08:00;True|2023-07-19T11:24:02.5425841+08:00;True|2023-07-19T10:32:06.7915754+08:00;True|2023-07-19T09:51:08.4553434+08:00;True|2023-07-19T09:48:11.2977426+08:00;True|2023-07-18T08:47:44.1724897+08:00;True|2023-07-17T16:25:10.8982872+08:00;True|2023-07-17T14:50:44.3708198+08:00;True|2023-07-17T14:20:26.4686898+08:00;True|2023-07-17T14:18:16.6127136+08:00;True|2023-07-17T14:16:34.9116950+08:00;True|2023-07-17T14:14:44.7988846+08:00;True|2023-07-17T14:06:18.1123806+08:00;True|2023-07-17T14:03:38.5290433+08:00;True|2023-07-17T13:48:54.3096778+08:00;True|2023-07-17T13:23:13.6097762+08:00;True|2023-07-17T09:54:25.9375716+08:00;True|2023-07-17T09:40:22.2531559+08:00;True|2023-07-17T09:21:15.0786649+08:00;True|2023-07-17T09:03:37.2081513+08:00;True|2023-07-16T21:20:45.3036514+08:00;True|2023-07-16T21:09:16.1559694+08:00;True|2023-07-16T21:05:22.2504644+08:00;True|2023-07-16T20:41:26.5956030+08:00;True|2023-07-16T20:19:33.5726613+08:00;True|2023-07-16T19:46:38.6493518+08:00;True|2023-07-14T10:33:17.6270692+08:00;True|2023-07-11T14:34:22.8852169+08:00;True|2023-07-11T14:27:22.7851108+08:00;True|2023-07-11T14:13:21.6512172+08:00;True|2023-07-11T14:06:33.9865646+08:00;True|2023-07-11T13:52:46.2830836+08:00;True|2023-07-11T13:38:56.3165889+08:00;True|2023-07-11T13:29:40.9636697+08:00;True|2023-07-11T13:25:23.0633788+08:00;True|2023-07-11T10:17:40.8002359+08:00;True|2023-07-11T10:15:47.5472709+08:00;True|2023-07-11T10:12:25.6440547+08:00;True|2023-07-11T10:07:39.3716167+08:00;True|2023-07-11T09:22:07.4191357+08:00;True|2023-07-04T13:07:10.1209516+08:00;True|2023-06-30T16:11:25.7541580+08:00;True|2023-06-30T15:39:26.6678989+08:00;True|2023-06-30T15:26:40.6581344+08:00;True|2023-06-30T15:12:57.9906312+08:00;True|2023-06-29T16:39:15.6477820+08:00;True|2023-06-28T17:01:51.9542466+08:00;True|2023-06-27T15:03:28.1320450+08:00;True|2023-06-27T13:36:39.6707848+08:00;True|2023-06-26T09:40:01.1754706+08:00;True|2023-06-25T12:16:28.9080024+08:00;True|2023-06-25T11:51:59.9238461+08:00;True|2023-06-25T11:50:29.3100358+08:00;True|2023-06-25T11:29:28.5338563+08:00;True|2023-06-25T09:10:26.2420288+08:00;True|2023-06-25T09:08:15.0702872+08:00;True|2023-06-25T08:43:15.0806611+08:00;True|2023-06-25T08:41:41.8156616+08:00;True|2023-06-25T08:39:30.6818013+08:00;True|2023-06-25T08:38:18.5996529+08:00;True|2023-06-25T08:36:34.1479706+08:00;True|2023-06-25T08:34:53.9856289+08:00;True|2023-06-25T08:31:24.0298080+08:00;True|2023-06-25T08:15:45.7453280+08:00;True|2023-06-25T08:01:52.7609075+08:00;True|2023-06-24T21:25:23.8938665+08:00;True|2023-06-22T03:02:26.7305758+08:00;True|2023-06-22T02:10:48.8222890+08:00;True|2023-06-22T01:57:41.7875184+08:00;True|2023-06-22T01:52:19.4217362+08:00;True|2023-06-21T16:27:15.1464129+08:00;True|2023-06-21T16:11:46.6111817+08:00;True|2023-06-21T13:14:00.6869253+08:00;True|2023-06-21T13:09:28.2689225+08:00;True|2023-06-21T12:24:02.6762426+08:00;True|2023-06-21T12:18:06.2748924+08:00;True|2023-06-21T11:18:02.6754143+08:00;True|2023-06-21T11:08:34.2149469+08:00;True|2023-06-21T08:20:50.0079906+08:00;True|2023-06-20T15:56:03.2638713+08:00;True|2023-06-20T15:48:38.2419545+08:00;True|2023-06-20T15:35:26.6615171+08:00;True|2023-06-20T15:20:31.9284860+08:00;True|2023-06-20T15:18:39.8265469+08:00;True|2023-06-20T15:09:16.7617272+08:00;True|2023-06-20T09:53:23.2658672+08:00;True|2023-06-16T10:00:58.0337616+08:00;True|2023-06-16T09:47:58.8912904+08:00;True|2023-06-16T09:26:36.4914832+08:00;True|2023-06-15T16:22:21.4509393+08:00;True|2023-06-12T13:21:12.0491357+08:00;True|2023-06-12T10:18:32.9287587+08:00;True|2023-06-09T16:22:24.1132267+08:00;True|2023-06-08T18:12:42.4814009+08:00;True|2023-06-08T11:08:48.0533571+08:00;True|2023-06-08T10:41:43.0121701+08:00;False|2023-06-08T10:40:19.2093235+08:00;True|2023-06-06T13:03:50.8124200+08:00;True|2023-06-05T10:12:24.1858209+08:00;True|2023-06-02T17:02:57.5817094+08:00;True|2023-05-26T13:54:40.2272218+08:00;True|2023-05-24T12:43:50.2427994+08:00;True|2023-05-24T12:34:24.3922836+08:00;True|2023-05-24T10:07:19.4995219+08:00;True|2023-05-24T09:21:29.1960080+08:00;True|2023-05-23T22:34:23.3220912+08:00;True|2023-05-23T22:01:14.4175449+08:00;True|2023-05-23T17:02:53.0308400+08:00;True|2023-05-23T16:30:11.7138623+08:00;True|2023-05-23T15:51:50.0152484+08:00;True|2023-05-23T15:50:52.0657433+08:00;True|2023-05-23T15:28:25.5802377+08:00;True|2023-05-23T15:25:56.4633020+08:00;True|2023-05-23T14:52:29.8759921+08:00;True|2023-05-23T14:48:44.6519763+08:00;True|2023-05-20T04:28:10.3108871+08:00;True|2023-05-20T03:56:22.7233820+08:00;True|2023-05-20T03:47:38.4405026+08:00;True|2023-05-20T03:46:40.6056451+08:00;True|2023-05-20T03:44:25.0883888+08:00;True|2023-05-20T03:41:10.1148691+08:00;True|2023-05-20T02:34:14.3757035+08:00;True|2023-05-20T02:27:50.5595075+08:00;True|2023-05-20T02:23:04.2256041+08:00;True|2023-05-20T01:46:59.9534021+08:00;True|2023-05-20T01:42:33.5106065+08:00;True|2023-05-20T01:40:39.6918060+08:00;True|2023-05-20T01:11:47.7436847+08:00;True|2023-05-20T01:03:58.9476094+08:00;True|2023-05-19T22:59:47.4591129+08:00;True|2023-05-19T22:34:44.7988447+08:00;True|2023-05-19T22:24:55.2320279+08:00;True|2023-05-19T21:40:19.5285575+08:00;True|2023-05-19T21:38:21.2073338+08:00;True|2023-05-19T20:54:59.2058809+08:00;True|2023-05-19T16:08:15.0151080+08:00;True|2023-05-19T15:26:16.2836301+08:00;True|2023-05-19T13:09:06.1592914+08:00;True|2023-05-19T12:24:23.6252771+08:00;True|2023-05-19T11:50:53.8948740+08:00;True|2023-05-19T11:43:57.9296933+08:00;True|2023-05-19T10:44:34.9904463+08:00;True|2023-05-19T09:32:02.1216663+08:00;False|2023-05-19T09:31:06.4251757+08:00;True|2023-05-18T22:34:36.5292968+08:00;True|2023-05-18T20:37:59.7940567+08:00;True|2023-05-18T20:36:35.2790349+08:00;True|2023-05-18T20:34:10.7400457+08:00;True|2023-05-18T20:32:43.8790879+08:00;True|2023-05-18T20:31:13.5389643+08:00;True|2023-05-18T20:29:19.6206139+08:00;True|2023-05-18T20:07:25.5074263+08:00;True|2023-05-18T18:19:43.5324315+08:00;True|2023-05-18T18:15:36.4290026+08:00;True|2023-05-18T18:12:31.8703551+08:00;True|2023-05-18T18:10:52.9289531+08:00;True|2023-05-18T18:09:23.9118797+08:00;True|2023-05-18T17:58:30.8068228+08:00;True|2023-05-18T17:56:55.8055382+08:00;False|2023-05-18T17:54:54.7950789+08:00;False|2023-05-18T17:11:18.2325105+08:00;True|2023-05-18T17:09:24.4186482+08:00;True|2023-05-18T17:06:32.0699130+08:00;False|2023-05-18T17:01:41.8164925+08:00;False|2023-05-18T16:59:32.1112741+08:00;True|2023-05-18T16:58:34.1784100+08:00;True|2023-05-18T16:56:36.9460541+08:00;True|2023-05-18T16:55:00.9843495+08:00;True|2023-05-18T16:49:04.0161640+08:00;True|2023-05-18T16:48:28.9011382+08:00;True|2023-05-18T16:44:52.0675900+08:00;False|2023-05-18T16:44:37.3514214+08:00;False|2023-05-18T16:43:23.3343369+08:00;True|2023-05-18T16:41:35.8818611+08:00;True|2023-05-18T16:25:43.5167900+08:00;False|2023-05-18T16:24:46.6646890+08:00;False|2023-05-18T16:19:55.4153618+08:00;False|2023-05-18T16:16:18.0052881+08:00;False|2023-05-18T16:14:32.3377278+08:00;True|2023-05-17T15:43:45.1868569+08:00;True|2023-05-17T15:35:42.2476880+08:00;True|2023-05-17T14:23:28.2390957+08:00;True|2023-05-17T13:54:00.6756387+08:00;True|2023-05-17T13:45:46.1115068+08:00;True|2023-05-17T07:57:34.7129429+08:00;True|2023-05-16T16:04:20.3198005+08:00;False|2023-05-16T16:03:52.0737233+08:00;True|2023-05-16T15:28:45.4945726+08:00;True|2023-05-16T15:14:10.4952128+08:00;True|2023-05-16T15:04:46.5706346+08:00;True|2023-05-16T14:46:48.7034492+08:00;True|2023-05-16T14:45:29.4047499+08:00;True|2023-05-16T14:42:47.3507679+08:00;True|2023-05-16T14:30:47.9199224+08:00;True|2023-05-16T14:29:10.9147184+08:00;True|2023-05-16T14:27:48.3632687+08:00;True|2023-05-16T14:24:44.6240034+08:00;True|2023-05-16T14:19:41.2962188+08:00;True|2023-05-16T13:41:13.3366211+08:00;True|2023-05-16T13:26:44.1532655+08:00;True|2023-05-16T13:23:40.2882422+08:00;True|2023-05-16T13:11:41.5416792+08:00;True|2023-05-16T13:08:41.6341863+08:00;True|2023-05-16T13:04:35.6916867+08:00;True|2023-05-16T13:00:34.6889598+08:00;True|2023-05-16T12:57:48.4561274+08:00;True|2023-05-16T12:50:57.7405833+08:00;True|2023-05-16T12:49:33.8394829+08:00;True|2023-05-16T12:44:28.6906226+08:00;True|2023-05-16T12:41:08.3554032+08:00;True|2023-05-16T12:32:32.3448036+08:00;True|2023-05-16T11:32:04.4504376+08:00;True|2023-05-15T18:39:28.9172042+08:00;True|2023-05-15T18:35:41.5268755+08:00;True|2023-05-15T18:16:16.2900985+08:00;True|2023-04-28T16:24:40.7430596+08:00;False|2023-04-28T16:21:34.8499384+08:00;True|2023-04-28T15:43:40.3023318+08:00;True|2023-04-28T15:41:18.8228620+08:00;True|2023-04-28T14:16:21.1595325+08:00;True|2023-04-28T10:27:55.2150739+08:00;True|2023-04-12T16:25:26.5218825+08:00;True|2023-04-12T15:45:29.3993255+08:00;True|2023-04-12T14:00:18.1960878+08:00;True|2023-04-12T13:16:39.0804178+08:00;True|2023-04-11T11:02:27.5200402+08:00;True|2023-04-11T09:57:11.5903829+08:00;True|2023-04-10T09:58:01.1775220+08:00;True|2023-03-13T11:19:32.0927720+08:00;True|2023-03-13T10:39:50.9250037+08:00;True|2023-03-13T08:54:57.5891390+08:00;True|2023-03-10T09:00:31.2441735+08:00;True|2023-03-08T08:25:11.1877416+08:00;True|2023-03-06T09:18:03.5502956+08:00;True|2023-03-06T09:14:57.8192971+08:00;True|2023-01-11T13:30:27.8190489+08:00;True|2023-01-06T14:29:14.6067256+08:00;True|2022-12-23T17:06:52.0688439+08:00;True|2022-12-23T16:12:04.4155951+08:00;True|2022-12-23T13:35:44.6439326+08:00;True|2022-11-30T08:24:02.9999976+08:00;True|2022-11-30T08:01:51.4579972+08:00;True|2022-11-29T21:32:14.4359673+08:00;True|2022-11-29T19:30:22.9466023+08:00;True|2022-11-29T19:24:30.1630119+08:00;True|2022-11-29T17:31:43.1926801+08:00;True|2022-11-29T17:14:32.5869985+08:00;True|2022-11-29T10:42:57.1877576+08:00;True|2022-11-27T14:40:28.4784748+08:00;True|2022-11-26T20:49:34.2789400+08:00;True|2022-11-26T19:24:58.9988205+08:00;True|2022-11-26T15:33:08.6274944+08:00;True|2022-11-26T14:37:46.3953592+08:00;True|2022-11-26T09:16:41.7487240+08:00;True|2022-11-24T09:49:50.7302637+08:00;True|2022-11-23T16:24:56.5946914+08:00;True|2022-11-23T16:19:57.5570583+08:00;True|2022-11-23T15:05:13.8032246+08:00;True|2022-11-22T20:24:39.7324815+08:00;True|2022-11-22T13:18:16.2143925+08:00;False|2022-11-22T13:12:53.0448580+08:00;True|2022-11-22T11:03:01.7571733+08:00;True|2022-11-21T13:20:11.1961237+08:00;True|2022-11-21T13:13:52.0360749+08:00;True|2022-11-18T15:48:13.0747365+08:00;True|2022-11-18T14:15:54.5626901+08:00;True|2022-11-17T18:41:26.5464503+08:00;True|2022-11-15T13:55:35.3496366+08:00;True|2022-11-15T11:03:23.6773297+08:00;True|2022-11-15T10:58:47.9703720+08:00;True|2022-11-15T10:12:27.8305782+08:00;True|2022-11-15T09:47:26.7480777+08:00;True|2022-11-15T08:55:44.0275263+08:00;True|2022-11-15T08:54:06.6396851+08:00;True|2022-11-15T08:44:18.2013404+08:00;True|2022-11-15T01:16:19.8154538+08:00;True|2022-11-15T01:15:03.7846810+08:00;True|2022-11-15T01:01:11.0318599+08:00;True|2022-11-15T00:30:33.7148460+08:00;True|2022-11-15T00:15:26.5178283+08:00;True|2022-11-14T23:54:32.6128172+08:00;True|2022-11-14T23:26:52.0335380+08:00;True|2022-11-14T22:21:28.0622050+08:00;True|2022-11-14T21:47:43.6964619+08:00;True|2022-11-14T21:41:42.3128804+08:00;True|2022-11-14T21:31:17.2784203+08:00;True|2022-11-14T20:48:20.0380343+08:00;True|2022-11-11T17:24:44.7029993+08:00;True|2022-11-11T16:47:29.3444029+08:00;True|2022-11-11T16:07:26.4718473+08:00;True|2022-11-11T15:52:41.7235701+08:00;True|2022-11-10T15:58:10.8883176+08:00;True|2022-11-10T15:29:59.3113740+08:00;True|2022-11-10T13:34:14.7380132+08:00;True|2022-11-10T10:28:02.1166569+08:00;True|2022-11-09T23:28:25.6401971+08:00;True|2022-11-09T16:20:53.2757536+08:00;True|2022-11-09T16:16:41.3169214+08:00;True|2022-11-09T14:02:55.1802832+08:00;True|2022-11-09T13:57:55.2726154+08:00;True|2022-11-09T13:28:53.2022669+08:00;True|2022-11-09T13:10:58.0740163+08:00;True|2022-11-09T12:59:42.2328933+08:00;True|2022-11-09T11:54:08.0187924+08:00;True|2022-11-09T11:49:32.4296758+08:00;True|2022-11-09T11:34:32.6613370+08:00;True|2022-11-09T11:06:56.9443306+08:00;True|2022-11-06T23:43:44.0833657+08:00;True|2022-11-06T23:29:52.0088244+08:00;True|2022-11-06T22:06:14.7091464+08:00;True|2022-11-06T22:03:25.2696951+08:00;True|2022-11-06T21:58:50.1055520+08:00;True|2022-11-06T21:54:14.0075395+08:00;True|2022-11-06T21:39:30.2652105+08:00;True|2022-11-04T15:54:37.9813194+08:00;True|2022-11-04T15:43:59.7702621+08:00;True|2022-11-04T13:59:29.3941234+08:00;True|2022-11-04T13:44:18.1212719+08:00;True|2022-11-04T13:42:06.1010393+08:00;True|2022-11-04T13:37:01.7814703+08:00;True|2022-11-04T13:35:43.1121709+08:00;True|2022-11-04T13:33:05.1362535+08:00;True|2022-11-04T13:30:11.1113703+08:00;True|2022-11-04T13:28:53.7185382+08:00;True|2022-11-04T13:27:08.0691684+08:00;True|2022-11-04T13:20:46.2297633+08:00;True|2022-11-04T13:17:57.1564250+08:00;True|2022-11-04T13:15:36.3651019+08:00;True|2022-11-04T13:13:44.6635701+08:00;True|2022-11-04T13:12:02.3968306+08:00;True|2022-11-04T13:08:07.7653927+08:00;True|2022-11-04T11:37:44.1975649+08:00;True|2022-11-04T11:36:20.3813848+08:00;True|2022-11-04T11:26:40.9713465+08:00;True|2022-11-04T10:17:36.4269558+08:00;True|2022-11-04T09:47:05.4607111+08:00;True|2022-11-04T09:28:27.9347785+08:00;True|2022-11-04T08:38:38.5253737+08:00;True|2022-11-03T13:31:32.7883545+08:00;False|2022-11-03T13:27:07.8579021+08:00;True|2022-11-03T11:07:07.3903101+08:00;True|2022-11-03T10:54:26.7818816+08:00;True|2022-11-03T10:35:59.1956262+08:00;True|2022-11-03T10:30:07.0651285+08:00;True|2022-11-03T10:01:20.8467911+08:00;True|2022-08-22T11:13:33.9211829+08:00;True|2022-06-17T11:19:24.4893458+08:00;True|2022-06-07T14:44:51.5702202+08:00;True|2022-06-07T14:42:44.8351600+08:00;True|2022-05-17T14:19:55.1158182+08:00;True|2022-05-17T13:25:44.2886247+08:00;True|2022-05-17T10:29:26.6813564+08:00;True|2022-05-17T09:02:49.1742018+08:00;True|2022-05-06T15:13:12.2438900+08:00;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>
+ <History>True|2023-09-22T03:14:50.9067626Z;True|2023-09-22T09:36:50.6912928+08:00;True|2023-09-22T09:26:38.2305802+08:00;True|2023-09-22T09:02:22.5400635+08:00;True|2023-09-20T17:20:27.9780370+08:00;True|2023-09-19T09:20:00.1269897+08:00;True|2023-09-19T09:10:18.4900723+08:00;True|2023-09-19T08:30:20.1709390+08:00;True|2023-09-18T15:43:28.1580264+08:00;True|2023-09-15T10:08:50.6367258+08:00;True|2023-09-14T17:17:10.7002185+08:00;True|2023-09-14T16:55:47.7782477+08:00;True|2023-09-14T14:05:25.9485449+08:00;False|2023-09-14T14:04:51.9423918+08:00;True|2023-09-12T09:37:17.5430590+08:00;True|2023-09-11T16:38:00.9834961+08:00;True|2023-09-11T13:04:08.1338596+08:00;True|2023-09-11T09:33:03.5400174+08:00;True|2023-09-08T15:34:46.6427039+08:00;True|2023-09-08T15:32:26.7896155+08:00;True|2023-09-08T14:07:16.6283055+08:00;True|2023-09-08T08:21:08.8368055+08:00;True|2023-09-08T08:07:29.5992984+08:00;True|2023-09-07T13:03:24.6924914+08:00;True|2023-09-07T11:02:02.9462467+08:00;True|2023-09-07T08:57:36.4913496+08:00;True|2023-09-07T08:55:57.3245545+08:00;True|2023-09-06T13:47:04.0563026+08:00;True|2023-09-06T13:42:27.3031938+08:00;True|2023-09-05T08:28:44.6193871+08:00;True|2023-09-04T20:42:09.4672710+08:00;True|2023-09-03T14:06:37.5079909+08:00;True|2023-09-02T18:58:24.1492192+08:00;True|2023-09-01T13:19:28.2779978+08:00;True|2023-09-01T08:40:54.0577358+08:00;True|2023-08-31T16:47:34.8462721+08:00;True|2023-08-31T14:49:39.9056564+08:00;True|2023-08-31T14:20:01.4071384+08:00;True|2023-08-31T11:25:29.0233052+08:00;True|2023-08-31T10:28:13.4933678+08:00;True|2023-08-31T10:21:52.6638820+08:00;True|2023-08-31T08:46:57.8782261+08:00;True|2023-08-31T08:46:08.4791004+08:00;True|2023-08-30T09:06:17.4001684+08:00;True|2023-08-30T08:52:06.9481657+08:00;True|2023-08-29T17:11:33.7851914+08:00;True|2023-08-29T16:58:52.7298807+08:00;True|2023-08-29T15:58:23.4205277+08:00;True|2023-08-29T15:56:40.3534593+08:00;True|2023-08-29T15:54:29.1188567+08:00;True|2023-08-29T15:53:27.9719983+08:00;True|2023-08-29T15:52:38.7670005+08:00;True|2023-08-29T15:51:32.3703092+08:00;True|2023-08-29T15:47:38.5198946+08:00;True|2023-08-29T15:46:17.4698017+08:00;True|2023-08-29T15:42:04.1853400+08:00;True|2023-08-29T15:29:28.1098681+08:00;True|2023-08-29T15:18:40.8587286+08:00;True|2023-08-29T14:47:50.3088948+08:00;True|2023-08-29T14:47:27.6552611+08:00;False|2023-08-28T13:59:37.8725670+08:00;True|2023-08-18T13:23:38.9937084+08:00;True|2023-08-18T10:09:51.5247737+08:00;True|2023-08-18T08:26:21.8473123+08:00;True|2023-08-17T08:31:37.8696349+08:00;True|2023-08-17T08:23:59.5658185+08:00;True|2023-08-17T08:07:38.2174684+08:00;True|2023-08-16T16:49:44.2549852+08:00;True|2023-08-16T16:33:59.9298792+08:00;True|2023-08-16T15:35:29.6092783+08:00;True|2023-08-16T11:17:28.1086751+08:00;True|2023-08-16T11:17:22.3814672+08:00;True|2023-08-16T08:44:16.0941179+08:00;True|2023-08-15T15:29:15.8118269+08:00;True|2023-08-15T14:47:06.4963591+08:00;True|2023-08-11T16:49:35.8718314+08:00;True|2023-08-11T14:22:59.9440967+08:00;True|2023-08-11T14:16:25.0940743+08:00;True|2023-08-11T13:27:25.4148450+08:00;True|2023-08-11T09:08:31.5437265+08:00;True|2023-08-11T09:04:38.4540336+08:00;True|2023-08-10T14:11:07.0042283+08:00;True|2023-08-08T13:48:19.2402267+08:00;True|2023-08-08T13:44:15.6796969+08:00;True|2023-07-27T09:46:14.1491814+08:00;True|2023-07-21T11:13:10.0843656+08:00;True|2023-07-21T10:56:47.5835580+08:00;True|2023-07-21T10:30:33.0113443+08:00;True|2023-07-20T19:16:37.4936135+08:00;True|2023-07-20T19:00:41.0636578+08:00;True|2023-07-19T13:28:27.8671371+08:00;True|2023-07-19T13:23:42.1880500+08:00;True|2023-07-19T13:19:18.7201227+08:00;True|2023-07-19T13:06:38.9897249+08:00;True|2023-07-19T12:13:11.2061059+08:00;True|2023-07-19T11:45:20.0391356+08:00;True|2023-07-19T11:24:02.5425841+08:00;True|2023-07-19T10:32:06.7915754+08:00;True|2023-07-19T09:51:08.4553434+08:00;True|2023-07-19T09:48:11.2977426+08:00;True|2023-07-18T08:47:44.1724897+08:00;True|2023-07-17T16:25:10.8982872+08:00;True|2023-07-17T14:50:44.3708198+08:00;True|2023-07-17T14:20:26.4686898+08:00;True|2023-07-17T14:18:16.6127136+08:00;True|2023-07-17T14:16:34.9116950+08:00;True|2023-07-17T14:14:44.7988846+08:00;True|2023-07-17T14:06:18.1123806+08:00;True|2023-07-17T14:03:38.5290433+08:00;True|2023-07-17T13:48:54.3096778+08:00;True|2023-07-17T13:23:13.6097762+08:00;True|2023-07-17T09:54:25.9375716+08:00;True|2023-07-17T09:40:22.2531559+08:00;True|2023-07-17T09:21:15.0786649+08:00;True|2023-07-17T09:03:37.2081513+08:00;True|2023-07-16T21:20:45.3036514+08:00;True|2023-07-16T21:09:16.1559694+08:00;True|2023-07-16T21:05:22.2504644+08:00;True|2023-07-16T20:41:26.5956030+08:00;True|2023-07-16T20:19:33.5726613+08:00;True|2023-07-16T19:46:38.6493518+08:00;True|2023-07-14T10:33:17.6270692+08:00;True|2023-07-11T14:34:22.8852169+08:00;True|2023-07-11T14:27:22.7851108+08:00;True|2023-07-11T14:13:21.6512172+08:00;True|2023-07-11T14:06:33.9865646+08:00;True|2023-07-11T13:52:46.2830836+08:00;True|2023-07-11T13:38:56.3165889+08:00;True|2023-07-11T13:29:40.9636697+08:00;True|2023-07-11T13:25:23.0633788+08:00;True|2023-07-11T10:17:40.8002359+08:00;True|2023-07-11T10:15:47.5472709+08:00;True|2023-07-11T10:12:25.6440547+08:00;True|2023-07-11T10:07:39.3716167+08:00;True|2023-07-11T09:22:07.4191357+08:00;True|2023-07-04T13:07:10.1209516+08:00;True|2023-06-30T16:11:25.7541580+08:00;True|2023-06-30T15:39:26.6678989+08:00;True|2023-06-30T15:26:40.6581344+08:00;True|2023-06-30T15:12:57.9906312+08:00;True|2023-06-29T16:39:15.6477820+08:00;True|2023-06-28T17:01:51.9542466+08:00;True|2023-06-27T15:03:28.1320450+08:00;True|2023-06-27T13:36:39.6707848+08:00;True|2023-06-26T09:40:01.1754706+08:00;True|2023-06-25T12:16:28.9080024+08:00;True|2023-06-25T11:51:59.9238461+08:00;True|2023-06-25T11:50:29.3100358+08:00;True|2023-06-25T11:29:28.5338563+08:00;True|2023-06-25T09:10:26.2420288+08:00;True|2023-06-25T09:08:15.0702872+08:00;True|2023-06-25T08:43:15.0806611+08:00;True|2023-06-25T08:41:41.8156616+08:00;True|2023-06-25T08:39:30.6818013+08:00;True|2023-06-25T08:38:18.5996529+08:00;True|2023-06-25T08:36:34.1479706+08:00;True|2023-06-25T08:34:53.9856289+08:00;True|2023-06-25T08:31:24.0298080+08:00;True|2023-06-25T08:15:45.7453280+08:00;True|2023-06-25T08:01:52.7609075+08:00;True|2023-06-24T21:25:23.8938665+08:00;True|2023-06-22T03:02:26.7305758+08:00;True|2023-06-22T02:10:48.8222890+08:00;True|2023-06-22T01:57:41.7875184+08:00;True|2023-06-22T01:52:19.4217362+08:00;True|2023-06-21T16:27:15.1464129+08:00;True|2023-06-21T16:11:46.6111817+08:00;True|2023-06-21T13:14:00.6869253+08:00;True|2023-06-21T13:09:28.2689225+08:00;True|2023-06-21T12:24:02.6762426+08:00;True|2023-06-21T12:18:06.2748924+08:00;True|2023-06-21T11:18:02.6754143+08:00;True|2023-06-21T11:08:34.2149469+08:00;True|2023-06-21T08:20:50.0079906+08:00;True|2023-06-20T15:56:03.2638713+08:00;True|2023-06-20T15:48:38.2419545+08:00;True|2023-06-20T15:35:26.6615171+08:00;True|2023-06-20T15:20:31.9284860+08:00;True|2023-06-20T15:18:39.8265469+08:00;True|2023-06-20T15:09:16.7617272+08:00;True|2023-06-20T09:53:23.2658672+08:00;True|2023-06-16T10:00:58.0337616+08:00;True|2023-06-16T09:47:58.8912904+08:00;True|2023-06-16T09:26:36.4914832+08:00;True|2023-06-15T16:22:21.4509393+08:00;True|2023-06-12T13:21:12.0491357+08:00;True|2023-06-12T10:18:32.9287587+08:00;True|2023-06-09T16:22:24.1132267+08:00;True|2023-06-08T18:12:42.4814009+08:00;True|2023-06-08T11:08:48.0533571+08:00;True|2023-06-08T10:41:43.0121701+08:00;False|2023-06-08T10:40:19.2093235+08:00;True|2023-06-06T13:03:50.8124200+08:00;True|2023-06-05T10:12:24.1858209+08:00;True|2023-06-02T17:02:57.5817094+08:00;True|2023-05-26T13:54:40.2272218+08:00;True|2023-05-24T12:43:50.2427994+08:00;True|2023-05-24T12:34:24.3922836+08:00;True|2023-05-24T10:07:19.4995219+08:00;True|2023-05-24T09:21:29.1960080+08:00;True|2023-05-23T22:34:23.3220912+08:00;True|2023-05-23T22:01:14.4175449+08:00;True|2023-05-23T17:02:53.0308400+08:00;True|2023-05-23T16:30:11.7138623+08:00;True|2023-05-23T15:51:50.0152484+08:00;True|2023-05-23T15:50:52.0657433+08:00;True|2023-05-23T15:28:25.5802377+08:00;True|2023-05-23T15:25:56.4633020+08:00;True|2023-05-23T14:52:29.8759921+08:00;True|2023-05-23T14:48:44.6519763+08:00;True|2023-05-20T04:28:10.3108871+08:00;True|2023-05-20T03:56:22.7233820+08:00;True|2023-05-20T03:47:38.4405026+08:00;True|2023-05-20T03:46:40.6056451+08:00;True|2023-05-20T03:44:25.0883888+08:00;True|2023-05-20T03:41:10.1148691+08:00;True|2023-05-20T02:34:14.3757035+08:00;True|2023-05-20T02:27:50.5595075+08:00;True|2023-05-20T02:23:04.2256041+08:00;True|2023-05-20T01:46:59.9534021+08:00;True|2023-05-20T01:42:33.5106065+08:00;True|2023-05-20T01:40:39.6918060+08:00;True|2023-05-20T01:11:47.7436847+08:00;True|2023-05-20T01:03:58.9476094+08:00;True|2023-05-19T22:59:47.4591129+08:00;True|2023-05-19T22:34:44.7988447+08:00;True|2023-05-19T22:24:55.2320279+08:00;True|2023-05-19T21:40:19.5285575+08:00;True|2023-05-19T21:38:21.2073338+08:00;True|2023-05-19T20:54:59.2058809+08:00;True|2023-05-19T16:08:15.0151080+08:00;True|2023-05-19T15:26:16.2836301+08:00;True|2023-05-19T13:09:06.1592914+08:00;True|2023-05-19T12:24:23.6252771+08:00;True|2023-05-19T11:50:53.8948740+08:00;True|2023-05-19T11:43:57.9296933+08:00;True|2023-05-19T10:44:34.9904463+08:00;True|2023-05-19T09:32:02.1216663+08:00;False|2023-05-19T09:31:06.4251757+08:00;True|2023-05-18T22:34:36.5292968+08:00;True|2023-05-18T20:37:59.7940567+08:00;True|2023-05-18T20:36:35.2790349+08:00;True|2023-05-18T20:34:10.7400457+08:00;True|2023-05-18T20:32:43.8790879+08:00;True|2023-05-18T20:31:13.5389643+08:00;True|2023-05-18T20:29:19.6206139+08:00;True|2023-05-18T20:07:25.5074263+08:00;True|2023-05-18T18:19:43.5324315+08:00;True|2023-05-18T18:15:36.4290026+08:00;True|2023-05-18T18:12:31.8703551+08:00;True|2023-05-18T18:10:52.9289531+08:00;True|2023-05-18T18:09:23.9118797+08:00;True|2023-05-18T17:58:30.8068228+08:00;True|2023-05-18T17:56:55.8055382+08:00;False|2023-05-18T17:54:54.7950789+08:00;False|2023-05-18T17:11:18.2325105+08:00;True|2023-05-18T17:09:24.4186482+08:00;True|2023-05-18T17:06:32.0699130+08:00;False|2023-05-18T17:01:41.8164925+08:00;False|2023-05-18T16:59:32.1112741+08:00;True|2023-05-18T16:58:34.1784100+08:00;True|2023-05-18T16:56:36.9460541+08:00;True|2023-05-18T16:55:00.9843495+08:00;True|2023-05-18T16:49:04.0161640+08:00;True|2023-05-18T16:48:28.9011382+08:00;True|2023-05-18T16:44:52.0675900+08:00;False|2023-05-18T16:44:37.3514214+08:00;False|2023-05-18T16:43:23.3343369+08:00;True|2023-05-18T16:41:35.8818611+08:00;True|2023-05-18T16:25:43.5167900+08:00;False|2023-05-18T16:24:46.6646890+08:00;False|2023-05-18T16:19:55.4153618+08:00;False|2023-05-18T16:16:18.0052881+08:00;False|2023-05-18T16:14:32.3377278+08:00;True|2023-05-17T15:43:45.1868569+08:00;True|2023-05-17T15:35:42.2476880+08:00;True|2023-05-17T14:23:28.2390957+08:00;True|2023-05-17T13:54:00.6756387+08:00;True|2023-05-17T13:45:46.1115068+08:00;True|2023-05-17T07:57:34.7129429+08:00;True|2023-05-16T16:04:20.3198005+08:00;False|2023-05-16T16:03:52.0737233+08:00;True|2023-05-16T15:28:45.4945726+08:00;True|2023-05-16T15:14:10.4952128+08:00;True|2023-05-16T15:04:46.5706346+08:00;True|2023-05-16T14:46:48.7034492+08:00;True|2023-05-16T14:45:29.4047499+08:00;True|2023-05-16T14:42:47.3507679+08:00;True|2023-05-16T14:30:47.9199224+08:00;True|2023-05-16T14:29:10.9147184+08:00;True|2023-05-16T14:27:48.3632687+08:00;True|2023-05-16T14:24:44.6240034+08:00;True|2023-05-16T14:19:41.2962188+08:00;True|2023-05-16T13:41:13.3366211+08:00;True|2023-05-16T13:26:44.1532655+08:00;True|2023-05-16T13:23:40.2882422+08:00;True|2023-05-16T13:11:41.5416792+08:00;True|2023-05-16T13:08:41.6341863+08:00;True|2023-05-16T13:04:35.6916867+08:00;True|2023-05-16T13:00:34.6889598+08:00;True|2023-05-16T12:57:48.4561274+08:00;True|2023-05-16T12:50:57.7405833+08:00;True|2023-05-16T12:49:33.8394829+08:00;True|2023-05-16T12:44:28.6906226+08:00;True|2023-05-16T12:41:08.3554032+08:00;True|2023-05-16T12:32:32.3448036+08:00;True|2023-05-16T11:32:04.4504376+08:00;True|2023-05-15T18:39:28.9172042+08:00;True|2023-05-15T18:35:41.5268755+08:00;True|2023-05-15T18:16:16.2900985+08:00;True|2023-04-28T16:24:40.7430596+08:00;False|2023-04-28T16:21:34.8499384+08:00;True|2023-04-28T15:43:40.3023318+08:00;True|2023-04-28T15:41:18.8228620+08:00;True|2023-04-28T14:16:21.1595325+08:00;True|2023-04-28T10:27:55.2150739+08:00;True|2023-04-12T16:25:26.5218825+08:00;True|2023-04-12T15:45:29.3993255+08:00;True|2023-04-12T14:00:18.1960878+08:00;True|2023-04-12T13:16:39.0804178+08:00;True|2023-04-11T11:02:27.5200402+08:00;True|2023-04-11T09:57:11.5903829+08:00;True|2023-04-10T09:58:01.1775220+08:00;True|2023-03-13T11:19:32.0927720+08:00;True|2023-03-13T10:39:50.9250037+08:00;True|2023-03-13T08:54:57.5891390+08:00;True|2023-03-10T09:00:31.2441735+08:00;True|2023-03-08T08:25:11.1877416+08:00;True|2023-03-06T09:18:03.5502956+08:00;True|2023-03-06T09:14:57.8192971+08:00;True|2023-01-11T13:30:27.8190489+08:00;True|2023-01-06T14:29:14.6067256+08:00;True|2022-12-23T17:06:52.0688439+08:00;True|2022-12-23T16:12:04.4155951+08:00;True|2022-12-23T13:35:44.6439326+08:00;True|2022-11-30T08:24:02.9999976+08:00;True|2022-11-30T08:01:51.4579972+08:00;True|2022-11-29T21:32:14.4359673+08:00;True|2022-11-29T19:30:22.9466023+08:00;True|2022-11-29T19:24:30.1630119+08:00;True|2022-11-29T17:31:43.1926801+08:00;True|2022-11-29T17:14:32.5869985+08:00;True|2022-11-29T10:42:57.1877576+08:00;True|2022-11-27T14:40:28.4784748+08:00;True|2022-11-26T20:49:34.2789400+08:00;True|2022-11-26T19:24:58.9988205+08:00;True|2022-11-26T15:33:08.6274944+08:00;True|2022-11-26T14:37:46.3953592+08:00;True|2022-11-26T09:16:41.7487240+08:00;True|2022-11-24T09:49:50.7302637+08:00;True|2022-11-23T16:24:56.5946914+08:00;True|2022-11-23T16:19:57.5570583+08:00;True|2022-11-23T15:05:13.8032246+08:00;True|2022-11-22T20:24:39.7324815+08:00;True|2022-11-22T13:18:16.2143925+08:00;False|2022-11-22T13:12:53.0448580+08:00;True|2022-11-22T11:03:01.7571733+08:00;True|2022-11-21T13:20:11.1961237+08:00;True|2022-11-21T13:13:52.0360749+08:00;True|2022-11-18T15:48:13.0747365+08:00;True|2022-11-18T14:15:54.5626901+08:00;True|2022-11-17T18:41:26.5464503+08:00;True|2022-11-15T13:55:35.3496366+08:00;True|2022-11-15T11:03:23.6773297+08:00;True|2022-11-15T10:58:47.9703720+08:00;True|2022-11-15T10:12:27.8305782+08:00;True|2022-11-15T09:47:26.7480777+08:00;True|2022-11-15T08:55:44.0275263+08:00;True|2022-11-15T08:54:06.6396851+08:00;True|2022-11-15T08:44:18.2013404+08:00;True|2022-11-15T01:16:19.8154538+08:00;True|2022-11-15T01:15:03.7846810+08:00;True|2022-11-15T01:01:11.0318599+08:00;True|2022-11-15T00:30:33.7148460+08:00;True|2022-11-15T00:15:26.5178283+08:00;True|2022-11-14T23:54:32.6128172+08:00;True|2022-11-14T23:26:52.0335380+08:00;True|2022-11-14T22:21:28.0622050+08:00;True|2022-11-14T21:47:43.6964619+08:00;True|2022-11-14T21:41:42.3128804+08:00;True|2022-11-14T21:31:17.2784203+08:00;True|2022-11-14T20:48:20.0380343+08:00;True|2022-11-11T17:24:44.7029993+08:00;True|2022-11-11T16:47:29.3444029+08:00;True|2022-11-11T16:07:26.4718473+08:00;True|2022-11-11T15:52:41.7235701+08:00;True|2022-11-10T15:58:10.8883176+08:00;True|2022-11-10T15:29:59.3113740+08:00;True|2022-11-10T13:34:14.7380132+08:00;True|2022-11-10T10:28:02.1166569+08:00;True|2022-11-09T23:28:25.6401971+08:00;True|2022-11-09T16:20:53.2757536+08:00;True|2022-11-09T16:16:41.3169214+08:00;True|2022-11-09T14:02:55.1802832+08:00;True|2022-11-09T13:57:55.2726154+08:00;True|2022-11-09T13:28:53.2022669+08:00;True|2022-11-09T13:10:58.0740163+08:00;True|2022-11-09T12:59:42.2328933+08:00;True|2022-11-09T11:54:08.0187924+08:00;True|2022-11-09T11:49:32.4296758+08:00;True|2022-11-09T11:34:32.6613370+08:00;True|2022-11-09T11:06:56.9443306+08:00;True|2022-11-06T23:43:44.0833657+08:00;True|2022-11-06T23:29:52.0088244+08:00;True|2022-11-06T22:06:14.7091464+08:00;True|2022-11-06T22:03:25.2696951+08:00;True|2022-11-06T21:58:50.1055520+08:00;True|2022-11-06T21:54:14.0075395+08:00;True|2022-11-06T21:39:30.2652105+08:00;True|2022-11-04T15:54:37.9813194+08:00;True|2022-11-04T15:43:59.7702621+08:00;True|2022-11-04T13:59:29.3941234+08:00;True|2022-11-04T13:44:18.1212719+08:00;True|2022-11-04T13:42:06.1010393+08:00;True|2022-11-04T13:37:01.7814703+08:00;True|2022-11-04T13:35:43.1121709+08:00;True|2022-11-04T13:33:05.1362535+08:00;True|2022-11-04T13:30:11.1113703+08:00;True|2022-11-04T13:28:53.7185382+08:00;True|2022-11-04T13:27:08.0691684+08:00;True|2022-11-04T13:20:46.2297633+08:00;True|2022-11-04T13:17:57.1564250+08:00;True|2022-11-04T13:15:36.3651019+08:00;True|2022-11-04T13:13:44.6635701+08:00;True|2022-11-04T13:12:02.3968306+08:00;True|2022-11-04T13:08:07.7653927+08:00;True|2022-11-04T11:37:44.1975649+08:00;True|2022-11-04T11:36:20.3813848+08:00;True|2022-11-04T11:26:40.9713465+08:00;True|2022-11-04T10:17:36.4269558+08:00;True|2022-11-04T09:47:05.4607111+08:00;True|2022-11-04T09:28:27.9347785+08:00;True|2022-11-04T08:38:38.5253737+08:00;True|2022-11-03T13:31:32.7883545+08:00;False|2022-11-03T13:27:07.8579021+08:00;True|2022-11-03T11:07:07.3903101+08:00;True|2022-11-03T10:54:26.7818816+08:00;True|2022-11-03T10:35:59.1956262+08:00;True|2022-11-03T10:30:07.0651285+08:00;True|2022-11-03T10:01:20.8467911+08:00;True|2022-08-22T11:13:33.9211829+08:00;True|2022-06-17T11:19:24.4893458+08:00;True|2022-06-07T14:44:51.5702202+08:00;True|2022-06-07T14:42:44.8351600+08:00;True|2022-05-17T14:19:55.1158182+08:00;True|2022-05-17T13:25:44.2886247+08:00;True|2022-05-17T10:29:26.6813564+08:00;True|2022-05-17T09:02:49.1742018+08:00;True|2022-05-06T15:13:12.2438900+08:00;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">
@@ -20,12 +20,12 @@
<File Include="bin/BLL.dll">
<publishTime>11/09/2022 16:02:08</publishTime>
<publishTime>11/02/2022 22:03:01</publishTime>
- <publishTime>09/05/2023 08:28:28</publishTime>
+ <publishTime>09/22/2023 11:14:37</publishTime>
</File>
<File Include="bin/BLL.pdb">
<publishTime>11/09/2022 16:02:08</publishTime>
<publishTime>11/02/2022 22:03:01</publishTime>
- <publishTime>09/05/2023 08:28:28</publishTime>
+ <publishTime>09/22/2023 11:14:37</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
@@ -33,12 +33,12 @@
<File Include="bin/DAL.dll">
<publishTime>11/09/2022 16:02:06</publishTime>
<publishTime>11/02/2022 22:02:58</publishTime>
- <publishTime>09/05/2023 08:28:26</publishTime>
+ <publishTime>09/22/2023 11:14:35</publishTime>
</File>
<File Include="bin/DAL.pdb">
<publishTime>11/09/2022 16:02:06</publishTime>
<publishTime>11/02/2022 22:02:58</publishTime>
- <publishTime>09/05/2023 08:28:26</publishTime>
+ <publishTime>09/22/2023 11:14:35</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
@@ -46,12 +46,12 @@
<File Include="bin/DBUtility.dll">
<publishTime>11/02/2022 22:02:56</publishTime>
<publishTime>11/15/2022 13:55:23</publishTime>
- <publishTime>09/05/2023 08:28:23</publishTime>
+ <publishTime>09/22/2023 11:14:31</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
<publishTime>11/09/2022 16:01:58</publishTime>
<publishTime>11/02/2022 22:02:56</publishTime>
- <publishTime>09/05/2023 08:28:23</publishTime>
+ <publishTime>09/22/2023 11:14:31</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -107,12 +107,12 @@
<File Include="bin/Model.dll">
<publishTime>11/09/2022 16:02:01</publishTime>
<publishTime>11/02/2022 22:02:56</publishTime>
- <publishTime>09/05/2023 08:28:23</publishTime>
+ <publishTime>09/22/2023 11:14:32</publishTime>
</File>
<File Include="bin/Model.pdb">
<publishTime>11/09/2022 16:02:01</publishTime>
<publishTime>11/02/2022 22:02:56</publishTime>
- <publishTime>09/05/2023 08:28:23</publishTime>
+ <publishTime>09/22/2023 11:14:32</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>04/06/2023 15:57:02</publishTime>
@@ -147,33 +147,33 @@
<File Include="bin/Pub_Class.dll">
<publishTime>11/09/2022 16:01:56</publishTime>
<publishTime>11/02/2022 22:02:54</publishTime>
- <publishTime>09/05/2023 08:28:21</publishTime>
+ <publishTime>09/22/2023 11:14:30</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
<publishTime>11/09/2022 16:01:56</publishTime>
<publishTime>11/02/2022 22:02:54</publishTime>
- <publishTime>09/05/2023 08:28:21</publishTime>
+ <publishTime>09/22/2023 11:14:30</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
<publishTime>11/09/2022 16:01:57</publishTime>
<publishTime>11/02/2022 22:02:55</publishTime>
- <publishTime>09/05/2023 08:28:22</publishTime>
+ <publishTime>09/22/2023 11:14:30</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
<publishTime>11/09/2022 16:01:57</publishTime>
<publishTime>11/02/2022 22:02:55</publishTime>
- <publishTime>09/05/2023 08:28:22</publishTime>
+ <publishTime>09/22/2023 11:14:30</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>09/05/2023 08:28:22</publishTime>
+ <publishTime>09/22/2023 11:14:31</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
<publishTime>11/09/2022 16:01:57</publishTime>
<publishTime>11/02/2022 22:02:55</publishTime>
- <publishTime>09/05/2023 08:28:22</publishTime>
+ <publishTime>09/22/2023 11:14:31</publishTime>
</File>
<File Include="bin/stdole.dll">
<publishTime>05/09/2021 13:35:37</publishTime>
@@ -286,7 +286,7 @@
<File Include="bin/WebAPI.dll">
<publishTime>11/14/2022 11:23:59</publishTime>
<publishTime>11/02/2022 22:03:04</publishTime>
- <publishTime>09/05/2023 08:28:33</publishTime>
+ <publishTime>09/22/2023 11:14:44</publishTime>
</File>
<File Include="bin/WebAPI.dll.config">
<publishTime>12/15/2021 17:59:43</publishTime>
@@ -294,7 +294,7 @@
<File Include="bin/WebAPI.pdb">
<publishTime>11/14/2022 11:23:59</publishTime>
<publishTime>11/02/2022 22:03:04</publishTime>
- <publishTime>09/05/2023 08:28:33</publishTime>
+ <publishTime>09/22/2023 11:14:44</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -503,7 +503,7 @@
<File Include="Web.config">
<publishTime>11/14/2022 11:24:08</publishTime>
<publishTime>11/02/2022 22:03:20</publishTime>
- <publishTime>09/05/2023 08:28:42</publishTime>
+ <publishTime>09/22/2023 11:14:49</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 408dd29..873af06 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -593,6 +593,7 @@
<Compile Include="Controllers\椤圭洰绠＄悊\涓氱哗鎸囨爣\PM_YearEmployeeMoneyBillController.cs" />
<Compile Include="Controllers\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskBillController.cs" />
<Compile Include="Controllers\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_ProjectBillController.cs" />
+ <Compile Include="Controllers\椤圭洰绠＄悊\鎶ヨ〃鍒嗘瀽\PM_ReportController.cs" />
<Compile Include="Controllers\椤圭洰绠＄悊\椤圭洰闃舵\Gy_ProjectStageController.cs" />
<Compile Include="Dapper\SqlHelper.cs" />
<Compile Include="Dapper\SqlPools.cs" />
--
Gitblit v1.9.1