From 38b01cb446b0725ded3ae8867353925e67da3ac1 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 18 六月 2024 19:41:25 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
PlanM/计划管理/Gy_RoutingBill.cs | 50 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 38 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 98307aa..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"
@@ -82,16 +82,18 @@
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 const Int16 HSNCtrlCol = 65;
//
public string ModName = "3301";
@@ -390,6 +392,9 @@
if (BillOld.CheckBill(BillOld.omodel.HInterID, ref ClsPub.sExeReturnInfo) == true)
{
+
+
+
BillChange = true;
txtHChecker.Text = ClsPub.CurUserName;
txtHCheckDate.Text = BillOld.omodel.HCheckDate;
@@ -1108,6 +1113,8 @@
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[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);
@@ -1348,6 +1355,8 @@
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.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)
@@ -1422,7 +1431,7 @@
private void initGrid()
{
//
- grdMain.ColumnCount = 63; //鎬诲垪鏁�
+ grdMain.ColumnCount = 66; //鎬诲垪鏁�
DBUtility.Xt_BaseBillFun.initGridFst(grdMain, this.Name);
//
grdMain.RowsDefaultCellStyle.WrapMode = DataGridViewTriState.True;
@@ -1486,6 +1495,8 @@
grdMain.Columns[HNextProcFlagCol].HeaderText = "涓嬮亾娴佽浆宸ュ簭";
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 = "澶囨敞";
@@ -1552,7 +1563,9 @@
"," + HRemarkCol.ToString() +
"," + HTechnologyParameterCol.ToString() +
"," + HPicNumCol.ToString() +
- "," + HProcCheckNoteCol.ToString()+
+ "," + HProcCheckNoteCol.ToString() +
+ "," + HWorkTimes_SCol.ToString() +
+ "," + HSNCtrlCol.ToString() +
"," + HOverRateCol.ToString();
//璁剧疆鍚堣鍒�
string sTotalCol = HTimeUnitCol.ToString();
@@ -1588,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(" ");
@@ -1597,6 +1616,7 @@
}
//
DBUtility.Xt_BaseBillFun.initGridLast(sAllowCol, sTotalCol,oSumGrid);
+ DBUtility.Xt_BaseBillFun.GetGrid(grdMain, this.Name);
//==================
DBUtility.ClsPub.HideGridView(grdMain, Name, ClsPub.AppPath);//璁剧疆闅愯棌鍒�
}
@@ -2190,6 +2210,12 @@
MessageBox.Show("浣跨敤澶辫触!褰撳墠宸ヨ壓璺嚎涓嶆槸娴忚鐘舵��!");
return;
}
+ //鍒ゆ柇鏉冮檺
+ if (!ClsPub.Security_Log(ModRightNameCheck, 1, true, DBUtility.ClsPub.CurUserName))
+ {
+ return;
+ }
+
if (BillOld.Sub_RoutingCheckAndUsed(BillOld.omodel.HInterID))
{
MessageBox.Show("浣跨敤鎴愬姛锛�");
--
Gitblit v1.9.1