From 096f0a528fc003ad60d50155af11a40d14b9f0d9 Mon Sep 17 00:00:00 2001 From: yangle <admin@YINMOU> Date: 星期二, 12 十二月 2023 13:34:14 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- PlanM/计划管理/Gy_RoutingBill.cs | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 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 ecebd58..9d76bd3 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" @@ -82,16 +82,17 @@ public const Int16 HSumPassRateCol = 52; public const Int16 HRemarkCol = 53; - public const Int16 HSourceInterIDCol = 53; - public const Int16 HSourceEntryIDCol = 54; - public const Int16 HSourceBillNoCol = 55; - public const Int16 HSourceBillTypeCol = 56; - public const Int16 HRelationQtyCol = 57; - public const Int16 HRelationMoneyCol = 58; - public const Int16 HTechnologyParameterCol = 59; - public const Int16 HPicNumCol = 60; - public const Int16 HProcCheckNoteCol = 61; - public const Int16 HProcWorkNumCol = 62; + public const Int16 HSourceInterIDCol = 54; + public const Int16 HSourceEntryIDCol = 55; + public const Int16 HSourceBillNoCol = 56; + public const Int16 HSourceBillTypeCol = 57; + public const Int16 HRelationQtyCol = 58; + public const Int16 HRelationMoneyCol = 59; + public const Int16 HTechnologyParameterCol = 60; + public const Int16 HPicNumCol = 61; + public const Int16 HProcCheckNoteCol = 62; + public const Int16 HProcWorkNumCol = 63; + public const Int16 HWorkTimes_SCol = 64; // public string ModName = "3301"; @@ -1111,6 +1112,7 @@ grdMain.Rows[i].Cells[HPassRateCol].Value = oSub.HPassRate.ToString(); 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[HNextProcFlagCol].Value = DBUtility.ClsPub.isBool(oSub.HNextProcFlag); grdMain.Rows[i].Cells[HFlowProcCol].Value = DBUtility.ClsPub.isBool(oSub.HFlowProc); @@ -1351,6 +1353,7 @@ oSub.HStdFlag = DBUtility.ClsPub.isBool(grdMain.Rows[i].Cells[HStdFlagCol].Value); 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.HProcWorkNum = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HProcWorkNumCol].Value); if (DBUtility.ClsPub.isSingle(grdMain.Rows[i].Cells[HPassRateCol].Value) > 0) @@ -1425,7 +1428,7 @@ private void initGrid() { // - grdMain.ColumnCount = 63; //鎬诲垪鏁� + grdMain.ColumnCount = 65; //鎬诲垪鏁� DBUtility.Xt_BaseBillFun.initGridFst(grdMain, this.Name); // grdMain.RowsDefaultCellStyle.WrapMode = DataGridViewTriState.True; @@ -1489,6 +1492,7 @@ grdMain.Columns[HNextProcFlagCol].HeaderText = "涓嬮亾娴佽浆宸ュ簭"; grdMain.Columns[HFlowProcCol].HeaderText = "娴佽浆宸ュ簭"; grdMain.Columns[HOverRateCol].HeaderText = "瓒呴姣斾緥"; + grdMain.Columns[HWorkTimes_SCol].HeaderText = "浜у搧鍗曚欢宸ユ椂"; ////鍥哄畾璧嬪��===================================================== grdMain.Columns[HSnoCol].HeaderText = "搴忓彿"; grdMain.Columns[HRemarkCol].HeaderText = "澶囨敞"; @@ -1555,7 +1559,8 @@ "," + HRemarkCol.ToString() + "," + HTechnologyParameterCol.ToString() + "," + HPicNumCol.ToString() + - "," + HProcCheckNoteCol.ToString()+ + "," + HProcCheckNoteCol.ToString() + + "," + HWorkTimes_SCol.ToString() + "," + HOverRateCol.ToString(); //璁剧疆鍚堣鍒� string sTotalCol = HTimeUnitCol.ToString(); -- Gitblit v1.9.1