Sop文件接口修改

yl

2022-12-05 3004bd5c7daa7d85ed691818ab96bde207aeeedc

Sop文件接口修改

 .vs/VueWebApi/v16/.suo

Binary files differ

 VueWebApi/Controllers/ProductionManagementController.cs

@@ -17,7 +17,7 @@
{
    [RoutePrefix(prefix: "api/ProductionManagement")]
    [ControllerGroup("生产管理", "在线接口")]
    //[ChannelActionFilter]
    [ChannelActionFilter]
    public class ProductionManagementController : ApiController
    {
        //定义全局信息返回变量
@@ -266,6 +266,23 @@
        }
        #endregion

        #region[MES工单工序任务查看SOP,获取SOP文件下拉列表]
        /// <summary>
        /// MES工单工序任务查看SOP,获取SOP文件下拉列表
        /// </summary>
        /// <param name="partcode">产品编码</param>
        /// <param name="routecode">工艺路线编码</param>
        /// <param name="stepcode">工序编码</param>
        /// <returns></returns>
        [Route(template: "SearchWorkStepSopList")]
        [HttpGet]
        public HttpResponseMessage SearchWorkStepSopList(string partcode,string routecode,string stepcode)
        {
            mes = ProductionManagementBLL.SearchWorkStepSopList(partcode, routecode, stepcode);
            return TJson.toJson(mes);
        }
        #endregion



        #region[生产开报工扫码获取工单对应工序任务(自制)]

 VueWebApi/DLL/BLL/ProductionManagementBLL.cs

@@ -90,6 +90,12 @@
        }
        #endregion

        #region[MES工单工序任务查看SOP,获取SOP文件下拉列表]
        public static ToMessage SearchWorkStepSopList(string partcode, string routecode,string stepcode)
        {
            return ProductionManagementDAL.SearchWorkStepSopList(partcode,routecode,stepcode);
        }
        #endregion




 VueWebApi/DLL/DAL/ProductionManagementDAL.cs

@@ -776,6 +776,40 @@
        }
        #endregion

        #region[MES工单工序任务查看SOP,获取SOP文件下拉列表]
        public static ToMessage SearchWorkStepSopList(string partcode, string routecode,string stepcode)
        {
            string sql = "";
            var dynamicParams = new DynamicParameters();
            try
            {
                //获取SOP文件信息
                sql = @"select id,define_name,file_path   from TK_Sop_Matfile where materiel_code=@partcode and eqptype_code in(
                        select distinct T.code  from TMateriel_Route A
                        inner join TFlw_Rtdt B on A.route_code=B.rout_code
                        inner join TFlw_Rteqp E on B.step_code=E.step_code
                        inner join TEqpInfo  Q on E.eqp_code=Q.code
                        inner join TEqpType T on Q.eqptype_code=T.code
                        where A.materiel_code=@partcode and A.route_code=@routecode and B.step_code=@stepcode)";
                dynamicParams.Add("@partcode", partcode);
                dynamicParams.Add("@routecode", routecode);
                dynamicParams.Add("@stepcode", stepcode);
                var data = DapperHelper.selectdata(sql, dynamicParams);
                mes.code = "200";
                mes.Message = "查询成功!";
                mes.data = data;
            }
            catch (Exception e)
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.data = null;
            }
            return mes;
        }
        #endregion



        #region[生产开报工扫码获取工单对应工序任务(自制)]

 VueWebApi/DLL/DAL/SystemSettingDAL.cs

@@ -365,7 +365,7 @@
            {
                if (search != "" && search != null)
                {
                    sech += "and concat(isnull(AA.partcode,''),isnull(AA.partname,''),isnull(AA.partname,''),isnull(AA.eqptype_name,''),isnull(AA.filetype_name,''),isnull(AA.file_name,''),isnull(AA.file_version,''),isnull(AA.username,'')) like '%@search%' ";
                    sech += "and concat(isnull(AA.partcode,''),isnull(AA.partname,''),isnull(AA.partspec,''),isnull(AA.eqptype_name,''),isnull(AA.filetype_name,''),isnull(AA.file_name,''),isnull(AA.file_version,''),isnull(AA.username,'')) like '%@search%' ";
                    dynamicParams.Add("@search", search);
                }
                if (check == "Y")
@@ -374,11 +374,11 @@
                    dynamicParams.Add("@rn", 1);
                }

                if (search == "")
                if (sech == "")
                {
                    sech = "and 1=1 ";
                }
                search = search.Substring(3);//截取索引2后面的字符
                sech = sech.Substring(3);//截取索引2后面的字符
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select AA.id,AA.partcode,AA.partname,AA.partspec,AA.eqptype_code,AA.eqptype_name,AA.filetype_code,AA.filetype_name,AA.file_name,AA.file_version,AA.file_path,
@@ -391,7 +391,7 @@
                            left  join TMateriel_Info M on A.materiel_code=M.partcode
                            left  join TEqpType T on A.eqptype_code=T.code
                            left  join TUser U on A.lm_user=U.usercode
                            ) as AA  where  " + sech + " order by AA.lm_date";
                            ) as AA  where  " + sech + "";
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                mes.code = "200";
                mes.Message = "查询成功!";
@@ -451,7 +451,7 @@
                {
                    mes.code = "200";
                    mes.Message = "获取版本号成功!";
                    mes.data = "V" + data.Rows[0]["version"].ToString();
                    mes.data = "V" + data.Rows[0]["file_version"].ToString();
                }
                else
                {
@@ -480,7 +480,7 @@
            {
                //写入SOP文件表
                sql = @"insert into TK_Sop_Matfile(materiel_code,eqptype_code,filetype_code,file_name,define_name,file_version,file_path,lm_user,lm_date)
                        values(@wksp_code,@title,@contents,@if_cancel,@cancel_date,@lm_user,@lm_date,@priority)";
                        values(@materiel_code,@eqptype_code,@filetype_code,@file_name,@define_name,@file_version,@file_path,@lm_user,@lm_date)";
                list.Add(new
                {
                    str = sql,

 VueWebApi/Logs/2022-12-05.TXT

 VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user

@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <_PublishTargetUrl>D:\网站发布\MES灵翔</_PublishTargetUrl>
    <History>True|2022-11-28T09:29:35.0448121Z;True|2022-11-21T15:13:51.4848378+08:00;True|2022-11-21T11:02:59.6984011+08:00;True|2022-11-21T10:55:50.7022834+08:00;True|2022-11-18T16:03:51.0449470+08:00;False|2022-11-18T16:03:09.4203709+08:00;True|2022-11-18T16:01:39.4591963+08:00;True|2022-11-18T15:18:55.9443587+08:00;True|2022-11-18T15:18:44.4492390+08:00;True|2022-11-18T13:29:22.9601475+08:00;True|2022-11-18T13:29:05.4108151+08:00;True|2022-11-18T13:25:30.9305617+08:00;True|2022-11-17T10:13:35.2543186+08:00;True|2022-11-16T11:50:20.8332089+08:00;True|2022-11-16T10:30:15.8662476+08:00;True|2022-11-16T09:54:50.9630719+08:00;True|2022-11-11T13:23:20.3484151+08:00;True|2022-11-09T13:07:34.9422662+08:00;True|2022-11-09T10:59:58.4912849+08:00;True|2022-11-09T10:11:04.4851324+08:00;True|2022-11-09T10:10:46.8698985+08:00;</History>
    <History>True|2022-12-05T08:40:51.0731150Z;True|2022-12-05T13:17:38.4883581+08:00;True|2022-12-05T13:16:11.2439234+08:00;True|2022-12-05T13:11:31.6502410+08:00;True|2022-12-05T13:06:31.8519147+08:00;True|2022-11-28T17:29:35.0448121+08:00;True|2022-11-21T15:13:51.4848378+08:00;True|2022-11-21T11:02:59.6984011+08:00;True|2022-11-21T10:55:50.7022834+08:00;True|2022-11-18T16:03:51.0449470+08:00;False|2022-11-18T16:03:09.4203709+08:00;True|2022-11-18T16:01:39.4591963+08:00;True|2022-11-18T15:18:55.9443587+08:00;True|2022-11-18T15:18:44.4492390+08:00;True|2022-11-18T13:29:22.9601475+08:00;True|2022-11-18T13:29:05.4108151+08:00;True|2022-11-18T13:25:30.9305617+08:00;True|2022-11-17T10:13:35.2543186+08:00;True|2022-11-16T11:50:20.8332089+08:00;True|2022-11-16T10:30:15.8662476+08:00;True|2022-11-16T09:54:50.9630719+08:00;True|2022-11-11T13:23:20.3484151+08:00;True|2022-11-09T13:07:34.9422662+08:00;True|2022-11-09T10:59:58.4912849+08:00;True|2022-11-09T10:11:04.4851324+08:00;True|2022-11-09T10:10:46.8698985+08:00;</History>
  </PropertyGroup>
  <ItemGroup>
    <File Include="Areas/HelpPage/HelpPage.css">
@@ -705,13 +705,13 @@
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/VueWebApi.dll">
      <publishTime>11/28/2022 17:29:26</publishTime>
      <publishTime>12/05/2022 16:40:41</publishTime>
    </File>
    <File Include="bin/VueWebApi.pdb">
      <publishTime>11/28/2022 17:29:26</publishTime>
      <publishTime>12/05/2022 16:40:41</publishTime>
    </File>
    <File Include="bin/VueWebApi.xml">
      <publishTime>11/28/2022 17:29:26</publishTime>
      <publishTime>12/05/2022 16:40:40</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>02/08/2013 16:42:28</publishTime>
@@ -1074,7 +1074,7 @@
      <publishTime>06/16/2022 13:39:23</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>11/28/2022 17:29:34</publishTime>
      <publishTime>12/05/2022 16:40:49</publishTime>
    </File>
  </ItemGroup>
</Project>

 VueWebApi/bin/VueWebApi.dll

Binary files differ

 VueWebApi/bin/VueWebApi.pdb

Binary files differ

 VueWebApi/bin/VueWebApi.xml

@@ -1966,6 +1966,15 @@
            <param name="wo_code">工单编号</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.SearchWorkStepSopList(System.String,System.String,System.String)">
            <summary>
            MES工单工序任务查看SOP,获取SOP文件下拉列表
            </summary>
            <param name="partcode">产品编码</param>
            <param name="routecode">工艺路线编码</param>
            <param name="stepcode">工序编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderStepSearch(System.String,System.Int32,System.Int32,System.String,System.String)">
            <summary>
            生产开报工扫码获取工单对应工序任务(自制)

 VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.dll

Binary files differ

 VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb

Binary files differ

 VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml

@@ -1966,6 +1966,15 @@
            <param name="wo_code">工单编号</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.SearchWorkStepSopList(System.String,System.String,System.String)">
            <summary>
            MES工单工序任务查看SOP,获取SOP文件下拉列表
            </summary>
            <param name="partcode">产品编码</param>
            <param name="routecode">工艺路线编码</param>
            <param name="stepcode">工序编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderStepSearch(System.String,System.Int32,System.Int32,System.String,System.String)">
            <summary>
            生产开报工扫码获取工单对应工序任务(自制)

 VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache

Binary files differ

 VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt

@@ -845,6 +845,7 @@
D:\新凯迪MES\MES项目\MES灵翔\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.resources.dll
D:\新凯迪MES\MES项目\MES灵翔\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.Deployment.resources.dll
D:\新凯迪MES\MES项目\MES灵翔\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.Razor.resources.dll
D:\新凯迪MES\MES项目\MES灵翔\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.AssemblyReference.cache
D:\新凯迪MES\MES项目\MES灵翔\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.CoreCompileInputs.cache
D:\新凯迪MES\MES项目\MES灵翔\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.CopyComplete
D:\新凯迪MES\MES项目\MES灵翔\VueWebApi\VueWebApi\obj\Release\VueWebApi.dll

 VueWebApi/obj/Release/VueWebApi.dll

Binary files differ

 VueWebApi/obj/Release/VueWebApi.pdb

Binary files differ