From 83e76d9d4d384777efa90df4992f4c5a6210a9d7 Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期二, 07 三月 2023 09:59:38 +0800
Subject: [PATCH] 条码生成模块，新增条码类型：奇瑞条码单箱
---
SCM/条码打印/Gy_BarCodeBill.cs | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git "a/SCM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs" "b/SCM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
index 60a1c2b..6318a53 100644
--- "a/SCM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
+++ "b/SCM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
@@ -220,6 +220,7 @@
if (CampanyName == "鍥涚淮灏�") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉�
{
cmbHBarCodeType.Items.Add("濂囩憺鏉＄爜");
+ cmbHBarCodeType.Items.Add("濂囩憺鏉＄爜鍗曠");
}
//cmbHBarCodeType.Items.Add("鎵樼洏鏉＄爜");
cmbHBarCodeType.SelectedIndex = 0;
@@ -679,7 +680,7 @@
MessageBox.Show(" 绗�" + ClsPub.isLong(grdMain.Rows[j].Cells[HSnoCol].Value) + "琛岋紝鐗╂枡锛�" + ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterNameCol].Value) + " 锛屾湭鍚敤鎵规绠＄悊锛屼笉鍏佽鏈夋壒娆★紒");
return false;
}
- if (cmbHBarCodeType.Text == "濂囩憺鏉＄爜")
+ if (cmbHBarCodeType.Text == "濂囩憺鏉＄爜" || cmbHBarCodeType.Text == "濂囩憺鏉＄爜鍗曠")
{
string HCusBatchNo = ""; //瀹㈡埛鎵规
HCusBatchNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCustomBatchNoCol].Value);
@@ -1587,7 +1588,7 @@
#endregion
}
- else if (cmbHBarCodeType.Text == "濂囩憺鏉＄爜")
+ else if (cmbHBarCodeType.Text == "濂囩憺鏉＄爜" || cmbHBarCodeType.Text == "濂囩憺鏉＄爜鍗曠")
{
//鏉＄爜鍓嶇紑 = 缁勭粐浠ｇ爜 + 鐗╂枡鍐呯爜 + 骞� + 鏈� + 鏃�
sTMNumber = HOrgNumber + HNumber + sYear + sPeriod + sDay;
@@ -1666,7 +1667,7 @@
//鏉＄爜缂栧彿 = 鏉＄爜鍓嶇紑 + 娴佹按鍙�
TM = sTMNumber + LSH2;
}
- else if (cmbHBarCodeType.Text == "濂囩憺鏉＄爜")
+ else if (cmbHBarCodeType.Text == "濂囩憺鏉＄爜" || cmbHBarCodeType.Text == "濂囩憺鏉＄爜鍗曠")
{
//鏉＄爜缂栧彿 = 鏉＄爜鍓嶇紑 + 娴佹按鍙�
TM = sTMNumber + LSH2;
@@ -1734,7 +1735,7 @@
grdSub.Rows[i].Cells[HSourceBillType2Col].Value = grdMain.Rows[j].Cells[HBillTypeCol].Value;
grdSub.Rows[i].Cells[HPrintCol].Value = "0";
grdSub.Rows[i].Cells[HWeiCol].Value = WeiShu;
- if (cmbHBarCodeType.Text == "濂囩憺鏉＄爜")
+ if (cmbHBarCodeType.Text == "濂囩憺鏉＄爜" || cmbHBarCodeType.Text == "濂囩憺鏉＄爜鍗曠")
{
grdSub.Rows[i].Cells[HBarcodeNoCol].Value = CusTMLSH;
}
@@ -1801,7 +1802,7 @@
MessageBox.Show("鏉＄爜鐢熸垚澶辫触,鎵归噺鐢熸垚娴佹按鍙峰け璐ワ紒");
return;
}
- if (cmbHBarCodeType.Text == "濂囩憺鏉＄爜")
+ if (cmbHBarCodeType.Text == "濂囩憺鏉＄爜" || cmbHBarCodeType.Text == "濂囩憺鏉＄爜鍗曠")
{
string[] sSQLCusNoMul = new string[1];
sSQLCusNoMul[0] = " exec h_p_WMS_SetMaxNo_QTY '" + sCusTMNumber + "'," + nn.ToString() + " ";
@@ -1913,6 +1914,12 @@
HRemark = "濂囩憺鏉＄爜";
HBarCodeStatus = "寰呰绠�";
}
+ else if (cmbHBarCodeType.Text == "濂囩憺鏉＄爜鍗曠")
+ {
+ HBarCodeType = "鍞竴鏉＄爜";
+ HRemark = "濂囩憺鏉＄爜鍗曠";
+ HBarCodeStatus = "";
+ }
else
{
HBarCodeType = ClsPub.isStrNull(cmbHBarCodeType.Text);
--
Gitblit v1.9.1