1

啊鑫

2024-12-31 e2988c27cb7e250d8834e3097b4821c7dbff6b64

 service/Warehouse/MesItemBlManager.cs

@@ -30,8 +30,9 @@
    /// </summary>
    /// <param name="billNo">补料单号</param>
    /// <returns>补料单明细列表</returns>
    public List<MesItemBlDetail> GetMesItemBlDetailByBillNo(
        WarehouseQuery query)
    public (string bl001, List<MesItemBlDetail> item)
        GetMesItemBlDetailByBillNo(
            WarehouseQuery query)
    {
        if (string.IsNullOrEmpty(query.billNo))
            throw new Exception("请选单据号！");
@@ -63,7 +64,7 @@
            })
            .ToList();

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

    /// <summary>
@@ -78,11 +79,10 @@
    ///     - userName: 用户名
    ///     - blNo: 补料单号(必填)
    /// </remarks>
    public (bool success, List<PendingMaterialDto> pendingList) SctlScanBarcode(
        WarehouseQuery query)
    public (WarehouseQuery item, List<MesItemBlDetail> pendingList)
        SctlScanBarcode(
            WarehouseQuery query)
    {
        #region 参数校验

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

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

        #endregion

        // 检验是否重复扫描
        var exists = Db.Queryable<MesInvItemOutCDetails>()
@@ -164,17 +163,22 @@
                    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);
        }

        // 开启事务处理
@@ -182,7 +186,7 @@
        {
            // 获取或创建出库单
            var outId = Guid.NewGuid();
            var outNo = BillNo.GetBillNo("SCBL");
            var outNo = BillNo.GetBillNo("BL(工单补料)");

            var existingOut = db.Queryable<MesInvItemOuts>()
                .Where(a => a.BbillNo == query.blNo
@@ -400,17 +404,18 @@
                    new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
            .Where((a, b) => a.BlNo == query.blNo
                             && (b.Bld007 ?? 0) - (b.Bld008 ?? 0) > 0)
            .Select((a, b) => new PendingMaterialDto
            .Select((a, b) => new MesItemBlDetail
            {
                SectionCode = b.Bld012.ToString(),
                ItemNo = b.Bld002,
                ItemName = b.Bld003,
                ItemSpec = b.Bld004,
                PendingQty = (b.Bld007 ?? 0) - (b.Bld008 ?? 0)
                Bld012 = b.Bld012,
                Bld002 = b.Bld002,
                Bld003 = b.Bld003,
                Bld004 = b.Bld004,
                Bld007 = b.Bld007,
                Bld008 = b.Bld008
            })
            .ToList();

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

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

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

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

        #endregion

        // 检验是否重复扫描
        var exists = Db.Queryable<MesInvItemOutCDetails>()
@@ -676,7 +678,7 @@
            {
                // 创建新的出库单
                var outId = Guid.NewGuid();
                var outNo = BillNo.GetBillNo("SCBL");
                var outNo = BillNo.GetBillNo("BL(工单补料)");

                // 插入出库单主表
                executeCommand += db.Insertable(new MesInvItemOuts
@@ -871,13 +873,14 @@
                new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
            .Where((a, b) => a.BlNo == query.blNo
                             && (b.Bld007 ?? 0) - (b.Bld008 ?? 0) > 0)
            .Select((a, b) => new PendingMaterialDto
            .Select((a, b) => new MesItemBlDetail
            {
                SectionCode = b.Bld012.ToString(),
                ItemNo = b.Bld002,
                ItemName = b.Bld003,
                ItemSpec = b.Bld004,
                PendingQty = (b.Bld007 ?? 0) - (b.Bld008 ?? 0)
                Bld012 = b.Bld012,
                Bld002 = b.Bld002,
                Bld003 = b.Bld003,
                Bld004 = b.Bld004,
                Bld007 = b.Bld007,
                Bld008 = b.Bld008
            })
            .ToList();

@@ -904,8 +907,9 @@
    /// </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("请选单据号！");
@@ -952,7 +956,7 @@
            })
            .ToList();

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

    /// <summary>
@@ -967,7 +971,7 @@
    ///     - userName: 用户名(必填)
    ///     - blNo: 超领单号(必填)
    /// </remarks>
    public (bool success, List<PendingMaterialDto> pendingList)
    public (WarehouseQuery item, List<MesItemBlDetail> pendingList)
        ScanBarcodeForOverPicking(
            WarehouseQuery query)
    {
@@ -1071,17 +1075,21 @@
                    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);
        }

        // 执行数据库事务
@@ -1102,7 +1110,7 @@
            if (outRecord == null)
            {
                outId = Guid.NewGuid();
                outNo = BillNo.GetBillNo("SCBL"); // 需要实现生成单号的方法
                outNo = BillNo.GetBillNo("BL(工单补料)"); // 需要实现生成单号的方法

                // 插入出库单主表
                db.Insertable(new MesInvItemOuts
@@ -1282,17 +1290,18 @@
                    new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
            .Where((a, b) => a.BlNo == query.blNo
                             && (b.Bld007 ?? 0) - (b.Bld008 ?? 0) > 0)
            .Select((a, b) => new PendingMaterialDto
            .Select((a, b) => new MesItemBlDetail
            {
                SectionCode = b.Bld012.ToString(),
                ItemNo = b.Bld002,
                ItemName = b.Bld003,
                ItemSpec = b.Bld004,
                PendingQty = (b.Bld007 ?? 0) - (b.Bld008 ?? 0)
                Bld012 = b.Bld012,
                Bld002 = b.Bld002,
                Bld003 = b.Bld003,
                Bld004 = b.Bld004,
                Bld007 = b.Bld007,
                Bld008 = b.Bld008
            })
            .ToList();

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

    /// <summary>
@@ -1300,7 +1309,7 @@
    /// </summary>
    /// <param name="query">查询参数</param>
    /// <returns>处理结果</returns>
    public (bool success, List<PendingMaterialDto> pendingList)
    public (bool success, List<MesItemBlDetail> pendingList)
        PrintBarcodeForOverPicking(WarehouseQuery query)
    {
        UseTransaction(db =>
@@ -1505,7 +1514,7 @@
                itemOut = new MesInvItemOuts
                {
                    Guid = Guid.NewGuid(),
                    ItemOutNo = BillNo.GetBillNo("SCBL"), // 需要实现生成单号的方法
                    ItemOutNo = BillNo.GetBillNo("BL(工单补料)"), // 需要实现生成单号的方法
                    TaskNo = query.blNo,
                    CreateBy = query.userName,
                    CreateDate = DateTime.Now,
@@ -1683,17 +1692,21 @@


        // 获取最终的待处理列表
        // 获取补料单明细中未完成的记录
        // 通过左连接查询补料单(MesItemBl)和补料单明细(MesItemBlDetail)表
        // 条件: 1.补料单号匹配 2.计划数量(Bld007)减去已补数量(Bld008)大于0(即未完成的)
        var pendingList = Db.Queryable<MesItemBl, MesItemBlDetail>((a, b) =>
                new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
            .Where((a, b) => a.BlNo == query.blNo
                             && (b.Bld007 ?? 0) - (b.Bld008 ?? 0) > 0)
            .Select((a, b) => new 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();