From e59a4905136d6ec150a3e5abf1db2ffa9f818571 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期四, 28 十二月 2023 16:10:11 +0800
Subject: [PATCH] 条码生成模块，生成条码时增加客户中控条码规则
---
BLL/系统公用CLS/Cls_S_KF_ICInventoryList_IF.cs | 4
DBUtility/基础资料/BillSelect.cs | 4
WarM/条码打印/Gy_BarCodeBill.cs | 113 ++++++++++++++++++++++++++++++-------
3 files changed, 95 insertions(+), 26 deletions(-)
diff --git "a/BLL/\347\263\273\347\273\237\345\205\254\347\224\250CLS/Cls_S_KF_ICInventoryList_IF.cs" "b/BLL/\347\263\273\347\273\237\345\205\254\347\224\250CLS/Cls_S_KF_ICInventoryList_IF.cs"
index ec60050..e49c4aa 100644
--- "a/BLL/\347\263\273\347\273\237\345\205\254\347\224\250CLS/Cls_S_KF_ICInventoryList_IF.cs"
+++ "b/BLL/\347\263\273\347\273\237\345\205\254\347\224\250CLS/Cls_S_KF_ICInventoryList_IF.cs"
@@ -61,8 +61,8 @@
oSelect.BatchNo = DBUtility.ClsPub.isStrNull(oFrm.grdMain.Rows[oFrm.grdMain.SelectedRows[i].Index].Cells[BatchNoCol].Value);
oSelect.HAuxPropID = DBUtility.ClsPub.isLong(oFrm.grdMain.Rows[oFrm.grdMain.SelectedRows[i].Index].Cells[AuxPropIDCol].Value);
oSelect.BillNo = DBUtility.ClsPub.isStrNull(oFrm.grdMain.Rows[oFrm.grdMain.SelectedRows[i].Index].Cells[MTONoCol].Value);
- oSelect.HProduceDate = DBUtility.ClsPub.isDate(oFrm.grdMain.Rows[oFrm.grdMain.SelectedRows[i].Index].Cells[HProduceDateCol].Value);
- oSelect.HExpiryDate = DBUtility.ClsPub.isDate(oFrm.grdMain.Rows[oFrm.grdMain.SelectedRows[i].Index].Cells[HExpiryDateCol].Value);
+ oSelect.HProduceDate = DBUtility.ClsPub.isStrNull(oFrm.grdMain.Rows[oFrm.grdMain.SelectedRows[i].Index].Cells[HProduceDateCol].Value);
+ oSelect.HExpiryDate = DBUtility.ClsPub.isStrNull(oFrm.grdMain.Rows[oFrm.grdMain.SelectedRows[i].Index].Cells[HExpiryDateCol].Value);
oSelect.BillTitle = mvarReportTitle;
oSelect.BillType = mvarItemKey;
oBillSelectColl.Add(oSelect);
diff --git "a/DBUtility/\345\237\272\347\241\200\350\265\204\346\226\231/BillSelect.cs" "b/DBUtility/\345\237\272\347\241\200\350\265\204\346\226\231/BillSelect.cs"
index 6090b24..fe18918 100644
--- "a/DBUtility/\345\237\272\347\241\200\350\265\204\346\226\231/BillSelect.cs"
+++ "b/DBUtility/\345\237\272\347\241\200\350\265\204\346\226\231/BillSelect.cs"
@@ -14,7 +14,7 @@
public Int64 SPID;
public string BatchNo;
public Int64 HAuxPropID;
- public DateTime HProduceDate; //鐢熶骇鏃ユ湡
- public DateTime HExpiryDate; //鏈夋晥鏈熻嚦
+ public string HProduceDate; //鐢熶骇鏃ユ湡
+ public string HExpiryDate; //鏈夋晥鏈熻嚦
}
}
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
index 1e133de..9270228 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
@@ -206,6 +206,10 @@
cmbHBarCodeType.Items.Add("浠櫒鎴愬搧鏉＄爜瑙勫垯");
cmbHBarCodeType.Items.Add("璇曞墏鎴愬搧鏉＄爜瑙勫垯");
}
+ else if (sCapName == "涓帶")
+ {
+ cmbHBarCodeType.Items.Add("鍞竴鏉＄爜");
+ }
else
{
//
@@ -215,20 +219,28 @@
//cmbHBarCodeType.Items.Add("鎵樼洏鏉＄爜");
}
- //
- cmbSourceBillType.Items.Add("鐢熶骇璁㈠崟");
- cmbSourceBillType.Items.Add("鐢熶骇姹囨姤鍗�");
- cmbSourceBillType.Items.Add("閲囪喘璁㈠崟");
- cmbSourceBillType.Items.Add("鏀舵枡閫氱煡鍗�");
- cmbSourceBillType.Items.Add("濮斿璁㈠崟");
- cmbSourceBillType.Items.Add("宸ュ簭姹囨姤鍗�");
- cmbSourceBillType.Items.Add("宸ュ簭娴佽浆鍗�");
- cmbSourceBillType.Items.Add("閫�璐ч�氱煡鍗�");
- cmbSourceBillType.Items.Add("鍏朵粬鍏ュ簱鍗�");
- cmbSourceBillType.Items.Add("鐩存帴璋冩嫧鍗�");
- cmbSourceBillType.Items.Add("閲囪喘閫�鏂欏崟");
- cmbSourceBillType.Items.Add("鐢熶骇閫�鏂欏崟");
- cmbSourceBillType.Items.Add("缁勮鎷嗗嵏鍗�");
+ //婧愬崟绫诲瀷
+ if (sCapName == "涓帶")
+ {
+ cmbSourceBillType.Items.Add("鐢熶骇姹囨姤鍗�");
+ cmbSourceBillType.Items.Add("鏀舵枡閫氱煡鍗�");
+ }
+ else
+ {
+ cmbSourceBillType.Items.Add("鐢熶骇璁㈠崟");
+ cmbSourceBillType.Items.Add("鐢熶骇姹囨姤鍗�");
+ cmbSourceBillType.Items.Add("閲囪喘璁㈠崟");
+ cmbSourceBillType.Items.Add("鏀舵枡閫氱煡鍗�");
+ cmbSourceBillType.Items.Add("濮斿璁㈠崟");
+ cmbSourceBillType.Items.Add("宸ュ簭姹囨姤鍗�");
+ cmbSourceBillType.Items.Add("宸ュ簭娴佽浆鍗�");
+ cmbSourceBillType.Items.Add("閫�璐ч�氱煡鍗�");
+ cmbSourceBillType.Items.Add("鍏朵粬鍏ュ簱鍗�");
+ cmbSourceBillType.Items.Add("鐩存帴璋冩嫧鍗�");
+ cmbSourceBillType.Items.Add("閲囪喘閫�鏂欏崟");
+ cmbSourceBillType.Items.Add("鐢熶骇閫�鏂欏崟");
+ cmbSourceBillType.Items.Add("缁勮鎷嗗嵏鍗�");
+ }
//
DBUtility.Xt_BaseBillFun.Sub_ClearBill(gbUp);
//
@@ -754,6 +766,8 @@
int k = 0;
Int64 n = 0; //鍚屼竴鎵圭敓鎴愭潯鐮佷腑鐨勭鍑犳潯
string sTMNumber = ""; //鏉＄爜鑷畾涔夊墠缂�
+ string sSourceBillNo = ""; //婧愬崟鍙�
+ string sSourceEntryID = ""; //琛屽彿锛堟簮鍗曞瓙ID锛�
DataSet Ds;
//Ds = oCn.RunProcReturn("exec GetLSH '" + ClsPub.GetServerDate(0) + "'", "GetLSH");
//LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
@@ -815,6 +829,23 @@
Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
//oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
+ }
+ else if (CampanyName == "涓帶")
+ {
+ sSourceBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HBillNoCol].Value);
+ sSourceEntryID = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HSubIDCol].Value);
+ if (sSourceBillNo == "")
+ {
+ //鏉＄爜鍓嶇紑 = 缁勭粐浠ｇ爜 + 鐗╂枡浠ｇ爜 + 骞� + 鏈� + 鏃�
+ sTMNumber = HOrgNumber + HNumber + sYear + sPeriod + sDay;
+ Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
+ }
+ else
+ {
+ //鏉＄爜 = 婧愬崟鍗曞彿 + 鐗╂枡ID + 琛屽彿
+ sTMNumber = sSourceBillNo + HNumber + sSourceEntryID;
+ }
}
else //閫氱敤鏂规硶
{
@@ -957,8 +988,30 @@
}
if (cmbHBarCodeType.Text == "鍞竴鏉＄爜")
{
- //鏉＄爜缂栧彿 = 鏉＄爜鍓嶇紑 + 娴佹按鍙�
- TM = sTMNumber + LSH2;
+ if (CampanyName == "涓帶")
+ {
+ if (sSourceBillNo == "")
+ {
+ //鏉＄爜缂栧彿 = 鏉＄爜鍓嶇紑 + 娴佹按鍙�
+ TM = sTMNumber + LSH2;
+ }
+ else
+ {
+ if (HBQty >1)
+ {
+ MessageBox.Show("鐢熶骇姹囨姤鍗曘�佹敹鏂欓�氱煡鍗曠敓鎴愭潯鐮佹椂锛岀鏁颁笉鑳藉ぇ浜�1锛�");
+ bc.Enabled = true;
+ return;
+ }
+ //鏉＄爜缂栧彿 = 鏉＄爜鍓嶇紑
+ TM = sTMNumber;
+ }
+ }
+ else
+ {
+ //鏉＄爜缂栧彿 = 鏉＄爜鍓嶇紑 + 娴佹按鍙�
+ TM = sTMNumber + LSH2;
+ }
}
else if (cmbHBarCodeType.Text == "搴忓垪鐮�")
{
@@ -2631,7 +2684,14 @@
}
else
{
- grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["鏈�灏忓寘瑁呮暟"].ToString();
+ if (CampanyName == "涓帶")
+ {
+ grdMain.Rows[i].Cells[HMinQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["鏈敓鎴愭潯鐮佹暟閲�"]);
+ }
+ else
+ {
+ grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["鏈�灏忓寘瑁呮暟"].ToString();
+ }
}
grdMain.Rows[i].Cells[HMakerCol].Value = ClsPub.CurUserName;
if (cmbSourceBillType.Text.Trim() == "鏀舵枡閫氱煡鍗�"|| cmbSourceBillType.Text.Trim() == "閲囪喘璁㈠崟"
@@ -3623,11 +3683,20 @@
}
else
{
- cmbHBarCodeType.Items.Clear();
- cmbHBarCodeType.Items.Add("鍞竴鏉＄爜");
- cmbHBarCodeType.Items.Add("鍝佺鏉＄爜");
- cmbHBarCodeType.Items.Add("鎵规鏉＄爜");
- this.cmbHBarCodeType.SelectedIndex = 0;
+ if (CampanyName == "涓帶")
+ {
+ cmbHBarCodeType.Items.Clear();
+ cmbHBarCodeType.Items.Add("鍞竴鏉＄爜");
+ this.cmbHBarCodeType.SelectedIndex = 0;
+ }
+ else
+ {
+ cmbHBarCodeType.Items.Clear();
+ cmbHBarCodeType.Items.Add("鍞竴鏉＄爜");
+ cmbHBarCodeType.Items.Add("鍝佺鏉＄爜");
+ cmbHBarCodeType.Items.Add("鎵规鏉＄爜");
+ this.cmbHBarCodeType.SelectedIndex = 0;
+ }
}
}
}
--
Gitblit v1.9.1