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

yangle

2022-08-01 baaa9227a9e0b720ce2f4bca20b18d270982ee93

 WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs

@@ -189,14 +189,14 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (HSourceID == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "生产资源没有选择！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //if (HSourceID == 0)
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "生产资源没有选择！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                if (HCenterID == 0)
                {
                    objJsonResult.code = "0";
@@ -213,14 +213,14 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (HWorkTimes <= 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "工时必须大于0！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //if (HWorkTimes <= 0)
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "工时必须大于0！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //if (HEmpID2 == 0 )
                //{
                //    objJsonResult.code = "0";
@@ -438,22 +438,23 @@
                    string sql = sql1 + sWhere+ "  order by hmainid desc";
                    ds = oCN.RunProcReturn(sql, "h_v_MES_StationOutBillList");
                }
                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)
            {
@@ -1148,5 +1149,7 @@
        }
        #endregion


        
    }
}