From ff1d21b0cff4b0920cefcd4c40da3956793a4a7c Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 21 十一月 2022 13:50:45 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
Model/车间管理/ClsSc_StationOutBillMain.cs | 2
WorkM/流转卡管理/MES_StationOutBill.designer.cs | 396 ++++++++++++++++++--------------
DAL/车间管理/ClsSc_StationOutBill.cs | 8
WebAPI/Controllers/基础资料/基础资料/Gy_SOPBillController.cs | 8
WebAPI/Controllers/BaseSet/Gy_WorkDayController.cs | 277 +++++++++++++++++++++++
WebAPI/Models/基础资料/WorkDay.cs | 19 +
WorkM/流转卡管理/MES_StationOutBill.cs | 4
WebAPI/WebAPI.csproj | 2
WebAPI/Controllers/POStockInBillController.cs | 1
9 files changed, 541 insertions(+), 176 deletions(-)
diff --git "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationOutBill.cs" "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationOutBill.cs"
index d4ef820..826bb5e 100644
--- "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationOutBill.cs"
+++ "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationOutBill.cs"
@@ -107,6 +107,8 @@
",HWasterQty=" + omodel.HWasterQty.ToString() +
",HBadCount=" + omodel.HBadCount.ToString() +
",HLastSubProc=" + Convert.ToString(omodel.HLastSubProc ? 1 : 0) +
+ ",HPersonNums=" + omodel.HPersonNums.ToString() +
+ ",HMachineNums=" + omodel.HMachineNums.ToString() +
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
//DeleteRelation(ref sReturn, lngBillKey);
@@ -337,6 +339,7 @@
",HSupID,HQty,HPrice,HMoney,HBadCount,HCenterID,HProcNo,HOrderProcNO,HSourceNameList" +
",HMainSourceInterID,HMainSourceBillNo,HMainSourceBillType,HLastSubProc" +
",HEmpID2,HEmpID3,HEmpID4,HEmpID5,HDSQty,HChongQty,HPriceRate,HWorkTimes,HQCCheckID" +
+ ",HPersonNums,HMachineNums" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",getdate(),'" + DBUtility.ClsPub.CurUserName + "',getdate(),'" + omodel.HMouldNum + "'" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HSourceName + "'," + omodel.HPieceQty.ToString() + "," + omodel.HWasterQty.ToString() + "," + omodel.HPlanPieceQty.ToString() + "," + omodel.HBadPNL.ToString() +
@@ -345,7 +348,8 @@
"," + omodel.HGroupID.ToString() + "," + omodel.HDeptID.ToString() + "," + omodel.HEmpID.ToString() + ",'" + omodel.HBarCode + "','" + omodel.HAddr + "','" + omodel.HBarCodeMaker + "',getdate()" + "," + omodel.HSourceID2.ToString() + "," + omodel.HSourceID3.ToString() + "," + omodel.HSourceID4.ToString() + "," + omodel.HSourceID5.ToString() +
"," + omodel.HSupID.ToString() + "," + omodel.HQty.ToString() + "," + omodel.HPrice.ToString() + "," + omodel.HMoney.ToString() + "," + omodel.HBadCount.ToString() + "," + omodel.HCenterID.ToString() + "," + omodel.HProcNo.ToString() + ",'" + omodel.HOrderProcNO + "'" + ",'" + omodel.HSourceNameList + "'" +
"," + omodel.HMainSourceInterID.ToString() + ",'" + omodel.HMainSourceBillNo + "','" + omodel.HMainSourceBillType + "'," + Convert.ToString(omodel.HLastSubProc ? 1 : 0) +
- "," + omodel.HEmpID2.ToString() + "," + omodel.HEmpID3.ToString() + "," + omodel.HEmpID4.ToString() + "," + omodel.HEmpID5.ToString() + "," + omodel.HDSQty.ToString() + "," + omodel.HChongQty.ToString() + "," + omodel.HPriceRate.ToString() + "," + omodel.HWorkTimes.ToString() + "," + omodel.HQCCheckID.ToString() +
+ "," + omodel.HEmpID2.ToString() + "," + omodel.HEmpID3.ToString() + "," + omodel.HEmpID4.ToString() + "," + omodel.HEmpID5.ToString() + "," + omodel.HDSQty.ToString() + "," + omodel.HChongQty.ToString() + "," + omodel.HPriceRate.ToString() + "," + omodel.HWorkTimes.ToString() + "," + omodel.HQCCheckID.ToString() +
+ "," + omodel.HPersonNums.ToString() + "," + omodel.HMachineNums.ToString() +
") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsSc_StationOutBillSub oSub in DetailColl)
@@ -676,6 +680,8 @@
omodel.HMouldNum = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMouldNum"]);
omodel.HQCCheckID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HQCCheckID"]);
omodel.HSourceNameList = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HSourceNameList"]);
+ omodel.HPersonNums = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPersonNums"]);
+ omodel.HMachineNums = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMachineNums"]);
//
//寰幆
DataSet DsSub ;
diff --git "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationOutBillMain.cs" "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationOutBillMain.cs"
index 3d8a65f..17f03e4 100644
--- "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationOutBillMain.cs"
+++ "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationOutBillMain.cs"
@@ -61,6 +61,8 @@
public Single HWorkTimes;//工时
public Int64 HQCCheckID;//检验员
public string HSourceNameList;//设备清单
+ public Int64 HPersonNums; //人员数
+ public Int64 HMachineNums; //机器数
}
}
diff --git a/WebAPI/Controllers/BaseSet/Gy_WorkDayController.cs b/WebAPI/Controllers/BaseSet/Gy_WorkDayController.cs
new file mode 100644
index 0000000..2ccd2ff
--- /dev/null
+++ b/WebAPI/Controllers/BaseSet/Gy_WorkDayController.cs
@@ -0,0 +1,277 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers
+{
+ public class Gy_WorkDayController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+ /// <summary>
+ /// 杩斿洖浠撳簱鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_WorkDay/list")]
+ [HttpGet]
+ public object list(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //缂栬緫鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log_second("Gy_WorkDay", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ string sql1 = string.Format(@"select * from H_v_Gy_WorkDay where 1='" + 1 + "'");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn(sql1 + sWhere + "", "H_v_Gy_WorkDay");
+ }
+ else
+ {
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "H_v_Gy_WorkDay");
+ }
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_WorkDay/ModifyByID")]
+ [HttpPost]
+ public object ModifyByID([FromBody] JObject oMain)
+ {
+ try
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+
+ //鍙嶅簭鍒楀寲
+ msg2 = "[" + msg2.ToString() + "]";
+ List<WorkDay> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<WorkDay>>(msg2);
+
+ long HItemID = list[0].HItemID;
+
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ if (HItemID == 0)
+ {
+ oCN.BeginTran();
+ string sql = string.Format(@"insert into Gy_WorkDay (HDate,HWorkBegin,HWorkEnd,HNoonbreakBegin,HNoonbreakEnd,HNightbreakBegin,HNightbreakEnd)
+values ('{0}','{1}','{2}','{3}','{4}','{5}','{6}')", list[0].HDate, list[0].HWorkBegin, list[0].HWorkEnd, list[0].HNoonbreakBegin, list[0].HNoonbreakEnd, list[0].HNightbreakBegin, list[0].HNightbreakEnd);
+ oCN.RunProc(sql);
+ oCN.Commit();
+ }
+ else
+ {
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCN.BeginTran();
+ //涓昏〃
+ oCN.RunProc("Update Gy_WorkDay set " +
+ " HDate='" + list[0].HDate + "'" +
+ ",HWorkBegin='" + list[0].HWorkBegin + "'" +
+ ",HWorkEnd='" + list[0].HWorkEnd + "'" +
+ ",HNoonbreakBegin='" + list[0].HNoonbreakBegin + "'" +
+ ",HNoonbreakEnd=" + list[0].HNoonbreakEnd +
+ ",HNightbreakBegin=" + list[0].HNightbreakBegin +
+ ",HNightbreakEnd=" + list[0].HNightbreakEnd +
+ " Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //
+ oCN.Commit();
+ }
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ //oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁鍩虹璧勬枡ID 鏌ユ壘璁板綍
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_WorkDay/cx")]
+ [HttpGet]
+ public object cx(long HInterID)
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn("select * from Gy_WorkDay where HitemID=" + HInterID, "Gy_WorkDay");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ 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>
+ /// <returns></returns>
+ [Route("DeltetGy_WorkDay")]
+ [HttpGet]
+ public object DeltetGy_WorkDay(string HItemID, string user)
+ {
+ DataSet ds;
+ DataSet ds1;
+ try
+ {
+ ////鍒犻櫎鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log("Gy_Warehouse_Delete", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犲垹闄ゆ潈闄�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (string.IsNullOrWhiteSpace(HItemID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HItemID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+ ds = oCN.RunProcReturn("select * from Gy_WorkDay where HItemID=" + HItemID, "Gy_WorkDay");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ //var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
+ //if (HStopflag)
+ //{
+ // oCN.RollBack();//鍥炴粴浜嬪姟
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏁版嵁宸插垹闄ゆ棤娉曞啀娆″垹闄わ紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ ds1 = oCN.RunProcReturn("Select HItemID from Gy_WorkDay Where HParentID='" + HItemID + "'", "Gy_WorkDay");
+ if (ds1.Tables[0].Rows.Count != 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ら」鐩瓨鍦ㄥ瓙椤圭洰锛屼笉鑳藉垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ string HUseFlag = Convert.ToString(ds.Tables[0].Rows[0]["HUseFlag"]);
+ if (HUseFlag == "宸蹭娇鐢�")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ら」鐩凡浣跨敤锛屼笉鑳藉垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.RunProc("delete from Gy_WorkDay where HItemID=" + HItemID);
+ oCN.Commit();//鎻愪氦浜嬪姟
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "* 鏁版嵁鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/POStockInBillController.cs b/WebAPI/Controllers/POStockInBillController.cs
index e579bda..38913c9 100644
--- a/WebAPI/Controllers/POStockInBillController.cs
+++ b/WebAPI/Controllers/POStockInBillController.cs
@@ -1113,7 +1113,6 @@
}
-
#region 鍒拌揣纭
[Route("POStockInBillList/Get_ReciveBill")]
[HttpGet]
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_SOPBillController.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_SOPBillController.cs"
index c9a5385..e6769f8 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_SOPBillController.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_SOPBillController.cs"
@@ -40,7 +40,7 @@
// objJsonResult.data = null;
// return objJsonResult;
//}
- string sql1 = string.Format(@"select * from h_v_Sc_WorkOrderList where HMainID='" + sWhere + "'");
+ string sql1 = string.Format(@"select * from h_v_Sc_WorkOrderList where 寮�宸ユ爣璁� = 1 and HMainID='" + sWhere + "'");
ds = oCN.RunProcReturn(sql1, "h_v_Sc_WorkOrderList");
@@ -68,7 +68,7 @@
/// </summary>
[Route("Sc_ICMOBillStatus_Tmp/Filelist")]
[HttpGet]
- public object Filelist()
+ public object Filelist(int sWhere)
{
try
{
@@ -81,9 +81,9 @@
// objJsonResult.data = null;
// return objJsonResult;
//}
- string sql1 = string.Format(@"select HSno 搴忓彿,HFileName 鏂囦欢鍚嶇О from Gy_SOPBillSub2");
+ string sql1 = string.Format(@"select * from h_v_Sc_GetFileList where 鏂囦欢ID = " + sWhere);
- ds = oCN.RunProcReturn(sql1, "Gy_SOPBillSub2");
+ ds = oCN.RunProcReturn(sql1, "h_v_Sc_GetFileList");
objJsonResult.code = "1";
diff --git "a/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/WorkDay.cs" "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/WorkDay.cs"
new file mode 100644
index 0000000..36320f9
--- /dev/null
+++ "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/WorkDay.cs"
@@ -0,0 +1,19 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class WorkDay
+ {
+ public long HItemID { get; set; } //涓婚敭
+ public DateTime HDate { get; set; }
+ public DateTime HWorkBegin { get; set; }
+ public DateTime HWorkEnd { get; set; }
+ public DateTime HNoonbreakBegin { get; set; }
+ public DateTime HNoonbreakEnd { get; set; }
+ public DateTime HNightbreakBegin { get; set; }
+ public DateTime HNightbreakEnd { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 9e9eac2..87cbfbd 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -322,6 +322,7 @@
<Compile Include="App_Start\WebApiConfig.cs" />
<Compile Include="Controllers\BaseSet\Gy_BarCodeBillController.cs" />
<Compile Include="Controllers\BaseSet\Gy_ConkTypeController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_WorkDayController.cs" />
<Compile Include="Controllers\BaseSet\Gy_PackTypeController.cs" />
<Compile Include="Controllers\BaseSet\Gy_RoutingGroupController.cs" />
<Compile Include="Controllers\BaseSet\Gy_TechnologyController.cs" />
@@ -616,6 +617,7 @@
<Compile Include="Models\鍩虹璧勬枡\ConkType.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_ClassTimePrj.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_Duty.cs" />
+ <Compile Include="Models\鍩虹璧勬枡\WorkDay.cs" />
<Compile Include="Models\鍩虹璧勬枡\PackType.cs" />
<Compile Include="Models\鍩虹璧勬枡\WorkStation.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsGy_ClassTimePrj_Model.cs" />
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBill.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBill.cs"
index 53f7bc5..aa51a91 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBill.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBill.cs"
@@ -428,6 +428,8 @@
this.txtHWorkTimes.Text = BillOld.omodel.HWorkTimes.ToString();
this.txtHMouldNum.Text = BillOld.omodel.HMouldNum.ToString();
this.txtHSourceNameList.Text = BillOld.omodel.HSourceNameList.ToString();
+ this.txtHPersonNums.Text = BillOld.omodel.HPersonNums.ToString();
+ this.txtHMachineNums.Text = BillOld.omodel.HMachineNums.ToString();
//鍔犺浇琛ㄤ綋
initGrid();
initGrid_Sub();
@@ -904,6 +906,8 @@
BillNew.omodel.HWorkTimes = DBUtility.ClsPub.isSingle(this.txtHWorkTimes.Text);
BillNew.omodel.HQCCheckID = DBUtility.ClsPub.isLong(this.txtHQCCheckID.Tag);
BillNew.omodel.HSourceNameList = DBUtility.ClsPub.isStrNull(this.txtHSourceNameList.Text);
+ BillNew.omodel.HPersonNums = DBUtility.ClsPub.isLong(this.txtHPersonNums.Text);
+ BillNew.omodel.HMachineNums = DBUtility.ClsPub.isLong(this.txtHMachineNums.Text);
//鏄庣粏绫昏祴鍊�
BillNew.DetailColl = new List<Model.ClsSc_StationOutBillSub>();
for (int i = 0; i <= grdSub.RowCount - 1; i++)
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBill.designer.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBill.designer.cs"
index 8c50833..9f4304a 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBill.designer.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBill.designer.cs"
@@ -177,6 +177,10 @@
this.panel7 = new System.Windows.Forms.Panel();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
+ this.txtHPersonNums = new System.Windows.Forms.TextBox();
+ this.label45 = new System.Windows.Forms.Label();
+ this.txtHMachineNums = new System.Windows.Forms.TextBox();
+ this.label46 = new System.Windows.Forms.Label();
this.gbUp.SuspendLayout();
this.groupBox1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdCardList)).BeginInit();
@@ -203,9 +207,9 @@
this.cmdHMaterID.BackColor = System.Drawing.Color.Transparent;
this.cmdHMaterID.Enabled = false;
this.cmdHMaterID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHMaterID.Image")));
- this.cmdHMaterID.Location = new System.Drawing.Point(303, 121);
+ this.cmdHMaterID.Location = new System.Drawing.Point(303, 117);
this.cmdHMaterID.Name = "cmdHMaterID";
- this.cmdHMaterID.Size = new System.Drawing.Size(26, 28);
+ this.cmdHMaterID.Size = new System.Drawing.Size(26, 23);
this.cmdHMaterID.TabIndex = 86;
this.cmdHMaterID.TabStop = false;
this.cmdHMaterID.UseVisualStyleBackColor = false;
@@ -215,13 +219,13 @@
// txtHMaterID
//
this.txtHMaterID.Enabled = false;
- this.txtHMaterID.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHMaterID.Font = new System.Drawing.Font("瀹嬩綋", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHMaterID.ForeColor = System.Drawing.Color.Green;
this.txtHMaterID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterID.Location = new System.Drawing.Point(115, 121);
+ this.txtHMaterID.Location = new System.Drawing.Point(115, 117);
this.txtHMaterID.Name = "txtHMaterID";
this.txtHMaterID.ReadOnly = true;
- this.txtHMaterID.Size = new System.Drawing.Size(188, 28);
+ this.txtHMaterID.Size = new System.Drawing.Size(188, 23);
this.txtHMaterID.TabIndex = 85;
this.txtHMaterID.TabStop = false;
this.txtHMaterID.Tag = "0";
@@ -233,7 +237,7 @@
this.label16.BackColor = System.Drawing.Color.Gray;
this.label16.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label16.ForeColor = System.Drawing.Color.Yellow;
- this.label16.Location = new System.Drawing.Point(12, 125);
+ this.label16.Location = new System.Drawing.Point(12, 118);
this.label16.Name = "label16";
this.label16.Size = new System.Drawing.Size(90, 21);
this.label16.TabIndex = 84;
@@ -245,7 +249,7 @@
this.label9.BackColor = System.Drawing.Color.Gray;
this.label9.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label9.ForeColor = System.Drawing.Color.Yellow;
- this.label9.Location = new System.Drawing.Point(340, 38);
+ this.label9.Location = new System.Drawing.Point(340, 40);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(90, 21);
this.label9.TabIndex = 82;
@@ -256,7 +260,7 @@
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.Yellow;
- this.label2.Location = new System.Drawing.Point(12, 299);
+ this.label2.Location = new System.Drawing.Point(12, 274);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(84, 21);
this.label2.TabIndex = 80;
@@ -264,25 +268,25 @@
//
// txtHICMOBillNo
//
- this.txtHICMOBillNo.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHICMOBillNo.Font = new System.Drawing.Font("瀹嬩綋", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHICMOBillNo.ForeColor = System.Drawing.Color.Green;
this.txtHICMOBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHICMOBillNo.Location = new System.Drawing.Point(115, 294);
+ this.txtHICMOBillNo.Location = new System.Drawing.Point(115, 273);
this.txtHICMOBillNo.Name = "txtHICMOBillNo";
this.txtHICMOBillNo.ReadOnly = true;
- this.txtHICMOBillNo.Size = new System.Drawing.Size(188, 28);
+ this.txtHICMOBillNo.Size = new System.Drawing.Size(188, 23);
this.txtHICMOBillNo.TabIndex = 81;
this.txtHICMOBillNo.TabStop = false;
//
// txtHProcExchBillNo
//
- this.txtHProcExchBillNo.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHProcExchBillNo.Font = new System.Drawing.Font("瀹嬩綋", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHProcExchBillNo.ForeColor = System.Drawing.Color.Green;
this.txtHProcExchBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHProcExchBillNo.Location = new System.Drawing.Point(115, 5);
+ this.txtHProcExchBillNo.Location = new System.Drawing.Point(115, 13);
this.txtHProcExchBillNo.Name = "txtHProcExchBillNo";
this.txtHProcExchBillNo.ReadOnly = true;
- this.txtHProcExchBillNo.Size = new System.Drawing.Size(188, 28);
+ this.txtHProcExchBillNo.Size = new System.Drawing.Size(188, 23);
this.txtHProcExchBillNo.TabIndex = 1;
this.txtHProcExchBillNo.TabStop = false;
this.txtHProcExchBillNo.Tag = "0";
@@ -294,7 +298,7 @@
this.label1.BackColor = System.Drawing.Color.Gray;
this.label1.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ForeColor = System.Drawing.Color.Yellow;
- this.label1.Location = new System.Drawing.Point(12, 9);
+ this.label1.Location = new System.Drawing.Point(12, 14);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(74, 21);
this.label1.TabIndex = 87;
@@ -303,13 +307,13 @@
// txtHMaterModel
//
this.txtHMaterModel.Enabled = false;
- this.txtHMaterModel.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHMaterModel.Font = new System.Drawing.Font("瀹嬩綋", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHMaterModel.ForeColor = System.Drawing.Color.Green;
this.txtHMaterModel.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterModel.Location = new System.Drawing.Point(115, 179);
+ this.txtHMaterModel.Location = new System.Drawing.Point(115, 169);
this.txtHMaterModel.Name = "txtHMaterModel";
this.txtHMaterModel.ReadOnly = true;
- this.txtHMaterModel.Size = new System.Drawing.Size(188, 28);
+ this.txtHMaterModel.Size = new System.Drawing.Size(188, 23);
this.txtHMaterModel.TabIndex = 90;
this.txtHMaterModel.TabStop = false;
this.txtHMaterModel.Tag = "0";
@@ -320,7 +324,7 @@
this.label3.BackColor = System.Drawing.Color.Gray;
this.label3.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.ForeColor = System.Drawing.Color.Yellow;
- this.label3.Location = new System.Drawing.Point(12, 182);
+ this.label3.Location = new System.Drawing.Point(12, 170);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(90, 21);
this.label3.TabIndex = 89;
@@ -330,21 +334,21 @@
//
this.cmdHEmpID.BackColor = System.Drawing.Color.Transparent;
this.cmdHEmpID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHEmpID.Image")));
- this.cmdHEmpID.Location = new System.Drawing.Point(614, 121);
+ this.cmdHEmpID.Location = new System.Drawing.Point(614, 117);
this.cmdHEmpID.Name = "cmdHEmpID";
- this.cmdHEmpID.Size = new System.Drawing.Size(26, 28);
+ this.cmdHEmpID.Size = new System.Drawing.Size(26, 23);
this.cmdHEmpID.TabIndex = 93;
this.cmdHEmpID.UseVisualStyleBackColor = false;
this.cmdHEmpID.Click += new System.EventHandler(this.cmdHEmpID_Click);
//
// txtHEmpID
//
- this.txtHEmpID.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHEmpID.Font = new System.Drawing.Font("瀹嬩綋", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHEmpID.ForeColor = System.Drawing.Color.Green;
this.txtHEmpID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHEmpID.Location = new System.Drawing.Point(426, 121);
+ this.txtHEmpID.Location = new System.Drawing.Point(426, 117);
this.txtHEmpID.Name = "txtHEmpID";
- this.txtHEmpID.Size = new System.Drawing.Size(84, 28);
+ this.txtHEmpID.Size = new System.Drawing.Size(84, 23);
this.txtHEmpID.TabIndex = 2;
this.txtHEmpID.Tag = "0";
this.txtHEmpID.TextChanged += new System.EventHandler(this.txtHEmpID_TextChanged);
@@ -356,7 +360,7 @@
this.label4.BackColor = System.Drawing.Color.Gray;
this.label4.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.ForeColor = System.Drawing.Color.Yellow;
- this.label4.Location = new System.Drawing.Point(340, 125);
+ this.label4.Location = new System.Drawing.Point(340, 118);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(84, 21);
this.label4.TabIndex = 91;
@@ -366,9 +370,9 @@
//
this.cmdHSourceID.BackColor = System.Drawing.Color.Transparent;
this.cmdHSourceID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSourceID.Image")));
- this.cmdHSourceID.Location = new System.Drawing.Point(301, 324);
+ this.cmdHSourceID.Location = new System.Drawing.Point(301, 299);
this.cmdHSourceID.Name = "cmdHSourceID";
- this.cmdHSourceID.Size = new System.Drawing.Size(26, 28);
+ this.cmdHSourceID.Size = new System.Drawing.Size(26, 23);
this.cmdHSourceID.TabIndex = 96;
this.cmdHSourceID.TabStop = false;
this.cmdHSourceID.UseVisualStyleBackColor = false;
@@ -376,12 +380,12 @@
//
// txtHSourceID
//
- this.txtHSourceID.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHSourceID.Font = new System.Drawing.Font("瀹嬩綋", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHSourceID.ForeColor = System.Drawing.Color.Green;
this.txtHSourceID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSourceID.Location = new System.Drawing.Point(115, 324);
+ this.txtHSourceID.Location = new System.Drawing.Point(115, 299);
this.txtHSourceID.Name = "txtHSourceID";
- this.txtHSourceID.Size = new System.Drawing.Size(92, 28);
+ this.txtHSourceID.Size = new System.Drawing.Size(92, 23);
this.txtHSourceID.TabIndex = 95;
this.txtHSourceID.TabStop = false;
this.txtHSourceID.Tag = "0";
@@ -393,7 +397,7 @@
this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.ForeColor = System.Drawing.Color.Yellow;
- this.label5.Location = new System.Drawing.Point(12, 328);
+ this.label5.Location = new System.Drawing.Point(12, 300);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(90, 21);
this.label5.TabIndex = 94;
@@ -401,13 +405,13 @@
//
// txtHICMOQty
//
- this.txtHICMOQty.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHICMOQty.Font = new System.Drawing.Font("瀹嬩綋", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHICMOQty.ForeColor = System.Drawing.Color.Green;
this.txtHICMOQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHICMOQty.Location = new System.Drawing.Point(115, 266);
+ this.txtHICMOQty.Location = new System.Drawing.Point(115, 247);
this.txtHICMOQty.Name = "txtHICMOQty";
this.txtHICMOQty.ReadOnly = true;
- this.txtHICMOQty.Size = new System.Drawing.Size(188, 28);
+ this.txtHICMOQty.Size = new System.Drawing.Size(188, 23);
this.txtHICMOQty.TabIndex = 98;
this.txtHICMOQty.TabStop = false;
this.txtHICMOQty.Tag = "0";
@@ -418,7 +422,7 @@
this.label6.BackColor = System.Drawing.Color.Gray;
this.label6.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.ForeColor = System.Drawing.Color.Yellow;
- this.label6.Location = new System.Drawing.Point(364, 35);
+ this.label6.Location = new System.Drawing.Point(364, 38);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(109, 21);
this.label6.TabIndex = 97;
@@ -443,7 +447,7 @@
this.label7.BackColor = System.Drawing.Color.Gray;
this.label7.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label7.ForeColor = System.Drawing.Color.Yellow;
- this.label7.Location = new System.Drawing.Point(340, 154);
+ this.label7.Location = new System.Drawing.Point(340, 144);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(90, 21);
this.label7.TabIndex = 99;
@@ -453,9 +457,9 @@
//
this.cmdHGroupID.BackColor = System.Drawing.Color.Transparent;
this.cmdHGroupID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHGroupID.Image")));
- this.cmdHGroupID.Location = new System.Drawing.Point(614, 5);
+ this.cmdHGroupID.Location = new System.Drawing.Point(614, 13);
this.cmdHGroupID.Name = "cmdHGroupID";
- this.cmdHGroupID.Size = new System.Drawing.Size(26, 28);
+ this.cmdHGroupID.Size = new System.Drawing.Size(26, 23);
this.cmdHGroupID.TabIndex = 103;
this.cmdHGroupID.UseVisualStyleBackColor = false;
this.cmdHGroupID.Click += new System.EventHandler(this.cmdHGroupID_Click);
@@ -463,12 +467,12 @@
// txtHGroupID
//
this.txtHGroupID.BackColor = System.Drawing.SystemColors.Window;
- this.txtHGroupID.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHGroupID.Font = new System.Drawing.Font("瀹嬩綋", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHGroupID.ForeColor = System.Drawing.Color.Green;
this.txtHGroupID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHGroupID.Location = new System.Drawing.Point(426, 5);
+ this.txtHGroupID.Location = new System.Drawing.Point(426, 13);
this.txtHGroupID.Name = "txtHGroupID";
- this.txtHGroupID.Size = new System.Drawing.Size(84, 28);
+ this.txtHGroupID.Size = new System.Drawing.Size(84, 23);
this.txtHGroupID.TabIndex = 102;
this.txtHGroupID.TabStop = false;
this.txtHGroupID.Tag = "0";
@@ -480,7 +484,7 @@
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.Yellow;
- this.label8.Location = new System.Drawing.Point(340, 9);
+ this.label8.Location = new System.Drawing.Point(340, 14);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(90, 21);
this.label8.TabIndex = 101;
@@ -491,9 +495,9 @@
this.cmdHProcID.BackColor = System.Drawing.Color.Transparent;
this.cmdHProcID.Enabled = false;
this.cmdHProcID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHProcID.Image")));
- this.cmdHProcID.Location = new System.Drawing.Point(303, 92);
+ this.cmdHProcID.Location = new System.Drawing.Point(303, 91);
this.cmdHProcID.Name = "cmdHProcID";
- this.cmdHProcID.Size = new System.Drawing.Size(26, 28);
+ this.cmdHProcID.Size = new System.Drawing.Size(26, 23);
this.cmdHProcID.TabIndex = 106;
this.cmdHProcID.TabStop = false;
this.cmdHProcID.UseVisualStyleBackColor = false;
@@ -503,13 +507,13 @@
// txtHProcID
//
this.txtHProcID.Enabled = false;
- this.txtHProcID.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHProcID.Font = new System.Drawing.Font("瀹嬩綋", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHProcID.ForeColor = System.Drawing.Color.Green;
this.txtHProcID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHProcID.Location = new System.Drawing.Point(115, 92);
+ this.txtHProcID.Location = new System.Drawing.Point(115, 91);
this.txtHProcID.Name = "txtHProcID";
this.txtHProcID.ReadOnly = true;
- this.txtHProcID.Size = new System.Drawing.Size(188, 28);
+ this.txtHProcID.Size = new System.Drawing.Size(188, 23);
this.txtHProcID.TabIndex = 105;
this.txtHProcID.TabStop = false;
this.txtHProcID.Tag = "0";
@@ -522,7 +526,7 @@
this.label10.BackColor = System.Drawing.Color.Gray;
this.label10.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label10.ForeColor = System.Drawing.Color.Yellow;
- this.label10.Location = new System.Drawing.Point(12, 96);
+ this.label10.Location = new System.Drawing.Point(12, 92);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(90, 21);
this.label10.TabIndex = 104;
@@ -531,13 +535,13 @@
// txtHMaterName
//
this.txtHMaterName.Enabled = false;
- this.txtHMaterName.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHMaterName.Font = new System.Drawing.Font("瀹嬩綋", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHMaterName.ForeColor = System.Drawing.Color.Green;
this.txtHMaterName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterName.Location = new System.Drawing.Point(115, 150);
+ this.txtHMaterName.Location = new System.Drawing.Point(115, 143);
this.txtHMaterName.Name = "txtHMaterName";
this.txtHMaterName.ReadOnly = true;
- this.txtHMaterName.Size = new System.Drawing.Size(188, 28);
+ this.txtHMaterName.Size = new System.Drawing.Size(188, 23);
this.txtHMaterName.TabIndex = 108;
this.txtHMaterName.TabStop = false;
this.txtHMaterName.Tag = "0";
@@ -548,7 +552,7 @@
this.label11.BackColor = System.Drawing.Color.Gray;
this.label11.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label11.ForeColor = System.Drawing.Color.Yellow;
- this.label11.Location = new System.Drawing.Point(12, 154);
+ this.label11.Location = new System.Drawing.Point(12, 144);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(90, 21);
this.label11.TabIndex = 107;
@@ -608,10 +612,14 @@
// tabPage2
//
this.tabPage2.BackColor = System.Drawing.Color.Gray;
+ this.tabPage2.Controls.Add(this.txtHMachineNums);
this.tabPage2.Controls.Add(this.txtHSourceNameList);
+ this.tabPage2.Controls.Add(this.label46);
this.tabPage2.Controls.Add(this.txtHGroupName);
this.tabPage2.Controls.Add(this.txtHBadCount);
this.tabPage2.Controls.Add(this.txtHQCCheckName);
+ this.tabPage2.Controls.Add(this.txtHPersonNums);
+ this.tabPage2.Controls.Add(this.label45);
this.tabPage2.Controls.Add(this.label17);
this.tabPage2.Controls.Add(this.txtHQCCheckID);
this.tabPage2.Controls.Add(this.txtHSourceName);
@@ -693,12 +701,12 @@
//
// txtHSourceNameList
//
- this.txtHSourceNameList.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHSourceNameList.Font = new System.Drawing.Font("瀹嬩綋", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHSourceNameList.ForeColor = System.Drawing.Color.Green;
this.txtHSourceNameList.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSourceNameList.Location = new System.Drawing.Point(115, 353);
+ this.txtHSourceNameList.Location = new System.Drawing.Point(115, 325);
this.txtHSourceNameList.Name = "txtHSourceNameList";
- this.txtHSourceNameList.Size = new System.Drawing.Size(188, 28);
+ this.txtHSourceNameList.Size = new System.Drawing.Size(188, 23);
this.txtHSourceNameList.TabIndex = 180;
this.txtHSourceNameList.TabStop = false;
this.txtHSourceNameList.Tag = "0";
@@ -706,13 +714,13 @@
// txtHGroupName
//
this.txtHGroupName.BackColor = System.Drawing.SystemColors.Window;
- this.txtHGroupName.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHGroupName.Font = new System.Drawing.Font("瀹嬩綋", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHGroupName.ForeColor = System.Drawing.Color.Green;
this.txtHGroupName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHGroupName.Location = new System.Drawing.Point(510, 5);
+ this.txtHGroupName.Location = new System.Drawing.Point(510, 13);
this.txtHGroupName.Name = "txtHGroupName";
this.txtHGroupName.ReadOnly = true;
- this.txtHGroupName.Size = new System.Drawing.Size(104, 28);
+ this.txtHGroupName.Size = new System.Drawing.Size(104, 23);
this.txtHGroupName.TabIndex = 178;
this.txtHGroupName.TabStop = false;
this.txtHGroupName.Tag = "0";
@@ -720,12 +728,12 @@
// txtHBadCount
//
this.txtHBadCount.BackColor = System.Drawing.SystemColors.Window;
- this.txtHBadCount.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHBadCount.Font = new System.Drawing.Font("瀹嬩綋", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHBadCount.ForeColor = System.Drawing.Color.Green;
this.txtHBadCount.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHBadCount.Location = new System.Drawing.Point(426, 208);
+ this.txtHBadCount.Location = new System.Drawing.Point(426, 195);
this.txtHBadCount.Name = "txtHBadCount";
- this.txtHBadCount.Size = new System.Drawing.Size(187, 28);
+ this.txtHBadCount.Size = new System.Drawing.Size(187, 23);
this.txtHBadCount.TabIndex = 114;
this.txtHBadCount.TabStop = false;
this.txtHBadCount.Tag = "0";
@@ -734,13 +742,13 @@
// txtHQCCheckName
//
this.txtHQCCheckName.BackColor = System.Drawing.Color.DarkGray;
- this.txtHQCCheckName.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHQCCheckName.Font = new System.Drawing.Font("瀹嬩綋", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHQCCheckName.ForeColor = System.Drawing.Color.Green;
this.txtHQCCheckName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHQCCheckName.Location = new System.Drawing.Point(511, 177);
+ this.txtHQCCheckName.Location = new System.Drawing.Point(511, 169);
this.txtHQCCheckName.Name = "txtHQCCheckName";
this.txtHQCCheckName.ReadOnly = true;
- this.txtHQCCheckName.Size = new System.Drawing.Size(104, 32);
+ this.txtHQCCheckName.Size = new System.Drawing.Size(104, 23);
this.txtHQCCheckName.TabIndex = 177;
this.txtHQCCheckName.TabStop = false;
//
@@ -749,7 +757,7 @@
this.label17.AutoSize = true;
this.label17.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label17.ForeColor = System.Drawing.Color.Yellow;
- this.label17.Location = new System.Drawing.Point(340, 212);
+ this.label17.Location = new System.Drawing.Point(340, 196);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(90, 21);
this.label17.TabIndex = 113;
@@ -757,12 +765,12 @@
//
// txtHQCCheckID
//
- this.txtHQCCheckID.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHQCCheckID.Font = new System.Drawing.Font("瀹嬩綋", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHQCCheckID.ForeColor = System.Drawing.Color.Green;
this.txtHQCCheckID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHQCCheckID.Location = new System.Drawing.Point(426, 179);
+ this.txtHQCCheckID.Location = new System.Drawing.Point(426, 169);
this.txtHQCCheckID.Name = "txtHQCCheckID";
- this.txtHQCCheckID.Size = new System.Drawing.Size(84, 28);
+ this.txtHQCCheckID.Size = new System.Drawing.Size(84, 23);
this.txtHQCCheckID.TabIndex = 174;
this.txtHQCCheckID.Tag = "0";
this.txtHQCCheckID.TextChanged += new System.EventHandler(this.txtHQCCheckID_TextChanged);
@@ -770,13 +778,13 @@
//
// txtHSourceName
//
- this.txtHSourceName.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHSourceName.Font = new System.Drawing.Font("瀹嬩綋", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHSourceName.ForeColor = System.Drawing.Color.Green;
this.txtHSourceName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSourceName.Location = new System.Drawing.Point(208, 324);
+ this.txtHSourceName.Location = new System.Drawing.Point(208, 299);
this.txtHSourceName.Name = "txtHSourceName";
this.txtHSourceName.ReadOnly = true;
- this.txtHSourceName.Size = new System.Drawing.Size(95, 28);
+ this.txtHSourceName.Size = new System.Drawing.Size(95, 23);
this.txtHSourceName.TabIndex = 1;
this.txtHSourceName.Tag = "0";
this.txtHSourceName.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHSourceName_KeyDown);
@@ -785,9 +793,9 @@
//
this.cmdHQCCheckID.BackColor = System.Drawing.Color.Transparent;
this.cmdHQCCheckID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHQCCheckID.Image")));
- this.cmdHQCCheckID.Location = new System.Drawing.Point(614, 179);
+ this.cmdHQCCheckID.Location = new System.Drawing.Point(614, 169);
this.cmdHQCCheckID.Name = "cmdHQCCheckID";
- this.cmdHQCCheckID.Size = new System.Drawing.Size(26, 28);
+ this.cmdHQCCheckID.Size = new System.Drawing.Size(26, 23);
this.cmdHQCCheckID.TabIndex = 176;
this.cmdHQCCheckID.UseVisualStyleBackColor = false;
this.cmdHQCCheckID.Visible = false;
@@ -796,24 +804,24 @@
// txtHWorkTimes
//
this.txtHWorkTimes.BackColor = System.Drawing.SystemColors.Window;
- this.txtHWorkTimes.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHWorkTimes.Font = new System.Drawing.Font("瀹嬩綋", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHWorkTimes.ForeColor = System.Drawing.Color.Green;
this.txtHWorkTimes.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHWorkTimes.Location = new System.Drawing.Point(426, 237);
+ this.txtHWorkTimes.Location = new System.Drawing.Point(426, 221);
this.txtHWorkTimes.Name = "txtHWorkTimes";
- this.txtHWorkTimes.Size = new System.Drawing.Size(188, 28);
+ this.txtHWorkTimes.Size = new System.Drawing.Size(188, 23);
this.txtHWorkTimes.TabIndex = 172;
this.txtHWorkTimes.Tag = "0";
this.txtHWorkTimes.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHWorkTimes_KeyDown);
//
// txtHMouldNum
//
- this.txtHMouldNum.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHMouldNum.Font = new System.Drawing.Font("瀹嬩綋", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHMouldNum.ForeColor = System.Drawing.Color.Green;
this.txtHMouldNum.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMouldNum.Location = new System.Drawing.Point(115, 382);
+ this.txtHMouldNum.Location = new System.Drawing.Point(115, 351);
this.txtHMouldNum.Name = "txtHMouldNum";
- this.txtHMouldNum.Size = new System.Drawing.Size(188, 28);
+ this.txtHMouldNum.Size = new System.Drawing.Size(188, 23);
this.txtHMouldNum.TabIndex = 171;
this.txtHMouldNum.TabStop = false;
this.txtHMouldNum.Tag = "0";
@@ -822,65 +830,65 @@
// txtHEmpName5
//
this.txtHEmpName5.BackColor = System.Drawing.Color.DarkGray;
- this.txtHEmpName5.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHEmpName5.Font = new System.Drawing.Font("瀹嬩綋", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHEmpName5.ForeColor = System.Drawing.Color.Green;
this.txtHEmpName5.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHEmpName5.Location = new System.Drawing.Point(510, 350);
+ this.txtHEmpName5.Location = new System.Drawing.Point(510, 325);
this.txtHEmpName5.Name = "txtHEmpName5";
this.txtHEmpName5.ReadOnly = true;
- this.txtHEmpName5.Size = new System.Drawing.Size(104, 32);
+ this.txtHEmpName5.Size = new System.Drawing.Size(104, 23);
this.txtHEmpName5.TabIndex = 167;
this.txtHEmpName5.TabStop = false;
//
// txtHEmpName4
//
this.txtHEmpName4.BackColor = System.Drawing.Color.DarkGray;
- this.txtHEmpName4.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHEmpName4.Font = new System.Drawing.Font("瀹嬩綋", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHEmpName4.ForeColor = System.Drawing.Color.Green;
this.txtHEmpName4.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHEmpName4.Location = new System.Drawing.Point(510, 322);
+ this.txtHEmpName4.Location = new System.Drawing.Point(510, 299);
this.txtHEmpName4.Name = "txtHEmpName4";
this.txtHEmpName4.ReadOnly = true;
- this.txtHEmpName4.Size = new System.Drawing.Size(104, 32);
+ this.txtHEmpName4.Size = new System.Drawing.Size(104, 23);
this.txtHEmpName4.TabIndex = 166;
this.txtHEmpName4.TabStop = false;
//
// txtHEmpName3
//
this.txtHEmpName3.BackColor = System.Drawing.Color.DarkGray;
- this.txtHEmpName3.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHEmpName3.Font = new System.Drawing.Font("瀹嬩綋", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHEmpName3.ForeColor = System.Drawing.Color.Green;
this.txtHEmpName3.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHEmpName3.Location = new System.Drawing.Point(510, 293);
+ this.txtHEmpName3.Location = new System.Drawing.Point(510, 273);
this.txtHEmpName3.Name = "txtHEmpName3";
this.txtHEmpName3.ReadOnly = true;
- this.txtHEmpName3.Size = new System.Drawing.Size(104, 32);
+ this.txtHEmpName3.Size = new System.Drawing.Size(104, 23);
this.txtHEmpName3.TabIndex = 165;
this.txtHEmpName3.TabStop = false;
//
// txtHEmpName2
//
this.txtHEmpName2.BackColor = System.Drawing.Color.DarkGray;
- this.txtHEmpName2.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHEmpName2.Font = new System.Drawing.Font("瀹嬩綋", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHEmpName2.ForeColor = System.Drawing.Color.Green;
this.txtHEmpName2.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHEmpName2.Location = new System.Drawing.Point(510, 264);
+ this.txtHEmpName2.Location = new System.Drawing.Point(510, 247);
this.txtHEmpName2.Name = "txtHEmpName2";
this.txtHEmpName2.ReadOnly = true;
- this.txtHEmpName2.Size = new System.Drawing.Size(104, 32);
+ this.txtHEmpName2.Size = new System.Drawing.Size(104, 23);
this.txtHEmpName2.TabIndex = 164;
this.txtHEmpName2.TabStop = false;
//
// txtHBillNo
//
this.txtHBillNo.BackColor = System.Drawing.Color.DarkGray;
- this.txtHBillNo.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHBillNo.Font = new System.Drawing.Font("瀹嬩綋", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHBillNo.ForeColor = System.Drawing.Color.Green;
this.txtHBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHBillNo.Location = new System.Drawing.Point(115, 208);
+ this.txtHBillNo.Location = new System.Drawing.Point(115, 195);
this.txtHBillNo.Name = "txtHBillNo";
this.txtHBillNo.ReadOnly = true;
- this.txtHBillNo.Size = new System.Drawing.Size(188, 28);
+ this.txtHBillNo.Size = new System.Drawing.Size(188, 23);
this.txtHBillNo.TabIndex = 117;
this.txtHBillNo.TabStop = false;
//
@@ -888,9 +896,9 @@
//
this.cmdHEmpID5.BackColor = System.Drawing.Color.Transparent;
this.cmdHEmpID5.Image = ((System.Drawing.Image)(resources.GetObject("cmdHEmpID5.Image")));
- this.cmdHEmpID5.Location = new System.Drawing.Point(614, 353);
+ this.cmdHEmpID5.Location = new System.Drawing.Point(614, 325);
this.cmdHEmpID5.Name = "cmdHEmpID5";
- this.cmdHEmpID5.Size = new System.Drawing.Size(26, 28);
+ this.cmdHEmpID5.Size = new System.Drawing.Size(26, 23);
this.cmdHEmpID5.TabIndex = 162;
this.cmdHEmpID5.UseVisualStyleBackColor = false;
this.cmdHEmpID5.Click += new System.EventHandler(this.cmdHEmpID5_Click);
@@ -898,13 +906,13 @@
// txtHCenterID
//
this.txtHCenterID.Enabled = false;
- this.txtHCenterID.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHCenterID.Font = new System.Drawing.Font("瀹嬩綋", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHCenterID.ForeColor = System.Drawing.Color.Green;
this.txtHCenterID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHCenterID.Location = new System.Drawing.Point(115, 62);
+ this.txtHCenterID.Location = new System.Drawing.Point(115, 65);
this.txtHCenterID.Name = "txtHCenterID";
this.txtHCenterID.ReadOnly = true;
- this.txtHCenterID.Size = new System.Drawing.Size(188, 28);
+ this.txtHCenterID.Size = new System.Drawing.Size(188, 23);
this.txtHCenterID.TabIndex = 141;
this.txtHCenterID.TabStop = false;
//
@@ -912,9 +920,9 @@
//
this.cmdHEmpID4.BackColor = System.Drawing.Color.Transparent;
this.cmdHEmpID4.Image = ((System.Drawing.Image)(resources.GetObject("cmdHEmpID4.Image")));
- this.cmdHEmpID4.Location = new System.Drawing.Point(614, 324);
+ this.cmdHEmpID4.Location = new System.Drawing.Point(614, 299);
this.cmdHEmpID4.Name = "cmdHEmpID4";
- this.cmdHEmpID4.Size = new System.Drawing.Size(26, 28);
+ this.cmdHEmpID4.Size = new System.Drawing.Size(26, 23);
this.cmdHEmpID4.TabIndex = 159;
this.cmdHEmpID4.UseVisualStyleBackColor = false;
this.cmdHEmpID4.Click += new System.EventHandler(this.cmdHEmpID4_Click);
@@ -923,21 +931,21 @@
//
this.cmdHEmpID3.BackColor = System.Drawing.Color.Transparent;
this.cmdHEmpID3.Image = ((System.Drawing.Image)(resources.GetObject("cmdHEmpID3.Image")));
- this.cmdHEmpID3.Location = new System.Drawing.Point(614, 294);
+ this.cmdHEmpID3.Location = new System.Drawing.Point(614, 273);
this.cmdHEmpID3.Name = "cmdHEmpID3";
- this.cmdHEmpID3.Size = new System.Drawing.Size(26, 28);
+ this.cmdHEmpID3.Size = new System.Drawing.Size(26, 23);
this.cmdHEmpID3.TabIndex = 156;
this.cmdHEmpID3.UseVisualStyleBackColor = false;
this.cmdHEmpID3.Click += new System.EventHandler(this.cmdHEmpID3_Click);
//
// txtHProcNo
//
- this.txtHProcNo.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHProcNo.Font = new System.Drawing.Font("瀹嬩綋", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHProcNo.ForeColor = System.Drawing.Color.Green;
this.txtHProcNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHProcNo.Location = new System.Drawing.Point(115, 34);
+ this.txtHProcNo.Location = new System.Drawing.Point(115, 39);
this.txtHProcNo.Name = "txtHProcNo";
- this.txtHProcNo.Size = new System.Drawing.Size(188, 28);
+ this.txtHProcNo.Size = new System.Drawing.Size(188, 23);
this.txtHProcNo.TabIndex = 145;
this.txtHProcNo.TabStop = false;
this.txtHProcNo.Tag = "0";
@@ -947,33 +955,33 @@
//
this.cmdHEmpID2.BackColor = System.Drawing.Color.Transparent;
this.cmdHEmpID2.Image = ((System.Drawing.Image)(resources.GetObject("cmdHEmpID2.Image")));
- this.cmdHEmpID2.Location = new System.Drawing.Point(614, 266);
+ this.cmdHEmpID2.Location = new System.Drawing.Point(614, 247);
this.cmdHEmpID2.Name = "cmdHEmpID2";
- this.cmdHEmpID2.Size = new System.Drawing.Size(26, 28);
+ this.cmdHEmpID2.Size = new System.Drawing.Size(26, 23);
this.cmdHEmpID2.TabIndex = 153;
this.cmdHEmpID2.UseVisualStyleBackColor = false;
this.cmdHEmpID2.Click += new System.EventHandler(this.cmdHEmpID2_Click);
//
// txtHRemark
//
- this.txtHRemark.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHRemark.Font = new System.Drawing.Font("瀹嬩綋", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHRemark.ForeColor = System.Drawing.Color.Green;
this.txtHRemark.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHRemark.Location = new System.Drawing.Point(426, 92);
+ this.txtHRemark.Location = new System.Drawing.Point(426, 91);
this.txtHRemark.Name = "txtHRemark";
- this.txtHRemark.Size = new System.Drawing.Size(188, 28);
+ this.txtHRemark.Size = new System.Drawing.Size(188, 23);
this.txtHRemark.TabIndex = 169;
this.txtHRemark.TabStop = false;
this.txtHRemark.Tag = "0";
//
// txtHEmpID5
//
- this.txtHEmpID5.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHEmpID5.Font = new System.Drawing.Font("瀹嬩綋", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHEmpID5.ForeColor = System.Drawing.Color.Green;
this.txtHEmpID5.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHEmpID5.Location = new System.Drawing.Point(426, 353);
+ this.txtHEmpID5.Location = new System.Drawing.Point(426, 325);
this.txtHEmpID5.Name = "txtHEmpID5";
- this.txtHEmpID5.Size = new System.Drawing.Size(84, 28);
+ this.txtHEmpID5.Size = new System.Drawing.Size(84, 23);
this.txtHEmpID5.TabIndex = 160;
this.txtHEmpID5.Tag = "0";
this.txtHEmpID5.TextChanged += new System.EventHandler(this.txtHEmpID5_TextChanged);
@@ -982,25 +990,25 @@
// txtHOrderProcNO
//
this.txtHOrderProcNO.Enabled = false;
- this.txtHOrderProcNO.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHOrderProcNO.Font = new System.Drawing.Font("瀹嬩綋", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHOrderProcNO.ForeColor = System.Drawing.Color.Green;
this.txtHOrderProcNO.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHOrderProcNO.Location = new System.Drawing.Point(115, 237);
+ this.txtHOrderProcNO.Location = new System.Drawing.Point(115, 221);
this.txtHOrderProcNO.Name = "txtHOrderProcNO";
this.txtHOrderProcNO.ReadOnly = true;
- this.txtHOrderProcNO.Size = new System.Drawing.Size(188, 28);
+ this.txtHOrderProcNO.Size = new System.Drawing.Size(188, 23);
this.txtHOrderProcNO.TabIndex = 147;
this.txtHOrderProcNO.TabStop = false;
this.txtHOrderProcNO.Tag = "0";
//
// txtHEmpID4
//
- this.txtHEmpID4.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHEmpID4.Font = new System.Drawing.Font("瀹嬩綋", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHEmpID4.ForeColor = System.Drawing.Color.Green;
this.txtHEmpID4.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHEmpID4.Location = new System.Drawing.Point(426, 324);
+ this.txtHEmpID4.Location = new System.Drawing.Point(426, 299);
this.txtHEmpID4.Name = "txtHEmpID4";
- this.txtHEmpID4.Size = new System.Drawing.Size(84, 28);
+ this.txtHEmpID4.Size = new System.Drawing.Size(84, 23);
this.txtHEmpID4.TabIndex = 157;
this.txtHEmpID4.Tag = "0";
this.txtHEmpID4.TextChanged += new System.EventHandler(this.txtHEmpID4_TextChanged);
@@ -1008,12 +1016,12 @@
//
// txtHEmpID3
//
- this.txtHEmpID3.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHEmpID3.Font = new System.Drawing.Font("瀹嬩綋", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHEmpID3.ForeColor = System.Drawing.Color.Green;
this.txtHEmpID3.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHEmpID3.Location = new System.Drawing.Point(426, 294);
+ this.txtHEmpID3.Location = new System.Drawing.Point(426, 273);
this.txtHEmpID3.Name = "txtHEmpID3";
- this.txtHEmpID3.Size = new System.Drawing.Size(84, 28);
+ this.txtHEmpID3.Size = new System.Drawing.Size(84, 23);
this.txtHEmpID3.TabIndex = 154;
this.txtHEmpID3.Tag = "0";
this.txtHEmpID3.TextChanged += new System.EventHandler(this.txtHEmpID3_TextChanged);
@@ -1022,24 +1030,24 @@
// txtHEmpName
//
this.txtHEmpName.BackColor = System.Drawing.Color.DarkGray;
- this.txtHEmpName.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHEmpName.Font = new System.Drawing.Font("瀹嬩綋", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHEmpName.ForeColor = System.Drawing.Color.Green;
this.txtHEmpName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHEmpName.Location = new System.Drawing.Point(511, 118);
+ this.txtHEmpName.Location = new System.Drawing.Point(511, 117);
this.txtHEmpName.Name = "txtHEmpName";
this.txtHEmpName.ReadOnly = true;
- this.txtHEmpName.Size = new System.Drawing.Size(104, 32);
+ this.txtHEmpName.Size = new System.Drawing.Size(104, 23);
this.txtHEmpName.TabIndex = 163;
this.txtHEmpName.TabStop = false;
//
// txtHEmpID2
//
- this.txtHEmpID2.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHEmpID2.Font = new System.Drawing.Font("瀹嬩綋", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHEmpID2.ForeColor = System.Drawing.Color.Green;
this.txtHEmpID2.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHEmpID2.Location = new System.Drawing.Point(426, 266);
+ this.txtHEmpID2.Location = new System.Drawing.Point(426, 247);
this.txtHEmpID2.Name = "txtHEmpID2";
- this.txtHEmpID2.Size = new System.Drawing.Size(84, 28);
+ this.txtHEmpID2.Size = new System.Drawing.Size(84, 23);
this.txtHEmpID2.TabIndex = 151;
this.txtHEmpID2.Tag = "0";
this.txtHEmpID2.TextChanged += new System.EventHandler(this.txtHEmpID2_TextChanged);
@@ -1048,25 +1056,25 @@
// txtHStationOutTime
//
this.txtHStationOutTime.Enabled = false;
- this.txtHStationOutTime.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHStationOutTime.Font = new System.Drawing.Font("瀹嬩綋", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHStationOutTime.ForeColor = System.Drawing.Color.Green;
this.txtHStationOutTime.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHStationOutTime.Location = new System.Drawing.Point(426, 34);
+ this.txtHStationOutTime.Location = new System.Drawing.Point(426, 39);
this.txtHStationOutTime.Name = "txtHStationOutTime";
this.txtHStationOutTime.ReadOnly = true;
- this.txtHStationOutTime.Size = new System.Drawing.Size(188, 28);
+ this.txtHStationOutTime.Size = new System.Drawing.Size(188, 23);
this.txtHStationOutTime.TabIndex = 112;
this.txtHStationOutTime.TabStop = false;
this.txtHStationOutTime.Tag = "0";
//
// txtHQty
//
- this.txtHQty.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHQty.Font = new System.Drawing.Font("瀹嬩綋", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHQty.ForeColor = System.Drawing.Color.Green;
this.txtHQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHQty.Location = new System.Drawing.Point(426, 150);
+ this.txtHQty.Location = new System.Drawing.Point(426, 143);
this.txtHQty.Name = "txtHQty";
- this.txtHQty.Size = new System.Drawing.Size(188, 28);
+ this.txtHQty.Size = new System.Drawing.Size(188, 23);
this.txtHQty.TabIndex = 4;
this.txtHQty.Tag = "0";
this.txtHQty.TextChanged += new System.EventHandler(this.txtHQty_TextChanged);
@@ -1077,12 +1085,12 @@
// txtHWasterQty
//
this.txtHWasterQty.BackColor = System.Drawing.SystemColors.Window;
- this.txtHWasterQty.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHWasterQty.Font = new System.Drawing.Font("瀹嬩綋", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHWasterQty.ForeColor = System.Drawing.Color.Green;
this.txtHWasterQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHWasterQty.Location = new System.Drawing.Point(426, 382);
+ this.txtHWasterQty.Location = new System.Drawing.Point(426, 351);
this.txtHWasterQty.Name = "txtHWasterQty";
- this.txtHWasterQty.Size = new System.Drawing.Size(188, 28);
+ this.txtHWasterQty.Size = new System.Drawing.Size(188, 23);
this.txtHWasterQty.TabIndex = 5;
this.txtHWasterQty.Tag = "0";
this.txtHWasterQty.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHWasterQty_KeyDown);
@@ -1091,12 +1099,12 @@
//
// txtHPayProcID
//
- this.txtHPayProcID.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHPayProcID.Font = new System.Drawing.Font("瀹嬩綋", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHPayProcID.ForeColor = System.Drawing.Color.Green;
this.txtHPayProcID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHPayProcID.Location = new System.Drawing.Point(426, 62);
+ this.txtHPayProcID.Location = new System.Drawing.Point(426, 65);
this.txtHPayProcID.Name = "txtHPayProcID";
- this.txtHPayProcID.Size = new System.Drawing.Size(126, 28);
+ this.txtHPayProcID.Size = new System.Drawing.Size(126, 23);
this.txtHPayProcID.TabIndex = 149;
this.txtHPayProcID.TabStop = false;
this.txtHPayProcID.Tag = "0";
@@ -1111,7 +1119,7 @@
this.chkHLastSubProc.Enabled = false;
this.chkHLastSubProc.Font = new System.Drawing.Font("瀹嬩綋", 10.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chkHLastSubProc.ForeColor = System.Drawing.Color.Yellow;
- this.chkHLastSubProc.Location = new System.Drawing.Point(556, 68);
+ this.chkHLastSubProc.Location = new System.Drawing.Point(556, 67);
this.chkHLastSubProc.Margin = new System.Windows.Forms.Padding(2);
this.chkHLastSubProc.Name = "chkHLastSubProc";
this.chkHLastSubProc.Size = new System.Drawing.Size(90, 19);
@@ -1124,7 +1132,7 @@
this.label40.AutoSize = true;
this.label40.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label40.ForeColor = System.Drawing.Color.Yellow;
- this.label40.Location = new System.Drawing.Point(10, 357);
+ this.label40.Location = new System.Drawing.Point(10, 326);
this.label40.Name = "label40";
this.label40.Size = new System.Drawing.Size(90, 21);
this.label40.TabIndex = 179;
@@ -1136,7 +1144,7 @@
this.label39.BackColor = System.Drawing.Color.Gray;
this.label39.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label39.ForeColor = System.Drawing.Color.Yellow;
- this.label39.Location = new System.Drawing.Point(340, 182);
+ this.label39.Location = new System.Drawing.Point(340, 170);
this.label39.Name = "label39";
this.label39.Size = new System.Drawing.Size(89, 21);
this.label39.TabIndex = 175;
@@ -1149,7 +1157,7 @@
this.label38.BackColor = System.Drawing.Color.Gray;
this.label38.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label38.ForeColor = System.Drawing.Color.Yellow;
- this.label38.Location = new System.Drawing.Point(340, 241);
+ this.label38.Location = new System.Drawing.Point(340, 222);
this.label38.Name = "label38";
this.label38.Size = new System.Drawing.Size(58, 21);
this.label38.TabIndex = 173;
@@ -1160,7 +1168,7 @@
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.Yellow;
- this.label37.Location = new System.Drawing.Point(12, 387);
+ this.label37.Location = new System.Drawing.Point(12, 352);
this.label37.Name = "label37";
this.label37.Size = new System.Drawing.Size(74, 21);
this.label37.TabIndex = 170;
@@ -1172,7 +1180,7 @@
this.label13.BackColor = System.Drawing.Color.Gray;
this.label13.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label13.ForeColor = System.Drawing.Color.Yellow;
- this.label13.Location = new System.Drawing.Point(12, 270);
+ this.label13.Location = new System.Drawing.Point(12, 248);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(106, 21);
this.label13.TabIndex = 119;
@@ -1184,7 +1192,7 @@
this.label12.BackColor = System.Drawing.Color.Gray;
this.label12.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label12.ForeColor = System.Drawing.Color.Yellow;
- this.label12.Location = new System.Drawing.Point(12, 212);
+ this.label12.Location = new System.Drawing.Point(12, 196);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(84, 21);
this.label12.TabIndex = 116;
@@ -1196,7 +1204,7 @@
this.label20.BackColor = System.Drawing.Color.Gray;
this.label20.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label20.ForeColor = System.Drawing.Color.Yellow;
- this.label20.Location = new System.Drawing.Point(12, 67);
+ this.label20.Location = new System.Drawing.Point(12, 66);
this.label20.Name = "label20";
this.label20.Size = new System.Drawing.Size(90, 21);
this.label20.TabIndex = 140;
@@ -1209,7 +1217,7 @@
this.label23.BackColor = System.Drawing.Color.Gray;
this.label23.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label23.ForeColor = System.Drawing.Color.Yellow;
- this.label23.Location = new System.Drawing.Point(12, 38);
+ this.label23.Location = new System.Drawing.Point(12, 40);
this.label23.Name = "label23";
this.label23.Size = new System.Drawing.Size(74, 21);
this.label23.TabIndex = 144;
@@ -1221,7 +1229,7 @@
this.label29.BackColor = System.Drawing.Color.Gray;
this.label29.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label29.ForeColor = System.Drawing.Color.Yellow;
- this.label29.Location = new System.Drawing.Point(340, 357);
+ this.label29.Location = new System.Drawing.Point(340, 326);
this.label29.Name = "label29";
this.label29.Size = new System.Drawing.Size(83, 21);
this.label29.TabIndex = 161;
@@ -1233,7 +1241,7 @@
this.label24.BackColor = System.Drawing.Color.Gray;
this.label24.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label24.ForeColor = System.Drawing.Color.Yellow;
- this.label24.Location = new System.Drawing.Point(12, 241);
+ this.label24.Location = new System.Drawing.Point(12, 222);
this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(106, 21);
this.label24.TabIndex = 146;
@@ -1245,7 +1253,7 @@
this.label30.BackColor = System.Drawing.Color.Gray;
this.label30.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label30.ForeColor = System.Drawing.Color.Yellow;
- this.label30.Location = new System.Drawing.Point(340, 96);
+ this.label30.Location = new System.Drawing.Point(340, 92);
this.label30.Name = "label30";
this.label30.Size = new System.Drawing.Size(58, 21);
this.label30.TabIndex = 168;
@@ -1257,7 +1265,7 @@
this.label28.BackColor = System.Drawing.Color.Gray;
this.label28.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label28.ForeColor = System.Drawing.Color.Yellow;
- this.label28.Location = new System.Drawing.Point(340, 328);
+ this.label28.Location = new System.Drawing.Point(340, 300);
this.label28.Name = "label28";
this.label28.Size = new System.Drawing.Size(83, 21);
this.label28.TabIndex = 158;
@@ -1269,7 +1277,7 @@
this.label27.BackColor = System.Drawing.Color.Gray;
this.label27.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label27.ForeColor = System.Drawing.Color.Yellow;
- this.label27.Location = new System.Drawing.Point(340, 299);
+ this.label27.Location = new System.Drawing.Point(340, 274);
this.label27.Name = "label27";
this.label27.Size = new System.Drawing.Size(83, 21);
this.label27.TabIndex = 155;
@@ -1281,7 +1289,7 @@
this.label26.BackColor = System.Drawing.Color.Gray;
this.label26.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label26.ForeColor = System.Drawing.Color.Yellow;
- this.label26.Location = new System.Drawing.Point(340, 270);
+ this.label26.Location = new System.Drawing.Point(340, 248);
this.label26.Name = "label26";
this.label26.Size = new System.Drawing.Size(83, 21);
this.label26.TabIndex = 152;
@@ -1294,7 +1302,7 @@
this.label18.BackColor = System.Drawing.Color.Gray;
this.label18.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label18.ForeColor = System.Drawing.Color.Yellow;
- this.label18.Location = new System.Drawing.Point(338, 386);
+ this.label18.Location = new System.Drawing.Point(338, 352);
this.label18.Name = "label18";
this.label18.Size = new System.Drawing.Size(90, 21);
this.label18.TabIndex = 124;
@@ -1306,7 +1314,7 @@
this.label25.BackColor = System.Drawing.Color.Gray;
this.label25.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label25.ForeColor = System.Drawing.Color.Yellow;
- this.label25.Location = new System.Drawing.Point(340, 67);
+ this.label25.Location = new System.Drawing.Point(340, 66);
this.label25.Name = "label25";
this.label25.Size = new System.Drawing.Size(90, 21);
this.label25.TabIndex = 148;
@@ -1377,7 +1385,7 @@
this.txtHPriceRate.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHPriceRate.ForeColor = System.Drawing.Color.Green;
this.txtHPriceRate.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHPriceRate.Location = new System.Drawing.Point(464, 148);
+ this.txtHPriceRate.Location = new System.Drawing.Point(464, 149);
this.txtHPriceRate.Name = "txtHPriceRate";
this.txtHPriceRate.ReadOnly = true;
this.txtHPriceRate.Size = new System.Drawing.Size(188, 28);
@@ -1413,7 +1421,7 @@
this.txtHUnitChongQty.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHUnitChongQty.ForeColor = System.Drawing.Color.Green;
this.txtHUnitChongQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHUnitChongQty.Location = new System.Drawing.Point(464, 119);
+ this.txtHUnitChongQty.Location = new System.Drawing.Point(464, 120);
this.txtHUnitChongQty.Name = "txtHUnitChongQty";
this.txtHUnitChongQty.ReadOnly = true;
this.txtHUnitChongQty.Size = new System.Drawing.Size(188, 28);
@@ -1438,7 +1446,7 @@
this.txtHPieceQty.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHPieceQty.ForeColor = System.Drawing.Color.Green;
this.txtHPieceQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHPieceQty.Location = new System.Drawing.Point(464, 33);
+ this.txtHPieceQty.Location = new System.Drawing.Point(464, 34);
this.txtHPieceQty.Name = "txtHPieceQty";
this.txtHPieceQty.Size = new System.Drawing.Size(188, 28);
this.txtHPieceQty.TabIndex = 3;
@@ -1463,7 +1471,7 @@
this.txtHChecker.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHChecker.ForeColor = System.Drawing.Color.Green;
this.txtHChecker.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHChecker.Location = new System.Drawing.Point(464, 90);
+ this.txtHChecker.Location = new System.Drawing.Point(464, 91);
this.txtHChecker.Name = "txtHChecker";
this.txtHChecker.Size = new System.Drawing.Size(188, 28);
this.txtHChecker.TabIndex = 142;
@@ -1659,7 +1667,7 @@
this.label31.BackColor = System.Drawing.Color.Gray;
this.label31.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label31.ForeColor = System.Drawing.Color.Yellow;
- this.label31.Location = new System.Drawing.Point(23, 174);
+ this.label31.Location = new System.Drawing.Point(23, 182);
this.label31.Name = "label31";
this.label31.Size = new System.Drawing.Size(106, 21);
this.label31.TabIndex = 170;
@@ -1683,7 +1691,7 @@
this.label35.BackColor = System.Drawing.Color.Gray;
this.label35.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label35.ForeColor = System.Drawing.Color.Yellow;
- this.label35.Location = new System.Drawing.Point(364, 154);
+ this.label35.Location = new System.Drawing.Point(364, 153);
this.label35.Name = "label35";
this.label35.Size = new System.Drawing.Size(88, 21);
this.label35.TabIndex = 179;
@@ -1707,7 +1715,7 @@
this.label21.BackColor = System.Drawing.Color.Gray;
this.label21.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label21.ForeColor = System.Drawing.Color.Yellow;
- this.label21.Location = new System.Drawing.Point(23, 65);
+ this.label21.Location = new System.Drawing.Point(23, 66);
this.label21.Name = "label21";
this.label21.Size = new System.Drawing.Size(105, 21);
this.label21.TabIndex = 139;
@@ -1719,7 +1727,7 @@
this.label14.BackColor = System.Drawing.Color.Gray;
this.label14.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label14.ForeColor = System.Drawing.Color.Yellow;
- this.label14.Location = new System.Drawing.Point(364, 65);
+ this.label14.Location = new System.Drawing.Point(364, 66);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(88, 21);
this.label14.TabIndex = 120;
@@ -1731,7 +1739,7 @@
this.label32.BackColor = System.Drawing.Color.Gray;
this.label32.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label32.ForeColor = System.Drawing.Color.Yellow;
- this.label32.Location = new System.Drawing.Point(23, 92);
+ this.label32.Location = new System.Drawing.Point(23, 95);
this.label32.Name = "label32";
this.label32.Size = new System.Drawing.Size(90, 21);
this.label32.TabIndex = 173;
@@ -1743,7 +1751,7 @@
this.label33.BackColor = System.Drawing.Color.Gray;
this.label33.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label33.ForeColor = System.Drawing.Color.Yellow;
- this.label33.Location = new System.Drawing.Point(23, 119);
+ this.label33.Location = new System.Drawing.Point(23, 124);
this.label33.Name = "label33";
this.label33.Size = new System.Drawing.Size(107, 21);
this.label33.TabIndex = 175;
@@ -1755,7 +1763,7 @@
this.label15.BackColor = System.Drawing.Color.Gray;
this.label15.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label15.ForeColor = System.Drawing.Color.Yellow;
- this.label15.Location = new System.Drawing.Point(23, 146);
+ this.label15.Location = new System.Drawing.Point(23, 153);
this.label15.Name = "label15";
this.label15.Size = new System.Drawing.Size(105, 21);
this.label15.TabIndex = 122;
@@ -1767,7 +1775,7 @@
this.label22.BackColor = System.Drawing.Color.Gray;
this.label22.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label22.ForeColor = System.Drawing.Color.Yellow;
- this.label22.Location = new System.Drawing.Point(364, 94);
+ this.label22.Location = new System.Drawing.Point(364, 95);
this.label22.Name = "label22";
this.label22.Size = new System.Drawing.Size(106, 21);
this.label22.TabIndex = 143;
@@ -2109,6 +2117,50 @@
this.splitContainer2.SplitterDistance = 935;
this.splitContainer2.TabIndex = 0;
//
+ // txtHPersonNums
+ //
+ this.txtHPersonNums.Font = new System.Drawing.Font("瀹嬩綋", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHPersonNums.ForeColor = System.Drawing.Color.Green;
+ this.txtHPersonNums.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHPersonNums.Location = new System.Drawing.Point(115, 377);
+ this.txtHPersonNums.Name = "txtHPersonNums";
+ this.txtHPersonNums.Size = new System.Drawing.Size(188, 23);
+ this.txtHPersonNums.TabIndex = 197;
+ //
+ // label45
+ //
+ this.label45.AutoSize = true;
+ this.label45.BackColor = System.Drawing.Color.Gray;
+ this.label45.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label45.ForeColor = System.Drawing.Color.Yellow;
+ this.label45.Location = new System.Drawing.Point(15, 378);
+ this.label45.Name = "label45";
+ this.label45.Size = new System.Drawing.Size(74, 21);
+ this.label45.TabIndex = 196;
+ this.label45.Text = "浜哄憳鏁帮細";
+ //
+ // txtHMachineNums
+ //
+ this.txtHMachineNums.Font = new System.Drawing.Font("瀹嬩綋", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHMachineNums.ForeColor = System.Drawing.Color.Green;
+ this.txtHMachineNums.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHMachineNums.Location = new System.Drawing.Point(426, 377);
+ this.txtHMachineNums.Name = "txtHMachineNums";
+ this.txtHMachineNums.Size = new System.Drawing.Size(188, 23);
+ this.txtHMachineNums.TabIndex = 199;
+ //
+ // label46
+ //
+ this.label46.AutoSize = true;
+ this.label46.BackColor = System.Drawing.Color.Gray;
+ this.label46.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label46.ForeColor = System.Drawing.Color.Yellow;
+ this.label46.Location = new System.Drawing.Point(336, 378);
+ this.label46.Name = "label46";
+ this.label46.Size = new System.Drawing.Size(74, 21);
+ this.label46.TabIndex = 198;
+ this.label46.Text = "鏈哄櫒鏁帮細";
+ //
// MES_StationOutBill
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -2304,5 +2356,9 @@
private System.Windows.Forms.Button cmdHSourceID2;
private System.Windows.Forms.Button cmdXZ;
private System.Windows.Forms.Button cmdBFChecker;
+ private System.Windows.Forms.TextBox txtHMachineNums;
+ private System.Windows.Forms.Label label46;
+ private System.Windows.Forms.TextBox txtHPersonNums;
+ private System.Windows.Forms.Label label45;
}
}
\ No newline at end of file
--
Gitblit v1.9.1