From 7a716274b90df3f2b0745d15156308c69ebe54c2 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 04 八月 2025 10:31:07 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WarM/条码打印/Gy_BarCodeBill_Rework.cs | 7 +++++--
1 files changed, 5 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 081fe4b..51987b0 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 = "鏉＄爜鐢熸垚";
@@ -803,7 +805,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";
@@ -814,6 +816,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 = "璁￠噺鍗曚綅浠ｇ爜";
--
Gitblit v1.9.1