From 1ce0de5fe9438f3f237bdce8e261be94eee64a2b Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 21 二月 2024 17:32:42 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
PlanM/计划管理/Gy_RoutingBill.cs | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git "a/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBill.cs" "b/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBill.cs"
index 9d76bd3..167d8b9 100644
--- "a/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBill.cs"
+++ "b/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBill.cs"
@@ -93,6 +93,7 @@
public const Int16 HProcCheckNoteCol = 62;
public const Int16 HProcWorkNumCol = 63;
public const Int16 HWorkTimes_SCol = 64;
+ public const Int16 HSNCtrlCol = 65;
//
public string ModName = "3301";
@@ -1113,6 +1114,7 @@
grdMain.Rows[i].Cells[HSumPassRateCol].Value = oSub.HSumPassRate.ToString();
grdMain.Rows[i].Cells[HOverRateCol].Value = oSub.HOverRate.ToString();
grdMain.Rows[i].Cells[HWorkTimes_SCol].Value = oSub.HWorkTimes_S.ToString();
+ grdMain.Rows[i].Cells[HSNCtrlCol].Value = DBUtility.ClsPub.isBool(oSub.HSNCtrl);
//涓嬮亾娴佽浆宸ュ簭
grdMain.Rows[i].Cells[HNextProcFlagCol].Value = DBUtility.ClsPub.isBool(oSub.HNextProcFlag);
grdMain.Rows[i].Cells[HFlowProcCol].Value = DBUtility.ClsPub.isBool(oSub.HFlowProc);
@@ -1354,6 +1356,7 @@
oSub.HAutoTrunFlag = DBUtility.ClsPub.isBool(grdMain.Rows[i].Cells[HAutoTrunFlagCol].Value);
oSub.HProcType = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HProcTypeCol].Value);
oSub.HWorkTimes_S = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HWorkTimes_SCol].Value);
+ oSub.HSNCtrl = DBUtility.ClsPub.isBool(grdMain.Rows[i].Cells[HSNCtrlCol].Value);
oSub.HProcWorkNum = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HProcWorkNumCol].Value);
if (DBUtility.ClsPub.isSingle(grdMain.Rows[i].Cells[HPassRateCol].Value) > 0)
@@ -1428,7 +1431,7 @@
private void initGrid()
{
//
- grdMain.ColumnCount = 65; //鎬诲垪鏁�
+ grdMain.ColumnCount = 66; //鎬诲垪鏁�
DBUtility.Xt_BaseBillFun.initGridFst(grdMain, this.Name);
//
grdMain.RowsDefaultCellStyle.WrapMode = DataGridViewTriState.True;
@@ -1493,6 +1496,7 @@
grdMain.Columns[HFlowProcCol].HeaderText = "娴佽浆宸ュ簭";
grdMain.Columns[HOverRateCol].HeaderText = "瓒呴姣斾緥";
grdMain.Columns[HWorkTimes_SCol].HeaderText = "浜у搧鍗曚欢宸ユ椂";
+ grdMain.Columns[HSNCtrlCol].HeaderText = "SN鐮佽繃绔�";
////鍥哄畾璧嬪��=====================================================
grdMain.Columns[HSnoCol].HeaderText = "搴忓彿";
grdMain.Columns[HRemarkCol].HeaderText = "澶囨敞";
@@ -1561,6 +1565,7 @@
"," + HPicNumCol.ToString() +
"," + HProcCheckNoteCol.ToString() +
"," + HWorkTimes_SCol.ToString() +
+ "," + HSNCtrlCol.ToString() +
"," + HOverRateCol.ToString();
//璁剧疆鍚堣鍒�
string sTotalCol = HTimeUnitCol.ToString();
@@ -1596,6 +1601,12 @@
oCell5.Value = 0;
oCell5.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
grdMain.Rows[i].Cells[HFlowProcCol] = oCell5;
+ //SN鐮佽繃绔�
+ DataGridViewCheckBoxCell oCell6 = new DataGridViewCheckBoxCell();
+ oCell6.ThreeState = false;
+ oCell6.Value = 0;
+ oCell6.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ grdMain.Rows[i].Cells[HSNCtrlCol] = oCell6;
//
DataGridViewComboBoxCell column = new DataGridViewComboBoxCell();
column.Items.Add(" ");
--
Gitblit v1.9.1