南骏 池
9 天以前 bfa01e00dc6b89cbba901175689a2199b8f82da4
service/Warehouse/MesItemBlManager.cs
@@ -1,8 +1,13 @@
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;
using System.Data;
using System.Text;
using System.Data.SqlClient;
namespace NewPdaSqlServer.service.Warehouse;
@@ -14,14 +19,22 @@
    ///     获取生产补料单号列表
    /// </summary>
    /// <returns>补料单号列表</returns>
    public List<string> GetSCBLBillNo()
    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 == "生产补料")
            .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;
    }
@@ -30,43 +43,69 @@
    /// </summary>
    /// <param name="billNo">补料单号</param>
    /// <returns>补料单明细列表</returns>
    public List<MesItemBlDetail> GetMesItemBlDetailByBillNo(
        WarehouseQuery query)
    public ProductionPickDto
        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 && 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 blDetails;
        //return (mesItemBl.Bl001, blDetails);
        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
         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>
@@ -78,14 +117,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("请选取单据号!");
        if (string.IsNullOrEmpty(query.barcode))
            throw new Exception("请扫描条码!");
@@ -93,332 +128,109 @@
            throw new Exception("用户名不能为空!");
        if (string.IsNullOrEmpty(query.blNo))
            throw new Exception("补料单号不能为空!");
            throw new Exception("申请单号不能为空!");
        #endregion
        // 准备调用存储过程的参数
        string outMsg = "";
        int outSum = -1;
        decimal barcodeNum = 0;
        decimal splitNum = 0;
        // 检验是否重复扫描
        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 mesItemBl = Db.Queryable<MesItemBl>()
            .Where(a => a.BlNo == query.blNo && (a.Bl018 ?? false) == false)
            .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("物料已扫码完成,请核对!");
        // 检查工单信息
        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)
        try
        {
            // 获取待发料明细列表
            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
                {
                    SectionCode = b.Bld012.ToString(),
                    ItemNo = b.Bld002,
                    ItemName = b.Bld003,
                    ItemSpec = b.Bld004,
                    PendingQty = (b.Bld007 ?? 0) - (b.Bld008 ?? 0)
                })
                .ToList();
            return (false, pendingList);
        }
        // 开启事务处理
        var success = UseTransaction(db =>
        {
            // 获取或创建出库单
            var outId = Guid.NewGuid();
            var outNo = BillNo.GetBillNo("SCBL");
            var existingOut = db.Queryable<MesInvItemOuts>()
                .Where(a => a.BbillNo == query.blNo
                            && a.DepotCode == womdab.Dab017
                            && 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)
            // 调用存储过程
            var parameters = new SqlParameter[]
            {
                outId = existingOut.Guid;
                outNo = existingOut.ItemOutNo;
            }
            else
    new SqlParameter("@C_USER", SqlDbType.NVarChar, 100) { Value = query.userName ?? string.Empty },
    new SqlParameter("@P_BILL_NO", SqlDbType.NVarChar, 50) { Value = query.billNo ?? string.Empty },
    new SqlParameter("@P_ITEM_BARCODE", SqlDbType.NVarChar, 100) { Value = query.barcode ?? string.Empty },
    new SqlParameter("@P_BL_NO", SqlDbType.NVarChar, 100) { Value = query.blNo ?? string.Empty },
    new SqlParameter("@P_TYPE", SqlDbType.NVarChar, 20) { Value = query.Type ?? string.Empty },
    new SqlParameter("@OUT_MSG", SqlDbType.NVarChar, 2000) { Direction = ParameterDirection.Output },
    new SqlParameter("@OUT_SUM", SqlDbType.Int) { Direction = ParameterDirection.Output },
    new SqlParameter("@BARCODE_NUM", SqlDbType.Decimal) {
        Direction = ParameterDirection.Output,
        Precision = 18,
        Scale = 10
    },
    new SqlParameter("@SPLIT_NUM", SqlDbType.Decimal) {
        Direction = ParameterDirection.Output,
        Precision = 18,
        Scale = 10
    }
            };
            // 执行存储过程
            string procedureName = "PRC_PDA_SCBLCL";
            int res = DbHelperSQL.RunProcedure_NonQuery(procedureName, parameters);
            // 获取输出参数
            outMsg = parameters[5].Value?.ToString() ?? "";
            outSum = parameters[6].Value as int? ?? 0;  // 默认值根据需求调整
            barcodeNum = parameters[7].Value as decimal? ?? 0m;
            splitNum = parameters[8].Value as decimal? ?? 0m;
            // 处理存储过程返回的结果
            if (outSum == 2) // 需要拆分
            {
                // 插入出库单主表
                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 = womdab.Dab017,
                    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,
                    BbillNo = query.blNo
                }).IgnoreColumns(true).ExecuteCommand();
            }
                query.status = 2;
                query.message = outMsg;
                query.CfNum = splitNum;
                query.Num = barcodeNum;
            // 检查并更新出库单物料明细
            var itemCount = db.Queryable<MesInvItemOutItems>()
                .Where(i =>
                    i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId)
                .Count();
            if (itemCount > 0)
            {
                // 更新已存在的物料明细数量
                db.Updateable<MesInvItemOutItems>()
                    .SetColumns(i =>
                        i.Quantity == i.Quantity + stockBarcode.Quantity)
                    .Where(i =>
                        i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId)
                    .ExecuteCommand();
            }
            else
            {
                // 插入新的物料明细记录
                db.Insertable(new MesInvItemOutItems
                {
                    Guid = Guid.NewGuid(),
                    ItemOutId = outId,
                    ItemNo = blDetail.Bld002,
                    Quantity = stockBarcode.Quantity,
                    CreateBy = query.userName,
                    CreateDate = DateTime.Now,
                    LastupdateBy = query.userName,
                    LastupdateDate = DateTime.Now,
                    Factory = stockBarcode.Factory,
                    Company = stockBarcode.Company,
                    DepotCode = womdab.Dab017,
                    TaskNo = query.blNo,
                    WorkNo = womdaa.Daa021,
                    WorkLine = blDetail.Bld013,
                    ErpItemNo = womdab.Dab003,
                    ErpId = womdab.Eid,
                    ErpAutoid = womdab.Erpid,
                    PbillNo = query.billNo,
                    ItemId = blDetail.Bld012,
                    // 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 = stockBarcode.DepotsCode,
                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.DepotsId,
                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 = "210", // 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.Id == womdab.Id && 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
                // 获取待发料明细列表
                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
                    {
                        Bl019 = true,
                        WcUser = query.userName,
                        WcTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
                        Bld012 = b.Bld012,
                        Bld002 = b.Bld002,
                        Bld003 = b.Bld003,
                        Bld004 = b.Bld004,
                        Bld007 = b.Bld007,
                        Bld008 = b.Bld008
                    })
                    .Where(it => it.Id == mesItemBl.Id)
                    .ExecuteCommand();
                    .ToList();
                return (query, pendingList);
            }
            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 PendingMaterialDto
            else if (outSum == -1) // 处理失败
            {
                SectionCode = b.Bld012.ToString(),
                ItemNo = b.Bld002,
                ItemName = b.Bld003,
                ItemSpec = b.Bld004,
                PendingQty = (b.Bld007 ?? 0) - (b.Bld008 ?? 0)
            })
            .ToList();
                throw new Exception(outMsg);
            }
            else if (outSum == 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 (true, finalPendingList);
                query.status = 1;
                query.message = outMsg;
                return (query, finalPendingList);
            }
            else
            {
                throw new Exception("未知的处理结果状态");
            }
        }
        catch (Exception ex)
        {
            throw new Exception($"调用存储过程PRC_PDA_SCBLCL失败: {ex.Message}");
        }
    }
    /// <summary>
@@ -434,11 +246,11 @@
    ///     - Num: 发料数量(必填,必须大于0)
    ///     - blNo: 补料单号(必填)
    /// </remarks>
    public (bool success, List<PendingMaterialDto> pendingList) SplitBarcode(
    public ProductionPickDto SplitBarcode(
        WarehouseQuery query)
    {
        #region 参数校验
        // Validate input parameters
        if (string.IsNullOrEmpty(query.userName))
            throw new Exception("用户名不能为空!");
@@ -448,467 +260,91 @@
        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))
            throw new Exception("补料单号不能为空!");
        #endregion
        // Prepare parameters for the stored procedure
        var parameters = new List<SugarParameter>
{
    new SugarParameter("@C_USER", query.userName),
    new SugarParameter("@P_BILL_NO", query.billNo),
    new SugarParameter("@P_ITEM_BARCODE", query.barcode),
    new SugarParameter("@P_BL_NO", query.blNo),
    new SugarParameter("@P_TYPE", query.Type),
    new SugarParameter("@NUM", query.Num),
    new SugarParameter("@OUT_MSG", "", System.Data.DbType.String, ParameterDirection.Output),
    new SugarParameter("@OUT_SUM", 0, System.Data.DbType.Int32, ParameterDirection.Output),
    new SugarParameter("@OUT_CF_BAR", "", System.Data.DbType.String, ParameterDirection.Output)
};
        // 检验是否重复扫描
        var exists = Db.Queryable<MesInvItemOutCDetails>()
            .Where(b => b.ItemBarcode == query.barcode)
            .Any();
        // Execute the stored procedure
        Db.Ado.UseStoredProcedure().ExecuteCommand("PRC_PDA_SCBLCL_CF", parameters);
        if (exists)
            throw new Exception("此条码已扫描,勿重复扫码!");
        // Get output parameters
        var outMsg = parameters.FirstOrDefault(p => p.ParameterName == "@OUT_MSG")?.Value?.ToString();
        var outSum = Convert.ToInt32(parameters.FirstOrDefault(p => p.ParameterName == "@OUT_SUM")?.Value ?? -1);
        var outCfBar = parameters.FirstOrDefault(p => p.ParameterName == "@OUT_CF_BAR")?.Value?.ToString();
        // 查询条码库存信息
        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 success = UseTransaction(db =>
        // Handle the result
        if (outSum == -1)
        {
            var executeCommand = 0;
            throw new Exception(outMsg ?? "操作失败");
        }
            // 拆分条码
            if (totalQty > query.Num)
            {
                var mesItems = db.Queryable<MesItems>()
                    .Where(s => s.Id == stockBarcode.ItemId).First();
                // 生成新条码号
                newBarcode = BillNo.GetBillNo("TMBH(条码编号)", 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 = 0,
                    // OldQty = query.Num,
                    // 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,
                    SuppNo = stockBarcode.SuppNo,
                    // InsDate = stockBarcode.InsDate, // Added InsDate
                    ItemId = stockBarcode.ItemId,
                    // ItemUnit = stockBarcode.ItemUnit // Added ItemUnit
                }).IgnoreColumns(true).ExecuteCommand();
                // 更新原条码数量
                executeCommand += db.Updateable<MesInvItemBarcodes>()
                    .SetColumns(it => it.Quantity == totalQty - 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,
                    ItemNo = stockBarcode.ItemNo,
                    LotNo = stockBarcode.LotNo,
                    Quantity = totalQty - 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 = -1,
                    ItemBarcode = newBarcode,
                    ItemNo = stockBarcode.ItemNo,
                    LotNo = stockBarcode.LotNo,
                    EpFlag = true,
                    Quantity = query.Num,
                    FromInvDepotsCode = null,
                    FromInvDepotSectionsCode = null,
                    ToInvDepotsCode = stockBarcode.DepotsCode,
                    ToInvDepotSectionsCode = stockBarcode.DepotSectionsCode,
                    Description = null,
                    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) == false)
                .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 itemOut = db.Queryable<MesInvItemOuts>()
                .Where(a => a.BbillNo == query.blNo
                            && a.DepotCode == womdab.Dab017
                            && 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 (itemOut == null)
            {
                // 创建新的出库单
                var outId = Guid.NewGuid();
                var outNo = BillNo.GetBillNo("SCBL");
                // 插入出库单主表
                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 = womdab.Dab017,
                    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,
                    BbillNo = query.blNo
                }).IgnoreColumns(true).ExecuteCommand();
            }
            // 检查是否已存在出库单明细
            var itemOutItemCount = db.Queryable<MesInvItemOutItems>()
                .Where(it =>
                    it.ItemOutId == itemOut.Guid &&
                    it.ItemId == stockBarcode.ItemId)
                .Count();
            if (itemOutItemCount == 0)
            {
                // 插入新的出库单明细
                executeCommand += db.Insertable(new MesInvItemOutItems
                {
                    Guid = Guid.NewGuid(),
                    ItemOutId = itemOut.Guid,
                    ItemNo = blDetail.Bld002,
                    Quantity = query.Num,
                    CreateBy = query.userName,
                    CreateDate = DateTime.Now,
                    LastupdateBy = query.userName,
                    LastupdateDate = DateTime.Now,
                    Factory = stockBarcode.Factory,
                    Company = stockBarcode.Company,
                    DepotCode = womdab.Dab017,
                    TaskNo = query.blNo,
                    WorkNo = womdaa.Daa021,
                    WorkLine = blDetail.Bld013,
                    ErpItemNo = womdab.Dab003,
                    ErpId = womdab.Eid,
                    ErpAutoid = womdab.Erpid,
                    PbillNo = query.billNo,
                    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)
                    .Where(it =>
                        it.ItemOutId == itemOut.Guid &&
                        it.ItemId == stockBarcode.ItemId)
                    .ExecuteCommand();
            }
            // 插入出库条码明细
            executeCommand += db.Insertable(new MesInvItemOutCDetails
            {
                Guid = Guid.NewGuid(),
                ItemOutId = itemOut.Guid,
                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 = stockBarcode.DepotsCode,
                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.DepotsId
            }).IgnoreColumns(true).ExecuteCommand();
            // 插入业务流水
            executeCommand += db.Insertable(new MesInvBusiness2
            {
                Guid = Guid.NewGuid(),
                Status = 1,
                BillTypeId = 200, // p_bill_type_id
                TransactionCode = "210", // 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 = null,
                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.Id == womdab.Id && it.Dab003 == womdab.Dab003)
                .IgnoreColumns(true)
                .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("更新失败");
            return executeCommand;
        }) > 0;
        // 获取最终的待发料明细列表
        // Get pending list for the supplement order
        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,
                Bld002 = b.Bld002,
                Bld003 = b.Bld003,
                Bld004 = b.Bld004,
                Bld007 = b.Bld007,
                Bld008 = b.Bld008
            })
            .ToList();
        return (success, pendingList);
        var dto = new ProductionPickDto
        {
            daa001 = query.billNo,
            barcode = query.barcode,//原条码
            cfBarcode = outCfBar//拆分后条码
        };
        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 生产超领
    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 +355,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 +404,7 @@
            })
            .ToList();
        return pendingDetails;
        return (mesItemBl.Bl001, pendingDetails);
    }
    /// <summary>
@@ -982,7 +419,7 @@
    ///     - userName: 用户名(必填)
    ///     - blNo: 超领单号(必填)
    /// </remarks>
    public (bool success, List<PendingMaterialDto> pendingList)
    public (WarehouseQuery item, List<MesItemBlDetail> pendingList)
        ScanBarcodeForOverPicking(
            WarehouseQuery query)
    {
@@ -1020,7 +457,7 @@
        // 检查超领单状态
        var mesItemBl = Db.Queryable<MesItemBl>()
            .Where(a => a.BlNo == query.blNo && a.Bl008 == "生产超领")
            .Where(a => a.BlNo == query.blNo && (a.Bl018 ?? false) == false)
            .First();
        if (mesItemBl == null)
@@ -1086,28 +523,32 @@
                    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
                            && 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
@@ -1117,7 +558,7 @@
            if (outRecord == null)
            {
                outId = Guid.NewGuid();
                outNo = BillNo.GetBillNo("SCBL"); // 需要实现生成单号的方法
                outNo = BillNo.GetBillNo("BL(工单补料)"); // 需要实现生成单号的方法
                // 插入出库单主表
                db.Insertable(new MesInvItemOuts
@@ -1136,7 +577,7 @@
                    OutPart = womdaa.Daa013,
                    FType = 0,
                    WorkNo = womdaa.Daa021,
                    OutType = "生产超领单",
                    OutType = query.Type,
                    BoardItem = womdaa.Daa002,
                    PbillNo = womdaa.Daa001,
                    OutDate = DateTime.Now,
@@ -1157,7 +598,6 @@
                .First();
            if (outItem == null)
            {
                // 插入出库单明细
                db.Insertable(new MesInvItemOutItems
                {
@@ -1178,12 +618,11 @@
                    ErpAutoid = womdab.Erpid,
                    PbillNo = query.billNo,
                    ItemId = blDetail.Bld012,
                    DepotId = stockBarcode.DepotId.ToString(),
                    // Unit = blDetail.Bld009,
                    // DepotId = stockBarcode.DepotsId
                }).IgnoreColumns(true).ExecuteCommand();
            }
            else
            {
                // 更新出库单明细数量
                db.Updateable<MesInvItemOutItems>()
                    .SetColumns(it => new MesInvItemOutItems
@@ -1194,7 +633,6 @@
                        it.ItemOutId == outId &&
                        it.ItemId == stockBarcode.ItemId)
                    .ExecuteCommand();
            }
            // 插入出库条码明细
            db.Insertable(new MesInvItemOutCDetails
@@ -1219,7 +657,8 @@
                PbillNo = query.billNo,
                ItemId = blDetail.Bld012,
                Unit = blDetail.Bld009,
                DepotId = (int)stockBarcode.DepotsId
                DepotId = (int)stockBarcode.DepotId,
                Dabid = womdab.Guid,
            }).IgnoreColumns(true).ExecuteCommand();
            // 插入业务流水
@@ -1247,7 +686,7 @@
                WorkLine = blDetail.Bld013,
                SuppNo = stockBarcode.SuppNo,
                SuppId = stockBarcode.SuppId,
                ItemId = stockBarcode.ItemId,
                ItemId = stockBarcode.ItemId
                // CkDepot = stockBarcode.DepotsId
            }).IgnoreColumns(true).ExecuteCommand();
@@ -1258,7 +697,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();
            // 更新超领单明细
@@ -1287,12 +726,10 @@
            // 如果所有明细完成,更新超领单状态为已完成
            if (!hasUnfinished)
            {
                db.Updateable<MesItemBl>()
                    .SetColumns(it => it.Bl019 == true)
                    .Where(it => it.Id == mesItemBl.Id)
                    .ExecuteCommand();
            }
            return 1;
        });
@@ -1303,25 +740,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 =>
@@ -1410,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,
@@ -1526,7 +964,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 +998,6 @@
                .Count();
            if (itemOutItemCount == 0)
            {
                // 插入新的出库单明细
                db.Insertable(new MesInvItemOutItems
                {
@@ -1582,13 +1019,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 +1031,6 @@
                        it.ItemOutId == itemOut.Guid &&
                        it.ItemId == stockBarcode.ItemId)
                    .ExecuteCommand();
            }
            // 插入出库明细记录
            db.Insertable(new MesInvItemOutCDetails
@@ -1626,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();
@@ -1667,7 +1101,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();
            // 更新补料单明细已补数量
@@ -1685,13 +1119,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,34 +1132,103 @@
            // 如果所有明细完成,更新补料单状态为已完成
            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();
        return (true, pendingList);
    }
    /// <summary>
    ///     根据单号获取生产补料单明细  prc_rf_pda_scan_zout_showbl
    /// </summary>
    /// <param name="billNo">补料单号</param>
    /// <returns>补料单明细列表</returns>
    public ProductionPickDto
        GetMesItemWWBlDetailByBillNo(
            WarehouseQuery query)
    {
        if (string.IsNullOrEmpty(query.billNo))
            throw new Exception("请选单据号!");
        // 检查补料单是否存在且为生产补料类型
        var mesItemBl = Db.Queryable<MesItemBl>()
            .Where(a => a.BlNo == query.billNo && a.Bl008 == query.Type && a.Bl018 == true)
            .First();
        if (mesItemBl == null)
            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();
        //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 WW_GD D ON B.about_guid = D.ID
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;
    }
    #endregion
}