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

沈泽

2021-10-18 916c4dad569938c2a398ad7c5f9da37cb59fb1ec

 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs

@@ -359,18 +359,26 @@
        /// </summary>
        [Route("Gy_Mould/list1")]
        [HttpGet]
        public object list1(string sWhere)
        public object list1(string sWhere,string ModRightNameSelect, string user)
        {
            try
            {
                if (!DBUtility.ClsPub.Security_Log(ModRightNameSelect, 1, true, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有查看权限";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFileList " + sWhere, "h_v_Gy_MouldFileList");
                    ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFileList " + sWhere+ "order by 日期 desc", "h_v_Gy_MouldFileList");
                }
                else
                {
                    string sql1 = "select * from h_v_Gy_MouldFileList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere + "order by 日期 desc";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_MouldFileList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
@@ -417,12 +425,12 @@
            {
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Gy_CheckToolsFileMainList " + sWhere, "h_v_Gy_CheckToolsFileMainList");
                    ds = oCN.RunProcReturn("select * from h_v_Gy_CheckToolsFileMainList " + sWhere+ "order by 日期 desc", "h_v_Gy_CheckToolsFileMainList");
                }
                else
                {
                    string sql1 = "select * from h_v_Gy_CheckToolsFileMainList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere + "order by 日期 desc";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_CheckToolsFileMainList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
@@ -465,12 +473,12 @@
            {
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_IF_BarCodeBillList " + sWhere, "h_v_IF_BarCodeBillList");
                    ds = oCN.RunProcReturn("select * from h_v_IF_BarCodeBillList " + sWhere+ "order by 日期 desc", "h_v_IF_BarCodeBillList");
                }
                else
                {
                    string sql1 = "select * from h_v_IF_BarCodeBillList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere + "order by 日期 desc";
                    ds = oCN.RunProcReturn(sql, "h_v_IF_BarCodeBillList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
@@ -509,13 +517,26 @@
        /// </summary>
        [Route("Gy_Mould_Edit/AddBill")]
        [HttpPost]
        public object AddBill([FromBody] JObject sMainSub)
        public object AddBill([FromBody] JObject oMain)
        {
            var _value = sMainSub["oMain"].ToString();
            var _value = oMain["oMain"].ToString();
            string msg1 = _value.ToString();
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();//模块权限
            string msg4 = sArray[2].ToString();//当前人

            oCN.BeginTran();
            if (!DBUtility.ClsPub.Security_Log(msg3, 1, true, msg4))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有查看权限";
                objJsonResult.data = null;
                return objJsonResult;
            }
            //保存主表
            objJsonResult = AddBillMain(msg1);
            objJsonResult = AddBillMain(msg2);
            if (objJsonResult.code == "0")
            {
                oCN.RollBack();
@@ -532,10 +553,8 @@
            return objJsonResult;
        }

        public json AddBillMain(string msg1)
        public json AddBillMain(string msg2)
        {
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            try
            {
                msg2 = "[" + msg2.ToString() + "]";
@@ -650,16 +669,25 @@
        [HttpPost]
        public object AddBill1([FromBody] JObject oMain)
        {

            var _value = oMain["oMain"].ToString();
            string msg1 = _value.ToString();
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();//模块权限
            string msg4 = sArray[2].ToString();//当前人
            try
            {
                if (!DBUtility.ClsPub.Security_Log(msg3, 1, true, msg4))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有查看权限";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                DAL.ClsGy_MouldFile oMould = new DAL.ClsGy_MouldFile();
                DAL.ClsGy_MouldFileMain_View oDeptHlp = new DAL.ClsGy_MouldFileMain_View();

                var _value = oMain["oMain"].ToString();
                string msg1 = _value.ToString();
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg2 = sArray[0].ToString();

                //反序列化
                msg2 = "[" + msg2.ToString() + "]";
@@ -814,12 +842,20 @@
        /// </summary>
        [Route("Gy_Mould_Edit/Delete_Json")]
        [HttpGet]
        public object Delete_Json(long hmainid)
        public object Delete_Json(long hmainid, string ModRightNameDelete, string user)
        {
            DAL.ClsGy_MouldFile oBill = new DAL.ClsGy_MouldFile();
            try
            {
                    if (oBill.DeleteBill(hmainid, ref DBUtility.ClsPub.sExeReturnInfo))
                if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有删除权限";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (oBill.DeleteBill(hmainid, ref DBUtility.ClsPub.sExeReturnInfo))
                    {
                        //写入日志
                        ClsPub.Add_Log("", "删除项目，代码：" + oBill.omodel.HMouldNo + ",名称：" + oBill.omodel.HName, ClsPub.CurUserName);