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

ch

2022-01-19 a09ff1d01aeebae9037118035f10e06c570b092e

 WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs

@@ -10,6 +10,7 @@
    {
        private json objJsonResult = new json();
        public DataSet ds = new DataSet();
        public SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();

        #region [模具报废入库单审核、反审核]
        /// <summary>
@@ -28,7 +29,7 @@
            try
            {
                //审核权限
                if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
                if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -135,7 +136,7 @@
            try
            {
                //审核权限
                if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
                if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -235,10 +236,10 @@
        /// <returns></returns>
        [Route("Sc_MouldScrapInBill/set_DeleteBill")]
        [HttpGet]
        public object set_DeleteBill(string HInterID)
        public object set_DeleteBill(string HInterID,string user)
        {
            //编辑权限
            if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapInBill_Edit", 1, true, DBUtility.ClsPub.CurUserName))
            if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldScrapInBill_Delete", 1, false, user))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
@@ -314,16 +315,109 @@
        }
        #endregion

        #region 器具报废入库单审核/反审核
        [Route("Sc_MouldScrapInBill/AuditMouldScrapInBill")]
        [HttpGet]
        public object AuditMouldScrapInBill(string HInterID, string user, int flag)
        {
            //flag=1 审核；  flag=2 反审核
            //编辑权限
            if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldScrapInBill_Check", 1, false, user))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "无审核权限！";
                objJsonResult.data = null;
                return objJsonResult;
            }

            Int64 lngBillKey = 0;
            lngBillKey = DBUtility.ClsPub.isLong(HInterID);
            if (lngBillKey == 0)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "单据ID为空！";
                objJsonResult.data = null;
                return objJsonResult;
            }
            DLL.ClsSc_MouldProdOutBill oBill = new DLL.ClsSc_MouldProdOutBill();
            if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
            {
                if (flag == 1)
                {
                    if (oBill.omodel.HBillStatus == 2)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "当前单据已审核，无需再次审核";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    else
                    {
                        string HCheckDate = DateTime.Now.Date.ToString();
                        oCn.RunProc(" Update Sc_MouldStockBillMain set HChecker ='" + user + "',HCheckDate='" + HCheckDate + "',HBillStatus=2 Where HBillType='3831' and HInterID=" + HInterID);
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "审核成功！";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                }
                else
                {
                    if (oBill.omodel.HBillStatus == 1)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "当前单据未审核，无需反审核";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    else
                    {
                        string HCheckDate = DateTime.Now.Date.ToString();
                        oCn.RunProc(" Update Sc_MouldStockBillMain set HChecker=' ',HCheckDate=' ',HBillStatus=1 Where HBillType='3831' and HInterID=" + HInterID);
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "反审核成功！";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                }

            }
            else
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "单据未找到";
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region 模具报废入库单列表

        [Route("Sc_MouldScrapInBill/get_Display")]
        [HttpGet]
        public object get_Display(string sWhere)
        public object get_Display(string sWhere,string user, string Organization)
        {
            try
            {
                ds = Sc_GetMouldScrapInHouseBill(sWhere);
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldScrapRequestBillList", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                ds = Sc_GetMouldScrapInHouseBill(sWhere,Organization);
                if (ds == null)
                {
                    objJsonResult.code = "0";
@@ -351,16 +445,16 @@
            }
        }

        public static DataSet Sc_GetMouldScrapInHouseBill(string sWhere)
        public static DataSet Sc_GetMouldScrapInHouseBill(string sWhere, string Organization)
        {
            string sql1 = string.Format(@"select * from h_v_Sc_MouldScrapInHouseBillList where 库存组织='" + Organization + "'");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldScrapInHouseBillList " + sWhere, "h_v_Sc_MouldScrapInHouseBillList");
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + sWhere + "order by 日期 desc", "h_v_Sc_MouldScrapInHouseBillList");
            }
            else
            {
                string sql1 = "select * from h_v_Sc_MouldScrapInHouseBillList where 1 = 1 ";
                string sql = sql1 + sWhere;
                string sql = sql1 + sWhere + "order by 日期 desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldScrapInHouseBillList");
            }