From 0a0391a8fe504bc690f94456e9ced8113631a79c Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期一, 04 十一月 2024 11:29:38 +0800
Subject: [PATCH] 长城产品基础资料表增加公司编码字段，新增修改时写入；长城产品客户条码生成时条码前缀中供应商代码由原来固定为AAAQK改为取长城产品基本资料公司编码字段
---
SCM/基础资料/长城系列产品/Gy_Material_ChangCheng.resx | 86 ++++++++++++++--------------
SCM/基础资料/长城系列产品/Gy_Material_ChangCheng.cs | 9 ++
SCM/基础资料/长城系列产品/ClsGy_Material_ChangCheng_Ctl.cs | 5 +
SCM/基础资料/长城系列产品/ClsGy_Material_ChangCheng_View.cs | 1
SCM/条码打印/Gy_BarCodeBill_ChangCheng.cs | 32 ++++++++--
SCM/基础资料/长城系列产品/Gy_Material_ChangCheng.designer.cs | 27 ++++++++
6 files changed, 106 insertions(+), 54 deletions(-)
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 3686870..037778a 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"
@@ -24,8 +24,8 @@
{
oWeb.Url = ClsPub1.WEBSURL;
oWeb.getRunProc("Insert into " + MvarItemKey + " " +
- " (HNumber,HName,HModel,HMakeEmp,HMakeTime) " +
- " Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HModel + "','" + ClsPub.CurUserName + "',getdate())", ref DBUtility.ClsPub.sExeReturnInfo);
+ " (HNumber,HName,HModel,HSupplierNumber,HMakeEmp,HMakeTime) " +
+ " Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HModel + "','" + oModel.HShortNumber + "','" + ClsPub.CurUserName + "',getdate())", ref DBUtility.ClsPub.sExeReturnInfo);
return true;
}
catch (Exception e)
@@ -45,6 +45,7 @@
" HNumber='" + oModel.HNumber + "'" +
",HName='" + oModel.HName + "'" +
",HModel='" + oModel.HModel + "'" +
+ ",HSupplierNumber='" + oModel.HShortNumber + "'" +
",HModifyEmp='" + ClsPub.CurUserName + "'" +
",HModifyTime=getdate()" +
" Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
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 3122cc9..308af9c 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"
@@ -81,6 +81,7 @@
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();
return true;
}
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 cdf1c7d..dc86be9 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,6 +77,7 @@
txtHNumber.Text = oMaterialHlp.omodel.HNumber.ToString();
txtHName.Text = oMaterialHlp.omodel.HName.ToString();
txtHModel.Text = oMaterialHlp.omodel.HModel.ToString();
+ txtHSupplierNumber.Text = oMaterialHlp.omodel.HShortNumber.ToString();
HItemID = oMaterialHlp.omodel.HItemID;
}
}
@@ -280,6 +281,11 @@
MessageBox.Show("浜у搧绠�鐮佷笉鑳戒负绌�!", "鎻愮ず");
return false;
}
+ if (txtHSupplierNumber.Text.Trim() == "")
+ {
+ MessageBox.Show("鍏徃缂栫爜涓嶈兘涓虹┖!", "鎻愮ず");
+ return false;
+ }
return true;
}
@@ -291,10 +297,11 @@
{
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();
return true;
}
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 c95f725..6a83a74 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"
@@ -59,6 +59,8 @@
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();
@@ -291,6 +293,8 @@
//
this.tabPage2.BackColor = System.Drawing.SystemColors.Control;
this.tabPage2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.tabPage2.Controls.Add(this.label3);
+ this.tabPage2.Controls.Add(this.txtHSupplierNumber);
this.tabPage2.Controls.Add(this.txtHName);
this.tabPage2.Controls.Add(this.label4);
this.tabPage2.Controls.Add(this.cmdCancel);
@@ -325,7 +329,7 @@
//
// cmdCancel
//
- this.cmdCancel.Location = new System.Drawing.Point(202, 137);
+ this.cmdCancel.Location = new System.Drawing.Point(202, 151);
this.cmdCancel.Name = "cmdCancel";
this.cmdCancel.Size = new System.Drawing.Size(52, 23);
this.cmdCancel.TabIndex = 16;
@@ -335,7 +339,7 @@
//
// cmdOK
//
- this.cmdOK.Location = new System.Drawing.Point(144, 137);
+ this.cmdOK.Location = new System.Drawing.Point(144, 151);
this.cmdOK.Name = "cmdOK";
this.cmdOK.Size = new System.Drawing.Size(52, 23);
this.cmdOK.TabIndex = 15;
@@ -381,6 +385,23 @@
//
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
//
@@ -436,5 +457,7 @@
private System.Windows.Forms.DataGridView grdMain;
private System.Windows.Forms.TextBox txtHName;
private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.TextBox txtHSupplierNumber;
}
}
\ 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 5ad25eb..c8bcf7b 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,51 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACE
- CgAAAk1TRnQBSQFMAgEBAgEAASwBAQEsAQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+ CgAAAk1TRnQBSQFMAgEBAgEAATQBAQE0AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
AwABEAMAAQEBAAEgBgABEBIAgP+AAAj/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
AwAB/wMAAf8DAAH/AwAB/wMADf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
- AwAB/wMAAf8DAAH/gAAE/wEAAUEBigH/AQwBkAG5Af8BDAGQAbkB/wEMAZABuQH/AQwBkAG5Af8BDAGQ
- AbkB/wEMAZABuQH/AQwBkAG5Af8BDAGQAbkB/wEMAZABuQH/AQwBkAG5Af8BDAGQAbkB/wEMAZABuQH/
- AQwBkAG5Af8DAAn/AQABQQGKAf8BAAFBAYoB/wEAAUEBigH/AQABQQGKAf8BAAFBAYoB/wEAAUEBigH/
- AQABQQGKAf8BAAFBAYoB/wEAAUEBigH/AQABQQGKAf8BAAFBAYoB/wEAAUEBigH/AwAB/wMAAf+AAAT/
- AQABQQGKAf8B0QH2Av8BUwHaAfQB/wFIAdMB8QH/AT0BywHvAf8BMwHEAe0B/wEpAb4B6wH/AR8BuAHo
- Af8BEwGwAecB/wEJAakB5AH/AQABowHiAf8BAAGeAeAB/wEAAZoB3wH/AQwBkAG5Af8DAAn/AQABQQGK
- Af8B0QH2Av8BKAG+AesB/wEiAbkB6QH/ARoBtAHnAf8BEgGwAeYB/wELAasB5AH/AQQBpwHjAf8BAAGi
- AeEB/wEAAZ8B4QH/AQwBkAG5Af8BAAFBAYoB/wMAAf8DAAH/gAAE/wEAAUEBigH/AdEB9gL/AVkB3gH1
- Af8BTgHWAfMB/wFEAdAB8QH/ATkByQHuAf8BLwHCAewB/wEkAbwB6gH/ARoBtAHnAf8BDwGtAeUB/wEF
- AaYB4wH/AQABoQHhAf8BAAGdAeAB/wEMAZABuQH/AwAF/wEAAUEBigH/AdEB9gL/ATMBxQHuAf8BLQHB
- AesB/wEmAbwB6wH/AR4BtwHoAf8BFwGyAecB/wEPAa4B5QH/AQgBqQHkAf8BAQGlAeIB/wEAAaEB4QH/
- AQwBkAG5Af8DAAH/AQABQQGKAf8DAAH/gAAE/wEAAUEBigH/AdEB9gL/AYEB4QH3Af8BVQHaAfQB/wFK
- AdQB8gH/AT8BzAHvAf8BNQHGAe4B/wErAcAB6wH/ASABuQHpAf8BFgGyAeYB/wELAasB5QH/AQEBpQHi
- Af8BAAGfAeEB/wEMAZABuQH/AwAF/wEAAUEBigH/AdEB9gL/ATgByAHuAf8BMQHEAewB/wEqAb8B6wH/
- ASMBuwHqAf8BHAG2AegB/wEUAbAB5wH/AQ0BrAHlAf8BBgGnAeMB/wEAAaMB4gH/AQABQQGKAf8DAAH/
- AQABQQGKAf8DAAH/gAAE/wEAAUEBigH/AdEB9gL/AYYB5QH3Af8BWwHfAfUB/wFQAdgB8wH/AUYB0QHx
- Af8BOwHKAe8B/wExAcQB7QH/AScBvQHqAf8BHAG2AegB/wERAa8B5QH/AQYBqAHjAf8BAAGiAeEB/wEM
- AZABuQH/AwAB/wEAAUEBigH/AdEB9gL/AUQBzwHxAf8BPQHLAe8B/wE1AccB7gH/AS8BwgHsAf8BKAG9
- AeoB/wEgAbkB6QH/ARkBtAHnAf8BEgGwAeYB/wEKAaoB5QH/AQwBkAG5Af8DAAH/AQwBkAG5Af8BDAGQ
- AbkB/wMAAf+AAAT/AQABQQGKAf8B0QH2Av8BjAHoAfkB/wGDAeIB9wH/AVcB3AH1Af8BTQHVAfIB/wFB
- Ac4B8AH/ATcByAHuAf8BLQHBAewB/wEjAboB6gH/ARcBswHnAf8BDQGsAeUB/wEDAaYB4wH/AQwBkAG5
- Af8DAAH/AQABQQGKAf8B0QH2Av8BSQHTAfIB/wFBAc4B8AH/AToBygHuAf8BMwHFAe0B/wEtAcEB6wH/
- ASUBvAHqAf8BHgG3AegB/wEWAbIB5gH/AQ8BrgHlAf8BDAGQAbkB/wMAAf8BDAGQAbkB/wEMAZABuQH/
- AwAB/4AABP8BAAFBAYoB/wHRAfYC/wGQAesB+QH/AYgB5gH4Af8BXQHgAfYB/wFTAdkB8wH/AUgB0wHy
- Af8BPQHLAe8B/wEzAcUB7QH/ASkBvgHrAf8BHwG4AekB/wETAbAB5gH/AQgBqQHkAf8BDAGQAbkB/wMA
- Af8BAAFBAYoB/wEAAUEBigH/AQABQQGKAf8BAAFBAYoB/wEAAUEBigH/AQABQQGKAf8BAAFBAYoB/wEA
- AUEBigH/AQABQQGKAf8BAAFBAYoB/wEAAUEBigH/AQABQQGKAf8BDAGQAbkB/wE6AckB7gH/AQwBkAG5
- Af8DAAH/gAAE/wEAAUEBigH/AdEB9gL/AZMB7QH6Af8BjQHpAfkB/wGFAeQB9wH/AVoB3gH1Af8BTgHW
- AfMB/wFEAc8B8QH/ATkByQHvAf8BLwHCAewB/wElAbsB6QH/ARoBtQHnAf8BDwGtAeYB/wEMAZABuQH/
- AwAF/wEAAUEBigH/AdEB9gL/AZEB7AH6Af8BjQHpAfkB/wGKAecB+AH/AYYB5AH4Af8BgQHhAfcB/wFa
- Ad0B9QH/AVQB2gHzAf8BTgHXAfMB/wFJAdMB8QH/AUMBzwHxAf8BPQHLAe8B/wEMAZABuQH/AwAB/4AA
- BP8BAAFBAYoB/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHR
- AfYC/wHRAfYC/wHRAfYC/wHRAfYC/wEMAZABuQH/AwAF/wEAAUEBigH/AdEB9gL/AZMB7QH6Af8BkAHr
- AfkB/wGMAekB+QH/AYgB5gH4Af8BhAHjAfcB/wFdAeAB9gH/AVgB3AH1Af8B0QH2Av8B0QH2Av8B0QH2
- Av8B0QH2Av8BDAGQAbkB/wMAAf+AAAT/AQABQQGKAf8BHwGoAdMB/wEfAagB0wH/AR8BqAHTAf8BHwGo
- AdMB/wEfAagB0wH/AR8BqAHTAf8BHwGoAdMB/wEAAUEBigH/AQABQQGKAf8BAAFBAYoB/wEAAUEBigH/
- AQABQQGKAf8BAAFBAYoJ/wEAAUEBigH/AdEB9gL/AZMB7QH6Af8BkgHsAfoB/wGPAesB+QH/AYsB6AH4
- Af8BhwHlAfcB/wHRAfYC/wEAAUEBigH/AQABQQGKAf8BAAFBAYoB/wEAAUEBigH/AQABQQGKAf8BAAFB
- AYoF/4AACP8BAAFBAYoB/wG4AegB9QH/Ac4D/wHOA/8BnAP/AZwD/wEAAUEBigH/AwAh/wEAAUEBigH/
- AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AQABQQGKHf+AAAz/AQABQQGKAf8BAAFBAYoB/wEA
- AUEBigH/AQABQQGKAf8BAAFBAYoB/wMAKf8BAAFBAYoB/wEAAUEBigH/AQABQQGKAf8BAAFBAYoB/wEA
- AUEBiiH/gACA/4AAgP+AAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/gQAL
+ 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
</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 43874f6..4e1dac8 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"
@@ -24,8 +24,9 @@
public const Int16 HMaterNumberCol = 3;
public const Int16 HMaterNameCol = 4;
public const Int16 HMaterModelCol = 5;
- public const Int16 HQtyCol = 6;
- public const Int16 HRemarkCol = 7;
+ public const Int16 HSupplierNumberCol = 6;
+ public const Int16 HQtyCol = 7;
+ public const Int16 HRemarkCol = 8;
//
public string ModName = "86";
public string ModCaption = "瀹㈡埛鏉＄爜鐢熸垚";
@@ -338,10 +339,25 @@
long HSno = DBUtility.ClsPub.isLong(grdMain.Rows[j].Cells[HSnoCol].Value); // 搴忓彿
long HMaterID = DBUtility.ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value); // 鐗╂枡鍐呯爜
double HQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[HQtyCol].Value); // 鏁伴噺
+ string HMaterModel = ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterModelCol].Value); // 浜у搧绠�鐮�
+ string HSupplierNumber = ClsPub.isStrNull(grdMain.Rows[j].Cells[HSupplierNumberCol].Value); // 鍏徃缂栫爜
- if (HMaterID != 0 && HQty == 0)
+ if (HMaterID != 0 && (HQty == 0 || HMaterModel == "" || HSupplierNumber == ""))
{
- sHRemark = sHRemark + " 绗�" + HSno + "琛岋紝浜у搧闇�鐢熸垚鏉＄爜鏁伴噺涓� 0锛屼笉鍏佽鐢熸垚鏉＄爜锛�";
+ sHRemark = sHRemark + " 绗�" + HSno + "琛岋紝";
+ if (HQty == 0)
+ {
+ sHRemark = sHRemark + "浜у搧闇�鐢熸垚鏉＄爜鏁伴噺涓� 0锛�";
+ }
+ if (HMaterModel == "")
+ {
+ sHRemark = sHRemark + "浜у搧绠�鐮佷负绌猴紝";
+ }
+ if (HSupplierNumber == "")
+ {
+ sHRemark = sHRemark + "鍏徃缂栫爜涓虹┖锛�";
+ }
+ sHRemark = sHRemark + "涓嶅厑璁哥敓鎴愭潯鐮侊紒";
}
}
if (sHRemark != "")
@@ -373,7 +389,7 @@
DataSet Ds;
pb1.Value = 0;
- string HSupplierNumber = "AAAQK"; //渚涘簲鍟嗕唬鐮�
+ string HSupplierNumber = ""; //渚涘簲鍟嗕唬鐮�
long HSno = 0; //搴忓彿
Int64 HEntryID = 0; //瀛怚D
string HBarCode = ""; //鏉″舰鐮�
@@ -415,6 +431,7 @@
if (ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value) != 0)
{
HMaterModel = ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterModelCol].Value);
+ HSupplierNumber = ClsPub.isStrNull(grdMain.Rows[j].Cells[HSupplierNumberCol].Value);
//鏉＄爜鍓嶇紑 = 浜у搧绠�鐮� + 渚涘簲鍟嗕唬鐮� + 骞� + 鏈� + 鏃�
sTMNumber = HMaterModel + HSupplierNumber + sYear + sPeriod + sDay;
Ds = oWeb.getDataSetBySQL("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo", ref DBUtility.ClsPub.sExeReturnInfo);//鑾峰彇鏈�澶ф祦姘村彿
@@ -518,13 +535,14 @@
private void initGrid()
{
grdMain.RowCount = 0;
- grdMain.ColumnCount = 8; //鎬诲垪鏁�
+ grdMain.ColumnCount = 9; //鎬诲垪鏁�
ClsPub1.initGridFst(grdMain, this.Name);
grdMain.Columns[HSnoCol].HeaderText = "搴忓彿";
grdMain.Columns[HMaterIDCol].HeaderText = "浜у搧ID";
grdMain.Columns[HMaterNumberCol].HeaderText = "浜у搧浠ｇ爜";
grdMain.Columns[HMaterNameCol].HeaderText = "浜у搧鍚嶇О";
grdMain.Columns[HMaterModelCol].HeaderText = "浜у搧绠�鐮�";
+ grdMain.Columns[HSupplierNumberCol].HeaderText = "鍏徃缂栫爜";
grdMain.Columns[HQtyCol].HeaderText = "鐢熸垚鏉＄爜涓暟";
grdMain.Columns[HRemarkCol].HeaderText = "澶囨敞";
////
@@ -606,6 +624,7 @@
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();
}
i++;
}
@@ -617,6 +636,7 @@
grdMain.Rows[sRow].Cells[HMaterNumberCol].Value = "";
grdMain.Rows[sRow].Cells[HMaterNameCol].Value = "";
grdMain.Rows[sRow].Cells[HMaterModelCol].Value = "";
+ grdMain.Rows[sRow].Cells[HSupplierNumberCol].Value = "";
}
break;
--
Gitblit v1.9.1