From 93b9f26c4581fa9d39f064a453fc21a67d582152 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期二, 28 六月 2022 08:46:12 +0800
Subject: [PATCH] 合并
---
WebAPI/Controllers/工资管理/Gy_ClassTimePrjSubController.cs | 50
WarM/条码打印/Sc_ICMOToBarCode.cs | 44
WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs | 178
BLL/公用模块/FrmLogin.designer.cs | 115
WebAPI/WebAPI.csproj.user | 2
WorkM/流转卡管理/MES_StationInBill.cs | 30
WorkM/流转卡管理/Sc_ProcessExchangeBill.cs | 514 ++-
Model/obj/x86/Release/Model.csproj.AssemblyReference.cache | 0
WebAPI/Models/ClsKf_ICStockBillMain.cs | 6
WebAPI/Controllers/SCGL/日计划管理/JIT_Cg_PODemandPlanBillController.cs | 50
WarM/WarM.csproj.user | 2
DAL/车间管理/ClsSc_ProcessExchangeBill.cs | 24
WebAPI/Controllers/MateOutController.cs | 3
WebAPI/Models/Cls_InventoryAnalysisList.cs | 1
WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs | 11
WebAPI/Models/基础资料/Gy_Process.cs | 1
Model/基础资料/基础资料/ClsGy_Source_Model.cs | 1
WorkM/流转卡管理/MES_StationInBill.designer.cs | 346 +-
SQLHelper/obj/x86/Release/SQLHelper.csproj.AssemblyReference.cache | 0
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 2
WebAPI/Controllers/基础资料/基础资料/Gy_StockCheckItemBillController.cs | 15
WebAPI/Controllers/仓存管理/领料发货/Kf_MateOutBackBillController.cs | 8
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs | 3
WebAPI/Controllers/WebAPIController.cs | 98
DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache | 0
WebAPI/Controllers/POStockInBillController.cs | 120
WebAPI/Controllers/生产管理/生产任务单/Sc_ICMOBillController.cs | 27
WebAPI/Controllers/生产管理/报工台工序/Sc_MESBeginStepWorkBillController.cs | 99
WebAPI/Controllers/BaseSet/Gy_ProcessController.cs | 7
WebAPI/Models/Gy_Group.cs | 1
WebAPI/Vlog/webapi20220623.txt | 1
WarM/Sc_MESNowWorkBill_Fast.cs | 1593 ++++++++++++
WebAPI/Controllers/工资管理/Pay_WorkTimesBillController.cs | 1
WebAPI/Controllers/博日自动扫码线/ScanlineAPIController.cs | 11
WebAPI/Controllers/工资管理/Pay_SingleBalBillController.cs | 2
WebAPI/Config/kdapi.config | 9
WebAPI/WebAPI.csproj | 45
WebAPI/Controllers/工资管理/Gy_ClassTimePrjBillController.cs | 3
WebAPI/DLL/ClsGy_Source_Ctl.cs | 4
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 203
WebAPI/Controllers/SCGL/日计划管理/Sc_WorkDemandPlanBillController.cs | 53
Model/车间管理/ClsSc_ProcessExchangeBillMain.cs | 2
WarM/Sc_MESNowWorkBill_Fast.designer.cs | 2070 +++++++++++++++
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 4
WebAPI/Utility/Util.cs | 124
SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache | 0
DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache | 0
WarM/Sc_MESNowWorkBill_Fast.resx | 777 +++++
WarM/WarM.csproj | 10
WebAPI/Sc_MouldProdOutBill/Log/637915974420110542.log | 3
WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs | 142 +
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | 24
WarM/条码打印/Sc_ICMOToBarCode.designer.cs | 328 +-
WebAPI/Controllers/BaseSet/Gy_GroupController.cs | 5
WebAPI/InvokeHelper.cs | 17
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs | 16
BLL/公用模块/FrmLogin.resx | 2
WebAPI/Controllers/PublicPageMethodController.cs | 28
WarM/条码打印/Sc_ICMOToBarCode.resx | 8
WebAPI/Models/Gy_WorkCenter.cs | 1
WebAPI/Controllers/Sc_ProcessMangementController.cs | 196 +
BLL/公用模块/FrmLogin.cs | 212
Pub_Class/CustomerCls/ClsPub.cs | 135 +
63 files changed, 6,688 insertions(+), 1,099 deletions(-)
diff --git "a/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/FrmLogin.cs" "b/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/FrmLogin.cs"
index af3aed1..03207e5 100644
--- "a/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/FrmLogin.cs"
+++ "b/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/FrmLogin.cs"
@@ -271,6 +271,7 @@
{
textBox1.Visible = true;
button1.Visible = true;
+ textBox1.Focus();
}
else
{
@@ -455,107 +456,122 @@
private void textBox1_TextChanged(object sender, EventArgs e)
{
- //string HPassWord = textBox1.Text.Trim().ToString();
- ////MessageBox.Show(HPassWord);
- //SQLHelper.ClsCN oCn1 = new SQLHelper.ClsCN();
- ////1.鏌ユ壘鏁版嵁搴撴搷浣滃憳绠＄悊琛ㄩ噷闈㈡槸鍚︽湁瀵瑰簲杩欎釜鍔犲瘑瀛楃涓插搴旂殑璁板綍
- //DataSet DSet = oCn1.RunProcReturn("select Czybm,Czmm from Gy_Czygl where HICNumber ='" + HPassWord + "'", "Gy_Czygl");
- //if (DSet == null || DSet.Tables[0].Rows.Count == 0)
- ////if (DSet == null|| DSet.Tables[0].Rows.Count == 0)
- //{
- // MessageBox.Show("娌℃湁鎵惧埌瀵瑰簲鑱屽憳淇℃伅锛岃閲嶆柊鍒峰崱" + DBUtility.ClsPub.sExeReturnInfo);
- // //textBox1.Text = "";
- // return;
- //}
- //else
- //{
- // cmbUser.Text = ClsPub.isStrNull(DSet.Tables[0].Rows[0]["Czybm"]);
- // if (AllowLogin() != true)
- // return;
- // DataSet ds = null;
- // ClsCNmaster oCn = new ClsCNmaster();
- // ClsCN oCnLoc = new ClsCN();
- // string sDataBase;
- // string sDataBase_K3 = "";
- // string sDataBase_K32 = "";
- // string sDataBase_K33 = "";
- // sDataBase = oCn.GetDataBase(cmbAccount.Text.Trim(), ref sDataBase_K3);
- // ClsIni oIni = new ClsIni();
- // ClsIni.WriteIni("Erp", "DataBase", sDataBase.Trim(), DBUtility.ClsPub.AppPath + @"/HXERP.ini");
- // ClsIni.WriteIni("K3Erp", "DataBase", sDataBase_K3.Trim(), DBUtility.ClsPub.AppPath + @"/HXERP.ini");
- // DAL.ClsUser oUser = new DAL.ClsUser();
+ }
- // ds = oUser.CheckCzymc(cmbUser.Text.Trim(),textBox1.Text.Trim());
- // if (ds == null)
- // {
- // MessageBox.Show("閫夋嫨鐨勫笎濂椾笉瀛樺湪锛�", "鎻愮ず");
- // return;
- // }
- // if (ds.Tables[0].Rows.Count > 0)
- // {
- // ClsPub.CurUserID = ds.Tables[0].Rows[0]["Czybm"].ToString();
- // this.Close();
- // isOk = true;
- // }
- // else
- // {
- // MessageBox.Show("閿欒鐨勭敤鎴峰瘑鐮侊紒", "鎻愮ず", MessageBoxButtons.OK, MessageBoxIcon.Error);
- // return;
- // }
- // //寰楀埌褰撳墠浼氳鏈熼棿
- // int sYear = 0;
- // int sPeriod = 0;
- // if (!ClsPub.Sub_GetCurPeriod(ref sYear, ref sPeriod))
- // {
- // MessageBox.Show("寰楀埌褰撳墠浼氳鏈熼棿澶辫触锛�", "鎻愮ず", MessageBoxButtons.OK, MessageBoxIcon.Error);
- // isOk = false;
- // return;
- // }
- // //
- // this.Close();
- // isOk = true;
- // ClsIni.WriteIni("Erp", "DataBaseNumber", cmbAccount.Text.Trim(), DBUtility.ClsPub.AppPath + @"/HXERP.ini");
- // //瀛樺叆鐢ㄦ埛鍚嶅瘑鐮�
- // //
- // UserName = cmbUser.Text.Trim() + "," + UserName;
- // string[] str = UserName.Split(',');
- // List<string> listStr = new List<string>();
- // foreach (string eachStr in str)
- // {
- // if (!listStr.Contains(eachStr))
- // listStr.Add(eachStr);
- // }
- // UserName = "";
- // if (listStr.Count > 10)
- // {
- // listStr.RemoveAt(10);
- // }
- // foreach (string eachStr in listStr)
- // {
- // UserName = UserName + eachStr + ",";
- // }
- // UserName = UserName.Remove(UserName.LastIndexOf(","), 1);
- // //
- // ClsIni.WriteIni("UserInfo", "UserName", UserName, DBUtility.ClsPub.AppPath + @"/HXERP.ini");
- // ClsIni.WriteIni("UserInfo", "HOrgName", cmbHOrg.Text.ToString(), DBUtility.ClsPub.AppPath + @"/HXERP.ini");
- // ClsPub.CurUserName = cmbUser.Text.Trim();
- // ClsPub.AppPath = System.Environment.CurrentDirectory;
- // ClsPub.HOrgID = ClsPub.get_ORGANIZATIONSIDByName(ClsPub.isStrNull(cmbHOrg.Text));
- // ClsPub.HOrgNumber = ClsPub.get_ORGANIZATIONSNOByName(ClsPub.isStrNull(cmbHOrg.Text));
- // ClsPub.HOrgName = ClsPub.isStrNull(cmbHOrg.Text);
- // if (chkRemember.Checked == true)
- // {
- // ClsIni.WriteIni("UserInfo", "UserPsd", "", DBUtility.ClsPub.AppPath + @"/HXERP.ini");
- // ClsIni.WriteIni("UserInfo", "Remember", "1", DBUtility.ClsPub.AppPath + @"/HXERP.ini");
- // }
- // else
- // {
- // ClsIni.WriteIni("UserInfo", "UserPsd", "", DBUtility.ClsPub.AppPath + @"/HXERP.ini");
- // ClsIni.WriteIni("UserInfo", "Remember", "0", DBUtility.ClsPub.AppPath + @"/HXERP.ini");
- // }
- //}
+ private void textBox1_KeyDown(object sender, KeyEventArgs e)
+ {
+ string HPassWord = textBox1.Text.Trim().ToString();
+ if (HPassWord.Length < 10)
+ {
+ return;
+ }
+ //MessageBox.Show(HPassWord);
+ //婕旂ず瑙嗛鐢紝骞虫椂灞忚斀鎺�
+ if (HPassWord.Trim() == "3012460306-1" || HPassWord.Contains("3012460306-1") == true)
+ {
+ MessageBox.Show("鎮ㄥ埛鐨勫憳宸ュ崱锛屾病鏈夌粡杩囨妧鑳界殑鍩硅锛屼笉鑳藉湪鏈伐绔欎笂宀楋紒");
+ return;
+ }
+ //
+ SQLHelper.ClsCN oCn1 = new SQLHelper.ClsCN();
+ //1.鏌ユ壘鏁版嵁搴撴搷浣滃憳绠＄悊琛ㄩ噷闈㈡槸鍚︽湁瀵瑰簲杩欎釜鍔犲瘑瀛楃涓插搴旂殑璁板綍
+ DataSet DSet = oCn1.RunProcReturn("select Czybm,Czmm from Gy_Czygl where HICNumber ='" + HPassWord + "'", "Gy_Czygl");
+ if (DSet == null || DSet.Tables[0].Rows.Count == 0)
+ //if (DSet == null|| DSet.Tables[0].Rows.Count == 0)
+ {
+ MessageBox.Show("娌℃湁鎵惧埌瀵瑰簲鑱屽憳淇℃伅锛岃閲嶆柊鍒峰崱" + DBUtility.ClsPub.sExeReturnInfo);
+ //textBox1.Text = "";
+ return;
+ }
+ else
+ {
+ cmbUser.Text = ClsPub.isStrNull(DSet.Tables[0].Rows[0]["Czybm"]);
+ if (AllowLogin() != true)
+ return;
+ //DataSet ds = null;
+ ClsCNmaster oCn = new ClsCNmaster();
+ ClsCN oCnLoc = new ClsCN();
+ string sDataBase;
+ string sDataBase_K3 = "";
+ string sDataBase_K32 = "";
+ string sDataBase_K33 = "";
+ sDataBase = oCn.GetDataBase(cmbAccount.Text.Trim(), ref sDataBase_K3);
+ ClsIni oIni = new ClsIni();
+ ClsIni.WriteIni("Erp", "DataBase", sDataBase.Trim(), DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+ ClsIni.WriteIni("K3Erp", "DataBase", sDataBase_K3.Trim(), DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+ DAL.ClsUser oUser = new DAL.ClsUser();
+
+ //ds = oUser.CheckCzymc(cmbUser.Text.Trim(), textBox1.Text.Trim());
+ //if (ds == null)
+ //{
+ // MessageBox.Show("閫夋嫨鐨勫笎濂椾笉瀛樺湪锛�", "鎻愮ず");
+ // return;
+ //}
+ //if (ds.Tables[0].Rows.Count > 0)
+ //{
+ ClsPub.CurUserID = DSet.Tables[0].Rows[0]["Czybm"].ToString();
+ this.Close();
+ isOk = true;
+ //}
+ //else
+ //{
+ // MessageBox.Show("閿欒鐨勭敤鎴峰瘑鐮侊紒", "鎻愮ず", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ // return;
+ //}
+ //寰楀埌褰撳墠浼氳鏈熼棿
+ int sYear = 0;
+ int sPeriod = 0;
+ if (!ClsPub.Sub_GetCurPeriod(ref sYear, ref sPeriod))
+ {
+ MessageBox.Show("寰楀埌褰撳墠浼氳鏈熼棿澶辫触锛�", "鎻愮ず", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ isOk = false;
+ return;
+ }
+ //
+ this.Close();
+ isOk = true;
+ ClsIni.WriteIni("Erp", "DataBaseNumber", cmbAccount.Text.Trim(), DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+ //瀛樺叆鐢ㄦ埛鍚嶅瘑鐮�
+ //
+ UserName = cmbUser.Text.Trim() + "," + UserName;
+ string[] str = UserName.Split(',');
+ List<string> listStr = new List<string>();
+ foreach (string eachStr in str)
+ {
+ if (!listStr.Contains(eachStr))
+ listStr.Add(eachStr);
+ }
+ UserName = "";
+ if (listStr.Count > 10)
+ {
+ listStr.RemoveAt(10);
+ }
+ foreach (string eachStr in listStr)
+ {
+ UserName = UserName + eachStr + ",";
+ }
+ UserName = UserName.Remove(UserName.LastIndexOf(","), 1);
+ //
+ ClsIni.WriteIni("UserInfo", "UserName", UserName, DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+ ClsIni.WriteIni("UserInfo", "HOrgName", cmbHOrg.Text.ToString(), DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+ ClsPub.CurUserName = cmbUser.Text.Trim();
+ ClsPub.AppPath = System.Environment.CurrentDirectory;
+ ClsPub.HOrgID = ClsPub.get_ORGANIZATIONSIDByName(ClsPub.isStrNull(cmbHOrg.Text));
+ ClsPub.HOrgNumber = ClsPub.get_ORGANIZATIONSNOByName(ClsPub.isStrNull(cmbHOrg.Text));
+ ClsPub.HOrgName = ClsPub.isStrNull(cmbHOrg.Text);
+ if (chkRemember.Checked == true)
+ {
+ ClsIni.WriteIni("UserInfo", "UserPsd", "", DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+ ClsIni.WriteIni("UserInfo", "Remember", "1", DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+ }
+ else
+ {
+ ClsIni.WriteIni("UserInfo", "UserPsd", "", DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+ ClsIni.WriteIni("UserInfo", "Remember", "0", DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+ }
+ }
}
}
}
\ No newline at end of file
diff --git "a/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/FrmLogin.designer.cs" "b/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/FrmLogin.designer.cs"
index cb36c14..b3a6adc 100644
--- "a/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/FrmLogin.designer.cs"
+++ "b/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/FrmLogin.designer.cs"
@@ -58,18 +58,20 @@
//
this.label1.AutoSize = true;
this.label1.BackColor = System.Drawing.Color.White;
- this.label1.Location = new System.Drawing.Point(279, 260);
+ this.label1.Location = new System.Drawing.Point(372, 325);
+ this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(59, 12);
+ this.label1.Size = new System.Drawing.Size(76, 15);
this.label1.TabIndex = 0;
this.label1.Text = "鐢� 鎴� 鍚�:";
//
// txtUser
//
this.txtUser.ImeMode = System.Windows.Forms.ImeMode.On;
- this.txtUser.Location = new System.Drawing.Point(78, 149);
+ this.txtUser.Location = new System.Drawing.Point(104, 186);
+ this.txtUser.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtUser.Name = "txtUser";
- this.txtUser.Size = new System.Drawing.Size(167, 21);
+ this.txtUser.Size = new System.Drawing.Size(221, 25);
this.txtUser.TabIndex = 1;
this.txtUser.Visible = false;
this.txtUser.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtUser_KeyUp);
@@ -77,10 +79,11 @@
// txtPsd
//
this.txtPsd.ImeMode = System.Windows.Forms.ImeMode.On;
- this.txtPsd.Location = new System.Drawing.Point(347, 290);
+ this.txtPsd.Location = new System.Drawing.Point(463, 362);
+ this.txtPsd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtPsd.Name = "txtPsd";
this.txtPsd.PasswordChar = '*';
- this.txtPsd.Size = new System.Drawing.Size(167, 21);
+ this.txtPsd.Size = new System.Drawing.Size(221, 25);
this.txtPsd.TabIndex = 3;
this.txtPsd.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtPsd_KeyUp);
//
@@ -88,17 +91,19 @@
//
this.label2.AutoSize = true;
this.label2.BackColor = System.Drawing.Color.White;
- this.label2.Location = new System.Drawing.Point(279, 293);
+ this.label2.Location = new System.Drawing.Point(372, 366);
+ this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(59, 12);
+ this.label2.Size = new System.Drawing.Size(76, 15);
this.label2.TabIndex = 2;
this.label2.Text = "瀵� 銆�鐮�:";
//
// btnOK
//
- this.btnOK.Location = new System.Drawing.Point(391, 339);
+ this.btnOK.Location = new System.Drawing.Point(521, 424);
+ this.btnOK.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnOK.Name = "btnOK";
- this.btnOK.Size = new System.Drawing.Size(81, 25);
+ this.btnOK.Size = new System.Drawing.Size(108, 31);
this.btnOK.TabIndex = 4;
this.btnOK.Text = "纭畾(&O)";
this.btnOK.UseVisualStyleBackColor = true;
@@ -106,9 +111,10 @@
//
// button2
//
- this.button2.Location = new System.Drawing.Point(502, 339);
+ this.button2.Location = new System.Drawing.Point(669, 424);
+ this.button2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(81, 25);
+ this.button2.Size = new System.Drawing.Size(108, 31);
this.button2.TabIndex = 5;
this.button2.Text = "鍙栨秷(&C)";
this.button2.UseVisualStyleBackColor = true;
@@ -118,9 +124,10 @@
//
this.label3.AutoSize = true;
this.label3.BackColor = System.Drawing.Color.White;
- this.label3.Location = new System.Drawing.Point(279, 222);
+ this.label3.Location = new System.Drawing.Point(372, 278);
+ this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(59, 12);
+ this.label3.Size = new System.Drawing.Size(75, 15);
this.label3.TabIndex = 6;
this.label3.Text = "閫夋嫨甯愬:";
//
@@ -129,17 +136,19 @@
this.cmbAccount.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbAccount.FormattingEnabled = true;
this.cmbAccount.ImeMode = System.Windows.Forms.ImeMode.On;
- this.cmbAccount.Location = new System.Drawing.Point(347, 219);
+ this.cmbAccount.Location = new System.Drawing.Point(463, 274);
+ this.cmbAccount.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmbAccount.Name = "cmbAccount";
- this.cmbAccount.Size = new System.Drawing.Size(167, 20);
+ this.cmbAccount.Size = new System.Drawing.Size(221, 23);
this.cmbAccount.TabIndex = 7;
//
// lblStatus
//
this.lblStatus.BackColor = System.Drawing.Color.Transparent;
- this.lblStatus.Location = new System.Drawing.Point(240, 339);
+ this.lblStatus.Location = new System.Drawing.Point(320, 424);
+ this.lblStatus.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblStatus.Name = "lblStatus";
- this.lblStatus.Size = new System.Drawing.Size(145, 21);
+ this.lblStatus.Size = new System.Drawing.Size(193, 26);
this.lblStatus.TabIndex = 8;
this.lblStatus.Click += new System.EventHandler(this.lblStatus_Click);
//
@@ -152,9 +161,10 @@
//
this.chkRemember.AutoSize = true;
this.chkRemember.BackColor = System.Drawing.Color.White;
- this.chkRemember.Location = new System.Drawing.Point(520, 295);
+ this.chkRemember.Location = new System.Drawing.Point(693, 369);
+ this.chkRemember.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.chkRemember.Name = "chkRemember";
- this.chkRemember.Size = new System.Drawing.Size(72, 16);
+ this.chkRemember.Size = new System.Drawing.Size(89, 19);
this.chkRemember.TabIndex = 9;
this.chkRemember.Text = "淇濆瓨瀵嗙爜";
this.chkRemember.UseVisualStyleBackColor = false;
@@ -163,36 +173,40 @@
// lblChangePsd
//
this.lblChangePsd.BackColor = System.Drawing.Color.Transparent;
- this.lblChangePsd.Location = new System.Drawing.Point(547, 6);
+ this.lblChangePsd.Location = new System.Drawing.Point(729, 8);
+ this.lblChangePsd.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblChangePsd.Name = "lblChangePsd";
- this.lblChangePsd.Size = new System.Drawing.Size(66, 21);
+ this.lblChangePsd.Size = new System.Drawing.Size(88, 26);
this.lblChangePsd.TabIndex = 10;
this.lblChangePsd.Click += new System.EventHandler(this.lblChangePsd_Click);
//
// lblSetServer
//
this.lblSetServer.BackColor = System.Drawing.Color.Transparent;
- this.lblSetServer.Location = new System.Drawing.Point(459, 6);
+ this.lblSetServer.Location = new System.Drawing.Point(612, 8);
+ this.lblSetServer.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblSetServer.Name = "lblSetServer";
- this.lblSetServer.Size = new System.Drawing.Size(66, 21);
+ this.lblSetServer.Size = new System.Drawing.Size(88, 26);
this.lblSetServer.TabIndex = 11;
this.lblSetServer.Click += new System.EventHandler(this.lblSetServer_Click);
//
// lblVersion
//
this.lblVersion.BackColor = System.Drawing.Color.Transparent;
- this.lblVersion.Location = new System.Drawing.Point(454, 130);
+ this.lblVersion.Location = new System.Drawing.Point(605, 162);
+ this.lblVersion.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblVersion.Name = "lblVersion";
this.lblVersion.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
- this.lblVersion.Size = new System.Drawing.Size(150, 15);
+ this.lblVersion.Size = new System.Drawing.Size(200, 19);
this.lblVersion.TabIndex = 12;
//
// lblVersion2
//
this.lblVersion2.BackColor = System.Drawing.Color.Transparent;
- this.lblVersion2.Location = new System.Drawing.Point(451, 152);
+ this.lblVersion2.Location = new System.Drawing.Point(601, 190);
+ this.lblVersion2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblVersion2.Name = "lblVersion2";
- this.lblVersion2.Size = new System.Drawing.Size(150, 15);
+ this.lblVersion2.Size = new System.Drawing.Size(200, 19);
this.lblVersion2.TabIndex = 13;
this.lblVersion2.Visible = false;
//
@@ -202,9 +216,10 @@
this.label4.BackColor = System.Drawing.Color.Transparent;
this.label4.Font = new System.Drawing.Font("瀹嬩綋", 7.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.ForeColor = System.Drawing.Color.Yellow;
- this.label4.Location = new System.Drawing.Point(486, 104);
+ this.label4.Location = new System.Drawing.Point(648, 130);
+ this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(49, 10);
+ this.label4.Size = new System.Drawing.Size(63, 13);
this.label4.TabIndex = 14;
this.label4.Text = "鎵嬪姩鏇存柊";
this.label4.Click += new System.EventHandler(this.label4_Click);
@@ -213,17 +228,19 @@
//
this.lblIPAddress.AutoSize = true;
this.lblIPAddress.BackColor = System.Drawing.Color.Transparent;
- this.lblIPAddress.Location = new System.Drawing.Point(389, 380);
+ this.lblIPAddress.Location = new System.Drawing.Point(519, 475);
+ this.lblIPAddress.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblIPAddress.Name = "lblIPAddress";
- this.lblIPAddress.Size = new System.Drawing.Size(0, 12);
+ this.lblIPAddress.Size = new System.Drawing.Size(0, 15);
this.lblIPAddress.TabIndex = 15;
//
// cmbUser
//
this.cmbUser.FormattingEnabled = true;
- this.cmbUser.Location = new System.Drawing.Point(347, 257);
+ this.cmbUser.Location = new System.Drawing.Point(463, 321);
+ this.cmbUser.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmbUser.Name = "cmbUser";
- this.cmbUser.Size = new System.Drawing.Size(167, 20);
+ this.cmbUser.Size = new System.Drawing.Size(221, 23);
this.cmbUser.TabIndex = 16;
//
// cmbHOrg
@@ -231,46 +248,51 @@
this.cmbHOrg.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbHOrg.FormattingEnabled = true;
this.cmbHOrg.ImeMode = System.Windows.Forms.ImeMode.On;
- this.cmbHOrg.Location = new System.Drawing.Point(347, 187);
+ this.cmbHOrg.Location = new System.Drawing.Point(463, 234);
+ this.cmbHOrg.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmbHOrg.Name = "cmbHOrg";
- this.cmbHOrg.Size = new System.Drawing.Size(167, 20);
+ this.cmbHOrg.Size = new System.Drawing.Size(221, 23);
this.cmbHOrg.TabIndex = 18;
//
// label5
//
this.label5.AutoSize = true;
this.label5.BackColor = System.Drawing.Color.White;
- this.label5.Location = new System.Drawing.Point(279, 190);
+ this.label5.Location = new System.Drawing.Point(372, 238);
+ this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(59, 12);
+ this.label5.Size = new System.Drawing.Size(77, 15);
this.label5.TabIndex = 17;
this.label5.Text = "缁� 缁�:";
//
// button1
//
- this.button1.Location = new System.Drawing.Point(269, 339);
+ this.button1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
+ this.button1.Location = new System.Drawing.Point(359, 424);
+ this.button1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(81, 25);
+ this.button1.Size = new System.Drawing.Size(108, 31);
this.button1.TabIndex = 19;
this.button1.Text = "鍒峰崱鐧婚檰";
- this.button1.UseVisualStyleBackColor = true;
+ this.button1.UseVisualStyleBackColor = false;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// textBox1
//
this.textBox1.ImeMode = System.Windows.Forms.ImeMode.On;
- this.textBox1.Location = new System.Drawing.Point(347, 149);
+ this.textBox1.Location = new System.Drawing.Point(463, 186);
+ this.textBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox1.Name = "textBox1";
- this.textBox1.Size = new System.Drawing.Size(167, 21);
+ this.textBox1.Size = new System.Drawing.Size(221, 25);
this.textBox1.TabIndex = 20;
- this.textBox1.TextChanged += new System.EventHandler(this.textBox1_TextChanged);
+ this.textBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox1_KeyDown);
//
// FrmLogin
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("$this.BackgroundImage")));
- this.ClientSize = new System.Drawing.Size(613, 401);
+ this.ClientSize = new System.Drawing.Size(817, 501);
this.Controls.Add(this.textBox1);
this.Controls.Add(this.button1);
this.Controls.Add(this.cmbHOrg);
@@ -294,6 +316,7 @@
this.Controls.Add(this.label1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.ImeMode = System.Windows.Forms.ImeMode.On;
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "FrmLogin";
diff --git "a/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/FrmLogin.resx" "b/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/FrmLogin.resx"
index 331d1a0..072b05d 100644
--- "a/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/FrmLogin.resx"
+++ "b/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/FrmLogin.resx"
@@ -121,7 +121,7 @@
<value>17, 17</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>25</value>
+ <value>66</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
diff --git "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs" "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs"
index b6d37ed..74ca52f 100644
--- "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs"
+++ "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs"
@@ -117,7 +117,7 @@
",HMaterTexture='" + omodel.HMaterTexture + "'" +
",HProductNum='" + omodel.HProductNum + "'" +
",HVerNum='" + omodel.HVerNum + "'" +
- ",WorkBillSortNo='" + omodel.WorkBillSortNo + "'" +
+ ",HWorkBillSortNo='" + omodel.HWorkBillSortNo + "'" +
//鍔犲叆鐢熶骇绫诲瀷
",HWorkTypeNum='" + omodel.HWorkTypeNum + "'" +
" where HInterID=" + lngBillKey.ToString());
@@ -168,7 +168,7 @@
",'" + oSub.HKeyProc + "','" + oSub.HFstProc + "'," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "'," + oSub.HWWOrderInterID.ToString() +
"," + oSub.HWWOrderEntryID.ToString() + ",'" + oSub.HWWOrderBillNo + "'," + oSub.HReportQty.ToString() + "," + Convert.ToString(oSub.HBackProc ? 1 : 0) +
"," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "," + oSub.HOverRate.ToString() + "," + oSub.HMaxQty.ToString() + ",'" + oSub.HTechnologyParameter + "','" + oSub.HProcCheckNote + "','" + oSub.HPicNum + "'" +
- ",'" + oSub.HMouldNo?.ToString() + "','" + oSub.HProcWorkNum?.ToString() + "','"+ omodel.HSeOrderInterID.ToString() + "','"+ omodel.HSeOrderEntryID.ToString() + "'"+
+ ",'" + oSub.HMouldNo + "','" + oSub.HProcWorkNum + "','" + DBUtility.ClsPub.isStrNull(omodel.HSeOrderInterID) + "','" + DBUtility.ClsPub.isStrNull(omodel.HSeOrderEntryID) + "'"+
") ");
oCn.RunProc(sql1);
}
@@ -269,6 +269,7 @@
//鏂板鍗曟嵁
public override bool AddBill(ref string sReturn)
{
+ string sErr = "";
try
{
//寰楀埌mainid
@@ -279,6 +280,7 @@
//omodel.HProjectNum = "";
//omodel.HProjectNum = GetNewCodeByNum(omodel.HInterID, 1, 3).ToString();
//
+
oCn.BeginTran();
//涓昏〃
oCn.RunProc("Insert Into Sc_ProcessExchangeBillMain " +
@@ -292,7 +294,7 @@
",HProdMaterName,HCusName,HWorkRemark,HImportNote,HMaterNumber_A" +
",HMaterNumber_B,HMaterNumber_C,HMaterNumber_D,HProdType,HMaterShortName" +
",HMaterIDA,HMaterIDB,HMaterIDC,HMaterIDD,HICMOEntryID" +
- ",HPicNumVer,HPicNumAssemble,HMaterTexture,HProductNum,HVerNum,HPRDORGID,HBLFlag,WorkBillSortNo" +
+ ",HPicNumVer,HPicNumAssemble,HMaterTexture,HProductNum,HVerNum,HPRDORGID,HBLFlag,HWorkBillSortNo" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMaker + "',getdate()," + "" + (omodel.HPrevMainSourceInterID == 0 ? omodel.HInterID : omodel.HPrevMainSourceInterID) +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HBatchNo + "'," + omodel.HMainMaterID.ToString() + "," + omodel.HKeyMaterID.ToString() + "," + omodel.HNo.ToString() + ",'" + omodel.HOrderProcNO + "'" +
@@ -304,8 +306,9 @@
",'" + omodel.HProdMaterName + "','" + omodel.HCusName + "','" + omodel.HWorkRemark + "','" + omodel.HImportNote + "','" + omodel.HMaterNumber_A + "'" +
",'" + omodel.HMaterNumber_B + "','" + omodel.HMaterNumber_C + "','" + omodel.HMaterNumber_D + "','" + omodel.HProdType + "','" + omodel.HMaterShortName + "'" +
",'" + omodel.HMaterIDA + "','" + omodel.HMaterIDB + "','" + omodel.HMaterIDC + "','" + omodel.HMaterIDD + "'," + omodel.HICMOEntryID +
- ",'" + omodel.HPicNumVer + "','" + omodel.HPicNumAssemble + "','" + omodel.HMaterTexture + "','" + omodel.HProductNum + "','" + omodel.HVerNum + "','"+ omodel.HPRDORGID+ "','"+omodel.HBLFlag+"','" + omodel.WorkBillSortNo +
+ ",'" + omodel.HPicNumVer + "','" + omodel.HPicNumAssemble + "','" + omodel.HMaterTexture + "','" + omodel.HProductNum + "','" + omodel.HVerNum + "','"+ omodel.HPRDORGID+ "','"+omodel.HBLFlag+"','" + omodel.HWorkBillSortNo +
"') ");
+ sErr = sErr + "1;";
//鎻掑叆瀛愯〃
foreach (Model.ClsSc_ProcessExchangeBillSub oSub in DetailColl)
{
@@ -345,9 +348,11 @@
",'" + oSub.HKeyProc + "','" + oSub.HFstProc + "'," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "'," + oSub.HWWOrderInterID.ToString() +
"," + oSub.HWWOrderEntryID.ToString() + ",'" + oSub.HWWOrderBillNo + "'," + oSub.HReportQty.ToString() + "," + Convert.ToString(oSub.HBackProc ? 1 : 0) +
"," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "," + oSub.HOverRate.ToString() + "," + oSub.HMaxQty.ToString() + ",'" + oSub.HTechnologyParameter + "','" + oSub.HProcCheckNote + "','" + oSub.HPicNum + "'" +
- ",'" + oSub.HMouldNo?.ToString() + "','" + oSub.HProcWorkNum?.ToString() + "','" + omodel.HSeOrderInterID.ToString() + "','" + omodel.HSeOrderEntryID.ToString() + "'" +
+ ",'" + oSub.HMouldNo + "','" + oSub.HProcWorkNum + "','" + DBUtility.ClsPub.isStrNull( omodel.HSeOrderInterID) + "','" + DBUtility.ClsPub.isStrNull(omodel.HSeOrderEntryID) + "'" +
") ");
+ sErr = sErr + sql1 + "2;";
oCn.RunProc(sql1);
+ sErr = sErr + "2;";
//鏇存柊鎵�閫夋祦杞崱鏁伴噺
if (!oSub.HBackProc)
{
@@ -358,10 +363,13 @@
}
}
+ sErr = sErr + "3;";
}
oCn.RunProc("exec h_p_Sc_ProcessExchangeBill_SetRemark " + omodel.HInterID.ToString()); //璁剧疆 澶囨敞 涓� 宸ヨ壓娴�
+ sErr = sErr + "4;";
oCn.RunProc("exec h_p_Sc_ProcessExchangeBill_SetUpdate " + omodel.HInterID.ToString()); //璁剧疆 鏈亾 棣栭亾 杞� 绛変俊鎭�
+ sErr = sErr + "5;";
DataSet ds = new DataSet();
//璁剧疆鏉＄爜鍙� 鍥炲～ 棰嗘枡鎵规
ds = oCn.RunProcReturn("exec h_p_Mes_ProcessExchangeBackBarCode " + omodel.HInterID.ToString(), "h_p_Mes_ProcessExchangeBackBarCode");
@@ -372,10 +380,11 @@
return false;
}
+ sErr = sErr + "6;";
//oCn.RunProc("exec h_p_Sc_ProcessExchangeBill_SetDate " + omodel.HInterID.ToString()); //鍥炲～ 寮�宸ュ畬宸ユ棩鏈�
//oCn.RunProc("exec h_p_Sc_ProcessExchangeBill_RelationQty " + omodel.HInterID.ToString() + ",1"); //杩斿伐娴佽浆鍗� 鍙嶅啓 鎷嗗垎鏁伴噺 鍥炲～浠诲姟鍗� 娴佽浆鍗℃暟閲� 鍥炲～浠诲姟鍗曚笂闄愭暟閲�
-
+
//鎺у埗鍏宠仈鏁伴噺
ds = null;
ds = oCn.RunProcReturn("exec h_p_Sc_ProcessExchangeBill_Checkqty " + omodel.HInterID.ToString(), "h_p_Sc_ProcessExchangeBill_Checkqty");
@@ -386,6 +395,7 @@
return false;
}
+ sErr = sErr + "7;";
//
sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
@@ -394,7 +404,7 @@
}
catch (Exception e)
{
- sReturn = e.Message;
+ sReturn = sErr + "," + e.Message;
oCn.RollBack();
throw (e);
}
diff --git a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
index 9fa8240..1abdfb0 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache b/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
index a1123a1..0869c19 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
Binary files differ
diff --git a/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache b/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache
index 79cf853..f3f1c92 100644
--- a/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache
+++ b/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache
Binary files differ
diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Source_Model.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Source_Model.cs"
index 080cbaa..fd811db 100644
--- "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Source_Model.cs"
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Source_Model.cs"
@@ -22,5 +22,6 @@
public double HMaxWorkTimes;//money //单班最大工时 --addnew
public double HMinAdd;// money //最小进阶 --addnew
public Int64 HClassCount;// int //每日班次 --addnew
+ public int HUSEORGID;
}
}
diff --git "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillMain.cs" "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillMain.cs"
index e481a7d..6cae548 100644
--- "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillMain.cs"
+++ "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillMain.cs"
@@ -66,6 +66,6 @@
public string HVerNum;//版本
public string HSeOrderEntryID;
public string HSeOrderInterID;
- public string WorkBillSortNo;
+ public string HWorkBillSortNo;
}
}
diff --git a/Pub_Class/CustomerCls/ClsPub.cs b/Pub_Class/CustomerCls/ClsPub.cs
index f87582c..615388e 100644
--- a/Pub_Class/CustomerCls/ClsPub.cs
+++ b/Pub_Class/CustomerCls/ClsPub.cs
@@ -418,7 +418,7 @@
}
return sBillNo;
- case 1://鏍规嵁 YY骞�+MM鏈� + 娴佹按鍙� 鐢熸垚鍗曟嵁鍙�
+ case 1://鏍规嵁 YY骞�+MM鏈� 鏃� + 娴佹按鍙� 鐢熸垚鍗曟嵁鍙� 锛堟棩 閲囩敤浜� 浠撳簱鐨勫瓧娈碉級
sKjYear = sKjYear.Substring(2, 2);
sPeriod = "0" + sPeriod;
sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);
@@ -440,7 +440,6 @@
oCn.RunProc("update Gy_Maxnum set NowNumBer=NowNumBer+1 where BillCode='" + BillCode.Trim() + "' and KjYear='" + sKjYear + "' and Period='" + sPeriod + "' and whcode='" + sDay + "'");
}
return sBillNo;
-
case 2: //鏍规嵁骞�+鏈�+鏃� 鐢熸垚鍗曟嵁鍙�
Ds = oCn.RunProcReturn("Select * from Gy_MaxNum where BillCode='" + BillCode.Trim() + "' and KjYear='" + sKjYear + "' and Period='" + sPeriod + "' and whcode='" + sDay + "'", "Gy_MaxNum");
if (Ds.Tables[0].Rows.Count != 0)
@@ -476,6 +475,138 @@
oCn = null;
}
+ //寰楀埌鏈�澶у崟鎹彿
+ public static string CreateBillCode(string BillCode,string HOrgNumber,Int64 HOrgID,string HWhNumber, ref string sReturn, bool Add)
+ {
+ Int64 BillCodeMode;
+ string Profix;
+ Int64 Glida;
+ Int32 CodeLen;
+ string sBillNo = "";
+ char c = Convert.ToChar("0");
+ string sKjYear = DateTime.Today.Year.ToString();
+ string sPeriod = DateTime.Today.Month.ToString();
+ string sDay = DateTime.Today.Day.ToString();
+ //寰楀埌鍗曟嵁鍙疯〃 淇℃伅
+ ClsSqlHelper oCn = new ClsSqlHelper();
+ DataSet Ds = new DataSet();
+ Ds = oCn.RunProcReturn("Select * from Gy_BillNumber where BillCode='" + BillCode.Trim() + "'", "Gy_BillNumber");
+ if (Ds.Tables[0].Rows.Count != 0)
+ {
+ BillCodeMode = ClsPub.isLong(Ds.Tables[0].Rows[0]["BillCodeMode"].ToString());
+ Profix = ClsPub.isStrNull(Ds.Tables[0].Rows[0]["Profix"].ToString());
+ Glida = ClsPub.isLong(Ds.Tables[0].Rows[0]["Glida"].ToString());
+ CodeLen = ClsPub.isInt(Ds.Tables[0].Rows[0]["CodeLen"].ToString());
+ }
+ else
+ {
+ return "";
+ }
+ //
+ string sStr;
+ switch (BillCodeMode)
+ {
+ case 0:
+ switch (Glida)
+ {
+ case 0://绾祦姘村彿
+ Ds = oCn.RunProcReturn("Select * from Gy_MaxNum where BillCode='" + BillCode.Trim() + "'", "Gy_MaxNum");
+ if (Ds.Tables[0].Rows.Count != 0)
+ {
+ sStr = new string(c, CodeLen - (Ds.Tables[0].Rows[0]["NowNumBer"].ToString()).Length);
+ sBillNo = Profix.Trim() + sStr + Ds.Tables[0].Rows[0]["NowNumBer"].ToString().Trim();
+ }
+ else //鎻掑叆鏂拌褰�
+ {
+ sStr = new string(c, CodeLen - 1);
+ oCn.RunProc("insert into Gy_MaxNum(BillCode,NowNumber) values('" + BillCode.Trim() + "',1)");
+ sBillNo = Profix.Trim() + sStr + 1;
+ }
+ if (Add == true)
+ {
+ oCn.RunProc("update Gy_Maxnum set NowNumBer=NowNumBer+1 where BillCode='" + BillCode.Trim() + "'");
+ }
+ return sBillNo;
+
+ case 1://鏍规嵁 YY骞�+MM鏈� 鏃� + 娴佹按鍙� 鐢熸垚鍗曟嵁鍙� 锛堟棩 閲囩敤浜� 浠撳簱鐨勫瓧娈碉級
+ sKjYear = sKjYear.Substring(2, 2);
+ sPeriod = "0" + sPeriod;
+ sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);
+ sDay = "";
+ Ds = oCn.RunProcReturn("Select * from Gy_MaxNum where BillCode='" + BillCode.Trim() + "' and KjYear='" + sKjYear + "' and Period='" + sPeriod + "' and whcode='" + sDay + "'", "Gy_MaxNum");
+ if (Ds.Tables[0].Rows.Count != 0)
+ {
+ sStr = new string(c, CodeLen - (Ds.Tables[0].Rows[0]["NowNumBer"].ToString()).Length);
+ sBillNo = Profix.Trim() + sKjYear + sPeriod + sDay + sStr + Ds.Tables[0].Rows[0]["NowNumBer"].ToString().Trim();
+ }
+ else //鎻掑叆鏂拌褰�
+ {
+ sStr = new string(c, CodeLen - 1);
+ oCn.RunProc("insert into Gy_Maxnum(BillCode,Kjyear,Period,whcode,NowNumber) values('" + BillCode.Trim() + "','" + sKjYear + "','" + sPeriod + "','" + sDay + "',1)");
+ sBillNo = Profix.Trim() + sKjYear + sPeriod + sDay + sStr + "1";
+ }
+ if (Add == true)
+ {
+ oCn.RunProc("update Gy_Maxnum set NowNumBer=NowNumBer+1 where BillCode='" + BillCode.Trim() + "' and KjYear='" + sKjYear + "' and Period='" + sPeriod + "' and whcode='" + sDay + "'");
+ }
+ return sBillNo;
+ case 2: //鏍规嵁骞�+鏈�+鏃� 鐢熸垚鍗曟嵁鍙� (杩欏姛鑳� 濂藉儚鏄綔搴熶簡锛�
+ Ds = oCn.RunProcReturn("Select * from Gy_MaxNum where BillCode='" + BillCode.Trim() + "' and KjYear='" + sKjYear + "' and Period='" + sPeriod + "' and whcode='" + sDay + "'", "Gy_MaxNum");
+ if (Ds.Tables[0].Rows.Count != 0)
+ {
+ sStr = new string(c, CodeLen - (Ds.Tables[0].Rows[0]["NowNumBer"].ToString()).Length);
+ sBillNo = Profix.Trim() + sKjYear + ClsPub.isStrNull(("0" + sPeriod)).Substring(ClsPub.isStrNull(("0" + sPeriod)).Length - 2, 2) + ClsPub.isStrNull(("0" + sDay)).Substring(ClsPub.isStrNull(("0" + sDay)).Length - 2, 2) + sStr + Ds.Tables[0].Rows[0]["NowNumBer"].ToString().Trim();
+ }
+ else //鎻掑叆鏂拌褰�
+ {
+ sStr = new string(c, CodeLen - 1);
+ oCn.RunProc("insert into Gy_Maxnum(BillCode,Kjyear,Period,whcode,NowNumber) values('" + BillCode.Trim() + "','" + sKjYear + "','" + sPeriod + "','" + sDay + "',1)");
+ sBillNo = Profix.Trim() + sKjYear + ClsPub.isStrNull(("0" + sPeriod)).Substring(ClsPub.isStrNull(("0" + sPeriod)).Length - 2, 2) + ClsPub.isStrNull(("0" + sDay)).Substring(ClsPub.isStrNull(("0" + sDay)).Length - 2, 2) + sStr + 1;
+ }
+ if (Add == true)
+ {
+ oCn.RunProc("update Gy_Maxnum set NowNumBer=NowNumBer+1 where BillCode='" + BillCode.Trim() + "' and KjYear='" + sKjYear + "' and Period='" + sPeriod + "' and whcode='" + sDay + "'");
+ }
+ return sBillNo;
+ case 3://鏍规嵁 鍓嶇紑+缁勭粐+ YY骞�+MM鏈� + 娴佹按鍙� 鐢熸垚鍗曟嵁鍙� 锛堢粍缁� 閲囩敤浜� 浠撳簱鐨勫瓧娈碉級
+ sKjYear = sKjYear.Substring(2, 2);
+ sPeriod = "0" + sPeriod;
+ sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);
+
+ Ds = oCn.RunProcReturn("Select * from Gy_MaxNum where BillCode='" + BillCode.Trim() + "' and KjYear='" + sKjYear + "' and Period='" + sPeriod + "' and whcode='" + HOrgNumber + "'", "Gy_MaxNum");
+ if (Ds.Tables[0].Rows.Count != 0)
+ {
+ sStr = new string(c, CodeLen - (Ds.Tables[0].Rows[0]["NowNumBer"].ToString()).Length);
+ sBillNo = Profix.Trim() + HOrgNumber + sKjYear + sPeriod + sStr + Ds.Tables[0].Rows[0]["NowNumBer"].ToString().Trim();
+ }
+ else //鎻掑叆鏂拌褰�
+ {
+ sStr = new string(c, CodeLen - 1);
+ oCn.RunProc("insert into Gy_Maxnum(BillCode,Kjyear,Period,whcode,NowNumber) values('" + BillCode.Trim() + "','" + sKjYear + "','" + sPeriod + "','" + HOrgNumber + "',1)");
+ sBillNo = Profix.Trim() + sKjYear + sPeriod + sDay + sStr + "1";
+ }
+ if (Add == true)
+ {
+ oCn.RunProc("update Gy_Maxnum set NowNumBer=NowNumBer+1 where BillCode='" + BillCode.Trim() + "' and KjYear='" + sKjYear + "' and Period='" + sPeriod + "' and whcode='" + HOrgNumber + "'");
+ }
+ return sBillNo;
+ default:
+ return sBillNo;
+
+ }
+
+ case 1:
+ return sBillNo;
+
+ default:
+ return sBillNo;
+
+ }
+ oCn.CnClose();
+ oCn.CnDispose();
+ oCn = null;
+ }
+
//寰楀埌鏈�澶у崟鎹彿2
public static string CreateBillCode(string BillCode, ref string sReturn, bool Add,ClsSqlHelper oCn)
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index 0c4eba6..c385dfd 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -152,6 +152,10 @@
{
omodel.Kf_MateOutBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_FIFOList") //先进先出下架清单
+ {
+ omodel.Kf_MateOutBill_FIFOList = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_FIFOCtl") //先进先出控制
{
omodel.Kf_MateOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -302,6 +306,10 @@
{
omodel.Kf_EntrustOutBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_FIFOList") //先进先出下架清单
+ {
+ omodel.Kf_EntrustOutBill_FIFOList = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_FIFOCtl")
{
omodel.Kf_EntrustOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -355,6 +363,10 @@
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_BillTypeOneScan")
{
omodel.Kf_SellOutBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_FIFOList") //先进先出下架清单
+ {
+ omodel.Kf_SellOutBill_FIFOList = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_FIFOCtl")
{
@@ -452,6 +464,14 @@
{
omodel.Kf_MoveStockBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_FIFOList") //先进先出下架清单
+ {
+ omodel.Kf_MoveStockBill_FIFOList = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_FIFOCtl")
+ {
+ omodel.Kf_MoveStockBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_MustQtyCtl")
{
omodel.Kf_MoveStockBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -532,6 +552,10 @@
{
omodel.Kf_MoveStockStepOutBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepOutBill_FIFOList") //先进先出下架清单
+ {
+ omodel.Kf_MoveStockStepOutBill_FIFOList = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepOutBill_FIFOCtl")
{
omodel.Kf_MoveStockStepOutBill_FIFOCtl = 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 c7f65d7..67c6362 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -23,7 +23,8 @@
public string Kf_MateOutBill_AutoCheck;
public string Kf_MateOutBill_ERPMode;
public string Kf_MateOutBill_MustQtyCtl;
- public string Kf_MateOutBill_FIFOCtl;
+ public string Kf_MateOutBill_FIFOList; //先进先出下架清单
+ public string Kf_MateOutBill_FIFOCtl; //先进先出控制
public string Kf_MateOutBill_AutoBarCode; //免扫码模式， 不需要扫码物料条码自动写入临时表（只支持品种码）
public string Kf_MateOutBill_MulSourceBill; //多源单模式
public string Kf_MateOutBill_SimpleMode; //简洁模式（不显示源单列表，只显示扫码记录，但后台仍控制）
@@ -65,7 +66,8 @@
public string Kf_EntrustOutBill_AutoCheck;
public string Kf_EntrustOutBill_ERPMode;
public string Kf_EntrustOutBill_MustQtyCtl;
- public string Kf_EntrustOutBill_FIFOCtl;
+ public string Kf_EntrustOutBill_FIFOList; //先进先出下架清单
+ public string Kf_EntrustOutBill_FIFOCtl; //先进先出控制
public string Kf_EntrustOutBill_MulSourceBill; //多源单模式
public string Kf_EntrustOutBill_SimpleMode; //简洁模式（不显示源单列表，只显示扫码记录，但后台仍控制）
public string Kf_EntrustOutBill_BillTypeOneScan;//本单据类型内只允许一次扫码（唯一码，含缓存列表）
@@ -80,7 +82,8 @@
public string Kf_SellOutBill_AutoCheck;
public string Kf_SellOutBill_ERPMode;
public string Kf_SellOutBill_MustQtyCtl;
- public string Kf_SellOutBill_FIFOCtl;
+ public string Kf_SellOutBill_FIFOList; //先进先出下架清单
+ public string Kf_SellOutBill_FIFOCtl; //先进先出控制
public string Kf_SellOutBill_MulSourceBill; //多源单模式
public string Kf_SellOutBill_AutoSavePOStockInBill; //同步生成采购入库单
public string Kf_SellOutBill_NoRefresh; //PDA不自动刷新
@@ -106,10 +109,12 @@
public string Kf_OtherOutBill_BarCodeMustSameSourceBill; // 条码必须同源单一致
public string Kf_OtherOutBill_BillTypeOneScan;//本单据类型内只允许一次扫码（唯一码，含缓存列表）
public string Kf_OtherOutBillCheck_MustQtyCtl; //校验数量控制
- //调拨
+ //直接调拨
public string Kf_MoveStockBill_AutoCheck;
public string Kf_MoveStockBill_ERPMode;
public string Kf_MoveStockBill_MustQtyCtl;
+ public string Kf_MoveStockBill_FIFOList; //先进先出下架清单
+ public string Kf_MoveStockBill_FIFOCtl; //先进先出控制
public string Kf_MoveStockBill_MulSourceBill; //多源单模式
public string Kf_MoveStockBill_BarCodeMustSameSourceBill; // 条码必须同源单一致
public string Kf_MoveStockBill_BillTypeOneScan;//本单据类型内只允许一次扫码（唯一码，含缓存列表）
@@ -138,7 +143,8 @@
public string Kf_MoveStockStepOutBill_ERPMode; //ERP模式
public string Kf_MoveStockStepOutBill_MustQtyCtl; //
public string Kf_MoveStockStepOutBill_MulSourceBill;//
- public string Kf_MoveStockStepOutBill_FIFOCtl; //先进先出控制
+ public string Kf_MoveStockStepOutBill_FIFOList; //先进先出下架清单
+ public string Kf_MoveStockStepOutBill_FIFOCtl; //先进先出控制
public string Kf_MoveStockStepOutBill_BillTypeOneScan;//本单据类型内只允许一次扫码（唯一码，含缓存列表）
//分步式调入单
public string Kf_MoveStockStepInBill_AutoCheck; //自动审核
diff --git a/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache b/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..c40953a
--- /dev/null
+++ b/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
Binary files differ
diff --git a/SQLHelper/obj/x86/Release/SQLHelper.csproj.AssemblyReference.cache b/SQLHelper/obj/x86/Release/SQLHelper.csproj.AssemblyReference.cache
index 441ae09..f5e894a 100644
--- a/SQLHelper/obj/x86/Release/SQLHelper.csproj.AssemblyReference.cache
+++ b/SQLHelper/obj/x86/Release/SQLHelper.csproj.AssemblyReference.cache
Binary files differ
diff --git a/WarM/Sc_MESNowWorkBill_Fast.cs b/WarM/Sc_MESNowWorkBill_Fast.cs
new file mode 100644
index 0000000..5dd6652
--- /dev/null
+++ b/WarM/Sc_MESNowWorkBill_Fast.cs
@@ -0,0 +1,1593 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using gregn6Lib;
+using Pub_Class;
+using System.IO;
+
+namespace WarM
+{
+ public partial class Sc_MESNowWorkBill_Fast : Form
+ {
+ //BLL.BardCodeHooK BarCode = new BLL.BardCodeHooK();
+ public Sc_MESNowWorkBill_Fast()
+ {
+ InitializeComponent();
+ //BarCode.BarCodeEvent += new BLL.BardCodeHooK.BardCodeDeletegate(BarCode_BarCodeEvent);
+ }
+ //瀹氫箟鍒�
+ public const Int16 HTagCol = 0;
+ public const Int16 HSnoCol = 1;
+ public const Int16 HProcIDCol = 2;
+ public const Int16 HProcNumberCol = 3;
+ public const Int16 HProcNameCol = 4;
+ public const Int16 HMaterIDCol = 5;
+ public const Int16 HMaterNumberCol = 6;
+ public const Int16 HMaterNameCol = 7;
+ public const Int16 HEmpIDCol = 8;
+ public const Int16 HEmpNumberCol = 9;
+ public const Int16 HEmpNameCol = 10;
+ public const Int16 HGroupIDCol = 11;
+ public const Int16 HGroupNumberCol = 12;
+ public const Int16 HGroupNameCol = 13;
+ public const Int16 HSourceIDCol = 14;
+ public const Int16 HSourceNumberCol = 15;
+ public const Int16 HSourceNameCol = 16;
+ public const Int16 HBadBarCodeCol = 17;
+ public const Int16 HBadReasonIDCol = 18;
+ public const Int16 HBadReasonNumberCol = 19;
+ public const Int16 HBadReasonNameCol = 20;
+ public const Int16 HBadCountCol = 21;
+ public const Int16 HBadPrirceCol = 22;
+ public const Int16 HBadMoneyCol = 23;
+ public const Int16 HCheckEmpIDCol = 24;
+ public const Int16 HCheckEmpNumberCol = 25;
+ public const Int16 HCheckEmpNameCol = 26;
+ public const Int16 HICMOInterIDCol = 27;
+ public const Int16 HICMOBillNoCol = 28;
+ public const Int16 HWWOrderInterIDCol = 29;
+ public const Int16 HWWOrderEntryIDCol = 30;
+ public const Int16 HWWOrderBillNoCol = 31;
+ public const Int16 HSeOrderInterIDCol = 32;
+ public const Int16 HSeOrderEntryIDCol = 33;
+ public const Int16 HSeOrderBillNoCol = 34;
+ public const Int16 HProcExchInterIDCol = 35;
+ public const Int16 HProcExchEntryIDCol = 36;
+ public const Int16 HProcExchBillNoCol = 37;
+ public const Int16 HProcExchReportInterIDCol = 38;
+ public const Int16 HProcExchReportEntryIDCol = 39;
+ public const Int16 HProcExchReportBillNoCol = 40;
+
+ public const Int16 HEntryIDCol = 41;
+ public const Int16 HCloseManCol = 42;
+ public const Int16 HEntryCloseDateCol = 43;
+ public const Int16 HCloseTypeCol = 44;
+ public const Int16 HRemarkCol = 45;
+ public const Int16 HSourceInterIDCol = 46;
+ public const Int16 HSourceEntryIDCol = 47;
+ public const Int16 HSourceBillNoCol = 48;
+ public const Int16 HSourceBillTypeCol = 49;
+ public const Int16 HRelationQtyCol = 50;
+ public const Int16 HRelationMoneyCol = 51;
+ //
+ //
+ //琛�2
+ public const Int16 SecHTagCol = 0;
+ public const Int16 SecHSnoCol = 1;
+ public const Int16 SecHMaterIDCol = 2;
+ public const Int16 SecHMaterNumberCol = 3;
+ public const Int16 SecHMaterNameCol = 4;
+ public const Int16 SecHMaterModelCol = 5;
+ public const Int16 SecHBarCodeCol = 6;
+ public const Int16 SecHQtyCol = 7;
+ public const Int16 SecHWhIDCol = 8;
+ public const Int16 SecHWhNumberCol = 9;
+ public const Int16 SecHWhNameCol = 10;
+ public const Int16 SecHSourceInterIDCol = 11;
+ public const Int16 SecHSourceEntryIDCol = 12;
+ public const Int16 SecHSourceBillTypeCol = 13;
+ public const Int16 SecHSourceBillNoCol = 14;
+ //
+ public const string ModName = "3787"; //鍗曟嵁绫诲瀷
+ public string ModCaption = "宸ヤ綅浣滀笟鎸囧涔�"; //鍗曟嵁鍚嶇О
+ public const string ModRightName = "Sc_MESBeginWorkBill";
+ public const string ModRightNameEdit = ModRightName + "_Edit";
+ public const string ModRightNameCheck = ModRightName + "_Check";
+ public const string ModRightNameClose = ModRightName + "_Close";
+ public const string ModRightNameDelete = ModRightName + "_Delete";
+ public const string ModRightNameMoney = ModRightName + "_Money";
+ public const string ModRightNameQty = ModRightName + "_Qty";
+ public bool BillChange; //鍗曟嵁淇敼鐘舵��
+ //
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus; //鍗曟嵁鐘舵�侊紙鏂板锛屼慨鏀癸紝娴忚锛屾洿鏂板崟浠凤紝鍙樻洿锛�
+ public Int64 KeyID; //鍗曟嵁涓诲唴鐮�
+ public bool grdStatus; //缃戞牸鐘舵�侊紙涓嶅彲缂栬緫锛屽彲缂栬緫锛�
+ public long HICMOInterID = 0;
+ public string HICMOBillNo = "";
+ public long HMaterID = 0;
+ public string HBatchNo = "";
+ public DAL.ClsSc_MESBeginWorkBill BillNew =new DAL.ClsSc_MESBeginWorkBill(); //瀵瑰簲鍗曟嵁绫�
+ public DAL.ClsSc_MESBeginWorkBill BillOld = new DAL.ClsSc_MESBeginWorkBill(); //瀵瑰簲鍗曟嵁绫�
+ Pub_Class.ClsGridListSum oSumGrid = new Pub_Class.ClsGridListSum();
+ //-------------------------------------------------------------------------
+
+ #region 鍥哄畾浠ｇ爜
+
+
+ //娓呯┖鐣岄潰
+ public void Sub_ClearBill()
+ {
+ DBUtility.Xt_BaseBillFun.Sub_ClearBill(gbUp);
+ //
+ }
+
+ //绐椾綋鍔犺浇
+ private void Sc_MESNowWorkBill_Fast_Load(object sender, EventArgs e)
+ {
+ //鎵撳嵃鍒濆鍖�
+ //
+ //oSumGrid_Sub.NoCol = SecHSnoCol;
+ //oSumGrid_Sub.ogrdMain = grdSub;
+ //oSumGrid_Sub.oGridsum = grdSumSub;
+ this.Text = ModCaption; //鍛藉悕绐椾綋鏍囬
+ this.lblCaption.Text = ModCaption;//鍛藉悕鍗曟嵁鏍囬
+ //
+ //BarCode.Start();
+ }
+
+ //棣栧紶
+ private void Sub_First()
+ {
+ BillStatus =DBUtility.ClsPub.Enum_BillStatus.BillStatus_View;
+ BillOld = new DAL.ClsSc_MESBeginWorkBill();
+ if (BillOld.GetFirstBill(ref ClsPub.sExeReturnInfo))
+ {
+ this.Sub_ShowBill();
+ }
+ else //娌℃湁鎵惧埌鍒� 鍙樹负鏂板鐘舵��
+ {
+ this.Sub_AddBill();
+ }
+ }
+
+ //涓婂紶
+ private void Sub_Prev()
+ {
+ BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_View;
+ if (BillOld.GetPrevousBill(ref ClsPub.sExeReturnInfo,txtHBillNo.Text))
+ {
+ this.Sub_ShowBill();
+ }
+ }
+
+ //涓嬪紶
+ private void Sub_Next()
+ {
+ BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_View;
+ if (BillOld.GetNextBill(ref ClsPub.sExeReturnInfo, txtHBillNo.Text))
+ {
+ this.Sub_ShowBill();
+ }
+ }
+
+ //鏈紶
+ private void Sub_Last()
+ {
+ BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_View;
+ BillOld = new DAL.ClsSc_MESBeginWorkBill();
+ if (BillOld.GetLastBill(ref ClsPub.sExeReturnInfo))
+ {
+ this.Sub_ShowBill();
+ }
+ }
+
+ //瀹℃牳鍗曟嵁
+ private void Sub_CheckBill()
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!ClsPub.Security_Log(ModRightNameCheck, 1, true,DBUtility.ClsPub.CurUserName))
+ {
+ return;
+ }
+
+ string s = "";
+ if (!DBUtility.Xt_BaseBillFun.Fun_AllowCheckBill(BillOld, ref s))
+ {
+ MessageBox.Show(s + "锛屼笉鍏佽瀹℃牳", "鎻愮ず");
+ return;
+ }
+ if (BillOld.CheckBill(BillOld.omodel.HInterID, ref ClsPub.sExeReturnInfo) == true)
+ {
+ BillChange = true;
+ this.Sub_ShowBill();
+ }
+ else
+ {
+ MessageBox.Show("瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo, "鎻愮ず");
+ }
+ }
+ //鍙嶅鍗曟嵁
+ private void Sub_AbandonCheck()
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!ClsPub.Security_Log(ModRightNameCheck, 1, true, DBUtility.ClsPub.CurUserName))
+ {
+ return;
+ }
+ //
+ string s = "";
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowAbandonCheckBill(BillOld.omodel.HChecker, ref s) == false)
+ {
+ MessageBox.Show("褰撳墠鎿嶄綔鍛樹笌瀹℃牳浜轰笉涓�鑷达紝涓嶅厑璁稿弽瀹℃牳锛�", "鎻愮ず");
+ return;
+ }
+ if (BillOld.AbandonCheck(BillOld.omodel.HInterID, ref ClsPub.sExeReturnInfo) == true)
+ {
+ BillChange = true;
+ this.Sub_ShowBill();
+ }
+ else
+ {
+ MessageBox.Show("鍙嶅鏍稿け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo, "鎻愮ず");
+ }
+ }
+ //鍏抽棴鍗曟嵁
+ private void Sub_CloseBill()
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!ClsPub.Security_Log(ModRightNameClose, 1, true, DBUtility.ClsPub.CurUserName))
+ {
+ return;
+ }
+ string s = "";
+ if (!DBUtility.Xt_BaseBillFun.Fun_AllowCloseBill(BillOld, ref s))
+ {
+ MessageBox.Show(s + "锛屼笉鍏佽鍏抽棴", "鎻愮ず");
+ return;
+ }
+ if (BillOld.CloseBill(BillOld.omodel.HInterID, ref ClsPub.sExeReturnInfo) == true)
+ {
+ BillChange = true;
+ this.Sub_ShowBill();
+ }
+ else
+ {
+ MessageBox.Show("鍏抽棴澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo, "鎻愮ず");
+ }
+ }
+ //鍙嶅叧闂崟鎹�
+ private void Sub_Cancel()
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!ClsPub.Security_Log(ModRightNameClose, 1, true, DBUtility.ClsPub.CurUserName))
+ {
+ return;
+ }
+ string s = "";
+ if (!DBUtility.Xt_BaseBillFun.Fun_AllowCancelBill(BillOld, ref s))
+ {
+ MessageBox.Show(s + "锛屼笉鍏佽鎭㈠", "鎻愮ず");
+ return;
+ }
+ if (BillOld.CancelClose(BillOld.omodel.HInterID, ref ClsPub.sExeReturnInfo) == true)
+ {
+ BillChange = true;
+ this.Sub_ShowBill();
+ }
+ else
+ {
+ MessageBox.Show("鎭㈠澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo, "鎻愮ず");
+ }
+ }
+ //浣滃簾鍗曟嵁
+ private void Sub_Cancelltion()
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!ClsPub.Security_Log(ModRightNameDelete, 1, true, DBUtility.ClsPub.CurUserName))
+ {
+ return;
+ }
+ string s = "";
+ if (!DBUtility.Xt_BaseBillFun.Fun_AllowCancelltionBill(BillOld, ref s))
+ {
+ MessageBox.Show(s + "锛屼笉鍏佽浣滃簾", "鎻愮ず");
+ return;
+ }
+ if (BillOld.Cancelltion(BillOld.omodel.HInterID, ref ClsPub.sExeReturnInfo) == true)
+ {
+ BillChange = true;
+ this.Sub_ShowBill();
+ }
+ else
+ {
+ MessageBox.Show("浣滃簾澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo, "鎻愮ず");
+ }
+ }
+ //鍙嶄綔搴�
+ private void Sub_AbandonCancelltion()
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!ClsPub.Security_Log(ModRightNameDelete, 1, true, DBUtility.ClsPub.CurUserName))
+ {
+ return;
+ }
+ string s = "";
+ if (!DBUtility.Xt_BaseBillFun.Fun_AllowAbandonCancelltionBill(BillOld, ref s))
+ {
+ MessageBox.Show(s + "锛屼笉鍏佽鎭㈠姝ｅ父", "鎻愮ず");
+ return;
+ }
+ if (BillOld.AbandonCancelltion(BillOld.omodel.HInterID, ref ClsPub.sExeReturnInfo) == true)
+ {
+ BillChange = true;
+ this.Sub_ShowBill();
+ }
+ else
+ {
+ MessageBox.Show("浣滃簾澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo, "鎻愮ず");
+ }
+ }
+ //鏂板鎸夌航
+ private void xz_Click(object sender, EventArgs e)
+ {
+ //cmbSourceBillType.Items.Clear();
+ //cmbSourceBillType.Items.Add("鍙戣揣閫氱煡鍗�");
+ //cmbSourceBillType.Items.Add("鎵嬪伐褰曞叆");
+ //cmbSourceBillType.SelectedIndex = 0;
+ redblue.Checked = false;
+ this.Sub_AddBill();
+ }
+ //淇敼鎸夌航
+ private void xg_Click(object sender, EventArgs e)
+ {
+
+ }
+ //鍒犻櫎鎸夐挳
+ private void sc_Click(object sender, EventArgs e)
+ {
+
+ }
+ //淇濆瓨鎸夐挳
+ private void bc_Click(object sender, EventArgs e)
+ {
+
+ }
+ //鏀惧純鎸夐挳
+ private void fq_Click(object sender, EventArgs e)
+ {
+
+ }
+ //瀹℃牳鎸夐挳
+ private void sh_Click(object sender, EventArgs e)
+ {
+
+ }
+ //鏀惧純瀹℃牳鎸夐挳
+ private void qsh_Click(object sender, EventArgs e)
+ {
+
+ }
+ //鍏抽棴鎸夐挳
+ private void gb_Click(object sender, EventArgs e)
+ {
+
+ }
+ //鎭㈠鎸夐挳
+ private void hf_Click(object sender, EventArgs e)
+ {
+
+ }
+ //浣滃簾鎸夐挳
+ private void zf_Click(object sender, EventArgs e)
+ {
+
+ }
+ //鍙嶄綔搴熸寜閽�
+ private void zc_Click(object sender, EventArgs e)
+ {
+
+ }
+ //棣栧紶鍗曟嵁鎸夐挳
+ private void sz_Click(object sender, EventArgs e)
+ {
+
+ }
+ //涓婁竴寮犳寜閽�
+ private void syz_Click(object sender, EventArgs e)
+ {
+
+ }
+ //涓嬩竴寮犳寜閽�
+ private void xyz_Click(object sender, EventArgs e)
+ {
+
+ }
+ //鏈紶鎸夐挳
+ private void mz_Click(object sender, EventArgs e)
+ {
+
+ }
+ //閫�鍑烘寜閽�
+ private void tc_Click(object sender, EventArgs e)
+ {
+ this.Close();
+ }
+
+ //鏍规嵁缂栬緫鐘舵�� 璁剧疆 鎺т欢鏄惁鍏佽褰曞叆
+ private void Sub_LrtextStatus(bool TextEnabled)
+ {
+ if (TextEnabled == true)
+ {
+ //鎺т欢鍏ㄩ儴鏈夋晥
+ gbUp.Enabled = true;
+
+
+ }
+ else
+ { //鎺т欢鍏ㄩ儴鏃犳晥
+ gbUp.Enabled = false;
+
+ }
+ }
+ //澶嶅埗鍗曟嵁
+ private void Sub_CopyBill()
+ {
+ this.BillStatus =DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
+ this.Sub_OperStatus();//璁剧疆TOOLBAR
+ this.txtHBillNo.Text = ClsPub.CreateBillCode(BillNew.BillType, ref ClsPub.sExeReturnInfo, true);//寰楀埌鏂板崟鍙�
+ this.txtHBillNo.Enabled = true;
+ //this.txtHBillNo.Focus();
+
+ //娓呯┖GIRD 婧愬崟淇℃伅
+ //DBUtility.Xt_BaseBillFun.SetDataGrid(grdMain, 0, HPOOrderEntryIDCol, grdMain.Rows.Count - 1, HCloseTypeCol, "");
+ }
+ //澶嶅埗鎸夐挳
+ private void fz_Click(object sender, EventArgs e)
+ {
+ Sub_CopyBill();
+ }
+ //timer
+ private void timer1_Tick(object sender, EventArgs e)
+ {
+ timer1.Enabled = false;
+ //DAL.ClsK3_Material_View oMater = new DAL.ClsK3_Material_View();
+ this.Sub_AddBill();
+ this.ShowPic();
+ //txtHICMOBillNo.Text = HICMOBillNo;
+ //txtHBatchNo.Text = HBatchNo;
+ //if (oMater.GetInfoByID(HMaterID))
+ //{
+ // txtHMaterID.Text = oMater.omodel.HNumber;
+ // txtHName.Text = oMater.omodel.HName;
+ // txtHModel.Text = oMater.omodel.HModel;
+ //}
+ }
+
+ //绐椾綋鍗歌浇
+ private void Sc_MESNowWorkBill_Fast_FormClosing(object sender, FormClosingEventArgs e)
+ {
+ BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
+
+ }
+ //鏂板鍗曟嵁
+ private void Sub_AddBill()
+ {
+ //this.BillNew = new DAL.ClsSc_MESBeginWorkBill();
+ //this.BillOld = new DAL.ClsSc_MESBeginWorkBill();
+ this.BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
+ this.Sub_OperStatus();//璁剧疆TOOLBAR
+ this.Sub_ClearBill();//娓呯┖鐣岄潰
+ //this.txtHBillNo.Text = ClsPub.CreateBillCode(BillNew.BillType, ref ClsPub.sExeReturnInfo, true);//寰楀埌鏂板崟鍙�
+ //this.txtHBillNo.Enabled = true;
+ this.txtHICMOBillNo.Focus();
+ //鐏板害婧愬崟绫诲瀷
+ //cmbSourceBillType.Enabled = true;
+ //txtHBeginWorkTime.Text = DBUtility.ClsPub.GetServerDate(-1);
+ }
+ //TOOLBAR鐘舵�� 鎸夐挳鏄惁鐏板害
+ public void Sub_OperStatus()
+ {
+ switch (BillStatus)
+ {
+ case DBUtility.ClsPub.Enum_BillStatus.BillStatus_View:
+ //娴忚鐘舵��
+ dy.Enabled = true;
+ yl.Enabled = true;
+ xz.Enabled = true;
+ xg.Enabled = true;
+ sc.Enabled = true;
+ AddRow.Enabled = false;
+ DelRow.Enabled = false;
+ bc.Enabled = false;
+ fq.Enabled = false;
+ sz.Enabled = true;
+ syz.Enabled = true;
+ xyz.Enabled = true;
+ mz.Enabled = true;
+ tc.Enabled = true;
+ redblue.Enabled = false;
+ //鏈鏍�
+
+ Sub_LrtextStatus(false);
+ grdStatus = false;
+ break;
+ case DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew:
+ //鏂板鐘舵��
+ dy.Enabled = false;
+ yl.Enabled = false;
+ xz.Enabled = false;
+ xg.Enabled = false;
+ sc.Enabled = false;
+ AddRow.Enabled = true;
+ DelRow.Enabled = true;
+ bc.Enabled = true;
+ fq.Enabled = true;
+ sh.Enabled = false;
+ qsh.Enabled = false;
+ //gb.Enabled = false;
+ //hf.Enabled = false;
+ //zf.Enabled = false;
+ //zc.Enabled = false;
+ sz.Enabled = false;
+ syz.Enabled = false;
+ xyz.Enabled = false;
+ mz.Enabled = false;
+ tc.Enabled = true;
+ Sub_LrtextStatus(true);
+ grdStatus = true;
+ redblue.Enabled = true;
+ //鏈鏍�
+ pic1.Visible = false;
+ pic1.Image = null;
+ //
+ break;
+ case DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify:
+ //淇敼鐘舵��
+ dy.Enabled = false;
+ yl.Enabled = false;
+ xz.Enabled = false;
+ xg.Enabled = false;
+ sc.Enabled = false;
+ AddRow.Enabled = true;
+ DelRow.Enabled = true;
+ bc.Enabled = true;
+ fq.Enabled = true;
+ sh.Enabled = false;
+ qsh.Enabled = false;
+ //gb.Enabled = false;
+ //hf.Enabled = false;
+ //zf.Enabled = false;
+ //zc.Enabled = false;
+ sz.Enabled = false;
+ syz.Enabled = false;
+ xyz.Enabled = false;
+ mz.Enabled = false;
+ tc.Enabled = true;
+ Sub_LrtextStatus(true);
+ grdStatus = true;
+ redblue.Enabled = true;
+ //鏈鏍�
+ pic1.Visible = false;
+ pic1.Image = null;
+ //
+ break;
+ }
+
+ }
+ #endregion
+
+ #region 璇诲啓绫�
+ //鏄剧ず鍗曟嵁
+ public void Sub_ShowBill()
+ {
+ //DAL.ClsK3_Department_View oDept = new DAL.ClsK3_Department_View();
+ //DAL.ClsGy_Group_View oGroup = new DAL.ClsGy_Group_View();//鐝粍
+ //DAL.ClsK3_Unit_View oUnit = new DAL.ClsK3_Unit_View();
+ //DAL.ClsK3_Process_View oPro = new DAL.ClsK3_Process_View();//宸ュ簭
+ //DAL.ClsK3_Material_View oMater = new DAL.ClsK3_Material_View();
+ //DAL.ClsK3_Employee_View oEmp = new DAL.ClsK3_Employee_View();
+ //DAL.ClsGy_Source_View oSource = new DAL.ClsGy_Source_View();//鐢熶骇璧勬簮
+ ////鍒ゆ柇鏄惁瀛樺湪鍗曟嵁
+ //if (BillOld.ShowBill(BillOld.omodel.HInterID, ref ClsPub.sExeReturnInfo) == false)
+ //{
+ // MessageBox.Show(ClsPub.sExeReturnInfo, "鎻愮ず");
+ // return;
+ //}
+ ////娓呯┖
+ //Sub_ClearBill();
+ ////鍔犺浇琛ㄥご
+ //if (oDept.GetInfoByID(BillOld.omodel.HDeptID))
+ //{
+ // this.txtHDeptID.Tag = oDept.omodel.HItemID.ToString().Trim();
+ // this.txtHDeptID.Text = oDept.omodel.HName;
+ // //this.txtHDeptNumber.Text = oDept.omodel.HNumber;
+ //}
+ //else
+ //{
+ // this.txtHDeptID.Text = "";
+ // //this.txtHDeptNumber.Text = "";
+ //}
+ ////
+ //if (oMater.GetInfoByID(BillOld.omodel.HMaterID))
+ //{
+ // this.txtHMaterID.Tag = oMater.omodel.HItemID.ToString().Trim();
+ // this.txtHMaterID.Text = oMater.omodel.HNumber;
+ // this.txtHName.Text = oMater.omodel.HName;
+ // this.txtHModel.Text = oMater.omodel.HModel;
+ //}
+ //else
+ //{
+ // this.txtHMaterID.Text = "";
+ // this.txtHName.Text = "";
+ // this.txtHModel.Text = "";
+ //}
+ ////
+ ////if (oUnit.GetInfoByID(BillOld.omodel.HUnitID))
+ ////{
+ //// this.txtHUnitID.Tag = oUnit.omodel.HItemID.ToString().Trim();
+ //// this.txtHUnitID.Text = oUnit.omodel.HName;
+ //// //this.txtHUnitNumber.Text = oUnit.omodel.HNumber;
+ ////}
+ ////else
+ ////{
+ //// this.txtHUnitID.Text = "";
+ //// //this.txtHUnitNumber.Text = "";
+ ////}
+ ////
+ //if (oPro.GetInfoByID(BillOld.omodel.HProcID))
+ //{
+ // this.txtHProcID.Tag = oPro.omodel.HItemID.ToString().Trim();
+ // this.txtHProcID.Text = oPro.omodel.HName;
+ //}
+ //else
+ //{
+ // this.txtHProcID.Text = "";
+ //}
+ ////
+ //if (oSource.GetInfoByID(BillOld.omodel.HSourceID))
+ //{
+ // this.txtHSourceID.Tag = oSource.omodel.HItemID.ToString().Trim();
+ // this.txtHSourceID.Text = oSource.omodel.HName;
+ //}
+ //else
+ //{
+ // this.txtHSourceID.Text = "";
+ //}
+ ////
+ //if (oEmp.GetInfoByID(BillOld.omodel.HEmpID))
+ //{
+ // this.txtHWorkEmpID.Tag = oEmp.omodel.HItemID.ToString().Trim();
+ // this.txtHWorkEmpID.Text = oEmp.omodel.HName;
+ //}
+ //else
+ //{
+ // this.txtHWorkEmpID.Text = "";
+ //}
+ ////
+ //if (oGroup.GetInfoByID(BillOld.omodel.HGroupID))
+ //{
+ // this.txtHGroupID.Tag = oGroup.omodel.HItemID.ToString().Trim();
+ // this.txtHGroupID.Text = oGroup.omodel.HName;
+ //}
+ //else
+ //{
+ // this.txtHGroupID.Text = "";
+ //}
+ ////============================================================
+ ////鍗曟嵁鍥哄畾璧嬪��
+ //this.dtpHDate.Value = BillOld.omodel.HDate;
+ //this.txtHBillNo.Text = BillOld.omodel.HBillNo;
+ //this.txtHRemark.Text = BillOld.omodel.HRemark;
+
+ ////
+ //this.txtHICMOBillNo.Tag = BillOld.omodel.HICMOInterID.ToString();
+ //this.txtHICMOBillNo.Text = BillOld.omodel.HICMOBillNo;
+ //this.txtHBatchNo.Text = BillOld.omodel.HBatchNo;
+ //this.txtHBeginWorkTime.Text = BillOld.omodel.HBeginWorkTime.ToString();
+ ////this.txtHProcExchInterID.Text = BillOld.omodel.HProcExchInterID.ToString().Trim();
+ ////this.txtHProcExchEntryID.Text = BillOld.omodel.HProcExchEntryID.ToString().Trim();
+ ////this.txtHProcExchBillNo.Text = BillOld.omodel.HProcExchBillNo;
+
+ //////鍔犺浇琛ㄤ綋
+ ////initGrid();
+ //////initGrid_Sub();
+ ////int i = 0;
+ ////foreach (Model.ClsSc_MESBeginWorkBillSub oSub in BillOld.DetailColl)
+ ////{
+ //// if (i >= grdMain.RowCount - 1)
+ //// grdMain.Rows.Add();
+ //// //鍗曟嵁鍥哄畾璧嬪��
+ //// grdMain.Rows[i].Cells[HTagCol].Value = "*";
+ //// grdMain.Rows[i].Cells[HEntryIDCol].Value = oSub.HEntryID.ToString();
+ //// grdMain.Rows[i].Cells[HRemarkCol].Value = oSub.HRemark;
+ //// grdMain.Rows[i].Cells[HCloseManCol].Value = oSub.HCloseMan;
+ //// grdMain.Rows[i].Cells[HEntryCloseDateCol].Value = oSub.HEntryCloseDate;
+ //// grdMain.Rows[i].Cells[HCloseTypeCol].Value = oSub.HCloseType;
+ //// grdMain.Rows[i].Cells[HSourceBillNoCol].Value = oSub.HSourceBillNo;
+ //// grdMain.Rows[i].Cells[HSourceInterIDCol].Value = oSub.HSourceInterID.ToString();
+ //// grdMain.Rows[i].Cells[HSourceEntryIDCol].Value = oSub.HSourceEntryID.ToString();
+ //// grdMain.Rows[i].Cells[HSourceBillTypeCol].Value = oSub.HSourceBillType.Trim();
+ //// grdMain.Rows[i].Cells[HRelationQtyCol].Value = oSub.HRelationQty.ToString();
+ //// grdMain.Rows[i].Cells[HRelationMoneyCol].Value = oSub.HRelationMoney.ToString();
+ //// //======================================================================================
+ //// //
+ //// grdMain.Rows[i].Cells[HProcIDCol].Value = oSub.HProcID.ToString();
+ //// if (oPro.GetInfoByID(oSub.HProcID))
+ //// {
+ //// grdMain.Rows[i].Cells[HProcNumberCol].Value = oPro.omodel.HNumber;
+ //// grdMain.Rows[i].Cells[HProcNameCol].Value = oPro.omodel.HName;
+
+ //// }
+ //// else
+ //// {
+ //// grdMain.Rows[i].Cells[HProcNumberCol].Value = "";
+ //// grdMain.Rows[i].Cells[HProcNameCol].Value = "";
+ //// }
+ //// //
+ //// grdMain.Rows[i].Cells[HMaterIDCol].Value = oSub.HMaterID.ToString();
+ //// if (oMater.GetInfoByID(oSub.HMaterID))
+ //// {
+ //// grdMain.Rows[i].Cells[HMaterNumberCol].Value = oMater.omodel.HNumber;
+ //// grdMain.Rows[i].Cells[HMaterNameCol].Value = oMater.omodel.HName;
+
+ //// }
+ //// else
+ //// {
+ //// grdMain.Rows[i].Cells[HMaterNumberCol].Value = "";
+ //// grdMain.Rows[i].Cells[HMaterNameCol].Value = "";
+ //// }
+ //// //
+ //// grdMain.Rows[i].Cells[HEmpIDCol].Value = oSub.HEmpID.ToString();
+ //// if (oEmp.GetInfoByID(oSub.HEmpID))
+ //// {
+ //// grdMain.Rows[i].Cells[HEmpNumberCol].Value = oEmp.omodel.HNumber;
+ //// grdMain.Rows[i].Cells[HEmpNameCol].Value = oEmp.omodel.HName;
+
+ //// }
+ //// else
+ //// {
+ //// grdMain.Rows[i].Cells[HEmpNumberCol].Value = "";
+ //// grdMain.Rows[i].Cells[HEmpNameCol].Value = "";
+ //// }
+ //// //
+ //// grdMain.Rows[i].Cells[HGroupIDCol].Value = oSub.HGroupID.ToString();
+ //// if (oGroup.GetInfoByID(oSub.HGroupID))
+ //// {
+ //// grdMain.Rows[i].Cells[HGroupNumberCol].Value = oGroup.omodel.HNumber;
+ //// grdMain.Rows[i].Cells[HGroupNameCol].Value = oGroup.omodel.HName;
+
+ //// }
+ //// else
+ //// {
+ //// grdMain.Rows[i].Cells[HGroupNumberCol].Value = "";
+ //// grdMain.Rows[i].Cells[HGroupNameCol].Value = "";
+ //// }
+ //// //
+ //// grdMain.Rows[i].Cells[HSourceIDCol].Value = oSub.HSourceID.ToString();
+ //// if (oSource.GetInfoByID(oSub.HSourceID))
+ //// {
+ //// grdMain.Rows[i].Cells[HSourceNumberCol].Value = oSource.omodel.HNumber;
+ //// grdMain.Rows[i].Cells[HSourceNameCol].Value = oSource.omodel.HName;
+
+ //// }
+ //// else
+ //// {
+ //// grdMain.Rows[i].Cells[HSourceNumberCol].Value = "";
+ //// grdMain.Rows[i].Cells[HSourceNameCol].Value = "";
+ //// }
+ //// //
+ //// grdMain.Rows[i].Cells[HBadReasonIDCol].Value = oSub.HBadReasonID.ToString();
+ //// if (oBad.GetInfoByID(oSub.HBadReasonID))
+ //// {
+ //// grdMain.Rows[i].Cells[HBadReasonNumberCol].Value = oBad.omodel.HNumber;
+ //// grdMain.Rows[i].Cells[HBadReasonNameCol].Value = oBad.omodel.HName;
+
+ //// }
+ //// else
+ //// {
+ //// grdMain.Rows[i].Cells[HBadReasonNumberCol].Value = "";
+ //// grdMain.Rows[i].Cells[HBadReasonNameCol].Value = "";
+ //// }
+ //// //
+ //// grdMain.Rows[i].Cells[HCheckEmpIDCol].Value = oSub.HCheckEmpID.ToString();
+ //// if (oEmp.GetInfoByID(oSub.HCheckEmpID))
+ //// {
+ //// grdMain.Rows[i].Cells[HCheckEmpNumberCol].Value = oEmp.omodel.HNumber;
+ //// grdMain.Rows[i].Cells[HCheckEmpNameCol].Value = oEmp.omodel.HName;
+
+ //// }
+ //// else
+ //// {
+ //// grdMain.Rows[i].Cells[HCheckEmpNumberCol].Value = "";
+ //// grdMain.Rows[i].Cells[HCheckEmpNameCol].Value = "";
+ //// }
+ //// //
+ //// grdMain.Rows[i].Cells[HBadBarCodeCol].Value = oSub.HBadBarCode.ToString();
+ //// grdMain.Rows[i].Cells[HBadCountCol].Value = oSub.HBadCount.ToString();
+ //// grdMain.Rows[i].Cells[HBadPrirceCol].Value = oSub.HBadPrirce.ToString();
+ //// grdMain.Rows[i].Cells[HBadMoneyCol].Value = oSub.HBadMoney.ToString();
+ //// grdMain.Rows[i].Cells[HICMOInterIDCol].Value = oSub.HICMOInterID.ToString();
+ //// grdMain.Rows[i].Cells[HICMOBillNoCol].Value = oSub.HICMOBillNo;
+ //// grdMain.Rows[i].Cells[HWWOrderInterIDCol].Value = oSub.HWWOrderInterID.ToString();
+ //// grdMain.Rows[i].Cells[HWWOrderEntryIDCol].Value = oSub.HWWOrderEntryID.ToString();
+ //// grdMain.Rows[i].Cells[HWWOrderBillNoCol].Value = oSub.HWWOrderBillNo;
+ //// grdMain.Rows[i].Cells[HSeOrderInterIDCol].Value = oSub.HSeOrderInterID.ToString();
+ //// grdMain.Rows[i].Cells[HSeOrderEntryIDCol].Value = oSub.HSeOrderEntryID.ToString();
+ //// grdMain.Rows[i].Cells[HSeOrderBillNoCol].Value = oSub.HSeOrderBillNo;
+ //// grdMain.Rows[i].Cells[HProcExchInterIDCol].Value = oSub.HProcExchInterID.ToString();
+ //// grdMain.Rows[i].Cells[HProcExchEntryIDCol].Value = oSub.HProcExchEntryID.ToString();
+ //// grdMain.Rows[i].Cells[HProcExchBillNoCol].Value = oSub.HProcExchBillNo;
+ //// grdMain.Rows[i].Cells[HProcExchReportInterIDCol].Value = oSub.HProcExchReportInterID.ToString();
+ //// grdMain.Rows[i].Cells[HProcExchReportEntryIDCol].Value = oSub.HProcExchReportEntryID.ToString();
+ //// grdMain.Rows[i].Cells[HProcExchReportBillNoCol].Value = oSub.HProcExchReportBillNo;
+
+ //// i = i + 1;
+ //}
+ ////GRID鍏佽鍒锋柊
+ //DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+ ////
+ //Sub_OperStatus();
+ ////鐏板害婧愬崟绫诲瀷
+ ////cmbSourceBillType.Enabled = false;
+ }
+
+ //鍗曟嵁瀹屾暣鎬у垽鏂� 鏈畬鎴�
+ private bool Sub_AllowSave()
+ {
+ //蹇呰緭椤圭洰鏄惁涓虹┖
+ //if (DBUtility.ClsPub.isDoule(txtHQty.Text) <= 0)
+ //{
+ // MessageBox.Show("瀹炲仛鏁伴噺涓嶈兘涓�0锛�", "鎻愮ず");
+ // return false;
+ //}
+ if (DBUtility.ClsPub.isLong(txtHProcID.Tag) == 0)
+ {
+ MessageBox.Show("宸ュ簭娌℃湁閫夋嫨锛�", "鎻愮ず");
+ return false;
+ }
+ if (DBUtility.ClsPub.isLong(txtHMaterID.Tag) == 0)
+ {
+ MessageBox.Show("浜у搧娌℃湁閫夋嫨锛�", "鎻愮ず");
+ return false;
+ }
+ //if (DBUtility.ClsPub.isLong(txtHUnitID.Tag) == 0)
+ //{
+ // MessageBox.Show("鍗曚綅娌℃湁閫夋嫨锛�", "鎻愮ず");
+ // return false;
+ //}
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ if (BillNew.IsExistBillNo(ref ClsPub.sExeReturnInfo, txtHBillNo.Text.Trim(), BillStatus, BillOld.omodel.HInterID))
+ {
+ MessageBox.Show("鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒", "鎻愮ず");
+ return false;
+ }
+ ////鏄庣粏琛ㄦ槸鍚︿负闆惰
+ //bool b = false;
+ //for (int i = 0; i < grdMain.RowCount; i++)
+ //{
+ // if (!IsNullRow(i))
+ // {
+ // b = true;
+ // break;
+ // }
+ //}
+ //if (b == false)
+ //{
+ // MessageBox.Show("琛ㄤ綋鏄庣粏琛屼笉瀛樺湪锛佽褰曞叆锛�", "鎻愮ず");
+ // return false;
+ //}
+ return true;
+ }
+ //淇濆瓨鍗曟嵁
+ private bool Sub_SaveBill()
+ {
+ //Model.ClsSc_MESBeginWorkBillSub oBillSub = new Model.ClsSc_MESBeginWorkBillSub();
+ ////鍒ゆ柇鏉冮檺
+ ////if (!ClsPub.Security_Log(ModRightNameEdit, 1, true, DBUtility.ClsPub.CurUserName))
+ ////{
+ return false;
+ ////}
+ ////
+ //Int32 i;
+ //bool bResult;
+ //BillNew = new DAL.ClsSc_MESBeginWorkBill();
+ ////澶卞幓鐒︾偣
+ //lblCaption.Focus();
+ //if (!Sub_AllowSave())//鍗曟嵁瀹屾暣鎬у垽鏂�
+ // return false;
+ ////璧嬪�糏D
+ //if (BillStatus ==DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify)
+ // BillNew.omodel.HInterID = BillOld.omodel.HInterID;
+ //else if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_UpdatePrice)
+ // BillNew.omodel.HInterID = BillOld.omodel.HInterID;
+ ////涓荤被璧嬪��
+ ////鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ //string s = "";
+ //int sYear = 0;
+ //int sPeriod = 0;
+ //if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(dtpHDate.Value, ref sYear, ref sPeriod, ref s)==false)
+ //{
+ // MessageBox.Show(s, "鎻愮ず");
+ // return false;
+ //}
+ ////婧愬崟淇℃伅
+ ////BillNew.omodel.HMainSourceBillType = cmbSourceBillType.Text;
+ ////
+ //BillNew.omodel.HYear = sYear;
+ //BillNew.omodel.HPeriod = sPeriod;
+ ////鍥哄畾璧嬪��=================================
+ //BillNew.omodel.HBillNo = this.txtHBillNo.Text.Trim(); //鍦ㄨ祴鍊肩被鍓嶅氨澶勭悊濂藉瓧绗︿覆鍜屾暟瀛�
+ //BillNew.omodel.HDate = this.dtpHDate.Value;
+ //BillNew.omodel.HRemark = this.txtHRemark.Text.Trim();
+ ////====================================================
+ //BillNew.omodel.HICMOInterID = ClsPub.isLong(this.txtHICMOBillNo.Tag);
+ //BillNew.omodel.HICMOBillNo = ClsPub.isStrNull(this.txtHICMOBillNo.Text);
+ //BillNew.omodel.HDeptID = ClsPub.isLong(this.txtHDeptID.Tag);
+ //BillNew.omodel.HGroupID = ClsPub.isLong(this.txtHGroupID.Tag);
+ //BillNew.omodel.HSourceID = ClsPub.isLong(this.txtHSourceID.Tag);
+ //BillNew.omodel.HProcID = ClsPub.isLong(this.txtHProcID.Tag);
+ //BillNew.omodel.HMaterID = ClsPub.isLong(this.txtHMaterID.Tag);
+ //BillNew.omodel.HBatchNo = ClsPub.isStrNull(this.txtHBatchNo.Text);
+ //BillNew.omodel.HBeginWorkTime = ClsPub.isDate(this.txtHBeginWorkTime.Text);
+ //BillNew.omodel.HBarCodeMakeDate = ClsPub.isDate("1900-01-01");
+ ////BillNew.omodel.HPlanQty = ClsPub.isDoule(this.txtHPlanQty.Text);
+ ////鏄庣粏绫昏祴鍊�
+ ////BillNew.DetailColl=new List<Model.ClsSc_MESBeginWorkBillSub>();
+ ////Model.ClsSc_MESBeginWorkBillSub oSub = new Model.ClsSc_MESBeginWorkBillSub();
+ //////鍥哄畾璧嬪��========================================
+ ////oSub.HEntryID = 1;
+ ////oSub.HRemark = this.txtHRemark.Text.Trim();
+ ////oSub.HSourceInterID = 0;
+ ////oSub.HSourceEntryID = 0;
+ ////oSub.HSourceBillType = "";
+ ////oSub.HSourceBillNo = "";
+ ////oSub.HRelationQty = 0;
+ ////oSub.HRelationMoney = 0;
+ ////oSub.HCloseMan = "";
+ ////oSub.HEntryCloseDate = ClsPub.isDate("1900-10-10");
+ ////oSub.HCloseType = false;
+ //////=============================
+ ////BillNew.DetailColl.Add(oSub);
+ ////淇濆瓨瀹屾瘯鍚庡鐞�
+ //if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew)
+ //{
+ // bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo );
+ //}
+ //else
+ //{
+ // bResult = BillNew.ModifyBill(BillNew.omodel.HInterID, ref ClsPub.sExeReturnInfo);
+ //}
+ ////鎻愮ず
+ //if (bResult == true)
+ //{
+ // BillChange = true;
+ // //MessageBox.Show("鍗曟嵁瀛樼洏瀹屾瘯!鍗曟嵁鍙�:" + this.txtHBillNo.Text.Trim(), "鎻愮ず");
+ // if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew)
+ // {
+ // BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_View;
+ // BillOld.omodel.HInterID = BillNew.omodel.HInterID;
+ // this.Sub_ShowBill();
+ // }
+ // else if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify)
+ // {
+ // BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_View;
+ // this.Sub_ShowBill();
+ // }
+ // this.Sub_OperStatus();
+ // return true;
+ //}
+ //else
+ //{
+ // MessageBox.Show("淇濆瓨澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo, "鎻愮ず");
+ // return false;
+ //}
+ }
+ #endregion
+
+
+ #region 绐椾綋澶勭悊鏂规硶
+ //鍒濆鍖朑RID
+
+
+ private void cmdHDeptID_Click(object sender, EventArgs e)
+ {
+ //DAL.ClsK3_Department_View oDep = new DAL.ClsK3_Department_View();
+ //if (oDep.RefreshView())
+ //{
+ // this.txtHDeptID.Text = oDep.oModel.HName;
+ // this.txtHDeptID.Tag = oDep.oModel.HItemID.ToString();
+ // //this.txtHDeptNumber.Text = oDep.oModel.HNumber;
+ //}
+ //else
+ //{
+ // this.txtHDeptID.Text = "";
+ // //this.txtHDeptNumber.Text = "";
+ //}
+
+ }
+
+ private void txtHDeptID_TextChanged(object sender, EventArgs e)
+ {
+ if (txtHDeptID.Text.Trim() == "")
+ {
+ txtHDeptID.Tag = "0";
+ }
+ }
+
+
+
+ #endregion
+
+
+
+ #region 婧愬崟澶勭悊
+ //
+ private void FillSelectData(List<DBUtility.BillSelect> oList)
+ {
+ DataSet Ds;
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ oSumGrid.Changelock = true;
+ //initGrid();
+ int i = -1;
+ foreach (DBUtility.BillSelect oSelectRow in oList)
+ {
+ i = i + 1;
+ if (oSelectRow.BillType == "3710")//鐢熶骇浠诲姟鍗�
+ {
+ //grdMain.Rows.Add();
+ //grdMain.Rows[i].Cells[HTagCol].Value = "*";
+ //寰楀埌淇℃伅
+ Ds = oCn.RunProcReturn("select * from h_v_K3_ICMOBillList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_K3_ICMOBillList");
+ //鍐欏叆淇℃伅
+ Sub_WriteInForm_SM(Ds.Tables[0], i);
+ }
+ }
+ //
+ oSumGrid.Changelock = false;
+ //DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+ }
+
+
+ //private void Sub_ChangeSourceBill()
+ //{
+ // if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew || BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify)
+ // {
+ // if (MessageBox.Show("鍗曟嵁灏氭湭淇濆瓨,纭畾瑕佹洿鎹㈢孩钃濆瓧?", "鎻愮ず", MessageBoxButtons.OKCancel) == DialogResult.Cancel)
+ // {
+ // if (redblue.Checked == true)
+ // {
+ // redblue.Checked = false;
+ // }
+ // else
+ // {
+ // redblue.Checked = true;
+ // }
+ // return;
+ // }
+ // if (redblue.Checked == false)//褰撹摑瀛楄閫変腑
+ // {
+ // //寰楀埌瀵瑰簲婧愬崟淇℃伅
+ // BLL.ClsPub_BLL.GetBillSource(ModName, redblue.Checked, cmbSourceBillType);
+ // cmbSourceBillType.SelectedIndex = 0;
+
+
+ // }
+ // else if (redblue.Checked == true)
+ // {
+ // //寰楀埌瀵瑰簲婧愬崟淇℃伅
+ // BLL.ClsPub_BLL.GetBillSource(ModName, redblue.Checked, cmbSourceBillType);
+ // cmbSourceBillType.SelectedIndex = 0;
+
+ // }
+ // else
+ // {
+
+ // }
+ // Sub_AddBill();
+ // }
+ //}
+
+ //private void redblue_Click(object sender, EventArgs e)
+ //{
+ // if (redblue.Checked == true)
+ // {
+ // redblue.Checked = false;
+ // }
+ // else
+ // {
+ // redblue.Checked = true;
+ // }
+ // Sub_ChangeSourceBill();
+ //}
+
+ #endregion
+
+ private void yc_Click(object sender, EventArgs e)
+ {
+
+ }
+
+ private void 鍙嶅鏍窽oolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ this.Sub_AbandonCheck();
+ }
+
+ private void 鍏抽棴ToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ this.Sub_CloseBill();
+ }
+
+ private void 瀹℃牳ToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ this.Sub_CheckBill();
+ }
+
+ private void 鍙嶅叧闂璗oolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ this.Sub_Cancel();
+ }
+
+ private void 浣滃簾ToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ this.Sub_Cancelltion();
+ }
+
+ private void 鎾ら攢浣滃簾ToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ this.Sub_AbandonCancelltion();
+ }
+ private void 闅愯棌鍒楄缃甌oolStripMenuItem_Click(object sender, EventArgs e)
+ {
+
+ }
+
+ private void cmdHProcID_Click(object sender, EventArgs e)
+ {
+ //DAL.ClsK3_Process_View oProc = new DAL.ClsK3_Process_View();
+ //if (oProc.RefreshView())
+ //{
+ // this.txtHProcNo.Text = oProc.oModel.HNumber;
+ // this.txtHProcID.Text = oProc.oModel.HName;
+ // this.txtHProcID.Tag = oProc.oModel.HItemID.ToString();
+ // //this.txtHICMOBillNo.Focus();
+ //}
+ //else
+ //{
+ // this.txtHProcNo.Text = "";
+ // this.txtHProcID.Text = "";
+ // this.txtHProcID.Tag = 0;
+ //}
+ }
+
+ private void txtHProcID_TextChanged(object sender, EventArgs e)
+ {
+ if (txtHProcID.Text.Trim() == "")
+ {
+ txtHProcID.Tag = "0";
+ }
+ }
+
+ private void cmdSM_Click(object sender, EventArgs e)
+ {
+ //if (DBUtility.ClsPub.isInt(txtHProcID.Tag) == 0)
+ //{
+ // MessageBox.Show("璇峰厛閫夋嫨姹囨姤宸ュ簭锛�");
+ // return;
+ //}
+ //DataSet Ds;
+ //SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ //long HInterID = 19623;
+
+ ////寰楀埌淇℃伅
+ //Ds = oCn.RunProcReturn("select * from h_v_Sc_ProcessExchangeBillList where hmainid=" + HInterID + " and HProcID=" + txtHProcID.Tag, "h_v_Sc_ProcessExchangeBillList");
+ ////鍐欏叆淇℃伅
+ //if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ //{
+ // return;
+ //}
+ //for (int i = 0; i < Ds.Tables[0].Rows.Count; i++)
+ //{
+ // Sub_WriteInForm_SM(Ds.Tables[0], i);
+ //}
+ }
+
+
+
+ //鏍规嵁TABLE鍐欏叆鐣岄潰
+ private void Sub_WriteInForm_SM(DataTable oTable, int i)
+ {
+ //
+ //this.txtHICMOBillNo.Tag = oTable.Rows[0]["HMainID"].ToString();
+ //this.txtHICMOBillNo.Text = oTable.Rows[0]["鍗曟嵁鍙�"].ToString();
+ //this.txtHMaterID.Tag = oTable.Rows[0]["HMaterID"].ToString();
+ //this.txtHMaterID.Text = oTable.Rows[0]["鐗╂枡浠ｇ爜"].ToString();
+ //this.txtHName.Text = oTable.Rows[0]["鐗╂枡鍚嶇О"].ToString();
+ //this.txtHModel.Text = oTable.Rows[0]["瑙勬牸鍨嬪彿"].ToString();
+ //this.txtHBatchNo.Text = oTable.Rows[0]["鎵瑰彿"].ToString();
+ //this.txtHUnitID.Tag = oTable.Rows[0]["HUnitID"].ToString();
+ //this.txtHUnitID.Text = oTable.Rows[0]["璁￠噺鍗曚綅"].ToString();
+ //this.txtHDeptID.Tag = oTable.Rows[0]["HDeptID"].ToString();
+ //this.txtHDeptID.Text = oTable.Rows[0]["閮ㄩ棬"].ToString();
+ ////this.txtHQty.Text = DBUtility.ClsPub.isDoule(oTable.Rows[0]["璁″垝鏁伴噺"], 0);
+ ////this.txtHPlanQty.Text = DBUtility.ClsPub.isDoule(oTable.Rows[0]["璁″垝鏁伴噺"], 0);
+ ////this.txtHWorkEmpID.Tag = oTable.Rows[0]["HWorkerID"].ToString();
+ ////this.txtHWorkEmpID.Text = oTable.Rows[0]["鎿嶄綔宸�"].ToString();
+ //this.dtpHPlanBeginDate.Value = ClsPub.isDate(oTable.Rows[0]["璁″垝寮�宸ユ棩鏈�"]);
+ //this.dtpHPlanEndDate.Value = ClsPub.isDate(oTable.Rows[0]["璁″垝瀹屽伐鏃ユ湡"]);
+ ////
+ //long sProcID = 0;
+ //string sProcNo = "";
+ //string sProcName = "";
+ //if (BillOld.GetICMOProc(DBUtility.ClsPub.isLong(oTable.Rows[0]["HMainID"]), ref sProcID, ref sProcNo, ref sProcName, ref ClsPub.sExeReturnInfo))
+ //{
+ // txtHProcID.Tag = sProcID.ToString();
+ // txtHProcID.Text = sProcName;
+ // txtHProcNo.Text = sProcNo;
+ //}
+ }
+
+ //鏍规嵁TABLE鍐欏叆鐣岄潰
+ private void Sub_WriteInForm_SM2(DataTable oTable, int i)
+ {
+ //DAL.ClsK3_Material_View oMater = new DAL.ClsK3_Material_View();
+
+ //this.txtHProcExchInterID.Text = oTable.Rows[0]["hmainid"].ToString();
+ //this.txtHProcExchEntryID.Text = oTable.Rows[0]["hsubid"].ToString();
+ ////
+ //this.txtHProcID.Tag = oTable.Rows[0]["HProcID"].ToString();
+ //this.txtHProcID.Text = oTable.Rows[0]["宸ュ簭"].ToString();
+ //this.txtHDeptID.Tag = oTable.Rows[0]["HDeptID"].ToString();
+ //this.txtHDeptID.Text = oTable.Rows[0]["鍔犲伐杞﹂棿"].ToString();
+ //this.txtHGroupID.Tag = oTable.Rows[0]["HGroupID"].ToString();
+ //this.txtHGroupID.Text = oTable.Rows[0]["鐝粍"].ToString();
+ ////this.txtHWorkEmpID.Tag = oTable.Rows[0]["HWorkerID"].ToString();
+ ////this.txtHWorkEmpID.Text = oTable.Rows[0]["鎿嶄綔宸�"].ToString();
+ //this.txtHSourceID.Tag = oTable.Rows[0]["HSourceID"].ToString();
+ //this.txtHSourceID.Text = oTable.Rows[0]["鐢熶骇璧勬簮"].ToString();
+ }
+
+ private void cmdHGroupID_Click(object sender, EventArgs e)
+ {
+ //DAL.ClsK3_Group_View oGroup = new DAL.ClsK3_Group_View();
+ //if (oGroup.RefreshView())
+ //{
+ // this.txtHGroupID.Text = oGroup.oModel.HName;
+ // this.txtHGroupID.Tag = oGroup.oModel.HItemID.ToString();
+ //}
+ //else
+ //{
+ // this.txtHGroupID.Text = "";
+ // this.txtHGroupID.Tag = 0;
+ //}
+ }
+
+ private void txtHGroupID_TextChanged(object sender, EventArgs e)
+ {
+ if (txtHGroupID.Text.Trim() == "")
+ {
+ txtHGroupID.Tag = "0";
+ }
+ }
+
+ private void cmdHWorkEmpID_Click(object sender, EventArgs e)
+ {
+ //DAL.ClsK3_Employee_View oEmp = new DAL.ClsK3_Employee_View();
+ //if (oEmp.RefreshView())
+ //{
+ // this.txtHWorkEmpID.Text = oEmp.oModel.HName;
+ // this.txtHWorkEmpID.Tag = oEmp.oModel.HItemID.ToString();
+ //}
+ //else
+ //{
+ // this.txtHWorkEmpID.Text = "";
+ // this.txtHWorkEmpID.Tag = 0;
+ //}
+ }
+
+ private void txtHWorkEmpID_TextChanged(object sender, EventArgs e)
+ {
+ if (txtHWorkEmpID.Text.Trim() == "")
+ {
+ txtHWorkEmpID.Tag = "0";
+ }
+ }
+
+ private void cmdHSourceID_Click(object sender, EventArgs e)
+ {
+ DAL.ClsGy_Source_View oSource = new DAL.ClsGy_Source_View();
+ if (oSource.RefreshView())
+ {
+ this.txtHSourceID.Text = oSource.oModel.HName;
+ this.txtHSourceID.Tag = oSource.oModel.HItemID.ToString();
+ }
+ else
+ {
+ this.txtHSourceID.Text = "";
+ this.txtHSourceID.Tag = 0;
+ }
+ }
+
+ private void txtHSourceID_TextChanged(object sender, EventArgs e)
+ {
+ if (txtHSourceID.Text.Trim() == "")
+ {
+ txtHSourceID.Tag = "0";
+ }
+ }
+
+ private void txtHProcExchBillNo_KeyDown(object sender, KeyEventArgs e)
+ {
+ if (e.KeyCode == Keys.Return)
+ {
+ if (txtHProcExchBillNo.Text.Trim() == "")
+ {
+ MessageBox.Show("宸ュ簭娴佽浆鍗″崱鍙凤紝涓嶈兘涓虹┖锛�");
+ return;
+ }
+ //if (DBUtility.ClsPub.isLong(txtHProcID.Tag) == 0)
+ //{
+ // MessageBox.Show("璇峰厛閫夋嫨姹囨姤宸ュ簭锛�");
+ // return;
+ //}
+
+ DataSet Ds;
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ string sBillNo = txtHProcExchBillNo.Text.Trim();
+
+ //寰楀埌淇℃伅
+ Ds = oCn.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList where 鍗曟嵁鍙�= '" + sBillNo + "'", "h_v_Sc_ProcessExchangeBillList");
+ //鍐欏叆淇℃伅
+ if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ {
+ txtHProcExchBillNo.Text = "";
+ MessageBox.Show("鏈煡璇㈠埌娴佽浆鍗′俊鎭紒");
+ return;
+ }
+ for (int i = 0; i < Ds.Tables[0].Rows.Count; i++)
+ {
+ Sub_WriteInForm_SM(Ds.Tables[0], i);
+ }
+ Sub_ShowBill();
+ txtHProcNo.Focus();
+ }
+ }
+
+ //private delegate void ShowInfoDelegate(BLL.BardCodeHooK.BarCodes barCode);
+ //private void ShowInfo(BLL.BardCodeHooK.BarCodes barCode)
+ //{
+ // if (this.InvokeRequired)
+ // {
+ // this.BeginInvoke(new ShowInfoDelegate(ShowInfo), new object[] { barCode });
+ // }
+ // else
+ // {
+ // if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_View)
+ // {
+ // if (barCode.KeyName == "Enter")
+ // {
+ // this.Sub_AddBill();
+ // }
+ // }
+ // txtHProcExchBillNo.Text = barCode.IsValid ? barCode.BarCode : txtHProcExchBillNo.Text;//鏄惁涓烘壂鎻忔灙杈撳叆锛屽鏋滀负true鍒欐槸 鍚﹀垯涓洪敭鐩樿緭鍏�
+ // }
+ //}
+
+ //void BarCode_BarCodeEvent(BLL.BardCodeHooK.BarCodes barCode)
+ //{
+ // ShowInfo(barCode);
+ //}
+
+ private void txtHQty_KeyDown(object sender, KeyEventArgs e)
+ {
+ if (e.KeyCode == Keys.Return)
+ {
+ Sub_SaveBill();
+ }
+ }
+
+ private void txtHProcNo_TextChanged(object sender, EventArgs e)
+ {
+ if (txtHProcNo.Text.Trim() == "")
+ {
+ txtHProcID.Tag = "0";
+ txtHProcID.Text = "";
+ }
+ }
+
+ private void txtHWorkEmpNo_TextChanged(object sender, EventArgs e)
+ {
+ if (txtHWorkEmpNo.Text.Trim() == "")
+ {
+ txtHWorkEmpID.Tag = "0";
+ txtHWorkEmpID.Text = "";
+ }
+ }
+
+ private void txtHProcNo_KeyDown(object sender, KeyEventArgs e)
+ {
+ //DataSet Ds;
+ //SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ //string sProcNo = txtHProcNo.Text.Trim();
+ //string sBillNo = txtHProcExchBillNo.Text.Trim();
+ //if (e.KeyCode == Keys.Return)
+ //{
+ // //寰楀埌淇℃伅
+ // Ds = oCn.RunProcReturn("select * from h_v_Sc_ProcessExchangeBillList where 鍗曟嵁鍙�= '" + sBillNo + "' and 宸ュ簭鍙�='" + sProcNo + "'", "h_v_Sc_ProcessExchangeBillList");
+ // //鍐欏叆淇℃伅
+ // if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ // {
+ // txtHProcNo.Text = "";
+ // MessageBox.Show("宸ュ簭鍙烽敊璇紝璇烽噸鏂拌緭鍏ワ紒");
+ // return;
+ // }
+ // for (int i = 0; i < Ds.Tables[0].Rows.Count; i++)
+ // {
+ // Sub_WriteInForm_SM2(Ds.Tables[0], i);
+ // }
+ // txtHWorkEmpNo.Focus();
+ //}
+ }
+
+ private void txtHWorkEmpNo_KeyDown(object sender, KeyEventArgs e)
+ {
+ //DAL.ClsK3_Employee_View oEmp = new DAL.ClsK3_Employee_View();
+ //string sEmp = txtHWorkEmpNo.Text.Trim();
+ //if (e.KeyCode == Keys.Return)
+ //{
+ // if (oEmp.GetInfoByEmpNo(sEmp))
+ // {
+ // txtHWorkEmpID.Tag = oEmp.omodel.HItemID;
+ // txtHWorkEmpID.Text = oEmp.omodel.HName;
+ // }
+ // else
+ // {
+ // txtHWorkEmpNo.Text = "";
+ // MessageBox.Show("鍛樺伐宸ュ彿閿欒锛岃閲嶆柊杈撳叆锛�");
+ // return;
+ // }
+ //}
+ }
+
+ private void tabControl1_KeyDown(object sender, KeyEventArgs e)
+ {
+ if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_View)
+ {
+ if (e.KeyCode == Keys.Return)
+ {
+ this.Sub_AddBill();
+ txtHProcExchBillNo.Focus();
+ }
+ }
+ }
+
+ private void timer2_Tick(object sender, EventArgs e)
+ {
+ //if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_View)
+ //{
+ // tabControl1.Focus();
+ //}
+ //else
+ //{
+ // if (txtHProcExchBillNo.Text.Trim() == "")
+ // {
+ // txtHProcExchBillNo.Focus();
+ // }
+ //}
+ }
+
+ private void cmdHICMOBillNo_Click(object sender, EventArgs e)
+ {
+ //DAL.Cls_S_K3_ICMOBill oICMOBill = new DAL.Cls_S_K3_ICMOBill();
+ //string sWhere = " ";
+ //if (oICMOBill.Refresh(sWhere)) //閫夋嫨鍘熷崟
+ //{
+ // FillSelectData(oICMOBill.oBillSelectColl);
+ //}
+ }
+
+ private void txtHICMOBillNo_KeyDown(object sender, KeyEventArgs e)
+ {
+ //DataSet Ds;
+ //SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ //long sICMOInterID = DBUtility.ClsPub.isLong(txtHICMOBillNo.Text.Trim());
+ //if (e.KeyCode == Keys.Return)
+ //{
+ // //寰楀埌淇℃伅
+ // Ds = oCn.RunProcReturn("select * from h_v_K3_ICMOBillList where hmainid=" + sICMOInterID.ToString() + " and hsubid=0", "h_v_K3_ICMOBillList");
+ // //鍐欏叆淇℃伅
+ // if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ // {
+ // txtHICMOBillNo.Text = "";
+ // MessageBox.Show("浠诲姟鍗曞唴鐮侀敊璇紝璇烽噸鏂版壂鎻忥紒");
+ // return;
+ // }
+ // for (int i = 0; i < Ds.Tables[0].Rows.Count; i++)
+ // {
+ // Sub_WriteInForm_SM(Ds.Tables[0], i);
+ // }
+ //}
+ }
+ private int ImageCount;
+ private List<string> ImagePaths;
+ private int nowCount = 0;
+
+ private void ShowPic()
+ {
+ //FolderBrowserDialog oDialog = new FolderBrowserDialog();
+ //oDialog.SelectedPath = Pub_Class.ClsPub.AppPath + @"\" + "PT" + @"\";
+ ImagePaths = new List<string>();
+ nowCount = 0;
+ //if (oDialog.ShowDialog() == DialogResult.OK)
+ //{
+ foreach (string Path in Directory.GetFiles(Pub_Class.ClsPub.AppPath + @"\" + "PT" + @"\EV30G-7"))
+ {
+ ImagePaths.Add(Path);
+ }
+ if (ImagePaths.Count != 0)
+ {
+ ImageCount = ImagePaths.Count;
+ }
+ //}
+ if (nowCount < ImageCount)
+ {
+ this.pictureBox1.Image = Bitmap.FromFile(ImagePaths[nowCount]);
+ }
+ }
+
+ private void Select_Click(object sender, EventArgs e)
+ {
+ FolderBrowserDialog oDialog = new FolderBrowserDialog();
+ oDialog.SelectedPath = Pub_Class.ClsPub.AppPath + @"\" + "PT" + @"\";
+ ImagePaths = new List<string>();
+ nowCount = 0;
+ if (oDialog.ShowDialog() == DialogResult.OK)
+ {
+ foreach (string Path in Directory.GetFiles(oDialog.SelectedPath))
+ {
+ ImagePaths.Add(Path);
+ }
+ if (ImagePaths.Count != 0)
+ {
+ ImageCount = ImagePaths.Count;
+ }
+ }
+ if (nowCount < ImageCount)
+ {
+ this.pictureBox1.Image = Bitmap.FromFile(ImagePaths[nowCount]);
+ }
+ }
+
+ private void cmbBack_Click(object sender, EventArgs e)
+ {
+ nowCount--;
+ if (nowCount < 0)
+ {
+ nowCount = 0;
+ }
+ if (nowCount < ImageCount && nowCount>=0)
+ {
+ this.pictureBox1.Image = Bitmap.FromFile(ImagePaths[nowCount]);
+ }
+ }
+
+ private void cmdNext_Click(object sender, EventArgs e)
+ {
+ nowCount++;
+ if (nowCount > ImageCount)
+ {
+ nowCount = ImageCount - 1;
+ }
+ if (nowCount < ImageCount && nowCount >= 0)
+ {
+ this.pictureBox1.Image = Bitmap.FromFile(ImagePaths[nowCount]);
+ }
+ }
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/WarM/Sc_MESNowWorkBill_Fast.designer.cs b/WarM/Sc_MESNowWorkBill_Fast.designer.cs
new file mode 100644
index 0000000..46c0a8e
--- /dev/null
+++ b/WarM/Sc_MESNowWorkBill_Fast.designer.cs
@@ -0,0 +1,2070 @@
+锘縩amespace WarM
+{
+ partial class Sc_MESNowWorkBill_Fast
+ {
+ /// <summary>
+ /// 蹇呴渶鐨勮璁″櫒鍙橀噺銆�
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// 娓呯悊鎵�鏈夋鍦ㄤ娇鐢ㄧ殑璧勬簮銆�
+ /// </summary>
+ /// <param name="disposing">濡傛灉搴旈噴鏀炬墭绠¤祫婧愶紝涓� true锛涘惁鍒欎负 false銆�</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows 绐椾綋璁捐鍣ㄧ敓鎴愮殑浠ｇ爜
+
+ /// <summary>
+ /// 璁捐鍣ㄦ敮鎸佹墍闇�鐨勬柟娉� - 涓嶈
+ /// 浣跨敤浠ｇ爜缂栬緫鍣ㄤ慨鏀规鏂规硶鐨勫唴瀹广��
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Sc_MESNowWorkBill_Fast));
+ this.Tool = new System.Windows.Forms.ToolStrip();
+ this.set = new System.Windows.Forms.ToolStripButton();
+ this.dy = new System.Windows.Forms.ToolStripButton();
+ this.yl = new System.Windows.Forms.ToolStripButton();
+ this.Select = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+ this.Back = new System.Windows.Forms.ToolStripButton();
+ this.Next = new System.Windows.Forms.ToolStripButton();
+ this.xz = new System.Windows.Forms.ToolStripButton();
+ this.xg = new System.Windows.Forms.ToolStripButton();
+ this.sc = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
+ this.AddRow = new System.Windows.Forms.ToolStripButton();
+ this.DelRow = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
+ this.bc = new System.Windows.Forms.ToolStripButton();
+ this.fq = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
+ this.sh = new System.Windows.Forms.ToolStripButton();
+ this.qsh = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+ this.sz = new System.Windows.Forms.ToolStripButton();
+ this.syz = new System.Windows.Forms.ToolStripButton();
+ this.xyz = new System.Windows.Forms.ToolStripButton();
+ this.mz = new System.Windows.Forms.ToolStripButton();
+ this.tm = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
+ this.redblue = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
+ this.qt = new System.Windows.Forms.ToolStripDropDownButton();
+ this.鍏抽棴ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.鍙嶅叧闂璗oolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripSeparator15 = new System.Windows.Forms.ToolStripSeparator();
+ this.瀹℃牳ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.鍙嶅鏍窽oolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripSeparator14 = new System.Windows.Forms.ToolStripSeparator();
+ this.浣滃簾ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.鎾ら攢浣滃簾ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator();
+ this.闅愯棌鍒楄缃甌oolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.澶嶅埗鍗曟嵁ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
+ this.tc = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
+ this.toolStripSeparator13 = new System.Windows.Forms.ToolStripSeparator();
+ this.mrlk = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator();
+ this.bclk = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
+ this.lblCaption = new System.Windows.Forms.Label();
+ this.P1 = new System.Windows.Forms.Panel();
+ this.pic1 = new System.Windows.Forms.PictureBox();
+ this.cmdHICMOBillNo = new System.Windows.Forms.Button();
+ this.gbUp = new System.Windows.Forms.GroupBox();
+ this.cmdHWorkEmpID = new System.Windows.Forms.Button();
+ this.cmdHProcID = new System.Windows.Forms.Button();
+ this.label2 = new System.Windows.Forms.Label();
+ this.txtHBeginWorkTime = new System.Windows.Forms.TextBox();
+ this.label34 = new System.Windows.Forms.Label();
+ this.txtHName = new System.Windows.Forms.TextBox();
+ this.label51 = new System.Windows.Forms.Label();
+ this.cmdHDeptID = new System.Windows.Forms.Button();
+ this.txtHDeptID = new System.Windows.Forms.TextBox();
+ this.label50 = new System.Windows.Forms.Label();
+ this.dtpHPlanEndDate = new System.Windows.Forms.DateTimePicker();
+ this.label48 = new System.Windows.Forms.Label();
+ this.dtpHPlanBeginDate = new System.Windows.Forms.DateTimePicker();
+ this.label49 = new System.Windows.Forms.Label();
+ this.txtHWorkEmpNo = new System.Windows.Forms.TextBox();
+ this.txtHProcNo = new System.Windows.Forms.TextBox();
+ this.label45 = new System.Windows.Forms.Label();
+ this.label46 = new System.Windows.Forms.Label();
+ this.label43 = new System.Windows.Forms.Label();
+ this.txtHModel = new System.Windows.Forms.TextBox();
+ this.label42 = new System.Windows.Forms.Label();
+ this.txtHBatchNo = new System.Windows.Forms.TextBox();
+ this.label38 = new System.Windows.Forms.Label();
+ this.txtHTimes = new System.Windows.Forms.TextBox();
+ this.dtpHRelEndDate = new System.Windows.Forms.DateTimePicker();
+ this.label36 = new System.Windows.Forms.Label();
+ this.dtpHRelBeginDate = new System.Windows.Forms.DateTimePicker();
+ this.label31 = new System.Windows.Forms.Label();
+ this.cmdHSourceID = new System.Windows.Forms.Button();
+ this.label37 = new System.Windows.Forms.Label();
+ this.txtHSourceID = new System.Windows.Forms.TextBox();
+ this.label35 = new System.Windows.Forms.Label();
+ this.txtHWorkEmpID = new System.Windows.Forms.TextBox();
+ this.cmdHGroupID = new System.Windows.Forms.Button();
+ this.txtHGroupID = new System.Windows.Forms.TextBox();
+ this.cmdSM = new System.Windows.Forms.Button();
+ this.label33 = new System.Windows.Forms.Label();
+ this.txtHProcID = new System.Windows.Forms.TextBox();
+ this.label30 = new System.Windows.Forms.Label();
+ this.txtHProcExchBillNo = new System.Windows.Forms.TextBox();
+ this.label7 = new System.Windows.Forms.Label();
+ this.txtHSumTimes = new System.Windows.Forms.TextBox();
+ this.label16 = new System.Windows.Forms.Label();
+ this.txtHInStockQty = new System.Windows.Forms.TextBox();
+ this.label32 = new System.Windows.Forms.Label();
+ this.txtHExplanation = new System.Windows.Forms.TextBox();
+ this.cmdHUnitID = new System.Windows.Forms.Button();
+ this.label26 = new System.Windows.Forms.Label();
+ this.txtHUnitID = new System.Windows.Forms.TextBox();
+ this.label14 = new System.Windows.Forms.Label();
+ this.txtHMaterID = new System.Windows.Forms.TextBox();
+ this.label1 = new System.Windows.Forms.Label();
+ this.txtHICMOBillNo = new System.Windows.Forms.TextBox();
+ this.txtHRemark = new System.Windows.Forms.TextBox();
+ this.label20 = new System.Windows.Forms.Label();
+ this.dtpHDate = new System.Windows.Forms.DateTimePicker();
+ this.label9 = new System.Windows.Forms.Label();
+ this.label4 = new System.Windows.Forms.Label();
+ this.txtHBillNo = new System.Windows.Forms.TextBox();
+ this.label47 = new System.Windows.Forms.Label();
+ this.label18 = new System.Windows.Forms.Label();
+ this.txtHProcExchEntryID = new System.Windows.Forms.TextBox();
+ this.label29 = new System.Windows.Forms.Label();
+ this.label12 = new System.Windows.Forms.Label();
+ this.txtHProcExchInterID = new System.Windows.Forms.TextBox();
+ this.label6 = new System.Windows.Forms.Label();
+ this.label3 = new System.Windows.Forms.Label();
+ this.txtHProcExchReportEntryID = new System.Windows.Forms.TextBox();
+ this.txtHProcExchReportInterID = new System.Windows.Forms.TextBox();
+ this.txtHInnerBillNo = new System.Windows.Forms.TextBox();
+ this.label22 = new System.Windows.Forms.Label();
+ this.cmdHMaterID = new System.Windows.Forms.Button();
+ this.timer1 = new System.Windows.Forms.Timer(this.components);
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.cmbBack = new System.Windows.Forms.Button();
+ this.panel3 = new System.Windows.Forms.Panel();
+ this.cmdNext = new System.Windows.Forms.Button();
+ this.grdPrint = new System.Windows.Forms.DataGridView();
+ this.timer2 = new System.Windows.Forms.Timer(this.components);
+ this.pictureBox1 = new System.Windows.Forms.PictureBox();
+ this.Tool.SuspendLayout();
+ this.P1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pic1)).BeginInit();
+ this.gbUp.SuspendLayout();
+ this.panel1.SuspendLayout();
+ this.panel3.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdPrint)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+ this.SuspendLayout();
+ //
+ // Tool
+ //
+ this.Tool.AutoSize = false;
+ this.Tool.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("Tool.BackgroundImage")));
+ this.Tool.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+ this.Tool.ImageScalingSize = new System.Drawing.Size(22, 22);
+ this.Tool.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.set,
+ this.dy,
+ this.yl,
+ this.Select,
+ this.toolStripSeparator2,
+ this.Back,
+ this.Next,
+ this.xz,
+ this.xg,
+ this.sc,
+ this.toolStripSeparator8,
+ this.AddRow,
+ this.DelRow,
+ this.toolStripSeparator4,
+ this.bc,
+ this.fq,
+ this.toolStripSeparator5,
+ this.sh,
+ this.qsh,
+ this.toolStripSeparator1,
+ this.sz,
+ this.syz,
+ this.xyz,
+ this.mz,
+ this.tm,
+ this.toolStripSeparator6,
+ this.redblue,
+ this.toolStripSeparator3,
+ this.qt,
+ this.toolStripSeparator9,
+ this.tc,
+ this.toolStripSeparator12,
+ this.toolStripSeparator13,
+ this.mrlk,
+ this.toolStripSeparator11,
+ this.bclk,
+ this.toolStripSeparator10});
+ this.Tool.Location = new System.Drawing.Point(0, 0);
+ this.Tool.Name = "Tool";
+ this.Tool.Padding = new System.Windows.Forms.Padding(0);
+ this.Tool.Size = new System.Drawing.Size(1344, 62);
+ this.Tool.Stretch = true;
+ this.Tool.TabIndex = 17;
+ this.Tool.Text = "toolStrip1";
+ //
+ // set
+ //
+ this.set.AutoSize = false;
+ this.set.Image = ((System.Drawing.Image)(resources.GetObject("set.Image")));
+ this.set.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.set.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.set.ImageTransparentColor = System.Drawing.Color.White;
+ this.set.Name = "set";
+ this.set.Size = new System.Drawing.Size(35, 47);
+ this.set.Text = "璁剧疆";
+ this.set.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.set.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.set.Visible = false;
+ //
+ // dy
+ //
+ this.dy.AutoSize = false;
+ this.dy.Image = ((System.Drawing.Image)(resources.GetObject("dy.Image")));
+ this.dy.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.dy.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.dy.ImageTransparentColor = System.Drawing.Color.White;
+ this.dy.Name = "dy";
+ this.dy.Size = new System.Drawing.Size(35, 47);
+ this.dy.Text = "鎵撳嵃";
+ this.dy.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.dy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.dy.Visible = false;
+ //
+ // yl
+ //
+ this.yl.AutoSize = false;
+ this.yl.Image = ((System.Drawing.Image)(resources.GetObject("yl.Image")));
+ this.yl.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.yl.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.yl.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.yl.Name = "yl";
+ this.yl.Size = new System.Drawing.Size(35, 47);
+ this.yl.Text = "棰勮";
+ this.yl.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.yl.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.yl.Visible = false;
+ //
+ // Select
+ //
+ this.Select.AutoSize = false;
+ this.Select.Image = ((System.Drawing.Image)(resources.GetObject("Select.Image")));
+ this.Select.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.Select.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.Select.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.Select.Name = "Select";
+ this.Select.Size = new System.Drawing.Size(35, 47);
+ this.Select.Text = "閫夋嫨";
+ this.Select.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.Select.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.Select.Click += new System.EventHandler(this.Select_Click);
+ //
+ // toolStripSeparator2
+ //
+ this.toolStripSeparator2.Name = "toolStripSeparator2";
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator2.Visible = false;
+ //
+ // Back
+ //
+ this.Back.AutoSize = false;
+ this.Back.Image = ((System.Drawing.Image)(resources.GetObject("Back.Image")));
+ this.Back.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.Back.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.Back.ImageTransparentColor = System.Drawing.Color.White;
+ this.Back.Name = "Back";
+ this.Back.Size = new System.Drawing.Size(35, 47);
+ this.Back.Text = "涓婂紶";
+ this.Back.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.Back.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.Back.Visible = false;
+ //
+ // Next
+ //
+ this.Next.AutoSize = false;
+ this.Next.Image = ((System.Drawing.Image)(resources.GetObject("Next.Image")));
+ this.Next.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.Next.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.Next.ImageTransparentColor = System.Drawing.Color.White;
+ this.Next.Name = "Next";
+ this.Next.Size = new System.Drawing.Size(35, 47);
+ this.Next.Text = "涓嬪紶";
+ this.Next.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.Next.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.Next.Visible = false;
+ //
+ // xz
+ //
+ this.xz.AutoSize = false;
+ this.xz.Image = ((System.Drawing.Image)(resources.GetObject("xz.Image")));
+ this.xz.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.xz.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.xz.ImageTransparentColor = System.Drawing.Color.White;
+ this.xz.Name = "xz";
+ this.xz.Size = new System.Drawing.Size(35, 47);
+ this.xz.Text = "鏂板";
+ this.xz.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.xz.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.xz.Visible = false;
+ this.xz.Click += new System.EventHandler(this.xz_Click);
+ //
+ // xg
+ //
+ this.xg.AutoSize = false;
+ this.xg.Image = ((System.Drawing.Image)(resources.GetObject("xg.Image")));
+ this.xg.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.xg.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.xg.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.xg.Name = "xg";
+ this.xg.Size = new System.Drawing.Size(35, 47);
+ this.xg.Text = "淇敼";
+ this.xg.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.xg.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.xg.Visible = false;
+ this.xg.Click += new System.EventHandler(this.xg_Click);
+ //
+ // sc
+ //
+ this.sc.AutoSize = false;
+ this.sc.Image = ((System.Drawing.Image)(resources.GetObject("sc.Image")));
+ this.sc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.sc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.sc.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.sc.Name = "sc";
+ this.sc.Size = new System.Drawing.Size(35, 47);
+ this.sc.Text = "鍒犻櫎";
+ this.sc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.sc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.sc.Visible = false;
+ this.sc.Click += new System.EventHandler(this.sc_Click);
+ //
+ // toolStripSeparator8
+ //
+ this.toolStripSeparator8.Name = "toolStripSeparator8";
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator8.Visible = false;
+ //
+ // AddRow
+ //
+ this.AddRow.AutoSize = false;
+ this.AddRow.Image = ((System.Drawing.Image)(resources.GetObject("AddRow.Image")));
+ this.AddRow.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.AddRow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.AddRow.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.AddRow.Name = "AddRow";
+ this.AddRow.Size = new System.Drawing.Size(35, 47);
+ this.AddRow.Text = "澧炶";
+ this.AddRow.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.AddRow.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.AddRow.Visible = false;
+ //
+ // DelRow
+ //
+ this.DelRow.AutoSize = false;
+ this.DelRow.Image = ((System.Drawing.Image)(resources.GetObject("DelRow.Image")));
+ this.DelRow.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.DelRow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.DelRow.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.DelRow.Name = "DelRow";
+ this.DelRow.Size = new System.Drawing.Size(35, 47);
+ this.DelRow.Text = "鍒犺";
+ this.DelRow.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.DelRow.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.DelRow.Visible = false;
+ //
+ // toolStripSeparator4
+ //
+ this.toolStripSeparator4.Name = "toolStripSeparator4";
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator4.Visible = false;
+ //
+ // bc
+ //
+ this.bc.AutoSize = false;
+ this.bc.Image = ((System.Drawing.Image)(resources.GetObject("bc.Image")));
+ this.bc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.bc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.bc.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.bc.Name = "bc";
+ this.bc.Size = new System.Drawing.Size(35, 47);
+ this.bc.Text = "淇濆瓨";
+ this.bc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.bc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.bc.Visible = false;
+ this.bc.Click += new System.EventHandler(this.bc_Click);
+ //
+ // fq
+ //
+ this.fq.AutoSize = false;
+ this.fq.Image = ((System.Drawing.Image)(resources.GetObject("fq.Image")));
+ this.fq.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.fq.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.fq.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.fq.Name = "fq";
+ this.fq.Size = new System.Drawing.Size(35, 47);
+ this.fq.Text = "鏀惧純";
+ this.fq.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.fq.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.fq.Visible = false;
+ this.fq.Click += new System.EventHandler(this.fq_Click);
+ //
+ // toolStripSeparator5
+ //
+ this.toolStripSeparator5.Name = "toolStripSeparator5";
+ this.toolStripSeparator5.Size = new System.Drawing.Size(6, 62);
+ //
+ // sh
+ //
+ this.sh.AutoSize = false;
+ this.sh.Image = ((System.Drawing.Image)(resources.GetObject("sh.Image")));
+ this.sh.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.sh.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.sh.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.sh.Name = "sh";
+ this.sh.Size = new System.Drawing.Size(35, 47);
+ this.sh.Text = "瀹℃牳";
+ this.sh.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.sh.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.sh.Visible = false;
+ this.sh.Click += new System.EventHandler(this.sh_Click);
+ //
+ // qsh
+ //
+ this.qsh.AutoSize = false;
+ this.qsh.Image = ((System.Drawing.Image)(resources.GetObject("qsh.Image")));
+ this.qsh.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.qsh.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.qsh.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.qsh.Name = "qsh";
+ this.qsh.Size = new System.Drawing.Size(35, 47);
+ this.qsh.Text = "鍙嶅";
+ this.qsh.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.qsh.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.qsh.Visible = false;
+ this.qsh.Click += new System.EventHandler(this.qsh_Click);
+ //
+ // toolStripSeparator1
+ //
+ this.toolStripSeparator1.Name = "toolStripSeparator1";
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator1.Visible = false;
+ //
+ // sz
+ //
+ this.sz.AutoSize = false;
+ this.sz.Image = ((System.Drawing.Image)(resources.GetObject("sz.Image")));
+ this.sz.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.sz.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.sz.ImageTransparentColor = System.Drawing.Color.White;
+ this.sz.Name = "sz";
+ this.sz.Size = new System.Drawing.Size(35, 47);
+ this.sz.Text = "棣栧紶";
+ this.sz.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.sz.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.sz.Visible = false;
+ this.sz.Click += new System.EventHandler(this.sz_Click);
+ //
+ // syz
+ //
+ this.syz.AutoSize = false;
+ this.syz.Image = ((System.Drawing.Image)(resources.GetObject("syz.Image")));
+ this.syz.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.syz.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.syz.ImageTransparentColor = System.Drawing.Color.White;
+ this.syz.Name = "syz";
+ this.syz.Size = new System.Drawing.Size(35, 47);
+ this.syz.Text = "涓婂紶";
+ this.syz.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.syz.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.syz.Visible = false;
+ this.syz.Click += new System.EventHandler(this.syz_Click);
+ //
+ // xyz
+ //
+ this.xyz.AutoSize = false;
+ this.xyz.Image = ((System.Drawing.Image)(resources.GetObject("xyz.Image")));
+ this.xyz.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.xyz.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.xyz.ImageTransparentColor = System.Drawing.Color.White;
+ this.xyz.Name = "xyz";
+ this.xyz.Size = new System.Drawing.Size(35, 47);
+ this.xyz.Text = "涓嬪紶";
+ this.xyz.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.xyz.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.xyz.Visible = false;
+ this.xyz.Click += new System.EventHandler(this.xyz_Click);
+ //
+ // mz
+ //
+ this.mz.AutoSize = false;
+ this.mz.Image = ((System.Drawing.Image)(resources.GetObject("mz.Image")));
+ this.mz.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.mz.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.mz.ImageTransparentColor = System.Drawing.Color.White;
+ this.mz.Name = "mz";
+ this.mz.Size = new System.Drawing.Size(35, 47);
+ this.mz.Text = "鏈紶";
+ this.mz.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.mz.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.mz.Visible = false;
+ this.mz.Click += new System.EventHandler(this.mz_Click);
+ //
+ // tm
+ //
+ this.tm.AutoSize = false;
+ this.tm.Image = ((System.Drawing.Image)(resources.GetObject("tm.Image")));
+ this.tm.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.tm.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.tm.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.tm.Name = "tm";
+ this.tm.Size = new System.Drawing.Size(35, 47);
+ this.tm.Text = "鏉＄爜";
+ this.tm.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.tm.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.tm.Visible = false;
+ //
+ // toolStripSeparator6
+ //
+ this.toolStripSeparator6.Name = "toolStripSeparator6";
+ this.toolStripSeparator6.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator6.Visible = false;
+ //
+ // redblue
+ //
+ this.redblue.AutoSize = false;
+ this.redblue.Image = ((System.Drawing.Image)(resources.GetObject("redblue.Image")));
+ this.redblue.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.redblue.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.redblue.ImageTransparentColor = System.Drawing.Color.White;
+ this.redblue.Name = "redblue";
+ this.redblue.Size = new System.Drawing.Size(35, 47);
+ this.redblue.Text = "绾㈠瓧";
+ this.redblue.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.redblue.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.redblue.Visible = false;
+ //
+ // toolStripSeparator3
+ //
+ this.toolStripSeparator3.Name = "toolStripSeparator3";
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator3.Visible = false;
+ //
+ // qt
+ //
+ this.qt.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.鍏抽棴ToolStripMenuItem,
+ this.鍙嶅叧闂璗oolStripMenuItem,
+ this.toolStripSeparator15,
+ this.瀹℃牳ToolStripMenuItem,
+ this.鍙嶅鏍窽oolStripMenuItem,
+ this.toolStripSeparator14,
+ this.浣滃簾ToolStripMenuItem,
+ this.鎾ら攢浣滃簾ToolStripMenuItem,
+ this.toolStripMenuItem1,
+ this.闅愯棌鍒楄缃甌oolStripMenuItem,
+ this.澶嶅埗鍗曟嵁ToolStripMenuItem});
+ this.qt.Image = ((System.Drawing.Image)(resources.GetObject("qt.Image")));
+ this.qt.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.qt.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.qt.ImageTransparentColor = System.Drawing.Color.White;
+ this.qt.Name = "qt";
+ this.qt.Size = new System.Drawing.Size(53, 59);
+ this.qt.Text = "鍏朵粬";
+ this.qt.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.qt.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.qt.Visible = false;
+ //
+ // 鍏抽棴ToolStripMenuItem
+ //
+ this.鍏抽棴ToolStripMenuItem.Name = "鍏抽棴ToolStripMenuItem";
+ this.鍏抽棴ToolStripMenuItem.Size = new System.Drawing.Size(167, 26);
+ this.鍏抽棴ToolStripMenuItem.Text = "鍏抽棴";
+ this.鍏抽棴ToolStripMenuItem.Click += new System.EventHandler(this.鍏抽棴ToolStripMenuItem_Click);
+ //
+ // 鍙嶅叧闂璗oolStripMenuItem
+ //
+ this.鍙嶅叧闂璗oolStripMenuItem.Name = "鍙嶅叧闂璗oolStripMenuItem";
+ this.鍙嶅叧闂璗oolStripMenuItem.Size = new System.Drawing.Size(167, 26);
+ this.鍙嶅叧闂璗oolStripMenuItem.Text = "鍙嶅叧闂�";
+ this.鍙嶅叧闂璗oolStripMenuItem.Click += new System.EventHandler(this.鍙嶅叧闂璗oolStripMenuItem_Click);
+ //
+ // toolStripSeparator15
+ //
+ this.toolStripSeparator15.Name = "toolStripSeparator15";
+ this.toolStripSeparator15.Size = new System.Drawing.Size(164, 6);
+ //
+ // 瀹℃牳ToolStripMenuItem
+ //
+ this.瀹℃牳ToolStripMenuItem.Name = "瀹℃牳ToolStripMenuItem";
+ this.瀹℃牳ToolStripMenuItem.Size = new System.Drawing.Size(167, 26);
+ this.瀹℃牳ToolStripMenuItem.Text = "瀹℃牳";
+ this.瀹℃牳ToolStripMenuItem.Click += new System.EventHandler(this.瀹℃牳ToolStripMenuItem_Click);
+ //
+ // 鍙嶅鏍窽oolStripMenuItem
+ //
+ this.鍙嶅鏍窽oolStripMenuItem.Name = "鍙嶅鏍窽oolStripMenuItem";
+ this.鍙嶅鏍窽oolStripMenuItem.Size = new System.Drawing.Size(167, 26);
+ this.鍙嶅鏍窽oolStripMenuItem.Text = "鍙嶅鏍�";
+ this.鍙嶅鏍窽oolStripMenuItem.Click += new System.EventHandler(this.鍙嶅鏍窽oolStripMenuItem_Click);
+ //
+ // toolStripSeparator14
+ //
+ this.toolStripSeparator14.Name = "toolStripSeparator14";
+ this.toolStripSeparator14.Size = new System.Drawing.Size(164, 6);
+ //
+ // 浣滃簾ToolStripMenuItem
+ //
+ this.浣滃簾ToolStripMenuItem.Name = "浣滃簾ToolStripMenuItem";
+ this.浣滃簾ToolStripMenuItem.Size = new System.Drawing.Size(167, 26);
+ this.浣滃簾ToolStripMenuItem.Text = "浣滃簾";
+ this.浣滃簾ToolStripMenuItem.Click += new System.EventHandler(this.浣滃簾ToolStripMenuItem_Click);
+ //
+ // 鎾ら攢浣滃簾ToolStripMenuItem
+ //
+ this.鎾ら攢浣滃簾ToolStripMenuItem.Name = "鎾ら攢浣滃簾ToolStripMenuItem";
+ this.鎾ら攢浣滃簾ToolStripMenuItem.Size = new System.Drawing.Size(167, 26);
+ this.鎾ら攢浣滃簾ToolStripMenuItem.Text = "鎾ら攢浣滃簾";
+ this.鎾ら攢浣滃簾ToolStripMenuItem.Click += new System.EventHandler(this.鎾ら攢浣滃簾ToolStripMenuItem_Click);
+ //
+ // toolStripMenuItem1
+ //
+ this.toolStripMenuItem1.Name = "toolStripMenuItem1";
+ this.toolStripMenuItem1.Size = new System.Drawing.Size(164, 6);
+ //
+ // 闅愯棌鍒楄缃甌oolStripMenuItem
+ //
+ this.闅愯棌鍒楄缃甌oolStripMenuItem.Name = "闅愯棌鍒楄缃甌oolStripMenuItem";
+ this.闅愯棌鍒楄缃甌oolStripMenuItem.Size = new System.Drawing.Size(167, 26);
+ this.闅愯棌鍒楄缃甌oolStripMenuItem.Text = "闅愯棌鍒楄缃�";
+ this.闅愯棌鍒楄缃甌oolStripMenuItem.Click += new System.EventHandler(this.闅愯棌鍒楄缃甌oolStripMenuItem_Click);
+ //
+ // 澶嶅埗鍗曟嵁ToolStripMenuItem
+ //
+ this.澶嶅埗鍗曟嵁ToolStripMenuItem.Name = "澶嶅埗鍗曟嵁ToolStripMenuItem";
+ this.澶嶅埗鍗曟嵁ToolStripMenuItem.Size = new System.Drawing.Size(167, 26);
+ this.澶嶅埗鍗曟嵁ToolStripMenuItem.Text = "澶嶅埗鍗曟嵁";
+ //
+ // toolStripSeparator9
+ //
+ this.toolStripSeparator9.Name = "toolStripSeparator9";
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator9.Visible = false;
+ //
+ // tc
+ //
+ this.tc.AutoSize = false;
+ this.tc.Image = ((System.Drawing.Image)(resources.GetObject("tc.Image")));
+ this.tc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.tc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.tc.ImageTransparentColor = System.Drawing.Color.White;
+ this.tc.Name = "tc";
+ this.tc.Size = new System.Drawing.Size(35, 47);
+ this.tc.Text = "閫�鍑�";
+ this.tc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.tc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.tc.Click += new System.EventHandler(this.tc_Click);
+ //
+ // toolStripSeparator12
+ //
+ this.toolStripSeparator12.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripSeparator12.Name = "toolStripSeparator12";
+ this.toolStripSeparator12.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator12.Visible = false;
+ //
+ // toolStripSeparator13
+ //
+ this.toolStripSeparator13.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripSeparator13.Name = "toolStripSeparator13";
+ this.toolStripSeparator13.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator13.Visible = false;
+ //
+ // mrlk
+ //
+ this.mrlk.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.mrlk.Image = ((System.Drawing.Image)(resources.GetObject("mrlk.Image")));
+ this.mrlk.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.mrlk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.mrlk.ImageTransparentColor = System.Drawing.Color.White;
+ this.mrlk.Name = "mrlk";
+ this.mrlk.Size = new System.Drawing.Size(73, 59);
+ this.mrlk.Text = "榛樿鍒楀";
+ this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.mrlk.Visible = false;
+ //
+ // toolStripSeparator11
+ //
+ this.toolStripSeparator11.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripSeparator11.Name = "toolStripSeparator11";
+ this.toolStripSeparator11.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator11.Visible = false;
+ //
+ // bclk
+ //
+ this.bclk.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.bclk.Image = ((System.Drawing.Image)(resources.GetObject("bclk.Image")));
+ this.bclk.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.bclk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.bclk.ImageTransparentColor = System.Drawing.Color.White;
+ this.bclk.Name = "bclk";
+ this.bclk.Size = new System.Drawing.Size(73, 59);
+ this.bclk.Text = "淇濆瓨鍒楀";
+ this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.bclk.Visible = false;
+ //
+ // toolStripSeparator10
+ //
+ this.toolStripSeparator10.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripSeparator10.Name = "toolStripSeparator10";
+ this.toolStripSeparator10.Size = new System.Drawing.Size(6, 62);
+ //
+ // lblCaption
+ //
+ this.lblCaption.Dock = System.Windows.Forms.DockStyle.Top;
+ this.lblCaption.Font = new System.Drawing.Font("瀹嬩綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lblCaption.Location = new System.Drawing.Point(0, 0);
+ this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lblCaption.Name = "lblCaption";
+ this.lblCaption.Size = new System.Drawing.Size(1237, 31);
+ this.lblCaption.TabIndex = 18;
+ this.lblCaption.Text = "鍗曟嵁缂栬緫";
+ this.lblCaption.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // P1
+ //
+ this.P1.BackColor = System.Drawing.Color.Lavender;
+ this.P1.Controls.Add(this.lblCaption);
+ this.P1.Controls.Add(this.pic1);
+ this.P1.Controls.Add(this.cmdHICMOBillNo);
+ this.P1.Controls.Add(this.gbUp);
+ this.P1.Controls.Add(this.label18);
+ this.P1.Controls.Add(this.txtHProcExchEntryID);
+ this.P1.Controls.Add(this.label29);
+ this.P1.Controls.Add(this.label12);
+ this.P1.Controls.Add(this.txtHProcExchInterID);
+ this.P1.Controls.Add(this.label6);
+ this.P1.Controls.Add(this.label3);
+ this.P1.Controls.Add(this.txtHProcExchReportEntryID);
+ this.P1.Controls.Add(this.txtHProcExchReportInterID);
+ this.P1.Controls.Add(this.txtHInnerBillNo);
+ this.P1.Controls.Add(this.label22);
+ this.P1.Controls.Add(this.cmdHMaterID);
+ this.P1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.P1.Location = new System.Drawing.Point(55, 62);
+ this.P1.Margin = new System.Windows.Forms.Padding(4);
+ this.P1.Name = "P1";
+ this.P1.Size = new System.Drawing.Size(1237, 130);
+ this.P1.TabIndex = 31;
+ //
+ // pic1
+ //
+ this.pic1.Location = new System.Drawing.Point(417, 4);
+ this.pic1.Margin = new System.Windows.Forms.Padding(4);
+ this.pic1.Name = "pic1";
+ this.pic1.Size = new System.Drawing.Size(88, 38);
+ this.pic1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.pic1.TabIndex = 36;
+ this.pic1.TabStop = false;
+ this.pic1.Visible = false;
+ //
+ // cmdHICMOBillNo
+ //
+ this.cmdHICMOBillNo.BackColor = System.Drawing.Color.Transparent;
+ this.cmdHICMOBillNo.Image = ((System.Drawing.Image)(resources.GetObject("cmdHICMOBillNo.Image")));
+ this.cmdHICMOBillNo.ImageAlign = System.Drawing.ContentAlignment.TopRight;
+ this.cmdHICMOBillNo.Location = new System.Drawing.Point(267, -4);
+ this.cmdHICMOBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdHICMOBillNo.Name = "cmdHICMOBillNo";
+ this.cmdHICMOBillNo.Size = new System.Drawing.Size(39, 35);
+ this.cmdHICMOBillNo.TabIndex = 371;
+ this.cmdHICMOBillNo.UseVisualStyleBackColor = false;
+ this.cmdHICMOBillNo.Visible = false;
+ this.cmdHICMOBillNo.Click += new System.EventHandler(this.cmdHICMOBillNo_Click);
+ //
+ // gbUp
+ //
+ this.gbUp.BackColor = System.Drawing.Color.Transparent;
+ this.gbUp.Controls.Add(this.cmdHWorkEmpID);
+ this.gbUp.Controls.Add(this.cmdHProcID);
+ this.gbUp.Controls.Add(this.label2);
+ this.gbUp.Controls.Add(this.txtHBeginWorkTime);
+ this.gbUp.Controls.Add(this.label34);
+ this.gbUp.Controls.Add(this.txtHName);
+ this.gbUp.Controls.Add(this.label51);
+ this.gbUp.Controls.Add(this.cmdHDeptID);
+ this.gbUp.Controls.Add(this.txtHDeptID);
+ this.gbUp.Controls.Add(this.label50);
+ this.gbUp.Controls.Add(this.dtpHPlanEndDate);
+ this.gbUp.Controls.Add(this.label48);
+ this.gbUp.Controls.Add(this.dtpHPlanBeginDate);
+ this.gbUp.Controls.Add(this.label49);
+ this.gbUp.Controls.Add(this.txtHWorkEmpNo);
+ this.gbUp.Controls.Add(this.txtHProcNo);
+ this.gbUp.Controls.Add(this.label45);
+ this.gbUp.Controls.Add(this.label46);
+ this.gbUp.Controls.Add(this.label43);
+ this.gbUp.Controls.Add(this.txtHModel);
+ this.gbUp.Controls.Add(this.label42);
+ this.gbUp.Controls.Add(this.txtHBatchNo);
+ this.gbUp.Controls.Add(this.label38);
+ this.gbUp.Controls.Add(this.txtHTimes);
+ this.gbUp.Controls.Add(this.dtpHRelEndDate);
+ this.gbUp.Controls.Add(this.label36);
+ this.gbUp.Controls.Add(this.dtpHRelBeginDate);
+ this.gbUp.Controls.Add(this.label31);
+ this.gbUp.Controls.Add(this.cmdHSourceID);
+ this.gbUp.Controls.Add(this.label37);
+ this.gbUp.Controls.Add(this.txtHSourceID);
+ this.gbUp.Controls.Add(this.label35);
+ this.gbUp.Controls.Add(this.txtHWorkEmpID);
+ this.gbUp.Controls.Add(this.cmdHGroupID);
+ this.gbUp.Controls.Add(this.txtHGroupID);
+ this.gbUp.Controls.Add(this.cmdSM);
+ this.gbUp.Controls.Add(this.label33);
+ this.gbUp.Controls.Add(this.txtHProcID);
+ this.gbUp.Controls.Add(this.label30);
+ this.gbUp.Controls.Add(this.txtHProcExchBillNo);
+ this.gbUp.Controls.Add(this.label7);
+ this.gbUp.Controls.Add(this.txtHSumTimes);
+ this.gbUp.Controls.Add(this.label16);
+ this.gbUp.Controls.Add(this.txtHInStockQty);
+ this.gbUp.Controls.Add(this.label32);
+ this.gbUp.Controls.Add(this.txtHExplanation);
+ this.gbUp.Controls.Add(this.cmdHUnitID);
+ this.gbUp.Controls.Add(this.label26);
+ this.gbUp.Controls.Add(this.txtHUnitID);
+ this.gbUp.Controls.Add(this.label14);
+ this.gbUp.Controls.Add(this.txtHMaterID);
+ this.gbUp.Controls.Add(this.label1);
+ this.gbUp.Controls.Add(this.txtHICMOBillNo);
+ this.gbUp.Controls.Add(this.txtHRemark);
+ this.gbUp.Controls.Add(this.label20);
+ this.gbUp.Controls.Add(this.dtpHDate);
+ this.gbUp.Controls.Add(this.label9);
+ this.gbUp.Controls.Add(this.label4);
+ this.gbUp.Controls.Add(this.txtHBillNo);
+ this.gbUp.Controls.Add(this.label47);
+ this.gbUp.Location = new System.Drawing.Point(4, 34);
+ this.gbUp.Margin = new System.Windows.Forms.Padding(4);
+ this.gbUp.Name = "gbUp";
+ this.gbUp.Padding = new System.Windows.Forms.Padding(4);
+ this.gbUp.Size = new System.Drawing.Size(1236, 92);
+ this.gbUp.TabIndex = 33;
+ this.gbUp.TabStop = false;
+ //
+ // cmdHWorkEmpID
+ //
+ this.cmdHWorkEmpID.BackColor = System.Drawing.Color.Transparent;
+ this.cmdHWorkEmpID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHWorkEmpID.Image")));
+ this.cmdHWorkEmpID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
+ this.cmdHWorkEmpID.Location = new System.Drawing.Point(371, 351);
+ this.cmdHWorkEmpID.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdHWorkEmpID.Name = "cmdHWorkEmpID";
+ this.cmdHWorkEmpID.Size = new System.Drawing.Size(39, 35);
+ this.cmdHWorkEmpID.TabIndex = 326;
+ this.cmdHWorkEmpID.UseVisualStyleBackColor = false;
+ this.cmdHWorkEmpID.Visible = false;
+ this.cmdHWorkEmpID.Click += new System.EventHandler(this.cmdHWorkEmpID_Click);
+ //
+ // cmdHProcID
+ //
+ this.cmdHProcID.BackColor = System.Drawing.Color.Transparent;
+ this.cmdHProcID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHProcID.Image")));
+ this.cmdHProcID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
+ this.cmdHProcID.Location = new System.Drawing.Point(371, 298);
+ this.cmdHProcID.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdHProcID.Name = "cmdHProcID";
+ this.cmdHProcID.Size = new System.Drawing.Size(39, 35);
+ this.cmdHProcID.TabIndex = 319;
+ this.cmdHProcID.UseVisualStyleBackColor = false;
+ this.cmdHProcID.Visible = false;
+ this.cmdHProcID.Click += new System.EventHandler(this.cmdHProcID_Click);
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label2.ForeColor = System.Drawing.Color.Black;
+ this.label2.Location = new System.Drawing.Point(415, 416);
+ this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(89, 20);
+ this.label2.TabIndex = 369;
+ this.label2.Text = "寮�宸ユ椂闂�";
+ this.label2.Visible = false;
+ //
+ // txtHBeginWorkTime
+ //
+ this.txtHBeginWorkTime.BackColor = System.Drawing.SystemColors.Window;
+ this.txtHBeginWorkTime.Enabled = false;
+ this.txtHBeginWorkTime.Font = new System.Drawing.Font("榛戜綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHBeginWorkTime.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHBeginWorkTime.Location = new System.Drawing.Point(517, 408);
+ this.txtHBeginWorkTime.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHBeginWorkTime.Name = "txtHBeginWorkTime";
+ this.txtHBeginWorkTime.Size = new System.Drawing.Size(277, 30);
+ this.txtHBeginWorkTime.TabIndex = 370;
+ this.txtHBeginWorkTime.Tag = "0";
+ this.txtHBeginWorkTime.Visible = false;
+ //
+ // label34
+ //
+ this.label34.AutoSize = true;
+ this.label34.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label34.ForeColor = System.Drawing.Color.Black;
+ this.label34.Location = new System.Drawing.Point(809, 359);
+ this.label34.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label34.Name = "label34";
+ this.label34.Size = new System.Drawing.Size(89, 20);
+ this.label34.TabIndex = 321;
+ this.label34.Text = "鐢熶骇鐝粍";
+ this.label34.Visible = false;
+ //
+ // txtHName
+ //
+ this.txtHName.BackColor = System.Drawing.SystemColors.Window;
+ this.txtHName.Enabled = false;
+ this.txtHName.Font = new System.Drawing.Font("榛戜綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHName.Location = new System.Drawing.Point(517, 54);
+ this.txtHName.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHName.Name = "txtHName";
+ this.txtHName.ReadOnly = true;
+ this.txtHName.Size = new System.Drawing.Size(277, 30);
+ this.txtHName.TabIndex = 368;
+ this.txtHName.Tag = "0";
+ //
+ // label51
+ //
+ this.label51.AutoSize = true;
+ this.label51.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label51.ForeColor = System.Drawing.Color.Black;
+ this.label51.Location = new System.Drawing.Point(420, 57);
+ this.label51.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label51.Name = "label51";
+ this.label51.Size = new System.Drawing.Size(89, 20);
+ this.label51.TabIndex = 367;
+ this.label51.Text = "浜у搧鍚嶇О";
+ //
+ // cmdHDeptID
+ //
+ this.cmdHDeptID.BackColor = System.Drawing.Color.Transparent;
+ this.cmdHDeptID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHDeptID.Image")));
+ this.cmdHDeptID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
+ this.cmdHDeptID.Location = new System.Drawing.Point(371, 406);
+ this.cmdHDeptID.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdHDeptID.Name = "cmdHDeptID";
+ this.cmdHDeptID.Size = new System.Drawing.Size(39, 35);
+ this.cmdHDeptID.TabIndex = 366;
+ this.cmdHDeptID.UseVisualStyleBackColor = false;
+ this.cmdHDeptID.Visible = false;
+ this.cmdHDeptID.Click += new System.EventHandler(this.cmdHDeptID_Click);
+ //
+ // txtHDeptID
+ //
+ this.txtHDeptID.BackColor = System.Drawing.Color.Beige;
+ this.txtHDeptID.Font = new System.Drawing.Font("榛戜綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHDeptID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHDeptID.Location = new System.Drawing.Point(125, 408);
+ this.txtHDeptID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHDeptID.Name = "txtHDeptID";
+ this.txtHDeptID.Size = new System.Drawing.Size(257, 30);
+ this.txtHDeptID.TabIndex = 365;
+ this.txtHDeptID.Tag = "0";
+ this.txtHDeptID.Visible = false;
+ this.txtHDeptID.TextChanged += new System.EventHandler(this.txtHDeptID_TextChanged);
+ //
+ // label50
+ //
+ this.label50.AutoSize = true;
+ this.label50.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label50.ForeColor = System.Drawing.Color.Black;
+ this.label50.Location = new System.Drawing.Point(21, 411);
+ this.label50.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label50.Name = "label50";
+ this.label50.Size = new System.Drawing.Size(89, 20);
+ this.label50.TabIndex = 364;
+ this.label50.Text = "宸� 娈�";
+ this.label50.Visible = false;
+ //
+ // dtpHPlanEndDate
+ //
+ this.dtpHPlanEndDate.Enabled = false;
+ this.dtpHPlanEndDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
+ this.dtpHPlanEndDate.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.dtpHPlanEndDate.Location = new System.Drawing.Point(933, 700);
+ this.dtpHPlanEndDate.Margin = new System.Windows.Forms.Padding(4);
+ this.dtpHPlanEndDate.Name = "dtpHPlanEndDate";
+ this.dtpHPlanEndDate.Size = new System.Drawing.Size(244, 25);
+ this.dtpHPlanEndDate.TabIndex = 363;
+ this.dtpHPlanEndDate.Visible = false;
+ //
+ // label48
+ //
+ this.label48.AutoSize = true;
+ this.label48.Enabled = false;
+ this.label48.ForeColor = System.Drawing.Color.Black;
+ this.label48.Location = new System.Drawing.Point(828, 705);
+ this.label48.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label48.Name = "label48";
+ this.label48.Size = new System.Drawing.Size(97, 15);
+ this.label48.TabIndex = 362;
+ this.label48.Text = "璁″垝瀹屽伐鏃ユ湡";
+ this.label48.Visible = false;
+ //
+ // dtpHPlanBeginDate
+ //
+ this.dtpHPlanBeginDate.Enabled = false;
+ this.dtpHPlanBeginDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
+ this.dtpHPlanBeginDate.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.dtpHPlanBeginDate.Location = new System.Drawing.Point(549, 700);
+ this.dtpHPlanBeginDate.Margin = new System.Windows.Forms.Padding(4);
+ this.dtpHPlanBeginDate.Name = "dtpHPlanBeginDate";
+ this.dtpHPlanBeginDate.Size = new System.Drawing.Size(244, 25);
+ this.dtpHPlanBeginDate.TabIndex = 361;
+ this.dtpHPlanBeginDate.Visible = false;
+ //
+ // label49
+ //
+ this.label49.AutoSize = true;
+ this.label49.Enabled = false;
+ this.label49.ForeColor = System.Drawing.Color.Black;
+ this.label49.Location = new System.Drawing.Point(441, 705);
+ this.label49.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label49.Name = "label49";
+ this.label49.Size = new System.Drawing.Size(97, 15);
+ this.label49.TabIndex = 360;
+ this.label49.Text = "璁″垝寮�宸ユ棩鏈�";
+ this.label49.Visible = false;
+ //
+ // txtHWorkEmpNo
+ //
+ this.txtHWorkEmpNo.BackColor = System.Drawing.Color.Beige;
+ this.txtHWorkEmpNo.Font = new System.Drawing.Font("榛戜綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHWorkEmpNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHWorkEmpNo.Location = new System.Drawing.Point(125, 352);
+ this.txtHWorkEmpNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHWorkEmpNo.Name = "txtHWorkEmpNo";
+ this.txtHWorkEmpNo.Size = new System.Drawing.Size(257, 30);
+ this.txtHWorkEmpNo.TabIndex = 357;
+ this.txtHWorkEmpNo.Tag = "0";
+ this.txtHWorkEmpNo.Visible = false;
+ this.txtHWorkEmpNo.TextChanged += new System.EventHandler(this.txtHWorkEmpNo_TextChanged);
+ this.txtHWorkEmpNo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHWorkEmpNo_KeyDown);
+ //
+ // txtHProcNo
+ //
+ this.txtHProcNo.BackColor = System.Drawing.Color.Beige;
+ this.txtHProcNo.Font = new System.Drawing.Font("榛戜綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHProcNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHProcNo.Location = new System.Drawing.Point(125, 299);
+ this.txtHProcNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHProcNo.Name = "txtHProcNo";
+ this.txtHProcNo.Size = new System.Drawing.Size(257, 30);
+ this.txtHProcNo.TabIndex = 356;
+ this.txtHProcNo.Tag = "0";
+ this.txtHProcNo.Visible = false;
+ this.txtHProcNo.TextChanged += new System.EventHandler(this.txtHProcNo_TextChanged);
+ this.txtHProcNo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHProcNo_KeyDown);
+ //
+ // label45
+ //
+ this.label45.AutoSize = true;
+ this.label45.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label45.ForeColor = System.Drawing.Color.Black;
+ this.label45.Location = new System.Drawing.Point(417, 359);
+ this.label45.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label45.Name = "label45";
+ this.label45.Size = new System.Drawing.Size(89, 20);
+ this.label45.TabIndex = 355;
+ this.label45.Text = "鎿� 浣� 鍛�";
+ this.label45.Visible = false;
+ //
+ // label46
+ //
+ this.label46.AutoSize = true;
+ this.label46.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label46.ForeColor = System.Drawing.Color.Black;
+ this.label46.Location = new System.Drawing.Point(417, 305);
+ this.label46.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label46.Name = "label46";
+ this.label46.Size = new System.Drawing.Size(89, 20);
+ this.label46.TabIndex = 354;
+ this.label46.Text = "宸� 搴� 鍚�";
+ this.label46.Visible = false;
+ //
+ // label43
+ //
+ this.label43.AutoSize = true;
+ this.label43.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label43.ForeColor = System.Drawing.Color.Black;
+ this.label43.Location = new System.Drawing.Point(815, 62);
+ this.label43.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label43.Name = "label43";
+ this.label43.Size = new System.Drawing.Size(89, 20);
+ this.label43.TabIndex = 352;
+ this.label43.Text = "瑙勬牸鍨嬪彿";
+ //
+ // txtHModel
+ //
+ this.txtHModel.BackColor = System.Drawing.SystemColors.Window;
+ this.txtHModel.Enabled = false;
+ this.txtHModel.Font = new System.Drawing.Font("榛戜綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHModel.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHModel.Location = new System.Drawing.Point(912, 54);
+ this.txtHModel.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHModel.Name = "txtHModel";
+ this.txtHModel.ReadOnly = true;
+ this.txtHModel.Size = new System.Drawing.Size(315, 30);
+ this.txtHModel.TabIndex = 353;
+ this.txtHModel.Tag = "0";
+ //
+ // label42
+ //
+ this.label42.AutoSize = true;
+ this.label42.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label42.ForeColor = System.Drawing.Color.Black;
+ this.label42.Location = new System.Drawing.Point(419, 25);
+ this.label42.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label42.Name = "label42";
+ this.label42.Size = new System.Drawing.Size(89, 20);
+ this.label42.TabIndex = 348;
+ this.label42.Text = "鎵� 鍙�";
+ //
+ // txtHBatchNo
+ //
+ this.txtHBatchNo.BackColor = System.Drawing.SystemColors.Window;
+ this.txtHBatchNo.Enabled = false;
+ this.txtHBatchNo.Font = new System.Drawing.Font("榛戜綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHBatchNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHBatchNo.Location = new System.Drawing.Point(517, 20);
+ this.txtHBatchNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHBatchNo.Name = "txtHBatchNo";
+ this.txtHBatchNo.Size = new System.Drawing.Size(277, 30);
+ this.txtHBatchNo.TabIndex = 349;
+ this.txtHBatchNo.Tag = "0";
+ //
+ // label38
+ //
+ this.label38.AutoSize = true;
+ this.label38.Enabled = false;
+ this.label38.ForeColor = System.Drawing.Color.Black;
+ this.label38.Location = new System.Drawing.Point(831, 571);
+ this.label38.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label38.Name = "label38";
+ this.label38.Size = new System.Drawing.Size(67, 15);
+ this.label38.TabIndex = 342;
+ this.label38.Text = "瀹炲仛鏃堕棿";
+ this.label38.Visible = false;
+ //
+ // txtHTimes
+ //
+ this.txtHTimes.BackColor = System.Drawing.SystemColors.Window;
+ this.txtHTimes.Enabled = false;
+ this.txtHTimes.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHTimes.Location = new System.Drawing.Point(928, 566);
+ this.txtHTimes.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHTimes.Name = "txtHTimes";
+ this.txtHTimes.Size = new System.Drawing.Size(249, 25);
+ this.txtHTimes.TabIndex = 343;
+ this.txtHTimes.Tag = "0";
+ this.txtHTimes.Visible = false;
+ //
+ // dtpHRelEndDate
+ //
+ this.dtpHRelEndDate.Enabled = false;
+ this.dtpHRelEndDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
+ this.dtpHRelEndDate.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.dtpHRelEndDate.Location = new System.Drawing.Point(543, 565);
+ this.dtpHRelEndDate.Margin = new System.Windows.Forms.Padding(4);
+ this.dtpHRelEndDate.Name = "dtpHRelEndDate";
+ this.dtpHRelEndDate.Size = new System.Drawing.Size(244, 25);
+ this.dtpHRelEndDate.TabIndex = 341;
+ this.dtpHRelEndDate.Visible = false;
+ //
+ // label36
+ //
+ this.label36.AutoSize = true;
+ this.label36.Enabled = false;
+ this.label36.ForeColor = System.Drawing.Color.Black;
+ this.label36.Location = new System.Drawing.Point(437, 570);
+ this.label36.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label36.Name = "label36";
+ this.label36.Size = new System.Drawing.Size(97, 15);
+ this.label36.TabIndex = 340;
+ this.label36.Text = "瀹為檯瀹屽伐鏃ユ湡";
+ this.label36.Visible = false;
+ //
+ // dtpHRelBeginDate
+ //
+ this.dtpHRelBeginDate.Enabled = false;
+ this.dtpHRelBeginDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
+ this.dtpHRelBeginDate.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.dtpHRelBeginDate.Location = new System.Drawing.Point(159, 565);
+ this.dtpHRelBeginDate.Margin = new System.Windows.Forms.Padding(4);
+ this.dtpHRelBeginDate.Name = "dtpHRelBeginDate";
+ this.dtpHRelBeginDate.Size = new System.Drawing.Size(244, 25);
+ this.dtpHRelBeginDate.TabIndex = 339;
+ this.dtpHRelBeginDate.Visible = false;
+ //
+ // label31
+ //
+ this.label31.AutoSize = true;
+ this.label31.Enabled = false;
+ this.label31.ForeColor = System.Drawing.Color.Black;
+ this.label31.Location = new System.Drawing.Point(51, 570);
+ this.label31.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label31.Name = "label31";
+ this.label31.Size = new System.Drawing.Size(97, 15);
+ this.label31.TabIndex = 338;
+ this.label31.Text = "瀹為檯寮�宸ユ棩鏈�";
+ this.label31.Visible = false;
+ //
+ // cmdHSourceID
+ //
+ this.cmdHSourceID.BackColor = System.Drawing.Color.Transparent;
+ this.cmdHSourceID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSourceID.Image")));
+ this.cmdHSourceID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
+ this.cmdHSourceID.Location = new System.Drawing.Point(1189, 298);
+ this.cmdHSourceID.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdHSourceID.Name = "cmdHSourceID";
+ this.cmdHSourceID.Size = new System.Drawing.Size(39, 35);
+ this.cmdHSourceID.TabIndex = 332;
+ this.cmdHSourceID.UseVisualStyleBackColor = false;
+ this.cmdHSourceID.Visible = false;
+ this.cmdHSourceID.Click += new System.EventHandler(this.cmdHSourceID_Click);
+ //
+ // label37
+ //
+ this.label37.AutoSize = true;
+ this.label37.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label37.ForeColor = System.Drawing.Color.Black;
+ this.label37.Location = new System.Drawing.Point(807, 305);
+ this.label37.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label37.Name = "label37";
+ this.label37.Size = new System.Drawing.Size(89, 20);
+ this.label37.TabIndex = 330;
+ this.label37.Text = "鐢熶骇璧勬簮";
+ this.label37.Visible = false;
+ //
+ // txtHSourceID
+ //
+ this.txtHSourceID.BackColor = System.Drawing.Color.Beige;
+ this.txtHSourceID.Font = new System.Drawing.Font("榛戜綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHSourceID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHSourceID.Location = new System.Drawing.Point(913, 299);
+ this.txtHSourceID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHSourceID.Name = "txtHSourceID";
+ this.txtHSourceID.Size = new System.Drawing.Size(277, 30);
+ this.txtHSourceID.TabIndex = 331;
+ this.txtHSourceID.Tag = "0";
+ this.txtHSourceID.Visible = false;
+ this.txtHSourceID.TextChanged += new System.EventHandler(this.txtHSourceID_TextChanged);
+ //
+ // label35
+ //
+ this.label35.AutoSize = true;
+ this.label35.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label35.ForeColor = System.Drawing.Color.Black;
+ this.label35.Location = new System.Drawing.Point(21, 359);
+ this.label35.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label35.Name = "label35";
+ this.label35.Size = new System.Drawing.Size(89, 20);
+ this.label35.TabIndex = 324;
+ this.label35.Text = "宸� 鍙�";
+ this.label35.Visible = false;
+ //
+ // txtHWorkEmpID
+ //
+ this.txtHWorkEmpID.BackColor = System.Drawing.SystemColors.Window;
+ this.txtHWorkEmpID.Enabled = false;
+ this.txtHWorkEmpID.Font = new System.Drawing.Font("榛戜綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHWorkEmpID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHWorkEmpID.Location = new System.Drawing.Point(516, 355);
+ this.txtHWorkEmpID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHWorkEmpID.Name = "txtHWorkEmpID";
+ this.txtHWorkEmpID.ReadOnly = true;
+ this.txtHWorkEmpID.Size = new System.Drawing.Size(276, 30);
+ this.txtHWorkEmpID.TabIndex = 3;
+ this.txtHWorkEmpID.Tag = "0";
+ this.txtHWorkEmpID.Visible = false;
+ this.txtHWorkEmpID.TextChanged += new System.EventHandler(this.txtHWorkEmpID_TextChanged);
+ //
+ // cmdHGroupID
+ //
+ this.cmdHGroupID.BackColor = System.Drawing.Color.Transparent;
+ this.cmdHGroupID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHGroupID.Image")));
+ this.cmdHGroupID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
+ this.cmdHGroupID.Location = new System.Drawing.Point(1189, 352);
+ this.cmdHGroupID.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdHGroupID.Name = "cmdHGroupID";
+ this.cmdHGroupID.Size = new System.Drawing.Size(39, 35);
+ this.cmdHGroupID.TabIndex = 323;
+ this.cmdHGroupID.UseVisualStyleBackColor = false;
+ this.cmdHGroupID.Visible = false;
+ this.cmdHGroupID.Click += new System.EventHandler(this.cmdHGroupID_Click);
+ //
+ // txtHGroupID
+ //
+ this.txtHGroupID.BackColor = System.Drawing.Color.Beige;
+ this.txtHGroupID.Font = new System.Drawing.Font("榛戜綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHGroupID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHGroupID.Location = new System.Drawing.Point(913, 352);
+ this.txtHGroupID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHGroupID.Name = "txtHGroupID";
+ this.txtHGroupID.Size = new System.Drawing.Size(277, 30);
+ this.txtHGroupID.TabIndex = 322;
+ this.txtHGroupID.Tag = "0";
+ this.txtHGroupID.Visible = false;
+ this.txtHGroupID.TextChanged += new System.EventHandler(this.txtHGroupID_TextChanged);
+ //
+ // cmdSM
+ //
+ this.cmdSM.Location = new System.Drawing.Point(4, -28);
+ this.cmdSM.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdSM.Name = "cmdSM";
+ this.cmdSM.Size = new System.Drawing.Size(100, 30);
+ this.cmdSM.TabIndex = 320;
+ this.cmdSM.Text = "鎵爜";
+ this.cmdSM.UseVisualStyleBackColor = true;
+ this.cmdSM.Visible = false;
+ this.cmdSM.Click += new System.EventHandler(this.cmdSM_Click);
+ //
+ // label33
+ //
+ this.label33.AutoSize = true;
+ this.label33.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label33.ForeColor = System.Drawing.Color.Black;
+ this.label33.Location = new System.Drawing.Point(21, 305);
+ this.label33.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label33.Name = "label33";
+ this.label33.Size = new System.Drawing.Size(89, 20);
+ this.label33.TabIndex = 317;
+ this.label33.Text = "宸� 搴� 鍙�";
+ this.label33.Visible = false;
+ //
+ // txtHProcID
+ //
+ this.txtHProcID.BackColor = System.Drawing.SystemColors.Window;
+ this.txtHProcID.Enabled = false;
+ this.txtHProcID.Font = new System.Drawing.Font("榛戜綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHProcID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHProcID.Location = new System.Drawing.Point(517, 301);
+ this.txtHProcID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHProcID.Name = "txtHProcID";
+ this.txtHProcID.ReadOnly = true;
+ this.txtHProcID.Size = new System.Drawing.Size(276, 30);
+ this.txtHProcID.TabIndex = 2;
+ this.txtHProcID.Tag = "0";
+ this.txtHProcID.Visible = false;
+ this.txtHProcID.TextChanged += new System.EventHandler(this.txtHProcID_TextChanged);
+ //
+ // label30
+ //
+ this.label30.AutoSize = true;
+ this.label30.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label30.ForeColor = System.Drawing.Color.Black;
+ this.label30.Location = new System.Drawing.Point(1063, 86);
+ this.label30.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label30.Name = "label30";
+ this.label30.Size = new System.Drawing.Size(89, 20);
+ this.label30.TabIndex = 309;
+ this.label30.Text = "娴佽浆鍗″彿";
+ this.label30.Visible = false;
+ //
+ // txtHProcExchBillNo
+ //
+ this.txtHProcExchBillNo.Font = new System.Drawing.Font("榛戜綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHProcExchBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHProcExchBillNo.Location = new System.Drawing.Point(1167, 81);
+ this.txtHProcExchBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHProcExchBillNo.Name = "txtHProcExchBillNo";
+ this.txtHProcExchBillNo.Size = new System.Drawing.Size(283, 30);
+ this.txtHProcExchBillNo.TabIndex = 1;
+ this.txtHProcExchBillNo.Tag = "0";
+ this.txtHProcExchBillNo.Visible = false;
+ this.txtHProcExchBillNo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHProcExchBillNo_KeyDown);
+ //
+ // label7
+ //
+ this.label7.AutoSize = true;
+ this.label7.Enabled = false;
+ this.label7.ForeColor = System.Drawing.Color.Black;
+ this.label7.Location = new System.Drawing.Point(801, 502);
+ this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(82, 15);
+ this.label7.TabIndex = 303;
+ this.label7.Text = "鎬诲伐浣滄椂闂�";
+ this.label7.Visible = false;
+ //
+ // txtHSumTimes
+ //
+ this.txtHSumTimes.BackColor = System.Drawing.SystemColors.Window;
+ this.txtHSumTimes.Enabled = false;
+ this.txtHSumTimes.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHSumTimes.Location = new System.Drawing.Point(899, 498);
+ this.txtHSumTimes.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHSumTimes.Name = "txtHSumTimes";
+ this.txtHSumTimes.Size = new System.Drawing.Size(249, 25);
+ this.txtHSumTimes.TabIndex = 304;
+ this.txtHSumTimes.Tag = "0";
+ this.txtHSumTimes.Visible = false;
+ //
+ // label16
+ //
+ this.label16.AutoSize = true;
+ this.label16.Enabled = false;
+ this.label16.ForeColor = System.Drawing.Color.Black;
+ this.label16.Location = new System.Drawing.Point(421, 504);
+ this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label16.Name = "label16";
+ this.label16.Size = new System.Drawing.Size(67, 15);
+ this.label16.TabIndex = 301;
+ this.label16.Text = "鍏ュ簱鏁伴噺";
+ this.label16.Visible = false;
+ //
+ // txtHInStockQty
+ //
+ this.txtHInStockQty.BackColor = System.Drawing.SystemColors.Window;
+ this.txtHInStockQty.Enabled = false;
+ this.txtHInStockQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHInStockQty.Location = new System.Drawing.Point(513, 499);
+ this.txtHInStockQty.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHInStockQty.Name = "txtHInStockQty";
+ this.txtHInStockQty.Size = new System.Drawing.Size(249, 25);
+ this.txtHInStockQty.TabIndex = 302;
+ this.txtHInStockQty.Tag = "0";
+ this.txtHInStockQty.Visible = false;
+ //
+ // label32
+ //
+ this.label32.AutoSize = true;
+ this.label32.Enabled = false;
+ this.label32.ForeColor = System.Drawing.Color.Black;
+ this.label32.Location = new System.Drawing.Point(67, 638);
+ this.label32.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label32.Name = "label32";
+ this.label32.Size = new System.Drawing.Size(69, 15);
+ this.label32.TabIndex = 283;
+ this.label32.Text = "鎽� 瑕�";
+ this.label32.Visible = false;
+ //
+ // txtHExplanation
+ //
+ this.txtHExplanation.BackColor = System.Drawing.SystemColors.Window;
+ this.txtHExplanation.Enabled = false;
+ this.txtHExplanation.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHExplanation.Location = new System.Drawing.Point(159, 632);
+ this.txtHExplanation.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHExplanation.Name = "txtHExplanation";
+ this.txtHExplanation.Size = new System.Drawing.Size(1019, 25);
+ this.txtHExplanation.TabIndex = 284;
+ this.txtHExplanation.Tag = "0";
+ this.txtHExplanation.Visible = false;
+ //
+ // cmdHUnitID
+ //
+ this.cmdHUnitID.BackColor = System.Drawing.Color.Transparent;
+ this.cmdHUnitID.Enabled = false;
+ this.cmdHUnitID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHUnitID.Image")));
+ this.cmdHUnitID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
+ this.cmdHUnitID.Location = new System.Drawing.Point(735, 464);
+ this.cmdHUnitID.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdHUnitID.Name = "cmdHUnitID";
+ this.cmdHUnitID.Size = new System.Drawing.Size(29, 28);
+ this.cmdHUnitID.TabIndex = 274;
+ this.cmdHUnitID.UseVisualStyleBackColor = false;
+ this.cmdHUnitID.Visible = false;
+ //
+ // label26
+ //
+ this.label26.AutoSize = true;
+ this.label26.Enabled = false;
+ this.label26.ForeColor = System.Drawing.Color.Black;
+ this.label26.Location = new System.Drawing.Point(421, 470);
+ this.label26.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label26.Name = "label26";
+ this.label26.Size = new System.Drawing.Size(69, 15);
+ this.label26.TabIndex = 272;
+ this.label26.Text = "鍗� 浣�";
+ this.label26.Visible = false;
+ //
+ // txtHUnitID
+ //
+ this.txtHUnitID.BackColor = System.Drawing.Color.Beige;
+ this.txtHUnitID.Enabled = false;
+ this.txtHUnitID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHUnitID.Location = new System.Drawing.Point(513, 465);
+ this.txtHUnitID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHUnitID.Name = "txtHUnitID";
+ this.txtHUnitID.Size = new System.Drawing.Size(220, 25);
+ this.txtHUnitID.TabIndex = 273;
+ this.txtHUnitID.Tag = "0";
+ this.txtHUnitID.Visible = false;
+ //
+ // label14
+ //
+ this.label14.AutoSize = true;
+ this.label14.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label14.ForeColor = System.Drawing.Color.Black;
+ this.label14.Location = new System.Drawing.Point(21, 62);
+ this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label14.Name = "label14";
+ this.label14.Size = new System.Drawing.Size(89, 20);
+ this.label14.TabIndex = 267;
+ this.label14.Text = "浜� 鍝�";
+ //
+ // txtHMaterID
+ //
+ this.txtHMaterID.BackColor = System.Drawing.SystemColors.Window;
+ this.txtHMaterID.Enabled = false;
+ this.txtHMaterID.Font = new System.Drawing.Font("榛戜綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHMaterID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHMaterID.Location = new System.Drawing.Point(125, 54);
+ this.txtHMaterID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHMaterID.Name = "txtHMaterID";
+ this.txtHMaterID.ReadOnly = true;
+ this.txtHMaterID.Size = new System.Drawing.Size(283, 30);
+ this.txtHMaterID.TabIndex = 268;
+ this.txtHMaterID.Tag = "0";
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label1.ForeColor = System.Drawing.Color.Black;
+ this.label1.Location = new System.Drawing.Point(25, 24);
+ this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(89, 20);
+ this.label1.TabIndex = 265;
+ this.label1.Text = "浠诲姟鍗曞彿";
+ //
+ // txtHICMOBillNo
+ //
+ this.txtHICMOBillNo.BackColor = System.Drawing.Color.Beige;
+ this.txtHICMOBillNo.Font = new System.Drawing.Font("榛戜綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHICMOBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHICMOBillNo.Location = new System.Drawing.Point(125, 19);
+ this.txtHICMOBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHICMOBillNo.Name = "txtHICMOBillNo";
+ this.txtHICMOBillNo.Size = new System.Drawing.Size(283, 30);
+ this.txtHICMOBillNo.TabIndex = 266;
+ this.txtHICMOBillNo.Tag = "0";
+ this.txtHICMOBillNo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHICMOBillNo_KeyDown);
+ //
+ // txtHRemark
+ //
+ this.txtHRemark.Enabled = false;
+ this.txtHRemark.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHRemark.Location = new System.Drawing.Point(159, 666);
+ this.txtHRemark.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHRemark.Name = "txtHRemark";
+ this.txtHRemark.Size = new System.Drawing.Size(1019, 25);
+ this.txtHRemark.TabIndex = 264;
+ this.txtHRemark.Visible = false;
+ //
+ // label20
+ //
+ this.label20.AutoSize = true;
+ this.label20.Enabled = false;
+ this.label20.ForeColor = System.Drawing.Color.Black;
+ this.label20.Location = new System.Drawing.Point(67, 671);
+ this.label20.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label20.Name = "label20";
+ this.label20.Size = new System.Drawing.Size(69, 15);
+ this.label20.TabIndex = 263;
+ this.label20.Text = "澶� 娉�";
+ this.label20.Visible = false;
+ //
+ // dtpHDate
+ //
+ this.dtpHDate.Enabled = false;
+ this.dtpHDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
+ this.dtpHDate.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.dtpHDate.Location = new System.Drawing.Point(139, 496);
+ this.dtpHDate.Margin = new System.Windows.Forms.Padding(4);
+ this.dtpHDate.Name = "dtpHDate";
+ this.dtpHDate.Size = new System.Drawing.Size(244, 25);
+ this.dtpHDate.TabIndex = 256;
+ this.dtpHDate.Visible = false;
+ //
+ // label9
+ //
+ this.label9.AutoSize = true;
+ this.label9.Enabled = false;
+ this.label9.ForeColor = System.Drawing.Color.Black;
+ this.label9.Location = new System.Drawing.Point(47, 501);
+ this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label9.Name = "label9";
+ this.label9.Size = new System.Drawing.Size(69, 15);
+ this.label9.TabIndex = 255;
+ this.label9.Text = "鏃� 鏈�";
+ this.label9.Visible = false;
+ //
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.Enabled = false;
+ this.label4.ForeColor = System.Drawing.Color.Black;
+ this.label4.Location = new System.Drawing.Point(47, 468);
+ this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(68, 15);
+ this.label4.TabIndex = 251;
+ this.label4.Text = "鍗� 鎹� 鍙�";
+ this.label4.Visible = false;
+ //
+ // txtHBillNo
+ //
+ this.txtHBillNo.BackColor = System.Drawing.Color.Beige;
+ this.txtHBillNo.Enabled = false;
+ this.txtHBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHBillNo.Location = new System.Drawing.Point(139, 462);
+ this.txtHBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHBillNo.Name = "txtHBillNo";
+ this.txtHBillNo.Size = new System.Drawing.Size(249, 25);
+ this.txtHBillNo.TabIndex = 252;
+ this.txtHBillNo.Visible = false;
+ //
+ // label47
+ //
+ this.label47.AutoSize = true;
+ this.label47.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label47.Location = new System.Drawing.Point(-8, 119);
+ this.label47.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label47.Name = "label47";
+ this.label47.Size = new System.Drawing.Size(1673, 20);
+ this.label47.TabIndex = 359;
+ this.label47.Text = "鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��" +
+ "鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��";
+ this.label47.Visible = false;
+ //
+ // label18
+ //
+ this.label18.AutoSize = true;
+ this.label18.ForeColor = System.Drawing.Color.Black;
+ this.label18.Location = new System.Drawing.Point(789, 12);
+ this.label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label18.Name = "label18";
+ this.label18.Size = new System.Drawing.Size(69, 15);
+ this.label18.TabIndex = 94;
+ this.label18.Text = "鎽� 瑕�";
+ this.label18.Visible = false;
+ //
+ // txtHProcExchEntryID
+ //
+ this.txtHProcExchEntryID.BackColor = System.Drawing.SystemColors.Window;
+ this.txtHProcExchEntryID.Enabled = false;
+ this.txtHProcExchEntryID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHProcExchEntryID.Location = new System.Drawing.Point(931, 8);
+ this.txtHProcExchEntryID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHProcExchEntryID.Name = "txtHProcExchEntryID";
+ this.txtHProcExchEntryID.Size = new System.Drawing.Size(249, 25);
+ this.txtHProcExchEntryID.TabIndex = 312;
+ this.txtHProcExchEntryID.Tag = "0";
+ this.txtHProcExchEntryID.Visible = false;
+ //
+ // label29
+ //
+ this.label29.AutoSize = true;
+ this.label29.ForeColor = System.Drawing.Color.Black;
+ this.label29.Location = new System.Drawing.Point(797, 14);
+ this.label29.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label29.Name = "label29";
+ this.label29.Size = new System.Drawing.Size(113, 15);
+ this.label29.TabIndex = 311;
+ this.label29.Text = "宸ュ簭娴佽浆鍗″瓙ID";
+ this.label29.Visible = false;
+ //
+ // label12
+ //
+ this.label12.AutoSize = true;
+ this.label12.ForeColor = System.Drawing.Color.Black;
+ this.label12.Location = new System.Drawing.Point(820, 14);
+ this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label12.Name = "label12";
+ this.label12.Size = new System.Drawing.Size(98, 15);
+ this.label12.TabIndex = 313;
+ this.label12.Text = "宸ュ簭娴佽浆鍗D";
+ this.label12.Visible = false;
+ //
+ // txtHProcExchInterID
+ //
+ this.txtHProcExchInterID.BackColor = System.Drawing.SystemColors.Window;
+ this.txtHProcExchInterID.Enabled = false;
+ this.txtHProcExchInterID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHProcExchInterID.Location = new System.Drawing.Point(939, 8);
+ this.txtHProcExchInterID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHProcExchInterID.Name = "txtHProcExchInterID";
+ this.txtHProcExchInterID.Size = new System.Drawing.Size(249, 25);
+ this.txtHProcExchInterID.TabIndex = 314;
+ this.txtHProcExchInterID.Tag = "0";
+ this.txtHProcExchInterID.Visible = false;
+ //
+ // label6
+ //
+ this.label6.AutoSize = true;
+ this.label6.ForeColor = System.Drawing.Color.Black;
+ this.label6.Location = new System.Drawing.Point(825, 1);
+ this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(83, 30);
+ this.label6.TabIndex = 305;
+ this.label6.Text = "宸ュ簭娴佽浆鍗r\n姹囨姤鍗曞瓙ID";
+ this.label6.Visible = false;
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.ForeColor = System.Drawing.Color.Black;
+ this.label3.Location = new System.Drawing.Point(839, 6);
+ this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(82, 30);
+ this.label3.TabIndex = 307;
+ this.label3.Text = "宸ュ簭娴佽浆鍗r\n姹囨姤鍗旾D";
+ this.label3.Visible = false;
+ //
+ // txtHProcExchReportEntryID
+ //
+ this.txtHProcExchReportEntryID.BackColor = System.Drawing.SystemColors.Window;
+ this.txtHProcExchReportEntryID.Enabled = false;
+ this.txtHProcExchReportEntryID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHProcExchReportEntryID.Location = new System.Drawing.Point(931, 2);
+ this.txtHProcExchReportEntryID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHProcExchReportEntryID.Name = "txtHProcExchReportEntryID";
+ this.txtHProcExchReportEntryID.Size = new System.Drawing.Size(249, 25);
+ this.txtHProcExchReportEntryID.TabIndex = 306;
+ this.txtHProcExchReportEntryID.Tag = "0";
+ this.txtHProcExchReportEntryID.Visible = false;
+ //
+ // txtHProcExchReportInterID
+ //
+ this.txtHProcExchReportInterID.BackColor = System.Drawing.SystemColors.Window;
+ this.txtHProcExchReportInterID.Enabled = false;
+ this.txtHProcExchReportInterID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHProcExchReportInterID.Location = new System.Drawing.Point(945, 8);
+ this.txtHProcExchReportInterID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHProcExchReportInterID.Name = "txtHProcExchReportInterID";
+ this.txtHProcExchReportInterID.Size = new System.Drawing.Size(249, 25);
+ this.txtHProcExchReportInterID.TabIndex = 308;
+ this.txtHProcExchReportInterID.Tag = "0";
+ this.txtHProcExchReportInterID.Visible = false;
+ //
+ // txtHInnerBillNo
+ //
+ this.txtHInnerBillNo.Enabled = false;
+ this.txtHInnerBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHInnerBillNo.Location = new System.Drawing.Point(935, 9);
+ this.txtHInnerBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHInnerBillNo.Name = "txtHInnerBillNo";
+ this.txtHInnerBillNo.Size = new System.Drawing.Size(249, 25);
+ this.txtHInnerBillNo.TabIndex = 254;
+ this.txtHInnerBillNo.Tag = "0";
+ this.txtHInnerBillNo.Visible = false;
+ //
+ // label22
+ //
+ this.label22.AutoSize = true;
+ this.label22.ForeColor = System.Drawing.Color.Black;
+ this.label22.Location = new System.Drawing.Point(823, 15);
+ this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label22.Name = "label22";
+ this.label22.Size = new System.Drawing.Size(82, 15);
+ this.label22.TabIndex = 253;
+ this.label22.Text = "鍐呴儴鍗曟嵁鍙�";
+ this.label22.Visible = false;
+ //
+ // cmdHMaterID
+ //
+ this.cmdHMaterID.BackColor = System.Drawing.Color.Transparent;
+ this.cmdHMaterID.Enabled = false;
+ this.cmdHMaterID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHMaterID.Image")));
+ this.cmdHMaterID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
+ this.cmdHMaterID.Location = new System.Drawing.Point(267, 5);
+ this.cmdHMaterID.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdHMaterID.Name = "cmdHMaterID";
+ this.cmdHMaterID.Size = new System.Drawing.Size(29, 28);
+ this.cmdHMaterID.TabIndex = 269;
+ this.cmdHMaterID.UseVisualStyleBackColor = false;
+ this.cmdHMaterID.Visible = false;
+ //
+ // timer1
+ //
+ this.timer1.Enabled = true;
+ this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
+ //
+ // panel1
+ //
+ this.panel1.Controls.Add(this.cmbBack);
+ this.panel1.Dock = System.Windows.Forms.DockStyle.Left;
+ this.panel1.Location = new System.Drawing.Point(0, 62);
+ this.panel1.Margin = new System.Windows.Forms.Padding(4);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(55, 849);
+ this.panel1.TabIndex = 33;
+ //
+ // cmbBack
+ //
+ this.cmbBack.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.cmbBack.Font = new System.Drawing.Font("榛戜綋", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.cmbBack.Location = new System.Drawing.Point(0, 0);
+ this.cmbBack.Margin = new System.Windows.Forms.Padding(4);
+ this.cmbBack.Name = "cmbBack";
+ this.cmbBack.Size = new System.Drawing.Size(55, 849);
+ this.cmbBack.TabIndex = 1;
+ this.cmbBack.Text = "涓� 涓� 寮�";
+ this.cmbBack.UseVisualStyleBackColor = true;
+ this.cmbBack.Click += new System.EventHandler(this.cmbBack_Click);
+ //
+ // panel3
+ //
+ this.panel3.Controls.Add(this.cmdNext);
+ this.panel3.Dock = System.Windows.Forms.DockStyle.Right;
+ this.panel3.Location = new System.Drawing.Point(1292, 62);
+ this.panel3.Margin = new System.Windows.Forms.Padding(4);
+ this.panel3.Name = "panel3";
+ this.panel3.Size = new System.Drawing.Size(52, 849);
+ this.panel3.TabIndex = 34;
+ //
+ // cmdNext
+ //
+ this.cmdNext.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.cmdNext.Font = new System.Drawing.Font("榛戜綋", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.cmdNext.Location = new System.Drawing.Point(0, 0);
+ this.cmdNext.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdNext.Name = "cmdNext";
+ this.cmdNext.Size = new System.Drawing.Size(52, 849);
+ this.cmdNext.TabIndex = 0;
+ this.cmdNext.Text = "涓� 涓� 寮�";
+ this.cmdNext.UseVisualStyleBackColor = true;
+ this.cmdNext.Click += new System.EventHandler(this.cmdNext_Click);
+ //
+ // grdPrint
+ //
+ this.grdPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdPrint.Location = new System.Drawing.Point(1079, 679);
+ this.grdPrint.Margin = new System.Windows.Forms.Padding(4);
+ this.grdPrint.Name = "grdPrint";
+ this.grdPrint.RowHeadersWidth = 51;
+ this.grdPrint.RowTemplate.Height = 23;
+ this.grdPrint.Size = new System.Drawing.Size(33, 30);
+ this.grdPrint.TabIndex = 46;
+ this.grdPrint.Visible = false;
+ //
+ // timer2
+ //
+ this.timer2.Enabled = true;
+ this.timer2.Interval = 500;
+ this.timer2.Tick += new System.EventHandler(this.timer2_Tick);
+ //
+ // pictureBox1
+ //
+ this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.pictureBox1.Location = new System.Drawing.Point(55, 192);
+ this.pictureBox1.Margin = new System.Windows.Forms.Padding(4);
+ this.pictureBox1.Name = "pictureBox1";
+ this.pictureBox1.Size = new System.Drawing.Size(1237, 719);
+ this.pictureBox1.TabIndex = 316;
+ this.pictureBox1.TabStop = false;
+ //
+ // Sc_MESNowWorkBill_Fast
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.BackColor = System.Drawing.Color.Lavender;
+ this.ClientSize = new System.Drawing.Size(1344, 911);
+ this.Controls.Add(this.pictureBox1);
+ this.Controls.Add(this.P1);
+ this.Controls.Add(this.panel1);
+ this.Controls.Add(this.panel3);
+ this.Controls.Add(this.Tool);
+ this.Controls.Add(this.grdPrint);
+ this.ForeColor = System.Drawing.Color.Black;
+ this.KeyPreview = true;
+ this.Margin = new System.Windows.Forms.Padding(4);
+ this.Name = "Sc_MESNowWorkBill_Fast";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+ this.Text = "宸ヤ綅鎸囧涔�";
+ this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
+ this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Sc_MESNowWorkBill_Fast_FormClosing);
+ this.Load += new System.EventHandler(this.Sc_MESNowWorkBill_Fast_Load);
+ this.Tool.ResumeLayout(false);
+ this.Tool.PerformLayout();
+ this.P1.ResumeLayout(false);
+ this.P1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pic1)).EndInit();
+ this.gbUp.ResumeLayout(false);
+ this.gbUp.PerformLayout();
+ this.panel1.ResumeLayout(false);
+ this.panel3.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.grdPrint)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.ToolStrip Tool;
+ private System.Windows.Forms.ToolStripButton yl;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
+ private System.Windows.Forms.ToolStripButton xz;
+ private System.Windows.Forms.ToolStripButton xg;
+ private System.Windows.Forms.ToolStripButton sc;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
+ private System.Windows.Forms.ToolStripButton bc;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
+ private System.Windows.Forms.ToolStripButton fq;
+ private System.Windows.Forms.ToolStripButton sh;
+ private System.Windows.Forms.ToolStripButton qsh;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
+ private System.Windows.Forms.ToolStripButton sz;
+ private System.Windows.Forms.ToolStripButton syz;
+ private System.Windows.Forms.ToolStripButton xyz;
+ private System.Windows.Forms.ToolStripButton mz;
+ private System.Windows.Forms.Label lblCaption;
+ private System.Windows.Forms.Panel P1;
+ private System.Windows.Forms.Timer timer1;
+ private System.Windows.Forms.ToolStripButton AddRow;
+ private System.Windows.Forms.ToolStripButton DelRow;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;
+ private System.Windows.Forms.GroupBox gbUp;
+ private System.Windows.Forms.ToolStripButton redblue;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator9;
+ private System.Windows.Forms.ToolStripButton tc;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator12;
+ private System.Windows.Forms.ToolStripButton mrlk;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator11;
+ private System.Windows.Forms.ToolStripButton bclk;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator10;
+ private System.Windows.Forms.PictureBox pic1;
+ private System.Windows.Forms.Panel panel1;
+ private System.Windows.Forms.Panel panel3;
+ private System.Windows.Forms.DataGridView grdPrint;
+ private System.Windows.Forms.ToolStripButton set;
+ private System.Windows.Forms.ToolStripButton dy;
+ private System.Windows.Forms.Label label18;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator13;
+ private System.Windows.Forms.ToolStripDropDownButton qt;
+ private System.Windows.Forms.ToolStripMenuItem 鍏抽棴ToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem 鍙嶅叧闂璗oolStripMenuItem;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator15;
+ private System.Windows.Forms.ToolStripMenuItem 瀹℃牳ToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem 鍙嶅鏍窽oolStripMenuItem;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator14;
+ private System.Windows.Forms.ToolStripMenuItem 浣滃簾ToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem 鎾ら攢浣滃簾ToolStripMenuItem;
+ private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1;
+ private System.Windows.Forms.ToolStripMenuItem 闅愯棌鍒楄缃甌oolStripMenuItem;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;
+ private System.Windows.Forms.ToolStripMenuItem 澶嶅埗鍗曟嵁ToolStripMenuItem;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
+ private System.Windows.Forms.ToolStripButton tm;
+ private System.Windows.Forms.Label label32;
+ private System.Windows.Forms.TextBox txtHExplanation;
+ private System.Windows.Forms.Button cmdHUnitID;
+ private System.Windows.Forms.Label label26;
+ private System.Windows.Forms.TextBox txtHUnitID;
+ private System.Windows.Forms.Button cmdHMaterID;
+ private System.Windows.Forms.Label label14;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.TextBox txtHRemark;
+ private System.Windows.Forms.Label label20;
+ private System.Windows.Forms.DateTimePicker dtpHDate;
+ private System.Windows.Forms.Label label9;
+ private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.TextBox txtHBillNo;
+ private System.Windows.Forms.Label label22;
+ private System.Windows.Forms.TextBox txtHInnerBillNo;
+ private System.Windows.Forms.Label label7;
+ private System.Windows.Forms.TextBox txtHSumTimes;
+ private System.Windows.Forms.Label label16;
+ private System.Windows.Forms.TextBox txtHInStockQty;
+ private System.Windows.Forms.Label label12;
+ private System.Windows.Forms.TextBox txtHProcExchInterID;
+ private System.Windows.Forms.Label label29;
+ private System.Windows.Forms.TextBox txtHProcExchEntryID;
+ private System.Windows.Forms.Label label30;
+ private System.Windows.Forms.TextBox txtHProcExchBillNo;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.TextBox txtHProcExchReportInterID;
+ private System.Windows.Forms.Label label6;
+ private System.Windows.Forms.TextBox txtHProcExchReportEntryID;
+ private System.Windows.Forms.Button cmdSM;
+ private System.Windows.Forms.Button cmdHProcID;
+ private System.Windows.Forms.Label label33;
+ private System.Windows.Forms.TextBox txtHProcID;
+ private System.Windows.Forms.Button cmdHGroupID;
+ private System.Windows.Forms.Label label34;
+ private System.Windows.Forms.TextBox txtHGroupID;
+ private System.Windows.Forms.Button cmdHWorkEmpID;
+ private System.Windows.Forms.Label label35;
+ private System.Windows.Forms.TextBox txtHWorkEmpID;
+ private System.Windows.Forms.Button cmdHSourceID;
+ private System.Windows.Forms.Label label37;
+ private System.Windows.Forms.TextBox txtHSourceID;
+ private System.Windows.Forms.Label label38;
+ private System.Windows.Forms.TextBox txtHTimes;
+ private System.Windows.Forms.DateTimePicker dtpHRelEndDate;
+ private System.Windows.Forms.Label label36;
+ private System.Windows.Forms.DateTimePicker dtpHRelBeginDate;
+ private System.Windows.Forms.Label label31;
+ private System.Windows.Forms.Label label42;
+ private System.Windows.Forms.Label label43;
+ private System.Windows.Forms.TextBox txtHWorkEmpNo;
+ private System.Windows.Forms.TextBox txtHProcNo;
+ private System.Windows.Forms.Label label45;
+ private System.Windows.Forms.Label label46;
+ private System.Windows.Forms.Timer timer2;
+ private System.Windows.Forms.Label label47;
+ private System.Windows.Forms.DateTimePicker dtpHPlanEndDate;
+ private System.Windows.Forms.Label label48;
+ private System.Windows.Forms.DateTimePicker dtpHPlanBeginDate;
+ private System.Windows.Forms.Label label49;
+ private System.Windows.Forms.Label label50;
+ private System.Windows.Forms.Button cmdHDeptID;
+ private System.Windows.Forms.TextBox txtHDeptID;
+ private System.Windows.Forms.Label label51;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.TextBox txtHBeginWorkTime;
+ private System.Windows.Forms.Button cmdHICMOBillNo;
+ private System.Windows.Forms.ToolStripButton Select;
+ private System.Windows.Forms.ToolStripButton Back;
+ private System.Windows.Forms.ToolStripButton Next;
+ private System.Windows.Forms.Button cmbBack;
+ private System.Windows.Forms.Button cmdNext;
+ private System.Windows.Forms.PictureBox pictureBox1;
+ public System.Windows.Forms.TextBox txtHMaterID;
+ public System.Windows.Forms.TextBox txtHICMOBillNo;
+ public System.Windows.Forms.TextBox txtHBatchNo;
+ public System.Windows.Forms.TextBox txtHModel;
+ public System.Windows.Forms.TextBox txtHName;
+ }
+}
\ No newline at end of file
diff --git a/WarM/Sc_MESNowWorkBill_Fast.resx b/WarM/Sc_MESNowWorkBill_Fast.resx
new file mode 100644
index 0000000..64a70c4
--- /dev/null
+++ b/WarM/Sc_MESNowWorkBill_Fast.resx
@@ -0,0 +1,777 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="Tool.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ /9j/4AAQSkZJRgABAQEASABIAAD/4QSARXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAAB
+ AAAAYgEbAAUAAAABAAAAagEoAAMAAAABAAIAAAExAAIAAAAUAAAAcgEyAAIAAAAUAAAAhodpAAQAAAAB
+ AAAAmgAAAMYASAAAAAEAAABIAAAAAQAAQWRvYmUgUGhvdG9zaG9wIDcuMAAyMDA0OjEwOjE0IDE1OjUw
+ OjUwAAADoAEAAwAAAAH//wAAoAIABAAAAAEAAAQAoAMABAAAAAEAAABoAAAAAAAAAAYBAwADAAAAAQAG
+ AAABGgAFAAAAAQAAARQBGwAFAAAAAQAAARwBKAADAAAAAQACAAACAQAEAAAAAQAAASQCAgAEAAAAAQAA
+ A1QAAAAAAAAASAAAAAEAAABIAAAAAf/Y/9sAQwAIBgYHBgUIBwcHCQkICgwUDQwLCwwZEhMPFB0aHx4d
+ GhwcICQuJyAiLCMcHCg3KSwwMTQ0NB8nOT04MjwuMzQy/9sAQwEJCQkMCwwYDQ0YMiEcITIyMjIyMjIy
+ MjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy/8AAEQgABgCgAwEhAAIRAQMR
+ Af/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAE
+ EQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElK
+ U1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrC
+ w8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAAB
+ AgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkj
+ M1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5
+ eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm
+ 5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A9P8A+EAsf+fy4o/4QCy/5/Liuv6z/dOf2HmH/CAWX/P5
+ cUf8IBZf8/lz+lH1n+6HsPMP+EAsv+fy5/Oj/hALL/n8uKPrP90PYeYf8IBZf8/lxR/wgFl/z+XFH1n+
+ 6HsPMP8AhALL/n8uKP8AhX9j/wA/lxR9Z/uh7B9w/wCFf2P/AD+XFH/CAWP/AD+XFH1n+6HsH3D/AIQC
+ x/5/Lij/AIQCy/5/Lij6z/dD2HmH/CAWX/P5cUf8K/sf+fy4o+tf3Q9h5h/wgFj/AM/lxR/wgFl/z+XF
+ H1r+6HsPMP8AhALL/n8uKP8AhALL/n8uKPrX90PYeZ//2f/bAEMAAgEBAgEBAgICAgICAgIDBQMDAwMD
+ BgQEAwUHBgcHBwYHBwgJCwkICAoIBwcKDQoKCwwMDAwHCQ4PDQwOCwwMDP/bAEMBAgICAwMDBgMDBgwI
+ BwgMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDP/AABEIACoE
+ AAMBIgACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUE
+ BAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4
+ OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmq
+ srO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEB
+ AQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIy
+ gQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZn
+ aGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV
+ 1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APWB+2p4nH/MN0Qf9w20/wDjNL/w2t4o
+ P/MP0X/wW2n/AMZri/8AhDh6Uf8ACHD0r9f/ALPp/wAp+cfXJ9zsj+2p4oOQdO0U/wDcMtP/AIzR/wAN
+ peJ++m6KP+4Zaf8AxmuN/wCEOH93FH/CHD0prL4fyh9cn/Mdl/w2j4m/6B2if+Cy0/8AjNH/AA2n4mXr
+ puiEf9g20/8AjNcb/wAIcPSj/hDh/dNL+z6f8qBYyf8AMdkf21fEv/QN0T/wW2n/AMZo/wCG1fEv/QN0
+ T/wW2f8A8ZrjP+ENH9yl/wCEOA6KRR9Qp/yj+uz/AJmdl/w2r4l/6Buif+C2z/8AjNH/AA2r4l/6Buif
+ +C2z/wDjNcb/AMIcP7po/wCEOH900/7Ph/KL65P+Y7Mftq+JMf8AIO0Uf9w20/8AjNB/bU8S5407RD/3
+ DbT/AOM1xZ8HqOq0f8Iiv900v7Pp/wAofXZ/zHZf8NqeJe+m6L/4LbT/AOM0q/to+Je+naKP+4baf/Ga
+ 4z/hEV/umgeEAeimj+z4fyh9cn/Mdn/w2n4l/wCgdon/AILbT/4zR/w2n4l/6B2if+C20/8AjNcb/wAI
+ cP7po/4Q4f3TR/Z8P5UH1yf8x2P/AA2p4l/6Bui/+C20/wDjNH/DaniX/oG6L/4LbT/4zXHf8IcP7ppP
+ +ENH9yj+z4fyh9cn/MdmP21vEo66do3/AILbT/4zSj9tbxKemm6MT/2DbT/4zXF/8IcB/Cfyo/4RAf3T
+ +VCy+n/KH1uf8x2g/bT8SnrpmiD/ALhtp/8AGaD+2n4lH/MN0QY/6htn/wDGa4z/AIQ9f7rflSHwcp/h
+ P5U/7Pp/yjWMqfzM7Q/tp+Juo0zRP/BZZ/8AxmlX9tLxNj/kHaIP+4bZ/wDxmuK/4Q8eh/Kj/hDx6H8q
+ X9n0/wCUFjJ92ds37aPiY8HTtEx/2DbP/wCM0L+2l4lLZOnaJ/4LbP8A+M1xP/CHj0P5UDweOPlb8qP7
+ Pp/yieMn3Z2zftp+JP8AoG6Kf+4bZ/8Axmm/8Nq+Jf8AoF6L/wCC20/+M1xf/CID+435Uf8ACID+435U
+ f2fT/lD65PuztP8AhtXxJ/0DdG/8Ftp/8Zo/4bU8Rj/mG6MP+4Zaf/Ga4v8A4RH0Q4+lH/CI/wCyw+go
+ /s+n/Kg+tz7s7MftqeJP+gfop/7htp/8ZoP7aviUDjT9D/HTLT/4zXGDwgfRvypR4NY9FYj3WhZfT/lH
+ 9cn3Oy/4bU8Tf9A7Q/8AwWWn/wAZo/4bU8Tf9A7Q/wDwWWn/AMZrjv8AhDW/uH/vmk/4Q4/3f0oWX0/5
+ QWNn/Mzsv+G1fEv/AED9Fx7abaf/ABmj/htbxN/0D9F/8Ftn/wDGa40+Dj/dP5Un/CHH+6fyp/2fT/lF
+ 9bn3Oy/4bV8Tf9A7Rf8AwW2f/wAZpf8AhtXxP/0DtF/8Ftn/APGa4z/hDx/dP5Uf8IgP7p/Kl/Z9P+Uf
+ 1yp3Oz/4bU8S/wDQP0b/AMFtn/8AGaP+G1vE3bTtFx/2DbP/AOM1xn/CID+6fypR4OB/hIoWX0/5RfW5
+ 92dkf21fEx66fog/7hln/wDGaP8AhtbxP/0D9E/8Ftp/8Zrjf+EOHpS/8Id/s/pQsvp/yoFjJ/zHY/8A
+ Da3if/oH6J/4LbT/AOM0f8NqeJv+gfon/gttP/jNcePBuf4QPwo/4Qz2H5Uf2fT/AJR/XZ/zHXn9tXxL
+ 307RSf8AsG2n/wAZpR+2r4k/6B2ig/8AYNtP/jNcefBn+zTf+EOHpQsvp/yh9cqfzHZn9tPxKOPsGi/+
+ C20/+M0H9tLxKQSLDRCR2/s20/8AjNcZ/wAIcPSl/wCEOH90flR/Z9P+UX1up/Mzsf8AhtTxN/0DtD/8
+ Flp/8Zo/4bU8S99O0Q/TTbT/AOM1x3/CHj+6Pypf+ENH90/lQsvp/wAoLGVP5mdgf21PEo/5h2i/+C20
+ /wDjNJ/w2r4m3Z/s7RT9NMtP/jNcefBo/un8qP8AhDB/dYfhR/Z9P+UPrlT+Y7H/AIbW8S9Dp2igf9gy
+ 0/8AjNJ/w2r4l/6B2i/+Cyz/APjNcd/whwzjaRR/whw9KP7Ph/KCxlTudl/w2r4l/wCgdon/AILbT/4z
+ R/w2p4l/6B2if+C20/8AjNcb/wAIcPSl/wCEPH90flQsvp/ygsXU7nZf8Nq+JT007Rh/3DbT/wCM0f8A
+ Danic9NP0U5/6hlp/wDGa43/AIQ8f3R+VJ/who67Cc0LL6f8o/rlT+Y7M/tp+Jz00/RT/wBwy0H/ALRp
+ P+G0/E//AED9F/8ABZaf/Ga43/hDf9g0f8Ib/sGn/Z9P+VAsbP8AmZ2X/DaXif8A6B+in/uGWn/xmlH7
+ anicDjTtE/8ABXaf/Ga43/hDP9k0f8IZ/sml/Z8P5UL67P8AmOw/4bS8T/8AQO0X/wAFlp/8Zpf+G0/E
+ 46afon/grtP/AIzXHf8ACGf7Jo/4Qz/ZNP6hD+VB9dqfzHY/8NpeJ/8AoG6L/wCCu0/+M0v/AA2p4n/6
+ B+if+Cy0/wDjNcb/AMIZ/smj/hDP9k0ll9P+VB9dn/Mdl/w2l4nzn+ztEP8A3C7T/wCM0f8ADaXiftp2
+ iH/uF2n/AMZrjP8AhDf9g0f8Ib/sGhZfT/lQfXJ/zHZf8NpeJiMf2douf+wZaf8Axmj/AIbT8T/9A7Rf
+ /BZaf/Ga43/hDf8AYNH/AAhv+waay+H8qD65P+Y7H/htHxP/ANA3RP8AwW2n/wAZp3/DafifnOnaL/4L
+ bT/4zXF/8IkP7h/KlHhEHqhA+lDy+n/Kh/XKnc7P/htTxP207Rf/AAWWn/xmlP7anicgf6Boo/7hlp/8
+ ZrjP+EQX0P8A3zSf8Iev90n8KX9n0/5RfXKnc7P/AIbU8Tgc6fo2D/1DLT/4zSL+2n4l/wCfDRR/3C7T
+ /wCM1xv/AAh6/wB1vypf+ENX0P5Uf2fT/lQ/rlTuzsv+G1fEo/5cNF/8Flnj/wBE0p/bV8Sn/lw0XH/Y
+ Ms//AIzXGf8ACGr6H8qT/hDl9Dj6Uf2fT/lQvrdTuzs/+G0PEv8A0D9EI99MtP8A4zQf20PEwGRp2iE/
+ 9g20/wDjNcYfB6+hP4Uf8Iev91vyo/s+n/Kg+uVO7Oy/4bU8T/8AQO0X/wAFtp/8Zo/4bT8T/wDQO0X/
+ AMFtp/8AGa43/hER/dP5Uf8ACIjsp/Kj+z6f8ofXKnc7L/htLxP1Om6L/wCC20/+M0n/AA2p4l76foo/
+ 7h1p/wDGa43/AIREf3Dz7Uf8IgP7jflT/s+n/KCxlTuzs/8AhtTxKemn6If+4dZ//GaP+G0vEv8A0DtE
+ /wDBdaf/ABmuMHg8H+Aij/hEB/dP5Uv7Pp/yoPrdTudn/wANq+Jv+gdov/gttP8A4zR/w2p4m76fohH/
+ AGDbT/4zXGf8IgP7p/Kj/hEB/dP5U1l9P+UFjKnc7P8A4bW8Tf8AQO0X/wAFtp/8ZoH7aviYf8w7RR/3
+ DbT/AOM1xn/CID+6fypR4OB/hIpf2dT/AJUNYyp/Mzsx+2n4mPA07RMf9g20/wDjNB/bU8S9Dp+iZ/7B
+ tn/8ZrjP+EOHpR/whw9KP7Pp/wAqB4yf8zOy/wCG1vE//QP0T/wWWf8A8ZpT+2r4m76foo/7hln/APGa
+ 4z/hDQOi0f8ACHD+6aP7Pp9IoHjJ/wAzOzP7afiY9dP0Xj/qGWf/AMZpB+2n4m3f8g/RM/8AYNtP/jNc
+ aPBoPUYpf+ENHoKP7Ph/KhLGT/mOw/4bS8T5407RP/Bbaf8AxmlP7aXifHOn6Jj/ALBtp/8AGa43/hDh
+ 6Uf8IcPSj+z6f8qH9bqd2dl/w2n4m/6B2i49f7MtP/jNH/DafiXp/Z+iY/7Blp/8Zrjf+EOHpR/whw9K
+ f9n0/wCUPrlTudl/w2l4l/6B+if+Cy0/+M0f8NpeJP8AoH6J/wCCy0/+M1xv/CHD0o/4Q4elH1Cn/KH1
+ up3Z2Y/bV8Sr00/RP/BZaf8Axml/4bX8TdrDRef+oZaf/Ga4v/hDh6Uf8IcPShZfT/lD63U7s7P/AIbV
+ 8Tf9A/RP/BZaf/GaD+2r4mPA0/RSf+wbaf8AxmuM/wCEOHpR/wAIcPSj+z6f8ofW6ndnZf8ADanif/oH
+ aL/4LbT/AOM0f8NqeKP+gdon/gstP/jNcb/whw9KP+EOHpS/s+n/ACoFi6ndnZD9tPxOM507RB/3DbT/
+ AOM07/htTxMB/wAg7Rf/AAW2n/xmuLPg4dlo/wCEOHofyoeAp/yoPrlTudn/AMNp+Jcc6foo/wC4baf/
+ ABmg/to+JT107Rv/AAW2n/xmuMHg0Htj8KP+ENHpn8KFl9P+VCWMqfzHZ/8ADaHiT/oH6L/4LbT/AOM0
+ f8NpeJRnGnaKf+4Zaf8AxmuN/wCENX0P5Un/AAhw/un8qP7Pp/yoPrlT+Y7M/tqeJv8AoHaKf+4Zaf8A
+ xmk/4bU8T/8AQN0b/wAFtp/8Zrjf+EOH90/lSjwaPQCj+z6f8qGsZPuzsh+2n4mI507Rh/3DbT/4zTv+
+ G0fEpOf7P0Uf9wy0P/tGuL/4Q0ego/4Q0ego/s+n/Kg+t1O7Oz/4bT8Sj/mHaN/4LLQf+0aQ/to+Je2n
+ aKf+4Zaf/Ga4z/hDh6Uf8IcPSj+z6f8AKg+uVO7OzP7afiftp2ikf9gy0/8AjNJ/w2p4mHXTtFH/AHDL
+ T/4zXG/8IcPSg+DgP4SaP7Pp/wAqD65Puzsv+G1vEY66foo/7hlp/wDGaP8AhtbxIeP7P0Xn/qG2n/xm
+ uM/4RAf3T+VH/CID+6fyprL6f8oLGVO7OyP7a3iQH/kH6N/4LLT/AOM0f8Nq+Jf+gdov/gss/wD4zXG/
+ 8IgP7p/Kl/4RAf3f0pfUKf8AKH1yfdnY/wDDa3iUZP8AZ+ijH/UMs/8A4zSf8Nq+Jf8AoHaN/wCC20/+
+ M1x//CID+7+lH/CID+7+lNYCn/KCxk+7PVv+FeX/APz4T/mv+NH/AAr6+/58J/zX/Gv1p/4QTQ/+gLpH
+ /gJH/hR/wgmh/wDQF0j/AMBI/wDCvDfGlD/ny/8AwJf5Hp/6sVf+fi+5/wCZ+S3/AAr6+/58J/zX/Gj/
+ AIV9ff8APhP+a/41+tP/AAgmh/8AQF0j/wABI/8ACj/hBND/AOgLpH/gJH/hS/10of8APl/+BL/IP9WK
+ v/P1fc/8z8lv+FfX3/PhP+a/40h+Hl9jmwn/ADX/ABr9av8AhBND/wCgLpH/AICR/wCFH/CCaH/0BdI/
+ 8BI/8KFxpQ/58v8A8CX+Qf6sVf8An6vuf+Z+So+HV8RkWE/5r/jS/wDCvL5ePsE/5r/jX60/8IJof/QF
+ 0j/wEj/wo/4QTQ/+gLpH/gJH/hT/ANdKH/Pl/wDgS/yF/qxV/wCfq+5/5n5Lf8K+vv8Anwn/ADX/ABo/
+ 4V9ff8+E/wCa/wCNfrT/AMIJof8A0BdI/wDASP8Awo/4QTQ/+gLpH/gJH/hS/wBdKH/Pl/ev8g/1Yq/8
+ /V9z/wAz8lv+FfX3/PhP+a/40f8ACvr7/nwn/Nf8a/Wn/hBND/6Aukf+Akf+FH/CCaH/ANAXSP8AwEj/
+ AMKP9dKH/Pl/ev8AIP8AVir/AM/V9z/zPyW/4V9ff8+E/wCa/wCNH/Cvr7/nwn/Nf8a/Wn/hBND/AOgL
+ pH/gJH/hR/wgmh/9AXSP/ASP/Cj/AF0of8+X96/yD/Vir/z9X3P/ADPyW/4V9ff8+E/5r/jR/wAK+vv+
+ fCf81/xr9af+EE0P/oC6R/4CR/4Uf8IJof8A0BdI/wDASP8Awo/10of8+X96/wAg/wBWKv8Az9X3P/M/
+ JUfDy/IOdPnP4r/jR/wru+/6B9x/47/jX61f8IJof/QF0j/wEj/wo/4QTQ/+gLpH/gJH/hQuNKH/AD5f
+ 3r/IP9WKv/P1fc/8z8lR8O77tp9x+a/40v8Awru//wCfC4/Nf8a/Wn/hBND/AOgLpH/gJH/hR/wgmh/9
+ AXSP/ASP/Cn/AK6UP+fL/wDAl/kP/Vir/wA/V9z/AMz8lv8AhXd//wA+FwfxX/Gk/wCFd33/AD43H/fS
+ /wCNfrV/wgmh/wDQF0j/AMBI/wDCj/hBND/6Aukf+Akf+FH+ulD/AJ8v/wACX+Qv9WKv/P1fc/8AM/JX
+ /hXd9/z43H/fS/40f8K6viP+PCc/iv8AjX61f8IJof8A0BdI/wDASP8Awo/4QTQ/+gLpH/gJH/hR/rpQ
+ /wCfL/8AAl/kH+rFX/n6vuf+Z+Sv/Cur7/oHz/mv+NA+HeoDgWEwH1X/ABr9av8AhBND/wCgLpH/AICR
+ /wCFH/CCaH/0BdI/8BI/8KP9dKH/AD5f/gS/yGuGKv8Az9X3P/M/Jb/hXd//AM+M3/jv+NH/AAry/wD+
+ fCf81/xr9af+EE0P/oC6R/4CR/4Uf8IJof8A0BdI/wDASP8Awo/10of8+X/4Ev8AIP8AVmr/AM/V9z/z
+ PyWPw6vyedPn/Nf8aT/hXd8Dxp8+f+AnP61+tX/CCaH/ANAXSP8AwEj/AMKP+EE0P/oC6R/4CR/4Uf66
+ UP8Any//AAJf5D/1Zq/8/V9z/wAz8lf+Fe3/APz4T8f7v+NH/Cvb/wD58J//AB3/ABr9av8AhBND/wCg
+ LpH/AICR/wCFH/CCaH/0BdI/8BI/8KFxpQ/58v8A8CX+Qv8AVmr/AM/V9z/zPyV/4V7f/wDPhP8A+O/4
+ 0v8Awr+//wCgfN/47/jX60/8IJof/QF0j/wEj/wo/wCEE0P/AKAukf8AgJH/AIUf66UP+fL/APAl/kH+
+ rFX/AJ+L7n/mfkt/wr+//wCgfN/47/jR/wAK/v8A/oHzf+O/41+tP/CCaH/0BdI/8BI/8KP+EE0P/oC6
+ R/4CR/4Uf66UP+fL/wDAl/kH+rFX/n4vuf8Amfkt/wAK/v8A/oHzf+O/40f8K/v/APoHzf8Ajv8AjX60
+ /wDCCaH/ANAXSP8AwEj/AMKP+EE0P/oC6R/4CR/4Uf66UP8Any//AAJf5B/qxV/5+L7n/mfkt/wr+/8A
+ +gfN/wCO/wCNH/Cv7/8A58Jh/wB8/wCNfrT/AMIJof8A0BdI/wDASP8Awo/4QTQ/+gLpH/gJH/hS/wBd
+ KH/Pl/8AgS/yD/Vir/z9X3P/ADPyW/4V9fn/AJcZh/3yf60n/Cu9QPIsrgf98/41+tX/AAgmh/8AQF0j
+ /wABI/8ACj/hBND/AOgLpH/gJH/hTXGlD/ny/wDwJf5CXDFX/n6vuf8Amfkr/wAK71D/AJ8Z/wDx3/Gk
+ /wCFd3//AD4T/wDjv+NfrX/wgmh/9AXSP/ASP/Cj/hBND/6Aukf+Akf+FH+ulD/ny/8AwJf5D/1Yq/8A
+ P1fc/wDM/JQfDq/6/YJ8f8B/xpf+Fe32P+QfN+a/41+tX/CCaH/0BdI/8BI/8KP+EE0P/oC6R/4CR/4U
+ f66UP+fL/wDAl/kL/Vir/wA/V9z/AMz8lv8AhXt/n/jwnz/wH/Gj/hXl/wD8+E/5r/jX60/8IJof/QF0
+ j/wEj/wo/wCEE0P/AKAukf8AgJH/AIUf66UP+fL/APAl/kH+rFX/AJ+r7n/mfkt/wry//wCfCf8ANf8A
+ Gj/hXl//AM+E/wCa/wCNfrT/AMIJof8A0BdI/wDASP8Awo/4QTQ/+gLpH/gJH/hR/rpQ/wCfL/8AAl/k
+ H+rFX/n6vuf+Z+S3/CvL/wD58J/zX/Gj/hXl/wD8+E/5r/jX60/8IJof/QF0j/wEj/wo/wCEE0P/AKAu
+ kf8AgJH/AIUf66UP+fL/APAl/kH+rFX/AJ+r7n/mfkt/wry//wCfCf8ANf8AGj/hXl//AM+E/wCa/wCN
+ frT/AMIJof8A0BdI/wDASP8Awo/4QTQ/+gLpH/gJH/hR/rpQ/wCfL/8AAl/kH+rFX/n6vuf+Z+S3/CvL
+ /wD58J/zX/Gj/hXd9/0D5/8Ax3/Gv1p/4QTQ/wDoC6R/4CR/4Uf8IJof/QF0j/wEj/wo/wBdKH/Pl/8A
+ gS/yD/Vir/z9X3P/ADPyW/4V3ff9A+f/AMd/xpP+FfX/AEFhOMe6/wCNfrV/wgmh/wDQF0j/AMBI/wDC
+ j/hBND/6Aukf+Akf+FC40of8+X/4Ev8AIf8AqxV/5+L7n/mfkr/wr2//AOfGb81/xo/4V7f/APPjN+a/
+ 41+tX/CCaH/0BdI/8BI/8KP+EE0P/oC6R/4CR/4Uf660P+fL+9f5B/qxV/5+L7n/AJn5K/8ACvb/AP58
+ ZvzX/Gj/AIV7f/8APjN+a/41+tX/AAgmh/8AQF0j/wABI/8ACj/hBND/AOgLpH/gJH/hR/rrQ/58v71/
+ kH+rFX/n4vuf+Z+Sv/Cvb/8A58ZvzX/Gj/hXt/8A8+M35r/jX61f8IJof/QF0j/wEj/wo/4QTQ/+gLpH
+ /gJH/hR/rrQ/58v71/kH+rFX/n4vuf8Amfkr/wAK9v8A/nxm/Nf8aP8AhXt//wA+M35r/jX61f8ACCaH
+ /wBAXSP/AAEj/wAKP+EE0P8A6Aukf+Akf+FH+utD/ny/vX+Qf6sVf+fi+5/5n5K/8K9v/wDnxm/Nf8aP
+ +Fe3/wDz4zfmv+NfrV/wgmh/9AXSP/ASP/Cj/hBND/6Aukf+Akf+FH+utD/ny/vX+Qf6sVf+fi+5/wCZ
+ +Sv/AAr2/wD+fGb81/xo/wCFe3//AD4zfmv+NfrV/wAIJof/AEBdI/8AASP/AAo/4QTQ/wDoC6R/4CR/
+ 4Uf660P+fL+9f5B/qxV/5+L7n/mfkt/wr+//AOgfN/47/jSH4f3/AE+wTf8Ajv8AjX61f8IJof8A0BdI
+ /wDASP8Awo/4QTQ/+gLpH/gJH/hR/rpQ/wCfL/8AAl/kH+rFX/n4vuf+Z+Sv/Cvb/wD58ZvzX/Gj/hXt
+ /wD8+M35r/jX61f8IJof/QF0j/wEj/wo/wCEE0P/AKAukf8AgJH/AIULjSh/z5f3r/IP9WKv/Pxfc/8A
+ M/JX/hXt/wD8+M35r/jR/wAK9v8A/nxm/Nf8a/Wr/hBND/6Aukf+Akf+FH/CCaH/ANAXSP8AwEj/AMKP
+ 9daH/Pl/ev8AIP8AVir/AM/F9z/zPyV/4V7f/wDPjN+a/wCNH/Cvb/8A58ZvzX/Gv1q/4QTQ/wDoC6R/
+ 4CR/4Uf8IJof/QF0j/wEj/wo/wBdaH/Pl/ev8g/1Yq/8/F9z/wAz8lf+Fe3/APz4zfmv+NH/AAr2/wD+
+ fGb81/xr9av+EE0P/oC6R/4CR/4Uf8IJof8A0BdI/wDASP8Awo/11of8+X96/wAg/wBWKv8Az8X3P/M/
+ JX/hXt//AM+M35r/AI07/hXt/wD8+Ev/AI7/AI1+tH/CCaH/ANAXSP8AwEj/AMKP+EE0P/oC6R/4CR/4
+ Uf66UP8Any/vX+Qf6sVf+fi+5/5n5L/8K81DnNjNj/gP+NN/4V9ff8+E5/Ff8a/Wn/hBND/6Auk/+Acf
+ +FH/AAgmh/8AQF0n/wAA4/8ACk+NKH/Pl/8AgS/yF/qxV/5+L7n/AJn5Lf8ACv77/nwn/Nf8aD8Pr/8A
+ 58Jx/wB8/wCNfrV/wguh/wDQF0j/AMA4/wDCj/hBdD/6Aukf+Acf+FH+ulD/AJ8v/wACX+QLhir/AM/F
+ 9z/zPyW/4V5f/wDPjP8A+O/40n/Cvr//AJ8Zv/Hf8a/Wr/hBdD/6Aukf+Acf+FH/AAguh/8AQF0j/wAA
+ 4/8ACj/XSh/z5f8A4Ev8g/1Yq/8AP1fd/wAE/JX/AIV9f/8APjN/47/jR/wr6/8A+fGb/wAd/wAa/Wr/
+ AIQXQ/8AoC6R/wCAcf8AhR/wguh/9AXSP/AOP/Cj/XSh/wA+X/4Ev8g/1Yq/8/V93/BPyV/4V9f/APPj
+ N/47/jR/wr6//wCfGb/x3/Gv1q/4QXQ/+gLpH/gHH/hR/wAILof/AEBdI/8AAOP/AAo/10of8+X/AOBL
+ /IP9WKv/AD9X3f8ABPyVPw71Dp9huB/3yP60f8K8vxx9inP4r/jX61f8ILof/QF0j/wDj/wo/wCEF0P/
+ AKAukf8AgHH/AIUf660P+fL/APAl/kC4Yq/8/V9z/wAz8lf+Fe34/wCXGf8A8d/xpP8AhX1//wA+M/8A
+ 47/jX61/8ILof/QF0j/wDj/wpP8AhBND/wCgLpP/AIBx/wCFNca0P+fL+9f5AuGKv/Pxfc/8z8lv+Ff3
+ /wDz4T/+O/40f8K9v/8Anxm/Nf8AGv1q/wCEE0P/AKAukf8AgJH/AIUf8IJof/QF0j/wEj/woXGlD/ny
+ /vX+Q/8AVir/AM/F9z/zPyV/4V7f/wDPjN+a/wCNH/Cvb/8A58ZvzX/Gv1q/4QTQ/wDoC6R/4CR/4Uf8
+ IJof/QF0j/wEj/wo/wBdaH/Pl/ev8g/1Yq/8/F9z/wAz8lf+Fe3/APz4zfmv+NH/AAr2/wD+fGb81/xr
+ 9av+EE0P/oC6R/4CR/4Uf8IJof8A0BdI/wDASP8Awo/11of8+X96/wAg/wBWKv8Az8X3P/M/JX/hXt//
+ AM+M35r/AI0f8K9v/wDnxm/Nf8a/Wr/hBND/AOgLpH/gJH/hR/wgmh/9AXSP/ASP/Cj/AF1of8+X96/y
+ D/Vir/z8X3P/ADPyV/4V7f8A/PjN+a/40f8ACvb/AP58ZvzX/Gv1q/4QTQ/+gLpH/gJH/hR/wgmh/wDQ
+ F0j/AMBI/wDCj/XWh/z5f3r/ACD/AFYq/wDPxfc/8z8lf+Fe3/8Az4zfmv8AjR/wr2//AOfGb81/xr9a
+ v+EE0P8A6Aukf+Akf+FH/CCaH/0BdI/8BI/8KP8AXWh/z5f3r/IP9WKv/Pxfc/8AM/JX/hXmof8APhN+
+ a/40v/Cvb/vYT5/4D/jX60/8IJof/QF0j/wEj/wo/wCEE0P/AKAukf8AgJH/AIUf66UP+fL/APAl/kH+
+ rFX/AJ+L7n/mfkt/wr2//wCfCf8A8d/xo/4V7f8A/PhP/wCO/wCNfrT/AMIJof8A0BdI/wDASP8Awo/4
+ QTQ/+gLpH/gJH/hR/rrR/wCfL/8AAl/kL/Vir/z9X3P/ADPyW/4V5f8A/PhP/wCO/wCNH/Cvr7/nwn/N
+ f8a/Wn/hBND/AOgLpH/gJH/hR/wgmh/9AXSP/ASP/Cj/AF0of8+X/wCBL/IP9WKv/P1fc/8AM/Jb/hX1
+ 9/z4T/mv+NH/AAr2/wCMWE+Pqv8AjX60/wDCCaH/ANAXSP8AwEj/AMKP+EE0P/oC6R/4CR/4Uf66UP8A
+ ny//AAJf5B/qxV/5+L7n/mfkt/wry/8A+fCf81/xo/4V5f8A/PhP+a/41+tP/CCaH/0BdI/8BI/8KP8A
+ hBND/wCgLpH/AICR/wCFH+ulD/ny/wDwJf5B/qxV/wCfq+5/5n5Lf8K8v/8Anwn/ADX/ABo/4V5qBGDY
+ T/mv+NfrT/wgmh/9AXSP/ASP/Cj/AIQTQ/8AoC6R/wCAkf8AhR/rpQ/58v8A8CX+Qf6sVf8An6vuf+Z+
+ Sv8Awrq+/wCgfOD9V/xpR8O78dNPn/Nf8a/Wn/hBND/6Aukf+Akf+FH/AAgmh/8AQF0j/wABI/8ACl/r
+ pQ/58v8A8CX+Q/8AVir/AM/F9z/zPyW/4V5fnpYTj8V/xo/4V3f/APPjN/47/jX60/8ACCaH/wBAXSP/
+ AAEj/wAKP+EE0P8A6Aukf+Akf+FP/XSh/wA+X/4Ev8g/1Yq/8/F9z/zPyW/4V3f/APPjN/47/jR/wru/
+ /wCfGb/x3/Gv1p/4QTQ/+gLpH/gJH/hR/wAIJof/AEBdI/8AASP/AAo/10of8+X/AOBL/IP9Wav/AD8X
+ 3P8AzPyW/wCFd3//AD4zf+O/40f8K7v/APnxm/8AHf8AGv1p/wCEE0P/AKAukf8AgJH/AIUf8IJof/QF
+ 0j/wEj/wo/10of8APl/+BL/IP9Wav/Pxfc/8zUwfQ/lRg+h/KvyDHxY8VZP/ABU3iD/wYzf/ABVH/C2f
+ FX/QzeIP/BjN/wDFV8N9W8z7C5+vmD6H8qMH0P5V+Qf/AAtnxV/0M3iD/wAGM3/xVH/C2fFX/QzeIP8A
+ wYzf/FUnh/MHI/XzB9D+VGD6H8q/IP8A4Wz4q/6GbxB/4MZv/iqR/i14rGMeJvEIx/1EZv8A4qj6v5i5
+ j9fcH0P5UYPofyr8gP8Ahbniv/oZ/EP/AIMZv/iqP+FteK/+hm8Q/wDgxm/+Kpew8w5z9f8AB9D+VGD6
+ H8q/ID/hbXiv/oZvEP8A4MZv/iqP+FteK/8AoZvEP/gxm/8AiqPYeYKR+v8Ag+h/KjB9D+VfkB/wtrxX
+ /wBDN4h/8GM3/wAVR/wtrxX/ANDN4h/8GM3/AMVR7DzBSP1/wfQ/lRg+h/KvyA/4W14r/wChm8Q/+DGb
+ /wCKo/4W14r/AOhm8Q/+DGb/AOKo9h5gpH6/4PofyowfQ/lX5Af8La8V/wDQzeIf/BjN/wDFUf8AC2vF
+ f/QzeIf/AAYzf/FUew8wUj9f8H0P5UYPofyr8gP+FteK/wDoZvEP/gxm/wDiqP8AhbXiv/oZvEP/AIMZ
+ v/iqPYeYKR+v+D6H8qMH0P5V+QH/AAtrxX/0M3iH/wAGM3/xVH/C2vFf/QzeIf8AwYzf/FUew8wUj9f8
+ H0P5UYPofyr8gP8Ahbfiv/oZvEP/AIMZv/iqP+FteK/+hm8Q/wDgxm/+Ko9h5gpH6/4PofyowfQ/lX5A
+ f8La8V/9DN4h/wDBjN/8VR/wtrxX/wBDN4h/8GM3/wAVR7DzBSP1/wAH0P5UYPofyr8gP+FteK/+hm8Q
+ /wDgxm/+Ko/4W14r/wChm8Q/+DGb/wCKo9h5gpH6/wCD6H8qMH0P5V+QH/C2vFf/AEM3iH/wYzf/ABVH
+ /C2vFf8A0M3iH/wYzf8AxVHsPMFI/X/B9D+VGD6H8q/ID/hbXiv/AKGbxD/4MZv/AIqj/hbXiv8A6Gbx
+ D/4MZv8A4qj2HmCkfr/g+h/KjB9D+VfkB/wtrxX/ANDN4h/8GM3/AMVR/wALa8V/9DN4h/8ABjN/8VR7
+ DzBSP1/wfQ/lRg+h/KvyA/4W14r/AOhm8Q/+DGb/AOKo/wCFteK/+hm8Q/8Agxm/+Ko9h5gpH6/4Pofy
+ owfQ/lX5Af8AC2vFf/QzeIf/AAYzf/FUf8La8V/9DN4h/wDBjN/8VR7DzBSP1/wfQ/lRg+h/KvyA/wCF
+ teK/+hm8Q/8Agxm/+Ko/4W14r/6GbxD/AODGb/4qj2HmCkfr/g+h/KjB9D+VfkB/wtrxX/0M3iH/AMGM
+ 3/xVH/C2vFf/AEM3iH/wYzf/ABVHsPMFI/X/AAfQ/lRg+h/KvyA/4W14r/6GbxD/AODGb/4qj/hbXiv/
+ AKGbxD/4MZv/AIqj2HmCkfr/AIPofyowfQ/lX5Af8La8V/8AQzeIf/BjN/8AFUf8La8V/wDQzeIf/BjN
+ /wDFUew8wUj9f8H0P5UYPofyr8gP+FteK/8AoZvEP/gxm/8AiqP+FteK/wDoZvEP/gxm/wDiqPYeYKR+
+ v+D6H8qMH0P5V+QH/C2vFf8A0M3iH/wYzf8AxVH/AAtrxX/0M3iH/wAGM3/xVHsPMFI/X/B9D+VGD6H8
+ q/ID/hbXiv8A6GbxD/4MZv8A4qj/AIW14r/6GbxD/wCDGb/4qj2HmCkfr/g+h/KjB9D+VfkB/wALa8V/
+ 9DN4h/8ABjN/8VR/wtrxX/0M3iH/AMGM3/xVHsPMFI/X/B9D+VGD6H8q/ID/AIW14r/6GbxD/wCDGb/4
+ qj/hbXiv/oZvEP8A4MZv/iqPYeYKR+v+D6H8qMH0P5V+QH/C2vFf/QzeIf8AwYzf/FUf8La8V/8AQzeI
+ f/BjN/8AFUew8wUj9f8AB9D+VGD6H8q/ID/hbXiv/oZvEP8A4MZv/iqP+FteK/8AoZvEP/gxm/8AiqPY
+ eYKR+v8Ag+h/KjB9D+VfkB/wtrxX/wBDN4h/8GM3/wAVR/wtrxX/ANDN4h/8GM3/AMVR7DzBSP1/wfQ/
+ lRg+h/KvyA/4W14r/wChm8Q/+DGb/wCKo/4W14r/AOhm8Q/+DGb/AOKo9h5gpH6/4PofyowfQ/lX5Af8
+ La8V/wDQzeIf/BjN/wDFUf8AC2vFf/QzeIf/AAYzf/FUew8wUj9f8H0P5UYPofyr8gP+FteK/wDoZvEP
+ /gxm/wDiqP8AhbXiv/oZvEP/AIMZv/iqPYeYKR+v+D6H8qMH0P5V+QH/AAtvxX/0M3iH/wAGM3/xVH/C
+ 2vFf/QzeIf8AwYzf/FUew8wUj9f8H0P5UYPofyr8gP8AhbXiv/oZvEP/AIMZv/iqP+FteK/+hm8Q/wDg
+ xm/+Ko9h5gpH6/4PofyowfQ/lX5Af8La8V/9DN4h/wDBjN/8VR/wtrxX/wBDN4h/8GM3/wAVR7DzBSP1
+ /wAH0P5UYPofyr8gP+FteK/+hm8Q/wDgxm/+Ko/4W14r/wChm8Q/+DGb/wCKo9h5gpH6/wCD6H8qMH0P
+ 5V+QH/C2vFf/AEM3iH/wYzf/ABVH/C2vFf8A0M3iH/wYzf8AxVHsPMFI/X/B9D+VGD6H8q/ID/hbXiv/
+ AKGbxD/4MZv/AIqj/hbXiv8A6GbxD/4MZv8A4qj2HmCkfr/g+h/KjB9D+VfkB/wtrxX/ANDN4h/8GM3/
+ AMVR/wALa8V/9DN4h/8ABjN/8VR7DzBSP1/wfQ/lRg+h/KvyA/4W14r/AOhm8Q/+DGb/AOKo/wCFteK/
+ +hm8Q/8Agxm/+Ko9h5gpH6/4PofyowfQ/lX5Af8AC2/Ff/Qz+If/AAYzf/FUf8La8V/9DN4h/wDBjN/8
+ VR7DzBSP1/wfQ/lRg+h/KvyA/wCFteK/+hm8Q/8Agxm/+Ko/4W14r/6GbxD/AODGb/4qj2HmCkfr/g+h
+ /KjB9D+VfkB/wtrxX/0M3iH/AMGM3/xVH/C2vFf/AEM3iH/wYzf/ABVHsPMFI/X/AAfQ/lRg+h/KvyA/
+ 4W14r/6GbxD/AODGb/4qj/hbXiv/AKGbxD/4MZv/AIqj2HmCkfr/AIPofyowfQ/lX5Af8La8V/8AQzeI
+ f/BjN/8AFUf8La8V/wDQzeIf/BjN/wDFUew8wUj9f8H0P5UYPofyr8gP+Ft+K/8AoZvEP/gxm/8AiqP+
+ Ft+Kz18T+If/AAYzf/FUew8wUj9f8H0P5UYPofyr8gP+FteK/wDoZvEP/gxm/wDiqP8AhbXiv/oZvEP/
+ AIMZv/iqPYeYKR+v+D6H8qMH0P5V+QH/AAtrxX/0M3iH/wAGM3/xVH/C2vFf/QzeIf8AwYzf/FUew8wU
+ j9f8H0P5UYPofyr8gP8AhbXiv/oZvEP/AIMZv/iqP+FteK/+hm8Q/wDgxm/+Ko9h5gpH6/4PofyowfQ/
+ lX5Af8La8V/9DN4h/wDBjN/8VR/wtrxX/wBDN4h/8GM3/wAVR7DzBSP1/wAH0P5UYPofyr8gP+FteK/+
+ hm8Q/wDgxm/+Ko/4W14r/wChm8Q/+DGb/wCKo9h5gpH6/wCD6H8qMH0P5V+QH/C2vFf/AEM3iH/wYzf/
+ ABVH/C2vFf8A0M3iH/wYzf8AxVHsPMFI/X/B9D+VGD6H8q/ID/hbXiv/AKGbxD/4MZv/AIqj/hbXiv8A
+ 6GbxD/4MZv8A4qj2HmCkfr/g+h/KjB9D+VfkB/wtrxX/ANDN4h/8GM3/AMVR/wALa8V/9DN4h/8ABjN/
+ 8VR7DzBSP1/wfQ/lRg+h/KvyA/4W14r/AOhm8Q/+DGb/AOKo/wCFteK/+hm8Q/8Agxm/+Ko9h5gpH6/4
+ PofyowfQ/lX5Af8AC2vFf/QzeIf/AAYzf/FUf8Lb8Vjp4n8Q/wDgxm/+Ko9h5gpH6/4PofyowfQ/lX5A
+ f8La8V/9DN4h/wDBjN/8VR/wtrxX/wBDN4h/8GM3/wAVR7DzBSP1/wAH0P5UYPofyr8gP+FteK/+hm8Q
+ /wDgxm/+Ko/4W14r/wChm8Q/+DGb/wCKo9h5gpH6/wCD6H8qMH0P5V+QH/C2/Ff/AEM/iH/wYzf/ABVH
+ /C2vFf8A0M3iH/wYzf8AxVHsPMFI/X/B9D+VGD6H8q/ID/hbXiv/AKGbxD/4MZv/AIqj/hbXiv8A6Gbx
+ D/4MZv8A4qj2HmCkfr/g+h/KjB9D+VfkB/wtrxX/ANDN4h/8GM3/AMVR/wALa8V/9DN4h/8ABjN/8VR7
+ DzBSP1/wfQ/lRg+h/KvyA/4W14r/AOhm8Q/+DGb/AOKo/wCFteK/+hm8Q/8Agxm/+Ko9h5i5/I/X/B9D
+ +VGD6H8q/ID/AIW14r/6GbxD/wCDGb/4qj/hbXiv/oZvEP8A4MZv/iqPYeY1M//Z
+</value>
+ </data>
+ <data name="set.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADwSURBVDhPhY+xDYUwDESz09/pr8ACiBGQ6Cj+IFRU6akY
+ go7OP2dzliGROOkp2Pgucer7XkC6xDr0ZRgGx6aCaA6GluQ4DjnPsw6KAeu66jdOEkI1AOz7jp4RjErD
+ TKBodvkQngYTQW9ZlvuNxl3cC88rpYNe13UaAtDDiR4otZm5F2/iSjln2bZNhzGH3iNAPIBo0yQ5fTQE
+ wIhZUgXwmXkqpoIGXOZxHJVorgJ02IwqrjHPv8rME/81AAV2ZYDkr79imqbqBWo0TAyBCeZWQDT67UG+
+ /zMAK+AEvIh14aZmAHgzuloBzZ1fFA0vxpT+sRXMCLq81bkAAAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="dy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
+ jo6OzvH7yVk/OFHg0MnC/vfuhzOq6zrK76vzIrRtm3nf92sgBpdlieu6ZgCe5xmAXEot0zTZMABBXLiU
+ grRUVRWHYTATYpOfYR9kiGbMnQelUTu5wzmsoDWk796GOI6jGRDDzH0BxAyQ1Z5e4xhuGUSQWbkAaE2B
+ FMRN05h9uAD4JoHato1d9yjCOjOAH9Y+QggDOW5gwZdfEgR7iAf4YG53yq0eBADzjlWk/+QP2WXf9xmk
+ u3/Bo2wICEG/Oo9XdCIYwhNr8dl8ZRwfdQAAAABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
+ V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
+ 9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
+ f7HKuoh2wcgCX7FfROMpZvmw7V68mxSHTx4gm0DXCbAYEefyyNSsgQXeowl8RDmmPMAnEhg7BzS34ss8
+ NghoSgE55YDvFRCSSahvgMM34El8YX+8JjAyrka/Yhh9iiHJcuA49IxA4BquF+DsG3hoFGiKwsP+4ioN
+ BMV7oHO6NqcawJG+u/2IXN1kL/JBgsgOwZ6up82IDNUgQdhDwF12GKDQCLXjQAVC/gBsYdYbXS03WwAA
+ AABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="Select.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
+ V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
+ 9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
+ f7HKuoh2wcgCX7FfROMpZvmw7V68mxSHTx4gm0DXCbAYEefyyNSsgQXeowl8RDmmPMAnEhg7BzS34ss8
+ NghoSgE55YDvFRCSSahvgMM34El8YX+8JjAyrka/Yhh9iiHJcuA49IxA4BquF+DsG3hoFGiKwsP+4ioN
+ BMV7oHO6NqcawJG+u/2IXN1kL/JBgsgOwZ6up82IDNUgQdhDwF12GKDQCLXjQAVC/gBsYdYbXS03WwAA
+ AABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="Back.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACcSURBVDhPtZPBCcQgEEXtNVUFBI+WYAlewl4twxJm88RZ
+ xDUbDeyDQWf4805q/o3U02yblbbq+JoakhhjCdPvIrIfUuYhhGsJ4TNXgt77ocA5NxboMuGz/QSnBO1y
+ H7wV9MtLgtHykiDnXIbWvp4JIKX0JaGfFkAv4b4kgFbCuSwAlVCPBKCS9iXSa90KAIn+BeD9s0j9/Avz
+ GPMGIZpkvqVDGAQAAAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="Next.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACYSURBVDhPrZMxDsMgEAT5qx9DSW0pEiVPoKSkSc9zNlmL
+ i+wUezjKSifB6mZEYYe/ZNseOM+sj34edbi4A9ifIIBa6wFOAcYYWvQtyDl/BNZJiRK8K1/iCjzJyguk
+ ZEkwJey4c5GsCgxOKaG1dk9gcIwRpZR7L5AwowQuzCgB7xJmbNHGBDwTlLCF3z9Bjv0LTO/dh39PCC/T
+ 8HpVcPCyWAAAAABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="xz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAG3SURBVDhPfVLdK0NhHH5LSXGn/QculCsfUbtRLl1JbhQh
+ taxNNPnOolY+yhjjQo12oRQ3bhWiZGULF3Kv5Nucbeacs4/HeX/HnJ289tRT7+/5/Z7nfc+vw+bXgvD4
+ NuFZDojpC2DOvwX/1i6YCDPeDXEjDyu+C5oRhrgX1knMZrMQkfe83vNf45+QydlVEtKZDETkvaWlkMlk
+ Chn3LFOhptIQMQsgsHmElvYetHXYcHB4YgpjIzOLJMhKCiIqagoZLUVKJPEWlWg2UlOKs3KmB7ncC3RI
+ yioKMfc5Zc4IkhUMCAOXVgvY4OQsNeJJBYl/qKYM8/ZtQr9QCwlZtFf0j3lI+PiUIQmoaHvg/RJ7mMzX
+ KlDtv6NXUIBjeJoG3mNfiMbNlFXdXGy/MplZAGB1QeqxPtcUHV4lbUkxg7K2PK4XOW7+N3PYBiaoeI5+
+ 4uXDINdWu1hhM0evc5SEx7c4nt4TRL51rvEAXLT+MR+fGn8m67YPUXH/IuH+NUbkNZnVB0C5opD8m3Me
+ QndfXpGHXECnlRF/ZILJ09zWhaqGJlTVG+R6ZW0jeAgNadjZ29f72iz36Cpj3yFNGCz1c9N0AAAAAElF
+ TkSuQmCC
+</value>
+ </data>
+ <data name="xg.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHvSURBVDhPnZJNSFRRGIYPCBHYLl24d9EiKsuN48KNBbUo
+ EGSEmEwXoo0iRkR/ZBkSaC3m74qmC3/GjS7Edv5RTQNCMzUyNMWUWFaTo6AIaqjQ2/d999id61SLXnjh
+ cr73ec8991yVqXZPLzq9PfD6e+AL2M1rnZ4n4IyO29Xa0YUf27twhwDlJfv3mdaawz8lw1mNWbrV7sHa
+ 6jrcUxsYTOOPbprelAxnNWbp+r1HWF1ZhnoMDHwFKp8BeYO0s0+b38IDyXBWY5au3nmIdOqbhC6HgYIh
+ ArrI3Rmmkq3NDWRK40o13XiAxYXPsltBkAb7YbIRN6HoyVyEDyt51rhSV67dRTL5EcqgxV5yn91GQvI4
+ 1BjFViHBEeCNI98qqGu+ibnEB7h8UaiqWaiLlo3Jpd9w8J15BC6ZzVdWQX3LbfSPPBUPjY4jqJ2cXxDg
+ YENE4LkdoMi/mF3AOlvhwonSM+JjJeUYHhkT+EBDzAbLsYr7ZabRbM08p6sg5bjf/hVm6Xi2eOirVv8H
+ x2foKkhcgFcV/4YnQhFkOnDJvF+Bd74D2zEp2YO/pJZtefqFO/Dy9Xu8iCQQin1CgEHSXoHLocSs+LQh
+ Gc4yw6w676yRL37ccRpHS87hfqUZPnKqzCzRmhoz0EYzznCWmQvOWvwCAklSiLgvRB8AAAAASUVORK5C
+ YII=
+</value>
+ </data>
+ <data name="sc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAG5SURBVDhPlZDrK4NhGMafP8BHf4BPwkfmq8NnvhKlUHxw
+ iEgSIsQKqcVyPjQ2Z9mS0ooSlqElQ07RaGRib6zmeHmf27O3zSZcdbXnfp77+r33PRZKZdXN8Le4/pt4
+ wO15g0vykvn5V4j/1/5iEfsSv/iPbPbjQAgvHp5ecXrlwv6ZE7bDC1h2j7BitWNpzYZ5swUG0zL6Jxag
+ GZxCe68+GFBe14rjkzOMjs9iSD+DPt0ktAN6dHQPQ63pR0N7N+pbtdBNL6KmRRNijVo1jWexHcLjfcbN
+ gwcDBhOOzp0wW+zoGpmG0bxBE1U2tAX/ocWVjQRY27JDenzClUtC39g8Dk4dcFzf0RuXw+nC+uZOMKCg
+ vI4avgPupUfg4wPWaEb2yVeLOGN5JVX08B3ARcFt+SBbAfnVBMgprKDmUIBOJgeaIr4sgr6avxEgK7+U
+ mkOuIIsgxeEBVsJcGblF1PgTgMZODQuwMj5XenYBNa5a9+CWAZe3bvTo5uhO2Zn/xgmLOwWSKSbg8r4D
+ 954XXNxIVNP4IszPVAtIwBrJKWmIjE1AlCoR0aokxMQnYWLGqEAoKIv3+mrGGPsEfOpdAqh7YNYAAAAA
+ SUVORK5CYII=
+</value>
+ </data>
+ <data name="AddRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
+ 9N9w6cv/mnMf/FeYeuO/eN/5/3xtx/4z1+wBY9oYUJCfTzTGasCqlSv/v3n9mihM0IDLly7937N79/+t
+ W7aAxZcuWQLHCgoKcAwDWA04evHY/1U7VmNgkMaSuw3/ra2todqRDIDZvHD9ov996yf+r1pa/z9rct7/
+ mOZEuK0S7Wr/rc75gGmYGIoBIJu3nt/xf+n5Vf9nnZv/f8r52f9b93XDbQbhkGspYHrS09mYBsBcMHXD
+ jP+Ny1r/F00v+5/akQW3DWQzSDNWF6CHwcbdGzAwSAPMZhjAagByLIDwiuXLwRhmK4YBZ8+cIRqD1CMD
+ sAGkYmRAYXb+/x8A86/iJXr/E3YAAAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="DelRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADSSURBVDhPlZPRDYQgEERpxgaswlCGv/ZBSXwbC6AAC7AA
+ G9hj1huCuMS7SUYi8l4IqhvHUf5tHRWc59ntcRy3dgXrusq2baUppUf3fe8L3mD0J0EPZLsCC0Sdcw8B
+ 5hgV4HBaEIt14bIUCYUyTUViCmpYhqFICLM61wq41YcEbeDbDmqwbpEYMKICC0QhRhUwYMQUEGxhS6KC
+ EIJ472We51dYm8+DEr1Cgm8BkhijCeNe575vhZJLk8OdQMCvkhKM+FfwjBIdc4oAgaQtFlpzV0Q+Xg/P
+ E8pc2+4AAAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="bc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH1SURBVDhPjZPNSxRxGMcfI+jQLTxYIKLoQQsjvEadEoRO
+ /gO+awReIiGty97sRQtbPSmoB8FFMSwKDx3VXdvcfGErt9YlpWUJF/dFV2d0v36fHc0XdPALX2bmme/z
+ mec38xuRBi+kahqRVmD5yfmsWe3J9ErtDD6tAQkAv85pzWqP9oo0foVcbWcJMEwDpmnaWjMqyWlHplfq
+ ZlD2IVPD5CTgnra3ZlTN3oMJaj24NWYVk6kUNrbsrRlV+QQBNZ7jgKkpPsVtb82oCl06wQnAv1gCa/Gk
+ rTWjutBHQN0+oOxgCbE4NuIJW2tGJc4jgNvvgUu9LLzYhHRuQ96Yp1vvdWwjt2UR0mVA6vdf4h1+hSv9
+ BDxfh1R+huS/ghR0Hnd+Bxu+QKrdcEwkmY2dAAwQ8DScGe8sSRUbqj0Y+c5zR+QUwOOQFbz2EtKyij+/
+ rTc/69tFKLjzH+DyM9O2wq3MiXSsux8JGGSx+YcFKHpNQBD+b8Dc/C78Pw2E/3L9RwGPAhYg654LeY4l
+ ZA+x2DiH9CaPeZygaQEBBrU5sJxCNJo6BOgSHi4wrz8TdbF8GJefBUn0IRYBQktAmKtZXeExsoPouoF0
+ eosbh3u/3ot3QQKafJAHsxZAlVUxCinthlx3QkreHrqY1+oS+maP5Rs8L6Xvj2MPx8IASe80O9sAAAAA
+ SUVORK5CYII=
+</value>
+ </data>
+ <data name="fq.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACfSURBVDhPYyAGsGWf/Q9lkglSz/xnSANiskHCqf9///8n
+ wxCQBhAOPfp/ytn/JBgCUpQIsRWGQQYQZwhQ8ilQEQj3XwAqnokFG8/EbwDMNrhiUCCSohluM0wxzAC8
+ mkEAagBYMbI/QQYQ1AwCuAwgSjMI4DKAaIBkwD2C0YULAJ2LYQgMEwWgBiAbAsMkGQLGoLBAxyR5C2YQ
+ OoYDBgYA9kn+I3B8Li4AAAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="sh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc
+ d1EcjEwytSiH4SZcRHLQ7FemtlJDOPiZml8XSzMWMz9mK7Xevs/z7DvDzLzr9X2253k+r8+nvn0pM10t
+ hGykjnMndRE1ZWJlVKvF+qdErytIF/1G6k72sMPTBULIRcCF4H2bcOMknC8SNsb/IXheJ8R8hAfPPwUH
+ M4Qz6fKVlXBtJwRWxP99aX/NnKfgcJZwMkfwS9OwdW86TwFLc6MGmxPE2Zok+CwCzwjB5XDkLpbDJHYj
+ cax9ArbHDzukt5HJ9wxbpuGe7+fvvL1esLU6BTmsSHpyfggGRiaxe3yJaJzfhbI/wGHJ7MqKS1ZKv+xx
+ gWFoDDtH57h7jCGeSGDQHoTJGUwL5M6MSrsKFd5y/jst6DaapQkuEI6+4eU1hoZRP4dFFhTMK6FYUKB4
+ SQHVciGKbMpPQafBxAWhiDRBPA7S73O4gH0HWtGtza9BrVslCnUSrSmBPAET3Eee0GO9Ra8tjGQyySUs
+ 8iQ1XvVn58xU1WnxG1zAJmn61pmIPgBiIY95z/CSIgAAAABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="qsh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGPSURBVDhPlZLLK0RhGMbfsrVRtkp2k4UFsUOxsPAn2NoI
+ C0MzEmpQFi4LpWEjUhaGMYqyUINQjEtqGEqkcZkY4zLO1CGP73vPN2cujdtTv97vPd/7PL2ncyhZTTWE
+ TKjrn6UGUVRgVElhnlF/DamvzjJN36FmMkteHk8RbhYJODXQNwnXHkJgmrA2+I+A51VC1Et4WPlnwN4Y
+ 4UQMX7gIV27C5ZzR+8TzZccfA/bHCUcTBL/YRtZd5x8DpKoqyrE+RMzGMME7YHDlG4WUGvtZMsRtJ8bV
+ RjjfEubPT+xYiFFjlN6zugecWJq08TevKzWQkoPwiYMgbkzu2dzeO4ztwzNENPYgx3bJSI2IfwA9+QbK
+ GO/lHQdYO/uxdRDA3WMUWiyGDncQXZ4g3j8+EiGNuSmYZqlmu0NscIpQ5A0vr1GU9fkZXdc5gNeuzU7B
+ XF+qwdrFATdhsYGmgep9jGmWR1mLFeqZGRLfQAbch5/Q4rpF63yIA3h9ZZZn7lVIymtYSiqRzszsghmS
+ PJzoib4AQHWvuebaS2wAAAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="sz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAClSURBVDhPxZNBCgMhDEVz1zmQSxkQXHoEj+CmdOtx0vyU
+ wFhjqaXQDyGEn/8QZ6Sf6TgSn8x83phl5For+iDsSOPW2uRNgJzzsARfLPVKKXsAC8OXcYKrVoBreHU6
+ lQd4DW8BvPAWIISgPaX7d4AYo33KAYL54zvovWthNoh5yAzyAE+H6ApB3wZABkEtAdLeLhnE/RMhXBqC
+ KO8tQIC4b+FPInoA2b1WbweybUAAAAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="syz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACcSURBVDhPtZPBCcQgEEXtNVUFBI+WYAlewl4twxJm88RZ
+ xDUbDeyDQWf4805q/o3U02yblbbq+JoakhhjCdPvIrIfUuYhhGsJ4TNXgt77ocA5NxboMuGz/QSnBO1y
+ H7wV9MtLgtHykiDnXIbWvp4JIKX0JaGfFkAv4b4kgFbCuSwAlVCPBKCS9iXSa90KAIn+BeD9s0j9/Avz
+ GPMGIZpkvqVDGAQAAAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="xyz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACYSURBVDhPrZMxDsMgEAT5qx9DSW0pEiVPoKSkSc9zNlmL
+ i+wUezjKSifB6mZEYYe/ZNseOM+sj34edbi4A9ifIIBa6wFOAcYYWvQtyDl/BNZJiRK8K1/iCjzJyguk
+ ZEkwJey4c5GsCgxOKaG1dk9gcIwRpZR7L5AwowQuzCgB7xJmbNHGBDwTlLCF3z9Bjv0LTO/dh39PCC/T
+ 8HpVcPCyWAAAAABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="mz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACXSURBVDhPrZPBCYAwDEW7a4fpsWdB6LEjdIRevHec2JQE
+ NIlgxA9B6c97iGj4JTHuQLcq2F2Hju+hAsYYagG7DQC2A9ZOa01L1hItSIkUlFJswexNiU9gSNxPICV+
+ AUnwbFbfBAznnP0ChlNKUGv1CSTsegcWzN0rwbwoGPNKMLNACWNYzvMkCL13BXPw+0cQx/wXvieEEzaJ
+ cBFxK5ZNAAAAAElFTkSuQmCC
+</value>
+ </data>
+ <data name="tm.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
+ V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
+ 9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
+ f7HKuoh2wcgCX7FfROMpZvmw7V68mxSHTx4gm0DXCbAYEefyyNSsgQXeowl8RDmmPMAnEhg7BzS34ss8
+ NghoSgE55YDvFRCSSahvgMM34El8YX+8JjAyrka/Yhh9iiHJcuA49IxA4BquF+DsG3hoFGiKwsP+4ioN
+ BMV7oHO6NqcawJG+u/2IXN1kL/JBgsgOwZ6up82IDNUgQdhDwF12GKDQCLXjQAVC/gBsYdYbXS03WwAA
+ AABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="redblue.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEXSURBVDhPpZG/TsJQFMbvO/kOsjrAzNI+Qu0L4MzCwg66
+ mMgAC2wYmEggECCQdtDUuGhQFiWQfJxz7+0VUmgv8SRn6T395fsjeAbVK5SLInV934c8PjUMAAbYbrr4
+ WTWxfqvjc1nB+7CE154nAXR2HhIDdhLQIkANHwsG3BnA9PHmPOQYoBRIwKiEFwLQydEmIAbwqxR8swK2
+ MCIFfQ9B28H8qYDxw3UGgBV8ESD6A7CCkAENBuTSAYchqgxUiEHbxayRx+Q+A7DbPGuAVsAhsoWOSxby
+ GGcDdAsRKTA13koF0oKdAl2jzCC24JAFiwxMC7GCRAs2Fg5bMCFyC9YZJFsIKcTUFmjkg+2eAgj+eMnq
+ 3/47QuwBNTYBELFI9AQAAAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="qt.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADvSURBVDhPzVLBCoJAEPUT/A5P/oh/4Vd19VBdig6egwg8
+ SZCIeIgIIYTIIiKiw752ZlcMS43q0IPB2dmZ994OGj+F53lwXRemaXJQTjV93Q5qlh/Yto1JkKM3XnJe
+ EqmuBmgVHop2QLIHZmsBPxFcI5JWJ6RAaukByM5AflEk05XAKBJ81+qCFMh2dgKKK3C8VSR+XLnQ7c8o
+ CdJCOpAk25qDToLyCWEO3kFMO9ioHfTDN57wuMR5JhBk0rocHiyUOt3paIZWYDUaoqCcahQYmnAcp53k
+ 1Y8kyzxsWRZHJ0kDmOi/SNTxM3w1XINh3AF00QUlYhBzgwAAAABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
+ rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
+ wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
+ gg==
+</value>
+ </data>
+ <data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
+ oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
+ znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
+ vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
+ AG0RaJ0Gqp8A+0ICGBIZLkZLifXv8Xb3YnVlRdrdb23gtAHHjpdj5hAVRVdv+vBlaVkes+6pPVzhieHn
+ YQKiwHtHpSFp6+rB4sIn+Y37R+3hB5kNec2SSKV5isvebuiZj8YPxoKxYrSMAR90RyWc2AZqgp/lKSzB
+ Jc91xJI6nEoUdCECchrRJlZl4YA7XgJL+Yl7BszjauvEu9QCZoUk8UFHMq3jW+6HLJS1p+1hniZXO6pq
+ 63Hk5Bkr/Fy9SHvC4+FXhuTa7V6s/dopydbOriXA7Ll/YN7nHrNSENeXMDA4aq0WvP0V2IpLSQFOpuaQ
+ mF+WPSm4Iv7CxmaXNBbWPwUtDpLhZ8/HwyU9ZolvjjkaUH3qrBUuV9WeBkv4mufh42clHWYaz7vwG72U
+ TLZQdeFnAAAAAElFTkSuQmCC
+</value>
+ </data>
+ <data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+ /QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
+ 77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
+ aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
+ JWylHvVeGGCm+hBQnNlCNIatWNxW6lGv9B0D3PsIXOrnQts2pGsX0mOdLX3WuYsbjT8gvTyNmsOPeJ+n
+ cOUtAa2bkEdfIbkdkLyuk8rtZGAGUuGCYzxBb/QUYJCAlpAp73+jnIEKN979pNcRPgPQEDSA7HZI4xpW
+ /pgvP+vdRzCwx/Y1AKeP3uZVtjIr0rJKPhMwxMX6RQO41U1AAL45YP77Pny/Ugitc//HAc/8BpD1wIkc
+ xxKuDnOxdh7pbc45rKBuAX4aNexfTiISYQNlALqFpwv068/EcbF0BJdfBEj0IhoGgktAKAisrXIO7yGy
+ mUI6vcPGYe/XePA+QECdF/Jk1gB0ZJWNQgpfQ273QQpeHSmf96oCquiN0R1eF1IPP+AAgRmsjnCqFmoA
+ AAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="cmdHICMOBillNo.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ R0lGODlhEAAQAIYAAAAzmQBmzP///1o7AJlmAOazAMTz/9mmAEW5//nNT+W5ToPV/5TW/cyZAAyf/7Dp
+ /yOn/2jD/q3h/le8/sz3/5zg/7bt/73l/7Xs/2fH/4DT///bnZXb/97//2rK/wWb/8np/6zf/1S//77x
+ /73w/8Xv/1+//wmc/1jA/5Db/5LV/6rn/6Xb/zCt/33O/9X3/4LO/7jj/4PT/x+m/7nk/3XP/3PJ/3bQ
+ /6Tb/5Td/zCv/3fM/029/4za/6Pf/ZHc/6Pk/////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
+ AABBACwAAAAAEAAQAAAIqACDCBwoMIDBAAQTBjEYIcKECQYVLmQQ44KJFhBmQECYMAAOEAJYnPjgwAHH
+ gQEYqAhBA4YOBDwQIDg5cYcLGyg8LOixYAFNABJkZBBRI8cDEg98ACAIlIOGGylWGOhgwMBSphUq/ACC
+ wQAFClcFEiAAQICAEhZGvDAbloCCDQUAlDUrQO5AtwkKHBgQRK7duwryHmjAV2IQAoIJGxY4QK/ixYwH
+ FIYcEAA7
+</value>
+ </data>
+ <data name="cmdHWorkEmpID.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ R0lGODlhEAAQAIYAAAAzmQBmzP///1o7AJlmAOazAMTz/9mmAEW5//nNT+W5ToPV/5TW/cyZAAyf/7Dp
+ /yOn/2jD/q3h/le8/sz3/5zg/7bt/73l/7Xs/2fH/4DT///bnZXb/97//2rK/wWb/8np/6zf/1S//77x
+ /73w/8Xv/1+//wmc/1jA/5Db/5LV/6rn/6Xb/zCt/33O/9X3/4LO/7jj/4PT/x+m/7nk/3XP/3PJ/3bQ
+ /6Tb/5Td/zCv/3fM/029/4za/6Pf/ZHc/6Pk/////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
+ AABBACwAAAAAEAAQAAAIqACDCBwoMIDBAAQTBjEYIcKECQYVLmQQ44KJFhBmQECYMAAOEAJYnPjgwAHH
+ gQEYqAhBA4YOBDwQIDg5cYcLGyg8LOixYAFNABJkZBBRI8cDEg98ACAIlIOGGylWGOhgwMBSphUq/ACC
+ wQAFClcFEiAAQICAEhZGvDAbloCCDQUAlDUrQO5AtwkKHBgQRK7duwryHmjAV2IQAoIJGxY4QK/ixYwH
+ FIYcEAA7
+</value>
+ </data>
+ <data name="cmdHProcID.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ R0lGODlhEAAQAIYAAAAzmQBmzP///1o7AJlmAOazAMTz/9mmAEW5//nNT+W5ToPV/5TW/cyZAAyf/7Dp
+ /yOn/2jD/q3h/le8/sz3/5zg/7bt/73l/7Xs/2fH/4DT///bnZXb/97//2rK/wWb/8np/6zf/1S//77x
+ /73w/8Xv/1+//wmc/1jA/5Db/5LV/6rn/6Xb/zCt/33O/9X3/4LO/7jj/4PT/x+m/7nk/3XP/3PJ/3bQ
+ /6Tb/5Td/zCv/3fM/029/4za/6Pf/ZHc/6Pk/////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
+ AABBACwAAAAAEAAQAAAIqACDCBwoMIDBAAQTBjEYIcKECQYVLmQQ44KJFhBmQECYMAAOEAJYnPjgwAHH
+ gQEYqAhBA4YOBDwQIDg5cYcLGyg8LOixYAFNABJkZBBRI8cDEg98ACAIlIOGGylWGOhgwMBSphUq/ACC
+ wQAFClcFEiAAQICAEhZGvDAbloCCDQUAlDUrQO5AtwkKHBgQRK7duwryHmjAV2IQAoIJGxY4QK/ixYwH
+ FIYcEAA7
+</value>
+ </data>
+ <data name="cmdHDeptID.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ R0lGODlhEAAQAIYAAAAzmQBmzP///1o7AJlmAOazAMTz/9mmAEW5//nNT+W5ToPV/5TW/cyZAAyf/7Dp
+ /yOn/2jD/q3h/le8/sz3/5zg/7bt/73l/7Xs/2fH/4DT///bnZXb/97//2rK/wWb/8np/6zf/1S//77x
+ /73w/8Xv/1+//wmc/1jA/5Db/5LV/6rn/6Xb/zCt/33O/9X3/4LO/7jj/4PT/x+m/7nk/3XP/3PJ/3bQ
+ /6Tb/5Td/zCv/3fM/029/4za/6Pf/ZHc/6Pk/////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
+ AABBACwAAAAAEAAQAAAIqACDCBwoMIDBAAQTBjEYIcKECQYVLmQQ44KJFhBmQECYMAAOEAJYnPjgwAHH
+ gQEYqAhBA4YOBDwQIDg5cYcLGyg8LOixYAFNABJkZBBRI8cDEg98ACAIlIOGGylWGOhgwMBSphUq/ACC
+ wQAFClcFEiAAQICAEhZGvDAbloCCDQUAlDUrQO5AtwkKHBgQRK7duwryHmjAV2IQAoIJGxY4QK/ixYwH
+ FIYcEAA7
+</value>
+ </data>
+ <data name="cmdHSourceID.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ R0lGODlhEAAQAIYAAAAzmQBmzP///1o7AJlmAOazAMTz/9mmAEW5//nNT+W5ToPV/5TW/cyZAAyf/7Dp
+ /yOn/2jD/q3h/le8/sz3/5zg/7bt/73l/7Xs/2fH/4DT///bnZXb/97//2rK/wWb/8np/6zf/1S//77x
+ /73w/8Xv/1+//wmc/1jA/5Db/5LV/6rn/6Xb/zCt/33O/9X3/4LO/7jj/4PT/x+m/7nk/3XP/3PJ/3bQ
+ /6Tb/5Td/zCv/3fM/029/4za/6Pf/ZHc/6Pk/////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
+ AABBACwAAAAAEAAQAAAIqACDCBwoMIDBAAQTBjEYIcKECQYVLmQQ44KJFhBmQECYMAAOEAJYnPjgwAHH
+ gQEYqAhBA4YOBDwQIDg5cYcLGyg8LOixYAFNABJkZBBRI8cDEg98ACAIlIOGGylWGOhgwMBSphUq/ACC
+ wQAFClcFEiAAQICAEhZGvDAbloCCDQUAlDUrQO5AtwkKHBgQRK7duwryHmjAV2IQAoIJGxY4QK/ixYwH
+ FIYcEAA7
+</value>
+ </data>
+ <data name="cmdHGroupID.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ R0lGODlhEAAQAIYAAAAzmQBmzP///1o7AJlmAOazAMTz/9mmAEW5//nNT+W5ToPV/5TW/cyZAAyf/7Dp
+ /yOn/2jD/q3h/le8/sz3/5zg/7bt/73l/7Xs/2fH/4DT///bnZXb/97//2rK/wWb/8np/6zf/1S//77x
+ /73w/8Xv/1+//wmc/1jA/5Db/5LV/6rn/6Xb/zCt/33O/9X3/4LO/7jj/4PT/x+m/7nk/3XP/3PJ/3bQ
+ /6Tb/5Td/zCv/3fM/029/4za/6Pf/ZHc/6Pk/////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
+ AABBACwAAAAAEAAQAAAIqACDCBwoMIDBAAQTBjEYIcKECQYVLmQQ44KJFhBmQECYMAAOEAJYnPjgwAHH
+ gQEYqAhBA4YOBDwQIDg5cYcLGyg8LOixYAFNABJkZBBRI8cDEg98ACAIlIOGGylWGOhgwMBSphUq/ACC
+ wQAFClcFEiAAQICAEhZGvDAbloCCDQUAlDUrQO5AtwkKHBgQRK7duwryHmjAV2IQAoIJGxY4QK/ixYwH
+ FIYcEAA7
+</value>
+ </data>
+ <data name="cmdHUnitID.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ R0lGODlhEAAQAIYAAAAzmQBmzP///1o7AJlmAOazAMTz/9mmAEW5//nNT+W5ToPV/5TW/cyZAAyf/7Dp
+ /yOn/2jD/q3h/le8/sz3/5zg/7bt/73l/7Xs/2fH/4DT///bnZXb/97//2rK/wWb/8np/6zf/1S//77x
+ /73w/8Xv/1+//wmc/1jA/5Db/5LV/6rn/6Xb/zCt/33O/9X3/4LO/7jj/4PT/x+m/7nk/3XP/3PJ/3bQ
+ /6Tb/5Td/zCv/3fM/029/4za/6Pf/ZHc/6Pk/////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
+ AABBACwAAAAAEAAQAAAIqACDCBwoMIDBAAQTBjEYIcKECQYVLmQQ44KJFhBmQECYMAAOEAJYnPjgwAHH
+ gQEYqAhBA4YOBDwQIDg5cYcLGyg8LOixYAFNABJkZBBRI8cDEg98ACAIlIOGGylWGOhgwMBSphUq/ACC
+ wQAFClcFEiAAQICAEhZGvDAbloCCDQUAlDUrQO5AtwkKHBgQRK7duwryHmjAV2IQAoIJGxY4QK/ixYwH
+ FIYcEAA7
+</value>
+ </data>
+ <data name="cmdHMaterID.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ R0lGODlhEAAQAIYAAAAzmQBmzP///1o7AJlmAOazAMTz/9mmAEW5//nNT+W5ToPV/5TW/cyZAAyf/7Dp
+ /yOn/2jD/q3h/le8/sz3/5zg/7bt/73l/7Xs/2fH/4DT///bnZXb/97//2rK/wWb/8np/6zf/1S//77x
+ /73w/8Xv/1+//wmc/1jA/5Db/5LV/6rn/6Xb/zCt/33O/9X3/4LO/7jj/4PT/x+m/7nk/3XP/3PJ/3bQ
+ /6Tb/5Td/zCv/3fM/029/4za/6Pf/ZHc/6Pk/////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
+ AABBACwAAAAAEAAQAAAIqACDCBwoMIDBAAQTBjEYIcKECQYVLmQQ44KJFhBmQECYMAAOEAJYnPjgwAHH
+ gQEYqAhBA4YOBDwQIDg5cYcLGyg8LOixYAFNABJkZBBRI8cDEg98ACAIlIOGGylWGOhgwMBSphUq/ACC
+ wQAFClcFEiAAQICAEhZGvDAbloCCDQUAlDUrQO5AtwkKHBgQRK7duwryHmjAV2IQAoIJGxY4QK/ixYwH
+ FIYcEAA7
+</value>
+ </data>
+ <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>93, 17</value>
+ </metadata>
+ <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>183, 17</value>
+ </metadata>
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>46</value>
+ </metadata>
+</root>
\ No newline at end of file
diff --git a/WarM/WarM.csproj b/WarM/WarM.csproj
index 3cb280f..82c42e5 100644
--- a/WarM/WarM.csproj
+++ b/WarM/WarM.csproj
@@ -123,6 +123,12 @@
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<DependentUpon>Settings.settings</DependentUpon>
</Compile>
+ <Compile Include="Sc_MESNowWorkBill_Fast.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="Sc_MESNowWorkBill_Fast.designer.cs">
+ <DependentUpon>Sc_MESNowWorkBill_Fast.cs</DependentUpon>
+ </Compile>
<Compile Include="浠撳簱绠＄悊\Gy_BarCodeBill_ChaiMa.cs">
<SubType>Form</SubType>
</Compile>
@@ -747,6 +753,10 @@
<DependentUpon>Kf_BillDatePeriod.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
+ <EmbeddedResource Include="Sc_MESNowWorkBill_Fast.resx">
+ <DependentUpon>Sc_MESNowWorkBill_Fast.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
<EmbeddedResource Include="浠撳簱绠＄悊\Gy_BarCodeBill_ChaiMa.resx">
<DependentUpon>Gy_BarCodeBill_ChaiMa.cs</DependentUpon>
</EmbeddedResource>
diff --git a/WarM/WarM.csproj.user b/WarM/WarM.csproj.user
index eca3abc..1c6f68c 100644
--- a/WarM/WarM.csproj.user
+++ b/WarM/WarM.csproj.user
@@ -9,6 +9,6 @@
<ErrorReportUrlHistory />
<FallbackCulture>zh-CN</FallbackCulture>
<VerifyUploadedFiles>false</VerifyUploadedFiles>
- <ProjectView>ShowAllFiles</ProjectView>
+ <ProjectView>ProjectFiles</ProjectView>
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
index 23d3fb3..07f7c53 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
@@ -2043,5 +2043,49 @@
Sub_SaveBarCode();
//
}
+
+ private void cmdESOP_Click(object sender, EventArgs e)
+ {
+ Sc_MESNowWorkBill_Fast oSc_MESNowWorkBill_Fast = new Sc_MESNowWorkBill_Fast();
+ oSc_MESNowWorkBill_Fast.txtHICMOBillNo.Text = "";
+ oSc_MESNowWorkBill_Fast.txtHMaterID.Text =txtHMaterID.Text;
+ oSc_MESNowWorkBill_Fast.txtHName.Text = ClsPub.isStrNull(grdMain.Rows[0].Cells[Fun_GetCol("鐗╂枡鍚嶇О")].Value);
+ oSc_MESNowWorkBill_Fast.txtHModel.Text = ClsPub.isStrNull(grdMain.Rows[0].Cells[Fun_GetCol("瑙勬牸鍨嬪彿")].Value);
+ oSc_MESNowWorkBill_Fast.Show();
+
+ }
+
+ private void txtHBarCode_KeyDown(object sender, KeyEventArgs e)
+ {
+ if(e.KeyCode==Keys.Enter)
+ {
+ //
+ //鑾峰彇绗竴琛屾潯褰㈢爜杩涜鎵撳嵃
+ DataSet DSet = oCn.RunProcReturn("select * from h_v_IF_BarCodeBillList_CS Where 鏉＄爜缂栧彿='"+ txtHBarCode.Text +"' and 鏉＄爜绫诲瀷 = '鎵樼洏鏉＄爜'", "h_v_IF_BarCodeBillList_CS", ref DBUtility.ClsPub.sExeReturnInfo);
+ //鐢熸垚棣栬鏍囬
+ if (DSet == null)
+ {
+ MessageBox.Show("娌℃湁杩斿洖浠讳綍缁撴灉,鏉＄爜涓嶅瓨鍦紒" + DBUtility.ClsPub.sExeReturnInfo);
+ return;
+ }
+ //
+ grdList.DataSource = DSet.Tables[0].DefaultView;
+ //鍐荤粨
+ int FrCol = 0;
+ string s = "鏄�";
+ DBUtility.Xt_BaseBillFun.DisplayGrid(grdList, this.Name + "grdList", s, FrCol);
+ //
+ //鍒ゆ柇鏄惁宸茬粡鐢熸垚鏉＄爜
+ if (DBUtility.ClsPub.isStrNull(grdList.Rows[0].Cells[Fun_GetColList("鏉＄爜缂栧彿")].Value) == "")
+ {
+ MessageBox.Show("鏉＄爜鏈敓鎴愶紝璇峰厛鐢熸垚鏉＄爜鍚庡啀棰勮锛�");
+ return;
+ }
+ //閫夋嫨鎵撳嵃妯℃澘
+ Sub_SetReport("娉ㄥ鐗╂枡鏍囩");
+ Report.Print(false);
+ Thread.Sleep(1000);
+ }
+ }
}
}
\ No newline at end of file
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.designer.cs"
index 7404c4a..f65f095 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.designer.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.designer.cs"
@@ -30,7 +30,7 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Sc_ICMOToBarCode));
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
this.Tool = new System.Windows.Forms.ToolStrip();
this.tc = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
@@ -70,6 +70,7 @@
this.label7 = new System.Windows.Forms.Label();
this.txtHBQty = new System.Windows.Forms.TextBox();
this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.cmdESOP = new System.Windows.Forms.Button();
this.cmdHSaveBill1 = new System.Windows.Forms.Button();
this.dtpHEndDate1 = new System.Windows.Forms.DateTimePicker();
this.label10 = new System.Windows.Forms.Label();
@@ -91,6 +92,7 @@
this.button2 = new System.Windows.Forms.Button();
this.button3 = new System.Windows.Forms.Button();
this.button7 = new System.Windows.Forms.Button();
+ this.txtHBarCode = new System.Windows.Forms.TextBox();
this.Tool.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
this.gbUp.SuspendLayout();
@@ -120,7 +122,7 @@
this.Tool.Location = new System.Drawing.Point(0, 0);
this.Tool.Name = "Tool";
this.Tool.Padding = new System.Windows.Forms.Padding(0);
- this.Tool.Size = new System.Drawing.Size(1172, 50);
+ this.Tool.Size = new System.Drawing.Size(1563, 62);
this.Tool.Stretch = true;
this.Tool.TabIndex = 16;
this.Tool.Text = "toolStrip1";
@@ -142,13 +144,13 @@
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 62);
//
// toolStripSeparator9
//
this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 62);
//
// mrlk
//
@@ -158,7 +160,7 @@
this.mrlk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.mrlk.ImageTransparentColor = System.Drawing.Color.White;
this.mrlk.Name = "mrlk";
- this.mrlk.Size = new System.Drawing.Size(60, 47);
+ this.mrlk.Size = new System.Drawing.Size(73, 59);
this.mrlk.Text = "榛樿鍒楀";
this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -168,7 +170,7 @@
//
this.toolStripSeparator7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator7.Name = "toolStripSeparator7";
- this.toolStripSeparator7.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 62);
//
// bclk
//
@@ -178,7 +180,7 @@
this.bclk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.bclk.ImageTransparentColor = System.Drawing.Color.White;
this.bclk.Name = "bclk";
- this.bclk.Size = new System.Drawing.Size(60, 47);
+ this.bclk.Size = new System.Drawing.Size(73, 59);
this.bclk.Text = "淇濆瓨鍒楀";
this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -188,7 +190,7 @@
//
this.toolStripSeparator8.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator8.Name = "toolStripSeparator8";
- this.toolStripSeparator8.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 62);
//
// cz
//
@@ -219,21 +221,21 @@
this.grdMain.AllowUserToDeleteRows = false;
this.grdMain.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window;
- dataGridViewCellStyle1.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText;
- dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.grdMain.DefaultCellStyle = dataGridViewCellStyle1;
- this.grdMain.Location = new System.Drawing.Point(4, 6);
+ dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
+ dataGridViewCellStyle2.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;
+ dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.grdMain.DefaultCellStyle = dataGridViewCellStyle2;
+ this.grdMain.Location = new System.Drawing.Point(5, 8);
this.grdMain.Margin = new System.Windows.Forms.Padding(0);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
this.grdMain.RowHeadersWidth = 51;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(867, 263);
+ this.grdMain.Size = new System.Drawing.Size(1156, 329);
this.grdMain.TabIndex = 19;
this.grdMain.Paint += new System.Windows.Forms.PaintEventHandler(this.grdMain_Paint);
this.grdMain.DoubleClick += new System.EventHandler(this.grdMain_DblClick);
@@ -243,9 +245,10 @@
this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ForeColor = System.Drawing.Color.Black;
- this.label1.Location = new System.Drawing.Point(19, 35);
+ this.label1.Location = new System.Drawing.Point(25, 44);
+ this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(88, 16);
+ this.label1.Size = new System.Drawing.Size(109, 20);
this.label1.TabIndex = 46;
this.label1.Text = "鐢熶骇璁㈠崟鍙�";
//
@@ -253,10 +256,11 @@
//
this.txtHICMOBillNo.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHICMOBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHICMOBillNo.Location = new System.Drawing.Point(112, 29);
+ this.txtHICMOBillNo.Location = new System.Drawing.Point(149, 36);
+ this.txtHICMOBillNo.Margin = new System.Windows.Forms.Padding(4);
this.txtHICMOBillNo.Name = "txtHICMOBillNo";
this.txtHICMOBillNo.ReadOnly = true;
- this.txtHICMOBillNo.Size = new System.Drawing.Size(166, 30);
+ this.txtHICMOBillNo.Size = new System.Drawing.Size(220, 36);
this.txtHICMOBillNo.TabIndex = 47;
//
// label2
@@ -264,9 +268,10 @@
this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.ForeColor = System.Drawing.Color.Black;
- this.label2.Location = new System.Drawing.Point(312, 34);
+ this.label2.Location = new System.Drawing.Point(416, 42);
+ this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(40, 16);
+ this.label2.Size = new System.Drawing.Size(49, 20);
this.label2.TabIndex = 49;
this.label2.Text = "鏈哄彴";
//
@@ -274,18 +279,20 @@
//
this.txtHSourceID.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHSourceID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSourceID.Location = new System.Drawing.Point(364, 28);
+ this.txtHSourceID.Location = new System.Drawing.Point(485, 35);
+ this.txtHSourceID.Margin = new System.Windows.Forms.Padding(4);
this.txtHSourceID.Name = "txtHSourceID";
this.txtHSourceID.ReadOnly = true;
- this.txtHSourceID.Size = new System.Drawing.Size(166, 30);
+ this.txtHSourceID.Size = new System.Drawing.Size(220, 36);
this.txtHSourceID.TabIndex = 50;
//
// cmdHSourceID
//
this.cmdHSourceID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSourceID.Image")));
- this.cmdHSourceID.Location = new System.Drawing.Point(527, 27);
+ this.cmdHSourceID.Location = new System.Drawing.Point(703, 34);
+ this.cmdHSourceID.Margin = new System.Windows.Forms.Padding(4);
this.cmdHSourceID.Name = "cmdHSourceID";
- this.cmdHSourceID.Size = new System.Drawing.Size(32, 32);
+ this.cmdHSourceID.Size = new System.Drawing.Size(43, 40);
this.cmdHSourceID.TabIndex = 51;
this.cmdHSourceID.UseVisualStyleBackColor = true;
this.cmdHSourceID.Click += new System.EventHandler(this.cmdHSourceID_Click);
@@ -295,9 +302,10 @@
this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.ForeColor = System.Drawing.Color.Black;
- this.label3.Location = new System.Drawing.Point(599, 34);
+ this.label3.Location = new System.Drawing.Point(799, 42);
+ this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(40, 16);
+ this.label3.Size = new System.Drawing.Size(49, 20);
this.label3.TabIndex = 52;
this.label3.Text = "鑱屽憳";
//
@@ -305,18 +313,20 @@
//
this.txtHEmpID.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHEmpID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHEmpID.Location = new System.Drawing.Point(651, 28);
+ this.txtHEmpID.Location = new System.Drawing.Point(868, 35);
+ this.txtHEmpID.Margin = new System.Windows.Forms.Padding(4);
this.txtHEmpID.Name = "txtHEmpID";
this.txtHEmpID.ReadOnly = true;
- this.txtHEmpID.Size = new System.Drawing.Size(166, 30);
+ this.txtHEmpID.Size = new System.Drawing.Size(220, 36);
this.txtHEmpID.TabIndex = 53;
//
// cmdHEmpID
//
this.cmdHEmpID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHEmpID.Image")));
- this.cmdHEmpID.Location = new System.Drawing.Point(817, 27);
+ this.cmdHEmpID.Location = new System.Drawing.Point(1089, 34);
+ this.cmdHEmpID.Margin = new System.Windows.Forms.Padding(4);
this.cmdHEmpID.Name = "cmdHEmpID";
- this.cmdHEmpID.Size = new System.Drawing.Size(32, 32);
+ this.cmdHEmpID.Size = new System.Drawing.Size(43, 40);
this.cmdHEmpID.TabIndex = 54;
this.cmdHEmpID.UseVisualStyleBackColor = true;
this.cmdHEmpID.Click += new System.EventHandler(this.cmdHEmpID_Click);
@@ -326,9 +336,10 @@
this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.ForeColor = System.Drawing.Color.Black;
- this.label4.Location = new System.Drawing.Point(875, 34);
+ this.label4.Location = new System.Drawing.Point(1167, 42);
+ this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(40, 16);
+ this.label4.Size = new System.Drawing.Size(49, 20);
this.label4.TabIndex = 55;
this.label4.Text = "鐗╂枡";
this.label4.Visible = false;
@@ -337,18 +348,20 @@
//
this.txtHMaterID.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHMaterID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterID.Location = new System.Drawing.Point(927, 28);
+ this.txtHMaterID.Location = new System.Drawing.Point(1236, 35);
+ this.txtHMaterID.Margin = new System.Windows.Forms.Padding(4);
this.txtHMaterID.Name = "txtHMaterID";
this.txtHMaterID.ReadOnly = true;
- this.txtHMaterID.Size = new System.Drawing.Size(166, 30);
+ this.txtHMaterID.Size = new System.Drawing.Size(220, 36);
this.txtHMaterID.TabIndex = 56;
//
// cmdHMaterID
//
this.cmdHMaterID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHMaterID.Image")));
- this.cmdHMaterID.Location = new System.Drawing.Point(1090, 27);
+ this.cmdHMaterID.Location = new System.Drawing.Point(1453, 34);
+ this.cmdHMaterID.Margin = new System.Windows.Forms.Padding(4);
this.cmdHMaterID.Name = "cmdHMaterID";
- this.cmdHMaterID.Size = new System.Drawing.Size(32, 32);
+ this.cmdHMaterID.Size = new System.Drawing.Size(43, 40);
this.cmdHMaterID.TabIndex = 57;
this.cmdHMaterID.UseVisualStyleBackColor = true;
this.cmdHMaterID.Visible = false;
@@ -375,9 +388,11 @@
this.gbUp.Controls.Add(this.txtHEmpID);
this.gbUp.Controls.Add(this.label2);
this.gbUp.Controls.Add(this.cmdHEmpID);
- this.gbUp.Location = new System.Drawing.Point(11, 55);
+ this.gbUp.Location = new System.Drawing.Point(15, 69);
+ this.gbUp.Margin = new System.Windows.Forms.Padding(4);
this.gbUp.Name = "gbUp";
- this.gbUp.Size = new System.Drawing.Size(1149, 126);
+ this.gbUp.Padding = new System.Windows.Forms.Padding(4);
+ this.gbUp.Size = new System.Drawing.Size(1532, 158);
this.gbUp.TabIndex = 58;
this.gbUp.TabStop = false;
//
@@ -385,10 +400,11 @@
//
this.txtHSeOrderBillNo.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHSeOrderBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSeOrderBillNo.Location = new System.Drawing.Point(112, 79);
+ this.txtHSeOrderBillNo.Location = new System.Drawing.Point(149, 99);
+ this.txtHSeOrderBillNo.Margin = new System.Windows.Forms.Padding(4);
this.txtHSeOrderBillNo.Name = "txtHSeOrderBillNo";
this.txtHSeOrderBillNo.ReadOnly = true;
- this.txtHSeOrderBillNo.Size = new System.Drawing.Size(123, 30);
+ this.txtHSeOrderBillNo.Size = new System.Drawing.Size(220, 36);
this.txtHSeOrderBillNo.TabIndex = 141;
//
// label9
@@ -396,9 +412,10 @@
this.label9.AutoSize = true;
this.label9.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label9.ForeColor = System.Drawing.Color.Black;
- this.label9.Location = new System.Drawing.Point(19, 85);
+ this.label9.Location = new System.Drawing.Point(25, 106);
+ this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(88, 16);
+ this.label9.Size = new System.Drawing.Size(109, 20);
this.label9.TabIndex = 140;
this.label9.Text = "閿�鍞鍗曞彿";
//
@@ -408,10 +425,10 @@
this.cmbHBarCodeType.FormattingEnabled = true;
this.cmbHBarCodeType.Items.AddRange(new object[] {
"鍞竴鏉＄爜"});
- this.cmbHBarCodeType.Location = new System.Drawing.Point(642, 79);
- this.cmbHBarCodeType.Margin = new System.Windows.Forms.Padding(2);
+ this.cmbHBarCodeType.Location = new System.Drawing.Point(868, 99);
+ this.cmbHBarCodeType.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.cmbHBarCodeType.Name = "cmbHBarCodeType";
- this.cmbHBarCodeType.Size = new System.Drawing.Size(140, 28);
+ this.cmbHBarCodeType.Size = new System.Drawing.Size(264, 33);
this.cmbHBarCodeType.TabIndex = 139;
//
// label8
@@ -419,9 +436,10 @@
this.label8.AutoSize = true;
this.label8.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.ForeColor = System.Drawing.Color.Black;
- this.label8.Location = new System.Drawing.Point(557, 86);
+ this.label8.Location = new System.Drawing.Point(759, 106);
+ this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(72, 16);
+ this.label8.Size = new System.Drawing.Size(89, 20);
this.label8.TabIndex = 138;
this.label8.Text = "鏉＄爜绫诲瀷";
//
@@ -429,10 +447,10 @@
//
this.cmdHSaveBill.BackColor = System.Drawing.Color.White;
this.cmdHSaveBill.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.cmdHSaveBill.Location = new System.Drawing.Point(821, 68);
- this.cmdHSaveBill.Margin = new System.Windows.Forms.Padding(2);
+ this.cmdHSaveBill.Location = new System.Drawing.Point(1228, 85);
+ this.cmdHSaveBill.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.cmdHSaveBill.Name = "cmdHSaveBill";
- this.cmdHSaveBill.Size = new System.Drawing.Size(112, 50);
+ this.cmdHSaveBill.Size = new System.Drawing.Size(149, 62);
this.cmdHSaveBill.TabIndex = 137;
this.cmdHSaveBill.Text = "鏌ヨ";
this.cmdHSaveBill.UseVisualStyleBackColor = false;
@@ -442,10 +460,10 @@
//
this.dtpHBeginDate.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.dtpHBeginDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHBeginDate.Location = new System.Drawing.Point(336, 77);
- this.dtpHBeginDate.Margin = new System.Windows.Forms.Padding(2);
+ this.dtpHBeginDate.Location = new System.Drawing.Point(485, 94);
+ this.dtpHBeginDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.dtpHBeginDate.Name = "dtpHBeginDate";
- this.dtpHBeginDate.Size = new System.Drawing.Size(154, 30);
+ this.dtpHBeginDate.Size = new System.Drawing.Size(261, 36);
this.dtpHBeginDate.TabIndex = 100;
//
// label6
@@ -453,20 +471,21 @@
this.label6.AutoSize = true;
this.label6.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.ForeColor = System.Drawing.Color.Black;
- this.label6.Location = new System.Drawing.Point(257, 85);
+ this.label6.Location = new System.Drawing.Point(416, 106);
+ this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(72, 16);
+ this.label6.Size = new System.Drawing.Size(49, 20);
this.label6.TabIndex = 99;
- this.label6.Text = "鏃� 鏈�";
+ this.label6.Text = "鏃ユ湡";
//
// button4
//
this.button4.BackColor = System.Drawing.Color.White;
this.button4.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button4.Location = new System.Drawing.Point(932, 189);
- this.button4.Margin = new System.Windows.Forms.Padding(2);
+ this.button4.Location = new System.Drawing.Point(1244, 242);
+ this.button4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button4.Name = "button4";
- this.button4.Size = new System.Drawing.Size(112, 50);
+ this.button4.Size = new System.Drawing.Size(149, 62);
this.button4.TabIndex = 138;
this.button4.Text = "鐢熸垚鏉＄爜";
this.button4.UseVisualStyleBackColor = false;
@@ -476,10 +495,10 @@
//
this.button5.BackColor = System.Drawing.Color.White;
this.button5.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button5.Location = new System.Drawing.Point(932, 247);
- this.button5.Margin = new System.Windows.Forms.Padding(2);
+ this.button5.Location = new System.Drawing.Point(1244, 315);
+ this.button5.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button5.Name = "button5";
- this.button5.Size = new System.Drawing.Size(112, 42);
+ this.button5.Size = new System.Drawing.Size(149, 52);
this.button5.TabIndex = 139;
this.button5.Text = "棰勮";
this.button5.UseVisualStyleBackColor = false;
@@ -489,10 +508,10 @@
//
this.button6.BackColor = System.Drawing.Color.White;
this.button6.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button6.Location = new System.Drawing.Point(932, 296);
- this.button6.Margin = new System.Windows.Forms.Padding(2);
+ this.button6.Location = new System.Drawing.Point(1244, 376);
+ this.button6.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button6.Name = "button6";
- this.button6.Size = new System.Drawing.Size(112, 44);
+ this.button6.Size = new System.Drawing.Size(149, 55);
this.button6.TabIndex = 140;
this.button6.Text = "鎵撳嵃";
this.button6.UseVisualStyleBackColor = false;
@@ -500,11 +519,12 @@
//
// txtHMiniQty
//
- this.txtHMiniQty.Location = new System.Drawing.Point(794, 296);
+ this.txtHMiniQty.Location = new System.Drawing.Point(1059, 370);
+ this.txtHMiniQty.Margin = new System.Windows.Forms.Padding(4);
this.txtHMiniQty.Multiline = true;
this.txtHMiniQty.Name = "txtHMiniQty";
this.txtHMiniQty.ReadOnly = true;
- this.txtHMiniQty.Size = new System.Drawing.Size(112, 42);
+ this.txtHMiniQty.Size = new System.Drawing.Size(148, 52);
this.txtHMiniQty.TabIndex = 141;
this.txtHMiniQty.TextChanged += new System.EventHandler(this.txtHMiniQty_TextChanged);
//
@@ -512,9 +532,10 @@
//
this.鏍囧噯瑁呯.AutoSize = true;
this.鏍囧噯瑁呯.Font = new System.Drawing.Font("瀹嬩綋", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.鏍囧噯瑁呯.Location = new System.Drawing.Point(790, 265);
+ this.鏍囧噯瑁呯.Location = new System.Drawing.Point(1053, 331);
+ this.鏍囧噯瑁呯.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.鏍囧噯瑁呯.Name = "鏍囧噯瑁呯";
- this.鏍囧噯瑁呯.Size = new System.Drawing.Size(120, 27);
+ this.鏍囧噯瑁呯.Size = new System.Drawing.Size(151, 34);
this.鏍囧噯瑁呯.TabIndex = 142;
this.鏍囧噯瑁呯.Text = "鏍囧噯瑁呯";
//
@@ -522,19 +543,21 @@
//
this.label7.AutoSize = true;
this.label7.Font = new System.Drawing.Font("瀹嬩綋", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label7.Location = new System.Drawing.Point(779, 349);
+ this.label7.Location = new System.Drawing.Point(1039, 436);
+ this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(174, 27);
+ this.label7.Size = new System.Drawing.Size(219, 34);
this.label7.TabIndex = 144;
this.label7.Text = "鏈鐢熸垚鏁伴噺";
this.label7.Visible = false;
//
// txtHBQty
//
- this.txtHBQty.Location = new System.Drawing.Point(797, 380);
+ this.txtHBQty.Location = new System.Drawing.Point(1063, 475);
+ this.txtHBQty.Margin = new System.Windows.Forms.Padding(4);
this.txtHBQty.Multiline = true;
this.txtHBQty.Name = "txtHBQty";
- this.txtHBQty.Size = new System.Drawing.Size(112, 42);
+ this.txtHBQty.Size = new System.Drawing.Size(148, 52);
this.txtHBQty.TabIndex = 143;
this.txtHBQty.Visible = false;
this.txtHBQty.TextChanged += new System.EventHandler(this.txtHBQty_TextChanged);
@@ -542,6 +565,7 @@
// groupBox1
//
this.groupBox1.BackColor = System.Drawing.Color.Transparent;
+ this.groupBox1.Controls.Add(this.cmdESOP);
this.groupBox1.Controls.Add(this.cmdHSaveBill1);
this.groupBox1.Controls.Add(this.dtpHEndDate1);
this.groupBox1.Controls.Add(this.label10);
@@ -552,20 +576,35 @@
this.groupBox1.Controls.Add(this.txtHMaterID1);
this.groupBox1.Controls.Add(this.label13);
this.groupBox1.Controls.Add(this.cmdHMaterID1);
- this.groupBox1.Location = new System.Drawing.Point(10, 485);
+ this.groupBox1.Location = new System.Drawing.Point(13, 606);
+ this.groupBox1.Margin = new System.Windows.Forms.Padding(4);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(1034, 126);
+ this.groupBox1.Padding = new System.Windows.Forms.Padding(4);
+ this.groupBox1.Size = new System.Drawing.Size(1406, 158);
this.groupBox1.TabIndex = 140;
this.groupBox1.TabStop = false;
+ //
+ // cmdESOP
+ //
+ this.cmdESOP.BackColor = System.Drawing.Color.White;
+ this.cmdESOP.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.cmdESOP.Location = new System.Drawing.Point(1230, 44);
+ this.cmdESOP.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.cmdESOP.Name = "cmdESOP";
+ this.cmdESOP.Size = new System.Drawing.Size(149, 62);
+ this.cmdESOP.TabIndex = 138;
+ this.cmdESOP.Text = "E-SOP";
+ this.cmdESOP.UseVisualStyleBackColor = false;
+ this.cmdESOP.Click += new System.EventHandler(this.cmdESOP_Click);
//
// cmdHSaveBill1
//
this.cmdHSaveBill1.BackColor = System.Drawing.Color.White;
this.cmdHSaveBill1.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.cmdHSaveBill1.Location = new System.Drawing.Point(771, 35);
- this.cmdHSaveBill1.Margin = new System.Windows.Forms.Padding(2);
+ this.cmdHSaveBill1.Location = new System.Drawing.Point(1045, 44);
+ this.cmdHSaveBill1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.cmdHSaveBill1.Name = "cmdHSaveBill1";
- this.cmdHSaveBill1.Size = new System.Drawing.Size(112, 50);
+ this.cmdHSaveBill1.Size = new System.Drawing.Size(149, 62);
this.cmdHSaveBill1.TabIndex = 137;
this.cmdHSaveBill1.Text = "鏌ヨ";
this.cmdHSaveBill1.UseVisualStyleBackColor = false;
@@ -575,10 +614,10 @@
//
this.dtpHEndDate1.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.dtpHEndDate1.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHEndDate1.Location = new System.Drawing.Point(478, 75);
- this.dtpHEndDate1.Margin = new System.Windows.Forms.Padding(2);
+ this.dtpHEndDate1.Location = new System.Drawing.Point(637, 94);
+ this.dtpHEndDate1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.dtpHEndDate1.Name = "dtpHEndDate1";
- this.dtpHEndDate1.Size = new System.Drawing.Size(213, 30);
+ this.dtpHEndDate1.Size = new System.Drawing.Size(283, 36);
this.dtpHEndDate1.TabIndex = 102;
//
// label10
@@ -586,9 +625,10 @@
this.label10.AutoSize = true;
this.label10.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label10.ForeColor = System.Drawing.Color.Black;
- this.label10.Location = new System.Drawing.Point(399, 83);
+ this.label10.Location = new System.Drawing.Point(532, 104);
+ this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(72, 16);
+ this.label10.Size = new System.Drawing.Size(89, 20);
this.label10.TabIndex = 101;
this.label10.Text = "缁撴潫鏃ユ湡";
//
@@ -596,10 +636,10 @@
//
this.dtpHBeginDate1.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.dtpHBeginDate1.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHBeginDate1.Location = new System.Drawing.Point(112, 77);
- this.dtpHBeginDate1.Margin = new System.Windows.Forms.Padding(2);
+ this.dtpHBeginDate1.Location = new System.Drawing.Point(149, 96);
+ this.dtpHBeginDate1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.dtpHBeginDate1.Name = "dtpHBeginDate1";
- this.dtpHBeginDate1.Size = new System.Drawing.Size(213, 30);
+ this.dtpHBeginDate1.Size = new System.Drawing.Size(283, 36);
this.dtpHBeginDate1.TabIndex = 100;
//
// label11
@@ -607,9 +647,10 @@
this.label11.AutoSize = true;
this.label11.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label11.ForeColor = System.Drawing.Color.Black;
- this.label11.Location = new System.Drawing.Point(33, 85);
+ this.label11.Location = new System.Drawing.Point(44, 106);
+ this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(72, 16);
+ this.label11.Size = new System.Drawing.Size(89, 20);
this.label11.TabIndex = 99;
this.label11.Text = "寮�濮嬫棩鏈�";
//
@@ -618,9 +659,10 @@
this.label12.AutoSize = true;
this.label12.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label12.ForeColor = System.Drawing.Color.Black;
- this.label12.Location = new System.Drawing.Point(427, 35);
+ this.label12.Location = new System.Drawing.Point(569, 44);
+ this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(40, 16);
+ this.label12.Size = new System.Drawing.Size(49, 20);
this.label12.TabIndex = 55;
this.label12.Text = "鐗╂枡";
//
@@ -628,20 +670,22 @@
//
this.txtHICMOBillNo1.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHICMOBillNo1.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHICMOBillNo1.Location = new System.Drawing.Point(112, 29);
+ this.txtHICMOBillNo1.Location = new System.Drawing.Point(149, 36);
+ this.txtHICMOBillNo1.Margin = new System.Windows.Forms.Padding(4);
this.txtHICMOBillNo1.Name = "txtHICMOBillNo1";
this.txtHICMOBillNo1.ReadOnly = true;
- this.txtHICMOBillNo1.Size = new System.Drawing.Size(214, 30);
+ this.txtHICMOBillNo1.Size = new System.Drawing.Size(284, 36);
this.txtHICMOBillNo1.TabIndex = 47;
//
// txtHMaterID1
//
this.txtHMaterID1.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHMaterID1.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterID1.Location = new System.Drawing.Point(477, 29);
+ this.txtHMaterID1.Location = new System.Drawing.Point(636, 36);
+ this.txtHMaterID1.Margin = new System.Windows.Forms.Padding(4);
this.txtHMaterID1.Name = "txtHMaterID1";
this.txtHMaterID1.ReadOnly = true;
- this.txtHMaterID1.Size = new System.Drawing.Size(184, 30);
+ this.txtHMaterID1.Size = new System.Drawing.Size(244, 36);
this.txtHMaterID1.TabIndex = 56;
//
// label13
@@ -649,18 +693,20 @@
this.label13.AutoSize = true;
this.label13.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label13.ForeColor = System.Drawing.Color.Black;
- this.label13.Location = new System.Drawing.Point(19, 35);
+ this.label13.Location = new System.Drawing.Point(25, 44);
+ this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(88, 16);
+ this.label13.Size = new System.Drawing.Size(109, 20);
this.label13.TabIndex = 46;
this.label13.Text = "鐢熶骇璁㈠崟鍙�";
//
// cmdHMaterID1
//
this.cmdHMaterID1.Image = ((System.Drawing.Image)(resources.GetObject("cmdHMaterID1.Image")));
- this.cmdHMaterID1.Location = new System.Drawing.Point(660, 27);
+ this.cmdHMaterID1.Location = new System.Drawing.Point(880, 34);
+ this.cmdHMaterID1.Margin = new System.Windows.Forms.Padding(4);
this.cmdHMaterID1.Name = "cmdHMaterID1";
- this.cmdHMaterID1.Size = new System.Drawing.Size(32, 32);
+ this.cmdHMaterID1.Size = new System.Drawing.Size(43, 40);
this.cmdHMaterID1.TabIndex = 57;
this.cmdHMaterID1.UseVisualStyleBackColor = true;
this.cmdHMaterID1.Click += new System.EventHandler(this.cmdHMaterID1_Click);
@@ -671,22 +717,23 @@
this.grdSub.AllowUserToDeleteRows = false;
this.grdSub.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
this.grdSub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdSub.Location = new System.Drawing.Point(9, 618);
+ this.grdSub.Location = new System.Drawing.Point(12, 772);
+ this.grdSub.Margin = new System.Windows.Forms.Padding(4);
this.grdSub.Name = "grdSub";
this.grdSub.ReadOnly = true;
this.grdSub.RowHeadersWidth = 51;
this.grdSub.RowTemplate.Height = 23;
- this.grdSub.Size = new System.Drawing.Size(866, 228);
+ this.grdSub.Size = new System.Drawing.Size(1155, 285);
this.grdSub.TabIndex = 145;
//
// button1
//
this.button1.BackColor = System.Drawing.Color.White;
this.button1.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button1.Location = new System.Drawing.Point(900, 626);
- this.button1.Margin = new System.Windows.Forms.Padding(2);
+ this.button1.Location = new System.Drawing.Point(1244, 772);
+ this.button1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(112, 50);
+ this.button1.Size = new System.Drawing.Size(149, 62);
this.button1.TabIndex = 146;
this.button1.Text = "琛ユ墦鏉＄爜";
this.button1.UseVisualStyleBackColor = false;
@@ -696,37 +743,41 @@
//
this.鏁寸鏁伴噺.AutoSize = true;
this.鏁寸鏁伴噺.Font = new System.Drawing.Font("瀹嬩綋", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.鏁寸鏁伴噺.Location = new System.Drawing.Point(796, 190);
+ this.鏁寸鏁伴噺.Location = new System.Drawing.Point(1061, 238);
+ this.鏁寸鏁伴噺.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.鏁寸鏁伴噺.Name = "鏁寸鏁伴噺";
- this.鏁寸鏁伴噺.Size = new System.Drawing.Size(120, 27);
+ this.鏁寸鏁伴噺.Size = new System.Drawing.Size(151, 34);
this.鏁寸鏁伴噺.TabIndex = 148;
this.鏁寸鏁伴噺.Text = "鏈鏁伴噺";
//
// txtHZXQty
//
- this.txtHZXQty.Location = new System.Drawing.Point(796, 221);
+ this.txtHZXQty.Location = new System.Drawing.Point(1061, 276);
+ this.txtHZXQty.Margin = new System.Windows.Forms.Padding(4);
this.txtHZXQty.Multiline = true;
this.txtHZXQty.Name = "txtHZXQty";
- this.txtHZXQty.Size = new System.Drawing.Size(112, 42);
+ this.txtHZXQty.Size = new System.Drawing.Size(148, 52);
this.txtHZXQty.TabIndex = 147;
//
// tabControl1
//
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage2);
- this.tabControl1.Location = new System.Drawing.Point(9, 181);
+ this.tabControl1.Location = new System.Drawing.Point(12, 226);
+ this.tabControl1.Margin = new System.Windows.Forms.Padding(4);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(759, 298);
+ this.tabControl1.Size = new System.Drawing.Size(1012, 372);
this.tabControl1.TabIndex = 149;
//
// tabPage1
//
this.tabPage1.Controls.Add(this.grdMain);
- this.tabPage1.Location = new System.Drawing.Point(4, 22);
+ this.tabPage1.Location = new System.Drawing.Point(4, 25);
+ this.tabPage1.Margin = new System.Windows.Forms.Padding(4);
this.tabPage1.Name = "tabPage1";
- this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage1.Size = new System.Drawing.Size(751, 272);
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(4);
+ this.tabPage1.Size = new System.Drawing.Size(1004, 343);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "鐗╂枡淇℃伅";
this.tabPage1.UseVisualStyleBackColor = true;
@@ -734,10 +785,11 @@
// tabPage2
//
this.tabPage2.Controls.Add(this.grdList);
- this.tabPage2.Location = new System.Drawing.Point(4, 22);
+ this.tabPage2.Location = new System.Drawing.Point(4, 25);
+ this.tabPage2.Margin = new System.Windows.Forms.Padding(4);
this.tabPage2.Name = "tabPage2";
- this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage2.Size = new System.Drawing.Size(751, 272);
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(4);
+ this.tabPage2.Size = new System.Drawing.Size(1004, 343);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "鏉＄爜淇℃伅";
this.tabPage2.UseVisualStyleBackColor = true;
@@ -748,23 +800,23 @@
this.grdList.AllowUserToDeleteRows = false;
this.grdList.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
this.grdList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdList.Location = new System.Drawing.Point(3, 3);
+ this.grdList.Location = new System.Drawing.Point(4, 4);
this.grdList.Margin = new System.Windows.Forms.Padding(0);
this.grdList.Name = "grdList";
this.grdList.ReadOnly = true;
this.grdList.RowHeadersWidth = 51;
this.grdList.RowTemplate.Height = 23;
- this.grdList.Size = new System.Drawing.Size(866, 269);
+ this.grdList.Size = new System.Drawing.Size(1155, 336);
this.grdList.TabIndex = 20;
//
// button2
//
this.button2.BackColor = System.Drawing.Color.White;
this.button2.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button2.Location = new System.Drawing.Point(796, 436);
- this.button2.Margin = new System.Windows.Forms.Padding(2);
+ this.button2.Location = new System.Drawing.Point(1061, 545);
+ this.button2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(112, 44);
+ this.button2.Size = new System.Drawing.Size(149, 55);
this.button2.TabIndex = 150;
this.button2.Text = "涓婁竴涓墿鏂�";
this.button2.UseVisualStyleBackColor = false;
@@ -774,10 +826,10 @@
//
this.button3.BackColor = System.Drawing.Color.White;
this.button3.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button3.Location = new System.Drawing.Point(932, 378);
- this.button3.Margin = new System.Windows.Forms.Padding(2);
+ this.button3.Location = new System.Drawing.Point(1243, 472);
+ this.button3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button3.Name = "button3";
- this.button3.Size = new System.Drawing.Size(112, 44);
+ this.button3.Size = new System.Drawing.Size(149, 55);
this.button3.TabIndex = 151;
this.button3.Text = "涓嬩竴涓墿鏂�";
this.button3.UseVisualStyleBackColor = false;
@@ -787,22 +839,31 @@
//
this.button7.BackColor = System.Drawing.Color.White;
this.button7.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button7.Location = new System.Drawing.Point(932, 436);
- this.button7.Margin = new System.Windows.Forms.Padding(2);
+ this.button7.Location = new System.Drawing.Point(1243, 545);
+ this.button7.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button7.Name = "button7";
- this.button7.Size = new System.Drawing.Size(112, 44);
+ this.button7.Size = new System.Drawing.Size(149, 55);
this.button7.TabIndex = 152;
this.button7.Text = "瓒呴鐢熶骇";
this.button7.UseVisualStyleBackColor = false;
this.button7.Click += new System.EventHandler(this.button7_Click);
//
+ // txtHBarCode
+ //
+ this.txtHBarCode.Location = new System.Drawing.Point(1243, 852);
+ this.txtHBarCode.Name = "txtHBarCode";
+ this.txtHBarCode.Size = new System.Drawing.Size(175, 25);
+ this.txtHBarCode.TabIndex = 153;
+ this.txtHBarCode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHBarCode_KeyDown);
+ //
// Sc_ICMOToBarCode
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoSize = true;
this.BackColor = System.Drawing.SystemColors.ActiveCaption;
- this.ClientSize = new System.Drawing.Size(1172, 844);
+ this.ClientSize = new System.Drawing.Size(1563, 1055);
+ this.Controls.Add(this.txtHBarCode);
this.Controls.Add(this.button7);
this.Controls.Add(this.button3);
this.Controls.Add(this.button2);
@@ -821,6 +882,7 @@
this.Controls.Add(this.button4);
this.Controls.Add(this.gbUp);
this.Controls.Add(this.Tool);
+ this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "Sc_ICMOToBarCode";
this.Text = "蹇�熺敓鎴愭潯鐮�";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -903,5 +965,7 @@
private System.Windows.Forms.Button button2;
private System.Windows.Forms.Button button3;
private System.Windows.Forms.Button button7;
+ private System.Windows.Forms.Button cmdESOP;
+ private System.Windows.Forms.TextBox txtHBarCode;
}
}
\ No newline at end of file
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.resx" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.resx"
index 19878a1..646138a 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.resx"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.resx"
@@ -360,7 +360,7 @@
<data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
@@ -370,7 +370,7 @@
<data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
@@ -385,7 +385,7 @@
<data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
/QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
@@ -400,7 +400,7 @@
<data name="cz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACfSURBVDhPYyAGsGWf/Q9lkglSz/xnSANiskHCqf9///8n
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACfSURBVDhPYyAGsGWf/Q9lkglSz/xnSANiskHCqf9///8n
wxCQBhAOPfp/ytn/JBgCUpQIsRWGQQYQZwhQ8ilQEQj3XwAqnokFG8/EbwDMNrhiUCCSohluM0wxzAC8
mkEAagBYMbI/QQYQ1AwCuAwgSjMI4DKAaIBkwD2C0YULAJ2LYQgMEwWgBiAbAsMkGQLGoLBAxyR5C2YQ
OoYDBgYA9kn+I3B8Li4AAAAASUVORK5CYII=
diff --git a/WebAPI/Config/kdapi.config b/WebAPI/Config/kdapi.config
new file mode 100644
index 0000000..c18615b
--- /dev/null
+++ b/WebAPI/Config/kdapi.config
@@ -0,0 +1,9 @@
+锘�<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+ <appSettings>
+ <add key="DbId" value="5f9258a311401c"></add>
+ <add key="UserName" value="Administrator"></add>
+ <add key="PassWord" value="qaz!@#123"></add>
+ <add key="KDApiUrl" value="http://localhost/K3Cloud/"></add>
+ </appSettings>
+</configuration>
\ No newline at end of file
diff --git a/WebAPI/Controllers/BaseSet/Gy_GroupController.cs b/WebAPI/Controllers/BaseSet/Gy_GroupController.cs
index fd38cb0..a403de6 100644
--- a/WebAPI/Controllers/BaseSet/Gy_GroupController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_GroupController.cs
@@ -286,6 +286,7 @@
var HBarCodeForBase = list[0].HBarCodeForBase;
var HDeptID = list[0].HDeptID;
long HProcID = list[0].HProcID;
+ int HUSEORGID = list[0].HUSEORGID;
var HDeptNumber = "";
//var HEndFlag = 0;
long HLevel = 1;
@@ -326,10 +327,10 @@
oCN.RunProc("Insert into Gy_Group " +
" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
",HEmpQty,HDeptID,HDeptNumber,HProcID" +
- ",HLevel,HEndFlag,HStopflag,HRemark,HBarCodeForBase) " +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HBarCodeForBase,HUSEORGID) " +
" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
"," + HEmpQty.ToString() + "," + HDeptID.ToString() + ",'" + HDeptNumber + "'," + HProcID.ToString() +
- "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "','" + HBarCodeForBase + "')", ref DBUtility.ClsPub.sExeReturnInfo);
+ "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "','" + HBarCodeForBase + "',"+ HUSEORGID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.RunProc("Update Gy_Group set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCN.Commit();
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index 570d439..e16bd1e 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -383,12 +383,12 @@
}
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFileList " + sWhere + "order by hmainid desc", "h_v_Gy_MouldFileList");
+ ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFileList " + sWhere + "order by 鏃ユ湡 desc", "h_v_Gy_MouldFileList");
}
else
{
string sql1 = "select * from h_v_Gy_MouldFileList where 1 = 1 ";
- string sql = sql1 + sWhere + "order by hmainid desc";
+ string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
ds = oCN.RunProcReturn(sql, "h_v_Gy_MouldFileList");
}
diff --git a/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs b/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
index 7cb277f..7b5f663 100644
--- a/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
@@ -321,6 +321,7 @@
string HBarCodeForBase = list[0].HBarCodeForBase;
long HDeptID = list[0].HDeptID;
long HProcID = list[0].HProcID;
+ int HUSEORGID = list[0].HUSEORGID;
//鍒ゆ柇鏉冮檺
//if (!ClsPub.Security_Log("Gy_Process_Edit", 1, false, msg3))
@@ -358,12 +359,14 @@
" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
",HTypeFlow,HTypeCount,HDeptNumber,HSNo" +
",HLevel,HEndFlag,HStopflag,HRemark,HDeptID,HBarCodeForBase,HProcessID_K3,HBillSubType,HAutoTrunFlag" +
- ",HFixPrice,HOverFixPrice,HProcMulID,HProcCheckNote) " +
+ ",HFixPrice,HOverFixPrice,HProcMulID,HProcCheckNote" +
+ ",HUSEORGID) " +
" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
"," + Convert.ToString(HTypeFlow ? 1 : 0) + "," + Convert.ToString(HTypeCount ? 1 : 0) + ",'" + HDeptNumber + "','" + HSNo.ToString() +
"'," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HDeptID +
",'" + HBarCode + "'," + HProcessID_K3 + ",'" +HBillSubType + "'," + Convert.ToString(HAutoTrunFlag ? 1 : 0) +
- ",'" + HFixPrice.ToString() + "'," + HOverFixPrice.ToString() + "," + HProcMulID.ToString() + ",'" + HProcCheckNote.ToString() + "')", ref DBUtility.ClsPub.sExeReturnInfo);
+ ",'" + HFixPrice.ToString() + "'," + HOverFixPrice.ToString() + "," + HProcMulID.ToString() + ",'" + HProcCheckNote.ToString() + "'" +
+ ","+ HUSEORGID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.RunProc("Update Gy_Process set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCN.Commit();
diff --git a/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs b/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs
index 5724165..d04ecdf 100644
--- a/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs
@@ -256,8 +256,8 @@
}
//鍙嶅簭鍒楀寲
- msg2 = "[" + msg2.ToString() + "]";
- List<Gy_WorkCenter> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_WorkCenter>>(msg2);
+ msg1 = "[" + msg1.ToString() + "]";
+ List<Gy_WorkCenter> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_WorkCenter>>(msg1);
long HItemID = list[0].HItemID;
string HNumber = list[0].HNumber;
@@ -277,9 +277,10 @@
var HProcID = list[0].HProcID;
var HLevel = list[0].HLevel;
var HWorkTimes = list[0].HWorkTimes;
+ int HUSEORGID = list[0].HUSEORGID;
//鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log("Gy_WorkCenter_Edit", 1, false, msg3))
+ if (!ClsPub.Security_Log("Gy_WorkCenter_Edit", 1, false, msg2))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -314,11 +315,11 @@
" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
",HDeptNumber,HWorkTimes,HQty" +
",HLevel,HEndFlag,HStopflag,HRemark,HDeptID,HBarCodeForBase" +
- ",HProcID,HDayMoney) " +
+ ",HProcID,HDayMoney,HUSEORGID) " +
" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
",'" + HDeptNumber + "'," + HWorkTimes + "," + HQty +
"," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) +
- ",'" + HRemark + "'," + HDeptID + ",'" + HBarCodeForBase + "'," + HProcID + "," + HDayMoney + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+ ",'" + HRemark + "'," + HDeptID + ",'" + HBarCodeForBase + "'," + HProcID + "," + HDayMoney + ","+ HUSEORGID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.RunProc("Update Gy_WorkCenter set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCN.Commit();
diff --git a/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs b/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
new file mode 100644
index 0000000..98c011a
--- /dev/null
+++ b/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
@@ -0,0 +1,142 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web;
+using System.Web.Http;
+using WebAPI.Models;
+namespace WebAPI.Controllers.BaseSet
+{
+ public class Xt_grdAlignment_WMESController : ApiController
+ {
+ private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+ public WebServer webserver = new WebServer();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ grdAlignment omdelMian = new grdAlignment();
+ List<grdAlignmentSub> omdelsub = new List<grdAlignmentSub>();
+
+
+ #region 闅愯棌鍒楄缃� 鍒楄〃
+ [Route("Xt_grdAlignment_WMES/grdAlignmentWMESList")]
+ [HttpGet]
+ public object grdAlignmentWMESList(string HModName, string user)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from Xt_grdAlignment_WMES where HModName='" + HModName + "' and HUserName='" + user + "'", "Xt_grdAlignment_WMES");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 闅愯棌鍒楄缃� 娣诲姞/淇敼
+ public class grdAlignment
+ {
+ public string HFixCols;
+ public string HFontSize;
+ public string HHeadTextHeight;
+ public string HTextHeight;
+ public string HSortFlag;
+ public string HSelTotal;
+
+ }
+ public class grdAlignmentSub
+ {
+ public string ColumnName;
+ public bool IsHide;
+ public string Alignment;
+ }
+
+ [Route("Xt_grdAlignment_WMES/AddgrdAlignmentWMES")]
+ [HttpPost]
+ public object AddgrdAlignmentWMES([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ oCN.BeginTran();
+ //淇濆瓨涓昏〃
+ objJsonResult = AddBillMain(msg1);
+ if (objJsonResult.code == "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ public json AddBillMain(string msg1)
+ {
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+ string HModName = sArray[2].ToString();
+ int OperationType = int.Parse(sArray[3].ToString());//鏁版嵁绫诲瀷 1娣诲姞 3淇敼
+ string user = sArray[4].ToString();
+ try
+ {
+
+
+ omdelMian = Newtonsoft.Json.JsonConvert.DeserializeObject<grdAlignment>(msg2);
+ omdelsub = Newtonsoft.Json.JsonConvert.DeserializeObject<List<grdAlignmentSub>>(msg3);
+
+ var HGridString = "";
+ for (int i = 0; i < omdelsub.Count; i++)
+ {
+ HGridString += $"{(i+1)}|{(omdelsub[i].IsHide == true ? 1 : 0)}|{omdelsub[i].Alignment},";
+ }
+ HGridString = HGridString.Substring(0, HGridString.Length - 1);
+
+ oCN.RunProc("Delete from Xt_grdAlignment_WMES where HUserName='" + user + "' and HModName='" + HModName + "' ");
+ oCN.RunProc("insert into Xt_grdAlignment_WMES (HUserName,HModName,HGridString,HFixCols" +
+ ",HFontSize,HHeadTextHeight,HTextHeight,HSortFlag,HSelTotal" +
+ ") values('" + user + "','" + HModName + "','" + HGridString + "'," + (omdelMian.HFixCols == "" ? "0" : omdelMian.HFixCols) +
+ "," + (omdelMian.HFontSize == "" ? "0" : omdelMian.HFontSize) + "," + (omdelMian.HHeadTextHeight == "" ? "0" : omdelMian.HHeadTextHeight) +
+ "," + (omdelMian.HTextHeight == "" ? "0" : omdelMian.HTextHeight) + ",'" + omdelMian.HSortFlag + "','" + omdelMian.HSelTotal + "'" +
+ ")");
+
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index ac6d135..2e16b55 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -1149,5 +1149,7 @@
}
#endregion
+
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
index 11bf5be..8c801b9 100644
--- a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
+++ b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -529,7 +529,7 @@
/// <returns></returns>
[Route("Sc_ProcessExchangeBill/DeltetProcessExchangeBillByID")]
[HttpGet]
- public object DeltetProcessExchangeBillByID(string HInterID, string user)
+ public object DeltetProcessExchangeBillByID(string HInterID,int HPRDORGID, string user)
{
//缂栬緫鏉冮檺
if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Drop", 1, false, user))
@@ -553,6 +553,7 @@
return objJsonResult;
}
DAL.ClsSc_ProcessExchangeBill oBill = new DAL.ClsSc_ProcessExchangeBill();
+ DBUtility.ClsPub.HOrgID = HPRDORGID;
if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
{
if (oBill.omodel.HBillStatus > 1)
diff --git a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
index 170e0df..44b51be 100644
--- a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
+++ b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
@@ -428,18 +428,11 @@
return objJsonResult;
}
- string hnumber = "";
- if (tb2.Rows.Count > 0)
- {
- hnumber = DBUtility.ClsPub.isStrNull(tb2.Rows[0]["浜у搧浠ｇ爜"].ToString());
- }
-
for (int i = 0; i <= tb2.Rows.Count - 1; i++)
{
string sHNumber = "";
if (DBUtility.ClsPub.isStrNull(tb2.Rows[i]["浜у搧浠ｇ爜"].ToString()) != "")
{
- //
sHNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["浜у搧浠ｇ爜"].ToString());
//瀹℃牳浠ｇ爜鏄惁鍚堢悊
if (!DBUtility.ClsPub.AllowNumber(sHNumber))
@@ -451,41 +444,14 @@
return objJsonResult;
}
- if (hnumber == DBUtility.ClsPub.isStrNull(tb2.Rows[i]["浜у搧浠ｇ爜"].ToString()))
+ //寰楀埌鐗╂枡鍐呯爜
+ if (!oMaterHlp.GetInfoByNumber(sHNumber))
{
- //寰楀埌鐗╂枡鍐呯爜
- if (!oMaterHlp.GetInfoByNumber(sHNumber))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "绗�" + (i+1).ToString() + "琛�," + sHNumber + "娌℃湁鎵惧埌瀵瑰簲鐨勭墿鏂欙紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
- else
- {
- hnumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["浜у搧浠ｇ爜"].ToString());
- sHNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["浜у搧浠ｇ爜"].ToString());
-
- //瀹℃牳浠ｇ爜鏄惁鍚堢悊
- if (!DBUtility.ClsPub.AllowNumber(sHNumber))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鐗╂枡浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
- //寰楀埌鐗╂枡鍐呯爜
- if (!oMaterHlp.GetInfoByNumber(sHNumber))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "绗�" + (i + 1).ToString() + "琛�," + sHNumber + "娌℃湁鎵惧埌瀵瑰簲鐨勭墿鏂欙紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + (i + 1).ToString() + "琛�," + sHNumber + "娌℃湁鎵惧埌瀵瑰簲鐨勭墿鏂欙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
}
}
else
@@ -652,7 +618,7 @@
oCN.Commit();
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "鍗曟嵁淇濆瓨鎴愬姛锛�";
+ objJsonResult.Message = objJsonResult.Message;
objJsonResult.data = null;
return objJsonResult;
}
@@ -694,30 +660,16 @@
var hnumber = "";
var HBillNo = "";
long HInterID = 0;
+ int[] num = new int[2] { 1, 0 };
+
for (int i = 0; i < list.Count; i++)
{
//鑾峰彇鐗╂枡鏁版嵁
- ds = oCN.RunProcReturn("select * from h_v_IF_Material Where HNumber=" + list[i]["浜у搧浠ｇ爜"].ToString() + " and HUSEORGID=" + omdelMian.HOrgID, "h_v_IF_Material");
+ ds = oCN.RunProcReturn("select * from h_v_IF_Material Where HNumber='" + list[i]["浜у搧浠ｇ爜"].ToString() + "' and HUSEORGID=" + omdelMian.HOrgID, "h_v_IF_Material");
var HMaterNumber = list[i]["浜у搧浠ｇ爜"].ToString();
var HMaterID = ds.Tables[0].Rows[0]["HItemID"].ToString();
- var Hunitid = ds.Tables[0].Rows[0]["鐗╂枡浠ｇ爜"].ToString();
- var HUnitNumber = ds.Tables[0].Rows[0]["鐗╂枡浠ｇ爜"].ToString();
-
- //鑾峰彇宸ュ簭
- ds = oCN.RunProcReturn("select * from Gy_Process Where HNumber=" + list[i]["宸ュ簭浠ｇ爜"].ToString(), "Gy_Process");
- var HProcID = ds.Tables[0].Rows[0]["HItemID"].ToString();
-
- //鑾峰彇宸ヤ綔涓績
- ds = oCN.RunProcReturn("select * from Gy_WorkCenter Where HNumber=" + list[i]["宸ヤ綔涓績浠ｇ爜"].ToString(), "Gy_WorkCenter");
- var HCenterID = ds.Tables[0].Rows[0]["HItemID"].ToString();
-
- if (hnumber != list[i]["浜у搧浠ｇ爜"].ToString())
- {
- hnumber = list[i]["浜у搧浠ｇ爜"].ToString();
- HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);//鑾峰緱涓�涓柊鐨勫崟鎹彿
- HInterID = DBUtility.ClsPub.CreateBillID_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo);//鑾峰緱涓�涓柊鐨刬d
- }
-
+ var Hunitid = ds.Tables[0].Rows[0]["Hunitid"].ToString();
+ var HUnitNumber = ds.Tables[0].Rows[0]["HUnitNumber"].ToString();
var HName = list[i]["宸ヨ壓璺嚎鍚嶇О"].ToString();
var HPicNumVer = list[i]["鍥惧彿鐗堟湰"].ToString();
@@ -725,17 +677,51 @@
var HMaterTexture = list[i]["鏉愯川"].ToString();
var HProductNum = list[i]["鎴愬搧缂栧彿"].ToString();
var HVerNum = list[i]["鐗堟湰"].ToString();
+ var HMainPrice = list[i]["宸ュ簭宸ヤ环"].ToString();
+ if (hnumber != list[i]["浜у搧浠ｇ爜"].ToString())
+ {
+ //鑾峰彇鐩稿悓涓昏〃鐨勫瓙琛ㄧ殑娣诲姞娆℃暟 HEntryID
+ num[0] = 1;
+ hnumber = list[i]["浜у搧浠ｇ爜"].ToString();
+ HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);//鑾峰緱涓�涓柊鐨勫崟鎹彿
+ HInterID = DBUtility.ClsPub.CreateBillID_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo);//鑾峰緱涓�涓柊鐨刬d
+
+ //娣诲姞涓昏〃鏁版嵁
+ oCN.RunProc("insert into Gy_RoutingBillMain(HInterID, HBillNo, HYear, HPeriod, HBillType, HDate, HBillStatus, " +
+ "HMaker, HMakeDate,HMaterNumber, HMaterID, Hunitid, HUnitNumber, HName," +
+ "HPicNumVer, HPicNumAssemble, HMaterTexture, HProductNum, HVerNum, HRoutingGroupID, HStandard, HRemark,HMainPrice" +
+ ",HOrgID)values" +
+ $"({HInterID}, '{HBillNo}', {omdelMian.HYear}, {omdelMian.HPeriod}, '{BillType}', GETDATE(), 1" +
+ $", '{user}', GETDATE(), '{HMaterNumber}', {HMaterID}, {Hunitid}, '{HUnitNumber}', '{HName}'," +
+ $" '{HPicNumVer}', '{HPicNumAssemble}', '{HMaterTexture}', '{HProductNum}', '{HVerNum}', 0, 1, '',{(HMainPrice==""?"0":HMainPrice)}" +
+ $",{omdelMian.HOrgID})");
+ //鑾峰彇涓昏〃娣诲姞鐨勬鏁�
+ num[1]++;
+ }
//鑾峰彇渚涘簲鍟�
- ds = oCN.RunProcReturn("select * from h_v_Gy_SupplierList Where HNumber=" + list[i]["渚涘簲鍟嗕唬鐮�"].ToString(), "h_v_Gy_SupplierList");
- var HSupID = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ ds = oCN.RunProcReturn("select * from h_v_Gy_SupplierList Where 渚涘簲鍟嗕唬鐮�='" + list[i]["渚涘簲鍟嗕唬鐮�"].ToString()+"'", "h_v_Gy_SupplierList");
+ var HSupID = "0";
+ if (ds.Tables[0].Rows.Count > 0)
+ HSupID = ds.Tables[0].Rows[0]["HItemID"].ToString();
+
+ //鑾峰彇宸ュ簭
+ ds = oCN.RunProcReturn("select * from Gy_Process Where HNumber='" + list[i]["宸ュ簭浠ｇ爜"].ToString() + "'", "Gy_Process");
+ var HProcID = "0";
+ if (ds.Tables[0].Rows.Count > 0)
+ HProcID = ds.Tables[0].Rows[0]["HItemID"].ToString();
+
+ //鑾峰彇宸ヤ綔涓績
+ ds = oCN.RunProcReturn("select * from Gy_WorkCenter Where HName='" + list[i]["宸ヤ綔涓績"].ToString() + "'", "Gy_WorkCenter");
+ var HCenterID = "0";
+ if (ds.Tables[0].Rows.Count > 0)
+ HCenterID = ds.Tables[0].Rows[0]["HItemID"].ToString();
var HProcNo = list[i]["宸ュ簭搴忓彿"].ToString();
var HTimeUnit = list[i]["鏃堕棿鍗曚綅"].ToString();
var hworkqty = list[i]["鍔犲伐鏁伴噺"].ToString();
var HFixPrice = list[i]["鐝骇瀹氶"].ToString();
- var HMainPrice = list[i]["宸ュ簭宸ヤ环"].ToString();
var HBadPrice = list[i]["涓嶅悎鏍煎崟浠�"].ToString();
var HWasterPrice = list[i]["鎶ュ簾鍗曚环"].ToString();
var HBeginFixQty = list[i]["鏈亾鍥哄畾寮�宸ュぉ鏁�"].ToString();
@@ -753,63 +739,21 @@
var HProcWorkNum = list[i]["绋嬪簭鍙�"].ToString();
//鐗╂枡鍒嗙被
-
+ oCN.RunProc("Insert into Gy_RoutingBillSub (HInterID,HEntryID,HSupID,HProcID,HCenterID,HProcNO,HTimeUnit" +
+ ", hworkqty, HFixPrice, HBadPrice, HWasterPrice, HBeginFixQty, HBeginDayQty, HFixWorkDays" +
+ ", HTrunWorkDays, HAutoTrunFlag, HSupFlag, HTechnologyParameter, HPicNum, HProcCheckNote" +
+ ", hpassrate, hremark, HMouldNo, HProcWorkNum, HReadyTime, HQueueTime, HMoveTime, HUnitTime)values" +
+ $"({HInterID}, {num[0]}, {HSupID}, {HProcID},{HCenterID}, '{HProcNo}', '{HTimeUnit}'" +
+ $", {hworkqty}, {(HFixPrice==""?"0": HFixPrice)}, {(HBadPrice == "" ? "0": HBadPrice)}, {(HWasterPrice == "" ? "0": HWasterPrice)}, {(HBeginFixQty == "" ? "0": HBeginFixQty)}, {(HBeginDayQty == "" ? "0": HBeginDayQty)}, {(HFixWorkDays == "" ? "0": HFixWorkDays)}" +
+ $", {(HTrunWorkDays == "" ? "0": HTrunWorkDays)},{(HAutoTrunFlag == "True" ? "1": "0")},{(HSupFlag == "True" ? "1" : "0")}, '{HTechnologyParameter}', '{HPicNum}', '{HProcCheckNote}'" +
+ $", {hpassrate}, '{hremark}', '{HMouldNo}', '{HProcWorkNum}', 0, 0, 0, 0)");
+ //鑷娆℃暟
+ num[0]++;
}
-
-
- // //涓昏〃
- // oCN.RunProc("insert into Sc_WorkBillSortBillMain(HInterID,HBillNo,HYear,HPeriod,HBillType," +
- // "HBillSubType,HDate,HBillStatus,HMaker,HMakeDate,HICMOBillNo,HOrderType," +
- // "HICMOEntrySEQ,HWorkShopID,HSourceID, HYX, HEmpID," +
- // " HMaterID, HMaterName, HMaterModel, HUnitID, HBatchNo," +
- // " HSeOrderBillQty, HPlanQty, HCompleteQty,HPreparatDate," +
- // "HMainSourceInterID,HMainSourceEntryID)values" +
- // $"({HInterID},'{HBillNo}',{DateTime.Now.Year},{DateTime.Now.Month},'{BillType}'," +
- // $"'{BillType}',GETDATE(),1,'{user}','{HDate}','{HICMOBillNo}','{HOrderType}'," +
- // $"{(HICMOEntrySEQ == "" ? 0.ToString() : HICMOEntrySEQ)},{(HWorkShopID == "" ? 0.ToString() : HWorkShopID)},{(HSourceID == "" ? 0.ToString() : HSourceID)}, {(HYX == "" ? 0.ToString() : HYX)}, {(HEmpID == "" ? 0.ToString() : HEmpID)}," +
- // $" {(HMaterID == "" ? 0.ToString() : HMaterID)}, '{HMaterName}', '{HMaterModel}', {(HUnitID == "" ? 0.ToString() : HUnitID)}, '{HBatchNo}'," +
- // $" {(HSeOrderBillQty == "" ? 0.ToString() : HSeOrderBillQty)}, {(HPlanQty == "" ? 0.ToString() : HPlanQty)}, {(HCompleteQty == "" ? 0.ToString() : HCompleteQty)},getdate()," +
- // $" {HMainSourceInterID},{HMainSourceEntryID})");
- //}
-
-
- // for (int j = 0; j < SumDay; j++)
- // {
- // //涓昏〃瀛愯〃閮芥湁鏁版嵁
- // if (list[i][DateTime.Now.AddDays(j).ToString("yyyy-MM-dd")].ToString() != "")
- // {
- // SumCount += 1;
- // ////淇濆瓨瀛愯〃
- // objJsonResult = RoutAddBillSub(HInterID == 0 ? list[i]["hmainid"].ToString() : HInterID.ToString()
- // , HBillNo == "" ? list[i]["鍗曟嵁鍙�"].ToString() : HBillNo
- // , DateTime.Parse(DateTime.Now.AddDays(j).ToString("yyyy-MM-dd").ToString())
- // , int.Parse(list[i][DateTime.Now.AddDays(j).ToString("yyyy-MM-dd")].ToString()));
-
- // if (objJsonResult.count == 1)
- // {
- // TrueCount += 1;
- // }
- // }
- // //涓昏〃鏈夋暟鎹� 瀛愯〃鏃犳暟鎹�
- // if (j == 30 && SumCount == 0 && HInterID != 0 && HBillNo != "")
- // {
- // objJsonResult = RoutAddBillSub(HInterID.ToString(), HBillNo, DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd").ToString()), 0);
- // }
- // }
- //}
-
- //if (TrueCount != SumCount)
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = objJsonResult.Message;
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = null;
+ objJsonResult.Message = "瀵煎叆瀹屾垚,鍏�" + num[1] + "涓伐鑹鸿矾绾�";
objJsonResult.data = null;
return objJsonResult;
}
diff --git a/WebAPI/Controllers/MateOutController.cs b/WebAPI/Controllers/MateOutController.cs
index 506ae91..8c1d146 100644
--- a/WebAPI/Controllers/MateOutController.cs
+++ b/WebAPI/Controllers/MateOutController.cs
@@ -501,7 +501,7 @@
}
}
/// <summary>
- /// 鐢熸垚鐢熶骇棰嗘枡鍗�(绾㈠瓧)
+ /// 鐢熸垚鐢熶骇閫�鏂欏崟
/// </summary>
/// <returns></returns>
[Route("MateOut/set_SaveMateOutBackBill_Json")]
@@ -536,6 +536,7 @@
websLsmain.HEmpID = lsmain[0].HEmpID;
websLsmain.HRemark = lsmain[0].HRemark;
websLsmain.HMaker = lsmain[0].HMaker;
+ websLsmain.HBillType = "1244";//鍥哄畾鍊�
if (webserver.set_SaveMateOutBackBill_New(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo))
{
diff --git a/WebAPI/Controllers/POStockInBillController.cs b/WebAPI/Controllers/POStockInBillController.cs
index 8391864..aac8764 100644
--- a/WebAPI/Controllers/POStockInBillController.cs
+++ b/WebAPI/Controllers/POStockInBillController.cs
@@ -1,5 +1,6 @@
锘縰sing DBUtility;
using Model;
+using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using SQLHelper;
using System;
@@ -1030,6 +1031,7 @@
}
+
//[Route("POStockInBillList/confirm")]
//public object confirm(string hmainid)
//{
@@ -1064,7 +1066,7 @@
// FentityModel.Add("FSRCENTRYID", item["FHPOOrderEntryID"].ToString());//婧愬崟鍒嗗綍鍐呯爜
// FentityModel.Add("FORDERBILLNO", item["FHPOOrderBillNo"].ToString());//婧愬崟鍗曞彿
// FentityModel.Add("FPOORDERENTRYID", item["FHPOOrderEntryID"].ToString());//婧愬崟鍒嗗綍鍐呯爜
-
+
// JArray Fentity2 = new JArray();
// JObject FentityModel2 = new JObject();
@@ -1109,5 +1111,121 @@
//}
#endregion
+
+ #region [鏀舵枡閫氱煡鍗曞鏍竇
+ //鏀舵枡閫氱煡鍗曞鏍� 鎵潯鐮�
+ [Route("POStockInBillList/Get_ReciveBillCheckDate")]
+ [HttpGet]
+ public object Get_ReciveBillCheckDate(string HBarCode)
+ {
+ try
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ DataSet Ds = oCn.RunProcReturn("exec h_p_KF_PonderationBillMain_Temp_Add_POInStockCheck2 '" + HBarCode + "'", "h_p_KF_PonderationBillMain_Temp_Add_POInStockCheck2");
+ if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]) == 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = Ds.Tables[0];
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+
+ //鏀舵枡閫氱煡鍗曞鏍� 瀹℃牳鎻愪氦
+ [Route("POStockInBillList/Exec_ReciveBillCheck")]
+ [HttpGet]
+ public object Exec_ReciveBillCheck(string HBarCode)
+ {
+ try
+ {
+ //淇敼閲戣澏鐢熶骇鍗曠殑鐘舵��
+ //璁块棶閲戣澏
+ var loginRet = InvokeHelper.Login();
+ var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
+
+ if (isSuccess == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎿嶄綔澶辫触,閲戣澏璐﹀彿鐧诲綍寮傚父銆�" + loginRet;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ var json = new
+ {
+ //CreateOrgId = 0,
+ Numbers = HBarCode,
+ //Ids = (EntyID).Split('-')[0],
+ //PkEntryIds = (EntyID).Split('-')[1]
+ };
+ string result1 = string.Empty;
+ string result2 = string.Empty;
+ DataSet Ds = oCn.RunProcReturn("select FDOCUMENTSTATUS,FID from AIS20210811135644..T_PUR_RECEIVE where FBILLNO='" + HBarCode+"'", "AIS20210811135644..T_PUR_RECEIVE");
+ //鍒ゆ柇褰撳墠鏀舵枡閫氱煡鍗曠姸鎬佲�斺�斿凡鍒涘缓鍒欏厛鎻愪氦鍐嶅鏍搞�佷互鎻愪氦鍒欏彧瀹℃牳
+ if (Ds.Tables[0].Rows[0][0].ToString() == "A"|| Ds.Tables[0].Rows[0][0].ToString() == "D")
+ {
+ result1 = InvokeHelper.Submit("PUR_ReceiveBill", JsonConvert.SerializeObject(json));
+ result2 = InvokeHelper.Audit("PUR_ReceiveBill", JsonConvert.SerializeObject(json));
+ }
+ if (Ds.Tables[0].Rows[0][0].ToString() == "B")
+ {
+ result2 = InvokeHelper.Audit("PUR_ReceiveBill", JsonConvert.SerializeObject(json));
+ }
+ //鍒ゆ柇瀹℃牳鏄惁鎴愬姛
+ if (JObject.Parse(result2)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳鏀舵枡閫氱煡鍗曞け璐ワ紒鍗曟嵁鍙凤細" + HBarCode;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/PublicPageMethodController.cs b/WebAPI/Controllers/PublicPageMethodController.cs
index a47f0ea..a399375 100644
--- a/WebAPI/Controllers/PublicPageMethodController.cs
+++ b/WebAPI/Controllers/PublicPageMethodController.cs
@@ -34,7 +34,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -108,7 +108,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -140,7 +140,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -214,7 +214,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -245,7 +245,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -319,7 +319,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -350,7 +350,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -424,7 +424,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -455,7 +455,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -529,7 +529,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2228,7 +2228,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2302,7 +2302,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2333,7 +2333,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2438,7 +2438,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_Cg_PODemandPlanBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_Cg_PODemandPlanBillController.cs"
index ddd391c..3964443 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_Cg_PODemandPlanBillController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_Cg_PODemandPlanBillController.cs"
@@ -6,6 +6,7 @@
using System.Web;
using System.Web.Http;
using WebAPI.Models;
+using Newtonsoft.Json;
namespace WebAPI.Controllers.SCGL
{
@@ -321,6 +322,16 @@
#endregion
#region 鎻愭枡璁″垝鍗� 鎻愭枡璁″垝鎶ヨ〃(閲囪喘璁㈠崟缁村害)
+ public class ReportPODemandPlanBill
+ {
+ public int? HORGID;
+ public DateTime HBEGINDATE;
+ public DateTime HENDDATE;
+ public int? HMATERIALID;
+ public int? HSUPPLIERID;
+ public string HXQD;
+ public string HPURORDERNO;
+ }
[Route("JIT_Cg_PODemandPlanBill/ReportPODemandPlanBillList")]
[HttpGet]
public object ReportPODemandPlanBillList(string sWhere, string user)
@@ -336,8 +347,45 @@
objJsonResult.data = null;
return objJsonResult;
}
+ ReportPODemandPlanBill Report = JsonConvert.DeserializeObject<ReportPODemandPlanBill>(sWhere);
- ds = oCN.RunProcReturn("select * from h_v_JIT_Cg_PODemandPlanBillList where 1=1" + sWhere + "order by hmainid desc ", "h_v_JIT_Cg_PODemandPlanBillList");
+ ds = oCN.RunProcReturn($"exec h_p_JIT_PODemandPlanBill_ReportList {Report.HORGID},'{Report.HBEGINDATE}','{Report.HENDDATE}',{Report.HMATERIALID},{Report.HSUPPLIERID},'{Report.HXQD}','{Report.HPURORDERNO}' ", "h_p_JIT_PODemandPlanBill_ReportList");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鎻愭枡璁″垝鍗� 鎻愭枡璁″垝鎶ヨ〃
+ [Route("JIT_Cg_PODemandPlanBill/ReportPODemandPlanBillList_S")]
+ [HttpGet]
+ public object ReportPODemandPlanBillList_S(string sWhere, string user)
+ {
+ try
+ {
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("JIT_Cg_PODemandPlanBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn($"exec h_p_JIT_PODemandPlanBill_S_ReportList '{sWhere.ToString()}' ", "h_p_JIT_PODemandPlanBill_S_ReportList");
objJsonResult.code = "1";
objJsonResult.count = 1;
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_WorkDemandPlanBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_WorkDemandPlanBillController.cs"
index d9e3f4f..d4f2e1f 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_WorkDemandPlanBillController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_WorkDemandPlanBillController.cs"
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
@@ -91,7 +92,7 @@
string user = sArray[3].ToString();
try
{
- if (!DBUtility.ClsPub.Security_Log("Cg_PODemandPlanBill_Edit", 1, false, user))
+ if (!DBUtility.ClsPub.Security_Log("Sc_WorkDemandPlanBill_Edit", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -318,6 +319,52 @@
}
}
#endregion
-
+
+ #region 瑕佹枡璁″垝鍗� 瑕佹枡璁″垝鎶ヨ〃
+ public class ReportWorkDemandPlanBill
+ {
+ public int? HORGID;
+ public DateTime HBEGINDATE;
+ public DateTime HENDDATE;
+ public int? HMATERIALID;
+ public int? HDeptID;
+ }
+ [Route("Sc_WorkDemandPlanBill/ReportWorkDemandPlanBillList")]
+ [HttpGet]
+ public object ReportWorkDemandPlanBillList(string sWhere, string user)
+ {
+ try
+ {
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Sc_WorkDemandPlanBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ReportWorkDemandPlanBill Report = JsonConvert.DeserializeObject<ReportWorkDemandPlanBill>(sWhere);
+
+ ds = oCN.RunProcReturn($"exec h_p_JIT_Sc_WorkDemandPlanBill_ReportList {Report.HORGID},'{Report.HBEGINDATE}','{Report.HENDDATE}',{Report.HMATERIALID},{Report.HDeptID} ", "h_p_JIT_Sc_WorkDemandPlanBill_ReportList");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index b0a8e5a..0deda31 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -97,6 +98,199 @@
return objJsonResult;
}
+ #region 宸ュ簭姹囨姤鍏ュ簱
+ /// <summary>
+ /// 鑾峰彇宸ュ簭姹囨姤鍏ュ簱鍗曞垪琛�
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <param name="user"></param>
+ /// <returns></returns>
+ [Route("Sc_ProcessMangement/Get_ProcessReportOverList")]
+ [HttpGet]
+ public object Get_ProcessReportOverList(string sWhere, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_MES_StationOutBillList_LastProc order by hmainid desc", "h_v_MES_StationOutBillList_LastProc");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_MES_StationOutBillList_LastProc where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by hmainid desc";
+ ds = oCN.RunProcReturn(sql, "h_v_MES_StationOutBillList_LastProc");
+ }
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 鍏ュ簱鈥斺�旂敓浜ф眹鎶ュ崟
+ /// </summary>
+ /// <param name="InterID">宸ュ簭姹囨姤鍗曚富ID</param>
+ /// <returns></returns>
+ [Route("Sc_ProcessMangement/SaveICMOReportBill")]
+ [HttpGet]
+ public object SaveICMOReportBill(string InterID, string user, string BillNo, string OrganizationID)
+ {
+ try
+ {
+ //鑾峰彇鐢熶骇姹囨姤鍗曟渶澶nterID鍜屽崟鎹彿
+ Int64 HInterID = DBUtility.ClsPub.CreateBillID("3711", ref DBUtility.ClsPub.sExeReturnInfo);
+ string HBillNo = DBUtility.ClsPub.CreateBillCode("3711", ref DBUtility.ClsPub.sExeReturnInfo, true);
+ //鑾峰彇缁勭粐浠ｇ爜
+ string OrganizationNUM = oCN.RunProcReturn("select HNumber from Xt_ORGANIZATIONS where HItemID=" + OrganizationID, "Xt_ORGANIZATIONS").Tables[0].Rows[0]["HNumber"].ToString();
+ //鏍规嵁宸ュ簭姹囨姤鍗曚富ID鑾峰彇宸ュ簭姹囨姤鍏ュ簱鍗曠殑鏁版嵁
+ DataSet ds = oCN.RunProcReturn("select * from h_v_MES_StationOutBillList_LastProc where HInterID=" + InterID, "h_v_MES_StationOutBillList_LastProc");
+ DataRow dr = ds.Tables[0].Rows[0];
+ //淇濆瓨
+ oCN.BeginTran();
+ //鐢熶骇姹囨姤鍗曚富琛�
+ oCN.RunProc("Insert Into Sc_ICMOReportBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate,HBillStatus,HChecker,HCheckDate" +
+ ",HYear,HPeriod,HRemark,HEmpID,HEmpNumber" +
+ ",HGroupID,HDeptID,HDeptNumber" +
+ ",HMainSourceBillNo,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillType" +
+ ") " +
+ " values('3711','3711'," + HInterID.ToString() + ",'" + HBillNo + "',getdate(),'" + user + "',getdate(),2,'" + user + "',getdate()" +
+ ",DATENAME(YEAR,GETDATE()),0,'','" + dr["HEmpID"].ToString() + "','" + dr["鎿嶄綔鍛樹唬鐮�"].ToString() +
+ "','" + dr["HGroupID"].ToString() + "',0,''" +
+ ",'" + BillNo.ToString() + "'," + InterID.ToString() + ", 0,'3791'" +
+ ") ");
+ //鐢熶骇姹囨姤鍗曞瓙琛�
+ oCN.RunProc("Insert into Sc_ICMOReportBillSub " +
+ " (HInterID,HEntryID,HMaterID,HMaterNumber" +
+ ",HQty,HUnitID,HUnitNumber,HTimes,HSourceID" +
+ ",HQtyMust,HWorkerID,HWorkerNumber,HBadCount,HWasterQty," +
+ "HCloseMan,HCloseType,HRemark," +
+ "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
+ ",HICMOInterID,HICMOBillNo,HBarCode" +
+ ") values("
+ + HInterID.ToString() + ",1," + dr["HMaterID"].ToString() + ",'" + dr["浜у搧浠ｇ爜"].ToString() + "'" +
+ "," + dr["鍚堟牸鏁伴噺"].ToString() + ",0,'',0,0" +
+ "," + dr["鎺ユ敹鏁伴噺"].ToString() + "," + dr["HEmpID"].ToString() + ",'" + dr["鎿嶄綔鍛樹唬鐮�"].ToString() + "'," + dr["涓嶈壇鏁伴噺"].ToString() + "," + dr["鎶ュ簾鏁伴噺"].ToString() +
+ ",'',0,''" +
+ "," + InterID.ToString() + ",0,'" + BillNo.ToString() + "','3791',0,0" +
+ ",0,0,''" +
+ "," + dr["HICMOInterID"].ToString() + ",'" + dr["浠诲姟鍗�"].ToString() + "',''" +
+ ") ");
+ //鍚屾閲戣澏
+ //璁块棶閲戣澏
+ var loginRet = InvokeHelper.Login();
+ var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
+ if (isSuccess == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎿嶄綔澶辫触,閲戣澏璐﹀彿鐧诲綍寮傚父銆�" + loginRet;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鏍规嵁浠诲姟鍗曟煡鎵惧埌閲戣澏鐨勭敓浜ц鍗�
+ DataSet ds1 = oCN.RunProcReturn("select * from h_v_TOERP_StationOutBillList_LastProc where HICMOInterID=" + dr["HICMOInterID"].ToString(), "h_v_TOERP_StationOutBillList_LastProc");
+ DataRow dr1 = ds1.Tables[0].Rows[0];
+
+ JObject model = new JObject();
+ model.Add("FBillType", "50fa7c2eda7947b89fab5431bf25d48e"); //鍗曟嵁绫诲瀷1
+ model.Add("FPrdOrgId", new JObject() { ["Fnumber"] = dr1["FPrdOrgNUMBER"].ToString() }); //鐢熶骇缁勭粐1
+ model.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); //鍗曟嵁鏃ユ湡1
+ JArray Fentity = new JArray();
+ foreach (DataRow item in ds.Tables[0].Rows)
+ {
+ JObject FentityModel = new JObject();
+ FentityModel.Add("FReportType", "103852");//鐢熶骇姹囨姤绫诲瀷
+ FentityModel.Add("FTimeUnitId", "1");//鏃堕棿鍗曚綅
+ FentityModel.Add("FWorkshipId", new JObject() { ["Fnumber"] = dr1["FWorkShopNUM"].ToString() }); // 鐢熶骇杞﹂棿
+ FentityModel.Add("FStandHourUnitId", "3600"); // 鍗曚綅鏍囧噯宸ユ椂鍗曚綅
+ FentityModel.Add("FMaterialId", new JObject() { ["Fnumber"] = dr1["FMaterialNUM"].ToString() }); // 鐗╂枡缂栫爜
+ FentityModel.Add("FMoEntrySeq", dr1["HICMOEntryID"].ToString());//鐢熶骇璁㈠崟琛屽彿
+ FentityModel.Add("FMoId", dr1["HICMOInterID"].ToString());//鐢熶骇璁㈠崟鍐呯爜
+ FentityModel.Add("FFinishQty", item["鎺ユ敹鏁伴噺"].ToString());//瀹屾垚鏁伴噺1
+ FentityModel.Add("FQuaQty", item["鍚堟牸鏁伴噺"].ToString());//鍚堟牸鏁伴噺1
+ FentityModel.Add("FStockInOrgId ", OrganizationNUM);// 鍏ュ簱缁勭粐
+ FentityModel.Add("FStockId", new JObject() { ["Fnumber"] = dr1["FStockNUM"].ToString() }); // 浠撳簱
+ FentityModel.Add("FSrcBillType", "PRD_MO");// 婧愬崟绫诲瀷
+ FentityModel.Add("FSrcBillNo", item["浠诲姟鍗�"].ToString());// 婧愬崟缂栧彿
+ FentityModel.Add("FSrcInterId", dr1["HICMOInterID"].ToString());// 婧愬崟鍐呯爜
+ FentityModel.Add("FSrcEntryId", dr1["HICMOEntryID"].ToString());// 婧愬崟鍒嗗綍鍐呯爜
+
+ //JArray Fentity2 = new JArray();
+ //JObject FentityModel2 = new JObject();
+ //FentityModel2.Add("FDetailEntity_Link_FRULEID", "PUR_PurchaseOrder-PUR_ReceiveBill");
+ //FentityModel2.Add("FDetailEntity_Link_FSTableName", "t_PUR_POOrderEntry");
+ //FentityModel2.Add("FDetailEntity_Link_FSBillId", item["FID"].ToString());
+ //FentityModel2.Add("FDetailEntity_Link_FSId", item["FEntryID"].ToString());
+ //Fentity2.Add(FentityModel2);
+ //FentityModel.Add("FDetailEntity_Link", Fentity2);
+ //Fentity.Add(FentityModel);
+ }
+ model.Add("FDetailEntity", Fentity); //鏄庣粏淇℃伅
+ JObject jsonRoot = new JObject()
+ {
+ ["Creator"] = "",
+ ["NeedUpDateFields"] = new JArray(),
+ ["NeedReturnFields"] = new JArray(),
+ ["IsDeleteEntry"] = "false",
+ ["SubSystemId"] = "",
+ ["IsVerifyBaseDataField"] = "false",
+ //["IsAutoSubmitAndAudit"] = true,//鑷姩璋冪敤鎻愪氦鍜屽鏍稿姛鑳�
+ ["Model"] = model
+ };
+ string result = InvokeHelper.Submit("PRD_MORPT", JsonConvert.SerializeObject(jsonRoot));
+ //鍒ゆ柇瀹℃牳鏄惁鎴愬姛
+ if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = $"宸ュ簭姹囨姤鍏ュ簱鍗曞悓姝ラ噾铦朵簯澶辫触锛佸崟鍙�:{dr["鍗曟嵁鍙�"].ToString()}" + result;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.Commit();
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
/// <summary>
/// 杩斿洖鐢熶骇姹囨姤鍗曞垪琛�
///鍙傛暟锛歴tring sql銆�
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 1594131..6d285a5 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -177,7 +177,7 @@
objjson.code = "0";
objjson.count = 0;
- objjson.Message = "鐧诲綍寮傚父锛�"+e.Message;
+ objjson.Message = "鐧诲綍寮傚父锛�" + e.Message;
objjson.data = null;
return objjson; ;
}
@@ -258,7 +258,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍒犻櫎澶辫触锛�";
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -778,7 +778,7 @@
/// <returns></returns>
[Route("Web/GetStockPlaceList_Json_NEW")]
[HttpGet]
- public object GetStockPlaceList_Json_NEW(string StockPlace, Int64 HWhID,Int64 HOrgID)
+ public object GetStockPlaceList_Json_NEW(string StockPlace, Int64 HWhID, Int64 HOrgID)
{
WebS.WebService1 oWeb = new WebS.WebService1();
sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + HOrgID + "";
@@ -1004,7 +1004,7 @@
try
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- ds = oCN.RunProcReturn("Select HItemID,HNumber 鐝粍浠ｇ爜,HName 鐝粍 from h_v_IF_Group where HStopflag=0 " + sWhere + " Order by HItemID ", "h_v_IF_Group");
+ ds = oCN.RunProcReturn("Select HItemID,鐝粍浠ｇ爜 鐝粍浠ｇ爜,鐝粍鍚嶇О 鐝粍 from h_v_GroupList where 1=1 " + sWhere + " Order by HItemID ", "h_v_GroupList");
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
objjson.code = "0";
@@ -1686,7 +1686,7 @@
/// <returns></returns>
[Route("DeltetGy_BadReason")]
[HttpGet]
- public object DeltetGy_BadReason(string HItemID,string user)
+ public object DeltetGy_BadReason(string HItemID, string user)
{
DataSet ds;
//string ModRightNameCheck = "Sc_ProcessReport_check";
@@ -2148,7 +2148,7 @@
[Route("Web/GetClassTimePrjGroupBillList_Json")]
[HttpGet]
- public object GetClassTimePrjGroupBillList_Json(string sWhere,string user)
+ public object GetClassTimePrjGroupBillList_Json(string sWhere, string user)
{
if (!DBUtility.ClsPub.Security_Log("Gy_ClassTimePrj", 1, false, user))
{
@@ -2202,6 +2202,58 @@
return objjson;
}
}
+ /// <summary>
+ /// 鏍哥畻鏂瑰紡缁勭紪杈�
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <param name="user"></param>
+ /// <returns></returns>
+ [Route("Web/GetClassTimePrjGroupBillEdit_Json")]
+ [HttpGet]
+ public object GetClassTimePrjGroupBillEdit_Json(string sWhere)
+ {
+ //if (!DBUtility.ClsPub.Security_Log("Gy_ClassTimePrj", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ string sql = "select a.HNumber,a.HName,a.HDeptID,b.HName as 浠撳簱鍚嶇О from Gy_ClassTimePrjGroup a left join Gy_Department b on a.HDeptID = b.HItemID where a.hitemid = " + sWhere;
+ ds = oCN.RunProcReturn(sql, "Gy_ClassTimePrjGroup");
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "1";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception ex)
+ {
+
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+
#region 鍒犻櫎鏍哥畻鏂瑰紡缁�
/// <summary>
/// 鏍哥畻鏂瑰紡鍒楄〃鍒犻櫎鎸夐挳
@@ -2250,9 +2302,9 @@
/// <returns></returns>
[Route("Web/SaveGetClassTimePrjGroupList")]
[HttpGet]
- public object SaveGetClassTimePrjGroupList(string HNumber,string HName,string HDeptID,string refSav,string user,string HItem)
+ public object SaveGetClassTimePrjGroupList(string HNumber, string HName, string HDeptID, string refSav, string user, string HItem)
{
-
+
try
{
int HItemID = int.Parse(HItem);
@@ -2265,18 +2317,18 @@
objJsonResult.data = null;
return objJsonResult;
}
- string sql="";
- if (refSav== "Add")
+ string sql = "";
+ if (refSav == "Add")
{
- sql = "Insert Into Gy_ClassTimePrjGroup " +
- "(HNumber,HName,HStopflag,HRemark,HShortNumber,HParentID,HLevel" +
- ",HEndFlag,HHelpCode,HDeptID,HGroupID,HUseFlag" +
- ") " +
- " values('" + HNumber + "','" + HName + "','','',0,0,0,0,''," + HDeptID + ",0,'鏈娇鐢�'" + ") ";
+ sql = "Insert Into Gy_ClassTimePrjGroup " +
+ "(HNumber,HName,HStopflag,HRemark,HShortNumber,HParentID,HLevel" +
+ ",HEndFlag,HHelpCode,HDeptID,HGroupID,HUseFlag" +
+ ") " +
+ " values('" + HNumber + "','" + HName + "','','',0,0,0,0,''," + HDeptID + ",0,'鏈娇鐢�'" + ") ";
}
else
{
- sql = "UpDate Gy_ClassTimePrjGroup set HNumber='" + HNumber + "',HName='" + HName + "',HDeptID=" + HDeptID+ " where HItemID="+ HItemID;
+ sql = "UpDate Gy_ClassTimePrjGroup set HNumber='" + HNumber + "',HName='" + HName + "',HDeptID=" + HDeptID + " where HItemID=" + HItemID;
}
oCN.RunProc(sql);
objJsonResult.code = "1";
@@ -2762,7 +2814,7 @@
[HttpGet]
public object GetMaintainItemtemByMouldProjectID(int MouldProjectID)
{
-
+
if (MouldProjectID <= 0)
{
objjson.code = "0";
@@ -2874,7 +2926,7 @@
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
string sql = string.Format(@"select * from h_v_Sc_MouldDotCheckRuleBillList ");
- ds = oCN.RunProcReturn(sql+sWhere, "h_v_Sc_MouldDotCheckRuleBillList");
+ ds = oCN.RunProcReturn(sql + sWhere, "h_v_Sc_MouldDotCheckRuleBillList");
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
objjson.code = "0";
@@ -2902,7 +2954,7 @@
}
}
- /// <summary>
+ /// <summary>
/// 鏍规嵁璁惧鏄剧ず璁惧淇濆吇瑙勭▼椤圭洰
/// </summary>
/// <returns></returns>
@@ -2980,7 +3032,7 @@
from Sb_EquipMaintainRuleBillMain a left join Sb_EquipMaintainRuleBillSub_Item t on a.HInterID=t.HInterID
left join Gy_Maintain m on m.HItemID=t.HMaintainItemID
left join Gy_Employee e on e.HItemID=t.HManagerID
- where a.HInterID=" + EquipProjectID );
+ where a.HInterID=" + EquipProjectID);
string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HRemark from Sb_EquipMaintainRuleBillMain a
left join Sb_EquipMaintainRuleBillSub b on a.HInterID=b.HInterID
left join h_v_IF_Material m on b.HMaterID=m.HItemID
@@ -3112,8 +3164,8 @@
return objjson;
}
}
-
-
+
+
/// <summary>
/// 鑾峰彇缁翠慨椤圭洰鍒楄〃
/// </summary>
@@ -3338,7 +3390,7 @@
WebS.WebService1 oWebs = new WebS.WebService1();
try
{
- ds = oWebs.GetKf_PonderationBillMain_TempList_New (HBillType, sHMaker, HOrgID);
+ ds = oWebs.GetKf_PonderationBillMain_TempList_New(HBillType, sHMaker, HOrgID);
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
objJsonResult.code = "0";
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBackBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBackBillController.cs"
index 46e209e..8025b3e 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBackBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBackBillController.cs"
@@ -589,10 +589,10 @@
oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
//oItemSub.HRemark = ""; //澶囨敞
- oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
- oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
- //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
- //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
+ oItemSub.HSourceInterID = lsmain[0].HSourceInterID; // 婧愬崟涓诲唴鐮�
+ oItemSub.HSourceEntryID = lsmain[0].HSourceEntryID; //婧愬崟瀛愬唴鐮�
+ oItemSub.HSourceBillNo = lsmain[0].HSourceBillNo; //婧愬崟鍗曞彿
+ oItemSub.HSourceBillType = lsmain[0].HSourceBillType; //婧愬崟绫诲瀷
//oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
//oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
//oItemSub.HRepairID = 0; //缁翠慨椤圭洰
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 9ae9001..26fc827 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"
@@ -108,9 +108,9 @@
bool IsBarCodePack = oBill.IsBarCodePack(list.packagebarcode);
if (IsBarCodePack == false)
{
- LogService.Write("绠辩爜宸插瓨鍦�,涓嶈兘閲嶅缁戝畾锛�");
+ LogService.Write($"绠辩爜:{list.packagebarcode}宸插瓨鍦�,涓嶈兘閲嶅缁戝畾锛�");
objJsonResult.status = -1;
- objJsonResult.msg = "绠辩爜宸插瓨鍦�,涓嶈兘閲嶅缁戝畾锛�";
+ objJsonResult.msg = $"绠辩爜:{list.packagebarcode}宸插瓨鍦�,涓嶈兘閲嶅缁戝畾锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -159,12 +159,13 @@
for (int i = 0; i < list.barcodes.Count; i++)
{
//鍒ゆ柇鏉＄爜鏄惁瀛樺湪
- bool IsBarCode = oBill.IsBarCodePack(list.barcodes[i].barcode);
+ bool IsBarCode = oBill.IsBarCode(list.barcodes[i].barcode);
if (IsBarCodePack == false)
{
- LogService.Write("鏉＄爜宸插瓨鍦�,涓嶈兘閲嶅缁戝畾锛�");
+ DataTable dt = oCN.RunProcReturn("Select HBarCode_Pack from Sc_PackUnionBillSub Where HBarCode='" + list.barcodes[i].barcode + "'", "Sc_PackUnionBillSub").Tables[0];
+ LogService.Write($"鏉＄爜锛歿list.barcodes[i].barcode}锛屽凡瀛樺湪绠辩爜锛歿dt.Rows[0]["HBarCode_Pack"]}涓紝鏈缁戝畾绠辩爜涓猴細{list.packagebarcode},缁戝畾澶辫触,涓嶈兘閲嶅缁戝畾锛�");
objJsonResult.status = -1;
- objJsonResult.msg = "鏉＄爜宸插瓨鍦�,涓嶈兘閲嶅缁戝畾锛�";
+ objJsonResult.msg = $"鏉＄爜锛歿list.barcodes[i].barcode}锛屽凡瀛樺湪绠辩爜锛歿dt.Rows[0]["HBarCode_Pack"]}涓紝鏈缁戝畾绠辩爜涓猴細{list.packagebarcode},缁戝畾澶辫触,涓嶈兘閲嶅缁戝畾锛�";
objJsonResult.data = null;
return objJsonResult;
}
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemBillController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemBillController.cs"
index 50973d3..33509ad 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemBillController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemBillController.cs"
@@ -406,6 +406,7 @@
{
var HBarCode = item.HBarCode;
var HItemID = item.HItemID;
+ string HDate = item.HMakeDate;
string HBillNo = "";
Int64 HInterID = 0;//鏄剧ず鐨勫瓧娈�
DataSet ds1 = new DataSet();
@@ -422,7 +423,7 @@
",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
") " +
- " values('3814','3814'," + HInterID + ",'" + HBillNo + "',getdate()" +
+ " values('3814','3814'," + HInterID + ",'" + HBillNo + "','" + HDate+"'"+
", '" + user + "',getdate()" +
", " + dr["HSupID"].ToString() + ", 1," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
", 0," + dr["HDeptID"].ToString() + ",' ',0" +
@@ -490,6 +491,7 @@
var HBarCode = item.HBarCode;
var HItemID = item.HItemID;
string HBillNo = "";
+ string HDate = item.HMakeDate;
Int64 HInterID = 0;//鏄剧ず鐨勫瓧娈�
DataSet ds1 = new DataSet();
ds = oCn.RunProcReturn("select * from Gy_MouldFileMain where HBarCode='" + HBarCode + "'", "Gy_MouldFileMain");
@@ -504,7 +506,7 @@
",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
") " +
- " values('3827','3827'," + HInterID + ",'" + HBillNo + "',getdate()" +
+ " values('3827','3827'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
", '" + user + "',getdate()" +
", " + dr1["HCorrespondentID"].ToString() + "," + dr1["HCorrespondentTypeID"].ToString() + ",isnull('" + dr["HNowSupID"].ToString() + "',0),0,0,0,0" +
", 0," + dr["HDeptID"].ToString() + ",'',0" +
@@ -572,6 +574,7 @@
var HBarCode = item.HBarCode;
var HItemID = item.HItemID;
string HBillNo = "";
+ string HDate = item.HMakeDate;
Int64 HInterID = 0;//鏄剧ず鐨勫瓧娈�
DataSet ds1 = new DataSet();
ds = oCn.RunProcReturn("select * from Gy_MouldFileMain where HBarCode='" + HBarCode + "'", "Gy_MouldFileMain");
@@ -587,7 +590,7 @@
",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
") " +
- " values('3832','3832'," + HInterID + ",'" + HBillNo + "',getdate()" +
+ " values('3832','3832'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
", '" + user + "',getdate()" +
", " + dr1["HCorrespondentID"].ToString() + "," + dr1["HCorrespondentTypeID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
", 0," + dr["HDeptID"].ToString() + ",' ',0" +
@@ -653,6 +656,7 @@
var HBarCode = item.HBarCode;
var HItemID = item.HItemID;
string HBillNo = "";
+ string HDate = item.HMakeDate;
Int64 HInterID = 0;//鏄剧ず鐨勫瓧娈�
DataSet ds1 = new DataSet();
ds = oCn.RunProcReturn("select * from Gy_MouldFileMain where HBarCode='" + HBarCode + "'", "Gy_MouldFileMain");
@@ -668,7 +672,7 @@
",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
") " +
- " values('3802','3802'," + HInterID + ",'" + HBillNo + "',getdate()" +
+ " values('3802','3802'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
", '" + user + "',getdate()" +
", " + dr1["HCorrespondentID"].ToString() + "," + dr1["HCorrespondentTypeID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
", 0," + dr["HDeptID"].ToString() + ",' ',0" +
@@ -733,6 +737,7 @@
var HBarCode = item.HBarCode;
var HItemID = item.HItemID;
string HBillNo = "";
+ string HDate = item.HMakeDate;
Int64 HInterID = 0;//鏄剧ず鐨勫瓧娈�
DataSet ds1 = new DataSet();
ds = oCn.RunProcReturn("select * from Gy_MouldFileMain where HBarCode='" + HBarCode + "'", "Gy_MouldFileMain");
@@ -748,7 +753,7 @@
",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
") " +
- " values('3803','3803'," + HInterID + ",'" + HBillNo + "',getdate()" +
+ " values('3803','3803'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
", '" + user + "',getdate()" +
", " + dr["HNowSupID"].ToString() + "," + dr["HNowSupTypeID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
", 0," + dr["HDeptID"].ToString() + ",' ',0" +
diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjBillController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjBillController.cs"
index 6cf86c6..3562648 100644
--- "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjBillController.cs"
+++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjBillController.cs"
@@ -171,6 +171,7 @@
{
try
{
+ oCN.BeginTran();
var _value = oMain["oMain"].ToString();
string msg1 = _value.ToString();
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
@@ -209,7 +210,7 @@
return objJsonResult;
}
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
- oCN.BeginTran();
+
//涓昏〃
oCN.RunProc("Insert Into Gy_ClassTimePrj " +
"(HNumber,HName,HParentID,HDeptID,HGroupID" +
diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjSubController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjSubController.cs"
index f031b62..90155fb 100644
--- "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjSubController.cs"
+++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjSubController.cs"
@@ -17,7 +17,6 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
-
/// <summary>
/// 杩斿洖鍒楄〃
///鍙傛暟锛歴tring sql銆�
@@ -25,7 +24,7 @@
/// </summary>
[Route("Gy_ClassTimePrjSub/list")]
[HttpGet]
- public object list(string sWhere,string user)
+ public object list(string sWhere, string user)
{
try
{
@@ -45,7 +44,7 @@
else
{
string sql1 = "select * from h_v_Gy_ClassTimePrjSubList where 1=1 ";
- string sql = sql1 + sWhere+ " order by HInterID desc";
+ string sql = sql1 + sWhere + " order by HInterID desc";
ds = oCN.RunProcReturn(sql, "h_v_Gy_ClassTimePrjSubList");
}
@@ -219,7 +218,7 @@
/// <returns></returns>
[Route("DeltetGy_ClassTimePrjSub")]
[HttpGet]
- public object DeltetGy_ClassTimePrjSub(string HItemID,string user)
+ public object DeltetGy_ClassTimePrjSub(string HItemID, string user)
{
DataSet ds;
DataSet ds1;
@@ -268,18 +267,34 @@
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
- [Route("Gy_ClassTimePrjSub/ModifyByID")]
- [HttpPost]
+ [Route("Gy_ClassTimePrjSub/Calc")]
+ [HttpGet]
public object Calc(string HEntryID, string HYear, string HPeriod)
{
try
{
- oCN.RunProcReturn("exec h_p_Pay_GetAvgMoney " + HYear.ToString() + "," + HPeriod.ToString() + "," + HEntryID.ToString(), "pjgz");
-
- objJsonResult.code = "0";
+ if (string.IsNullOrEmpty(HEntryID) || HEntryID == "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璇烽�夋嫨鏍哥畻鏂瑰紡缁勶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (HYear == "" || HPeriod == "" || !IsDate($"{HYear}-{HPeriod}-1"))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璇疯緭鍏ユ湁闄愮殑骞存湀浠斤紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ string sql = $"exec h_p_Pay_GetAvgMoneyTest {HYear},{HPeriod},{HEntryID}";
+ ds = oCN.RunProcReturn(sql, "Pay_GetAvgMoneyTest");
+ objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- objJsonResult.data = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
return objJsonResult;
}
catch (Exception e)
@@ -292,5 +307,18 @@
return objJsonResult;
}
}
+
+ public bool IsDate(string strDate)
+ {
+ try
+ {
+ DateTime.Parse(strDate);
+ return true;
+ }
+ catch
+ {
+ return false;
+ }
+ }
}
}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_SingleBalBillController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_SingleBalBillController.cs"
index 53f0361..f3f86b5 100644
--- "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_SingleBalBillController.cs"
+++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_SingleBalBillController.cs"
@@ -408,7 +408,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.Message = "鎵ц寮傚父锛岃仈绯荤鐞嗗憳锛佹姤閿欙細" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_WorkTimesBillController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_WorkTimesBillController.cs"
index 1f8d012..6d10537 100644
--- "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_WorkTimesBillController.cs"
+++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_WorkTimesBillController.cs"
@@ -362,7 +362,6 @@
objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
objJsonResult.list = list;
return objJsonResult;
-
}
catch (Exception ex)
{
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs"
index 1d97bf2..c0bbff3 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs"
@@ -1526,6 +1526,7 @@
string BillNo = "";
long MainId = 0;
string EntyID = "";
+
if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(DateTime.Now, ref sYear, ref sPeriod, ref s) == false)
{
objJsonResult.code = "0";
@@ -1557,7 +1558,7 @@
return objJsonResult;
}
}
-
+ //鐢熶骇璁㈠崟缂栧彿銆佺敓浜ц鍗曚富ID銆佺敓浜ц鍗曚富ID+瀛怚D
BillNo = oItem.HMainSourceBillNo;
MainId = oItem.HMainSourceInterID;
EntyID = oItem.HMainSourceEntryID;
@@ -1579,43 +1580,75 @@
oBill.omodel = oItem;
}
- //淇濆瓨
- //淇濆瓨瀹屾瘯鍚庡鐞�
bool bResult;
if (oBill.omodel.HInterID == 0)
{
oCN.BeginTran();
- //淇敼閲戣澏鐢熶骇鍗曠殑鐘舵��
- oCN.RunProc("update AIS20200908101915zs..T_PRD_MOENTRY_A set FSTATUS=4,FCONVEYDATE=getdate() where FENTRYID=" + (EntyID).Split('-')[1]);
+
+ //鏍规嵁鐢熶骇璁㈠崟瀛怚D鎵惧搴旂殑鐢熶骇鐢ㄦ枡娓呭崟
+ DataSet Ds = oCN.RunProcReturn("select b.FID,b.FBILLNO,b.FDOCUMENTSTATUS from Sc_ICMOBillSub a left join AIS20200908101915zs..T_PRD_PPBOM b on a.HERPEntryID=b.FMOENTRYID where a.HEntryID=" + (EntyID).Split('-')[1], "Sc_ICMOBillSub");
+ //鏌ユ壘褰撳墠鐢熶骇璁㈠崟鏄庣粏鐘舵��
+ DataSet Dss = oCN.RunProcReturn("select FSTATUS from AIS20200908101915zs..T_PRD_MOENTRY_A where FENTRYID=" + (EntyID).Split('-')[1], "AIS20200908101915zs..T_PRD_MOENTRY_A");
+ //鍒ゆ柇閲戣澏鐢熶骇鍗曠殑鐘舵�佷笉涓�4鍒欐墽琛屽紑宸�
+ if (Dss.Tables[0].Rows[0][0].ToString() != "4")
+ {
+ oCN.RunProc("update AIS20200908101915zs..T_PRD_MOENTRY_A set FSTATUS=4,FCONVEYDATE=getdate() where FENTRYID=" + (EntyID).Split('-')[1]);
+ }
+ else
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插紑宸ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
//璁块棶閲戣澏
- //var loginRet = InvokeHelper.Login();
- //var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
- //if (isSuccess == 0)
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鎿嶄綔澶辫触,閲戣澏璐﹀彿鐧诲綍寮傚父銆�" + loginRet;
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
- //var json = new
- //{
- // //CreateOrgId = 0,
- // Numbers = BillNo,
- // //Ids = (EntyID).Split('-')[0],
- // PkEntryIds = (EntyID).Split('-')[1]
- //};
- //Console.Write("json=" + json);
- //var result = InvokeHelper.ExcuteOperation("PRD_MO", "ToStart", JsonConvert.SerializeObject(json));
- //if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
- //{
- // oCN.RollBack();
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "瀵瑰簲閲戣澏浜戠敓浜ц鍗曟洿鏀瑰紑宸ョ姸鎬佸け璐ワ紒" + result;
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ var loginRet = InvokeHelper.Login();
+ var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
+ if (isSuccess == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎿嶄綔澶辫触,閲戣澏璐﹀彿鐧诲綍寮傚父銆�" + loginRet;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ var json = new
+ {
+ //CreateOrgId = 0,
+ //Numbers = BillNo,
+ Ids = Ds.Tables[0].Rows[0][0].ToString(),
+ //PkEntryIds = (EntyID).Split('-')[1]
+ };
+ LogService.Write("json=" + json);
+ string result1 = string.Empty;
+ string result2 = string.Empty;
+
+ //鍒ゆ柇褰撳墠鐢ㄧ敓浜ф枡娓呭崟鍗曠姸鎬佲�斺�斿凡鍒涘缓鍒欏厛鎻愪氦鍐嶅鏍搞�佷互鎻愪氦鍒欏彧瀹℃牳--A:鍒涘缓锛孊:鎻愪氦,C:瀹℃牳,D:閲嶆柊瀹℃牳
+ if (Ds.Tables[0].Rows[0][2].ToString() == "A"|| Ds.Tables[0].Rows[0][2].ToString() == "D")
+ {
+ result1 = InvokeHelper.Submit("PRD_PPBOM", JsonConvert.SerializeObject(json));
+ result2 = InvokeHelper.Audit("PRD_PPBOM", JsonConvert.SerializeObject(json));
+ }
+ if (Ds.Tables[0].Rows[0][2].ToString() == "B")
+ {
+ result2 = InvokeHelper.Audit("PRD_PPBOM", JsonConvert.SerializeObject(json));
+ }
+ LogService.Write("result2=" + result2);
+ //鍒ゆ柇瀹℃牳鏄惁鎴愬姛
+ if (JObject.Parse(result2)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = $"瀵瑰簲鐢熶骇鐢ㄦ枡娓呭崟,鍗曞彿{Ds.Tables[0].Rows[0][1].ToString()},瀹℃牳澶辫触锛�" + result2;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //淇濆瓨
////鎵ц淇濆瓨
bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
if (bResult)
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 f207523..0e031b3 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"
@@ -106,7 +106,10 @@
[Route("Sc_ICMOBill/QK_PackingBillByXSBill")]
[HttpGet]
public object QK_PackingBillByXSBill(string HBillNo)
- { //string sql = string.Format(@"select a.HInterID,a.HBillNo,b.HEntryID,b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName, b.HUnitID,u.HName HUnitName,b.HQty HPlanQty,
+ {
+ try
+ {
+ //string sql = string.Format(@"select a.HInterID,a.HBillNo,b.HEntryID,b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName, b.HUnitID,u.HName HUnitName,b.HQty HPlanQty,b.HQty HSPlanQty,
// a.HCusID, c.HName HCusName,a.HEmpID,e.HName HEmpName,b.HDeptID,d.HName HDeptName,a.HPlanEndDate,0 HMinQty,0 HTotalQty,0 HSpsQty,a.HSeOrderBillNo,a.HRemark
// from Sc_ICMOBillMain a
// left join Sc_ICMOBillSub b on a.HInterID=b.HInterID
@@ -116,14 +119,10 @@
// left join Gy_Employee e on a.HEmpID=e.HItemID
// left join Gy_Department d on a.HDeptID=d.HItemID
// where b.HInterID=(select HICMOInterID from Sc_PPBomBillMain where HBillNo='" + HBillNo + "')");
- try
- {
-
-
- string sql = string.Format(@"select a.HInterID,a.HBillNo,b.HMaterID,b.HEntryID, m.HNumber HMaterNumber, m.HName HMaterName, b.HUnitID,u.HName HUnitName,b.HQty HPlanQty,a.HCusID, c.HName HCusName,
+ string sql = string.Format(@"select a.HInterID,a.HBillNo,b.HMaterID,b.HEntryID, m.HNumber HMaterNumber, m.HName HMaterName, b.HUnitID,u.HName HUnitName,b.HQty HPlanQty,b.HQty HSPlanQty,a.HCusID, c.HName HCusName,
a.HEmpID,e.HName HEmpName,b.HDeptID,d.HName HDeptName,a.HPlanEndDate,0 HMinQty,0 HTotalQty,0 HSpsQty,a.HSeOrderBillNo,a.HRemark,
- fo.FBILLNO FBillNo,fo.F_ZZZZ_TEXT7 FLXName,fo.FRECEIVEADDRESS FInAddress,fmn.FNAME FMaterName,fo.F_ZZZZ_TEXT FBZFS,fu.FDATAVALUE FHX,
- fu1.FDATAVALUE FQK,fo.F_ZZZZ_WBBZ FWBBZ
+ fo.FBILLNO FBillNo,fo.F_ZZZZ_TEXT7 FLXName,fo.FRECEIVEADDRESS FInAddress,fmn.FNAME FMaterName,fo1.F_ZZZZ_TEXT FBZFS,fu.FDATAVALUE FHX,
+ fu1.FDATAVALUE FQK,fo1.F_ZZZZ_WBBZ1 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
@@ -486,6 +485,8 @@
/// <summary>
/// 澧欏挃瑁呯鍒楄〃-鍒犻櫎
/// </summary>
+ /// <param name="HInterID">鏉＄爜妗ｆ涓昏〃涓籌D锛堝敮涓�锛�</param>
+ /// <param name="Flag">鏍囪瘑</param>
/// <returns></returns>
[Route("Sc_ICMOBillController/DeleteQK_GetPackingBillList")]
[HttpGet]
@@ -500,14 +501,14 @@
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 + ")");
- oCN.RunProc(sql);
+ string sql1 = string.Format(@"update Sc_ICMOBillSub set HQty=HQty+" + dr["HQty"] + " where HEntryID=(select HSourceEntryID from Gy_BarCodeBill where HItemID=" + HInterID + ")");
oCN.RunProc(sql1);
+ oCN.RunProc(sql);
}
else
{
//閫氳繃鏉＄爜id鎵惧埌鎵樻潯鐮侊紝閫氳繃鎵樻潯鐮佹壘鍒扮粍鎵樺崟瀛愯〃涓殑鍞竴鐮�
- string sql2 = "select HBarCode from Sc_PackUnionBillSub where HInterID=(select HBarcodeNo from Gy_BarCodeBill where HItemID=" + HInterID;
+ string sql2 = "select HBarCode from Sc_PackUnionBillSub where HInterID=(select HBarcodeNo from Gy_BarCodeBill where HItemID=" + HInterID+")";
//string sql2 = "select HBarCode from Sc_PackUnionBillSub where HInterID=(select HBarcodeNo from Gy_BarCodeBill where HItemID=3250)";
DataSet ds1 = oCN.RunProcReturn(sql2, "Sc_PackUnionBillSub");
DataTable dt = ds1.Tables[0];
@@ -521,9 +522,9 @@
DataRow dr1 = ds.Tables[0].Rows[0];
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() + "')");
+ string sql1 = string.Format(@"update Sc_ICMOBillSub set HQty=HQty+" + dr1["HQty"] + " where HEntryID=(select HSourceEntryID from Gy_BarCodeBill where HBarCode='" + dr["HBarCode"].ToString() + "')");
+ oCN.RunProc(sql1);
oCN.RunProc(sql);
- oCN.RunProc(sql1);
}
}
diff --git a/WebAPI/DLL/ClsGy_Source_Ctl.cs b/WebAPI/DLL/ClsGy_Source_Ctl.cs
index c8b1799..ec919b1 100644
--- a/WebAPI/DLL/ClsGy_Source_Ctl.cs
+++ b/WebAPI/DLL/ClsGy_Source_Ctl.cs
@@ -22,12 +22,12 @@
" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
",HType,HRelationID,HCenterID,HEquipFileID_K3,HDeptID" +
",HLevel,HEndFlag,HStopflag,HRemark,HProcID,HOverTimes " +
- ",HWorkTimes,HMaxWorkTimes,HMinAdd,HClassCount,HGroupID,HGroupK3ID)" +
+ ",HWorkTimes,HMaxWorkTimes,HMinAdd,HClassCount,HGroupID,HGroupK3ID,HUSEORGID)" +
" Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
",'" + oModel.HType + "'," + oModel.HRelationID.ToString() + "," + oModel.HCenterID.ToString() + "," + oModel.HEquipFileID_K3.ToString() + "," + oModel.HDeptID.ToString() +
"," + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) +
",'" + oModel.HRemark + "'," + oModel.HProcID + "," + oModel.HOverTimes + "," + oModel.HWorkTimes + "," + oModel.HMaxWorkTimes +
- "," + oModel.HMinAdd + "," + oModel.HClassCount + "," + oModel.HGroupID.ToString() + "," + oModel.HGroupK3ID.ToString() + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+ "," + oModel.HMinAdd + "," + oModel.HClassCount + "," + oModel.HGroupID.ToString() + "," + oModel.HGroupK3ID.ToString() + ","+ oModel.HUSEORGID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCn.Commit();
diff --git a/WebAPI/InvokeHelper.cs b/WebAPI/InvokeHelper.cs
index 2bc5e15..d7eaf36 100644
--- a/WebAPI/InvokeHelper.cs
+++ b/WebAPI/InvokeHelper.cs
@@ -4,29 +4,28 @@
using System.Text;
using System.Threading.Tasks;
using Newtonsoft.Json;
+using WebAPI.Utility;
namespace WebAPI
{
public static class InvokeHelper
{
- //private static string CloudUrl = "http://localhost/k3cloud/";//K/3 Cloud 涓氬姟绔欑偣鍦板潃
- //private static string CloudUrl = "http://60.190.4.42:9002/k3cloud/";//K/3 Cloud 涓氬姟绔欑偣鍦板潃
- //private static string CloudUrl = "http://47.96.97.237/k3cloud/";//K/3 Cloud 涓氬姟绔欑偣鍦板潃
- //private static string CloudUrl = "http://60.190.4.42:9002/K3CLOUD/";//澶忓疂
- private static string CloudUrl = "http://124.70.129.242/k3cloud/";//闆呯惇璇�
-
+ private static string CloudUrl = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "KDApiUrl");//K/3 Cloud 涓氬姟绔欑偣鍦板潃
/// <summary>
/// 鐧婚檰
/// </summary>
public static string Login()
{
+ var dbId = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DbId");
+ var useName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "UserName");
+ var pwd = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "PassWord");
HttpClient httpClient = new HttpClient();
httpClient.Url = string.Concat(CloudUrl, "Kingdee.BOS.WebApi.ServicesStub.AuthService.ValidateUser.common.kdsvc");
List<object> Parameters = new List<object>();
- Parameters.Add("5f56ea565892f4");//璐﹀鏍囩ず
- Parameters.Add("Administrator");//鐢ㄦ埛鍚�
- Parameters.Add("ycy123");//瀵嗙爜
+ Parameters.Add(dbId);//璐﹀鏍囩ず
+ Parameters.Add(useName);//鐢ㄦ埛鍚�
+ Parameters.Add(pwd);//瀵嗙爜
Parameters.Add(2052);//2052浠ｈ〃涓枃
httpClient.Content = JsonConvert.SerializeObject(Parameters);
diff --git a/WebAPI/Models/ClsKf_ICStockBillMain.cs b/WebAPI/Models/ClsKf_ICStockBillMain.cs
index 5af248d..62c3529 100644
--- a/WebAPI/Models/ClsKf_ICStockBillMain.cs
+++ b/WebAPI/Models/ClsKf_ICStockBillMain.cs
@@ -48,6 +48,10 @@
public Int64 HPAYORGID; // int --付款结算组织
public string HOWNERTYPEID; // varchar(100) --货主类型
public string HStockStyle; // varchar(100) --库存类型
-
+ //源单信息
+ public string HSourceBillNo;
+ public string HSourceBillType;
+ public Int64 HSourceInterID;
+ public Int64 HSourceEntryID;
}
}
diff --git a/WebAPI/Models/Cls_InventoryAnalysisList.cs b/WebAPI/Models/Cls_InventoryAnalysisList.cs
index 9b05e3f..496302c 100644
--- a/WebAPI/Models/Cls_InventoryAnalysisList.cs
+++ b/WebAPI/Models/Cls_InventoryAnalysisList.cs
@@ -15,5 +15,6 @@
public string HRealPot;
public string HBookPotType;
public string HBookPot;
+ public string HMakeDate;
}
}
\ No newline at end of file
diff --git a/WebAPI/Models/Gy_Group.cs b/WebAPI/Models/Gy_Group.cs
index aa605d9..e162dd6 100644
--- a/WebAPI/Models/Gy_Group.cs
+++ b/WebAPI/Models/Gy_Group.cs
@@ -20,6 +20,7 @@
public long HDeptID { get; set; }
public long HEmpQty { get; set; }
public long HProcID { get; set; }
+ public int HUSEORGID;
public string HBarCodeForBase { get; set; }
diff --git a/WebAPI/Models/Gy_WorkCenter.cs b/WebAPI/Models/Gy_WorkCenter.cs
index 3bb88bb..5add5dc 100644
--- a/WebAPI/Models/Gy_WorkCenter.cs
+++ b/WebAPI/Models/Gy_WorkCenter.cs
@@ -24,6 +24,7 @@
public long HProcID { get; set; }
public long HLevel { get; set; }
public long HDayMoney { get; set; }
+ public int HUSEORGID { get; set; }
public string HBarCodeForBase { get; set; }
diff --git "a/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.cs" "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.cs"
index 0999cf8..807f58a 100644
--- "a/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.cs"
+++ "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.cs"
@@ -33,6 +33,7 @@
public long HDeptID { get; set; }
public long HEmpQty { get; set; }
public long HProcID { get; set; }
+ public int HUSEORGID { get; set; }
public string HBarCodeForBase { get; set; }
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 2092999..4afe066 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,41 +5,41 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2022-06-12T08:11:24.2895280Z;True|2022-05-17T14:19:55.1158182+08:00;True|2022-05-17T13:25:44.2886247+08:00;True|2022-05-17T10:29:26.6813564+08:00;True|2022-05-17T09:02:49.1742018+08:00;True|2022-05-06T15:13:12.2438900+08:00;True|2022-05-06T14:49:39.8536594+08:00;True|2022-04-22T17:07:44.8823529+08:00;True|2022-04-19T19:13:40.8312746+08:00;True|2022-04-19T15:40:16.0022040+08:00;True|2022-04-19T15:13:32.9767736+08:00;False|2022-04-19T15:08:33.6507639+08:00;True|2022-04-19T15:02:51.9580210+08:00;True|2022-04-19T13:54:18.7579131+08:00;True|2022-04-12T10:36:02.1779173+08:00;True|2022-04-12T10:05:31.0222037+08:00;True|2022-04-12T09:47:49.3724819+08:00;True|2022-04-09T15:08:54.5697468+08:00;True|2022-04-08T17:31:31.0046258+08:00;True|2022-04-08T16:50:41.3018422+08:00;True|2022-04-08T10:35:36.5029980+08:00;True|2022-03-31T09:38:37.3646053+08:00;True|2022-03-29T13:57:45.4410942+08:00;True|2022-03-10T18:59:23.7994337+08:00;True|2022-03-10T18:52:39.5019082+08:00;True|2022-03-10T18:51:12.7949284+08:00;True|2022-03-10T18:50:47.2024177+08:00;True|2022-03-10T18:45:08.8409380+08:00;True|2022-03-10T18:41:17.0102564+08:00;True|2022-03-10T18:35:49.0742353+08:00;True|2022-03-10T17:57:47.4196965+08:00;True|2022-03-10T17:34:27.5723245+08:00;True|2022-03-10T16:13:59.3829164+08:00;True|2022-03-09T14:50:49.1222033+08:00;True|2022-03-09T11:21:03.0073651+08:00;False|2022-03-09T11:16:56.1792896+08:00;False|2022-03-09T11:16:49.7923320+08:00;True|2022-03-08T15:47:47.4722336+08:00;True|2022-03-08T15:47:28.5397115+08:00;True|2022-03-08T15:37:08.7379870+08:00;True|2022-03-02T17:37:54.4659976+08:00;True|2022-03-02T17:34:12.2949726+08:00;True|2022-03-02T17:26:38.7070673+08:00;True|2022-03-02T17:07:49.7024316+08:00;True|2022-03-02T17:05:22.4177336+08:00;True|2022-03-02T16:14:57.9880587+08:00;True|2022-03-01T17:52:52.6766959+08:00;True|2022-02-28T14:36:22.6449303+08:00;True|2022-02-24T15:43:36.8244163+08:00;True|2022-02-23T17:57:14.3693224+08:00;True|2022-02-23T17:46:42.1078183+08:00;False|2022-02-23T17:41:06.5886724+08:00;True|2022-02-23T16:59:45.5533581+08:00;True|2022-02-23T16:57:43.3328895+08:00;True|2022-02-21T09:09:37.2601134+08:00;True|2022-02-21T09:03:32.4071009+08:00;True|2022-02-21T08:59:59.0172082+08:00;True|2022-02-18T14:05:39.1358825+08:00;True|2022-02-18T10:23:02.4391239+08:00;True|2022-02-18T10:21:31.0559267+08:00;True|2022-02-17T16:50:11.7192509+08:00;True|2022-02-17T13:19:13.7697894+08:00;True|2022-02-11T10:36:12.7757100+08:00;True|2022-02-10T10:54:25.2685040+08:00;True|2022-02-10T10:37:02.1034768+08:00;True|2022-02-09T17:32:45.6511283+08:00;True|2022-02-09T17:24:32.5115193+08:00;True|2022-02-09T17:00:24.0662114+08:00;True|2022-02-09T16:56:42.3364622+08:00;True|2022-02-09T14:17:25.8688855+08:00;True|2022-02-09T14:11:51.6149822+08:00;True|2022-02-07T23:29:26.2842648+08:00;True|2022-02-07T23:28:58.8242274+08:00;False|2022-02-07T23:25:29.0647793+08:00;True|2022-02-07T13:06:37.5515985+08:00;True|2022-02-07T12:42:19.5220491+08:00;True|2022-02-07T09:52:59.6728595+08:00;True|2022-02-01T11:32:10.5831557+08:00;True|2022-01-29T14:09:02.9178986+08:00;True|2022-01-28T12:01:45.1416438+08:00;True|2022-01-28T11:03:41.6361866+08:00;True|2022-01-28T10:44:53.5367862+08:00;True|2022-01-28T10:40:41.6697563+08:00;True|2022-01-28T10:25:56.7093616+08:00;True|2022-01-28T09:58:13.0733060+08:00;True|2022-01-27T09:26:29.6568807+08:00;True|2022-01-27T00:47:57.9102528+08:00;True|2022-01-27T00:46:52.8845001+08:00;True|2022-01-27T00:36:34.5330938+08:00;True|2022-01-27T00:35:19.5439329+08:00;True|2022-01-27T00:33:38.5701950+08:00;True|2022-01-27T00:32:00.9028982+08:00;True|2022-01-27T00:30:13.2390921+08:00;True|2022-01-27T00:28:23.2989144+08:00;True|2022-01-27T00:16:01.3789455+08:00;True|2022-01-27T00:09:58.8112352+08:00;True|2022-01-27T00:00:40.8353538+08:00;True|2022-01-26T23:37:50.9494735+08:00;True|2022-01-26T23:29:39.8647473+08:00;True|2022-01-26T23:20:49.3274392+08:00;True|2022-01-26T23:15:53.7037293+08:00;True|2022-01-26T23:06:28.8595953+08:00;True|2022-01-26T23:02:12.9882299+08:00;True|2022-01-26T22:55:33.2535730+08:00;True|2022-01-26T22:51:01.8427947+08:00;True|2022-01-26T22:47:44.0715387+08:00;True|2022-01-26T22:20:21.7217039+08:00;True|2022-01-26T22:13:39.5372069+08:00;True|2022-01-26T22:01:31.2113177+08:00;True|2022-01-26T21:55:26.5478921+08:00;True|2022-01-26T21:50:18.2700369+08:00;True|2022-01-26T21:48:52.0020233+08:00;True|2022-01-26T19:19:29.4530523+08:00;True|2022-01-26T19:07:21.6474231+08:00;True|2022-01-26T18:25:42.2933291+08:00;True|2022-01-26T12:39:02.0149050+08:00;True|2022-01-26T12:13:43.9149452+08:00;True|2022-01-26T11:24:33.5742248+08:00;True|2022-01-26T08:51:10.8105076+08:00;True|2022-01-25T21:07:32.9069261+08:00;True|2022-01-24T01:35:12.3309466+08:00;True|2022-01-23T23:19:15.9702821+08:00;True|2022-01-23T21:50:41.6903353+08:00;True|2022-01-23T21:25:57.6084267+08:00;True|2022-01-23T21:16:10.1516535+08:00;True|2022-01-23T20:52:08.3745284+08:00;True|2022-01-23T18:19:32.2386502+08:00;True|2022-01-23T18:11:42.0830325+08:00;True|2022-01-23T18:00:01.3239547+08:00;True|2022-01-23T12:18:48.2466943+08:00;True|2022-01-22T00:48:50.4531647+08:00;True|2022-01-21T13:10:32.8173598+08:00;True|2022-01-21T13:04:01.6388059+08:00;True|2022-01-21T12:51:40.5304103+08:00;True|2022-01-21T12:44:06.3059885+08:00;True|2022-01-21T12:34:33.9314010+08:00;True|2022-01-21T11:39:20.1088577+08:00;True|2022-01-20T11:33:49.0516846+08:00;True|2022-01-20T10:02:12.0295471+08:00;True|2022-01-20T10:02:03.3535503+08:00;True|2022-01-19T23:56:18.7293193+08:00;True|2022-01-19T22:30:14.6986228+08:00;True|2022-01-19T22:15:08.8608795+08:00;True|2022-01-19T21:57:55.2295030+08:00;True|2022-01-19T13:50:37.8588759+08:00;True|2022-01-19T13:42:52.9761531+08:00;True|2022-01-19T00:26:36.9722917+08:00;True|2022-01-19T00:15:30.8583143+08:00;True|2022-01-18T21:19:30.6193048+08:00;True|2022-01-18T21:12:07.1453825+08:00;True|2022-01-18T20:35:27.3779956+08:00;True|2022-01-18T17:44:45.2318570+08:00;True|2022-01-18T14:45:29.0299640+08:00;True|2022-01-17T22:23:20.8214203+08:00;True|2022-01-17T21:49:15.7740045+08:00;True|2022-01-17T21:47:24.6997598+08:00;True|2022-01-17T21:44:00.1942787+08:00;True|2022-01-17T21:43:15.5992687+08:00;True|2022-01-17T21:33:16.8034756+08:00;True|2022-01-17T21:25:39.9909343+08:00;True|2022-01-17T21:13:03.9659338+08:00;True|2022-01-17T20:32:14.8869091+08:00;True|2022-01-17T19:01:46.5753686+08:00;True|2022-01-17T18:31:24.1032169+08:00;True|2022-01-17T18:21:39.2918684+08:00;True|2022-01-17T18:12:07.4859038+08:00;True|2022-01-17T18:09:26.6989718+08:00;True|2022-01-17T18:04:36.7564997+08:00;True|2022-01-17T17:57:44.7814863+08:00;True|2022-01-17T17:51:50.1516107+08:00;True|2022-01-17T17:39:29.2918799+08:00;True|2022-01-17T14:55:21.5859341+08:00;True|2022-01-17T14:38:06.5091500+08:00;True|2022-01-17T14:30:25.5378436+08:00;True|2022-01-16T19:15:24.5874858+08:00;True|2022-01-16T19:07:49.0613424+08:00;True|2022-01-16T16:10:47.3112741+08:00;False|2022-01-14T19:09:41.9296709+08:00;False|2022-01-14T18:56:11.0569808+08:00;False|2022-01-14T18:28:20.1376762+08:00;False|2022-01-14T18:27:30.8678130+08:00;False|2022-01-14T18:22:45.4436504+08:00;False|2022-01-14T18:19:37.0374753+08:00;False|2022-01-14T18:18:48.5868254+08:00;False|2022-01-14T18:14:02.5810257+08:00;False|2022-01-14T18:09:51.1730754+08:00;False|2022-01-14T18:09:17.8940754+08:00;True|2022-01-13T20:08:16.2937608+08:00;True|2022-01-13T20:07:30.1505466+08:00;True|2022-01-13T13:39:42.0146294+08:00;True|2022-01-13T13:38:07.5062471+08:00;True|2022-01-13T11:29:49.3751232+08:00;True|2022-01-13T11:05:43.9574142+08:00;True|2022-01-13T10:33:23.1921058+08:00;True|2022-01-12T20:38:16.9165651+08:00;True|2022-01-12T20:24:46.3779264+08:00;True|2022-01-12T20:03:06.5030626+08:00;True|2022-01-12T19:44:55.4294326+08:00;True|2022-01-12T12:58:45.9548600+08:00;True|2022-01-12T11:28:44.7797749+08:00;True|2022-01-11T18:07:30.9151356+08:00;True|2022-01-11T15:06:32.7301609+08:00;True|2022-01-11T09:27:00.1766442+08:00;True|2021-12-30T14:41:56.8541015+08:00;True|2021-12-30T13:45:00.6130694+08:00;True|2021-12-30T13:44:18.7370780+08:00;True|2021-12-30T13:36:52.8171136+08:00;True|2021-12-28T19:14:22.5979649+08:00;True|2021-12-28T13:13:39.3543252+08:00;True|2021-12-27T15:31:26.6037782+08:00;True|2021-12-27T15:28:54.4824480+08:00;True|2021-12-27T15:22:47.8436108+08:00;True|2021-12-27T15:04:37.0711590+08:00;True|2021-12-27T15:03:52.0932499+08:00;True|2021-12-27T15:03:33.0172733+08:00;True|2021-12-27T13:28:27.4252747+08:00;True|2021-12-25T19:38:33.6784042+08:00;True|2021-12-24T20:47:43.3471563+08:00;True|2021-12-24T20:14:57.6946814+08:00;True|2021-12-24T19:55:21.1843105+08:00;True|2021-12-24T19:49:54.6719726+08:00;True|2021-12-24T19:38:14.1180741+08:00;True|2021-12-22T13:51:37.1082523+08:00;True|2021-12-21T15:38:59.8015096+08:00;True|2021-12-21T15:29:54.8095063+08:00;False|2021-12-21T15:29:21.7006531+08:00;False|2021-12-21T15:16:18.2218025+08:00;False|2021-12-21T15:11:38.1215841+08:00;False|2021-12-21T15:08:27.0590078+08:00;True|2021-12-10T14:12:36.4065298+08:00;True|2021-12-10T13:54:03.4921778+08:00;True|2021-12-10T13:25:49.0439086+08:00;True|2021-12-10T13:19:58.9494477+08:00;True|2021-12-10T13:10:45.3929017+08:00;True|2021-12-10T11:06:53.2416794+08:00;True|2021-12-07T17:23:28.9380484+08:00;True|2021-12-07T17:13:52.4384814+08:00;True|2021-12-07T16:39:49.2020208+08:00;True|2021-12-07T15:18:20.9024533+08:00;True|2021-12-07T15:07:35.4428035+08:00;True|2021-12-07T15:01:02.0445043+08:00;True|2021-12-07T14:50:08.9019705+08:00;True|2021-12-07T14:34:50.4993666+08:00;False|2021-12-07T14:32:56.0408332+08:00;True|2021-12-06T17:11:41.4004606+08:00;True|2021-12-06T16:48:07.6029757+08:00;True|2021-12-06T13:46:35.9437718+08:00;True|2021-12-06T13:45:07.6622615+08:00;True|2021-12-06T11:25:04.3483155+08:00;True|2021-12-06T11:18:24.5804187+08:00;True|2021-11-22T16:27:05.4241947+08:00;True|2021-11-22T13:40:17.6768280+08:00;True|2021-11-19T16:15:19.9085104+08:00;True|2021-11-09T10:34:21.1623512+08:00;True|2021-11-07T16:57:59.7380254+08:00;True|2021-11-07T16:53:47.4198852+08:00;True|2021-11-07T16:42:05.5096826+08:00;True|2021-11-07T16:37:21.0729013+08:00;True|2021-11-05T20:51:17.6170717+08:00;True|2021-11-05T20:35:14.6250333+08:00;True|2021-11-05T19:30:19.8374158+08:00;True|2021-11-05T19:22:46.2276569+08:00;True|2021-11-05T19:20:30.8253213+08:00;True|2021-11-05T19:16:45.7553310+08:00;True|2021-11-05T19:16:00.4532689+08:00;True|2021-11-05T19:12:25.9022478+08:00;False|2021-11-05T19:11:26.5753529+08:00;True|2021-11-05T19:09:30.0085433+08:00;True|2021-11-05T18:48:19.9395153+08:00;True|2021-11-05T18:45:34.3437897+08:00;True|2021-11-05T18:43:43.4558159+08:00;True|2021-11-05T18:40:40.9948500+08:00;True|2021-11-05T18:34:18.4440455+08:00;True|2021-11-05T15:54:51.6037132+08:00;True|2021-10-28T16:27:53.9728270+08:00;True|2021-10-28T16:03:59.5629998+08:00;True|2021-10-28T08:51:04.2549186+08:00;True|2021-10-27T15:14:53.5506098+08:00;True|2021-10-27T15:00:44.9100320+08:00;True|2021-10-27T13:14:46.7921647+08:00;True|2021-10-27T11:24:49.4550753+08:00;True|2021-10-27T10:10:10.3545125+08:00;True|2021-10-27T10:02:24.9248610+08:00;True|2021-10-27T09:59:40.3795897+08:00;True|2021-10-27T09:56:30.6629207+08:00;True|2021-10-27T09:10:48.3883432+08:00;True|2021-10-27T09:03:31.9191991+08:00;True|2021-10-27T08:59:59.7651159+08:00;True|2021-10-27T08:36:11.8620997+08:00;True|2021-10-27T08:26:40.2533014+08:00;True|2021-10-26T09:19:35.5674748+08:00;True|2021-10-26T09:17:17.6900747+08:00;True|2021-10-26T09:14:32.3999220+08:00;True|2021-10-25T15:08:21.2581763+08:00;True|2021-10-25T10:01:57.8524903+08:00;True|2021-10-25T09:28:51.6294879+08:00;True|2021-10-25T09:25:50.3373336+08:00;True|2021-10-25T09:23:37.0203978+08:00;True|2021-10-25T09:18:23.3380608+08:00;True|2021-10-25T09:15:10.5292071+08:00;True|2021-10-25T08:56:30.4632027+08:00;True|2021-10-25T08:50:11.4697392+08:00;True|2021-10-22T13:46:49.7207066+08:00;True|2021-10-22T10:06:33.3130089+08:00;True|2021-10-20T14:32:10.1235516+08:00;True|2021-10-20T14:16:18.6496291+08:00;True|2021-10-20T14:08:49.2443715+08:00;True|2021-10-20T14:05:14.6847950+08:00;True|2021-10-20T13:30:21.6057636+08:00;True|2021-10-20T10:55:22.2151716+08:00;True|2021-10-19T10:42:13.4198267+08:00;True|2021-10-19T10:01:41.0018108+08:00;True|2021-10-19T09:59:11.2127619+08:00;True|2021-10-19T09:54:04.8472874+08:00;True|2021-10-15T11:19:15.5327495+08:00;True|2021-10-15T11:17:41.0686485+08:00;True|2021-10-15T11:12:11.8295042+08:00;True|2021-10-15T10:33:31.5670079+08:00;True|2021-10-15T10:27:45.0815146+08:00;True|2021-10-14T14:51:28.5331025+08:00;True|2021-10-14T14:37:28.3276051+08:00;True|2021-10-14T14:23:39.0606792+08:00;True|2021-10-14T14:21:03.8140347+08:00;True|2021-10-13T10:31:10.6628977+08:00;True|2021-10-13T10:12:24.4238027+08:00;True|2021-10-13T08:47:43.9314486+08:00;True|2021-10-12T14:07:18.6065183+08:00;True|2021-10-12T10:34:10.1682362+08:00;True|2021-10-12T10:27:14.3073332+08:00;True|2021-10-12T10:22:08.0004619+08:00;True|2021-10-12T10:21:03.0275378+08:00;True|2021-10-12T10:11:54.9812692+08:00;True|2021-10-11T16:59:07.3568342+08:00;True|2021-10-11T16:53:14.2016138+08:00;True|2021-10-11T16:21:35.0133775+08:00;True|2021-10-11T15:34:19.5731935+08:00;True|2021-10-11T15:31:07.5780983+08:00;True|2021-10-11T15:06:47.1145237+08:00;True|2021-10-11T15:03:25.5000280+08:00;True|2021-10-11T10:12:57.6416898+08:00;True|2021-10-09T10:15:17.9235165+08:00;True|2021-10-09T10:13:51.3318441+08:00;True|2021-10-09T10:01:21.6661542+08:00;True|2021-10-09T09:58:41.9225837+08:00;True|2021-10-08T14:56:49.7935800+08:00;True|2021-10-08T14:35:41.4490063+08:00;True|2021-10-08T14:02:42.6990656+08:00;True|2021-09-29T15:48:55.1547397+08:00;True|2021-09-29T15:48:23.5567191+08:00;True|2021-09-27T16:17:35.7180978+08:00;True|2021-09-27T15:51:50.4240134+08:00;True|2021-09-23T20:55:27.3554447+08:00;True|2021-09-23T14:14:44.0572017+08:00;True|2021-09-23T13:51:56.2344673+08:00;True|2021-09-23T10:46:16.7417007+08:00;True|2021-09-23T10:42:23.2117537+08:00;True|2021-09-22T15:21:22.9615672+08:00;True|2021-09-22T14:23:32.7907754+08:00;True|2021-09-22T13:48:03.4780947+08:00;True|2021-09-22T11:05:24.5249356+08:00;True|2021-09-22T10:00:19.0962943+08:00;True|2021-09-22T09:30:26.2686514+08:00;True|2021-09-17T11:22:34.5692792+08:00;True|2021-09-16T16:11:27.5372277+08:00;True|2021-09-16T14:53:40.8396557+08:00;True|2021-09-16T14:32:29.7905500+08:00;True|2021-09-16T14:26:46.2224219+08:00;True|2021-09-16T10:32:24.4244440+08:00;True|2021-09-15T11:10:35.3529360+08:00;True|2021-09-15T11:08:30.0857376+08:00;True|2021-09-15T11:05:56.7191571+08:00;True|2021-09-14T01:24:39.8041136+08:00;True|2021-09-14T01:05:01.1593327+08:00;True|2021-09-14T00:44:14.7233198+08:00;True|2021-09-13T23:48:19.4506233+08:00;True|2021-09-13T20:30:31.3243872+08:00;True|2021-09-13T19:45:35.9108911+08:00;False|2021-09-13T19:44:59.2779092+08:00;True|2021-09-13T18:09:22.4994381+08:00;True|2021-09-10T14:18:27.5788854+08:00;True|2021-09-09T15:57:01.7407207+08:00;True|2021-09-09T15:49:34.2598998+08:00;True|2021-09-09T11:32:10.7853024+08:00;True|2021-09-09T11:10:48.6840025+08:00;True|2021-09-09T10:35:37.3883078+08:00;True|2021-09-07T14:11:49.8497588+08:00;True|2021-09-07T13:34:48.4693349+08:00;True|2021-09-06T14:33:48.7549675+08:00;True|2021-09-03T16:27:51.1888520+08:00;True|2021-09-03T16:19:35.9003465+08:00;True|2021-09-03T15:46:28.1828032+08:00;True|2021-09-03T15:34:21.9362871+08:00;True|2021-09-03T11:24:49.8749819+08:00;True|2021-09-03T11:21:17.8373159+08:00;True|2021-09-03T11:16:53.2208136+08:00;True|2021-09-03T11:12:23.9063804+08:00;True|2021-09-03T09:11:09.2435721+08:00;True|2021-09-02T11:16:15.1370453+08:00;True|2021-09-02T10:35:39.1171879+08:00;True|2021-09-01T10:17:09.4536285+08:00;True|2021-09-01T09:46:28.4581776+08:00;True|2021-08-31T08:54:26.8588887+08:00;True|2021-08-31T08:39:08.3685693+08:00;True|2021-08-30T17:11:56.8438985+08:00;True|2021-08-30T15:59:42.0820292+08:00;True|2021-08-30T15:45:18.1868510+08:00;True|2021-08-30T14:56:08.3958863+08:00;True|2021-08-30T14:37:11.5379830+08:00;True|2021-08-30T14:35:34.8775934+08:00;True|2021-08-30T14:24:36.5111821+08:00;True|2021-08-30T10:05:49.6945200+08:00;True|2021-08-30T10:03:28.4064538+08:00;True|2021-08-30T10:00:16.8360929+08:00;True|2021-08-30T09:56:09.4434379+08:00;True|2021-08-30T09:55:36.1725334+08:00;True|2021-08-30T09:52:04.8600054+08:00;True|2021-08-30T09:47:46.4225655+08:00;True|2021-08-30T09:45:20.4894962+08:00;False|2021-08-27T17:17:34.2646751+08:00;False|2021-08-27T16:01:21.2791979+08:00;False|2021-08-27T15:58:06.9667160+08:00;False|2021-08-27T15:38:37.4818036+08:00;False|2021-08-27T15:21:02.8863114+08:00;False|2021-08-27T15:20:28.6828668+08:00;True|2021-08-26T16:00:44.3162145+08:00;True|2021-08-26T08:57:31.3842587+08:00;True|2021-08-23T08:43:41.1549775+08:00;True|2021-08-22T09:24:12.7210871+08:00;True|2021-08-22T09:19:53.8300229+08:00;True|2021-08-20T20:00:52.0140407+08:00;True|2021-08-20T19:40:14.7712765+08:00;True|2021-08-19T17:37:54.9748049+08:00;True|2021-08-19T17:20:11.0515687+08:00;True|2021-08-19T16:12:35.4392809+08:00;True|2021-08-19T16:06:50.6204587+08:00;True|2021-08-19T16:03:53.0824286+08:00;True|2021-08-19T15:56:01.3498791+08:00;True|2021-08-19T10:18:50.8113630+08:00;True|2021-08-19T09:58:06.2784035+08:00;True|2021-08-19T09:56:54.0619777+08:00;True|2021-08-19T00:32:08.3503093+08:00;True|2021-08-19T00:11:18.3150227+08:00;True|2021-08-19T00:02:49.4827718+08:00;True|2021-08-18T23:54:45.4845900+08:00;True|2021-08-18T23:39:51.6147977+08:00;True|2021-08-18T23:16:42.7214379+08:00;True|2021-08-18T22:38:57.4681929+08:00;True|2021-08-18T21:41:58.7560707+08:00;True|2021-08-18T21:11:52.2369249+08:00;True|2021-08-18T21:01:49.5669106+08:00;True|2021-08-18T20:47:46.5352688+08:00;False|2021-08-18T20:46:36.7956141+08:00;False|2021-08-18T20:46:01.0502138+08:00;True|2021-08-18T19:39:12.8186242+08:00;False|2021-08-18T19:38:12.6839708+08:00;True|2021-08-18T19:15:51.4626694+08:00;True|2021-08-18T16:07:20.4350886+08:00;True|2021-08-18T14:29:41.7171934+08:00;True|2021-08-18T14:20:36.3647361+08:00;True|2021-08-16T09:08:58.3617662+08:00;True|2021-08-15T20:44:29.9214083+08:00;True|2021-08-15T20:36:17.0958549+08:00;True|2021-08-15T20:29:34.3879773+08:00;True|2021-08-15T20:23:47.4052038+08:00;True|2021-08-15T15:01:19.7830862+08:00;True|2021-08-15T12:15:18.3433782+08:00;True|2021-08-13T20:59:11.3947130+08:00;True|2021-08-06T22:49:09.9538339+08:00;True|2021-08-06T22:35:19.0418168+08:00;True|2021-08-06T20:29:47.4241975+08:00;True|2021-08-06T14:08:16.4791827+08:00;True|2021-08-06T13:59:28.9874611+08:00;True|2021-08-06T13:57:34.3723977+08:00;True|2021-08-06T13:36:03.4816652+08:00;True|2021-08-06T12:22:52.5055221+08:00;True|2021-08-06T09:31:58.1272499+08:00;True|2021-08-06T09:26:51.6310039+08:00;True|2021-08-06T09:24:22.2899244+08:00;True|2021-08-06T09:06:30.6477912+08:00;True|2021-08-06T09:00:55.5101612+08:00;True|2021-08-06T08:49:59.9616490+08:00;True|2021-08-06T08:45:18.8586902+08:00;True|2021-08-05T20:09:25.8861998+08:00;True|2021-08-04T19:14:27.2396953+08:00;True|2021-08-04T19:11:47.5849093+08:00;True|2021-08-04T16:42:54.0149043+08:00;True|2021-08-04T15:02:11.5056561+08:00;True|2021-08-04T14:58:37.1435509+08:00;True|2021-08-04T14:55:34.7380132+08:00;True|2021-08-04T14:47:42.5933921+08:00;True|2021-08-04T14:45:17.9911874+08:00;True|2021-08-04T13:52:20.9601351+08:00;True|2021-08-04T09:48:28.8796992+08:00;True|2021-08-03T18:14:13.1894998+08:00;True|2021-08-03T17:45:35.1349721+08:00;True|2021-08-03T17:21:52.6028977+08:00;True|2021-08-03T17:20:35.4423020+08:00;True|2021-08-03T17:03:33.1667669+08:00;True|2021-08-03T17:01:54.2656787+08:00;True|2021-08-03T17:00:22.2778374+08:00;True|2021-08-03T16:56:58.8902582+08:00;True|2021-08-03T15:02:21.8601533+08:00;True|2021-08-03T14:57:34.0186758+08:00;True|2021-08-03T14:28:47.2242515+08:00;True|2021-08-03T14:22:22.4554236+08:00;True|2021-08-03T14:21:51.1339715+08:00;True|2021-08-03T13:37:33.9697131+08:00;True|2021-08-03T13:28:29.7591095+08:00;True|2021-08-03T11:35:09.5118324+08:00;True|2021-08-03T11:11:23.3051573+08:00;True|2021-08-02T13:14:42.3663755+08:00;True|2021-07-30T22:50:19.9749878+08:00;True|2021-07-30T22:49:31.2150970+08:00;True|2021-07-28T19:12:05.8381075+08:00;True|2021-07-28T18:59:45.4808797+08:00;True|2021-07-28T18:15:58.8301509+08:00;True|2021-07-28T18:04:54.8613546+08:00;True|2021-07-28T17:53:48.6225611+08:00;True|2021-07-28T17:42:50.9171563+08:00;True|2021-07-28T17:17:16.3137677+08:00;True|2021-07-28T17:11:46.8925200+08:00;True|2021-07-28T16:28:27.6823943+08:00;True|2021-07-28T16:23:00.3385836+08:00;True|2021-07-28T09:57:55.4237411+08:00;True|2021-07-28T08:38:29.6691541+08:00;True|2021-07-27T23:16:32.0331671+08:00;True|2021-07-27T23:06:08.1947249+08:00;True|2021-07-27T23:05:58.4619176+08:00;True|2021-07-27T18:42:09.5358261+08:00;True|2021-07-27T18:30:04.8532823+08:00;True|2021-07-27T18:29:43.5775092+08:00;True|2021-07-27T15:16:49.8356224+08:00;True|2021-07-27T15:05:27.8453220+08:00;True|2021-07-27T14:59:15.9519440+08:00;True|2021-07-27T09:23:32.6111337+08:00;True|2021-07-27T08:27:41.6395353+08:00;True|2021-07-27T08:25:56.7378296+08:00;True|2021-07-26T11:18:46.0856966+08:00;True|2021-07-26T11:18:02.0751924+08:00;True|2021-07-26T11:13:49.6285395+08:00;True|2021-07-21T21:08:25.9898902+08:00;True|2021-07-21T20:09:26.2258104+08:00;True|2021-07-13T16:17:25.8407435+08:00;True|2021-07-13T13:46:13.4309531+08:00;True|2021-07-13T12:29:04.5082461+08:00;True|2021-06-29T13:55:01.6864637+08:00;True|2021-06-29T10:38:52.2206472+08:00;True|2021-06-29T10:10:13.1540749+08:00;True|2021-06-28T14:37:56.3853273+08:00;False|2021-06-28T14:36:57.5726124+08:00;True|2021-06-25T14:17:57.5196108+08:00;True|2021-06-25T13:56:38.9522535+08:00;True|2021-06-24T19:38:32.8766933+08:00;True|2021-06-24T18:26:35.6118833+08:00;True|2021-06-24T18:02:52.8136877+08:00;True|2021-06-24T17:48:49.5851948+08:00;True|2021-06-24T17:45:46.7527572+08:00;True|2021-06-24T15:05:20.1592723+08:00;True|2021-06-23T16:18:15.6814625+08:00;True|2021-06-23T16:05:24.6112343+08:00;True|2021-06-23T15:14:08.2489658+08:00;True|2021-06-23T13:52:58.6029788+08:00;True|2021-06-22T16:11:20.4726923+08:00;True|2021-06-22T16:04:53.7231389+08:00;True|2021-06-22T15:50:59.2583262+08:00;True|2021-06-22T15:38:15.3016140+08:00;True|2021-06-22T15:34:42.9185543+08:00;True|2021-06-22T15:21:55.1419108+08:00;True|2021-06-22T15:07:21.5357494+08:00;True|2021-06-22T15:03:35.0535733+08:00;True|2021-06-22T14:54:47.8802969+08:00;True|2021-06-22T11:19:38.7303011+08:00;True|2021-06-22T08:53:49.2882695+08:00;True|2021-06-22T08:47:54.8286530+08:00;True|2021-06-21T16:27:19.3017700+08:00;True|2021-06-21T15:32:28.7237952+08:00;True|2021-06-21T12:34:02.6329555+08:00;True|2021-06-21T12:24:17.5427495+08:00;True|2021-06-21T10:47:30.6423502+08:00;True|2021-06-21T08:43:20.3026558+08:00;True|2021-06-19T15:10:06.8335499+08:00;True|2021-06-18T15:37:29.5009930+08:00;True|2021-06-18T13:46:35.6283432+08:00;True|2021-06-18T10:00:37.1474954+08:00;True|2021-06-18T09:55:21.8551780+08:00;True|2021-06-18T09:22:27.8432927+08:00;True|2021-06-17T11:17:43.2166430+08:00;True|2021-06-17T09:24:09.8350403+08:00;True|2021-06-16T16:10:47.8564888+08:00;True|2021-06-16T16:04:09.8286582+08:00;True|2021-06-16T15:12:29.9427169+08:00;True|2021-06-16T14:58:45.6801892+08:00;True|2021-06-16T14:46:01.6873221+08:00;True|2021-06-16T11:02:06.1272477+08:00;True|2021-06-16T09:33:56.0223915+08:00;True|2021-06-16T08:50:07.6995413+08:00;True|2021-06-16T08:28:38.7692635+08:00;True|2021-06-16T01:04:19.6282474+08:00;True|2021-06-16T01:03:50.5058323+08:00;False|2021-06-16T01:02:15.3819672+08:00;False|2021-06-16T01:01:38.6171098+08:00;True|2021-06-16T00:34:54.9902044+08:00;True|2021-06-15T23:55:36.2003828+08:00;True|2021-06-15T22:47:17.2192750+08:00;True|2021-06-15T22:42:41.1512585+08:00;True|2021-06-15T22:38:01.7390462+08:00;True|2021-06-15T22:14:11.2060782+08:00;True|2021-06-15T22:12:27.0615357+08:00;True|2021-06-15T22:07:59.9280871+08:00;True|2021-06-15T22:04:21.5051427+08:00;True|2021-06-15T21:25:55.0099814+08:00;True|2021-06-15T19:13:51.3494172+08:00;True|2021-06-15T19:02:17.6844742+08:00;True|2021-06-15T18:47:37.1629411+08:00;False|2021-06-15T18:47:11.0828111+08:00;True|2021-06-15T18:38:26.6620668+08:00;True|2021-06-15T18:33:45.2069831+08:00;True|2021-06-15T18:24:52.0550838+08:00;True|2021-06-15T18:19:43.6999796+08:00;True|2021-06-15T18:08:17.2464506+08:00;True|2021-06-15T18:03:51.3952624+08:00;True|2021-06-15T18:01:20.6141766+08:00;True|2021-06-15T17:59:04.4479416+08:00;True|2021-06-15T17:41:44.6389379+08:00;True|2021-06-15T17:39:03.1565124+08:00;True|2021-06-15T17:34:41.0634638+08:00;True|2021-06-15T17:33:50.4853178+08:00;True|2021-06-15T17:25:38.5914037+08:00;True|2021-06-15T17:22:21.3611360+08:00;True|2021-06-15T17:16:49.4970813+08:00;True|2021-06-15T17:05:28.9389484+08:00;True|2021-06-15T16:52:54.6372199+08:00;True|2021-06-15T16:51:23.9081030+08:00;True|2021-06-15T16:45:40.6017997+08:00;True|2021-06-15T16:41:05.0218887+08:00;True|2021-06-15T16:38:02.8541862+08:00;True|2021-06-15T16:22:10.3118721+08:00;True|2021-06-15T16:12:11.1552506+08:00;True|2021-06-15T15:33:42.0100494+08:00;True|2021-06-15T15:28:39.7145659+08:00;True|2021-06-15T15:15:02.7939125+08:00;True|2021-06-15T14:49:14.2300396+08:00;True|2021-06-15T14:42:28.1198064+08:00;True|2021-06-15T13:30:12.7997686+08:00;True|2021-06-15T13:25:37.7284670+08:00;True|2021-06-15T13:23:43.6207813+08:00;False|2021-06-15T13:23:19.4190232+08:00;True|2021-06-15T13:16:38.5062674+08:00;True|2021-06-15T13:03:31.2055635+08:00;True|2021-06-15T12:58:43.1653215+08:00;True|2021-06-15T12:39:22.8442109+08:00;True|2021-06-15T12:35:09.1288556+08:00;False|2021-06-15T12:33:50.0723143+08:00;True|2021-06-15T11:28:01.9733727+08:00;True|2021-06-15T11:26:26.6569392+08:00;True|2021-06-15T11:22:43.0366435+08:00;True|2021-06-15T11:07:50.1610580+08:00;True|2021-06-15T10:32:59.1925931+08:00;True|2021-06-10T17:16:57.9552310+08:00;True|2021-06-10T16:44:42.2731836+08:00;True|2021-06-10T14:39:27.6745737+08:00;True|2021-06-10T12:15:05.1524413+08:00;True|2021-06-09T18:19:24.1005606+08:00;True|2021-06-09T17:56:09.5646288+08:00;True|2021-06-09T13:34:06.1882292+08:00;True|2021-06-09T13:29:54.5924933+08:00;True|2021-06-09T13:25:55.7520662+08:00;True|2021-06-09T13:07:47.6686811+08:00;True|2021-06-09T12:59:41.2595048+08:00;True|2021-06-09T12:45:27.1305548+08:00;True|2021-06-09T12:29:52.1418191+08:00;True|2021-06-09T12:24:12.7610588+08:00;True|2021-06-09T11:31:25.3409568+08:00;True|2021-06-09T09:57:44.4387175+08:00;True|2021-06-09T09:54:26.5161307+08:00;True|2021-06-09T09:14:14.7288045+08:00;True|2021-06-09T09:10:25.1812139+08:00;True|2021-06-09T08:46:21.6585123+08:00;True|2021-06-08T19:56:55.7192062+08:00;True|2021-06-08T19:52:59.0326821+08:00;True|2021-06-08T19:49:13.6274217+08:00;True|2021-06-08T19:09:22.1038939+08:00;True|2021-06-08T15:28:41.3716247+08:00;True|2021-06-08T15:26:47.2621178+08:00;True|2021-06-08T13:49:45.8936617+08:00;True|2021-06-08T13:43:18.8115502+08:00;True|2021-06-08T10:04:06.2200731+08:00;True|2021-06-08T09:17:10.0470792+08:00;True|2021-06-08T08:44:37.4395849+08:00;True|2021-06-08T00:01:09.3745613+08:00;True|2021-06-07T23:49:31.5196888+08:00;True|2021-06-07T23:41:00.8017855+08:00;True|2021-06-07T23:21:53.1371134+08:00;True|2021-06-07T23:01:27.5712153+08:00;True|2021-06-07T22:36:12.9274014+08:00;True|2021-06-07T22:23:00.6545134+08:00;True|2021-06-07T17:44:47.5686346+08:00;True|2021-06-07T17:17:01.3431233+08:00;True|2021-06-07T16:53:28.9989587+08:00;True|2021-06-07T16:41:10.4975607+08:00;True|2021-06-07T14:21:06.8176477+08:00;True|2021-06-07T14:10:39.0355659+08:00;True|2021-06-07T12:34:31.4562732+08:00;True|2021-06-07T12:28:44.9629488+08:00;True|2021-06-07T10:30:26.9387988+08:00;True|2021-06-07T09:12:14.7658099+08:00;True|2021-06-07T08:37:19.6353792+08:00;True|2021-06-07T08:35:25.2031954+08:00;True|2021-06-05T07:07:32.0541266+08:00;True|2021-06-05T06:44:35.9475270+08:00;True|2021-06-05T06:37:27.4595197+08:00;True|2021-06-05T06:26:59.7663998+08:00;True|2021-06-05T05:43:12.8699318+08:00;True|2021-06-04T17:00:41.2426007+08:00;True|2021-06-04T16:08:03.8078072+08:00;True|2021-06-04T15:47:21.6412616+08:00;True|2021-06-04T15:21:02.4239800+08:00;True|2021-06-04T15:20:37.8641854+08:00;True|2021-06-04T13:38:51.5088395+08:00;True|2021-06-04T10:20:01.7784282+08:00;True|2021-06-04T10:13:50.3548857+08:00;True|2021-06-04T10:11:25.5017821+08:00;True|2021-06-04T10:09:51.6792228+08:00;True|2021-06-04T10:02:39.5851057+08:00;True|2021-06-04T09:30:40.4495494+08:00;True|2021-06-03T13:16:36.0317546+08:00;True|2021-06-03T13:12:47.0402047+08:00;True|2021-06-02T14:37:08.9683351+08:00;True|2021-06-02T14:10:15.7439829+08:00;True|2021-06-02T13:59:46.5841931+08:00;True|2021-06-02T13:25:18.7962660+08:00;True|2021-06-02T13:23:16.2261980+08:00;True|2021-06-01T15:37:32.2495085+08:00;True|2021-06-01T15:21:01.2856122+08:00;True|2021-06-01T15:13:36.7262365+08:00;True|2021-06-01T15:10:26.8905629+08:00;True|2021-06-01T14:56:17.5231551+08:00;True|2021-06-01T14:38:39.7895927+08:00;True|2021-06-01T14:23:12.3265287+08:00;True|2021-03-01T09:11:31.3226422+08:00;True|2021-05-26T14:54:56.9426462+08:00;True|2021-05-26T13:57:33.7780451+08:00;True|2021-05-26T13:39:02.8043358+08:00;True|2021-02-25T16:01:40.2917200+08:00;True|2021-02-25T15:49:46.6681205+08:00;True|2021-02-25T15:16:30.9372640+08:00;True|2021-05-25T13:10:21.7831921+08:00;True|2021-05-25T11:21:38.5224475+08:00;True|2021-05-25T11:12:52.0637175+08:00;True|2021-05-25T11:02:18.4164663+08:00;True|2021-05-25T10:52:06.8998521+08:00;True|2021-05-25T10:50:45.0929606+08:00;True|2021-05-25T10:45:54.1498313+08:00;True|2021-05-25T10:39:27.8602249+08:00;True|2021-05-25T10:34:49.5771162+08:00;True|2021-05-25T10:17:30.3009163+08:00;True|2021-05-25T10:14:03.8512581+08:00;True|2021-05-25T10:05:33.4343836+08:00;True|2021-05-24T17:01:23.3221168+08:00;True|2021-05-24T10:11:24.0197347+08:00;False|2021-05-24T10:11:07.6338995+08:00;</History>
+ <History>True|2022-06-17T03:19:24.4893458Z;True|2022-06-07T14:44:51.5702202+08:00;True|2022-06-07T14:42:44.8351600+08:00;True|2022-05-17T14:19:55.1158182+08:00;True|2022-05-17T13:25:44.2886247+08:00;True|2022-05-17T10:29:26.6813564+08:00;True|2022-05-17T09:02:49.1742018+08:00;True|2022-05-06T15:13:12.2438900+08:00;True|2022-05-06T14:49:39.8536594+08:00;True|2022-04-22T17:07:44.8823529+08:00;True|2022-04-19T19:13:40.8312746+08:00;True|2022-04-19T15:40:16.0022040+08:00;True|2022-04-19T15:13:32.9767736+08:00;False|2022-04-19T15:08:33.6507639+08:00;True|2022-04-19T15:02:51.9580210+08:00;True|2022-04-19T13:54:18.7579131+08:00;True|2022-04-12T10:36:02.1779173+08:00;True|2022-04-12T10:05:31.0222037+08:00;True|2022-04-12T09:47:49.3724819+08:00;True|2022-04-09T15:08:54.5697468+08:00;True|2022-04-08T17:31:31.0046258+08:00;True|2022-04-08T16:50:41.3018422+08:00;True|2022-04-08T10:35:36.5029980+08:00;True|2022-03-31T09:38:37.3646053+08:00;True|2022-03-29T13:57:45.4410942+08:00;True|2022-03-10T18:59:23.7994337+08:00;True|2022-03-10T18:52:39.5019082+08:00;True|2022-03-10T18:51:12.7949284+08:00;True|2022-03-10T18:50:47.2024177+08:00;True|2022-03-10T18:45:08.8409380+08:00;True|2022-03-10T18:41:17.0102564+08:00;True|2022-03-10T18:35:49.0742353+08:00;True|2022-03-10T17:57:47.4196965+08:00;True|2022-03-10T17:34:27.5723245+08:00;True|2022-03-10T16:13:59.3829164+08:00;True|2022-03-09T14:50:49.1222033+08:00;True|2022-03-09T11:21:03.0073651+08:00;False|2022-03-09T11:16:56.1792896+08:00;False|2022-03-09T11:16:49.7923320+08:00;True|2022-03-08T15:47:47.4722336+08:00;True|2022-03-08T15:47:28.5397115+08:00;True|2022-03-08T15:37:08.7379870+08:00;True|2022-03-02T17:37:54.4659976+08:00;True|2022-03-02T17:34:12.2949726+08:00;True|2022-03-02T17:26:38.7070673+08:00;True|2022-03-02T17:07:49.7024316+08:00;True|2022-03-02T17:05:22.4177336+08:00;True|2022-03-02T16:14:57.9880587+08:00;True|2022-03-01T17:52:52.6766959+08:00;True|2022-02-28T14:36:22.6449303+08:00;True|2022-02-24T15:43:36.8244163+08:00;True|2022-02-23T17:57:14.3693224+08:00;True|2022-02-23T17:46:42.1078183+08:00;False|2022-02-23T17:41:06.5886724+08:00;True|2022-02-23T16:59:45.5533581+08:00;True|2022-02-23T16:57:43.3328895+08:00;True|2022-02-21T09:09:37.2601134+08:00;True|2022-02-21T09:03:32.4071009+08:00;True|2022-02-21T08:59:59.0172082+08:00;True|2022-02-18T14:05:39.1358825+08:00;True|2022-02-18T10:23:02.4391239+08:00;True|2022-02-18T10:21:31.0559267+08:00;True|2022-02-17T16:50:11.7192509+08:00;True|2022-02-17T13:19:13.7697894+08:00;True|2022-02-11T10:36:12.7757100+08:00;True|2022-02-10T10:54:25.2685040+08:00;True|2022-02-10T10:37:02.1034768+08:00;True|2022-02-09T17:32:45.6511283+08:00;True|2022-02-09T17:24:32.5115193+08:00;True|2022-02-09T17:00:24.0662114+08:00;True|2022-02-09T16:56:42.3364622+08:00;True|2022-02-09T14:17:25.8688855+08:00;True|2022-02-09T14:11:51.6149822+08:00;True|2022-02-07T23:29:26.2842648+08:00;True|2022-02-07T23:28:58.8242274+08:00;False|2022-02-07T23:25:29.0647793+08:00;True|2022-02-07T13:06:37.5515985+08:00;True|2022-02-07T12:42:19.5220491+08:00;True|2022-02-07T09:52:59.6728595+08:00;True|2022-02-01T11:32:10.5831557+08:00;True|2022-01-29T14:09:02.9178986+08:00;True|2022-01-28T12:01:45.1416438+08:00;True|2022-01-28T11:03:41.6361866+08:00;True|2022-01-28T10:44:53.5367862+08:00;True|2022-01-28T10:40:41.6697563+08:00;True|2022-01-28T10:25:56.7093616+08:00;True|2022-01-28T09:58:13.0733060+08:00;True|2022-01-27T09:26:29.6568807+08:00;True|2022-01-27T00:47:57.9102528+08:00;True|2022-01-27T00:46:52.8845001+08:00;True|2022-01-27T00:36:34.5330938+08:00;True|2022-01-27T00:35:19.5439329+08:00;True|2022-01-27T00:33:38.5701950+08:00;True|2022-01-27T00:32:00.9028982+08:00;True|2022-01-27T00:30:13.2390921+08:00;True|2022-01-27T00:28:23.2989144+08:00;True|2022-01-27T00:16:01.3789455+08:00;True|2022-01-27T00:09:58.8112352+08:00;True|2022-01-27T00:00:40.8353538+08:00;True|2022-01-26T23:37:50.9494735+08:00;True|2022-01-26T23:29:39.8647473+08:00;True|2022-01-26T23:20:49.3274392+08:00;True|2022-01-26T23:15:53.7037293+08:00;True|2022-01-26T23:06:28.8595953+08:00;True|2022-01-26T23:02:12.9882299+08:00;True|2022-01-26T22:55:33.2535730+08:00;True|2022-01-26T22:51:01.8427947+08:00;True|2022-01-26T22:47:44.0715387+08:00;True|2022-01-26T22:20:21.7217039+08:00;True|2022-01-26T22:13:39.5372069+08:00;True|2022-01-26T22:01:31.2113177+08:00;True|2022-01-26T21:55:26.5478921+08:00;True|2022-01-26T21:50:18.2700369+08:00;True|2022-01-26T21:48:52.0020233+08:00;True|2022-01-26T19:19:29.4530523+08:00;True|2022-01-26T19:07:21.6474231+08:00;True|2022-01-26T18:25:42.2933291+08:00;True|2022-01-26T12:39:02.0149050+08:00;True|2022-01-26T12:13:43.9149452+08:00;True|2022-01-26T11:24:33.5742248+08:00;True|2022-01-26T08:51:10.8105076+08:00;True|2022-01-25T21:07:32.9069261+08:00;True|2022-01-24T01:35:12.3309466+08:00;True|2022-01-23T23:19:15.9702821+08:00;True|2022-01-23T21:50:41.6903353+08:00;True|2022-01-23T21:25:57.6084267+08:00;True|2022-01-23T21:16:10.1516535+08:00;True|2022-01-23T20:52:08.3745284+08:00;True|2022-01-23T18:19:32.2386502+08:00;True|2022-01-23T18:11:42.0830325+08:00;True|2022-01-23T18:00:01.3239547+08:00;True|2022-01-23T12:18:48.2466943+08:00;True|2022-01-22T00:48:50.4531647+08:00;True|2022-01-21T13:10:32.8173598+08:00;True|2022-01-21T13:04:01.6388059+08:00;True|2022-01-21T12:51:40.5304103+08:00;True|2022-01-21T12:44:06.3059885+08:00;True|2022-01-21T12:34:33.9314010+08:00;True|2022-01-21T11:39:20.1088577+08:00;True|2022-01-20T11:33:49.0516846+08:00;True|2022-01-20T10:02:12.0295471+08:00;True|2022-01-20T10:02:03.3535503+08:00;True|2022-01-19T23:56:18.7293193+08:00;True|2022-01-19T22:30:14.6986228+08:00;True|2022-01-19T22:15:08.8608795+08:00;True|2022-01-19T21:57:55.2295030+08:00;True|2022-01-19T13:50:37.8588759+08:00;True|2022-01-19T13:42:52.9761531+08:00;True|2022-01-19T00:26:36.9722917+08:00;True|2022-01-19T00:15:30.8583143+08:00;True|2022-01-18T21:19:30.6193048+08:00;True|2022-01-18T21:12:07.1453825+08:00;True|2022-01-18T20:35:27.3779956+08:00;True|2022-01-18T17:44:45.2318570+08:00;True|2022-01-18T14:45:29.0299640+08:00;True|2022-01-17T22:23:20.8214203+08:00;True|2022-01-17T21:49:15.7740045+08:00;True|2022-01-17T21:47:24.6997598+08:00;True|2022-01-17T21:44:00.1942787+08:00;True|2022-01-17T21:43:15.5992687+08:00;True|2022-01-17T21:33:16.8034756+08:00;True|2022-01-17T21:25:39.9909343+08:00;True|2022-01-17T21:13:03.9659338+08:00;True|2022-01-17T20:32:14.8869091+08:00;True|2022-01-17T19:01:46.5753686+08:00;True|2022-01-17T18:31:24.1032169+08:00;True|2022-01-17T18:21:39.2918684+08:00;True|2022-01-17T18:12:07.4859038+08:00;True|2022-01-17T18:09:26.6989718+08:00;True|2022-01-17T18:04:36.7564997+08:00;True|2022-01-17T17:57:44.7814863+08:00;True|2022-01-17T17:51:50.1516107+08:00;True|2022-01-17T17:39:29.2918799+08:00;True|2022-01-17T14:55:21.5859341+08:00;True|2022-01-17T14:38:06.5091500+08:00;True|2022-01-17T14:30:25.5378436+08:00;True|2022-01-16T19:15:24.5874858+08:00;True|2022-01-16T19:07:49.0613424+08:00;True|2022-01-16T16:10:47.3112741+08:00;False|2022-01-14T19:09:41.9296709+08:00;False|2022-01-14T18:56:11.0569808+08:00;False|2022-01-14T18:28:20.1376762+08:00;False|2022-01-14T18:27:30.8678130+08:00;False|2022-01-14T18:22:45.4436504+08:00;False|2022-01-14T18:19:37.0374753+08:00;False|2022-01-14T18:18:48.5868254+08:00;False|2022-01-14T18:14:02.5810257+08:00;False|2022-01-14T18:09:51.1730754+08:00;False|2022-01-14T18:09:17.8940754+08:00;True|2022-01-13T20:08:16.2937608+08:00;True|2022-01-13T20:07:30.1505466+08:00;True|2022-01-13T13:39:42.0146294+08:00;True|2022-01-13T13:38:07.5062471+08:00;True|2022-01-13T11:29:49.3751232+08:00;True|2022-01-13T11:05:43.9574142+08:00;True|2022-01-13T10:33:23.1921058+08:00;True|2022-01-12T20:38:16.9165651+08:00;True|2022-01-12T20:24:46.3779264+08:00;True|2022-01-12T20:03:06.5030626+08:00;True|2022-01-12T19:44:55.4294326+08:00;True|2022-01-12T12:58:45.9548600+08:00;True|2022-01-12T11:28:44.7797749+08:00;True|2022-01-11T18:07:30.9151356+08:00;True|2022-01-11T15:06:32.7301609+08:00;True|2022-01-11T09:27:00.1766442+08:00;True|2021-12-30T14:41:56.8541015+08:00;True|2021-12-30T13:45:00.6130694+08:00;True|2021-12-30T13:44:18.7370780+08:00;True|2021-12-30T13:36:52.8171136+08:00;True|2021-12-28T19:14:22.5979649+08:00;True|2021-12-28T13:13:39.3543252+08:00;True|2021-12-27T15:31:26.6037782+08:00;True|2021-12-27T15:28:54.4824480+08:00;True|2021-12-27T15:22:47.8436108+08:00;True|2021-12-27T15:04:37.0711590+08:00;True|2021-12-27T15:03:52.0932499+08:00;True|2021-12-27T15:03:33.0172733+08:00;True|2021-12-27T13:28:27.4252747+08:00;True|2021-12-25T19:38:33.6784042+08:00;True|2021-12-24T20:47:43.3471563+08:00;True|2021-12-24T20:14:57.6946814+08:00;True|2021-12-24T19:55:21.1843105+08:00;True|2021-12-24T19:49:54.6719726+08:00;True|2021-12-24T19:38:14.1180741+08:00;True|2021-12-22T13:51:37.1082523+08:00;True|2021-12-21T15:38:59.8015096+08:00;True|2021-12-21T15:29:54.8095063+08:00;False|2021-12-21T15:29:21.7006531+08:00;False|2021-12-21T15:16:18.2218025+08:00;False|2021-12-21T15:11:38.1215841+08:00;False|2021-12-21T15:08:27.0590078+08:00;True|2021-12-10T14:12:36.4065298+08:00;True|2021-12-10T13:54:03.4921778+08:00;True|2021-12-10T13:25:49.0439086+08:00;True|2021-12-10T13:19:58.9494477+08:00;True|2021-12-10T13:10:45.3929017+08:00;True|2021-12-10T11:06:53.2416794+08:00;True|2021-12-07T17:23:28.9380484+08:00;True|2021-12-07T17:13:52.4384814+08:00;True|2021-12-07T16:39:49.2020208+08:00;True|2021-12-07T15:18:20.9024533+08:00;True|2021-12-07T15:07:35.4428035+08:00;True|2021-12-07T15:01:02.0445043+08:00;True|2021-12-07T14:50:08.9019705+08:00;True|2021-12-07T14:34:50.4993666+08:00;False|2021-12-07T14:32:56.0408332+08:00;True|2021-12-06T17:11:41.4004606+08:00;True|2021-12-06T16:48:07.6029757+08:00;True|2021-12-06T13:46:35.9437718+08:00;True|2021-12-06T13:45:07.6622615+08:00;True|2021-12-06T11:25:04.3483155+08:00;True|2021-12-06T11:18:24.5804187+08:00;True|2021-11-22T16:27:05.4241947+08:00;True|2021-11-22T13:40:17.6768280+08:00;True|2021-11-19T16:15:19.9085104+08:00;True|2021-11-09T10:34:21.1623512+08:00;True|2021-11-07T16:57:59.7380254+08:00;True|2021-11-07T16:53:47.4198852+08:00;True|2021-11-07T16:42:05.5096826+08:00;True|2021-11-07T16:37:21.0729013+08:00;True|2021-11-05T20:51:17.6170717+08:00;True|2021-11-05T20:35:14.6250333+08:00;True|2021-11-05T19:30:19.8374158+08:00;True|2021-11-05T19:22:46.2276569+08:00;True|2021-11-05T19:20:30.8253213+08:00;True|2021-11-05T19:16:45.7553310+08:00;True|2021-11-05T19:16:00.4532689+08:00;True|2021-11-05T19:12:25.9022478+08:00;False|2021-11-05T19:11:26.5753529+08:00;True|2021-11-05T19:09:30.0085433+08:00;True|2021-11-05T18:48:19.9395153+08:00;True|2021-11-05T18:45:34.3437897+08:00;True|2021-11-05T18:43:43.4558159+08:00;True|2021-11-05T18:40:40.9948500+08:00;True|2021-11-05T18:34:18.4440455+08:00;True|2021-11-05T15:54:51.6037132+08:00;True|2021-10-28T16:27:53.9728270+08:00;True|2021-10-28T16:03:59.5629998+08:00;True|2021-10-28T08:51:04.2549186+08:00;True|2021-10-27T15:14:53.5506098+08:00;True|2021-10-27T15:00:44.9100320+08:00;True|2021-10-27T13:14:46.7921647+08:00;True|2021-10-27T11:24:49.4550753+08:00;True|2021-10-27T10:10:10.3545125+08:00;True|2021-10-27T10:02:24.9248610+08:00;True|2021-10-27T09:59:40.3795897+08:00;True|2021-10-27T09:56:30.6629207+08:00;True|2021-10-27T09:10:48.3883432+08:00;True|2021-10-27T09:03:31.9191991+08:00;True|2021-10-27T08:59:59.7651159+08:00;True|2021-10-27T08:36:11.8620997+08:00;True|2021-10-27T08:26:40.2533014+08:00;True|2021-10-26T09:19:35.5674748+08:00;True|2021-10-26T09:17:17.6900747+08:00;True|2021-10-26T09:14:32.3999220+08:00;True|2021-10-25T15:08:21.2581763+08:00;True|2021-10-25T10:01:57.8524903+08:00;True|2021-10-25T09:28:51.6294879+08:00;True|2021-10-25T09:25:50.3373336+08:00;True|2021-10-25T09:23:37.0203978+08:00;True|2021-10-25T09:18:23.3380608+08:00;True|2021-10-25T09:15:10.5292071+08:00;True|2021-10-25T08:56:30.4632027+08:00;True|2021-10-25T08:50:11.4697392+08:00;True|2021-10-22T13:46:49.7207066+08:00;True|2021-10-22T10:06:33.3130089+08:00;True|2021-10-20T14:32:10.1235516+08:00;True|2021-10-20T14:16:18.6496291+08:00;True|2021-10-20T14:08:49.2443715+08:00;True|2021-10-20T14:05:14.6847950+08:00;True|2021-10-20T13:30:21.6057636+08:00;True|2021-10-20T10:55:22.2151716+08:00;True|2021-10-19T10:42:13.4198267+08:00;True|2021-10-19T10:01:41.0018108+08:00;True|2021-10-19T09:59:11.2127619+08:00;True|2021-10-19T09:54:04.8472874+08:00;True|2021-10-15T11:19:15.5327495+08:00;True|2021-10-15T11:17:41.0686485+08:00;True|2021-10-15T11:12:11.8295042+08:00;True|2021-10-15T10:33:31.5670079+08:00;True|2021-10-15T10:27:45.0815146+08:00;True|2021-10-14T14:51:28.5331025+08:00;True|2021-10-14T14:37:28.3276051+08:00;True|2021-10-14T14:23:39.0606792+08:00;True|2021-10-14T14:21:03.8140347+08:00;True|2021-10-13T10:31:10.6628977+08:00;True|2021-10-13T10:12:24.4238027+08:00;True|2021-10-13T08:47:43.9314486+08:00;True|2021-10-12T14:07:18.6065183+08:00;True|2021-10-12T10:34:10.1682362+08:00;True|2021-10-12T10:27:14.3073332+08:00;True|2021-10-12T10:22:08.0004619+08:00;True|2021-10-12T10:21:03.0275378+08:00;True|2021-10-12T10:11:54.9812692+08:00;True|2021-10-11T16:59:07.3568342+08:00;True|2021-10-11T16:53:14.2016138+08:00;True|2021-10-11T16:21:35.0133775+08:00;True|2021-10-11T15:34:19.5731935+08:00;True|2021-10-11T15:31:07.5780983+08:00;True|2021-10-11T15:06:47.1145237+08:00;True|2021-10-11T15:03:25.5000280+08:00;True|2021-10-11T10:12:57.6416898+08:00;True|2021-10-09T10:15:17.9235165+08:00;True|2021-10-09T10:13:51.3318441+08:00;True|2021-10-09T10:01:21.6661542+08:00;True|2021-10-09T09:58:41.9225837+08:00;True|2021-10-08T14:56:49.7935800+08:00;True|2021-10-08T14:35:41.4490063+08:00;True|2021-10-08T14:02:42.6990656+08:00;True|2021-09-29T15:48:55.1547397+08:00;True|2021-09-29T15:48:23.5567191+08:00;True|2021-09-27T16:17:35.7180978+08:00;True|2021-09-27T15:51:50.4240134+08:00;True|2021-09-23T20:55:27.3554447+08:00;True|2021-09-23T14:14:44.0572017+08:00;True|2021-09-23T13:51:56.2344673+08:00;True|2021-09-23T10:46:16.7417007+08:00;True|2021-09-23T10:42:23.2117537+08:00;True|2021-09-22T15:21:22.9615672+08:00;True|2021-09-22T14:23:32.7907754+08:00;True|2021-09-22T13:48:03.4780947+08:00;True|2021-09-22T11:05:24.5249356+08:00;True|2021-09-22T10:00:19.0962943+08:00;True|2021-09-22T09:30:26.2686514+08:00;True|2021-09-17T11:22:34.5692792+08:00;True|2021-09-16T16:11:27.5372277+08:00;True|2021-09-16T14:53:40.8396557+08:00;True|2021-09-16T14:32:29.7905500+08:00;True|2021-09-16T14:26:46.2224219+08:00;True|2021-09-16T10:32:24.4244440+08:00;True|2021-09-15T11:10:35.3529360+08:00;True|2021-09-15T11:08:30.0857376+08:00;True|2021-09-15T11:05:56.7191571+08:00;True|2021-09-14T01:24:39.8041136+08:00;True|2021-09-14T01:05:01.1593327+08:00;True|2021-09-14T00:44:14.7233198+08:00;True|2021-09-13T23:48:19.4506233+08:00;True|2021-09-13T20:30:31.3243872+08:00;True|2021-09-13T19:45:35.9108911+08:00;False|2021-09-13T19:44:59.2779092+08:00;True|2021-09-13T18:09:22.4994381+08:00;True|2021-09-10T14:18:27.5788854+08:00;True|2021-09-09T15:57:01.7407207+08:00;True|2021-09-09T15:49:34.2598998+08:00;True|2021-09-09T11:32:10.7853024+08:00;True|2021-09-09T11:10:48.6840025+08:00;True|2021-09-09T10:35:37.3883078+08:00;True|2021-09-07T14:11:49.8497588+08:00;True|2021-09-07T13:34:48.4693349+08:00;True|2021-09-06T14:33:48.7549675+08:00;True|2021-09-03T16:27:51.1888520+08:00;True|2021-09-03T16:19:35.9003465+08:00;True|2021-09-03T15:46:28.1828032+08:00;True|2021-09-03T15:34:21.9362871+08:00;True|2021-09-03T11:24:49.8749819+08:00;True|2021-09-03T11:21:17.8373159+08:00;True|2021-09-03T11:16:53.2208136+08:00;True|2021-09-03T11:12:23.9063804+08:00;True|2021-09-03T09:11:09.2435721+08:00;True|2021-09-02T11:16:15.1370453+08:00;True|2021-09-02T10:35:39.1171879+08:00;True|2021-09-01T10:17:09.4536285+08:00;True|2021-09-01T09:46:28.4581776+08:00;True|2021-08-31T08:54:26.8588887+08:00;True|2021-08-31T08:39:08.3685693+08:00;True|2021-08-30T17:11:56.8438985+08:00;True|2021-08-30T15:59:42.0820292+08:00;True|2021-08-30T15:45:18.1868510+08:00;True|2021-08-30T14:56:08.3958863+08:00;True|2021-08-30T14:37:11.5379830+08:00;True|2021-08-30T14:35:34.8775934+08:00;True|2021-08-30T14:24:36.5111821+08:00;True|2021-08-30T10:05:49.6945200+08:00;True|2021-08-30T10:03:28.4064538+08:00;True|2021-08-30T10:00:16.8360929+08:00;True|2021-08-30T09:56:09.4434379+08:00;True|2021-08-30T09:55:36.1725334+08:00;True|2021-08-30T09:52:04.8600054+08:00;True|2021-08-30T09:47:46.4225655+08:00;True|2021-08-30T09:45:20.4894962+08:00;False|2021-08-27T17:17:34.2646751+08:00;False|2021-08-27T16:01:21.2791979+08:00;False|2021-08-27T15:58:06.9667160+08:00;False|2021-08-27T15:38:37.4818036+08:00;False|2021-08-27T15:21:02.8863114+08:00;False|2021-08-27T15:20:28.6828668+08:00;True|2021-08-26T16:00:44.3162145+08:00;True|2021-08-26T08:57:31.3842587+08:00;True|2021-08-23T08:43:41.1549775+08:00;True|2021-08-22T09:24:12.7210871+08:00;True|2021-08-22T09:19:53.8300229+08:00;True|2021-08-20T20:00:52.0140407+08:00;True|2021-08-20T19:40:14.7712765+08:00;True|2021-08-19T17:37:54.9748049+08:00;True|2021-08-19T17:20:11.0515687+08:00;True|2021-08-19T16:12:35.4392809+08:00;True|2021-08-19T16:06:50.6204587+08:00;True|2021-08-19T16:03:53.0824286+08:00;True|2021-08-19T15:56:01.3498791+08:00;True|2021-08-19T10:18:50.8113630+08:00;True|2021-08-19T09:58:06.2784035+08:00;True|2021-08-19T09:56:54.0619777+08:00;True|2021-08-19T00:32:08.3503093+08:00;True|2021-08-19T00:11:18.3150227+08:00;True|2021-08-19T00:02:49.4827718+08:00;True|2021-08-18T23:54:45.4845900+08:00;True|2021-08-18T23:39:51.6147977+08:00;True|2021-08-18T23:16:42.7214379+08:00;True|2021-08-18T22:38:57.4681929+08:00;True|2021-08-18T21:41:58.7560707+08:00;True|2021-08-18T21:11:52.2369249+08:00;True|2021-08-18T21:01:49.5669106+08:00;True|2021-08-18T20:47:46.5352688+08:00;False|2021-08-18T20:46:36.7956141+08:00;False|2021-08-18T20:46:01.0502138+08:00;True|2021-08-18T19:39:12.8186242+08:00;False|2021-08-18T19:38:12.6839708+08:00;True|2021-08-18T19:15:51.4626694+08:00;True|2021-08-18T16:07:20.4350886+08:00;True|2021-08-18T14:29:41.7171934+08:00;True|2021-08-18T14:20:36.3647361+08:00;True|2021-08-16T09:08:58.3617662+08:00;True|2021-08-15T20:44:29.9214083+08:00;True|2021-08-15T20:36:17.0958549+08:00;True|2021-08-15T20:29:34.3879773+08:00;True|2021-08-15T20:23:47.4052038+08:00;True|2021-08-15T15:01:19.7830862+08:00;True|2021-08-15T12:15:18.3433782+08:00;True|2021-08-13T20:59:11.3947130+08:00;True|2021-08-06T22:49:09.9538339+08:00;True|2021-08-06T22:35:19.0418168+08:00;True|2021-08-06T20:29:47.4241975+08:00;True|2021-08-06T14:08:16.4791827+08:00;True|2021-08-06T13:59:28.9874611+08:00;True|2021-08-06T13:57:34.3723977+08:00;True|2021-08-06T13:36:03.4816652+08:00;True|2021-08-06T12:22:52.5055221+08:00;True|2021-08-06T09:31:58.1272499+08:00;True|2021-08-06T09:26:51.6310039+08:00;True|2021-08-06T09:24:22.2899244+08:00;True|2021-08-06T09:06:30.6477912+08:00;True|2021-08-06T09:00:55.5101612+08:00;True|2021-08-06T08:49:59.9616490+08:00;True|2021-08-06T08:45:18.8586902+08:00;True|2021-08-05T20:09:25.8861998+08:00;True|2021-08-04T19:14:27.2396953+08:00;True|2021-08-04T19:11:47.5849093+08:00;True|2021-08-04T16:42:54.0149043+08:00;True|2021-08-04T15:02:11.5056561+08:00;True|2021-08-04T14:58:37.1435509+08:00;True|2021-08-04T14:55:34.7380132+08:00;True|2021-08-04T14:47:42.5933921+08:00;True|2021-08-04T14:45:17.9911874+08:00;True|2021-08-04T13:52:20.9601351+08:00;True|2021-08-04T09:48:28.8796992+08:00;True|2021-08-03T18:14:13.1894998+08:00;True|2021-08-03T17:45:35.1349721+08:00;True|2021-08-03T17:21:52.6028977+08:00;True|2021-08-03T17:20:35.4423020+08:00;True|2021-08-03T17:03:33.1667669+08:00;True|2021-08-03T17:01:54.2656787+08:00;True|2021-08-03T17:00:22.2778374+08:00;True|2021-08-03T16:56:58.8902582+08:00;True|2021-08-03T15:02:21.8601533+08:00;True|2021-08-03T14:57:34.0186758+08:00;True|2021-08-03T14:28:47.2242515+08:00;True|2021-08-03T14:22:22.4554236+08:00;True|2021-08-03T14:21:51.1339715+08:00;True|2021-08-03T13:37:33.9697131+08:00;True|2021-08-03T13:28:29.7591095+08:00;True|2021-08-03T11:35:09.5118324+08:00;True|2021-08-03T11:11:23.3051573+08:00;True|2021-08-02T13:14:42.3663755+08:00;True|2021-07-30T22:50:19.9749878+08:00;True|2021-07-30T22:49:31.2150970+08:00;True|2021-07-28T19:12:05.8381075+08:00;True|2021-07-28T18:59:45.4808797+08:00;True|2021-07-28T18:15:58.8301509+08:00;True|2021-07-28T18:04:54.8613546+08:00;True|2021-07-28T17:53:48.6225611+08:00;True|2021-07-28T17:42:50.9171563+08:00;True|2021-07-28T17:17:16.3137677+08:00;True|2021-07-28T17:11:46.8925200+08:00;True|2021-07-28T16:28:27.6823943+08:00;True|2021-07-28T16:23:00.3385836+08:00;True|2021-07-28T09:57:55.4237411+08:00;True|2021-07-28T08:38:29.6691541+08:00;True|2021-07-27T23:16:32.0331671+08:00;True|2021-07-27T23:06:08.1947249+08:00;True|2021-07-27T23:05:58.4619176+08:00;True|2021-07-27T18:42:09.5358261+08:00;True|2021-07-27T18:30:04.8532823+08:00;True|2021-07-27T18:29:43.5775092+08:00;True|2021-07-27T15:16:49.8356224+08:00;True|2021-07-27T15:05:27.8453220+08:00;True|2021-07-27T14:59:15.9519440+08:00;True|2021-07-27T09:23:32.6111337+08:00;True|2021-07-27T08:27:41.6395353+08:00;True|2021-07-27T08:25:56.7378296+08:00;True|2021-07-26T11:18:46.0856966+08:00;True|2021-07-26T11:18:02.0751924+08:00;True|2021-07-26T11:13:49.6285395+08:00;True|2021-07-21T21:08:25.9898902+08:00;True|2021-07-21T20:09:26.2258104+08:00;True|2021-07-13T16:17:25.8407435+08:00;True|2021-07-13T13:46:13.4309531+08:00;True|2021-07-13T12:29:04.5082461+08:00;True|2021-06-29T13:55:01.6864637+08:00;True|2021-06-29T10:38:52.2206472+08:00;True|2021-06-29T10:10:13.1540749+08:00;True|2021-06-28T14:37:56.3853273+08:00;False|2021-06-28T14:36:57.5726124+08:00;True|2021-06-25T14:17:57.5196108+08:00;True|2021-06-25T13:56:38.9522535+08:00;True|2021-06-24T19:38:32.8766933+08:00;True|2021-06-24T18:26:35.6118833+08:00;True|2021-06-24T18:02:52.8136877+08:00;True|2021-06-24T17:48:49.5851948+08:00;True|2021-06-24T17:45:46.7527572+08:00;True|2021-06-24T15:05:20.1592723+08:00;True|2021-06-23T16:18:15.6814625+08:00;True|2021-06-23T16:05:24.6112343+08:00;True|2021-06-23T15:14:08.2489658+08:00;True|2021-06-23T13:52:58.6029788+08:00;True|2021-06-22T16:11:20.4726923+08:00;True|2021-06-22T16:04:53.7231389+08:00;True|2021-06-22T15:50:59.2583262+08:00;True|2021-06-22T15:38:15.3016140+08:00;True|2021-06-22T15:34:42.9185543+08:00;True|2021-06-22T15:21:55.1419108+08:00;True|2021-06-22T15:07:21.5357494+08:00;True|2021-06-22T15:03:35.0535733+08:00;True|2021-06-22T14:54:47.8802969+08:00;True|2021-06-22T11:19:38.7303011+08:00;True|2021-06-22T08:53:49.2882695+08:00;True|2021-06-22T08:47:54.8286530+08:00;True|2021-06-21T16:27:19.3017700+08:00;True|2021-06-21T15:32:28.7237952+08:00;True|2021-06-21T12:34:02.6329555+08:00;True|2021-06-21T12:24:17.5427495+08:00;True|2021-06-21T10:47:30.6423502+08:00;True|2021-06-21T08:43:20.3026558+08:00;True|2021-06-19T15:10:06.8335499+08:00;True|2021-06-18T15:37:29.5009930+08:00;True|2021-06-18T13:46:35.6283432+08:00;True|2021-06-18T10:00:37.1474954+08:00;True|2021-06-18T09:55:21.8551780+08:00;True|2021-06-18T09:22:27.8432927+08:00;True|2021-06-17T11:17:43.2166430+08:00;True|2021-06-17T09:24:09.8350403+08:00;True|2021-06-16T16:10:47.8564888+08:00;True|2021-06-16T16:04:09.8286582+08:00;True|2021-06-16T15:12:29.9427169+08:00;True|2021-06-16T14:58:45.6801892+08:00;True|2021-06-16T14:46:01.6873221+08:00;True|2021-06-16T11:02:06.1272477+08:00;True|2021-06-16T09:33:56.0223915+08:00;True|2021-06-16T08:50:07.6995413+08:00;True|2021-06-16T08:28:38.7692635+08:00;True|2021-06-16T01:04:19.6282474+08:00;True|2021-06-16T01:03:50.5058323+08:00;False|2021-06-16T01:02:15.3819672+08:00;False|2021-06-16T01:01:38.6171098+08:00;True|2021-06-16T00:34:54.9902044+08:00;True|2021-06-15T23:55:36.2003828+08:00;True|2021-06-15T22:47:17.2192750+08:00;True|2021-06-15T22:42:41.1512585+08:00;True|2021-06-15T22:38:01.7390462+08:00;True|2021-06-15T22:14:11.2060782+08:00;True|2021-06-15T22:12:27.0615357+08:00;True|2021-06-15T22:07:59.9280871+08:00;True|2021-06-15T22:04:21.5051427+08:00;True|2021-06-15T21:25:55.0099814+08:00;True|2021-06-15T19:13:51.3494172+08:00;True|2021-06-15T19:02:17.6844742+08:00;True|2021-06-15T18:47:37.1629411+08:00;False|2021-06-15T18:47:11.0828111+08:00;True|2021-06-15T18:38:26.6620668+08:00;True|2021-06-15T18:33:45.2069831+08:00;True|2021-06-15T18:24:52.0550838+08:00;True|2021-06-15T18:19:43.6999796+08:00;True|2021-06-15T18:08:17.2464506+08:00;True|2021-06-15T18:03:51.3952624+08:00;True|2021-06-15T18:01:20.6141766+08:00;True|2021-06-15T17:59:04.4479416+08:00;True|2021-06-15T17:41:44.6389379+08:00;True|2021-06-15T17:39:03.1565124+08:00;True|2021-06-15T17:34:41.0634638+08:00;True|2021-06-15T17:33:50.4853178+08:00;True|2021-06-15T17:25:38.5914037+08:00;True|2021-06-15T17:22:21.3611360+08:00;True|2021-06-15T17:16:49.4970813+08:00;True|2021-06-15T17:05:28.9389484+08:00;True|2021-06-15T16:52:54.6372199+08:00;True|2021-06-15T16:51:23.9081030+08:00;True|2021-06-15T16:45:40.6017997+08:00;True|2021-06-15T16:41:05.0218887+08:00;True|2021-06-15T16:38:02.8541862+08:00;True|2021-06-15T16:22:10.3118721+08:00;True|2021-06-15T16:12:11.1552506+08:00;True|2021-06-15T15:33:42.0100494+08:00;True|2021-06-15T15:28:39.7145659+08:00;True|2021-06-15T15:15:02.7939125+08:00;True|2021-06-15T14:49:14.2300396+08:00;True|2021-06-15T14:42:28.1198064+08:00;True|2021-06-15T13:30:12.7997686+08:00;True|2021-06-15T13:25:37.7284670+08:00;True|2021-06-15T13:23:43.6207813+08:00;False|2021-06-15T13:23:19.4190232+08:00;True|2021-06-15T13:16:38.5062674+08:00;True|2021-06-15T13:03:31.2055635+08:00;True|2021-06-15T12:58:43.1653215+08:00;True|2021-06-15T12:39:22.8442109+08:00;True|2021-06-15T12:35:09.1288556+08:00;False|2021-06-15T12:33:50.0723143+08:00;True|2021-06-15T11:28:01.9733727+08:00;True|2021-06-15T11:26:26.6569392+08:00;True|2021-06-15T11:22:43.0366435+08:00;True|2021-06-15T11:07:50.1610580+08:00;True|2021-06-15T10:32:59.1925931+08:00;True|2021-06-10T17:16:57.9552310+08:00;True|2021-06-10T16:44:42.2731836+08:00;True|2021-06-10T14:39:27.6745737+08:00;True|2021-06-10T12:15:05.1524413+08:00;True|2021-06-09T18:19:24.1005606+08:00;True|2021-06-09T17:56:09.5646288+08:00;True|2021-06-09T13:34:06.1882292+08:00;True|2021-06-09T13:29:54.5924933+08:00;True|2021-06-09T13:25:55.7520662+08:00;True|2021-06-09T13:07:47.6686811+08:00;True|2021-06-09T12:59:41.2595048+08:00;True|2021-06-09T12:45:27.1305548+08:00;True|2021-06-09T12:29:52.1418191+08:00;True|2021-06-09T12:24:12.7610588+08:00;True|2021-06-09T11:31:25.3409568+08:00;True|2021-06-09T09:57:44.4387175+08:00;True|2021-06-09T09:54:26.5161307+08:00;True|2021-06-09T09:14:14.7288045+08:00;True|2021-06-09T09:10:25.1812139+08:00;True|2021-06-09T08:46:21.6585123+08:00;True|2021-06-08T19:56:55.7192062+08:00;True|2021-06-08T19:52:59.0326821+08:00;True|2021-06-08T19:49:13.6274217+08:00;True|2021-06-08T19:09:22.1038939+08:00;True|2021-06-08T15:28:41.3716247+08:00;True|2021-06-08T15:26:47.2621178+08:00;True|2021-06-08T13:49:45.8936617+08:00;True|2021-06-08T13:43:18.8115502+08:00;True|2021-06-08T10:04:06.2200731+08:00;True|2021-06-08T09:17:10.0470792+08:00;True|2021-06-08T08:44:37.4395849+08:00;True|2021-06-08T00:01:09.3745613+08:00;True|2021-06-07T23:49:31.5196888+08:00;True|2021-06-07T23:41:00.8017855+08:00;True|2021-06-07T23:21:53.1371134+08:00;True|2021-06-07T23:01:27.5712153+08:00;True|2021-06-07T22:36:12.9274014+08:00;True|2021-06-07T22:23:00.6545134+08:00;True|2021-06-07T17:44:47.5686346+08:00;True|2021-06-07T17:17:01.3431233+08:00;True|2021-06-07T16:53:28.9989587+08:00;True|2021-06-07T16:41:10.4975607+08:00;True|2021-06-07T14:21:06.8176477+08:00;True|2021-06-07T14:10:39.0355659+08:00;True|2021-06-07T12:34:31.4562732+08:00;True|2021-06-07T12:28:44.9629488+08:00;True|2021-06-07T10:30:26.9387988+08:00;True|2021-06-07T09:12:14.7658099+08:00;True|2021-06-07T08:37:19.6353792+08:00;True|2021-06-07T08:35:25.2031954+08:00;True|2021-06-05T07:07:32.0541266+08:00;True|2021-06-05T06:44:35.9475270+08:00;True|2021-06-05T06:37:27.4595197+08:00;True|2021-06-05T06:26:59.7663998+08:00;True|2021-06-05T05:43:12.8699318+08:00;True|2021-06-04T17:00:41.2426007+08:00;True|2021-06-04T16:08:03.8078072+08:00;True|2021-06-04T15:47:21.6412616+08:00;True|2021-06-04T15:21:02.4239800+08:00;True|2021-06-04T15:20:37.8641854+08:00;True|2021-06-04T13:38:51.5088395+08:00;True|2021-06-04T10:20:01.7784282+08:00;True|2021-06-04T10:13:50.3548857+08:00;True|2021-06-04T10:11:25.5017821+08:00;True|2021-06-04T10:09:51.6792228+08:00;True|2021-06-04T10:02:39.5851057+08:00;True|2021-06-04T09:30:40.4495494+08:00;True|2021-06-03T13:16:36.0317546+08:00;True|2021-06-03T13:12:47.0402047+08:00;True|2021-06-02T14:37:08.9683351+08:00;True|2021-06-02T14:10:15.7439829+08:00;True|2021-06-02T13:59:46.5841931+08:00;True|2021-06-02T13:25:18.7962660+08:00;True|2021-06-02T13:23:16.2261980+08:00;True|2021-06-01T15:37:32.2495085+08:00;True|2021-06-01T15:21:01.2856122+08:00;True|2021-06-01T15:13:36.7262365+08:00;True|2021-06-01T15:10:26.8905629+08:00;True|2021-06-01T14:56:17.5231551+08:00;True|2021-06-01T14:38:39.7895927+08:00;True|2021-06-01T14:23:12.3265287+08:00;True|2021-03-01T09:11:31.3226422+08:00;True|2021-05-26T14:54:56.9426462+08:00;True|2021-05-26T13:57:33.7780451+08:00;True|2021-05-26T13:39:02.8043358+08:00;True|2021-02-25T16:01:40.2917200+08:00;True|2021-02-25T15:49:46.6681205+08:00;True|2021-02-25T15:16:30.9372640+08:00;True|2021-05-25T13:10:21.7831921+08:00;True|2021-05-25T11:21:38.5224475+08:00;True|2021-05-25T11:12:52.0637175+08:00;True|2021-05-25T11:02:18.4164663+08:00;True|2021-05-25T10:52:06.8998521+08:00;True|2021-05-25T10:50:45.0929606+08:00;True|2021-05-25T10:45:54.1498313+08:00;True|2021-05-25T10:39:27.8602249+08:00;True|2021-05-25T10:34:49.5771162+08:00;True|2021-05-25T10:17:30.3009163+08:00;True|2021-05-25T10:14:03.8512581+08:00;True|2021-05-25T10:05:33.4343836+08:00;True|2021-05-24T17:01:23.3221168+08:00;True|2021-05-24T10:11:24.0197347+08:00;False|2021-05-24T10:11:07.6338995+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.dll">
- <publishTime>02/22/2013 16:43:40</publishTime>
+ <publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.pdb">
- <publishTime>02/22/2013 16:43:40</publishTime>
+ <publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>06/27/2022 15:42:00</publishTime>
+ <publishTime>06/17/2022 11:19:20</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>06/27/2022 15:42:00</publishTime>
+ <publishTime>06/17/2022 11:19:20</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>06/27/2022 15:41:58</publishTime>
+ <publishTime>06/17/2022 11:19:18</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>06/27/2022 15:41:58</publishTime>
+ <publishTime>06/17/2022 11:19:18</publishTime>
</File>
<File Include="bin/Dapper.dll">
- <publishTime>07/22/2016 22:52:40</publishTime>
+ <publishTime>07/22/2016 14:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>06/27/2022 15:41:51</publishTime>
+ <publishTime>06/17/2022 11:19:14</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>06/27/2022 15:41:51</publishTime>
+ <publishTime>06/17/2022 11:19:14</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -69,7 +69,7 @@
<publishTime>08/25/2021 10:28:25</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>03/15/2022 10:06:40</publishTime>
+ <publishTime>10/11/2021 09:26:35</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
<publishTime>09/20/2018 19:23:20</publishTime>
@@ -84,25 +84,25 @@
<publishTime>03/19/2022 07:38:42</publishTime>
</File>
<File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
- <publishTime>03/19/2015 01:02:50</publishTime>
+ <publishTime>03/18/2015 17:02:50</publishTime>
</File>
<File Include="bin/Microsoft.CSharp.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/Microsoft.Web.Infrastructure.dll">
- <publishTime>07/25/2012 19:48:56</publishTime>
+ <publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>06/27/2022 15:41:52</publishTime>
+ <publishTime>06/17/2022 11:19:15</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>06/27/2022 15:41:52</publishTime>
+ <publishTime>06/17/2022 11:19:15</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
- <publishTime>08/04/2014 04:33:56</publishTime>
+ <publishTime>08/03/2014 20:33:56</publishTime>
</File>
<File Include="bin/NPOI.dll">
<publishTime>10/23/2021 09:07:54</publishTime>
@@ -129,31 +129,31 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>06/27/2022 15:41:48</publishTime>
+ <publishTime>06/17/2022 11:19:12</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>06/27/2022 15:41:48</publishTime>
+ <publishTime>06/17/2022 11:19:12</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>06/27/2022 15:41:49</publishTime>
+ <publishTime>06/17/2022 11:19:13</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>06/27/2022 15:41:49</publishTime>
+ <publishTime>06/17/2022 11:19:13</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>06/27/2022 15:41:50</publishTime>
+ <publishTime>06/17/2022 11:19:13</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>06/27/2022 15:41:50</publishTime>
+ <publishTime>06/17/2022 11:19:13</publishTime>
</File>
<File Include="bin/stdole.dll">
<publishTime>05/09/2021 13:35:37</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
- <publishTime>02/16/2015 01:57:08</publishTime>
+ <publishTime>02/15/2015 17:57:08</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
- <publishTime>07/19/2017 18:01:28</publishTime>
+ <publishTime>07/19/2017 10:01:28</publishTime>
</File>
<File Include="bin/System.ComponentModel.DataAnnotations.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -177,19 +177,19 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.IdentityModel.Tokens.Jwt.dll">
- <publishTime>08/19/2014 18:03:34</publishTime>
+ <publishTime>08/19/2014 10:03:34</publishTime>
</File>
<File Include="bin/System.Memory.dll">
- <publishTime>04/18/2019 00:24:34</publishTime>
+ <publishTime>04/17/2019 16:24:34</publishTime>
</File>
<File Include="bin/System.Net.Http.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Net.Http.Formatting.dll">
- <publishTime>11/28/2018 21:00:36</publishTime>
+ <publishTime>11/28/2018 13:00:36</publishTime>
</File>
<File Include="bin/System.Runtime.CompilerServices.Unsafe.dll">
- <publishTime>09/19/2018 03:38:10</publishTime>
+ <publishTime>09/18/2018 19:38:10</publishTime>
</File>
<File Include="bin/System.Runtime.Serialization.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -198,7 +198,7 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Web.Cors.dll">
- <publishTime>11/28/2018 20:58:44</publishTime>
+ <publishTime>11/28/2018 12:58:44</publishTime>
</File>
<File Include="bin/System.Web.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -213,37 +213,37 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Web.Helpers.dll">
- <publishTime>01/28/2015 12:04:30</publishTime>
+ <publishTime>01/28/2015 04:04:30</publishTime>
</File>
<File Include="bin/System.Web.Http.Cors.dll">
- <publishTime>11/28/2018 21:01:26</publishTime>
+ <publishTime>11/28/2018 13:01:26</publishTime>
</File>
<File Include="bin/System.Web.Http.dll">
- <publishTime>11/28/2018 21:01:00</publishTime>
+ <publishTime>11/28/2018 13:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
- <publishTime>01/28/2015 12:02:18</publishTime>
+ <publishTime>01/28/2015 04:02:18</publishTime>
</File>
<File Include="bin/System.Web.Optimization.dll">
- <publishTime>02/11/2014 23:26:04</publishTime>
+ <publishTime>02/11/2014 15:26:04</publishTime>
</File>
<File Include="bin/System.Web.Razor.dll">
- <publishTime>01/28/2015 12:02:32</publishTime>
+ <publishTime>01/28/2015 04:02:32</publishTime>
</File>
<File Include="bin/System.Web.Services.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Web.WebPages.Deployment.dll">
- <publishTime>01/28/2015 12:04:30</publishTime>
+ <publishTime>01/28/2015 04:04:30</publishTime>
</File>
<File Include="bin/System.Web.WebPages.dll">
- <publishTime>01/28/2015 12:04:30</publishTime>
+ <publishTime>01/28/2015 04:04:30</publishTime>
</File>
<File Include="bin/System.Web.WebPages.Razor.dll">
- <publishTime>01/28/2015 12:04:30</publishTime>
+ <publishTime>01/28/2015 04:04:30</publishTime>
</File>
<File Include="bin/System.Xml.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -252,19 +252,19 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
- <publishTime>11/24/2014 19:18:48</publishTime>
+ <publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>06/27/2022 15:42:04</publishTime>
+ <publishTime>06/17/2022 11:15:38</publishTime>
</File>
<File Include="bin/WebAPI.dll.config">
<publishTime>12/15/2021 17:59:43</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>06/27/2022 15:42:04</publishTime>
+ <publishTime>06/17/2022 11:15:38</publishTime>
</File>
<File Include="bin/WebGrease.dll">
- <publishTime>07/18/2013 01:03:52</publishTime>
+ <publishTime>07/17/2013 17:03:52</publishTime>
</File>
<File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
<publishTime>11/29/2018 21:26:02</publishTime>
@@ -272,56 +272,59 @@
<File Include="bin/zh-Hans/System.Web.Http.resources.dll">
<publishTime>11/29/2018 21:26:30</publishTime>
</File>
+ <File Include="Config/kdapi.config">
+ <publishTime>02/13/2021 14:18:17</publishTime>
+ </File>
<File Include="Content/bootstrap.css">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>10/11/2021 09:26:37</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>10/11/2021 09:26:37</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>10/11/2021 09:26:37</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>11/01/2021 09:08:18</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="grpc_csharp_ext.x64.dll">
<publishTime>03/22/2022 13:17:22</publishTime>
@@ -330,7 +333,7 @@
<publishTime>03/22/2022 13:17:22</publishTime>
</File>
<File Include="Index.html">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="libgrpc_csharp_ext.x64.dylib">
<publishTime>03/19/2022 07:38:44</publishTime>
@@ -339,115 +342,115 @@
<publishTime>03/19/2022 07:38:42</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="packages.config">
- <publishTime>05/07/2022 09:07:20</publishTime>
+ <publishTime>05/17/2022 10:50:07</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>06/18/2022 15:45:06</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>06/18/2022 15:45:06</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>06/18/2022 15:45:06</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>06/18/2022 15:45:06</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>06/18/2022 15:45:06</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>06/18/2022 15:45:06</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>06/18/2022 15:45:06</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>06/18/2022 15:45:06</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>06/18/2022 15:45:06</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>06/18/2022 15:45:06</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>06/18/2022 15:45:06</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>06/18/2022 15:45:06</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>06/18/2022 15:45:06</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>06/18/2022 15:45:06</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>06/18/2022 15:45:06</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>06/18/2022 15:45:06</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>06/18/2022 15:45:06</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
- <publishTime>06/18/2022 15:45:06</publishTime>
+ <publishTime>04/06/2022 11:02:09</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>06/18/2022 15:45:06</publishTime>
+ <publishTime>10/11/2021 09:26:38</publishTime>
</File>
<File Include="Web References/WebS/Reference.cs">
<publishTime>12/20/2021 13:19:56</publishTime>
</File>
<File Include="Web References/WebS/Reference.map">
- <publishTime>06/12/2022 23:16:37</publishTime>
+ <publishTime>12/20/2021 13:19:56</publishTime>
</File>
<File Include="Web References/WebS/WebService1.disco">
<publishTime>12/20/2021 13:19:56</publishTime>
@@ -456,7 +459,7 @@
<publishTime>12/20/2021 13:19:56</publishTime>
</File>
<File Include="Web.config">
- <publishTime>06/27/2022 15:42:37</publishTime>
+ <publishTime>06/17/2022 11:19:21</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Sc_MouldProdOutBill/Log/637915974420110542.log b/WebAPI/Sc_MouldProdOutBill/Log/637915974420110542.log
new file mode 100644
index 0000000..14f12ed
--- /dev/null
+++ b/WebAPI/Sc_MouldProdOutBill/Log/637915974420110542.log
@@ -0,0 +1,3 @@
+------------------------2022/6/23 16:10:42------------------------------
+select * from h_v_Sc_MouldProdOutHouseBillList where 搴撳瓨缁勭粐='钃濇捣瀹炰笟闆嗗洟'
+
diff --git a/WebAPI/Utility/Util.cs b/WebAPI/Utility/Util.cs
new file mode 100644
index 0000000..3e818fc
--- /dev/null
+++ b/WebAPI/Utility/Util.cs
@@ -0,0 +1,124 @@
+锘縰sing Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Serialization;
+
+namespace WebAPI.Utility
+{
+ public class Util
+ {
+ public static string GetObjectType(object obj)
+ {
+ var isType = false;
+ isType = obj.GetType() == typeof(string);
+ if (isType)
+ {
+ return "string";
+ }
+
+ isType = obj.GetType() == typeof(double);
+ if (isType)
+ {
+ return "double";
+ }
+
+ isType = obj.GetType() == typeof(long);
+ if (isType)
+ {
+ return "long";
+ }
+
+ isType = obj.GetType() == typeof(DateTime);
+ if (isType)
+ {
+ return "date";
+ }
+
+ isType = obj.GetType() == typeof(int);
+ if (isType)
+ {
+ return "int";
+ }
+
+ isType = obj.GetType() == typeof(decimal);
+ if (isType)
+ {
+ return "decimal";
+ }
+
+ return "string";
+ }
+
+ public static JObject JsonVerify(string json)
+ {
+ if (string.IsNullOrEmpty(json))
+ {
+ throw new Exception("鍙傛暟涓嶈兘涓虹┖");
+ }
+ try
+ {
+ return JObject.Parse(json.ToString().Replace("\r", "").Replace("\n", "").Replace("\t", ""));
+ }
+ catch (Exception)
+ {
+ throw;
+ }
+ }
+
+ //public static T DeepCopy<T>(T obj)
+ //{
+ // object retval;
+ // using (MemoryStream ms = new MemoryStream())
+ // {
+ // XmlSerializer xml = new XmlSerializer(typeof(T));
+ // xml.Serialize(ms, obj);
+ // ms.Seek(0, SeekOrigin.Begin);
+ // retval = xml.Deserialize(ms);
+ // ms.Close();
+ // }
+ // return (T)retval;
+ //}
+
+ public static String GetConfigKey(String configPath, String key)
+ {
+ Configuration ConfigurationInstance = ConfigurationManager.OpenMappedExeConfiguration(new ExeConfigurationFileMap()
+ {
+ ExeConfigFilename = configPath
+ }, ConfigurationUserLevel.None);
+
+
+ if (ConfigurationInstance.AppSettings.Settings[key] != null)
+ return ConfigurationInstance.AppSettings.Settings[key].Value;
+ else
+
+ return string.Empty;
+ }
+
+ public static bool SetConfigKey(String configPath, String key, String vls)
+ {
+ try
+ {
+ Configuration ConfigurationInstance = ConfigurationManager.OpenMappedExeConfiguration(new ExeConfigurationFileMap()
+ {
+ ExeConfigFilename = configPath
+ }, ConfigurationUserLevel.None);
+
+ if (ConfigurationInstance.AppSettings.Settings[key] != null)
+ ConfigurationInstance.AppSettings.Settings[key].Value = vls;
+ else
+ ConfigurationInstance.AppSettings.Settings.Add(key, vls);
+ ConfigurationInstance.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ return true;
+ }
+ catch
+ {
+ return false;
+ }
+ }
+ }
+}
diff --git a/WebAPI/Vlog/webapi20220623.txt b/WebAPI/Vlog/webapi20220623.txt
new file mode 100644
index 0000000..2690fc8
--- /dev/null
+++ b/WebAPI/Vlog/webapi20220623.txt
@@ -0,0 +1 @@
+2022/6/23 16:10:28 and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-05-24' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-06-23';钃濇捣瀹炰笟闆嗗洟
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index fad7f62..2aeedcf 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -233,6 +233,7 @@
<Content Include="Index.html" />
<Content Include="Views\Scripts\bootstrap.js" />
<Content Include="Views\Scripts\bootstrap.min.js" />
+ <Content Include="Config\kdapi.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -297,15 +298,14 @@
<Content Include="Web References\WebS\ClsGy_Warehouse_Model.datasource">
<DependentUpon>Reference.map</DependentUpon>
</Content>
- <Content Include="Web References\WebS\ClsKf_ICStockBill_Mould.datasource">
+ <Content Include="Web References\WebS\ClsKf_ICStockBill_WMS.datasource">
<DependentUpon>Reference.map</DependentUpon>
</Content>
- <Content Include="Web References\WebS\ClsKf_ICStockBill_WMS.datasource">
+ <Content Include="Web References\WebS\ClsKf_ICStockBill_Mould.datasource">
<DependentUpon>Reference.map</DependentUpon>
</Content>
<None Include="Web References\WebS\Reference.map">
<Generator>MSDiscoCodeGenerator</Generator>
- <LastGenOutput>Reference.cs</LastGenOutput>
</None>
<None Include="Web References\WebS\WebService1.disco" />
<Content Include="Web.config">
@@ -350,6 +350,7 @@
<Compile Include="Controllers\BaseSet\Gy_PropertyController.cs" />
<Compile Include="Controllers\BaseSet\Gy_WarehouseController.cs" />
<Compile Include="Controllers\BaseSet\Xt_DataDictionary_ViewController.cs" />
+ <Compile Include="Controllers\BaseSet\Xt_grdAlignment_WMESController.cs" />
<Compile Include="Controllers\BaseSet\Xt_ORGANIZATIONSController.cs" />
<Compile Include="Controllers\BLL\Xt_AccountPeriodController.cs" />
<Compile Include="Controllers\BLL\Xt_BillTypeController.cs" />
@@ -753,6 +754,12 @@
<Compile Include="Service\ProcessDal.cs" />
<Compile Include="Service\YqnDal.cs" />
<Compile Include="Service\YqnQbService.cs" />
+ <Compile Include="Utility\Util.cs" />
+ <Compile Include="Web References\WebS\Reference.cs">
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
+ <DependentUpon>Reference.map</DependentUpon>
+ </Compile>
<Compile Include="Code\Common.cs" />
<Compile Include="Code\Test2.cs" />
<Compile Include="Code\TestDAL.cs" />
@@ -778,11 +785,6 @@
<Compile Include="Models\JsonResult.cs" />
<Compile Include="Models\Pensen.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Web References\WebS\Reference.cs">
- <AutoGen>True</AutoGen>
- <DesignTime>True</DesignTime>
- <DependentUpon>Reference.map</DependentUpon>
- </Compile>
<Compile Include="WebServer.cs" />
</ItemGroup>
<ItemGroup>
@@ -846,6 +848,7 @@
<Folder Include="Views\Sc_WorkBillAutoSortBillMain\" />
<Folder Include="Views\Sc_WorkBillSortBill\" />
<Folder Include="Views\Sc_WorkDemandPlanBill\" />
+ <Folder Include="Views\Xt_grdAlignment_WMES\" />
</ItemGroup>
<ItemGroup>
<WCFMetadata Include="Service References\" />
@@ -858,6 +861,19 @@
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
+ </ItemGroup>
+ <ItemGroup>
+ <WebReferenceUrl Include="http://47.96.97.237/WEBS-WMS/WebService1.asmx">
+ <UrlBehavior>Dynamic</UrlBehavior>
+ <RelPath>Web References\WebS\</RelPath>
+ <UpdateFromURL>http://47.96.97.237/WEBS-WMS/WebService1.asmx</UpdateFromURL>
+ <ServiceLocationURL>
+ </ServiceLocationURL>
+ <CachedDynamicPropName>
+ </CachedDynamicPropName>
+ <CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
+ <CachedSettingsPropName>WebAPI_WebS_WebService1</CachedSettingsPropName>
+ </WebReferenceUrl>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\BLL\BLL.csproj">
@@ -888,19 +904,6 @@
<Project>{0a4ef483-d8d3-49a5-8378-974ef7993365}</Project>
<Name>SQLHelper</Name>
</ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <WebReferenceUrl Include="http://192.168.10.66/WEBS-WMS/WebService1.asmx">
- <UrlBehavior>Dynamic</UrlBehavior>
- <RelPath>Web References\WebS\</RelPath>
- <UpdateFromURL>http://192.168.10.66/WEBS-WMS/WebService1.asmx</UpdateFromURL>
- <ServiceLocationURL>
- </ServiceLocationURL>
- <CachedDynamicPropName>
- </CachedDynamicPropName>
- <CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
- <CachedSettingsPropName>WebAPI_WebS_WebService1</CachedSettingsPropName>
- </WebReferenceUrl>
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 16d95e2..e7d6e7d 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -9,7 +9,7 @@
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\椤圭洰\LayUI\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>false</UseIISExpress>
<Use64BitIISExpress />
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBill.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBill.cs"
index fcf9aa1..cadce83 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBill.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBill.cs"
@@ -138,6 +138,7 @@
//鍙栨秷鎸夐挳
private void cmdCancel_Click(object sender, EventArgs e)
{
+ ClsPub.SaveGridView(grdSub, Name+"grdSub", ClsPub.AppPath);//璁剧疆鍒楀
this.Close();
}
//鎺т欢浣嶇疆
@@ -414,7 +415,8 @@
txtHProcNo.Enabled = false;
//鍔犺浇 閰嶄欢缁戝畾娓呭崟
-
+ HInterID = BillOld.omodel.HInterID;
+ DisplaySub();
@@ -1510,9 +1512,13 @@
DataSet Dsplay;
Dsplay = oCn.RunProcReturn("exec h_p_MES_StationInBillSub_BindDisplay " + HInterID.ToString() + " ", "h_p_MES_StationInBillSub_BindDisplay");
//鍐欏叆淇℃伅
- if (Dsplay == null || Dsplay.Tables[0].Rows.Count == 0)
+ if (Dsplay == null )
{
MessageBox.Show("鍒锋柊澶辫触锛�");
+ return;
+ }
+ else if(Dsplay.Tables[0].Rows.Count == 0)
+ {
return;
}
else
@@ -1536,5 +1542,25 @@
MessageBox.Show(e.Message + "DisplaySub");
}
}
+
+ private void cmdDelLine_Click(object sender, EventArgs e)
+ {
+ try
+ {
+ //鏍规嵁閫夋嫨鐨勬潯褰㈢爜 鏉ュ垹闄�
+ if (grdSub.CurrentRow == null)
+ return;
+ string sBarCode = DBUtility.ClsPub.isStrNull(grdSub.Rows[grdSub.CurrentRow.Index].Cells[Fun_GetCol("鏉″舰鐮�")].Value);
+ SQLHelper.ClsCN oCn = new ClsCN();
+ oCn.RunProc(" delete from Sc_StationInBillSub_BindBarCodeTemp " +
+ "Where HInterID = "+ HInterID.ToString() +" and HBarCode = '"+ sBarCode + "'");
+ DisplaySub();
+ }
+ catch (Exception e1)
+ {
+ MessageBox.Show("鍒犻櫎琛屽け璐ワ紒"+e1.Message);
+ }
+
+ }
}
}
\ No newline at end of file
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBill.designer.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBill.designer.cs"
index adf16dd..7a28de4 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBill.designer.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBill.designer.cs"
@@ -103,6 +103,8 @@
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.grdCardList = new System.Windows.Forms.DataGridView();
this.panel2 = new System.Windows.Forms.Panel();
+ this.txtHBarCode_Mater = new System.Windows.Forms.TextBox();
+ this.label25 = new System.Windows.Forms.Label();
this.txtHBarCode = new System.Windows.Forms.TextBox();
this.label19 = new System.Windows.Forms.Label();
this.timer1 = new System.Windows.Forms.Timer(this.components);
@@ -113,8 +115,7 @@
this.cmdHDelBill = new System.Windows.Forms.Button();
this.cmdXG = new System.Windows.Forms.Button();
this.cmdAddNew = new System.Windows.Forms.Button();
- this.txtHBarCode_Mater = new System.Windows.Forms.TextBox();
- this.label25 = new System.Windows.Forms.Label();
+ this.cmdDelLine = new System.Windows.Forms.Button();
this.gbUp.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdSub)).BeginInit();
this.tabControl1.SuspendLayout();
@@ -132,7 +133,7 @@
this.cmdHMaterID.Enabled = false;
this.cmdHMaterID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHMaterID.Image")));
this.cmdHMaterID.Location = new System.Drawing.Point(949, 311);
- this.cmdHMaterID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdHMaterID.Margin = new System.Windows.Forms.Padding(4);
this.cmdHMaterID.Name = "cmdHMaterID";
this.cmdHMaterID.Size = new System.Drawing.Size(40, 40);
this.cmdHMaterID.TabIndex = 86;
@@ -147,7 +148,7 @@
this.txtHMaterID.ForeColor = System.Drawing.Color.Green;
this.txtHMaterID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.txtHMaterID.Location = new System.Drawing.Point(133, 179);
- this.txtHMaterID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHMaterID.Margin = new System.Windows.Forms.Padding(4);
this.txtHMaterID.Multiline = true;
this.txtHMaterID.Name = "txtHMaterID";
this.txtHMaterID.ReadOnly = true;
@@ -200,7 +201,7 @@
this.txtHICMOBillNo.ForeColor = System.Drawing.Color.Green;
this.txtHICMOBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.txtHICMOBillNo.Location = new System.Drawing.Point(653, 267);
- this.txtHICMOBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHICMOBillNo.Margin = new System.Windows.Forms.Padding(4);
this.txtHICMOBillNo.Multiline = true;
this.txtHICMOBillNo.Name = "txtHICMOBillNo";
this.txtHICMOBillNo.ReadOnly = true;
@@ -213,7 +214,7 @@
this.txtHProcExchBillNo.ForeColor = System.Drawing.Color.Green;
this.txtHProcExchBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.txtHProcExchBillNo.Location = new System.Drawing.Point(133, 5);
- this.txtHProcExchBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHProcExchBillNo.Margin = new System.Windows.Forms.Padding(4);
this.txtHProcExchBillNo.Multiline = true;
this.txtHProcExchBillNo.Name = "txtHProcExchBillNo";
this.txtHProcExchBillNo.ReadOnly = true;
@@ -242,7 +243,7 @@
this.txtHMaterModel.ForeColor = System.Drawing.Color.Green;
this.txtHMaterModel.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.txtHMaterModel.Location = new System.Drawing.Point(653, 92);
- this.txtHMaterModel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHMaterModel.Margin = new System.Windows.Forms.Padding(4);
this.txtHMaterModel.Multiline = true;
this.txtHMaterModel.Name = "txtHMaterModel";
this.txtHMaterModel.ReadOnly = true;
@@ -268,7 +269,7 @@
this.cmdHEmpID.BackColor = System.Drawing.Color.Transparent;
this.cmdHEmpID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHEmpID.Image")));
this.cmdHEmpID.Location = new System.Drawing.Point(949, 180);
- this.cmdHEmpID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdHEmpID.Margin = new System.Windows.Forms.Padding(4);
this.cmdHEmpID.Name = "cmdHEmpID";
this.cmdHEmpID.Size = new System.Drawing.Size(40, 40);
this.cmdHEmpID.TabIndex = 93;
@@ -281,7 +282,7 @@
this.txtHEmpID.ForeColor = System.Drawing.Color.Green;
this.txtHEmpID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.txtHEmpID.Location = new System.Drawing.Point(795, 180);
- this.txtHEmpID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHEmpID.Margin = new System.Windows.Forms.Padding(4);
this.txtHEmpID.Name = "txtHEmpID";
this.txtHEmpID.ReadOnly = true;
this.txtHEmpID.Size = new System.Drawing.Size(151, 38);
@@ -307,7 +308,7 @@
this.cmdHSourceID.BackColor = System.Drawing.Color.Transparent;
this.cmdHSourceID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSourceID.Image")));
this.cmdHSourceID.Location = new System.Drawing.Point(423, 352);
- this.cmdHSourceID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdHSourceID.Margin = new System.Windows.Forms.Padding(4);
this.cmdHSourceID.Name = "cmdHSourceID";
this.cmdHSourceID.Size = new System.Drawing.Size(40, 40);
this.cmdHSourceID.TabIndex = 96;
@@ -320,7 +321,7 @@
this.txtHSourceID.ForeColor = System.Drawing.Color.Green;
this.txtHSourceID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.txtHSourceID.Location = new System.Drawing.Point(133, 352);
- this.txtHSourceID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHSourceID.Margin = new System.Windows.Forms.Padding(4);
this.txtHSourceID.Name = "txtHSourceID";
this.txtHSourceID.Size = new System.Drawing.Size(133, 38);
this.txtHSourceID.TabIndex = 95;
@@ -346,7 +347,7 @@
this.txtHICMOQty.ForeColor = System.Drawing.Color.Green;
this.txtHICMOQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.txtHICMOQty.Location = new System.Drawing.Point(653, 311);
- this.txtHICMOQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHICMOQty.Margin = new System.Windows.Forms.Padding(4);
this.txtHICMOQty.Multiline = true;
this.txtHICMOQty.Name = "txtHICMOQty";
this.txtHICMOQty.ReadOnly = true;
@@ -373,7 +374,7 @@
this.txtHPlanQty.ForeColor = System.Drawing.Color.Green;
this.txtHPlanQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.txtHPlanQty.Location = new System.Drawing.Point(653, 50);
- this.txtHPlanQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHPlanQty.Margin = new System.Windows.Forms.Padding(4);
this.txtHPlanQty.Multiline = true;
this.txtHPlanQty.Name = "txtHPlanQty";
this.txtHPlanQty.ReadOnly = true;
@@ -399,7 +400,7 @@
this.cmdHGroupID.BackColor = System.Drawing.Color.Transparent;
this.cmdHGroupID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHGroupID.Image")));
this.cmdHGroupID.Location = new System.Drawing.Point(423, 310);
- this.cmdHGroupID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdHGroupID.Margin = new System.Windows.Forms.Padding(4);
this.cmdHGroupID.Name = "cmdHGroupID";
this.cmdHGroupID.Size = new System.Drawing.Size(40, 40);
this.cmdHGroupID.TabIndex = 103;
@@ -412,7 +413,7 @@
this.txtHGroupID.ForeColor = System.Drawing.Color.Green;
this.txtHGroupID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.txtHGroupID.Location = new System.Drawing.Point(133, 310);
- this.txtHGroupID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHGroupID.Margin = new System.Windows.Forms.Padding(4);
this.txtHGroupID.Name = "txtHGroupID";
this.txtHGroupID.Size = new System.Drawing.Size(133, 38);
this.txtHGroupID.TabIndex = 102;
@@ -438,7 +439,7 @@
this.cmdHProcID.Enabled = false;
this.cmdHProcID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHProcID.Image")));
this.cmdHProcID.Location = new System.Drawing.Point(423, 91);
- this.cmdHProcID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdHProcID.Margin = new System.Windows.Forms.Padding(4);
this.cmdHProcID.Name = "cmdHProcID";
this.cmdHProcID.Size = new System.Drawing.Size(40, 40);
this.cmdHProcID.TabIndex = 106;
@@ -452,7 +453,7 @@
this.txtHProcID.ForeColor = System.Drawing.Color.Green;
this.txtHProcID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.txtHProcID.Location = new System.Drawing.Point(133, 91);
- this.txtHProcID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHProcID.Margin = new System.Windows.Forms.Padding(4);
this.txtHProcID.Multiline = true;
this.txtHProcID.Name = "txtHProcID";
this.txtHProcID.ReadOnly = true;
@@ -482,7 +483,7 @@
this.txtHMaterName.ForeColor = System.Drawing.Color.Green;
this.txtHMaterName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.txtHMaterName.Location = new System.Drawing.Point(133, 222);
- this.txtHMaterName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHMaterName.Margin = new System.Windows.Forms.Padding(4);
this.txtHMaterName.Multiline = true;
this.txtHMaterName.Name = "txtHMaterName";
this.txtHMaterName.ReadOnly = true;
@@ -506,7 +507,7 @@
// cmdOK
//
this.cmdOK.Location = new System.Drawing.Point(388, 12);
- this.cmdOK.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdOK.Margin = new System.Windows.Forms.Padding(4);
this.cmdOK.Name = "cmdOK";
this.cmdOK.Size = new System.Drawing.Size(113, 52);
this.cmdOK.TabIndex = 109;
@@ -517,7 +518,7 @@
// cmdCancel
//
this.cmdCancel.Location = new System.Drawing.Point(511, 12);
- this.cmdCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdCancel.Margin = new System.Windows.Forms.Padding(4);
this.cmdCancel.Name = "cmdCancel";
this.cmdCancel.Size = new System.Drawing.Size(113, 52);
this.cmdCancel.TabIndex = 110;
@@ -547,9 +548,9 @@
this.gbUp.Controls.Add(this.panel2);
this.gbUp.Dock = System.Windows.Forms.DockStyle.Fill;
this.gbUp.Location = new System.Drawing.Point(0, 0);
- this.gbUp.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.gbUp.Margin = new System.Windows.Forms.Padding(4);
this.gbUp.Name = "gbUp";
- this.gbUp.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.gbUp.Padding = new System.Windows.Forms.Padding(4);
this.gbUp.Size = new System.Drawing.Size(1381, 736);
this.gbUp.TabIndex = 114;
this.gbUp.TabStop = false;
@@ -639,7 +640,7 @@
this.txtHGroupName.ForeColor = System.Drawing.Color.Green;
this.txtHGroupName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.txtHGroupName.Location = new System.Drawing.Point(269, 310);
- this.txtHGroupName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHGroupName.Margin = new System.Windows.Forms.Padding(4);
this.txtHGroupName.Name = "txtHGroupName";
this.txtHGroupName.ReadOnly = true;
this.txtHGroupName.Size = new System.Drawing.Size(151, 38);
@@ -652,7 +653,7 @@
this.txtHEmpNumber.ForeColor = System.Drawing.Color.Green;
this.txtHEmpNumber.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.txtHEmpNumber.Location = new System.Drawing.Point(653, 180);
- this.txtHEmpNumber.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHEmpNumber.Margin = new System.Windows.Forms.Padding(4);
this.txtHEmpNumber.Name = "txtHEmpNumber";
this.txtHEmpNumber.Size = new System.Drawing.Size(139, 38);
this.txtHEmpNumber.TabIndex = 149;
@@ -666,7 +667,7 @@
this.txtHSourceName.ForeColor = System.Drawing.Color.Green;
this.txtHSourceName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.txtHSourceName.Location = new System.Drawing.Point(269, 352);
- this.txtHSourceName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHSourceName.Margin = new System.Windows.Forms.Padding(4);
this.txtHSourceName.Name = "txtHSourceName";
this.txtHSourceName.ReadOnly = true;
this.txtHSourceName.Size = new System.Drawing.Size(151, 38);
@@ -680,7 +681,7 @@
this.txtHOrderProcNO.ForeColor = System.Drawing.Color.Green;
this.txtHOrderProcNO.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.txtHOrderProcNO.Location = new System.Drawing.Point(653, 223);
- this.txtHOrderProcNO.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHOrderProcNO.Margin = new System.Windows.Forms.Padding(4);
this.txtHOrderProcNO.Multiline = true;
this.txtHOrderProcNO.Name = "txtHOrderProcNO";
this.txtHOrderProcNO.ReadOnly = true;
@@ -720,7 +721,7 @@
this.txtHProcNo.ForeColor = System.Drawing.Color.Green;
this.txtHProcNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.txtHProcNo.Location = new System.Drawing.Point(133, 49);
- this.txtHProcNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHProcNo.Margin = new System.Windows.Forms.Padding(4);
this.txtHProcNo.Name = "txtHProcNo";
this.txtHProcNo.Size = new System.Drawing.Size(328, 38);
this.txtHProcNo.TabIndex = 146;
@@ -746,7 +747,7 @@
this.txtHQty.ForeColor = System.Drawing.Color.Green;
this.txtHQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.txtHQty.Location = new System.Drawing.Point(653, 136);
- this.txtHQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHQty.Margin = new System.Windows.Forms.Padding(4);
this.txtHQty.Name = "txtHQty";
this.txtHQty.Size = new System.Drawing.Size(292, 38);
this.txtHQty.TabIndex = 117;
@@ -761,7 +762,7 @@
this.cmdHCenterID.Enabled = false;
this.cmdHCenterID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHCenterID.Image")));
this.cmdHCenterID.Location = new System.Drawing.Point(423, 135);
- this.cmdHCenterID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdHCenterID.Margin = new System.Windows.Forms.Padding(4);
this.cmdHCenterID.Name = "cmdHCenterID";
this.cmdHCenterID.Size = new System.Drawing.Size(40, 40);
this.cmdHCenterID.TabIndex = 144;
@@ -801,7 +802,7 @@
this.txtHBillNo.ForeColor = System.Drawing.Color.Green;
this.txtHBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.txtHBillNo.Location = new System.Drawing.Point(653, 6);
- this.txtHBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHBillNo.Margin = new System.Windows.Forms.Padding(4);
this.txtHBillNo.Multiline = true;
this.txtHBillNo.Name = "txtHBillNo";
this.txtHBillNo.ReadOnly = true;
@@ -815,7 +816,7 @@
this.txtHCenterID.ForeColor = System.Drawing.Color.Green;
this.txtHCenterID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.txtHCenterID.Location = new System.Drawing.Point(133, 135);
- this.txtHCenterID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHCenterID.Margin = new System.Windows.Forms.Padding(4);
this.txtHCenterID.Multiline = true;
this.txtHCenterID.Name = "txtHCenterID";
this.txtHCenterID.ReadOnly = true;
@@ -830,7 +831,7 @@
this.txtHStationInTime.ForeColor = System.Drawing.Color.Green;
this.txtHStationInTime.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.txtHStationInTime.Location = new System.Drawing.Point(133, 266);
- this.txtHStationInTime.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHStationInTime.Margin = new System.Windows.Forms.Padding(4);
this.txtHStationInTime.Multiline = true;
this.txtHStationInTime.Name = "txtHStationInTime";
this.txtHStationInTime.ReadOnly = true;
@@ -864,7 +865,7 @@
this.tabPage2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.tabPage2.Size = new System.Drawing.Size(994, 446);
+ this.tabPage2.Size = new System.Drawing.Size(994, 403);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "鍏朵粬淇℃伅";
//
@@ -875,7 +876,7 @@
this.txtHSourceName5.ForeColor = System.Drawing.Color.Green;
this.txtHSourceName5.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.txtHSourceName5.Location = new System.Drawing.Point(287, 186);
- this.txtHSourceName5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHSourceName5.Margin = new System.Windows.Forms.Padding(4);
this.txtHSourceName5.Name = "txtHSourceName5";
this.txtHSourceName5.ReadOnly = true;
this.txtHSourceName5.Size = new System.Drawing.Size(151, 38);
@@ -888,7 +889,7 @@
this.txtHSourceID5.ForeColor = System.Drawing.Color.Green;
this.txtHSourceID5.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.txtHSourceID5.Location = new System.Drawing.Point(151, 186);
- this.txtHSourceID5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHSourceID5.Margin = new System.Windows.Forms.Padding(4);
this.txtHSourceID5.Name = "txtHSourceID5";
this.txtHSourceID5.Size = new System.Drawing.Size(133, 38);
this.txtHSourceID5.TabIndex = 135;
@@ -899,7 +900,7 @@
this.cmdHSourceID5.BackColor = System.Drawing.Color.Transparent;
this.cmdHSourceID5.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSourceID5.Image")));
this.cmdHSourceID5.Location = new System.Drawing.Point(439, 186);
- this.cmdHSourceID5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdHSourceID5.Margin = new System.Windows.Forms.Padding(4);
this.cmdHSourceID5.Name = "cmdHSourceID5";
this.cmdHSourceID5.Size = new System.Drawing.Size(40, 40);
this.cmdHSourceID5.TabIndex = 136;
@@ -913,7 +914,7 @@
this.txtHSourceName4.ForeColor = System.Drawing.Color.Green;
this.txtHSourceName4.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.txtHSourceName4.Location = new System.Drawing.Point(287, 138);
- this.txtHSourceName4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHSourceName4.Margin = new System.Windows.Forms.Padding(4);
this.txtHSourceName4.Name = "txtHSourceName4";
this.txtHSourceName4.ReadOnly = true;
this.txtHSourceName4.Size = new System.Drawing.Size(151, 38);
@@ -926,7 +927,7 @@
this.txtHSourceID4.ForeColor = System.Drawing.Color.Green;
this.txtHSourceID4.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.txtHSourceID4.Location = new System.Drawing.Point(151, 138);
- this.txtHSourceID4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHSourceID4.Margin = new System.Windows.Forms.Padding(4);
this.txtHSourceID4.Name = "txtHSourceID4";
this.txtHSourceID4.Size = new System.Drawing.Size(133, 38);
this.txtHSourceID4.TabIndex = 131;
@@ -937,7 +938,7 @@
this.cmdHSourceID4.BackColor = System.Drawing.Color.Transparent;
this.cmdHSourceID4.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSourceID4.Image")));
this.cmdHSourceID4.Location = new System.Drawing.Point(439, 138);
- this.cmdHSourceID4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdHSourceID4.Margin = new System.Windows.Forms.Padding(4);
this.cmdHSourceID4.Name = "cmdHSourceID4";
this.cmdHSourceID4.Size = new System.Drawing.Size(40, 40);
this.cmdHSourceID4.TabIndex = 132;
@@ -951,7 +952,7 @@
this.txtHSourceName3.ForeColor = System.Drawing.Color.Green;
this.txtHSourceName3.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.txtHSourceName3.Location = new System.Drawing.Point(287, 88);
- this.txtHSourceName3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHSourceName3.Margin = new System.Windows.Forms.Padding(4);
this.txtHSourceName3.Name = "txtHSourceName3";
this.txtHSourceName3.ReadOnly = true;
this.txtHSourceName3.Size = new System.Drawing.Size(151, 38);
@@ -964,7 +965,7 @@
this.txtHSourceID3.ForeColor = System.Drawing.Color.Green;
this.txtHSourceID3.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.txtHSourceID3.Location = new System.Drawing.Point(151, 88);
- this.txtHSourceID3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHSourceID3.Margin = new System.Windows.Forms.Padding(4);
this.txtHSourceID3.Name = "txtHSourceID3";
this.txtHSourceID3.Size = new System.Drawing.Size(133, 38);
this.txtHSourceID3.TabIndex = 127;
@@ -975,7 +976,7 @@
this.cmdHSourceID3.BackColor = System.Drawing.Color.Transparent;
this.cmdHSourceID3.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSourceID3.Image")));
this.cmdHSourceID3.Location = new System.Drawing.Point(439, 88);
- this.cmdHSourceID3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdHSourceID3.Margin = new System.Windows.Forms.Padding(4);
this.cmdHSourceID3.Name = "cmdHSourceID3";
this.cmdHSourceID3.Size = new System.Drawing.Size(40, 40);
this.cmdHSourceID3.TabIndex = 128;
@@ -989,7 +990,7 @@
this.txtHSourceName2.ForeColor = System.Drawing.Color.Green;
this.txtHSourceName2.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.txtHSourceName2.Location = new System.Drawing.Point(287, 40);
- this.txtHSourceName2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHSourceName2.Margin = new System.Windows.Forms.Padding(4);
this.txtHSourceName2.Name = "txtHSourceName2";
this.txtHSourceName2.ReadOnly = true;
this.txtHSourceName2.Size = new System.Drawing.Size(151, 38);
@@ -1002,7 +1003,7 @@
this.txtHSourceID2.ForeColor = System.Drawing.Color.Green;
this.txtHSourceID2.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.txtHSourceID2.Location = new System.Drawing.Point(151, 40);
- this.txtHSourceID2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHSourceID2.Margin = new System.Windows.Forms.Padding(4);
this.txtHSourceID2.Name = "txtHSourceID2";
this.txtHSourceID2.Size = new System.Drawing.Size(133, 38);
this.txtHSourceID2.TabIndex = 123;
@@ -1013,7 +1014,7 @@
this.cmdHSourceID2.BackColor = System.Drawing.Color.Transparent;
this.cmdHSourceID2.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSourceID2.Image")));
this.cmdHSourceID2.Location = new System.Drawing.Point(439, 40);
- this.cmdHSourceID2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdHSourceID2.Margin = new System.Windows.Forms.Padding(4);
this.cmdHSourceID2.Name = "cmdHSourceID2";
this.cmdHSourceID2.Size = new System.Drawing.Size(40, 40);
this.cmdHSourceID2.TabIndex = 124;
@@ -1027,7 +1028,7 @@
this.txtHPieceQty.ForeColor = System.Drawing.Color.Green;
this.txtHPieceQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.txtHPieceQty.Location = new System.Drawing.Point(719, 38);
- this.txtHPieceQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHPieceQty.Margin = new System.Windows.Forms.Padding(4);
this.txtHPieceQty.Multiline = true;
this.txtHPieceQty.Name = "txtHPieceQty";
this.txtHPieceQty.Size = new System.Drawing.Size(249, 40);
@@ -1151,125 +1152,6 @@
this.panel2.Size = new System.Drawing.Size(1373, 55);
this.panel2.TabIndex = 151;
//
- // txtHBarCode
- //
- this.txtHBarCode.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.txtHBarCode.ForeColor = System.Drawing.Color.Green;
- this.txtHBarCode.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHBarCode.Location = new System.Drawing.Point(248, 8);
- this.txtHBarCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.txtHBarCode.Multiline = true;
- this.txtHBarCode.Name = "txtHBarCode";
- this.txtHBarCode.Size = new System.Drawing.Size(279, 40);
- this.txtHBarCode.TabIndex = 113;
- this.txtHBarCode.Tag = "0";
- this.txtHBarCode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHBarCode_KeyDown);
- //
- // label19
- //
- this.label19.AutoSize = true;
- this.label19.BackColor = System.Drawing.Color.Gray;
- this.label19.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label19.ForeColor = System.Drawing.Color.Yellow;
- this.label19.Location = new System.Drawing.Point(160, 12);
- this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- this.label19.Name = "label19";
- this.label19.Size = new System.Drawing.Size(92, 27);
- this.label19.TabIndex = 112;
- this.label19.Text = "娴佽浆鍗★細";
- //
- // timer1
- //
- this.timer1.Enabled = true;
- this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
- //
- // panel1
- //
- this.panel1.Controls.Add(this.cmdXZ);
- this.panel1.Controls.Add(this.button2);
- this.panel1.Controls.Add(this.button1);
- this.panel1.Controls.Add(this.cmdHDelBill);
- this.panel1.Controls.Add(this.cmdXG);
- this.panel1.Controls.Add(this.cmdAddNew);
- this.panel1.Controls.Add(this.cmdCancel);
- this.panel1.Controls.Add(this.cmdOK);
- this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panel1.Location = new System.Drawing.Point(0, 736);
- this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1381, 81);
- this.panel1.TabIndex = 115;
- //
- // cmdXZ
- //
- this.cmdXZ.Location = new System.Drawing.Point(20, 12);
- this.cmdXZ.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.cmdXZ.Name = "cmdXZ";
- this.cmdXZ.Size = new System.Drawing.Size(113, 52);
- this.cmdXZ.TabIndex = 124;
- this.cmdXZ.Text = "鏂� 澧�";
- this.cmdXZ.UseVisualStyleBackColor = true;
- this.cmdXZ.Click += new System.EventHandler(this.cmdXZ_Click);
- //
- // button2
- //
- this.button2.Enabled = false;
- this.button2.Location = new System.Drawing.Point(756, 12);
- this.button2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(113, 52);
- this.button2.TabIndex = 123;
- this.button2.Text = "鍙嶅鏍�";
- this.button2.UseVisualStyleBackColor = true;
- this.button2.Click += new System.EventHandler(this.button2_Click);
- //
- // button1
- //
- this.button1.Enabled = false;
- this.button1.Location = new System.Drawing.Point(633, 12);
- this.button1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(113, 52);
- this.button1.TabIndex = 122;
- this.button1.Text = "瀹� 鏍�";
- this.button1.UseVisualStyleBackColor = true;
- this.button1.Click += new System.EventHandler(this.button1_Click);
- //
- // cmdHDelBill
- //
- this.cmdHDelBill.Location = new System.Drawing.Point(265, 12);
- this.cmdHDelBill.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.cmdHDelBill.Name = "cmdHDelBill";
- this.cmdHDelBill.Size = new System.Drawing.Size(113, 52);
- this.cmdHDelBill.TabIndex = 121;
- this.cmdHDelBill.Text = "鍒犻櫎棰嗘枡鍗�";
- this.cmdHDelBill.UseVisualStyleBackColor = true;
- this.cmdHDelBill.Visible = false;
- this.cmdHDelBill.Click += new System.EventHandler(this.cmdHDelBill_Click);
- //
- // cmdXG
- //
- this.cmdXG.Location = new System.Drawing.Point(143, 12);
- this.cmdXG.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.cmdXG.Name = "cmdXG";
- this.cmdXG.Size = new System.Drawing.Size(113, 52);
- this.cmdXG.TabIndex = 120;
- this.cmdXG.Text = "淇� 鏀�";
- this.cmdXG.UseVisualStyleBackColor = true;
- this.cmdXG.Click += new System.EventHandler(this.cmdXG_Click);
- //
- // cmdAddNew
- //
- this.cmdAddNew.Location = new System.Drawing.Point(879, 12);
- this.cmdAddNew.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.cmdAddNew.Name = "cmdAddNew";
- this.cmdAddNew.Size = new System.Drawing.Size(113, 52);
- this.cmdAddNew.TabIndex = 114;
- this.cmdAddNew.Text = "娓� 绌�";
- this.cmdAddNew.UseVisualStyleBackColor = true;
- this.cmdAddNew.Visible = false;
- this.cmdAddNew.Click += new System.EventHandler(this.cmdAddNew_Click);
- //
// txtHBarCode_Mater
//
this.txtHBarCode_Mater.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -1297,6 +1179,137 @@
this.label25.TabIndex = 114;
this.label25.Text = "閰嶄欢鏉″舰鐮侊細";
//
+ // txtHBarCode
+ //
+ this.txtHBarCode.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHBarCode.ForeColor = System.Drawing.Color.Green;
+ this.txtHBarCode.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHBarCode.Location = new System.Drawing.Point(248, 8);
+ this.txtHBarCode.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHBarCode.Multiline = true;
+ this.txtHBarCode.Name = "txtHBarCode";
+ this.txtHBarCode.Size = new System.Drawing.Size(279, 40);
+ this.txtHBarCode.TabIndex = 113;
+ this.txtHBarCode.Tag = "0";
+ this.txtHBarCode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHBarCode_KeyDown);
+ //
+ // label19
+ //
+ this.label19.AutoSize = true;
+ this.label19.BackColor = System.Drawing.Color.Gray;
+ this.label19.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label19.ForeColor = System.Drawing.Color.Yellow;
+ this.label19.Location = new System.Drawing.Point(160, 12);
+ this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label19.Name = "label19";
+ this.label19.Size = new System.Drawing.Size(92, 27);
+ this.label19.TabIndex = 112;
+ this.label19.Text = "娴佽浆鍗★細";
+ //
+ // timer1
+ //
+ this.timer1.Enabled = true;
+ this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
+ //
+ // panel1
+ //
+ this.panel1.Controls.Add(this.cmdDelLine);
+ this.panel1.Controls.Add(this.cmdXZ);
+ this.panel1.Controls.Add(this.button2);
+ this.panel1.Controls.Add(this.button1);
+ this.panel1.Controls.Add(this.cmdHDelBill);
+ this.panel1.Controls.Add(this.cmdXG);
+ this.panel1.Controls.Add(this.cmdAddNew);
+ this.panel1.Controls.Add(this.cmdCancel);
+ this.panel1.Controls.Add(this.cmdOK);
+ this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.panel1.Location = new System.Drawing.Point(0, 736);
+ this.panel1.Margin = new System.Windows.Forms.Padding(4);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(1381, 81);
+ this.panel1.TabIndex = 115;
+ //
+ // cmdXZ
+ //
+ this.cmdXZ.Location = new System.Drawing.Point(20, 12);
+ this.cmdXZ.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdXZ.Name = "cmdXZ";
+ this.cmdXZ.Size = new System.Drawing.Size(113, 52);
+ this.cmdXZ.TabIndex = 124;
+ this.cmdXZ.Text = "鏂� 澧�";
+ this.cmdXZ.UseVisualStyleBackColor = true;
+ this.cmdXZ.Click += new System.EventHandler(this.cmdXZ_Click);
+ //
+ // button2
+ //
+ this.button2.Enabled = false;
+ this.button2.Location = new System.Drawing.Point(756, 12);
+ this.button2.Margin = new System.Windows.Forms.Padding(4);
+ this.button2.Name = "button2";
+ this.button2.Size = new System.Drawing.Size(113, 52);
+ this.button2.TabIndex = 123;
+ this.button2.Text = "鍙嶅鏍�";
+ this.button2.UseVisualStyleBackColor = true;
+ this.button2.Click += new System.EventHandler(this.button2_Click);
+ //
+ // button1
+ //
+ this.button1.Enabled = false;
+ this.button1.Location = new System.Drawing.Point(633, 12);
+ this.button1.Margin = new System.Windows.Forms.Padding(4);
+ this.button1.Name = "button1";
+ this.button1.Size = new System.Drawing.Size(113, 52);
+ this.button1.TabIndex = 122;
+ this.button1.Text = "瀹� 鏍�";
+ this.button1.UseVisualStyleBackColor = true;
+ this.button1.Click += new System.EventHandler(this.button1_Click);
+ //
+ // cmdHDelBill
+ //
+ this.cmdHDelBill.Location = new System.Drawing.Point(1009, 12);
+ this.cmdHDelBill.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdHDelBill.Name = "cmdHDelBill";
+ this.cmdHDelBill.Size = new System.Drawing.Size(113, 52);
+ this.cmdHDelBill.TabIndex = 121;
+ this.cmdHDelBill.Text = "鍒犻櫎棰嗘枡鍗�";
+ this.cmdHDelBill.UseVisualStyleBackColor = true;
+ this.cmdHDelBill.Visible = false;
+ this.cmdHDelBill.Click += new System.EventHandler(this.cmdHDelBill_Click);
+ //
+ // cmdXG
+ //
+ this.cmdXG.Location = new System.Drawing.Point(143, 12);
+ this.cmdXG.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdXG.Name = "cmdXG";
+ this.cmdXG.Size = new System.Drawing.Size(113, 52);
+ this.cmdXG.TabIndex = 120;
+ this.cmdXG.Text = "淇� 鏀�";
+ this.cmdXG.UseVisualStyleBackColor = true;
+ this.cmdXG.Click += new System.EventHandler(this.cmdXG_Click);
+ //
+ // cmdAddNew
+ //
+ this.cmdAddNew.Location = new System.Drawing.Point(879, 12);
+ this.cmdAddNew.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdAddNew.Name = "cmdAddNew";
+ this.cmdAddNew.Size = new System.Drawing.Size(113, 52);
+ this.cmdAddNew.TabIndex = 114;
+ this.cmdAddNew.Text = "娓� 绌�";
+ this.cmdAddNew.UseVisualStyleBackColor = true;
+ this.cmdAddNew.Visible = false;
+ this.cmdAddNew.Click += new System.EventHandler(this.cmdAddNew_Click);
+ //
+ // cmdDelLine
+ //
+ this.cmdDelLine.Location = new System.Drawing.Point(264, 12);
+ this.cmdDelLine.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdDelLine.Name = "cmdDelLine";
+ this.cmdDelLine.Size = new System.Drawing.Size(113, 52);
+ this.cmdDelLine.TabIndex = 125;
+ this.cmdDelLine.Text = "鍒� 琛�";
+ this.cmdDelLine.UseVisualStyleBackColor = true;
+ this.cmdDelLine.Click += new System.EventHandler(this.cmdDelLine_Click);
+ //
// MES_StationInBill
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
@@ -1307,7 +1320,7 @@
this.Controls.Add(this.panel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.KeyPreview = true;
- this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "MES_StationInBill";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "杩涚珯鎺ユ敹鍗�";
@@ -1418,5 +1431,6 @@
private System.Windows.Forms.Button cmdXZ;
private System.Windows.Forms.TextBox txtHBarCode_Mater;
private System.Windows.Forms.Label label25;
+ private System.Windows.Forms.Button cmdDelLine;
}
}
\ No newline at end of file
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.cs"
index f7f6463..fa63144 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.cs"
@@ -1323,280 +1323,288 @@
//淇濆瓨鍗曟嵁
private bool Sub_SaveBill()
{
- Model.ClsSc_ProcessExchangeBillSub oBillSub = new Model.ClsSc_ProcessExchangeBillSub();
- //鍒ゆ柇鏉冮檺
- //if (!ClsPub.Security_Log(ModRightNameEdit, 1, true, DBUtility.ClsPub.CurUserName))
- //{
- // return false;
- //}
- //
- Int32 i;
- bool bResult;
- BillNew = new DAL.ClsSc_ProcessExchangeBill();
- //澶卞幓鐒︾偣
- lblCaption.Focus();
- if (!Sub_AllowSave())//鍗曟嵁瀹屾暣鎬у垽鏂�
- return false;
- //璧嬪�糏D
- if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify)
- BillNew.omodel.HInterID = BillOld.omodel.HInterID;
- else if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_UpdatePrice)
- BillNew.omodel.HInterID = BillOld.omodel.HInterID;
- //涓荤被璧嬪��
- //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
- string s = "";
- int sYear = 0;
- int sPeriod = 0;
- //if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(dtpHDate.Value, ref sYear, ref sPeriod, ref s) == false)
- //{
- // MessageBox.Show(s, "鎻愮ず");
- // return false;
- //}
- sYear = ClsPub.isDate(dtpHDate.Value).Year;
- sPeriod = ClsPub.isDate(dtpHDate.Value).Month;
- //婧愬崟淇℃伅
- //BillNew.omodel.HMainSourceBillType = cmbSourceBillType.Text;
- //
- BillNew.omodel.HYear = sYear;
- BillNew.omodel.HPeriod = sPeriod;
- BillNew.omodel.HPRDORGID = DBUtility.ClsPub.HOrgID; //缁勭粐
- //鍥哄畾璧嬪��=================================
- BillNew.omodel.HBillNo = this.txtHBillNo.Text.Trim(); //鍦ㄨ祴鍊肩被鍓嶅氨澶勭悊濂藉瓧绗︿覆鍜屾暟瀛�
- BillNew.omodel.HDate = this.dtpHDate.Value;
- BillNew.omodel.HRemark = this.txtHRemark.Text.Trim();
- //====================================================
- BillNew.omodel.HMaker = DBUtility.ClsPub.CurUserName;
- BillNew.omodel.HWWOrderInterID = ClsPub.isLong(this.txtHWWOrderInterID.Text.ToString());
- BillNew.omodel.HWWOrderEntryID = ClsPub.isLong(this.txtHWWOrderEntryID.Text.ToString());
- BillNew.omodel.HWWOrderBillNo = ClsPub.isStrNull(this.txtHWWOrderBillNo.Text);
- BillNew.omodel.HICMOInterID = ClsPub.isLong(this.txtHICMOBillNo.Tag);
- BillNew.omodel.HICMOEntryID = ClsPub.isLong(this.txtHICMOEntryID.Text);
- BillNew.omodel.HICMOBillNo = ClsPub.isStrNull(this.txtHICMOBillNo.Text);
- BillNew.omodel.HMaterID2 = ClsPub.isLong(this.txtHMaterID2.Tag);
- BillNew.omodel.HMaterID = ClsPub.isLong(this.txtHMaterID.Tag.ToString());
- BillNew.omodel.HMaterNumber = ClsPub.isStrNull(this.txtHMaterNumber.Text);
- BillNew.omodel.HBatchNo = ClsPub.isStrNull(this.txtHBatchNo.Text);
- BillNew.omodel.HUnitID = ClsPub.isLong(this.txtHUnitID.Tag.ToString());
- BillNew.omodel.HUnitNumber = ClsPub.isStrNull(this.txtHUnitNumber.Text);
- BillNew.omodel.HPlanQty = ClsPub.isDoule(this.txtHPlanQty.Text);
- BillNew.omodel.HQty = ClsPub.isDoule(this.txtHQty.Text);
- //BillNew.omodel.HQty = ClsPub.isDoule(this.txtHprocExQty.Text);
- BillNew.omodel.HPlanBeginDate = ClsPub.isDate(this.dtpHPlanBeginDate.Value);
- BillNew.omodel.HPlanEndDate = ClsPub.isDate(this.dtpHPlanEndDate.Value);
- BillNew.omodel.HExplanation = ClsPub.isStrNull(this.txtHExplanation.Text);
- BillNew.omodel.HInnerBillNo = ClsPub.isStrNull(this.txtHInnerBillNo.Text);
- BillNew.omodel.HWorkShopID = ClsPub.isLong(this.txtHWorkShopID.Tag.ToString());
- BillNew.omodel.HSupID = ClsPub.isLong(this.txtHSupID.Tag.ToString());
- BillNew.omodel.HBLFlag = chkHBLFlag.Checked;
- //BillNew.omodel.HWorkTypeNum = ClsPub.isStrNull(this.txtHWorkTypeID.Tag.ToString());
- //========================
- BillNew.omodel.HMainMaterID = ClsPub.isLong(this.txtHMainMaterID.Text.ToString());
- BillNew.omodel.HKeyMaterID = ClsPub.isLong(this.txtHKeyMaterID.Text.ToString());
- BillNew.omodel.HOrderProcNO = ClsPub.isStrNull(this.txtHOrderProcNO.Text.ToString());
- BillNew.omodel.HEquipMentID = ClsPub.isLong(this.txtHEquipMentID.Tag.ToString());
- BillNew.omodel.HMateOutBatchNo = ClsPub.isStrNull(this.txtHMateOutBatchNo.Text);
- BillNew.omodel.HProjectNum = ClsPub.isStrNull(this.txtHProjectNum.Text);
- //===================
- BillNew.omodel.HProdMaterCode = ClsPub.isStrNull(this.txtHProdMaterCode.Text);
- BillNew.omodel.HSeOrderBillNo = ClsPub.isStrNull(this.txtHSeOrderBillNo.Text);
- BillNew.omodel.HCusShortName = ClsPub.isStrNull(this.txtHCusShortName.Text);
- BillNew.omodel.HCusNeedMaterial = ClsPub.isStrNull(this.txtHCusNeedMaterial.Text);
- BillNew.omodel.HPlanSendGoodsDate = ClsPub.isStrNull(this.txtHPlanSendGoodsDate.Text);
- BillNew.omodel.HProdMaterName = ClsPub.isStrNull(this.txtHProdMaterName.Text);
- BillNew.omodel.HCusName = ClsPub.isStrNull(this.txtHCusName.Text);
- BillNew.omodel.HWorkRemark = ClsPub.isStrNull(this.txtHWorkRemark.Text);
- BillNew.omodel.HImportNote = ClsPub.isStrNull(this.txtHImportNote.Text);
- BillNew.omodel.HMaterNumber_A = ClsPub.isStrNull(this.txtHMaterNumber_A.Text);
- BillNew.omodel.HMaterNumber_B = ClsPub.isStrNull(this.txtHMaterNumber_B.Text);
- BillNew.omodel.HMaterNumber_C = ClsPub.isStrNull(this.txtHMaterNumber_C.Text);
- BillNew.omodel.HMaterNumber_D = ClsPub.isStrNull(this.txtHMaterNumber_D.Text);
- BillNew.omodel.HProdType = ClsPub.isStrNull(this.txtHProdType.Text);
- BillNew.omodel.HMaterShortName = ClsPub.isStrNull(this.txtHMaterShortName.Text);
- BillNew.omodel.HMaterIDA = ClsPub.isStrNull(this.txtHMaterIDA.Text);
- BillNew.omodel.HMaterIDB = ClsPub.isStrNull(this.txtHMaterIDB.Text);
- BillNew.omodel.HMaterIDC = ClsPub.isStrNull(this.txtHMaterIDC.Text);
- BillNew.omodel.HMaterIDD = ClsPub.isStrNull(this.txtHMaterIDD.Text);
- //===================
- BillNew.omodel.HPicNumVer = ClsPub.isStrNull(this.textHPicNumVer.Text);
- BillNew.omodel.HPicNumAssemble = ClsPub.isStrNull(this.textHPicNumAssemble.Text);
- BillNew.omodel.HMaterTexture = ClsPub.isStrNull(this.textHMaterTexture.Text);
- BillNew.omodel.HProductNum = ClsPub.isStrNull(this.textHProductNum.Text);
- BillNew.omodel.HVerNum = ClsPub.isStrNull(this.textHVerNum.Text);
- //鑾峰彇鏈�澶ц鍙�
- int MaxRowNo = 0;
- for (int n = 0; n < grdMain.Rows.Count; n++)
+ try
{
- if (DBUtility.ClsPub.isInt(grdMain.Rows[n].Cells[HEntryIDCol].Value) > MaxRowNo)
+ Model.ClsSc_ProcessExchangeBillSub oBillSub = new Model.ClsSc_ProcessExchangeBillSub();
+ //鍒ゆ柇鏉冮檺
+ //if (!ClsPub.Security_Log(ModRightNameEdit, 1, true, DBUtility.ClsPub.CurUserName))
+ //{
+ // return false;
+ //}
+ //
+ Int32 i;
+ bool bResult;
+ BillNew = new DAL.ClsSc_ProcessExchangeBill();
+ //澶卞幓鐒︾偣
+ lblCaption.Focus();
+ if (!Sub_AllowSave())//鍗曟嵁瀹屾暣鎬у垽鏂�
+ return false;
+ //璧嬪�糏D
+ if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify)
+ BillNew.omodel.HInterID = BillOld.omodel.HInterID;
+ else if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_UpdatePrice)
+ BillNew.omodel.HInterID = BillOld.omodel.HInterID;
+ //涓荤被璧嬪��
+ //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ //if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(dtpHDate.Value, ref sYear, ref sPeriod, ref s) == false)
+ //{
+ // MessageBox.Show(s, "鎻愮ず");
+ // return false;
+ //}
+ sYear = ClsPub.isDate(dtpHDate.Value).Year;
+ sPeriod = ClsPub.isDate(dtpHDate.Value).Month;
+ //婧愬崟淇℃伅
+ //BillNew.omodel.HMainSourceBillType = cmbSourceBillType.Text;
+ //
+ BillNew.omodel.HYear = sYear;
+ BillNew.omodel.HPeriod = sPeriod;
+ BillNew.omodel.HPRDORGID = DBUtility.ClsPub.HOrgID; //缁勭粐
+ //鍥哄畾璧嬪��=================================
+ BillNew.omodel.HBillNo = this.txtHBillNo.Text.Trim(); //鍦ㄨ祴鍊肩被鍓嶅氨澶勭悊濂藉瓧绗︿覆鍜屾暟瀛�
+ BillNew.omodel.HDate = this.dtpHDate.Value;
+ BillNew.omodel.HRemark = this.txtHRemark.Text.Trim();
+ //====================================================
+ BillNew.omodel.HMaker = DBUtility.ClsPub.CurUserName;
+ BillNew.omodel.HWWOrderInterID = ClsPub.isLong(this.txtHWWOrderInterID.Text.ToString());
+ BillNew.omodel.HWWOrderEntryID = ClsPub.isLong(this.txtHWWOrderEntryID.Text.ToString());
+ BillNew.omodel.HWWOrderBillNo = ClsPub.isStrNull(this.txtHWWOrderBillNo.Text);
+ BillNew.omodel.HICMOInterID = ClsPub.isLong(this.txtHICMOBillNo.Tag);
+ BillNew.omodel.HICMOEntryID = ClsPub.isLong(this.txtHICMOEntryID.Text);
+ BillNew.omodel.HICMOBillNo = ClsPub.isStrNull(this.txtHICMOBillNo.Text);
+ BillNew.omodel.HMaterID2 = ClsPub.isLong(this.txtHMaterID2.Tag);
+ BillNew.omodel.HMaterID = ClsPub.isLong(this.txtHMaterID.Tag.ToString());
+ BillNew.omodel.HMaterNumber = ClsPub.isStrNull(this.txtHMaterNumber.Text);
+ BillNew.omodel.HBatchNo = ClsPub.isStrNull(this.txtHBatchNo.Text);
+ BillNew.omodel.HUnitID = ClsPub.isLong(this.txtHUnitID.Tag.ToString());
+ BillNew.omodel.HUnitNumber = ClsPub.isStrNull(this.txtHUnitNumber.Text);
+ BillNew.omodel.HPlanQty = ClsPub.isDoule(this.txtHPlanQty.Text);
+ BillNew.omodel.HQty = ClsPub.isDoule(this.txtHQty.Text);
+ //BillNew.omodel.HQty = ClsPub.isDoule(this.txtHprocExQty.Text);
+ BillNew.omodel.HPlanBeginDate = ClsPub.isDate(this.dtpHPlanBeginDate.Value);
+ BillNew.omodel.HPlanEndDate = ClsPub.isDate(this.dtpHPlanEndDate.Value);
+ BillNew.omodel.HExplanation = ClsPub.isStrNull(this.txtHExplanation.Text);
+ BillNew.omodel.HInnerBillNo = ClsPub.isStrNull(this.txtHInnerBillNo.Text);
+ BillNew.omodel.HWorkShopID = ClsPub.isLong(this.txtHWorkShopID.Tag.ToString());
+ BillNew.omodel.HSupID = ClsPub.isLong(this.txtHSupID.Tag.ToString());
+ BillNew.omodel.HBLFlag = chkHBLFlag.Checked;
+ //BillNew.omodel.HWorkTypeNum = ClsPub.isStrNull(this.txtHWorkTypeID.Tag.ToString());
+ //========================
+ BillNew.omodel.HMainMaterID = ClsPub.isLong(this.txtHMainMaterID.Text.ToString());
+ BillNew.omodel.HKeyMaterID = ClsPub.isLong(this.txtHKeyMaterID.Text.ToString());
+ BillNew.omodel.HOrderProcNO = ClsPub.isStrNull(this.txtHOrderProcNO.Text.ToString());
+ BillNew.omodel.HEquipMentID = ClsPub.isLong(this.txtHEquipMentID.Tag.ToString());
+ BillNew.omodel.HMateOutBatchNo = ClsPub.isStrNull(this.txtHMateOutBatchNo.Text);
+ BillNew.omodel.HProjectNum = ClsPub.isStrNull(this.txtHProjectNum.Text);
+ //===================
+ BillNew.omodel.HProdMaterCode = ClsPub.isStrNull(this.txtHProdMaterCode.Text);
+ BillNew.omodel.HSeOrderBillNo = ClsPub.isStrNull(this.txtHSeOrderBillNo.Text);
+ BillNew.omodel.HCusShortName = ClsPub.isStrNull(this.txtHCusShortName.Text);
+ BillNew.omodel.HCusNeedMaterial = ClsPub.isStrNull(this.txtHCusNeedMaterial.Text);
+ BillNew.omodel.HPlanSendGoodsDate = ClsPub.isStrNull(this.txtHPlanSendGoodsDate.Text);
+ BillNew.omodel.HProdMaterName = ClsPub.isStrNull(this.txtHProdMaterName.Text);
+ BillNew.omodel.HCusName = ClsPub.isStrNull(this.txtHCusName.Text);
+ BillNew.omodel.HWorkRemark = ClsPub.isStrNull(this.txtHWorkRemark.Text);
+ BillNew.omodel.HImportNote = ClsPub.isStrNull(this.txtHImportNote.Text);
+ BillNew.omodel.HMaterNumber_A = ClsPub.isStrNull(this.txtHMaterNumber_A.Text);
+ BillNew.omodel.HMaterNumber_B = ClsPub.isStrNull(this.txtHMaterNumber_B.Text);
+ BillNew.omodel.HMaterNumber_C = ClsPub.isStrNull(this.txtHMaterNumber_C.Text);
+ BillNew.omodel.HMaterNumber_D = ClsPub.isStrNull(this.txtHMaterNumber_D.Text);
+ BillNew.omodel.HProdType = ClsPub.isStrNull(this.txtHProdType.Text);
+ BillNew.omodel.HMaterShortName = ClsPub.isStrNull(this.txtHMaterShortName.Text);
+ BillNew.omodel.HMaterIDA = ClsPub.isStrNull(this.txtHMaterIDA.Text);
+ BillNew.omodel.HMaterIDB = ClsPub.isStrNull(this.txtHMaterIDB.Text);
+ BillNew.omodel.HMaterIDC = ClsPub.isStrNull(this.txtHMaterIDC.Text);
+ BillNew.omodel.HMaterIDD = ClsPub.isStrNull(this.txtHMaterIDD.Text);
+ //===================
+ BillNew.omodel.HPicNumVer = ClsPub.isStrNull(this.textHPicNumVer.Text);
+ BillNew.omodel.HPicNumAssemble = ClsPub.isStrNull(this.textHPicNumAssemble.Text);
+ BillNew.omodel.HMaterTexture = ClsPub.isStrNull(this.textHMaterTexture.Text);
+ BillNew.omodel.HProductNum = ClsPub.isStrNull(this.textHProductNum.Text);
+ BillNew.omodel.HVerNum = ClsPub.isStrNull(this.textHVerNum.Text);
+ //鑾峰彇鏈�澶ц鍙�
+ int MaxRowNo = 0;
+ for (int n = 0; n < grdMain.Rows.Count; n++)
{
- MaxRowNo = DBUtility.ClsPub.isInt(grdMain.Rows[n].Cells[HEntryIDCol].Value);
- }
- }
- //鏄庣粏绫昏祴鍊�
- BillNew.DetailColl = new List<Model.ClsSc_ProcessExchangeBillSub>();
- for (i = 0; i <= grdMain.RowCount - 1; i++)
- {
- if (ClsPub.isLong(grdMain.Rows[i].Cells[HProcIDCol].Value) != 0)
- {
- Model.ClsSc_ProcessExchangeBillSub oSub = new Model.ClsSc_ProcessExchangeBillSub();
- //鍥哄畾璧嬪��========================================
- if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify)
+ if (DBUtility.ClsPub.isInt(grdMain.Rows[n].Cells[HEntryIDCol].Value) > MaxRowNo)
{
- if (DBUtility.ClsPub.isInt(grdMain.Rows[i].Cells[HEntryIDCol].Value) == 0)
+ MaxRowNo = DBUtility.ClsPub.isInt(grdMain.Rows[n].Cells[HEntryIDCol].Value);
+ }
+ }
+ //鏄庣粏绫昏祴鍊�
+ BillNew.DetailColl = new List<Model.ClsSc_ProcessExchangeBillSub>();
+ for (i = 0; i <= grdMain.RowCount - 1; i++)
+ {
+ if (ClsPub.isLong(grdMain.Rows[i].Cells[HProcIDCol].Value) != 0)
+ {
+ Model.ClsSc_ProcessExchangeBillSub oSub = new Model.ClsSc_ProcessExchangeBillSub();
+ //鍥哄畾璧嬪��========================================
+ if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify)
{
- oSub.HEntryID = MaxRowNo + i;
- grdMain.Rows[i].Cells[HEntryIDCol].Value = oSub.HEntryID;
+ if (DBUtility.ClsPub.isInt(grdMain.Rows[i].Cells[HEntryIDCol].Value) == 0)
+ {
+ oSub.HEntryID = MaxRowNo + i;
+ grdMain.Rows[i].Cells[HEntryIDCol].Value = oSub.HEntryID;
+ }
+ else
+ {
+ oSub.HEntryID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HEntryIDCol].Value);
+ }
+ }
+ else if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew)
+ {
+ oSub.HEntryID = i + 1;
}
else
{
- oSub.HEntryID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HEntryIDCol].Value);
+ if (DBUtility.ClsPub.isInt(grdMain.Rows[i].Cells[HEntryIDCol].Value) == 0)
+ {
+ oSub.HEntryID = MaxRowNo + i;
+ grdMain.Rows[i].Cells[HEntryIDCol].Value = oSub.HEntryID;
+ }
+ else
+ {
+ oSub.HEntryID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HEntryIDCol].Value);
+ }
}
- }
- else if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew)
- {
- oSub.HEntryID = i + 1;
- }
- else
- {
- if (DBUtility.ClsPub.isInt(grdMain.Rows[i].Cells[HEntryIDCol].Value) == 0)
+ oSub.HRemark = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HRemarkCol].Value);
+ oSub.HSourceInterID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HSourceInterIDCol].Value);
+ oSub.HSourceEntryID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HSourceEntryIDCol].Value);
+ oSub.HSourceBillType = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HSourceBillTypeCol].Value);
+ oSub.HSourceBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HSourceBillNoCol].Value);
+ oSub.HRelationQty = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HRelationQtyCol].Value);
+ oSub.HRelationQty_In = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HRelationQty_InCol].Value);
+ oSub.HRelationQty_Out = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HRelationQty_OutCol].Value);
+ oSub.HRelationQty_WWOrder = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HRelationQty_WWOrderCol].Value);
+ oSub.HRelationQty_Bad = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HRelationQty_BadCol].Value);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HRelationMoneyCol].Value);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HCloseManCol].Value);
+ oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEntryCloseDateCol].Value);
+ oSub.HCloseType = DBUtility.ClsPub.isBool(grdMain.Rows[i].Cells[HCloseTypeCol].Value);
+ //=============================
+ oSub.HQty = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HQtyCol].Value);
+ if (oSub.HQty <= 0)
{
- oSub.HEntryID = MaxRowNo + i;
- grdMain.Rows[i].Cells[HEntryIDCol].Value = oSub.HEntryID;
+ MessageBox.Show("绗�" + ClsPub.isStrNull(i + 1) + "琛岋紝娴佽浆鍗℃暟閲忎笉鑳戒负0鎴栬�呭皬浜�0");
+ return false;
}
- else
+ oSub.HProcNo = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HProcNoCol].Value);
+ if (oSub.HProcNo <= 0)
{
- oSub.HEntryID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HEntryIDCol].Value);
+ MessageBox.Show("绗�" + ClsPub.isStrNull(i + 1) + "琛岋紝娴佹按鍙蜂笉鑳戒负0鎴栬�呭皬浜�0");
+ return false;
}
+ oSub.HProcID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HProcIDCol].Value);
+ oSub.HProcNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HProcNumberCol].Value);
+ oSub.HWorkRemark = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HWorkRemarkCol].Value);
+ oSub.HCenterID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HCenterIDCol].Value);
+ oSub.HDeptID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HDeptIDCol].Value);
+ oSub.HDeptNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HDeptNumberCol].Value);
+ //oSub.HGroupID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HGroupIDCol].Value);
+ oSub.HGroupNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HGroupNumberCol].Value);
+ oSub.HWorkerID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HWorkerIDCol].Value);
+ oSub.HWorkerNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HWorkerNumberCol].Value);
+ oSub.HSourceID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HSourceIDCol].Value);
+ oSub.HTimeUnit = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HTimeUnitCol].Value);
+
+ oSub.HPlanWorkTimes = DBUtility.ClsPub.isSingle(grdMain.Rows[i].Cells[HPlanWorkTimesCol].Value);
+
+ oSub.HPlanBeginDate = DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HPlanBeginDateCol].Value);
+ oSub.HPlanEndDate = DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HPlanEndDateCol].Value);
+ oSub.HRelBeginDate = DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HRelBeginDateCol].Value);
+ oSub.HRelEndDate = DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HRelEndDateCol].Value);
+
+ oSub.HReadyTime = 0;
+ oSub.HQueueTime = 0;
+ oSub.HMoveTime = 0;
+ oSub.HBeginDayQty = DBUtility.ClsPub.isSingle(grdMain.Rows[i].Cells[HBeginDayQtyCol].Value);
+ oSub.HBeginFixQty = DBUtility.ClsPub.isSingle(grdMain.Rows[i].Cells[HBeginFixQtyCol].Value);
+ oSub.HFixWorkDays = DBUtility.ClsPub.isSingle(grdMain.Rows[i].Cells[HFixWorkDaysCol].Value);
+ oSub.HTrunWorkDays = DBUtility.ClsPub.isSingle(grdMain.Rows[i].Cells[HTrunWorkDaysCol].Value);
+ oSub.HReadyTimes = DBUtility.ClsPub.isSingle(grdMain.Rows[i].Cells[HReadyTimesCol].Value);
+ oSub.HMyWorkDays = DBUtility.ClsPub.isSingle(grdMain.Rows[i].Cells[HMyWorkDaysCol].Value);
+ oSub.HOutPrice = DBUtility.ClsPub.isSingle(grdMain.Rows[i].Cells[HOutPriceCol].Value);
+ oSub.HOutMoney = DBUtility.ClsPub.isSingle(grdMain.Rows[i].Cells[HOutMoneyCol].Value);
+
+ oSub.HLastProc = "鍚�";
+ oSub.HFstProc = "鍚�";
+ oSub.HKeyProc = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HKeyProcCol].Value);
+
+ oSub.HSupID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HSupIDCol].Value);
+ oSub.HSupFlag = DBUtility.ClsPub.isBool(grdMain.Rows[i].Cells[HSupFlagCol].Value);
+ oSub.HBackProc = DBUtility.ClsPub.isBool(grdMain.Rows[i].Cells[HBackProcCol].Value);
+ oSub.HEdit = DBUtility.ClsPub.isBool(grdMain.Rows[i].Cells[HEditCol].Value);
+ //if (oSub.HSourceID == 0)
+ //{
+ // MessageBox.Show("绗�" + ClsPub.isStrNull(i + 1) + "琛岋紝鐢熶骇璧勬簮涓嶈兘涓虹┖");
+ // return false;
+ //}
+ //
+ if (oSub.HCenterID == 0 && oSub.HSupFlag == false)
+ {
+ MessageBox.Show("绗�" + ClsPub.isStrNull(i + 1) + "琛岋紝宸ヤ綔涓績鎴栧澶栨爣璁颁笉鑳藉悓鏃朵负绌�");
+ return false;
+ }
+ oSub.HICMOBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HICMOBillNoCol].Value);
+ oSub.HICMOInterID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HICMOInterIDCol].Value);
+ oSub.HICMOEntryID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HICMOEntryIDCol].Value);
+ oSub.HSeOrderInterID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HSeOrderInterIDCol].Value);
+ oSub.HSeOrderEntryID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HSeOrderEntryIDCol].Value);
+ oSub.HSeOrderBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HSeOrderBillNoCol].Value);
+ oSub.HWWOrderInterID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HWWOrderInterIDCol].Value);
+ oSub.HWWOrderEntryID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HWWOrderEntryIDCol].Value);
+ oSub.HWWOrderBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HWWOrderBillNoCol].Value);
+ oSub.HSumPassRate = DBUtility.ClsPub.isSingle(grdMain.Rows[i].Cells[HSumPassRateCol].Value);
+ oSub.HPassRate = DBUtility.ClsPub.isSingle(grdMain.Rows[i].Cells[HPassRateCol].Value);
+ oSub.HOverRate = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HOverRateCol].Value);
+ oSub.HMaxQty = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HMaxQtyCol].Value);
+ oSub.HTechnologyParameter = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HTechnologyParameterCol].Value);
+ oSub.HPicNum = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HPicNumCol].Value);
+ oSub.HProcCheckNote = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HProcCheckNoteCol].Value);
+ oSub.HMouldNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HMouldNoCol].Value);
+ oSub.HProcWorkNum = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HProcWorkNumCol].Value);
+ BillNew.DetailColl.Add(oSub);
}
- oSub.HRemark = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HRemarkCol].Value);
- oSub.HSourceInterID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HSourceInterIDCol].Value);
- oSub.HSourceEntryID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HSourceEntryIDCol].Value);
- oSub.HSourceBillType = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HSourceBillTypeCol].Value);
- oSub.HSourceBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HSourceBillNoCol].Value);
- oSub.HRelationQty = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HRelationQtyCol].Value);
- oSub.HRelationQty_In = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HRelationQty_InCol].Value);
- oSub.HRelationQty_Out = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HRelationQty_OutCol].Value);
- oSub.HRelationQty_WWOrder = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HRelationQty_WWOrderCol].Value);
- oSub.HRelationQty_Bad = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HRelationQty_BadCol].Value);
- oSub.HRelationMoney = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HRelationMoneyCol].Value);
- oSub.HCloseMan = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HCloseManCol].Value);
- oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEntryCloseDateCol].Value);
- oSub.HCloseType = DBUtility.ClsPub.isBool(grdMain.Rows[i].Cells[HCloseTypeCol].Value);
- //=============================
- oSub.HQty = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HQtyCol].Value);
- if (oSub.HQty <= 0)
- {
- MessageBox.Show("绗�" + ClsPub.isStrNull(i + 1) + "琛岋紝娴佽浆鍗℃暟閲忎笉鑳戒负0鎴栬�呭皬浜�0");
- return false;
- }
- oSub.HProcNo = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HProcNoCol].Value);
- if (oSub.HProcNo <= 0)
- {
- MessageBox.Show("绗�" + ClsPub.isStrNull(i + 1) + "琛岋紝娴佹按鍙蜂笉鑳戒负0鎴栬�呭皬浜�0");
- return false;
- }
- oSub.HProcID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HProcIDCol].Value);
- oSub.HProcNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HProcNumberCol].Value);
- oSub.HWorkRemark = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HWorkRemarkCol].Value);
- oSub.HCenterID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HCenterIDCol].Value);
- oSub.HDeptID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HDeptIDCol].Value);
- oSub.HDeptNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HDeptNumberCol].Value);
- //oSub.HGroupID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HGroupIDCol].Value);
- oSub.HGroupNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HGroupNumberCol].Value);
- oSub.HWorkerID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HWorkerIDCol].Value);
- oSub.HWorkerNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HWorkerNumberCol].Value);
- oSub.HSourceID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HSourceIDCol].Value);
- oSub.HTimeUnit = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HTimeUnitCol].Value);
-
- oSub.HPlanWorkTimes = DBUtility.ClsPub.isSingle(grdMain.Rows[i].Cells[HPlanWorkTimesCol].Value);
-
- oSub.HPlanBeginDate = DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HPlanBeginDateCol].Value);
- oSub.HPlanEndDate = DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HPlanEndDateCol].Value);
- oSub.HRelBeginDate = DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HRelBeginDateCol].Value);
- oSub.HRelEndDate = DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HRelEndDateCol].Value);
-
- oSub.HReadyTime = 0;
- oSub.HQueueTime = 0;
- oSub.HMoveTime = 0;
- oSub.HBeginDayQty = DBUtility.ClsPub.isSingle(grdMain.Rows[i].Cells[HBeginDayQtyCol].Value);
- oSub.HBeginFixQty = DBUtility.ClsPub.isSingle(grdMain.Rows[i].Cells[HBeginFixQtyCol].Value);
- oSub.HFixWorkDays = DBUtility.ClsPub.isSingle(grdMain.Rows[i].Cells[HFixWorkDaysCol].Value);
- oSub.HTrunWorkDays = DBUtility.ClsPub.isSingle(grdMain.Rows[i].Cells[HTrunWorkDaysCol].Value);
- oSub.HReadyTimes = DBUtility.ClsPub.isSingle(grdMain.Rows[i].Cells[HReadyTimesCol].Value);
- oSub.HMyWorkDays = DBUtility.ClsPub.isSingle(grdMain.Rows[i].Cells[HMyWorkDaysCol].Value);
- oSub.HOutPrice = DBUtility.ClsPub.isSingle(grdMain.Rows[i].Cells[HOutPriceCol].Value);
- oSub.HOutMoney = DBUtility.ClsPub.isSingle(grdMain.Rows[i].Cells[HOutMoneyCol].Value);
-
- oSub.HLastProc = "鍚�";
- oSub.HFstProc = "鍚�";
- oSub.HKeyProc = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HKeyProcCol].Value);
-
- oSub.HSupID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HSupIDCol].Value);
- oSub.HSupFlag = DBUtility.ClsPub.isBool(grdMain.Rows[i].Cells[HSupFlagCol].Value);
- oSub.HBackProc = DBUtility.ClsPub.isBool(grdMain.Rows[i].Cells[HBackProcCol].Value);
- oSub.HEdit = DBUtility.ClsPub.isBool(grdMain.Rows[i].Cells[HEditCol].Value);
- //if (oSub.HSourceID == 0)
- //{
- // MessageBox.Show("绗�" + ClsPub.isStrNull(i + 1) + "琛岋紝鐢熶骇璧勬簮涓嶈兘涓虹┖");
- // return false;
- //}
- //
- if (oSub.HCenterID == 0 && oSub.HSupFlag == false)
- {
- MessageBox.Show("绗�" + ClsPub.isStrNull(i + 1) + "琛岋紝宸ヤ綔涓績鎴栧澶栨爣璁颁笉鑳藉悓鏃朵负绌�");
- return false;
- }
- oSub.HICMOBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HICMOBillNoCol].Value);
- oSub.HICMOInterID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HICMOInterIDCol].Value);
- oSub.HICMOEntryID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HICMOEntryIDCol].Value);
- oSub.HSeOrderInterID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HSeOrderInterIDCol].Value);
- oSub.HSeOrderEntryID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HSeOrderEntryIDCol].Value);
- oSub.HSeOrderBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HSeOrderBillNoCol].Value);
- oSub.HWWOrderInterID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HWWOrderInterIDCol].Value);
- oSub.HWWOrderEntryID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HWWOrderEntryIDCol].Value);
- oSub.HWWOrderBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HWWOrderBillNoCol].Value);
- oSub.HSumPassRate = DBUtility.ClsPub.isSingle(grdMain.Rows[i].Cells[HSumPassRateCol].Value);
- oSub.HPassRate = DBUtility.ClsPub.isSingle(grdMain.Rows[i].Cells[HPassRateCol].Value);
- oSub.HOverRate = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HOverRateCol].Value);
- oSub.HMaxQty = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HMaxQtyCol].Value);
- oSub.HTechnologyParameter = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HTechnologyParameterCol].Value);
- oSub.HPicNum = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HPicNumCol].Value);
- oSub.HProcCheckNote = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HProcCheckNoteCol].Value);
- oSub.HMouldNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HMouldNoCol].Value);
- oSub.HProcWorkNum = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HProcWorkNumCol].Value);
- BillNew.DetailColl.Add(oSub);
}
- }
- //淇濆瓨瀹屾瘯鍚庡鐞�
- if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew)
- {
- bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
- }
- else
- {
- bResult = BillNew.ModifyBill(BillNew.omodel.HInterID, ref ClsPub.sExeReturnInfo);
- }
- //鎻愮ず
- if (bResult == true)
- {
- BillChange = true;
- MessageBox.Show("鍗曟嵁瀛樼洏瀹屾瘯!鍗曟嵁鍙�:" + this.txtHBillNo.Text.Trim(), "鎻愮ず");
+ //淇濆瓨瀹屾瘯鍚庡鐞�
if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew)
{
- BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_View;
- BillOld.omodel.HInterID = BillNew.omodel.HInterID;
- this.Sub_ShowBill();
+ bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
}
- else if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify)
+ else
{
- BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_View;
- this.Sub_ShowBill();
+ bResult = BillNew.ModifyBill(BillNew.omodel.HInterID, ref ClsPub.sExeReturnInfo);
}
- this.Sub_OperStatus();
- return true;
+ //鎻愮ず
+ if (bResult == true)
+ {
+ BillChange = true;
+ MessageBox.Show("鍗曟嵁瀛樼洏瀹屾瘯!鍗曟嵁鍙�:" + this.txtHBillNo.Text.Trim(), "鎻愮ず");
+ if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew)
+ {
+ BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_View;
+ BillOld.omodel.HInterID = BillNew.omodel.HInterID;
+ this.Sub_ShowBill();
+ }
+ else if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify)
+ {
+ BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_View;
+ this.Sub_ShowBill();
+ }
+ this.Sub_OperStatus();
+ return true;
+ }
+ else
+ {
+ MessageBox.Show("淇濆瓨澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo, "鎻愮ず");
+ return false;
+ }
}
- else
+ catch(Exception e1)
{
- MessageBox.Show("淇濆瓨澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo, "鎻愮ず");
+ MessageBox.Show(ClsPub.sExeReturnInfo + e1.Message);
return false;
}
}
--
Gitblit v1.9.1