1.来料检list页面添加下拉框，可精准选择要筛选的项目 2.新建实验室送检接口

zjh

2025-03-27 71af12d1d4abf46e4d4ba89a8e64c8a8dc190362

1.来料检list页面添加下拉框，可精准选择要筛选的项目 2.新建实验室送检接口

 StandardPda/MES.Service/Dto/service/SysSubmit.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace MES.Service.Dto.service
{
    public class SysSubmit
    {
        public string? PI_BILLNO { get; set; }
        public string? PI_USER { get; set; }
        public string? PI_SAMPLE_STATUS { get; set; }
        public string? PI_SAMPLE_TYPE { get; set; }
        public string? PI_SAMPLE_REASON { get; set; }
        public string? PI_INSPECT_TYPE { get; set; }
        public string? PI_SAMPLE_PREPARATION { get; set; }
        public string? PI_URGENCY { get; set; }
        public string? PI_FIRMWAREVERSION { get; set; }
        public string? PI_HARDWAREVERSION { get; set; }
        public string? PI_REMARK { get; set; }
    }
}

 StandardPda/MES.Service/Dto/service/XJPageResult.cs

@@ -10,7 +10,12 @@
    public string? id { get; set; }

    /// <summary>
    ///     æœç´¢æ¡ä»¶ï¼Œæ ¹æ®æ­¤æ¡ä»¶ç­›é€‰ä¾›åº”商 ç‰©æ–™ç¼–码 ç‰©æ–™åç§°çš„数据
    ///     æœç´¢æ¡ä»¶ï¼Œå®žé™…用户输入的内容
    /// </summary>
    public string? SearchValue { get; set; }

    /// <summary>
    ///     ä¸‹æ‹‰æ¡†æœç´¢æ¡ä»¶
    /// </summary>
    public string? SelectedIndex { get; set; }
}

 StandardPda/MES.Service/service/QC/LljService.cs

@@ -51,14 +51,20 @@
            //    (a, b, c) => itemIds.Contains(a.ItemId))
            .WhereIF(id > 0, (a, b, d) => a.Id == id)
            .WhereIF(true, (a, b, d, e, f, g) => (g.Fcode == queryObj.createUser || g.Fcode == null))
        //加筛选条件,根据供应商，物料编码，物料名称搜索
        //.WhereIF(queryObj.SearchValue!=null && queryObj.SearchValue!="", (a) => a.SuppName == queryObj.SearchValue|| a.ItemName == queryObj.SearchValue || a.ItemNo == queryObj.SearchValue )
            .WhereIF(queryObj.SearchValue != null && queryObj.SearchValue != "",
            (a, b, d) => (a.SuppName.ToLower().Contains(queryObj.SearchValue.ToLower())
            || a.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower())
            || a.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower())
            || d.ProjectCodes.ToLower().Contains(queryObj.SearchValue.ToLower())
            ))
            //加筛选条件,根据供应商，物料编码，物料名称，项目搜索
            //.WhereIF(queryObj.SearchValue != null && queryObj.SearchValue != "",
            //(a, b, d) => (a.SuppName.ToLower().Contains(queryObj.SearchValue.ToLower())
            //|| a.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower())
            //|| a.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower())
            //|| d.ProjectCodes.ToLower().Contains(queryObj.SearchValue.ToLower())
            //))

            //根据下拉框搜索条件筛选（0项目, 1物料编号, 2物料名称, 3供应商, 4采购员）
            .WhereIF(queryObj.SelectedIndex == "0" && queryObj.SearchValue != null && queryObj.SearchValue != "", (a, b, d) => (d.ProjectCodes.ToLower().Contains(queryObj.SearchValue.ToLower())))
            .WhereIF(queryObj.SelectedIndex == "1" && queryObj.SearchValue != null && queryObj.SearchValue != "", (a, b, d) => (a.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower())))
            .WhereIF(queryObj.SelectedIndex == "2" && queryObj.SearchValue != null && queryObj.SearchValue != "", (a, b, d) => (a.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower())))
            .WhereIF(queryObj.SelectedIndex == "3" && queryObj.SearchValue != null && queryObj.SearchValue != "", (a, b, d) => (a.SuppName.ToLower().Contains(queryObj.SearchValue.ToLower())))
            .WhereIF(queryObj.SelectedIndex == "4" && queryObj.SearchValue != null && queryObj.SearchValue != "", (a, b, d, e) => (e.Fname.ToLower().Contains(queryObj.SearchValue.ToLower())))
            .OrderByDescending((a, b, d) => a.Id)
            .Select((a, b, d, e, f, g) => new LtsLlj
            {
@@ -192,7 +198,13 @@
    //}


    //根据检验标准来计算检验个数
    /// <summary>
    /// è°ƒç”¨å­˜å‚¨è¿‡ç¨‹ï¼Œé‡æ–°èŽ·å–检验项目
    /// </summary>
    /// <param name="itemNo"></param>
    /// <param name="quantity"></param>
    /// <param name="releaseNo"></param>
    /// <returns></returns>
    public string[] SetItems(string itemNo,
        decimal quantity, string releaseNo)
    {
@@ -229,7 +241,61 @@
        msg[1] = messageValue;
        return msg;

    }
    public string[] SaveSysSubmit(SysSubmit sysSubmit)
    {
        // å®šä¹‰è¾“出参数
        var outputResult = new SugarParameter("o_Result", null,
            DbType.Int32, ParameterDirection.Output,
            4000);

        var outputMessage = new SugarParameter("o_Msg", null,
            DbType.String,
            ParameterDirection.Output, 4000);

        // å®šä¹‰è¾“入参数
        var parameters = new List<SugarParameter>
        {
            new("PI_BILLNO", sysSubmit.PI_BILLNO,
          DbType.String, ParameterDirection.Input),
             new("PI_USER", sysSubmit.PI_USER,
          DbType.String, ParameterDirection.Input),
              new("PI_SAMPLE_STATUS", sysSubmit.PI_SAMPLE_STATUS,
          DbType.String, ParameterDirection.Input),
               new("PI_SAMPLE_TYPE", sysSubmit.PI_SAMPLE_TYPE,
          DbType.String, ParameterDirection.Input),
                new("PI_SAMPLE_REASON", sysSubmit.PI_SAMPLE_REASON,
          DbType.String, ParameterDirection.Input),
                 new("PI_INSPECT_TYPE", sysSubmit.PI_INSPECT_TYPE,
          DbType.String, ParameterDirection.Input),
                  new("PI_SAMPLE_PREPARATION", sysSubmit.PI_SAMPLE_PREPARATION,
          DbType.String, ParameterDirection.Input),
                   new("PI_URGENCY", sysSubmit.PI_URGENCY,
          DbType.String, ParameterDirection.Input),
                    new("PI_FIRMWAREVERSION", sysSubmit.PI_FIRMWAREVERSION,
          DbType.String, ParameterDirection.Input),
                     new("PI_HARDWAREVERSION", sysSubmit.PI_HARDWAREVERSION,
          DbType.String, ParameterDirection.Input),
                      new("PI_REMARK", sysSubmit.PI_REMARK,
          DbType.String, ParameterDirection.Input),
            outputResult,
            outputMessage
  };

        var db = SqlSugarHelper.GetInstance();

        // ä½¿ç”¨ SqlSugar æ‰§è¡Œå­˜å‚¨è¿‡ç¨‹
        db.Ado.ExecuteCommand(
            "BEGIN PRC_MES_IQC_QC_SYSSUBMIT(:PI_BILLNO,:PI_USER,:PI_SAMPLE_STATUS,:PI_SAMPLE_TYPE,:PI_SAMPLE_REASON,:PI_INSPECT_TYPE,:PI_SAMPLE_PREPARATION,:PI_URGENCY,:PI_FIRMWAREVERSION,:PI_HARDWAREVERSION,:PI_REMARK, :o_Result, :o_Msg); END;",
            parameters.ToArray());

        // èŽ·å–输出参数的值
        var resultValue = outputResult.Value?.ToString();
        var messageValue = outputMessage.Value?.ToString();
        string[] msg = new string[2];
        msg[0] = resultValue;
        msg[1] = messageValue;
        return msg;

    }
    private string ExtractSubstring(string input, char startChar, char endChar)

 StandardPda/MESApplication/Controllers/QC/LljController.cs

@@ -45,8 +45,8 @@
        try
        {
            dynamic resultInfos = new ExpandoObject();
    
            string[] msg= new LljService().SetItems(itemNo, quantity, releaseNo);

            string[] msg = new LljService().SetItems(itemNo, quantity, releaseNo);

            return new ResponseResult
            {
@@ -274,7 +274,11 @@
        }
    }

    //IqcQaSubmit
    /// <summary>
    /// èŽ·å–U9图纸数据
    /// </summary>
    /// <param name="data"></param>
    /// <returns></returns>
    [HttpPost("GetFileUrlByU9List")]
    public async Task<ResponseResult> GetFileUrlByU9List([FromBody] JObject data)
    {
@@ -310,4 +314,29 @@
            return ResponseResult.ResponseError(ex);
        }
    }
    /// <summary>
    /// å®žéªŒå®¤é€æ£€æ•°æ®ä¿å­˜
    /// </summary>
    /// <param name="sysSubmit">实验室送检数据</param>
    /// <returns></returns>
    [HttpPost("SaveSysSubmit")]
    public ResponseResult SaveSysSubmit(SysSubmit sysSubmit)
    {
        try
        {

            string[] msg = new LljService().SaveSysSubmit(sysSubmit);

            return new ResponseResult
            {
                status = int.Parse(msg[0]),
                message = msg[1],
                data = msg[1]
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }
}