1.其他出库优化

南骏 池

2025-06-06 b8fa3c75a36784fb61d1ebc988710293826da521

 service/Warehouse/MesItemQtManager.cs

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

@@ -15,12 +16,15 @@
    /// <returns>退料单号列表</returns>
    public List<string> GetPendingQtList()
    {
        return Db.Queryable<MesItemQt>()
            .Where(it =>
                (it.Qt015 ?? false) == true && (it.Qt014 ?? false) == false)
            .OrderByDescending(it => it.Qtck)
            .Select(it => it.Qtck)
            .ToList();
        const string sql = @"SELECT qtck 
                        FROM MES_ITEM_QT 
                        WHERE qt015 = 1 
                          AND qt026 = 1 
                          AND QT029 = 1 
                          AND qt032 = 1
                          AND QT014 = 0  ";

        return Db.Ado.SqlQuery<string>(sql);
    }

    /// <summary>
@@ -28,7 +32,7 @@
    /// </summary>
    /// <param name="query">仓库查询参数，包含用户名和单据号</param>
    /// <returns>待处理的退料单明细列表</returns>
    public List<MesItemQtDatall> GetPendingQtList(WarehouseQuery query)
    public ProductionPickDto GetPendingQtList(WarehouseQuery query)
    {
        // 从查询参数中获取用户名和单据号
        var c_User = query.userName;
@@ -42,41 +46,45 @@
        // 如果未找到退料单，抛出异常
        if (mesItemQt == null) throw new Exception($"未查询到此其他入库申请单 {p_bill_no}");

        // 检查退料单的审核状态(Qt015)，未审核则抛出异常
        if (mesItemQt.Qt015 == false)
            throw new Exception($"其他出库申请单 {p_bill_no} 未审核，请确认！");
        //// 检查退料单的审核状态(Qt015)，未审核则抛出异常
        //if (mesItemQt.Qt015 == false)
        //    throw new Exception($"其他出库申请单 {p_bill_no} 未审核，请确认！");

        // 检查退料单的完结状态(Qt014)，已完结则抛出异常
        if (mesItemQt.Qt014 == true)
            throw new Exception($"其他出库申请单 {p_bill_no} 已完结，请确认！");

        // 联表查询获取未完成的明细列表
        // 关联表：
        // - MesItemQt: 退料单主表(a)
        // - MesItemQtDatall: 退料单明细表(b)
        // - MesItems: 物料基础信息表(c)
        var pendingList = Db.Queryable<MesItemQt, MesItemQtDatall, MesItems>(
                (a, b, c) =>
                    new JoinQueryInfos(
                        JoinType.Left, a.Guid == b.QtGuid, // 主表和明细表通过Guid关联
                        JoinType.Left,
                        b.ItemId == c.Id.ToString())) // 明细表和物料表通过ItemId关联
            .Where((a, b, c) =>
                a.Qtck == p_bill_no && // 匹配单据号
                (b.Qd007 ?? 0) - (b.Qd008 ?? 0) >
                0) // 计划数量减去已完成数量大于0的记录(即未完成的记录)
            .OrderBy((a, b, c) => c.ItemNo) // 按物料编号排序
            .Select((a, b, c) => new MesItemQtDatall
            {
                Qd002 = b.Qd002, // 明细行号
                Qt011 = a.Qt011, // 退料原因
                ItemNo = c.ItemNo, // 物料编号
                Qd007 = b.Qd007 ?? 0, // 计划数量
                Qd008 = b.Qd008 ?? 0 // 已完成数量
            })
            .ToList();
        var sql = @"SELECT c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel,
                    ISNULL(A.qd007,0)  FQty,ISNULL(A.qd008,0) SQty,ISNULL(A.qd007,0) - ISNULL(A.qd008,0) DSQty,
                    dbo.F_QX_GETRECODEPOTSE(A.itemId,'','','') as RecoKw
                    FROM MES_ITEM_QT_DATALL A
                    LEFT JOIN MES_ITEM_QT B ON A.qtGuid = B.guid
                    LEFT JOIN MES_ITEMS C ON A.itemId = C.item_id
                    WHERE B.qtck = @billNo AND (qt015 = 1 AND qt026 =1 AND QT029 = 1 AND qt032 = 1)";

        return pendingList;
        var sqlParams = new List<SugarParameter> {
            new("@billNo", query.billNo)
        };

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

        // 检查退料单的完结状态(Qt014)，已完结则抛出异常
        if (womdabs.Count < 1)
            throw new Exception($"该其他出库申请单 {p_bill_no} 未全部审核，请确认！");

        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 = womdaa.Daa001,
            //PlanNo = womcaa.Caa020,
            items = DS_list,
            Ysitems = YS_list
        };

        return dto;
    }

    public (WarehouseQuery form, List<MesItemQtDatall> item, string message)
@@ -135,7 +143,7 @@

        // 获取其他出库单信息
        var mesItemQt = Db.Queryable<MesItemQt>()
            .Where(it => it.Qtck == p_bill_no)
            .Where(it => it.Qtck == p_bill_no && it.Qt015 == true && it.Qt026 == true && it.Qt029 == true && it.Qt032 == true)
            .First();

        if (mesItemQt == null)
@@ -235,8 +243,8 @@
                    BillTypeId = p_bill_type_id,
                    TransactionNo = p_transaction_no,
                    DepotCode = stock.DepotsCode,
                    DepotId = stock.DepotsId.HasValue
                        ? (int)stock.DepotsId
                    DepotId = stock.DepotId.HasValue
                        ? (int)stock.DepotId
                        : null,
                    OutPart = mesItemQt.Qt012,
                    FType = 0,
@@ -270,7 +278,7 @@
            // 检查是否已存在出库物料记录
            var existingOutItem = Db.Queryable<MesInvItemOutItems>()
                .Where(it =>
                    it.ItemOutId == outId && it.ItemId == barcode.ItemId && it.AboutGuid == qtDetail.Guid)
                    it.ItemOutId == outId && it.ItemId == barcode.ItemId && it.ItemDabid == qtDetail.Guid)
                .First();

            if (existingOutItem == null)
@@ -298,7 +306,8 @@
                        ? long.Parse(qtDetail.ItemId)
                        : null,
                    FType = 0,
                    AboutGuid = qtDetail.Guid
                    AboutGuid = qtDetail.Guid,
                    ItemDabid = qtDetail.Guid
                    // Unit = qtDetail.Qd009
                };

@@ -311,9 +320,7 @@
                commit += db.Updateable<MesInvItemOutItems>()
                    .SetColumns(it =>
                        it.TlQty == (it.TlQty ?? 0) + stock.Quantity)
                    .Where(it => it.ItemOutId == outId &&
                                 it.ItemId == barcode.ItemId &&
                                 it.QtOutId == qtDetail.Guid)
                    .Where(it => it.ItemOutId == outId && it.ItemId == barcode.ItemId && it.ItemDabid == qtDetail.Guid)
                    .ExecuteCommand();
            }

@@ -331,8 +338,8 @@
                LastupdateBy = c_user,
                LastupdateDate = DateTime.Now,
                DepotCode = stock.DepotsCode,
                DepotId = stock.DepotsId.HasValue
                    ? (int)stock.DepotsId
                DepotId = stock.DepotId.HasValue
                    ? (int)stock.DepotId
                    : null,
                // DepotsCode = stock.DepotsCode,
                // DepotSectionsCode = stock.DepotSectionsCode,
@@ -436,6 +443,11 @@
            query.Num = stock.Quantity;
            query.Fum = null;

            // 创建 插入日志
            var logService = new LogService();
            var LogMsg = "【PDA】其他出库。条码【" + query.barcode + "】数量【"+ stock.Quantity.ToString() + "】 出库单号【" + outNo + "】";
            logService.CreateLog(db, query.userName, mesItemQt.Guid.ToString(), "MES_ITEM_QT", LogMsg, mesItemQt.Qtck);

            if (commit < 5) throw new Exception("更新失败");

            return commit;