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

yangle

2024-01-12 5f2fed1533426f40f417eb4d58c4b564bcfab980

 WebAPI/Controllers/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Xt_FastICSchemeController.cs

@@ -61,6 +61,67 @@
            }
        }

        /// <summary>
        /// è¿”回过滤方案列表
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Xt_FastICScheme/Chooselist")]
        [HttpGet]
        public object Chooselist(string user, string HModuleName,Int64 HInterID,string Type)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                string sql = "";

                if (Type == "Default")
                {
                    sql = string.Format(@"select * from h_v_Xt_FastICScheme_ChooseList where ç”¨æˆ·ç¼–码='" + user + "' and æ¨¡å—名称 = '" + HModuleName + "' and é»˜è®¤ä½¿ç”¨æ ‡è®° = '默认方案'");
                }
                else
                {
                    sql = string.Format(@"select * from h_v_Xt_FastICScheme_ChooseList where ç”¨æˆ·ç¼–码='" + user + "' and æ¨¡å—名称 = '" + HModuleName + "' and hmainid = " + HInterID);
                }
                ds = oCN.RunProcReturn(sql, "h_v_Xt_FastICScheme_ChooseList");

                if (ds.Tables[0].Rows.Count != 0 && ds != null)
                {
                    //添加列名
                    foreach (DataColumn col in ds.Tables[0].Columns)
                    {
                        Type dataType = col.DataType;
                        string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                        columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                    }

                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    objJsonResult.data = ds.Tables[0];
                    objJsonResult.list = columnNameList;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有查询到数据！";
                    objJsonResult.data = ds.Tables[0];
                    objJsonResult.list = columnNameList;
                    return objJsonResult;
                }                
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        #region å¿«é€Ÿè¿‡æ»¤æ–¹æ¡ˆ
        /// <summary>
        /// æ–°å¢žä¿®æ”¹å•æ®-保存按钮
@@ -84,6 +145,7 @@
                string msg4 = sArray[2].ToString();//过滤值
                string msg5 = sArray[3].ToString();//标签类型
                string msg6 = sArray[4].ToString();//用户
                string OperationType = sArray[5].ToString();//操作类型

                DAL.ClsXt_FastICScheme_Ctl oBill = new DAL.ClsXt_FastICScheme_Ctl();
                //反序列化
@@ -92,7 +154,14 @@
                List<Model.ClsXt_FastICSchemeMain_Model> lsmain = new List<Model.ClsXt_FastICSchemeMain_Model>();
                msg2 = msg2.Replace("\\", "");
                msg2 = msg2.Replace("\n", "");  //\n
                lsmain = oListModels.getObjectByJson_Xt_FastICSchemeMain(msg2);
                if (Convert.ToInt32(OperationType) != 3)
                {
                    lsmain = oListModels.getObjectByJson_Xt_FastICSchemeMain(msg2);
                }
                else
                {
                    oBill.omodel.HInterID = Convert.ToInt32(msg2);
                }

                foreach (Model.ClsXt_FastICSchemeMain_Model oItem in lsmain)
                {                    
@@ -115,14 +184,14 @@
                //保存
                //保存完毕后处理
                bool bResult;
                if (1 == 1)
                if (Convert.ToInt32(OperationType) == 1)
                {
                    // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                    bResult = oBill.AddBill(msg3, msg4, msg5, ref DBUtility.ClsPub.sExeReturnInfo);
                }
                else
                {
                    bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
                    bResult = oBill.ModifyBill(Convert.ToInt32(msg2), msg3, msg4, msg5, ref DBUtility.ClsPub.sExeReturnInfo);
                }
                if (bResult)
                {
@@ -153,5 +222,44 @@
            }
        }
        #endregion

        #region è¿‡æ»¤æ–¹æ¡ˆåˆ é™¤åŠŸèƒ½
        [Route("Xt_FastICScheme/DeltetXt_FastICScheme")]
        [HttpGet]
        public object DeltetXt_FastICScheme(string HInterID, string user)
        {
            try
            {               
                if (string.IsNullOrWhiteSpace(HInterID))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HInterID为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                oCN.BeginTran();//开始事务
                             
                oCN.RunProc("delete from xt_FastICSchemeMain where HInterID in (" + HInterID + ")");
                oCN.RunProc("delete from xt_FastICSchemeSub  where HInterID in (" + HInterID + ")");

                oCN.Commit();//提交事务
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "* æ•°æ®åˆ é™¤æˆåŠŸï¼";
                objJsonResult.data = null;
                return objJsonResult; ;

            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "删除失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}