1.生产补料优化 2.首检开发-v1

南骏 池

2025-06-02 1be2fc056943ba8b9e62328430e15beee03e8a9f

 service/Warehouse/MesItemBlManager.cs

@@ -1,6 +1,8 @@
using NewPdaSqlServer.DB;
using Masuit.Tools;
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
using NewPdaSqlServer.entity.Base;
using NewPdaSqlServer.util;
using SqlSugar;

@@ -14,12 +16,13 @@
    ///     获取生产补料单号列表
    /// </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.Bl019 ?? false) == false
                        && s.Bl008 == query.Type)
            .OrderByDescending(s => s.Bl006)
            .Select(s => s.BlNo)
            .ToList();
        return list;
@@ -30,7 +33,7 @@
    /// </summary>
    /// <param name="billNo">补料单号</param>
    /// <returns>补料单明细列表</returns>
    public (string bl001, List<MesItemBlDetail> item)
    public ProductionPickDto
        GetMesItemBlDetailByBillNo(
            WarehouseQuery query)
    {
@@ -39,35 +42,60 @@

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

        if (mesItemBl == null)
            throw new Exception("单据号不正确！");
            throw new Exception("单据号不存在或未审核！");

        if (mesItemBl.Bl019 == true)
            throw new Exception("单据号已完成！");
        //if (mesItemBl.Bl019 == true)
        //    throw new Exception("单据号已完成！");

        // 获取未完成的补料单明细
        var blDetails = Db.Queryable<MesItemBl, MesItemBlDetail>((a, b) =>
                new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
            .Where((a, b) => a.BlNo == query.billNo
                             && (b.Bld007 ?? 0) - (b.Bld008 ?? 0) > 0)
            .Select((a, b) => new MesItemBlDetail
            {
                Bld012 = b.Bld012,
                Bld002 = b.Bld002,
                Bld003 = b.Bld003,
                Bld004 = b.Bld004,
                Bld007 = b.Bld007,
                Bld008 = b.Bld008
            })
            .ToList();
        //// 获取未完成的补料单明细
        //var blDetails = Db.Queryable<MesItemBl, MesItemBlDetail>((a, b) =>
        //        new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
        //    .Where((a, b) => a.BlNo == query.billNo
        //                     && (b.Bld007 ?? 0) - (b.Bld008 ?? 0) > 0)
        //    .Select((a, b) => new MesItemBlDetail
        //    {
        //        Bld012 = b.Bld012,
        //        Bld002 = b.Bld002,
        //        Bld003 = b.Bld003,
        //        Bld004 = b.Bld004,
        //        Bld007 = b.Bld007,
        //        Bld008 = b.Bld008
        //    })
        //    .ToList();

        return (mesItemBl.Bl001, blDetails);
        //return (mesItemBl.Bl001, blDetails);
        var sql = string.Format(@"SELECT c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel,A.BLD007 FQty,A.BLD008 SQty,A.BLD007 - A.BLD008 DSQty,
       dbo.F_QX_GETRECODEPOTSE(A.bld012) as RecoKw,D.daa001
fROM MES_ITEM_BL_DETAIL A
         LEFT JOIN MES_ITEM_BL B ON A.MID = B.ID
         LEFT JOIN MES_ITEMS C ON A.bld012 = CAST(C.item_id AS VARCHAR(50))
         LEFT JOIN WOMDAA D ON B.about_guid = D.guid
WHERE B.bl_no = '{0}'", query.billNo);

        var womdabs = Db.Ado.SqlQuery<ItemDetailModel>(sql);


        var DS_list = womdabs.Where(s => s.DSQty > 0).ToList();

        var YS_list = womdabs.Where(s => s.SQty > 0).ToList();

        var dto = new ProductionPickDto
        {
            daa001 = womdabs[0].DAA001,
            //PlanNo = womcaa.Caa020,
            items = DS_list,
            Ysitems = YS_list
        };

        return dto;
    }

    /// <summary>
    /// 生产工单补料扫码
    ///     扫描条码  prc_rf_pda_scan_zout_barcode3
    /// </summary>
    /// <param name="query">查询参数</param>
@@ -80,11 +108,11 @@
    ///     - blNo: 补料单号(必填)
    /// </remarks>
    public (WarehouseQuery item, List<MesItemBlDetail> pendingList)
        SctlScanBarcode(
        ScblScanBarcode(
            WarehouseQuery query)
    {
        if (string.IsNullOrEmpty(query.billNo))
            throw new Exception("请选取单据号！");
        //if (string.IsNullOrEmpty(query.billNo))
        //    throw new Exception("请选取单据号！");

        if (string.IsNullOrEmpty(query.barcode))
            throw new Exception("请扫描条码！");
@@ -93,7 +121,7 @@
            throw new Exception("用户名不能为空！");

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


        // 检验是否重复扫描
@@ -112,9 +140,13 @@
        if (stockBarcode == null)
            throw new Exception($"库存中无此条码,请核对！{query.barcode}");

        var depots = Db.Queryable<MesDepots>()
            .Where(t => t.DepotId == stockBarcode.DepotId)
            .First();

        // 检查补料单状态
        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)
@@ -139,6 +171,16 @@
        var quantity = (blDetail.Bld007 ?? 0) - (blDetail.Bld008 ?? 0);
        if (quantity == 0)
            throw new Exception("物料已扫码完成，请核对！");


        if(stockBarcode.Quantity >  quantity)
        {
            query.status = 2;
            query.message = "条码库存大于需领，请拆分！";
            query.CfNum = quantity;
            query.Num = stockBarcode.Quantity;
            return (query, []);
        }

        // 检查工单信息
        var womdaa = Db.Queryable<Womdaa>()
@@ -184,13 +226,21 @@
        // 开启事务处理
        var success = UseTransaction(db =>
        {
            var outNoType = "";
            if(query.Type == "生产补料")
            {
                outNoType = "SCBL(生产补料)";
            }else 
            {
                outNoType = "SCCL(生产超领)";
            }
            // 获取或创建出库单
            var outId = Guid.NewGuid();
            var outNo = BillNo.GetBillNo("BL(工单补料)");
            var outNo = BillNo.GetBillNo(outNoType);

            var existingOut = db.Queryable<MesInvItemOuts>()
                .Where(a => a.BbillNo == query.blNo
                            && a.DepotCode == womdab.Dab017
                .Where(a => a.TaskNo == query.blNo
                            && a.DepotId == stockBarcode.DepotId
                            && a.OutDate.Value.Date.ToString("yyyy-MM-dd") ==
                            DateTime.Now.Date.ToString("yyyy-MM-dd")
                            && a.BillTypeId == 200
@@ -218,8 +268,9 @@
                    BillTypeId = 200,
                    TransactionNo = 209,
                    Remark = mesItemBl.Bl007,
                    DepotCode = womdab.Dab017,
                    DepotCode = depots.DepotCode,
                    OutPart = womdaa.Daa013,
                    OutType = query.Type,
                    FType = 0,
                    Factory = stockBarcode.Factory,
                    Company = stockBarcode.Company,
@@ -228,23 +279,25 @@
                    PbillNo = womdaa.Daa001,
                    OutDate = DateTime.Now,
                    Status = 0,
                    BbillNo = query.blNo
                    DepotId = stockBarcode.DepotId,
                    THORGID = stockBarcode.StockOrgId,
                    //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
                // 插入新的物料明细记录
@@ -254,13 +307,14 @@
                    ItemOutId = outId,
                    ItemNo = blDetail.Bld002,
                    Quantity = stockBarcode.Quantity,
                    TlQty = stockBarcode.Quantity,
                    CreateBy = query.userName,
                    CreateDate = DateTime.Now,
                    LastupdateBy = query.userName,
                    LastupdateDate = DateTime.Now,
                    Factory = stockBarcode.Factory,
                    Company = stockBarcode.Company,
                    DepotCode = womdab.Dab017,
                    DepotCode = depots.DepotCode,
                    TaskNo = query.blNo,
                    WorkNo = womdaa.Daa021,
                    WorkLine = blDetail.Bld013,
@@ -268,7 +322,9 @@
                    ErpId = womdab.Eid,
                    ErpAutoid = womdab.Erpid,
                    PbillNo = query.billNo,
                    ItemId = blDetail.Bld012
                    ItemId = blDetail.Bld012,
                    DepotId = stockBarcode.DepotsId.ToString(),
                    ItemDabid = blDetail.Id,
                    // Unit = blDetail.Bld009,
                    // DepotId = (int)stockBarcode.DepotsId
                }).IgnoreColumns(true).ExecuteCommand();
@@ -287,7 +343,7 @@
                CreateDate = DateTime.Now,
                LastupdateBy = query.userName,
                LastupdateDate = DateTime.Now,
                DepotCode = stockBarcode.DepotsCode,
                DepotCode = depots.DepotCode,
                DepotSectionCode = stockBarcode.DepotSectionsCode,
                Remark = blDetail.Bld010,
                Factory = stockBarcode.Factory,
@@ -301,7 +357,7 @@
                PbillNo = query.billNo,
                ItemId = blDetail.Bld012,
                Unit = blDetail.Bld009,
                DepotId = (int)stockBarcode.DepotsId,
                DepotId = (int)stockBarcode.DepotId,
                EbelnK3id = womdab.Eid,
                LineK3id = womdab.Erpid
            }).IgnoreColumns(true).ExecuteCommand();
@@ -312,7 +368,7 @@
                Guid = Guid.NewGuid(),
                Status = 1,
                BillTypeId = 200, // p_bill_type_id
                TransactionCode = "210", // p_transaction_no
                TransactionCode = "209", // p_transaction_no
                BusinessType = -1,
                ItemBarcode = stockBarcode.ItemBarcode,
                ItemNo = stockBarcode.ItemNo,
@@ -345,7 +401,7 @@
                    Dab020 = (it.Dab020 ?? 0) + stockBarcode.Quantity,
                    Dab021 = (it.Dab021 ?? 0) + stockBarcode.Quantity
                })
                .Where(it => it.Id == womdab.Id && it.Dab003 == womdab.Dab003)
                .Where(it => it.Guid == womdab.DaaGuid && it.Dab003 == womdab.Dab003)
                .ExecuteCommand();

            // 更新补料单明细已补数量
@@ -443,7 +499,7 @@
        if (string.IsNullOrEmpty(query.barcode))
            throw new Exception("请扫描条码！");

        if (query.Num <= 0)
        if ((query.Num ?? 0) <= 0)
            throw new Exception("请输入正确的发料数量！");

        if (string.IsNullOrEmpty(query.blNo))
@@ -469,6 +525,16 @@
        var totalQty = stockBarcode.Quantity;
        string newBarcode = null;

        var outNoType = "";
        if (query.Type == "生产补料")
        {
            outNoType = "SCBL(生产补料)";
        }
        else
        {
            outNoType = "SCCL(生产超领)";
        }

        // 开启事务处理
        var success = UseTransaction(db =>
        {
@@ -481,7 +547,7 @@
                    .Where(s => s.Id == stockBarcode.ItemId).First();

                // 生成新条码号
                newBarcode = BillNo.GetBillNo("TMBH(条码编号)", mesItems.ItemNo);
                newBarcode = BillNo.GetBillNo("TM(条码)", mesItems.ItemNo);

                // 写入新条码
                executeCommand += db.Insertable(new MesInvItemBarcodes
@@ -505,8 +571,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,
@@ -519,32 +585,39 @@
                    // MemoBad = stockBarcode.MemoBad,
                    ComeFlg = 5,
                    // Memo = stockBarcode.Memo,
                    SuppId = stockBarcode.SuppId,
                    SuppNo = stockBarcode.SuppNo,
                    // InsDate = stockBarcode.InsDate, // Added InsDate
                    InsDate = stockBarcode.IndepDate, // Added InsDate
                    ItemId = stockBarcode.ItemId
                    // ItemUnit = stockBarcode.ItemUnit // Added ItemUnit
                }).IgnoreColumns(true).ExecuteCommand();

                // 更新原条码数量
                executeCommand += db.Updateable<MesInvItemBarcodes>()
                    .SetColumns(it => it.Quantity == totalQty - query.Num)
                    .SetColumns(it => it.Quantity == it.Quantity - query.Num)
                    .Where(it => it.ItemBarcode == query.barcode)
                    .ExecuteCommand();

                // 删除原条码库存记录
                executeCommand += db.Deleteable<MesInvItemStocks>()
                // 更新原条码数量
                executeCommand += db.Updateable<MesInvItemStocks>()
                    .SetColumns(it => it.Quantity == it.Quantity - query.Num)
                    .Where(it => it.ItemBarcode == query.barcode)
                    .ExecuteCommand();

                //// 删除原条码库存记录
                //executeCommand += db.Deleteable<MesInvItemStocks>()
                //    .Where(it => it.ItemBarcode == query.barcode)
                //    .ExecuteCommand();

                // 插入剩余条码数量的新库存记录
                executeCommand += db.Insertable(new MesInvItemStocks
                {
                    Guid = Guid.NewGuid(),
                    TaskNo = stockBarcode.TaskNo,
                    ItemBarcode = stockBarcode.ItemBarcode,
                    ItemBarcode = newBarcode,
                    ItemNo = stockBarcode.ItemNo,
                    LotNo = stockBarcode.LotNo,
                    Quantity = totalQty - query.Num,
                    Quantity = query.Num,
                    EpFlag = stockBarcode.EpFlag,
                    CustomerNo = stockBarcode.CustomerNo,
                    ItemWt = stockBarcode.ItemWt,
@@ -572,7 +645,7 @@
                    Status = 1,
                    BillTypeId = 200, // p_bill_type_id
                    TransactionCode = "209", // p_transaction_no
                    BusinessType = -1,
                    BusinessType = 0,
                    ItemBarcode = newBarcode,
                    ItemNo = stockBarcode.ItemNo,
                    LotNo = stockBarcode.LotNo,
@@ -582,7 +655,7 @@
                    FromInvDepotSectionsCode = null,
                    ToInvDepotsCode = stockBarcode.DepotsCode,
                    ToInvDepotSectionsCode = stockBarcode.DepotSectionsCode,
                    Description = null,
                    Description = query.Type + "拆分生成",
                    CreateBy = query.userName,
                    CreateDate = DateTime.Now,
                    LastupdateBy = query.userName,
@@ -604,11 +677,11 @@
                throw new Exception("发料数量大于条码数,请核对！");
            }

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

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

            if (mesItemBl == null)
@@ -659,14 +732,19 @@
                    it.TaskNo == query.blNo && it.ItemId == stockBarcode.ItemId)
                .Sum(it => it.Quantity);

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


            var depots = Db.Queryable<MesDepots>()
                .Where(t => t.DepotId == stockBarcode.DepotId)
                .First();

            // 获取或创建出库单
            var itemOut = db.Queryable<MesInvItemOuts>()
                .Where(a => a.BbillNo == query.blNo
                            && a.DepotCode == womdab.Dab017
                .Where(a => a.TaskNo == query.blNo
                            && a.DepotId == stockBarcode.DepotId
                            && a.OutDate.Value.Date.ToString("yyyy-MM-dd") ==
                            DateTime.Now.Date.ToString("yyyy-MM-dd")
                            && a.BillTypeId == 200
@@ -674,11 +752,13 @@
                            && a.Status == 0)
                .First();

            var outId = new Guid();
            var outNo = "";
            if (itemOut == null)
            {
                // 创建新的出库单
                var outId = Guid.NewGuid();
                var outNo = BillNo.GetBillNo("BL(工单补料)");
                outId = Guid.NewGuid();
                outNo = BillNo.GetBillNo(outNoType);

                // 插入出库单主表
                executeCommand += db.Insertable(new MesInvItemOuts
@@ -693,7 +773,7 @@
                    BillTypeId = 200,
                    TransactionNo = 209,
                    Remark = mesItemBl.Bl007,
                    DepotCode = womdab.Dab017,
                    DepotCode = depots.DepotCode,
                    OutPart = womdaa.Daa013,
                    FType = 0,
                    Factory = stockBarcode.Factory,
@@ -703,15 +783,24 @@
                    PbillNo = womdaa.Daa001,
                    OutDate = DateTime.Now,
                    Status = 0,
                    BbillNo = query.blNo
                    DepotId = stockBarcode.DepotId,
                    THORGID = stockBarcode.StockOrgId,
                    OutType = query.Type,
                    //BbillNo = query.blNo
                }).IgnoreColumns(true).ExecuteCommand();
            }
            else
            {
                 outId = itemOut.Guid;
                 outNo = itemOut.ItemOutNo;
            }

            // 检查是否已存在出库单明细
            var itemOutItemCount = db.Queryable<MesInvItemOutItems>()
                .Where(it =>
                    it.ItemOutId == itemOut.Guid &&
                    it.ItemId == stockBarcode.ItemId)
                    it.ItemOutId == outId &&
                    it.ItemId == stockBarcode.ItemId && 
                    it.DepotId == stockBarcode.DepotId.ToString())
                .Count();

            if (itemOutItemCount == 0)
@@ -719,16 +808,17 @@
                executeCommand += db.Insertable(new MesInvItemOutItems
                {
                    Guid = Guid.NewGuid(),
                    ItemOutId = itemOut.Guid,
                    ItemOutId = outId,
                    ItemNo = blDetail.Bld002,
                    Quantity = query.Num,
                    TlQty = query.Num,
                    CreateBy = query.userName,
                    CreateDate = DateTime.Now,
                    LastupdateBy = query.userName,
                    LastupdateDate = DateTime.Now,
                    Factory = stockBarcode.Factory,
                    Company = stockBarcode.Company,
                    DepotCode = womdab.Dab017,
                    DepotCode = depots.DepotCode,
                    TaskNo = query.blNo,
                    WorkNo = womdaa.Daa021,
                    WorkLine = blDetail.Bld013,
@@ -736,24 +826,27 @@
                    ErpId = womdab.Eid,
                    ErpAutoid = womdab.Erpid,
                    PbillNo = query.billNo,
                    ItemId = blDetail.Bld012
                    ItemId = blDetail.Bld012,
                    DepotId = stockBarcode.DepotId.ToString(),
                    ItemDabid = blDetail.Id,
                    // Unit = blDetail.Bld009,
                    // DepotId = (int)stockBarcode.DepotsId
                }).IgnoreColumns(true).ExecuteCommand();
            else
                // 更新已有出库单明细数量
                executeCommand += db.Updateable<MesInvItemOutItems>()
                    .SetColumns(it => it.Quantity == it.Quantity + query.Num)
                    .SetColumns(it => it.TlQty == (it.TlQty ?? 0) + query.Num)
                    .Where(it =>
                        it.ItemOutId == itemOut.Guid &&
                        it.ItemId == stockBarcode.ItemId)
                    it.ItemOutId == outId &&
                    it.ItemId == stockBarcode.ItemId &&
                    it.DepotId == stockBarcode.DepotId.ToString())
                    .ExecuteCommand();

            // 插入出库条码明细
            executeCommand += db.Insertable(new MesInvItemOutCDetails
            {
                Guid = Guid.NewGuid(),
                ItemOutId = itemOut.Guid,
                ItemOutId = outId,
                ItemBarcode = newBarcode ?? query.barcode,
                ItemNo = stockBarcode.ItemNo,
                LotNo = stockBarcode.LotNo,
@@ -763,7 +856,7 @@
                CreateDate = DateTime.Now,
                LastupdateBy = query.userName,
                LastupdateDate = DateTime.Now,
                DepotCode = stockBarcode.DepotsCode,
                DepotCode = depots.DepotCode,
                DepotSectionCode = stockBarcode.DepotSectionsCode,
                Remark = blDetail.Bld010,
                Factory = stockBarcode.Factory,
@@ -777,7 +870,8 @@
                PbillNo = query.billNo,
                ItemId = blDetail.Bld012,
                Unit = blDetail.Bld009,
                DepotId = (int)stockBarcode.DepotsId
                DepotId = (int)stockBarcode.DepotId,
                Dabid = womdab.Guid,
            }).IgnoreColumns(true).ExecuteCommand();

            // 插入业务流水
@@ -786,7 +880,7 @@
                Guid = Guid.NewGuid(),
                Status = 1,
                BillTypeId = 200, // p_bill_type_id
                TransactionCode = "210", // p_transaction_no 
                TransactionCode = "209", // p_transaction_no 
                BusinessType = 1,
                ItemBarcode = newBarcode ?? query.barcode,
                ItemNo = stockBarcode.ItemNo,
@@ -795,7 +889,7 @@
                Quantity = query.Num,
                FromInvDepotsCode = stockBarcode.DepotsCode,
                FromInvDepotSectionsCode = stockBarcode.DepotSectionsCode,
                Description = null,
                Description = query.Type,
                CreateBy = query.userName,
                CreateDate = DateTime.Now,
                LastupdateBy = query.userName,
@@ -819,8 +913,7 @@
                    Dab020 = (it.Dab020 ?? 0) + query.Num, // 已发料数量
                    Dab021 = (it.Dab021 ?? 0) + query.Num // 已发料数量
                })
                .Where(it => it.Id == womdab.Id && it.Dab003 == womdab.Dab003)
                .IgnoreColumns(true)
                .Where(it => it.Guid == womdab.DaaGuid && it.Dab003 == womdab.Dab003)
                .ExecuteCommand();

            // 更新补料单明细已补数量
@@ -865,6 +958,13 @@

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


            // 创建 插入日志
            var logService = new LogService();
            var LogMsg = "[PDA]" + query.Type + "。条码【" + query.barcode + "】 出库单号【" + outNo + "】";
            logService.CreateLog(db, query.userName, womdaa.Guid.ToString(), "WOMDAA", LogMsg, womdaa.Daa001);


            return executeCommand;
        }) > 0;

@@ -891,12 +991,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;
@@ -914,9 +1014,9 @@
        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)
@@ -1099,8 +1199,8 @@
            var outId = Guid.Empty;
            var outNo = "";
            var outRecord = db.Queryable<MesInvItemOuts>()
                .Where(a => a.BbillNo == query.blNo
                            && a.DepotCode == womdab.Dab017
                .Where(a => a.TaskNo == query.blNo
                            && a.DepotId == stockBarcode.DepotId
                            && a.OutDate.Value.Date == DateTime.Now.Date
                            && a.BillTypeId == 200
                            && a.TransactionNo == 210
@@ -1129,7 +1229,7 @@
                    OutPart = womdaa.Daa013,
                    FType = 0,
                    WorkNo = womdaa.Daa021,
                    OutType = "生产超领单",
                    OutType = query.Type,
                    BoardItem = womdaa.Daa002,
                    PbillNo = womdaa.Daa001,
                    OutDate = DateTime.Now,
@@ -1169,7 +1269,8 @@
                    ErpId = womdab.Eid,
                    ErpAutoid = womdab.Erpid,
                    PbillNo = query.billNo,
                    ItemId = blDetail.Bld012
                    ItemId = blDetail.Bld012,
                    DepotId = stockBarcode.DepotId.ToString(),
                    // Unit = blDetail.Bld009,
                    // DepotId = stockBarcode.DepotsId
                }).IgnoreColumns(true).ExecuteCommand();
@@ -1208,7 +1309,8 @@
                PbillNo = query.billNo,
                ItemId = blDetail.Bld012,
                Unit = blDetail.Bld009,
                DepotId = (int)stockBarcode.DepotsId
                DepotId = (int)stockBarcode.DepotsId,
                Dabid = womdab.Guid,
            }).IgnoreColumns(true).ExecuteCommand();

            // 插入业务流水
@@ -1247,7 +1349,7 @@
                    Dab020 = (it.Dab020 ?? 0) + stockBarcode.Quantity,
                    Dab023 = (it.Dab023 ?? 0) + stockBarcode.Quantity
                })
                .Where(it => it.Id == womdab.Id)
                .Where(it => it.Guid == womdab.Guid)
                .ExecuteCommand();

            // 更新超领单明细
@@ -1651,7 +1753,7 @@
                    Dab020 = (it.Dab020 ?? 0) + stockBarcode.Quantity,
                    Dab023 = (it.Dab023 ?? 0) + stockBarcode.Quantity
                })
                .Where(it => it.Id == workOrderDetail.Id)
                .Where(it => it.Guid == workOrderDetail.Guid)
                .ExecuteCommand();

            // 更新补料单明细已补数量
@@ -1692,18 +1794,21 @@


        // 获取最终的待处理列表
        // 获取补料单明细中未完成的记录
        // 通过左连接查询补料单(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 MesItemBlDetail
            {
                Bld012 = b.Bld012,
                Bld002 = b.Bld002,
                Bld003 = b.Bld003,
                Bld004 = b.Bld004,
                Bld007 = b.Bld007,
                Bld008 = b.Bld008
                Bld012 = b.Bld012, // 物料ID
                Bld002 = b.Bld002, // 物料编号
                Bld003 = b.Bld003, // 物料名称
                Bld004 = b.Bld004, // 物料规格
                Bld007 = b.Bld007, // 计划数量
                Bld008 = b.Bld008 // 已补数量
            })
            .ToList();