看板模块

huawei

4 天以前 63d047db30e03608479ab3d340e925bc3366357c

 service/Warehouse/MesItemBlManager.cs

@@ -6,6 +6,7 @@
using NewPdaSqlServer.util;
using SqlSugar;
using System.Data;
using System.Text;
using System.Data.SqlClient;

namespace NewPdaSqlServer.service.Warehouse;
@@ -18,15 +19,22 @@
    ///     获取生产补料单号列表
    /// </summary>
    /// <returns>补料单号列表</returns>
    public List<string> GetSCBLBillNo(WarehouseQuery query)
    public List<string> GetSCBLBillNo(dynamic query, dynamic RequestInfo)
    {
        var list = Db.Queryable<MesItemBl>()
            .Where(s => (s.Bl018 ?? false) == true
                        //&& (s.Bl019 ?? false) == false
                        && s.Bl008 == query.Type)
            .OrderByDescending(s => s.Bl006)
            .Select(s => s.BlNo)
            .ToList();
        var orgId = RequestInfo.OrgId;
        var sqlParams = new List<SugarParameter>
        {
            new("@orgId", orgId),
            new("@type", query.type),
            new("@dateTime", query.dateTime == "" ? null : query.dateTime),
            new("@lineNo", query.lineNo)

        };
        var sql2 = new StringBuilder("exec prc_pda_itemBl_billNoList @type,@orgId,@dateTime,@lineNo");

        var LineInfo = Db.Ado.SqlQuery<dynamic>(sql2.ToString(), sqlParams);

        var list = LineInfo.Select(s => (string)s.bl_no).ToList();
        return list;
    }

@@ -70,7 +78,7 @@
        //    .ToList();

        //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,
        var sql = string.Format(@"SELECT c.id as ItemId,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
@@ -113,7 +121,6 @@
        ScblScanBarcode(
            WarehouseQuery query)
    {

        if (string.IsNullOrEmpty(query.barcode))
            throw new Exception("请扫描条码！");

@@ -224,368 +231,6 @@
        {
            throw new Exception($"调用存储过程PRC_PDA_SCBLCL失败: {ex.Message}");
        }

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

        //if (string.IsNullOrEmpty(query.barcode))
        //    throw new Exception("请扫描条码！");

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

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


        //// 检验是否重复扫描
        //var exists = Db.Queryable<MesInvItemOutCDetails>()
        //    .Where(b => b.ItemBarcode == query.barcode)
        //    .Any();

        //if (exists)
        //    throw new Exception("此条码已扫描,勿重复扫码！");

        //// 查询条码库存信息
        //var stockBarcode = Db.Queryable<MesInvItemStocks>()
        //    .Where(t => t.ItemBarcode == query.barcode && t.Quantity > 0)
        //    .First();

        //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)
        //    .First();

        //if (mesItemBl == null)
        //    throw new Exception($"申请单 {query.blNo} 已撤回！");

        //if (mesItemBl.Bl018 != true)
        //    throw new Exception($"申请单 {query.blNo} 未审核！");

        //if (mesItemBl.Bl019 == true)
        //    throw new Exception($"申请单 {query.blNo} 已完结！");

        //// 获取补料单明细并校验
        //var blDetail = Db.Queryable<MesItemBlDetail>()
        //    .Where(b =>
        //        b.Mid == mesItemBl.Id && b.Bld012 == stockBarcode.ItemId)
        //    .First();

        //if (blDetail == null)
        //    throw new Exception($"申请单不存在此物料 {stockBarcode.ItemNo} 请确认！");

        //// 检查待补数量
        //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>()
        //    .Where(a => a.Daa001 == query.billNo)
        //    .First();

        //if (womdaa == null)
        //    throw new Exception($"工单 {query.billNo} 不存在，请确认！");

        //// 检查备料明细
        //var womdab = Db.Queryable<Womdab>()
        //    .Where(b => b.Dab001 == query.billNo && b.Erpid == blDetail.Bld014)
        //    .First();

        //if (womdab == null)
        //    throw new Exception($"备料明细不存在此物料 {stockBarcode.ItemNo} 请确认！");

        //if (stockBarcode.Quantity > quantity)
        //{
        //    // 获取待发料明细列表
        //    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
        //        })
        //        .ToList();


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

        //    return (query, pendingList);
        //}

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

        //    var existingOut = db.Queryable<MesInvItemOuts>()
        //        .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
        //                    && a.TransactionNo == 209
        //                    && a.Status == 0)
        //        .First();

        //    if (existingOut != null)
        //    {
        //        outId = existingOut.Guid;
        //        outNo = existingOut.ItemOutNo;
        //    }
        //    else
        //    {
        //        // 插入出库单主表
        //        db.Insertable(new MesInvItemOuts
        //        {
        //            Guid = outId,
        //            ItemOutNo = outNo,
        //            TaskNo = query.blNo,
        //            CreateBy = query.userName,
        //            CreateDate = DateTime.Now,
        //            LastupdateBy = query.userName,
        //            LastupdateDate = DateTime.Now,
        //            BillTypeId = 200,
        //            TransactionNo = 209,
        //            Remark = mesItemBl.Bl007,
        //            DepotCode = depots.DepotCode,
        //            OutPart = womdaa.Daa013,
        //            OutType = query.Type,
        //            FType = 0,
        //            Factory = stockBarcode.Factory,
        //            Company = stockBarcode.Company,
        //            WorkNo = womdaa.Daa021,
        //            BoardItem = womdaa.Daa002,
        //            PbillNo = womdaa.Daa001,
        //            OutDate = DateTime.Now,
        //            Status = 0,
        //            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.DepotId == stockBarcode.DepotsId.ToString())
        //        .Count();

        //    if (itemCount > 0)
        //        // 更新已存在的物料明细数量
        //        db.Updateable<MesInvItemOutItems>()
        //            .SetColumns(i =>
        //                i.TlQty == i.TlQty + stockBarcode.Quantity)
        //            .Where(i =>
        //                i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId && i.ItemOutId == outId && i.DepotId == stockBarcode.DepotsId.ToString())
        //            .ExecuteCommand();
        //    else
        //        // 插入新的物料明细记录
        //        db.Insertable(new MesInvItemOutItems
        //        {
        //            Guid = Guid.NewGuid(),
        //            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 = depots.DepotCode,
        //            TaskNo = query.blNo,
        //            WorkNo = womdaa.Daa021,
        //            WorkLine = blDetail.Bld013,
        //            ErpItemNo = womdab.Dab003,
        //            ErpId = womdab.Eid,
        //            ErpAutoid = womdab.Erpid,
        //            PbillNo = query.billNo,
        //            ItemId = blDetail.Bld012,
        //            DepotId = stockBarcode.DepotId.ToString(),
        //            ItemDabid = blDetail.Id,
        //            // Unit = blDetail.Bld009,
        //            // DepotId = (int)stockBarcode.DepotsId
        //        }).IgnoreColumns(true).ExecuteCommand();

        //    // 插入出库单条码明细
        //    db.Insertable(new MesInvItemOutCDetails
        //    {
        //        Guid = Guid.NewGuid(),
        //        ItemOutId = outId,
        //        ItemBarcode = stockBarcode.ItemBarcode,
        //        ItemNo = stockBarcode.ItemNo,
        //        LotNo = stockBarcode.LotNo,
        //        Quantity = stockBarcode.Quantity,
        //        ForceOutFlag = 0,
        //        CreateBy = query.userName,
        //        CreateDate = DateTime.Now,
        //        LastupdateBy = query.userName,
        //        LastupdateDate = DateTime.Now,
        //        DepotCode = depots.DepotCode,
        //        DepotSectionCode = stockBarcode.DepotSectionsCode,
        //        Remark = blDetail.Bld010,
        //        Factory = stockBarcode.Factory,
        //        Company = stockBarcode.Company,
        //        TaskNoy = mesItemBl.Bl013,
        //        BoardStyle = mesItemBl.Bl002,
        //        TaskNo = query.blNo,
        //        WorkNo = blDetail.Bld001,
        //        WorkLine = blDetail.Bld013,
        //        SuppNo = stockBarcode.SuppNo,
        //        PbillNo = query.billNo,
        //        ItemId = blDetail.Bld012,
        //        Unit = blDetail.Bld009,
        //        DepotId = (int)stockBarcode.DepotId,
        //        EbelnK3id = womdab.Eid,
        //        LineK3id = womdab.Erpid
        //    }).IgnoreColumns(true).ExecuteCommand();

        //    // 插入业务交易记录
        //    db.Insertable(new MesInvBusiness2
        //    {
        //        Guid = Guid.NewGuid(),
        //        Status = 1,
        //        BillTypeId = 200, // p_bill_type_id
        //        TransactionCode = "209", // p_transaction_no
        //        BusinessType = -1,
        //        ItemBarcode = stockBarcode.ItemBarcode,
        //        ItemNo = stockBarcode.ItemNo,
        //        LotNo = stockBarcode.LotNo,
        //        EpFlag = true,
        //        Quantity = stockBarcode.Quantity,
        //        FromInvDepotsCode = stockBarcode.DepotsCode,
        //        FromInvDepotSectionsCode = stockBarcode.DepotSectionsCode,
        //        CreateBy = query.userName,
        //        CreateDate = DateTime.Now,
        //        LastupdateBy = query.userName,
        //        LastupdateDate = DateTime.Now,
        //        Factory = stockBarcode.Factory,
        //        Company = stockBarcode.Company,
        //        TaskNo = mesItemBl.Bl012, // Matches C_QTCK.Bl012
        //        BillNo = query.blNo,
        //        WorkNo = blDetail.Bld001, // Matches C_QTCK_D.Bld001
        //        WorkLine = blDetail.Bld013, // Matches C_QTCK_D.Bld013
        //        SuppNo = stockBarcode.SuppNo,
        //        ItemId = stockBarcode.ItemId
        //        // CkDepot = stockBarcode.DepotsId
        //    }).IgnoreColumns(true).ExecuteCommand();


        //    // 更新工单表数量
        //    db.Updateable<Womdab>()
        //        .SetColumns(it => new Womdab
        //        {
        //            Dab007 = (it.Dab007 ?? 0) + stockBarcode.Quantity,
        //            Dab020 = (it.Dab020 ?? 0) + stockBarcode.Quantity,
        //            Dab021 = (it.Dab021 ?? 0) + stockBarcode.Quantity
        //        })
        //        .Where(it => it.Guid == womdab.DaaGuid && it.Dab003 == womdab.Dab003)
        //        .ExecuteCommand();

        //    // 更新补料单明细已补数量
        //    db.Updateable<MesItemBlDetail>()
        //        .SetColumns(it => new MesItemBlDetail
        //        {
        //            Bld008 = (it.Bld008 ?? 0) + (int)stockBarcode.Quantity
        //        })
        //        .Where(it => it.Id == blDetail.Id)
        //        .ExecuteCommand();

        //    // 检查补料单明细是否完成
        //    var blDetail1 = db.Queryable<MesItemBlDetail>()
        //        .Where(it => it.Id == blDetail.Id)
        //        .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>()
        //        .SetColumns(it => it.Quantity == 0)
        //        .Where(it => it.Guid == stockBarcode.Guid)
        //        .ExecuteCommand();


        //    // 检查是否所有明细都已完成
        //    var unfinishedDetail = db.Queryable<MesItemBlDetail>()
        //        .LeftJoin<MesItemBl>((b, a) => a.Id == b.Mid)
        //        .Where((b, a) => a.BlNo == query.blNo && (b.Bld011 ?? 0) == 0)
        //        .Select((b, a) => b)
        //        .First();

        //    if (unfinishedDetail == null)
        //        // 如果没有未完成的明细，更新补料单状态为已完成
        //        db.Updateable<MesItemBl>()
        //            .SetColumns(it => new MesItemBl
        //            {
        //                Bl019 = true,
        //                WcUser = query.userName,
        //                WcTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
        //            })
        //            .Where(it => it.Id == mesItemBl.Id)
        //            .ExecuteCommand();

        //    return 1;
        //});

        //// 获取最终的待发料明细列表
        //var finalPendingList = 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
        //    })
        //    .ToList();

        //return (query, finalPendingList);
    }

    /// <summary>
@@ -601,7 +246,7 @@
    ///     - Num: 发料数量(必填,必须大于0)
    ///     - blNo: 补料单号(必填)
    /// </remarks>
    public (bool success, List<MesItemBlDetail> pendingList) SplitBarcode(
    public ProductionPickDto SplitBarcode(
        WarehouseQuery query)
    {

@@ -649,12 +294,6 @@
            throw new Exception(outMsg ?? "操作失败");
        }

        if (outSum == 2)
        {
            // Handle case where barcode needs to be split
            // You might want to return the new barcode to the client
        }

        // Get pending list for the supplement order
        var pendingList = Db.Queryable<MesItemBl, MesItemBlDetail>((a, b) =>
                new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
@@ -671,505 +310,31 @@
            })
            .ToList();

        return (outSum == 1, pendingList);
        var dto = new ProductionPickDto
        {
            daa001 = query.billNo,
            barcode = query.barcode,//原条码
            cfBarcode = outCfBar//拆分后条码
        };

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

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

        //if (string.IsNullOrEmpty(query.barcode))
        //    throw new Exception("请扫描条码！");

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

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


        //// 检验是否重复扫描
        //var exists = Db.Queryable<MesInvItemOutCDetails>()
        //    .Where(b => b.ItemBarcode == query.barcode)
        //    .Any();

        //if (exists)
        //    throw new Exception("此条码已扫描,勿重复扫码！");

        //// 查询条码库存信息
        //var stockBarcode = Db.Queryable<MesInvItemStocks>()
        //    .Where(t => t.ItemBarcode == query.barcode && t.Quantity > 0)
        //    .First();

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

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

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

        //// 开启事务处理
        //var success = UseTransaction(db =>
        //{
        //    var executeCommand = 0;

        //    // 拆分条码
        //    if (totalQty > query.Num)
        //    {
        //        var mesItems = db.Queryable<MesItems>()
        //            .Where(s => s.Id == stockBarcode.ItemId).First();

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

        //        // 写入新条码
        //        executeCommand += db.Insertable(new MesInvItemBarcodes
        //        {
        //            Guid = Guid.NewGuid(),
        //            ItemBarcode = newBarcode,
        //            CustNo = stockBarcode.CustomerNo,
        //            // ProductCode = stockBarcode.ProductCode, 
        //            // ItemBarcode2 = stockBarcode.ItemBarcode2,
        //            // ItemCode = stockBarcode.ItemCode,
        //            ItemNo = stockBarcode.ItemNo,
        //            LotNo = stockBarcode.LotNo,
        //            Quantity = query.Num,
        //            EpFlag = true,
        //            TaskNo = stockBarcode.TaskNo,
        //            CreateBy = query.userName,
        //            CreateDate = DateTime.Now,
        //            LastupdateBy = query.userName,
        //            LastupdateDate = DateTime.Now,
        //            OldItemBarcode = query.barcode,
        //            // Mblnr = stockBarcode.Mblnr,
        //            // Zeile = stockBarcode.Zeile,
        //            // RohInId = stockBarcode.RohInId,
        //            Barcodestatus = false,
        //            Oldqty = query.Num as long?,
        //            // Unit = stockBarcode.Unit,
        //            // WeightUnit = stockBarcode.WeightUnit,
        //            Factory = stockBarcode.Factory,
        //            Company = stockBarcode.Company,
        //            BillNo = stockBarcode.BillNo,
        //            BoardStyle = stockBarcode.BoardStyle,
        //            // ColorName = stockBarcode.ColorName,
        //            WorkNo = stockBarcode.WorkNo,
        //            WorkLine = stockBarcode.WorkLine,
        //            // MemoBad = stockBarcode.MemoBad,
        //            ComeFlg = 5,
        //            // Memo = stockBarcode.Memo,
        //            SuppId = stockBarcode.SuppId,
        //            SuppNo = stockBarcode.SuppNo,
        //            InsDate = stockBarcode.IndepDate, // Added InsDate
        //            ItemId = stockBarcode.ItemId
        //            // ItemUnit = stockBarcode.ItemUnit // Added ItemUnit
        //        }).IgnoreColumns(true).ExecuteCommand();

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

        //        // 更新原条码数量
        //        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 = newBarcode,
        //            ItemNo = stockBarcode.ItemNo,
        //            LotNo = stockBarcode.LotNo,
        //            Quantity = query.Num,
        //            EpFlag = stockBarcode.EpFlag,
        //            CustomerNo = stockBarcode.CustomerNo,
        //            ItemWt = stockBarcode.ItemWt,
        //            DepotsCode = stockBarcode.DepotsCode,
        //            DepotsId = stockBarcode.DepotsId,
        //            DepotSectionsCode = stockBarcode.DepotSectionsCode,
        //            CheckDate = stockBarcode.CheckDate,
        //            ItemType = stockBarcode.ItemType,
        //            IndepDate = stockBarcode.IndepDate,
        //            Factory = stockBarcode.Factory,
        //            Company = stockBarcode.Company,
        //            IqcStatus = stockBarcode.IqcStatus,
        //            BoardStyle = stockBarcode.BoardStyle,
        //            WorkNo = stockBarcode.WorkNo,
        //            WorkLine = stockBarcode.WorkLine,
        //            SuppNo = stockBarcode.SuppNo,
        //            ItemId = stockBarcode.ItemId
        //            // UnitId = stockBarcode.ItemUnit
        //        }).IgnoreColumns(true).ExecuteCommand();

        //        // 写入新条码的交易记录
        //        executeCommand += db.Insertable(new MesInvBusiness2
        //        {
        //            Guid = Guid.NewGuid(),
        //            Status = 1,
        //            BillTypeId = 200, // p_bill_type_id
        //            TransactionCode = "209", // p_transaction_no
        //            BusinessType = 0,
        //            ItemBarcode = newBarcode,
        //            ItemNo = stockBarcode.ItemNo,
        //            LotNo = stockBarcode.LotNo,
        //            EpFlag = true,
        //            Quantity = query.Num,
        //            FromInvDepotsCode = null,
        //            FromInvDepotSectionsCode = null,
        //            ToInvDepotsCode = stockBarcode.DepotsCode,
        //            ToInvDepotSectionsCode = stockBarcode.DepotSectionsCode,
        //            Description = query.Type + "拆分生成",
        //            CreateBy = query.userName,
        //            CreateDate = DateTime.Now,
        //            LastupdateBy = query.userName,
        //            LastupdateDate = DateTime.Now,
        //            Factory = stockBarcode.Factory,
        //            Company = stockBarcode.Company,
        //            TaskNo = stockBarcode.TaskNo,
        //            BillNo = stockBarcode.BillNo,
        //            WorkNo = stockBarcode.WorkNo,
        //            WorkLine = stockBarcode.WorkLine,
        //            SuppNo = stockBarcode.SuppNo,
        //            SuppId = stockBarcode.SuppId,
        //            ItemId = stockBarcode.ItemId
        //            // CkDepot = stockBarcode.DepotsId
        //        }).IgnoreColumns(true).ExecuteCommand();
        //    }
        //    else if (totalQty < query.Num)
        //    {
        //        throw new Exception("发料数量大于条码数,请核对！");
        //    }

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

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

        //    if (mesItemBl == null)
        //        throw new Exception($"申请单 {query.blNo} 已撤回！");

        //    if (mesItemBl.Bl018 != true)
        //        throw new Exception($"申请单 {query.blNo} 未审核！");

        //    if (mesItemBl.Bl019 == true)
        //        throw new Exception($"申请单 {query.blNo} 已完结！");

        //    // 获取补料单明细并校验
        //    var blDetail = Db.Queryable<MesItemBlDetail>()
        //        .Where(b =>
        //            b.Mid == mesItemBl.Id && b.Bld012 == stockBarcode.ItemId)
        //        .First();

        //    if (blDetail == null)
        //        throw new Exception($"申请单不存在此物料 {stockBarcode.ItemNo} 请确认！");

        //    var remainingQty = (blDetail.Bld007 ?? 0) - (blDetail.Bld008 ?? 0);
        //    if (remainingQty == 0)
        //        throw new Exception("物料已扫码完成，请核对！");

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

        //    // 检查工单信息
        //    var womdaa = Db.Queryable<Womdaa>()
        //        .Where(a => a.Daa001 == query.billNo)
        //        .First();

        //    if (womdaa == null)
        //        throw new Exception($"工单 {query.billNo} 不存在，请确认！");

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

        //    if (womdab == null)
        //        throw new Exception($"备料明细不存在此物料 {stockBarcode.ItemNo} 请确认！");

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

        //    //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.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
        //                    && a.TransactionNo == 209
        //                    && a.Status == 0)
        //        .First();

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

        //        // 插入出库单主表
        //        executeCommand += db.Insertable(new MesInvItemOuts
        //        {
        //            Guid = outId,
        //            ItemOutNo = outNo,
        //            TaskNo = query.blNo,
        //            CreateBy = query.userName,
        //            CreateDate = DateTime.Now,
        //            LastupdateBy = query.userName,
        //            LastupdateDate = DateTime.Now,
        //            BillTypeId = 200,
        //            TransactionNo = 209,
        //            Remark = mesItemBl.Bl007,
        //            DepotCode = depots.DepotCode,
        //            OutPart = womdaa.Daa013,
        //            FType = 0,
        //            Factory = stockBarcode.Factory,
        //            Company = stockBarcode.Company,
        //            WorkNo = womdaa.Daa021,
        //            BoardItem = womdaa.Daa002,
        //            PbillNo = womdaa.Daa001,
        //            OutDate = DateTime.Now,
        //            Status = 0,
        //            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 == outId &&
        //            it.ItemId == stockBarcode.ItemId && 
        //            it.DepotId == stockBarcode.DepotId.ToString())
        //        .Count();

        //    if (itemOutItemCount == 0)
        //        // 插入新的出库单明细
        //        executeCommand += db.Insertable(new MesInvItemOutItems
        //        {
        //            Guid = Guid.NewGuid(),
        //            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 = depots.DepotCode,
        //            TaskNo = query.blNo,
        //            WorkNo = womdaa.Daa021,
        //            WorkLine = blDetail.Bld013,
        //            ErpItemNo = womdab.Dab003,
        //            ErpId = womdab.Eid,
        //            ErpAutoid = womdab.Erpid,
        //            PbillNo = query.billNo,
        //            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.TlQty == (it.TlQty ?? 0) + query.Num)
        //            .Where(it =>
        //            it.ItemOutId == outId &&
        //            it.ItemId == stockBarcode.ItemId &&
        //            it.DepotId == stockBarcode.DepotId.ToString())
        //            .ExecuteCommand();

        //    // 插入出库条码明细
        //    executeCommand += db.Insertable(new MesInvItemOutCDetails
        //    {
        //        Guid = Guid.NewGuid(),
        //        ItemOutId = outId,
        //        ItemBarcode = newBarcode ?? query.barcode,
        //        ItemNo = stockBarcode.ItemNo,
        //        LotNo = stockBarcode.LotNo,
        //        Quantity = query.Num,
        //        ForceOutFlag = 0,
        //        CreateBy = query.userName,
        //        CreateDate = DateTime.Now,
        //        LastupdateBy = query.userName,
        //        LastupdateDate = DateTime.Now,
        //        DepotCode = depots.DepotCode,
        //        DepotSectionCode = stockBarcode.DepotSectionsCode,
        //        Remark = blDetail.Bld010,
        //        Factory = stockBarcode.Factory,
        //        Company = stockBarcode.Company,
        //        TaskNoy = mesItemBl.Bl013,
        //        BoardStyle = mesItemBl.Bl002,
        //        TaskNo = query.blNo,
        //        WorkNo = blDetail.Bld001,
        //        WorkLine = blDetail.Bld013,
        //        SuppNo = stockBarcode.SuppNo,
        //        PbillNo = query.billNo,
        //        ItemId = blDetail.Bld012,
        //        Unit = blDetail.Bld009,
        //        DepotId = (int)stockBarcode.DepotId,
        //        Dabid = womdab.Guid,
        //    }).IgnoreColumns(true).ExecuteCommand();

        //    // 插入业务流水
        //    executeCommand += db.Insertable(new MesInvBusiness2
        //    {
        //        Guid = Guid.NewGuid(),
        //        Status = 1,
        //        BillTypeId = 200, // p_bill_type_id
        //        TransactionCode = "209", // p_transaction_no 
        //        BusinessType = 1,
        //        ItemBarcode = newBarcode ?? query.barcode,
        //        ItemNo = stockBarcode.ItemNo,
        //        LotNo = stockBarcode.LotNo,
        //        EpFlag = true,
        //        Quantity = query.Num,
        //        FromInvDepotsCode = stockBarcode.DepotsCode,
        //        FromInvDepotSectionsCode = stockBarcode.DepotSectionsCode,
        //        Description = query.Type,
        //        CreateBy = query.userName,
        //        CreateDate = DateTime.Now,
        //        LastupdateBy = query.userName,
        //        LastupdateDate = DateTime.Now,
        //        Factory = stockBarcode.Factory,
        //        Company = stockBarcode.Company,
        //        TaskNo = mesItemBl.Bl012,
        //        BillNo = query.blNo,
        //        WorkNo = blDetail.Bld001,
        //        WorkLine = blDetail.Bld013,
        //        SuppNo = stockBarcode.SuppNo,
        //        ItemId = stockBarcode.ItemId
        //        // CkDepot = stockBarcode.DepotsId
        //    }).IgnoreColumns(true).ExecuteCommand();

        //    // 更新工单表数量
        //    executeCommand += db.Updateable<Womdab>()
        //        .SetColumns(it => new Womdab
        //        {
        //            Dab007 = (it.Dab007 ?? 0) + query.Num, // 工单数量
        //            Dab020 = (it.Dab020 ?? 0) + query.Num, // 已发料数量
        //            Dab021 = (it.Dab021 ?? 0) + query.Num // 已发料数量
        //        })
        //        .Where(it => it.Guid == womdab.DaaGuid && it.Dab003 == womdab.Dab003)
        //        .ExecuteCommand();

        //    // 更新补料单明细已补数量
        //    executeCommand += db.Updateable<MesItemBlDetail>()
        //        .SetColumns(it => new MesItemBlDetail
        //        {
        //            Bld008 = (it.Bld008 ?? 0) + (int)query.Num
        //        })
        //        .Where(it => it.Id == blDetail.Id)
        //        .ExecuteCommand();

        //    // 获取更新后的补料单明细数量
        //    var updatedDetail = db.Queryable<MesItemBlDetail>()
        //        .Where(it => it.Id == blDetail.Id)
        //        .Select(it => new { it.Bld007, it.Bld008 })
        //        .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();

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

        //    var unfinishedDetail = db.Queryable<MesItemBlDetail>()
        //        .Where(it => it.Mid == mesItemBl.Id && (it.Bld011 ?? 0) == 0)
        //        .First();

        //    if (unfinishedDetail == null)
        //        // 如果没有找到未完成明细，则更新补料单状态为已完成
        //        executeCommand += db.Updateable<MesItemBl>()
        //            .SetColumns(it => new MesItemBl
        //            {
        //                Bl019 = true,
        //                WcUser = query.userName,
        //                WcTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
        //            })
        //            .Where(it => it.Id == mesItemBl.Id)
        //            .ExecuteCommand();

        //    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;

        //// 获取最终的待发料明细列表
        //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
        //    })
        //    .ToList();

        //return (success, pendingList);
        return dto;
    }

    // 获取产线列表
    public dynamic GetLineInfo(dynamic unity, dynamic RequestInfo)
    {
        var orgId = RequestInfo.OrgId;
        var sqlParams = new List<SugarParameter>
        {
            new("@orgId", orgId)
        };

        var sql2 = new StringBuilder("exec prc_pda_itemBl_lineInfo @orgId");

        var LineInfo = Db.Ado.SqlQuery<dynamic>(sql2.ToString(), sqlParams);

        return LineInfo;
    }
    #endregion

    #region 生产超领
@@ -1492,7 +657,7 @@
                PbillNo = query.billNo,
                ItemId = blDetail.Bld012,
                Unit = blDetail.Bld009,
                DepotId = (int)stockBarcode.DepotsId,
                DepotId = (int)stockBarcode.DepotId,
                Dabid = womdab.Guid,
            }).IgnoreColumns(true).ExecuteCommand();

@@ -1683,7 +848,7 @@
                    EpFlag = stockBarcode.EpFlag,
                    CustomerNo = stockBarcode.CustomerNo,
                    DepotsCode = stockBarcode.DepotsCode,
                    DepotsId = stockBarcode.DepotsId,
                    DepotsId = stockBarcode.DepotId,
                    DepotSectionsCode = stockBarcode.DepotSectionsCode,
                    CheckDate = stockBarcode.CheckDate,
                    ItemType = stockBarcode.ItemType,
@@ -1895,7 +1060,7 @@
                PbillNo = query.billNo,
                ItemId = blDetail.Bld012,
                Unit = blDetail.Bld009,
                DepotId = (int)stockBarcode.DepotsId,
                DepotId = (int)stockBarcode.DepotId,
                LineK3id = workOrderDetail.Erpid,
                EbelnK3id = workOrderDetail.Eid
            }).IgnoreColumns(true).ExecuteCommand();
@@ -2044,7 +1209,7 @@
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
         LEFT JOIN WW_GD D ON B.about_guid = D.ID
WHERE B.bl_no = '{0}'", query.billNo);

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