From 6153d7826fc1fcf39759c5070fdd37fe4b75c3d5 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 07 四月 2026 15:44:43 +0800
Subject: [PATCH] 夏宝机型码规则调整
---
WarM/条码打印/Gy_BarCodeBill_Rework.cs | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.cs"
index afa5a6c..82daf9f 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.cs"
@@ -702,8 +702,30 @@
Int32 HModelLen = grdMain.Rows[j].Cells[HMaterModelCol].Value.ToString().Length;
string HModelLeft = HModelLen >= 4 ? grdMain.Rows[j].Cells[HMaterModelCol].Value.ToString() : "";
string HSubjoin2 = grdMain.Rows[j].Cells[HSubjoin2Col].Value.ToString();
- //鏉＄爜缂栧彿 = 宸ュ巶浠ｇ爜锛�1锛� + 杞﹂棿浠ｇ爜锛�060113锛�+ 鏈哄瀷鍙� + 骞� + 鏈� + 鏃� + 娴佹按鍙�
- TM = "1" + "060113" + HSubjoin2 + sYear + sPeriod + sDay + LSH.ToString("D5");
+
+ //鐢熸垚鐗╂枡鏉＄爜鏃讹紝鏈哄瀷鐮佷笉鍏佽涓虹┖,濡傝嫢鐗╂枡浠ｇ爜鍓嶇紑涓嶄负G鎴朙鐨勶紝鍙烦杩囨帶鍒�
+ if (oSystemParameter.omodel.Gy_BarCodeBill_Rework_Ctrl != "")
+ {
+ string[] HMaterNumberPrefix = oSystemParameter.omodel.Gy_BarCodeBill_Rework_Ctrl.Split(',');
+
+ char HMaterfirstChar = grdMain.Rows[j].Cells[HMaterNumberCol].Value.ToString()[0];
+
+ if (HMaterNumberPrefix.Contains(HMaterfirstChar.ToString()))
+ {
+ //鏉＄爜缂栧彿 = 宸ュ巶浠ｇ爜锛�1锛� + 杞﹂棿浠ｇ爜锛�060113锛�+ 鏈哄瀷鍙� + 骞� + 鏈� + 鏃� + 娴佹按鍙�
+ TM = "1" + "060113" + HSubjoin2 + sYear + sPeriod + sDay + LSH.ToString("D5");
+ }
+ else
+ {
+ //鏉＄爜缂栧彿 = 宸ュ巶浠ｇ爜锛�1锛� + 杞﹂棿浠ｇ爜锛�060113锛�+ 鐗╂枡浠ｇ爜棣栧瓧姣� + 骞� + 鏈� + 鏃� + 娴佹按鍙�
+ TM = "1" + "060113" + HMaterfirstChar.ToString() + sYear + sPeriod + sDay + LSH.ToString("D5");
+ }
+ }
+ else
+ {
+ //鏉＄爜缂栧彿 = 宸ュ巶浠ｇ爜锛�1锛� + 杞﹂棿浠ｇ爜锛�060113锛�+ 鏈哄瀷鍙� + 骞� + 鏈� + 鏃� + 娴佹按鍙�
+ TM = "1" + "060113" + HSubjoin2 + sYear + sPeriod + sDay + LSH.ToString("D5");
+ }
}
HEntryID = j + 1;
--
Gitblit v1.9.1