From bbb7326dbc1b92f05cc8eff656586a743ba21733 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期二, 01 三月 2022 17:51:59 +0800
Subject: [PATCH] 新增核算方式组+工资运算
---
BaseSet/公用资料/生产基础资料/Gy_Process.cs | 73 ++
WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs | 837 ++++++++++++++++++++++++++
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 150 ++--
WebAPI/Controllers/CJGL/Cj_ComplementGoodsBillController.cs | 53 +
WorkM/报表分析/Pt_RadiumCarvingCodeBillList.designer.cs | 99 ++
WebAPI/Controllers/CJGL/Sc_WorkBillAutoSortBillMainController.cs | 53 +
WebAPI/Controllers/仓存管理/调拨盘点/Kf_MoveStockRequestBillController.cs | 11
BaseSet/公用资料/生产基础资料/Gy_Process.resx | 116 ++-
WebAPI/ListModels.cs | 2
WorkM/报表分析/Pt_RadiumCarvingCodeBillList.cs | 15
WebAPI/Controllers/CJGL/Cj_CallGoodsBillMainController.cs | 54 +
WebAPI/Models/HSouceOrderList.cs | 65 ++
WarM/条码打印/Gy_BarCodeBill.designer.cs | 4
DAL/基础资料/公用基础资料/ClsGy_Process_Ctl.cs | 6
DAL/基础资料/公用基础资料/ClsGy_Process_View.cs | 2
Model/基础资料/基础资料/ClsGy_Process_Model.cs | 4
WebAPI/WebAPI.csproj | 10
BaseSet/公用资料/生产基础资料/Gy_Process.designer.cs | 186 ++++-
WebAPI/Controllers/CJGL/Cj_CallGoodsBillBackController.cs | 53 +
WebAPI/Models/HBarCodeList.cs | 66 ++
WebAPI/Models/json.cs | 3
21 files changed, 1,655 insertions(+), 207 deletions(-)
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.cs" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.cs"
index bc9b30b..85ab8e1 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.cs"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.cs"
@@ -513,6 +513,26 @@
txtHBadCountDevelopWHID.Text = "";
}
//
+ if (oWH.GetInfoByID(oProcHlp.omodel.HWWBadWHID))
+ {
+ txtHWWBadWHID.Text = oWH.omodel.HName;
+ txtHWWBadWHID.Tag = oWH.omodel.HItemID.ToString();
+ }
+ else
+ {
+ txtHWWBadWHID.Text = "";
+ }
+ //
+ if (oWH.GetInfoByID(oProcHlp.omodel.HWWWasterWHID))
+ {
+ txtHWWWasterWHID.Text = oWH.omodel.HName;
+ txtHWWWasterWHID.Tag = oWH.omodel.HItemID.ToString();
+ }
+ else
+ {
+ txtHWWWasterWHID.Text = "";
+ }
+ //
txtHNumber.Text = oProcHlp.omodel.HNumber.ToString();
txtHRemark.Text = oProcHlp.omodel.HRemark;
txtHProcCheckNote.Text = oProcHlp.omodel.HProcCheckNote;
@@ -620,6 +640,8 @@
oProc.oModel.HBadWHID = DBUtility.ClsPub.isLong(txtHBadWHID.Tag.ToString());
oProc.oModel.HWasterWHID = DBUtility.ClsPub.isLong(txtHWasterWHID.Tag.ToString());
oProc.oModel.HBadCountDevelopWHID = DBUtility.ClsPub.isLong(txtHBadCountDevelopWHID.Tag.ToString());
+ oProc.oModel.HWWBadWHID = DBUtility.ClsPub.isLong(txtHWWBadWHID.Tag.ToString());
+ oProc.oModel.HWWWasterWHID = DBUtility.ClsPub.isLong(txtHWWWasterWHID.Tag.ToString());
oProc.oModel.HTypeFlow = chkHTypeFlow.Checked;
oProc.oModel.HTypeCount = chkHTypeCount.Checked;
oProc.oModel.HAutoTrunFlag = chkHAutoTrunFlag.Checked;
@@ -785,5 +807,56 @@
}
}
+ //濮斿涓嶈壇鍝佷粨
+ private void cmdHWWBadWHID_Click(object sender, EventArgs e)
+ {
+ DAL.ClsGy_Warehouse_View oWare = new DAL.ClsGy_Warehouse_View();
+ if (oWare.RefreshView())
+ {
+ this.txtHWWBadWHID.Text = oWare.oModel.HName;
+ this.txtHWWBadWHID.Tag = oWare.oModel.HItemID.ToString();
+ }
+ else
+ {
+ this.txtHWWBadWHID.Text = "";
+ }
+ }
+
+ private void txtHWWBadWHID_TextChanged(object sender, EventArgs e)
+ {
+ if (txtHWWBadWHID.Text.Length == 0)
+ {
+ txtHWWBadWHID.Tag = "0";
+ }
+ }
+
+ //濮斿鎶ュ簾浠�
+ private void cmdHWWWasterWHID_Click(object sender, EventArgs e)
+ {
+ DAL.ClsGy_Warehouse_View oWare = new DAL.ClsGy_Warehouse_View();
+ if (oWare.RefreshView())
+ {
+ this.txtHWWWasterWHID.Text = oWare.oModel.HName;
+ this.txtHWWWasterWHID.Tag = oWare.oModel.HItemID.ToString();
+ }
+ else
+ {
+ this.txtHWWWasterWHID.Text = "";
+ }
+ }
+
+ private void txtHWWWasterWHID_TextChanged(object sender, EventArgs e)
+ {
+ if (txtHWWWasterWHID.Text.Length == 0)
+ {
+ txtHWWWasterWHID.Tag = "0";
+ }
+ }
+
+
+
+
+
+
}
}
\ No newline at end of file
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.designer.cs" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.designer.cs"
index 9a3c0cb..35b5ee5 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.designer.cs"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.designer.cs"
@@ -30,7 +30,7 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Gy_Process));
- System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("椤圭洰");
+ System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("椤圭洰");
this.ToolBar = new System.Windows.Forms.ToolStrip();
this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
this.dc = new System.Windows.Forms.ToolStripButton();
@@ -58,6 +58,9 @@
this.tabPage1 = new System.Windows.Forms.TabPage();
this.grdMain = new System.Windows.Forms.DataGridView();
this.tabPage2 = new System.Windows.Forms.TabPage();
+ this.txtHBadCountDevelopWHID = new System.Windows.Forms.TextBox();
+ this.cmdHBadCountDevelopWHID = new System.Windows.Forms.Button();
+ this.label17 = new System.Windows.Forms.Label();
this.cmdHWasterWHID = new System.Windows.Forms.Button();
this.label16 = new System.Windows.Forms.Label();
this.txtHWasterWHID = new System.Windows.Forms.TextBox();
@@ -107,9 +110,12 @@
this.panel1 = new System.Windows.Forms.Panel();
this.cmdLoadTree = new System.Windows.Forms.Button();
this.label3 = new System.Windows.Forms.Label();
- this.cmdHBadCountDevelopWHID = new System.Windows.Forms.Button();
- this.label17 = new System.Windows.Forms.Label();
- this.txtHBadCountDevelopWHID = new System.Windows.Forms.TextBox();
+ this.cmdHWWWasterWHID = new System.Windows.Forms.Button();
+ this.label18 = new System.Windows.Forms.Label();
+ this.txtHWWWasterWHID = new System.Windows.Forms.TextBox();
+ this.cmdHWWBadWHID = new System.Windows.Forms.Button();
+ this.label19 = new System.Windows.Forms.Label();
+ this.txtHWWBadWHID = new System.Windows.Forms.TextBox();
this.ToolBar.SuspendLayout();
this.stTab.SuspendLayout();
this.tabPage1.SuspendLayout();
@@ -399,7 +405,7 @@
this.tabPage1.Controls.Add(this.grdMain);
this.tabPage1.Location = new System.Drawing.Point(4, 22);
this.tabPage1.Name = "tabPage1";
- this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(729, 469);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "鍒楄〃瑙嗗浘";
@@ -425,6 +431,12 @@
//
this.tabPage2.BackColor = System.Drawing.SystemColors.Control;
this.tabPage2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.tabPage2.Controls.Add(this.txtHWWBadWHID);
+ this.tabPage2.Controls.Add(this.cmdHWWWasterWHID);
+ this.tabPage2.Controls.Add(this.label18);
+ this.tabPage2.Controls.Add(this.txtHWWWasterWHID);
+ this.tabPage2.Controls.Add(this.cmdHWWBadWHID);
+ this.tabPage2.Controls.Add(this.label19);
this.tabPage2.Controls.Add(this.txtHBadCountDevelopWHID);
this.tabPage2.Controls.Add(this.cmdHBadCountDevelopWHID);
this.tabPage2.Controls.Add(this.label17);
@@ -473,10 +485,43 @@
this.tabPage2.Controls.Add(this.label1);
this.tabPage2.Location = new System.Drawing.Point(4, 22);
this.tabPage2.Name = "tabPage2";
- this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(729, 469);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "鍗曞紶瑙嗗浘";
+ //
+ // txtHBadCountDevelopWHID
+ //
+ this.txtHBadCountDevelopWHID.BackColor = System.Drawing.SystemColors.Window;
+ this.txtHBadCountDevelopWHID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHBadCountDevelopWHID.Location = new System.Drawing.Point(77, 199);
+ this.txtHBadCountDevelopWHID.Name = "txtHBadCountDevelopWHID";
+ this.txtHBadCountDevelopWHID.Size = new System.Drawing.Size(144, 21);
+ this.txtHBadCountDevelopWHID.TabIndex = 226;
+ this.txtHBadCountDevelopWHID.Tag = "0";
+ this.txtHBadCountDevelopWHID.TextChanged += new System.EventHandler(this.txtHBadCountDevelopWHID_TextChanged);
+ //
+ // cmdHBadCountDevelopWHID
+ //
+ this.cmdHBadCountDevelopWHID.BackColor = System.Drawing.Color.Transparent;
+ this.cmdHBadCountDevelopWHID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHBadCountDevelopWHID.Image")));
+ this.cmdHBadCountDevelopWHID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
+ this.cmdHBadCountDevelopWHID.Location = new System.Drawing.Point(221, 198);
+ this.cmdHBadCountDevelopWHID.Name = "cmdHBadCountDevelopWHID";
+ this.cmdHBadCountDevelopWHID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHBadCountDevelopWHID.TabIndex = 227;
+ this.cmdHBadCountDevelopWHID.UseVisualStyleBackColor = false;
+ this.cmdHBadCountDevelopWHID.Click += new System.EventHandler(this.cmdHBadCountDevelopWHID_Click);
+ //
+ // label17
+ //
+ this.label17.AutoSize = true;
+ this.label17.ForeColor = System.Drawing.Color.Black;
+ this.label17.Location = new System.Drawing.Point(2, 203);
+ this.label17.Name = "label17";
+ this.label17.Size = new System.Drawing.Size(77, 12);
+ this.label17.TabIndex = 225;
+ this.label17.Text = "鐮斿彂涓嶈壇鍝佷粨";
//
// cmdHWasterWHID
//
@@ -494,7 +539,7 @@
//
this.label16.AutoSize = true;
this.label16.ForeColor = System.Drawing.Color.Black;
- this.label16.Location = new System.Drawing.Point(284, 176);
+ this.label16.Location = new System.Drawing.Point(296, 176);
this.label16.Name = "label16";
this.label16.Size = new System.Drawing.Size(41, 12);
this.label16.TabIndex = 222;
@@ -547,7 +592,7 @@
// txtHProcCheckNote
//
this.txtHProcCheckNote.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHProcCheckNote.Location = new System.Drawing.Point(77, 294);
+ this.txtHProcCheckNote.Location = new System.Drawing.Point(77, 321);
this.txtHProcCheckNote.Multiline = true;
this.txtHProcCheckNote.Name = "txtHProcCheckNote";
this.txtHProcCheckNote.Size = new System.Drawing.Size(431, 60);
@@ -556,7 +601,7 @@
// label14
//
this.label14.AutoSize = true;
- this.label14.Location = new System.Drawing.Point(19, 298);
+ this.label14.Location = new System.Drawing.Point(19, 325);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(53, 36);
this.label14.TabIndex = 217;
@@ -654,7 +699,7 @@
// chkHAutoTrunFlag
//
this.chkHAutoTrunFlag.AutoSize = true;
- this.chkHAutoTrunFlag.Location = new System.Drawing.Point(335, 361);
+ this.chkHAutoTrunFlag.Location = new System.Drawing.Point(335, 388);
this.chkHAutoTrunFlag.Name = "chkHAutoTrunFlag";
this.chkHAutoTrunFlag.Size = new System.Drawing.Size(72, 16);
this.chkHAutoTrunFlag.TabIndex = 205;
@@ -677,7 +722,7 @@
//
this.label9.AutoSize = true;
this.label9.ForeColor = System.Drawing.Color.Black;
- this.label9.Location = new System.Drawing.Point(284, 149);
+ this.label9.Location = new System.Drawing.Point(278, 149);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(59, 12);
this.label9.TabIndex = 202;
@@ -731,7 +776,7 @@
// chkHTypeCount
//
this.chkHTypeCount.AutoSize = true;
- this.chkHTypeCount.Location = new System.Drawing.Point(250, 361);
+ this.chkHTypeCount.Location = new System.Drawing.Point(250, 388);
this.chkHTypeCount.Name = "chkHTypeCount";
this.chkHTypeCount.Size = new System.Drawing.Size(72, 16);
this.chkHTypeCount.TabIndex = 197;
@@ -741,7 +786,7 @@
// chkHTypeFlow
//
this.chkHTypeFlow.AutoSize = true;
- this.chkHTypeFlow.Location = new System.Drawing.Point(164, 361);
+ this.chkHTypeFlow.Location = new System.Drawing.Point(164, 388);
this.chkHTypeFlow.Name = "chkHTypeFlow";
this.chkHTypeFlow.Size = new System.Drawing.Size(72, 16);
this.chkHTypeFlow.TabIndex = 196;
@@ -818,7 +863,7 @@
//
// cmdCancel
//
- this.cmdCancel.Location = new System.Drawing.Point(457, 390);
+ this.cmdCancel.Location = new System.Drawing.Point(457, 417);
this.cmdCancel.Name = "cmdCancel";
this.cmdCancel.Size = new System.Drawing.Size(52, 23);
this.cmdCancel.TabIndex = 16;
@@ -828,7 +873,7 @@
//
// cmdOK
//
- this.cmdOK.Location = new System.Drawing.Point(398, 390);
+ this.cmdOK.Location = new System.Drawing.Point(398, 417);
this.cmdOK.Name = "cmdOK";
this.cmdOK.Size = new System.Drawing.Size(52, 23);
this.cmdOK.TabIndex = 15;
@@ -839,7 +884,7 @@
// chkHStopflag
//
this.chkHStopflag.AutoSize = true;
- this.chkHStopflag.Location = new System.Drawing.Point(77, 361);
+ this.chkHStopflag.Location = new System.Drawing.Point(77, 388);
this.chkHStopflag.Name = "chkHStopflag";
this.chkHStopflag.Size = new System.Drawing.Size(72, 16);
this.chkHStopflag.TabIndex = 12;
@@ -849,7 +894,7 @@
// txtHRemark
//
this.txtHRemark.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHRemark.Location = new System.Drawing.Point(77, 227);
+ this.txtHRemark.Location = new System.Drawing.Point(77, 254);
this.txtHRemark.Multiline = true;
this.txtHRemark.Name = "txtHRemark";
this.txtHRemark.Size = new System.Drawing.Size(431, 60);
@@ -858,7 +903,7 @@
// label5
//
this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(19, 227);
+ this.label5.Location = new System.Drawing.Point(19, 254);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(53, 12);
this.label5.TabIndex = 9;
@@ -934,13 +979,13 @@
this.tv.LineColor = System.Drawing.Color.Navy;
this.tv.Location = new System.Drawing.Point(0, 23);
this.tv.Name = "tv";
- treeNode2.ForeColor = System.Drawing.Color.Black;
- treeNode2.Name = "tjbb";
- treeNode2.NodeFont = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- treeNode2.StateImageKey = "鏂囦欢澶�1.ico";
- treeNode2.Text = "椤圭洰";
+ treeNode1.ForeColor = System.Drawing.Color.Black;
+ treeNode1.Name = "tjbb";
+ treeNode1.NodeFont = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ treeNode1.StateImageKey = "鏂囦欢澶�1.ico";
+ treeNode1.Text = "椤圭洰";
this.tv.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
- treeNode2});
+ treeNode1});
this.tv.SelectedImageIndex = 1;
this.tv.Size = new System.Drawing.Size(136, 472);
this.tv.TabIndex = 16;
@@ -977,38 +1022,71 @@
this.label3.TabIndex = 0;
this.label3.Text = "宸ュ簭璧勬枡-姝ｅ湪娴忚";
//
- // cmdHBadCountDevelopWHID
+ // cmdHWWWasterWHID
//
- this.cmdHBadCountDevelopWHID.BackColor = System.Drawing.Color.Transparent;
- this.cmdHBadCountDevelopWHID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHBadCountDevelopWHID.Image")));
- this.cmdHBadCountDevelopWHID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHBadCountDevelopWHID.Location = new System.Drawing.Point(221, 198);
- this.cmdHBadCountDevelopWHID.Name = "cmdHBadCountDevelopWHID";
- this.cmdHBadCountDevelopWHID.Size = new System.Drawing.Size(22, 22);
- this.cmdHBadCountDevelopWHID.TabIndex = 227;
- this.cmdHBadCountDevelopWHID.UseVisualStyleBackColor = false;
- this.cmdHBadCountDevelopWHID.Click += new System.EventHandler(this.cmdHBadCountDevelopWHID_Click);
+ this.cmdHWWWasterWHID.BackColor = System.Drawing.Color.Transparent;
+ this.cmdHWWWasterWHID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHWWWasterWHID.Image")));
+ this.cmdHWWWasterWHID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
+ this.cmdHWWWasterWHID.Location = new System.Drawing.Point(487, 225);
+ this.cmdHWWWasterWHID.Name = "cmdHWWWasterWHID";
+ this.cmdHWWWasterWHID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHWWWasterWHID.TabIndex = 233;
+ this.cmdHWWWasterWHID.UseVisualStyleBackColor = false;
+ this.cmdHWWWasterWHID.Click += new System.EventHandler(this.cmdHWWWasterWHID_Click);
//
- // label17
+ // label18
//
- this.label17.AutoSize = true;
- this.label17.ForeColor = System.Drawing.Color.Black;
- this.label17.Location = new System.Drawing.Point(1, 203);
- this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(77, 12);
- this.label17.TabIndex = 225;
- this.label17.Text = "鐮斿彂涓嶈壇鍝佷粨";
+ this.label18.AutoSize = true;
+ this.label18.ForeColor = System.Drawing.Color.Black;
+ this.label18.Location = new System.Drawing.Point(272, 230);
+ this.label18.Name = "label18";
+ this.label18.Size = new System.Drawing.Size(65, 12);
+ this.label18.TabIndex = 231;
+ this.label18.Text = "濮斿鎶ュ簾浠�";
//
- // txtHBadCountDevelopWHID
+ // txtHWWWasterWHID
//
- this.txtHBadCountDevelopWHID.BackColor = System.Drawing.SystemColors.Window;
- this.txtHBadCountDevelopWHID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHBadCountDevelopWHID.Location = new System.Drawing.Point(77, 199);
- this.txtHBadCountDevelopWHID.Name = "txtHBadCountDevelopWHID";
- this.txtHBadCountDevelopWHID.Size = new System.Drawing.Size(144, 21);
- this.txtHBadCountDevelopWHID.TabIndex = 226;
- this.txtHBadCountDevelopWHID.Tag = "0";
- this.txtHBadCountDevelopWHID.TextChanged += new System.EventHandler(this.txtHBadCountDevelopWHID_TextChanged);
+ this.txtHWWWasterWHID.BackColor = System.Drawing.SystemColors.Window;
+ this.txtHWWWasterWHID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHWWWasterWHID.Location = new System.Drawing.Point(343, 226);
+ this.txtHWWWasterWHID.Name = "txtHWWWasterWHID";
+ this.txtHWWWasterWHID.Size = new System.Drawing.Size(144, 21);
+ this.txtHWWWasterWHID.TabIndex = 232;
+ this.txtHWWWasterWHID.Tag = "0";
+ this.txtHWWWasterWHID.TextChanged += new System.EventHandler(this.txtHWWWasterWHID_TextChanged);
+ //
+ // cmdHWWBadWHID
+ //
+ this.cmdHWWBadWHID.BackColor = System.Drawing.Color.Transparent;
+ this.cmdHWWBadWHID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHWWBadWHID.Image")));
+ this.cmdHWWBadWHID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
+ this.cmdHWWBadWHID.Location = new System.Drawing.Point(221, 225);
+ this.cmdHWWBadWHID.Name = "cmdHWWBadWHID";
+ this.cmdHWWBadWHID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHWWBadWHID.TabIndex = 230;
+ this.cmdHWWBadWHID.UseVisualStyleBackColor = false;
+ this.cmdHWWBadWHID.Click += new System.EventHandler(this.cmdHWWBadWHID_Click);
+ //
+ // label19
+ //
+ this.label19.AutoSize = true;
+ this.label19.ForeColor = System.Drawing.Color.Black;
+ this.label19.Location = new System.Drawing.Point(2, 230);
+ this.label19.Name = "label19";
+ this.label19.Size = new System.Drawing.Size(77, 12);
+ this.label19.TabIndex = 228;
+ this.label19.Text = "濮斿涓嶈壇鍝佷粨";
+ //
+ // txtHWWBadWHID
+ //
+ this.txtHWWBadWHID.BackColor = System.Drawing.SystemColors.Window;
+ this.txtHWWBadWHID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHWWBadWHID.Location = new System.Drawing.Point(77, 226);
+ this.txtHWWBadWHID.Name = "txtHWWBadWHID";
+ this.txtHWWBadWHID.Size = new System.Drawing.Size(144, 21);
+ this.txtHWWBadWHID.TabIndex = 229;
+ this.txtHWWBadWHID.Tag = "0";
+ this.txtHWWBadWHID.TextChanged += new System.EventHandler(this.txtHWWBadWHID_TextChanged);
//
// Gy_Process
//
@@ -1121,5 +1199,11 @@
private System.Windows.Forms.TextBox txtHBadCountDevelopWHID;
private System.Windows.Forms.Button cmdHBadCountDevelopWHID;
private System.Windows.Forms.Label label17;
+ private System.Windows.Forms.TextBox txtHWWBadWHID;
+ private System.Windows.Forms.Button cmdHWWWasterWHID;
+ private System.Windows.Forms.Label label18;
+ private System.Windows.Forms.TextBox txtHWWWasterWHID;
+ private System.Windows.Forms.Button cmdHWWBadWHID;
+ private System.Windows.Forms.Label label19;
}
}
\ No newline at end of file
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.resx" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.resx"
index fe1e873..e5d29aa 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.resx"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.resx"
@@ -409,51 +409,81 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACE
- CgAAAk1TRnQBSQFMAgEBAgEAAXQBAQF0AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+ CgAAAk1TRnQBSQFMAgEBAgEAAXwBAQF8AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
AwABEAMAAQEBAAEgBgABEBIAgP+AAAj/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
AwAB/wMAAf8DAAH/AwAB/wMADf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
- AwAB/wMAAf8DAAH/gAAE/wEAATgBigH/AQMBkAG5Af8BAwGQAbkB/wEDAZABuQH/AQMBkAG5Af8BAwGQ
- AbkB/wEDAZABuQH/AQMBkAG5Af8BAwGQAbkB/wEDAZABuQH/AQMBkAG5Af8BAwGQAbkB/wEDAZABuQH/
- AQMBkAG5Af8DAAn/AQABOAGKAf8BAAE4AYoB/wEAATgBigH/AQABOAGKAf8BAAE4AYoB/wEAATgBigH/
- AQABOAGKAf8BAAE4AYoB/wEAATgBigH/AQABOAGKAf8BAAE4AYoB/wEAATgBigH/AwAB/wMAAf+AAAT/
- AQABOAGKAf8B0QH2Av8BSgHaAfQB/wE/AdMB8QH/ATQBywHvAf8BKgHEAe0B/wEgAb4B6wH/ARYBuAHo
- Af8BCgGwAecB/wEAAakB5AH/AQABowHiAf8BAAGeAeAB/wEAAZoB3wH/AQMBkAG5Af8DAAn/AQABOAGK
- Af8B0QH2Av8BHwG+AesB/wEZAbkB6QH/AREBtAHnAf8BCQGwAeYB/wECAasB5AH/AQABpwHjAf8BAAGi
- AeEB/wEAAZ8B4QH/AQMBkAG5Af8BAAE4AYoB/wMAAf8DAAH/gAAE/wEAATgBigH/AdEB9gL/AVAB3gH1
- Af8BRQHWAfMB/wE7AdAB8QH/ATAByQHuAf8BJgHCAewB/wEbAbwB6gH/AREBtAHnAf8BBgGtAeUB/wEA
- AaYB4wH/AQABoQHhAf8BAAGdAeAB/wEDAZABuQH/AwAF/wEAATgBigH/AdEB9gL/ASoBxQHuAf8BJAHB
- AesB/wEdAbwB6wH/ARUBtwHoAf8BDgGyAecB/wEGAa4B5QH/AQABqQHkAf8BAAGlAeIB/wEAAaEB4QH/
- AQMBkAG5Af8DAAH/AQABOAGKAf8DAAH/gAAE/wEAATgBigH/AdEB9gL/AYEB4QH3Af8BTAHaAfQB/wFB
- AdQB8gH/ATYBzAHvAf8BLAHGAe4B/wEiAcAB6wH/ARcBuQHpAf8BDQGyAeYB/wECAasB5QH/AQABpQHi
- Af8BAAGfAeEB/wEDAZABuQH/AwAF/wEAATgBigH/AdEB9gL/AS8ByAHuAf8BKAHEAewB/wEhAb8B6wH/
- ARoBuwHqAf8BEwG2AegB/wELAbAB5wH/AQQBrAHlAf8BAAGnAeMB/wEAAaMB4gH/AQABOAGKAf8DAAH/
- AQABOAGKAf8DAAH/gAAE/wEAATgBigH/AdEB9gL/AYYB5QH3Af8BUgHfAfUB/wFHAdgB8wH/AT0B0QHx
- Af8BMgHKAe8B/wEoAcQB7QH/AR4BvQHqAf8BEwG2AegB/wEIAa8B5QH/AQABqAHjAf8BAAGiAeEB/wED
- AZABuQH/AwAB/wEAATgBigH/AdEB9gL/ATsBzwHxAf8BNAHLAe8B/wEsAccB7gH/ASYBwgHsAf8BHwG9
- AeoB/wEXAbkB6QH/ARABtAHnAf8BCQGwAeYB/wEBAaoB5QH/AQMBkAG5Af8DAAH/AQMBkAG5Af8BAwGQ
- AbkB/wMAAf+AAAT/AQABOAGKAf8B0QH2Av8BjAHoAfkB/wGDAeIB9wH/AU4B3AH1Af8BRAHVAfIB/wE4
- Ac4B8AH/AS4ByAHuAf8BJAHBAewB/wEaAboB6gH/AQ4BswHnAf8BBAGsAeUB/wEAAaYB4wH/AQMBkAG5
- Af8DAAH/AQABOAGKAf8B0QH2Av8BQAHTAfIB/wE4Ac4B8AH/ATEBygHuAf8BKgHFAe0B/wEkAcEB6wH/
- ARwBvAHqAf8BFQG3AegB/wENAbIB5gH/AQYBrgHlAf8BAwGQAbkB/wMAAf8BAwGQAbkB/wEDAZABuQH/
- AwAB/4AABP8BAAE4AYoB/wHRAfYC/wGQAesB+QH/AYgB5gH4Af8BVAHgAfYB/wFKAdkB8wH/AT8B0wHy
- Af8BNAHLAe8B/wEqAcUB7QH/ASABvgHrAf8BFgG4AekB/wEKAbAB5gH/AQABqQHkAf8BAwGQAbkB/wMA
- Af8BAAE4AYoB/wEAATgBigH/AQABOAGKAf8BAAE4AYoB/wEAATgBigH/AQABOAGKAf8BAAE4AYoB/wEA
- ATgBigH/AQABOAGKAf8BAAE4AYoB/wEAATgBigH/AQABOAGKAf8BAwGQAbkB/wExAckB7gH/AQMBkAG5
- Af8DAAH/gAAE/wEAATgBigH/AdEB9gL/AZMB7QH6Af8BjQHpAfkB/wGFAeQB9wH/AVEB3gH1Af8BRQHW
- AfMB/wE7Ac8B8QH/ATAByQHvAf8BJgHCAewB/wEcAbsB6QH/AREBtQHnAf8BBgGtAeYB/wEDAZABuQH/
- AwAF/wEAATgBigH/AdEB9gL/AZEB7AH6Af8BjQHpAfkB/wGKAecB+AH/AYYB5AH4Af8BgQHhAfcB/wFR
- Ad0B9QH/AUsB2gHzAf8BRQHXAfMB/wFAAdMB8QH/AToBzwHxAf8BNAHLAe8B/wEDAZABuQH/AwAB/4AA
- BP8BAAE4AYoB/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHR
- AfYC/wHRAfYC/wHRAfYC/wHRAfYC/wEDAZABuQH/AwAF/wEAATgBigH/AdEB9gL/AZMB7QH6Af8BkAHr
- AfkB/wGMAekB+QH/AYgB5gH4Af8BhAHjAfcB/wFUAeAB9gH/AU8B3AH1Af8B0QH2Av8B0QH2Av8B0QH2
- Av8B0QH2Av8BAwGQAbkB/wMAAf+AAAT/AQABOAGKAf8BFgGoAdMB/wEWAagB0wH/ARYBqAHTAf8BFgGo
- AdMB/wEWAagB0wH/ARYBqAHTAf8BFgGoAdMB/wEAATgBigH/AQABOAGKAf8BAAE4AYoB/wEAATgBigH/
- AQABOAGKAf8BAAE4AYoJ/wEAATgBigH/AdEB9gL/AZMB7QH6Af8BkgHsAfoB/wGPAesB+QH/AYsB6AH4
- Af8BhwHlAfcB/wHRAfYC/wEAATgBigH/AQABOAGKAf8BAAE4AYoB/wEAATgBigH/AQABOAGKAf8BAAE4
- AYoF/4AACP8BAAE4AYoB/wG4AegB9QH/Ac4D/wHOA/8BnAP/AZwD/wEAATgBigH/AwAh/wEAATgBigH/
- AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AQABOAGKHf+AAAz/AQABOAGKAf8BAAE4AYoB/wEA
- ATgBigH/AQABOAGKAf8BAAE4AYoB/wMAKf8BAAE4AYoB/wEAATgBigH/AQABOAGKAf8BAAE4AYoB/wEA
- ATgBiiH/gACA/4AAgP+AAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/gQAL
+ AwAB/wMAAf8DAAH/gAAE/wEAATcBigH/AQIBkAG5Af8BAgGQAbkB/wECAZABuQH/AQIBkAG5Af8BAgGQ
+ AbkB/wECAZABuQH/AQIBkAG5Af8BAgGQAbkB/wECAZABuQH/AQIBkAG5Af8BAgGQAbkB/wECAZABuQH/
+ AQIBkAG5Af8DAAn/AQABNwGKAf8BAAE3AYoB/wEAATcBigH/AQABNwGKAf8BAAE3AYoB/wEAATcBigH/
+ AQABNwGKAf8BAAE3AYoB/wEAATcBigH/AQABNwGKAf8BAAE3AYoB/wEAATcBigH/AwAB/wMAAf+AAAT/
+ AQABNwGKAf8B0QH2Av8BSQHaAfQB/wE+AdMB8QH/ATMBywHvAf8BKQHEAe0B/wEfAb4B6wH/ARUBuAHo
+ Af8BCQGwAecB/wEAAakB5AH/AQABowHiAf8BAAGeAeAB/wEAAZoB3wH/AQIBkAG5Af8DAAn/AQABNwGK
+ Af8B0QH2Av8BHgG+AesB/wEYAbkB6QH/ARABtAHnAf8BCAGwAeYB/wEBAasB5AH/AQABpwHjAf8BAAGi
+ AeEB/wEAAZ8B4QH/AQIBkAG5Af8BAAE3AYoB/wMAAf8DAAH/gAAE/wEAATcBigH/AdEB9gL/AU8B3gH1
+ Af8BRAHWAfMB/wE6AdAB8QH/AS8ByQHuAf8BJQHCAewB/wEaAbwB6gH/ARABtAHnAf8BBQGtAeUB/wEA
+ AaYB4wH/AQABoQHhAf8BAAGdAeAB/wECAZABuQH/AwAF/wEAATcBigH/AdEB9gL/ASkBxQHuAf8BIwHB
+ AesB/wEcAbwB6wH/ARQBtwHoAf8BDQGyAecB/wEFAa4B5QH/AQABqQHkAf8BAAGlAeIB/wEAAaEB4QH/
+ AQIBkAG5Af8DAAH/AQABNwGKAf8DAAH/gAAE/wEAATcBigH/AdEB9gL/AYEB4QH3Af8BSwHaAfQB/wFA
+ AdQB8gH/ATUBzAHvAf8BKwHGAe4B/wEhAcAB6wH/ARYBuQHpAf8BDAGyAeYB/wEBAasB5QH/AQABpQHi
+ Af8BAAGfAeEB/wECAZABuQH/AwAF/wEAATcBigH/AdEB9gL/AS4ByAHuAf8BJwHEAewB/wEgAb8B6wH/
+ ARkBuwHqAf8BEgG2AegB/wEKAbAB5wH/AQMBrAHlAf8BAAGnAeMB/wEAAaMB4gH/AQABNwGKAf8DAAH/
+ AQABNwGKAf8DAAH/gAAE/wEAATcBigH/AdEB9gL/AYYB5QH3Af8BUQHfAfUB/wFGAdgB8wH/ATwB0QHx
+ Af8BMQHKAe8B/wEnAcQB7QH/AR0BvQHqAf8BEgG2AegB/wEHAa8B5QH/AQABqAHjAf8BAAGiAeEB/wEC
+ AZABuQH/AwAB/wEAATcBigH/AdEB9gL/AToBzwHxAf8BMwHLAe8B/wErAccB7gH/ASUBwgHsAf8BHgG9
+ AeoB/wEWAbkB6QH/AQ8BtAHnAf8BCAGwAeYB/wEAAaoB5QH/AQIBkAG5Af8DAAH/AQIBkAG5Af8BAgGQ
+ AbkB/wMAAf+AAAT/AQABNwGKAf8B0QH2Av8BjAHoAfkB/wGDAeIB9wH/AU0B3AH1Af8BQwHVAfIB/wE3
+ Ac4B8AH/AS0ByAHuAf8BIwHBAewB/wEZAboB6gH/AQ0BswHnAf8BAwGsAeUB/wEAAaYB4wH/AQIBkAG5
+ Af8DAAH/AQABNwGKAf8B0QH2Av8BPwHTAfIB/wE3Ac4B8AH/ATABygHuAf8BKQHFAe0B/wEjAcEB6wH/
+ ARsBvAHqAf8BFAG3AegB/wEMAbIB5gH/AQUBrgHlAf8BAgGQAbkB/wMAAf8BAgGQAbkB/wECAZABuQH/
+ AwAB/4AABP8BAAE3AYoB/wHRAfYC/wGQAesB+QH/AYgB5gH4Af8BUwHgAfYB/wFJAdkB8wH/AT4B0wHy
+ Af8BMwHLAe8B/wEpAcUB7QH/AR8BvgHrAf8BFQG4AekB/wEJAbAB5gH/AQABqQHkAf8BAgGQAbkB/wMA
+ Af8BAAE3AYoB/wEAATcBigH/AQABNwGKAf8BAAE3AYoB/wEAATcBigH/AQABNwGKAf8BAAE3AYoB/wEA
+ ATcBigH/AQABNwGKAf8BAAE3AYoB/wEAATcBigH/AQABNwGKAf8BAgGQAbkB/wEwAckB7gH/AQIBkAG5
+ Af8DAAH/gAAE/wEAATcBigH/AdEB9gL/AZMB7QH6Af8BjQHpAfkB/wGFAeQB9wH/AVAB3gH1Af8BRAHW
+ AfMB/wE6Ac8B8QH/AS8ByQHvAf8BJQHCAewB/wEbAbsB6QH/ARABtQHnAf8BBQGtAeYB/wECAZABuQH/
+ AwAF/wEAATcBigH/AdEB9gL/AZEB7AH6Af8BjQHpAfkB/wGKAecB+AH/AYYB5AH4Af8BgQHhAfcB/wFQ
+ Ad0B9QH/AUoB2gHzAf8BRAHXAfMB/wE/AdMB8QH/ATkBzwHxAf8BMwHLAe8B/wECAZABuQH/AwAB/4AA
+ BP8BAAE3AYoB/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHR
+ AfYC/wHRAfYC/wHRAfYC/wHRAfYC/wECAZABuQH/AwAF/wEAATcBigH/AdEB9gL/AZMB7QH6Af8BkAHr
+ AfkB/wGMAekB+QH/AYgB5gH4Af8BhAHjAfcB/wFTAeAB9gH/AU4B3AH1Af8B0QH2Av8B0QH2Av8B0QH2
+ Av8B0QH2Av8BAgGQAbkB/wMAAf+AAAT/AQABNwGKAf8BFQGoAdMB/wEVAagB0wH/ARUBqAHTAf8BFQGo
+ AdMB/wEVAagB0wH/ARUBqAHTAf8BFQGoAdMB/wEAATcBigH/AQABNwGKAf8BAAE3AYoB/wEAATcBigH/
+ AQABNwGKAf8BAAE3AYoJ/wEAATcBigH/AdEB9gL/AZMB7QH6Af8BkgHsAfoB/wGPAesB+QH/AYsB6AH4
+ Af8BhwHlAfcB/wHRAfYC/wEAATcBigH/AQABNwGKAf8BAAE3AYoB/wEAATcBigH/AQABNwGKAf8BAAE3
+ AYoF/4AACP8BAAE3AYoB/wG4AegB9QH/Ac4D/wHOA/8BnAP/AZwD/wEAATcBigH/AwAh/wEAATcBigH/
+ AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AQABNwGKHf+AAAz/AQABNwGKAf8BAAE3AYoB/wEA
+ ATcBigH/AQABNwGKAf8BAAE3AYoB/wMAKf8BAAE3AYoB/wEAATcBigH/AQABNwGKAf8BAAE3AYoB/wEA
+ ATcBiiH/gACA/4AAgP+AAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/gQAL
+</value>
+ </data>
+ <data name="cmdHWWWasterWHID.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ R0lGODlhEAAQAIYAAAAzmQBmzP///1o7AJlmAOazAMTz/9mmAEW5//nNT+W5ToPV/5TW/cyZAAyf/7Dp
+ /yOn/2jD/q3h/le8/sz3/5zg/7bt/73l/7Xs/2fH/4DT///bnZXb/97//2rK/wWb/8np/6zf/1S//77x
+ /73w/8Xv/1+//wmc/1jA/5Db/5LV/6rn/6Xb/zCt/33O/9X3/4LO/7jj/4PT/x+m/7nk/3XP/3PJ/3bQ
+ /6Tb/5Td/zCv/3fM/029/4za/6Pf/ZHc/6Pk/////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
+ AABBACwAAAAAEAAQAAAIqACDCBwoMIDBAAQTBjEYIcKECQYVLmQQ44KJFhBmQECYMAAOEAJYnPjgwAHH
+ gQEYqAhBA4YOBDwQIDg5cYcLGyg8LOixYAFNABJkZBBRI8cDEg98ACAIlIOGGylWGOhgwMBSphUq/ACC
+ wQAFClcFEiAAQICAEhZGvDAbloCCDQUAlDUrQO5AtwkKHBgQRK7duwryHmjAV2IQAoIJGxY4QK/ixYwH
+ FIYcEAA7
+</value>
+ </data>
+ <data name="cmdHWWBadWHID.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ R0lGODlhEAAQAIYAAAAzmQBmzP///1o7AJlmAOazAMTz/9mmAEW5//nNT+W5ToPV/5TW/cyZAAyf/7Dp
+ /yOn/2jD/q3h/le8/sz3/5zg/7bt/73l/7Xs/2fH/4DT///bnZXb/97//2rK/wWb/8np/6zf/1S//77x
+ /73w/8Xv/1+//wmc/1jA/5Db/5LV/6rn/6Xb/zCt/33O/9X3/4LO/7jj/4PT/x+m/7nk/3XP/3PJ/3bQ
+ /6Tb/5Td/zCv/3fM/029/4za/6Pf/ZHc/6Pk/////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
+ AABBACwAAAAAEAAQAAAIqACDCBwoMIDBAAQTBjEYIcKECQYVLmQQ44KJFhBmQECYMAAOEAJYnPjgwAHH
+ gQEYqAhBA4YOBDwQIDg5cYcLGyg8LOixYAFNABJkZBBRI8cDEg98ACAIlIOGGylWGOhgwMBSphUq/ACC
+ wQAFClcFEiAAQICAEhZGvDAbloCCDQUAlDUrQO5AtwkKHBgQRK7duwryHmjAV2IQAoIJGxY4QK/ixYwH
+ FIYcEAA7
</value>
</data>
<data name="cmdHBadCountDevelopWHID.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Process_Ctl.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Process_Ctl.cs"
index 723e722..26e5b5d 100644
--- "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Process_Ctl.cs"
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Process_Ctl.cs"
@@ -21,12 +21,12 @@
oCn.RunProc("Insert into " + MvarItemKey + " " +
" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
",HTypeFlow,HTypeCount,HDeptNumber,HSNo,HBadWHID,HWasterWHID" +
- ",HBadCountDevelopWHID" +
+ ",HBadCountDevelopWHID,HWWBadWHID,HWWWasterWHID" +
",HLevel,HEndFlag,HStopflag,HRemark,HDeptID,HBarCodeForBase,HProcessID_K3,HBillSubType,HAutoTrunFlag" +
",HFixPrice,HOverFixPrice,HProcMulID,HProcCheckNote) " +
" Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
"," + Convert.ToString(oModel.HTypeFlow ? 1 : 0) + "," + Convert.ToString(oModel.HTypeCount ? 1 : 0) + ",'" + oModel.HDeptNumber + "'," + oModel.HSNo.ToString() + "," + oModel.HBadWHID.ToString() + "," + oModel.HWasterWHID.ToString() +
- "," + oModel.HBadCountDevelopWHID.ToString() +
+ "," + oModel.HBadCountDevelopWHID.ToString() + "," + oModel.HWWBadWHID.ToString() + "," + oModel.HWWWasterWHID.ToString() +
"," + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'," + oModel.HDeptID +
",'" + oModel.HBarCode + "'," + oModel.HProcessID_K3 + ",'" + oModel.HBillSubType + "'," + Convert.ToString(oModel.HAutoTrunFlag ? 1 : 0) +
"," + oModel.HFixPrice.ToString() + "," + oModel.HOverFixPrice.ToString() + "," + oModel.HProcMulID.ToString() +",'"+ oModel.HProcCheckNote.ToString() + "')", ref DBUtility.ClsPub.sExeReturnInfo);
@@ -60,6 +60,8 @@
",HBadWHID=" + oModel.HBadWHID.ToString() +
",HWasterWHID=" + oModel.HWasterWHID.ToString() +
",HBadCountDevelopWHID=" + oModel.HBadCountDevelopWHID.ToString() +
+ ",HWWBadWHID=" + oModel.HWWBadWHID.ToString() +
+ ",HWWWasterWHID=" + oModel.HWWWasterWHID.ToString() +
",HProcessID_K3=" +oModel.HProcessID_K3+
",HBillSubType='" + oModel.HBillSubType + "'" +
",HDeptNumber='" + oModel.HDeptNumber + "'" +
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Process_View.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Process_View.cs"
index 6f51657..e56d16e 100644
--- "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Process_View.cs"
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Process_View.cs"
@@ -124,6 +124,8 @@
omodel.HBadWHID = DBUtility.ClsPub.isLong(DS.Tables[0].Rows[0]["HBadWHID"]);
omodel.HWasterWHID = DBUtility.ClsPub.isLong(DS.Tables[0].Rows[0]["HWasterWHID"]);
omodel.HBadCountDevelopWHID = DBUtility.ClsPub.isLong(DS.Tables[0].Rows[0]["HBadCountDevelopWHID"]);
+ omodel.HWWBadWHID = DBUtility.ClsPub.isLong(DS.Tables[0].Rows[0]["HWWBadWHID"]);
+ omodel.HWWWasterWHID = DBUtility.ClsPub.isLong(DS.Tables[0].Rows[0]["HWWWasterWHID"]);
return true;
}
catch (Exception e)
diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Process_Model.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Process_Model.cs"
index fb350d8..e28bbfc 100644
--- "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Process_Model.cs"
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Process_Model.cs"
@@ -23,6 +23,8 @@
public string HProcCheckNote = "";//本工序确认记录
public Int64 HBadWHID;//New
public Int64 HWasterWHID;//New
- public Int64 HBadCountDevelopWHID;//研发不良品仓库New
+ public Int64 HBadCountDevelopWHID; //研发不良品仓库New
+ public Int64 HWWBadWHID; //委外不良品仓New
+ public Int64 HWWWasterWHID; //委外报废仓New
}
}
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
index 546555a..bdf497c 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
@@ -1058,7 +1058,7 @@
this.tabPage3.Location = new System.Drawing.Point(4, 28);
this.tabPage3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.tabPage3.Name = "tabPage3";
- this.tabPage3.Size = new System.Drawing.Size(1397, 419);
+ this.tabPage3.Size = new System.Drawing.Size(1398, 420);
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = "妗ｆ鍒楄〃";
this.tabPage3.UseVisualStyleBackColor = true;
@@ -1078,7 +1078,7 @@
this.grdList.ReadOnly = true;
this.grdList.RowHeadersWidth = 30;
this.grdList.RowTemplate.Height = 23;
- this.grdList.Size = new System.Drawing.Size(1397, 419);
+ this.grdList.Size = new System.Drawing.Size(1398, 420);
this.grdList.TabIndex = 46;
//
// Gy_BarCodeBill
diff --git a/WebAPI/Controllers/CJGL/Cj_CallGoodsBillBackController.cs b/WebAPI/Controllers/CJGL/Cj_CallGoodsBillBackController.cs
new file mode 100644
index 0000000..ecdce91
--- /dev/null
+++ b/WebAPI/Controllers/CJGL/Cj_CallGoodsBillBackController.cs
@@ -0,0 +1,53 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.CJGL
+{
+ public class Cj_CallGoodsBillBackController : ApiController
+ {
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+ #region 鍙枡閫�鏂欏崟鍒楄〃
+ [Route("Cj_CallGoodsBillBack/CallGoodsBillBackMainList")]
+ [HttpGet]
+ public object CallGoodsBillMainList(string sWhere, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cj_CallGoodsBillBack_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from h_v_IF_JIT_CallGoodsBillBackMainList where 1=1 " + sWhere + " order by hmainid desc", "h_v_IF_JIT_CallGoodsBillBackMainList");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/CJGL/Cj_CallGoodsBillMainController.cs b/WebAPI/Controllers/CJGL/Cj_CallGoodsBillMainController.cs
new file mode 100644
index 0000000..9d7cd47
--- /dev/null
+++ b/WebAPI/Controllers/CJGL/Cj_CallGoodsBillMainController.cs
@@ -0,0 +1,54 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.CJGL
+{
+ public class Cj_CallGoodsBillMainController : ApiController
+ {
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+ #region 鍙枡鍗曞垪琛�
+ [Route("Cj_CallGoodsBillMain/CallGoodsBillMainList")]
+ [HttpGet]
+ public object CallGoodsBillMainList(string sWhere,string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cj_CallGoodsBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from h_v_IF_JIT_CallGoodsBillList where 1=1 " + sWhere + " order by hmainid desc", "h_v_IF_JIT_CallGoodsBillList");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/CJGL/Cj_ComplementGoodsBillController.cs b/WebAPI/Controllers/CJGL/Cj_ComplementGoodsBillController.cs
new file mode 100644
index 0000000..fda8aad
--- /dev/null
+++ b/WebAPI/Controllers/CJGL/Cj_ComplementGoodsBillController.cs
@@ -0,0 +1,53 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.CJGL
+{
+ public class Cj_ComplementGoodsBillController : ApiController
+ {
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+ #region 鎷ｆ枡閰嶉�佸崟鍒楄〃
+ [Route("Cj_ComplementGoodsBill/ComplementGoodsBillMainList")]
+ [HttpGet]
+ public object ComplementGoodsBillMainList(string sWhere, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cj_ComplementGoodsBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from h_v_IF_JIT_ComplementGoodsBill where 1=1 " + sWhere + " order by hmainid desc", "h_v_IF_JIT_ComplementGoodsBill");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/CJGL/Sc_WorkBillAutoSortBillMainController.cs b/WebAPI/Controllers/CJGL/Sc_WorkBillAutoSortBillMainController.cs
new file mode 100644
index 0000000..26d19dd
--- /dev/null
+++ b/WebAPI/Controllers/CJGL/Sc_WorkBillAutoSortBillMainController.cs
@@ -0,0 +1,53 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.CJGL
+{
+ public class Sc_WorkBillAutoSortBillMainController : ApiController
+ {
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+ #region 鐢熶骇鏃ヨ鍒掑崟鍒楄〃
+ [Route("Sc_WorkBillAutoSortBillMain/WorkBillAutoSortBillMainList")]
+ [HttpGet]
+ public object CallGoodsBillMainList(string sWhere, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sc_WorkBillAutoSortBillMain_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from h_v_IF_Sc_WorkBillAutoSortBillMain where 1=1 " + sWhere + " order by hmainid desc", "h_v_IF_Sc_WorkBillAutoSortBillMain");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
index c5143ee..044e63c 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
@@ -1,5 +1,7 @@
-锘縰sing Newtonsoft.Json;
+锘縰sing DBUtility;
+using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
@@ -22,8 +24,12 @@
private WebS.WebService1 oWebs = new WebS.WebService1();
//鑾峰彇绯荤粺鍙傛暟
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ public Int64 HInterID = 0; //鍐呯爜
+ public string ModName = "85";
+ public string HOrgNumber = "";
+ public Int64 HOrgID = -1;
+ public string SourceQtyCtl = ""; //瓒呮簮鍗曟暟閲忔帶鍒�
-
#region 鏉＄爜鐢熸垚
@@ -169,16 +175,28 @@
{
case "鐢熶骇璁㈠崟":
tabname = "h_v_IFCLD_ICMOBillList_Source";
- count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IFCLD_ICMOBillList_Source "+sWhere+ " and 浠诲姟鏁伴噺>isnull(鍏ュ簱鏁伴噺,0) and 鐘舵��<>'缁撴' order by 鍗曟嵁鍙�", "h_v_IFCLD_ICMOBillList_Source").Tables[0].Rows.Count;
+ count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IFCLD_ICMOBillList_Source "+sWhere+ " and 浠诲姟鏁伴噺>isnull(鍏ュ簱鏁伴噺,0) and 鐘舵��<>'缁撴' order by 鍗曟嵁鍙�", tabname).Tables[0].Rows.Count;
sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by 鍗曟嵁鍙�) as HRowNumber,* from h_v_IFCLD_ICMOBillList_Source " + sWhere + " and 浠诲姟鏁伴噺>isnull(鍏ュ簱鏁伴噺,0) and 鐘舵��<>'缁撴') as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
break;
case "鐢熶骇姹囨姤鍗�":
+ tabname = "h_v_IF_ICMOReportBillList_Source";
+ count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_ICMOReportBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count;
+ sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_ICMOReportBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
break;
case "閲囪喘璁㈠崟":
+ tabname = "h_v_IF_POOrderBillList_Source";
+ count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_POOrderBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count;
+ sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_POOrderBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
break;
case "鏀舵枡閫氱煡鍗�":
+ tabname = "h_v_IF_POInStockBillList_Source";
+ count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_POInStockBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count;
+ sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_POInStockBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
break;
case "濮斿璁㈠崟":
+ tabname = "h_v_IF_EntrustOrderBillList_Source";
+ count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_EntrustOrderBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count;
+ sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_EntrustOrderBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
break;
case "閫�璐ч�氱煡鍗�":
break;
@@ -197,7 +215,10 @@
}
ds = new SQLHelper.ClsCN().RunProcReturn(sql, tabname);
string aa = ds.Tables[0].Columns[0].ToString();
-
+ //ds.Tables[0].Columns["hmainid"].ColumnName.ToUpper();
+ //ds.Tables[0].Columns["hsubid"].ColumnName.ToUpper();
+ ds.Tables[0].Columns["hmainid"].ColumnName= "HMainID";
+ ds.Tables[0].Columns["hsubid"].ColumnName= "HSubID";
foreach (DataColumn col in ds.Tables[0].Columns)
{
@@ -238,6 +259,814 @@
}
#endregion
+ #region [閫氳繃閫夋嫨鐨勬簮鍗曚俊鎭煡鎵炬簮鍗曟暟鎹甝
+ [Route("Sc_BarCode/SelectReportFromBillList")]
+ [HttpPost]
+ public object SelectReportFromBillList([FromBody] JObject msg)
+ {
+ //List<DBUtility.BillSelect> oList,string HBarCodeType
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string HSourceBillType = sArray[1].ToString();
+ string HBarCodeType = sArray[2].ToString();
+ string UserName = sArray[3].ToString();
+ ClsPub.CurUserName = UserName;
+ ListModels oListModels = new ListModels();
+ List<object> ListRows = new List<object>();
+ try
+ {
+
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ List<DBUtility.BillSelect> oList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<DBUtility.BillSelect>>(msg2);
+ foreach (DBUtility.BillSelect oSelectRow in oList)
+ {
+ HSouceOrderList ordrlist = new HSouceOrderList();
+ switch (oSelectRow.BillType)
+ {
+ case "3710": //鐢熶骇璁㈠崟
+ //寰楀埌淇℃伅
+ ds = oCN.RunProcReturn("select * from h_v_IFCLD_ICMOList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IFCLD_ICMOList");
+ //鍐欏叆淇℃伅
+ ListRows.Add(HSourceOrderList(ds.Tables[0],ordrlist, HBarCodeType));
+ break;
+ case "3711": //鐢熶骇姹囨姤鍗�
+ //寰楀埌淇℃伅
+ ds = oCN.RunProcReturn("select * from h_v_IF_ICMOReportList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_ICMOReportList");
+ //鍐欏叆淇℃伅
+ ListRows.Add(HSourceOrderList1(ds.Tables[0], ordrlist, HBarCodeType, HSourceBillType));
+ break;
+ case "1102": //閲囪喘璁㈠崟
+ //寰楀埌淇℃伅
+ ds = oCN.RunProcReturn("select * from h_v_IF_POOrderList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_POOrderList");
+ //鍐欏叆淇℃伅
+ ListRows.Add(HSourceOrderList1(ds.Tables[0], ordrlist, HBarCodeType, HSourceBillType));
+ break;
+ case "1103": //鏀舵枡閫氱煡鍗�
+ //寰楀埌淇℃伅
+ ds = oCN.RunProcReturn("select * from h_v_IF_POInStockList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_POInStockList");
+ //鍐欏叆淇℃伅
+ ListRows.Add(HSourceOrderList1(ds.Tables[0], ordrlist, HBarCodeType, HSourceBillType));
+ break;
+ case "1601": //濮斿璁㈠崟
+ //寰楀埌淇℃伅
+ ds = oCN.RunProcReturn("select * from h_v_IF_EntrustOrderList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_EntrustOrderList");
+ //鍐欏叆淇℃伅
+ ListRows.Add(HSourceOrderList1(ds.Tables[0], ordrlist, HBarCodeType, HSourceBillType));
+ break;
+ case "1403": //閫�璐ч�氱煡鍗�
+ break;
+ case "1203": //鍏朵粬鍏ュ簱鍗�
+ break;
+ case "1207": //鐩存帴璋冩嫧鍗�
+ break;
+ case "1239": //閲囪喘閫�鏂欏崟
+ break;
+ case "1244": //鐢熶骇閫�鏂欏崟
+ break;
+ case "1255": //缁勮鎷嗗嵏鍗�
+ break;
+ default:
+ break;
+ }
+ }
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇鏁版嵁鎴愬姛!";
+ objJsonResult.data = null;
+ objJsonResult.list = ListRows;
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.Message.ToString();
+ objJsonResult.data = null;
+ objJsonResult.list = ListRows;
+ }
+ return objJsonResult;
+ }
+
+ public object HSourceOrderList(DataTable dt, HSouceOrderList ordrlist,string HBarCodeType)
+ {
+ for (int i = 0; i < dt.Rows.Count; i++)
+ {
+ ordrlist.HQty = dt.Rows[i]["鏈敓鎴愭潯鐮佹暟閲�"].ToString();
+ ordrlist.HMinQty = dt.Rows[i]["鏈敓鎴愭潯鐮佹暟閲�"].ToString();
+ ordrlist.HMainID = dt.Rows[i]["hmainid"].ToString();
+ ordrlist.HSubID = dt.Rows[i]["hsubid"].ToString();
+ ordrlist.HBillNo = dt.Rows[i]["鍗曟嵁鍙�"].ToString();
+ ordrlist.HSourceBillNo = dt.Rows[i]["鍗曟嵁鍙�"].ToString();
+ ordrlist.HBillType = dt.Rows[i]["HBillType"].ToString();
+ ordrlist.HDate = dt.Rows[i]["鏃ユ湡"].ToString(); //鍗氭棩 鏀舵枡鍗曟嵁鏃ユ湡
+ ordrlist.HShowDate = DateTime.Now.ToString();
+ ordrlist.HSupID = dt.Rows[i]["hsupid"].ToString();
+ ordrlist.HSupNumber = dt.Rows[i]["渚涘簲鍟嗕唬鐮�"].ToString();
+ ordrlist.HSupName = dt.Rows[i]["渚涘簲鍟�"].ToString();
+ ordrlist.HDeptID = dt.Rows[i]["HDeptID"].ToString();
+ ordrlist.HDeptNumber = dt.Rows[i]["閮ㄩ棬浠ｇ爜"].ToString();
+ ordrlist.HDeptName = dt.Rows[i]["閮ㄩ棬"].ToString();
+ ordrlist.HMaterID = dt.Rows[i]["HMaterID"].ToString();
+ ordrlist.HMaterNumber = dt.Rows[i]["鐗╂枡浠ｇ爜"].ToString();
+ ordrlist.HMaterName = dt.Rows[i]["鐗╂枡鍚嶇О"].ToString();
+ ordrlist.HMaterModel = dt.Rows[i]["瑙勬牸鍨嬪彿"].ToString();
+ ordrlist.HBatchNo = dt.Rows[i]["鎵规"].ToString();
+ ordrlist.HUnitID = dt.Rows[i]["HUnitID"].ToString();
+ ordrlist.HUnitNumber = dt.Rows[i]["璁￠噺鍗曚綅浠ｇ爜"].ToString();
+ ordrlist.HUnitName = dt.Rows[i]["璁￠噺鍗曚綅"].ToString();
+ ordrlist.HRemark = dt.Rows[i]["澶囨敞"].ToString();
+ ordrlist.HMTONo = dt.Rows[i]["璁″垝璺熻釜鍙�"].ToString();
+ ordrlist.HCusID = dt.Rows[i]["HCusID"].ToString();
+ ordrlist.HCusNumber = dt.Rows[i]["瀹㈡埛浠ｇ爜"].ToString();
+ ordrlist.HCusName = dt.Rows[i]["瀹㈡埛"].ToString();
+ ordrlist.HCusType = dt.Rows[i]["瀹㈡埛鍨嬪彿"].ToString();
+ ordrlist.HPinfanBarCode = dt.Rows[i]["HPinfanBarCode"].ToString();
+ ordrlist.HPinfan = dt.Rows[i]["HPinfan"].ToString();
+ ordrlist.HSourceName = dt.Rows[i]["鐢熶骇绾�"].ToString();
+ ordrlist.HEndDate = dt.Rows[i]["璁″垝瀹屽伐鏃ユ湡"].ToString();//鍗氭棩 鐢熶骇璁㈠崟 澶辨晥鏃ユ湡
+ if (HBarCodeType == "浠櫒澶栬喘浠舵潯鐮佸鍣ㄨ鍒�")
+ {
+ ordrlist.HMinQty = dt.Rows[i]["鏈敓鎴愭潯鐮佹暟閲�"].ToString();
+ }
+ else if (HBarCodeType == "浠櫒澶栬喘浠舵潯鐮佹櫘閫氳鍒�"|| HBarCodeType == "浠櫒鎴愬搧鏉＄爜瑙勫垯"|| HBarCodeType == "璇曞墏鎴愬搧鏉＄爜瑙勫垯")
+ {
+ ordrlist.HMinQty = "1";
+ }
+ else
+ {
+ ordrlist.HMinQty = dt.Rows[i]["鏈�灏忓寘瑁呮暟"].ToString();
+ }
+ }
+ return ordrlist;
+ }
+
+ public object HSourceOrderList1(DataTable dt, HSouceOrderList ordrlist, string HBarCodeType,string HSourceBillType)
+ {
+ for (int i = 0; i < dt.Rows.Count; i++)
+ {
+ ordrlist.HQty = dt.Rows[i]["鏈敓鎴愭潯鐮佹暟閲�"].ToString();
+ ordrlist.HMinQty = dt.Rows[i]["鏈敓鎴愭潯鐮佹暟閲�"].ToString();
+ ordrlist.HMainID = dt.Rows[i]["hmainid"].ToString();
+ ordrlist.HSubID = dt.Rows[i]["hsubid"].ToString();
+ ordrlist.HBillNo = dt.Rows[i]["鍗曟嵁鍙�"].ToString();
+ ordrlist.HBillType = dt.Rows[i]["HBillType"].ToString();
+ ordrlist.HDate = dt.Rows[i]["鏃ユ湡"].ToString(); //鍗氭棩 鏀舵枡鍗曟嵁鏃ユ湡
+ ordrlist.HShowDate = DateTime.Now.ToString();
+ ordrlist.HDeptID = dt.Rows[i]["HDeptID"].ToString();
+ ordrlist.HDeptNumber = dt.Rows[i]["閮ㄩ棬浠ｇ爜"].ToString();
+ ordrlist.HDeptName = dt.Rows[i]["閮ㄩ棬"].ToString();
+ ordrlist.HMaterID = dt.Rows[i]["HMaterID"].ToString();
+ ordrlist.HMaterNumber = dt.Rows[i]["鐗╂枡浠ｇ爜"].ToString();
+ ordrlist.HMaterName = dt.Rows[i]["鐗╂枡鍚嶇О"].ToString();
+ ordrlist.HMaterModel = dt.Rows[i]["瑙勬牸鍨嬪彿"].ToString();
+ ordrlist.HBatchNo = dt.Rows[i]["鎵规"].ToString();
+ ordrlist.HUnitID = dt.Rows[i]["HUnitID"].ToString();
+ ordrlist.HUnitNumber = dt.Rows[i]["璁￠噺鍗曚綅浠ｇ爜"].ToString();
+ ordrlist.HUnitName = dt.Rows[i]["璁￠噺鍗曚綅"].ToString();
+ ordrlist.HRemark = dt.Rows[i]["澶囨敞"].ToString();
+ ordrlist.HMTONo = dt.Rows[i]["璁″垝璺熻釜鍙�"].ToString();
+ if (HBarCodeType == "浠櫒澶栬喘浠舵潯鐮佸鍣ㄨ鍒�")
+ {
+ ordrlist.HMinQty = dt.Rows[i]["鏈敓鎴愭潯鐮佹暟閲�"].ToString();
+ }
+ else if (HBarCodeType == "浠櫒澶栬喘浠舵潯鐮佹櫘閫氳鍒�")
+ {
+ ordrlist.HMinQty = "1";
+ }
+ else
+ {
+ ordrlist.HMinQty = dt.Rows[i]["鏈�灏忓寘瑁呮暟"].ToString();
+ }
+ ordrlist.HMaker = ClsPub.CurUserName;
+ if (HSourceBillType== "鏀舵枡閫氱煡鍗�"|| HSourceBillType== "閲囪喘璁㈠崟"|| HSourceBillType=="濮斿璁㈠崟"|| HSourceBillType== "閲囪喘鍏ュ簱鍗�")
+ {
+ ordrlist.HInnerBillNo = dt.Rows[i]["鍐呴儴閲囪喘璁㈠崟鍙�"].ToString();
+ ordrlist.HSupID= dt.Rows[i]["hsupid"].ToString();
+ ordrlist.HSupNumber = dt.Rows[i]["渚涘簲鍟嗕唬鐮�"].ToString();
+ ordrlist.HSupName = dt.Rows[i]["渚涘簲鍟�"].ToString();
+ if (HSourceBillType == "鏀舵枡閫氱煡鍗�")
+ {
+ if (dt.Rows[i]["鏄惁璧犲搧"].ToString() == "鏄�")
+ {
+ ordrlist.HGiveAwayFlag = 1;
+ }
+ else
+ {
+ ordrlist.HGiveAwayFlag = 0;
+ }
+ }
+ }
+ if (HSourceBillType == "閫�璐ч�氱煡鍗�")
+ {
+ ordrlist.HCusID = dt.Rows[i]["HCusID"].ToString();
+ ordrlist.HCusNumber = dt.Rows[i]["瀹㈡埛浠ｇ爜"].ToString();
+ ordrlist.HCusName= dt.Rows[i]["瀹㈡埛"].ToString();
+ }
+ if (HSourceBillType == "鍏朵粬鍏ュ簱鍗�")
+ {
+ ordrlist.HWhID = dt.Rows[i]["HWhID"].ToString();
+ ordrlist.HWhNumber = dt.Rows[i]["浠撳簱浠ｇ爜"].ToString();
+ ordrlist.HWhName = dt.Rows[i]["浠撳簱"].ToString();
+ ordrlist.HSPID = dt.Rows[i]["HSPID"].ToString();
+ ordrlist.HSPNumber = dt.Rows[i]["浠撲綅浠ｇ爜"].ToString();
+ ordrlist.HSPName = dt.Rows[i]["浠撲綅"].ToString();
+ }
+ }
+ return ordrlist;
+ }
+
+ #endregion
+
+ #region [鏉＄爜鐢熸垚鎺ュ彛]
+ [Route("Sc_BarCode/Sub_SaveBill")]
+ [HttpPost]
+ public object Sub_SaveBill([FromBody] JObject msg)
+ {
+ try
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string HOrgType = sArray[1].ToString();
+ string HSourceBillType = sArray[2].ToString();
+ string HSelectBarCodeType = sArray[3].ToString();
+ string CampanyName = sArray[4].ToString()=="xxx"?"": sArray[4].ToString();
+ string UserName = sArray[5].ToString();
+
+ //鑾峰彇鍐呯爜
+ HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
+ DAL.ClsGy_ORGANIZATIONS_View oClsGy_ORGANIZATIONS_View = new DAL.ClsGy_ORGANIZATIONS_View();
+ HOrgNumber = "";
+ if (oClsGy_ORGANIZATIONS_View.GetInfoByName(HOrgType))
+ {
+ HOrgID = oClsGy_ORGANIZATIONS_View.omodel.HItemID;
+ HOrgNumber = DBUtility.ClsPub.isStrNull(oClsGy_ORGANIZATIONS_View.omodel.HNumber);
+ }
+ if (HOrgID == -1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "閫夋嫨缁勭粐鏈夐敊璇�!";
+ return objJsonResult;
+ }
+ if (!Sub_AllowSave(msg2, HSelectBarCodeType))//鍗曟嵁瀹屾暣鎬у垽鏂�
+ {
+ return objJsonResult;
+ }
+ if (HSelectBarCodeType == "浠櫒鎴愬搧鏉＄爜瑙勫垯")
+ {
+ //瀹㈡埛瀹氬埗
+ }
+ else
+ {
+ //鐢熸垚鏉＄爜
+ SaveBarCode(msg2, HSelectBarCodeType, CampanyName);
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏉＄爜鐢熸垚澶辫触!"+e.Message;
+ return objJsonResult;
+ }
+ return objJsonResult;
+ }
+ #endregion
+
+ #region[鍗曟嵁瀹屾暣鎬у垽鏂璢
+ private bool Sub_AllowSave(string msg2, string HSelectBarCodeType)
+ {
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ List<HSouceOrderList> ordrlist = Newtonsoft.Json.JsonConvert.DeserializeObject<List<HSouceOrderList>>(msg2);
+
+ string sHRemark = "";
+ for (int i = 0; i < ordrlist.Count; i++)
+ {
+ long HSno = i + 1; // 搴忓彿
+ string HBarCodeType = HSelectBarCodeType; // 鏉＄爜绫诲瀷
+ string HSourceBillNo = DBUtility.ClsPub.isStrNull(ordrlist[i].HBillNo); // 婧愬崟鍗曞彿
+ long HMaterID = DBUtility.ClsPub.isLong(ordrlist[i].HMaterID); // 鐗╂枡鍐呯爜
+ string HBatchNo = DBUtility.ClsPub.isStrNull(ordrlist[i].HBatchNo); // 鎵瑰彿
+ long HAuxPropID = DBUtility.ClsPub.isLong(ordrlist[i].HAuxPropID); // 杈呭姪灞炴�D
+ double HSourceQty = DBUtility.ClsPub.isDoule(ordrlist[i].HMinQty); // 婧愬崟鏁伴噺
+ double HQty = DBUtility.ClsPub.isDoule(ordrlist[i].HQty); // 鏁伴噺
+ double HMinQty = DBUtility.ClsPub.isDoule(ordrlist[i].HMinQty); // 鏈�灏忓寘瑁呮暟
+ if (HMaterID != 0)
+ {
+ DataSet oDsCheck = oCN.RunProcReturn("exec h_p_Gy_BarCodeBill_AddCheck " + HSno.ToString() + ",'" + HBarCodeType + "','" + HSourceBillNo + "'," + HMaterID.ToString() + ",'" + HBatchNo + "'," + HAuxPropID.ToString() + "," + HSourceQty.ToString() + "," + HQty.ToString() + "," + HMinQty.ToString() + "," + HOrgID.ToString() + ",'" + SourceQtyCtl + "'", "h_p_Gy_BarCodeBill_AddCheck");
+ if (oDsCheck == null && oDsCheck.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏉＄爜鐢熸垚瀹屾暣鎬у垽鏂敊璇�";
+ return false;
+ }
+ else if (DBUtility.ClsPub.isStrNull(oDsCheck.Tables[0].Rows[0][0]) == "1")
+ {
+ sHRemark = sHRemark + DBUtility.ClsPub.isStrNull(oDsCheck.Tables[0].Rows[0]["HRemark"]);
+ }
+ }
+ }
+ if (sHRemark != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = sHRemark;
+ return false;
+ }
+ return true;
+ }
+
+ #endregion
+
+ #region[鏉＄爜鐢熸垚鏂规硶]
+ private object SaveBarCode(string msg2, string HSelectBarCodeType, string CampanyName)
+ {
+ int LSHlen = 6; //娴佹按鍙烽暱搴�
+ int SumLen = 10; //鎬婚暱搴�
+ string TM = ""; //鏉＄爜
+ string HNumber = ""; //鐗╂枡鍐呯爜
+ string HMaterNumber = ""; //鐗╂枡浠ｇ爜
+ double HSumQty = 0; //浜у搧鏁伴噺
+ double HMinQty = 0; //鏈�灏忓寘瑁呮暟
+ int HBQty = 0; //绠辨暟
+ double HQty = 0; //鏁伴噺
+ string WeiShu = ""; //灏炬暟
+ int LSH = 0; //娴佹按鍙�
+ string LSH2 = ""; //娴佹按鍙疯浆鎹㈡垚瀛楃
+ string sDate = ""; //鏃ユ湡
+ string sYear = ""; //骞�
+ string sPeriod = ""; //鏈�
+ string sDay = ""; //鏃�
+ string HBatchNo = ""; //鎵规
+ string HYasuoji = ""; //鍘嬬缉鏈�
+ string HModelName = ""; //鏈哄瀷
+ string HICMOBillNo = ""; //婧愬崟鍙�
+ string HBarCodeBatchNo = ""; //鏉＄爜鎵规鍙�
+ string HBarCodeDate = ""; //鏉＄爜鏃ユ湡
+ int k = 0;
+ int n = 0; //鍚屼竴鎵圭敓鎴愭潯鐮佷腑鐨勭鍑犳潯
+ string sTMNumber = ""; //鏉＄爜鑷畾涔夊墠缂�
+ DataSet Ds;
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ List<HSouceOrderList> ordrlist = Newtonsoft.Json.JsonConvert.DeserializeObject<List<HSouceOrderList>>(msg2);
+ List<HBarCodeList> ListRows = new List<HBarCodeList>();
+ for (int j = 0; j < ordrlist.Count; j++)
+ {
+ if (ClsPub.isLong(ordrlist[j].HMaterID) != 0)
+ {
+ HNumber = DBUtility.ClsPub.isStrNull(ordrlist[j].HMaterID);
+ HMaterNumber = DBUtility.ClsPub.isStrNull(ordrlist[j].HMaterNumber);
+ HBatchNo = ClsPub.isStrNull(ordrlist[j].HBatchNo);
+ //鏃ユ湡鑾峰彇鏂瑰紡
+ sDate = DateTime.Now.ToString();
+ //
+ if (HSelectBarCodeType == "浠櫒澶栬喘浠舵潯鐮佹櫘閫氳鍒�" || HSelectBarCodeType == "浠櫒澶栬喘浠舵潯鐮佸鍣ㄨ鍒�") //鍗曟嵁鏃ユ湡(鏀舵枡閫氱煡鍗�)
+ {
+ sDate = DBUtility.ClsPub.isStrNull(ordrlist[j].HDate);
+ }
+ else if (HSelectBarCodeType == "璇曞墏鎴愬搧鏉＄爜瑙勫垯")// 澶辨晥鏃ユ湡锛堢敓浜ц鍗曪級
+ {
+ sDate = DBUtility.ClsPub.isStrNull(ordrlist[j].HEndDate);
+ }
+ else if (CampanyName == "澶忓疂鐢靛櫒")// 鏃ユ湡锛氱敓浜ц鍗� 鏉＄爜鏃ユ湡
+ {
+ sDate = DBUtility.ClsPub.isStrNull(ordrlist[j].HDate);
+ }
+ HYasuoji = DBUtility.ClsPub.isStrNull(ordrlist[j].HPinfan); //鍘嬬缉鏈轰唬鐮侊紙澶忓疂鐢靛櫒锛�
+ HModelName = DBUtility.ClsPub.isStrNull(ordrlist[j].HCusType); //鏈哄瀷锛堝瀹濈數鍣級
+ HICMOBillNo = DBUtility.ClsPub.isStrNull(ordrlist[j].HSourceBillNo); //鐢熶骇璁㈠崟鍙凤紙澶忓疂鐢靛櫒锛�
+ HBarCodeBatchNo = DBUtility.ClsPub.isStrNull(ordrlist[j].HPinfanBarCode); //鏉＄爜鎵规鍙凤紙澶忓疂鐢靛櫒锛�
+ HBarCodeDate = DBUtility.ClsPub.isStrNull(ordrlist[j].HSupNumber); //鏉＄爜鏃ユ湡锛堝瀹濈數鍣級
+ //
+ sYear = ClsPub.isDate(sDate).Year.ToString().Substring(2, 2);
+ sPeriod = "0" + ClsPub.isDate(sDate).Month.ToString();
+ sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);
+ sDay = "0" + ClsPub.isDate(sDate).Day.ToString();
+ sDay = sDay.Substring(sDay.Length - 2, 2);
+ //==================================
+ if (HSelectBarCodeType == "鍞竴鏉＄爜")
+ {
+ if (CampanyName == "鍗撳姏") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉�
+ {
+ //鏉＄爜鍓嶇紑 = 鐗╂枡浠ｇ爜 + 骞� + 鏈� + 鏃�
+ sTMNumber = HNumber + sYear + sPeriod + sDay;
+ Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+ LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ }
+ else if (CampanyName == "椋為緳")
+ {
+ string HWorksNumber = "";
+ HWorksNumber = CampanyName;
+ if (HWorksNumber == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "宸ュ巶浠ｇ爜涓嶈兘涓虹┖!";
+ return objJsonResult;
+ }
+ //鏉＄爜鍓嶇紑 = 宸ュ巶浠ｇ爜 + 鐗╂枡鍐呯爜 + 鏃ユ湡
+ sTMNumber = HWorksNumber + HNumber + sYear + sPeriod + sDay;
+ Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+ LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ }
+ else //閫氱敤鏂规硶
+ {
+ //鏉＄爜鍓嶇紑 = 缁勭粐浠ｇ爜 + 鐗╂枡浠ｇ爜 + 骞� + 鏈� + 鏃�
+ sTMNumber = HOrgNumber + HNumber + sYear + sPeriod + sDay;
+ Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+ LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ }
+ }
+ else if (HSelectBarCodeType == "鍝佺鏉＄爜")
+ {
+ if (CampanyName == "浜斾簯") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉�
+ {
+ TM = HNumber + ";" + DBUtility.ClsPub.isStrNull(ordrlist[j].HMTONo);
+ }
+ else
+ {
+ TM = HOrgNumber + HNumber;
+ }
+ }
+ else if (HSelectBarCodeType == "鎵规鏉＄爜")
+ {
+ TM = HOrgNumber + HNumber + HBatchNo;
+ }//鍗氭棩鐗规畩澶勭悊
+ else if (HSelectBarCodeType == "浠櫒澶栬喘浠舵潯鐮佹櫘閫氳鍒�" || HSelectBarCodeType == "浠櫒澶栬喘浠舵潯鐮佸鍣ㄨ鍒�")
+ {
+ //鐗╂枡缂栫爜+鍗曟嵁鏃ユ湡锛圷YMMDD锛�+娴佹按4浣�
+ sTMNumber = HMaterNumber + sYear + sPeriod + sDay;
+ Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+ LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ LSHlen = 4;
+ }
+ else if (HSelectBarCodeType == "浠櫒鎴愬搧鏉＄爜瑙勫垯") //鍙﹀澶勭悊浜�
+ {
+ //鐗╂枡缂栫爜+搴忓垪鍙�+鐢熶骇鏃ユ湡
+ //sTMNumber = HMaterNumber + sYear + sPeriod + sDay;
+ //Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ // //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+ //LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ }
+ else if (HSelectBarCodeType == "璇曞墏鎴愬搧鏉＄爜瑙勫垯")
+ {
+ //鐗╂枡缂栫爜+鐢熶骇鎵瑰彿+娴佹按鍙�6浣�-
+ sTMNumber = HMaterNumber + HBatchNo;
+ Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+ LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ LSHlen = 6;
+ }
+ else if (HSelectBarCodeType == "鍐呴攢鏈烘潯鐮�")
+ {
+ //鍒堕�犳湰閮�1浣嶏紙榛樿1锛�+鏈哄瀷浠ｇ爜5浣嶏紙锛�+骞�2浣�+鏈�1浣嶏紙A銆丅銆丆浠ｆ浛10鏈堜唤锛�
+ //+鏃�2浣�+鏉＄爜鎵规鐮�2浣�+鍘嬬缉鏈轰唬鐮�1浣�+00+娴佹按鍙�4浣�+鏍￠獙鐮侊紙榛樿0锛�
+ sTMNumber = "1" + HModelName + HBarCodeDate + HBarCodeBatchNo + HYasuoji + "00";
+ Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+ LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ LSHlen = 5;
+ if (sTMNumber.Length != 16)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏉＄爜闀垮害涓嶅16浣嶏紝鏄惁鏁版嵁涓嶅叏锛佸埗閫犳湰閮�1浣�:[0] + 鏈哄瀷浠ｇ爜5浣�:[" + HModelName + "] + 骞存湀鏃�5浣�:[" + HBarCodeDate + "] + 鎵规鍙�2浣�:[" + HBarCodeBatchNo + "]+ 鍘嬬缉鏈�1浣�:[" + HYasuoji + "]+00 ; ";
+ return objJsonResult;
+ }
+ }
+ else if (HSelectBarCodeType == "澶栭攢鏈烘潯鐮�")
+ {
+ //鐗╂枡浠ｇ爜11浣�+骞�2浣�+鏈�1浣嶏紙A銆丅銆丆浠ｆ浛10鏈堜唤锛�+鏃�2浣�+鎵规2浣�+娴佹按鍙�4浣�
+ //sTMNumber = HMaterNumber.Replace(Convert.ToChar("."),Convert.ToChar("")) + HBarCodeDate + HBarCodeBatchNo;
+ sTMNumber = HMaterNumber.Replace(".", "") + HBarCodeDate + HBarCodeBatchNo;
+ Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+ LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ LSHlen = 5;
+ if (sTMNumber.Length != 18)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏉＄爜闀垮害涓嶅18浣嶏紝鏄惁鏁版嵁涓嶅叏锛佺墿鏂欎唬鐮�11浣�:[" + HMaterNumber.Replace(".", "") + "]+骞存湀鏃�5浣�:[" + HBarCodeDate + "]+鎵规鍙�2浣�:[" + HBarCodeBatchNo + "];";
+ return objJsonResult;
+ }
+ }
+ else if (HSelectBarCodeType == "鍗婃垚鍝佹潯鐮�")
+ {
+ //鐢熶骇璁㈠崟鍙�+4浣嶆祦姘村彿
+ sTMNumber = HICMOBillNo;
+ Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+ LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ LSHlen = 5;
+ }
+ //else if (cmbHBarCodeType.Text == "鎵樼洏鏉＄爜")
+ //{
+ // TM = HOrgNumber + HNumber + LSH2;
+ //}
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "閿欒鐨勬潯鐮佺被鍨嬶紝涓嶈兘鐢熸垚鏉＄爜锛�";
+ return objJsonResult;
+ }
+
+ HBQty = HBQty + ClsPub.isInt(ordrlist[j].HBQty);
+ HMinQty = ClsPub.isDoule(ordrlist[j].HMinQty);
+ HSumQty = ClsPub.isDoule(ordrlist[j].HQty);
+ n = 0;
+
+ for (int i = k; i < HBQty; i++)
+ {
+ if (HSumQty - HMinQty > 0)
+ {
+ WeiShu = "";
+ HSumQty = HSumQty - HMinQty;
+ }
+ else
+ {
+ if (HSumQty == HMinQty)
+ {
+ WeiShu = "";
+ }
+ else
+ {
+ WeiShu = "灏炬暟";
+ }
+ HMinQty = HSumQty;
+ }
+ //
+ LSH = LSH + 1;
+ LSH2 = LSH.ToString();
+ while (LSH2.Length < LSHlen) //濡傛灉娴佹按鍙峰皬浜�6浣嶆暟鍓嶉潰琛�0
+ {
+ LSH2 = "0" + LSH2;
+ }
+ if (HSelectBarCodeType == "鍞竴鏉＄爜")
+ {
+ //鏉＄爜缂栧彿 = 鏉＄爜鍓嶇紑 + 娴佹按鍙�
+ TM = sTMNumber + LSH2;
+ }
+ else if (HSelectBarCodeType == "浠櫒澶栬喘浠舵潯鐮佹櫘閫氳鍒�" || HSelectBarCodeType == "浠櫒澶栬喘浠舵潯鐮佸鍣ㄨ鍒�" || HSelectBarCodeType == "璇曞墏鎴愬搧鏉＄爜瑙勫垯"
+ || HSelectBarCodeType == "鍗婃垚鍝佹潯鐮�" || HSelectBarCodeType == "澶栭攢鏈烘潯鐮�")
+ {
+ TM = sTMNumber + LSH2;
+
+ }
+ else if (HSelectBarCodeType == "鍐呴攢鏈烘潯鐮�")
+ {
+ TM = sTMNumber + LSH2 + "0";
+ }
+ //
+ if (TM.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏉″舰鐮佷笉鑳戒负绌猴紝涓嶈兘鐢熸垚鏉＄爜锛�";
+ return objJsonResult;
+ }
+ HBarCodeList barcode = new HBarCodeList();
+ barcode.HBarCode2 = TM;
+ barcode.HEntryID2 = ClsPub.isStrNull(j + 1);
+ barcode.HMaterID2 = ordrlist[j].HMaterID;
+ barcode.HMaterNumber2 = ordrlist[j].HMaterNumber;
+ barcode.HMaterName2 = ordrlist[j].HMaterName;
+ barcode.HMaterModel2 = ordrlist[j].HMaterModel;
+ barcode.HPinfan2 = ordrlist[j].HPinfan;
+ barcode.HPinfanBarCode2 = ordrlist[j].HPinfanBarCode;
+
+
+ barcode.HAuxPropID2 = ordrlist[j].HAuxPropID;
+ barcode.HAuxPropNumber2 = ordrlist[j].HAuxPropNumber;
+ barcode.HAuxPropName2 = ordrlist[j].HAuxPropName;
+
+ barcode.HUnitID2 = ordrlist[j].HUnitID;
+ barcode.HUnitNumber2 = ordrlist[j].HUnitNumber;
+ barcode.HUnitName2 = ordrlist[j].HUnitName;
+
+ barcode.HQty2 = ClsPub.isStrNull(HMinQty);
+ barcode.HBatchNo2 = ordrlist[j].HBatchNo;
+ barcode.HSourceInterID2 = ordrlist[j].HMainID;
+ barcode.HSourceEntryID2 = ordrlist[j].HSubID;
+ barcode.HSourceBillNo2 = ordrlist[j].HBillNo;
+ barcode.HSourceBillType2 = ordrlist[j].HBillType;
+ barcode.HPrint = "0";
+ barcode.HWei = WeiShu;
+ barcode.HBarcodeNo = ClsPub.isStrNull(n + 1);
+ barcode.HBarcodeQtys = ordrlist[j].HBQty;
+ barcode.HSupID2 = ordrlist[j].HSupID;
+ barcode.HSupNumber2 = ordrlist[j].HSupNumber;
+ barcode.HSupName2 = ordrlist[j].HSupName;
+ barcode.HDeptID2 = ordrlist[j].HDeptID;
+ barcode.HDeptNumber2 = ordrlist[j].HDeptNumber;
+ barcode.HDeptName2 = ordrlist[j].HDeptName;
+ barcode.HRemark2 = ordrlist[j].HRemark;
+ barcode.HDate2 = ordrlist[j].HDate;
+ barcode.HShowDate2 = ordrlist[j].HShowDate;
+ barcode.HWhID2 = ordrlist[j].HWhID;
+ barcode.HWhNumber2 = ordrlist[j].HWhNumber;
+ barcode.HWhName2 = ordrlist[j].HWhName;
+ barcode.HSPID2 = ordrlist[j].HSPID;
+ barcode.HSPNumber2 = ordrlist[j].HSPNumber;
+ barcode.HSPName2 = ordrlist[j].HSPName;
+ barcode.HMTONo2 = ordrlist[j].HMTONo;
+ barcode.HCusID2 = ordrlist[j].HCusID;
+ barcode.HCusNumber2 = ordrlist[j].HCusNumber;
+ barcode.HCusName2 = ordrlist[j].HCusName;
+ barcode.HCusType2 = ordrlist[j].HCusType;
+ barcode.HSourceID2 = ordrlist[j].HSourceID;
+ barcode.HSourceNumber2 = ordrlist[j].HSourceNumber;
+ barcode.HSourceName2 = ordrlist[j].HSourceName;
+ barcode.HEndDate2 = ordrlist[j].HEndDate;
+ barcode.HSeOrderBillNo2 = ordrlist[j].HSeOrderBillNo;
+ barcode.HInnerBillNo2 = ordrlist[j].HInnerBillNo;
+ barcode.HMaker2 = ordrlist[j].HMaker;
+ barcode.HGiveAwayFlag2 = ordrlist[j].HGiveAwayFlag;
+ ListRows.Add(barcode);
+ k = k + 1;
+ n = n + 1;
+ oCN.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+ }
+ }
+ }
+ string HWei = ""; //灏炬暟
+ string HBarCode = "";
+ string HBarCodeType = "";
+ Int64 HMaterID = 0;
+ Int64 HAuxPropID = 0;
+ Int64 HUnitID = 0;
+ double HQty2 = 0;
+ string HBatchNo2 = "";
+ Int64 HSupID = 0;
+ Int64 HGroupID = 0;
+ int HPrintQty = 0;
+ Int64 HSourceInterID = 0;
+ Int64 HSourceEntryID = 0;
+ string HSourceBillNo = "";
+ string HSourceBillType = "";
+ Int64 HBarcodeNo = 0; //鎵樺彿
+ Int64 HBarcodeQtys = 0; //鎬绘墭鏁�
+ Int64 HDeptID = 0;
+ Int64 HWhID = 0;
+ Int64 HSPID = 0;
+ string HRemark = "";
+ string HMaterName = "";
+ string HMaterModel = "";
+ string HPinfan = "";
+ string HMTONo = "";
+ Int64 HCusID = 0;
+ string HCusType = "";
+ DateTime HEndDate;
+ string HWorkLineName = "";
+ string HSeOrderBillNo = "";
+ string HInnerBillNo = "";
+ bool HGiveAwayFlag = false;
+ Int64 HEntryID = 0;
+ try
+ {
+ oCN.BeginTran();
+ for (int i = 0; i < ListRows.Count; i++)
+ {
+ if (ClsPub.isLong(ListRows[i].HMaterID2) != 0)
+ {
+ HWei = ClsPub.isStrNull(ListRows[i].HWei);
+ HBarCode = ClsPub.isStrNull(ListRows[i].HBarCode2);
+ //
+ HBarCodeType = ClsPub.isStrNull(HSelectBarCodeType);
+ if (CampanyName == "鍗氭棩绉戞妧" || CampanyName == "澶忓疂鐢靛櫒")
+ {
+ HBarCodeType = "鍞竴鏉＄爜";
+ }
+ //
+ HMaterID = ClsPub.isLong(ListRows[i].HMaterID2);
+ HEntryID = ClsPub.isLong(ListRows[i].HEntryID2);
+ HAuxPropID = ClsPub.isLong(ListRows[i].HAuxPropID2);
+ HUnitID = ClsPub.isLong(ListRows[i].HUnitID2);
+ HQty2 = ClsPub.isDoule(ListRows[i].HQty2);
+ HBatchNo2 = ClsPub.isStrNull(ListRows[i].HBatchNo2);
+ HSourceInterID = ClsPub.isLong(ListRows[i].HSourceInterID2);
+ HSourceEntryID = ClsPub.isLong(ListRows[i].HSourceEntryID2);
+ HSourceBillNo = ClsPub.isStrNull(ListRows[i].HSourceBillNo2);
+ HSourceBillType = ClsPub.isStrNull(ListRows[i].HSourceBillType2);
+ HBarcodeQtys = ClsPub.isLong(ListRows[i].HBarcodeQtys);
+ HBarcodeNo = ClsPub.isLong(ListRows[i].HBarcodeNo);
+ HSupID = ClsPub.isLong(ListRows[i].HSupID2);
+ HDeptID = ClsPub.isLong(ListRows[i].HDeptID2);
+ HWhID = ClsPub.isLong(ListRows[i].HWhID2);
+ HSPID = ClsPub.isLong(ListRows[i].HSPID2);
+ HRemark = ClsPub.isStrNull(ListRows[i].HRemark2);
+ HMaterName = ClsPub.isStrNull(ListRows[i].HMaterName2);
+ HMaterModel = ClsPub.isStrNull(ListRows[i].HMaterModel2);
+ HPinfan = ClsPub.isStrNull(ListRows[i].HPinfan2);
+ HMTONo = ClsPub.isStrNull(ListRows[i].HMTONo2);
+ HCusID = ClsPub.isLong(ListRows[i].HCusID2);
+ HCusType = ClsPub.isStrNull(ListRows[i].HCusType2);
+ HEndDate = ClsPub.isDate(ListRows[i].HEndDate2);
+ HWorkLineName = ClsPub.isStrNull(ListRows[i].HSourceName2);
+ HSeOrderBillNo = ClsPub.isStrNull(ListRows[i].HSeOrderBillNo2);
+ HInnerBillNo = ClsPub.isStrNull(ListRows[i].HInnerBillNo2);
+ HGiveAwayFlag = ClsPub.isBool(ListRows[i].HGiveAwayFlag2);
+ oCN.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
+ ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
+ ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
+ ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate " +
+ ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " +
+ ",HGiveAwayFlag " +
+ ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " +
+ ") values ("
+ + "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()
+ + ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString()
+ + ", " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HWei + "'"
+ + ", " + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + "," + HDeptID.ToString() + "," + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HRemark + "'"
+ + ", " + HCusID.ToString() + ",'" + HCusType + "','" + HEndDate.ToShortDateString() + "','" + HWorkLineName + "','" + sDate + "'"
+ + ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HInterID.ToString() + "," + HEntryID.ToString() + ""
+ + ", " + DBUtility.ClsPub.BoolToString(HGiveAwayFlag)
+ + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "')");
+
+
+ //HNumber = ClsPub.isStrNull(grdSub.Rows[i].Cells[HMaterID2Col].Value);
+ //if (cmbHBarCodeType.Text == "鍞竴鏉＄爜")
+ //{
+ // if (CampanyName == "鍗撳姏") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉�
+ // {
+ // //鏉＄爜鍓嶇紑 = 鐗╂枡浠ｇ爜 + 骞� + 鏈� + 鏃�
+ // sTMNumber = HNumber + sYear + sPeriod + sDay;
+ // }
+ // else if (CampanyName == "椋為緳")
+ // {
+ // string HWorksNumber = "";
+ // HWorksNumber = cmbHWorksNumber.Text;
+ // if (HWorksNumber == "")
+ // {
+ // MessageBox.Show("宸ュ巶浠ｇ爜涓嶈兘涓虹┖锛�");
+ // return;
+ // }
+ // //鏉＄爜鍓嶇紑 = 宸ュ巶浠ｇ爜 + 鐗╂枡鍐呯爜 + 鏃ユ湡
+ // sTMNumber = HWorksNumber + HNumber + sYear + sPeriod + sDay;
+ // }
+ // else //閫氱敤鏂规硶
+ // {
+ // //鏉＄爜鍓嶇紑 = 缁勭粐浠ｇ爜 + 鐗╂枡浠ｇ爜 + 骞� + 鏈� + 鏃�
+ // sTMNumber = HOrgNumber + HNumber + sYear + sPeriod + sDay;
+ // }
+ //}
+ //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+ }
+ }
+ //澧炲姞 鏉＄爜瓒呰繃鏈敓鎴愬姛鑳芥帶鍒�
+
+ //
+ oCN.Commit();
+ List<Object> listobj = ListRows.ConvertAll(s => (object)s);//List瀹炰綋绫昏浆鎹负object
+ //鑾峰彇鐢熸垚鐨勬潯鐮佷俊鎭�
+ string sql = string.Format(@"select * from h_v_IF_BarCodeBillList Where HinterID=" + HInterID.ToString() + " order by HItemID");
+ ds = new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_IF_ICMOBillList_Table");
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇璧勬簮缁戝畾鏁版嵁鎴愬姛锛�";
+ objJsonResult.data = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(ds.Tables[0], new IsoDateTimeConverter { DateTimeFormat = "yyyy-MM-dd HH:mm:ss" })); //搴忓垪鍖朌ataSet涓殑鏃堕棿鏍煎紡锛岀劧鍚庡啀鍙嶅簭鍒楀寲鍥炴潵
+ objJsonResult.list = listobj;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍缁撴灉,鏉＄爜涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ objJsonResult.list = listobj;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏉＄爜鐢熸垚澶辫触锛�" + e.Message;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
#endregion
}
}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\350\260\203\346\213\250\347\233\230\347\202\271/Kf_MoveStockRequestBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\350\260\203\346\213\250\347\233\230\347\202\271/Kf_MoveStockRequestBillController.cs"
index 66780e3..f4c442a 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\350\260\203\346\213\250\347\233\230\347\202\271/Kf_MoveStockRequestBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\350\260\203\346\213\250\347\233\230\347\202\271/Kf_MoveStockRequestBillController.cs"
@@ -43,22 +43,11 @@
ds = oCn.RunProcReturn(sql, "h_v_IF_MoveStockRequestBillList_Litee");
}
- //if (ds.Tables[0].Rows.Count != 0 || ds != null)
- //{
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
- //}
- //else
- //{
- //objJsonResult.code = "0";
- //objJsonResult.count = 0;
- //objJsonResult.Message = "鏃犳暟鎹�";
- //objJsonResult.data = null;
- //return objJsonResult;
- //}
}
catch (Exception ex)
{
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index fc9e98b..f9d1ad9 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -1954,6 +1954,6 @@
List<Models.ClsSc_ProcessReportSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_ProcessReportSub>>(jsonString);
return list;
}
-
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Models/HBarCodeList.cs b/WebAPI/Models/HBarCodeList.cs
new file mode 100644
index 0000000..9ac3310
--- /dev/null
+++ b/WebAPI/Models/HBarCodeList.cs
@@ -0,0 +1,66 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class HBarCodeList
+ {
+ public string HBarCode2 { get; set; } //鏉＄爜缂栧彿
+ public string HBarCodeType2 { get; set; } //鏉＄爜绫诲瀷
+ public string HMaterID2 { get; set; } // "鐗╂枡ID";
+ public string HMaterNumber2 { get; set; } // "鐗╂枡浠ｇ爜";
+ public string HMaterName2 { get; set; } // "鐗╂枡鍚嶇О";
+ public string HMaterModel2 { get; set; } // "瑙勬牸鍨嬪彿";
+ public string HModel2 { get; set; } // "鑷畾涔夎鏍�";
+ public string HAuxPropID2 { get; set; } // "杈呭姪灞炴�D";
+ public string HAuxPropNumber2 { get; set; } // "杈呭姪灞炴�т唬鐮�";
+ public string HAuxPropName2 { get; set; } // "杈呭姪灞炴�у悕绉�";
+ public string HPinfan2 { get; set; } //鍝佺暘
+ public string HPinfanBarCode2 { get; set; } //HPinfanBarCode
+ public string HBatchNo2 { get; set; } //"鎵瑰彿";
+ public int HGiveAwayFlag2 { get; set; } //"鏄惁璧犲搧";
+ public string HUnitID2 { get; set; } //"璁￠噺鍗曚綅ID";
+ public string HUnitNumber2 { get; set; } //"璁￠噺鍗曚綅浠ｇ爜";
+ public string HUnitName2 { get; set; } //"璁￠噺鍗曚綅";
+ public string HQty2 { get; set; } //"鏁伴噺";
+ public string HWei { get; set; } //"灏炬暟";
+ public string HPrint { get; set; } //"鎵撳嵃娆℃暟";
+ public string HSourceInterID2 { get; set; } //"婧愬崟涓籌D";
+ public string HSourceEntryID2 { get; set; } //"婧愬崟瀛怚D";
+ public string HSourceBillNo2 { get; set; } //"婧愬崟鍗曞彿";
+ public string HSourceBillType2 { get; set; } //"婧愬崟绫诲瀷";
+ public string HSeOrderBillNo2 { get; set; } //"閿�鍞鍗曞彿";
+ public string HBarcodeNo { get; set; } //"鎵樺彿";
+ public string HBarcodeQtys { get; set; } //"鎬绘墭鏁�";
+ public string HSupID2 { get; set; } //"渚涘簲鍟咺D";
+ public string HSupNumber2 { get; set; } //"渚涘簲鍟嗕唬鐮�";
+ public string HSupName2 { get; set; } //"渚涘簲鍟�";
+ public string HDeptID2 { get; set; } //"杞﹂棿ID";
+ public string HDeptNumber2 { get; set; } //"杞﹂棿浠ｇ爜";
+ public string HDeptName2 { get; set; } //"杞﹂棿";
+ public string HWhID2 { get; set; } //"浠撳簱ID";
+ public string HWhNumber2 { get; set; } //"浠撳簱浠ｇ爜";
+ public string HWhName2 { get; set; } //"浠撳簱";
+ public string HSPID2 { get; set; } //"浠撲綅ID";
+ public string HSPNumber2 { get; set; } //"浠撲綅浠ｇ爜";
+ public string HSPName2 { get; set; } //"浠撲綅";
+ public string HInstructNo2 { get; set; } //"鎸囦护鍗曞彿";
+ public string HDate2 { get; set; } //"杩涙枡鏃ユ湡";
+ public string HRemark2 { get; set; } //"澶囨敞";
+ public string HMTONo2 { get; set; } //"璁″垝璺熻釜鍙�";
+ public string HCusID2 { get; set; } //"瀹㈡埛ID";
+ public string HCusNumber2 { get; set; } //"瀹㈡埛浠ｇ爜";
+ public string HCusName2 { get; set; } //"瀹㈡埛";
+ public string HCusType2 { get; set; } //"瀹㈡埛鍨嬪彿";
+ public string HEndDate2 { get; set; } //"璁″垝瀹屽伐鏃ユ湡";
+ public string HSourceID2 { get; set; } //"鐢熶骇绾縄D";
+ public string HSourceNumber2 { get; set; } //"鐢熶骇绾夸唬鐮�";
+ public string HSourceName2 { get; set; } //"鐢熶骇绾�";
+ public string HShowDate2 { get; set; } //"鏃ユ湡";
+ public string HInnerBillNo2 { get; set; } //"鍐呴儴閲囪喘璁㈠崟鍙�";
+ public string HMaker2 { get; set; } //"鍒跺崟浜�";
+ public string HEntryID2 { get; set; } //"琛屽彿";
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Models/HSouceOrderList.cs b/WebAPI/Models/HSouceOrderList.cs
new file mode 100644
index 0000000..565e388
--- /dev/null
+++ b/WebAPI/Models/HSouceOrderList.cs
@@ -0,0 +1,65 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class HSouceOrderList
+ {
+ public string HMainID { get; set; } //婧愬崟涓籌D
+ public string HSubID { get; set; } //婧愬崟瀛怚D
+ public string HBillNo{get;set;} // "婧愬崟鍗曞彿";
+ public string HSourceBillNo { get; set; } // "婧愬崟鍗曞彿";
+ public string HBillType{get;set;} // "鍗曟嵁绫诲瀷";
+ public string HMaterID{get;set;} // "鐗╂枡ID";
+ public string HMaterNumber{get;set;} // "鐗╂枡浠ｇ爜";
+ public string HMaterName{get;set;} // "鐗╂枡鍚嶇О";
+ public string HMaterModel{get;set;} // "瑙勬牸鍨嬪彿";
+ public string HModel{get;set;} // "鑷畾涔夎鏍�";
+ public string HPinfan{get;set;} // "鍝佺暘";
+ public string HPinfanBarCode{get;set;} // "HPinfanBarCode";
+ public string HAuxPropID{get;set;} // "杈呭姪灞炴�D";
+ public string HAuxPropNumber{get;set;} // "杈呭姪灞炴�т唬鐮�";
+ public string HAuxPropName{get;set;} // "杈呭姪灞炴�у悕绉�";
+ public string HUnitID{get;set;} // "璁￠噺鍗曚綅ID";
+ public string HUnitNumber{get;set;} // "璁￠噺鍗曚綅浠ｇ爜";
+ public string HUnitName{get;set;} // "璁￠噺鍗曚綅鍚嶇О";
+ public string HBarCodeType{get;set;} // "鏉＄爜绫诲瀷";
+ public string HBatchManager{get;set;} // "鏄惁鍚敤鎵规";
+ public string HBatchNo{get;set;} // "鎵瑰彿";
+ public int HGiveAwayFlag{get;set;} // "鏄惁璧犲搧";
+ public string HQty{get;set;} // "鏁伴噺";
+ public string HMinQty{get;set;} // "鏈�灏忓寘瑁呮暟";
+ public string HPackQty{get;set;} // "澶栫鏁�";
+ public string HBQty{get;set;} // "绠辨暟";
+ public string HSupID{get;set;} // "渚涘簲鍟咺D";
+ public string HSupNumber{get;set;} // "渚涘簲鍟嗕唬鐮�";
+ public string HSupName{get;set;} // "渚涘簲鍟�";
+ public string HDeptID{get;set;} // "杞﹂棿ID";
+ public string HDeptNumber{get;set;} // "杞﹂棿浠ｇ爜";
+ public string HDeptName{get;set;} // "杞﹂棿";
+ public string HWhID{get;set;} // "浠撳簱ID";
+ public string HWhNumber{get;set;} // "浠撳簱浠ｇ爜";
+ public string HWhName{get;set;} // "浠撳簱";
+ public string HSPID{get;set;} // "浠撲綅ID";
+ public string HSPNumber{get;set;} // "浠撲綅浠ｇ爜";
+ public string HSPName{get;set;} // "浠撲綅";
+ public string HInstructNo{get;set;} // "鎸囦护鍗曞彿";
+ public string HSeOrderBillNo{get;set;} // "閿�鍞鍗曞彿";
+ public string HDate{get;set;} // "杩涙枡鏃ユ湡";
+ public string HRemark{get;set;} // "澶囨敞";
+ public string HMTONo{get;set;} // "璁″垝璺熻釜鍙�";
+ public string HCusID{get;set;} // "瀹㈡埛ID";
+ public string HCusNumber{get;set;} // "瀹㈡埛浠ｇ爜";
+ public string HCusName{get;set;} // "瀹㈡埛";
+ public string HCusType{get;set;} // "瀹㈡埛鍨嬪彿";
+ public string HEndDate{get;set;} // "璁″垝瀹屽伐鏃ユ湡";
+ public string HSourceID{get;set;} // "鐢熶骇绾縄D";
+ public string HSourceNumber{get;set;} // "鐢熶骇绾夸唬鐮�";
+ public string HSourceName{get;set;} // "鐢熶骇绾�";
+ public string HShowDate{get;set;} // "鏃ユ湡";
+ public string HInnerBillNo{get;set;} // "鍐呴儴閲囪喘璁㈠崟鍙�";
+ public string HMaker{get;set;} // "鍒跺崟浜�";
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Models/json.cs b/WebAPI/Models/json.cs
index ed49eab..edf95f6 100644
--- a/WebAPI/Models/json.cs
+++ b/WebAPI/Models/json.cs
@@ -11,9 +11,8 @@
public int count { get; set; }
public string Message { get; set; }
public object data { get; set; }
-
public List<object> list { get; set; }
-
+ public Dictionary<object, object> Dictlist { get; set; }
public string Verify { get; set; }
public string HInterID { get; set; }
}
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 1f5ff2f..398cc29 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,11 +5,11 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2022-02-28T09:41:39.7714852Z;True|2022-02-28T17:34:28.2025587+08:00;True|2022-02-28T10:52:34.5492360+08:00;True|2022-02-25T15:19:47.8954929+08:00;True|2022-02-23T17:57:14.3693224+08:00;True|2022-02-23T17:46:42.1078183+08:00;False|2022-02-23T17:41:06.5886724+08:00;True|2022-02-23T16:59:45.5533581+08:00;True|2022-02-23T16:57:43.3328895+08:00;True|2022-02-21T09:09:37.2601134+08:00;True|2022-02-21T09:03:32.4071009+08:00;True|2022-02-21T08:59:59.0172082+08:00;True|2022-02-18T14:05:39.1358825+08:00;True|2022-02-18T10:23:02.4391239+08:00;True|2022-02-18T10:21:31.0559267+08:00;True|2022-02-17T16:50:11.7192509+08:00;True|2022-02-17T13:19:13.7697894+08:00;True|2022-02-11T10:36:12.7757100+08:00;True|2022-02-10T10:54:25.2685040+08:00;True|2022-02-10T10:37:02.1034768+08:00;True|2022-02-09T17:32:45.6511283+08:00;True|2022-02-09T17:24:32.5115193+08:00;True|2022-02-09T17:00:24.0662114+08:00;True|2022-02-09T16:56:42.3364622+08:00;True|2022-02-09T14:17:25.8688855+08:00;True|2022-02-09T14:11:51.6149822+08:00;True|2022-02-07T23:29:26.2842648+08:00;True|2022-02-07T23:28:58.8242274+08:00;False|2022-02-07T23:25:29.0647793+08:00;True|2022-02-07T13:06:37.5515985+08:00;True|2022-02-07T12:42:19.5220491+08:00;True|2022-02-07T09:52:59.6728595+08:00;True|2022-02-01T11:32:10.5831557+08:00;True|2022-01-29T14:09:02.9178986+08:00;True|2022-01-28T12:01:45.1416438+08:00;True|2022-01-28T11:03:41.6361866+08:00;True|2022-01-28T10:44:53.5367862+08:00;True|2022-01-28T10:40:41.6697563+08:00;True|2022-01-28T10:25:56.7093616+08:00;True|2022-01-28T09:58:13.0733060+08:00;True|2022-01-27T09:26:29.6568807+08:00;True|2022-01-27T00:47:57.9102528+08:00;True|2022-01-27T00:46:52.8845001+08:00;True|2022-01-27T00:36:34.5330938+08:00;True|2022-01-27T00:35:19.5439329+08:00;True|2022-01-27T00:33:38.5701950+08:00;True|2022-01-27T00:32:00.9028982+08:00;True|2022-01-27T00:30:13.2390921+08:00;True|2022-01-27T00:28:23.2989144+08:00;True|2022-01-27T00:16:01.3789455+08:00;True|2022-01-27T00:09:58.8112352+08:00;True|2022-01-27T00:00:40.8353538+08:00;True|2022-01-26T23:37:50.9494735+08:00;True|2022-01-26T23:29:39.8647473+08:00;True|2022-01-26T23:20:49.3274392+08:00;True|2022-01-26T23:15:53.7037293+08:00;True|2022-01-26T23:06:28.8595953+08:00;True|2022-01-26T23:02:12.9882299+08:00;True|2022-01-26T22:55:33.2535730+08:00;True|2022-01-26T22:51:01.8427947+08:00;True|2022-01-26T22:47:44.0715387+08:00;True|2022-01-26T22:20:21.7217039+08:00;True|2022-01-26T22:13:39.5372069+08:00;True|2022-01-26T22:01:31.2113177+08:00;True|2022-01-26T21:55:26.5478921+08:00;True|2022-01-26T21:50:18.2700369+08:00;True|2022-01-26T21:48:52.0020233+08:00;True|2022-01-26T19:19:29.4530523+08:00;True|2022-01-26T19:07:21.6474231+08:00;True|2022-01-26T18:25:42.2933291+08:00;True|2022-01-26T12:39:02.0149050+08:00;True|2022-01-26T12:13:43.9149452+08:00;True|2022-01-26T11:24:33.5742248+08:00;True|2022-01-26T08:51:10.8105076+08:00;True|2022-01-25T21:07:32.9069261+08:00;True|2022-01-24T01:35:12.3309466+08:00;True|2022-01-23T23:19:15.9702821+08:00;True|2022-01-23T21:50:41.6903353+08:00;True|2022-01-23T21:25:57.6084267+08:00;True|2022-01-23T21:16:10.1516535+08:00;True|2022-01-23T20:52:08.3745284+08:00;True|2022-01-23T18:19:32.2386502+08:00;True|2022-01-23T18:11:42.0830325+08:00;True|2022-01-23T18:00:01.3239547+08:00;True|2022-01-23T12:18:48.2466943+08:00;True|2022-01-22T00:48:50.4531647+08:00;True|2022-01-21T13:10:32.8173598+08:00;True|2022-01-21T13:04:01.6388059+08:00;True|2022-01-21T12:51:40.5304103+08:00;True|2022-01-21T12:44:06.3059885+08:00;True|2022-01-21T12:34:33.9314010+08:00;True|2022-01-21T11:39:20.1088577+08:00;True|2022-01-20T11:33:49.0516846+08:00;True|2022-01-20T10:02:12.0295471+08:00;True|2022-01-20T10:02:03.3535503+08:00;True|2022-01-19T23:56:18.7293193+08:00;True|2022-01-19T22:30:14.6986228+08:00;True|2022-01-19T22:15:08.8608795+08:00;True|2022-01-19T21:57:55.2295030+08:00;True|2022-01-19T13:50:37.8588759+08:00;True|2022-01-19T13:42:52.9761531+08:00;True|2022-01-19T00:26:36.9722917+08:00;True|2022-01-19T00:15:30.8583143+08:00;True|2022-01-18T21:19:30.6193048+08:00;True|2022-01-18T21:12:07.1453825+08:00;True|2022-01-18T20:35:27.3779956+08:00;True|2022-01-18T17:44:45.2318570+08:00;True|2022-01-18T14:45:29.0299640+08:00;True|2022-01-17T22:23:20.8214203+08:00;True|2022-01-17T21:49:15.7740045+08:00;True|2022-01-17T21:47:24.6997598+08:00;True|2022-01-17T21:44:00.1942787+08:00;True|2022-01-17T21:43:15.5992687+08:00;True|2022-01-17T21:33:16.8034756+08:00;True|2022-01-17T21:25:39.9909343+08:00;True|2022-01-17T21:13:03.9659338+08:00;True|2022-01-17T20:32:14.8869091+08:00;True|2022-01-17T19:01:46.5753686+08:00;True|2022-01-17T18:31:24.1032169+08:00;True|2022-01-17T18:21:39.2918684+08:00;True|2022-01-17T18:12:07.4859038+08:00;True|2022-01-17T18:09:26.6989718+08:00;True|2022-01-17T18:04:36.7564997+08:00;True|2022-01-17T17:57:44.7814863+08:00;True|2022-01-17T17:51:50.1516107+08:00;True|2022-01-17T17:39:29.2918799+08:00;True|2022-01-17T14:55:21.5859341+08:00;True|2022-01-17T14:38:06.5091500+08:00;True|2022-01-17T14:30:25.5378436+08:00;True|2022-01-16T19:15:24.5874858+08:00;True|2022-01-16T19:07:49.0613424+08:00;True|2022-01-16T16:10:47.3112741+08:00;False|2022-01-14T19:09:41.9296709+08:00;False|2022-01-14T18:56:11.0569808+08:00;False|2022-01-14T18:28:20.1376762+08:00;False|2022-01-14T18:27:30.8678130+08:00;False|2022-01-14T18:22:45.4436504+08:00;False|2022-01-14T18:19:37.0374753+08:00;False|2022-01-14T18:18:48.5868254+08:00;False|2022-01-14T18:14:02.5810257+08:00;False|2022-01-14T18:09:51.1730754+08:00;False|2022-01-14T18:09:17.8940754+08:00;True|2022-01-13T20:08:16.2937608+08:00;True|2022-01-13T20:07:30.1505466+08:00;True|2022-01-13T13:39:42.0146294+08:00;True|2022-01-13T13:38:07.5062471+08:00;True|2022-01-13T11:29:49.3751232+08:00;True|2022-01-13T11:05:43.9574142+08:00;True|2022-01-13T10:33:23.1921058+08:00;True|2022-01-12T20:38:16.9165651+08:00;True|2022-01-12T20:24:46.3779264+08:00;True|2022-01-12T20:03:06.5030626+08:00;True|2022-01-12T19:44:55.4294326+08:00;True|2022-01-12T12:58:45.9548600+08:00;True|2022-01-12T11:28:44.7797749+08:00;True|2022-01-11T18:07:30.9151356+08:00;True|2022-01-11T15:06:32.7301609+08:00;True|2022-01-11T09:27:00.1766442+08:00;True|2021-12-30T14:41:56.8541015+08:00;True|2021-12-30T13:45:00.6130694+08:00;True|2021-12-30T13:44:18.7370780+08:00;True|2021-12-30T13:36:52.8171136+08:00;True|2021-12-28T19:14:22.5979649+08:00;True|2021-12-28T13:13:39.3543252+08:00;True|2021-12-27T15:31:26.6037782+08:00;True|2021-12-27T15:28:54.4824480+08:00;True|2021-12-27T15:22:47.8436108+08:00;True|2021-12-27T15:04:37.0711590+08:00;True|2021-12-27T15:03:52.0932499+08:00;True|2021-12-27T15:03:33.0172733+08:00;True|2021-12-27T13:28:27.4252747+08:00;True|2021-12-25T19:38:33.6784042+08:00;True|2021-12-24T20:47:43.3471563+08:00;True|2021-12-24T20:14:57.6946814+08:00;True|2021-12-24T19:55:21.1843105+08:00;True|2021-12-24T19:49:54.6719726+08:00;True|2021-12-24T19:38:14.1180741+08:00;True|2021-12-22T13:51:37.1082523+08:00;True|2021-12-21T15:38:59.8015096+08:00;True|2021-12-21T15:29:54.8095063+08:00;False|2021-12-21T15:29:21.7006531+08:00;False|2021-12-21T15:16:18.2218025+08:00;False|2021-12-21T15:11:38.1215841+08:00;False|2021-12-21T15:08:27.0590078+08:00;True|2021-12-10T14:12:36.4065298+08:00;True|2021-12-10T13:54:03.4921778+08:00;True|2021-12-10T13:25:49.0439086+08:00;True|2021-12-10T13:19:58.9494477+08:00;True|2021-12-10T13:10:45.3929017+08:00;True|2021-12-10T11:06:53.2416794+08:00;True|2021-12-07T17:23:28.9380484+08:00;True|2021-12-07T17:13:52.4384814+08:00;True|2021-12-07T16:39:49.2020208+08:00;True|2021-12-07T15:18:20.9024533+08:00;True|2021-12-07T15:07:35.4428035+08:00;True|2021-12-07T15:01:02.0445043+08:00;True|2021-12-07T14:50:08.9019705+08:00;True|2021-12-07T14:34:50.4993666+08:00;False|2021-12-07T14:32:56.0408332+08:00;True|2021-12-06T17:11:41.4004606+08:00;True|2021-12-06T16:48:07.6029757+08:00;True|2021-12-06T13:46:35.9437718+08:00;True|2021-12-06T13:45:07.6622615+08:00;True|2021-12-06T11:25:04.3483155+08:00;True|2021-12-06T11:18:24.5804187+08:00;True|2021-11-22T16:27:05.4241947+08:00;True|2021-11-22T13:40:17.6768280+08:00;True|2021-11-19T16:15:19.9085104+08:00;True|2021-11-09T10:34:21.1623512+08:00;True|2021-11-07T16:57:59.7380254+08:00;True|2021-11-07T16:53:47.4198852+08:00;True|2021-11-07T16:42:05.5096826+08:00;True|2021-11-07T16:37:21.0729013+08:00;True|2021-11-05T20:51:17.6170717+08:00;True|2021-11-05T20:35:14.6250333+08:00;True|2021-11-05T19:30:19.8374158+08:00;True|2021-11-05T19:22:46.2276569+08:00;True|2021-11-05T19:20:30.8253213+08:00;True|2021-11-05T19:16:45.7553310+08:00;True|2021-11-05T19:16:00.4532689+08:00;True|2021-11-05T19:12:25.9022478+08:00;False|2021-11-05T19:11:26.5753529+08:00;True|2021-11-05T19:09:30.0085433+08:00;True|2021-11-05T18:48:19.9395153+08:00;True|2021-11-05T18:45:34.3437897+08:00;True|2021-11-05T18:43:43.4558159+08:00;True|2021-11-05T18:40:40.9948500+08:00;True|2021-11-05T18:34:18.4440455+08:00;True|2021-11-05T15:54:51.6037132+08:00;True|2021-10-28T16:27:53.9728270+08:00;True|2021-10-28T16:03:59.5629998+08:00;True|2021-10-28T08:51:04.2549186+08:00;True|2021-10-27T15:14:53.5506098+08:00;True|2021-10-27T15:00:44.9100320+08:00;True|2021-10-27T13:14:46.7921647+08:00;True|2021-10-27T11:24:49.4550753+08:00;True|2021-10-27T10:10:10.3545125+08:00;True|2021-10-27T10:02:24.9248610+08:00;True|2021-10-27T09:59:40.3795897+08:00;True|2021-10-27T09:56:30.6629207+08:00;True|2021-10-27T09:10:48.3883432+08:00;True|2021-10-27T09:03:31.9191991+08:00;True|2021-10-27T08:59:59.7651159+08:00;True|2021-10-27T08:36:11.8620997+08:00;True|2021-10-27T08:26:40.2533014+08:00;True|2021-10-26T09:19:35.5674748+08:00;True|2021-10-26T09:17:17.6900747+08:00;True|2021-10-26T09:14:32.3999220+08:00;True|2021-10-25T15:08:21.2581763+08:00;True|2021-10-25T10:01:57.8524903+08:00;True|2021-10-25T09:28:51.6294879+08:00;True|2021-10-25T09:25:50.3373336+08:00;True|2021-10-25T09:23:37.0203978+08:00;True|2021-10-25T09:18:23.3380608+08:00;True|2021-10-25T09:15:10.5292071+08:00;True|2021-10-25T08:56:30.4632027+08:00;True|2021-10-25T08:50:11.4697392+08:00;True|2021-10-22T13:46:49.7207066+08:00;True|2021-10-22T10:06:33.3130089+08:00;True|2021-10-20T14:32:10.1235516+08:00;True|2021-10-20T14:16:18.6496291+08:00;True|2021-10-20T14:08:49.2443715+08:00;True|2021-10-20T14:05:14.6847950+08:00;True|2021-10-20T13:30:21.6057636+08:00;True|2021-10-20T10:55:22.2151716+08:00;True|2021-10-19T10:42:13.4198267+08:00;True|2021-10-19T10:01:41.0018108+08:00;True|2021-10-19T09:59:11.2127619+08:00;True|2021-10-19T09:54:04.8472874+08:00;True|2021-10-15T11:19:15.5327495+08:00;True|2021-10-15T11:17:41.0686485+08:00;True|2021-10-15T11:12:11.8295042+08:00;True|2021-10-15T10:33:31.5670079+08:00;True|2021-10-15T10:27:45.0815146+08:00;True|2021-10-14T14:51:28.5331025+08:00;True|2021-10-14T14:37:28.3276051+08:00;True|2021-10-14T14:23:39.0606792+08:00;True|2021-10-14T14:21:03.8140347+08:00;True|2021-10-13T10:31:10.6628977+08:00;True|2021-10-13T10:12:24.4238027+08:00;True|2021-10-13T08:47:43.9314486+08:00;True|2021-10-12T14:07:18.6065183+08:00;True|2021-10-12T10:34:10.1682362+08:00;True|2021-10-12T10:27:14.3073332+08:00;True|2021-10-12T10:22:08.0004619+08:00;True|2021-10-12T10:21:03.0275378+08:00;True|2021-10-12T10:11:54.9812692+08:00;True|2021-10-11T16:59:07.3568342+08:00;True|2021-10-11T16:53:14.2016138+08:00;True|2021-10-11T16:21:35.0133775+08:00;True|2021-10-11T15:34:19.5731935+08:00;True|2021-10-11T15:31:07.5780983+08:00;True|2021-10-11T15:06:47.1145237+08:00;True|2021-10-11T15:03:25.5000280+08:00;True|2021-10-11T10:12:57.6416898+08:00;True|2021-10-09T10:15:17.9235165+08:00;True|2021-10-09T10:13:51.3318441+08:00;True|2021-10-09T10:01:21.6661542+08:00;True|2021-10-09T09:58:41.9225837+08:00;True|2021-10-08T14:56:49.7935800+08:00;True|2021-10-08T14:35:41.4490063+08:00;True|2021-10-08T14:02:42.6990656+08:00;True|2021-09-29T15:48:55.1547397+08:00;True|2021-09-29T15:48:23.5567191+08:00;True|2021-09-27T16:17:35.7180978+08:00;True|2021-09-27T15:51:50.4240134+08:00;True|2021-09-23T20:55:27.3554447+08:00;True|2021-09-23T14:14:44.0572017+08:00;True|2021-09-23T13:51:56.2344673+08:00;True|2021-09-23T10:46:16.7417007+08:00;True|2021-09-23T10:42:23.2117537+08:00;True|2021-09-22T15:21:22.9615672+08:00;True|2021-09-22T14:23:32.7907754+08:00;True|2021-09-22T13:48:03.4780947+08:00;True|2021-09-22T11:05:24.5249356+08:00;True|2021-09-22T10:00:19.0962943+08:00;True|2021-09-22T09:30:26.2686514+08:00;True|2021-09-17T11:22:34.5692792+08:00;True|2021-09-16T16:11:27.5372277+08:00;True|2021-09-16T14:53:40.8396557+08:00;True|2021-09-16T14:32:29.7905500+08:00;True|2021-09-16T14:26:46.2224219+08:00;True|2021-09-16T10:32:24.4244440+08:00;True|2021-09-15T11:10:35.3529360+08:00;True|2021-09-15T11:08:30.0857376+08:00;True|2021-09-15T11:05:56.7191571+08:00;True|2021-09-14T01:24:39.8041136+08:00;True|2021-09-14T01:05:01.1593327+08:00;True|2021-09-14T00:44:14.7233198+08:00;True|2021-09-13T23:48:19.4506233+08:00;True|2021-09-13T20:30:31.3243872+08:00;True|2021-09-13T19:45:35.9108911+08:00;False|2021-09-13T19:44:59.2779092+08:00;True|2021-09-13T18:09:22.4994381+08:00;True|2021-09-10T14:18:27.5788854+08:00;True|2021-09-09T15:57:01.7407207+08:00;True|2021-09-09T15:49:34.2598998+08:00;True|2021-09-09T11:32:10.7853024+08:00;True|2021-09-09T11:10:48.6840025+08:00;True|2021-09-09T10:35:37.3883078+08:00;True|2021-09-07T14:11:49.8497588+08:00;True|2021-09-07T13:34:48.4693349+08:00;True|2021-09-06T14:33:48.7549675+08:00;True|2021-09-03T16:27:51.1888520+08:00;True|2021-09-03T16:19:35.9003465+08:00;True|2021-09-03T15:46:28.1828032+08:00;True|2021-09-03T15:34:21.9362871+08:00;True|2021-09-03T11:24:49.8749819+08:00;True|2021-09-03T11:21:17.8373159+08:00;True|2021-09-03T11:16:53.2208136+08:00;True|2021-09-03T11:12:23.9063804+08:00;True|2021-09-03T09:11:09.2435721+08:00;True|2021-09-02T11:16:15.1370453+08:00;True|2021-09-02T10:35:39.1171879+08:00;True|2021-09-01T10:17:09.4536285+08:00;True|2021-09-01T09:46:28.4581776+08:00;True|2021-08-31T08:54:26.8588887+08:00;True|2021-08-31T08:39:08.3685693+08:00;True|2021-08-30T17:11:56.8438985+08:00;True|2021-08-30T15:59:42.0820292+08:00;True|2021-08-30T15:45:18.1868510+08:00;True|2021-08-30T14:56:08.3958863+08:00;True|2021-08-30T14:37:11.5379830+08:00;True|2021-08-30T14:35:34.8775934+08:00;True|2021-08-30T14:24:36.5111821+08:00;True|2021-08-30T10:05:49.6945200+08:00;True|2021-08-30T10:03:28.4064538+08:00;True|2021-08-30T10:00:16.8360929+08:00;True|2021-08-30T09:56:09.4434379+08:00;True|2021-08-30T09:55:36.1725334+08:00;True|2021-08-30T09:52:04.8600054+08:00;True|2021-08-30T09:47:46.4225655+08:00;True|2021-08-30T09:45:20.4894962+08:00;False|2021-08-27T17:17:34.2646751+08:00;False|2021-08-27T16:01:21.2791979+08:00;False|2021-08-27T15:58:06.9667160+08:00;False|2021-08-27T15:38:37.4818036+08:00;False|2021-08-27T15:21:02.8863114+08:00;False|2021-08-27T15:20:28.6828668+08:00;True|2021-08-26T16:00:44.3162145+08:00;True|2021-08-26T08:57:31.3842587+08:00;True|2021-08-23T08:43:41.1549775+08:00;True|2021-08-22T09:24:12.7210871+08:00;True|2021-08-22T09:19:53.8300229+08:00;True|2021-08-20T20:00:52.0140407+08:00;True|2021-08-20T19:40:14.7712765+08:00;True|2021-08-19T17:37:54.9748049+08:00;True|2021-08-19T17:20:11.0515687+08:00;True|2021-08-19T16:12:35.4392809+08:00;True|2021-08-19T16:06:50.6204587+08:00;True|2021-08-19T16:03:53.0824286+08:00;True|2021-08-19T15:56:01.3498791+08:00;True|2021-08-19T10:18:50.8113630+08:00;True|2021-08-19T09:58:06.2784035+08:00;True|2021-08-19T09:56:54.0619777+08:00;True|2021-08-19T00:32:08.3503093+08:00;True|2021-08-19T00:11:18.3150227+08:00;True|2021-08-19T00:02:49.4827718+08:00;True|2021-08-18T23:54:45.4845900+08:00;True|2021-08-18T23:39:51.6147977+08:00;True|2021-08-18T23:16:42.7214379+08:00;True|2021-08-18T22:38:57.4681929+08:00;True|2021-08-18T21:41:58.7560707+08:00;True|2021-08-18T21:11:52.2369249+08:00;True|2021-08-18T21:01:49.5669106+08:00;True|2021-08-18T20:47:46.5352688+08:00;False|2021-08-18T20:46:36.7956141+08:00;False|2021-08-18T20:46:01.0502138+08:00;True|2021-08-18T19:39:12.8186242+08:00;False|2021-08-18T19:38:12.6839708+08:00;True|2021-08-18T19:15:51.4626694+08:00;True|2021-08-18T16:07:20.4350886+08:00;True|2021-08-18T14:29:41.7171934+08:00;True|2021-08-18T14:20:36.3647361+08:00;True|2021-08-16T09:08:58.3617662+08:00;True|2021-08-15T20:44:29.9214083+08:00;True|2021-08-15T20:36:17.0958549+08:00;True|2021-08-15T20:29:34.3879773+08:00;True|2021-08-15T20:23:47.4052038+08:00;True|2021-08-15T15:01:19.7830862+08:00;True|2021-08-15T12:15:18.3433782+08:00;True|2021-08-13T20:59:11.3947130+08:00;True|2021-08-06T22:49:09.9538339+08:00;True|2021-08-06T22:35:19.0418168+08:00;True|2021-08-06T20:29:47.4241975+08:00;True|2021-08-06T14:08:16.4791827+08:00;True|2021-08-06T13:59:28.9874611+08:00;True|2021-08-06T13:57:34.3723977+08:00;True|2021-08-06T13:36:03.4816652+08:00;True|2021-08-06T12:22:52.5055221+08:00;True|2021-08-06T09:31:58.1272499+08:00;True|2021-08-06T09:26:51.6310039+08:00;True|2021-08-06T09:24:22.2899244+08:00;True|2021-08-06T09:06:30.6477912+08:00;True|2021-08-06T09:00:55.5101612+08:00;True|2021-08-06T08:49:59.9616490+08:00;True|2021-08-06T08:45:18.8586902+08:00;True|2021-08-05T20:09:25.8861998+08:00;True|2021-08-04T19:14:27.2396953+08:00;True|2021-08-04T19:11:47.5849093+08:00;True|2021-08-04T16:42:54.0149043+08:00;True|2021-08-04T15:02:11.5056561+08:00;True|2021-08-04T14:58:37.1435509+08:00;True|2021-08-04T14:55:34.7380132+08:00;True|2021-08-04T14:47:42.5933921+08:00;True|2021-08-04T14:45:17.9911874+08:00;True|2021-08-04T13:52:20.9601351+08:00;True|2021-08-04T09:48:28.8796992+08:00;True|2021-08-03T18:14:13.1894998+08:00;True|2021-08-03T17:45:35.1349721+08:00;True|2021-08-03T17:21:52.6028977+08:00;True|2021-08-03T17:20:35.4423020+08:00;True|2021-08-03T17:03:33.1667669+08:00;True|2021-08-03T17:01:54.2656787+08:00;True|2021-08-03T17:00:22.2778374+08:00;True|2021-08-03T16:56:58.8902582+08:00;True|2021-08-03T15:02:21.8601533+08:00;True|2021-08-03T14:57:34.0186758+08:00;True|2021-08-03T14:28:47.2242515+08:00;True|2021-08-03T14:22:22.4554236+08:00;True|2021-08-03T14:21:51.1339715+08:00;True|2021-08-03T13:37:33.9697131+08:00;True|2021-08-03T13:28:29.7591095+08:00;True|2021-08-03T11:35:09.5118324+08:00;True|2021-08-03T11:11:23.3051573+08:00;True|2021-08-02T13:14:42.3663755+08:00;True|2021-07-30T22:50:19.9749878+08:00;True|2021-07-30T22:49:31.2150970+08:00;True|2021-07-28T19:12:05.8381075+08:00;True|2021-07-28T18:59:45.4808797+08:00;True|2021-07-28T18:15:58.8301509+08:00;True|2021-07-28T18:04:54.8613546+08:00;True|2021-07-28T17:53:48.6225611+08:00;True|2021-07-28T17:42:50.9171563+08:00;True|2021-07-28T17:17:16.3137677+08:00;True|2021-07-28T17:11:46.8925200+08:00;True|2021-07-28T16:28:27.6823943+08:00;True|2021-07-28T16:23:00.3385836+08:00;True|2021-07-28T09:57:55.4237411+08:00;True|2021-07-28T08:38:29.6691541+08:00;True|2021-07-27T23:16:32.0331671+08:00;True|2021-07-27T23:06:08.1947249+08:00;True|2021-07-27T23:05:58.4619176+08:00;True|2021-07-27T18:42:09.5358261+08:00;True|2021-07-27T18:30:04.8532823+08:00;True|2021-07-27T18:29:43.5775092+08:00;True|2021-07-27T15:16:49.8356224+08:00;True|2021-07-27T15:05:27.8453220+08:00;True|2021-07-27T14:59:15.9519440+08:00;True|2021-07-27T09:23:32.6111337+08:00;True|2021-07-27T08:27:41.6395353+08:00;True|2021-07-27T08:25:56.7378296+08:00;True|2021-07-26T11:18:46.0856966+08:00;True|2021-07-26T11:18:02.0751924+08:00;True|2021-07-26T11:13:49.6285395+08:00;True|2021-07-21T21:08:25.9898902+08:00;True|2021-07-21T20:09:26.2258104+08:00;True|2021-07-13T16:17:25.8407435+08:00;True|2021-07-13T13:46:13.4309531+08:00;True|2021-07-13T12:29:04.5082461+08:00;True|2021-06-29T13:55:01.6864637+08:00;True|2021-06-29T10:38:52.2206472+08:00;True|2021-06-29T10:10:13.1540749+08:00;True|2021-06-28T14:37:56.3853273+08:00;False|2021-06-28T14:36:57.5726124+08:00;True|2021-06-25T14:17:57.5196108+08:00;True|2021-06-25T13:56:38.9522535+08:00;True|2021-06-24T19:38:32.8766933+08:00;True|2021-06-24T18:26:35.6118833+08:00;True|2021-06-24T18:02:52.8136877+08:00;True|2021-06-24T17:48:49.5851948+08:00;True|2021-06-24T17:45:46.7527572+08:00;True|2021-06-24T15:05:20.1592723+08:00;True|2021-06-23T16:18:15.6814625+08:00;True|2021-06-23T16:05:24.6112343+08:00;True|2021-06-23T15:14:08.2489658+08:00;True|2021-06-23T13:52:58.6029788+08:00;True|2021-06-22T16:11:20.4726923+08:00;True|2021-06-22T16:04:53.7231389+08:00;True|2021-06-22T15:50:59.2583262+08:00;True|2021-06-22T15:38:15.3016140+08:00;True|2021-06-22T15:34:42.9185543+08:00;True|2021-06-22T15:21:55.1419108+08:00;True|2021-06-22T15:07:21.5357494+08:00;True|2021-06-22T15:03:35.0535733+08:00;True|2021-06-22T14:54:47.8802969+08:00;True|2021-06-22T11:19:38.7303011+08:00;True|2021-06-22T08:53:49.2882695+08:00;True|2021-06-22T08:47:54.8286530+08:00;True|2021-06-21T16:27:19.3017700+08:00;True|2021-06-21T15:32:28.7237952+08:00;True|2021-06-21T12:34:02.6329555+08:00;True|2021-06-21T12:24:17.5427495+08:00;True|2021-06-21T10:47:30.6423502+08:00;True|2021-06-21T08:43:20.3026558+08:00;True|2021-06-19T15:10:06.8335499+08:00;True|2021-06-18T15:37:29.5009930+08:00;True|2021-06-18T13:46:35.6283432+08:00;True|2021-06-18T10:00:37.1474954+08:00;True|2021-06-18T09:55:21.8551780+08:00;True|2021-06-18T09:22:27.8432927+08:00;True|2021-06-17T11:17:43.2166430+08:00;True|2021-06-17T09:24:09.8350403+08:00;True|2021-06-16T16:10:47.8564888+08:00;True|2021-06-16T16:04:09.8286582+08:00;True|2021-06-16T15:12:29.9427169+08:00;True|2021-06-16T14:58:45.6801892+08:00;True|2021-06-16T14:46:01.6873221+08:00;True|2021-06-16T11:02:06.1272477+08:00;True|2021-06-16T09:33:56.0223915+08:00;True|2021-06-16T08:50:07.6995413+08:00;True|2021-06-16T08:28:38.7692635+08:00;True|2021-06-16T01:04:19.6282474+08:00;True|2021-06-16T01:03:50.5058323+08:00;False|2021-06-16T01:02:15.3819672+08:00;False|2021-06-16T01:01:38.6171098+08:00;True|2021-06-16T00:34:54.9902044+08:00;True|2021-06-15T23:55:36.2003828+08:00;True|2021-06-15T22:47:17.2192750+08:00;True|2021-06-15T22:42:41.1512585+08:00;True|2021-06-15T22:38:01.7390462+08:00;True|2021-06-15T22:14:11.2060782+08:00;True|2021-06-15T22:12:27.0615357+08:00;True|2021-06-15T22:07:59.9280871+08:00;True|2021-06-15T22:04:21.5051427+08:00;True|2021-06-15T21:25:55.0099814+08:00;True|2021-06-15T19:13:51.3494172+08:00;True|2021-06-15T19:02:17.6844742+08:00;True|2021-06-15T18:47:37.1629411+08:00;False|2021-06-15T18:47:11.0828111+08:00;True|2021-06-15T18:38:26.6620668+08:00;True|2021-06-15T18:33:45.2069831+08:00;True|2021-06-15T18:24:52.0550838+08:00;True|2021-06-15T18:19:43.6999796+08:00;True|2021-06-15T18:08:17.2464506+08:00;True|2021-06-15T18:03:51.3952624+08:00;True|2021-06-15T18:01:20.6141766+08:00;True|2021-06-15T17:59:04.4479416+08:00;True|2021-06-15T17:41:44.6389379+08:00;True|2021-06-15T17:39:03.1565124+08:00;True|2021-06-15T17:34:41.0634638+08:00;True|2021-06-15T17:33:50.4853178+08:00;True|2021-06-15T17:25:38.5914037+08:00;True|2021-06-15T17:22:21.3611360+08:00;True|2021-06-15T17:16:49.4970813+08:00;True|2021-06-15T17:05:28.9389484+08:00;True|2021-06-15T16:52:54.6372199+08:00;True|2021-06-15T16:51:23.9081030+08:00;True|2021-06-15T16:45:40.6017997+08:00;True|2021-06-15T16:41:05.0218887+08:00;True|2021-06-15T16:38:02.8541862+08:00;True|2021-06-15T16:22:10.3118721+08:00;True|2021-06-15T16:12:11.1552506+08:00;True|2021-06-15T15:33:42.0100494+08:00;True|2021-06-15T15:28:39.7145659+08:00;True|2021-06-15T15:15:02.7939125+08:00;True|2021-06-15T14:49:14.2300396+08:00;True|2021-06-15T14:42:28.1198064+08:00;True|2021-06-15T13:30:12.7997686+08:00;True|2021-06-15T13:25:37.7284670+08:00;True|2021-06-15T13:23:43.6207813+08:00;False|2021-06-15T13:23:19.4190232+08:00;True|2021-06-15T13:16:38.5062674+08:00;True|2021-06-15T13:03:31.2055635+08:00;True|2021-06-15T12:58:43.1653215+08:00;True|2021-06-15T12:39:22.8442109+08:00;True|2021-06-15T12:35:09.1288556+08:00;False|2021-06-15T12:33:50.0723143+08:00;True|2021-06-15T11:28:01.9733727+08:00;True|2021-06-15T11:26:26.6569392+08:00;True|2021-06-15T11:22:43.0366435+08:00;True|2021-06-15T11:07:50.1610580+08:00;True|2021-06-15T10:32:59.1925931+08:00;True|2021-06-10T17:16:57.9552310+08:00;True|2021-06-10T16:44:42.2731836+08:00;True|2021-06-10T14:39:27.6745737+08:00;True|2021-06-10T12:15:05.1524413+08:00;True|2021-06-09T18:19:24.1005606+08:00;True|2021-06-09T17:56:09.5646288+08:00;True|2021-06-09T13:34:06.1882292+08:00;True|2021-06-09T13:29:54.5924933+08:00;True|2021-06-09T13:25:55.7520662+08:00;True|2021-06-09T13:07:47.6686811+08:00;True|2021-06-09T12:59:41.2595048+08:00;True|2021-06-09T12:45:27.1305548+08:00;True|2021-06-09T12:29:52.1418191+08:00;True|2021-06-09T12:24:12.7610588+08:00;True|2021-06-09T11:31:25.3409568+08:00;True|2021-06-09T09:57:44.4387175+08:00;True|2021-06-09T09:54:26.5161307+08:00;True|2021-06-09T09:14:14.7288045+08:00;True|2021-06-09T09:10:25.1812139+08:00;True|2021-06-09T08:46:21.6585123+08:00;True|2021-06-08T19:56:55.7192062+08:00;True|2021-06-08T19:52:59.0326821+08:00;True|2021-06-08T19:49:13.6274217+08:00;True|2021-06-08T19:09:22.1038939+08:00;True|2021-06-08T15:28:41.3716247+08:00;True|2021-06-08T15:26:47.2621178+08:00;True|2021-06-08T13:49:45.8936617+08:00;True|2021-06-08T13:43:18.8115502+08:00;True|2021-06-08T10:04:06.2200731+08:00;True|2021-06-08T09:17:10.0470792+08:00;True|2021-06-08T08:44:37.4395849+08:00;True|2021-06-08T00:01:09.3745613+08:00;True|2021-06-07T23:49:31.5196888+08:00;True|2021-06-07T23:41:00.8017855+08:00;True|2021-06-07T23:21:53.1371134+08:00;True|2021-06-07T23:01:27.5712153+08:00;True|2021-06-07T22:36:12.9274014+08:00;True|2021-06-07T22:23:00.6545134+08:00;True|2021-06-07T17:44:47.5686346+08:00;True|2021-06-07T17:17:01.3431233+08:00;True|2021-06-07T16:53:28.9989587+08:00;True|2021-06-07T16:41:10.4975607+08:00;True|2021-06-07T14:21:06.8176477+08:00;True|2021-06-07T14:10:39.0355659+08:00;True|2021-06-07T12:34:31.4562732+08:00;True|2021-06-07T12:28:44.9629488+08:00;True|2021-06-07T10:30:26.9387988+08:00;True|2021-06-07T09:12:14.7658099+08:00;True|2021-06-07T08:37:19.6353792+08:00;True|2021-06-07T08:35:25.2031954+08:00;True|2021-06-05T07:07:32.0541266+08:00;True|2021-06-05T06:44:35.9475270+08:00;True|2021-06-05T06:37:27.4595197+08:00;True|2021-06-05T06:26:59.7663998+08:00;True|2021-06-05T05:43:12.8699318+08:00;True|2021-06-04T17:00:41.2426007+08:00;True|2021-06-04T16:08:03.8078072+08:00;True|2021-06-04T15:47:21.6412616+08:00;True|2021-06-04T15:21:02.4239800+08:00;True|2021-06-04T15:20:37.8641854+08:00;True|2021-06-04T13:38:51.5088395+08:00;True|2021-06-04T10:20:01.7784282+08:00;True|2021-06-04T10:13:50.3548857+08:00;True|2021-06-04T10:11:25.5017821+08:00;True|2021-06-04T10:09:51.6792228+08:00;True|2021-06-04T10:02:39.5851057+08:00;True|2021-06-04T09:30:40.4495494+08:00;True|2021-06-03T13:16:36.0317546+08:00;True|2021-06-03T13:12:47.0402047+08:00;True|2021-06-02T14:37:08.9683351+08:00;True|2021-06-02T14:10:15.7439829+08:00;True|2021-06-02T13:59:46.5841931+08:00;True|2021-06-02T13:25:18.7962660+08:00;True|2021-06-02T13:23:16.2261980+08:00;True|2021-06-01T15:37:32.2495085+08:00;True|2021-06-01T15:21:01.2856122+08:00;True|2021-06-01T15:13:36.7262365+08:00;True|2021-06-01T15:10:26.8905629+08:00;True|2021-06-01T14:56:17.5231551+08:00;True|2021-06-01T14:38:39.7895927+08:00;True|2021-06-01T14:23:12.3265287+08:00;True|2021-03-01T09:11:31.3226422+08:00;True|2021-05-26T14:54:56.9426462+08:00;True|2021-05-26T13:57:33.7780451+08:00;True|2021-05-26T13:39:02.8043358+08:00;True|2021-02-25T16:01:40.2917200+08:00;True|2021-02-25T15:49:46.6681205+08:00;True|2021-02-25T15:16:30.9372640+08:00;True|2021-05-25T13:10:21.7831921+08:00;True|2021-05-25T11:21:38.5224475+08:00;True|2021-05-25T11:12:52.0637175+08:00;True|2021-05-25T11:02:18.4164663+08:00;True|2021-05-25T10:52:06.8998521+08:00;True|2021-05-25T10:50:45.0929606+08:00;True|2021-05-25T10:45:54.1498313+08:00;True|2021-05-25T10:39:27.8602249+08:00;True|2021-05-25T10:34:49.5771162+08:00;True|2021-05-25T10:17:30.3009163+08:00;True|2021-05-25T10:14:03.8512581+08:00;True|2021-05-25T10:05:33.4343836+08:00;True|2021-05-24T17:01:23.3221168+08:00;True|2021-05-24T10:11:24.0197347+08:00;False|2021-05-24T10:11:07.6338995+08:00;</History>
+ <History>True|2022-02-28T06:36:22.6449303Z;True|2022-02-24T15:43:36.8244163+08:00;True|2022-02-23T17:57:14.3693224+08:00;True|2022-02-23T17:46:42.1078183+08:00;False|2022-02-23T17:41:06.5886724+08:00;True|2022-02-23T16:59:45.5533581+08:00;True|2022-02-23T16:57:43.3328895+08:00;True|2022-02-21T09:09:37.2601134+08:00;True|2022-02-21T09:03:32.4071009+08:00;True|2022-02-21T08:59:59.0172082+08:00;True|2022-02-18T14:05:39.1358825+08:00;True|2022-02-18T10:23:02.4391239+08:00;True|2022-02-18T10:21:31.0559267+08:00;True|2022-02-17T16:50:11.7192509+08:00;True|2022-02-17T13:19:13.7697894+08:00;True|2022-02-11T10:36:12.7757100+08:00;True|2022-02-10T10:54:25.2685040+08:00;True|2022-02-10T10:37:02.1034768+08:00;True|2022-02-09T17:32:45.6511283+08:00;True|2022-02-09T17:24:32.5115193+08:00;True|2022-02-09T17:00:24.0662114+08:00;True|2022-02-09T16:56:42.3364622+08:00;True|2022-02-09T14:17:25.8688855+08:00;True|2022-02-09T14:11:51.6149822+08:00;True|2022-02-07T23:29:26.2842648+08:00;True|2022-02-07T23:28:58.8242274+08:00;False|2022-02-07T23:25:29.0647793+08:00;True|2022-02-07T13:06:37.5515985+08:00;True|2022-02-07T12:42:19.5220491+08:00;True|2022-02-07T09:52:59.6728595+08:00;True|2022-02-01T11:32:10.5831557+08:00;True|2022-01-29T14:09:02.9178986+08:00;True|2022-01-28T12:01:45.1416438+08:00;True|2022-01-28T11:03:41.6361866+08:00;True|2022-01-28T10:44:53.5367862+08:00;True|2022-01-28T10:40:41.6697563+08:00;True|2022-01-28T10:25:56.7093616+08:00;True|2022-01-28T09:58:13.0733060+08:00;True|2022-01-27T09:26:29.6568807+08:00;True|2022-01-27T00:47:57.9102528+08:00;True|2022-01-27T00:46:52.8845001+08:00;True|2022-01-27T00:36:34.5330938+08:00;True|2022-01-27T00:35:19.5439329+08:00;True|2022-01-27T00:33:38.5701950+08:00;True|2022-01-27T00:32:00.9028982+08:00;True|2022-01-27T00:30:13.2390921+08:00;True|2022-01-27T00:28:23.2989144+08:00;True|2022-01-27T00:16:01.3789455+08:00;True|2022-01-27T00:09:58.8112352+08:00;True|2022-01-27T00:00:40.8353538+08:00;True|2022-01-26T23:37:50.9494735+08:00;True|2022-01-26T23:29:39.8647473+08:00;True|2022-01-26T23:20:49.3274392+08:00;True|2022-01-26T23:15:53.7037293+08:00;True|2022-01-26T23:06:28.8595953+08:00;True|2022-01-26T23:02:12.9882299+08:00;True|2022-01-26T22:55:33.2535730+08:00;True|2022-01-26T22:51:01.8427947+08:00;True|2022-01-26T22:47:44.0715387+08:00;True|2022-01-26T22:20:21.7217039+08:00;True|2022-01-26T22:13:39.5372069+08:00;True|2022-01-26T22:01:31.2113177+08:00;True|2022-01-26T21:55:26.5478921+08:00;True|2022-01-26T21:50:18.2700369+08:00;True|2022-01-26T21:48:52.0020233+08:00;True|2022-01-26T19:19:29.4530523+08:00;True|2022-01-26T19:07:21.6474231+08:00;True|2022-01-26T18:25:42.2933291+08:00;True|2022-01-26T12:39:02.0149050+08:00;True|2022-01-26T12:13:43.9149452+08:00;True|2022-01-26T11:24:33.5742248+08:00;True|2022-01-26T08:51:10.8105076+08:00;True|2022-01-25T21:07:32.9069261+08:00;True|2022-01-24T01:35:12.3309466+08:00;True|2022-01-23T23:19:15.9702821+08:00;True|2022-01-23T21:50:41.6903353+08:00;True|2022-01-23T21:25:57.6084267+08:00;True|2022-01-23T21:16:10.1516535+08:00;True|2022-01-23T20:52:08.3745284+08:00;True|2022-01-23T18:19:32.2386502+08:00;True|2022-01-23T18:11:42.0830325+08:00;True|2022-01-23T18:00:01.3239547+08:00;True|2022-01-23T12:18:48.2466943+08:00;True|2022-01-22T00:48:50.4531647+08:00;True|2022-01-21T13:10:32.8173598+08:00;True|2022-01-21T13:04:01.6388059+08:00;True|2022-01-21T12:51:40.5304103+08:00;True|2022-01-21T12:44:06.3059885+08:00;True|2022-01-21T12:34:33.9314010+08:00;True|2022-01-21T11:39:20.1088577+08:00;True|2022-01-20T11:33:49.0516846+08:00;True|2022-01-20T10:02:12.0295471+08:00;True|2022-01-20T10:02:03.3535503+08:00;True|2022-01-19T23:56:18.7293193+08:00;True|2022-01-19T22:30:14.6986228+08:00;True|2022-01-19T22:15:08.8608795+08:00;True|2022-01-19T21:57:55.2295030+08:00;True|2022-01-19T13:50:37.8588759+08:00;True|2022-01-19T13:42:52.9761531+08:00;True|2022-01-19T00:26:36.9722917+08:00;True|2022-01-19T00:15:30.8583143+08:00;True|2022-01-18T21:19:30.6193048+08:00;True|2022-01-18T21:12:07.1453825+08:00;True|2022-01-18T20:35:27.3779956+08:00;True|2022-01-18T17:44:45.2318570+08:00;True|2022-01-18T14:45:29.0299640+08:00;True|2022-01-17T22:23:20.8214203+08:00;True|2022-01-17T21:49:15.7740045+08:00;True|2022-01-17T21:47:24.6997598+08:00;True|2022-01-17T21:44:00.1942787+08:00;True|2022-01-17T21:43:15.5992687+08:00;True|2022-01-17T21:33:16.8034756+08:00;True|2022-01-17T21:25:39.9909343+08:00;True|2022-01-17T21:13:03.9659338+08:00;True|2022-01-17T20:32:14.8869091+08:00;True|2022-01-17T19:01:46.5753686+08:00;True|2022-01-17T18:31:24.1032169+08:00;True|2022-01-17T18:21:39.2918684+08:00;True|2022-01-17T18:12:07.4859038+08:00;True|2022-01-17T18:09:26.6989718+08:00;True|2022-01-17T18:04:36.7564997+08:00;True|2022-01-17T17:57:44.7814863+08:00;True|2022-01-17T17:51:50.1516107+08:00;True|2022-01-17T17:39:29.2918799+08:00;True|2022-01-17T14:55:21.5859341+08:00;True|2022-01-17T14:38:06.5091500+08:00;True|2022-01-17T14:30:25.5378436+08:00;True|2022-01-16T19:15:24.5874858+08:00;True|2022-01-16T19:07:49.0613424+08:00;True|2022-01-16T16:10:47.3112741+08:00;False|2022-01-14T19:09:41.9296709+08:00;False|2022-01-14T18:56:11.0569808+08:00;False|2022-01-14T18:28:20.1376762+08:00;False|2022-01-14T18:27:30.8678130+08:00;False|2022-01-14T18:22:45.4436504+08:00;False|2022-01-14T18:19:37.0374753+08:00;False|2022-01-14T18:18:48.5868254+08:00;False|2022-01-14T18:14:02.5810257+08:00;False|2022-01-14T18:09:51.1730754+08:00;False|2022-01-14T18:09:17.8940754+08:00;True|2022-01-13T20:08:16.2937608+08:00;True|2022-01-13T20:07:30.1505466+08:00;True|2022-01-13T13:39:42.0146294+08:00;True|2022-01-13T13:38:07.5062471+08:00;True|2022-01-13T11:29:49.3751232+08:00;True|2022-01-13T11:05:43.9574142+08:00;True|2022-01-13T10:33:23.1921058+08:00;True|2022-01-12T20:38:16.9165651+08:00;True|2022-01-12T20:24:46.3779264+08:00;True|2022-01-12T20:03:06.5030626+08:00;True|2022-01-12T19:44:55.4294326+08:00;True|2022-01-12T12:58:45.9548600+08:00;True|2022-01-12T11:28:44.7797749+08:00;True|2022-01-11T18:07:30.9151356+08:00;True|2022-01-11T15:06:32.7301609+08:00;True|2022-01-11T09:27:00.1766442+08:00;True|2021-12-30T14:41:56.8541015+08:00;True|2021-12-30T13:45:00.6130694+08:00;True|2021-12-30T13:44:18.7370780+08:00;True|2021-12-30T13:36:52.8171136+08:00;True|2021-12-28T19:14:22.5979649+08:00;True|2021-12-28T13:13:39.3543252+08:00;True|2021-12-27T15:31:26.6037782+08:00;True|2021-12-27T15:28:54.4824480+08:00;True|2021-12-27T15:22:47.8436108+08:00;True|2021-12-27T15:04:37.0711590+08:00;True|2021-12-27T15:03:52.0932499+08:00;True|2021-12-27T15:03:33.0172733+08:00;True|2021-12-27T13:28:27.4252747+08:00;True|2021-12-25T19:38:33.6784042+08:00;True|2021-12-24T20:47:43.3471563+08:00;True|2021-12-24T20:14:57.6946814+08:00;True|2021-12-24T19:55:21.1843105+08:00;True|2021-12-24T19:49:54.6719726+08:00;True|2021-12-24T19:38:14.1180741+08:00;True|2021-12-22T13:51:37.1082523+08:00;True|2021-12-21T15:38:59.8015096+08:00;True|2021-12-21T15:29:54.8095063+08:00;False|2021-12-21T15:29:21.7006531+08:00;False|2021-12-21T15:16:18.2218025+08:00;False|2021-12-21T15:11:38.1215841+08:00;False|2021-12-21T15:08:27.0590078+08:00;True|2021-12-10T14:12:36.4065298+08:00;True|2021-12-10T13:54:03.4921778+08:00;True|2021-12-10T13:25:49.0439086+08:00;True|2021-12-10T13:19:58.9494477+08:00;True|2021-12-10T13:10:45.3929017+08:00;True|2021-12-10T11:06:53.2416794+08:00;True|2021-12-07T17:23:28.9380484+08:00;True|2021-12-07T17:13:52.4384814+08:00;True|2021-12-07T16:39:49.2020208+08:00;True|2021-12-07T15:18:20.9024533+08:00;True|2021-12-07T15:07:35.4428035+08:00;True|2021-12-07T15:01:02.0445043+08:00;True|2021-12-07T14:50:08.9019705+08:00;True|2021-12-07T14:34:50.4993666+08:00;False|2021-12-07T14:32:56.0408332+08:00;True|2021-12-06T17:11:41.4004606+08:00;True|2021-12-06T16:48:07.6029757+08:00;True|2021-12-06T13:46:35.9437718+08:00;True|2021-12-06T13:45:07.6622615+08:00;True|2021-12-06T11:25:04.3483155+08:00;True|2021-12-06T11:18:24.5804187+08:00;True|2021-11-22T16:27:05.4241947+08:00;True|2021-11-22T13:40:17.6768280+08:00;True|2021-11-19T16:15:19.9085104+08:00;True|2021-11-09T10:34:21.1623512+08:00;True|2021-11-07T16:57:59.7380254+08:00;True|2021-11-07T16:53:47.4198852+08:00;True|2021-11-07T16:42:05.5096826+08:00;True|2021-11-07T16:37:21.0729013+08:00;True|2021-11-05T20:51:17.6170717+08:00;True|2021-11-05T20:35:14.6250333+08:00;True|2021-11-05T19:30:19.8374158+08:00;True|2021-11-05T19:22:46.2276569+08:00;True|2021-11-05T19:20:30.8253213+08:00;True|2021-11-05T19:16:45.7553310+08:00;True|2021-11-05T19:16:00.4532689+08:00;True|2021-11-05T19:12:25.9022478+08:00;False|2021-11-05T19:11:26.5753529+08:00;True|2021-11-05T19:09:30.0085433+08:00;True|2021-11-05T18:48:19.9395153+08:00;True|2021-11-05T18:45:34.3437897+08:00;True|2021-11-05T18:43:43.4558159+08:00;True|2021-11-05T18:40:40.9948500+08:00;True|2021-11-05T18:34:18.4440455+08:00;True|2021-11-05T15:54:51.6037132+08:00;True|2021-10-28T16:27:53.9728270+08:00;True|2021-10-28T16:03:59.5629998+08:00;True|2021-10-28T08:51:04.2549186+08:00;True|2021-10-27T15:14:53.5506098+08:00;True|2021-10-27T15:00:44.9100320+08:00;True|2021-10-27T13:14:46.7921647+08:00;True|2021-10-27T11:24:49.4550753+08:00;True|2021-10-27T10:10:10.3545125+08:00;True|2021-10-27T10:02:24.9248610+08:00;True|2021-10-27T09:59:40.3795897+08:00;True|2021-10-27T09:56:30.6629207+08:00;True|2021-10-27T09:10:48.3883432+08:00;True|2021-10-27T09:03:31.9191991+08:00;True|2021-10-27T08:59:59.7651159+08:00;True|2021-10-27T08:36:11.8620997+08:00;True|2021-10-27T08:26:40.2533014+08:00;True|2021-10-26T09:19:35.5674748+08:00;True|2021-10-26T09:17:17.6900747+08:00;True|2021-10-26T09:14:32.3999220+08:00;True|2021-10-25T15:08:21.2581763+08:00;True|2021-10-25T10:01:57.8524903+08:00;True|2021-10-25T09:28:51.6294879+08:00;True|2021-10-25T09:25:50.3373336+08:00;True|2021-10-25T09:23:37.0203978+08:00;True|2021-10-25T09:18:23.3380608+08:00;True|2021-10-25T09:15:10.5292071+08:00;True|2021-10-25T08:56:30.4632027+08:00;True|2021-10-25T08:50:11.4697392+08:00;True|2021-10-22T13:46:49.7207066+08:00;True|2021-10-22T10:06:33.3130089+08:00;True|2021-10-20T14:32:10.1235516+08:00;True|2021-10-20T14:16:18.6496291+08:00;True|2021-10-20T14:08:49.2443715+08:00;True|2021-10-20T14:05:14.6847950+08:00;True|2021-10-20T13:30:21.6057636+08:00;True|2021-10-20T10:55:22.2151716+08:00;True|2021-10-19T10:42:13.4198267+08:00;True|2021-10-19T10:01:41.0018108+08:00;True|2021-10-19T09:59:11.2127619+08:00;True|2021-10-19T09:54:04.8472874+08:00;True|2021-10-15T11:19:15.5327495+08:00;True|2021-10-15T11:17:41.0686485+08:00;True|2021-10-15T11:12:11.8295042+08:00;True|2021-10-15T10:33:31.5670079+08:00;True|2021-10-15T10:27:45.0815146+08:00;True|2021-10-14T14:51:28.5331025+08:00;True|2021-10-14T14:37:28.3276051+08:00;True|2021-10-14T14:23:39.0606792+08:00;True|2021-10-14T14:21:03.8140347+08:00;True|2021-10-13T10:31:10.6628977+08:00;True|2021-10-13T10:12:24.4238027+08:00;True|2021-10-13T08:47:43.9314486+08:00;True|2021-10-12T14:07:18.6065183+08:00;True|2021-10-12T10:34:10.1682362+08:00;True|2021-10-12T10:27:14.3073332+08:00;True|2021-10-12T10:22:08.0004619+08:00;True|2021-10-12T10:21:03.0275378+08:00;True|2021-10-12T10:11:54.9812692+08:00;True|2021-10-11T16:59:07.3568342+08:00;True|2021-10-11T16:53:14.2016138+08:00;True|2021-10-11T16:21:35.0133775+08:00;True|2021-10-11T15:34:19.5731935+08:00;True|2021-10-11T15:31:07.5780983+08:00;True|2021-10-11T15:06:47.1145237+08:00;True|2021-10-11T15:03:25.5000280+08:00;True|2021-10-11T10:12:57.6416898+08:00;True|2021-10-09T10:15:17.9235165+08:00;True|2021-10-09T10:13:51.3318441+08:00;True|2021-10-09T10:01:21.6661542+08:00;True|2021-10-09T09:58:41.9225837+08:00;True|2021-10-08T14:56:49.7935800+08:00;True|2021-10-08T14:35:41.4490063+08:00;True|2021-10-08T14:02:42.6990656+08:00;True|2021-09-29T15:48:55.1547397+08:00;True|2021-09-29T15:48:23.5567191+08:00;True|2021-09-27T16:17:35.7180978+08:00;True|2021-09-27T15:51:50.4240134+08:00;True|2021-09-23T20:55:27.3554447+08:00;True|2021-09-23T14:14:44.0572017+08:00;True|2021-09-23T13:51:56.2344673+08:00;True|2021-09-23T10:46:16.7417007+08:00;True|2021-09-23T10:42:23.2117537+08:00;True|2021-09-22T15:21:22.9615672+08:00;True|2021-09-22T14:23:32.7907754+08:00;True|2021-09-22T13:48:03.4780947+08:00;True|2021-09-22T11:05:24.5249356+08:00;True|2021-09-22T10:00:19.0962943+08:00;True|2021-09-22T09:30:26.2686514+08:00;True|2021-09-17T11:22:34.5692792+08:00;True|2021-09-16T16:11:27.5372277+08:00;True|2021-09-16T14:53:40.8396557+08:00;True|2021-09-16T14:32:29.7905500+08:00;True|2021-09-16T14:26:46.2224219+08:00;True|2021-09-16T10:32:24.4244440+08:00;True|2021-09-15T11:10:35.3529360+08:00;True|2021-09-15T11:08:30.0857376+08:00;True|2021-09-15T11:05:56.7191571+08:00;True|2021-09-14T01:24:39.8041136+08:00;True|2021-09-14T01:05:01.1593327+08:00;True|2021-09-14T00:44:14.7233198+08:00;True|2021-09-13T23:48:19.4506233+08:00;True|2021-09-13T20:30:31.3243872+08:00;True|2021-09-13T19:45:35.9108911+08:00;False|2021-09-13T19:44:59.2779092+08:00;True|2021-09-13T18:09:22.4994381+08:00;True|2021-09-10T14:18:27.5788854+08:00;True|2021-09-09T15:57:01.7407207+08:00;True|2021-09-09T15:49:34.2598998+08:00;True|2021-09-09T11:32:10.7853024+08:00;True|2021-09-09T11:10:48.6840025+08:00;True|2021-09-09T10:35:37.3883078+08:00;True|2021-09-07T14:11:49.8497588+08:00;True|2021-09-07T13:34:48.4693349+08:00;True|2021-09-06T14:33:48.7549675+08:00;True|2021-09-03T16:27:51.1888520+08:00;True|2021-09-03T16:19:35.9003465+08:00;True|2021-09-03T15:46:28.1828032+08:00;True|2021-09-03T15:34:21.9362871+08:00;True|2021-09-03T11:24:49.8749819+08:00;True|2021-09-03T11:21:17.8373159+08:00;True|2021-09-03T11:16:53.2208136+08:00;True|2021-09-03T11:12:23.9063804+08:00;True|2021-09-03T09:11:09.2435721+08:00;True|2021-09-02T11:16:15.1370453+08:00;True|2021-09-02T10:35:39.1171879+08:00;True|2021-09-01T10:17:09.4536285+08:00;True|2021-09-01T09:46:28.4581776+08:00;True|2021-08-31T08:54:26.8588887+08:00;True|2021-08-31T08:39:08.3685693+08:00;True|2021-08-30T17:11:56.8438985+08:00;True|2021-08-30T15:59:42.0820292+08:00;True|2021-08-30T15:45:18.1868510+08:00;True|2021-08-30T14:56:08.3958863+08:00;True|2021-08-30T14:37:11.5379830+08:00;True|2021-08-30T14:35:34.8775934+08:00;True|2021-08-30T14:24:36.5111821+08:00;True|2021-08-30T10:05:49.6945200+08:00;True|2021-08-30T10:03:28.4064538+08:00;True|2021-08-30T10:00:16.8360929+08:00;True|2021-08-30T09:56:09.4434379+08:00;True|2021-08-30T09:55:36.1725334+08:00;True|2021-08-30T09:52:04.8600054+08:00;True|2021-08-30T09:47:46.4225655+08:00;True|2021-08-30T09:45:20.4894962+08:00;False|2021-08-27T17:17:34.2646751+08:00;False|2021-08-27T16:01:21.2791979+08:00;False|2021-08-27T15:58:06.9667160+08:00;False|2021-08-27T15:38:37.4818036+08:00;False|2021-08-27T15:21:02.8863114+08:00;False|2021-08-27T15:20:28.6828668+08:00;True|2021-08-26T16:00:44.3162145+08:00;True|2021-08-26T08:57:31.3842587+08:00;True|2021-08-23T08:43:41.1549775+08:00;True|2021-08-22T09:24:12.7210871+08:00;True|2021-08-22T09:19:53.8300229+08:00;True|2021-08-20T20:00:52.0140407+08:00;True|2021-08-20T19:40:14.7712765+08:00;True|2021-08-19T17:37:54.9748049+08:00;True|2021-08-19T17:20:11.0515687+08:00;True|2021-08-19T16:12:35.4392809+08:00;True|2021-08-19T16:06:50.6204587+08:00;True|2021-08-19T16:03:53.0824286+08:00;True|2021-08-19T15:56:01.3498791+08:00;True|2021-08-19T10:18:50.8113630+08:00;True|2021-08-19T09:58:06.2784035+08:00;True|2021-08-19T09:56:54.0619777+08:00;True|2021-08-19T00:32:08.3503093+08:00;True|2021-08-19T00:11:18.3150227+08:00;True|2021-08-19T00:02:49.4827718+08:00;True|2021-08-18T23:54:45.4845900+08:00;True|2021-08-18T23:39:51.6147977+08:00;True|2021-08-18T23:16:42.7214379+08:00;True|2021-08-18T22:38:57.4681929+08:00;True|2021-08-18T21:41:58.7560707+08:00;True|2021-08-18T21:11:52.2369249+08:00;True|2021-08-18T21:01:49.5669106+08:00;True|2021-08-18T20:47:46.5352688+08:00;False|2021-08-18T20:46:36.7956141+08:00;False|2021-08-18T20:46:01.0502138+08:00;True|2021-08-18T19:39:12.8186242+08:00;False|2021-08-18T19:38:12.6839708+08:00;True|2021-08-18T19:15:51.4626694+08:00;True|2021-08-18T16:07:20.4350886+08:00;True|2021-08-18T14:29:41.7171934+08:00;True|2021-08-18T14:20:36.3647361+08:00;True|2021-08-16T09:08:58.3617662+08:00;True|2021-08-15T20:44:29.9214083+08:00;True|2021-08-15T20:36:17.0958549+08:00;True|2021-08-15T20:29:34.3879773+08:00;True|2021-08-15T20:23:47.4052038+08:00;True|2021-08-15T15:01:19.7830862+08:00;True|2021-08-15T12:15:18.3433782+08:00;True|2021-08-13T20:59:11.3947130+08:00;True|2021-08-06T22:49:09.9538339+08:00;True|2021-08-06T22:35:19.0418168+08:00;True|2021-08-06T20:29:47.4241975+08:00;True|2021-08-06T14:08:16.4791827+08:00;True|2021-08-06T13:59:28.9874611+08:00;True|2021-08-06T13:57:34.3723977+08:00;True|2021-08-06T13:36:03.4816652+08:00;True|2021-08-06T12:22:52.5055221+08:00;True|2021-08-06T09:31:58.1272499+08:00;True|2021-08-06T09:26:51.6310039+08:00;True|2021-08-06T09:24:22.2899244+08:00;True|2021-08-06T09:06:30.6477912+08:00;True|2021-08-06T09:00:55.5101612+08:00;True|2021-08-06T08:49:59.9616490+08:00;True|2021-08-06T08:45:18.8586902+08:00;True|2021-08-05T20:09:25.8861998+08:00;True|2021-08-04T19:14:27.2396953+08:00;True|2021-08-04T19:11:47.5849093+08:00;True|2021-08-04T16:42:54.0149043+08:00;True|2021-08-04T15:02:11.5056561+08:00;True|2021-08-04T14:58:37.1435509+08:00;True|2021-08-04T14:55:34.7380132+08:00;True|2021-08-04T14:47:42.5933921+08:00;True|2021-08-04T14:45:17.9911874+08:00;True|2021-08-04T13:52:20.9601351+08:00;True|2021-08-04T09:48:28.8796992+08:00;True|2021-08-03T18:14:13.1894998+08:00;True|2021-08-03T17:45:35.1349721+08:00;True|2021-08-03T17:21:52.6028977+08:00;True|2021-08-03T17:20:35.4423020+08:00;True|2021-08-03T17:03:33.1667669+08:00;True|2021-08-03T17:01:54.2656787+08:00;True|2021-08-03T17:00:22.2778374+08:00;True|2021-08-03T16:56:58.8902582+08:00;True|2021-08-03T15:02:21.8601533+08:00;True|2021-08-03T14:57:34.0186758+08:00;True|2021-08-03T14:28:47.2242515+08:00;True|2021-08-03T14:22:22.4554236+08:00;True|2021-08-03T14:21:51.1339715+08:00;True|2021-08-03T13:37:33.9697131+08:00;True|2021-08-03T13:28:29.7591095+08:00;True|2021-08-03T11:35:09.5118324+08:00;True|2021-08-03T11:11:23.3051573+08:00;True|2021-08-02T13:14:42.3663755+08:00;True|2021-07-30T22:50:19.9749878+08:00;True|2021-07-30T22:49:31.2150970+08:00;True|2021-07-28T19:12:05.8381075+08:00;True|2021-07-28T18:59:45.4808797+08:00;True|2021-07-28T18:15:58.8301509+08:00;True|2021-07-28T18:04:54.8613546+08:00;True|2021-07-28T17:53:48.6225611+08:00;True|2021-07-28T17:42:50.9171563+08:00;True|2021-07-28T17:17:16.3137677+08:00;True|2021-07-28T17:11:46.8925200+08:00;True|2021-07-28T16:28:27.6823943+08:00;True|2021-07-28T16:23:00.3385836+08:00;True|2021-07-28T09:57:55.4237411+08:00;True|2021-07-28T08:38:29.6691541+08:00;True|2021-07-27T23:16:32.0331671+08:00;True|2021-07-27T23:06:08.1947249+08:00;True|2021-07-27T23:05:58.4619176+08:00;True|2021-07-27T18:42:09.5358261+08:00;True|2021-07-27T18:30:04.8532823+08:00;True|2021-07-27T18:29:43.5775092+08:00;True|2021-07-27T15:16:49.8356224+08:00;True|2021-07-27T15:05:27.8453220+08:00;True|2021-07-27T14:59:15.9519440+08:00;True|2021-07-27T09:23:32.6111337+08:00;True|2021-07-27T08:27:41.6395353+08:00;True|2021-07-27T08:25:56.7378296+08:00;True|2021-07-26T11:18:46.0856966+08:00;True|2021-07-26T11:18:02.0751924+08:00;True|2021-07-26T11:13:49.6285395+08:00;True|2021-07-21T21:08:25.9898902+08:00;True|2021-07-21T20:09:26.2258104+08:00;True|2021-07-13T16:17:25.8407435+08:00;True|2021-07-13T13:46:13.4309531+08:00;True|2021-07-13T12:29:04.5082461+08:00;True|2021-06-29T13:55:01.6864637+08:00;True|2021-06-29T10:38:52.2206472+08:00;True|2021-06-29T10:10:13.1540749+08:00;True|2021-06-28T14:37:56.3853273+08:00;False|2021-06-28T14:36:57.5726124+08:00;True|2021-06-25T14:17:57.5196108+08:00;True|2021-06-25T13:56:38.9522535+08:00;True|2021-06-24T19:38:32.8766933+08:00;True|2021-06-24T18:26:35.6118833+08:00;True|2021-06-24T18:02:52.8136877+08:00;True|2021-06-24T17:48:49.5851948+08:00;True|2021-06-24T17:45:46.7527572+08:00;True|2021-06-24T15:05:20.1592723+08:00;True|2021-06-23T16:18:15.6814625+08:00;True|2021-06-23T16:05:24.6112343+08:00;True|2021-06-23T15:14:08.2489658+08:00;True|2021-06-23T13:52:58.6029788+08:00;True|2021-06-22T16:11:20.4726923+08:00;True|2021-06-22T16:04:53.7231389+08:00;True|2021-06-22T15:50:59.2583262+08:00;True|2021-06-22T15:38:15.3016140+08:00;True|2021-06-22T15:34:42.9185543+08:00;True|2021-06-22T15:21:55.1419108+08:00;True|2021-06-22T15:07:21.5357494+08:00;True|2021-06-22T15:03:35.0535733+08:00;True|2021-06-22T14:54:47.8802969+08:00;True|2021-06-22T11:19:38.7303011+08:00;True|2021-06-22T08:53:49.2882695+08:00;True|2021-06-22T08:47:54.8286530+08:00;True|2021-06-21T16:27:19.3017700+08:00;True|2021-06-21T15:32:28.7237952+08:00;True|2021-06-21T12:34:02.6329555+08:00;True|2021-06-21T12:24:17.5427495+08:00;True|2021-06-21T10:47:30.6423502+08:00;True|2021-06-21T08:43:20.3026558+08:00;True|2021-06-19T15:10:06.8335499+08:00;True|2021-06-18T15:37:29.5009930+08:00;True|2021-06-18T13:46:35.6283432+08:00;True|2021-06-18T10:00:37.1474954+08:00;True|2021-06-18T09:55:21.8551780+08:00;True|2021-06-18T09:22:27.8432927+08:00;True|2021-06-17T11:17:43.2166430+08:00;True|2021-06-17T09:24:09.8350403+08:00;True|2021-06-16T16:10:47.8564888+08:00;True|2021-06-16T16:04:09.8286582+08:00;True|2021-06-16T15:12:29.9427169+08:00;True|2021-06-16T14:58:45.6801892+08:00;True|2021-06-16T14:46:01.6873221+08:00;True|2021-06-16T11:02:06.1272477+08:00;True|2021-06-16T09:33:56.0223915+08:00;True|2021-06-16T08:50:07.6995413+08:00;True|2021-06-16T08:28:38.7692635+08:00;True|2021-06-16T01:04:19.6282474+08:00;True|2021-06-16T01:03:50.5058323+08:00;False|2021-06-16T01:02:15.3819672+08:00;False|2021-06-16T01:01:38.6171098+08:00;True|2021-06-16T00:34:54.9902044+08:00;True|2021-06-15T23:55:36.2003828+08:00;True|2021-06-15T22:47:17.2192750+08:00;True|2021-06-15T22:42:41.1512585+08:00;True|2021-06-15T22:38:01.7390462+08:00;True|2021-06-15T22:14:11.2060782+08:00;True|2021-06-15T22:12:27.0615357+08:00;True|2021-06-15T22:07:59.9280871+08:00;True|2021-06-15T22:04:21.5051427+08:00;True|2021-06-15T21:25:55.0099814+08:00;True|2021-06-15T19:13:51.3494172+08:00;True|2021-06-15T19:02:17.6844742+08:00;True|2021-06-15T18:47:37.1629411+08:00;False|2021-06-15T18:47:11.0828111+08:00;True|2021-06-15T18:38:26.6620668+08:00;True|2021-06-15T18:33:45.2069831+08:00;True|2021-06-15T18:24:52.0550838+08:00;True|2021-06-15T18:19:43.6999796+08:00;True|2021-06-15T18:08:17.2464506+08:00;True|2021-06-15T18:03:51.3952624+08:00;True|2021-06-15T18:01:20.6141766+08:00;True|2021-06-15T17:59:04.4479416+08:00;True|2021-06-15T17:41:44.6389379+08:00;True|2021-06-15T17:39:03.1565124+08:00;True|2021-06-15T17:34:41.0634638+08:00;True|2021-06-15T17:33:50.4853178+08:00;True|2021-06-15T17:25:38.5914037+08:00;True|2021-06-15T17:22:21.3611360+08:00;True|2021-06-15T17:16:49.4970813+08:00;True|2021-06-15T17:05:28.9389484+08:00;True|2021-06-15T16:52:54.6372199+08:00;True|2021-06-15T16:51:23.9081030+08:00;True|2021-06-15T16:45:40.6017997+08:00;True|2021-06-15T16:41:05.0218887+08:00;True|2021-06-15T16:38:02.8541862+08:00;True|2021-06-15T16:22:10.3118721+08:00;True|2021-06-15T16:12:11.1552506+08:00;True|2021-06-15T15:33:42.0100494+08:00;True|2021-06-15T15:28:39.7145659+08:00;True|2021-06-15T15:15:02.7939125+08:00;True|2021-06-15T14:49:14.2300396+08:00;True|2021-06-15T14:42:28.1198064+08:00;True|2021-06-15T13:30:12.7997686+08:00;True|2021-06-15T13:25:37.7284670+08:00;True|2021-06-15T13:23:43.6207813+08:00;False|2021-06-15T13:23:19.4190232+08:00;True|2021-06-15T13:16:38.5062674+08:00;True|2021-06-15T13:03:31.2055635+08:00;True|2021-06-15T12:58:43.1653215+08:00;True|2021-06-15T12:39:22.8442109+08:00;True|2021-06-15T12:35:09.1288556+08:00;False|2021-06-15T12:33:50.0723143+08:00;True|2021-06-15T11:28:01.9733727+08:00;True|2021-06-15T11:26:26.6569392+08:00;True|2021-06-15T11:22:43.0366435+08:00;True|2021-06-15T11:07:50.1610580+08:00;True|2021-06-15T10:32:59.1925931+08:00;True|2021-06-10T17:16:57.9552310+08:00;True|2021-06-10T16:44:42.2731836+08:00;True|2021-06-10T14:39:27.6745737+08:00;True|2021-06-10T12:15:05.1524413+08:00;True|2021-06-09T18:19:24.1005606+08:00;True|2021-06-09T17:56:09.5646288+08:00;True|2021-06-09T13:34:06.1882292+08:00;True|2021-06-09T13:29:54.5924933+08:00;True|2021-06-09T13:25:55.7520662+08:00;True|2021-06-09T13:07:47.6686811+08:00;True|2021-06-09T12:59:41.2595048+08:00;True|2021-06-09T12:45:27.1305548+08:00;True|2021-06-09T12:29:52.1418191+08:00;True|2021-06-09T12:24:12.7610588+08:00;True|2021-06-09T11:31:25.3409568+08:00;True|2021-06-09T09:57:44.4387175+08:00;True|2021-06-09T09:54:26.5161307+08:00;True|2021-06-09T09:14:14.7288045+08:00;True|2021-06-09T09:10:25.1812139+08:00;True|2021-06-09T08:46:21.6585123+08:00;True|2021-06-08T19:56:55.7192062+08:00;True|2021-06-08T19:52:59.0326821+08:00;True|2021-06-08T19:49:13.6274217+08:00;True|2021-06-08T19:09:22.1038939+08:00;True|2021-06-08T15:28:41.3716247+08:00;True|2021-06-08T15:26:47.2621178+08:00;True|2021-06-08T13:49:45.8936617+08:00;True|2021-06-08T13:43:18.8115502+08:00;True|2021-06-08T10:04:06.2200731+08:00;True|2021-06-08T09:17:10.0470792+08:00;True|2021-06-08T08:44:37.4395849+08:00;True|2021-06-08T00:01:09.3745613+08:00;True|2021-06-07T23:49:31.5196888+08:00;True|2021-06-07T23:41:00.8017855+08:00;True|2021-06-07T23:21:53.1371134+08:00;True|2021-06-07T23:01:27.5712153+08:00;True|2021-06-07T22:36:12.9274014+08:00;True|2021-06-07T22:23:00.6545134+08:00;True|2021-06-07T17:44:47.5686346+08:00;True|2021-06-07T17:17:01.3431233+08:00;True|2021-06-07T16:53:28.9989587+08:00;True|2021-06-07T16:41:10.4975607+08:00;True|2021-06-07T14:21:06.8176477+08:00;True|2021-06-07T14:10:39.0355659+08:00;True|2021-06-07T12:34:31.4562732+08:00;True|2021-06-07T12:28:44.9629488+08:00;True|2021-06-07T10:30:26.9387988+08:00;True|2021-06-07T09:12:14.7658099+08:00;True|2021-06-07T08:37:19.6353792+08:00;True|2021-06-07T08:35:25.2031954+08:00;True|2021-06-05T07:07:32.0541266+08:00;True|2021-06-05T06:44:35.9475270+08:00;True|2021-06-05T06:37:27.4595197+08:00;True|2021-06-05T06:26:59.7663998+08:00;True|2021-06-05T05:43:12.8699318+08:00;True|2021-06-04T17:00:41.2426007+08:00;True|2021-06-04T16:08:03.8078072+08:00;True|2021-06-04T15:47:21.6412616+08:00;True|2021-06-04T15:21:02.4239800+08:00;True|2021-06-04T15:20:37.8641854+08:00;True|2021-06-04T13:38:51.5088395+08:00;True|2021-06-04T10:20:01.7784282+08:00;True|2021-06-04T10:13:50.3548857+08:00;True|2021-06-04T10:11:25.5017821+08:00;True|2021-06-04T10:09:51.6792228+08:00;True|2021-06-04T10:02:39.5851057+08:00;True|2021-06-04T09:30:40.4495494+08:00;True|2021-06-03T13:16:36.0317546+08:00;True|2021-06-03T13:12:47.0402047+08:00;True|2021-06-02T14:37:08.9683351+08:00;True|2021-06-02T14:10:15.7439829+08:00;True|2021-06-02T13:59:46.5841931+08:00;True|2021-06-02T13:25:18.7962660+08:00;True|2021-06-02T13:23:16.2261980+08:00;True|2021-06-01T15:37:32.2495085+08:00;True|2021-06-01T15:21:01.2856122+08:00;True|2021-06-01T15:13:36.7262365+08:00;True|2021-06-01T15:10:26.8905629+08:00;True|2021-06-01T14:56:17.5231551+08:00;True|2021-06-01T14:38:39.7895927+08:00;True|2021-06-01T14:23:12.3265287+08:00;True|2021-03-01T09:11:31.3226422+08:00;True|2021-05-26T14:54:56.9426462+08:00;True|2021-05-26T13:57:33.7780451+08:00;True|2021-05-26T13:39:02.8043358+08:00;True|2021-02-25T16:01:40.2917200+08:00;True|2021-02-25T15:49:46.6681205+08:00;True|2021-02-25T15:16:30.9372640+08:00;True|2021-05-25T13:10:21.7831921+08:00;True|2021-05-25T11:21:38.5224475+08:00;True|2021-05-25T11:12:52.0637175+08:00;True|2021-05-25T11:02:18.4164663+08:00;True|2021-05-25T10:52:06.8998521+08:00;True|2021-05-25T10:50:45.0929606+08:00;True|2021-05-25T10:45:54.1498313+08:00;True|2021-05-25T10:39:27.8602249+08:00;True|2021-05-25T10:34:49.5771162+08:00;True|2021-05-25T10:17:30.3009163+08:00;True|2021-05-25T10:14:03.8512581+08:00;True|2021-05-25T10:05:33.4343836+08:00;True|2021-05-24T17:01:23.3221168+08:00;True|2021-05-24T10:11:24.0197347+08:00;False|2021-05-24T10:11:07.6338995+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>08/16/2021 17:23:16</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.dll">
<publishTime>02/22/2013 08:43:40</publishTime>
@@ -18,28 +18,28 @@
<publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>02/28/2022 17:41:26</publishTime>
+ <publishTime>02/28/2022 14:36:13</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>02/28/2022 17:41:26</publishTime>
+ <publishTime>02/28/2022 14:36:13</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>02/28/2022 17:41:23</publishTime>
+ <publishTime>02/28/2022 14:36:12</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>02/28/2022 17:41:23</publishTime>
+ <publishTime>02/28/2022 14:36:12</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 14:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>02/28/2022 17:41:18</publishTime>
+ <publishTime>02/28/2022 14:36:11</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>02/28/2022 17:41:18</publishTime>
+ <publishTime>02/28/2022 14:36:11</publishTime>
</File>
<File Include="bin/ICSharpCode.SharpZipLib.dll">
<publishTime>05/09/2021 01:08:30</publishTime>
@@ -51,7 +51,7 @@
<publishTime>08/25/2021 10:28:25</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>08/16/2021 17:23:13</publishTime>
+ <publishTime>01/16/2022 20:46:27</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
<publishTime>09/20/2018 19:23:20</publishTime>
@@ -69,13 +69,13 @@
<publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>02/28/2022 17:41:19</publishTime>
+ <publishTime>02/28/2022 14:36:11</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>02/28/2022 17:41:19</publishTime>
+ <publishTime>02/28/2022 14:36:11</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>08/03/2014 20:33:56</publishTime>
@@ -105,22 +105,22 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>02/28/2022 17:41:16</publishTime>
+ <publishTime>02/28/2022 14:36:10</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>02/28/2022 17:41:16</publishTime>
+ <publishTime>02/28/2022 14:36:10</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>02/28/2022 17:41:17</publishTime>
+ <publishTime>02/28/2022 14:36:10</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>02/28/2022 17:41:17</publishTime>
+ <publishTime>02/28/2022 14:36:10</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>02/28/2022 17:41:17</publishTime>
+ <publishTime>02/28/2022 14:36:10</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>02/28/2022 17:41:17</publishTime>
+ <publishTime>02/28/2022 14:36:10</publishTime>
</File>
<File Include="bin/stdole.dll">
<publishTime>05/09/2021 13:35:37</publishTime>
@@ -189,7 +189,7 @@
<publishTime>11/28/2018 13:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
<publishTime>01/28/2015 04:02:18</publishTime>
@@ -222,13 +222,13 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>02/28/2022 17:41:31</publishTime>
+ <publishTime>02/28/2022 14:36:15</publishTime>
</File>
<File Include="bin/WebAPI.dll.config">
<publishTime>12/15/2021 17:59:43</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>02/28/2022 17:41:31</publishTime>
+ <publishTime>02/28/2022 14:36:15</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/17/2013 17:03:52</publishTime>
@@ -240,163 +240,163 @@
<publishTime>11/29/2018 21:26:30</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>10/29/2021 19:50:53</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>08/16/2021 17:23:16</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>08/16/2021 17:23:16</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>08/16/2021 17:23:16</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>08/16/2021 17:23:16</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="Index.html">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="packages.config">
- <publishTime>01/12/2022 09:30:51</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 20:46:29</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 23:02:58</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 23:02:58</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 23:02:58</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 23:02:58</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 23:02:58</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 23:02:58</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 23:02:58</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 23:02:58</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 23:02:58</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 23:02:58</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 23:02:58</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 23:02:58</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 23:02:58</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 23:02:58</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 23:02:58</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 23:02:58</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 23:02:58</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
- <publishTime>01/14/2022 19:33:07</publishTime>
+ <publishTime>01/16/2022 23:02:58</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>01/16/2022 23:02:58</publishTime>
</File>
<File Include="Web References/WebS/Reference.cs">
<publishTime>12/20/2021 13:19:56</publishTime>
@@ -411,7 +411,7 @@
<publishTime>12/20/2021 13:19:56</publishTime>
</File>
<File Include="Web.config">
- <publishTime>02/28/2022 17:41:38</publishTime>
+ <publishTime>02/28/2022 14:36:21</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index ad54778..b007a0f 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -349,11 +349,15 @@
<Compile Include="Controllers\CGGL\WW_EntrustOrderBillController.cs" />
<Compile Include="Controllers\CGGL\Cg_POInStockBillController.cs" />
<Compile Include="Controllers\CGGL\Cg_POInStockBackBillController.cs" />
+ <Compile Include="Controllers\CJGL\Cj_CallGoodsBillBackController.cs" />
+ <Compile Include="Controllers\CJGL\Cj_CallGoodsBillMainController.cs" />
+ <Compile Include="Controllers\CJGL\Cj_ComplementGoodsBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_NoPassProcController.cs" />
<Compile Include="Controllers\CJGL\Sc_ProcessExchangeBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationOutBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationInBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationEntrustOutBillController.cs" />
+ <Compile Include="Controllers\CJGL\Sc_WorkBillAutoSortBillMainController.cs" />
<Compile Include="Controllers\SCGL\Sc_ICBomBillController.cs" />
<Compile Include="Controllers\Sc_PckSplitBillController.cs" />
<Compile Include="Controllers\GZGL\Gy_DuSubsidyItemBillController.cs" />
@@ -522,6 +526,8 @@
<Compile Include="Models\ClsWW_PPBomBillSub.cs" />
<Compile Include="Models\Cls_InventoryAnalysisList.cs" />
<Compile Include="Models\GetWeekList.cs" />
+ <Compile Include="Models\HBarCodeList.cs" />
+ <Compile Include="Models\HSouceOrderList.cs" />
<Compile Include="Models\jsonScanline.cs" />
<Compile Include="Models\ScanLineCode.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsGy_ClassTimePrj_Model.cs" />
@@ -771,6 +777,9 @@
<Folder Include="App_Data\" />
<Folder Include="obj\x86\Debug\" />
<Folder Include="Views\Cg_PurchaseReturn\" />
+ <Folder Include="Views\Cj_CallGoodsBillBack\" />
+ <Folder Include="Views\Cj_CallGoodsBillMain\" />
+ <Folder Include="Views\Cj_ComplementGoodsBill\" />
<Folder Include="Views\Gy_EquipType\" />
<Folder Include="Views\Gy_ICBomBill\" />
<Folder Include="Views\Gy_RoutingGroup\" />
@@ -787,6 +796,7 @@
<Folder Include="Views\Sb_EquipRepairSendWorkBill\" />
<Folder Include="Views\Sc_MouldRepairOutBill\" />
<Folder Include="Views\Sc_MouldRepairSendWorkBill\" />
+ <Folder Include="Views\Sc_WorkBillAutoSortBillMain\" />
</ItemGroup>
<ItemGroup>
<WCFMetadata Include="Service References\" />
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Pt_RadiumCarvingCodeBillList.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Pt_RadiumCarvingCodeBillList.cs"
index 5b0045e..fb749ff 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Pt_RadiumCarvingCodeBillList.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Pt_RadiumCarvingCodeBillList.cs"
@@ -194,6 +194,21 @@
{
sFastSQL = sFastSQL + " and a.CarveTime<='" + dtpHEDate.Value.ToString("yyyy-MM-dd") + " 23:59:59" + "'";
}
+ //鍒ゆ柇娴佷紶鍗曞彿
+ if (SpreadNo.Text.ToString().Trim() != "")
+ {
+ sFastSQL = sFastSQL + " and b.spreadno like '%"+ SpreadNo.Text.ToString().Trim() + "%'";
+ }
+ //鍒ゆ柇闀洉鐮�
+ if (SpreadCar.Text.ToString().Trim() != "")
+ {
+ sFastSQL = sFastSQL + " and a.SerialNo like '%" + SpreadCar.Text.ToString().Trim() + "%'";
+ }
+ //鍒ゆ柇鏈哄彴缂栧彿
+ if (SpreadNo.Text.ToString().Trim() != "")
+ {
+ sFastSQL = sFastSQL + " and b.DeviceSerialNum='" + SpreadNo.Text.ToString().Trim() + "'";
+ }
if (sFastSQL.Trim() == "")
{
MessageBox.Show("娌℃湁杈撳叆鏉′欢!");
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Pt_RadiumCarvingCodeBillList.designer.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Pt_RadiumCarvingCodeBillList.designer.cs"
index 6ef5226..c02735b 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Pt_RadiumCarvingCodeBillList.designer.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Pt_RadiumCarvingCodeBillList.designer.cs"
@@ -53,6 +53,12 @@
this.label3 = new System.Windows.Forms.Label();
this.btnOK = new System.Windows.Forms.Button();
this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.label1 = new System.Windows.Forms.Label();
+ this.SpreadNo = new System.Windows.Forms.TextBox();
+ this.SpreadCar = new System.Windows.Forms.TextBox();
+ this.label4 = new System.Windows.Forms.Label();
+ this.DeviceCode = new System.Windows.Forms.TextBox();
+ this.label5 = new System.Windows.Forms.Label();
this.pPic.SuspendLayout();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdPrint)).BeginInit();
@@ -73,7 +79,7 @@
this.pPic.Location = new System.Drawing.Point(0, 75);
this.pPic.Margin = new System.Windows.Forms.Padding(4);
this.pPic.Name = "pPic";
- this.pPic.Size = new System.Drawing.Size(1376, 80);
+ this.pPic.Size = new System.Drawing.Size(1656, 80);
this.pPic.TabIndex = 15;
//
// panel1
@@ -82,7 +88,7 @@
this.panel1.Controls.Add(this.grdPrint);
this.panel1.Controls.Add(this.lbldj);
this.panel1.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel1.Location = new System.Drawing.Point(1055, 0);
+ this.panel1.Location = new System.Drawing.Point(1335, 0);
this.panel1.Margin = new System.Windows.Forms.Padding(4);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(321, 80);
@@ -152,7 +158,7 @@
this.Tool.Location = new System.Drawing.Point(0, 0);
this.Tool.Name = "Tool";
this.Tool.Padding = new System.Windows.Forms.Padding(0);
- this.Tool.Size = new System.Drawing.Size(1376, 75);
+ this.Tool.Size = new System.Drawing.Size(1656, 75);
this.Tool.Stretch = true;
this.Tool.TabIndex = 16;
this.Tool.Text = "toolStrip1";
@@ -254,7 +260,7 @@
this.grdMain.ReadOnly = true;
this.grdMain.RowHeadersWidth = 62;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(1376, 339);
+ this.grdMain.Size = new System.Drawing.Size(1656, 468);
this.grdMain.TabIndex = 19;
this.grdMain.Paint += new System.Windows.Forms.PaintEventHandler(this.grdMain_Paint);
//
@@ -265,20 +271,20 @@
this.grdSum.BackgroundColor = System.Drawing.SystemColors.Control;
this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.grdSum.Location = new System.Drawing.Point(0, 556);
+ this.grdSum.Location = new System.Drawing.Point(0, 685);
this.grdSum.Margin = new System.Windows.Forms.Padding(4);
this.grdSum.Name = "grdSum";
this.grdSum.ReadOnly = true;
this.grdSum.RowHeadersWidth = 62;
this.grdSum.RowTemplate.Height = 23;
this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
- this.grdSum.Size = new System.Drawing.Size(1376, 28);
+ this.grdSum.Size = new System.Drawing.Size(1656, 28);
this.grdSum.TabIndex = 47;
//
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(33, 22);
+ this.label2.Location = new System.Drawing.Point(19, 27);
this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(98, 18);
@@ -289,28 +295,28 @@
//
this.dtpHBDate.Checked = false;
this.dtpHBDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHBDate.Location = new System.Drawing.Point(126, 16);
+ this.dtpHBDate.Location = new System.Drawing.Point(112, 22);
this.dtpHBDate.Margin = new System.Windows.Forms.Padding(4);
this.dtpHBDate.Name = "dtpHBDate";
this.dtpHBDate.ShowCheckBox = true;
- this.dtpHBDate.Size = new System.Drawing.Size(181, 28);
+ this.dtpHBDate.Size = new System.Drawing.Size(164, 28);
this.dtpHBDate.TabIndex = 3;
//
// dtpHEDate
//
this.dtpHEDate.Checked = false;
this.dtpHEDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHEDate.Location = new System.Drawing.Point(425, 14);
+ this.dtpHEDate.Location = new System.Drawing.Point(411, 22);
this.dtpHEDate.Margin = new System.Windows.Forms.Padding(4);
this.dtpHEDate.Name = "dtpHEDate";
this.dtpHEDate.ShowCheckBox = true;
- this.dtpHEDate.Size = new System.Drawing.Size(181, 28);
+ this.dtpHEDate.Size = new System.Drawing.Size(164, 28);
this.dtpHEDate.TabIndex = 5;
//
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(332, 21);
+ this.label3.Location = new System.Drawing.Point(318, 27);
this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(98, 18);
@@ -319,7 +325,7 @@
//
// btnOK
//
- this.btnOK.Location = new System.Drawing.Point(811, 12);
+ this.btnOK.Location = new System.Drawing.Point(1480, 18);
this.btnOK.Margin = new System.Windows.Forms.Padding(4);
this.btnOK.Name = "btnOK";
this.btnOK.Size = new System.Drawing.Size(110, 36);
@@ -331,6 +337,12 @@
// groupBox1
//
this.groupBox1.BackColor = System.Drawing.Color.Lavender;
+ this.groupBox1.Controls.Add(this.DeviceCode);
+ this.groupBox1.Controls.Add(this.label5);
+ this.groupBox1.Controls.Add(this.SpreadCar);
+ this.groupBox1.Controls.Add(this.label4);
+ this.groupBox1.Controls.Add(this.SpreadNo);
+ this.groupBox1.Controls.Add(this.label1);
this.groupBox1.Controls.Add(this.dtpHBDate);
this.groupBox1.Controls.Add(this.label2);
this.groupBox1.Controls.Add(this.dtpHEDate);
@@ -341,15 +353,66 @@
this.groupBox1.Margin = new System.Windows.Forms.Padding(4);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Padding = new System.Windows.Forms.Padding(4);
- this.groupBox1.Size = new System.Drawing.Size(1376, 62);
+ this.groupBox1.Size = new System.Drawing.Size(1656, 62);
this.groupBox1.TabIndex = 49;
this.groupBox1.TabStop = false;
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(622, 27);
+ this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(98, 18);
+ this.label1.TabIndex = 7;
+ this.label1.Text = "娴佷紶鍗曞彿锛�";
+ //
+ // SpreadNo
+ //
+ this.SpreadNo.Location = new System.Drawing.Point(727, 22);
+ this.SpreadNo.Name = "SpreadNo";
+ this.SpreadNo.Size = new System.Drawing.Size(164, 28);
+ this.SpreadNo.TabIndex = 8;
+ //
+ // SpreadCar
+ //
+ this.SpreadCar.Location = new System.Drawing.Point(989, 22);
+ this.SpreadCar.Name = "SpreadCar";
+ this.SpreadCar.Size = new System.Drawing.Size(164, 28);
+ this.SpreadCar.TabIndex = 10;
+ //
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.Location = new System.Drawing.Point(907, 27);
+ this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(80, 18);
+ this.label4.TabIndex = 9;
+ this.label4.Text = "闀洉鐮侊細";
+ //
+ // DeviceCode
+ //
+ this.DeviceCode.Location = new System.Drawing.Point(1261, 22);
+ this.DeviceCode.Name = "DeviceCode";
+ this.DeviceCode.Size = new System.Drawing.Size(164, 28);
+ this.DeviceCode.TabIndex = 12;
+ //
+ // label5
+ //
+ this.label5.AutoSize = true;
+ this.label5.Location = new System.Drawing.Point(1167, 27);
+ this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(98, 18);
+ this.label5.TabIndex = 11;
+ this.label5.Text = "鏈哄彴缂栧彿锛�";
//
// Pt_RadiumCarvingCodeBillList
//
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1376, 584);
+ this.ClientSize = new System.Drawing.Size(1656, 713);
this.Controls.Add(this.grdMain);
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.grdSum);
@@ -401,5 +464,11 @@
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Button btnOK;
private System.Windows.Forms.GroupBox groupBox1;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.TextBox SpreadNo;
+ private System.Windows.Forms.TextBox SpreadCar;
+ private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.TextBox DeviceCode;
+ private System.Windows.Forms.Label label5;
}
}
\ No newline at end of file
--
Gitblit v1.9.1