From 1ce73b98043f2fd3f0262c8f85471e5888f486eb Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 31 七月 2025 12:22:20 +0800
Subject: [PATCH] 排产计划查询中生产车间过滤字段改成字符串类型;凯贝添加excel导入日计划方法;凯贝提料运算改成和宝工一个方法;返修码生成模块添加机型码字段

---
 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 = "鐗╂枡浠g爜";
             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 = "璁¢噺鍗曚綅浠g爜";

--
Gitblit v1.9.1