修改入库检更新工单完工条件

zyf

2025-06-18 91489875fc8c9fd2b44c3791ca6f67dcf559675f

 MES.Service/service/QC/RKJService.cs

@@ -513,9 +513,27 @@
            {
                //womdaa 已生产量 DAA011加上条码报工数量
                db.Updateable<Womdaa>()
                    .SetColumns(b => b.Daa011 == b.Daa011 + sumQty)
                    .SetColumns(b => b.Daa011 == SqlFunc.IsNull(b.Daa011, 0) + sumQty)
                    .Where(b => b.Daa001 == qsItemOqcReq.Daa001)
                    .ExecuteCommand();

                //判断是否完工
                var complete = db.Queryable<Womdaa>()
                            .Where(a => a.Daa008 == a.Daa011 && a.Daa001== qsItemOqcReq.Daa001)
                            .Count();

                var WqtQty = db.Queryable<Womdab>()
                            .Where(a => a.Dab001 == qsItemOqcReq.Daa001)
                            .Sum(a => a.Dab006- SqlFunc.IsNull(a.Dab007, 0));

                if (complete > 0 && WqtQty == 0)  //齐套且工单生产数量=工单数量，工单更改为完工
                {
                    db.Updateable<Womdaa>()
                    .SetColumns(b => b.Daa018 == "完工")
                    .SetColumns(b => b.Daa017 == DateTime.Now)
                    .Where(b => b.Daa001 == qsItemOqcReq.Daa001)
                    .ExecuteCommand();
                }
            }
        }
        else if ("不合格".Equals(FcheckResu))
@@ -812,7 +830,7 @@
        });
    }

    public int saveItem(RKJDto rkjDto)
    public int saveItem(RKJDto rkjDto) //自动生成合格的检验项
    {
        var items = rkjDto.items;
        var userNo = rkjDto.userNo;
@@ -869,18 +887,32 @@
            .Select((a, b) => new {b.Quantity })
            .MergeTable().Sum( a=> a.Quantity);

        /*
        //更新生产量
        db.Updateable<Womdaa>()
                    .SetColumns(b => b.Daa011 == b.Daa011 + sumQty)
                    .SetColumns(b => b.Daa011 == SqlFunc.IsNull(b.Daa011, 0) + sumQty)
                    .Where(b => b.Daa001 == oqcReqList.Daa001)
                    .ExecuteCommand();

        //判断是否完工
        var complete = db.Queryable<Womdaa>()
                    .Where(a => a.Daa008 == a.Daa011 && a.Daa001 == oqcReqList.Daa001)
                    .Count();

        if (complete > 0)
        {
            db.Updateable<Womdaa>()
            .SetColumns(b => b.Daa018 == "完工")
            .Where(b => b.Daa001 == oqcReqList.Daa001)
            .ExecuteCommand();
        }

        */

        return Convert.ToInt32(rkjDto.gid);
    }

    public int cleanReqResult(RKJDto dto)
    public int cleanReqResult(RKJDto dto) //清除检验结果
    {
        if (isRk(dto.gid)) throw new Exception("已有条码入库，不允许清除检验结果");

@@ -947,7 +979,14 @@
        {
            //womdaa 已生产量 DAA011扣除条码报工数量
            db.Updateable<Womdaa>()
                .SetColumns(b => b.Daa011 == b.Daa011 - sumQty)
                .SetColumns(b => b.Daa011 == SqlFunc.IsNull(b.Daa011, 0) - sumQty)
                .Where(b => b.Daa001 == oqcReqList.Daa001)
                .ExecuteCommand();

            //工单状态更改为开工
            db.Updateable<Womdaa>()
                .SetColumns(b => b.Daa018 == "开工")
                .SetColumns(b => b.Daa017 == null)
                .Where(b => b.Daa001 == oqcReqList.Daa001)
                .ExecuteCommand();
        }