去除 开工单 配置项

chenhaozhe

6 小时以前 af5ed4d676b880e3ba5ada0e3a2568018fd40c0d

去除 开工单 配置项

 Pub_Class/CustomerCls/ClsXt_SystemParameter.cs

@@ -2784,12 +2784,6 @@
                        omodel.Xt_grdAlignment_WMES_RemoteTransFileCTL = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    // 是否启用开工单首检控制
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MESBeginWorkBill_FirstCheckCtl")
                    {
                        omodel.Sc_MESBeginWorkBill_FirstCheckCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_PatrolProcCheckOtherBill_FirstCheckCtl")
                    {
                        omodel.QC_PatrolProcCheckOtherBill_FirstCheckCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -5221,11 +5215,6 @@
                    }

                    // 是否启用开工单首检控制
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MESBeginWorkBill_FirstCheckCtl")
                    {
                        omodel.Sc_MESBeginWorkBill_FirstCheckCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_PatrolProcCheckOtherBill_FirstCheckCtl")
                    {
                        omodel.QC_PatrolProcCheckOtherBill_FirstCheckCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);

 Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs

@@ -869,9 +869,6 @@
        // 多语言
        public string Xt_grdAlignment_WMES_RemoteTransFileCTL; // APP 是否启用远程获取翻译文件功能

        // 开工单 首检控制
        public string Sc_MESBeginWorkBill_FirstCheckCtl; // 开工单 是否启用 首检控制

        // 巡检单 首检控制
        public string QC_PatrolProcCheckOtherBill_FirstCheckCtl; // 巡检单 是否启用 首检控制


 WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs

@@ -1631,32 +1631,6 @@
                objJsonResult.data = null;
                return objJsonResult;
            }

            oSystemParameter.ShowBill(ref DBUtility.ClsPub.sErrInfo);
            if(oSystemParameter.omodel.Sc_MESBeginWorkBill_FirstCheckCtl == "Y")
            {
                // 判断是否允许 未首检合格前开工
                DataSet ds = oCN.RunProcReturn($@"select top 1 * from QC_FirstPieceCheckBillMain 
                            where HMainSourceBillType = '{HBillType}' and HMainSourceBillNo = '{HSourceBillNo}'
                order by HDate desc", "QC_FirstPieceCheckBillMain");

                if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "检验首件检验失败，该单据没有做对印的首检单";

                    return objJsonResult;
                }

                if (ds.Tables[0].Rows[0]["HLastResult"].ToString() == "0")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "首件检失败，首件检检验结果为不合格，不允许下推单据";
                    return objJsonResult;
                }
            }
            

            //判断会计期是否合理