1.来料检验”未检验“”已检验“做区分

南骏 池

2025-02-07 f7f1b35ea5074fcf13897c0c256cac6897647ee6

 service/Warehouse/MesItemBlManager.cs

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

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

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

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

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

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

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

        #endregion

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

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

        if (mesItemBl == null)
@@ -164,17 +164,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 +187,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 +405,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 +432,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 +450,6 @@
        if (string.IsNullOrEmpty(query.blNo))
            throw new Exception("补料单号不能为空！");

        #endregion

        // 检验是否重复扫描
        var exists = Db.Queryable<MesInvItemOutCDetails>()
@@ -503,8 +506,8 @@
                    // Mblnr = stockBarcode.Mblnr,
                    // Zeile = stockBarcode.Zeile,
                    // RohInId = stockBarcode.RohInId,
                    // BarcodeStatus = 0,
                    // OldQty = query.Num,
                    Barcodestatus = false,
                    Oldqty = query.Num as long?,
                    // Unit = stockBarcode.Unit,
                    // WeightUnit = stockBarcode.WeightUnit,
                    Factory = stockBarcode.Factory,
@@ -517,8 +520,9 @@
                    // MemoBad = stockBarcode.MemoBad,
                    ComeFlg = 5,
                    // Memo = stockBarcode.Memo,
                    SuppId = stockBarcode.SuppId,
                    SuppNo = stockBarcode.SuppNo,
                    // InsDate = stockBarcode.InsDate, // Added InsDate
                    InsDate = stockBarcode.IndepDate, // Added InsDate
                    ItemId = stockBarcode.ItemId
                    // ItemUnit = stockBarcode.ItemUnit // Added ItemUnit
                }).IgnoreColumns(true).ExecuteCommand();
@@ -676,7 +680,7 @@
            {
                // 创建新的出库单
                var outId = Guid.NewGuid();
                var outNo = BillNo.GetBillNo("SCBL");
                var outNo = BillNo.GetBillNo("BL(工单补料)");

                // 插入出库单主表
                executeCommand += db.Insertable(new MesInvItemOuts
@@ -871,13 +875,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();

@@ -888,12 +893,12 @@

    #region 生产超领

    public List<string> GetSccList()
    public List<string> GetSccList(WarehouseQuery query)
    {
        var list = Db.Queryable<MesItemBl>()
            .Where(s => (s.Bl018 ?? false) == true
                        && (s.Bl019 ?? false) == false
                        && s.Bl008 == "生产超领")
                        && s.Bl008 == query.Type)
            .Select(s => s.BlNo)
            .ToList();
        return list;
@@ -904,15 +909,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)
@@ -952,7 +958,7 @@
            })
            .ToList();

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

    /// <summary>
@@ -967,7 +973,7 @@
    ///     - userName: 用户名(必填)
    ///     - blNo: 超领单号(必填)
    /// </remarks>
    public (bool success, List<PendingMaterialDto> pendingList)
    public (WarehouseQuery item, List<MesItemBlDetail> pendingList)
        ScanBarcodeForOverPicking(
            WarehouseQuery query)
    {
@@ -1071,17 +1077,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 +1112,7 @@
            if (outRecord == null)
            {
                outId = Guid.NewGuid();
                outNo = BillNo.GetBillNo("SCBL"); // 需要实现生成单号的方法
                outNo = BillNo.GetBillNo("BL(工单补料)"); // 需要实现生成单号的方法

                // 插入出库单主表
                db.Insertable(new MesInvItemOuts
@@ -1282,17 +1292,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 +1311,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 +1516,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 +1694,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();