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

yangle

2023-08-16 55c64d855c964da4a8fbede789abb198107cadca

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

 Pub_Class/CustomerCls/ClsXt_SystemParameter.cs

@@ -1646,6 +1646,78 @@
                        omodel.MES_StationEntrustOutBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }


                    //=============================首件检验单
                    //保存后是否自动审核
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_FirstPieceCheckBill_AutoCheck")
                    {
                        omodel.QC_FirstPieceCheckBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //保存后变为新增状态
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_FirstPieceCheckBill_SaveAutoAddnew")
                    {
                        omodel.QC_FirstPieceCheckBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //删除人必须是制单人
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_FirstPieceCheckBill_DeleterAndMakerMustSame")
                    {
                        omodel.QC_FirstPieceCheckBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //质检方案来源
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_FirstPieceCheckBill_QCSchemeSource")
                    {
                        omodel.QC_FirstPieceCheckBill_QCSchemeSource = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }



                    //=============================巡检单
                    //保存后是否自动审核
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_PatrolProcCheckBill_AutoCheck")
                    {
                        omodel.QC_PatrolProcCheckBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //保存后变为新增状态
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_PatrolProcCheckBill_SaveAutoAddnew")
                    {
                        omodel.QC_PatrolProcCheckBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //删除人必须是制单人
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_PatrolProcCheckBill_DeleterAndMakerMustSame")
                    {
                        omodel.QC_PatrolProcCheckBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //质检方案来源
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_PatrolProcCheckBill_QCSchemeSource")
                    {
                        omodel.QC_PatrolProcCheckBill_QCSchemeSource = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }


                    //=============================工序转序检验单
                    //保存后是否自动审核
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_ProcessCheckBill_AutoCheck")
                    {
                        omodel.QC_ProcessCheckBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //保存后变为新增状态
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_ProcessCheckBill_SaveAutoAddnew")
                    {
                        omodel.QC_ProcessCheckBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //删除人必须是制单人
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_ProcessCheckBill_DeleterAndMakerMustSame")
                    {
                        omodel.QC_ProcessCheckBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //质检方案来源
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_ProcessCheckBill_QCSchemeSource")
                    {
                        omodel.QC_ProcessCheckBill_QCSchemeSource = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }



                    //报工台，工序汇报自动审核参数
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MESProceReportWorkBill_AutoCheck")
                    {

 Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs

@@ -525,6 +525,25 @@
        public string QC_FirstPieceCheckBill_AutoCheck;                     //保存后是否自动审核  
        public string QC_FirstPieceCheckBill_SaveAutoAddnew;               //保存后变为新增状态
        public string QC_FirstPieceCheckBill_DeleterAndMakerMustSame;      //删除人必须是制单人
        public string QC_FirstPieceCheckBill_QCSchemeSource;               //质检方案来源

        //巡检单

        public string QC_PatrolProcCheckBill_AutoCheck;                     //保存后是否自动审核  
        public string QC_PatrolProcCheckBill_SaveAutoAddnew;               //保存后变为新增状态
        public string QC_PatrolProcCheckBill_DeleterAndMakerMustSame;      //删除人必须是制单人
        public string QC_PatrolProcCheckBill_QCSchemeSource;               //质检方案来源

        //工序转序检验单

        public string QC_ProcessCheckBill_AutoCheck;                     //保存后是否自动审核  
        public string QC_ProcessCheckBill_SaveAutoAddnew;               //保存后变为新增状态
        public string QC_ProcessCheckBill_DeleterAndMakerMustSame;      //删除人必须是制单人
        public string QC_ProcessCheckBill_QCSchemeSource;               //质检方案来源