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

zzr99

2022-03-09 a4b3efa1f5d800d56f600b33aaf36022e5dc49d7

 WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs

@@ -91,22 +91,23 @@
                    string sql = sql1 + sWhere+ " order by 日期 desc,hmainid desc";
                    ds = oCN.RunProcReturn(sql, "h_v_IF_POInStockBillList");
                }
                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)
            {
@@ -349,6 +350,7 @@
                        Ids = ""
                    };
                    var loginRet = InvokeHelper.Login();
                    
                    var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
                    if (isSuccess == 0)
                    {