Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yangle

2023-12-12 096f0a528fc003ad60d50155af11a40d14b9f0d9

 PlanM/¼Æ»®¹ÜÀí/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";
@@ -390,6 +391,9 @@

            if (BillOld.CheckBill(BillOld.omodel.HInterID, ref ClsPub.sExeReturnInfo) == true)
            {



                BillChange = true;
                txtHChecker.Text = ClsPub.CurUserName;
                txtHCheckDate.Text = BillOld.omodel.HCheckDate;
@@ -1108,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);
@@ -1348,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)
@@ -1422,7 +1428,7 @@
        private void initGrid()
        {
            //
            grdMain.ColumnCount = 63;                       //总列数
            grdMain.ColumnCount = 65;                       //总列数
            DBUtility.Xt_BaseBillFun.initGridFst(grdMain, this.Name);
            //
            grdMain.RowsDefaultCellStyle.WrapMode = DataGridViewTriState.True;
@@ -1486,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 = "备注";
@@ -1552,7 +1559,8 @@
                            "," + HRemarkCol.ToString() +
                            "," + HTechnologyParameterCol.ToString() +
                             "," + HPicNumCol.ToString() +
                             "," + HProcCheckNoteCol.ToString()+
                             "," + HProcCheckNoteCol.ToString() +
                             "," + HWorkTimes_SCol.ToString() +
                            "," + HOverRateCol.ToString();
            //设置合计列
            string sTotalCol = HTimeUnitCol.ToString();
@@ -1597,6 +1605,7 @@
            }
            //
            DBUtility.Xt_BaseBillFun.initGridLast(sAllowCol, sTotalCol,oSumGrid);
            DBUtility.Xt_BaseBillFun.GetGrid(grdMain, this.Name);
            //================== 
            DBUtility.ClsPub.HideGridView(grdMain, Name, ClsPub.AppPath);//设置隐藏列
        }
@@ -2190,6 +2199,12 @@
                MessageBox.Show("使用失败!当前工艺路线不是浏览状态!");
                return;
            }
            //判断权限
            if (!ClsPub.Security_Log(ModRightNameCheck, 1, true, DBUtility.ClsPub.CurUserName))
            {
                return;
            }

            if (BillOld.Sub_RoutingCheckAndUsed(BillOld.omodel.HInterID))
            {
                MessageBox.Show("使用成功！");