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

ch

2022-01-19 8a2f4c5977834d55b889bef3d01e1e02442b735c

 WebAPI/Controllers/LMESController.cs

@@ -246,7 +246,7 @@
                    return objJsonResult;
                }
                oCN.BeginTran();//开始事务
                ds = oCN.RunProcReturn("select * from Gy_RoutingBillSub where HInterID=" + lngBillKey, "Gy_RoutingBillSub");
                ds = oCN.RunProcReturn("select * from Gy_RoutingBillmain where HInterID=" + lngBillKey, "Gy_RoutingBillmain");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
@@ -255,12 +255,21 @@
                    objJsonResult.data = null;
                    return objJsonResult; ;
                }
                //string HChecker = Convert.ToString(ds.Tables[0].Rows[0]["HChecker"]);
                //if (HChecker != " ")
                string HChecker = Convert.ToString(ds.Tables[0].Rows[0]["HChecker"]);
                //string hdeleteman = Convert.ToString(ds.Tables[0].Rows[0]["hdeleteman"]);
                if (HChecker != "")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "单据已经审核,不能删除！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //if (hdeleteman != "")
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "单据已经审核,不能删除！";
                //    objJsonResult.Message = "单据已经作废,不能删除！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}