1.条码表实体类型调整 2.条码库存表实体新增基础字段 3.期初入库新增入库人

南骏 池

2025-02-13 eda0c8f74ce453b6e43f88fc92b1e651ce5b6095

 service/Warehouse/MesItemBlManager.cs

@@ -14,12 +14,12 @@
    ///     获取生产补料单号列表
    /// </summary>
    /// <returns>补料单号列表</returns>
    public List<string> GetSCBLBillNo()
    public List<string> GetSCBLBillNo(WarehouseQuery query)
    {
        var list = Db.Queryable<MesItemBl>()
            .Where(s => (s.Bl018 ?? false) == true
                        && (s.Bl019 ?? false) == false
                        && s.Bl008 == "生产补料")
                        && s.Bl008 == query.Type)
            .Select(s => s.BlNo)
            .ToList();
        return list;
@@ -30,15 +30,16 @@
    /// </summary>
    /// <param name="billNo">补料单号</param>
    /// <returns>补料单明细列表</returns>
    public List<MesItemBlDetail> GetMesItemBlDetailByBillNo(
        WarehouseQuery query)
    public (string bl001, List<MesItemBlDetail> item)
        GetMesItemBlDetailByBillNo(
            WarehouseQuery query)
    {
        if (string.IsNullOrEmpty(query.billNo))
            throw new Exception("请选单据号！");

        // 检查补料单是否存在且为生产补料类型
        var mesItemBl = Db.Queryable<MesItemBl>()
            .Where(a => a.BlNo == query.billNo && a.Bl008 == "生产补料")
            .Where(a => a.BlNo == query.billNo && a.Bl008 == query.Type)
            .First();

        if (mesItemBl == null)
@@ -63,10 +64,11 @@
            })
            .ToList();

        return blDetails;
        return (mesItemBl.Bl001, blDetails);
    }

    /// <summary>
    /// 生产工单补料扫码
    ///     扫描条码  prc_rf_pda_scan_zout_barcode3
    /// </summary>
    /// <param name="query">查询参数</param>
@@ -78,11 +80,10 @@
    ///     - userName: 用户名
    ///     - blNo: 补料单号(必填)
    /// </remarks>
    public (bool success, List<PendingMaterialDto> pendingList) SctlScanBarcode(
        WarehouseQuery query)
    public (WarehouseQuery item, List<MesItemBlDetail> pendingList)
        ScblScanBarcode(
            WarehouseQuery query)
    {
        #region 参数校验

        if (string.IsNullOrEmpty(query.billNo))
            throw new Exception("请选取单据号！");

@@ -93,9 +94,8 @@
            throw new Exception("用户名不能为空！");

        if (string.IsNullOrEmpty(query.blNo))
            throw new Exception("补料单号不能为空！");
            throw new Exception("申请单号不能为空！");

        #endregion

        // 检验是否重复扫描
        var exists = Db.Queryable<MesInvItemOutCDetails>()
@@ -115,7 +115,7 @@

        // 检查补料单状态
        var mesItemBl = Db.Queryable<MesItemBl>()
            .Where(a => a.BlNo == query.blNo && (a.Bl018 ?? false) == false)
            .Where(a => a.BlNo == query.blNo)
            .First();

        if (mesItemBl == null)
@@ -164,25 +164,38 @@
                    new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
                .Where((a, b) => a.BlNo == query.blNo
                                 && (b.Bld007 ?? 0) - (b.Bld008 ?? 0) > 0)
                .Select((a, b) => new PendingMaterialDto
                .Select((a, b) => new MesItemBlDetail
                {
                    SectionCode = b.Bld012.ToString(),
                    ItemNo = b.Bld002,
                    ItemName = b.Bld003,
                    ItemSpec = b.Bld004,
                    PendingQty = (b.Bld007 ?? 0) - (b.Bld008 ?? 0)
                    Bld012 = b.Bld012,
                    Bld002 = b.Bld002,
                    Bld003 = b.Bld003,
                    Bld004 = b.Bld004,
                    Bld007 = b.Bld007,
                    Bld008 = b.Bld008
                })
                .ToList();

            return (false, pendingList);

            query.Num = stockBarcode.Quantity;
            query.Fum = quantity;

            return (query, pendingList);
        }

        // 开启事务处理
        var success = UseTransaction(db =>
        {
            var outNoType = "";
            if(query.Type == "生产补料")
            {
                outNoType = "BL(工单补料)";
            }else 
            {
                outNoType = "CL(工单超领)";
            }
            // 获取或创建出库单
            var outId = Guid.NewGuid();
            var outNo = BillNo.GetBillNo("SCBL");
            var outNo = BillNo.GetBillNo(outNoType);

            var existingOut = db.Queryable<MesInvItemOuts>()
                .Where(a => a.BbillNo == query.blNo
@@ -216,6 +229,7 @@
                    Remark = mesItemBl.Bl007,
                    DepotCode = womdab.Dab017,
                    OutPart = womdaa.Daa013,
                    OutType = query.Type,
                    FType = 0,
                    Factory = stockBarcode.Factory,
                    Company = stockBarcode.Company,
@@ -224,28 +238,25 @@
                    PbillNo = womdaa.Daa001,
                    OutDate = DateTime.Now,
                    Status = 0,
                    BbillNo = query.blNo
                    BbillNo = query.billNo
                }).IgnoreColumns(true).ExecuteCommand();
            }

            // 检查并更新出库单物料明细
            var itemCount = db.Queryable<MesInvItemOutItems>()
                .Where(i =>
                    i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId)
                    i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId && i.ItemOutId == outId && i.DepotId == stockBarcode.DepotsId.ToString())
                .Count();

            if (itemCount > 0)
            {
                // 更新已存在的物料明细数量
                db.Updateable<MesInvItemOutItems>()
                    .SetColumns(i =>
                        i.Quantity == i.Quantity + stockBarcode.Quantity)
                        i.TlQty == i.TlQty + stockBarcode.Quantity)
                    .Where(i =>
                        i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId)
                        i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId && i.ItemOutId == outId && i.DepotId == stockBarcode.DepotsId.ToString())
                    .ExecuteCommand();
            }
            else
            {
                // 插入新的物料明细记录
                db.Insertable(new MesInvItemOutItems
                {
@@ -253,6 +264,7 @@
                    ItemOutId = outId,
                    ItemNo = blDetail.Bld002,
                    Quantity = stockBarcode.Quantity,
                    TlQty = stockBarcode.Quantity,
                    CreateBy = query.userName,
                    CreateDate = DateTime.Now,
                    LastupdateBy = query.userName,
@@ -268,10 +280,10 @@
                    ErpAutoid = womdab.Erpid,
                    PbillNo = query.billNo,
                    ItemId = blDetail.Bld012,
                    DepotId = stockBarcode.DepotsId.ToString(),
                    // Unit = blDetail.Bld009,
                    // DepotId = (int)stockBarcode.DepotsId
                }).IgnoreColumns(true).ExecuteCommand();
            }

            // 插入出库单条码明细
            db.Insertable(new MesInvItemOutCDetails
@@ -332,7 +344,7 @@
                WorkNo = blDetail.Bld001, // Matches C_QTCK_D.Bld001
                WorkLine = blDetail.Bld013, // Matches C_QTCK_D.Bld013
                SuppNo = stockBarcode.SuppNo,
                ItemId = stockBarcode.ItemId,
                ItemId = stockBarcode.ItemId
                // CkDepot = stockBarcode.DepotsId
            }).IgnoreColumns(true).ExecuteCommand();

@@ -363,13 +375,11 @@
                .First();

            if ((blDetail1.Bld007 ?? 0) <= (blDetail1.Bld008 ?? 0))
            {
                // 更新明细完成状态
                db.Updateable<MesItemBlDetail>()
                    .SetColumns(it => it.Bld011 == 1)
                    .Where(it => it.Id == blDetail1.Id)
                    .ExecuteCommand();
            }

            // 更新库存数量为0
            db.Updateable<MesInvItemStocks>()
@@ -386,7 +396,6 @@
                .First();

            if (unfinishedDetail == null)
            {
                // 如果没有未完成的明细，更新补料单状态为已完成
                db.Updateable<MesItemBl>()
                    .SetColumns(it => new MesItemBl
@@ -397,7 +406,6 @@
                    })
                    .Where(it => it.Id == mesItemBl.Id)
                    .ExecuteCommand();
            }

            return 1;
        });
@@ -408,17 +416,18 @@
                    new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
            .Where((a, b) => a.BlNo == query.blNo
                             && (b.Bld007 ?? 0) - (b.Bld008 ?? 0) > 0)
            .Select((a, b) => new PendingMaterialDto
            .Select((a, b) => new MesItemBlDetail
            {
                SectionCode = b.Bld012.ToString(),
                ItemNo = b.Bld002,
                ItemName = b.Bld003,
                ItemSpec = b.Bld004,
                PendingQty = (b.Bld007 ?? 0) - (b.Bld008 ?? 0)
                Bld012 = b.Bld012,
                Bld002 = b.Bld002,
                Bld003 = b.Bld003,
                Bld004 = b.Bld004,
                Bld007 = b.Bld007,
                Bld008 = b.Bld008
            })
            .ToList();

        return (true, finalPendingList);
        return (query, finalPendingList);
    }

    /// <summary>
@@ -434,11 +443,9 @@
    ///     - Num: 发料数量(必填,必须大于0)
    ///     - blNo: 补料单号(必填)
    /// </remarks>
    public (bool success, List<PendingMaterialDto> pendingList) SplitBarcode(
    public (bool success, List<MesItemBlDetail> pendingList) SplitBarcode(
        WarehouseQuery query)
    {
        #region 参数校验

        if (string.IsNullOrEmpty(query.userName))
            throw new Exception("用户名不能为空！");

@@ -454,7 +461,6 @@
        if (string.IsNullOrEmpty(query.blNo))
            throw new Exception("补料单号不能为空！");

        #endregion

        // 检验是否重复扫描
        var exists = Db.Queryable<MesInvItemOutCDetails>()
@@ -471,7 +477,7 @@

        if (stockBarcode == null)
            throw new Exception($"库存中无此条码,请核对！{query.barcode}");
        

        var totalQty = stockBarcode.Quantity;
        string newBarcode = null;

@@ -511,8 +517,8 @@
                    // Mblnr = stockBarcode.Mblnr,
                    // Zeile = stockBarcode.Zeile,
                    // RohInId = stockBarcode.RohInId,
                    // BarcodeStatus = 0,
                    // OldQty = query.Num,
                    Barcodestatus = false,
                    Oldqty = query.Num as long?,
                    // Unit = stockBarcode.Unit,
                    // WeightUnit = stockBarcode.WeightUnit,
                    Factory = stockBarcode.Factory,
@@ -525,9 +531,10 @@
                    // MemoBad = stockBarcode.MemoBad,
                    ComeFlg = 5,
                    // Memo = stockBarcode.Memo,
                    SuppId = stockBarcode.SuppId,
                    SuppNo = stockBarcode.SuppNo,
                    // InsDate = stockBarcode.InsDate, // Added InsDate
                    ItemId = stockBarcode.ItemId,
                    InsDate = stockBarcode.IndepDate, // Added InsDate
                    ItemId = stockBarcode.ItemId
                    // ItemUnit = stockBarcode.ItemUnit // Added ItemUnit
                }).IgnoreColumns(true).ExecuteCommand();

@@ -567,7 +574,7 @@
                    WorkNo = stockBarcode.WorkNo,
                    WorkLine = stockBarcode.WorkLine,
                    SuppNo = stockBarcode.SuppNo,
                    ItemId = stockBarcode.ItemId,
                    ItemId = stockBarcode.ItemId
                    // UnitId = stockBarcode.ItemUnit
                }).IgnoreColumns(true).ExecuteCommand();

@@ -601,7 +608,7 @@
                    WorkLine = stockBarcode.WorkLine,
                    SuppNo = stockBarcode.SuppNo,
                    SuppId = stockBarcode.SuppId,
                    ItemId = stockBarcode.ItemId,
                    ItemId = stockBarcode.ItemId
                    // CkDepot = stockBarcode.DepotsId
                }).IgnoreColumns(true).ExecuteCommand();
            }
@@ -611,7 +618,7 @@
            }

            if (string.IsNullOrEmpty(newBarcode)) newBarcode = query.barcode;
            

            // 检查补料单状态
            var mesItemBl = Db.Queryable<MesItemBl>()
                .Where(a => a.BlNo == query.blNo && (a.Bl018 ?? false) == false)
@@ -652,7 +659,8 @@
                throw new Exception($"工单 {query.billNo} 不存在，请确认！");

            var womdab = Db.Queryable<Womdab>()
                .Where(b => b.Dab001 == query.billNo && b.Erpid == blDetail.Bld014)
                .Where(b =>
                    b.Dab001 == query.billNo && b.Erpid == blDetail.Bld014)
                .First();

            if (womdab == null)
@@ -660,13 +668,13 @@

            // 检查已发料数量是否超过待发料数量
            var sumQty = db.Queryable<MesInvItemOutCDetails>()
                .Where(it => it.TaskNo == query.blNo && it.ItemId == stockBarcode.ItemId)
                .Where(it =>
                    it.TaskNo == query.blNo && it.ItemId == stockBarcode.ItemId)
                .Sum(it => it.Quantity);

            if (sumQty > remainingQty)
            {
                throw new Exception($"拆分数量：{sumQty} 大于待发料数量：{remainingQty}，请核对！");
            }
                throw new Exception(
                    $"拆分数量：{sumQty} 大于待发料数量：{remainingQty}，请核对！");

            // 获取或创建出库单
            var itemOut = db.Queryable<MesInvItemOuts>()
@@ -683,7 +691,7 @@
            {
                // 创建新的出库单
                var outId = Guid.NewGuid();
                var outNo = BillNo.GetBillNo("SCBL");
                var outNo = BillNo.GetBillNo("BL(工单补料)");

                // 插入出库单主表
                executeCommand += db.Insertable(new MesInvItemOuts
@@ -720,7 +728,6 @@
                .Count();

            if (itemOutItemCount == 0)
            {
                // 插入新的出库单明细
                executeCommand += db.Insertable(new MesInvItemOutItems
                {
@@ -742,13 +749,11 @@
                    ErpId = womdab.Eid,
                    ErpAutoid = womdab.Erpid,
                    PbillNo = query.billNo,
                    ItemId = blDetail.Bld012,
                    ItemId = blDetail.Bld012
                    // Unit = blDetail.Bld009,
                    // DepotId = (int)stockBarcode.DepotsId
                }).IgnoreColumns(true).ExecuteCommand();
            }
            else
            {
                // 更新已有出库单明细数量
                executeCommand += db.Updateable<MesInvItemOutItems>()
                    .SetColumns(it => it.Quantity == it.Quantity + query.Num)
@@ -756,7 +761,6 @@
                        it.ItemOutId == itemOut.Guid &&
                        it.ItemId == stockBarcode.ItemId)
                    .ExecuteCommand();
            }

            // 插入出库条码明细
            executeCommand += db.Insertable(new MesInvItemOutCDetails
@@ -816,7 +820,7 @@
                WorkNo = blDetail.Bld001,
                WorkLine = blDetail.Bld013,
                SuppNo = stockBarcode.SuppNo,
                ItemId = stockBarcode.ItemId,
                ItemId = stockBarcode.ItemId
                // CkDepot = stockBarcode.DepotsId
            }).IgnoreColumns(true).ExecuteCommand();

@@ -848,13 +852,11 @@
                .First();

            if ((updatedDetail.Bld007 ?? 0) <= (updatedDetail.Bld008 ?? 0))
            {
                // 更新明细完成状态
                executeCommand += db.Updateable<MesItemBlDetail>()
                    .SetColumns(it => new MesItemBlDetail { Bld011 = 1 })
                    .Where(it => it.Id == blDetail.Id)
                    .ExecuteCommand();
            }

            // 检查是否还有未完成的明细

@@ -863,7 +865,6 @@
                .First();

            if (unfinishedDetail == null)
            {
                // 如果没有找到未完成明细，则更新补料单状态为已完成
                executeCommand += db.Updateable<MesItemBl>()
                    .SetColumns(it => new MesItemBl
@@ -874,8 +875,7 @@
                    })
                    .Where(it => it.Id == mesItemBl.Id)
                    .ExecuteCommand();
            }
            

            if (executeCommand <= 1) throw new Exception("更新失败");

            return executeCommand;
@@ -886,13 +886,14 @@
                new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
            .Where((a, b) => a.BlNo == query.blNo
                             && (b.Bld007 ?? 0) - (b.Bld008 ?? 0) > 0)
            .Select((a, b) => new PendingMaterialDto
            .Select((a, b) => new MesItemBlDetail
            {
                SectionCode = b.Bld012.ToString(),
                ItemNo = b.Bld002,
                ItemName = b.Bld003,
                ItemSpec = b.Bld004,
                PendingQty = (b.Bld007 ?? 0) - (b.Bld008 ?? 0)
                Bld012 = b.Bld012,
                Bld002 = b.Bld002,
                Bld003 = b.Bld003,
                Bld004 = b.Bld004,
                Bld007 = b.Bld007,
                Bld008 = b.Bld008
            })
            .ToList();

@@ -903,12 +904,12 @@

    #region 生产超领

    public List<string> GetSccList()
    public List<string> GetSccList(WarehouseQuery query)
    {
        var list = Db.Queryable<MesItemBl>()
            .Where(s => (s.Bl018 ?? false) == true
                        && (s.Bl019 ?? false) == false
                        && s.Bl008 == "生产超领")
                        && s.Bl008 == query.Type)
            .Select(s => s.BlNo)
            .ToList();
        return list;
@@ -919,15 +920,16 @@
    /// </summary>
    /// <param name="query">查询参数</param>
    /// <returns>生产超领单明细列表</returns>
    public List<MesItemBlDetail> GetMesItemBlDetailBySccBillNo(
        WarehouseQuery query)
    public (string bl001, List<MesItemBlDetail> item)
        GetMesItemBlDetailBySccBillNo(
            WarehouseQuery query)
    {
        if (string.IsNullOrEmpty(query.billNo))
            throw new Exception("请选单据号！");

        // 检查超领单是否存在且为生产超领类型
        // 检查超领单是否存在且为生产超领/委外超领类型
        var mesItemBl = Db.Queryable<MesItemBl>()
            .Where(a => a.BlNo == query.billNo && a.Bl008 == "生产超领")
            .Where(a => a.BlNo == query.billNo && a.Bl008 == query.Type)
            .First();

        if (mesItemBl == null)
@@ -967,7 +969,7 @@
            })
            .ToList();

        return pendingDetails;
        return (mesItemBl.Bl001, pendingDetails);
    }

    /// <summary>
@@ -982,7 +984,7 @@
    ///     - userName: 用户名(必填)
    ///     - blNo: 超领单号(必填)
    /// </remarks>
    public (bool success, List<PendingMaterialDto> pendingList)
    public (WarehouseQuery item, List<MesItemBlDetail> pendingList)
        ScanBarcodeForOverPicking(
            WarehouseQuery query)
    {
@@ -1086,24 +1088,28 @@
                    new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
                .Where((a, b) => a.BlNo == query.blNo
                                 && (b.Bld007 ?? 0) - (b.Bld008 ?? 0) > 0)
                .Select((a, b) => new PendingMaterialDto
                .Select((a, b) => new MesItemBlDetail
                {
                    SectionCode = b.Bld012.ToString(),
                    ItemNo = b.Bld002,
                    ItemName = b.Bld003,
                    ItemSpec = b.Bld004,
                    PendingQty = (b.Bld007 ?? 0) - (b.Bld008 ?? 0)
                    Bld012 = b.Bld012,
                    Bld002 = b.Bld002,
                    Bld003 = b.Bld003,
                    Bld004 = b.Bld004,
                    Bld007 = b.Bld007,
                    Bld008 = b.Bld008
                })
                .ToList();

            return (false, pendingList);
            query.Num = stockBarcode.Quantity;
            query.Fum = quantity;

            return (query, pendingList);
        }

        // 执行数据库事务
        UseTransaction(db =>
        {
            // 生成或获取出库单
            Guid outId = Guid.Empty;
            var outId = Guid.Empty;
            var outNo = "";
            var outRecord = db.Queryable<MesInvItemOuts>()
                .Where(a => a.BbillNo == query.blNo
@@ -1117,7 +1123,7 @@
            if (outRecord == null)
            {
                outId = Guid.NewGuid();
                outNo = BillNo.GetBillNo("SCBL"); // 需要实现生成单号的方法
                outNo = BillNo.GetBillNo("BL(工单补料)"); // 需要实现生成单号的方法

                // 插入出库单主表
                db.Insertable(new MesInvItemOuts
@@ -1157,7 +1163,6 @@
                .First();

            if (outItem == null)
            {
                // 插入出库单明细
                db.Insertable(new MesInvItemOutItems
                {
@@ -1177,13 +1182,11 @@
                    ErpId = womdab.Eid,
                    ErpAutoid = womdab.Erpid,
                    PbillNo = query.billNo,
                    ItemId = blDetail.Bld012,
                    ItemId = blDetail.Bld012
                    // Unit = blDetail.Bld009,
                    // DepotId = stockBarcode.DepotsId
                }).IgnoreColumns(true).ExecuteCommand();
            }
            else
            {
                // 更新出库单明细数量
                db.Updateable<MesInvItemOutItems>()
                    .SetColumns(it => new MesInvItemOutItems
@@ -1194,7 +1197,6 @@
                        it.ItemOutId == outId &&
                        it.ItemId == stockBarcode.ItemId)
                    .ExecuteCommand();
            }

            // 插入出库条码明细
            db.Insertable(new MesInvItemOutCDetails
@@ -1247,7 +1249,7 @@
                WorkLine = blDetail.Bld013,
                SuppNo = stockBarcode.SuppNo,
                SuppId = stockBarcode.SuppId,
                ItemId = stockBarcode.ItemId,
                ItemId = stockBarcode.ItemId
                // CkDepot = stockBarcode.DepotsId
            }).IgnoreColumns(true).ExecuteCommand();

@@ -1287,12 +1289,10 @@

            // 如果所有明细完成,更新超领单状态为已完成
            if (!hasUnfinished)
            {
                db.Updateable<MesItemBl>()
                    .SetColumns(it => it.Bl019 == true)
                    .Where(it => it.Id == mesItemBl.Id)
                    .ExecuteCommand();
            }

            return 1;
        });
@@ -1303,25 +1303,26 @@
                    new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
            .Where((a, b) => a.BlNo == query.blNo
                             && (b.Bld007 ?? 0) - (b.Bld008 ?? 0) > 0)
            .Select((a, b) => new PendingMaterialDto
            .Select((a, b) => new MesItemBlDetail
            {
                SectionCode = b.Bld012.ToString(),
                ItemNo = b.Bld002,
                ItemName = b.Bld003,
                ItemSpec = b.Bld004,
                PendingQty = (b.Bld007 ?? 0) - (b.Bld008 ?? 0)
                Bld012 = b.Bld012,
                Bld002 = b.Bld002,
                Bld003 = b.Bld003,
                Bld004 = b.Bld004,
                Bld007 = b.Bld007,
                Bld008 = b.Bld008
            })
            .ToList();

        return (true, finalPendingList);
        return (query, finalPendingList);
    }

    /// <summary>
    /// 生产超领打印条码
    ///     生产超领打印条码
    /// </summary>
    /// <param name="query">查询参数</param>
    /// <returns>处理结果</returns>
    public (bool success, List<PendingMaterialDto> pendingList)
    public (bool success, List<MesItemBlDetail> pendingList)
        PrintBarcodeForOverPicking(WarehouseQuery query)
    {
        UseTransaction(db =>
@@ -1526,7 +1527,7 @@
                itemOut = new MesInvItemOuts
                {
                    Guid = Guid.NewGuid(),
                    ItemOutNo = BillNo.GetBillNo("SCBL"), // 需要实现生成单号的方法
                    ItemOutNo = BillNo.GetBillNo("BL(工单补料)"), // 需要实现生成单号的方法
                    TaskNo = query.blNo,
                    CreateBy = query.userName,
                    CreateDate = DateTime.Now,
@@ -1560,7 +1561,6 @@
                .Count();

            if (itemOutItemCount == 0)
            {
                // 插入新的出库单明细
                db.Insertable(new MesInvItemOutItems
                {
@@ -1582,13 +1582,11 @@
                    ErpId = workOrderDetail.Eid,
                    ErpAutoid = workOrderDetail.Erpid,
                    PbillNo = query.billNo,
                    ItemId = blDetail.Bld012,
                    ItemId = blDetail.Bld012
                    // Unit = blDetail.Bld009,
                    // DepotId = stockBarcode.DepotsId
                }).IgnoreColumns(true).ExecuteCommand();
            }
            else
            {
                // 更新已有出库单明细数量
                db.Updateable<MesInvItemOutItems>()
                    .SetColumns(it => it.Quantity == it.Quantity + query.Num)
@@ -1596,7 +1594,6 @@
                        it.ItemOutId == itemOut.Guid &&
                        it.ItemId == stockBarcode.ItemId)
                    .ExecuteCommand();
            }

            // 插入出库明细记录
            db.Insertable(new MesInvItemOutCDetails
@@ -1685,13 +1682,11 @@
                .First();

            if ((blDetail1.Bld007 ?? 0) <= (blDetail1.Bld008 ?? 0))
            {
                // 更新明细完成状态
                db.Updateable<MesItemBlDetail>()
                    .SetColumns(it => it.Bld011 == 1)
                    .Where(it => it.Id == blDetail1.Id)
                    .ExecuteCommand();
            }

            // 检查是否所有明细都已完成
            var hasUnfinished = db.Queryable<MesItemBlDetail>()
@@ -1700,29 +1695,31 @@

            // 如果所有明细完成,更新补料单状态为已完成
            if (!hasUnfinished)
            {
                db.Updateable<MesItemBl>()
                    .SetColumns(it => it.Bl019 == true)
                    .Where(it => it.Id == mesItemBl.Id)
                    .ExecuteCommand();
            }

            return 1;
        });


        // 获取最终的待处理列表
        // 获取补料单明细中未完成的记录
        // 通过左连接查询补料单(MesItemBl)和补料单明细(MesItemBlDetail)表
        // 条件: 1.补料单号匹配 2.计划数量(Bld007)减去已补数量(Bld008)大于0(即未完成的)
        var pendingList = Db.Queryable<MesItemBl, MesItemBlDetail>((a, b) =>
                new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
            .Where((a, b) => a.BlNo == query.blNo
                             && (b.Bld007 ?? 0) - (b.Bld008 ?? 0) > 0)
            .Select((a, b) => new PendingMaterialDto
            .Select((a, b) => new MesItemBlDetail
            {
                SectionCode = b.Bld012.ToString(),
                ItemNo = b.Bld002,
                ItemName = b.Bld003,
                ItemSpec = b.Bld004,
                PendingQty = (b.Bld007 ?? 0) - (b.Bld008 ?? 0)
                Bld012 = b.Bld012, // 物料ID
                Bld002 = b.Bld002, // 物料编号
                Bld003 = b.Bld003, // 物料名称
                Bld004 = b.Bld004, // 物料规格
                Bld007 = b.Bld007, // 计划数量
                Bld008 = b.Bld008 // 已补数量
            })
            .ToList();