From f19044df4868173b951e81b377869666d16806dd Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期一, 13 六月 2022 17:28:16 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/SCGL/日计划管理/NpoiHelper.cs | 17
WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs | 523 +++++++++++++++++++++++
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | 7
WebAPI/Web.config | 1
WorkM/流转卡管理/MES_StationInBill.designer.cs | 542 ++++++++++++++---------
WorkM/流转卡管理/MES_StationInBill.cs | 113 ++++
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormImportController.cs | 5
WebAPI/Models/Gy_RoutingBill.cs | 1
WebAPI/Controllers/LMESController.cs | 43 +
WebAPI/Controllers/SCGL/日计划管理/JIT_Cg_PODemandPlanBillController.cs | 44 +
DAL/车间管理/ClsSc_StationInBill.cs | 13
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs | 1
12 files changed, 1,065 insertions(+), 245 deletions(-)
diff --git "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationInBill.cs" "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationInBill.cs"
index 783c98b..943a5f6 100644
--- "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationInBill.cs"
+++ "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationInBill.cs"
@@ -323,9 +323,12 @@
public override bool AddBill(ref string sReturn)
{
try
- {
+ {
//寰楀埌mainid
- omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ if (DBUtility.ClsPub.isLong(omodel.HInterID) == 0)
+ {
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCn.BeginTran();
//涓昏〃
@@ -389,7 +392,11 @@
//////
oCn.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_In " + omodel.HInterID.ToString() + ",1");
-
+
+ //==================杩涚珯鍗曞惎鐢ㄩ厤浠舵竻鍗曠粦瀹氾紝 杩涜 淇濆瓨寮哄埗鎺у埗
+
+ //==============================
+
//鍒ゆ柇鏄惁鏄� 棣栭亾宸ュ簭
DataSet ds1;
ds1 = oCn.RunProcReturn(" select HLastProc,HFstProc from Sc_ProcessExchangeBillMain a " +
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index 7fc3709..0c4eba6 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -675,7 +675,12 @@
{
omodel.MES_StationInBill_DeleteCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
-
+ //进站接收时是否绑定该工序的配件清单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationInBill_LineBindCtl")
+ {
+ omodel.MES_StationInBill_LineBindCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
//===============出站单
//出站数量不能大于本道进站汇总数
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_QtyCtl")
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
index 92fa632..c7f65d7 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -181,6 +181,7 @@
public string MES_StationInBill_FirstCheckOut; //必须首件检验通过才能保存单据
public string MES_StationInBill_ProcessCheckCtl; //进站单当前工序的上道工序是否做工序检验
public string MES_StationInBill_DeleteCtl; //删除单据时制单人与删除人必须一致
+ public string MES_StationInBill_LineBindCtl; //进站接收时是否绑定该工序的配件清单
//出站单
public string MES_StationOutBill_QtyCtl; //出站数量不能大于本道进站汇总数
public string MES_StationOutBill_ProcessCheckOut; //必须工序检验通过才能保存单据
diff --git a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
index 0a4b61e..b83ec6e 100644
--- a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
+++ b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
@@ -1,11 +1,16 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using Pub_Class;
+using SQLHelper;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
+using System.IO;
+using System.Web;
using System.Web.Http;
+using WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�;
using WebAPI.Models;
namespace WebAPI.Controllers
@@ -19,7 +24,13 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
+ DAL.ClsIF_Material_View oMaterHlp = new DAL.ClsIF_Material_View();
+ public DAL.ClsGy_Process_View oProcHlp = new DAL.ClsGy_Process_View();
+ DAL.ClsGy_WorkCenter_View oCenHlp = new DAL.ClsGy_WorkCenter_View();
+ Gy_RoutingBill_temporary omdelMian = new Gy_RoutingBill_temporary();
+ public string BillType = "3301";
+ #region 宸ヨ壓璺嚎 鍒楄〃
/// <summary>
/// 杩斿洖宸ヨ壓璺嚎鍒楄〃
///鍙傛暟锛歴tring sql銆�
@@ -68,6 +79,9 @@
}
}
+ #endregion
+
+ #region 宸ヨ壓璺嚎 鏂板
/// <summary>
/// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
///鍙傛暟锛歴tring sql銆�
@@ -122,7 +136,7 @@
msg2 = "[" + msg2.ToString() + "]";
List<Gy_RoutingBill> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_RoutingBill>>(msg2);
- string BillType = "3301";
+
long HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
string HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
DateTime HDate = mainList[0].HDate;//鏃ユ湡
@@ -148,8 +162,8 @@
double HStdSourceQty = mainList[0].HStdSourceQty;//鏍囧噯璧勬簮鏁�
double HAddSourceRate = mainList[0].HAddSourceRate;//鍔犺祫婧愬閲�
double HDelSourceRate = mainList[0].HDelSourceRate;//鍑忚祫婧愬噺閲�
- int HPRDORGID = mainList[0].HPRDORGID; //缁勭粐
-
+ int HPRDORGID = mainList[0].HPRDORGID; //鐢熶骇缁勭粐
+ int HOrgID = mainList[0].HOrgID; //缁勭粐
string HPicNumVer = mainList[0].HPicNumVer;//鍥惧彿鐗堟湰
string HPicNumAssemble = mainList[0].HPicNumAssemble;//鎬昏鍥惧彿
string HMaterTexture = mainList[0].HMaterTexture;//鏉愯川
@@ -165,12 +179,12 @@
",HRoutingGroupID,HUnitID,HMaterNumber,HUnitNumber,HStandard" +
",HMainGroupID,HMainProcID,HMainCenterID,HMainTimeUnit,HMainUnitTime,HMainWorkQty" +
",HMainPrice,HStdSourceQty,HAddSourceRate,HPRDORGID,HDelSourceRate" +
- ",HPicNumVer,HPicNumAssemble,HMaterTexture,HProductNum,HVerNum) " + " values('" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
+ ",HPicNumVer,HPicNumAssemble,HMaterTexture,HProductNum,HVerNum,HOrgID) " + " values('" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
"," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()," + HMaterID + ",'" + HName + "'," + HMaterTypeID +
"," + HRoutingGroupID + "," + HUnitID + ",'" + HMaterNumber + "','" + HUnitNumber + "'," + Convert.ToString(HStandard ? 1 : 0) +
"," + HMainGroupID + "," + HMainProcID + "," + HMainCenterID + ",'" + HMainTimeUnit + "'," + HMainUnitTime + "," + HMainWorkQty +
"," + HMainPrice + "," + HStdSourceQty + "," + HAddSourceRate + "," + HPRDORGID + "," + HDelSourceRate +
- ",'"+ HPicNumVer + "','" + HPicNumAssemble + "','" + HMaterTexture + "','" + HProductNum + "','" + HVerNum + "') ");
+ ",'"+ HPicNumVer + "','" + HPicNumAssemble + "','" + HMaterTexture + "','" + HProductNum + "','" + HVerNum + "',"+ HOrgID + ") ");
}
else if (OperationType == 3)
{ //淇敼
@@ -291,6 +305,501 @@
return objJsonResult;
}
- //
+ #endregion
+
+ #region 宸ヨ壓璺嚎 鏂囦欢涓婁紶
+ [Route("Gy_RoutingBill/Gy_RoutingBillimport")]
+ [HttpPost]
+ public object Gy_RoutingBillimport()
+ {
+ try
+ {
+ var WorkBookName = HttpContext.Current.Request["WorkBookName"];
+ DBUtility.ClsPub.HOrgID = long.Parse(HttpContext.Current.Request["HOrgID"]);
+ //鑾峰彇鏂囦欢鍚嶇О
+ var file = HttpContext.Current.Request.Files[0];
+ //鑾峰彇鏂囦欢鐗╃悊璺緞
+ string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
+ //淇濆瓨鏂囦欢
+ file.SaveAs(ExcelPath);
+
+ NpoiHelper np = new NpoiHelper();
+ DataSet ExcelDs = np.ReadExcel(ExcelPath, 1,2, WorkBookName);
+
+ //鍒犻櫎鏂囦欢
+ File.Delete(ExcelPath);
+
+ //鍒涘缓涓存椂琛�
+ DataTable tb2 = new DataTable("dt2");
+
+ //娣诲姞鍒楀悕
+ for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
+ {
+ tb2.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
+ }
+
+ //娣诲姞鏁版嵁
+ for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
+ {
+ DataRow row = tb2.NewRow();
+ for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
+ {
+ row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
+ }
+ tb2.Rows.Add(row);
+ }
+
+
+ var error = "";
+
+ //鏌ヨ宸ヨ壓璺嚎娌℃湁鐨勫垪
+ if (!tb2.Columns.Contains("浜у搧浠ｇ爜"))
+ error += "娌℃湁鎵惧埌銆愪骇鍝佷唬鐮併�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("宸ュ簭"))
+ error += "娌℃湁鎵惧埌銆愬伐搴忋�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("宸ヤ綔涓績"))
+ error += "娌℃湁鎵惧埌銆愬伐浣滀腑蹇冦�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鍔犲伐鏁伴噺"))
+ error += "娌℃湁鎵惧埌銆愬姞宸ユ暟閲忋�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鏈亾寮�宸ヤ綑閲�"))
+ error += "娌℃湁鎵惧埌銆愭湰閬撳紑宸ヤ綑閲忋�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鏈亾鍥哄畾寮�宸ュぉ鏁�"))
+ error += "娌℃湁鎵惧埌銆愭湰閬撳浐瀹氬紑宸ュぉ鏁般�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鐝骇瀹氶"))
+ error += "娌℃湁鎵惧埌銆愮彮浜у畾棰濄�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("宸ュ簭宸ヤ环"))
+ error += "娌℃湁鎵惧埌銆愬伐搴忓伐浠枫�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("宸ュ簭搴忓彿"))
+ error += "娌℃湁鎵惧埌銆愬伐搴忓簭鍙枫�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("宸ヨ壓鍙傛暟"))
+ error += "娌℃湁鎵惧埌銆愬伐鑹哄弬鏁般�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鍥剧焊缂栧彿"))
+ error += "娌℃湁鎵惧埌銆愬浘绾哥紪鍙枫�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鏈伐搴忕‘璁よ褰�"))
+ error += "娌℃湁鎵惧埌銆愭湰宸ュ簭纭璁板綍銆戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鍥惧彿鐗堟湰"))
+ error += "娌℃湁鎵惧埌銆愬浘鍙风増鏈�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鎬昏鍥惧彿"))
+ error += "娌℃湁鎵惧埌銆愭�昏鍥惧彿銆戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鏉愯川"))
+ error += "娌℃湁鎵惧埌銆愭潗璐ㄣ�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鎴愬搧缂栧彿"))
+ error += "娌℃湁鎵惧埌銆愭垚鍝佺紪鍙枫�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鐗堟湰"))
+ error += "娌℃湁鎵惧埌銆愮増鏈�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("妯″叿缂栧彿"))
+ error += "娌℃湁鎵惧埌銆愭ā鍏风紪鍙枫�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("绋嬪簭鍙�"))
+ error += "娌℃湁鎵惧埌銆愮▼搴忓彿銆戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鑹巼"))
+ error += "娌℃湁鎵惧埌銆愯壇鐜囥�戠殑鏍囬";
+
+ if (error.Length > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = $"Excel妯℃澘瀛樺湪閿欒,{error}\r\n" ;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult = (json)Checkdata(tb2);
+ if (objJsonResult.code == "0")
+ {
+ 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))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鐗╂枡浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (hnumber == DBUtility.ClsPub.isStrNull(tb2.Rows[i]["浜у搧浠ｇ爜"].ToString()))
+ {
+ //寰楀埌鐗╂枡鍐呯爜
+ 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;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + (i + 1).ToString() + "琛�,娌℃湁鎵惧埌瀵瑰簲鐨勭墿鏂欙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = error;
+ objJsonResult.data = tb2;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ //妫�鏌ョ墿鏂�
+ private object Checkdata(DataTable dt)
+ {
+ bool b = false;
+ string sErrMsg = "";
+ string sMsg = "";
+ for (int i = 0; i <= dt.Rows.Count - 1; i++)
+ {
+ string sHNumber = "";
+ string sHNamePoc = "";
+ string sHNumberCen = "";
+ Single sWorkQty = 0;
+ Single sHPassRate = 0;
+
+ //
+ sHNumber = DBUtility.ClsPub.isStrNull(dt.Rows[i]["浜у搧浠ｇ爜"].ToString());
+ sHNumberCen = DBUtility.ClsPub.isStrNull(dt.Rows[i]["宸ヤ綔涓績"].ToString());
+ sHNamePoc = DBUtility.ClsPub.isStrNull(dt.Rows[i]["宸ュ簭"].ToString());
+ sWorkQty = DBUtility.ClsPub.isSingle(dt.Rows[i]["鍔犲伐鏁伴噺"].ToString());
+ sHPassRate = DBUtility.ClsPub.isSingle(dt.Rows[i]["鑹巼"].ToString());
+ if (sHNumber != "")
+ {
+ //
+ int index = i + 1;
+ //鍔犲伐鏁伴噺涓嶈兘灏忎簬绛変簬闆�
+ if (sWorkQty <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + index + "琛屽姞宸ユ暟閲忎笉鑳藉皬浜庣瓑浜庨浂锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鑹巼涓嶈兘灏忎簬绛変簬闆�
+ if (sHPassRate <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + index + "琛岃壇鐜囦笉鑳藉皬浜庣瓑浜庨浂锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //瀹℃牳浠ｇ爜鏄惁鍚堢悊
+ if (!DBUtility.ClsPub.AllowNumber(sHNumber))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鐗╂枡浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //寰楀埌鐗╂枡鍐呯爜
+ int j = i + 2;
+ if (!oMaterHlp.GetInfoByNumber(sHNumber))
+ {
+ sMsg = "[" + sHNumber + "]鐗╂枡涓嶅瓨鍦�";
+ if (sErrMsg.Contains(sMsg) == false)
+ {
+ sErrMsg = sErrMsg + "[" + sHNumber + "]鐗╂枡涓嶅瓨鍦╘r\n";
+ }
+ b = true;
+ }
+ //寰楀埌宸ュ簭鍐呯爜
+ if (!oProcHlp.GetInfoByName(sHNamePoc))
+ {
+ sMsg = "[" + sHNamePoc + "]宸ュ簭涓嶅瓨鍦�";
+ if (sErrMsg.Contains(sMsg) == false)
+ {
+ sErrMsg = sErrMsg + "[" + sHNamePoc + "]宸ュ簭涓嶅瓨鍦╘r\n";
+ }
+ b = true;
+ }
+
+ //寰楀埌宸ヤ綔涓績鍐呯爜
+ if (!oCenHlp.GetInfoByName(sHNumberCen))
+ {
+ sMsg = "[" + sHNumberCen + "]宸ヤ綔涓績涓嶅瓨鍦�";
+ if (sErrMsg.Contains(sMsg) == false)
+ {
+ sErrMsg = sErrMsg + "[" + sHNumberCen + "]宸ヤ綔涓績涓嶅瓨鍦╘r\n";
+ }
+ b = true;
+
+ }
+
+ }
+ }
+ if (b == true)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = sErrMsg;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = sErrMsg;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+ #endregion
+
+ #region 宸ヨ壓璺嚎 瀵煎叆(淇濆瓨)
+ //涓存椂瀛楁
+ public class Gy_RoutingBill_temporary
+ {
+ public string HYear;
+ public string HPeriod;
+ public string DataAppend;
+ public string HOrgID;
+ }
+
+ [Route("Gy_RoutingBill/Gy_RoutingBill_btnSave")]
+ [HttpPost]
+ public object Gy_RoutingBill_btnSave([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ oCN.BeginTran();
+ //淇濆瓨涓昏〃
+ objJsonResult = RoutAddBillMain(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.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ public json RoutAddBillMain(string msg1)
+ {
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+ string user = sArray[2].ToString();
+
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //琛ㄥご瀛楁
+ omdelMian = Newtonsoft.Json.JsonConvert.DeserializeObject<Gy_RoutingBill_temporary>(msg2);
+
+ //JSON搴忓垪鍖栬浆鎹㈠瓧鍏搁泦鍚�
+ List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();
+ List<object> jb = JsonConvert.DeserializeObject<List<object>>(msg3);
+ foreach (JObject item in jb)
+ {
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ foreach (var itm in item.Properties())
+ {
+ dic.Add(itm.Name, itm.Value.ToString());
+ }
+ list.Add(dic);
+ }
+
+ 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");
+ var HMaterNumber = list[i]["浜у搧浠ｇ爜"].ToString();
+ var HMaterID = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ 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();
+ var HPicNumAssemble = list[i]["鎬昏鍥惧彿"].ToString();
+ 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 渚涘簲鍟嗕唬鐮�='" + 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 HNumber='" + 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 HBadPrice = list[i]["涓嶅悎鏍煎崟浠�"].ToString();
+ var HWasterPrice = list[i]["鎶ュ簾鍗曚环"].ToString();
+ var HBeginFixQty = list[i]["鏈亾鍥哄畾寮�宸ュぉ鏁�"].ToString();
+ var HBeginDayQty = list[i]["鏈亾寮�宸ヤ綑閲�"].ToString();
+ var HFixWorkDays = list[i]["涓婇亾绛夊緟澶╂暟"].ToString();
+ var HTrunWorkDays = list[i]["涓婇亾寰幆鍛ㄦ湡"].ToString();
+ var HAutoTrunFlag = list[i]["鑷姩杞Щ"].ToString();
+ var HSupFlag = list[i]["澶栧崗鏍囪"].ToString();
+ var HTechnologyParameter = list[i]["宸ヨ壓鍙傛暟"].ToString();
+ var HPicNum = list[i]["鍥剧焊缂栧彿"].ToString();
+ var HProcCheckNote = list[i]["鏈伐搴忕‘璁よ褰�"].ToString();
+ var hpassrate = list[i]["鑹巼"].ToString();
+ var hremark = list[i]["澶囨敞"].ToString();
+ var HMouldNo = list[i]["妯″叿缂栧彿"].ToString();
+ 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]++;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀵煎叆瀹屾垚,鍏�" + num[1] + "涓伐鑹鸿矾绾�";
+ 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/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index b597654..f43a150 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -322,6 +322,49 @@
}
#endregion
+ #region 宸ヨ壓璺嚎鍩虹鍒楄〃
+ /// <summary>
+ /// 杩斿洖宸ヨ壓璺嚎鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("LEMS/Gy_RoutingBillList")]
+ [HttpGet]
+ public object Gy_RoutingBillList(string sWhere, string user)
+ {
+ DataSet ds;
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ string sql1 = "select * from h_v_Gy_RoutingBillList_Base where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by hmainid desc";
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_RoutingBillList_Base");
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ return GetObjectJson(ds);
+ }
+
+ #endregion
+
#endregion
/// <summary>
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 a117d1f..ddd391c 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"
@@ -26,7 +26,7 @@
try
{
//鏌ョ湅鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Cg_PODemandPlanBill_Query", 1, false, user))
+ if (!DBUtility.ClsPub.Security_Log("JIT_Cg_PODemandPlanBill_Query", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -90,7 +90,7 @@
string user = sArray[3].ToString();
try
{
- if (!DBUtility.ClsPub.Security_Log("Cg_PODemandPlanBill_Edit", 1, false, user))
+ if (!DBUtility.ClsPub.Security_Log("JIT_Cg_PODemandPlanBill_Edit", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -202,7 +202,7 @@
try
{
//鍒犻櫎鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Cg_PODemandPlanBill_Drop", 1, false, User))
+ if (!DBUtility.ClsPub.Security_Log_second("JIT_Cg_PODemandPlanBill_Drop", 1, false, User))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -267,7 +267,7 @@
try
{
//鍏抽棴鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Cg_PODemandPlanBill_Close", 1, false, User))
+ if (!DBUtility.ClsPub.Security_Log_second("JIT_Cg_PODemandPlanBill_Close", 1, false, User))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -319,5 +319,41 @@
}
}
#endregion
+
+ #region 鎻愭枡璁″垝鍗� 鎻愭枡璁″垝鎶ヨ〃(閲囪喘璁㈠崟缁村害)
+ [Route("JIT_Cg_PODemandPlanBill/ReportPODemandPlanBillList")]
+ [HttpGet]
+ public object ReportPODemandPlanBillList(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("select * from h_v_JIT_Cg_PODemandPlanBillList where 1=1" + sWhere + "order by hmainid desc ", "h_v_JIT_Cg_PODemandPlanBillList");
+
+ 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
}
}
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs"
index 3d73e5b..2406df5 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs"
@@ -36,14 +36,13 @@
file.SaveAs(ExcelPath);
NpoiHelper np = new NpoiHelper();
- DataSet ExcelDs = np.ReadExcel(ExcelPath, 1);
+ DataSet ExcelDs = np.ReadExcel(ExcelPath, 1,1,"0");
//鍒犻櫎鏂囦欢
File.Delete(ExcelPath);
//鍒涘缓涓存椂琛�
DataTable tb2 = new DataTable("dt2");
- DataTable tb3 = new DataTable("dt3");
//娣诲姞鍒楀悕
for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
@@ -71,8 +70,6 @@
}
tb2.Rows.Add(row);
}
-
- ExcelDs.Tables.Add(tb2);
var error = "";
var ErrorResult = "";
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/NpoiHelper.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/NpoiHelper.cs"
index 8f66487..a4220f8 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/NpoiHelper.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/NpoiHelper.cs"
@@ -26,8 +26,10 @@
/// <param name="FileName">鏂囦欢缁濆璺緞</param>
/// <param name="startRow">鏁版嵁寮�濮嬭鏁�(1涓虹涓�琛�)</param>
/// <param name="ColumnDataType">姣忓垪鐨勬暟鎹被鍨�</param>
+ /// <param name="numType">鑾峰彇鏁版嵁绨跨殑绫诲瀷</param>
+ /// <param name="name">宸ヤ綔绨跨殑鍚嶅瓧</param>
/// <returns></returns>
- public DataSet ReadExcel(string FileName, int startRow, params NpoiDataType[] ColumnDataType)
+ public DataSet ReadExcel(string FileName, int startRow,int numType,string name, params NpoiDataType[] ColumnDataType)
{
string colNamePix = "F";
int ertime = 0;
@@ -40,8 +42,17 @@
{
IWorkbook workbook = WorkbookFactory.Create(stream);//浣跨敤鎺ュ彛锛岃嚜鍔ㄨ瘑鍒玡xcel2003/2007鏍煎紡
//for (int k = 0; k < 14; k++)
- //{
- ISheet sheet = workbook.GetSheetAt(0);//寰楀埌閲岄潰绗竴涓猻heet
+ ISheet sheet = null ; //{
+ if (numType == 1)//numType==1 鑾峰彇宸ヤ綔绨挎寜鐓т笅鏍�
+ {
+ sheet = workbook.GetSheetAt(int.Parse(name));//寰楀埌閲岄潰绗竴涓猻heet
+ }
+ else if (numType == 2)//numType==12 鑾峰彇宸ヤ綔绨挎寜鐓� 宸ヤ綔绨跨殑鍚嶅瓧
+ {
+ sheet = workbook.GetSheet(name);//寰楀埌閲岄潰绗竴涓猻heet
+ }
+
+
int j;
IRow row;
#region ColumnDataType璧嬪��
diff --git a/WebAPI/Models/Gy_RoutingBill.cs b/WebAPI/Models/Gy_RoutingBill.cs
index e112ad7..7564b98 100644
--- a/WebAPI/Models/Gy_RoutingBill.cs
+++ b/WebAPI/Models/Gy_RoutingBill.cs
@@ -36,6 +36,7 @@
public string HVerNum { get; set; }
public int HPRDORGID { get; set; }
+ public int HOrgID { get; set; }
}
}
\ No newline at end of file
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index e430be9..3c2649e 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -25,6 +25,7 @@
<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx" />
<!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/> 鍗氭棩绉戞妧-->
<!--<add key="sUrl" value="http://192.168.0.214/WEBS-WMS/WebService1.asmx"/> 鐟炰笌绁�-->
+ <!--<add key="sUrl" value="http://192.168.10.66/WEBS-WMS/WebService1.asmx"/> 妫シ-->
<add key="webpages:Version" value="3.0.0.0" />
<add key="webpages:Enabled" value="false" />
<add key="ClientValidationEnabled" value="true" />
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 9aee82b..fcf9aa1 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"
@@ -30,8 +30,9 @@
public DAL.ClsSc_StationInBill BillNew = new DAL.ClsSc_StationInBill();
public DAL.ClsSc_StationInBill BillOld = new DAL.ClsSc_StationInBill();
- public Int64 lngBillKey;
- public Int64 lngBillSubKey;
+ public Int64 HInterID;//涓诲唴鍚�
+ public Int64 lngBillKey; //娴佽浆鍗D
+ public Int64 lngBillSubKey; //娴佽浆鍗″瓙ID
public Int64 lngICMOEntryID;
//-------------------------------------------------------------------------
@@ -191,11 +192,11 @@
this.txtHStationInTime.Text = DBUtility.ClsPub.GetServerDate(-1);
this.txtHBillNo.Text = ClsPub.CreateBillCode(BillNew.BillType, ref ClsPub.sExeReturnInfo, true);//寰楀埌鏂板崟鍙�
-
- if (lngBillKey != 0 )
- {
- //LotShow();
- }
+ this.HInterID = DBUtility.ClsPub.CreateBillID(this.ModName, ref DBUtility.ClsPub.sExeReturnInfo);
+ //if (lngBillKey != 0 )
+ //{
+ // //LotShow();
+ //}
}
private void LotShow() //鑷姩杞藉叆 娴佽浆鍗¤繘绔欑晫闈㈠姛鑳�
@@ -411,6 +412,12 @@
//
txtHProcExchBillNo.Enabled = false;
txtHProcNo.Enabled = false;
+
+ //鍔犺浇 閰嶄欢缁戝畾娓呭崟
+
+
+
+
}
//鍗曟嵁瀹屾暣鎬у垽鏂� 鏈畬鎴�
@@ -555,7 +562,13 @@
return false;
//璧嬪�糏D
if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify)
+ {
BillNew.omodel.HInterID = BillOld.omodel.HInterID;
+ }
+ else
+ {
+ BillNew.omodel.HInterID = HInterID;
+ }
//涓荤被璧嬪��
//鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
string s = "";
@@ -1027,6 +1040,16 @@
{
Sub_WriteInForm_SM2(Ds.Tables[0], i);
}
+ //濡傛灉绯荤粺鍙傛暟鍚敤浜� 杩涚珯鍗曠粦瀹氶厤浠舵竻鍗曞垯 浠庣敓浜х敤鏂欐竻鍗曚腑鑾峰彇宸ュ簭BOM鍐欏叆 涓存椂琛紝骞跺姞杞借〃鏍�
+ Pub_Class.ClsXt_SystemParameter oParam = new ClsXt_SystemParameter();
+ string sIsBingLine = oParam.GetSingleSystemParameter("MES_StationInBill_LineBindCtl",ref DBUtility.ClsPub.sExeReturnInfo );
+ if (sIsBingLine.Trim() == "Y")
+ {
+ oCn.RunProc("exec h_p_MES_StationInBillSubBindSource_Insert " + lngBillKey.ToString() + " , " + lngBillSubKey.ToString() + "," + HInterID.ToString() + " ");
+ //鍒锋柊琛ㄤ綋缃戞牸鏁版嵁
+ DisplaySub();
+ }
+ //
txtHGroupID.Focus();
}
}
@@ -1437,5 +1460,81 @@
{
this.Sub_AddBill();
}
+
+ //閰嶄欢鏉″舰鐮� 鍥炶溅浜嬩欢
+ private void txtHBarCode_Mater_KeyDown(object sender, KeyEventArgs e)
+ {
+ try
+ {
+ if (e.KeyCode == Keys.Return)
+ {
+ if (txtHBarCode_Mater.Text.Trim() == "")
+ {
+ MessageBox.Show("璇疯緭鍏ユ潯褰㈢爜锛�");
+ return;
+ }
+ string sBarCode = txtHBarCode_Mater.Text.Trim();
+ txtHBarCode_Mater.Text = "";
+ //鍒ゆ柇鏉″舰鐮佹槸鍚﹀湪鏉＄爜妗ｆ涓紝鍒ゆ柇鏉″舰鐮佹槸鍚﹀悎鐞�
+ //鍏堝垽鏂� 涓存椂琛ㄤ腑鏄惁鏈夋暟鎹紝鏉″舰鐮佺殑鐗╂枡鏄惁鍦ㄦ竻鍗曚腑锛屽啓鍏� 鎵爜璁板綍琛�
+ //寰楀埌淇℃伅
+ SQLHelper.ClsCN oCn = new ClsCN();
+ DataSet Ds;
+ Ds = oCn.RunProcReturn("exec h_p_MES_StationInBillSub_BindBarCode " + HInterID.ToString() + " ,'" + sBarCode + "'", "h_p_MES_StationInBillSub_BindBarCode");
+ //鍐欏叆淇℃伅
+ if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ {
+ MessageBox.Show("鏈煡璇㈠埌鏉″舰鐮佷俊鎭紒");
+ return;
+ }
+ else if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]) == 2)
+ {
+ MessageBox.Show("閿欒锛�" + DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0][1]));
+ return;
+ }
+ //鍒锋柊琛ㄤ綋缃戞牸鏁版嵁锛堟渶濂介鑹叉樉绀猴級
+ DisplaySub();
+ }
+ }
+ catch (Exception e1)
+ {
+ MessageBox.Show(e1.Message + "txtHBarCode_Mater_KeyDown");
+ }
+ }
+
+ private void DisplaySub()
+ {
+ try
+ {
+ SQLHelper.ClsCN oCn = new ClsCN();
+ 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)
+ {
+ MessageBox.Show("鍒锋柊澶辫触锛�");
+ return;
+ }
+ else
+ {
+ grdSub.DataSource = Dsplay.Tables[0].DefaultView;
+ //璁剧疆鍚堣鍒�
+ //string sTotalCol = "";
+ //sTotalCol = DBUtility.Gy_BaseFun.GetTotalCols(DSet);
+ //string[] sT;
+ //sT = sTotalCol.Split(Convert.ToChar(","));
+ //oSumGrid.BuildTotalCols(sT);
+ //
+ //鍐荤粨
+ int FrCol = 0;
+ string s = "鏄�";
+ DBUtility.Xt_BaseBillFun.DisplayGrid(grdSub, this.Name + "grdSub", s, FrCol);
+ }
+ }
+ catch (Exception e)
+ {
+ MessageBox.Show(e.Message + "DisplaySub");
+ }
+ }
}
}
\ 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 5da54ff..adf16dd 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"
@@ -81,25 +81,25 @@
this.txtHCenterID = new System.Windows.Forms.TextBox();
this.txtHStationInTime = new System.Windows.Forms.TextBox();
this.tabPage2 = new System.Windows.Forms.TabPage();
- this.label24 = new System.Windows.Forms.Label();
this.txtHSourceName5 = new System.Windows.Forms.TextBox();
this.txtHSourceID5 = new System.Windows.Forms.TextBox();
this.cmdHSourceID5 = new System.Windows.Forms.Button();
- this.label23 = new System.Windows.Forms.Label();
this.txtHSourceName4 = new System.Windows.Forms.TextBox();
this.txtHSourceID4 = new System.Windows.Forms.TextBox();
this.cmdHSourceID4 = new System.Windows.Forms.Button();
- this.label22 = new System.Windows.Forms.Label();
this.txtHSourceName3 = new System.Windows.Forms.TextBox();
this.txtHSourceID3 = new System.Windows.Forms.TextBox();
this.cmdHSourceID3 = new System.Windows.Forms.Button();
- this.label21 = new System.Windows.Forms.Label();
this.txtHSourceName2 = new System.Windows.Forms.TextBox();
this.txtHSourceID2 = new System.Windows.Forms.TextBox();
this.cmdHSourceID2 = new System.Windows.Forms.Button();
this.txtHPieceQty = new System.Windows.Forms.TextBox();
this.label15 = new System.Windows.Forms.Label();
this.label14 = new System.Windows.Forms.Label();
+ this.label24 = new System.Windows.Forms.Label();
+ this.label23 = new System.Windows.Forms.Label();
+ this.label22 = new System.Windows.Forms.Label();
+ this.label21 = new System.Windows.Forms.Label();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.grdCardList = new System.Windows.Forms.DataGridView();
this.panel2 = new System.Windows.Forms.Panel();
@@ -113,6 +113,8 @@
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.gbUp.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdSub)).BeginInit();
this.tabControl1.SuspendLayout();
@@ -129,9 +131,10 @@
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(712, 263);
+ this.cmdHMaterID.Location = new System.Drawing.Point(949, 311);
+ this.cmdHMaterID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHMaterID.Name = "cmdHMaterID";
- this.cmdHMaterID.Size = new System.Drawing.Size(30, 32);
+ this.cmdHMaterID.Size = new System.Drawing.Size(40, 40);
this.cmdHMaterID.TabIndex = 86;
this.cmdHMaterID.UseVisualStyleBackColor = false;
this.cmdHMaterID.Visible = false;
@@ -143,11 +146,12 @@
this.txtHMaterID.Font = new System.Drawing.Font("寰蒋闆呴粦", 10.8F, 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(100, 158);
+ this.txtHMaterID.Location = new System.Drawing.Point(133, 179);
+ this.txtHMaterID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHMaterID.Multiline = true;
this.txtHMaterID.Name = "txtHMaterID";
this.txtHMaterID.ReadOnly = true;
- this.txtHMaterID.Size = new System.Drawing.Size(247, 33);
+ this.txtHMaterID.Size = new System.Drawing.Size(328, 40);
this.txtHMaterID.TabIndex = 85;
this.txtHMaterID.Tag = "0";
this.txtHMaterID.TextChanged += new System.EventHandler(this.txtHMaterID_TextChanged);
@@ -158,9 +162,10 @@
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(8, 164);
+ this.label16.Location = new System.Drawing.Point(11, 186);
+ this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label16.Name = "label16";
- this.label16.Size = new System.Drawing.Size(90, 21);
+ this.label16.Size = new System.Drawing.Size(112, 27);
this.label16.TabIndex = 84;
this.label16.Text = "浜у搧浠ｇ爜锛�";
//
@@ -170,9 +175,10 @@
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(8, 234);
+ this.label9.Location = new System.Drawing.Point(11, 273);
+ this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(90, 21);
+ this.label9.Size = new System.Drawing.Size(112, 27);
this.label9.TabIndex = 82;
this.label9.Text = "杩涚珯鏃堕棿锛�";
//
@@ -181,9 +187,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.Yellow;
- this.label2.Location = new System.Drawing.Point(378, 234);
+ this.label2.Location = new System.Drawing.Point(504, 274);
+ this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(84, 21);
+ this.label2.Size = new System.Drawing.Size(104, 27);
this.label2.TabIndex = 80;
this.label2.Text = "浠� 鍔� 鍗曪細";
//
@@ -192,11 +199,12 @@
this.txtHICMOBillNo.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, 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(490, 228);
+ this.txtHICMOBillNo.Location = new System.Drawing.Point(653, 267);
+ this.txtHICMOBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHICMOBillNo.Multiline = true;
this.txtHICMOBillNo.Name = "txtHICMOBillNo";
this.txtHICMOBillNo.ReadOnly = true;
- this.txtHICMOBillNo.Size = new System.Drawing.Size(220, 33);
+ this.txtHICMOBillNo.Size = new System.Drawing.Size(292, 40);
this.txtHICMOBillNo.TabIndex = 81;
//
// txtHProcExchBillNo
@@ -204,11 +212,12 @@
this.txtHProcExchBillNo.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, 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(100, 19);
+ this.txtHProcExchBillNo.Location = new System.Drawing.Point(133, 5);
+ this.txtHProcExchBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHProcExchBillNo.Multiline = true;
this.txtHProcExchBillNo.Name = "txtHProcExchBillNo";
this.txtHProcExchBillNo.ReadOnly = true;
- this.txtHProcExchBillNo.Size = new System.Drawing.Size(247, 33);
+ this.txtHProcExchBillNo.Size = new System.Drawing.Size(328, 40);
this.txtHProcExchBillNo.TabIndex = 88;
this.txtHProcExchBillNo.Tag = "0";
this.txtHProcExchBillNo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHProcExchBillNo_KeyDown);
@@ -219,9 +228,10 @@
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(8, 25);
+ this.label1.Location = new System.Drawing.Point(11, 12);
+ this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(74, 21);
+ this.label1.Size = new System.Drawing.Size(92, 27);
this.label1.TabIndex = 87;
this.label1.Text = "娴佽浆鍗★細";
//
@@ -231,11 +241,12 @@
this.txtHMaterModel.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, 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(490, 88);
+ this.txtHMaterModel.Location = new System.Drawing.Point(653, 92);
+ this.txtHMaterModel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHMaterModel.Multiline = true;
this.txtHMaterModel.Name = "txtHMaterModel";
this.txtHMaterModel.ReadOnly = true;
- this.txtHMaterModel.Size = new System.Drawing.Size(220, 33);
+ this.txtHMaterModel.Size = new System.Drawing.Size(292, 40);
this.txtHMaterModel.TabIndex = 90;
this.txtHMaterModel.Tag = "0";
//
@@ -245,9 +256,10 @@
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(377, 94);
+ this.label3.Location = new System.Drawing.Point(503, 100);
+ this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(90, 21);
+ this.label3.Size = new System.Drawing.Size(112, 27);
this.label3.TabIndex = 89;
this.label3.Text = "瑙勬牸鍨嬪彿锛�";
//
@@ -255,9 +267,10 @@
//
this.cmdHEmpID.BackColor = System.Drawing.Color.Transparent;
this.cmdHEmpID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHEmpID.Image")));
- this.cmdHEmpID.Location = new System.Drawing.Point(712, 158);
+ this.cmdHEmpID.Location = new System.Drawing.Point(949, 180);
+ this.cmdHEmpID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHEmpID.Name = "cmdHEmpID";
- this.cmdHEmpID.Size = new System.Drawing.Size(30, 32);
+ this.cmdHEmpID.Size = new System.Drawing.Size(40, 40);
this.cmdHEmpID.TabIndex = 93;
this.cmdHEmpID.UseVisualStyleBackColor = false;
this.cmdHEmpID.Click += new System.EventHandler(this.cmdHEmpID_Click);
@@ -267,10 +280,11 @@
this.txtHEmpID.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, 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(596, 158);
+ this.txtHEmpID.Location = new System.Drawing.Point(795, 180);
+ this.txtHEmpID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHEmpID.Name = "txtHEmpID";
this.txtHEmpID.ReadOnly = true;
- this.txtHEmpID.Size = new System.Drawing.Size(114, 32);
+ this.txtHEmpID.Size = new System.Drawing.Size(151, 38);
this.txtHEmpID.TabIndex = 92;
this.txtHEmpID.Tag = "0";
this.txtHEmpID.TextChanged += new System.EventHandler(this.txtHEmpID_TextChanged);
@@ -281,9 +295,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.Yellow;
- this.label4.Location = new System.Drawing.Point(377, 164);
+ this.label4.Location = new System.Drawing.Point(503, 187);
+ this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(84, 21);
+ this.label4.Size = new System.Drawing.Size(104, 27);
this.label4.TabIndex = 91;
this.label4.Text = "鎺� 鏀� 浜猴細";
//
@@ -291,9 +306,10 @@
//
this.cmdHSourceID.BackColor = System.Drawing.Color.Transparent;
this.cmdHSourceID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSourceID.Image")));
- this.cmdHSourceID.Location = new System.Drawing.Point(317, 297);
+ this.cmdHSourceID.Location = new System.Drawing.Point(423, 352);
+ this.cmdHSourceID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHSourceID.Name = "cmdHSourceID";
- this.cmdHSourceID.Size = new System.Drawing.Size(30, 32);
+ this.cmdHSourceID.Size = new System.Drawing.Size(40, 40);
this.cmdHSourceID.TabIndex = 96;
this.cmdHSourceID.UseVisualStyleBackColor = false;
this.cmdHSourceID.Click += new System.EventHandler(this.cmdHSourceID_Click);
@@ -303,9 +319,10 @@
this.txtHSourceID.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F);
this.txtHSourceID.ForeColor = System.Drawing.Color.Green;
this.txtHSourceID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSourceID.Location = new System.Drawing.Point(100, 297);
+ this.txtHSourceID.Location = new System.Drawing.Point(133, 352);
+ this.txtHSourceID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHSourceID.Name = "txtHSourceID";
- this.txtHSourceID.Size = new System.Drawing.Size(101, 32);
+ this.txtHSourceID.Size = new System.Drawing.Size(133, 38);
this.txtHSourceID.TabIndex = 95;
this.txtHSourceID.Tag = "0";
this.txtHSourceID.TextChanged += new System.EventHandler(this.txtHSourceID_TextChanged);
@@ -316,9 +333,10 @@
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(8, 303);
+ this.label5.Location = new System.Drawing.Point(11, 360);
+ this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(90, 21);
+ this.label5.Size = new System.Drawing.Size(112, 27);
this.label5.TabIndex = 94;
this.label5.Text = "鐢熶骇璧勬簮锛�";
//
@@ -327,11 +345,12 @@
this.txtHICMOQty.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, 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(490, 263);
+ this.txtHICMOQty.Location = new System.Drawing.Point(653, 311);
+ this.txtHICMOQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHICMOQty.Multiline = true;
this.txtHICMOQty.Name = "txtHICMOQty";
this.txtHICMOQty.ReadOnly = true;
- this.txtHICMOQty.Size = new System.Drawing.Size(220, 33);
+ this.txtHICMOQty.Size = new System.Drawing.Size(292, 40);
this.txtHICMOQty.TabIndex = 98;
this.txtHICMOQty.Tag = "0";
//
@@ -341,9 +360,10 @@
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(377, 60);
+ this.label6.Location = new System.Drawing.Point(503, 57);
+ this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(106, 21);
+ this.label6.Size = new System.Drawing.Size(132, 27);
this.label6.TabIndex = 97;
this.label6.Text = "娴佽浆鍗℃暟閲忥細";
//
@@ -352,11 +372,12 @@
this.txtHPlanQty.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHPlanQty.ForeColor = System.Drawing.Color.Green;
this.txtHPlanQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHPlanQty.Location = new System.Drawing.Point(490, 54);
+ this.txtHPlanQty.Location = new System.Drawing.Point(653, 50);
+ this.txtHPlanQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHPlanQty.Multiline = true;
this.txtHPlanQty.Name = "txtHPlanQty";
this.txtHPlanQty.ReadOnly = true;
- this.txtHPlanQty.Size = new System.Drawing.Size(220, 33);
+ this.txtHPlanQty.Size = new System.Drawing.Size(292, 40);
this.txtHPlanQty.TabIndex = 100;
this.txtHPlanQty.Tag = "0";
//
@@ -366,9 +387,10 @@
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(377, 129);
+ this.label7.Location = new System.Drawing.Point(503, 143);
+ this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(90, 21);
+ this.label7.Size = new System.Drawing.Size(112, 27);
this.label7.TabIndex = 99;
this.label7.Text = "鎺ユ敹鏁伴噺锛�";
//
@@ -376,9 +398,10 @@
//
this.cmdHGroupID.BackColor = System.Drawing.Color.Transparent;
this.cmdHGroupID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHGroupID.Image")));
- this.cmdHGroupID.Location = new System.Drawing.Point(317, 263);
+ this.cmdHGroupID.Location = new System.Drawing.Point(423, 310);
+ this.cmdHGroupID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHGroupID.Name = "cmdHGroupID";
- this.cmdHGroupID.Size = new System.Drawing.Size(30, 32);
+ this.cmdHGroupID.Size = new System.Drawing.Size(40, 40);
this.cmdHGroupID.TabIndex = 103;
this.cmdHGroupID.UseVisualStyleBackColor = false;
this.cmdHGroupID.Click += new System.EventHandler(this.cmdHGroupID_Click);
@@ -388,9 +411,10 @@
this.txtHGroupID.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, 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(100, 263);
+ this.txtHGroupID.Location = new System.Drawing.Point(133, 310);
+ this.txtHGroupID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHGroupID.Name = "txtHGroupID";
- this.txtHGroupID.Size = new System.Drawing.Size(101, 32);
+ this.txtHGroupID.Size = new System.Drawing.Size(133, 38);
this.txtHGroupID.TabIndex = 102;
this.txtHGroupID.Tag = "0";
this.txtHGroupID.TextChanged += new System.EventHandler(this.txtHGroupID_TextChanged);
@@ -401,9 +425,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.Yellow;
- this.label8.Location = new System.Drawing.Point(8, 269);
+ this.label8.Location = new System.Drawing.Point(11, 317);
+ this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(90, 21);
+ this.label8.Size = new System.Drawing.Size(112, 27);
this.label8.TabIndex = 101;
this.label8.Text = "鐢熶骇鐝粍锛�";
//
@@ -412,9 +437,10 @@
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(317, 88);
+ this.cmdHProcID.Location = new System.Drawing.Point(423, 91);
+ this.cmdHProcID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHProcID.Name = "cmdHProcID";
- this.cmdHProcID.Size = new System.Drawing.Size(30, 32);
+ this.cmdHProcID.Size = new System.Drawing.Size(40, 40);
this.cmdHProcID.TabIndex = 106;
this.cmdHProcID.UseVisualStyleBackColor = false;
this.cmdHProcID.Click += new System.EventHandler(this.cmdHProcID_Click);
@@ -425,11 +451,12 @@
this.txtHProcID.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, 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(100, 88);
+ this.txtHProcID.Location = new System.Drawing.Point(133, 91);
+ this.txtHProcID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHProcID.Multiline = true;
this.txtHProcID.Name = "txtHProcID";
this.txtHProcID.ReadOnly = true;
- this.txtHProcID.Size = new System.Drawing.Size(216, 33);
+ this.txtHProcID.Size = new System.Drawing.Size(287, 40);
this.txtHProcID.TabIndex = 105;
this.txtHProcID.Tag = "0";
this.txtHProcID.TextChanged += new System.EventHandler(this.txtHProcID_TextChanged);
@@ -441,9 +468,10 @@
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(8, 94);
+ this.label10.Location = new System.Drawing.Point(11, 99);
+ this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(90, 21);
+ this.label10.Size = new System.Drawing.Size(112, 27);
this.label10.TabIndex = 104;
this.label10.Text = "褰撳墠宸ュ簭锛�";
//
@@ -453,11 +481,12 @@
this.txtHMaterName.Font = new System.Drawing.Font("寰蒋闆呴粦", 10.8F, 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(100, 193);
+ this.txtHMaterName.Location = new System.Drawing.Point(133, 222);
+ this.txtHMaterName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHMaterName.Multiline = true;
this.txtHMaterName.Name = "txtHMaterName";
this.txtHMaterName.ReadOnly = true;
- this.txtHMaterName.Size = new System.Drawing.Size(247, 33);
+ this.txtHMaterName.Size = new System.Drawing.Size(328, 40);
this.txtHMaterName.TabIndex = 108;
this.txtHMaterName.Tag = "0";
//
@@ -467,17 +496,19 @@
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(8, 199);
+ this.label11.Location = new System.Drawing.Point(11, 230);
+ this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(90, 21);
+ this.label11.Size = new System.Drawing.Size(112, 27);
this.label11.TabIndex = 107;
this.label11.Text = "浜у搧鍚嶇О锛�";
//
// cmdOK
//
- this.cmdOK.Location = new System.Drawing.Point(291, 10);
+ this.cmdOK.Location = new System.Drawing.Point(388, 12);
+ this.cmdOK.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdOK.Name = "cmdOK";
- this.cmdOK.Size = new System.Drawing.Size(85, 42);
+ this.cmdOK.Size = new System.Drawing.Size(113, 52);
this.cmdOK.TabIndex = 109;
this.cmdOK.Text = "杩� 绔�";
this.cmdOK.UseVisualStyleBackColor = true;
@@ -485,9 +516,10 @@
//
// cmdCancel
//
- this.cmdCancel.Location = new System.Drawing.Point(383, 10);
+ this.cmdCancel.Location = new System.Drawing.Point(511, 12);
+ this.cmdCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdCancel.Name = "cmdCancel";
- this.cmdCancel.Size = new System.Drawing.Size(85, 42);
+ this.cmdCancel.Size = new System.Drawing.Size(113, 52);
this.cmdCancel.TabIndex = 110;
this.cmdCancel.Text = "鍙� 娑�";
this.cmdCancel.UseVisualStyleBackColor = true;
@@ -499,9 +531,10 @@
this.lblCaption.BackColor = System.Drawing.Color.Gray;
this.lblCaption.Font = new System.Drawing.Font("寰蒋闆呴粦", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblCaption.ForeColor = System.Drawing.Color.LimeGreen;
- this.lblCaption.Location = new System.Drawing.Point(7, 7);
+ this.lblCaption.Location = new System.Drawing.Point(9, 9);
+ this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(107, 26);
+ this.lblCaption.Size = new System.Drawing.Size(134, 31);
this.lblCaption.TabIndex = 111;
this.lblCaption.Text = "杩涚珯鎺ユ敹鍗�";
//
@@ -514,8 +547,10 @@
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.Name = "gbUp";
- this.gbUp.Size = new System.Drawing.Size(1036, 539);
+ this.gbUp.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.gbUp.Size = new System.Drawing.Size(1381, 736);
this.gbUp.TabIndex = 114;
this.gbUp.TabStop = false;
//
@@ -523,12 +558,12 @@
//
this.grdSub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdSub.Dock = System.Windows.Forms.DockStyle.Fill;
- this.grdSub.Location = new System.Drawing.Point(3, 454);
- this.grdSub.Margin = new System.Windows.Forms.Padding(2);
+ this.grdSub.Location = new System.Drawing.Point(4, 509);
+ this.grdSub.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.grdSub.Name = "grdSub";
this.grdSub.RowHeadersWidth = 51;
this.grdSub.RowTemplate.Height = 27;
- this.grdSub.Size = new System.Drawing.Size(752, 82);
+ this.grdSub.Size = new System.Drawing.Size(1002, 223);
this.grdSub.TabIndex = 149;
//
// tabControl1
@@ -536,11 +571,11 @@
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Dock = System.Windows.Forms.DockStyle.Top;
- this.tabControl1.Location = new System.Drawing.Point(3, 74);
- this.tabControl1.Margin = new System.Windows.Forms.Padding(2);
+ this.tabControl1.Location = new System.Drawing.Point(4, 77);
+ this.tabControl1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(752, 380);
+ this.tabControl1.Size = new System.Drawing.Size(1002, 432);
this.tabControl1.TabIndex = 150;
//
// tabPage1
@@ -589,11 +624,11 @@
this.tabPage1.Controls.Add(this.txtHEmpID);
this.tabPage1.Controls.Add(this.label7);
this.tabPage1.Controls.Add(this.label6);
- this.tabPage1.Location = new System.Drawing.Point(4, 22);
- this.tabPage1.Margin = new System.Windows.Forms.Padding(2);
+ this.tabPage1.Location = new System.Drawing.Point(4, 25);
+ this.tabPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tabPage1.Name = "tabPage1";
- this.tabPage1.Padding = new System.Windows.Forms.Padding(2);
- this.tabPage1.Size = new System.Drawing.Size(744, 354);
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.tabPage1.Size = new System.Drawing.Size(994, 403);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "杩涚珯淇℃伅";
//
@@ -603,10 +638,11 @@
this.txtHGroupName.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, 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(202, 263);
+ this.txtHGroupName.Location = new System.Drawing.Point(269, 310);
+ this.txtHGroupName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHGroupName.Name = "txtHGroupName";
this.txtHGroupName.ReadOnly = true;
- this.txtHGroupName.Size = new System.Drawing.Size(114, 32);
+ this.txtHGroupName.Size = new System.Drawing.Size(151, 38);
this.txtHGroupName.TabIndex = 150;
this.txtHGroupName.Tag = "0";
//
@@ -615,9 +651,10 @@
this.txtHEmpNumber.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHEmpNumber.ForeColor = System.Drawing.Color.Green;
this.txtHEmpNumber.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHEmpNumber.Location = new System.Drawing.Point(490, 158);
+ this.txtHEmpNumber.Location = new System.Drawing.Point(653, 180);
+ this.txtHEmpNumber.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHEmpNumber.Name = "txtHEmpNumber";
- this.txtHEmpNumber.Size = new System.Drawing.Size(105, 32);
+ this.txtHEmpNumber.Size = new System.Drawing.Size(139, 38);
this.txtHEmpNumber.TabIndex = 149;
this.txtHEmpNumber.Tag = "0";
this.txtHEmpNumber.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHEmpNumber_KeyDown);
@@ -628,10 +665,11 @@
this.txtHSourceName.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F);
this.txtHSourceName.ForeColor = System.Drawing.Color.Green;
this.txtHSourceName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSourceName.Location = new System.Drawing.Point(202, 297);
+ this.txtHSourceName.Location = new System.Drawing.Point(269, 352);
+ this.txtHSourceName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHSourceName.Name = "txtHSourceName";
this.txtHSourceName.ReadOnly = true;
- this.txtHSourceName.Size = new System.Drawing.Size(114, 32);
+ this.txtHSourceName.Size = new System.Drawing.Size(151, 38);
this.txtHSourceName.TabIndex = 119;
this.txtHSourceName.Tag = "0";
//
@@ -641,11 +679,12 @@
this.txtHOrderProcNO.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, 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(490, 193);
+ this.txtHOrderProcNO.Location = new System.Drawing.Point(653, 223);
+ this.txtHOrderProcNO.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHOrderProcNO.Multiline = true;
this.txtHOrderProcNO.Name = "txtHOrderProcNO";
this.txtHOrderProcNO.ReadOnly = true;
- this.txtHOrderProcNO.Size = new System.Drawing.Size(220, 33);
+ this.txtHOrderProcNO.Size = new System.Drawing.Size(292, 40);
this.txtHOrderProcNO.TabIndex = 148;
this.txtHOrderProcNO.Tag = "0";
//
@@ -655,9 +694,10 @@
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(378, 199);
+ this.label18.Location = new System.Drawing.Point(504, 231);
+ this.label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label18.Name = "label18";
- this.label18.Size = new System.Drawing.Size(106, 21);
+ this.label18.Size = new System.Drawing.Size(132, 27);
this.label18.TabIndex = 147;
this.label18.Text = "璁㈠崟璺熻釜鍙凤細";
//
@@ -667,9 +707,10 @@
this.label17.BackColor = System.Drawing.Color.Gray;
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(8, 60);
+ this.label17.Location = new System.Drawing.Point(11, 56);
+ this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(74, 21);
+ this.label17.Size = new System.Drawing.Size(92, 27);
this.label17.TabIndex = 145;
this.label17.Text = "娴佹按鍙凤細";
//
@@ -678,9 +719,10 @@
this.txtHProcNo.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, 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(100, 54);
+ this.txtHProcNo.Location = new System.Drawing.Point(133, 49);
+ this.txtHProcNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHProcNo.Name = "txtHProcNo";
- this.txtHProcNo.Size = new System.Drawing.Size(247, 32);
+ this.txtHProcNo.Size = new System.Drawing.Size(328, 38);
this.txtHProcNo.TabIndex = 146;
this.txtHProcNo.TextChanged += new System.EventHandler(this.txtHProcNo_TextChanged);
this.txtHProcNo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHProcNo_KeyDown);
@@ -691,9 +733,10 @@
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(372, 269);
+ this.label13.Location = new System.Drawing.Point(496, 318);
+ this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(106, 21);
+ this.label13.Size = new System.Drawing.Size(132, 27);
this.label13.TabIndex = 116;
this.label13.Text = "浠诲姟鍗曟暟閲忥細";
//
@@ -702,9 +745,10 @@
this.txtHQty.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, 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(490, 123);
+ this.txtHQty.Location = new System.Drawing.Point(653, 136);
+ this.txtHQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHQty.Name = "txtHQty";
- this.txtHQty.Size = new System.Drawing.Size(220, 32);
+ this.txtHQty.Size = new System.Drawing.Size(292, 38);
this.txtHQty.TabIndex = 117;
this.txtHQty.Tag = "0";
this.txtHQty.TextChanged += new System.EventHandler(this.txtHQty_TextChanged);
@@ -716,9 +760,10 @@
this.cmdHCenterID.BackColor = System.Drawing.Color.Transparent;
this.cmdHCenterID.Enabled = false;
this.cmdHCenterID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHCenterID.Image")));
- this.cmdHCenterID.Location = new System.Drawing.Point(317, 123);
+ this.cmdHCenterID.Location = new System.Drawing.Point(423, 135);
+ this.cmdHCenterID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHCenterID.Name = "cmdHCenterID";
- this.cmdHCenterID.Size = new System.Drawing.Size(30, 32);
+ this.cmdHCenterID.Size = new System.Drawing.Size(40, 40);
this.cmdHCenterID.TabIndex = 144;
this.cmdHCenterID.UseVisualStyleBackColor = false;
this.cmdHCenterID.Click += new System.EventHandler(this.cmdHCenterID_Click);
@@ -729,9 +774,10 @@
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(377, 25);
+ this.label12.Location = new System.Drawing.Point(503, 13);
+ this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(84, 21);
+ this.label12.Size = new System.Drawing.Size(104, 27);
this.label12.TabIndex = 114;
this.label12.Text = "鍗� 鎹� 鍙凤細";
//
@@ -741,9 +787,10 @@
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(8, 129);
+ this.label20.Location = new System.Drawing.Point(11, 142);
+ this.label20.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label20.Name = "label20";
- this.label20.Size = new System.Drawing.Size(90, 21);
+ this.label20.Size = new System.Drawing.Size(112, 27);
this.label20.TabIndex = 142;
this.label20.Text = "宸ヤ綔涓績锛�";
//
@@ -753,11 +800,12 @@
this.txtHBillNo.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, 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(490, 19);
+ this.txtHBillNo.Location = new System.Drawing.Point(653, 6);
+ this.txtHBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHBillNo.Multiline = true;
this.txtHBillNo.Name = "txtHBillNo";
this.txtHBillNo.ReadOnly = true;
- this.txtHBillNo.Size = new System.Drawing.Size(220, 33);
+ this.txtHBillNo.Size = new System.Drawing.Size(292, 40);
this.txtHBillNo.TabIndex = 115;
//
// txtHCenterID
@@ -766,11 +814,12 @@
this.txtHCenterID.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, 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(100, 123);
+ this.txtHCenterID.Location = new System.Drawing.Point(133, 135);
+ this.txtHCenterID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHCenterID.Multiline = true;
this.txtHCenterID.Name = "txtHCenterID";
this.txtHCenterID.ReadOnly = true;
- this.txtHCenterID.Size = new System.Drawing.Size(216, 33);
+ this.txtHCenterID.Size = new System.Drawing.Size(287, 40);
this.txtHCenterID.TabIndex = 143;
this.txtHCenterID.TabStop = false;
//
@@ -780,11 +829,12 @@
this.txtHStationInTime.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHStationInTime.ForeColor = System.Drawing.Color.Green;
this.txtHStationInTime.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHStationInTime.Location = new System.Drawing.Point(100, 228);
+ this.txtHStationInTime.Location = new System.Drawing.Point(133, 266);
+ this.txtHStationInTime.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHStationInTime.Multiline = true;
this.txtHStationInTime.Name = "txtHStationInTime";
this.txtHStationInTime.ReadOnly = true;
- this.txtHStationInTime.Size = new System.Drawing.Size(247, 33);
+ this.txtHStationInTime.Size = new System.Drawing.Size(328, 40);
this.txtHStationInTime.TabIndex = 113;
this.txtHStationInTime.Tag = "0";
//
@@ -810,24 +860,13 @@
this.tabPage2.Controls.Add(this.label23);
this.tabPage2.Controls.Add(this.label22);
this.tabPage2.Controls.Add(this.label21);
- this.tabPage2.Location = new System.Drawing.Point(4, 22);
- this.tabPage2.Margin = new System.Windows.Forms.Padding(2);
+ this.tabPage2.Location = new System.Drawing.Point(4, 25);
+ this.tabPage2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tabPage2.Name = "tabPage2";
- this.tabPage2.Padding = new System.Windows.Forms.Padding(2);
- this.tabPage2.Size = new System.Drawing.Size(744, 354);
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.tabPage2.Size = new System.Drawing.Size(994, 446);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "鍏朵粬淇℃伅";
- //
- // label24
- //
- this.label24.AutoSize = true;
- 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(21, 148);
- this.label24.Name = "label24";
- this.label24.Size = new System.Drawing.Size(99, 21);
- this.label24.TabIndex = 134;
- this.label24.Text = "鐢熶骇璧勬簮5锛�";
//
// txtHSourceName5
//
@@ -835,10 +874,11 @@
this.txtHSourceName5.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F);
this.txtHSourceName5.ForeColor = System.Drawing.Color.Green;
this.txtHSourceName5.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSourceName5.Location = new System.Drawing.Point(215, 149);
+ this.txtHSourceName5.Location = new System.Drawing.Point(287, 186);
+ this.txtHSourceName5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHSourceName5.Name = "txtHSourceName5";
this.txtHSourceName5.ReadOnly = true;
- this.txtHSourceName5.Size = new System.Drawing.Size(114, 32);
+ this.txtHSourceName5.Size = new System.Drawing.Size(151, 38);
this.txtHSourceName5.TabIndex = 137;
this.txtHSourceName5.Tag = "0";
//
@@ -847,9 +887,10 @@
this.txtHSourceID5.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F);
this.txtHSourceID5.ForeColor = System.Drawing.Color.Green;
this.txtHSourceID5.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSourceID5.Location = new System.Drawing.Point(113, 149);
+ this.txtHSourceID5.Location = new System.Drawing.Point(151, 186);
+ this.txtHSourceID5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHSourceID5.Name = "txtHSourceID5";
- this.txtHSourceID5.Size = new System.Drawing.Size(101, 32);
+ this.txtHSourceID5.Size = new System.Drawing.Size(133, 38);
this.txtHSourceID5.TabIndex = 135;
this.txtHSourceID5.Tag = "0";
//
@@ -857,23 +898,13 @@
//
this.cmdHSourceID5.BackColor = System.Drawing.Color.Transparent;
this.cmdHSourceID5.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSourceID5.Image")));
- this.cmdHSourceID5.Location = new System.Drawing.Point(329, 149);
+ this.cmdHSourceID5.Location = new System.Drawing.Point(439, 186);
+ this.cmdHSourceID5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHSourceID5.Name = "cmdHSourceID5";
- this.cmdHSourceID5.Size = new System.Drawing.Size(30, 32);
+ this.cmdHSourceID5.Size = new System.Drawing.Size(40, 40);
this.cmdHSourceID5.TabIndex = 136;
this.cmdHSourceID5.UseVisualStyleBackColor = false;
this.cmdHSourceID5.Click += new System.EventHandler(this.cmdHSourceID5_Click);
- //
- // label23
- //
- this.label23.AutoSize = true;
- 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(21, 110);
- this.label23.Name = "label23";
- this.label23.Size = new System.Drawing.Size(99, 21);
- this.label23.TabIndex = 130;
- this.label23.Text = "鐢熶骇璧勬簮4锛�";
//
// txtHSourceName4
//
@@ -881,10 +912,11 @@
this.txtHSourceName4.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F);
this.txtHSourceName4.ForeColor = System.Drawing.Color.Green;
this.txtHSourceName4.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSourceName4.Location = new System.Drawing.Point(215, 110);
+ this.txtHSourceName4.Location = new System.Drawing.Point(287, 138);
+ this.txtHSourceName4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHSourceName4.Name = "txtHSourceName4";
this.txtHSourceName4.ReadOnly = true;
- this.txtHSourceName4.Size = new System.Drawing.Size(114, 32);
+ this.txtHSourceName4.Size = new System.Drawing.Size(151, 38);
this.txtHSourceName4.TabIndex = 133;
this.txtHSourceName4.Tag = "0";
//
@@ -893,9 +925,10 @@
this.txtHSourceID4.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F);
this.txtHSourceID4.ForeColor = System.Drawing.Color.Green;
this.txtHSourceID4.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSourceID4.Location = new System.Drawing.Point(113, 110);
+ this.txtHSourceID4.Location = new System.Drawing.Point(151, 138);
+ this.txtHSourceID4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHSourceID4.Name = "txtHSourceID4";
- this.txtHSourceID4.Size = new System.Drawing.Size(101, 32);
+ this.txtHSourceID4.Size = new System.Drawing.Size(133, 38);
this.txtHSourceID4.TabIndex = 131;
this.txtHSourceID4.Tag = "0";
//
@@ -903,23 +936,13 @@
//
this.cmdHSourceID4.BackColor = System.Drawing.Color.Transparent;
this.cmdHSourceID4.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSourceID4.Image")));
- this.cmdHSourceID4.Location = new System.Drawing.Point(329, 110);
+ this.cmdHSourceID4.Location = new System.Drawing.Point(439, 138);
+ this.cmdHSourceID4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHSourceID4.Name = "cmdHSourceID4";
- this.cmdHSourceID4.Size = new System.Drawing.Size(30, 32);
+ this.cmdHSourceID4.Size = new System.Drawing.Size(40, 40);
this.cmdHSourceID4.TabIndex = 132;
this.cmdHSourceID4.UseVisualStyleBackColor = false;
this.cmdHSourceID4.Click += new System.EventHandler(this.cmdHSourceID4_Click);
- //
- // label22
- //
- this.label22.AutoSize = true;
- 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(21, 70);
- this.label22.Name = "label22";
- this.label22.Size = new System.Drawing.Size(99, 21);
- this.label22.TabIndex = 126;
- this.label22.Text = "鐢熶骇璧勬簮3锛�";
//
// txtHSourceName3
//
@@ -927,10 +950,11 @@
this.txtHSourceName3.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F);
this.txtHSourceName3.ForeColor = System.Drawing.Color.Green;
this.txtHSourceName3.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSourceName3.Location = new System.Drawing.Point(215, 70);
+ this.txtHSourceName3.Location = new System.Drawing.Point(287, 88);
+ this.txtHSourceName3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHSourceName3.Name = "txtHSourceName3";
this.txtHSourceName3.ReadOnly = true;
- this.txtHSourceName3.Size = new System.Drawing.Size(114, 32);
+ this.txtHSourceName3.Size = new System.Drawing.Size(151, 38);
this.txtHSourceName3.TabIndex = 129;
this.txtHSourceName3.Tag = "0";
//
@@ -939,9 +963,10 @@
this.txtHSourceID3.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F);
this.txtHSourceID3.ForeColor = System.Drawing.Color.Green;
this.txtHSourceID3.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSourceID3.Location = new System.Drawing.Point(113, 70);
+ this.txtHSourceID3.Location = new System.Drawing.Point(151, 88);
+ this.txtHSourceID3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHSourceID3.Name = "txtHSourceID3";
- this.txtHSourceID3.Size = new System.Drawing.Size(101, 32);
+ this.txtHSourceID3.Size = new System.Drawing.Size(133, 38);
this.txtHSourceID3.TabIndex = 127;
this.txtHSourceID3.Tag = "0";
//
@@ -949,23 +974,13 @@
//
this.cmdHSourceID3.BackColor = System.Drawing.Color.Transparent;
this.cmdHSourceID3.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSourceID3.Image")));
- this.cmdHSourceID3.Location = new System.Drawing.Point(329, 70);
+ this.cmdHSourceID3.Location = new System.Drawing.Point(439, 88);
+ this.cmdHSourceID3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHSourceID3.Name = "cmdHSourceID3";
- this.cmdHSourceID3.Size = new System.Drawing.Size(30, 32);
+ this.cmdHSourceID3.Size = new System.Drawing.Size(40, 40);
this.cmdHSourceID3.TabIndex = 128;
this.cmdHSourceID3.UseVisualStyleBackColor = false;
this.cmdHSourceID3.Click += new System.EventHandler(this.cmdHSourceID3_Click);
- //
- // label21
- //
- this.label21.AutoSize = true;
- 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(21, 31);
- this.label21.Name = "label21";
- this.label21.Size = new System.Drawing.Size(99, 21);
- this.label21.TabIndex = 122;
- this.label21.Text = "鐢熶骇璧勬簮2锛�";
//
// txtHSourceName2
//
@@ -973,10 +988,11 @@
this.txtHSourceName2.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F);
this.txtHSourceName2.ForeColor = System.Drawing.Color.Green;
this.txtHSourceName2.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSourceName2.Location = new System.Drawing.Point(215, 32);
+ this.txtHSourceName2.Location = new System.Drawing.Point(287, 40);
+ this.txtHSourceName2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHSourceName2.Name = "txtHSourceName2";
this.txtHSourceName2.ReadOnly = true;
- this.txtHSourceName2.Size = new System.Drawing.Size(114, 32);
+ this.txtHSourceName2.Size = new System.Drawing.Size(151, 38);
this.txtHSourceName2.TabIndex = 125;
this.txtHSourceName2.Tag = "0";
//
@@ -985,9 +1001,10 @@
this.txtHSourceID2.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F);
this.txtHSourceID2.ForeColor = System.Drawing.Color.Green;
this.txtHSourceID2.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSourceID2.Location = new System.Drawing.Point(113, 32);
+ this.txtHSourceID2.Location = new System.Drawing.Point(151, 40);
+ this.txtHSourceID2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHSourceID2.Name = "txtHSourceID2";
- this.txtHSourceID2.Size = new System.Drawing.Size(101, 32);
+ this.txtHSourceID2.Size = new System.Drawing.Size(133, 38);
this.txtHSourceID2.TabIndex = 123;
this.txtHSourceID2.Tag = "0";
//
@@ -995,9 +1012,10 @@
//
this.cmdHSourceID2.BackColor = System.Drawing.Color.Transparent;
this.cmdHSourceID2.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSourceID2.Image")));
- this.cmdHSourceID2.Location = new System.Drawing.Point(329, 32);
+ this.cmdHSourceID2.Location = new System.Drawing.Point(439, 40);
+ this.cmdHSourceID2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHSourceID2.Name = "cmdHSourceID2";
- this.cmdHSourceID2.Size = new System.Drawing.Size(30, 32);
+ this.cmdHSourceID2.Size = new System.Drawing.Size(40, 40);
this.cmdHSourceID2.TabIndex = 124;
this.cmdHSourceID2.UseVisualStyleBackColor = false;
this.cmdHSourceID2.Click += new System.EventHandler(this.cmdHSourceID2_Click);
@@ -1008,10 +1026,11 @@
this.txtHPieceQty.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, 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(539, 30);
+ this.txtHPieceQty.Location = new System.Drawing.Point(719, 38);
+ this.txtHPieceQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHPieceQty.Multiline = true;
this.txtHPieceQty.Name = "txtHPieceQty";
- this.txtHPieceQty.Size = new System.Drawing.Size(188, 33);
+ this.txtHPieceQty.Size = new System.Drawing.Size(249, 40);
this.txtHPieceQty.TabIndex = 121;
this.txtHPieceQty.Tag = "0";
this.txtHPieceQty.Visible = false;
@@ -1022,9 +1041,10 @@
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(433, 30);
+ this.label15.Location = new System.Drawing.Point(577, 38);
+ this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label15.Name = "label15";
- this.label15.Size = new System.Drawing.Size(90, 21);
+ this.label15.Size = new System.Drawing.Size(112, 27);
this.label15.TabIndex = 120;
this.label15.Text = "鎺ユ敹浠舵暟锛�";
this.label15.Visible = false;
@@ -1034,12 +1054,61 @@
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.Yellow;
- this.label14.Location = new System.Drawing.Point(433, 69);
+ this.label14.Location = new System.Drawing.Point(577, 86);
+ this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(88, 21);
+ this.label14.Size = new System.Drawing.Size(108, 27);
this.label14.TabIndex = 118;
this.label14.Text = "鏈� 鍙帮細";
this.label14.Visible = false;
+ //
+ // label24
+ //
+ this.label24.AutoSize = true;
+ 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(28, 185);
+ this.label24.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label24.Name = "label24";
+ this.label24.Size = new System.Drawing.Size(124, 27);
+ this.label24.TabIndex = 134;
+ this.label24.Text = "鐢熶骇璧勬簮5锛�";
+ //
+ // label23
+ //
+ this.label23.AutoSize = true;
+ 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(28, 138);
+ this.label23.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label23.Name = "label23";
+ this.label23.Size = new System.Drawing.Size(124, 27);
+ this.label23.TabIndex = 130;
+ this.label23.Text = "鐢熶骇璧勬簮4锛�";
+ //
+ // label22
+ //
+ this.label22.AutoSize = true;
+ 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(28, 88);
+ this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label22.Name = "label22";
+ this.label22.Size = new System.Drawing.Size(124, 27);
+ this.label22.TabIndex = 126;
+ this.label22.Text = "鐢熶骇璧勬簮3锛�";
+ //
+ // label21
+ //
+ this.label21.AutoSize = true;
+ 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(28, 39);
+ this.label21.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label21.Name = "label21";
+ this.label21.Size = new System.Drawing.Size(124, 27);
+ this.label21.TabIndex = 122;
+ this.label21.Text = "鐢熶骇璧勬簮2锛�";
//
// groupBox1
//
@@ -1047,11 +1116,11 @@
this.groupBox1.Dock = System.Windows.Forms.DockStyle.Right;
this.groupBox1.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.ForeColor = System.Drawing.Color.Yellow;
- this.groupBox1.Location = new System.Drawing.Point(755, 74);
- this.groupBox1.Margin = new System.Windows.Forms.Padding(2);
+ this.groupBox1.Location = new System.Drawing.Point(1006, 77);
+ this.groupBox1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Padding = new System.Windows.Forms.Padding(2);
- this.groupBox1.Size = new System.Drawing.Size(278, 462);
+ this.groupBox1.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.groupBox1.Size = new System.Drawing.Size(371, 655);
this.groupBox1.TabIndex = 152;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "鏈珯宸ュ崟";
@@ -1060,24 +1129,26 @@
//
this.grdCardList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdCardList.Dock = System.Windows.Forms.DockStyle.Fill;
- this.grdCardList.Location = new System.Drawing.Point(2, 21);
- this.grdCardList.Margin = new System.Windows.Forms.Padding(2);
+ this.grdCardList.Location = new System.Drawing.Point(3, 25);
+ this.grdCardList.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.grdCardList.Name = "grdCardList";
this.grdCardList.RowHeadersWidth = 51;
this.grdCardList.RowTemplate.Height = 27;
- this.grdCardList.Size = new System.Drawing.Size(274, 439);
+ this.grdCardList.Size = new System.Drawing.Size(365, 628);
this.grdCardList.TabIndex = 150;
//
// panel2
//
+ this.panel2.Controls.Add(this.txtHBarCode_Mater);
+ this.panel2.Controls.Add(this.label25);
this.panel2.Controls.Add(this.txtHBarCode);
this.panel2.Controls.Add(this.label19);
this.panel2.Controls.Add(this.lblCaption);
this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
- this.panel2.Location = new System.Drawing.Point(3, 17);
- this.panel2.Margin = new System.Windows.Forms.Padding(2);
+ this.panel2.Location = new System.Drawing.Point(4, 22);
+ this.panel2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(1030, 57);
+ this.panel2.Size = new System.Drawing.Size(1373, 55);
this.panel2.TabIndex = 151;
//
// txtHBarCode
@@ -1085,10 +1156,11 @@
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(278, 7);
+ 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(229, 33);
+ 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);
@@ -1099,11 +1171,12 @@
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(202, 10);
+ 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(74, 21);
+ this.label19.Size = new System.Drawing.Size(92, 27);
this.label19.TabIndex = 112;
- this.label19.Text = "鏉″舰鐮侊細";
+ this.label19.Text = "娴佽浆鍗★細";
//
// timer1
//
@@ -1121,16 +1194,18 @@
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, 539);
+ 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(1036, 65);
+ this.panel1.Size = new System.Drawing.Size(1381, 81);
this.panel1.TabIndex = 115;
//
// cmdXZ
//
- this.cmdXZ.Location = new System.Drawing.Point(15, 10);
+ 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(85, 42);
+ this.cmdXZ.Size = new System.Drawing.Size(113, 52);
this.cmdXZ.TabIndex = 124;
this.cmdXZ.Text = "鏂� 澧�";
this.cmdXZ.UseVisualStyleBackColor = true;
@@ -1139,9 +1214,10 @@
// button2
//
this.button2.Enabled = false;
- this.button2.Location = new System.Drawing.Point(567, 10);
+ 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(85, 42);
+ this.button2.Size = new System.Drawing.Size(113, 52);
this.button2.TabIndex = 123;
this.button2.Text = "鍙嶅鏍�";
this.button2.UseVisualStyleBackColor = true;
@@ -1150,9 +1226,10 @@
// button1
//
this.button1.Enabled = false;
- this.button1.Location = new System.Drawing.Point(475, 10);
+ 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(85, 42);
+ this.button1.Size = new System.Drawing.Size(113, 52);
this.button1.TabIndex = 122;
this.button1.Text = "瀹� 鏍�";
this.button1.UseVisualStyleBackColor = true;
@@ -1160,9 +1237,10 @@
//
// cmdHDelBill
//
- this.cmdHDelBill.Location = new System.Drawing.Point(199, 10);
+ 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(85, 42);
+ this.cmdHDelBill.Size = new System.Drawing.Size(113, 52);
this.cmdHDelBill.TabIndex = 121;
this.cmdHDelBill.Text = "鍒犻櫎棰嗘枡鍗�";
this.cmdHDelBill.UseVisualStyleBackColor = true;
@@ -1171,9 +1249,10 @@
//
// cmdXG
//
- this.cmdXG.Location = new System.Drawing.Point(107, 10);
+ 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(85, 42);
+ this.cmdXG.Size = new System.Drawing.Size(113, 52);
this.cmdXG.TabIndex = 120;
this.cmdXG.Text = "淇� 鏀�";
this.cmdXG.UseVisualStyleBackColor = true;
@@ -1181,25 +1260,54 @@
//
// cmdAddNew
//
- this.cmdAddNew.Location = new System.Drawing.Point(659, 10);
+ 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(85, 42);
+ 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)));
+ this.txtHBarCode_Mater.ForeColor = System.Drawing.Color.Green;
+ this.txtHBarCode_Mater.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHBarCode_Mater.Location = new System.Drawing.Point(767, 7);
+ this.txtHBarCode_Mater.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHBarCode_Mater.Multiline = true;
+ this.txtHBarCode_Mater.Name = "txtHBarCode_Mater";
+ this.txtHBarCode_Mater.Size = new System.Drawing.Size(292, 40);
+ this.txtHBarCode_Mater.TabIndex = 115;
+ this.txtHBarCode_Mater.Tag = "0";
+ this.txtHBarCode_Mater.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHBarCode_Mater_KeyDown);
+ //
+ // label25
+ //
+ this.label25.AutoSize = true;
+ 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(627, 12);
+ this.label25.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label25.Name = "label25";
+ this.label25.Size = new System.Drawing.Size(132, 27);
+ this.label25.TabIndex = 114;
+ this.label25.Text = "閰嶄欢鏉″舰鐮侊細";
+ //
// MES_StationInBill
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.Gray;
- this.ClientSize = new System.Drawing.Size(1036, 604);
+ this.ClientSize = new System.Drawing.Size(1381, 817);
this.Controls.Add(this.gbUp);
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.Name = "MES_StationInBill";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "杩涚珯鎺ユ敹鍗�";
@@ -1308,5 +1416,7 @@
private System.Windows.Forms.TextBox txtHSourceID2;
private System.Windows.Forms.Button cmdHSourceID2;
private System.Windows.Forms.Button cmdXZ;
+ private System.Windows.Forms.TextBox txtHBarCode_Mater;
+ private System.Windows.Forms.Label label25;
}
}
\ No newline at end of file
--
Gitblit v1.9.1