From 180e5879d508734f1ad395dba7f81e0d59a8627e Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期五, 09 一月 2026 08:38:07 +0800
Subject: [PATCH] 丸井客户条码标签生成模块修改，供应商编码根据物料带出
---
SCM/Gy_BarCodeBill_Cus.cs | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/SCM/Gy_BarCodeBill_Cus.cs b/SCM/Gy_BarCodeBill_Cus.cs
index ca177a5..fab99fd 100644
--- a/SCM/Gy_BarCodeBill_Cus.cs
+++ b/SCM/Gy_BarCodeBill_Cus.cs
@@ -483,8 +483,11 @@
MessageBox.Show(" 绗�" + ClsPub.isLong(grdMain.Rows[j].Cells[HSnoCol].Value) + "琛岋紝鐗╂枡锛�" + ClsPub.isStrNull(grdMain.Rows[j].Cells[HCusModelCol].Value) + " 锛屼腑瀛樺湪鏁伴噺銆佹渶灏忓寘瑁呮暟銆佺鏁颁负 0锛屼笉鍏佽鐢熸垚鏉＄爜锛�");
return false;
}
-
-
+ if (ClsPub.isStrNull(grdMain.Rows[j].Cells[HCusModelCol].Value) != "" && ClsPub.isStrNull(grdMain.Rows[j].Cells[HSupNumberCol].Value) == "")
+ {
+ MessageBox.Show(" 绗�" + ClsPub.isLong(grdMain.Rows[j].Cells[HSnoCol].Value) + "琛岋紝瀹㈡埛闆朵欢鍙凤細" + ClsPub.isStrNull(grdMain.Rows[j].Cells[HCusModelCol].Value) + " 锛屽搴斾緵搴斿晢缂栫爜涓虹┖锛屼笉鍏佽鐢熸垚鏉＄爜锛�");
+ return false;
+ }
}
return true;
@@ -916,18 +919,18 @@
//璁剧疆鍙紪杈戝垪
string sAllowCol;
sAllowCol = HQtyCol.ToString() +
- "," + HCusModelCol.ToString() +
- "," + HMaterIDCol.ToString() +
- "," + HCusModelNameCol.ToString() +
- "," + HWorkLineNameCol.ToString() +
- "," + HSupNumberCol.ToString() +
- "," + HSupNameCol.ToString() +
- "," + HCode1Col.ToString() +
- "," + HCode2Col.ToString() +
- "," + HCode3Col.ToString() +
- "," + HBarCodeDateCol.ToString() +
- "," + HBackDataFlagCol.ToString() +
- "," + HMinQtyCol.ToString();
+ //"," + HCusModelCol.ToString() +
+ //"," + HMinQtyCol.ToString() +
+ //"," + HCusModelNameCol.ToString() +
+ //"," + HWorkLineNameCol.ToString() +
+ //"," + HSupNumberCol.ToString() +
+ //"," + HSupNameCol.ToString() +
+ //"," + HCode1Col.ToString() +
+ //"," + HCode2Col.ToString() +
+ //"," + HCode3Col.ToString() +
+ //"," + HBarCodeDateCol.ToString() +
+ //"," + HBackDataFlagCol.ToString() +
+ "," + HMaterIDCol.ToString();
//璁剧疆鍚堣鍒�
string sTotalCol = HQtyCol.ToString();
//
@@ -1173,7 +1176,6 @@
grdMain.Rows[sRow].Cells[HCode1Col].Value = "00";
grdMain.Rows[sRow].Cells[HCode2Col].Value ="000";
grdMain.Rows[sRow].Cells[HCode3Col].Value = "0000";
- grdMain.Rows[sRow].Cells[HSupNumberCol].Value = "VG509";
grdMain.Rows[sRow].Cells[HWorkLineNameCol].Value = "1";
grdMain.Rows[sRow].Cells[HBarCodeDateCol].Value = dtpHDate.Value.ToShortDateString();
grdMain.Rows[sRow].Cells[HBackDataFlagCol].Value = "%";
@@ -1193,12 +1195,12 @@
if (oDs2 != null && oDs2.Tables[0].Rows.Count > 0)
{
grdMain.Rows[sRow].Cells[HCusModelCol].Value = DBUtility.ClsPub.isStrNull(oDs2.Tables[0].Rows[0]["HPinfan"]);
-
+ grdMain.Rows[sRow].Cells[HSupNumberCol].Value = DBUtility.ClsPub.isStrNull(oDs2.Tables[0].Rows[0]["HSupNumber"]);
}
else
{
grdMain.Rows[sRow].Cells[HCusModelCol].Value = "";
-
+ grdMain.Rows[sRow].Cells[HSupNumberCol].Value = "";
}
//}
break;
--
Gitblit v1.9.1