From dc9cf6b3219923162b6a665ed4b8db31bb09d9bc Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 18 五月 2022 09:11:12 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Sc_MouldProdInBill/Log/637880486996635039.log | 3
WebAPI/Sc_MouldProdInBill/Log/637880489053087606.log | 3
LMES/ClsShowMod.cs | 10
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 36
WebAPI/Sc_MouldProdInBill/Log/637880489053097665.log | 3
WebAPI/Sc_MouldProdInBill/Log/637879637531386497.log | 3
WorkM/流转卡管理/MES_StationOutBillList.cs | 14
WebAPI/Sc_MouldProdInBill/Log/637880489052667576.log | 3
WorkM/流转卡管理/MES_StationInBillList.cs | 8
WorkM/报表分析/DefectiveDetailedYieldReport.cs | 148 +++--
WebAPI/Sc_MouldProdInBill/Log/637879637531326475.log | 3
WebAPI/Sc_MouldProdInBill/Log/637879637530646434.log | 3
WebAPI/Sc_MouldProdInBill/Log/637880486996675048.log | 3
WebAPI/Sc_MouldProdInBill/Log/637880486996165006.log | 3
BaseSet/BaseSet.csproj | 10
WorkM/车间管理/QC_NoPassProdCheckBill.cs | 9
LMES/bin/x86/Debug.zip | 0
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | 27 +
WebAPI/Sc_MouldProdOutBill/Log/637879637552458053.log | 3
WebAPI/Sc_MouldProdOutBill/Log/637880487100073561.log | 3
BaseSet/导入模板/Gy_DataIn_StdWorkTimes.cs | 294 ++++++++++++
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs | 5
WebAPI/Vlog/webapi20220512.txt | 1
WebAPI/Controllers/生产管理/生产任务单/Sc_ICMOBillController.cs | 318 ++++++++-----
WorkM/流转卡管理/MES_StationEntrustOutBillList.cs | 9
BaseSet/导入模板/Gy_DataIn_StdWorkTimes.resx | 0
/dev/null | 230 ----------
Model/基础资料/其他基础资料/ClsGy_StdWorkTimes_Model.cs | 4
BaseSet/导入模板/Gy_DataIn_StdWorkTimes.Designer.cs | 79 +-
WebAPI/Vlog/webapi20220513.txt | 3
WebAPI/Controllers/博日自动扫码线/ScanlineAPIController.cs | 49 +-
WebAPI/Sc_MouldProdOutBill/Log/637880489108808963.log | 3
DAL/基础资料/其他基础资料/ClsGy_StdWorkTimes_Ctl.cs | 14
WorkM/流转卡管理/MES_StationEntrustInBillList.cs | 9
WebAPI/Models/ClsQK_PackingBill.cs | 3
PlanM/PlanM.csproj | 10
36 files changed, 785 insertions(+), 541 deletions(-)
diff --git a/BaseSet/BaseSet.csproj b/BaseSet/BaseSet.csproj
index 4751d46..239fba4 100644
--- a/BaseSet/BaseSet.csproj
+++ b/BaseSet/BaseSet.csproj
@@ -1564,6 +1564,12 @@
<Compile Include="瀵煎叆妯℃澘\Gy_DataIn_WorkCenter.designer.cs">
<DependentUpon>Gy_DataIn_WorkCenter.cs</DependentUpon>
</Compile>
+ <Compile Include="瀵煎叆妯℃澘\Gy_DataIn_StdWorkTimes.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="瀵煎叆妯℃澘\Gy_DataIn_StdWorkTimes.Designer.cs">
+ <DependentUpon>Gy_DataIn_StdWorkTimes.cs</DependentUpon>
+ </Compile>
</ItemGroup>
<ItemGroup>
<COMReference Include="stdole">
@@ -2551,6 +2557,10 @@
<SubType>Designer</SubType>
<DependentUpon>Gy_DataIn_WorkCenter.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="瀵煎叆妯℃澘\Gy_DataIn_StdWorkTimes.resx">
+ <DependentUpon>Gy_DataIn_StdWorkTimes.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
</ItemGroup>
<ItemGroup>
<Folder Include="CLOUD鍩虹璧勬枡\" />
diff --git "a/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_StdWorkTimes_RoutingBill.Designer.cs" "b/BaseSet/\345\257\274\345\205\245\346\250\241\346\235\277/Gy_DataIn_StdWorkTimes.Designer.cs"
similarity index 70%
rename from "PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_StdWorkTimes_RoutingBill.Designer.cs"
rename to "BaseSet/\345\257\274\345\205\245\346\250\241\346\235\277/Gy_DataIn_StdWorkTimes.Designer.cs"
index 3eea509..c5564ae 100644
--- "a/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_StdWorkTimes_RoutingBill.Designer.cs"
+++ "b/BaseSet/\345\257\274\345\205\245\346\250\241\346\235\277/Gy_DataIn_StdWorkTimes.Designer.cs"
@@ -1,6 +1,6 @@
-namespace PlanM
+namespace BaseSet
{
- partial class Gy_StdWorkTimes_RoutingBill
+ partial class Gy_DataIn_StdWorkTimes
{
/// <summary>
/// 必需的设计器变量。
@@ -41,8 +41,8 @@
//
// pPic
//
- this.pPic.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
- this.pPic.Size = new System.Drawing.Size(1544, 56);
+ this.pPic.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.pPic.Size = new System.Drawing.Size(1158, 45);
//
// panel1
//
@@ -53,8 +53,8 @@
this.panel1.Controls.Add(this.label2);
this.panel1.Controls.Add(this.cmbHYear);
this.panel1.Controls.Add(this.label1);
- this.panel1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
- this.panel1.Size = new System.Drawing.Size(1544, 52);
+ this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.panel1.Size = new System.Drawing.Size(1158, 42);
this.panel1.Controls.SetChildIndex(this.cmdHPath, 0);
this.panel1.Controls.SetChildIndex(this.label4, 0);
this.panel1.Controls.SetChildIndex(this.txtHPath, 0);
@@ -68,33 +68,32 @@
//
// lblCaption
//
- this.lblCaption.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
- this.lblCaption.Size = new System.Drawing.Size(160, 24);
+ this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lblCaption.Size = new System.Drawing.Size(129, 19);
this.lblCaption.Text = "数据导入模块";
//
// cmdHPath
//
- this.cmdHPath.Location = new System.Drawing.Point(1043, 9);
- this.cmdHPath.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+ this.cmdHPath.Location = new System.Drawing.Point(782, 7);
+ this.cmdHPath.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
//
// txtHPath
//
- this.txtHPath.Location = new System.Drawing.Point(615, 4);
- this.txtHPath.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
- this.txtHPath.Size = new System.Drawing.Size(419, 39);
+ this.txtHPath.Location = new System.Drawing.Point(461, 3);
+ this.txtHPath.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHPath.Size = new System.Drawing.Size(315, 32);
//
// label4
//
- this.label4.Location = new System.Drawing.Point(520, 15);
- this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.label4.Location = new System.Drawing.Point(390, 12);
+ this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
//
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(35, 11);
- this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label1.Location = new System.Drawing.Point(26, 9);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(67, 15);
+ this.label1.Size = new System.Drawing.Size(53, 12);
this.label1.TabIndex = 104;
this.label1.Text = "会计年：";
//
@@ -102,10 +101,9 @@
//
this.cmbHYear.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbHYear.FormattingEnabled = true;
- this.cmbHYear.Location = new System.Drawing.Point(112, 10);
- this.cmbHYear.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmbHYear.Location = new System.Drawing.Point(84, 8);
this.cmbHYear.Name = "cmbHYear";
- this.cmbHYear.Size = new System.Drawing.Size(124, 23);
+ this.cmbHYear.Size = new System.Drawing.Size(94, 20);
this.cmbHYear.TabIndex = 105;
//
// cmbHPeriod
@@ -125,62 +123,55 @@
"10",
"11",
"12"});
- this.cmbHPeriod.Location = new System.Drawing.Point(359, 12);
- this.cmbHPeriod.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmbHPeriod.Location = new System.Drawing.Point(269, 10);
this.cmbHPeriod.Name = "cmbHPeriod";
- this.cmbHPeriod.Size = new System.Drawing.Size(112, 23);
+ this.cmbHPeriod.Size = new System.Drawing.Size(85, 20);
this.cmbHPeriod.TabIndex = 107;
//
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(264, 12);
- this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label2.Location = new System.Drawing.Point(198, 10);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(82, 15);
+ this.label2.Size = new System.Drawing.Size(65, 12);
this.label2.TabIndex = 106;
this.label2.Text = "会计期间：";
//
// checkadd
//
this.checkadd.AutoSize = true;
- this.checkadd.Checked = true;
- this.checkadd.CheckState = System.Windows.Forms.CheckState.Checked;
- this.checkadd.Location = new System.Drawing.Point(1447, 12);
- this.checkadd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.checkadd.Location = new System.Drawing.Point(1085, 10);
this.checkadd.Name = "checkadd";
- this.checkadd.Size = new System.Drawing.Size(59, 19);
+ this.checkadd.Size = new System.Drawing.Size(48, 16);
this.checkadd.TabIndex = 108;
this.checkadd.Text = "追加";
this.checkadd.UseVisualStyleBackColor = true;
//
// txtHSheetName
//
- this.txtHSheetName.Location = new System.Drawing.Point(1265, 11);
- this.txtHSheetName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHSheetName.Location = new System.Drawing.Point(949, 9);
this.txtHSheetName.Name = "txtHSheetName";
- this.txtHSheetName.Size = new System.Drawing.Size(132, 25);
+ this.txtHSheetName.Size = new System.Drawing.Size(100, 21);
this.txtHSheetName.TabIndex = 109;
this.txtHSheetName.Text = "Sheet1";
//
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(1203, 12);
- this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label3.Location = new System.Drawing.Point(902, 10);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(52, 15);
+ this.label3.Size = new System.Drawing.Size(41, 12);
this.label3.TabIndex = 110;
this.label3.Text = "工作簿";
//
- // Gy_StdWorkTimes_RoutingBill
+ // Gy_DataIn_StdWorkTimes
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
- this.ClientSize = new System.Drawing.Size(1544, 789);
- this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
- this.Name = "Gy_StdWorkTimes_RoutingBill";
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.ClientSize = new System.Drawing.Size(1158, 631);
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.Name = "Gy_DataIn_StdWorkTimes";
this.Text = "数据导入模块";
- this.Load += new System.EventHandler(this.Gy_StdWorkTimes_RoutingBill_Load);
+ this.Load += new System.EventHandler(this.Gy_DataIn_StdWorkTimes_Load);
this.pPic.ResumeLayout(false);
this.pPic.PerformLayout();
this.panel1.ResumeLayout(false);
diff --git "a/BaseSet/\345\257\274\345\205\245\346\250\241\346\235\277/Gy_DataIn_StdWorkTimes.cs" "b/BaseSet/\345\257\274\345\205\245\346\250\241\346\235\277/Gy_DataIn_StdWorkTimes.cs"
new file mode 100644
index 0000000..85d088f
--- /dev/null
+++ "b/BaseSet/\345\257\274\345\205\245\346\250\241\346\235\277/Gy_DataIn_StdWorkTimes.cs"
@@ -0,0 +1,294 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using Pub_Class;
+using SQLHelper;
+
+namespace BaseSet
+{
+ public partial class Gy_DataIn_StdWorkTimes : BLL.Gy_DataInTmp
+ {
+ public Gy_DataIn_StdWorkTimes()
+ {
+ InitializeComponent();
+ }
+ public int HItemIDCol = 0;
+ public int HMaterNumberCol = 0; //物料代码
+ public int HProcNumberCol = 0; //工序代码
+ public int HStdWorkTimesCol = 0; //标准工时
+ public int HUpperlimitCol = 0; //上限比例
+ public int HLowerlimitCol = 0; //下限比例
+ public int HStdPieceCol = 0; //标准计件
+ public int HStdPricCol = 0; //标准计价
+ public int HUSEORGIDCol = 0; //组织ID
+ public int HMakerCol = 0; //制单人
+ public int HMakeDateCol = 0; //制单日期
+ //
+ public DAL.ClsGy_Process_View oProcHlp = new DAL.ClsGy_Process_View();
+ public DAL.ClsGy_StdWorkTimes_Ctl BillNew = new DAL.ClsGy_StdWorkTimes_Ctl();
+ DAL.ClsIF_Material_View oMaterHlp = new DAL.ClsIF_Material_View();
+ int c = 0;
+
+ public override bool OpenExcelData()
+ {
+ base.sSheetName = txtHSheetName.Text;
+ return base.OpenExcelData();
+ }
+
+ /// <summary>
+ /// 初始化界面
+ /// </summary>
+ public override void initData()
+ {
+ base.initData();
+ base.sSheetName = "标准工时导入";
+ base.ModRightName = "Gy_DataIn_StdWorkTimes";
+ base.ModRightNameCheck = base.ModRightName + base.ModRightNameCheck;
+ base.ModRightNameClose = base.ModRightName + base.ModRightNameClose;
+ base.ModRightNameDelete = base.ModRightName + base.ModRightNameDelete;
+ base.ModRightNameEdit = base.ModRightName + base.ModRightNameEdit;
+ base.ModRightNameMoney = base.ModRightName + base.ModRightNameMoney;
+ base.ModRightNameQty = base.ModRightName + base.ModRightNameQty;
+ base.ModCaption = "标准工时导入";
+ this.Text = base.ModCaption;
+ lblCaption.Text = base.ModCaption;
+ //
+ DBUtility.Gy_BaseFun.SetComboxYear(cmbHYear);
+ DBUtility.Gy_BaseFun.SetComboxPeriod(cmbHPeriod);
+ }
+
+ public override void Sub_DataIn()
+ {
+ HStdWorkTimesCol = DBUtility.Gy_BaseFun.Fun_GetCol("标准工时", grdMain);
+ HProcNumberCol = DBUtility.Gy_BaseFun.Fun_GetCol("工序代码", grdMain);
+ HMaterNumberCol = DBUtility.Gy_BaseFun.Fun_GetCol("物料代码", grdMain);
+ HUpperlimitCol = DBUtility.Gy_BaseFun.Fun_GetCol("上线比例", grdMain);
+ HLowerlimitCol = DBUtility.Gy_BaseFun.Fun_GetCol("下线比例", grdMain);
+ HStdPieceCol = DBUtility.Gy_BaseFun.Fun_GetCol("标准计件", grdMain);
+ HStdPricCol = DBUtility.Gy_BaseFun.Fun_GetCol("标准计价", grdMain);
+
+ //判断导入文档中是否存在以下标题列
+ if (HStdWorkTimesCol == -1)
+ {
+ MessageBox.Show("没有找到【标准工时】的标题", "提示");
+ return;
+ }
+ if (HProcNumberCol == -1)
+ {
+ MessageBox.Show("没有找到【工序代码】的标题", "提示");
+ return;
+ }
+ if (HMaterNumberCol == -1)
+ {
+ MessageBox.Show("没有找到【物料代码】的标题", "提示");
+ return;
+ }
+ if (HUpperlimitCol == -1)
+ {
+ MessageBox.Show("没有找到【上线比例】的标题", "提示");
+ return;
+ }
+ if (HLowerlimitCol == -1)
+ {
+ MessageBox.Show("没有找到【下线比例】的标题", "提示");
+ return;
+ }
+ if (HStdPieceCol == -1)
+ {
+ MessageBox.Show("没有找到【标准计件】的标题", "提示");
+ return;
+ }
+ if (HStdPricCol == -1)
+ {
+ MessageBox.Show("没有找到【标准计价】的标题", "提示");
+ return;
+ }
+ //导入前数据是否合理判断
+ if (!Checkdata())
+ {
+ return;
+ }
+
+ for (int i = 0; i <= grdMain.Rows.Count - 1; i++)
+ {
+ //写入类
+ if (WriteClass(i))
+ {
+ bool b = false;
+ //保存记录
+ b = BillNew.AddNew();
+ if (b == false) return;
+ c++;
+ }
+ }
+ MessageBox.Show("导入完毕:共" + c.ToString() + "条数据！");
+ grdMain.DataSource = null;
+ c = 0;
+ }
+
+ //写入类 从控件
+ private bool WriteClass(int row)
+ {
+ Model.ClsGy_StdWorkTimes_Model oSub = new Model.ClsGy_StdWorkTimes_Model();
+ BillNew.DetailColl.Clear();
+ string sHMaterNumber = "";
+ string sHProcNumber = "";
+ //
+ sHMaterNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[HMaterNumberCol].Value);
+ sHProcNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[HProcNumberCol].Value);
+
+ //写入信息
+ //得到物料内码
+ if (oMaterHlp.GetInfoByNumber(sHMaterNumber))
+ {
+ oSub.HMaterID = oMaterHlp.omodel.HItemID;
+ }
+ //得到工序内码
+ if (oProcHlp.GetInfoByNumber(sHProcNumber))
+ {
+ oSub.HProcID = oProcHlp.omodel.HItemID;
+ }
+ oSub.HRemark = "";
+ oSub.HStdWorkTimes = DBUtility.ClsPub.isDoule(grdMain.Rows[row].Cells[HStdWorkTimesCol].Value);
+ oSub.HUpperlimit = DBUtility.ClsPub.isDoule(grdMain.Rows[row].Cells[HUpperlimitCol].Value);
+ oSub.HLowerlimit = DBUtility.ClsPub.isDoule(grdMain.Rows[row].Cells[HLowerlimitCol].Value);
+ oSub.HStdPiece = DBUtility.ClsPub.isDoule(grdMain.Rows[row].Cells[HStdPieceCol].Value);
+ oSub.HStdPric = DBUtility.ClsPub.isDoule(grdMain.Rows[row].Cells[HStdPricCol].Value);
+ oSub.HUSEORGID = DBUtility.ClsPub.HOrgID;
+ oSub.HMaker = DBUtility.ClsPub.CurUserName;
+ oSub.HMakeDate = DateTime.Today.ToShortDateString();
+ BillNew.DetailColl.Add(oSub);
+
+ //非追加模式，导入前根据物料ID、工序ID查找删除对应记录
+ if (checkadd.Checked == false)
+ {
+ BillNew.DeleteByMaterIDAndHProcID(oSub.HMaterID, oSub.HProcID);
+ }
+ return true;
+ }
+
+ //检查导入数据是否合理
+ private bool Checkdata()
+ {
+ bool b = false;
+ string sErrMsg = "";
+ string sMsg = "";
+ for (int i = 0; i <= grdMain.Rows.Count - 1; i++)
+ {
+ string sHMaterNumber = "";
+ string sHProcNumber = "";
+ double sHStdWorkTimes = 0;
+ double sHUpperlimit = 0;
+ double sHLowerlimit = 0;
+ double sHStdPiece = 0;
+ double sHStdPric = 0;
+ //
+ sHMaterNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HMaterNumberCol].Value);
+ sHProcNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HProcNumberCol].Value);
+ sHStdWorkTimes = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HStdWorkTimesCol].Value);
+ sHUpperlimit = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HUpperlimitCol].Value);
+ sHLowerlimit = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HLowerlimitCol].Value);
+ sHStdPiece = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HStdPieceCol].Value);
+ sHStdPric = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HStdPricCol].Value);
+ //
+ //审核代码是否合理
+ if (!DBUtility.ClsPub.AllowNumber(sHMaterNumber))
+ {
+ sErrMsg = sErrMsg + "第" + (i + 1).ToString() + "行,物料代码中不能出现连续‘.’并且首位末位不能为‘.’！\r\n";
+ b = true;
+ }
+ if (!DBUtility.ClsPub.AllowNumber(sHProcNumber))
+ {
+ sErrMsg = sErrMsg + "第" + (i + 1).ToString() + "行,工序代码中不能出现连续‘.’并且首位末位不能为‘.’！\r\n";
+ b = true;
+ }
+
+ //判断所导入数据是否正确
+ if (sHStdWorkTimes<=0)
+ {
+ sErrMsg = sErrMsg + "第" + (i + 1).ToString() + "行,标准工时不能小于或等于0！\r\n";
+ b = true;
+ }
+ if (sHUpperlimit < 0)
+ {
+ sErrMsg = sErrMsg + "第" + (i + 1).ToString() + "行,上限比例不能小于0！\r\n";
+ b = true;
+ }
+ if (sHLowerlimit < 0)
+ {
+ sErrMsg = sErrMsg + "第" + (i + 1).ToString() + "行,下限比例不能小于0！\r\n";
+ b = true;
+ }
+ if (sHStdPiece < 0)
+ {
+ sErrMsg = sErrMsg + "第" + (i + 1).ToString() + "行,标准计件不能小于0！\r\n";
+ b = true;
+ }
+ if (sHStdPric < 0)
+ {
+ sErrMsg = sErrMsg + "第" + (i + 1).ToString() + "行,标准计价不能小于0！\r\n";
+ b = true;
+ }
+
+ if (sHMaterNumber == "")
+ {
+ sErrMsg = sErrMsg + "第" + (i + 1).ToString() + "行,物料代码不能为空！\r\n";
+ b = true;
+ }
+ else
+ {
+ //得到物料内码
+ if (!oMaterHlp.GetInfoByNumber(sHMaterNumber))
+ {
+ sMsg = "[" + sHMaterNumber + "]物料不存在";
+ if (sErrMsg.Contains(sMsg) == false)
+ {
+ sErrMsg = sErrMsg + "[" + sHMaterNumber + "]物料不存在\r\n";
+ }
+ b = true;
+ }
+ }
+
+ if (sHProcNumber == "")
+ {
+ sErrMsg = sErrMsg + "第" + (i + 1).ToString() + "行,工序代码不能为空！\r\n";
+ b = true;
+ }
+ else
+ {
+ //得到工序内码
+ if (!oProcHlp.GetInfoByNumber(sHProcNumber))
+ {
+ sMsg = "[" + sHProcNumber + "]工序不存在";
+ if (sErrMsg.Contains(sMsg) == false)
+ {
+ sErrMsg = sErrMsg + "[" + sHProcNumber + "]工序不存在\r\n";
+ }
+ b = true;
+ }
+ }
+ }
+ if (b == true)
+ {
+ Pub_Control.ErrMsgBox oMsgbox = new Pub_Control.ErrMsgBox();
+ oMsgbox.txtHErrMsg.Text = sErrMsg;
+ oMsgbox.ShowDialog();
+ return false;
+ }
+ else
+ {
+ return true;
+ }
+ }
+
+ private void Gy_DataIn_StdWorkTimes_Load(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
+
diff --git "a/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_StdWorkTimes_RoutingBill.resx" "b/BaseSet/\345\257\274\345\205\245\346\250\241\346\235\277/Gy_DataIn_StdWorkTimes.resx"
similarity index 100%
rename from "PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_StdWorkTimes_RoutingBill.resx"
rename to "BaseSet/\345\257\274\345\205\245\346\250\241\346\235\277/Gy_DataIn_StdWorkTimes.resx"
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_StdWorkTimes_Ctl.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_StdWorkTimes_Ctl.cs"
index 42260f2..30aa5ff 100644
--- "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_StdWorkTimes_Ctl.cs"
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_StdWorkTimes_Ctl.cs"
@@ -146,6 +146,20 @@
}
}
+ //鏍规嵁鐗╂枡ID銆佸伐搴廔D 鍒犻櫎 鏍囧噯宸ユ椂
+ public bool DeleteByMaterIDAndHProcID(Int64 HMaterID, Int64 HProcID)
+ {
+ try
+ {
+ oCn.RunProc("Delete from Gy_StdWorkTimes where HMaterID=" + HMaterID.ToString() + " and HProcID=" + HProcID.ToString());
+ return true;
+ }
+ catch (Exception e)
+ {
+ return false;
+ }
+ }
+
public ClsGy_StdWorkTimes_Ctl()
{
MvarItemKey = "Gy_StdWorkTimes";
diff --git a/LMES/ClsShowMod.cs b/LMES/ClsShowMod.cs
index 2fe85ee..12493be 100644
--- a/LMES/ClsShowMod.cs
+++ b/LMES/ClsShowMod.cs
@@ -8085,11 +8085,11 @@
oGy_DataIn_ProcessPrice.Show();
oMainForm.AddTabPage(oGy_DataIn_ProcessPrice);
break;
- case "gy_stdworktimes_routingbill":
- Gy_StdWorkTimes_RoutingBill oGy_StdWorkTimes_RoutingBill = new Gy_StdWorkTimes_RoutingBill();
- oGy_StdWorkTimes_RoutingBill.MdiParent = oMain;
- oGy_StdWorkTimes_RoutingBill.Show();
- oMainForm.AddTabPage(oGy_StdWorkTimes_RoutingBill);
+ case "gy_datain_stdworktimes":
+ Gy_DataIn_StdWorkTimes oGy_DataIn_StdWorkTimes = new Gy_DataIn_StdWorkTimes();
+ oGy_DataIn_StdWorkTimes.MdiParent = oMain;
+ oGy_DataIn_StdWorkTimes.Show();
+ oMainForm.AddTabPage(oGy_DataIn_StdWorkTimes);
break;
case "gy_datain_process":
Gy_DataIn_Process oGy_DataIn_Process = new Gy_DataIn_Process();
diff --git a/LMES/bin/x86/Debug.zip b/LMES/bin/x86/Debug.zip
index 17052fa..d5cc379 100644
--- a/LMES/bin/x86/Debug.zip
+++ b/LMES/bin/x86/Debug.zip
Binary files differ
diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_StdWorkTimes_Model.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_StdWorkTimes_Model.cs"
index 1ff276e..a965b48 100644
--- "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_StdWorkTimes_Model.cs"
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_StdWorkTimes_Model.cs"
@@ -24,7 +24,7 @@
public double HStdWorkTimes; //鏍囧噯宸ユ椂
public double HUpperlimit; //涓婇檺姣斾緥
public double HLowerlimit; //涓嬮檺姣斾緥
- public double HStdPiece; //涓婇檺姣斾緥
- public double HStdPric; //涓嬮檺姣斾緥
+ public double HStdPiece; //鏍囧噯璁′欢
+ public double HStdPric; //鏍囧噯璁′环
}
}
diff --git a/PlanM/PlanM.csproj b/PlanM/PlanM.csproj
index 0bf7d26..026fa9a 100644
--- a/PlanM/PlanM.csproj
+++ b/PlanM/PlanM.csproj
@@ -183,12 +183,6 @@
<Compile Include="鏁版嵁瀵煎叆\Gy_DataIn_RoutingBill.designer.cs">
<DependentUpon>Gy_DataIn_RoutingBill.cs</DependentUpon>
</Compile>
- <Compile Include="鏁版嵁瀵煎叆\Gy_StdWorkTimes_RoutingBill.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="鏁版嵁瀵煎叆\Gy_StdWorkTimes_RoutingBill.designer.cs">
- <DependentUpon>Gy_StdWorkTimes_RoutingBill.cs</DependentUpon>
- </Compile>
<Compile Include="鏁版嵁瀵煎叆\Gy_DataIn_RoutingBill_New.cs">
<SubType>Form</SubType>
</Compile>
@@ -285,10 +279,6 @@
</EmbeddedResource>
<EmbeddedResource Include="鏁版嵁瀵煎叆\Gy_DataIn_RoutingBill.resx">
<DependentUpon>Gy_DataIn_RoutingBill.cs</DependentUpon>
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <EmbeddedResource Include="鏁版嵁瀵煎叆\Gy_StdWorkTimes_RoutingBill.resx">
- <DependentUpon>Gy_StdWorkTimes_RoutingBill.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="鏁版嵁瀵煎叆\Gy_DataIn_RoutingBill_New.resx">
diff --git "a/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_StdWorkTimes_RoutingBill.cs" "b/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_StdWorkTimes_RoutingBill.cs"
deleted file mode 100644
index 095e1cd..0000000
--- "a/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_StdWorkTimes_RoutingBill.cs"
+++ /dev/null
@@ -1,230 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
-using Pub_Class;
-using SQLHelper;
-
-namespace PlanM
-{
- public partial class Gy_StdWorkTimes_RoutingBill : BLL.Gy_DataInTmp
- {
- public Gy_StdWorkTimes_RoutingBill()
- {
- InitializeComponent();
- }
- public int HItemID =0;
- public int HMaker = 0; //制单人
- public int HMakeDate = 0; //制单日期
- public int HChecker = 0; //审核人
- public int HCheckDate = 0; //审核日期
- public int HStopflag = 0;
- public int HRemark = 0;
- public int HUSEORGName = 0; //组织ID
- public int HProcName = 0; //
- public int HMaterName = 0; //物料ID
- public int HProcNum = 0; //
- public int HMaterNum = 0; //物料ID
- public int HStdWorkTimes = 0; //标准工时
- public int HUpperlimit = 0; //上限比例
- public int HLowerlimit = 0; //下限比例
- public int HStdPiece = 0; //上限比例
- public int HStdPric = 0; //下限比例
- //
- public const int HBeginRow = 2; //有效数据，开始行数
-
-
- //
- public DAL.ClsGy_Process_View oProcHlp = new DAL.ClsGy_Process_View();
- public DAL.ClsGy_StdWorkTimes_Ctl BillNew = new DAL.ClsGy_StdWorkTimes_Ctl();
- DAL.ClsIF_Material_View oMaterHlp = new DAL.ClsIF_Material_View();
-
-
-
- public override bool OpenExcelData()
- {
- base.sSheetName = txtHSheetName.Text;
- return base.OpenExcelData();
- }
-
-
- /// <summary>
- /// 初始化界面
- /// </summary>
- public override void initData()
- {
- base.initData();
- base.sSheetName = "标准工时";
- base.ModRightName = "Gy_StdWorkTimes_RoutingBill";
- base.ModRightNameCheck = base.ModRightName + base.ModRightNameCheck;
- base.ModRightNameClose = base.ModRightName + base.ModRightNameClose;
- base.ModRightNameDelete = base.ModRightName + base.ModRightNameDelete;
- base.ModRightNameEdit = base.ModRightName + base.ModRightNameEdit;
- base.ModRightNameMoney = base.ModRightName + base.ModRightNameMoney;
- base.ModRightNameQty = base.ModRightName + base.ModRightNameQty;
- base.ModCaption = "标准工时";
- this.Text = base.ModCaption;
- lblCaption.Text = base.ModCaption;
- //
- DBUtility.Gy_BaseFun.SetComboxYear(cmbHYear);
- DBUtility.Gy_BaseFun.SetComboxPeriod(cmbHPeriod);
- //
- }
-
- public override void Sub_DataIn()
- {
- int sHStdWorkTimesCol = DBUtility.Gy_BaseFun.Fun_GetCol("标准工时", grdMain);
- int sHProcNumCol = DBUtility.Gy_BaseFun.Fun_GetCol("工序代码", grdMain);
- int sHProcNameCol = DBUtility.Gy_BaseFun.Fun_GetCol("工序", grdMain);
- int sHMaterNumCol = DBUtility.Gy_BaseFun.Fun_GetCol("物料代码", grdMain);
- int sHMaterNameCol = DBUtility.Gy_BaseFun.Fun_GetCol("物料", grdMain);
- int sHUpperlimitCol = DBUtility.Gy_BaseFun.Fun_GetCol("上线比例", grdMain);
- int sHLowerlimitCol = DBUtility.Gy_BaseFun.Fun_GetCol("下线比例", grdMain);
- int sHStdPieceCol = DBUtility.Gy_BaseFun.Fun_GetCol("标准计件", grdMain);
- int sHStdPricCol = DBUtility.Gy_BaseFun.Fun_GetCol("标准计价", grdMain);
- int sHUSEORGNameCol = DBUtility.Gy_BaseFun.Fun_GetCol("组织", grdMain);
- int sHMakerCol = DBUtility.Gy_BaseFun.Fun_GetCol("制单人", grdMain);
- int sHMakeDateCol = DBUtility.Gy_BaseFun.Fun_GetCol("制单日期", grdMain);
-
- for (int i = 0; i <= grdMain.Rows.Count - 1; i++)
- {
- if (DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[sHMaterNumCol].Value) != "" && DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[sHProcNumCol].Value) != ""&& DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[sHStdWorkTimesCol].Value) != "")
- {
- if (DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[sHStdWorkTimesCol].Value)>0&& DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[sHUpperlimitCol].Value) > 0&& DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[sHLowerlimitCol].Value) > 0)
- {
- //写入类
- if (WriteClass(i))
- {
- //保存记录
- if (!BillNew.AddNew())
- {
- MessageBox.Show("导入失败!原因:" + DBUtility.ClsPub.sExeReturnInfo, "提示");
- return;
- }
- }
- }
- else
- {
- MessageBox.Show("第" + (i + 1) + "行,标准工时、上限比例和下限比例不能小于0", "提示");
- return;
- }
- }
- else
- {
- MessageBox.Show("第"+(i+1)+"行,工序代码、物料代码和标准工时不能为空!原因:" + DBUtility.ClsPub.sExeReturnInfo, "提示");
- return;
- }
- }
- MessageBox.Show("导入完毕");
- grdMain.DataSource = null;
- }
-
- //写入类 从控件
- private bool WriteClass(int row)
- {
- BillNew.DetailColl.Clear();
- string sMaterNumber = "";
- string sMaterName = "";
- string sProcNumber = "";
- string sProcName = "";
- double sStdWorkTimes = 0;
- double sUpperlimit = 0;
- double sLowerlimit = 0;
- double sStdPiece = 0;
- double sStdPric= 0;
- int sUSEORGName = 0;
- DateTime sHMakeDate = DateTime.Today.Date;
- string sHMaker = DBUtility.ClsPub.CurUserName;
-
- int sHStdWorkTimesCol = DBUtility.Gy_BaseFun.Fun_GetCol("标准工时", grdMain);
- int sHProcNumCol = DBUtility.Gy_BaseFun.Fun_GetCol("工序代码", grdMain);
- int sHProcNameCol = DBUtility.Gy_BaseFun.Fun_GetCol("工序", grdMain);
- int sHMaterNumCol = DBUtility.Gy_BaseFun.Fun_GetCol("物料代码", grdMain);
- int sHMaterNameCol = DBUtility.Gy_BaseFun.Fun_GetCol("物料", grdMain);
- int sHUpperlimitCol = DBUtility.Gy_BaseFun.Fun_GetCol("上线比例", grdMain);
- int sHLowerlimitCol = DBUtility.Gy_BaseFun.Fun_GetCol("下线比例", grdMain);
- int sHStdPieceCol = DBUtility.Gy_BaseFun.Fun_GetCol("标准计件", grdMain);
- int sHStdPricCol = DBUtility.Gy_BaseFun.Fun_GetCol("标准计价", grdMain);
- int sHUSEORGNameCol = DBUtility.Gy_BaseFun.Fun_GetCol("组织", grdMain);
- int sHMakerCol = DBUtility.Gy_BaseFun.Fun_GetCol("制单人", grdMain);
- int sHMakeDateCol = DBUtility.Gy_BaseFun.Fun_GetCol("制单日期", grdMain);
- //
- sMaterNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[sHMaterNumCol].Value);
- //sMaterName = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[sHMaterNameCol].Value);
- sProcNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[sHProcNumCol].Value);
- //sProcName = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[sHProcNameCol].Value);
- sStdWorkTimes = DBUtility.ClsPub.isDoule(grdMain.Rows[row].Cells[sHStdWorkTimesCol].Value);
- sUpperlimit = DBUtility.ClsPub.isDoule(grdMain.Rows[row].Cells[sHUpperlimitCol].Value);
- sLowerlimit = DBUtility.ClsPub.isDoule(grdMain.Rows[row].Cells[sHLowerlimitCol].Value);
- sStdPiece = DBUtility.ClsPub.isDoule(grdMain.Rows[row].Cells[sHStdPieceCol].Value);
- sStdPric = DBUtility.ClsPub.isDoule(grdMain.Rows[row].Cells[sHStdPricCol].Value);
- //sUSEORGName = DBUtility.ClsPub.isInt(grdMain.Rows[row].Cells[sHUSEORGNameCol].Value);
- //sHMakeDate = DBUtility.ClsPub.isDate(grdMain.Rows[row].Cells[sHMakeDateCol].Value);
- //sHMaker = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[sHMakerCol].Value);
-
- //判断是否允许 保存
-
- //审核代码是否合理
- if (!DBUtility.ClsPub.AllowNumber(sMaterNumber))
- {
- MessageBox.Show("产品代码中不能出现连续‘.’并且首位末位不能为‘.’！", "提示");
- return false;
- }
- if (!DBUtility.ClsPub.AllowNumber(sProcNumber))
- {
- MessageBox.Show("工序代码中不能出现连续‘.’并且首位末位不能为‘.’！", "提示");
- return false;
- }
-
- Model.ClsGy_StdWorkTimes_Model oSub = new Model.ClsGy_StdWorkTimes_Model();
- //得到物料内码
- if (oMaterHlp.GetInfoByNumber(sMaterNumber))
- {
- oSub.HMaterID = oMaterHlp.omodel.HItemID;
- }
- else
- {
- oSub.HMaterID = 0;
- MessageBox.Show("第" + row.ToString() + "行," + sMaterNumber + "没有找到对应的物料！");
- return false;
- }
- //得到工序内码
- if (oProcHlp.GetInfoByNumber(sProcNumber))
- {
- oSub.HProcID = oProcHlp.omodel.HItemID;
- }
- else
- {
- oSub.HProcID = 0;
- MessageBox.Show("第" + row.ToString() + "行," + sProcNumber + "没有找到对应的工序！");
- return false;
- }
-
- //写入信息
-
- oSub.HRemark = "";
- oSub.HStdWorkTimes = sStdWorkTimes;
- oSub.HUpperlimit = sUpperlimit;
- oSub.HLowerlimit = sLowerlimit;
- oSub.HStdPiece = sStdPiece;
- oSub.HStdPric = sStdPric;
- oSub.HUSEORGID = DBUtility.ClsPub.HOrgID;
- oSub.HMaker = DBUtility.ClsPub.CurUserName;
- oSub.HMakeDate = DateTime.Today.ToShortDateString();
- BillNew.DetailColl.Add(oSub);
- //oProc.oModel.HBillSubType = DBUtility.ClsPub.isStrNull(txtHBillSubType.Text);
-
- return true;
- }
-
-
- private void Gy_StdWorkTimes_RoutingBill_Load(object sender, EventArgs e)
- {
-
- }
- }
-}
-
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index 4a18d08..e95380d 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -662,7 +662,11 @@
{
omodel.MES_StationInBill_ProcessCheckCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
-
+ //删除单据时制单人与删除人必须一致
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationInBill_DeleteCtl")
+ {
+ omodel.MES_StationInBill_DeleteCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//===============出站单
//出站数量不能大于本道进站汇总数
@@ -674,6 +678,11 @@
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_FirstCheckOut")
{
omodel.MES_StationOutBill_FirstCheckOut = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ //删除单据时制单人与删除人必须一致
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_DeleteCtl")
+ {
+ omodel.MES_StationOutBill_DeleteCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
//=====不良评审单
@@ -687,6 +696,12 @@
{
omodel.QC_NoPassProdCheckBill_BadReasonQtyCtrl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ //删除单据时制单人与删除人必须一致
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_NoPassProdCheckBill_DeleteCtl")
+ {
+ omodel.QC_NoPassProdCheckBill_DeleteCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
//=======委外发出
//工站或工序先进先出（同上）
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustInBill_FIFOCtl")
@@ -708,6 +723,11 @@
{
omodel.MES_StationEntrustInBill_OneCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ //删除单据时制单人与删除人必须一致
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustInBill_DeleteCtl")
+ {
+ omodel.MES_StationEntrustInBill_DeleteCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//===========委外接收单
//出站数量不能大于本道进站汇总数
@@ -715,6 +735,11 @@
{
omodel.MES_StationEntrustOutBill_QtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ //删除单据时制单人与删除人必须一致
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustOutBill_DeleteCtl")
+ {
+ omodel.MES_StationEntrustOutBill_DeleteCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//==========生产汇报单
//自动审核
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
index 4d9f633..c920232 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -178,20 +178,25 @@
public string MES_StationInBill_OneCtl; //一张流转卡只允许一次进站
public string MES_StationInBill_FirstCheckOut; //必须首件检验通过才能保存单据
public string MES_StationInBill_ProcessCheckCtl; //进站单当前工序的上道工序是否做工序检验
+ public string MES_StationInBill_DeleteCtl; //删除单据时制单人与删除人必须一致
//出站单
public string MES_StationOutBill_QtyCtl; //出站数量不能大于本道进站汇总数
public string MES_StationOutBill_ProcessCheckOut; //必须工序检验通过才能保存单据
public string MES_StationOutBill_FirstCheckOut; //出战单判断本道工序是否做首件检验
+ public string MES_StationOutBill_DeleteCtl; //删除单据时制单人与删除人必须一致
//不良品评审单
public string QC_NoPassProdCheckBill_QtyCtl; //不良品数不能大于出站单报废数量
public string QC_NoPassProdCheckBill_BadReasonQtyCtrl; //不良品评审单不良数量和不良原因总数必须一致
+ public string QC_NoPassProdCheckBill_DeleteCtl; //删除单据时制单人与删除人必须一致
//委外发出
public string MES_StationEntrustInBill_FIFOCtl; //工站或工序先进先出（同上）
public string MES_StationEntrustInBill_FullMoveCtl; //上道完全出站控制（同上）
public string MES_StationEntrustInBill_QtyCtl; //进站数量不能大于上道出站汇总合格数（同上）
public string MES_StationEntrustInBill_OneCtl; //一张流转卡只允许一次委外发出
+ public string MES_StationEntrustInBill_DeleteCtl; //删除单据时制单人与删除人必须一致
//委外接收
public string MES_StationEntrustOutBill_QtyCtl; //出站数量不能大于本道进站汇总数
+ public string MES_StationEntrustOutBill_DeleteCtl; //删除单据时制单人与删除人必须一致
//MES
diff --git "a/WebAPI/Controllers/\345\215\232\346\227\245\350\207\252\345\212\250\346\211\253\347\240\201\347\272\277/ScanlineAPIController.cs" "b/WebAPI/Controllers/\345\215\232\346\227\245\350\207\252\345\212\250\346\211\253\347\240\201\347\272\277/ScanlineAPIController.cs"
index 98467d9..04e17a1 100644
--- "a/WebAPI/Controllers/\345\215\232\346\227\245\350\207\252\345\212\250\346\211\253\347\240\201\347\272\277/ScanlineAPIController.cs"
+++ "b/WebAPI/Controllers/\345\215\232\346\227\245\350\207\252\345\212\250\346\211\253\347\240\201\347\272\277/ScanlineAPIController.cs"
@@ -45,9 +45,9 @@
sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);
string sDay = "0" + ClsPub.isDate(sDate).Day.ToString();
sDay = sDay.Substring(sDay.Length - 2, 2);
- string sTMNumber ="ZX"+ sYear + sPeriod + sDay;
+ string sTMNumber = "ZX" + sYear + sPeriod + sDay;
ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
- int LSH = ClsPub.isInt(ds.Tables[0].Rows[0][0])+1; //娴佹按鍙峰姞1
+ int LSH = ClsPub.isInt(ds.Tables[0].Rows[0][0]) + 1; //娴佹按鍙峰姞1
string TM = sTMNumber + LSH;
jsn.packagebarcode = TM;
oCN.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
@@ -55,14 +55,15 @@
}
objJsonResult.status = 0;
objJsonResult.msg = "鏌ヨ鏁版嵁鎴愬姛锛�";
- objJsonResult.data =objJsonResult.data;
+ objJsonResult.data = objJsonResult.data;
return objJsonResult;
}
catch (Exception e)
{
- objJsonResult.status =-1;
+ LogService.Write("閿欒锛�" + e.Message.ToString());
+ objJsonResult.status = -1;
objJsonResult.msg = "鐢熸垚绠辨潯鐮佸け璐ワ紒";
- objJsonResult.data =null;
+ objJsonResult.data = null;
return objJsonResult;
}
}
@@ -80,7 +81,7 @@
ScanLineCode list = js.Deserialize<ScanLineCode>(msg.ToString()); //灏唈son鏁版嵁杞寲涓哄璞＄被鍨嬪苟璧嬪�肩粰list
if (list.billno != "" && list.billno != null) //浠诲姟鍗曞彿锛岄潪蹇呴』锛岄潪绌哄垯鏍￠獙barcodes閲宐arcode鏄惁鐢辨浠诲姟鍗曞埗浣滅敓鎴愮殑
{
- ds = oCN.RunProcReturn("Select HBarCode barcode,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType from Gy_BarCodeBill where HSourceBillNo='" + list.billno.ToString().Trim()+"' Order by HItemID ", "Gy_BarCodeBill");
+ ds = oCN.RunProcReturn("Select HBarCode barcode,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType from Gy_BarCodeBill where HSourceBillNo='" + list.billno.ToString().Trim() + "' Order by HItemID ", "Gy_BarCodeBill");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.status = -1;
@@ -89,21 +90,21 @@
return objJsonResult;
}
List<string> NameList = (from r in ds.Tables[0].AsEnumerable() select r.Field<string>("barcode")).ToList();
- List<string> NameList1= list.barcodes.Select(t => t.barcode).ToList();
+ List<string> NameList1 = list.barcodes.Select(t => t.barcode).ToList();
var strList = NameList1.Except(NameList).ToList(); //鍒ゆ柇鎻愪氦鏁版嵁涓潯鐮佹槸鍚﹀瓨鍦ㄤ簬璁㈠崟涓�
- if (strList.Count > 0)
+ if (strList.Count > 0)
{
- string Str=String.Join(",", strList.ToArray());
+ string Str = String.Join(",", strList.ToArray());
objJsonResult.status = -1;
- objJsonResult.msg = "鏉＄爜:"+ Str.ToString()+" 涓嶅寘鍚湪璁㈠崟:"+list.billno+"涓�!";
+ objJsonResult.msg = "鏉＄爜:" + Str.ToString() + " 涓嶅寘鍚湪璁㈠崟:" + list.billno + "涓�!";
objJsonResult.data = null;
return objJsonResult;
- }
+ }
}
DLL.ClsSc_PackUnionBill oBill = new DLL.ClsSc_PackUnionBill();
//鍒ゆ柇绠辩爜鏄惁瀛樺湪
bool IsBarCodePack = oBill.IsBarCodePack(list.packagebarcode);
- if (IsBarCodePack == false)
+ if (IsBarCodePack == false)
{
objJsonResult.status = -1;
objJsonResult.msg = "绠辩爜宸插瓨鍦�,涓嶈兘閲嶅缁戝畾锛�";
@@ -124,7 +125,7 @@
oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
oItem.HBillType = "3783";
oItem.HBillSubType = "3783";
- oItem.HDate= DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd"));
+ oItem.HDate = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd"));
oItem.HBillNo = DBUtility.ClsPub.CreateBillCode(oItem.HBillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
oItem.HBillStatus = 1;
oItem.HCheckItemNowID = 0;
@@ -146,10 +147,10 @@
oItem.HDeleteDate = "";
oItem.HICMOInterID = 0;
oItem.HICMOBillNo = "";
- oItem.HBarCode_Pack= list.packagebarcode;
+ oItem.HBarCode_Pack = list.packagebarcode;
oItem.HMaterID = 0;
oItem.HUnitID = 0;
- oItem.HUseFlag =false; //鏈夋晥鐘舵��
+ oItem.HUseFlag = false; //鏈夋晥鐘舵��
oBill.omodel = oItem;
for (int i = 0; i < list.barcodes.Count; i++)
{
@@ -164,14 +165,14 @@
}
Models.ClsSc_PackUnionBillSub oItemSub = new ClsSc_PackUnionBillSub();
ds0 = oCN.RunProcReturn("Select HBarCode,HMaterID,HUnitID,HQty,HSourceID,HGroupID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType from Gy_BarCodeBill where HSourceBillNo='" + list.billno.ToString().Trim() + "' and HBarCode='" + list.barcodes[i].barcode + "' Order by HItemID ", "Gy_BarCodeBill");
- oItemSub.HEntryID = i+1;
+ oItemSub.HEntryID = i + 1;
oItemSub.HMaterID = DBUtility.ClsPub.isLong(ds0.Tables[0].Rows[0]["HMaterID"].ToString());
oItemSub.HUnitID = DBUtility.ClsPub.isLong(ds0.Tables[0].Rows[0]["HUnitID"].ToString());
oItemSub.HQty = DBUtility.ClsPub.isDoule(ds0.Tables[0].Rows[0]["HQty"].ToString());
oItemSub.HSourceID = DBUtility.ClsPub.isLong(ds0.Tables[0].Rows[0]["HSourceID"].ToString());
oItemSub.HEquipID = 0;
oItemSub.HGroupID = DBUtility.ClsPub.isLong(ds0.Tables[0].Rows[0]["HGroupID"].ToString());
- oItemSub.HWorkerID = 0;
+ oItemSub.HWorkerID = 0;
oItemSub.HBarCode = list.barcodes[i].barcode;
oItemSub.HBarCode_Pack = list.packagebarcode;
oItemSub.HCloseMan = "";
@@ -202,7 +203,7 @@
objJsonResult.status = 0;
objJsonResult.msg = "success";
objJsonResult.data = null;
- Log.LogSaveInfo("鎻愪氦鎴愬姛绠辨潯鐮侊細"+ list.packagebarcode); //璁板綍鎻愪氦鏁版嵁
+ Log.LogSaveInfo("鎻愪氦鎴愬姛绠辨潯鐮侊細" + list.packagebarcode); //璁板綍鎻愪氦鏁版嵁
return objJsonResult;
}
else
@@ -215,7 +216,7 @@
}
catch (Exception e)
{
- objJsonResult.status =-1;
+ objJsonResult.status = -1;
objJsonResult.msg = e.Message;
objJsonResult.data = null;
return objJsonResult;
@@ -232,7 +233,7 @@
{
//鍒ゆ柇鏄惁鍏ュ簱
ds = oCN.RunProcReturn("select * from Sc_ScanLineInStock where HBarCode_Pack='" + packagebarcode + "'", "Sc_ScanLineInStock");
- if (ds!= null && ds.Tables[0].Rows.Count>0)
+ if (ds != null && ds.Tables[0].Rows.Count > 0)
{
objJsonResult.status = -1;
objJsonResult.msg = "璇ョ鏉＄爜宸插叆搴撲笉鍏佽鍙栨秷!";
@@ -249,7 +250,7 @@
return objJsonResult;
}
ds = oCN.RunProcReturn("Select 1 from Gy_BarCodeBill where HBarCode='" + packagebarcode.ToString().Trim() + "' and HStopflag='1'", "Gy_BarCodeBill");
- if (ds != null && ds.Tables[0].Rows.Count>0)
+ if (ds != null && ds.Tables[0].Rows.Count > 0)
{
objJsonResult.status = -1;
objJsonResult.msg = "姝ょ鏉＄爜宸蹭綔搴�";
@@ -262,11 +263,11 @@
//鍒犻櫎SUM涓昏〃
oCN.RunProc("Delete From Sc_PackUnionBillSub_Sum where HBarCode_Pack='" + packagebarcode.ToString() + "'");
//鍒犻櫎瀛愯〃
- oCN.RunProc("Delete From Sc_PackUnionBillSub where HBarCode_Pack='"+ packagebarcode.ToString() + "'");
+ oCN.RunProc("Delete From Sc_PackUnionBillSub where HBarCode_Pack='" + packagebarcode.ToString() + "'");
//鍒犻櫎涓昏〃
oCN.RunProc("Delete From Sc_PackUnionBillMain where HBarCode_Pack='" + packagebarcode.ToString() + "'");
//浣滃簾鏉＄爜妗ｆ琛�
- oCN.RunProc("Update Gy_BarCodeBill set HStopflag='1' where HBarCode='"+ packagebarcode.ToString()+ "'");
+ oCN.RunProc("Update Gy_BarCodeBill set HStopflag='1' where HBarCode='" + packagebarcode.ToString() + "'");
oCN.Commit();
@@ -296,7 +297,7 @@
//string aa=list.getWeek(Convert.ToDateTime(tim));
string aa = list.GetCodeDateStr(Convert.ToDateTime(tim));
objJsonResult.status = 0;
- objJsonResult.msg =aa.ToString();
+ objJsonResult.msg = aa.ToString();
objJsonResult.data = null;
return objJsonResult;
}
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
index ccdeb43..363fc92 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
@@ -16,14 +16,14 @@
public class Sc_ICMOBillController : ApiController
{
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
- private json objJsonResult = new json();
+ private json objJsonResult = new json();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
#region 鐢熶骇浠诲姟鍗曞垹闄ゅ姛鑳�
[Route("Sc_ICMOBill/DeltetSc_ICMOReportBill")]
[HttpGet]
- public object DeltetSc_ICMOReportBill(string HInterID,string user)
+ public object DeltetSc_ICMOReportBill(string HInterID, string user)
{
try
{
@@ -75,6 +75,33 @@
}
#endregion
+ #region 鐢熶骇浠诲姟鍗曡幏鍙栬溅闂�
+ [Route("Sc_ICMOBill/GetHDeptList")]
+ [HttpGet]
+ public object GetHDeptList()
+ {
+ try
+ {
+ DataSet oDs = new DataSet();
+ //==========
+ oDs = oCN.RunProcReturn("select HItemID,HName from Gy_Department", "Gy_Department");
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇鎴愬姛锛�";
+ objJsonResult.data = oDs.Tables[0];
+ return objJsonResult; ;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 澧欏挃瑁呯鍗曞洖杞︿簨浠�
[Route("Sc_ICMOBill/QK_PackingBillByXSBill")]
[HttpGet]
@@ -82,7 +109,7 @@
{
try
{
- string sql = string.Format(@"select a.HInterID,a.HBillNo,a.HMaterID,m.HName HMaterName, a.HUnitID,u.HName HUnitName,b.HQty HPlanQty,a.HCusID, c.HName HCusName,a.HEmpID,e.HName HEmpName,a.HDeptID,d.HName HDeptName,a.HPlanEndDate,0 HMinQty,0 HTotalQty,0 HSpsQty
+ string sql = string.Format(@"select a.HInterID,a.HBillNo,b.HEntryID,a.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName, a.HUnitID,u.HName HUnitName,b.HQty HPlanQty,a.HCusID, c.HName HCusName,a.HEmpID,e.HName HEmpName,a.HDeptID,d.HName HDeptName,a.HPlanEndDate,0 HMinQty,0 HTotalQty,0 HSpsQty,a.HSeOrderBillNo
from Sc_ICMOBillMain a
left join Sc_ICMOBillSub b on a.HInterID=b.HInterID
left join Gy_Material m on b.HMaterID=m.HItemID
@@ -90,8 +117,26 @@
left join Gy_Customer c on a.HCusID=c.HItemID
left join Gy_Employee e on a.HEmpID=e.HItemID
left join Gy_Department d on a.HDeptID=d.HItemID
- where b.HDEPTID='113546' and b.HSeOrderInterID=(select HSeOrderInterID from Sc_PPBomBillMain where HBillNo='" + HBillNo + "')");
-
+ where b.HInterID=(select HICMOInterID from Sc_PPBomBillMain where HBillNo='" + HBillNo + "')");
+ //string sql = string.Format(@" select a.HInterID,a.HBillNo,b.HEntryID,a.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName, a.HUnitID,u.HName HUnitName,b.HQty HPlanQty,a.HCusID,
+ // c.HName HCusName,a.HEmpID,e.HName HEmpName,a.HDeptID,d.HName HDeptName,a.HPlanEndDate,0 HMinQty,0 HTotalQty,0 HSpsQty,a.HSeOrderBillNo
+ // ,fo.FBILLNO FBillNo,fo.F_ZZZZ_TEXT7 FLXName,fo.FRECEIVEADDRESS FInAddress,fm1.FOLDNUMBER FMaterName,fo.F_ZZZZ_TEXT FBZFS,fu.FDATAVALUE FHX,
+ // fu1.FDATAVALUE FQK,fo.F_ZZZZ_WBBZ FWBBZ
+ // from Sc_ICMOBillMain a
+ // left join Sc_ICMOBillSub b on a.HInterID=b.HInterID
+ // left join Gy_Material m on b.HMaterID=m.HItemID
+ // left join Gy_Unit u on b.HUnitID=u.HItemID
+ // left join Gy_Customer c on a.HCusID=c.HItemID
+ // left join Gy_Employee e on a.HEmpID=e.HItemID
+ // left join Gy_Department d on a.HDeptID=d.HItemID
+ // left join AIS20200908101915zs..T_PRD_MOENTRY f1 on b.HERPEntryID=f1.FENTRYID
+ // left join AIS20200908101915zs..T_SAL_ORDER fo on f1.FSaleOrderId =fo.FID
+ // left join AIS20200908101915zs..T_SAL_ORDERENTRY fo1 on fo.FID=fo1.FID
+ // left join AIS20200908101915zs..T_BD_MATERIAL fm1 on fo1.FSUBMATERIALNUMBER=fm1.FMATERIALID
+ // LEFT JOIN AIS20200908101915zs..T_BAS_ASSISTANTDATAENTRY_L fu1 on fo1.F_ZZZZ_ASSISTANT1=fu1.FENTRYID
+ // LEFT JOIN AIS20200908101915zs..T_BAS_ASSISTANTDATAENTRY_L fu on fo1.F_ZZZZ_ASSISTANT2=fu.FENTRYID
+ // where b.HInterID=(select HICMOInterID from Sc_PPBomBillMain where HBillNo='" + HBillNo + "')");
+
ds = oCN.RunProcReturn(sql, "Sc_ICMOBillMain");
if (ds.Tables[0].Rows.Count != 0 || ds != null)
{
@@ -152,67 +197,31 @@
string month = DateTime.Now.Month.ToString();
string day = DateTime.Now.Day.ToString();
string nowDate = year + month + day;
- string materid = "";
- long sum = 0;
- if (msg4=="ZZ")
+ //string materid = "";
+ //long sum = 0;
+ //if (msg4 == "ZZ")
+ //{
+ string FID = "";
+ int LSH;
+ string LSH2;
+ string TM = "";
+ foreach (Models.ClsQK_PackingBill oItemSub in ls)
{
- oCN.BeginTran();
- foreach (Models.ClsQK_PackingBill oItemSub in ls)
+ //鏍规嵁鐢熸垚鏉℃暟鐢熸垚鐩稿簲鏁伴噺鏉＄爜
+ for (int i = 0; i < oItemSub.HTotalQty; i++)
{
- //鏍规嵁鐢熸垚鏉℃暟鐢熸垚鐩稿簲鏁伴噺鏉＄爜
- foreach (var item in oItemSub.HTotalQty.ToString())
- {
- //鐢熸垚鍞竴鏉＄爜 鏉＄爜鍓嶇紑 = 缁勭粐浠ｇ爜 + 鐗╂枡浠ｇ爜 + 骞� + 鏈� + 鏃�
- string sTMNumber = OrgNum + oItemSub.HMaterNumber + nowDate;
- Ds1 = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
- int LSH = ClsPub.isInt(Ds1.Tables[0].Rows[0][0]);//鍞竴鐮�
- //鑾峰彇鍐呯爜
- long HInterID = DBUtility.ClsPub.CreateBillID_Prod("85", ref DBUtility.ClsPub.sExeReturnInfo);
- oCN.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
- ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
- ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
- ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
- ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate " +
- ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID " +
- ",HGiveAwayFlag " +
- ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " +
- ") values ("
- + "'" + LSH + "','鍞竴鏉＄爜'," + oItemSub.HMaterID.ToString() + "," + oItemSub.HUnitID.ToString() + "," + oItemSub.HMinQty.ToString()
- + ",'',0,0,'" + msg3 + "',getdate(),0," + oItemSub.HMinQty.ToString()
- + ", " + oItemSub.HInterID.ToString() + "," + oItemSub.HInterID.ToString() + ",'" + oItemSub.HBillNo + "','3710',''"
- + ",1,1," + oItemSub.HDeptID.ToString() + ",0,0,''"
- + ", " + oItemSub.HCusID.ToString() + ",'',getdate(),'',getdate()"
- + ", " + msg5.ToString() + "," + OrgNum.ToString() + ",''," + HInterID.ToString()
- + ",0"
- + ",'" + oItemSub.HMaterName + "','','',0,'','')");
-
- string sql1 = string.Format(@"update Sc_ICMOBillSub set HQty=" + oItemSub.HSpsQty + " where HInterID=" + oItemSub.HInterID);
- oCN.RunProc(sql1);
- }
- }
- oCN.Commit();
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "鏁磋鐢熸垚鎴愬姛锛�";
- objJsonResult.data = 1;
- return objJsonResult;
- }
- else
- {
- var HInterID = DBUtility.ClsPub.CreateBillID("3783", ref DBUtility.ClsPub.sExeReturnInfo);
- var HBillNo = DBUtility.ClsPub.CreateBillCode("3783", ref DBUtility.ClsPub.sExeReturnInfo, true);
- oCN.BeginTran();
- foreach (Models.ClsQK_PackingBill oItemSub in ls)
- {
- sum += oItemSub.HMinQty;
- materid = oItemSub.HMaterNumber;
- //鑾峰彇鍐呯爜
- long HInterID2 = DBUtility.ClsPub.CreateBillID_Prod("85", ref DBUtility.ClsPub.sExeReturnInfo);
- //鐢熸垚鍞竴鏉＄爜 鏉＄爜鍓嶇紑 = 缁勭粐浠ｇ爜 + 鐗╂枡浠ｇ爜 + 骞� + 鏈� + 鏃�
+ long HInterID = DBUtility.ClsPub.CreateBillID_Prod("85", ref DBUtility.ClsPub.sExeReturnInfo);
string sTMNumber = OrgNum + oItemSub.HMaterNumber + nowDate;
Ds1 = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
- int LSH = ClsPub.isInt(Ds1.Tables[0].Rows[0][0]);//鍞竴鐮�
- //鎻掑叆鏉＄爜妗ｆ
+ LSH = ClsPub.isInt(Ds1.Tables[0].Rows[0][0]);//
+ LSH = LSH + 1;
+ LSH2 = LSH.ToString();
+ while (LSH2.Length < 6)
+ {
+ LSH2 = "0" + LSH2;
+ }
+ TM = sTMNumber + LSH2;
+ //鑾峰彇鍐呯爜
oCN.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
@@ -222,76 +231,119 @@
",HGiveAwayFlag " +
",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " +
") values ("
- + "'" + LSH + "','鍞竴鏉＄爜'," + oItemSub.HMaterID.ToString() + "," + oItemSub.HUnitID.ToString() + "," + oItemSub.HMinQty.ToString()
+ + "'" + TM + "','鍞竴鏉＄爜'," + oItemSub.HMaterID.ToString() + "," + oItemSub.HUnitID.ToString() + "," + oItemSub.HMinQty.ToString()
+ ",'',0,0,'" + msg3 + "',getdate(),0," + oItemSub.HMinQty.ToString()
+ ", " + oItemSub.HInterID.ToString() + "," + oItemSub.HInterID.ToString() + ",'" + oItemSub.HBillNo + "','3710',''"
+ ",1,1," + oItemSub.HDeptID.ToString() + ",0,0,''"
+ ", " + oItemSub.HCusID.ToString() + ",'',getdate(),'',getdate()"
- + ", " + msg5.ToString() + "," + OrgNum.ToString() + ",''," + HInterID2.ToString()
+ + ", " + msg5.ToString() + "," + OrgNum.ToString() + ",'" + oItemSub.HSeOrderBillNo.ToString() + "'," + HInterID.ToString()
+ ",0"
+ ",'" + oItemSub.HMaterName + "','','',0,'','')");
- //鎻掑叆缁勬墭鍗曞瓙琛�
- string sql = string.Format(@"insert into Sc_PackUnionBillSub(HInterID,HEntryID,HCloseMan,HCloseType,HRemark,
- HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,
- HRelationQty,HRelationMoney,HMaterID,HUnitID,HQty,HSourceID,HEquipID,HGroupID,HWorkerID,
- HScanDate,HBarCode,HBarCode_Pack)
- values("+HInterID+",'','',0,'鑷姩缁戝畾',"+oItemSub.HInterID+",'','"+oItemSub.HBillNo+"','3710',"+
- "0,0,"+ oItemSub.HMaterID+","+ oItemSub.HUnitID+","+ oItemSub.HPlanQty+", 0,0,0,0,"+
- "getdate(),'"+ LSH + "','" +HBillNo+"')");
- //鏇存敼鐢熶骇璁㈠崟鐨勬暟閲�
- string sql1 = string.Format(@"update Sc_ICMOBillSub set HQty=" + oItemSub.HSpsQty + " where HInterID=" + oItemSub.HInterID);
-
- oCN.RunProc(sql);
- oCN.RunProc(sql1);
+ oCN.RunProc("update Sc_ICMOBillSub set HQty=" + (oItemSub.HPlanQty- oItemSub.HMinQty).ToString() + " where HEntryID=" + oItemSub.HEntryID);
+ oCN.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+ FID = FID + HInterID + ",";
}
- //鐢熸垚缁勬墭鍗曚富琛�
- string sql2 = string.Format(@"Insert Sc_PackUnionBillMain(HYear,HPeriod,HBillType,HInterID,HDate,HBillNo,HBillStatus,HCheckItemNowID,HCheckItemNextID,
- HRemark,HBacker,HChecker,HMaker,HMakeDate,HUpDater,HCloseMan,HCloseType,HDeleteMan,HICMOInterID,HICMOBillNo,
- HBarCode_Pack,HMaterID,HUnitID,HWeight,HMWeight,HPWeight,
- HProdOrgID,HDeptID,HEmpID,HSNum,HPackNum,HBarCode_Cus,HBatchNo,HBillSubType)
- values('2022',1,'3783'," + HInterID + ",getdate(),'" + HBillNo + "',1,0,0," +
- "'鑷姩缁戝畾','','', '" + msg3 + "',getdate(),'','',0,'',0,0,'" +
- HBillNo + "',0,0,0,0,0," +
- "0,0,0,0,0,'','','')");
- oCN.RunProc(sql2);
- //鍐嶆鐢熸垚鍞竴鐮�
- //鑾峰彇鍐呯爜
- long HInterID3 = DBUtility.ClsPub.CreateBillID_Prod("85", ref DBUtility.ClsPub.sExeReturnInfo);
- //鐢熸垚鍞竴鏉＄爜 鏉＄爜鍓嶇紑 = 缁勭粐浠ｇ爜 + 鐗╂枡浠ｇ爜 + 骞� + 鏈� + 鏃�
- string sTMNumber1 = OrgNum + materid+nowDate;
- Ds1 = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber1 + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
- int LSH1 = ClsPub.isInt(Ds1.Tables[0].Rows[0][0]);//鍞竴鐮�
- string sql3 = string.Format(@"insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
- ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
- ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
- ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
- ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate " +
- ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID " +
- ",HGiveAwayFlag " +
- ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " +
- ") values ("
- + "'" + LSH1 + "','鍞竴鏉＄爜','" + materid.ToString() + "',0," + sum.ToString()
- + ",'',0,0,'" + msg3 + "',getdate(),0," + sum.ToString()
- + ", 0,0,'" + HBillNo + "','3710','',"
- + sum.ToString() + "," + HInterID.ToString() + ",0,0,0,''"
- + ",0,'',getdate(),'',getdate()"
- + ", " + msg5.ToString() + "," + OrgNum.ToString() + ",''," + HInterID3.ToString()
- + ",0"
- + ",'','','',0,'','')");
-
- oCN.RunProc(sql3);
- oCN.Commit();
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "鎷艰鐢熸垚鎴愬姛";
- objJsonResult.data = null;
- return objJsonResult;
}
-
+ objJsonResult.code = FID;
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏁磋鐢熸垚鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ //}
+ //else
+ //{
+ // var HInterID = DBUtility.ClsPub.CreateBillID("3783", ref DBUtility.ClsPub.sExeReturnInfo);
+ // var HBillNo = DBUtility.ClsPub.CreateBillCode("3783", ref DBUtility.ClsPub.sExeReturnInfo, true);
+ // oCN.BeginTran();
+ // foreach (Models.ClsQK_PackingBill oItemSub in ls)
+ // {
+ // sum += oItemSub.HMinQty;
+ // materid = oItemSub.HMaterNumber;
+ // //鑾峰彇鍐呯爜
+ // long HInterID2 = DBUtility.ClsPub.CreateBillID_Prod("85", ref DBUtility.ClsPub.sExeReturnInfo);
+ // //鐢熸垚鍞竴鏉＄爜 鏉＄爜鍓嶇紑 = 缁勭粐浠ｇ爜 + 鐗╂枡浠ｇ爜 + 骞� + 鏈� + 鏃�
+ // string sTMNumber = OrgNum + oItemSub.HMaterNumber + nowDate;
+ // Ds1 = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ // LSH = ClsPub.isInt(Ds1.Tables[0].Rows[0][0]);//鍞竴鐮�
+ // //鎻掑叆鏉＄爜妗ｆ
+ // oCN.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
+ // ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
+ // ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
+ // ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
+ // ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate " +
+ // ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID " +
+ // ",HGiveAwayFlag " +
+ // ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " +
+ // ") values ("
+ // + "'" + LSH + "','鍞竴鏉＄爜'," + oItemSub.HMaterID.ToString() + "," + oItemSub.HUnitID.ToString() + "," + oItemSub.HMinQty.ToString()
+ // + ",'',0,0,'" + msg3 + "',getdate(),0," + oItemSub.HMinQty.ToString()
+ // + ", " + oItemSub.HInterID.ToString() + "," + oItemSub.HInterID.ToString() + ",'" + oItemSub.HBillNo + "','3710',''"
+ // + ",1,1," + oItemSub.HDeptID.ToString() + ",0,0,''"
+ // + ", " + oItemSub.HCusID.ToString() + ",'',getdate(),'',getdate()"
+ // + ", " + msg5.ToString() + "," + OrgNum.ToString() + ",''," + HInterID2.ToString()
+ // + ",0"
+ // + ",'" + oItemSub.HMaterName + "','','',0,'','')");
+ // //鎻掑叆缁勬墭鍗曞瓙琛�
+ // string sql = string.Format(@"insert into Sc_PackUnionBillSub(HInterID,HEntryID,HCloseMan,HCloseType,HRemark,
+ // HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,
+ // HRelationQty,HRelationMoney,HMaterID,HUnitID,HQty,HSourceID,HEquipID,HGroupID,HWorkerID,
+ // HScanDate,HBarCode,HBarCode_Pack)
+ // values(" + HInterID + ",'','',0,'鑷姩缁戝畾'," + oItemSub.HInterID + ",'','" + oItemSub.HBillNo + "','3710'," +
+ // "0,0," + oItemSub.HMaterID + "," + oItemSub.HUnitID + "," + oItemSub.HPlanQty + ", 0,0,0,0," +
+ // "getdate(),'" + LSH + "','" + HBillNo + "')");
+ // //鏇存敼鐢熶骇璁㈠崟鐨勬暟閲�
+ // string sql1 = string.Format(@"update Sc_ICMOBillSub set HQty=" + oItemSub.HSpsQty + " where HInterID=" + oItemSub.HInterID);
+
+ // oCN.RunProc(sql);
+ // oCN.RunProc(sql1);
+ // }
+ // //鐢熸垚缁勬墭鍗曚富琛�
+ // string sql2 = string.Format(@"Insert Sc_PackUnionBillMain(HYear,HPeriod,HBillType,HInterID,HDate,HBillNo,HBillStatus,HCheckItemNowID,HCheckItemNextID,
+ // HRemark,HBacker,HChecker,HMaker,HMakeDate,HUpDater,HCloseMan,HCloseType,HDeleteMan,HICMOInterID,HICMOBillNo,
+ // HBarCode_Pack,HMaterID,HUnitID,HWeight,HMWeight,HPWeight,
+ // HProdOrgID,HDeptID,HEmpID,HSNum,HPackNum,HBarCode_Cus,HBatchNo,HBillSubType)
+ // values('2022',1,'3783'," + HInterID + ",getdate(),'" + HBillNo + "',1,0,0," +
+ // "'鑷姩缁戝畾','','', '" + msg3 + "',getdate(),'','',0,'',0,0,'" +
+ // HBillNo + "',0,0,0,0,0," +
+ // "0,0,0,0,0,'','','')");
+ // oCN.RunProc(sql2);
+ // //鍐嶆鐢熸垚鍞竴鐮�
+ // //鑾峰彇鍐呯爜
+ // long HInterID3 = DBUtility.ClsPub.CreateBillID_Prod("85", ref DBUtility.ClsPub.sExeReturnInfo);
+ // //鐢熸垚鍞竴鏉＄爜 鏉＄爜鍓嶇紑 = 缁勭粐浠ｇ爜 + 鐗╂枡浠ｇ爜 + 骞� + 鏈� + 鏃�
+ // string sTMNumber1 = OrgNum + materid + nowDate;
+ // Ds1 = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber1 + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ // int LSH1 = ClsPub.isInt(Ds1.Tables[0].Rows[0][0]);//鍞竴鐮�
+ // string sql3 = string.Format(@"insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
+ // ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
+ // ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
+ // ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
+ // ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate " +
+ // ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID " +
+ // ",HGiveAwayFlag " +
+ // ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " +
+ // ") values ("
+ // + "'" + LSH1 + "','鍞竴鏉＄爜','" + materid.ToString() + "',0," + sum.ToString()
+ // + ",'',0,0,'" + msg3 + "',getdate(),0," + sum.ToString()
+ // + ", 0,0,'" + HBillNo + "','3710','',"
+ // + sum.ToString() + "," + HInterID.ToString() + ",0,0,0,''"
+ // + ",0,'',getdate(),'',getdate()"
+ // + ", " + msg5.ToString() + "," + OrgNum.ToString() + ",''," + HInterID3.ToString()
+ // + ",0"
+ // + ",'','','',0,'','')");
+
+ // oCN.RunProc(sql3);
+ // oCN.Commit();
+ // objJsonResult.code = "1";
+ // objJsonResult.count = 1;
+ // objJsonResult.Message = "鎷艰鐢熸垚鎴愬姛";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
}
catch (Exception e)
{
- oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "鑾峰彇澶辫触锛�" + e.ToString();
@@ -322,10 +374,10 @@
left join Gy_Employee e on a.HEmpID=e.HItemID
left join Gy_Department d on a.HDeptID=d.HItemID
left join Sc_PackUnionBillMain p on a.HSourceInterID=p.HInterID
- where a.HBarCode=(select HBarCode from Sc_PackUnionBillSub where HInterID=
- (select HBarcodeNo from Gy_BarCodeBill where HBarCode='" + HInterID + "'))");
+ where a.HBarCode in(select HBarCode from Sc_PackUnionBillSub where HInterID=
+ (select HBarcodeNo from Gy_BarCodeBill where HItemID='" + HInterID + "'))");
ds = oCN.RunProcReturn(sql, "Sc_PackUnionBillSub");
-
+
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
@@ -353,7 +405,7 @@
{
try
{
-
+
ds = QK_GetPackingBillList_s(sWhere);
//if (ds.Tables[0].Rows.Count != 0 || ds != null)
@@ -412,18 +464,18 @@
/// <returns></returns>
[Route("Sc_ICMOBillController/DeleteQK_GetPackingBillList")]
[HttpGet]
- public object DeleteQK_GetPackingBillList(string HInterID,string Flag)
+ public object DeleteQK_GetPackingBillList(string HInterID, string Flag)
{
try
{
oCN.BeginTran();
- if (Flag=="0")
+ if (Flag == "0")
{
DataSet ds = new DataSet();
ds = oCN.RunProcReturn("select * from Gy_BarCodeBill where HItemID=" + HInterID, "Gy_BarCodeBill");
DataRow dr = ds.Tables[0].Rows[0];
string sql = string.Format(@"delete from Gy_BarCodeBill where HItemID=" + HInterID);
- string sql1 = string.Format(@"update Sc_ICMOBillSub set HQty=HPlanQty+" + dr["HQty"] +" where HInterID=(select HSourceInterID from Gy_BarCodeBill where HItemID="+ HInterID + ")");
+ string sql1 = string.Format(@"update Sc_ICMOBillSub set HQty=HPlanQty+" + dr["HQty"] + " where HInterID=(select HSourceInterID from Gy_BarCodeBill where HItemID=" + HInterID + ")");
oCN.RunProc(sql);
oCN.RunProc(sql1);
}
@@ -440,18 +492,18 @@
foreach (DataRow dr in dt.Rows)
{
DataSet ds = new DataSet();
- ds = oCN.RunProcReturn("select * from Gy_BarCodeBill where HBarCode='" + dr["HBarCode"].ToString()+"'", "Gy_BarCodeBill");
+ ds = oCN.RunProcReturn("select * from Gy_BarCodeBill where HBarCode='" + dr["HBarCode"].ToString() + "'", "Gy_BarCodeBill");
DataRow dr1 = ds.Tables[0].Rows[0];
- string sql = string.Format(@"delete from Gy_BarCodeBill where HBarCode='" + dr["HBarCode"].ToString()+"'");
+ string sql = string.Format(@"delete from Gy_BarCodeBill where HBarCode='" + dr["HBarCode"].ToString() + "'");
string sql1 = string.Format(@"update Sc_ICMOBillSub set HQty=HPlanQty+" + dr1["HQty"] + " where HInterID=(select HSourceInterID from Gy_BarCodeBill where HBarCode='" + dr["HBarCode"].ToString() + "')");
oCN.RunProc(sql);
oCN.RunProc(sql1);
}
}
-
+
//閬嶅巻瀹屽悗鍒犻櫎閫氳繃鏉＄爜id鎵惧埌鎵樻潯鐮侊紝閫氳繃鎵樻潯鐮佹壘鍒扮粍鎵樺崟瀛愯〃鐨勬暟鎹紝浠ュ強涓昏〃鏁版嵁
- string sql3 = string.Format(@"delect from Sc_PackUnionBillSub where HInterID=(select HBarcodeNo from Gy_BarCodeBill where HItemID="+ HInterID);
+ string sql3 = string.Format(@"delect from Sc_PackUnionBillSub where HInterID=(select HBarcodeNo from Gy_BarCodeBill where HItemID=" + HInterID);
string sql4 = string.Format(@"delect from Sc_PackUnionBillMain where HInterID=(select HBarcodeNo from Gy_BarCodeBill where HItemID=" + HInterID);
//鍒犻櫎鏈�澶х殑鍚堟垚鐨勫敮涓�鐮�
string sql5 = string.Format(@"delete from Gy_BarCodeBill where HItemID=" + HInterID);
@@ -478,5 +530,7 @@
}
}
#endregion
+
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Models/ClsQK_PackingBill.cs b/WebAPI/Models/ClsQK_PackingBill.cs
index 2884ea9..27c273e 100644
--- a/WebAPI/Models/ClsQK_PackingBill.cs
+++ b/WebAPI/Models/ClsQK_PackingBill.cs
@@ -24,6 +24,9 @@
public string HDeptName;
public string HPlanEndDate;
public Int64 HInterID;
+ public Int64 HEntryID;
public string HBillNo;
+ public string HSeOrderBillNo;
+ public string FBillNo;
}
}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 9f5f825..727a446 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2022-04-22T09:07:44.8823529Z;True|2022-04-19T19:13:40.8312746+08:00;True|2022-04-19T15:40:16.0022040+08:00;True|2022-04-19T15:13:32.9767736+08:00;False|2022-04-19T15:08:33.6507639+08:00;True|2022-04-19T15:02:51.9580210+08:00;True|2022-04-19T13:54:18.7579131+08:00;True|2022-04-12T10:36:02.1779173+08:00;True|2022-04-12T10:05:31.0222037+08:00;True|2022-04-12T09:47:49.3724819+08:00;True|2022-04-09T15:08:54.5697468+08:00;True|2022-04-08T17:31:31.0046258+08:00;True|2022-04-08T16:50:41.3018422+08:00;True|2022-04-08T10:35:36.5029980+08:00;True|2022-03-31T09:38:37.3646053+08:00;True|2022-03-29T13:57:45.4410942+08:00;True|2022-03-10T18:59:23.7994337+08:00;True|2022-03-10T18:52:39.5019082+08:00;True|2022-03-10T18:51:12.7949284+08:00;True|2022-03-10T18:50:47.2024177+08:00;True|2022-03-10T18:45:08.8409380+08:00;True|2022-03-10T18:41:17.0102564+08:00;True|2022-03-10T18:35:49.0742353+08:00;True|2022-03-10T17:57:47.4196965+08:00;True|2022-03-10T17:34:27.5723245+08:00;True|2022-03-10T16:13:59.3829164+08:00;True|2022-03-09T14:50:49.1222033+08:00;True|2022-03-09T11:21:03.0073651+08:00;False|2022-03-09T11:16:56.1792896+08:00;False|2022-03-09T11:16:49.7923320+08:00;True|2022-03-08T15:47:47.4722336+08:00;True|2022-03-08T15:47:28.5397115+08:00;True|2022-03-08T15:37:08.7379870+08:00;True|2022-03-02T17:37:54.4659976+08:00;True|2022-03-02T17:34:12.2949726+08:00;True|2022-03-02T17:26:38.7070673+08:00;True|2022-03-02T17:07:49.7024316+08:00;True|2022-03-02T17:05:22.4177336+08:00;True|2022-03-02T16:14:57.9880587+08:00;True|2022-03-01T17:52:52.6766959+08:00;True|2022-02-28T14:36:22.6449303+08:00;True|2022-02-24T15:43:36.8244163+08:00;True|2022-02-23T17:57:14.3693224+08:00;True|2022-02-23T17:46:42.1078183+08:00;False|2022-02-23T17:41:06.5886724+08:00;True|2022-02-23T16:59:45.5533581+08:00;True|2022-02-23T16:57:43.3328895+08:00;True|2022-02-21T09:09:37.2601134+08:00;True|2022-02-21T09:03:32.4071009+08:00;True|2022-02-21T08:59:59.0172082+08:00;True|2022-02-18T14:05:39.1358825+08:00;True|2022-02-18T10:23:02.4391239+08:00;True|2022-02-18T10:21:31.0559267+08:00;True|2022-02-17T16:50:11.7192509+08:00;True|2022-02-17T13:19:13.7697894+08:00;True|2022-02-11T10:36:12.7757100+08:00;True|2022-02-10T10:54:25.2685040+08:00;True|2022-02-10T10:37:02.1034768+08:00;True|2022-02-09T17:32:45.6511283+08:00;True|2022-02-09T17:24:32.5115193+08:00;True|2022-02-09T17:00:24.0662114+08:00;True|2022-02-09T16:56:42.3364622+08:00;True|2022-02-09T14:17:25.8688855+08:00;True|2022-02-09T14:11:51.6149822+08:00;True|2022-02-07T23:29:26.2842648+08:00;True|2022-02-07T23:28:58.8242274+08:00;False|2022-02-07T23:25:29.0647793+08:00;True|2022-02-07T13:06:37.5515985+08:00;True|2022-02-07T12:42:19.5220491+08:00;True|2022-02-07T09:52:59.6728595+08:00;True|2022-02-01T11:32:10.5831557+08:00;True|2022-01-29T14:09:02.9178986+08:00;True|2022-01-28T12:01:45.1416438+08:00;True|2022-01-28T11:03:41.6361866+08:00;True|2022-01-28T10:44:53.5367862+08:00;True|2022-01-28T10:40:41.6697563+08:00;True|2022-01-28T10:25:56.7093616+08:00;True|2022-01-28T09:58:13.0733060+08:00;True|2022-01-27T09:26:29.6568807+08:00;True|2022-01-27T00:47:57.9102528+08:00;True|2022-01-27T00:46:52.8845001+08:00;True|2022-01-27T00:36:34.5330938+08:00;True|2022-01-27T00:35:19.5439329+08:00;True|2022-01-27T00:33:38.5701950+08:00;True|2022-01-27T00:32:00.9028982+08:00;True|2022-01-27T00:30:13.2390921+08:00;True|2022-01-27T00:28:23.2989144+08:00;True|2022-01-27T00:16:01.3789455+08:00;True|2022-01-27T00:09:58.8112352+08:00;True|2022-01-27T00:00:40.8353538+08:00;True|2022-01-26T23:37:50.9494735+08:00;True|2022-01-26T23:29:39.8647473+08:00;True|2022-01-26T23:20:49.3274392+08:00;True|2022-01-26T23:15:53.7037293+08:00;True|2022-01-26T23:06:28.8595953+08:00;True|2022-01-26T23:02:12.9882299+08:00;True|2022-01-26T22:55:33.2535730+08:00;True|2022-01-26T22:51:01.8427947+08:00;True|2022-01-26T22:47:44.0715387+08:00;True|2022-01-26T22:20:21.7217039+08:00;True|2022-01-26T22:13:39.5372069+08:00;True|2022-01-26T22:01:31.2113177+08:00;True|2022-01-26T21:55:26.5478921+08:00;True|2022-01-26T21:50:18.2700369+08:00;True|2022-01-26T21:48:52.0020233+08:00;True|2022-01-26T19:19:29.4530523+08:00;True|2022-01-26T19:07:21.6474231+08:00;True|2022-01-26T18:25:42.2933291+08:00;True|2022-01-26T12:39:02.0149050+08:00;True|2022-01-26T12:13:43.9149452+08:00;True|2022-01-26T11:24:33.5742248+08:00;True|2022-01-26T08:51:10.8105076+08:00;True|2022-01-25T21:07:32.9069261+08:00;True|2022-01-24T01:35:12.3309466+08:00;True|2022-01-23T23:19:15.9702821+08:00;True|2022-01-23T21:50:41.6903353+08:00;True|2022-01-23T21:25:57.6084267+08:00;True|2022-01-23T21:16:10.1516535+08:00;True|2022-01-23T20:52:08.3745284+08:00;True|2022-01-23T18:19:32.2386502+08:00;True|2022-01-23T18:11:42.0830325+08:00;True|2022-01-23T18:00:01.3239547+08:00;True|2022-01-23T12:18:48.2466943+08:00;True|2022-01-22T00:48:50.4531647+08:00;True|2022-01-21T13:10:32.8173598+08:00;True|2022-01-21T13:04:01.6388059+08:00;True|2022-01-21T12:51:40.5304103+08:00;True|2022-01-21T12:44:06.3059885+08:00;True|2022-01-21T12:34:33.9314010+08:00;True|2022-01-21T11:39:20.1088577+08:00;True|2022-01-20T11:33:49.0516846+08:00;True|2022-01-20T10:02:12.0295471+08:00;True|2022-01-20T10:02:03.3535503+08:00;True|2022-01-19T23:56:18.7293193+08:00;True|2022-01-19T22:30:14.6986228+08:00;True|2022-01-19T22:15:08.8608795+08:00;True|2022-01-19T21:57:55.2295030+08:00;True|2022-01-19T13:50:37.8588759+08:00;True|2022-01-19T13:42:52.9761531+08:00;True|2022-01-19T00:26:36.9722917+08:00;True|2022-01-19T00:15:30.8583143+08:00;True|2022-01-18T21:19:30.6193048+08:00;True|2022-01-18T21:12:07.1453825+08:00;True|2022-01-18T20:35:27.3779956+08:00;True|2022-01-18T17:44:45.2318570+08:00;True|2022-01-18T14:45:29.0299640+08:00;True|2022-01-17T22:23:20.8214203+08:00;True|2022-01-17T21:49:15.7740045+08:00;True|2022-01-17T21:47:24.6997598+08:00;True|2022-01-17T21:44:00.1942787+08:00;True|2022-01-17T21:43:15.5992687+08:00;True|2022-01-17T21:33:16.8034756+08:00;True|2022-01-17T21:25:39.9909343+08:00;True|2022-01-17T21:13:03.9659338+08:00;True|2022-01-17T20:32:14.8869091+08:00;True|2022-01-17T19:01:46.5753686+08:00;True|2022-01-17T18:31:24.1032169+08:00;True|2022-01-17T18:21:39.2918684+08:00;True|2022-01-17T18:12:07.4859038+08:00;True|2022-01-17T18:09:26.6989718+08:00;True|2022-01-17T18:04:36.7564997+08:00;True|2022-01-17T17:57:44.7814863+08:00;True|2022-01-17T17:51:50.1516107+08:00;True|2022-01-17T17:39:29.2918799+08:00;True|2022-01-17T14:55:21.5859341+08:00;True|2022-01-17T14:38:06.5091500+08:00;True|2022-01-17T14:30:25.5378436+08:00;True|2022-01-16T19:15:24.5874858+08:00;True|2022-01-16T19:07:49.0613424+08:00;True|2022-01-16T16:10:47.3112741+08:00;False|2022-01-14T19:09:41.9296709+08:00;False|2022-01-14T18:56:11.0569808+08:00;False|2022-01-14T18:28:20.1376762+08:00;False|2022-01-14T18:27:30.8678130+08:00;False|2022-01-14T18:22:45.4436504+08:00;False|2022-01-14T18:19:37.0374753+08:00;False|2022-01-14T18:18:48.5868254+08:00;False|2022-01-14T18:14:02.5810257+08:00;False|2022-01-14T18:09:51.1730754+08:00;False|2022-01-14T18:09:17.8940754+08:00;True|2022-01-13T20:08:16.2937608+08:00;True|2022-01-13T20:07:30.1505466+08:00;True|2022-01-13T13:39:42.0146294+08:00;True|2022-01-13T13:38:07.5062471+08:00;True|2022-01-13T11:29:49.3751232+08:00;True|2022-01-13T11:05:43.9574142+08:00;True|2022-01-13T10:33:23.1921058+08:00;True|2022-01-12T20:38:16.9165651+08:00;True|2022-01-12T20:24:46.3779264+08:00;True|2022-01-12T20:03:06.5030626+08:00;True|2022-01-12T19:44:55.4294326+08:00;True|2022-01-12T12:58:45.9548600+08:00;True|2022-01-12T11:28:44.7797749+08:00;True|2022-01-11T18:07:30.9151356+08:00;True|2022-01-11T15:06:32.7301609+08:00;True|2022-01-11T09:27:00.1766442+08:00;True|2021-12-30T14:41:56.8541015+08:00;True|2021-12-30T13:45:00.6130694+08:00;True|2021-12-30T13:44:18.7370780+08:00;True|2021-12-30T13:36:52.8171136+08:00;True|2021-12-28T19:14:22.5979649+08:00;True|2021-12-28T13:13:39.3543252+08:00;True|2021-12-27T15:31:26.6037782+08:00;True|2021-12-27T15:28:54.4824480+08:00;True|2021-12-27T15:22:47.8436108+08:00;True|2021-12-27T15:04:37.0711590+08:00;True|2021-12-27T15:03:52.0932499+08:00;True|2021-12-27T15:03:33.0172733+08:00;True|2021-12-27T13:28:27.4252747+08:00;True|2021-12-25T19:38:33.6784042+08:00;True|2021-12-24T20:47:43.3471563+08:00;True|2021-12-24T20:14:57.6946814+08:00;True|2021-12-24T19:55:21.1843105+08:00;True|2021-12-24T19:49:54.6719726+08:00;True|2021-12-24T19:38:14.1180741+08:00;True|2021-12-22T13:51:37.1082523+08:00;True|2021-12-21T15:38:59.8015096+08:00;True|2021-12-21T15:29:54.8095063+08:00;False|2021-12-21T15:29:21.7006531+08:00;False|2021-12-21T15:16:18.2218025+08:00;False|2021-12-21T15:11:38.1215841+08:00;False|2021-12-21T15:08:27.0590078+08:00;True|2021-12-10T14:12:36.4065298+08:00;True|2021-12-10T13:54:03.4921778+08:00;True|2021-12-10T13:25:49.0439086+08:00;True|2021-12-10T13:19:58.9494477+08:00;True|2021-12-10T13:10:45.3929017+08:00;True|2021-12-10T11:06:53.2416794+08:00;True|2021-12-07T17:23:28.9380484+08:00;True|2021-12-07T17:13:52.4384814+08:00;True|2021-12-07T16:39:49.2020208+08:00;True|2021-12-07T15:18:20.9024533+08:00;True|2021-12-07T15:07:35.4428035+08:00;True|2021-12-07T15:01:02.0445043+08:00;True|2021-12-07T14:50:08.9019705+08:00;True|2021-12-07T14:34:50.4993666+08:00;False|2021-12-07T14:32:56.0408332+08:00;True|2021-12-06T17:11:41.4004606+08:00;True|2021-12-06T16:48:07.6029757+08:00;True|2021-12-06T13:46:35.9437718+08:00;True|2021-12-06T13:45:07.6622615+08:00;True|2021-12-06T11:25:04.3483155+08:00;True|2021-12-06T11:18:24.5804187+08:00;True|2021-11-22T16:27:05.4241947+08:00;True|2021-11-22T13:40:17.6768280+08:00;True|2021-11-19T16:15:19.9085104+08:00;True|2021-11-09T10:34:21.1623512+08:00;True|2021-11-07T16:57:59.7380254+08:00;True|2021-11-07T16:53:47.4198852+08:00;True|2021-11-07T16:42:05.5096826+08:00;True|2021-11-07T16:37:21.0729013+08:00;True|2021-11-05T20:51:17.6170717+08:00;True|2021-11-05T20:35:14.6250333+08:00;True|2021-11-05T19:30:19.8374158+08:00;True|2021-11-05T19:22:46.2276569+08:00;True|2021-11-05T19:20:30.8253213+08:00;True|2021-11-05T19:16:45.7553310+08:00;True|2021-11-05T19:16:00.4532689+08:00;True|2021-11-05T19:12:25.9022478+08:00;False|2021-11-05T19:11:26.5753529+08:00;True|2021-11-05T19:09:30.0085433+08:00;True|2021-11-05T18:48:19.9395153+08:00;True|2021-11-05T18:45:34.3437897+08:00;True|2021-11-05T18:43:43.4558159+08:00;True|2021-11-05T18:40:40.9948500+08:00;True|2021-11-05T18:34:18.4440455+08:00;True|2021-11-05T15:54:51.6037132+08:00;True|2021-10-28T16:27:53.9728270+08:00;True|2021-10-28T16:03:59.5629998+08:00;True|2021-10-28T08:51:04.2549186+08:00;True|2021-10-27T15:14:53.5506098+08:00;True|2021-10-27T15:00:44.9100320+08:00;True|2021-10-27T13:14:46.7921647+08:00;True|2021-10-27T11:24:49.4550753+08:00;True|2021-10-27T10:10:10.3545125+08:00;True|2021-10-27T10:02:24.9248610+08:00;True|2021-10-27T09:59:40.3795897+08:00;True|2021-10-27T09:56:30.6629207+08:00;True|2021-10-27T09:10:48.3883432+08:00;True|2021-10-27T09:03:31.9191991+08:00;True|2021-10-27T08:59:59.7651159+08:00;True|2021-10-27T08:36:11.8620997+08:00;True|2021-10-27T08:26:40.2533014+08:00;True|2021-10-26T09:19:35.5674748+08:00;True|2021-10-26T09:17:17.6900747+08:00;True|2021-10-26T09:14:32.3999220+08:00;True|2021-10-25T15:08:21.2581763+08:00;True|2021-10-25T10:01:57.8524903+08:00;True|2021-10-25T09:28:51.6294879+08:00;True|2021-10-25T09:25:50.3373336+08:00;True|2021-10-25T09:23:37.0203978+08:00;True|2021-10-25T09:18:23.3380608+08:00;True|2021-10-25T09:15:10.5292071+08:00;True|2021-10-25T08:56:30.4632027+08:00;True|2021-10-25T08:50:11.4697392+08:00;True|2021-10-22T13:46:49.7207066+08:00;True|2021-10-22T10:06:33.3130089+08:00;True|2021-10-20T14:32:10.1235516+08:00;True|2021-10-20T14:16:18.6496291+08:00;True|2021-10-20T14:08:49.2443715+08:00;True|2021-10-20T14:05:14.6847950+08:00;True|2021-10-20T13:30:21.6057636+08:00;True|2021-10-20T10:55:22.2151716+08:00;True|2021-10-19T10:42:13.4198267+08:00;True|2021-10-19T10:01:41.0018108+08:00;True|2021-10-19T09:59:11.2127619+08:00;True|2021-10-19T09:54:04.8472874+08:00;True|2021-10-15T11:19:15.5327495+08:00;True|2021-10-15T11:17:41.0686485+08:00;True|2021-10-15T11:12:11.8295042+08:00;True|2021-10-15T10:33:31.5670079+08:00;True|2021-10-15T10:27:45.0815146+08:00;True|2021-10-14T14:51:28.5331025+08:00;True|2021-10-14T14:37:28.3276051+08:00;True|2021-10-14T14:23:39.0606792+08:00;True|2021-10-14T14:21:03.8140347+08:00;True|2021-10-13T10:31:10.6628977+08:00;True|2021-10-13T10:12:24.4238027+08:00;True|2021-10-13T08:47:43.9314486+08:00;True|2021-10-12T14:07:18.6065183+08:00;True|2021-10-12T10:34:10.1682362+08:00;True|2021-10-12T10:27:14.3073332+08:00;True|2021-10-12T10:22:08.0004619+08:00;True|2021-10-12T10:21:03.0275378+08:00;True|2021-10-12T10:11:54.9812692+08:00;True|2021-10-11T16:59:07.3568342+08:00;True|2021-10-11T16:53:14.2016138+08:00;True|2021-10-11T16:21:35.0133775+08:00;True|2021-10-11T15:34:19.5731935+08:00;True|2021-10-11T15:31:07.5780983+08:00;True|2021-10-11T15:06:47.1145237+08:00;True|2021-10-11T15:03:25.5000280+08:00;True|2021-10-11T10:12:57.6416898+08:00;True|2021-10-09T10:15:17.9235165+08:00;True|2021-10-09T10:13:51.3318441+08:00;True|2021-10-09T10:01:21.6661542+08:00;True|2021-10-09T09:58:41.9225837+08:00;True|2021-10-08T14:56:49.7935800+08:00;True|2021-10-08T14:35:41.4490063+08:00;True|2021-10-08T14:02:42.6990656+08:00;True|2021-09-29T15:48:55.1547397+08:00;True|2021-09-29T15:48:23.5567191+08:00;True|2021-09-27T16:17:35.7180978+08:00;True|2021-09-27T15:51:50.4240134+08:00;True|2021-09-23T20:55:27.3554447+08:00;True|2021-09-23T14:14:44.0572017+08:00;True|2021-09-23T13:51:56.2344673+08:00;True|2021-09-23T10:46:16.7417007+08:00;True|2021-09-23T10:42:23.2117537+08:00;True|2021-09-22T15:21:22.9615672+08:00;True|2021-09-22T14:23:32.7907754+08:00;True|2021-09-22T13:48:03.4780947+08:00;True|2021-09-22T11:05:24.5249356+08:00;True|2021-09-22T10:00:19.0962943+08:00;True|2021-09-22T09:30:26.2686514+08:00;True|2021-09-17T11:22:34.5692792+08:00;True|2021-09-16T16:11:27.5372277+08:00;True|2021-09-16T14:53:40.8396557+08:00;True|2021-09-16T14:32:29.7905500+08:00;True|2021-09-16T14:26:46.2224219+08:00;True|2021-09-16T10:32:24.4244440+08:00;True|2021-09-15T11:10:35.3529360+08:00;True|2021-09-15T11:08:30.0857376+08:00;True|2021-09-15T11:05:56.7191571+08:00;True|2021-09-14T01:24:39.8041136+08:00;True|2021-09-14T01:05:01.1593327+08:00;True|2021-09-14T00:44:14.7233198+08:00;True|2021-09-13T23:48:19.4506233+08:00;True|2021-09-13T20:30:31.3243872+08:00;True|2021-09-13T19:45:35.9108911+08:00;False|2021-09-13T19:44:59.2779092+08:00;True|2021-09-13T18:09:22.4994381+08:00;True|2021-09-10T14:18:27.5788854+08:00;True|2021-09-09T15:57:01.7407207+08:00;True|2021-09-09T15:49:34.2598998+08:00;True|2021-09-09T11:32:10.7853024+08:00;True|2021-09-09T11:10:48.6840025+08:00;True|2021-09-09T10:35:37.3883078+08:00;True|2021-09-07T14:11:49.8497588+08:00;True|2021-09-07T13:34:48.4693349+08:00;True|2021-09-06T14:33:48.7549675+08:00;True|2021-09-03T16:27:51.1888520+08:00;True|2021-09-03T16:19:35.9003465+08:00;True|2021-09-03T15:46:28.1828032+08:00;True|2021-09-03T15:34:21.9362871+08:00;True|2021-09-03T11:24:49.8749819+08:00;True|2021-09-03T11:21:17.8373159+08:00;True|2021-09-03T11:16:53.2208136+08:00;True|2021-09-03T11:12:23.9063804+08:00;True|2021-09-03T09:11:09.2435721+08:00;True|2021-09-02T11:16:15.1370453+08:00;True|2021-09-02T10:35:39.1171879+08:00;True|2021-09-01T10:17:09.4536285+08:00;True|2021-09-01T09:46:28.4581776+08:00;True|2021-08-31T08:54:26.8588887+08:00;True|2021-08-31T08:39:08.3685693+08:00;True|2021-08-30T17:11:56.8438985+08:00;True|2021-08-30T15:59:42.0820292+08:00;True|2021-08-30T15:45:18.1868510+08:00;True|2021-08-30T14:56:08.3958863+08:00;True|2021-08-30T14:37:11.5379830+08:00;True|2021-08-30T14:35:34.8775934+08:00;True|2021-08-30T14:24:36.5111821+08:00;True|2021-08-30T10:05:49.6945200+08:00;True|2021-08-30T10:03:28.4064538+08:00;True|2021-08-30T10:00:16.8360929+08:00;True|2021-08-30T09:56:09.4434379+08:00;True|2021-08-30T09:55:36.1725334+08:00;True|2021-08-30T09:52:04.8600054+08:00;True|2021-08-30T09:47:46.4225655+08:00;True|2021-08-30T09:45:20.4894962+08:00;False|2021-08-27T17:17:34.2646751+08:00;False|2021-08-27T16:01:21.2791979+08:00;False|2021-08-27T15:58:06.9667160+08:00;False|2021-08-27T15:38:37.4818036+08:00;False|2021-08-27T15:21:02.8863114+08:00;False|2021-08-27T15:20:28.6828668+08:00;True|2021-08-26T16:00:44.3162145+08:00;True|2021-08-26T08:57:31.3842587+08:00;True|2021-08-23T08:43:41.1549775+08:00;True|2021-08-22T09:24:12.7210871+08:00;True|2021-08-22T09:19:53.8300229+08:00;True|2021-08-20T20:00:52.0140407+08:00;True|2021-08-20T19:40:14.7712765+08:00;True|2021-08-19T17:37:54.9748049+08:00;True|2021-08-19T17:20:11.0515687+08:00;True|2021-08-19T16:12:35.4392809+08:00;True|2021-08-19T16:06:50.6204587+08:00;True|2021-08-19T16:03:53.0824286+08:00;True|2021-08-19T15:56:01.3498791+08:00;True|2021-08-19T10:18:50.8113630+08:00;True|2021-08-19T09:58:06.2784035+08:00;True|2021-08-19T09:56:54.0619777+08:00;True|2021-08-19T00:32:08.3503093+08:00;True|2021-08-19T00:11:18.3150227+08:00;True|2021-08-19T00:02:49.4827718+08:00;True|2021-08-18T23:54:45.4845900+08:00;True|2021-08-18T23:39:51.6147977+08:00;True|2021-08-18T23:16:42.7214379+08:00;True|2021-08-18T22:38:57.4681929+08:00;True|2021-08-18T21:41:58.7560707+08:00;True|2021-08-18T21:11:52.2369249+08:00;True|2021-08-18T21:01:49.5669106+08:00;True|2021-08-18T20:47:46.5352688+08:00;False|2021-08-18T20:46:36.7956141+08:00;False|2021-08-18T20:46:01.0502138+08:00;True|2021-08-18T19:39:12.8186242+08:00;False|2021-08-18T19:38:12.6839708+08:00;True|2021-08-18T19:15:51.4626694+08:00;True|2021-08-18T16:07:20.4350886+08:00;True|2021-08-18T14:29:41.7171934+08:00;True|2021-08-18T14:20:36.3647361+08:00;True|2021-08-16T09:08:58.3617662+08:00;True|2021-08-15T20:44:29.9214083+08:00;True|2021-08-15T20:36:17.0958549+08:00;True|2021-08-15T20:29:34.3879773+08:00;True|2021-08-15T20:23:47.4052038+08:00;True|2021-08-15T15:01:19.7830862+08:00;True|2021-08-15T12:15:18.3433782+08:00;True|2021-08-13T20:59:11.3947130+08:00;True|2021-08-06T22:49:09.9538339+08:00;True|2021-08-06T22:35:19.0418168+08:00;True|2021-08-06T20:29:47.4241975+08:00;True|2021-08-06T14:08:16.4791827+08:00;True|2021-08-06T13:59:28.9874611+08:00;True|2021-08-06T13:57:34.3723977+08:00;True|2021-08-06T13:36:03.4816652+08:00;True|2021-08-06T12:22:52.5055221+08:00;True|2021-08-06T09:31:58.1272499+08:00;True|2021-08-06T09:26:51.6310039+08:00;True|2021-08-06T09:24:22.2899244+08:00;True|2021-08-06T09:06:30.6477912+08:00;True|2021-08-06T09:00:55.5101612+08:00;True|2021-08-06T08:49:59.9616490+08:00;True|2021-08-06T08:45:18.8586902+08:00;True|2021-08-05T20:09:25.8861998+08:00;True|2021-08-04T19:14:27.2396953+08:00;True|2021-08-04T19:11:47.5849093+08:00;True|2021-08-04T16:42:54.0149043+08:00;True|2021-08-04T15:02:11.5056561+08:00;True|2021-08-04T14:58:37.1435509+08:00;True|2021-08-04T14:55:34.7380132+08:00;True|2021-08-04T14:47:42.5933921+08:00;True|2021-08-04T14:45:17.9911874+08:00;True|2021-08-04T13:52:20.9601351+08:00;True|2021-08-04T09:48:28.8796992+08:00;True|2021-08-03T18:14:13.1894998+08:00;True|2021-08-03T17:45:35.1349721+08:00;True|2021-08-03T17:21:52.6028977+08:00;True|2021-08-03T17:20:35.4423020+08:00;True|2021-08-03T17:03:33.1667669+08:00;True|2021-08-03T17:01:54.2656787+08:00;True|2021-08-03T17:00:22.2778374+08:00;True|2021-08-03T16:56:58.8902582+08:00;True|2021-08-03T15:02:21.8601533+08:00;True|2021-08-03T14:57:34.0186758+08:00;True|2021-08-03T14:28:47.2242515+08:00;True|2021-08-03T14:22:22.4554236+08:00;True|2021-08-03T14:21:51.1339715+08:00;True|2021-08-03T13:37:33.9697131+08:00;True|2021-08-03T13:28:29.7591095+08:00;True|2021-08-03T11:35:09.5118324+08:00;True|2021-08-03T11:11:23.3051573+08:00;True|2021-08-02T13:14:42.3663755+08:00;True|2021-07-30T22:50:19.9749878+08:00;True|2021-07-30T22:49:31.2150970+08:00;True|2021-07-28T19:12:05.8381075+08:00;True|2021-07-28T18:59:45.4808797+08:00;True|2021-07-28T18:15:58.8301509+08:00;True|2021-07-28T18:04:54.8613546+08:00;True|2021-07-28T17:53:48.6225611+08:00;True|2021-07-28T17:42:50.9171563+08:00;True|2021-07-28T17:17:16.3137677+08:00;True|2021-07-28T17:11:46.8925200+08:00;True|2021-07-28T16:28:27.6823943+08:00;True|2021-07-28T16:23:00.3385836+08:00;True|2021-07-28T09:57:55.4237411+08:00;True|2021-07-28T08:38:29.6691541+08:00;True|2021-07-27T23:16:32.0331671+08:00;True|2021-07-27T23:06:08.1947249+08:00;True|2021-07-27T23:05:58.4619176+08:00;True|2021-07-27T18:42:09.5358261+08:00;True|2021-07-27T18:30:04.8532823+08:00;True|2021-07-27T18:29:43.5775092+08:00;True|2021-07-27T15:16:49.8356224+08:00;True|2021-07-27T15:05:27.8453220+08:00;True|2021-07-27T14:59:15.9519440+08:00;True|2021-07-27T09:23:32.6111337+08:00;True|2021-07-27T08:27:41.6395353+08:00;True|2021-07-27T08:25:56.7378296+08:00;True|2021-07-26T11:18:46.0856966+08:00;True|2021-07-26T11:18:02.0751924+08:00;True|2021-07-26T11:13:49.6285395+08:00;True|2021-07-21T21:08:25.9898902+08:00;True|2021-07-21T20:09:26.2258104+08:00;True|2021-07-13T16:17:25.8407435+08:00;True|2021-07-13T13:46:13.4309531+08:00;True|2021-07-13T12:29:04.5082461+08:00;True|2021-06-29T13:55:01.6864637+08:00;True|2021-06-29T10:38:52.2206472+08:00;True|2021-06-29T10:10:13.1540749+08:00;True|2021-06-28T14:37:56.3853273+08:00;False|2021-06-28T14:36:57.5726124+08:00;True|2021-06-25T14:17:57.5196108+08:00;True|2021-06-25T13:56:38.9522535+08:00;True|2021-06-24T19:38:32.8766933+08:00;True|2021-06-24T18:26:35.6118833+08:00;True|2021-06-24T18:02:52.8136877+08:00;True|2021-06-24T17:48:49.5851948+08:00;True|2021-06-24T17:45:46.7527572+08:00;True|2021-06-24T15:05:20.1592723+08:00;True|2021-06-23T16:18:15.6814625+08:00;True|2021-06-23T16:05:24.6112343+08:00;True|2021-06-23T15:14:08.2489658+08:00;True|2021-06-23T13:52:58.6029788+08:00;True|2021-06-22T16:11:20.4726923+08:00;True|2021-06-22T16:04:53.7231389+08:00;True|2021-06-22T15:50:59.2583262+08:00;True|2021-06-22T15:38:15.3016140+08:00;True|2021-06-22T15:34:42.9185543+08:00;True|2021-06-22T15:21:55.1419108+08:00;True|2021-06-22T15:07:21.5357494+08:00;True|2021-06-22T15:03:35.0535733+08:00;True|2021-06-22T14:54:47.8802969+08:00;True|2021-06-22T11:19:38.7303011+08:00;True|2021-06-22T08:53:49.2882695+08:00;True|2021-06-22T08:47:54.8286530+08:00;True|2021-06-21T16:27:19.3017700+08:00;True|2021-06-21T15:32:28.7237952+08:00;True|2021-06-21T12:34:02.6329555+08:00;True|2021-06-21T12:24:17.5427495+08:00;True|2021-06-21T10:47:30.6423502+08:00;True|2021-06-21T08:43:20.3026558+08:00;True|2021-06-19T15:10:06.8335499+08:00;True|2021-06-18T15:37:29.5009930+08:00;True|2021-06-18T13:46:35.6283432+08:00;True|2021-06-18T10:00:37.1474954+08:00;True|2021-06-18T09:55:21.8551780+08:00;True|2021-06-18T09:22:27.8432927+08:00;True|2021-06-17T11:17:43.2166430+08:00;True|2021-06-17T09:24:09.8350403+08:00;True|2021-06-16T16:10:47.8564888+08:00;True|2021-06-16T16:04:09.8286582+08:00;True|2021-06-16T15:12:29.9427169+08:00;True|2021-06-16T14:58:45.6801892+08:00;True|2021-06-16T14:46:01.6873221+08:00;True|2021-06-16T11:02:06.1272477+08:00;True|2021-06-16T09:33:56.0223915+08:00;True|2021-06-16T08:50:07.6995413+08:00;True|2021-06-16T08:28:38.7692635+08:00;True|2021-06-16T01:04:19.6282474+08:00;True|2021-06-16T01:03:50.5058323+08:00;False|2021-06-16T01:02:15.3819672+08:00;False|2021-06-16T01:01:38.6171098+08:00;True|2021-06-16T00:34:54.9902044+08:00;True|2021-06-15T23:55:36.2003828+08:00;True|2021-06-15T22:47:17.2192750+08:00;True|2021-06-15T22:42:41.1512585+08:00;True|2021-06-15T22:38:01.7390462+08:00;True|2021-06-15T22:14:11.2060782+08:00;True|2021-06-15T22:12:27.0615357+08:00;True|2021-06-15T22:07:59.9280871+08:00;True|2021-06-15T22:04:21.5051427+08:00;True|2021-06-15T21:25:55.0099814+08:00;True|2021-06-15T19:13:51.3494172+08:00;True|2021-06-15T19:02:17.6844742+08:00;True|2021-06-15T18:47:37.1629411+08:00;False|2021-06-15T18:47:11.0828111+08:00;True|2021-06-15T18:38:26.6620668+08:00;True|2021-06-15T18:33:45.2069831+08:00;True|2021-06-15T18:24:52.0550838+08:00;True|2021-06-15T18:19:43.6999796+08:00;True|2021-06-15T18:08:17.2464506+08:00;True|2021-06-15T18:03:51.3952624+08:00;True|2021-06-15T18:01:20.6141766+08:00;True|2021-06-15T17:59:04.4479416+08:00;True|2021-06-15T17:41:44.6389379+08:00;True|2021-06-15T17:39:03.1565124+08:00;True|2021-06-15T17:34:41.0634638+08:00;True|2021-06-15T17:33:50.4853178+08:00;True|2021-06-15T17:25:38.5914037+08:00;True|2021-06-15T17:22:21.3611360+08:00;True|2021-06-15T17:16:49.4970813+08:00;True|2021-06-15T17:05:28.9389484+08:00;True|2021-06-15T16:52:54.6372199+08:00;True|2021-06-15T16:51:23.9081030+08:00;True|2021-06-15T16:45:40.6017997+08:00;True|2021-06-15T16:41:05.0218887+08:00;True|2021-06-15T16:38:02.8541862+08:00;True|2021-06-15T16:22:10.3118721+08:00;True|2021-06-15T16:12:11.1552506+08:00;True|2021-06-15T15:33:42.0100494+08:00;True|2021-06-15T15:28:39.7145659+08:00;True|2021-06-15T15:15:02.7939125+08:00;True|2021-06-15T14:49:14.2300396+08:00;True|2021-06-15T14:42:28.1198064+08:00;True|2021-06-15T13:30:12.7997686+08:00;True|2021-06-15T13:25:37.7284670+08:00;True|2021-06-15T13:23:43.6207813+08:00;False|2021-06-15T13:23:19.4190232+08:00;True|2021-06-15T13:16:38.5062674+08:00;True|2021-06-15T13:03:31.2055635+08:00;True|2021-06-15T12:58:43.1653215+08:00;True|2021-06-15T12:39:22.8442109+08:00;True|2021-06-15T12:35:09.1288556+08:00;False|2021-06-15T12:33:50.0723143+08:00;True|2021-06-15T11:28:01.9733727+08:00;True|2021-06-15T11:26:26.6569392+08:00;True|2021-06-15T11:22:43.0366435+08:00;True|2021-06-15T11:07:50.1610580+08:00;True|2021-06-15T10:32:59.1925931+08:00;True|2021-06-10T17:16:57.9552310+08:00;True|2021-06-10T16:44:42.2731836+08:00;True|2021-06-10T14:39:27.6745737+08:00;True|2021-06-10T12:15:05.1524413+08:00;True|2021-06-09T18:19:24.1005606+08:00;True|2021-06-09T17:56:09.5646288+08:00;True|2021-06-09T13:34:06.1882292+08:00;True|2021-06-09T13:29:54.5924933+08:00;True|2021-06-09T13:25:55.7520662+08:00;True|2021-06-09T13:07:47.6686811+08:00;True|2021-06-09T12:59:41.2595048+08:00;True|2021-06-09T12:45:27.1305548+08:00;True|2021-06-09T12:29:52.1418191+08:00;True|2021-06-09T12:24:12.7610588+08:00;True|2021-06-09T11:31:25.3409568+08:00;True|2021-06-09T09:57:44.4387175+08:00;True|2021-06-09T09:54:26.5161307+08:00;True|2021-06-09T09:14:14.7288045+08:00;True|2021-06-09T09:10:25.1812139+08:00;True|2021-06-09T08:46:21.6585123+08:00;True|2021-06-08T19:56:55.7192062+08:00;True|2021-06-08T19:52:59.0326821+08:00;True|2021-06-08T19:49:13.6274217+08:00;True|2021-06-08T19:09:22.1038939+08:00;True|2021-06-08T15:28:41.3716247+08:00;True|2021-06-08T15:26:47.2621178+08:00;True|2021-06-08T13:49:45.8936617+08:00;True|2021-06-08T13:43:18.8115502+08:00;True|2021-06-08T10:04:06.2200731+08:00;True|2021-06-08T09:17:10.0470792+08:00;True|2021-06-08T08:44:37.4395849+08:00;True|2021-06-08T00:01:09.3745613+08:00;True|2021-06-07T23:49:31.5196888+08:00;True|2021-06-07T23:41:00.8017855+08:00;True|2021-06-07T23:21:53.1371134+08:00;True|2021-06-07T23:01:27.5712153+08:00;True|2021-06-07T22:36:12.9274014+08:00;True|2021-06-07T22:23:00.6545134+08:00;True|2021-06-07T17:44:47.5686346+08:00;True|2021-06-07T17:17:01.3431233+08:00;True|2021-06-07T16:53:28.9989587+08:00;True|2021-06-07T16:41:10.4975607+08:00;True|2021-06-07T14:21:06.8176477+08:00;True|2021-06-07T14:10:39.0355659+08:00;True|2021-06-07T12:34:31.4562732+08:00;True|2021-06-07T12:28:44.9629488+08:00;True|2021-06-07T10:30:26.9387988+08:00;True|2021-06-07T09:12:14.7658099+08:00;True|2021-06-07T08:37:19.6353792+08:00;True|2021-06-07T08:35:25.2031954+08:00;True|2021-06-05T07:07:32.0541266+08:00;True|2021-06-05T06:44:35.9475270+08:00;True|2021-06-05T06:37:27.4595197+08:00;True|2021-06-05T06:26:59.7663998+08:00;True|2021-06-05T05:43:12.8699318+08:00;True|2021-06-04T17:00:41.2426007+08:00;True|2021-06-04T16:08:03.8078072+08:00;True|2021-06-04T15:47:21.6412616+08:00;True|2021-06-04T15:21:02.4239800+08:00;True|2021-06-04T15:20:37.8641854+08:00;True|2021-06-04T13:38:51.5088395+08:00;True|2021-06-04T10:20:01.7784282+08:00;True|2021-06-04T10:13:50.3548857+08:00;True|2021-06-04T10:11:25.5017821+08:00;True|2021-06-04T10:09:51.6792228+08:00;True|2021-06-04T10:02:39.5851057+08:00;True|2021-06-04T09:30:40.4495494+08:00;True|2021-06-03T13:16:36.0317546+08:00;True|2021-06-03T13:12:47.0402047+08:00;True|2021-06-02T14:37:08.9683351+08:00;True|2021-06-02T14:10:15.7439829+08:00;True|2021-06-02T13:59:46.5841931+08:00;True|2021-06-02T13:25:18.7962660+08:00;True|2021-06-02T13:23:16.2261980+08:00;True|2021-06-01T15:37:32.2495085+08:00;True|2021-06-01T15:21:01.2856122+08:00;True|2021-06-01T15:13:36.7262365+08:00;True|2021-06-01T15:10:26.8905629+08:00;True|2021-06-01T14:56:17.5231551+08:00;True|2021-06-01T14:38:39.7895927+08:00;True|2021-06-01T14:23:12.3265287+08:00;True|2021-03-01T09:11:31.3226422+08:00;True|2021-05-26T14:54:56.9426462+08:00;True|2021-05-26T13:57:33.7780451+08:00;True|2021-05-26T13:39:02.8043358+08:00;True|2021-02-25T16:01:40.2917200+08:00;True|2021-02-25T15:49:46.6681205+08:00;True|2021-02-25T15:16:30.9372640+08:00;True|2021-05-25T13:10:21.7831921+08:00;True|2021-05-25T11:21:38.5224475+08:00;True|2021-05-25T11:12:52.0637175+08:00;True|2021-05-25T11:02:18.4164663+08:00;True|2021-05-25T10:52:06.8998521+08:00;True|2021-05-25T10:50:45.0929606+08:00;True|2021-05-25T10:45:54.1498313+08:00;True|2021-05-25T10:39:27.8602249+08:00;True|2021-05-25T10:34:49.5771162+08:00;True|2021-05-25T10:17:30.3009163+08:00;True|2021-05-25T10:14:03.8512581+08:00;True|2021-05-25T10:05:33.4343836+08:00;True|2021-05-24T17:01:23.3221168+08:00;True|2021-05-24T10:11:24.0197347+08:00;False|2021-05-24T10:11:07.6338995+08:00;</History>
+ <History>True|2022-05-06T07:13:12.2438900Z;True|2022-05-06T14:49:39.8536594+08:00;True|2022-04-22T17:07:44.8823529+08:00;True|2022-04-19T19:13:40.8312746+08:00;True|2022-04-19T15:40:16.0022040+08:00;True|2022-04-19T15:13:32.9767736+08:00;False|2022-04-19T15:08:33.6507639+08:00;True|2022-04-19T15:02:51.9580210+08:00;True|2022-04-19T13:54:18.7579131+08:00;True|2022-04-12T10:36:02.1779173+08:00;True|2022-04-12T10:05:31.0222037+08:00;True|2022-04-12T09:47:49.3724819+08:00;True|2022-04-09T15:08:54.5697468+08:00;True|2022-04-08T17:31:31.0046258+08:00;True|2022-04-08T16:50:41.3018422+08:00;True|2022-04-08T10:35:36.5029980+08:00;True|2022-03-31T09:38:37.3646053+08:00;True|2022-03-29T13:57:45.4410942+08:00;True|2022-03-10T18:59:23.7994337+08:00;True|2022-03-10T18:52:39.5019082+08:00;True|2022-03-10T18:51:12.7949284+08:00;True|2022-03-10T18:50:47.2024177+08:00;True|2022-03-10T18:45:08.8409380+08:00;True|2022-03-10T18:41:17.0102564+08:00;True|2022-03-10T18:35:49.0742353+08:00;True|2022-03-10T17:57:47.4196965+08:00;True|2022-03-10T17:34:27.5723245+08:00;True|2022-03-10T16:13:59.3829164+08:00;True|2022-03-09T14:50:49.1222033+08:00;True|2022-03-09T11:21:03.0073651+08:00;False|2022-03-09T11:16:56.1792896+08:00;False|2022-03-09T11:16:49.7923320+08:00;True|2022-03-08T15:47:47.4722336+08:00;True|2022-03-08T15:47:28.5397115+08:00;True|2022-03-08T15:37:08.7379870+08:00;True|2022-03-02T17:37:54.4659976+08:00;True|2022-03-02T17:34:12.2949726+08:00;True|2022-03-02T17:26:38.7070673+08:00;True|2022-03-02T17:07:49.7024316+08:00;True|2022-03-02T17:05:22.4177336+08:00;True|2022-03-02T16:14:57.9880587+08:00;True|2022-03-01T17:52:52.6766959+08:00;True|2022-02-28T14:36:22.6449303+08:00;True|2022-02-24T15:43:36.8244163+08:00;True|2022-02-23T17:57:14.3693224+08:00;True|2022-02-23T17:46:42.1078183+08:00;False|2022-02-23T17:41:06.5886724+08:00;True|2022-02-23T16:59:45.5533581+08:00;True|2022-02-23T16:57:43.3328895+08:00;True|2022-02-21T09:09:37.2601134+08:00;True|2022-02-21T09:03:32.4071009+08:00;True|2022-02-21T08:59:59.0172082+08:00;True|2022-02-18T14:05:39.1358825+08:00;True|2022-02-18T10:23:02.4391239+08:00;True|2022-02-18T10:21:31.0559267+08:00;True|2022-02-17T16:50:11.7192509+08:00;True|2022-02-17T13:19:13.7697894+08:00;True|2022-02-11T10:36:12.7757100+08:00;True|2022-02-10T10:54:25.2685040+08:00;True|2022-02-10T10:37:02.1034768+08:00;True|2022-02-09T17:32:45.6511283+08:00;True|2022-02-09T17:24:32.5115193+08:00;True|2022-02-09T17:00:24.0662114+08:00;True|2022-02-09T16:56:42.3364622+08:00;True|2022-02-09T14:17:25.8688855+08:00;True|2022-02-09T14:11:51.6149822+08:00;True|2022-02-07T23:29:26.2842648+08:00;True|2022-02-07T23:28:58.8242274+08:00;False|2022-02-07T23:25:29.0647793+08:00;True|2022-02-07T13:06:37.5515985+08:00;True|2022-02-07T12:42:19.5220491+08:00;True|2022-02-07T09:52:59.6728595+08:00;True|2022-02-01T11:32:10.5831557+08:00;True|2022-01-29T14:09:02.9178986+08:00;True|2022-01-28T12:01:45.1416438+08:00;True|2022-01-28T11:03:41.6361866+08:00;True|2022-01-28T10:44:53.5367862+08:00;True|2022-01-28T10:40:41.6697563+08:00;True|2022-01-28T10:25:56.7093616+08:00;True|2022-01-28T09:58:13.0733060+08:00;True|2022-01-27T09:26:29.6568807+08:00;True|2022-01-27T00:47:57.9102528+08:00;True|2022-01-27T00:46:52.8845001+08:00;True|2022-01-27T00:36:34.5330938+08:00;True|2022-01-27T00:35:19.5439329+08:00;True|2022-01-27T00:33:38.5701950+08:00;True|2022-01-27T00:32:00.9028982+08:00;True|2022-01-27T00:30:13.2390921+08:00;True|2022-01-27T00:28:23.2989144+08:00;True|2022-01-27T00:16:01.3789455+08:00;True|2022-01-27T00:09:58.8112352+08:00;True|2022-01-27T00:00:40.8353538+08:00;True|2022-01-26T23:37:50.9494735+08:00;True|2022-01-26T23:29:39.8647473+08:00;True|2022-01-26T23:20:49.3274392+08:00;True|2022-01-26T23:15:53.7037293+08:00;True|2022-01-26T23:06:28.8595953+08:00;True|2022-01-26T23:02:12.9882299+08:00;True|2022-01-26T22:55:33.2535730+08:00;True|2022-01-26T22:51:01.8427947+08:00;True|2022-01-26T22:47:44.0715387+08:00;True|2022-01-26T22:20:21.7217039+08:00;True|2022-01-26T22:13:39.5372069+08:00;True|2022-01-26T22:01:31.2113177+08:00;True|2022-01-26T21:55:26.5478921+08:00;True|2022-01-26T21:50:18.2700369+08:00;True|2022-01-26T21:48:52.0020233+08:00;True|2022-01-26T19:19:29.4530523+08:00;True|2022-01-26T19:07:21.6474231+08:00;True|2022-01-26T18:25:42.2933291+08:00;True|2022-01-26T12:39:02.0149050+08:00;True|2022-01-26T12:13:43.9149452+08:00;True|2022-01-26T11:24:33.5742248+08:00;True|2022-01-26T08:51:10.8105076+08:00;True|2022-01-25T21:07:32.9069261+08:00;True|2022-01-24T01:35:12.3309466+08:00;True|2022-01-23T23:19:15.9702821+08:00;True|2022-01-23T21:50:41.6903353+08:00;True|2022-01-23T21:25:57.6084267+08:00;True|2022-01-23T21:16:10.1516535+08:00;True|2022-01-23T20:52:08.3745284+08:00;True|2022-01-23T18:19:32.2386502+08:00;True|2022-01-23T18:11:42.0830325+08:00;True|2022-01-23T18:00:01.3239547+08:00;True|2022-01-23T12:18:48.2466943+08:00;True|2022-01-22T00:48:50.4531647+08:00;True|2022-01-21T13:10:32.8173598+08:00;True|2022-01-21T13:04:01.6388059+08:00;True|2022-01-21T12:51:40.5304103+08:00;True|2022-01-21T12:44:06.3059885+08:00;True|2022-01-21T12:34:33.9314010+08:00;True|2022-01-21T11:39:20.1088577+08:00;True|2022-01-20T11:33:49.0516846+08:00;True|2022-01-20T10:02:12.0295471+08:00;True|2022-01-20T10:02:03.3535503+08:00;True|2022-01-19T23:56:18.7293193+08:00;True|2022-01-19T22:30:14.6986228+08:00;True|2022-01-19T22:15:08.8608795+08:00;True|2022-01-19T21:57:55.2295030+08:00;True|2022-01-19T13:50:37.8588759+08:00;True|2022-01-19T13:42:52.9761531+08:00;True|2022-01-19T00:26:36.9722917+08:00;True|2022-01-19T00:15:30.8583143+08:00;True|2022-01-18T21:19:30.6193048+08:00;True|2022-01-18T21:12:07.1453825+08:00;True|2022-01-18T20:35:27.3779956+08:00;True|2022-01-18T17:44:45.2318570+08:00;True|2022-01-18T14:45:29.0299640+08:00;True|2022-01-17T22:23:20.8214203+08:00;True|2022-01-17T21:49:15.7740045+08:00;True|2022-01-17T21:47:24.6997598+08:00;True|2022-01-17T21:44:00.1942787+08:00;True|2022-01-17T21:43:15.5992687+08:00;True|2022-01-17T21:33:16.8034756+08:00;True|2022-01-17T21:25:39.9909343+08:00;True|2022-01-17T21:13:03.9659338+08:00;True|2022-01-17T20:32:14.8869091+08:00;True|2022-01-17T19:01:46.5753686+08:00;True|2022-01-17T18:31:24.1032169+08:00;True|2022-01-17T18:21:39.2918684+08:00;True|2022-01-17T18:12:07.4859038+08:00;True|2022-01-17T18:09:26.6989718+08:00;True|2022-01-17T18:04:36.7564997+08:00;True|2022-01-17T17:57:44.7814863+08:00;True|2022-01-17T17:51:50.1516107+08:00;True|2022-01-17T17:39:29.2918799+08:00;True|2022-01-17T14:55:21.5859341+08:00;True|2022-01-17T14:38:06.5091500+08:00;True|2022-01-17T14:30:25.5378436+08:00;True|2022-01-16T19:15:24.5874858+08:00;True|2022-01-16T19:07:49.0613424+08:00;True|2022-01-16T16:10:47.3112741+08:00;False|2022-01-14T19:09:41.9296709+08:00;False|2022-01-14T18:56:11.0569808+08:00;False|2022-01-14T18:28:20.1376762+08:00;False|2022-01-14T18:27:30.8678130+08:00;False|2022-01-14T18:22:45.4436504+08:00;False|2022-01-14T18:19:37.0374753+08:00;False|2022-01-14T18:18:48.5868254+08:00;False|2022-01-14T18:14:02.5810257+08:00;False|2022-01-14T18:09:51.1730754+08:00;False|2022-01-14T18:09:17.8940754+08:00;True|2022-01-13T20:08:16.2937608+08:00;True|2022-01-13T20:07:30.1505466+08:00;True|2022-01-13T13:39:42.0146294+08:00;True|2022-01-13T13:38:07.5062471+08:00;True|2022-01-13T11:29:49.3751232+08:00;True|2022-01-13T11:05:43.9574142+08:00;True|2022-01-13T10:33:23.1921058+08:00;True|2022-01-12T20:38:16.9165651+08:00;True|2022-01-12T20:24:46.3779264+08:00;True|2022-01-12T20:03:06.5030626+08:00;True|2022-01-12T19:44:55.4294326+08:00;True|2022-01-12T12:58:45.9548600+08:00;True|2022-01-12T11:28:44.7797749+08:00;True|2022-01-11T18:07:30.9151356+08:00;True|2022-01-11T15:06:32.7301609+08:00;True|2022-01-11T09:27:00.1766442+08:00;True|2021-12-30T14:41:56.8541015+08:00;True|2021-12-30T13:45:00.6130694+08:00;True|2021-12-30T13:44:18.7370780+08:00;True|2021-12-30T13:36:52.8171136+08:00;True|2021-12-28T19:14:22.5979649+08:00;True|2021-12-28T13:13:39.3543252+08:00;True|2021-12-27T15:31:26.6037782+08:00;True|2021-12-27T15:28:54.4824480+08:00;True|2021-12-27T15:22:47.8436108+08:00;True|2021-12-27T15:04:37.0711590+08:00;True|2021-12-27T15:03:52.0932499+08:00;True|2021-12-27T15:03:33.0172733+08:00;True|2021-12-27T13:28:27.4252747+08:00;True|2021-12-25T19:38:33.6784042+08:00;True|2021-12-24T20:47:43.3471563+08:00;True|2021-12-24T20:14:57.6946814+08:00;True|2021-12-24T19:55:21.1843105+08:00;True|2021-12-24T19:49:54.6719726+08:00;True|2021-12-24T19:38:14.1180741+08:00;True|2021-12-22T13:51:37.1082523+08:00;True|2021-12-21T15:38:59.8015096+08:00;True|2021-12-21T15:29:54.8095063+08:00;False|2021-12-21T15:29:21.7006531+08:00;False|2021-12-21T15:16:18.2218025+08:00;False|2021-12-21T15:11:38.1215841+08:00;False|2021-12-21T15:08:27.0590078+08:00;True|2021-12-10T14:12:36.4065298+08:00;True|2021-12-10T13:54:03.4921778+08:00;True|2021-12-10T13:25:49.0439086+08:00;True|2021-12-10T13:19:58.9494477+08:00;True|2021-12-10T13:10:45.3929017+08:00;True|2021-12-10T11:06:53.2416794+08:00;True|2021-12-07T17:23:28.9380484+08:00;True|2021-12-07T17:13:52.4384814+08:00;True|2021-12-07T16:39:49.2020208+08:00;True|2021-12-07T15:18:20.9024533+08:00;True|2021-12-07T15:07:35.4428035+08:00;True|2021-12-07T15:01:02.0445043+08:00;True|2021-12-07T14:50:08.9019705+08:00;True|2021-12-07T14:34:50.4993666+08:00;False|2021-12-07T14:32:56.0408332+08:00;True|2021-12-06T17:11:41.4004606+08:00;True|2021-12-06T16:48:07.6029757+08:00;True|2021-12-06T13:46:35.9437718+08:00;True|2021-12-06T13:45:07.6622615+08:00;True|2021-12-06T11:25:04.3483155+08:00;True|2021-12-06T11:18:24.5804187+08:00;True|2021-11-22T16:27:05.4241947+08:00;True|2021-11-22T13:40:17.6768280+08:00;True|2021-11-19T16:15:19.9085104+08:00;True|2021-11-09T10:34:21.1623512+08:00;True|2021-11-07T16:57:59.7380254+08:00;True|2021-11-07T16:53:47.4198852+08:00;True|2021-11-07T16:42:05.5096826+08:00;True|2021-11-07T16:37:21.0729013+08:00;True|2021-11-05T20:51:17.6170717+08:00;True|2021-11-05T20:35:14.6250333+08:00;True|2021-11-05T19:30:19.8374158+08:00;True|2021-11-05T19:22:46.2276569+08:00;True|2021-11-05T19:20:30.8253213+08:00;True|2021-11-05T19:16:45.7553310+08:00;True|2021-11-05T19:16:00.4532689+08:00;True|2021-11-05T19:12:25.9022478+08:00;False|2021-11-05T19:11:26.5753529+08:00;True|2021-11-05T19:09:30.0085433+08:00;True|2021-11-05T18:48:19.9395153+08:00;True|2021-11-05T18:45:34.3437897+08:00;True|2021-11-05T18:43:43.4558159+08:00;True|2021-11-05T18:40:40.9948500+08:00;True|2021-11-05T18:34:18.4440455+08:00;True|2021-11-05T15:54:51.6037132+08:00;True|2021-10-28T16:27:53.9728270+08:00;True|2021-10-28T16:03:59.5629998+08:00;True|2021-10-28T08:51:04.2549186+08:00;True|2021-10-27T15:14:53.5506098+08:00;True|2021-10-27T15:00:44.9100320+08:00;True|2021-10-27T13:14:46.7921647+08:00;True|2021-10-27T11:24:49.4550753+08:00;True|2021-10-27T10:10:10.3545125+08:00;True|2021-10-27T10:02:24.9248610+08:00;True|2021-10-27T09:59:40.3795897+08:00;True|2021-10-27T09:56:30.6629207+08:00;True|2021-10-27T09:10:48.3883432+08:00;True|2021-10-27T09:03:31.9191991+08:00;True|2021-10-27T08:59:59.7651159+08:00;True|2021-10-27T08:36:11.8620997+08:00;True|2021-10-27T08:26:40.2533014+08:00;True|2021-10-26T09:19:35.5674748+08:00;True|2021-10-26T09:17:17.6900747+08:00;True|2021-10-26T09:14:32.3999220+08:00;True|2021-10-25T15:08:21.2581763+08:00;True|2021-10-25T10:01:57.8524903+08:00;True|2021-10-25T09:28:51.6294879+08:00;True|2021-10-25T09:25:50.3373336+08:00;True|2021-10-25T09:23:37.0203978+08:00;True|2021-10-25T09:18:23.3380608+08:00;True|2021-10-25T09:15:10.5292071+08:00;True|2021-10-25T08:56:30.4632027+08:00;True|2021-10-25T08:50:11.4697392+08:00;True|2021-10-22T13:46:49.7207066+08:00;True|2021-10-22T10:06:33.3130089+08:00;True|2021-10-20T14:32:10.1235516+08:00;True|2021-10-20T14:16:18.6496291+08:00;True|2021-10-20T14:08:49.2443715+08:00;True|2021-10-20T14:05:14.6847950+08:00;True|2021-10-20T13:30:21.6057636+08:00;True|2021-10-20T10:55:22.2151716+08:00;True|2021-10-19T10:42:13.4198267+08:00;True|2021-10-19T10:01:41.0018108+08:00;True|2021-10-19T09:59:11.2127619+08:00;True|2021-10-19T09:54:04.8472874+08:00;True|2021-10-15T11:19:15.5327495+08:00;True|2021-10-15T11:17:41.0686485+08:00;True|2021-10-15T11:12:11.8295042+08:00;True|2021-10-15T10:33:31.5670079+08:00;True|2021-10-15T10:27:45.0815146+08:00;True|2021-10-14T14:51:28.5331025+08:00;True|2021-10-14T14:37:28.3276051+08:00;True|2021-10-14T14:23:39.0606792+08:00;True|2021-10-14T14:21:03.8140347+08:00;True|2021-10-13T10:31:10.6628977+08:00;True|2021-10-13T10:12:24.4238027+08:00;True|2021-10-13T08:47:43.9314486+08:00;True|2021-10-12T14:07:18.6065183+08:00;True|2021-10-12T10:34:10.1682362+08:00;True|2021-10-12T10:27:14.3073332+08:00;True|2021-10-12T10:22:08.0004619+08:00;True|2021-10-12T10:21:03.0275378+08:00;True|2021-10-12T10:11:54.9812692+08:00;True|2021-10-11T16:59:07.3568342+08:00;True|2021-10-11T16:53:14.2016138+08:00;True|2021-10-11T16:21:35.0133775+08:00;True|2021-10-11T15:34:19.5731935+08:00;True|2021-10-11T15:31:07.5780983+08:00;True|2021-10-11T15:06:47.1145237+08:00;True|2021-10-11T15:03:25.5000280+08:00;True|2021-10-11T10:12:57.6416898+08:00;True|2021-10-09T10:15:17.9235165+08:00;True|2021-10-09T10:13:51.3318441+08:00;True|2021-10-09T10:01:21.6661542+08:00;True|2021-10-09T09:58:41.9225837+08:00;True|2021-10-08T14:56:49.7935800+08:00;True|2021-10-08T14:35:41.4490063+08:00;True|2021-10-08T14:02:42.6990656+08:00;True|2021-09-29T15:48:55.1547397+08:00;True|2021-09-29T15:48:23.5567191+08:00;True|2021-09-27T16:17:35.7180978+08:00;True|2021-09-27T15:51:50.4240134+08:00;True|2021-09-23T20:55:27.3554447+08:00;True|2021-09-23T14:14:44.0572017+08:00;True|2021-09-23T13:51:56.2344673+08:00;True|2021-09-23T10:46:16.7417007+08:00;True|2021-09-23T10:42:23.2117537+08:00;True|2021-09-22T15:21:22.9615672+08:00;True|2021-09-22T14:23:32.7907754+08:00;True|2021-09-22T13:48:03.4780947+08:00;True|2021-09-22T11:05:24.5249356+08:00;True|2021-09-22T10:00:19.0962943+08:00;True|2021-09-22T09:30:26.2686514+08:00;True|2021-09-17T11:22:34.5692792+08:00;True|2021-09-16T16:11:27.5372277+08:00;True|2021-09-16T14:53:40.8396557+08:00;True|2021-09-16T14:32:29.7905500+08:00;True|2021-09-16T14:26:46.2224219+08:00;True|2021-09-16T10:32:24.4244440+08:00;True|2021-09-15T11:10:35.3529360+08:00;True|2021-09-15T11:08:30.0857376+08:00;True|2021-09-15T11:05:56.7191571+08:00;True|2021-09-14T01:24:39.8041136+08:00;True|2021-09-14T01:05:01.1593327+08:00;True|2021-09-14T00:44:14.7233198+08:00;True|2021-09-13T23:48:19.4506233+08:00;True|2021-09-13T20:30:31.3243872+08:00;True|2021-09-13T19:45:35.9108911+08:00;False|2021-09-13T19:44:59.2779092+08:00;True|2021-09-13T18:09:22.4994381+08:00;True|2021-09-10T14:18:27.5788854+08:00;True|2021-09-09T15:57:01.7407207+08:00;True|2021-09-09T15:49:34.2598998+08:00;True|2021-09-09T11:32:10.7853024+08:00;True|2021-09-09T11:10:48.6840025+08:00;True|2021-09-09T10:35:37.3883078+08:00;True|2021-09-07T14:11:49.8497588+08:00;True|2021-09-07T13:34:48.4693349+08:00;True|2021-09-06T14:33:48.7549675+08:00;True|2021-09-03T16:27:51.1888520+08:00;True|2021-09-03T16:19:35.9003465+08:00;True|2021-09-03T15:46:28.1828032+08:00;True|2021-09-03T15:34:21.9362871+08:00;True|2021-09-03T11:24:49.8749819+08:00;True|2021-09-03T11:21:17.8373159+08:00;True|2021-09-03T11:16:53.2208136+08:00;True|2021-09-03T11:12:23.9063804+08:00;True|2021-09-03T09:11:09.2435721+08:00;True|2021-09-02T11:16:15.1370453+08:00;True|2021-09-02T10:35:39.1171879+08:00;True|2021-09-01T10:17:09.4536285+08:00;True|2021-09-01T09:46:28.4581776+08:00;True|2021-08-31T08:54:26.8588887+08:00;True|2021-08-31T08:39:08.3685693+08:00;True|2021-08-30T17:11:56.8438985+08:00;True|2021-08-30T15:59:42.0820292+08:00;True|2021-08-30T15:45:18.1868510+08:00;True|2021-08-30T14:56:08.3958863+08:00;True|2021-08-30T14:37:11.5379830+08:00;True|2021-08-30T14:35:34.8775934+08:00;True|2021-08-30T14:24:36.5111821+08:00;True|2021-08-30T10:05:49.6945200+08:00;True|2021-08-30T10:03:28.4064538+08:00;True|2021-08-30T10:00:16.8360929+08:00;True|2021-08-30T09:56:09.4434379+08:00;True|2021-08-30T09:55:36.1725334+08:00;True|2021-08-30T09:52:04.8600054+08:00;True|2021-08-30T09:47:46.4225655+08:00;True|2021-08-30T09:45:20.4894962+08:00;False|2021-08-27T17:17:34.2646751+08:00;False|2021-08-27T16:01:21.2791979+08:00;False|2021-08-27T15:58:06.9667160+08:00;False|2021-08-27T15:38:37.4818036+08:00;False|2021-08-27T15:21:02.8863114+08:00;False|2021-08-27T15:20:28.6828668+08:00;True|2021-08-26T16:00:44.3162145+08:00;True|2021-08-26T08:57:31.3842587+08:00;True|2021-08-23T08:43:41.1549775+08:00;True|2021-08-22T09:24:12.7210871+08:00;True|2021-08-22T09:19:53.8300229+08:00;True|2021-08-20T20:00:52.0140407+08:00;True|2021-08-20T19:40:14.7712765+08:00;True|2021-08-19T17:37:54.9748049+08:00;True|2021-08-19T17:20:11.0515687+08:00;True|2021-08-19T16:12:35.4392809+08:00;True|2021-08-19T16:06:50.6204587+08:00;True|2021-08-19T16:03:53.0824286+08:00;True|2021-08-19T15:56:01.3498791+08:00;True|2021-08-19T10:18:50.8113630+08:00;True|2021-08-19T09:58:06.2784035+08:00;True|2021-08-19T09:56:54.0619777+08:00;True|2021-08-19T00:32:08.3503093+08:00;True|2021-08-19T00:11:18.3150227+08:00;True|2021-08-19T00:02:49.4827718+08:00;True|2021-08-18T23:54:45.4845900+08:00;True|2021-08-18T23:39:51.6147977+08:00;True|2021-08-18T23:16:42.7214379+08:00;True|2021-08-18T22:38:57.4681929+08:00;True|2021-08-18T21:41:58.7560707+08:00;True|2021-08-18T21:11:52.2369249+08:00;True|2021-08-18T21:01:49.5669106+08:00;True|2021-08-18T20:47:46.5352688+08:00;False|2021-08-18T20:46:36.7956141+08:00;False|2021-08-18T20:46:01.0502138+08:00;True|2021-08-18T19:39:12.8186242+08:00;False|2021-08-18T19:38:12.6839708+08:00;True|2021-08-18T19:15:51.4626694+08:00;True|2021-08-18T16:07:20.4350886+08:00;True|2021-08-18T14:29:41.7171934+08:00;True|2021-08-18T14:20:36.3647361+08:00;True|2021-08-16T09:08:58.3617662+08:00;True|2021-08-15T20:44:29.9214083+08:00;True|2021-08-15T20:36:17.0958549+08:00;True|2021-08-15T20:29:34.3879773+08:00;True|2021-08-15T20:23:47.4052038+08:00;True|2021-08-15T15:01:19.7830862+08:00;True|2021-08-15T12:15:18.3433782+08:00;True|2021-08-13T20:59:11.3947130+08:00;True|2021-08-06T22:49:09.9538339+08:00;True|2021-08-06T22:35:19.0418168+08:00;True|2021-08-06T20:29:47.4241975+08:00;True|2021-08-06T14:08:16.4791827+08:00;True|2021-08-06T13:59:28.9874611+08:00;True|2021-08-06T13:57:34.3723977+08:00;True|2021-08-06T13:36:03.4816652+08:00;True|2021-08-06T12:22:52.5055221+08:00;True|2021-08-06T09:31:58.1272499+08:00;True|2021-08-06T09:26:51.6310039+08:00;True|2021-08-06T09:24:22.2899244+08:00;True|2021-08-06T09:06:30.6477912+08:00;True|2021-08-06T09:00:55.5101612+08:00;True|2021-08-06T08:49:59.9616490+08:00;True|2021-08-06T08:45:18.8586902+08:00;True|2021-08-05T20:09:25.8861998+08:00;True|2021-08-04T19:14:27.2396953+08:00;True|2021-08-04T19:11:47.5849093+08:00;True|2021-08-04T16:42:54.0149043+08:00;True|2021-08-04T15:02:11.5056561+08:00;True|2021-08-04T14:58:37.1435509+08:00;True|2021-08-04T14:55:34.7380132+08:00;True|2021-08-04T14:47:42.5933921+08:00;True|2021-08-04T14:45:17.9911874+08:00;True|2021-08-04T13:52:20.9601351+08:00;True|2021-08-04T09:48:28.8796992+08:00;True|2021-08-03T18:14:13.1894998+08:00;True|2021-08-03T17:45:35.1349721+08:00;True|2021-08-03T17:21:52.6028977+08:00;True|2021-08-03T17:20:35.4423020+08:00;True|2021-08-03T17:03:33.1667669+08:00;True|2021-08-03T17:01:54.2656787+08:00;True|2021-08-03T17:00:22.2778374+08:00;True|2021-08-03T16:56:58.8902582+08:00;True|2021-08-03T15:02:21.8601533+08:00;True|2021-08-03T14:57:34.0186758+08:00;True|2021-08-03T14:28:47.2242515+08:00;True|2021-08-03T14:22:22.4554236+08:00;True|2021-08-03T14:21:51.1339715+08:00;True|2021-08-03T13:37:33.9697131+08:00;True|2021-08-03T13:28:29.7591095+08:00;True|2021-08-03T11:35:09.5118324+08:00;True|2021-08-03T11:11:23.3051573+08:00;True|2021-08-02T13:14:42.3663755+08:00;True|2021-07-30T22:50:19.9749878+08:00;True|2021-07-30T22:49:31.2150970+08:00;True|2021-07-28T19:12:05.8381075+08:00;True|2021-07-28T18:59:45.4808797+08:00;True|2021-07-28T18:15:58.8301509+08:00;True|2021-07-28T18:04:54.8613546+08:00;True|2021-07-28T17:53:48.6225611+08:00;True|2021-07-28T17:42:50.9171563+08:00;True|2021-07-28T17:17:16.3137677+08:00;True|2021-07-28T17:11:46.8925200+08:00;True|2021-07-28T16:28:27.6823943+08:00;True|2021-07-28T16:23:00.3385836+08:00;True|2021-07-28T09:57:55.4237411+08:00;True|2021-07-28T08:38:29.6691541+08:00;True|2021-07-27T23:16:32.0331671+08:00;True|2021-07-27T23:06:08.1947249+08:00;True|2021-07-27T23:05:58.4619176+08:00;True|2021-07-27T18:42:09.5358261+08:00;True|2021-07-27T18:30:04.8532823+08:00;True|2021-07-27T18:29:43.5775092+08:00;True|2021-07-27T15:16:49.8356224+08:00;True|2021-07-27T15:05:27.8453220+08:00;True|2021-07-27T14:59:15.9519440+08:00;True|2021-07-27T09:23:32.6111337+08:00;True|2021-07-27T08:27:41.6395353+08:00;True|2021-07-27T08:25:56.7378296+08:00;True|2021-07-26T11:18:46.0856966+08:00;True|2021-07-26T11:18:02.0751924+08:00;True|2021-07-26T11:13:49.6285395+08:00;True|2021-07-21T21:08:25.9898902+08:00;True|2021-07-21T20:09:26.2258104+08:00;True|2021-07-13T16:17:25.8407435+08:00;True|2021-07-13T13:46:13.4309531+08:00;True|2021-07-13T12:29:04.5082461+08:00;True|2021-06-29T13:55:01.6864637+08:00;True|2021-06-29T10:38:52.2206472+08:00;True|2021-06-29T10:10:13.1540749+08:00;True|2021-06-28T14:37:56.3853273+08:00;False|2021-06-28T14:36:57.5726124+08:00;True|2021-06-25T14:17:57.5196108+08:00;True|2021-06-25T13:56:38.9522535+08:00;True|2021-06-24T19:38:32.8766933+08:00;True|2021-06-24T18:26:35.6118833+08:00;True|2021-06-24T18:02:52.8136877+08:00;True|2021-06-24T17:48:49.5851948+08:00;True|2021-06-24T17:45:46.7527572+08:00;True|2021-06-24T15:05:20.1592723+08:00;True|2021-06-23T16:18:15.6814625+08:00;True|2021-06-23T16:05:24.6112343+08:00;True|2021-06-23T15:14:08.2489658+08:00;True|2021-06-23T13:52:58.6029788+08:00;True|2021-06-22T16:11:20.4726923+08:00;True|2021-06-22T16:04:53.7231389+08:00;True|2021-06-22T15:50:59.2583262+08:00;True|2021-06-22T15:38:15.3016140+08:00;True|2021-06-22T15:34:42.9185543+08:00;True|2021-06-22T15:21:55.1419108+08:00;True|2021-06-22T15:07:21.5357494+08:00;True|2021-06-22T15:03:35.0535733+08:00;True|2021-06-22T14:54:47.8802969+08:00;True|2021-06-22T11:19:38.7303011+08:00;True|2021-06-22T08:53:49.2882695+08:00;True|2021-06-22T08:47:54.8286530+08:00;True|2021-06-21T16:27:19.3017700+08:00;True|2021-06-21T15:32:28.7237952+08:00;True|2021-06-21T12:34:02.6329555+08:00;True|2021-06-21T12:24:17.5427495+08:00;True|2021-06-21T10:47:30.6423502+08:00;True|2021-06-21T08:43:20.3026558+08:00;True|2021-06-19T15:10:06.8335499+08:00;True|2021-06-18T15:37:29.5009930+08:00;True|2021-06-18T13:46:35.6283432+08:00;True|2021-06-18T10:00:37.1474954+08:00;True|2021-06-18T09:55:21.8551780+08:00;True|2021-06-18T09:22:27.8432927+08:00;True|2021-06-17T11:17:43.2166430+08:00;True|2021-06-17T09:24:09.8350403+08:00;True|2021-06-16T16:10:47.8564888+08:00;True|2021-06-16T16:04:09.8286582+08:00;True|2021-06-16T15:12:29.9427169+08:00;True|2021-06-16T14:58:45.6801892+08:00;True|2021-06-16T14:46:01.6873221+08:00;True|2021-06-16T11:02:06.1272477+08:00;True|2021-06-16T09:33:56.0223915+08:00;True|2021-06-16T08:50:07.6995413+08:00;True|2021-06-16T08:28:38.7692635+08:00;True|2021-06-16T01:04:19.6282474+08:00;True|2021-06-16T01:03:50.5058323+08:00;False|2021-06-16T01:02:15.3819672+08:00;False|2021-06-16T01:01:38.6171098+08:00;True|2021-06-16T00:34:54.9902044+08:00;True|2021-06-15T23:55:36.2003828+08:00;True|2021-06-15T22:47:17.2192750+08:00;True|2021-06-15T22:42:41.1512585+08:00;True|2021-06-15T22:38:01.7390462+08:00;True|2021-06-15T22:14:11.2060782+08:00;True|2021-06-15T22:12:27.0615357+08:00;True|2021-06-15T22:07:59.9280871+08:00;True|2021-06-15T22:04:21.5051427+08:00;True|2021-06-15T21:25:55.0099814+08:00;True|2021-06-15T19:13:51.3494172+08:00;True|2021-06-15T19:02:17.6844742+08:00;True|2021-06-15T18:47:37.1629411+08:00;False|2021-06-15T18:47:11.0828111+08:00;True|2021-06-15T18:38:26.6620668+08:00;True|2021-06-15T18:33:45.2069831+08:00;True|2021-06-15T18:24:52.0550838+08:00;True|2021-06-15T18:19:43.6999796+08:00;True|2021-06-15T18:08:17.2464506+08:00;True|2021-06-15T18:03:51.3952624+08:00;True|2021-06-15T18:01:20.6141766+08:00;True|2021-06-15T17:59:04.4479416+08:00;True|2021-06-15T17:41:44.6389379+08:00;True|2021-06-15T17:39:03.1565124+08:00;True|2021-06-15T17:34:41.0634638+08:00;True|2021-06-15T17:33:50.4853178+08:00;True|2021-06-15T17:25:38.5914037+08:00;True|2021-06-15T17:22:21.3611360+08:00;True|2021-06-15T17:16:49.4970813+08:00;True|2021-06-15T17:05:28.9389484+08:00;True|2021-06-15T16:52:54.6372199+08:00;True|2021-06-15T16:51:23.9081030+08:00;True|2021-06-15T16:45:40.6017997+08:00;True|2021-06-15T16:41:05.0218887+08:00;True|2021-06-15T16:38:02.8541862+08:00;True|2021-06-15T16:22:10.3118721+08:00;True|2021-06-15T16:12:11.1552506+08:00;True|2021-06-15T15:33:42.0100494+08:00;True|2021-06-15T15:28:39.7145659+08:00;True|2021-06-15T15:15:02.7939125+08:00;True|2021-06-15T14:49:14.2300396+08:00;True|2021-06-15T14:42:28.1198064+08:00;True|2021-06-15T13:30:12.7997686+08:00;True|2021-06-15T13:25:37.7284670+08:00;True|2021-06-15T13:23:43.6207813+08:00;False|2021-06-15T13:23:19.4190232+08:00;True|2021-06-15T13:16:38.5062674+08:00;True|2021-06-15T13:03:31.2055635+08:00;True|2021-06-15T12:58:43.1653215+08:00;True|2021-06-15T12:39:22.8442109+08:00;True|2021-06-15T12:35:09.1288556+08:00;False|2021-06-15T12:33:50.0723143+08:00;True|2021-06-15T11:28:01.9733727+08:00;True|2021-06-15T11:26:26.6569392+08:00;True|2021-06-15T11:22:43.0366435+08:00;True|2021-06-15T11:07:50.1610580+08:00;True|2021-06-15T10:32:59.1925931+08:00;True|2021-06-10T17:16:57.9552310+08:00;True|2021-06-10T16:44:42.2731836+08:00;True|2021-06-10T14:39:27.6745737+08:00;True|2021-06-10T12:15:05.1524413+08:00;True|2021-06-09T18:19:24.1005606+08:00;True|2021-06-09T17:56:09.5646288+08:00;True|2021-06-09T13:34:06.1882292+08:00;True|2021-06-09T13:29:54.5924933+08:00;True|2021-06-09T13:25:55.7520662+08:00;True|2021-06-09T13:07:47.6686811+08:00;True|2021-06-09T12:59:41.2595048+08:00;True|2021-06-09T12:45:27.1305548+08:00;True|2021-06-09T12:29:52.1418191+08:00;True|2021-06-09T12:24:12.7610588+08:00;True|2021-06-09T11:31:25.3409568+08:00;True|2021-06-09T09:57:44.4387175+08:00;True|2021-06-09T09:54:26.5161307+08:00;True|2021-06-09T09:14:14.7288045+08:00;True|2021-06-09T09:10:25.1812139+08:00;True|2021-06-09T08:46:21.6585123+08:00;True|2021-06-08T19:56:55.7192062+08:00;True|2021-06-08T19:52:59.0326821+08:00;True|2021-06-08T19:49:13.6274217+08:00;True|2021-06-08T19:09:22.1038939+08:00;True|2021-06-08T15:28:41.3716247+08:00;True|2021-06-08T15:26:47.2621178+08:00;True|2021-06-08T13:49:45.8936617+08:00;True|2021-06-08T13:43:18.8115502+08:00;True|2021-06-08T10:04:06.2200731+08:00;True|2021-06-08T09:17:10.0470792+08:00;True|2021-06-08T08:44:37.4395849+08:00;True|2021-06-08T00:01:09.3745613+08:00;True|2021-06-07T23:49:31.5196888+08:00;True|2021-06-07T23:41:00.8017855+08:00;True|2021-06-07T23:21:53.1371134+08:00;True|2021-06-07T23:01:27.5712153+08:00;True|2021-06-07T22:36:12.9274014+08:00;True|2021-06-07T22:23:00.6545134+08:00;True|2021-06-07T17:44:47.5686346+08:00;True|2021-06-07T17:17:01.3431233+08:00;True|2021-06-07T16:53:28.9989587+08:00;True|2021-06-07T16:41:10.4975607+08:00;True|2021-06-07T14:21:06.8176477+08:00;True|2021-06-07T14:10:39.0355659+08:00;True|2021-06-07T12:34:31.4562732+08:00;True|2021-06-07T12:28:44.9629488+08:00;True|2021-06-07T10:30:26.9387988+08:00;True|2021-06-07T09:12:14.7658099+08:00;True|2021-06-07T08:37:19.6353792+08:00;True|2021-06-07T08:35:25.2031954+08:00;True|2021-06-05T07:07:32.0541266+08:00;True|2021-06-05T06:44:35.9475270+08:00;True|2021-06-05T06:37:27.4595197+08:00;True|2021-06-05T06:26:59.7663998+08:00;True|2021-06-05T05:43:12.8699318+08:00;True|2021-06-04T17:00:41.2426007+08:00;True|2021-06-04T16:08:03.8078072+08:00;True|2021-06-04T15:47:21.6412616+08:00;True|2021-06-04T15:21:02.4239800+08:00;True|2021-06-04T15:20:37.8641854+08:00;True|2021-06-04T13:38:51.5088395+08:00;True|2021-06-04T10:20:01.7784282+08:00;True|2021-06-04T10:13:50.3548857+08:00;True|2021-06-04T10:11:25.5017821+08:00;True|2021-06-04T10:09:51.6792228+08:00;True|2021-06-04T10:02:39.5851057+08:00;True|2021-06-04T09:30:40.4495494+08:00;True|2021-06-03T13:16:36.0317546+08:00;True|2021-06-03T13:12:47.0402047+08:00;True|2021-06-02T14:37:08.9683351+08:00;True|2021-06-02T14:10:15.7439829+08:00;True|2021-06-02T13:59:46.5841931+08:00;True|2021-06-02T13:25:18.7962660+08:00;True|2021-06-02T13:23:16.2261980+08:00;True|2021-06-01T15:37:32.2495085+08:00;True|2021-06-01T15:21:01.2856122+08:00;True|2021-06-01T15:13:36.7262365+08:00;True|2021-06-01T15:10:26.8905629+08:00;True|2021-06-01T14:56:17.5231551+08:00;True|2021-06-01T14:38:39.7895927+08:00;True|2021-06-01T14:23:12.3265287+08:00;True|2021-03-01T09:11:31.3226422+08:00;True|2021-05-26T14:54:56.9426462+08:00;True|2021-05-26T13:57:33.7780451+08:00;True|2021-05-26T13:39:02.8043358+08:00;True|2021-02-25T16:01:40.2917200+08:00;True|2021-02-25T15:49:46.6681205+08:00;True|2021-02-25T15:16:30.9372640+08:00;True|2021-05-25T13:10:21.7831921+08:00;True|2021-05-25T11:21:38.5224475+08:00;True|2021-05-25T11:12:52.0637175+08:00;True|2021-05-25T11:02:18.4164663+08:00;True|2021-05-25T10:52:06.8998521+08:00;True|2021-05-25T10:50:45.0929606+08:00;True|2021-05-25T10:45:54.1498313+08:00;True|2021-05-25T10:39:27.8602249+08:00;True|2021-05-25T10:34:49.5771162+08:00;True|2021-05-25T10:17:30.3009163+08:00;True|2021-05-25T10:14:03.8512581+08:00;True|2021-05-25T10:05:33.4343836+08:00;True|2021-05-24T17:01:23.3221168+08:00;True|2021-05-24T10:11:24.0197347+08:00;False|2021-05-24T10:11:07.6338995+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
@@ -18,28 +18,28 @@
<publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>04/22/2022 17:19:45</publishTime>
+ <publishTime>05/06/2022 15:12:57</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>04/22/2022 17:19:45</publishTime>
+ <publishTime>05/06/2022 15:12:57</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>04/22/2022 17:19:43</publishTime>
+ <publishTime>05/06/2022 15:12:54</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>04/22/2022 17:19:43</publishTime>
+ <publishTime>05/06/2022 15:12:54</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 14:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>04/22/2022 17:19:39</publishTime>
+ <publishTime>05/06/2022 15:12:48</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>04/22/2022 17:19:39</publishTime>
+ <publishTime>05/06/2022 15:12:48</publishTime>
</File>
<File Include="bin/ICSharpCode.SharpZipLib.dll">
<publishTime>05/09/2021 01:08:30</publishTime>
@@ -69,10 +69,10 @@
<publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>04/22/2022 17:19:39</publishTime>
+ <publishTime>05/06/2022 15:12:49</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>04/22/2022 17:19:39</publishTime>
+ <publishTime>05/06/2022 15:12:49</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>08/16/2021 17:23:15</publishTime>
@@ -105,22 +105,22 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>04/22/2022 17:19:37</publishTime>
+ <publishTime>05/06/2022 15:12:46</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>04/22/2022 17:19:37</publishTime>
+ <publishTime>05/06/2022 15:12:46</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>04/22/2022 17:19:38</publishTime>
+ <publishTime>05/06/2022 15:12:47</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>04/22/2022 17:19:38</publishTime>
+ <publishTime>05/06/2022 15:12:47</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>04/22/2022 17:19:38</publishTime>
+ <publishTime>05/06/2022 15:12:47</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>04/22/2022 17:19:38</publishTime>
+ <publishTime>05/06/2022 15:12:47</publishTime>
</File>
<File Include="bin/stdole.dll">
<publishTime>05/09/2021 13:35:37</publishTime>
@@ -222,13 +222,13 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>04/22/2022 17:19:50</publishTime>
+ <publishTime>05/06/2022 15:13:03</publishTime>
</File>
<File Include="bin/WebAPI.dll.config">
<publishTime>12/15/2021 17:59:43</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>04/22/2022 17:19:50</publishTime>
+ <publishTime>05/06/2022 15:13:03</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/17/2013 17:03:52</publishTime>
@@ -411,7 +411,7 @@
<publishTime>12/20/2021 13:19:56</publishTime>
</File>
<File Include="Web.config">
- <publishTime>04/22/2022 17:20:11</publishTime>
+ <publishTime>05/06/2022 15:13:11</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Sc_MouldProdInBill/Log/637879637530646434.log b/WebAPI/Sc_MouldProdInBill/Log/637879637530646434.log
new file mode 100644
index 0000000..4eedde0
--- /dev/null
+++ b/WebAPI/Sc_MouldProdInBill/Log/637879637530646434.log
@@ -0,0 +1,3 @@
+------------------------2022/5/12 14:49:13------------------------------
+鎴愬姛锛�
+
diff --git a/WebAPI/Sc_MouldProdInBill/Log/637879637531326475.log b/WebAPI/Sc_MouldProdInBill/Log/637879637531326475.log
new file mode 100644
index 0000000..2232611
--- /dev/null
+++ b/WebAPI/Sc_MouldProdInBill/Log/637879637531326475.log
@@ -0,0 +1,3 @@
+------------------------2022/5/12 14:49:13------------------------------
+鏈夋潈闄�
+
diff --git a/WebAPI/Sc_MouldProdInBill/Log/637879637531386497.log b/WebAPI/Sc_MouldProdInBill/Log/637879637531386497.log
new file mode 100644
index 0000000..a132c7a
--- /dev/null
+++ b/WebAPI/Sc_MouldProdInBill/Log/637879637531386497.log
@@ -0,0 +1,3 @@
+------------------------2022/5/12 14:49:13------------------------------
+select * from h_v_Sc_MouldProdInHouseBillList where 搴撳瓨缁勭粐='钃濇捣瀹炰笟闆嗗洟' and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-04-12' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-05-12'order by hmainid desc
+
diff --git a/WebAPI/Sc_MouldProdInBill/Log/637880486996165006.log b/WebAPI/Sc_MouldProdInBill/Log/637880486996165006.log
new file mode 100644
index 0000000..ac2ac0c
--- /dev/null
+++ b/WebAPI/Sc_MouldProdInBill/Log/637880486996165006.log
@@ -0,0 +1,3 @@
+------------------------2022/5/13 14:24:59------------------------------
+鎴愬姛锛�
+
diff --git a/WebAPI/Sc_MouldProdInBill/Log/637880486996635039.log b/WebAPI/Sc_MouldProdInBill/Log/637880486996635039.log
new file mode 100644
index 0000000..14c8866
--- /dev/null
+++ b/WebAPI/Sc_MouldProdInBill/Log/637880486996635039.log
@@ -0,0 +1,3 @@
+------------------------2022/5/13 14:24:59------------------------------
+鏈夋潈闄�
+
diff --git a/WebAPI/Sc_MouldProdInBill/Log/637880486996675048.log b/WebAPI/Sc_MouldProdInBill/Log/637880486996675048.log
new file mode 100644
index 0000000..f7dc08e
--- /dev/null
+++ b/WebAPI/Sc_MouldProdInBill/Log/637880486996675048.log
@@ -0,0 +1,3 @@
+------------------------2022/5/13 14:24:59------------------------------
+select * from h_v_Sc_MouldProdInHouseBillList where 搴撳瓨缁勭粐='鎵嬫満浜嬩笟閮�' and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-04-13' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-05-13'order by hmainid desc
+
diff --git a/WebAPI/Sc_MouldProdInBill/Log/637880489052667576.log b/WebAPI/Sc_MouldProdInBill/Log/637880489052667576.log
new file mode 100644
index 0000000..9500820
--- /dev/null
+++ b/WebAPI/Sc_MouldProdInBill/Log/637880489052667576.log
@@ -0,0 +1,3 @@
+------------------------2022/5/13 14:28:25------------------------------
+鎴愬姛锛�
+
diff --git a/WebAPI/Sc_MouldProdInBill/Log/637880489053087606.log b/WebAPI/Sc_MouldProdInBill/Log/637880489053087606.log
new file mode 100644
index 0000000..82ba330
--- /dev/null
+++ b/WebAPI/Sc_MouldProdInBill/Log/637880489053087606.log
@@ -0,0 +1,3 @@
+------------------------2022/5/13 14:28:25------------------------------
+鏈夋潈闄�
+
diff --git a/WebAPI/Sc_MouldProdInBill/Log/637880489053097665.log b/WebAPI/Sc_MouldProdInBill/Log/637880489053097665.log
new file mode 100644
index 0000000..3daae83
--- /dev/null
+++ b/WebAPI/Sc_MouldProdInBill/Log/637880489053097665.log
@@ -0,0 +1,3 @@
+------------------------2022/5/13 14:28:25------------------------------
+select * from h_v_Sc_MouldProdInHouseBillList where 搴撳瓨缁勭粐='鎵嬫満浜嬩笟閮�' and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-04-13' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-05-13'order by hmainid desc
+
diff --git a/WebAPI/Sc_MouldProdOutBill/Log/637879637552458053.log b/WebAPI/Sc_MouldProdOutBill/Log/637879637552458053.log
new file mode 100644
index 0000000..e86ebbd
--- /dev/null
+++ b/WebAPI/Sc_MouldProdOutBill/Log/637879637552458053.log
@@ -0,0 +1,3 @@
+------------------------2022/5/12 14:49:15------------------------------
+select * from h_v_Sc_MouldProdOutHouseBillList where 搴撳瓨缁勭粐='钃濇捣瀹炰笟闆嗗洟'
+
diff --git a/WebAPI/Sc_MouldProdOutBill/Log/637880487100073561.log b/WebAPI/Sc_MouldProdOutBill/Log/637880487100073561.log
new file mode 100644
index 0000000..6845db5
--- /dev/null
+++ b/WebAPI/Sc_MouldProdOutBill/Log/637880487100073561.log
@@ -0,0 +1,3 @@
+------------------------2022/5/13 14:25:10------------------------------
+select * from h_v_Sc_MouldProdOutHouseBillList where 搴撳瓨缁勭粐='鎵嬫満浜嬩笟閮�'
+
diff --git a/WebAPI/Sc_MouldProdOutBill/Log/637880489108808963.log b/WebAPI/Sc_MouldProdOutBill/Log/637880489108808963.log
new file mode 100644
index 0000000..3c4849a
--- /dev/null
+++ b/WebAPI/Sc_MouldProdOutBill/Log/637880489108808963.log
@@ -0,0 +1,3 @@
+------------------------2022/5/13 14:28:30------------------------------
+select * from h_v_Sc_MouldProdOutHouseBillList where 搴撳瓨缁勭粐='鎵嬫満浜嬩笟閮�'
+
diff --git a/WebAPI/Vlog/webapi20220512.txt b/WebAPI/Vlog/webapi20220512.txt
new file mode 100644
index 0000000..f431049
--- /dev/null
+++ b/WebAPI/Vlog/webapi20220512.txt
@@ -0,0 +1 @@
+2022/5/12 14:49:13 and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-04-12' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-05-12';钃濇捣瀹炰笟闆嗗洟
diff --git a/WebAPI/Vlog/webapi20220513.txt b/WebAPI/Vlog/webapi20220513.txt
new file mode 100644
index 0000000..7aac2ff
--- /dev/null
+++ b/WebAPI/Vlog/webapi20220513.txt
@@ -0,0 +1,3 @@
+2022/5/13 14:24:59 and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-04-13' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-05-13';鎵嬫満浜嬩笟閮�
+
+2022/5/13 14:28:25 and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-04-13' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-05-13';鎵嬫満浜嬩笟閮�
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.cs"
index 06ff6d5..6232ec9 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.cs"
@@ -137,74 +137,94 @@
{
SQLHelper.ClsCN SubCn = new SQLHelper.ClsCN();
DataSet DSet = new DataSet();
+ ////杩囨护鏉′欢Dlg
+ //string sDlgWhere = "";
+ //if (txtHProcessExchangeBillNo.Text != "")//娴佽浆鍗�
+ //{
+ // sDlgWhere = sDlgWhere + "and c.HProcExchBillNo like '%" + txtHProcessExchangeBillNo.Text + "%'";
+ //}
+ //if (txtHICMOBillNo.Text != "")//鐢熶骇璁㈠崟
+ //{
+ // sDlgWhere = sDlgWhere + "and a.HICMOBillNo like '%" + txtHICMOBillNo.Text + "%'";
+ //}
+ //if (textHmaterName.Text != "")//鐗╂枡
+ //{
+ // sDlgWhere = sDlgWhere + "and b.HName like '%" + textHmaterName.Text + "%'";
+ //}
+ //if (textHprocName.Text != "")//宸ュ簭
+ //{
+ // sDlgWhere = sDlgWhere + "and d.HName like '%" + textHprocName.Text + "%'";
+ //}
+ //if (dtpHBDate.Value.ToShortDateString() != "")//寮�濮嬫棩鏈�
+ //{
+ // sDlgWhere = sDlgWhere + "and a.HMakeDate >= '" + dtpHBDate.Value.ToShortDateString() + "'";
+ //}
+ //if (dtpHEDate.Value.ToShortDateString() != "")//缁撴潫鏃ユ湡
+ //{
+ // sDlgWhere = sDlgWhere + "and a.HMakeDate <= '" + dtpHEDate.Value.ToShortDateString() + "'";
+ //}
+ ////杩囨护鏉′欢
+ ////string sWhere = "";
+ ////sWhere = sWhere + ",'" + this.dtpHBDate.Value.ToShortDateString() + "'";
+ ////sWhere = sWhere + ",'" + this.dtpHEDate.Value.ToShortDateString() + "'";
+ ////sWhere = sWhere + ",1,3";
+ //////sWhere = sWhere + ",'" + frmQuery.dtpHBakEndDate.Value.ToShortDateString() + "'";
+ //////sWhere = sWhere + "," + frmQuery.txtHCusID.Tag.ToString().Trim();
+ ////if (sWhere.Trim().Length > 0)
+ ////{
+ //// sWhere = sWhere.Substring(1, sWhere.Length - 1);
+ ////}
+ ////
+ //DSet = SubCn.RunProcReturn("select " +
+ // "MAX(a.HMakeDate) 姹囨姤鏃ユ湡, a.HICMOBillNo 浠诲姟鍗曞彿, c.HProcExchBillNo 娴佽浆鍗″彿, c.HProcID, d.HName 宸ュ簭鍚嶇О" +
+ // ", sum(a.HWorkTimes) 宸ユ椂, b.HName 鐗╂枡鍚嶇О, a.HICMOQty 鐢熶骇璁㈠崟鏁伴噺, a.HPlanQty 璁″垝鏁伴噺, c.HQty 杩涚珯鏁伴噺" +
+ // ", co.HQty 鍑虹珯鍚堟牸鏁伴噺, c.HQty - co.HQty - co.HWasterQty 鏈繘绔欐暟閲�" +
+ // ", co.HWasterQty 涓嶅悎鏍兼暟閲�, co.HQty / nullif((co.HQty+co.HWasterQty),0) 鍑虹珯鑹巼,a.hb, co.HName 涓嶈壇鏄庣粏, co.HBadQty 涓嶈壇鏁伴噺 " +
+ // " FROM Sc_StationOutBillMain a " +
+ // "left join Gy_Material b on a.HMaterID = b.HItemID " +
+ // "left join( " +
+ // "select sum(aa.HQty) HQty, aa.HProcExchBillNo, aa.HProcExchInterID, aa.HProcID " +
+ // "from Sc_StationInBillMain aa " +
+ // "group by aa.HProcExchBillNo, aa.HProcExchInterID, aa.HProcID " +
+ // ") c on a.HProcExchInterID = c.HProcExchInterID and a.HProcID = c.HProcID " +
+ // "left join( " +
+ // "select sum(aa.HQty) HQty, sum(aa.HWasterQty) HWasterQty, bad.HBadQty, bad.HName" +
+ // ", aa.HProcExchBillNo, aa.HProcExchInterID, aa.HProcID " +
+ // "from Sc_StationOutBillMain aa " +
+ // "left join ( " +
+ // "select qa.HProcExchInterID, qb.HBadQty, qbr.HName, qa.HProcID " +
+ // "from QC_NoPassProdCheckBillMain qa " +
+ // "left join QC_NoPassProdCheckBillsub qb on qa.HInterID = qb.HInterID " +
+ // "left join Gy_BadReason qbr on qb.HBadReasonID = qbr.HItemID " +
+ // "group by qa.HProcExchInterID, qbr.HName, qa.HProcID, qb.HBadQty " +
+ // ") bad on aa.HProcExchInterID = bad.HProcExchInterID and aa.HProcID = bad.HProcID " +
+ // "group by aa.HProcExchBillNo, aa.HProcExchInterID, aa.HProcID, bad.HBadQty, bad.HName " +
+ // ") co on a.HProcExchInterID = co.HProcExchInterID and a.HProcID = co.HProcID " +
+ // "left join Gy_Process d on c.HProcID = d.HItemID " +
+ // "where 1 = 1 " + sDlgWhere +
+ // "group by a.HICMOBillNo,c.HProcExchBillNo,d.HName,b.HName,a.HICMOQty,c.HQty,a.HPlanQty" +
+ // ",co.HQty,c.HProcID,co.HWasterQty,co.HName,co.HBadQty,a.HWasterQty " +
+ // "order by c.HProcID", "Sc_StationOutBillMain", ref ClsPub.sExeReturnInfo);
+
+
+
+
+
//杩囨护鏉′欢Dlg
string sDlgWhere = "";
- if (txtHProcessExchangeBillNo.Text != "")//娴佽浆鍗�
+ sDlgWhere = sDlgWhere + ",'" + txtHProcessExchangeBillNo.Text + "'";
+ sDlgWhere = sDlgWhere + ",'" + txtHICMOBillNo.Text + "'";
+ sDlgWhere = sDlgWhere + ",'" + textHmaterName.Text + "'";
+ sDlgWhere = sDlgWhere + ",'" + textHprocName.Text + "'";
+ sDlgWhere = sDlgWhere + ",'" + dtpHBDate.Value.ToShortDateString() + "'";
+ sDlgWhere = sDlgWhere + ",'" + dtpHEDate.Value.ToShortDateString() + "'";
+ if (sDlgWhere.Trim().Length > 0)
{
- sDlgWhere = sDlgWhere + "and c.HProcExchBillNo like '%" + txtHProcessExchangeBillNo.Text + "%'";
+ sDlgWhere = sDlgWhere.Substring(1, sDlgWhere.Length - 1);
}
- if (txtHICMOBillNo.Text != "")//鐢熶骇璁㈠崟
- {
- sDlgWhere = sDlgWhere + "and a.HICMOBillNo like '%" + txtHICMOBillNo.Text + "%'";
- }
- if (textHmaterName.Text != "")//鐗╂枡
- {
- sDlgWhere = sDlgWhere + "and b.HName like '%" + textHmaterName.Text + "%'";
- }
- if (textHprocName.Text != "")//宸ュ簭
- {
- sDlgWhere = sDlgWhere + "and d.HName like '%" + textHprocName.Text + "%'";
- }
- if (dtpHBDate.Value.ToShortDateString() != "")//寮�濮嬫棩鏈�
- {
- sDlgWhere = sDlgWhere + "and a.HMakeDate >= '" + dtpHBDate.Value.ToShortDateString() + "'";
- }
- if (dtpHEDate.Value.ToShortDateString() != "")//缁撴潫鏃ユ湡
- {
- sDlgWhere = sDlgWhere + "and a.HMakeDate <= '" + dtpHEDate.Value.ToShortDateString() + "'";
- }
- //杩囨护鏉′欢
- //string sWhere = "";
- //sWhere = sWhere + ",'" + this.dtpHBDate.Value.ToShortDateString() + "'";
- //sWhere = sWhere + ",'" + this.dtpHEDate.Value.ToShortDateString() + "'";
- //sWhere = sWhere + ",1,3";
- ////sWhere = sWhere + ",'" + frmQuery.dtpHBakEndDate.Value.ToShortDateString() + "'";
- ////sWhere = sWhere + "," + frmQuery.txtHCusID.Tag.ToString().Trim();
- //if (sWhere.Trim().Length > 0)
- //{
- // sWhere = sWhere.Substring(1, sWhere.Length - 1);
- //}
- //
- DSet = SubCn.RunProcReturn("select " +
- "MAX(a.HMakeDate) 姹囨姤鏃ユ湡, a.HICMOBillNo 浠诲姟鍗曞彿, c.HProcExchBillNo 娴佽浆鍗″彿, c.HProcID, d.HName 宸ュ簭鍚嶇О" +
- ", sum(a.HWorkTimes) 宸ユ椂, b.HName 鐗╂枡鍚嶇О, a.HICMOQty 鐢熶骇璁㈠崟鏁伴噺, a.HPlanQty 璁″垝鏁伴噺, c.HQty 杩涚珯鏁伴噺" +
- ", co.HQty 鍑虹珯鍚堟牸鏁伴噺, c.HQty - co.HQty - co.HWasterQty 鏈繘绔欐暟閲�" +
- ", co.HWasterQty 涓嶅悎鏍兼暟閲�, co.HQty / nullif((co.HQty+co.HWasterQty),0) 鍑虹珯鑹巼, co.HName 涓嶈壇鏄庣粏, co.HBadQty 涓嶈壇鏁伴噺 " +
- " FROM Sc_StationOutBillMain a " +
- "left join Gy_Material b on a.HMaterID = b.HItemID " +
- "left join( " +
- "select sum(aa.HQty) HQty, aa.HProcExchBillNo, aa.HProcExchInterID, aa.HProcID " +
- "from Sc_StationInBillMain aa " +
- "group by aa.HProcExchBillNo, aa.HProcExchInterID, aa.HProcID " +
- ") c on a.HProcExchInterID = c.HProcExchInterID and a.HProcID = c.HProcID " +
- "left join( " +
- "select sum(aa.HQty) HQty, sum(aa.HWasterQty) HWasterQty, bad.HBadQty, bad.HName" +
- ", aa.HProcExchBillNo, aa.HProcExchInterID, aa.HProcID " +
- "from Sc_StationOutBillMain aa " +
- "left join ( " +
- "select qa.HProcExchInterID, qb.HBadQty, qbr.HName, qa.HProcID " +
- "from QC_NoPassProdCheckBillMain qa " +
- "left join QC_NoPassProdCheckBillsub qb on qa.HInterID = qb.HInterID " +
- "left join Gy_BadReason qbr on qb.HBadReasonID = qbr.HItemID " +
- "group by qa.HProcExchInterID, qbr.HName, qa.HProcID, qb.HBadQty " +
- ") bad on aa.HProcExchInterID = bad.HProcExchInterID and aa.HProcID = bad.HProcID " +
- "group by aa.HProcExchBillNo, aa.HProcExchInterID, aa.HProcID, bad.HBadQty, bad.HName " +
- ") co on a.HProcExchInterID = co.HProcExchInterID and a.HProcID = co.HProcID " +
- "left join Gy_Process d on c.HProcID = d.HItemID " +
- "where 1 = 1 " + sDlgWhere +
- "group by a.HICMOBillNo,c.HProcExchBillNo,d.HName,b.HName,a.HICMOQty,c.HQty,a.HPlanQty" +
- ",co.HQty,c.HProcID,co.HWasterQty,co.HName,co.HBadQty,a.HWasterQty " +
- "order by c.HProcID", "Sc_StationOutBillMain", ref ClsPub.sExeReturnInfo);
+
+ DSet = SubCn.RunProcReturn("exec h_p_DefectiveDetailedYieldReport_New " + sDlgWhere, "h_p_DefectiveDetailedYieldReport_New");
+
//鐢熸垚棣栬鏍囬
if (DSet == null)
{
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBillList.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBillList.cs"
index ec5b2b8..8b46c94 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBillList.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBillList.cs"
@@ -10,6 +10,7 @@
using DBUtility;
using System.IO;
using System.Reflection;
+using Pub_Class;
namespace WorkM
{
@@ -263,11 +264,15 @@
{
if (MessageBox.Show("纭畾瑕佸垹闄ゅ綋鍓嶅崟鎹紵", "鎻愮ず", MessageBoxButtons.OKCancel) == DialogResult.OK)
{
- if (oBill.omodel.HMaker != ClsPub.CurUserName && (ClsPub.CurUserName != "admin" && ClsPub.CurUserName != "Admin"))
+ ClsXt_SystemParameter oClsXt_SystemParameter = new ClsXt_SystemParameter();
+ string DeleteCtl = oClsXt_SystemParameter.GetSingleSystemParameter("MES_StationEntrustInBill_DeleteCtl", ref DBUtility.ClsPub.sExeReturnInfo);
+
+ if (DeleteCtl == "Y" && oBill.omodel.HMaker != DBUtility.ClsPub.CurUserName && DBUtility.ClsPub.CurUserName != "admin" && DBUtility.ClsPub.CurUserName != "Admin")
{
- MessageBox.Show("鍙兘鍒犻櫎鏈汉鐨勫崟鎹紒", "鎻愮ず");
+ MessageBox.Show("鐧诲綍鐢ㄦ埛涓庡埗鍗曚汉涓嶄竴鑷达紝涓嶅厑璁稿垹闄�", "鎻愮ず");
return;
}
+
string c = "";
//if (oBill.DeleteCheck(oBill.omodel.HInterID, "濮斿鍙戝嚭鍗�", ref c) == false)
//{
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBillList.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBillList.cs"
index 602f3a2..ff0dc2b 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBillList.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBillList.cs"
@@ -10,6 +10,7 @@
using DBUtility;
using System.IO;
using System.Reflection;
+using Pub_Class;
namespace WorkM
{
@@ -262,11 +263,15 @@
{
if (MessageBox.Show("纭畾瑕佸垹闄ゅ綋鍓嶅崟鎹紵", "鎻愮ず", MessageBoxButtons.OKCancel)==DialogResult.OK)
{
- if (oBill.omodel.HMaker != ClsPub.CurUserName && (ClsPub.CurUserName != "admin" && ClsPub.CurUserName != "Admin"))
+ ClsXt_SystemParameter oClsXt_SystemParameter = new ClsXt_SystemParameter();
+ string DeleteCtl = oClsXt_SystemParameter.GetSingleSystemParameter("MES_StationOutBill_DeleteCtl", ref DBUtility.ClsPub.sExeReturnInfo);
+
+ if (DeleteCtl == "Y" && oBill.omodel.HMaker != DBUtility.ClsPub.CurUserName && DBUtility.ClsPub.CurUserName != "admin" && DBUtility.ClsPub.CurUserName != "Admin")
{
- MessageBox.Show("鍙兘鍒犻櫎鏈汉鐨勫崟鎹紒", "鎻愮ず");
+ MessageBox.Show("鐧诲綍鐢ㄦ埛涓庡埗鍗曚汉涓嶄竴鑷达紝涓嶅厑璁稿垹闄�", "鎻愮ず");
return;
}
+
//妫�鏌ユ槸鍚﹀紑绁�
//string d = "";
//if (oBill.CheckIsKP(oBill.omodel.HInterID, ref d) == false)
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBillList.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBillList.cs"
index a1de99a..d8e2e06 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBillList.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBillList.cs"
@@ -10,6 +10,7 @@
using DBUtility;
using System.IO;
using System.Reflection;
+using Pub_Class;
namespace WorkM
{
@@ -216,9 +217,12 @@
{
if (MessageBox.Show("纭畾瑕佸垹闄ゅ綋鍓嶅崟鎹紵", "鎻愮ず", MessageBoxButtons.OKCancel)==DialogResult.OK)
{
- if (oBill.omodel.HMaker != ClsPub.CurUserName && (ClsPub.CurUserName != "admin" && ClsPub.CurUserName != "Admin"))
+ ClsXt_SystemParameter oClsXt_SystemParameter = new ClsXt_SystemParameter();
+ string DeleteCtl = oClsXt_SystemParameter.GetSingleSystemParameter("MES_StationInBill_DeleteCtl", ref DBUtility.ClsPub.sExeReturnInfo);
+
+ if (DeleteCtl == "Y" && oBill.omodel.HMaker != DBUtility.ClsPub.CurUserName && DBUtility.ClsPub.CurUserName != "admin" && DBUtility.ClsPub.CurUserName != "Admin")
{
- MessageBox.Show("鍙兘鍒犻櫎鏈汉鐨勫崟鎹紒", "鎻愮ず");
+ MessageBox.Show("鐧诲綍鐢ㄦ埛涓庡埗鍗曚汉涓嶄竴鑷达紝涓嶅厑璁稿垹闄�", "鎻愮ず");
return;
}
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList.cs"
index 2bb87a6..f6be688 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList.cs"
@@ -10,6 +10,7 @@
using DBUtility;
using System.IO;
using System.Reflection;
+using Pub_Class;
namespace WorkM
{
@@ -217,9 +218,12 @@
{
if (MessageBox.Show("纭畾瑕佸垹闄ゅ綋鍓嶅崟鎹紵", "鎻愮ず", MessageBoxButtons.OKCancel)==DialogResult.OK)
{
- if (oBill.omodel.HMaker != ClsPub.CurUserName && (ClsPub.CurUserName != "admin" && ClsPub.CurUserName != "Admin"))
+ ClsXt_SystemParameter oClsXt_SystemParameter = new ClsXt_SystemParameter();
+ string DeleteCtl = oClsXt_SystemParameter.GetSingleSystemParameter("MES_StationOutBill_DeleteCtl", ref DBUtility.ClsPub.sExeReturnInfo);
+
+ if (DeleteCtl == "Y" && oBill.omodel.HMaker != DBUtility.ClsPub.CurUserName && DBUtility.ClsPub.CurUserName != "admin" && DBUtility.ClsPub.CurUserName != "Admin")
{
- MessageBox.Show("鍙兘鍒犻櫎鏈汉鐨勫崟鎹紒", "鎻愮ず");
+ MessageBox.Show("鐧诲綍鐢ㄦ埛涓庡埗鍗曚汉涓嶄竴鑷达紝涓嶅厑璁稿垹闄�", "鎻愮ず");
return;
}
@@ -634,9 +638,9 @@
for (int i = 0; i < grdMain.SelectedRows.Count; i++)
{
BillSelect oSelect = new BillSelect();
- oSelect.BillNo = ClsPub.isStrNull(grdMain.Rows[grdMain.SelectedRows[i].Index].Cells[BillNoCol].Value);
- oSelect.BillMainID = ClsPub.isLong(grdMain.Rows[grdMain.SelectedRows[i].Index].Cells[MainIDCol].Value);
- oSelect.BillSubID = ClsPub.isLong(grdMain.Rows[grdMain.SelectedRows[i].Index].Cells[SubIDCol].Value);
+ oSelect.BillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.SelectedRows[i].Index].Cells[BillNoCol].Value);
+ oSelect.BillMainID = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.SelectedRows[i].Index].Cells[MainIDCol].Value);
+ oSelect.BillSubID = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.SelectedRows[i].Index].Cells[SubIDCol].Value);
oSelect.BillTitle = "宸ュ簭鍑虹珯姹囨姤鍗�";
oSelect.BillType = ModName;
oBillSelectColl.Add(oSelect);
diff --git "a/WorkM/\350\275\246\351\227\264\347\256\241\347\220\206/QC_NoPassProdCheckBill.cs" "b/WorkM/\350\275\246\351\227\264\347\256\241\347\220\206/QC_NoPassProdCheckBill.cs"
index 5a1499e..1c0679d 100644
--- "a/WorkM/\350\275\246\351\227\264\347\256\241\347\220\206/QC_NoPassProdCheckBill.cs"
+++ "b/WorkM/\350\275\246\351\227\264\347\256\241\347\220\206/QC_NoPassProdCheckBill.cs"
@@ -179,6 +179,15 @@
return;
}
//
+ ClsXt_SystemParameter oClsXt_SystemParameter = new ClsXt_SystemParameter();
+ string DeleteCtl = oClsXt_SystemParameter.GetSingleSystemParameter("QC_NoPassProdCheckBill_DeleteCtl", ref DBUtility.ClsPub.sExeReturnInfo);
+
+ if (DeleteCtl == "Y" && BillOld.omodel.HMaker != DBUtility.ClsPub.CurUserName && DBUtility.ClsPub.CurUserName != "admin" && DBUtility.ClsPub.CurUserName != "Admin")
+ {
+ MessageBox.Show("鐧诲綍鐢ㄦ埛涓庡埗鍗曚汉涓嶄竴鑷达紝涓嶅厑璁稿垹闄�", "鎻愮ず");
+ return;
+ }
+ //
if (MessageBox.Show("纭畾瑕佸垹闄ゅ綋鍓嶅崟鎹紵", "鎻愮ず", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK)
{
--
Gitblit v1.9.1