查看所有图片、查看所有不良描述、首检提交时防呆（是否上传图片，是否检验完成等）

zjh

2025-11-26 c2b8d20496542254930431e8e6a2954826a95910

 StandardPda/MESApplication/Controllers/QC/SJController.cs

@@ -1,4 +1,4 @@
using MES.Service.DB;
using MES.Service.DB;
using MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.service.QC;
@@ -323,7 +323,7 @@
            return ResponseResult.ResponseError(ex);
        }
    }
    

    //IqcQaSubmit
    [HttpPost("SJQaSubmit")]
    public ResponseResult SJQaSubmit(LLJDto rkjDto)
@@ -331,26 +331,33 @@
        try
        {
            OracleSQLHelper SQLHelper = new();

            //------------------ SN扫码校验 ------------------
            var sql1 =
                string.Format(
                    @"select SCAN_ITEM from ZMZ_TEST.MES_SJ_SCAN_ITEM_CK where mid='" + rkjDto.gid + "' and sn_no is null");
                @"select SCAN_ITEM 
              from ZMZ_TEST.MES_SJ_SCAN_ITEM_CK 
              where mid='" + rkjDto.gid + "' and sn_no is null";

            var dataTable1 = SQLHelper.ExecuteQuery(sql1);
            string msg = "";
            for (var i = 0; i < dataTable1.Rows.Count; i++)
            {
                msg = msg + "【"+dataTable1.Rows[i]["SCAN_ITEM"].ToString()+"】";
                msg += "【" + dataTable1.Rows[i]["SCAN_ITEM"].ToString() + "】";
            }
            if (msg != null && msg != "")

            if (!string.IsNullOrEmpty(msg))
            {
                return new ResponseResult
                {
                    status = 1,
                    message = msg+"未进行SN扫码确认!",
                    message = msg + "未进行SN扫码确认!",
                    data = ""
                };
            }

            //------------------ 图像一致性校验 ------------------
            var msg1 = new SJService().YzxImgVerify(rkjDto.gid.ToString());
            if (msg1[0]=="1")
            if (msg1[0] == "1")
            {
                return new ResponseResult
                {
@@ -359,10 +366,88 @@
                    data = ""
                };
            }

            //------------------ 不合格图片是否上传校验 ------------------
            var sql2 =
                @"select A.id, A.PROJ_NAME, B.id as id2
              from QS_ITEM_IPI_ITEM A
              left join MES_QS_IMAGE B on 777 || A.ID = B.FID
              where A.PID = '" + rkjDto.gid + @"' 
                and B.id is null 
                and IS_PASS = 0";

            var dt2 = SQLHelper.ExecuteQuery(sql2);
            if (dt2.Rows.Count > 0)
            {
                string err = "";
                for (int i = 0; i < dt2.Rows.Count; i++)
                {
                    err += "【" + dt2.Rows[i]["PROJ_NAME"].ToString() + "】";
                }

                return new ResponseResult
                {
                    status = 1,
                    message = err + "不合格图片未上传！",
                    data = ""
                };
            }

            //------------------ 必填项图片是否上传校验 ------------------
            var sql3 =
                @"select A.id, A.PROJ_NAME, B.id as id2
              from QS_ITEM_IPI_ITEM A
              left join MES_QS_IMAGE B on 777 || A.ID = B.FID
              where A.PID = '" + rkjDto.gid + @"'
                and B.id is null
                and UP_FILE = 1";

            var dt3 = SQLHelper.ExecuteQuery(sql3);
            if (dt3.Rows.Count > 0)
            {
                string err = "";
                for (int i = 0; i < dt3.Rows.Count; i++)
                {
                    err += "【" + dt3.Rows[i]["PROJ_NAME"].ToString() + "】";
                }

                return new ResponseResult
                {
                    status = 1,
                    message = err + "必填项图片未上传！",
                    data = ""
                };
            }

            //------------------ 新增校验：检查是否存在未完成（IS_PASS is null） ------------------
            var sqlPass =
                @"select ID, PROJ_NAME 
              from QS_ITEM_IPI_ITEM
              where PID = '" + rkjDto.gid + @"'
                and IS_PASS is null";

            var dtPass = SQLHelper.ExecuteQuery(sqlPass);
            if (dtPass.Rows.Count > 0)
            {
                string err = "";
                for (int i = 0; i < dtPass.Rows.Count; i++)
                {
                    err += "【" + dtPass.Rows[i]["PROJ_NAME"].ToString() + "】";
                }

                return new ResponseResult
                {
                    status = 1,
                    message = err + "项目未完成，不允许提交检验！",
                    data = ""
                };
            }

            //------------------ 主业务逻辑：提交 ------------------
            dynamic resultInfos = new ExpandoObject();
            var tbBillList =
                new SJService().SJQaSubmit(rkjDto);
            var tbBillList = new SJService().SJQaSubmit(rkjDto);
            resultInfos.tbBillList = tbBillList;

            return new ResponseResult
            {
                status = 0,
@@ -375,6 +460,7 @@
            return ResponseResult.ResponseError(ex);
        }
    }


    /// <summary>
    ///     获取一致性核对项目
@@ -557,4 +643,31 @@
        }
    }

    /// <summary>
    ///     获取首检单所有不良描述
    /// </summary>
    /// <param name="data"></param>
    /// <returns></returns>
    [HttpPost("getQSBlmsItem")]
    public ResponseResult getQSBlmsItem([FromBody] JObject data)
    {
        var id = data["id"]?.ToString();

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

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

}