zgq
2021-03-26 8687516890dc64f5af301b75ef656d99c5c91055
Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-WEBAPI
2个文件已修改
77 ■■■■■ 已修改文件
WebAPI/Controllers/LMESController.cs 71 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/LMESController.cs
@@ -350,6 +350,77 @@
        }
        /// <summary>
        /// 返回委外工单列表
        /// </summary>
        /// <param name="sWhere"></param>
        /// <returns></returns>
        [Route("LEMS/MES_WW_EntrustWorkOrderBillMain_Json")]
        [HttpGet]
        public object MES_WW_EntrustWorkOrderBillMain_Json(string sWhere)
        {
            DataSet ds;
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select top 500 * from WW_EntrustWorkOrderBillMain ", "WW_EntrustWorkOrderBillMain");
                }
                else
                {
                    string sql1 = "select * from WW_EntrustWorkOrderBillMain where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    ds = oCN.RunProcReturn(sql, "WW_EntrustWorkOrderBillMain");
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
            return GetObjectJson(ds);
        }
        /// <summary>
        /// 返回委外工序汇报单列表
        /// </summary>
        /// <param name="sWhere"></param>
        /// <returns></returns>
        [Route("LEMS/MES_Sc_StationOutBillMain_Json")]
        [HttpGet]
        public object MES_Sc_StationOutBillMain_Json(string sWhere)
        {
            DataSet ds;
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select top 500 * from Sc_StationOutBillMain ", "Sc_StationOutBillMain");
                }
                else
                {
                    string sql1 = "select * from Sc_StationOutBillMain where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    ds = oCN.RunProcReturn(sql, "Sc_StationOutBillMain");
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
            return GetObjectJson(ds);
        }
        /// <summary>
        /// 返回工序委外接收单列表
        ///参数:string sql。
        ///返回值:object。
WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user
@@ -163,10 +163,10 @@
      <publishTime>03/24/2021 13:26:42</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>06/12/2020 17:45:15</publishTime>
      <publishTime>03/24/2021 15:45:15</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>03/24/2021 15:45:15</publishTime>
      <publishTime>03/25/2021 14:47:27</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>02/04/2021 21:35:21</publishTime>
@@ -340,7 +340,7 @@
      <publishTime>03/24/2021 16:19:16</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>03/24/2021 16:33:09</publishTime>
      <publishTime>03/24/2021 15:48:50</publishTime>
    </File>
  </ItemGroup>
</Project>