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

沈泽

2021-11-17 b380a9370d23b3642c6bcd0757b807ce93e8e382

 WebAPI/Controllers/Sc_MouldRepairInBillListController - .cs

@@ -791,44 +791,6 @@
            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_MoveStockBillList order by 日期 desc", "h_v_IF_MoveStockBillList");
        }
        #endregion

        /// <summary>
        /// 生产领料单列表
        /// </summary>
        /// <returns></returns>
        [Route("Kf_MateOutBill/GetMateOutBillList")]
        [HttpGet]
        public object GetMateOutBillList(string sWhere)
        {
            try
            {
                ds = Sc_GetMateOutBillList(sWhere);
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "返回记录成功！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception ex)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录！" + ex.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        #region sql语句


        public static DataSet Sc_GetMateOutBillList(string sWhere)
        {
            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_MateOutBillList order by 日期 desc", "h_v_IF_MateOutBillList");
        }
        #endregion


        /// <summary>
        /// 销售出库单列表
        /// </summary>