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

王 垚

2021-10-14 1745824a4c8e67d9a3e0611af80002c0897debc9

 WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs

@@ -4213,12 +4213,21 @@

        [Route("Sc_CheckToolsRepairWorkBillList/GetMouldRepairInBillList")]
        [HttpGet]
        public object GetMouldRepairInBillList(string sWhere)
        public object GetMouldRepairInBillList(string sWhere,string user, string Organization)
        {
            try
            {
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairIn_SingleBillList", 1, true, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无删除权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                ds = Sc_MouldRepairInBillList(sWhere);
                ds = Sc_MouldRepairInBillList(sWhere,Organization);
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "返回记录成功！";
@@ -4235,15 +4244,15 @@
            }
        }

        public static DataSet Sc_MouldRepairInBillList(string sWhere)
        public static DataSet Sc_MouldRepairInBillList(string sWhere,string Organization)
        {
            string sql1 = string.Format(@"select * from h_v_Sc_MouldRepairInBillList where 库存组织='" + Organization + "'");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairInBillList order by 日期 desc", "h_v_Sc_MouldRepairInBillList");
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by 日期 desc", "h_v_Sc_MouldRepairInBillList");
            }
            else
            {
                string sql1 = "select * from h_v_Sc_MouldRepairInBillList where 1 = 1 ";
                string sql = sql1 + sWhere+ "order by 日期 desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldRepairInBillList");
            }
@@ -4317,12 +4326,23 @@
            string msg2 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();
            string refSav = sArray[2].ToString();
            string msg4 = sArray[3].ToString();

            string UserName = "";
            string s = "";
            ListModels oListModels = new ListModels();
            try
            {
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairIn_SingleBill_Edit", 1, true, msg4))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无删除权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                DLL.ClsSc_MouldRepairInBill oBill = new DLL.ClsSc_MouldRepairInBill();
                List<Models.ClsSc_MouldRepairInBillMain> lsmain = new List<Models.ClsSc_MouldRepairInBillMain>();
                msg2 = msg2.Replace("\\", "");
@@ -4709,17 +4729,17 @@
        /// <returns></returns>
        [Route("Sc_MouldRepairInBill/DeltetMouldRepairInBill")]
        [HttpGet]
        public object DeltetMouldRepairInBill(string HInterID)
        public object DeltetMouldRepairInBill(string HInterID,string user)
        {
            //编辑权限
            //if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdBackBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
            //{
            //    objJsonResult.code = "0";
            //    objJsonResult.count = 0;
            //    objJsonResult.Message = "无删除权限！";
            //    objJsonResult.data = null;
            //    return objJsonResult;
            //}
            if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairIn_SingleBill_Delete", 1, true, user))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "无删除权限！";
                objJsonResult.data = null;
                return objJsonResult;
            }


            Int64 lngBillKey = 0;