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

yangle

2022-08-08 8560519c52cede92c33b89184f39844934c71de4

 WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs

@@ -28,32 +28,23 @@
        {
            try
            {
                ds = Sc_GetMouldRepairOutHouseBill(sWhere,Organization);
                if (ds == null)
                ds = Sc_GetMouldRepairOutHouseBill(sWhere, Organization);

                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairOut_SingleBillList", 1, false, user))
                {
                    //编辑权限
                    if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairOut_SingleBillList", 1, false, user))
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "无查看权限！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "查询数据异常，请与管理员联系！";
                    objJsonResult.Message = "无查看权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "返回记录成功！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "返回记录成功！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception ex)
            {
@@ -337,7 +328,7 @@
                }
                if (bResult)
                {
                    string sql = $"exec h_p_Sc_MouldChangeFileStatus  'out',{oBill.omodel.HInterID.ToString()} ";
                    string sql =string.Format($"exec h_p_Sc_MouldChangeFileStatus  'out',{oBill.omodel.HInterID.ToString()} ") ;
                    oCn.RunProc(sql);
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;