From fd6dfca81f21e5b246ac1568532838d25d0002f8 Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期四, 05 三月 2026 16:41:52 +0800
Subject: [PATCH] 1
---
WarM/条码打印/Gy_BarCodeBill_Rework.cs | 39 ++++++++++++++++++++++++++++-----------
1 files changed, 28 insertions(+), 11 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 d1d8420..1b1d01d 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"
@@ -27,7 +27,7 @@
public const Int16 HMaterIDCol = 6;
public const Int16 HMaterNumberCol = 7;
public const Int16 HMaterNameCol = 8;
- public const Int16 HPinfanCol = 9;
+ public const Int16 HSubjoin2Col = 9;
public const Int16 HMaterModelCol = 10;
public const Int16 HAuxPropIDCol = 11;
public const Int16 HAuxPropNumberCol = 12;
@@ -77,6 +77,8 @@
public const Int16 HInnerBillNoCol = 56;
public const Int16 HEndDateCol = 57;
public const Int16 HSourceBillQtyCol = 58;
+ public const Int16 HPinfanCol = 59;
+
//
public string ModName = "85";
public string ModCaption = "鏉＄爜鐢熸垚";
@@ -593,6 +595,16 @@
string HPinfan = ""; //鍝佺暘
DateTime HEndDate; //璁″垝瀹屽伐鏃ユ湡
+ for (int j = 0; j < grdMain.Rows.Count; j++)
+ {
+ if (ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value) != 0 && grdMain.Rows[j].Cells[HSubjoin2Col].Value.ToString() == "")
+ {
+ MessageBox.Show("绗�" + (j+1) + "琛岋紝鏈哄瀷鐮佹湭缁存姢锛屼笉鍏佽鐢熸垚鏉＄爜");
+ bc.Enabled = true;
+ return;
+ }
+ }
+
oCn.BeginTran();
Application.DoEvents();
//鑾峰彇鍚屼竴鎵圭敓鎴愭潯鐮佹�荤鏁�
@@ -621,8 +633,10 @@
if (HBarCodeType == "鍞竴鏉＄爜")
{
//鏉＄爜鍓嶇紑 = 缁勭粐浠ｇ爜 + 鐗╂枡浠ｇ爜 + 骞� + 鏈� + 鏃�
- sTMNumber = HOrgNumber + sMaterID + sYear + sPeriod + sDay;
- Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ //sTMNumber = HOrgNumber + sMaterID + sYear + sPeriod + sDay;
+ sTMNumber = sYear + sPeriod + sDay;
+
+ Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo_ReWorkBar '" + sTMNumber + "'", "h_p_WMS_GetMaxNo_ReWorkBar"); //鑾峰彇鏈�澶ф祦姘村彿
LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
}
else
@@ -666,13 +680,11 @@
}
if (HBarCodeType == "鍞竴鏉＄爜")
{
- //鏉＄爜缂栧彿 = 鏉＄爜鍓嶇紑 + 娴佹按鍙�
- TM = sTMNumber + LSH2;
-
- //鏉＄爜鍓嶇紑 = 缁勭粐浠ｇ爜 + 鐗╂枡浠ｇ爜 + 骞� + 鏈� + 鏃�
- sTMNumber = HOrgNumber + sMaterID + 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]);
+ 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");
}
HEntryID = j + 1;
@@ -806,7 +818,7 @@
private void initGrid()
{
grdMain.RowCount = 0;
- grdMain.ColumnCount = 59; //鎬诲垪鏁�
+ grdMain.ColumnCount = 60; //鎬诲垪鏁�
DBUtility.Xt_BaseBillFun.initGridFst(grdMain, this.Name);
grdMain.Columns[HSnoCol].HeaderText = "搴忓彿";
grdMain.Columns[HMainIDCol].HeaderText = "婧愬崟涓籌D";
@@ -817,6 +829,7 @@
grdMain.Columns[HMaterNumberCol].HeaderText = "鐗╂枡浠ｇ爜";
grdMain.Columns[HMaterNameCol].HeaderText = "鐗╂枡鍚嶇О";
grdMain.Columns[HMaterModelCol].HeaderText = "瑙勬牸鍨嬪彿";
+ grdMain.Columns[HSubjoin2Col].HeaderText = "鏈哄瀷鐮�";
grdMain.Columns[HPinfanCol].HeaderText = "鍝佺暘";
grdMain.Columns[HUnitIDCol].HeaderText = "璁￠噺鍗曚綅ID";
grdMain.Columns[HUnitNumberCol].HeaderText = "璁￠噺鍗曚綅浠ｇ爜";
@@ -910,6 +923,8 @@
grdMain.Columns[HInnerBillNoCol].Visible = false;
grdMain.Columns[HEndDateCol].Visible = false;
grdMain.Columns[HBillNoCol].Visible = false;
+ grdMain.Columns[HAuxPropNumberCol].Visible = false;
+ grdMain.Columns[HAuxPropNameCol].Visible = false;
//璁剧疆鍙紪杈戝垪
string sAllowCol = HQtyCol.ToString() +
@@ -975,6 +990,7 @@
{
sMoney = ClsPub.isDoule(grdMain.Rows[sRow].Cells[HQtyCol].Value) / ClsPub.isDoule(grdMain.Rows[sRow].Cells[HMinQtyCol].Value);
}
+ sMoney = Math.Round(sMoney, 10); // 淇濈暀10浣嶅皬鏁拌繘琛屽洓鑸嶄簲鍏�
sMoney = Math.Ceiling(sMoney);
grdMain.Rows[sRow].Cells[HBQtyCol].Value = sMoney;
}
@@ -1049,6 +1065,7 @@
grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = oMater.omodel.HAuxPropName;
grdMain.Rows[sRow].Cells[HBatchManagerCol].Value = oMater.omodel.HBatchManager;
grdMain.Rows[sRow].Cells[HISKFPERIODCol].Value = oMater.omodel.HISKFPERIOD;
+ grdMain.Rows[sRow].Cells[HSubjoin2Col].Value = oMater.omodel.HSubjoin2;
grdMain.Rows[sRow].Cells[HBarCodeTypeCol].Value = "鍞竴鏉＄爜";
//鍚敤鎵规
if (oMater.omodel.HBatchManager)
--
Gitblit v1.9.1