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

jhz

2022-09-22 81456046161696d3e1e31a8d9eb428f3b7a3442f

 WebAPI/Controllers/BLL/Xt_BillTypeController.cs

@@ -31,30 +31,31 @@
            {
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Xt_BillTypeList " + sWhere, "h_v_Xt_BillTypeList");
                    ds = oCN.RunProcReturn("select * from h_v_Xt_BillTypeList " + sWhere+ "  order by hitemid desc", "h_v_Xt_BillTypeList");
                }
                else
                {
                    string sql1 = "select * from h_v_Xt_BillTypeList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ "  order by hitemid desc";
                    ds = oCN.RunProcReturn(sql, "h_v_Xt_BillTypeList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }

                //if (ds.Tables[0].Rows.Count != 0 || ds != null)
                //{
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
                //}
                //else
                //{
                //objJsonResult.code = "0";
                //objJsonResult.count = 0;
                //objJsonResult.Message = "无数据";
                //objJsonResult.data = null;
                //return objJsonResult;
                //}
            }
            catch (Exception e)
            {
@@ -67,6 +68,195 @@
        }


        /// <summary>
        /// 单据类型列表修改方法
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Xt_BillType/xg")]
        [HttpGet]
        public object xg(long HInterID)
        {
            try
            {
                ds = oCN.RunProcReturn("select * from Xt_BillType where HItemID=" + HInterID, "Xt_BillType");

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        /// <summary>
        /// 获取最大基础资料ID
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Xt_BillType/GetMAXBillID")]
        [HttpGet]
        public object GetMAXBillID()
        {
            try
            {
                ds = oCN.RunProcReturn("select max(hitemid)+1 hitemid from Xt_BillType", "Xt_BillType");

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        /// <summary>
        /// 修改单据-保存按钮
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Xt_BillType/AddBill1")]
        [HttpPost]
        public object AddBill1([FromBody] JObject oMain)
        {

            try
            {
                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();
                string msg5 = sArray[3].ToString();
                //反序列化
                msg2 = "[" + msg2.ToString() + "]";
                List<BillType> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<BillType>>(msg2);

                long HItemID = int.Parse(msg3);
                string HNumber = list[0].HNumber;
                string HName = list[0].HName;
                string HTemplate = list[0].HTemplate;
                string HHeadTable = list[0].HHeadTable;
                string HEntryTable = list[0].HEntryTable;
                string HViewName = list[0].HViewName;
                string HRightName = list[0].HRightName;


               
                //若MAINDI重复则重新获取
                oCN.BeginTran();
                //主表
                oCN.RunProc("Update Xt_BillType set " +
                    " HNumber='" + HNumber + "'" +
                    ",HName='" + HName + "'" +
                    ",HTemplate='" + HTemplate + "'" +
                    ",HHeadTable='" + HHeadTable + "'" +
                    ",HEntryTable='" + HEntryTable + "'" +
                    ",HViewName='" + HViewName + "'" +
                    ",HRightName= '" + HRightName + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                //修改子项目代码
                //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
                //将上级 为非末级
                //
                oCN.Commit();
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "修改单据成功！";
                //objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.Message;
                objJsonResult.data = null;
                return objJsonResult;
            }
        }


        /// <summary>
        /// 新增单据-保存按钮
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Xt_BillType/AddBill")]
        [HttpPost]
        public object AddBill([FromBody] JObject oMain)
        {
            try
            {
                var _value = oMain["oMain"].ToString();
                string msg1 = _value.ToString();
                //反序列化
                msg1 = "[" + msg1.ToString() + "]";



                List<BillType> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<BillType>>(msg1);

                long HItemID = list[0].HItemID;
                string HNumber = list[0].HNumber;
                string HName = list[0].HName;
                string HTemplate = list[0].HTemplate;
                string HHeadTable = list[0].HHeadTable;
                string HEntryTable = list[0].HEntryTable;
                string HViewName = list[0].HViewName;
                string HRightName = list[0].HRightName;






                //若MAINDI重复则重新获取
                oCN.BeginTran();
                //主表
                oCN.RunProc("Insert Into Xt_BillType " +
                "(HNumber,HName,HTemplate,HHeadTable" +
                ",HEntryTable,HViewName,HRightName" +
                ") " +
                " values('" + HNumber + "','" + HName + "','" + HTemplate + "','" + HHeadTable + "'" +
                ",'" + HEntryTable + "','" + HViewName + "','" + HRightName + "'" +
              ") ");
                //修改上级为非末级代码
                oCN.Commit();
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "新增单据成功！";
                //objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.Message;
                objJsonResult.data = null;
                return objJsonResult;
            }
        }


        //
    }