1

沈泽

2021-09-27 abd9a9d9ccdff4b77d23c88edb39c0284f365c7f

 WebAPI/Controllers/WebAPIController.cs

@@ -713,14 +713,8 @@
        /// <returns></returns>
        [Route("Web/GetMaterialList_Json")]
        [HttpGet]
        public object GetMaterialList_Json(string Material)
        public object GetMaterialList_Json(string sWhere)
        {
            sWhere = " Where HStopFlag=0  and HEndFlag=1";
            //sWhere = " Where HStopFlag=0  and HEndFlag=1  and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
            if (Material != "")
            {
                sWhere = sWhere + " and ( HNumber like '%" + Material + "%' or HName like '%" + Material + "%' ) ";
            }
            try
            {
                ds = webserver.GetMaterialList(sWhere, ref DBUtility.ClsPub.sErrInfo);
@@ -1243,22 +1237,22 @@
                    objJsonResult.data = null;
                    return objJsonResult; ;
                }
                var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
                if (HStopflag)
                {
                    oCN.RollBack();//回滚事务
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "数据已删除无法再次删除！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
                //if (HStopflag)
                //{
                //    oCN.RollBack();//回滚事务
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "数据已删除无法再次删除！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}

                oCN.RunProc("update Gy_BadReason set HStopflag=1 where HItemID=" + HItemID);
                oCN.RunProc("delete Gy_BadReason where HItemID=" + HItemID);
                oCN.Commit();//提交事务
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "* 数据删除成功！";
                objJsonResult.Message = "数据删除成功！";
                objJsonResult.data = null;
                return objJsonResult; ;