zjh
2025-04-14 8452ea0d86fcd34965c49b6f580dca0601c8f596
平板代码提交
已添加1个文件
已修改7个文件
320 ■■■■ 文件已修改
StandardPda/MES.Service/Dto/service/XJPageResult.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/Dto/webApi/ErpItems.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/Modes/InspectorChangeLog.cs 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/Modes/MesItems.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/BasicData/MesItemsManager.cs 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/LoginService.cs 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/QC/LljService.cs 176 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MESApplication/Controllers/QC/LljController.cs 66 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/Dto/service/XJPageResult.cs
@@ -18,4 +18,9 @@
    ///     ä¸‹æ‹‰æ¡†æœç´¢æ¡ä»¶
    /// </summary>
    public string? SelectedIndex { get; set; }
    /// <summary>
    ///   æœå…¨éƒ¨ï¼Œæˆ–者当前用户(默认0,当前用户,1:全部)
    /// </summary>
    public string? UserIndex { get; set; }
}
StandardPda/MES.Service/Dto/webApi/ErpItems.cs
@@ -39,4 +39,12 @@
    public string? PrivateDescSeg11 { get; set; }
    public string? PrivateDescSeg7 { get; set; }
    public string? PrivateDescSeg2 { get; set; }
    /// <summary>
    /// é‡‡è´­å‘˜
    /// </summary>
    public string? Merchandiser { get; set; }
    /// <summary>
    /// ä»“管员
    /// </summary>
    public string? WarehouseKeeper { get; set; }
}
StandardPda/MES.Service/Modes/InspectorChangeLog.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,42 @@
using SqlSugar;
namespace MES.Service.Modes
{
    [SugarTable("INSPECTOR_CHANGE_LOG")]
    public class InspectorChangeLog
    {
        /// <summary>
        /// ä¸»é”®ï¼Œå”¯ä¸€æ ‡è¯†
        /// </summary>
        [SugarColumn(ColumnName = "CHANGE_ID", IsPrimaryKey = true, IsIdentity = true)]
        public long ChangeId { get; set; }
        /// <summary>
        /// æ£€éªŒå•号
        /// </summary>
        [SugarColumn(ColumnName = "INSPECTION_NO", Length = 50, IsNullable = false)]
        public string? InspectionNo { get; set; }
        /// <summary>
        /// æ£€éªŒå‘˜
        /// </summary>
        [SugarColumn(ColumnName = "INSPECTOR", Length = 50, IsNullable = false)]
        public string? Inspector { get; set; }
        /// <summary>
        /// ä¿®æ”¹æ—¶é—´ï¼ˆé»˜è®¤å½“前时间)
        /// </summary>
        [SugarColumn(ColumnName = "CHANGE_TIME", DefaultValue = "SYSDATE")]
        public DateTime? ChangeTime { get; set; }
        /// <summary>
        /// ä¿®æ”¹äºº
        /// </summary>
        [SugarColumn(ColumnName = "CHANGED_BY", Length = 50, IsNullable = false)]
        public string? ChangedBy { get; set; }
        /// <summary>
        /// æ˜¯å¦æœ‰æ•ˆï¼ˆY:有效 N:无效)
        /// </summary>
        [SugarColumn(ColumnName = "IS_VALID", DefaultValue = "Y", Length = 1)]
        public string? IsValid { get; set; }
    }
}
StandardPda/MES.Service/Modes/MesItems.cs
@@ -522,4 +522,15 @@
    /// </summary>
    [SugarColumn(ColumnName = "Old_ITEM_NO")]
    public string? OldItemNo { get; set; }
    /// <summary>
    /// é‡‡è´­ä¸šåŠ¡å‘˜
    /// </summary>
    [SugarColumn(ColumnName = "MERCHANDISER")]
    public string? Merchandiser { get; set; }
    /// <summary>
    /// ä»“管员
    /// </summary>
    [SugarColumn(ColumnName = "WAREHOUSEKEEPER")]
    public string? WarehouseKeeper { get; set; }
}
StandardPda/MES.Service/service/BasicData/MesItemsManager.cs
@@ -147,7 +147,10 @@
                UseOrg = erpDetail.FUseOrgId,
                CreateDate = DateTime.Now,
                Company = "1000",
                Factory = "1000"
                Factory = "1000",
                WarehouseKeeper=item.WarehouseKeeper,
                Merchandiser=item.Merchandiser
            };
            list.Add(items);
        }
StandardPda/MES.Service/service/LoginService.cs
@@ -11,7 +11,12 @@
    public DataTable login(string name, string pwd)
    {
        var sql =
            string.Format(@"select * from SYS_USER where FCODE = '{0}'",
            string.Format(@"select A.*,B.ROLEIDS from SYS_USER A
                            left join (
                            SELECT LISTAGG(ROLEID, ',') WITHIN GROUP (ORDER BY ROLEID) AS ROLEIDS,userid
                            FROM SYS_USER_ROLE
                            GROUP BY userid
                            )B on b.USERID=a.FID where FCODE = '{0}'",
                name);
        var dataTable = SQLHelper.ExecuteQuery(sql);
        if (dataTable.Rows.Count <= 0) throw new Exception("用户不存在");
StandardPda/MES.Service/service/QC/LljService.cs
@@ -3,10 +3,12 @@
using MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.util;
using MySqlConnector;
using Newtonsoft.Json;
using SharpCompress.Factories;
using SqlSugar;
using System.Data;
using System.Xml.Linq;
using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;
using DbType = System.Data.DbType;
@@ -31,12 +33,14 @@
        var pageList = db
            .Queryable<LtsLlj, IqcBefore, VMesQaItemsDetect01, SysUser,
                IqcBeforeFrom, SysUser>((a, b, d, e, f, g) =>
                IqcBeforeFrom, SysUser, InspectorChangeLog, SysUser>((a, b, d, e, f, g,h,i) =>
                new JoinQueryInfos(JoinType.Left, a.ItemId == b.ItemId,
                    JoinType.Inner, a.Id == d.Id,
                    JoinType.Left, a.CreateBy == e.Fcode,
                    JoinType.Left, f.Id == b.PID,
                    JoinType.Left, f.Sid == g.Fid
                    JoinType.Left, f.Sid == g.Fid,
                    JoinType.Left,a.ReleaseNo==h.InspectionNo && h.IsValid=="Y",
                    JoinType.Left,i.Fcode==h.Inspector
                ))
            .WhereIF(
                StringUtil.IsNotNullOrEmpty(queryObj.result) &&
@@ -50,9 +54,7 @@
            //    itemIds is { Length: > 0 },
            //    (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.createUser!="PL017"&& queryObj.UserIndex=="0", (a, b, d, e, f, g,h, i) => (g.Fcode == queryObj.createUser || i.Fcode == queryObj.createUser))//判断此单的检验员,或者检验为空就显示此单据
            //加筛选条件,根据供应商,物料编码,物料名称,项目搜索
            //.WhereIF(queryObj.SearchValue != null && queryObj.SearchValue != "",
            //(a, b, d) => (a.SuppName.ToLower().Contains(queryObj.SearchValue.ToLower())
@@ -62,35 +64,17 @@
            //))
            //根据下拉框搜索条件筛选(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())))
            .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
            .Select((a, b, d, e, f, g,h,i) => new LtsLlj
            {
                UserName = g.Fname,
                //UserName = g.Fname,
                //UserName = (i.Fname!=null ||i.Fname!="") ? i.Fname : g.Fname,
                UserName = (i.Fname!=null ||i.Fname!="") ? i.Fname : g.Fname,
                FIRST = d.First,
                CreateUserName = e.Fname,
                NewFngDesc = d.NewFngDesc,
@@ -243,9 +227,9 @@
        var parameters = new List<SugarParameter>
        {
            new("P_RELEASE_NO", releaseNo,
                DbType.String, ParameterDirection.Input),
            outputResult,
            outputMessage
          DbType.String, ParameterDirection.Input),
      outputResult,
      outputMessage
        };
        var db = SqlSugarHelper.GetInstance();
@@ -262,7 +246,62 @@
        msg[0] = resultValue;
        msg[1] = messageValue;
        return msg;
    }
    /// <summary>
    /// ä¿å­˜æ–°æ£€éªŒå‘˜
    /// </summary>
    /// <param name="NewStaffUserID">新检验员ID</param>
    /// <param name="userID">修改人</param>
    /// <param name="releaseNo">检验单号</param>
    /// <returns></returns>
    public string[] SaveCheckBy(string NewStaffUserID, string userID, string releaseNo)
    {
        // å®šä¹‰è¾“出参数
        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("P_FCHECK_BY", NewStaffUserID,
          DbType.String, ParameterDirection.Input),
              new("p_Release_No", releaseNo,
          DbType.String, ParameterDirection.Input),
            new("p_User", userID,
          DbType.String, ParameterDirection.Input),
      outputResult,
      outputMessage
        };
        var db = SqlSugarHelper.GetInstance();
        // ä½¿ç”¨ SqlSugar æ‰§è¡Œå­˜å‚¨è¿‡ç¨‹
        db.Ado.ExecuteCommand(
            "BEGIN Prc_Mes_Iqc_Qa_Update_CheckBy(:P_FCHECK_BY,:p_Release_No,:p_User, :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;
    }
    public string[] SaveSysSubmit(SysSubmit sysSubmit)
    {
@@ -279,30 +318,30 @@
        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),
          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();
@@ -318,8 +357,8 @@
        msg[0] = resultValue;
        msg[1] = messageValue;
        return msg;
    }
    }
    private string ExtractSubstring(string input, char startChar, char endChar)
    {
        var startIndex = input.IndexOf(startChar);
@@ -434,6 +473,16 @@
                FcheckItemDesc = a.FcheckItemDesc
            }).ToList();
    }
    public DataTable getAllInspectors()
    {
         OracleSQLHelper SQLHelper = new();
         var sql =string.Format(@"select a.USER_NAME label,U.FCODE value from IQC_BEFORE_FROM a JOIN SYS_USER U ON U.FID=A.SID");
         return SQLHelper.ExecuteQuery(sql);
    }
    public int SetQSItemDetail(MesQaItemsDetectDetail12 detail)
    {
@@ -735,7 +784,7 @@
        return withOracle;
    }
    public bool IqcQaSubmit(LLJDto dto)
    public string[] IqcQaSubmit(LLJDto dto)
    {
        var (factory, company) = UserUtil.GetFactory(dto.userNo);
        try
@@ -774,10 +823,11 @@
            // èŽ·å–è¾“å‡ºå‚æ•°çš„å€¼
            var resultValue = outputResult.Value?.ToString();
            var messageValue = outputMessage.Value?.ToString();
            if ("1".Equals(resultValue)) throw new Exception(messageValue);
            return true;
            string[] msg = new string[2];
            msg[0] = resultValue;
            msg[1] = messageValue;
            return msg;
        }
        catch (Exception ex)
        {
StandardPda/MESApplication/Controllers/QC/LljController.cs
@@ -3,6 +3,7 @@
using MES.Service.service.QC;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using NetTaste;
using Newtonsoft.Json.Linq;
using System.Dynamic;
@@ -83,6 +84,35 @@
        }
    }
    [HttpPost("SaveCheckBy")]
    public ResponseResult SaveCheckBy([FromBody] JObject data)
    {
        try
        {
            var NewStaffName = data["NewStaffName"].ToString();
            var userID = data["userID"].ToString();
            var releaseNo = data["releaseNo"].ToString();
            var NewStaffUserID = data["NewStaffUserID"].ToString();
            string[] msg = new LljService().SaveCheckBy(NewStaffUserID, userID, releaseNo);
            return new ResponseResult
            {
                status = int.Parse(msg[0]),
                message = msg[1],
                data = msg[1]
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }
    //getItems
    [HttpPost("getJYItem")]
    public ResponseResult getJYItem([FromBody] JObject data)
@@ -108,6 +138,31 @@
            return ResponseResult.ResponseError(ex);
        }
    }
    /// <summary>
    /// èŽ·å–æ‰€æœ‰æ£€éªŒå‘˜ä¿¡æ¯
    /// </summary>
    /// <param name="data"></param>
    /// <returns></returns>
    [HttpPost("getAllInspectors")]
    public ResponseResult getAllInspectors([FromBody] JObject data)
    {
        try
        {
            var tbBillList = new LljService().getAllInspectors();
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = tbBillList
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }
    //getXjDetail02ById
    [HttpPost("getXjDetail02ById")]
@@ -258,14 +313,13 @@
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var tbBillList =
                new LljService().IqcQaSubmit(rkjDto);
            resultInfos.tbBillList = tbBillList;
            var msg = new LljService().IqcQaSubmit(rkjDto);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
                status = int.Parse(msg[0]),
                message = msg[1],
                data = msg[1]
            };
        }
        catch (Exception ex)