From dbbb9d51fd82287021e87d7d9f41483e4f8bee95 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期五, 13 八月 2021 16:24:16 +0800
Subject: [PATCH] 修改生产任务单下推流转卡数量控制超出问题；修改流转卡数量显示问题；修改流转卡保存后单据显示问题；
---
Model/车间管理/ClsSc_ProcessExchangeBillSub.cs | 2
WorkM/流转卡管理/Sc_ProcessExchangeBill.designer.cs | 156 +++++++++++++++++++++++++++++++++++---
Model/车间管理/ClsSc_ProcessExchangeBillMain.cs | 5 +
WorkM/流转卡管理/Sc_ProcessExchangeBill.cs | 36 ++++++++
DAL/车间管理/ClsSc_ProcessExchangeBill.cs | 39 +++++++++
5 files changed, 220 insertions(+), 18 deletions(-)
diff --git "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs" "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs"
index 5d42bac..4c7a3d1 100644
--- "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs"
+++ "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs"
@@ -270,7 +270,7 @@
",HProdMaterCode,HSeOrderBillNo,HCusShortName,HCusNeedMaterial,HPlanSendGoodsDate" +
",HProdMaterName,HCusName,HWorkRemark,HImportNote,HMaterNumber_A" +
",HMaterNumber_B,HMaterNumber_C,HMaterNumber_D,HProdType,HMaterShortName" +
- ",HMaterIDA,HMaterIDB,HMaterIDC,HMaterIDD" +
+ ",HMaterIDA,HMaterIDB,HMaterIDC,HMaterIDD,HICMOEntryID" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMaker + "',getdate()," + "" + (omodel.HPrevMainSourceInterID == 0 ? omodel.HInterID : omodel.HPrevMainSourceInterID) +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HBatchNo + "'," + omodel.HMainMaterID.ToString() + "," + omodel.HKeyMaterID.ToString() + "," + omodel.HNo.ToString() + ",'" + omodel.HOrderProcNO + "'" +
@@ -281,7 +281,7 @@
",'" + omodel.HProdMaterCode + "','" + omodel.HSeOrderBillNo + "','" + omodel.HCusShortName + "','" + omodel.HCusNeedMaterial + "','" + omodel.HPlanSendGoodsDate + "'" +
",'" + omodel.HProdMaterName + "','" + omodel.HCusName + "','" + omodel.HWorkRemark + "','" + omodel.HImportNote + "','" + omodel.HMaterNumber_A + "'" +
",'" + omodel.HMaterNumber_B + "','" + omodel.HMaterNumber_C + "','" + omodel.HMaterNumber_D + "','" + omodel.HProdType + "','" + omodel.HMaterShortName + "'" +
- ",'" + omodel.HMaterIDA + "','" + omodel.HMaterIDB + "','" + omodel.HMaterIDC + "','" + omodel.HMaterIDD + "'" +
+ ",'" + omodel.HMaterIDA + "','" + omodel.HMaterIDB + "','" + omodel.HMaterIDC + "','" + omodel.HMaterIDD + "'," + omodel.HICMOEntryID +
") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsSc_ProcessExchangeBillSub oSub in DetailColl)
@@ -432,6 +432,12 @@
omodel.HBLFlag = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HBLFlag"]);
omodel.HEquipMentID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEquipMentID"]);
omodel.HProjectNum = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HProjectNum"]);
+ //===============
+ omodel.HPicNumVer = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HPicNumVer"]);
+ omodel.HPicNumAssemble = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HPicNumAssemble"]);
+ omodel.HMaterTexture = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterTexture"]);
+ omodel.HProductNum = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HProductNum"]);
+ omodel.HVerNum = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HVerNum"]);
//
//寰幆
DataSet DsSub;
@@ -509,6 +515,8 @@
oSub.HTechnologyParameter = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HTechnologyParameter"]);
oSub.HPicNum = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HPicNum"]);
oSub.HProcCheckNote = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HProcCheckNote"]);
+ oSub.HMouldNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HMouldNo"]);
+ oSub.HProcWorkNum = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HProcWorkNum"]);
DetailColl.Add(oSub);
}
@@ -630,7 +638,30 @@
omodel.HBLFlag = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HBLFlag"]);
omodel.HEquipMentID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEquipMentID"]);
omodel.HProjectNum = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HProjectNum"]);
- //
+
+ omodel.HProdMaterCode = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HProdMaterCode"]);
+ omodel.HSeOrderBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HSeOrderBillNo"]);
+ omodel.HCusShortName = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCusShortName"]);
+ omodel.HCusNeedMaterial = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCusNeedMaterial"]);
+ omodel.HPlanSendGoodsDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HPlanSendGoodsDate"]);
+ omodel.HProdMaterName = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HProdMaterName"]);
+ omodel.HCusName = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCusName"]);
+ omodel.HWorkRemark = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HWorkRemark"]);
+ omodel.HImportNote = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HImportNote"]);
+ omodel.HMaterNumber_A = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterNumber_A"]);
+ omodel.HMaterNumber_B = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterNumber_B"]);
+ omodel.HMaterNumber_C = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterNumber_C"]);
+ omodel.HMaterNumber_D = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterNumber_D"]);
+ omodel.HProdType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HProdType"]);
+ omodel.HMaterShortName = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterShortName"]);
+ omodel.HMaterIDA = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterIDA"]);
+ omodel.HMaterIDB = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterIDB"]);
+ omodel.HMaterIDC = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterIDC"]);
+ omodel.HMaterIDD = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterIDD"]);
+ omodel.HPicNumVer = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HPicNumVer"]);
+ omodel.HPicNumAssemble = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HPicNumAssemble"]);
+ omodel.HMaterTexture = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterTexture"]);
+ omodel.HVerNum = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HVerNum"]);
//寰幆
DataSet DsSub;
if (bBack)
@@ -722,6 +753,8 @@
oSub.HTechnologyParameter = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HTechnologyParameter"]);
oSub.HPicNum = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HPicNum"]);
oSub.HProcCheckNote = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HProcCheckNote"]);
+ oSub.HMouldNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HMouldNo"]);
+ oSub.HProcWorkNum = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HProcWorkNum"]);
DetailColl.Add(oSub);
}
sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
diff --git "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillMain.cs" "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillMain.cs"
index a04535a..60611bd 100644
--- "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillMain.cs"
+++ "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillMain.cs"
@@ -59,5 +59,10 @@
public string HMaterIDB;
public string HMaterIDC;
public string HMaterIDD;
+ public string HPicNumVer;//图号版本
+ public string HPicNumAssemble;//总装图号
+ public string HMaterTexture;//材质
+ public string HProductNum;//成品编号
+ public string HVerNum;//版本
}
}
diff --git "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillSub.cs" "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillSub.cs"
index 1f7b77c..924e656 100644
--- "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillSub.cs"
+++ "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillSub.cs"
@@ -68,5 +68,7 @@
public string HProcCheckNote;
public string HPicNum;
public string HTechnologyParameter;
+ public string HMouldNo;//模具编号
+ public string HProcWorkNum;//程序号
}
}
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.cs"
index 46f3566..5676212 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.cs"
@@ -102,6 +102,9 @@
public const Int16 HTechnologyParameterCol = 76;
public const Int16 HPicNumCol = 77;
public const Int16 HProcCheckNoteCol = 78;
+ public const Int16 HMouldNoCol = 79;
+ public const Int16 HProcWorkNumCol = 80;
+ public const Int16 HICMOEntryIDCol = 81;
@@ -1055,6 +1058,11 @@
this.txtHOrderProcNO.Text = DBUtility.ClsPub.isStrNull(BillOld.omodel.HOrderProcNO);
this.txtHMateOutBatchNo.Text = DBUtility.ClsPub.isStrNull(BillOld.omodel.HMateOutBatchNo);
this.txtHProjectNum.Text = DBUtility.ClsPub.isStrNull(BillOld.omodel.HProjectNum);
+ this.textHPicNumVer.Text = DBUtility.ClsPub.isStrNull(BillOld.omodel.HPicNumVer);
+ this.textHPicNumAssemble.Text = DBUtility.ClsPub.isStrNull(BillOld.omodel.HPicNumAssemble);
+ this.textHMaterTexture.Text = DBUtility.ClsPub.isStrNull(BillOld.omodel.HMaterTexture);
+ this.textHProductNum.Text = DBUtility.ClsPub.isStrNull(BillOld.omodel.HProductNum);
+ this.textHVerNum.Text = DBUtility.ClsPub.isStrNull(BillOld.omodel.HVerNum);
//鍔犺浇琛ㄤ綋
initGrid();
int i = 0;
@@ -1079,6 +1087,8 @@
grdMain.Rows[i].Cells[HRelationQty_WWOrderCol].Value = oSub.HRelationQty_WWOrder.ToString();
grdMain.Rows[i].Cells[HRelationQty_BadCol].Value = oSub.HRelationQty_Bad.ToString();
grdMain.Rows[i].Cells[HRelationMoneyCol].Value = oSub.HRelationMoney.ToString();
+ grdMain.Rows[i].Cells[HMouldNoCol].Value = oSub.HMouldNo.ToString();
+ grdMain.Rows[i].Cells[HProcWorkNumCol].Value = oSub.HProcWorkNum.ToString();
//======================================================================================
//
grdMain.Rows[i].Cells[HProcIDCol].Value = oSub.HProcID.ToString();
@@ -1208,6 +1218,7 @@
//
grdMain.Rows[i].Cells[HICMOBillNoCol].Value = oSub.HICMOBillNo;
grdMain.Rows[i].Cells[HICMOInterIDCol].Value = oSub.HICMOInterID.ToString();
+ grdMain.Rows[i].Cells[HICMOEntryIDCol].Value = oSub.HICMOEntryID.ToString();
grdMain.Rows[i].Cells[HSeOrderBillNoCol].Value = oSub.HSeOrderBillNo;
grdMain.Rows[i].Cells[HSeOrderInterIDCol].Value = oSub.HSeOrderInterID.ToString();
grdMain.Rows[i].Cells[HSeOrderEntryIDCol].Value = oSub.HSeOrderEntryID.ToString();
@@ -1400,6 +1411,12 @@
BillNew.omodel.HMaterIDB = ClsPub.isStrNull(this.txtHMaterIDB.Text);
BillNew.omodel.HMaterIDC = ClsPub.isStrNull(this.txtHMaterIDC.Text);
BillNew.omodel.HMaterIDD = ClsPub.isStrNull(this.txtHMaterIDD.Text);
+ //===================
+ BillNew.omodel.HPicNumVer = ClsPub.isStrNull(this.textHPicNumVer.Text);
+ BillNew.omodel.HPicNumAssemble = ClsPub.isStrNull(this.textHPicNumAssemble.Text);
+ BillNew.omodel.HMaterTexture = ClsPub.isStrNull(this.textHMaterTexture.Text);
+ BillNew.omodel.HProductNum = ClsPub.isStrNull(this.textHProductNum.Text);
+ BillNew.omodel.HVerNum = ClsPub.isStrNull(this.textHVerNum.Text);
//鑾峰彇鏈�澶ц鍙�
int MaxRowNo = 0;
for (int n = 0; n < grdMain.Rows.Count; n++)
@@ -1525,6 +1542,7 @@
}
oSub.HICMOBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HICMOBillNoCol].Value);
oSub.HICMOInterID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HICMOInterIDCol].Value);
+ oSub.HICMOEntryID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HICMOEntryIDCol].Value);
oSub.HSeOrderInterID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HSeOrderInterIDCol].Value);
oSub.HSeOrderEntryID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HSeOrderEntryIDCol].Value);
oSub.HSeOrderBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HSeOrderBillNoCol].Value);
@@ -1538,6 +1556,8 @@
oSub.HTechnologyParameter = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HTechnologyParameterCol].Value);
oSub.HPicNum = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HPicNumCol].Value);
oSub.HProcCheckNote = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HProcCheckNoteCol].Value);
+ oSub.HMouldNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HMouldNoCol].Value);
+ oSub.HProcWorkNum = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HProcWorkNumCol].Value);
BillNew.DetailColl.Add(oSub);
}
}
@@ -1584,7 +1604,7 @@
{
//
- grdMain.ColumnCount = 79; //鎬诲垪鏁�
+ grdMain.ColumnCount = 82; //鎬诲垪鏁�
DBUtility.Xt_BaseBillFun.initGridFst(grdMain, this.Name);
//
grdMain.RowsDefaultCellStyle.WrapMode = DataGridViewTriState.True;
@@ -1650,6 +1670,7 @@
grdMain.Columns[HICMOBillNoCol].HeaderText = "鐢熶骇璁㈠崟鍙�";
grdMain.Columns[HICMOInterIDCol].HeaderText = "鐢熶骇璁㈠崟涓诲唴鐮�";
+ grdMain.Columns[HICMOEntryIDCol].HeaderText = "鐢熶骇璁㈠崟瀛愬唴鐮�";
grdMain.Columns[HSeOrderInterIDCol].HeaderText = "閿�鍞鍗曚富鍐呯爜";
grdMain.Columns[HSeOrderEntryIDCol].HeaderText = "閿�鍞鍗曞瓙鍐呯爜";
grdMain.Columns[HSeOrderBillNoCol].HeaderText = "閿�鍞鍗曞崟鍙�";
@@ -1661,6 +1682,8 @@
grdMain.Columns[HTechnologyParameterCol].HeaderText = "宸ヨ壓鍙傛暟";
grdMain.Columns[HPicNumCol].HeaderText = "鍥剧焊缂栧彿";
grdMain.Columns[HProcCheckNoteCol].HeaderText = "鏈伐搴忕‘璁よ褰�";
+ grdMain.Columns[HMouldNoCol].HeaderText = "妯″叿缂栧彿";
+ grdMain.Columns[HProcWorkNumCol].HeaderText = "绋嬪簭鍙�";
// grdMain.Columns[HKeyProcCol].HeaderText = "鍏抽敭宸ュ簭";
grdMain.Columns[HKeyProcCol].Visible = false;
////鍥哄畾璧嬪��=====================================================
@@ -1709,6 +1732,7 @@
grdMain.Columns[HTagCol].Visible = false;
grdMain.Columns[HWorkerIDCol].Visible = false;
grdMain.Columns[HICMOInterIDCol].Visible = false;
+ grdMain.Columns[HICMOEntryIDCol].Visible = false;
grdMain.Columns[HOutMoneyCol].Visible = false;
grdMain.Columns[HSourceIDCol].Visible = false;
//grdMain.Columns[HEntryIDCol].Visible = false;
@@ -1815,6 +1839,8 @@
"," + HLastProcCol.ToString() +
"," + HFstProcCol.ToString() +
"," + HRemarkCol.ToString() +
+ "," + HMouldNoCol.ToString() +
+ "," + HProcWorkNumCol.ToString() +
"," + HSupNameCol +
"," + HSupFlagCol;
//璁剧疆鍚堣鍒�
@@ -3408,6 +3434,11 @@
txtHCusName.Text = oTable.Rows[row]["瀹㈡埛鍚嶇О"].ToString();
txtHWorkRemark.Text = oTable.Rows[row]["鐢熶骇澶囨敞"].ToString();
txtHImportNote.Text = oTable.Rows[row]["閲嶈鎻愮ず"].ToString();
+ textHPicNumVer.Text = oTable.Rows[row]["鍥惧彿鐗堟湰"].ToString();
+ textHPicNumAssemble.Text = oTable.Rows[row]["鎬昏鍥惧彿"].ToString();
+ textHMaterTexture.Text = oTable.Rows[row]["鏉愯川"].ToString();
+ textHProductNum.Text = oTable.Rows[row]["鎴愬搧缂栧彿"].ToString();
+ textHVerNum.Text = oTable.Rows[row]["鐗堟湰"].ToString();
// txtHWorkTypeID.Text = oTable.Rows[row]["鐢熶骇杞﹂棿鍚嶇О"].ToString();
@@ -3481,6 +3512,7 @@
//
grdMain.Rows[i].Cells[HICMOBillNoCol].Value = oTable.Rows[i]["鐢熶骇璁㈠崟鍙�"].ToString();
grdMain.Rows[i].Cells[HICMOInterIDCol].Value = oTable.Rows[i]["hmainid"].ToString();
+ grdMain.Rows[i].Cells[HICMOEntryIDCol].Value = oTable.Rows[i]["HEntryID"].ToString();
grdMain.Rows[i].Cells[HSourceInterIDCol].Value = oTable.Rows[i]["hmainid"].ToString();
grdMain.Rows[i].Cells[HSourceEntryIDCol].Value = oTable.Rows[i]["HEntryID"].ToString();
grdMain.Rows[i].Cells[HSourceBillTypeCol].Value = oTable.Rows[i]["HBillType"].ToString();
@@ -3492,6 +3524,8 @@
grdMain.Rows[i].Cells[HProcCheckNoteCol].Value = oTable.Rows[i]["鏈伐搴忕‘璁よ褰�"].ToString();
grdMain.Rows[i].Cells[HOverRateCol].Value = oTable.Rows[i]["瓒呴姣斾緥"].ToString();
grdMain.Rows[i].Cells[HMaxQtyCol].Value = oTable.Rows[i]["鏈�楂樹笂闄�"].ToString();
+ grdMain.Rows[i].Cells[HMouldNoCol].Value = oTable.Rows[i]["妯″叿缂栧彿"].ToString();
+ grdMain.Rows[i].Cells[HProcWorkNumCol].Value = oTable.Rows[i]["绋嬪簭鍙�"].ToString();
}
Sub_CountProcExchQty();
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.designer.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.designer.cs"
index 7ef3e61..792fbf9 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.designer.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.designer.cs"
@@ -226,6 +226,16 @@
this.grdSum = new System.Windows.Forms.DataGridView();
this.panel6 = new System.Windows.Forms.Panel();
this.lblHStockQty = new System.Windows.Forms.Label();
+ this.label62 = new System.Windows.Forms.Label();
+ this.textHVerNum = new System.Windows.Forms.TextBox();
+ this.label63 = new System.Windows.Forms.Label();
+ this.label64 = new System.Windows.Forms.Label();
+ this.textHPicNumVer = new System.Windows.Forms.TextBox();
+ this.label65 = new System.Windows.Forms.Label();
+ this.textHPicNumAssemble = new System.Windows.Forms.TextBox();
+ this.label66 = new System.Windows.Forms.Label();
+ this.textHMaterTexture = new System.Windows.Forms.TextBox();
+ this.textHProductNum = new System.Windows.Forms.TextBox();
this.Tool.SuspendLayout();
this.P1.SuspendLayout();
this.tabControl2.SuspendLayout();
@@ -286,7 +296,7 @@
this.Tool.Location = new System.Drawing.Point(0, 0);
this.Tool.Name = "Tool";
this.Tool.Padding = new System.Windows.Forms.Padding(0);
- this.Tool.Size = new System.Drawing.Size(1017, 50);
+ this.Tool.Size = new System.Drawing.Size(1348, 50);
this.Tool.Stretch = true;
this.Tool.TabIndex = 17;
this.Tool.Text = "toolStrip1";
@@ -748,7 +758,7 @@
this.lblCaption.Font = new System.Drawing.Font("瀹嬩綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblCaption.Location = new System.Drawing.Point(0, 0);
this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(937, 34);
+ this.lblCaption.Size = new System.Drawing.Size(1268, 34);
this.lblCaption.TabIndex = 18;
this.lblCaption.Text = "鍗曟嵁缂栬緫";
this.lblCaption.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -762,7 +772,7 @@
this.P1.Dock = System.Windows.Forms.DockStyle.Top;
this.P1.Location = new System.Drawing.Point(41, 50);
this.P1.Name = "P1";
- this.P1.Size = new System.Drawing.Size(937, 254);
+ this.P1.Size = new System.Drawing.Size(1268, 254);
this.P1.TabIndex = 31;
//
// tabControl2
@@ -775,7 +785,7 @@
this.tabControl2.Margin = new System.Windows.Forms.Padding(2);
this.tabControl2.Name = "tabControl2";
this.tabControl2.SelectedIndex = 0;
- this.tabControl2.Size = new System.Drawing.Size(937, 220);
+ this.tabControl2.Size = new System.Drawing.Size(1268, 220);
this.tabControl2.TabIndex = 310;
//
// tabPage2
@@ -785,7 +795,7 @@
this.tabPage2.Margin = new System.Windows.Forms.Padding(2);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(2);
- this.tabPage2.Size = new System.Drawing.Size(929, 194);
+ this.tabPage2.Size = new System.Drawing.Size(1260, 194);
this.tabPage2.TabIndex = 0;
this.tabPage2.Text = "琛ㄥご淇℃伅";
this.tabPage2.UseVisualStyleBackColor = true;
@@ -793,6 +803,16 @@
// gbUp
//
this.gbUp.BackColor = System.Drawing.Color.Lavender;
+ this.gbUp.Controls.Add(this.textHProductNum);
+ this.gbUp.Controls.Add(this.textHMaterTexture);
+ this.gbUp.Controls.Add(this.label62);
+ this.gbUp.Controls.Add(this.textHVerNum);
+ this.gbUp.Controls.Add(this.label63);
+ this.gbUp.Controls.Add(this.label64);
+ this.gbUp.Controls.Add(this.textHPicNumVer);
+ this.gbUp.Controls.Add(this.label65);
+ this.gbUp.Controls.Add(this.textHPicNumAssemble);
+ this.gbUp.Controls.Add(this.label66);
this.gbUp.Controls.Add(this.label42);
this.gbUp.Controls.Add(this.txtHProjectNum);
this.gbUp.Controls.Add(this.cmdEquipMentID);
@@ -838,7 +858,7 @@
this.gbUp.Dock = System.Windows.Forms.DockStyle.Fill;
this.gbUp.Location = new System.Drawing.Point(2, 2);
this.gbUp.Name = "gbUp";
- this.gbUp.Size = new System.Drawing.Size(925, 190);
+ this.gbUp.Size = new System.Drawing.Size(1256, 190);
this.gbUp.TabIndex = 33;
this.gbUp.TabStop = false;
//
@@ -2105,7 +2125,7 @@
this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
this.panel2.Location = new System.Drawing.Point(41, 526);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(937, 73);
+ this.panel2.Size = new System.Drawing.Size(1268, 73);
this.panel2.TabIndex = 32;
//
// txtHDeleteDate
@@ -2324,7 +2344,7 @@
// panel3
//
this.panel3.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel3.Location = new System.Drawing.Point(978, 50);
+ this.panel3.Location = new System.Drawing.Point(1309, 50);
this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(39, 549);
this.panel3.TabIndex = 34;
@@ -2347,7 +2367,7 @@
this.tabControl1.Location = new System.Drawing.Point(41, 304);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(937, 222);
+ this.tabControl1.Size = new System.Drawing.Size(1268, 222);
this.tabControl1.TabIndex = 55;
//
// tabPage1
@@ -2358,7 +2378,7 @@
this.tabPage1.Location = new System.Drawing.Point(4, 22);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage1.Size = new System.Drawing.Size(929, 196);
+ this.tabPage1.Size = new System.Drawing.Size(1260, 196);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "鏄庣粏淇℃伅";
this.tabPage1.UseVisualStyleBackColor = true;
@@ -2377,7 +2397,7 @@
this.grdMain.ReadOnly = true;
this.grdMain.RowHeadersWidth = 30;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(923, 146);
+ this.grdMain.Size = new System.Drawing.Size(1254, 146);
this.grdMain.TabIndex = 58;
this.grdMain.RowHeadersWidthChanged += new System.EventHandler(this.grdMain_RowHeadersWidthChanged);
this.grdMain.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdMain_CellBeginEdit);
@@ -2402,7 +2422,7 @@
this.grdSum.RowHeadersWidth = 51;
this.grdSum.RowTemplate.Height = 23;
this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
- this.grdSum.Size = new System.Drawing.Size(923, 19);
+ this.grdSum.Size = new System.Drawing.Size(1254, 19);
this.grdSum.TabIndex = 57;
//
// panel6
@@ -2413,7 +2433,7 @@
this.panel6.Dock = System.Windows.Forms.DockStyle.Bottom;
this.panel6.Location = new System.Drawing.Point(3, 168);
this.panel6.Name = "panel6";
- this.panel6.Size = new System.Drawing.Size(923, 25);
+ this.panel6.Size = new System.Drawing.Size(1254, 25);
this.panel6.TabIndex = 56;
//
// lblHStockQty
@@ -2424,12 +2444,110 @@
this.lblHStockQty.Size = new System.Drawing.Size(0, 12);
this.lblHStockQty.TabIndex = 0;
//
+ // label62
+ //
+ this.label62.AutoSize = true;
+ this.label62.ForeColor = System.Drawing.Color.Black;
+ this.label62.Location = new System.Drawing.Point(928, 138);
+ this.label62.Name = "label62";
+ this.label62.Size = new System.Drawing.Size(53, 12);
+ this.label62.TabIndex = 333;
+ this.label62.Text = "鐗� 鏈�";
+ //
+ // textHVerNum
+ //
+ this.textHVerNum.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.textHVerNum.Location = new System.Drawing.Point(1000, 134);
+ this.textHVerNum.Name = "textHVerNum";
+ this.textHVerNum.Size = new System.Drawing.Size(189, 21);
+ this.textHVerNum.TabIndex = 334;
+ this.textHVerNum.Tag = "0";
+ //
+ // label63
+ //
+ this.label63.AutoSize = true;
+ this.label63.ForeColor = System.Drawing.Color.Black;
+ this.label63.Location = new System.Drawing.Point(928, 110);
+ this.label63.Name = "label63";
+ this.label63.Size = new System.Drawing.Size(53, 12);
+ this.label63.TabIndex = 330;
+ this.label63.Text = "鎴愬搧缂栧彿";
+ //
+ // label64
+ //
+ this.label64.AutoSize = true;
+ this.label64.ForeColor = System.Drawing.Color.Black;
+ this.label64.Location = new System.Drawing.Point(926, 27);
+ this.label64.Name = "label64";
+ this.label64.Size = new System.Drawing.Size(53, 12);
+ this.label64.TabIndex = 328;
+ this.label64.Text = "鍥惧彿鐗堟湰";
+ //
+ // textHPicNumVer
+ //
+ this.textHPicNumVer.BackColor = System.Drawing.Color.Beige;
+ this.textHPicNumVer.Enabled = false;
+ this.textHPicNumVer.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.textHPicNumVer.Location = new System.Drawing.Point(1000, 24);
+ this.textHPicNumVer.Name = "textHPicNumVer";
+ this.textHPicNumVer.ReadOnly = true;
+ this.textHPicNumVer.Size = new System.Drawing.Size(188, 21);
+ this.textHPicNumVer.TabIndex = 329;
+ //
+ // label65
+ //
+ this.label65.AutoSize = true;
+ this.label65.ForeColor = System.Drawing.Color.Black;
+ this.label65.Location = new System.Drawing.Point(927, 56);
+ this.label65.Name = "label65";
+ this.label65.Size = new System.Drawing.Size(53, 12);
+ this.label65.TabIndex = 326;
+ this.label65.Text = "鎬昏鍥惧彿";
+ //
+ // textHPicNumAssemble
+ //
+ this.textHPicNumAssemble.BackColor = System.Drawing.SystemColors.Window;
+ this.textHPicNumAssemble.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.textHPicNumAssemble.Location = new System.Drawing.Point(1001, 52);
+ this.textHPicNumAssemble.Name = "textHPicNumAssemble";
+ this.textHPicNumAssemble.Size = new System.Drawing.Size(188, 21);
+ this.textHPicNumAssemble.TabIndex = 327;
+ this.textHPicNumAssemble.Tag = "0";
+ //
+ // label66
+ //
+ this.label66.AutoSize = true;
+ this.label66.ForeColor = System.Drawing.Color.Black;
+ this.label66.Location = new System.Drawing.Point(926, 84);
+ this.label66.Name = "label66";
+ this.label66.Size = new System.Drawing.Size(53, 12);
+ this.label66.TabIndex = 323;
+ this.label66.Text = "鏉� 璐�";
+ //
+ // textHMaterTexture
+ //
+ this.textHMaterTexture.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.textHMaterTexture.Location = new System.Drawing.Point(1001, 80);
+ this.textHMaterTexture.Name = "textHMaterTexture";
+ this.textHMaterTexture.Size = new System.Drawing.Size(189, 21);
+ this.textHMaterTexture.TabIndex = 335;
+ this.textHMaterTexture.Tag = "0";
+ //
+ // textHProductNum
+ //
+ this.textHProductNum.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.textHProductNum.Location = new System.Drawing.Point(1001, 106);
+ this.textHProductNum.Name = "textHProductNum";
+ this.textHProductNum.Size = new System.Drawing.Size(189, 21);
+ this.textHProductNum.TabIndex = 336;
+ this.textHProductNum.Tag = "0";
+ //
// Sc_ProcessExchangeBill
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.Lavender;
- this.ClientSize = new System.Drawing.Size(1017, 599);
+ this.ClientSize = new System.Drawing.Size(1348, 599);
this.Controls.Add(this.tabControl1);
this.Controls.Add(this.panel2);
this.Controls.Add(this.P1);
@@ -2674,5 +2792,15 @@
private System.Windows.Forms.Label label43;
private System.Windows.Forms.ToolStripMenuItem 闅愯棌鍒楄缃甌oolStripMenuItem;
private System.Windows.Forms.ToolStripButton fz;
+ private System.Windows.Forms.TextBox textHProductNum;
+ private System.Windows.Forms.TextBox textHMaterTexture;
+ private System.Windows.Forms.Label label62;
+ private System.Windows.Forms.TextBox textHVerNum;
+ private System.Windows.Forms.Label label63;
+ private System.Windows.Forms.Label label64;
+ private System.Windows.Forms.TextBox textHPicNumVer;
+ private System.Windows.Forms.Label label65;
+ private System.Windows.Forms.TextBox textHPicNumAssemble;
+ private System.Windows.Forms.Label label66;
}
}
\ No newline at end of file
--
Gitblit v1.9.1