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

ch

2022-10-20 e79ef1f195754b2afdc8e1e149d64774c7757ad9

 WebAPI/Controllers/XSGL/Xs_SeOutStockBackBillController.cs

@@ -27,36 +27,47 @@
        /// </summary>
        [Route("Xs_SeOutStockBackBill/list")]
        [HttpGet]
        public object list(string sWhere)
        public object list(string sWhere,string user)
        {
            try
            {
                //判断是否有查询权限
                if (!DBUtility.ClsPub.Security_Log("Xs_SeOutStockBackBillQuery", 1, false, 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_IF_SeOutStockBackBillList " + sWhere, "h_v_IF_SeOutStockBackBillList");
                    ds = oCN.RunProcReturn("select * from h_v_IF_SeOutStockBackBillList order by hmainid desc", "h_v_IF_SeOutStockBackBillList");
                }
                else
                {
                    string sql1 = "select * from h_v_IF_SeOutStockBackBillList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by hmainid desc";
                    ds = oCN.RunProcReturn(sql, "h_v_IF_SeOutStockBackBillList");
                }
                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)
            {
@@ -75,10 +86,20 @@
        /// <returns></returns>
        [Route("Xs_SeOutStockBackBill/DeltetSeOutStockBackBill")]
        [HttpGet]
        public object DeltetSeOutStockBackBill(string HInterID)
        public object DeltetSeOutStockBackBill(string HInterID,string user)
        {
            try
            {
                //判断是否有删除权限
                if (!DBUtility.ClsPub.Security_Log("Xs_SeOutStockBackBill_Drop", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无权限删除!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                oCN.BeginTran();
                oCN.RunProc("Delete From Xs_SeOutStockBackBillMain where HInterID = " + HInterID);
                oCN.RunProc("Delete From Xs_SeOutStockBackBillSub where HInterID = " + HInterID);