首检巡检，入库检验

啊鑫

5 天以前 a3a5db87cd11f10efd42eee49e7977c5360e1b55

首检巡检，入库检验

 MES.Service/Modes/QsItemIpiItem.cs

@@ -156,11 +156,25 @@
    [StringLength(32, ErrorMessage = "Picturename长度不能超出32")]
    public string? Picturename { get; set; }

    [Column("Remarks")]
    [SugarColumn(ColumnName = "Remarks")] //用于SqlSugar
    [Column("REMARKS")]
    [SugarColumn(ColumnName = "REMARKS")] //用于SqlSugar
    [StringLength(200, ErrorMessage = "备注不能超出200")]
    public string? Remarks { get; set; }

    /// <summary>
    ///     线长查看(默认0)
    /// </summary>
    [Column("IS_XZ")]
    [SugarColumn(ColumnName = "IS_XZ")] //用于SqlSugar
    public decimal? IsXz { get; set; }

    /// <summary>
    ///     检验查看(默认0)
    /// </summary>
    [Column("IS_JY")]
    [SugarColumn(ColumnName = "IS_JY")] //用于SqlSugar
    public decimal? IsJy { get; set; }

    [SugarColumn(IsIgnore = true)] public string? result { get; set; }
    [SugarColumn(IsIgnore = true)] public string? imageData { get; set; }
}

 MES.Service/service/QC/RKJService.cs

@@ -233,9 +233,11 @@
            xj.CreateBy = userNo;
            xj.CreateDate = DateTime.Now;

            var pid = db.Insertable(xj).ExecuteReturnIdentity();
            // var pid = db.Insertable(xj).ExecuteReturnIdentity();

            xj.Id = pid;
            var pid = (int)xj.Id;

            // xj.Id = pid;

            rkjDto.gid = pid;

@@ -459,33 +461,28 @@
        var db = SqlSugarHelper.GetInstance();
        var totalCount = 0;

        // 获取用户关联的线体编号
        string[] lineNo = null;
        if (!string.IsNullOrEmpty(queryObj.createUser))
        {
            lineNo = _baseService.getUserLineNo(queryObj.createUser);
        }

        var query = db.Queryable<QsItemOqcReq, MesItems, Womdaa>((a, b, da) =>
        var query = db.Queryable<QsItemOqcReq, MesItems, Womdaa,MesLine>((a, b, da,c) =>
            new JoinQueryInfos(
                JoinType.Left, a.ItemNo == b.ItemNo,       // 关联物料信息
                JoinType.Left, a.BillNo == da.Daa001        // 关联工单信息
                JoinType.Left, a.BillNo == da.Daa001,       // 关联工单信息
                JoinType.Left, da.Daa015 == c.LineNo        // 关联工单信息
            ))
            // 用户线体过滤条件
            //.WhereIF(lineNo != null && lineNo.Length > 0 && !"PL017".Equals(queryObj.createUser),
            //    (a, b, da) => lineNo.Contains(da.Daa015))
            // ID精确查询
            .WhereIF(!string.IsNullOrEmpty(queryObj.id),
                (a, b, da) => a.Id.ToString() == queryObj.id)
                (a, b, da,c) => a.Id.ToString() == queryObj.id)
            // 完成状态过滤
            .WhereIF("未完成".Equals(queryObj.result), (a, b, da) => a.FcheckResu == null)
            .WhereIF(!"未完成".Equals(queryObj.result), (a, b, da) => a.FcheckResu != null)
            .WhereIF("未完成".Equals(queryObj.result), (a, b, da,c) => a.FcheckResu == null)
            .WhereIF(!"未完成".Equals(queryObj.result), (a, b, da,c) => a.FcheckResu != null)
            // 搜索条件（物料名称/编号）
            .WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue),
                (a, b, da) => b.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower()) ||
                (a, b, da,c) => b.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower()) ||
                              a.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower()))
            // 查询字段
            .Select((a, b, da) => new QsItemOqcReq
            .Select((a, b, da,c) => new QsItemOqcReq
            {
                Id = a.Id,
                BillNo = a.BillNo,
@@ -500,7 +497,9 @@
                ReleaseNo = a.ReleaseNo,
                Remarks = a.Remarks,
                Daa015 = da.Daa015,  // 工单线体
                Fsubmit = a.Fsubmit
                Fsubmit = a.Fsubmit,
                Quantity = da.Daa008,
                LineNo = c.LineName
            })
            // 排序
            .OrderBy(a => a.CreateDate, OrderByType.Desc);

 MES.Service/service/QC/SJService.cs

@@ -60,7 +60,7 @@
                StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
                !"未完成".Equals(queryObj.Result),
                a => a.Result != "未完成")
            .OrderBy(a => a.BillNo, OrderByType.Desc);
            .OrderBy(a => a.CreateTime, OrderByType.Desc);
             var totalCount = data.Count();
        var items = data.ToPageList(queryObj.PageIndex, queryObj.Limit);

@@ -394,7 +394,7 @@

        detail.CreateBy = detail.UpdateBy;

        withOracle += autoResult(detail);
        // withOracle += autoResult(detail);

        return withOracle;
    }
@@ -511,4 +511,21 @@
        }
    }

    /// <summary>
    /// 更新QsItemIpiItem的IsPass值
    /// </summary>
    /// <param name="id">QsItemIpiItem的ID</param>
    /// <param name="isPass">IsPass的值(0表示不合格,1表示合格)</param>
    /// <returns>更新影响的行数</returns>
    public int UpdateQsItemIpiItemIsPass(decimal id, decimal isPass)
    {
        return SqlSugarHelper.UseTransactionWithOracle(db =>
        {
            return db.Updateable<QsItemIpiItem>()
                .SetColumns(s => s.IsPass == isPass)
                .Where(s => s.Id == id)
                .ExecuteCommand();
        });
    }

}

 MES.Service/service/QC/XJService.cs

@@ -111,6 +111,8 @@
    {
        var db = SqlSugarHelper.GetInstance();

        int totalCount = 0;

        var id = Convert.ToDecimal(queryObj.id);

        string[]? lineNo = null;
@@ -154,8 +156,7 @@
                FcheckResu = s.FcheckResu,
                Remarks = s.Remarks
            }).OrderBy(s => s.CreateDate, OrderByType.Desc);
           var totalCount = query.Count();
        var items = query.ToPageList(queryObj.PageIndex, queryObj.Limit);
        var items = query.ToPageList(queryObj.PageIndex, queryObj.Limit,ref totalCount);

        return (items, totalCount);
    }

 MESApplication/Controllers/QC/SJController.cs

@@ -342,4 +342,45 @@
        }
    }

    /// <summary>
    /// 更新QsItemIpiItem的IsPass值
    /// </summary>
    /// <param name="data">包含id和isPass的JSON对象</param>
    /// <returns>更新结果</returns>
    [HttpPost("UpdateQsItemIpiItemIsPass")]
    public ResponseResult UpdateQsItemIpiItemIsPass([FromBody] JObject data)
    {
        try
        {
            var id = data["id"]?.ToString();
            var isPass = data["isPass"]?.ToString();

            if (string.IsNullOrEmpty(id) || string.IsNullOrEmpty(isPass))
            {
                return new ResponseResult
                {
                    status = 1,
                    message = "参数不能为空",
                    data = null
                };
            }

            dynamic resultInfos = new ExpandoObject();
            var sjService = new SJService();
            var result = sjService.UpdateQsItemIpiItemIsPass(Convert.ToDecimal(id), Convert.ToDecimal(isPass));
            resultInfos.tbBillList = result;
            
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }

}