From 2ec6c6735982f7395567938c14ce403a2d911031 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期二, 05 十一月 2024 15:34:03 +0800
Subject: [PATCH] 长城系列客户条码生成修改
---
SCM/基础资料/长城系列产品/Gy_Material_ChangCheng.resx | 116 ++++++---
SCM/基础资料/长城系列产品/Gy_Material_ChangCheng.cs | 87 +++++++
SCM/基础资料/长城系列产品/ClsGy_Material_ChangCheng_Ctl.cs | 23 +
SCM/基础资料/长城系列产品/ClsGy_Material_ChangCheng_View.cs | 124 ++++++++++-
SCM/条码打印/Gy_BarCodeBill_ChangCheng.cs | 56 ++++
SCM/SCM.csproj | 1
SCM/基础资料/长城系列产品/Gy_Material_ChangCheng.designer.cs | 222 +++++++++++++++++---
SCM/基础资料/长城系列产品/ClsGy_Material_ChangCheng_Model.cs | 15 +
8 files changed, 543 insertions(+), 101 deletions(-)
diff --git a/SCM/SCM.csproj b/SCM/SCM.csproj
index e113bda..1ab5a8b 100644
--- a/SCM/SCM.csproj
+++ b/SCM/SCM.csproj
@@ -195,6 +195,7 @@
<Compile Include="鍗曟嵁璧勬枡\鍑哄叆搴撳崟鎹甛Kf_OtherOutBillList.designer.cs">
<DependentUpon>Kf_OtherOutBillList.cs</DependentUpon>
</Compile>
+ <Compile Include="鍩虹璧勬枡\闀垮煄绯诲垪浜у搧\ClsGy_Material_ChangCheng_Model.cs" />
<Compile Include="鍩虹璧勬枡\闀垮煄绯诲垪浜у搧\ClsGy_Material_ChangCheng_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\闀垮煄绯诲垪浜у搧\ClsGy_Material_ChangCheng_View.cs" />
<Compile Include="鍩虹璧勬枡\闀垮煄绯诲垪浜у搧\Gy_Material_ChangCheng.cs">
diff --git "a/SCM/\345\237\272\347\241\200\350\265\204\346\226\231/\351\225\277\345\237\216\347\263\273\345\210\227\344\272\247\345\223\201/ClsGy_Material_ChangCheng_Ctl.cs" "b/SCM/\345\237\272\347\241\200\350\265\204\346\226\231/\351\225\277\345\237\216\347\263\273\345\210\227\344\272\247\345\223\201/ClsGy_Material_ChangCheng_Ctl.cs"
index 037778a..655c4b5 100644
--- "a/SCM/\345\237\272\347\241\200\350\265\204\346\226\231/\351\225\277\345\237\216\347\263\273\345\210\227\344\272\247\345\223\201/ClsGy_Material_ChangCheng_Ctl.cs"
+++ "b/SCM/\345\237\272\347\241\200\350\265\204\346\226\231/\351\225\277\345\237\216\347\263\273\345\210\227\344\272\247\345\223\201/ClsGy_Material_ChangCheng_Ctl.cs"
@@ -13,7 +13,7 @@
public string MvarItemKey;
public string MvarReportTitle;
public string HOldNumber;
- public DBUtility.ClsGy_Base_Model oModel = new DBUtility.ClsGy_Base_Model();
+ public SCM.ClsGy_Material_ChangCheng_Model oModel = new SCM.ClsGy_Material_ChangCheng_Model();
public SCM.WMSWeb.WebService1 oWeb = new SCM.WMSWeb.WebService1();
//鏂板
@@ -24,8 +24,14 @@
{
oWeb.Url = ClsPub1.WEBSURL;
oWeb.getRunProc("Insert into " + MvarItemKey + " " +
- " (HNumber,HName,HModel,HSupplierNumber,HMakeEmp,HMakeTime) " +
- " Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HModel + "','" + oModel.HShortNumber + "','" + ClsPub.CurUserName + "',getdate())", ref DBUtility.ClsPub.sExeReturnInfo);
+ " (HNumber,HName,HModel,HSupplierNumber" +
+ ",HMaterID,HMaterNumber,HMaterName,HMaterModel" +
+ ",HUnitID,HUnitNumber,HUnitName" +
+ ",HMakeEmp,HMakeTime) " +
+ " Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HModel + "','" + oModel.HSupplierNumber + "'" +
+ ", " + oModel.HMaterID.ToString() + ",'" + oModel.HMaterNumber + "','" + oModel.HMaterName + "','" + oModel.HMaterModel + "'" +
+ ", " + oModel.HUnitID.ToString() + ",'" + oModel.HUnitNumber + "','" + oModel.HUnitName + "'" +
+ ",'" + ClsPub.CurUserName + "',getdate())", ref DBUtility.ClsPub.sExeReturnInfo);
return true;
}
catch (Exception e)
@@ -45,7 +51,14 @@
" HNumber='" + oModel.HNumber + "'" +
",HName='" + oModel.HName + "'" +
",HModel='" + oModel.HModel + "'" +
- ",HSupplierNumber='" + oModel.HShortNumber + "'" +
+ ",HSupplierNumber='" + oModel.HSupplierNumber + "'" +
+ ",HMaterID=" + oModel.HMaterID +
+ ",HMaterNumber='" + oModel.HMaterNumber + "'" +
+ ",HMaterName='" + oModel.HMaterName + "'" +
+ ",HMaterModel='" + oModel.HMaterModel + "'" +
+ ",HUnitID=" + oModel.HUnitID +
+ ",HUnitNumber='" + oModel.HUnitNumber + "'" +
+ ",HUnitName='" + oModel.HUnitName + "'" +
",HModifyEmp='" + ClsPub.CurUserName + "'" +
",HModifyTime=getdate()" +
" Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
@@ -114,7 +127,7 @@
{
MvarItemKey = "Gy_Material_ChangCheng";
MvarReportTitle = "浜у搧璁剧疆";
- oModel = new DBUtility.ClsGy_Base_Model();
+ oModel = new SCM.ClsGy_Material_ChangCheng_Model();
}
}
}
diff --git "a/SCM/\345\237\272\347\241\200\350\265\204\346\226\231/\351\225\277\345\237\216\347\263\273\345\210\227\344\272\247\345\223\201/ClsGy_Material_ChangCheng_Model.cs" "b/SCM/\345\237\272\347\241\200\350\265\204\346\226\231/\351\225\277\345\237\216\347\263\273\345\210\227\344\272\247\345\223\201/ClsGy_Material_ChangCheng_Model.cs"
new file mode 100644
index 0000000..301e213
--- /dev/null
+++ "b/SCM/\345\237\272\347\241\200\350\265\204\346\226\231/\351\225\277\345\237\216\347\263\273\345\210\227\344\272\247\345\223\201/ClsGy_Material_ChangCheng_Model.cs"
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SCM
+{
+ public class ClsGy_Material_ChangCheng_Model : DBUtility.ClsGy_Base_Model
+ {
+ public string HSupplierNumber; // varchar(100) --公司编码
+ public Int64 HMaterID; // int --物料ID
+ public string HMaterNumber; // varchar(100) --物料代码
+ public string HMaterName; // varchar(100) --物料名称
+ public string HMaterModel; // varchar(100) --规格型号
+ }
+}
diff --git "a/SCM/\345\237\272\347\241\200\350\265\204\346\226\231/\351\225\277\345\237\216\347\263\273\345\210\227\344\272\247\345\223\201/ClsGy_Material_ChangCheng_View.cs" "b/SCM/\345\237\272\347\241\200\350\265\204\346\226\231/\351\225\277\345\237\216\347\263\273\345\210\227\344\272\247\345\223\201/ClsGy_Material_ChangCheng_View.cs"
index 308af9c..cca688f 100644
--- "a/SCM/\345\237\272\347\241\200\350\265\204\346\226\231/\351\225\277\345\237\216\347\263\273\345\210\227\344\272\247\345\223\201/ClsGy_Material_ChangCheng_View.cs"
+++ "b/SCM/\345\237\272\347\241\200\350\265\204\346\226\231/\351\225\277\345\237\216\347\263\273\345\210\227\344\272\247\345\223\201/ClsGy_Material_ChangCheng_View.cs"
@@ -8,22 +8,28 @@
{
public class ClsGy_Material_ChangCheng_View : DBUtility.ClsGy_Base_View
{
- public DBUtility.ClsGy_Base_Model omodel = new DBUtility.ClsGy_Base_Model();
- public List<DBUtility.ClsGy_Base_Model> omodelList = new List<DBUtility.ClsGy_Base_Model>();
+ public SCM.ClsGy_Material_ChangCheng_Model omodel = new SCM.ClsGy_Material_ChangCheng_Model();
+ public List<SCM.ClsGy_Material_ChangCheng_Model> omodelList = new List<SCM.ClsGy_Material_ChangCheng_Model>();
SCM.WMSWeb.WebService1 oWeb = new SCM.WMSWeb.WebService1();
public ClsGy_Material_ChangCheng_View()
{
base.MvarReportTitle = "浜у搧璁剧疆";
base.MvarItemKey = "h_v_Gy_Material_ChangCheng";
- base.SQLName = "Select HItemID,HNumber 浜у搧浠g爜,HName 浜у搧鍚嶇О,HModel 浜у搧绠�鐮� from h_v_Gy_Material_ChangCheng ";
+ base.SQLName = "Select HItemID,HNumber 浜у搧浠g爜,HName 浜у搧鍚嶇О,HModel 浜у搧绠�鐮�,HSupplierNumber 鍏徃缂栫爜,HMaterNumber 鐗╂枡浠g爜,HMaterName 鐗╂枡鍚嶇О,HMaterModel 瑙勬牸鍨嬪彿,HUnitNumber 璁¢噺鍗曚綅浠g爜,HUnitName 璁¢噺鍗曚綅鍚嶇О from h_v_Gy_Material_ChangCheng ";
base.SQLWhere = " ";
base.SQLOrder = " Order by HNumber ";
base.SQLList = "Select * from " + MvarItemKey + " ";
//涓嬫媺SQL
- base.SQLNameForDown = " Select top 30 HItemID,HNumber 浜у搧浠g爜,HName 浜у搧鍚嶇О,HModel 浜у搧绠�鐮� from h_v_Gy_Material_ChangCheng ";
+ base.SQLNameForDown = " Select top 30 HItemID,HNumber 浜у搧浠g爜,HName 浜у搧鍚嶇О,HModel 浜у搧绠�鐮�,HSupplierNumber 鍏徃缂栫爜,HMaterNumber 鐗╂枡浠g爜,HMaterName 鐗╂枡鍚嶇О,HMaterModel 瑙勬牸鍨嬪彿,HUnitNumber 璁¢噺鍗曚綅浠g爜,HUnitName 璁¢噺鍗曚綅鍚嶇О from h_v_Gy_Material_ChangCheng ";
base.SQLOrderForDown = " Order by HNumber ";
base.SQLWhereForDown = " where 1=1 ";
+ //HlpInfoForBig
+ base.sBillColName = "浜у搧鍚嶇О";
+ base.sBillColNumber = "浜у搧浠g爜";
+ base.sBillShowItem = " * ";
+ base.sBillView = "h_v_Gy_Material_ChangChengList";
+ base.sBillOrder = " order by 浜у搧浠g爜 desc ";
}
//
public void Dispose()
@@ -76,14 +82,20 @@
{
try
{
- omodel = new DBUtility.ClsGy_Base_Model();
+ omodel = new SCM.ClsGy_Material_ChangCheng_Model();
omodel.HItemID = Convert.ToInt64(DS.Tables[0].Rows[0]["HItemID"]);
omodel.HNumber = DS.Tables[0].Rows[0]["HNumber"].ToString().Trim();
omodel.HName = DS.Tables[0].Rows[0]["HName"].ToString().Trim();
omodel.HModel = DS.Tables[0].Rows[0]["HModel"].ToString().Trim();
- omodel.HShortNumber = DS.Tables[0].Rows[0]["HSupplierNumber"].ToString().Trim();
+ omodel.HSupplierNumber = DS.Tables[0].Rows[0]["HSupplierNumber"].ToString().Trim();
+ omodel.HMaterID = Convert.ToInt64(DS.Tables[0].Rows[0]["HMaterID"]);
+ omodel.HMaterNumber = DS.Tables[0].Rows[0]["HMaterNumber"].ToString().Trim();
+ omodel.HMaterName = DS.Tables[0].Rows[0]["HMaterName"].ToString().Trim();
+ omodel.HMaterModel = DS.Tables[0].Rows[0]["HMaterModel"].ToString().Trim();
+ omodel.HUnitID = Convert.ToInt64(DS.Tables[0].Rows[0]["HUnitID"]);
+ omodel.HUnitNumber = DS.Tables[0].Rows[0]["HUnitNumber"].ToString().Trim();
+ omodel.HUnitName = DS.Tables[0].Rows[0]["HUnitName"].ToString().Trim();
return true;
-
}
catch (Exception e)
{
@@ -131,9 +143,8 @@
{
return false;
}
- oModel = new ClsGy_Base_Model();
- omodel = new ClsCLD_BaseGD_Model();
- omodel.HItemID = Pub_Class.ClsPub.isLong(ofrm.grdShow.Rows[ofrm.grdShow.CurrentRow.Index].Cells[0].Value);
+ oModel = new SCM.ClsGy_Material_ChangCheng_Model();
+ oModel.HItemID = Pub_Class.ClsPub.isLong(ofrm.grdShow.Rows[ofrm.grdShow.CurrentRow.Index].Cells[0].Value);
oModel.HNumber = Pub_Class.ClsPub.isStrNull(ofrm.grdShow.Rows[ofrm.grdShow.CurrentRow.Index].Cells[1].Value);
oModel.HName = Pub_Class.ClsPub.isStrNull(ofrm.grdShow.Rows[ofrm.grdShow.CurrentRow.Index].Cells[2].Value);
oModel.HModel = Pub_Class.ClsPub.isStrNull(ofrm.grdShow.Rows[ofrm.grdShow.CurrentRow.Index].Cells[3].Value);
@@ -198,12 +209,12 @@
omodelList.Clear();
for (int i = 0; i < ofrm.grdShow.SelectedRows.Count; i++)
{
- oModel = new DBUtility.ClsGy_Base_Model();
+ oModel = new SCM.ClsGy_Material_ChangCheng_Model();
oModel.HItemID = Pub_Class.ClsPub.isLong(ofrm.grdShow.Rows[ofrm.grdShow.SelectedRows[i].Index].Cells[0].Value);
oModel.HNumber = Pub_Class.ClsPub.isStrNull(ofrm.grdShow.Rows[ofrm.grdShow.SelectedRows[i].Index].Cells[1].Value);
oModel.HName = Pub_Class.ClsPub.isStrNull(ofrm.grdShow.Rows[ofrm.grdShow.SelectedRows[i].Index].Cells[2].Value);
oModel.HModel = Pub_Class.ClsPub.isStrNull(ofrm.grdShow.Rows[ofrm.grdShow.SelectedRows[i].Index].Cells[3].Value);
- omodelList.Add(oModel);
+ omodelList.Add((ClsGy_Material_ChangCheng_Model)oModel);
}
}
}
@@ -222,5 +233,94 @@
throw (e);
}
}
+ /// <summary>
+ /// 鍩虹璧勬枡甯姪-澶ф暟鎹瀷
+ /// </summary>
+ /// <returns></returns>
+ public virtual bool RefreshViewForBig()
+ {
+ try
+ {//
+ oWeb.Url = ClsPub1.WEBSURL;
+ SCM.frmHlpInfoForBig ofrm = new SCM.frmHlpInfoForBig();
+
+ string sSQL = SQLName + SQLWhere + SQLOrder;
+ //缂栬緫ofrm
+ //ofrm.sTitle = MvarReportTitle;
+ //ofrm.sBill = MvarItemKey;
+ //ofrm.txtFindInfo.Text = WherePart;
+
+ ofrm.sTitle = MvarReportTitle;
+ ofrm.sBill = sBillView;
+ ofrm.txtFindInfo.Text = WherePart;
+ ofrm.sOtherItem = sBillShowItem;
+ ofrm.sNameColName = sBillColName;
+ ofrm.sNumberColName = sBillColNumber;
+ ofrm.sOrderItem = sBillOrder;
+ ofrm.sLike = "";
+
+ //
+ DataSet Ds;
+ Pub_Class.ClsSqlHelper oCn = new Pub_Class.ClsSqlHelper();
+ ofrm.grdShow.SuspendLayout();
+ ofrm.ShowDialog();
+ //寰楀埌瀵瑰簲鍒�
+ int HItemIDCol = 0;
+ int HNumberCol = 1;
+ int HNameCol = 2;
+ //
+
+ //
+ //DataSet Ds;
+ //Ds = oWeb.getDataSetBySQL(sSQL, MvarItemKey, ref DBUtility.ClsPub.sExeReturnInfo);
+ //if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ //{
+ // return false;
+ //}
+
+ ////缁戝畾
+ //ofrm.grdShow.DataSource = Ds.Tables[0].DefaultView;
+ //Ds.Dispose();
+ //Ds = null;
+ //ofrm.grdShow.SuspendLayout();
+ //ofrm.grdShow.Columns[0].Visible = false;
+ //ofrm.ShowDialog();
+ //
+ if (ofrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
+ {
+ if (ofrm.grdShow.SelectedRows == null)
+ {
+ return false;
+ }
+ else
+ {
+ omodelList.Clear();
+ for (int i = 0; i < ofrm.grdShow.SelectedRows.Count; i++)
+ {
+ oModel = new SCM.ClsGy_Material_ChangCheng_Model();
+ oModel.HItemID = Pub_Class.ClsPub.isLong(ofrm.grdShow.Rows[ofrm.grdShow.SelectedRows[i].Index].Cells[0].Value);
+ oModel.HNumber = Pub_Class.ClsPub.isStrNull(ofrm.grdShow.Rows[ofrm.grdShow.SelectedRows[i].Index].Cells[1].Value);
+ oModel.HName = Pub_Class.ClsPub.isStrNull(ofrm.grdShow.Rows[ofrm.grdShow.SelectedRows[i].Index].Cells[2].Value);
+ oModel.HModel = Pub_Class.ClsPub.isStrNull(ofrm.grdShow.Rows[ofrm.grdShow.SelectedRows[i].Index].Cells[3].Value);
+ omodelList.Add((ClsGy_Material_ChangCheng_Model)oModel);
+ }
+ }
+ }
+ else
+ {
+ return false;
+ }
+ //
+ ofrm.Dispose();
+ ofrm = null;
+ //
+ return true;
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+
}
}
diff --git "a/SCM/\345\237\272\347\241\200\350\265\204\346\226\231/\351\225\277\345\237\216\347\263\273\345\210\227\344\272\247\345\223\201/Gy_Material_ChangCheng.cs" "b/SCM/\345\237\272\347\241\200\350\265\204\346\226\231/\351\225\277\345\237\216\347\263\273\345\210\227\344\272\247\345\223\201/Gy_Material_ChangCheng.cs"
index dc86be9..81d93fc 100644
--- "a/SCM/\345\237\272\347\241\200\350\265\204\346\226\231/\351\225\277\345\237\216\347\263\273\345\210\227\344\272\247\345\223\201/Gy_Material_ChangCheng.cs"
+++ "b/SCM/\345\237\272\347\241\200\350\265\204\346\226\231/\351\225\277\345\237\216\347\263\273\345\210\227\344\272\247\345\223\201/Gy_Material_ChangCheng.cs"
@@ -77,7 +77,14 @@
txtHNumber.Text = oMaterialHlp.omodel.HNumber.ToString();
txtHName.Text = oMaterialHlp.omodel.HName.ToString();
txtHModel.Text = oMaterialHlp.omodel.HModel.ToString();
- txtHSupplierNumber.Text = oMaterialHlp.omodel.HShortNumber.ToString();
+ txtHSupplierNumber.Text = oMaterialHlp.omodel.HSupplierNumber.ToString();
+ txtHMaterNumber.Tag = oMaterialHlp.omodel.HMaterID.ToString();
+ txtHMaterNumber.Text = oMaterialHlp.omodel.HMaterNumber.ToString();
+ txtHMaterName.Text = oMaterialHlp.omodel.HMaterName.ToString();
+ txtHMaterModel.Text = oMaterialHlp.omodel.HMaterModel.ToString();
+ txtHUnitNumber.Tag = oMaterialHlp.omodel.HUnitID.ToString();
+ txtHUnitNumber.Text = oMaterialHlp.omodel.HUnitNumber.ToString();
+ txtHUnitName.Text = oMaterialHlp.omodel.HUnitName.ToString();
HItemID = oMaterialHlp.omodel.HItemID;
}
}
@@ -297,11 +304,18 @@
{
return false;
}
- //鍐欏叆淇℃伅 鍏徃缂栫爜瀛樺叆HShortNumber瀛楁
+ //鍐欏叆淇℃伅
oMaterial.oModel.HNumber = txtHNumber.Text.Trim();
oMaterial.oModel.HName = txtHName.Text.Trim();
oMaterial.oModel.HModel = txtHModel.Text.Trim();
- oMaterial.oModel.HShortNumber = txtHSupplierNumber.Text.Trim();
+ oMaterial.oModel.HSupplierNumber = txtHSupplierNumber.Text.Trim();
+ oMaterial.oModel.HMaterID = DBUtility.ClsPub.isLong(this.txtHMaterNumber.Tag);
+ oMaterial.oModel.HMaterNumber = txtHMaterNumber.Text.Trim();
+ oMaterial.oModel.HMaterName = txtHMaterName.Text.Trim();
+ oMaterial.oModel.HMaterModel = txtHMaterModel.Text.Trim();
+ oMaterial.oModel.HUnitID = DBUtility.ClsPub.isLong(this.txtHUnitNumber.Tag);
+ oMaterial.oModel.HUnitNumber = txtHUnitNumber.Text.Trim();
+ oMaterial.oModel.HUnitName = txtHUnitName.Text.Trim();
return true;
}
@@ -418,8 +432,73 @@
}
+ #region 閫夋嫨鍩虹璧勬枡
+ #region 鐗╂枡
+ private void cmdHMaterID_Click(object sender, EventArgs e)
+ {
+ string sWhere = " and HUSEORGID = " + ClsPub1.HOrgID;
+ SCM.ClsIF_Material_View oMaterial = new SCM.ClsIF_Material_View();
+ if (oMaterial.RefreshView(sWhere))
+ {
+ txtHMaterNumber.Tag = oMaterial.omodel.HItemID.ToString();
+ txtHMaterNumber.Text = oMaterial.omodel.HNumber;
+ txtHMaterName.Text = oMaterial.omodel.HName;
+ txtHMaterModel.Text = oMaterial.omodel.HModel;
+ txtHUnitNumber.Tag = oMaterial.omodel.HUnitID.ToString();
+ txtHUnitNumber.Text = oMaterial.omodel.HUnitNumber;
+ txtHUnitName.Text = oMaterial.omodel.HUnitName;
+ }
+ else
+ {
+ txtHMaterNumber.Text = "";
+ txtHMaterName.Text = "";
+ txtHMaterModel.Text = "";
+ txtHUnitNumber.Text = "";
+ txtHUnitName.Text = "";
+ }
+ }
-
+ private void txtHMaterNumber_TextChanged(object sender, EventArgs e)
+ {
+ if (txtHMaterNumber.Text.Trim() == "")
+ {
+ this.txtHMaterNumber.Tag = "0";
+ this.txtHMaterName.Text = "";
+ this.txtHMaterModel.Text = "";
+ }
+ }
+
+ #endregion
+
+ #region 璁¢噺鍗曚綅
+ private void cmdHUnitID_Click(object sender, EventArgs e)
+ {
+ string sWhere = "";
+ SCM.ClsIF_Unit_View oUnit = new SCM.ClsIF_Unit_View();
+ if (oUnit.RefreshView(sWhere))
+ {
+ txtHUnitNumber.Tag = oUnit.oModel.HItemID.ToString();
+ txtHUnitNumber.Text = oUnit.oModel.HNumber;
+ txtHUnitName.Text = oUnit.oModel.HName;
+ }
+ else
+ {
+ txtHUnitNumber.Text = "";
+ txtHUnitName.Text = "";
+ }
+ }
+
+ private void txtHUnitNumber_TextChanged(object sender, EventArgs e)
+ {
+ if (txtHUnitNumber.Text.Trim() == "")
+ {
+ this.txtHUnitNumber.Tag = "0";
+ this.txtHUnitName.Text = "";
+ }
+ }
+ #endregion
+
+ #endregion
}
}
\ No newline at end of file
diff --git "a/SCM/\345\237\272\347\241\200\350\265\204\346\226\231/\351\225\277\345\237\216\347\263\273\345\210\227\344\272\247\345\223\201/Gy_Material_ChangCheng.designer.cs" "b/SCM/\345\237\272\347\241\200\350\265\204\346\226\231/\351\225\277\345\237\216\347\263\273\345\210\227\344\272\247\345\223\201/Gy_Material_ChangCheng.designer.cs"
index 6a83a74..5cd8cca 100644
--- "a/SCM/\345\237\272\347\241\200\350\265\204\346\226\231/\351\225\277\345\237\216\347\263\273\345\210\227\344\272\247\345\223\201/Gy_Material_ChangCheng.designer.cs"
+++ "b/SCM/\345\237\272\347\241\200\350\265\204\346\226\231/\351\225\277\345\237\216\347\263\273\345\210\227\344\272\247\345\223\201/Gy_Material_ChangCheng.designer.cs"
@@ -50,6 +50,20 @@
this.tabPage1 = new System.Windows.Forms.TabPage();
this.grdMain = new System.Windows.Forms.DataGridView();
this.tabPage2 = new System.Windows.Forms.TabPage();
+ this.txtHUnitName = new System.Windows.Forms.TextBox();
+ this.label9 = new System.Windows.Forms.Label();
+ this.txtHUnitNumber = new System.Windows.Forms.TextBox();
+ this.cmdHUnitID = new System.Windows.Forms.Button();
+ this.label8 = new System.Windows.Forms.Label();
+ this.txtHMaterModel = new System.Windows.Forms.TextBox();
+ this.label7 = new System.Windows.Forms.Label();
+ this.txtHMaterName = new System.Windows.Forms.TextBox();
+ this.label5 = new System.Windows.Forms.Label();
+ this.txtHMaterNumber = new System.Windows.Forms.TextBox();
+ this.cmdHMaterID = new System.Windows.Forms.Button();
+ this.label6 = new System.Windows.Forms.Label();
+ this.label3 = new System.Windows.Forms.Label();
+ this.txtHSupplierNumber = new System.Windows.Forms.TextBox();
this.txtHName = new System.Windows.Forms.TextBox();
this.label4 = new System.Windows.Forms.Label();
this.cmdCancel = new System.Windows.Forms.Button();
@@ -59,8 +73,6 @@
this.txtHNumber = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
this.timer1 = new System.Windows.Forms.Timer(this.components);
- this.label3 = new System.Windows.Forms.Label();
- this.txtHSupplierNumber = new System.Windows.Forms.TextBox();
this.ToolBar.SuspendLayout();
this.stTab.SuspendLayout();
this.tabPage1.SuspendLayout();
@@ -293,6 +305,18 @@
//
this.tabPage2.BackColor = System.Drawing.SystemColors.Control;
this.tabPage2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.tabPage2.Controls.Add(this.txtHUnitName);
+ this.tabPage2.Controls.Add(this.label9);
+ this.tabPage2.Controls.Add(this.txtHUnitNumber);
+ this.tabPage2.Controls.Add(this.cmdHUnitID);
+ this.tabPage2.Controls.Add(this.label8);
+ this.tabPage2.Controls.Add(this.txtHMaterModel);
+ this.tabPage2.Controls.Add(this.label7);
+ this.tabPage2.Controls.Add(this.txtHMaterName);
+ this.tabPage2.Controls.Add(this.label5);
+ this.tabPage2.Controls.Add(this.txtHMaterNumber);
+ this.tabPage2.Controls.Add(this.cmdHMaterID);
+ this.tabPage2.Controls.Add(this.label6);
this.tabPage2.Controls.Add(this.label3);
this.tabPage2.Controls.Add(this.txtHSupplierNumber);
this.tabPage2.Controls.Add(this.txtHName);
@@ -310,10 +334,144 @@
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "鍗曞紶瑙嗗浘";
//
+ // txtHUnitName
+ //
+ this.txtHUnitName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHUnitName.Location = new System.Drawing.Point(356, 138);
+ this.txtHUnitName.Name = "txtHUnitName";
+ this.txtHUnitName.Size = new System.Drawing.Size(166, 21);
+ this.txtHUnitName.TabIndex = 118;
+ //
+ // label9
+ //
+ this.label9.AutoSize = true;
+ this.label9.ForeColor = System.Drawing.Color.Black;
+ this.label9.Location = new System.Drawing.Point(278, 142);
+ this.label9.Name = "label9";
+ this.label9.Size = new System.Drawing.Size(77, 12);
+ this.label9.TabIndex = 117;
+ this.label9.Text = "璁¢噺鍗曚綅鍚嶇О";
+ //
+ // txtHUnitNumber
+ //
+ this.txtHUnitNumber.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHUnitNumber.Location = new System.Drawing.Point(88, 138);
+ this.txtHUnitNumber.Name = "txtHUnitNumber";
+ this.txtHUnitNumber.Size = new System.Drawing.Size(166, 21);
+ this.txtHUnitNumber.TabIndex = 116;
+ this.txtHUnitNumber.TextChanged += new System.EventHandler(this.txtHUnitNumber_TextChanged);
+ //
+ // cmdHUnitID
+ //
+ this.cmdHUnitID.BackColor = System.Drawing.Color.Transparent;
+ this.cmdHUnitID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHUnitID.Image")));
+ this.cmdHUnitID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
+ this.cmdHUnitID.Location = new System.Drawing.Point(253, 137);
+ this.cmdHUnitID.Name = "cmdHUnitID";
+ this.cmdHUnitID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHUnitID.TabIndex = 115;
+ this.cmdHUnitID.UseVisualStyleBackColor = false;
+ this.cmdHUnitID.Click += new System.EventHandler(this.cmdHUnitID_Click);
+ //
+ // label8
+ //
+ this.label8.AutoSize = true;
+ this.label8.ForeColor = System.Drawing.Color.Black;
+ this.label8.Location = new System.Drawing.Point(9, 142);
+ this.label8.Name = "label8";
+ this.label8.Size = new System.Drawing.Size(77, 12);
+ this.label8.TabIndex = 114;
+ this.label8.Text = "璁¢噺鍗曚綅浠g爜";
+ //
+ // txtHMaterModel
+ //
+ this.txtHMaterModel.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHMaterModel.Location = new System.Drawing.Point(621, 101);
+ this.txtHMaterModel.Name = "txtHMaterModel";
+ this.txtHMaterModel.Size = new System.Drawing.Size(166, 21);
+ this.txtHMaterModel.TabIndex = 113;
+ //
+ // label7
+ //
+ this.label7.AutoSize = true;
+ this.label7.ForeColor = System.Drawing.Color.Black;
+ this.label7.Location = new System.Drawing.Point(565, 105);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(53, 12);
+ this.label7.TabIndex = 112;
+ this.label7.Text = "瑙勬牸鍨嬪彿";
+ //
+ // txtHMaterName
+ //
+ this.txtHMaterName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHMaterName.Location = new System.Drawing.Point(356, 101);
+ this.txtHMaterName.Name = "txtHMaterName";
+ this.txtHMaterName.Size = new System.Drawing.Size(166, 21);
+ this.txtHMaterName.TabIndex = 111;
+ //
+ // label5
+ //
+ this.label5.AutoSize = true;
+ this.label5.ForeColor = System.Drawing.Color.Black;
+ this.label5.Location = new System.Drawing.Point(302, 105);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(53, 12);
+ this.label5.TabIndex = 110;
+ this.label5.Text = "鐗╂枡鍚嶇О";
+ //
+ // txtHMaterNumber
+ //
+ this.txtHMaterNumber.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHMaterNumber.Location = new System.Drawing.Point(88, 101);
+ this.txtHMaterNumber.Name = "txtHMaterNumber";
+ this.txtHMaterNumber.Size = new System.Drawing.Size(166, 21);
+ this.txtHMaterNumber.TabIndex = 109;
+ this.txtHMaterNumber.TextChanged += new System.EventHandler(this.txtHMaterNumber_TextChanged);
+ //
+ // cmdHMaterID
+ //
+ this.cmdHMaterID.BackColor = System.Drawing.Color.Transparent;
+ this.cmdHMaterID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHMaterID.Image")));
+ this.cmdHMaterID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
+ this.cmdHMaterID.Location = new System.Drawing.Point(253, 100);
+ this.cmdHMaterID.Name = "cmdHMaterID";
+ this.cmdHMaterID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHMaterID.TabIndex = 108;
+ this.cmdHMaterID.UseVisualStyleBackColor = false;
+ this.cmdHMaterID.Click += new System.EventHandler(this.cmdHMaterID_Click);
+ //
+ // label6
+ //
+ this.label6.AutoSize = true;
+ this.label6.ForeColor = System.Drawing.Color.Black;
+ this.label6.Location = new System.Drawing.Point(33, 105);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(53, 12);
+ this.label6.TabIndex = 106;
+ this.label6.Text = "鐗╂枡浠g爜";
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.ForeColor = System.Drawing.Color.Red;
+ this.label3.Location = new System.Drawing.Point(296, 68);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(59, 12);
+ this.label3.TabIndex = 20;
+ this.label3.Text = "鍏徃缂栫爜*";
+ //
+ // txtHSupplierNumber
+ //
+ this.txtHSupplierNumber.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHSupplierNumber.Location = new System.Drawing.Point(356, 64);
+ this.txtHSupplierNumber.Name = "txtHSupplierNumber";
+ this.txtHSupplierNumber.Size = new System.Drawing.Size(166, 21);
+ this.txtHSupplierNumber.TabIndex = 19;
+ //
// txtHName
//
this.txtHName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHName.Location = new System.Drawing.Point(88, 55);
+ this.txtHName.Location = new System.Drawing.Point(356, 27);
this.txtHName.Name = "txtHName";
this.txtHName.Size = new System.Drawing.Size(166, 21);
this.txtHName.TabIndex = 18;
@@ -321,15 +479,16 @@
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(29, 88);
+ this.label4.ForeColor = System.Drawing.Color.Red;
+ this.label4.Location = new System.Drawing.Point(27, 68);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(53, 12);
+ this.label4.Size = new System.Drawing.Size(59, 12);
this.label4.TabIndex = 17;
- this.label4.Text = "浜у搧绠�鐮�";
+ this.label4.Text = "浜у搧绠�鐮�*";
//
// cmdCancel
//
- this.cmdCancel.Location = new System.Drawing.Point(202, 151);
+ this.cmdCancel.Location = new System.Drawing.Point(470, 210);
this.cmdCancel.Name = "cmdCancel";
this.cmdCancel.Size = new System.Drawing.Size(52, 23);
this.cmdCancel.TabIndex = 16;
@@ -339,7 +498,7 @@
//
// cmdOK
//
- this.cmdOK.Location = new System.Drawing.Point(144, 151);
+ this.cmdOK.Location = new System.Drawing.Point(412, 210);
this.cmdOK.Name = "cmdOK";
this.cmdOK.Size = new System.Drawing.Size(52, 23);
this.cmdOK.TabIndex = 15;
@@ -350,7 +509,7 @@
// txtHModel
//
this.txtHModel.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHModel.Location = new System.Drawing.Point(88, 84);
+ this.txtHModel.Location = new System.Drawing.Point(88, 64);
this.txtHModel.Name = "txtHModel";
this.txtHModel.Size = new System.Drawing.Size(166, 21);
this.txtHModel.TabIndex = 3;
@@ -358,16 +517,17 @@
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(29, 59);
+ this.label2.ForeColor = System.Drawing.Color.Red;
+ this.label2.Location = new System.Drawing.Point(296, 31);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(53, 12);
+ this.label2.Size = new System.Drawing.Size(59, 12);
this.label2.TabIndex = 2;
- this.label2.Text = "浜у搧鍚嶇О";
+ this.label2.Text = "浜у搧鍚嶇О*";
//
// txtHNumber
//
this.txtHNumber.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHNumber.Location = new System.Drawing.Point(88, 26);
+ this.txtHNumber.Location = new System.Drawing.Point(88, 27);
this.txtHNumber.Name = "txtHNumber";
this.txtHNumber.Size = new System.Drawing.Size(166, 21);
this.txtHNumber.TabIndex = 1;
@@ -375,33 +535,17 @@
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(29, 30);
+ this.label1.ForeColor = System.Drawing.Color.Red;
+ this.label1.Location = new System.Drawing.Point(27, 31);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(53, 12);
+ this.label1.Size = new System.Drawing.Size(59, 12);
this.label1.TabIndex = 0;
- this.label1.Text = "浜у搧浠g爜";
+ this.label1.Text = "浜у搧浠g爜*";
//
// timer1
//
this.timer1.Enabled = true;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
- //
- // label3
- //
- this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(29, 117);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(53, 12);
- this.label3.TabIndex = 20;
- this.label3.Text = "鍏徃缂栫爜";
- //
- // txtHSupplierNumber
- //
- this.txtHSupplierNumber.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSupplierNumber.Location = new System.Drawing.Point(88, 113);
- this.txtHSupplierNumber.Name = "txtHSupplierNumber";
- this.txtHSupplierNumber.Size = new System.Drawing.Size(166, 21);
- this.txtHSupplierNumber.TabIndex = 19;
//
// Gy_Material_ChangCheng
//
@@ -459,5 +603,17 @@
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.TextBox txtHSupplierNumber;
+ private System.Windows.Forms.TextBox txtHMaterNumber;
+ private System.Windows.Forms.Button cmdHMaterID;
+ private System.Windows.Forms.Label label6;
+ private System.Windows.Forms.TextBox txtHUnitName;
+ private System.Windows.Forms.Label label9;
+ private System.Windows.Forms.TextBox txtHUnitNumber;
+ private System.Windows.Forms.Button cmdHUnitID;
+ private System.Windows.Forms.Label label8;
+ private System.Windows.Forms.TextBox txtHMaterModel;
+ private System.Windows.Forms.Label label7;
+ private System.Windows.Forms.TextBox txtHMaterName;
+ private System.Windows.Forms.Label label5;
}
}
\ No newline at end of file
diff --git "a/SCM/\345\237\272\347\241\200\350\265\204\346\226\231/\351\225\277\345\237\216\347\263\273\345\210\227\344\272\247\345\223\201/Gy_Material_ChangCheng.resx" "b/SCM/\345\237\272\347\241\200\350\265\204\346\226\231/\351\225\277\345\237\216\347\263\273\345\210\227\344\272\247\345\223\201/Gy_Material_ChangCheng.resx"
index c8bcf7b..8d6ab47 100644
--- "a/SCM/\345\237\272\347\241\200\350\265\204\346\226\231/\351\225\277\345\237\216\347\263\273\345\210\227\344\272\247\345\223\201/Gy_Material_ChangCheng.resx"
+++ "b/SCM/\345\237\272\347\241\200\350\265\204\346\226\231/\351\225\277\345\237\216\347\263\273\345\210\227\344\272\247\345\223\201/Gy_Material_ChangCheng.resx"
@@ -364,51 +364,81 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACE
- CgAAAk1TRnQBSQFMAgEBAgEAATQBAQE0AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+ CgAAAk1TRnQBSQFMAgEBAgEAATwBAQE8AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
AwABEAMAAQEBAAEgBgABEBIAgP+AAAj/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
AwAB/wMAAf8DAAH/AwAB/wMADf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
- AwAB/wMAAf8DAAH/gAAE/wEAAUABigH/AQsBkAG5Af8BCwGQAbkB/wELAZABuQH/AQsBkAG5Af8BCwGQ
- AbkB/wELAZABuQH/AQsBkAG5Af8BCwGQAbkB/wELAZABuQH/AQsBkAG5Af8BCwGQAbkB/wELAZABuQH/
- AQsBkAG5Af8DAAn/AQABQAGKAf8BAAFAAYoB/wEAAUABigH/AQABQAGKAf8BAAFAAYoB/wEAAUABigH/
- AQABQAGKAf8BAAFAAYoB/wEAAUABigH/AQABQAGKAf8BAAFAAYoB/wEAAUABigH/AwAB/wMAAf+AAAT/
- AQABQAGKAf8B0QH2Av8BUgHaAfQB/wFHAdMB8QH/ATwBywHvAf8BMgHEAe0B/wEoAb4B6wH/AR4BuAHo
- Af8BEgGwAecB/wEIAakB5AH/AQABowHiAf8BAAGeAeAB/wEAAZoB3wH/AQsBkAG5Af8DAAn/AQABQAGK
- Af8B0QH2Av8BJwG+AesB/wEhAbkB6QH/ARkBtAHnAf8BEQGwAeYB/wEKAasB5AH/AQMBpwHjAf8BAAGi
- AeEB/wEAAZ8B4QH/AQsBkAG5Af8BAAFAAYoB/wMAAf8DAAH/gAAE/wEAAUABigH/AdEB9gL/AVgB3gH1
- Af8BTQHWAfMB/wFDAdAB8QH/ATgByQHuAf8BLgHCAewB/wEjAbwB6gH/ARkBtAHnAf8BDgGtAeUB/wEE
- AaYB4wH/AQABoQHhAf8BAAGdAeAB/wELAZABuQH/AwAF/wEAAUABigH/AdEB9gL/ATIBxQHuAf8BLAHB
- AesB/wElAbwB6wH/AR0BtwHoAf8BFgGyAecB/wEOAa4B5QH/AQcBqQHkAf8BAAGlAeIB/wEAAaEB4QH/
- AQsBkAG5Af8DAAH/AQABQAGKAf8DAAH/gAAE/wEAAUABigH/AdEB9gL/AYEB4QH3Af8BVAHaAfQB/wFJ
- AdQB8gH/AT4BzAHvAf8BNAHGAe4B/wEqAcAB6wH/AR8BuQHpAf8BFQGyAeYB/wEKAasB5QH/AQABpQHi
- Af8BAAGfAeEB/wELAZABuQH/AwAF/wEAAUABigH/AdEB9gL/ATcByAHuAf8BMAHEAewB/wEpAb8B6wH/
- ASIBuwHqAf8BGwG2AegB/wETAbAB5wH/AQwBrAHlAf8BBQGnAeMB/wEAAaMB4gH/AQABQAGKAf8DAAH/
- AQABQAGKAf8DAAH/gAAE/wEAAUABigH/AdEB9gL/AYYB5QH3Af8BWgHfAfUB/wFPAdgB8wH/AUUB0QHx
- Af8BOgHKAe8B/wEwAcQB7QH/ASYBvQHqAf8BGwG2AegB/wEQAa8B5QH/AQUBqAHjAf8BAAGiAeEB/wEL
- AZABuQH/AwAB/wEAAUABigH/AdEB9gL/AUMBzwHxAf8BPAHLAe8B/wE0AccB7gH/AS4BwgHsAf8BJwG9
- AeoB/wEfAbkB6QH/ARgBtAHnAf8BEQGwAeYB/wEJAaoB5QH/AQsBkAG5Af8DAAH/AQsBkAG5Af8BCwGQ
- AbkB/wMAAf+AAAT/AQABQAGKAf8B0QH2Av8BjAHoAfkB/wGDAeIB9wH/AVYB3AH1Af8BTAHVAfIB/wFA
- Ac4B8AH/ATYByAHuAf8BLAHBAewB/wEiAboB6gH/ARYBswHnAf8BDAGsAeUB/wECAaYB4wH/AQsBkAG5
- Af8DAAH/AQABQAGKAf8B0QH2Av8BSAHTAfIB/wFAAc4B8AH/ATkBygHuAf8BMgHFAe0B/wEsAcEB6wH/
- ASQBvAHqAf8BHQG3AegB/wEVAbIB5gH/AQ4BrgHlAf8BCwGQAbkB/wMAAf8BCwGQAbkB/wELAZABuQH/
- AwAB/4AABP8BAAFAAYoB/wHRAfYC/wGQAesB+QH/AYgB5gH4Af8BXAHgAfYB/wFSAdkB8wH/AUcB0wHy
- Af8BPAHLAe8B/wEyAcUB7QH/ASgBvgHrAf8BHgG4AekB/wESAbAB5gH/AQcBqQHkAf8BCwGQAbkB/wMA
- Af8BAAFAAYoB/wEAAUABigH/AQABQAGKAf8BAAFAAYoB/wEAAUABigH/AQABQAGKAf8BAAFAAYoB/wEA
- AUABigH/AQABQAGKAf8BAAFAAYoB/wEAAUABigH/AQABQAGKAf8BCwGQAbkB/wE5AckB7gH/AQsBkAG5
- Af8DAAH/gAAE/wEAAUABigH/AdEB9gL/AZMB7QH6Af8BjQHpAfkB/wGFAeQB9wH/AVkB3gH1Af8BTQHW
- AfMB/wFDAc8B8QH/ATgByQHvAf8BLgHCAewB/wEkAbsB6QH/ARkBtQHnAf8BDgGtAeYB/wELAZABuQH/
- AwAF/wEAAUABigH/AdEB9gL/AZEB7AH6Af8BjQHpAfkB/wGKAecB+AH/AYYB5AH4Af8BgQHhAfcB/wFZ
- Ad0B9QH/AVMB2gHzAf8BTQHXAfMB/wFIAdMB8QH/AUIBzwHxAf8BPAHLAe8B/wELAZABuQH/AwAB/4AA
- BP8BAAFAAYoB/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHR
- AfYC/wHRAfYC/wHRAfYC/wHRAfYC/wELAZABuQH/AwAF/wEAAUABigH/AdEB9gL/AZMB7QH6Af8BkAHr
- AfkB/wGMAekB+QH/AYgB5gH4Af8BhAHjAfcB/wFcAeAB9gH/AVcB3AH1Af8B0QH2Av8B0QH2Av8B0QH2
- Av8B0QH2Av8BCwGQAbkB/wMAAf+AAAT/AQABQAGKAf8BHgGoAdMB/wEeAagB0wH/AR4BqAHTAf8BHgGo
- AdMB/wEeAagB0wH/AR4BqAHTAf8BHgGoAdMB/wEAAUABigH/AQABQAGKAf8BAAFAAYoB/wEAAUABigH/
- AQABQAGKAf8BAAFAAYoJ/wEAAUABigH/AdEB9gL/AZMB7QH6Af8BkgHsAfoB/wGPAesB+QH/AYsB6AH4
- Af8BhwHlAfcB/wHRAfYC/wEAAUABigH/AQABQAGKAf8BAAFAAYoB/wEAAUABigH/AQABQAGKAf8BAAFA
- AYoF/4AACP8BAAFAAYoB/wG4AegB9QH/Ac4D/wHOA/8BnAP/AZwD/wEAAUABigH/AwAh/wEAAUABigH/
- AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AQABQAGKHf+AAAz/AQABQAGKAf8BAAFAAYoB/wEA
- AUABigH/AQABQAGKAf8BAAFAAYoB/wMAKf8BAAFAAYoB/wEAAUABigH/AQABQAGKAf8BAAFAAYoB/wEA
- AUABiiH/gACA/4AAgP+AAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/gQAL
+ AwAB/wMAAf8DAAH/gAAE/wEAAT8BigH/AQoBkAG5Af8BCgGQAbkB/wEKAZABuQH/AQoBkAG5Af8BCgGQ
+ AbkB/wEKAZABuQH/AQoBkAG5Af8BCgGQAbkB/wEKAZABuQH/AQoBkAG5Af8BCgGQAbkB/wEKAZABuQH/
+ AQoBkAG5Af8DAAn/AQABPwGKAf8BAAE/AYoB/wEAAT8BigH/AQABPwGKAf8BAAE/AYoB/wEAAT8BigH/
+ AQABPwGKAf8BAAE/AYoB/wEAAT8BigH/AQABPwGKAf8BAAE/AYoB/wEAAT8BigH/AwAB/wMAAf+AAAT/
+ AQABPwGKAf8B0QH2Av8BUQHaAfQB/wFGAdMB8QH/ATsBywHvAf8BMQHEAe0B/wEnAb4B6wH/AR0BuAHo
+ Af8BEQGwAecB/wEHAakB5AH/AQABowHiAf8BAAGeAeAB/wEAAZoB3wH/AQoBkAG5Af8DAAn/AQABPwGK
+ Af8B0QH2Av8BJgG+AesB/wEgAbkB6QH/ARgBtAHnAf8BEAGwAeYB/wEJAasB5AH/AQIBpwHjAf8BAAGi
+ AeEB/wEAAZ8B4QH/AQoBkAG5Af8BAAE/AYoB/wMAAf8DAAH/gAAE/wEAAT8BigH/AdEB9gL/AVcB3gH1
+ Af8BTAHWAfMB/wFCAdAB8QH/ATcByQHuAf8BLQHCAewB/wEiAbwB6gH/ARgBtAHnAf8BDQGtAeUB/wED
+ AaYB4wH/AQABoQHhAf8BAAGdAeAB/wEKAZABuQH/AwAF/wEAAT8BigH/AdEB9gL/ATEBxQHuAf8BKwHB
+ AesB/wEkAbwB6wH/ARwBtwHoAf8BFQGyAecB/wENAa4B5QH/AQYBqQHkAf8BAAGlAeIB/wEAAaEB4QH/
+ AQoBkAG5Af8DAAH/AQABPwGKAf8DAAH/gAAE/wEAAT8BigH/AdEB9gL/AYEB4QH3Af8BUwHaAfQB/wFI
+ AdQB8gH/AT0BzAHvAf8BMwHGAe4B/wEpAcAB6wH/AR4BuQHpAf8BFAGyAeYB/wEJAasB5QH/AQABpQHi
+ Af8BAAGfAeEB/wEKAZABuQH/AwAF/wEAAT8BigH/AdEB9gL/ATYByAHuAf8BLwHEAewB/wEoAb8B6wH/
+ ASEBuwHqAf8BGgG2AegB/wESAbAB5wH/AQsBrAHlAf8BBAGnAeMB/wEAAaMB4gH/AQABPwGKAf8DAAH/
+ AQABPwGKAf8DAAH/gAAE/wEAAT8BigH/AdEB9gL/AYYB5QH3Af8BWQHfAfUB/wFOAdgB8wH/AUQB0QHx
+ Af8BOQHKAe8B/wEvAcQB7QH/ASUBvQHqAf8BGgG2AegB/wEPAa8B5QH/AQQBqAHjAf8BAAGiAeEB/wEK
+ AZABuQH/AwAB/wEAAT8BigH/AdEB9gL/AUIBzwHxAf8BOwHLAe8B/wEzAccB7gH/AS0BwgHsAf8BJgG9
+ AeoB/wEeAbkB6QH/ARcBtAHnAf8BEAGwAeYB/wEIAaoB5QH/AQoBkAG5Af8DAAH/AQoBkAG5Af8BCgGQ
+ AbkB/wMAAf+AAAT/AQABPwGKAf8B0QH2Av8BjAHoAfkB/wGDAeIB9wH/AVUB3AH1Af8BSwHVAfIB/wE/
+ Ac4B8AH/ATUByAHuAf8BKwHBAewB/wEhAboB6gH/ARUBswHnAf8BCwGsAeUB/wEBAaYB4wH/AQoBkAG5
+ Af8DAAH/AQABPwGKAf8B0QH2Av8BRwHTAfIB/wE/Ac4B8AH/ATgBygHuAf8BMQHFAe0B/wErAcEB6wH/
+ ASMBvAHqAf8BHAG3AegB/wEUAbIB5gH/AQ0BrgHlAf8BCgGQAbkB/wMAAf8BCgGQAbkB/wEKAZABuQH/
+ AwAB/4AABP8BAAE/AYoB/wHRAfYC/wGQAesB+QH/AYgB5gH4Af8BWwHgAfYB/wFRAdkB8wH/AUYB0wHy
+ Af8BOwHLAe8B/wExAcUB7QH/AScBvgHrAf8BHQG4AekB/wERAbAB5gH/AQYBqQHkAf8BCgGQAbkB/wMA
+ Af8BAAE/AYoB/wEAAT8BigH/AQABPwGKAf8BAAE/AYoB/wEAAT8BigH/AQABPwGKAf8BAAE/AYoB/wEA
+ AT8BigH/AQABPwGKAf8BAAE/AYoB/wEAAT8BigH/AQABPwGKAf8BCgGQAbkB/wE4AckB7gH/AQoBkAG5
+ Af8DAAH/gAAE/wEAAT8BigH/AdEB9gL/AZMB7QH6Af8BjQHpAfkB/wGFAeQB9wH/AVgB3gH1Af8BTAHW
+ AfMB/wFCAc8B8QH/ATcByQHvAf8BLQHCAewB/wEjAbsB6QH/ARgBtQHnAf8BDQGtAeYB/wEKAZABuQH/
+ AwAF/wEAAT8BigH/AdEB9gL/AZEB7AH6Af8BjQHpAfkB/wGKAecB+AH/AYYB5AH4Af8BgQHhAfcB/wFY
+ Ad0B9QH/AVIB2gHzAf8BTAHXAfMB/wFHAdMB8QH/AUEBzwHxAf8BOwHLAe8B/wEKAZABuQH/AwAB/4AA
+ BP8BAAE/AYoB/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHR
+ AfYC/wHRAfYC/wHRAfYC/wHRAfYC/wEKAZABuQH/AwAF/wEAAT8BigH/AdEB9gL/AZMB7QH6Af8BkAHr
+ AfkB/wGMAekB+QH/AYgB5gH4Af8BhAHjAfcB/wFbAeAB9gH/AVYB3AH1Af8B0QH2Av8B0QH2Av8B0QH2
+ Av8B0QH2Av8BCgGQAbkB/wMAAf+AAAT/AQABPwGKAf8BHQGoAdMB/wEdAagB0wH/AR0BqAHTAf8BHQGo
+ AdMB/wEdAagB0wH/AR0BqAHTAf8BHQGoAdMB/wEAAT8BigH/AQABPwGKAf8BAAE/AYoB/wEAAT8BigH/
+ AQABPwGKAf8BAAE/AYoJ/wEAAT8BigH/AdEB9gL/AZMB7QH6Af8BkgHsAfoB/wGPAesB+QH/AYsB6AH4
+ Af8BhwHlAfcB/wHRAfYC/wEAAT8BigH/AQABPwGKAf8BAAE/AYoB/wEAAT8BigH/AQABPwGKAf8BAAE/
+ AYoF/4AACP8BAAE/AYoB/wG4AegB9QH/Ac4D/wHOA/8BnAP/AZwD/wEAAT8BigH/AwAh/wEAAT8BigH/
+ AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AQABPwGKHf+AAAz/AQABPwGKAf8BAAE/AYoB/wEA
+ AT8BigH/AQABPwGKAf8BAAE/AYoB/wMAKf8BAAE/AYoB/wEAAT8BigH/AQABPwGKAf8BAAE/AYoB/wEA
+ AT8BiiH/gACA/4AAgP+AAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/gQAL
+</value>
+ </data>
+ <data name="cmdHUnitID.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ R0lGODlhEAAQAIZBAAAzmQBmzP///1o7AJlmAOazAMTz/9mmAEW5//nNT+W5ToPV/5TW/cyZAAyf/7Dp
+ /yOn/2jD/q3h/le8/sz3/5zg/7bt/73l/7Xs/2fH/4DT///bnZXb/97//2rK/wWb/8np/6zf/1S//77x
+ /73w/8Xv/1+//wmc/1jA/5Db/5LV/6rn/6Xb/zCt/33O/9X3/4LO/7jj/4PT/x+m/7nk/3XP/3PJ/3bQ
+ /6Tb/5Td/zCv/3fM/029/4za/6Pf/ZHc/6Pk/////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
+ AABBACwAAAAAEAAQAAAIqACDCBwoMIDBAAQTBjEYIcKECQYVLmQQ44KJFhBmQECYMAAOEAJYnPjgwAHH
+ gQEYqAhBA4YOBDwQIDg5cYcLGyg8LOixYAFNABJkZBBRI8cDEg98ACAIlIOGGylWGOhgwMBSphUq/ACC
+ wQAFClcFEiAAQICAEhZGvDAbloCCDQUAlDUrQO5AtwkKHBgQRK7duwryHmjAV2IQAoIJGxY4QK/ixYwH
+ FIYcEAA7
+</value>
+ </data>
+ <data name="cmdHMaterID.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ R0lGODlhEAAQAIZBAAAzmQBmzP///1o7AJlmAOazAMTz/9mmAEW5//nNT+W5ToPV/5TW/cyZAAyf/7Dp
+ /yOn/2jD/q3h/le8/sz3/5zg/7bt/73l/7Xs/2fH/4DT///bnZXb/97//2rK/wWb/8np/6zf/1S//77x
+ /73w/8Xv/1+//wmc/1jA/5Db/5LV/6rn/6Xb/zCt/33O/9X3/4LO/7jj/4PT/x+m/7nk/3XP/3PJ/3bQ
+ /6Tb/5Td/zCv/3fM/029/4za/6Pf/ZHc/6Pk/////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
+ AABBACwAAAAAEAAQAAAIqACDCBwoMIDBAAQTBjEYIcKECQYVLmQQ44KJFhBmQECYMAAOEAJYnPjgwAHH
+ gQEYqAhBA4YOBDwQIDg5cYcLGyg8LOixYAFNABJkZBBRI8cDEg98ACAIlIOGGylWGOhgwMBSphUq/ACC
+ wQAFClcFEiAAQICAEhZGvDAbloCCDQUAlDUrQO5AtwkKHBgQRK7duwryHmjAV2IQAoIJGxY4QK/ixYwH
+ FIYcEAA7
</value>
</data>
<metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
diff --git "a/SCM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_ChangCheng.cs" "b/SCM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_ChangCheng.cs"
index 4e1dac8..f9ee7ed 100644
--- "a/SCM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_ChangCheng.cs"
+++ "b/SCM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_ChangCheng.cs"
@@ -26,7 +26,14 @@
public const Int16 HMaterModelCol = 5;
public const Int16 HSupplierNumberCol = 6;
public const Int16 HQtyCol = 7;
- public const Int16 HRemarkCol = 8;
+ public const Int16 HMaterID2Col = 8;
+ public const Int16 HMaterNumber2Col = 9;
+ public const Int16 HMaterName2Col = 10;
+ public const Int16 HMaterModel2Col = 11;
+ public const Int16 HUnitIDCol = 12;
+ public const Int16 HUnitNumberCol = 13;
+ public const Int16 HUnitNameCol = 14;
+ public const Int16 HRemarkCol = 15;
//
public string ModName = "86";
public string ModCaption = "瀹㈡埛鏉$爜鐢熸垚";
@@ -400,6 +407,13 @@
Int64 HBarcodeQtys = 0; //鎬绘墭鏁�
Int64 HBarcodeNo = 0; //褰撳墠鎵樺彿
Int64 HQty = 0; //鏁伴噺
+ Int64 HMaterID2 = 0; //鐗╂枡ID
+ string HMaterNumber2 = ""; //鐗╂枡浠g爜
+ string HMaterName2 = ""; //鐗╂枡鍚嶇О
+ string HMaterModel2 = ""; //瑙勬牸鍨嬪彿
+ Int64 HUnitID = 0; //璁¢噺鍗曚綅ID
+ string HUnitNumber = ""; //璁¢噺鍗曚綅浠g爜
+ string HUnitName = ""; //璁¢噺鍗曚綅鍚嶇О
string HRemark = ""; //澶囨敞
Int64 HPrintQty = 0; //鎵撳嵃娆℃暟
@@ -459,6 +473,13 @@
HMaterName = ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterNameCol].Value);
HBarcodeQtys = HQty;
HBarcodeNo = i + 1;
+ HMaterID2 = ClsPub.isLong(grdMain.Rows[j].Cells[HMaterID2Col].Value);
+ HMaterNumber2 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterNumber2Col].Value);
+ HMaterName2 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterName2Col].Value);
+ HMaterModel2 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterModel2Col].Value);
+ HUnitID = ClsPub.isLong(grdMain.Rows[j].Cells[HUnitIDCol].Value);
+ HUnitNumber = ClsPub.isStrNull(grdMain.Rows[j].Cells[HUnitNumberCol].Value);
+ HUnitName = ClsPub.isStrNull(grdMain.Rows[j].Cells[HUnitNameCol].Value);
HRemark = ClsPub.isStrNull(grdMain.Rows[j].Cells[HRemarkCol].Value);
HPrintQty = 0;
@@ -466,10 +487,14 @@
"(HInterID,HEntryID,HBillType,HBarCode" +
",HMaterID,HMaterNumber,HMaterName,HMaterModel" +
",HBarCodeDate,HBarcodeQtys,HBarcodeNo " +
+ ",HMaterID2,HMaterNumber2,HMaterName2,HMaterModel2" +
+ ",HUnitID,HUnitNumber,HUnitName,HSupplierNumber" +
",HPrintQty,HRemark,HMaker,HMakeDate " +
") values (" + HInterID + "," + HEntryID + ",'" + ModName + "','" + HBarCode + "'"
+ "," + HMaterID.ToString() + ",'" + HMaterNumber + "','" + HMaterName + "','" + HMaterModel + "'"
+ ",'" + sDate + "'," + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString()
+ + "," + HMaterID2.ToString() + ",'" + HMaterNumber2 + "','" + HMaterName2 + "','" + HMaterModel2 + "'"
+ + "," + HUnitID.ToString() + ",'" + HUnitNumber + "','" + HUnitName + "','" + HSupplierNumber + "'"
+ "," + HPrintQty.ToString() + ",'" + HRemark + "','" + ClsPub.CurUserName + "',getdate())";
Application.DoEvents();
pb1.Value = n + 1;
@@ -535,7 +560,7 @@
private void initGrid()
{
grdMain.RowCount = 0;
- grdMain.ColumnCount = 9; //鎬诲垪鏁�
+ grdMain.ColumnCount = 16; //鎬诲垪鏁�
ClsPub1.initGridFst(grdMain, this.Name);
grdMain.Columns[HSnoCol].HeaderText = "搴忓彿";
grdMain.Columns[HMaterIDCol].HeaderText = "浜у搧ID";
@@ -544,11 +569,20 @@
grdMain.Columns[HMaterModelCol].HeaderText = "浜у搧绠�鐮�";
grdMain.Columns[HSupplierNumberCol].HeaderText = "鍏徃缂栫爜";
grdMain.Columns[HQtyCol].HeaderText = "鐢熸垚鏉$爜涓暟";
+ grdMain.Columns[HMaterID2Col].HeaderText = "鐗╂枡ID";
+ grdMain.Columns[HMaterNumber2Col].HeaderText = "鐗╂枡浠g爜";
+ grdMain.Columns[HMaterName2Col].HeaderText = "鐗╂枡鍚嶇О";
+ grdMain.Columns[HMaterModel2Col].HeaderText = "瑙勬牸鍨嬪彿";
+ grdMain.Columns[HUnitIDCol].HeaderText = "璁¢噺鍗曚綅ID";
+ grdMain.Columns[HUnitNumberCol].HeaderText = "璁¢噺鍗曚綅浠g爜";
+ grdMain.Columns[HUnitNameCol].HeaderText = "璁¢噺鍗曚綅鍚嶇О";
grdMain.Columns[HRemarkCol].HeaderText = "澶囨敞";
////
//鏍煎紡鍖� 闅愯棌鍒�
grdMain.Columns[HTagCol].Visible = false;
grdMain.Columns[HMaterIDCol].Visible = false;
+ grdMain.Columns[HMaterID2Col].Visible = false;
+ grdMain.Columns[HUnitIDCol].Visible = false;
//璁剧疆鍙紪杈戝垪
string sAllowCol = HQtyCol.ToString() +
@@ -609,7 +643,7 @@
case HMaterNumberCol:
oMaterial.WherePart = "";
//杩斿洖澶氳璁板綍
- if (oMaterial.RefreshViewMul())
+ if (oMaterial.RefreshViewForBig())
{
int i = 0;
foreach (DBUtility.ClsGy_Base_Model oSub in oMaterial.omodelList)
@@ -624,7 +658,14 @@
grdMain.Rows[sRow + i].Cells[HMaterNumberCol].Value = oMaterial.omodel.HNumber.ToString();
grdMain.Rows[sRow + i].Cells[HMaterNameCol].Value = oMaterial.omodel.HName.ToString();
grdMain.Rows[sRow + i].Cells[HMaterModelCol].Value = oMaterial.omodel.HModel.ToString();
- grdMain.Rows[sRow + i].Cells[HSupplierNumberCol].Value = oMaterial.omodel.HShortNumber.ToString();
+ grdMain.Rows[sRow + i].Cells[HSupplierNumberCol].Value = oMaterial.omodel.HSupplierNumber.ToString();
+ grdMain.Rows[sRow + i].Cells[HMaterID2Col].Value = oMaterial.omodel.HMaterID.ToString();
+ grdMain.Rows[sRow + i].Cells[HMaterNumber2Col].Value = oMaterial.omodel.HMaterNumber.ToString();
+ grdMain.Rows[sRow + i].Cells[HMaterName2Col].Value = oMaterial.omodel.HMaterName.ToString();
+ grdMain.Rows[sRow + i].Cells[HMaterModel2Col].Value = oMaterial.omodel.HMaterModel.ToString();
+ grdMain.Rows[sRow + i].Cells[HUnitIDCol].Value = oMaterial.omodel.HUnitID.ToString();
+ grdMain.Rows[sRow + i].Cells[HUnitNumberCol].Value = oMaterial.omodel.HUnitNumber.ToString();
+ grdMain.Rows[sRow + i].Cells[HUnitNameCol].Value = oMaterial.omodel.HUnitName.ToString();
}
i++;
}
@@ -637,6 +678,13 @@
grdMain.Rows[sRow].Cells[HMaterNameCol].Value = "";
grdMain.Rows[sRow].Cells[HMaterModelCol].Value = "";
grdMain.Rows[sRow].Cells[HSupplierNumberCol].Value = "";
+ grdMain.Rows[sRow].Cells[HMaterID2Col].Value = 0;
+ grdMain.Rows[sRow].Cells[HMaterNumber2Col].Value = "";
+ grdMain.Rows[sRow].Cells[HMaterName2Col].Value = "";
+ grdMain.Rows[sRow].Cells[HMaterModel2Col].Value = "";
+ grdMain.Rows[sRow].Cells[HUnitIDCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HUnitNumberCol].Value = "";
+ grdMain.Rows[sRow].Cells[HUnitNameCol].Value = "";
}
break;
--
Gitblit v1.9.1