1

啊鑫

2024-10-08 1b8d10dbb20b513be61556021f8f471e506d92c3

 MES.Service/service/QC/RKJService.cs

@@ -483,6 +483,10 @@

        var barCodes = mesInvItemInsList.Select(s => s.ItemBarcode).ToList();

        var count = db.Queryable<MesInvItemBarcodes>()
            .Where(s => barCodes.Contains(s.ItemBarcode) && s.WorkFlg == 0)
            .Count();

        var gxId = mesInvItemInsList.Select(s => s.MesScgdGxId).ToList();

        var sumQty = mesInvItemInsList.Sum(s => s.Quantity);
@@ -494,6 +498,23 @@
                .SetColumns(s => s.CheckFlag == "√")
                .Where(s => gxId.Contains(s.Id))
                .ExecuteCommand();

            if (count <= 0) return;
            
            //取消mes_inv_item_barcodes 的报工标识 WORK_FLG 使用条码
            var executeCommand = db.Updateable<MesInvItemBarcodes>()
                .SetColumns(a => a.WorkFlg == 1)
                .Where(a => barCodes.Contains(a.ItemBarcode))
                .ExecuteCommand();

            if (executeCommand > 0)
            {
                //womdaa 已生产量 DAA011加回条码报工数量
                db.Updateable<Womdaa>()
                    .SetColumns(b => b.Daa011 == b.Daa011 + sumQty)
                    .Where(b => b.Daa001 == qsItemOqcReq.Daa001)
                    .ExecuteCommand();
            }
        }
        else if ("不合格".Equals(FcheckResu))
        {
@@ -608,6 +629,7 @@
            .Select((a, b, c, ca, m, da, z) => new QsItemOqcReq
            {
                BillNo = a.BillNo,
                Fsubmit = a.Fsubmit,
                Remarks = a.Remarks,
                Id = a.Id,
                CreateDate = a.CreateDate,
@@ -825,12 +847,13 @@
    private bool isRk(int? gid)
    {
        var db = SqlSugarHelper.GetInstance();
        return db.Queryable<QsItemOqcReq, MesInvItemIns, MesInvItemInCDetails>(
                (a, b, c) => new JoinQueryInfos(
        return db.Queryable<QsItemOqcReq, MesInvItemIns, MesInvItemInCDetails2,MesInvItemStocks>(
                (a, b, c,d) => new JoinQueryInfos(
                    JoinType.Inner, a.BillNo == b.BillNo,
                    JoinType.Inner, b.Id == c.ItemInId
                    JoinType.Inner, b.Id == c.ItemInId,
                    JoinType.Inner,c.ItemBarcode == d.ItemBarcode
                ))
            .Where((a, b, c) => a.Id == gid)
            .Where((a, b, c,d) => a.Id == gid)
            .Count() > 0;
    }
}