代码提交

zjh

2025-09-09 e2b45bdeb78aadb0987082695c7fa367073da607

代码提交

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

@@ -1,5 +1,6 @@
using MES.Service.DB;
using MES.Service.Modes;
using SqlSugar;

namespace MES.Service.service.QC;

@@ -50,4 +51,18 @@
        });
        return mesQsImages;
    }
    public List<MesQsImage> getLljAllImgByFid(string id, string qsType)
    {
        var db = SqlSugarHelper.GetInstance();
        var mesQsImages = db
            .Queryable<MesQsImage, MesQaItemsDetectDetail5>((a, b) =>
                new JoinQueryInfos(JoinType.Left, a.Fid == b.Id))
            .Where((a, b) => b.ReleaseNo == id && a.Id != null).ToList();
        mesQsImages.ForEach(s =>
        {
            if (s.ImageData is { Length: > 0 })
                s.base64Date = Convert.ToBase64String(s.ImageData);
        });
        return mesQsImages;
    }
}

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

@@ -95,7 +95,16 @@

        return SQLHelper.ExecuteQuery(sql1);
    }
    public DataTable getBlmsItem(string id)
    {
        OracleSQLHelper SQLHelper = new();
        //查不良描述
        var sql1 = string.Format(
            @"select FCHECK_ITEM,FUNIT from mes_qa_items_detect_detail5 f where RELEASE_NO='" +
            id + "' and FUNIT is not null order by FCHECK_ITEM");

        return SQLHelper.ExecuteQuery(sql1);
    }
    private decimal[] GetQaItem(SqlSugarClient db, string? user)
    {
        var itemsId = db.Queryable<MesItems>()

 StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs

@@ -235,12 +235,12 @@

                var parameters1 = new[]
                {
            new OracleParameter(":ticketNo", asnInfo.tickeNo ?? (object)DBNull.Value),
            new OracleParameter(":snNo", asnInfo.snNo ?? (object)DBNull.Value),
            new OracleParameter(":workstationNo", asnInfo.workstationNo ?? (object)DBNull.Value),
            new OracleParameter(":snState", asnInfo.snState ?? (object)DBNull.Value),
            new OracleParameter(":loginId", asnInfo.loginId ?? (object)DBNull.Value),
            new OracleParameter(":turnoverCode", asnInfo.turnoverCode ?? (object)DBNull.Value)
            new OracleParameter("ticketNo", asnInfo.tickeNo ?? (object)DBNull.Value),
            new OracleParameter("snNo", asnInfo.snNo ?? (object)DBNull.Value),
            new OracleParameter("workstationNo", asnInfo.workstationNo ?? (object)DBNull.Value),
            new OracleParameter("snState", asnInfo.snState ?? (object)DBNull.Value),
            new OracleParameter("loginId", asnInfo.loginId ?? (object)DBNull.Value),
            new OracleParameter("turnoverCode", asnInfo.turnoverCode ?? (object)DBNull.Value)
        };

                int i = sqlHelper.ExecuteNonQueryWithTransaction(sql1, parameters1, connection, transaction);
@@ -264,11 +264,11 @@

                        var parameters2 = new[]
                        {
                    new OracleParameter(":defectIssue", item.DefectIssue ?? (object)DBNull.Value),
                    new OracleParameter(":rootCause", item.RootCause ?? (object)DBNull.Value),
                    new OracleParameter(":repairMethod", item.RepairMethod ?? (object)DBNull.Value),
                    new OracleParameter(":materialHandling", item.MaterialHandling ?? (object)DBNull.Value),
                    new OracleParameter(":loginId", asnInfo.loginId ?? (object)DBNull.Value)
                    new OracleParameter("defectIssue", item.DefectIssue ?? (object)DBNull.Value),
                    new OracleParameter("rootCause", item.RootCause ?? (object)DBNull.Value),
                    new OracleParameter("repairMethod", item.RepairMethod ?? (object)DBNull.Value),
                    new OracleParameter("materialHandling", item.MaterialHandling ?? (object)DBNull.Value),
                    new OracleParameter("loginId", asnInfo.loginId ?? (object)DBNull.Value)
                };

                        sqlHelper.ExecuteNonQueryWithTransaction(sql2, parameters2, connection, transaction);
@@ -289,7 +289,7 @@
                        {
                            // 校验
                            var checkSql = "SELECT COUNT(1) FROM MES_SN_PART_BINDING WHERE PART_SN_NO = :partSn";
                            var checkParams = new[] { new OracleParameter(":partSn", partSn ?? (object)DBNull.Value) };
                            var checkParams = new[] { new OracleParameter("partSn", partSn ?? (object)DBNull.Value) };
                            var exists = Convert.ToInt32(sqlHelper.ExecuteScalarWithTransaction(connection, transaction, checkSql, checkParams));

                            if (exists > 0)
@@ -299,24 +299,25 @@

                            // 插入绑定
                            var sqlBind = @"
                        INSERT INTO MES_SN_PART_BINDING
                           (ID, SN_NO, PART_SN_NO, PART_NAME_CN, CREATE_DATE, CREATE_USER)
                           VALUES (SEQ_MES_SN_PART_BINDING.NEXTVAL,
                                   :snNo,
                                   :partSn,
                                   :partName,
                                   SYSDATE,
                                   :user)";
    INSERT INTO MES_SN_PART_BINDING
       (ID, SN_NO, PART_SN_NO, PART_NAME_CN, CREATE_DATE, CREATE_USER)
       VALUES (SEQ_MES_SN_PART_BINDING.NEXTVAL,
               :snNo,
               :partSn,
               :partName,
               SYSDATE,
               :createUser)";

                            var bindParams = new[]
                            {
                        new OracleParameter(":snNo", snNo ?? (object)DBNull.Value),
                        new OracleParameter(":partSn", partSn ?? (object)DBNull.Value),
                        new OracleParameter(":partName", partName ?? (object)DBNull.Value),
                        new OracleParameter(":user", user ?? (object)DBNull.Value)
                    };
    new OracleParameter("snNo", snNo ?? (object)DBNull.Value),
    new OracleParameter("partSn", partSn ?? (object)DBNull.Value),
    new OracleParameter("partName", partName ?? (object)DBNull.Value),
    new OracleParameter("createUser", user ?? (object)DBNull.Value)
};

                            sqlHelper.ExecuteNonQueryWithTransaction(sqlBind, bindParams, connection, transaction);


                            // 插入日志
                            var sqlLog = @"
@@ -327,7 +328,7 @@
                                   :partSn,
                                   :partName,
                                   SYSDATE,
                                   :user,
                                   :createUser,
                                   0)";

                            sqlHelper.ExecuteNonQueryWithTransaction(sqlLog, bindParams, connection, transaction);
@@ -342,8 +343,8 @@

                            var unbindParams = new[]
                            {
                        new OracleParameter(":snNo", snNo ?? (object)DBNull.Value),
                        new OracleParameter(":partSn", partSn ?? (object)DBNull.Value)
                        new OracleParameter("snNo", snNo ?? (object)DBNull.Value),
                        new OracleParameter("partSn", partSn ?? (object)DBNull.Value)
                    };

                            sqlHelper.ExecuteNonQueryWithTransaction(sqlUnbind, unbindParams, connection, transaction);
@@ -357,15 +358,15 @@
                                   :partSn,
                                   :partName,
                                   SYSDATE,
                                   :user,
                                   :Puser,
                                   1)";

                            var logParams = new[]
                            {
                        new OracleParameter(":snNo", snNo ?? (object)DBNull.Value),
                        new OracleParameter(":partSn", partSn ?? (object)DBNull.Value),
                        new OracleParameter(":partName", partName ?? (object)DBNull.Value),
                        new OracleParameter(":user", user ?? (object)DBNull.Value)
                        new OracleParameter("snNo", snNo ?? (object)DBNull.Value),
                        new OracleParameter("partSn", partSn ?? (object)DBNull.Value),
                        new OracleParameter("partName", partName ?? (object)DBNull.Value),
                        new OracleParameter("Puser", user ?? (object)DBNull.Value)
                    };

                            sqlHelper.ExecuteNonQueryWithTransaction(sqlLog, logParams, connection, transaction);
@@ -390,6 +391,7 @@
        }



        /// <summary>
        /// 设置中箱码（绑定/解绑 SN）
        /// </summary>

 StandardPda/MESApplication/Controllers/QC/BaseController.cs

@@ -81,4 +81,32 @@
            return ResponseResult.ResponseError(ex);
        }
    }
    /// <summary>
    ///     获取来料检单个检验单上传的所有图片
    /// </summary>
    /// <param name="data"></param>
    /// <returns></returns>
    [HttpPost("getLljAllImgByFid")]
    public ResponseResult getLljAllImgByFid([FromBody] JObject data)
    {
        var id = data["id"].ToString();
        var qsType = data["qsType"].ToString();
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var tbBillList =
                new BaseService().getLljAllImgByFid(id, qsType);
            resultInfos.tbBillList = tbBillList;
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }
}

 StandardPda/MESApplication/Controllers/QC/LljController.cs

@@ -511,4 +511,30 @@
            return ResponseResult.ResponseError(ex);
        }
    }
    /// <summary>
    ///     获取检验单所有不良描述
    /// </summary>
    /// <param name="data"></param>
    /// <returns></returns>
    [HttpPost("getJYBlmsItem")]
    public ResponseResult getJYBlmsItem([FromBody] JObject data)
    {
        var id = data["id"]?.ToString();

        try
        {
            var tbBillList = new LljService().getBlmsItem(id);

            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = tbBillList
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }
}