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

zzr99

2022-02-16 b5e4995f76fb6bca191d23378e089eea5c05ba5b

 WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs

@@ -56,11 +56,22 @@
                    ds = oCN.RunProcReturn(sql, "h_v_IF_ICMOReportBillList_Edit");
                }
              
                //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)