From 3b5c38bbd9df7c5d9bad86c0a48cbac90cc975f8 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期三, 31 十二月 2025 14:56:16 +0800
Subject: [PATCH] 凯贝新增统合、紫光华智客户条码生成功能
---
WarM/条码打印/Gy_CusBarCodeBill_KaiBei_HuaSan.cs | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_HuaSan.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_HuaSan.cs"
index 2ad2937..80d82dc 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_HuaSan.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_HuaSan.cs"
@@ -71,7 +71,7 @@
public const Int16 HCusModelCol = 49;
//
public string ModName = "85";
- public string ModCaption = "鏂板崕涓夊鎴锋爣绛剧敓鎴�";
+ public string ModCaption = "鏂板崕涓夈�佷笢鏂归�氫俊銆佺粺鍚堛�佺传鍏夊崕鏅哄鎴锋爣绛剧敓鎴�";
public const string ModRightName = "Gy_CusBarCodeBill_KaiBei_HuaSan";
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
@@ -714,6 +714,14 @@
{
HBarCodeType = "涓滄柟閫氫俊鍐呯鐮�";
}
+ else if (cmbHCusName.Text.Contains("缁熷悎"))
+ {
+ HBarCodeType = "缁熷悎鍐呯鐮�";
+ }
+ else if (cmbHCusName.Text.Contains("绱厜鍗庢櫤"))
+ {
+ HBarCodeType = "绱厜鍗庢櫤鍐呯鐮�";
+ }
else
{
HBarCodeType = "鏂板崕涓夊唴绠辩爜";
@@ -799,7 +807,7 @@
//鏉＄爜鍓嶇紑 = 2浣嶅浐瀹氱爜锛�'09'锛� + CPN瀹㈡埛缂栫爜锛堣鏍煎瀷鍙凤級+ 2浣嶉鐣欑爜锛堝浐瀹�'01'锛�+ 5浣嶅勾骞存湀鏃ユ棩锛圷YMDD锛� + 3浣�09鐮佹祦姘村彿锛堝浐瀹�'001'锛� + 渚涘簲鍟嗕唬鐮侊紙鍥哄畾'105652'锛�
sWTMNumber = "09" + HMaterModel + "01" + sYear + sPeriod + sDay + "001105652";
}
- //鏂板崕涓�
+ //鏂板崕涓夈�佺粺鍚堛�佺传鍏夊崕鏅�
else
{
//鏉＄爜鍓嶇紑 = 2浣嶅浐瀹氱爜锛�'09'锛� + CPN瀹㈡埛缂栫爜锛堣鏍煎瀷鍙凤級+ 2浣嶉鐣欑爜锛堝浐瀹�'01'锛�+ 5浣嶅勾骞存湀鏃ユ棩锛圷YMDD锛� + 3浣�09鐮佹祦姘村彿锛堝浐瀹�'001'锛� + 渚涘簲鍟嗕唬鐮侊紙鍥哄畾'151091'锛�
@@ -839,6 +847,14 @@
if (cmbHCusName.Text.Contains("涓滄柟閫氫俊"))
{
HBarCodeType = "涓滄柟閫氫俊澶栫鐮�";
+ }
+ else if (cmbHCusName.Text.Contains("缁熷悎"))
+ {
+ HBarCodeType = "缁熷悎澶栫鐮�";
+ }
+ else if (cmbHCusName.Text.Contains("绱厜鍗庢櫤"))
+ {
+ HBarCodeType = "绱厜鍗庢櫤澶栫鐮�";
}
else
{
@@ -926,7 +942,7 @@
private void Display()
{
//鍒锋柊鍐呯鐮佸垪琛�
- DataSet DSet = oCn.RunProcReturn("select * from h_v_Gy_BarCodeBill_CusList where HInterID=" + HInterID.ToString() + " and (鏉＄爜绫诲瀷='鏂板崕涓夊唴绠辩爜' or 鏉＄爜绫诲瀷='涓滄柟閫氫俊鍐呯鐮�) order by HItemID", "h_v_Gy_BarCodeBill_CusList", ref DBUtility.ClsPub.sExeReturnInfo);
+ DataSet DSet = oCn.RunProcReturn("select * from h_v_Gy_BarCodeBill_CusList where HInterID=" + HInterID.ToString() + " and (鏉＄爜绫诲瀷 in ('鏂板崕涓夊唴绠辩爜','涓滄柟閫氫俊鍐呯鐮�','缁熷悎鍐呯鐮�','绱厜鍗庢櫤鍐呯鐮�') order by HItemID", "h_v_Gy_BarCodeBill_CusList", ref DBUtility.ClsPub.sExeReturnInfo);
//鐢熸垚棣栬鏍囬
if (DSet == null)
{
@@ -937,7 +953,7 @@
grdSub.DataSource = DSet.Tables[0].DefaultView;
//鍒锋柊澶栫鐮佸垪琛�
- DataSet DWSet = oCn.RunProcReturn("select * from h_v_Gy_BarCodeBill_CusList where HInterID=" + HInterID.ToString() + " and (鏉＄爜绫诲瀷='鏂板崕涓夊绠辩爜' or 鏉＄爜绫诲瀷='涓滄柟閫氫俊澶栫鐮�) order by HItemID", "h_v_Gy_BarCodeBill_CusList", ref DBUtility.ClsPub.sExeReturnInfo);
+ DataSet DWSet = oCn.RunProcReturn("select * from h_v_Gy_BarCodeBill_CusList where HInterID=" + HInterID.ToString() + " and (鏉＄爜绫诲瀷 in ('鏂板崕涓夊绠辩爜','涓滄柟閫氫俊澶栫鐮�','缁熷悎澶栫鐮�','绱厜鍗庢櫤澶栫鐮�') order by HItemID", "h_v_Gy_BarCodeBill_CusList", ref DBUtility.ClsPub.sExeReturnInfo);
//鐢熸垚棣栬鏍囬
if (DWSet == null)
{
@@ -1693,7 +1709,7 @@
{
try
{
- oCn.RunProc("update Gy_BarCodeBill_Cus set HPrintQty=isnull(HPrintQty,0)+1 where HBarCodeType in ('鏂板崕涓夊唴绠辩爜','涓滄柟閫氫俊鍐呯鐮�') and HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCn.RunProc("update Gy_BarCodeBill_Cus set HPrintQty=isnull(HPrintQty,0)+1 where HBarCodeType in ('鏂板崕涓夊唴绠辩爜','涓滄柟閫氫俊鍐呯鐮�','缁熷悎鍐呯鐮�','绱厜鍗庢櫤鍐呯鐮�') and HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
}
catch (Exception e)
{
@@ -1808,7 +1824,7 @@
{
try
{
- oCn.RunProc("update Gy_BarCodeBill_Cus set HPrintQty=isnull(HPrintQty,0)+1 where HBarCodeType in ('鏂板崕涓夊绠辩爜','涓滄柟閫氫俊澶栫鐮�') and HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCn.RunProc("update Gy_BarCodeBill_Cus set HPrintQty=isnull(HPrintQty,0)+1 where HBarCodeType in ('鏂板崕涓夊绠辩爜','涓滄柟閫氫俊澶栫鐮�','缁熷悎澶栫鐮�','绱厜鍗庢櫤澶栫鐮�') and HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
}
catch (Exception e)
{
--
Gitblit v1.9.1