SMT更新

Ben Lin

2024-05-08 b674ec171725dee1911483f0a1dbc0b3b9ad4ce5

SMT更新

 Tiger.Api/Controllers/MES/SMTController.Tool.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,32 @@
using Microsoft.AspNetCore.Mvc;
using Rhea.Common;
using System.Threading.Tasks;
using Tiger.IBusiness;
using Tiger.Model;

namespace Tiger.Api.Controllers.MES
{
    public partial class SMTController: ControllerBase
    {
        /// <summary>
        /// èŽ·å–未上料列表
        /// </summary>
        /// <param name="action"></param>
        /// <returns></returns>
        [HttpPost]
        [Route("api/[controller]/[action]")]
        public async Task<IActionResult> GetNotLoadingMaterial([FromBody] ApiAction<smtWoTableParams> action)
        {
            ApiAction response = new();
            try
            {
                response = response.GetResponse(await DI.Resolve<ISmtTool>().GetNotLoadingMaterial(action.Data));
            }
            catch (System.Exception ex)
            {
                response = response.GetResponse().CatchExceptionWithLog(ex);
            }
            return Ok(response);
        }
    }
}

 Tiger.Api/Controllers/MES/SMTController.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
using Microsoft.AspNetCore.Mvc;

namespace Tiger.Api.Controllers.MES
{
    /// <summary>
    /// 
    /// </summary>
    public partial class SMTController : ControllerBase
    {

    }
}

 Tiger.Business/MES/SMT/Biz.SmtTool.cs

@@ -12,6 +12,7 @@
using Tiger.IBusiness;
using static Tiger.Business.Biz;
using Microsoft.AspNetCore.Http;
using System.Collections;

namespace Tiger.Business
{
@@ -25,16 +26,34 @@
            /// <summary>
            /// èŽ·å–未上料列表
            /// </summary>
            /// <param name="itemCode"></param>
            /// <param name="lineCode"></param>
            /// <param name="pcbSurface"></param>
            /// <param name="moCode"></param>
            /// <param name="machineCode"></param>
            /// <param name="paras"></param>
            /// <returns></returns>
            /// <exception cref="NotImplementedException"></exception>
            public Task<ApiAction<SMT_PROD_TABLE>> GetNotLoadingMaterial(string itemCode, string lineCode, string pcbSurface, string moCode, string machineCode = null)
            public async Task<ApiAction<List<SMT_WO_TABLE>>> GetNotLoadingMaterial(smtWoTableParams paras)
            {
                throw new NotImplementedException();
                var res = new ApiAction<List<SMT_WO_TABLE>>();
                List<SMT_WO_TABLE> sList = new List<SMT_WO_TABLE>();
                try
                {
                    sList = Db.Queryable<SMT_WO_TABLE, SMT_LOADING>((t, l) =>
                                            new JoinQueryInfos(
                                                JoinType.Left,
                                                t.WORK_ORDER == l.WORK_ORDER
                                                && t.PROD_CODE == l.PROD_CODE
                                                && t.PCB_SURFACE == l.PCB_SURFACE
                                                && t.LINE_CODE == l.LINE_CODE
                                                && t.SLOT_NO == l.SLOT_NO
                                            ))
                                 .Where((t, l) => SqlFunc.IsNullOrEmpty(l.WORK_ORDER) && t.WORK_ORDER == paras.moCode && t.PROD_CODE == paras.prodCode && t.LINE_CODE == paras.lineCode && t.PCB_SURFACE == paras.pcbSurface)
                                 .WhereIF(SqlFunc.IsNullOrEmpty(paras.machineCode), (t, l) => t.SMT_CODE == paras.machineCode)
                                 .Select((t, l) => t)
                                 .ToList();
                }
                catch (Exception ex)
                {
                    res.CatchExceptionWithLog(ex, "查询异常");
                }
                res.Data = sList;
                return await Task.FromResult(res);
            }
        }
    }

 Tiger.IBusiness/MES/SMT/ISmtTool.cs

@@ -11,6 +11,6 @@
{
    public interface ISmtTool
    {
        public Task<ApiAction<SMT_PROD_TABLE>> GetNotLoadingMaterial(string itemCode, string lineCode, string pcbSurface, string moCode, string? machineCode = null);
        public Task<ApiAction<List<SMT_WO_TABLE>>> GetNotLoadingMaterial(smtWoTableParams paras);
    }
}

 Tiger.Model.Net/Entitys/MES/SMT_WO_TABLE.cs

@@ -126,4 +126,12 @@
        #endregion

    }//endClass

    public class smtWoTableParams { 
        public string prodCode { get; set; }
        public string lineCode { get; set; }
        public string pcbSurface { get; set; }
        public string moCode { get; set; }
        public string machineCode { get; set; }
    }
}