1111

啊鑫

2 天以前 00a72fff219241eb5b0405a066cc859d07cf7735

 service/Wom/WwGdManager.cs

@@ -1,11 +1,14 @@
using System.Data;
using System.Data.SqlClient;
using Masuit.Tools;
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.Data.SqlClient;
using System.Threading.Tasks.Dataflow;
using DbHelperSQL = NewPdaSqlServer.DB.DbHelperSQL;

namespace NewPdaSqlServer.service.Wom;

@@ -137,86 +140,110 @@
        }
    }

    public ProductionPickDto GetItemsByDaa001(WarehouseQuery query)

    /// <summary>
    /// 获取库位信息
    /// </summary>
    /// <param name="unity"></param>
    /// <returns></returns>
    /// <exception cref="Exception"></exception>
    public dynamic GetBarKwByItem(dynamic unity)
    {
        return getDaa001(query);
        if (unity == null)
            throw new ArgumentNullException(nameof(unity), "参数对象不能为null");

        if (string.IsNullOrEmpty(unity.itemId?.ToString()))
            throw new ArgumentException("物料ID不能为空", nameof(unity.itemId));

        try
        {
            var parameters = new List<SugarParameter>
            {
                new SugarParameter("@itemId",unity.itemId)
            };

            return Db.Ado.SqlQuery<dynamic>("EXEC prc_pda_scll_selBarMx @itemId", parameters);
        }
        catch (Exception ex)
        {
            throw new Exception($"获取条码信息失败：{ex.Message}");
        }

    }

    private ProductionPickDto getDaa001(WarehouseQuery query)
    /// <summary>
    /// 选取列表
    /// </summary>
    /// <param name="unity"></param>
    /// <param name="RequestInfo"></param>
    /// <returns></returns>
    public dynamic GetXcslDaa(dynamic unity, dynamic RequestInfo)
    {
        if (string.IsNullOrEmpty(query.daa001)) throw new Exception("工单号为空");

        var wwgd = Db.Queryable<WwGd, MesItems>((a, i) =>
                new JoinQueryInfos(JoinType.Left,
                    a.Daa003 == i.ItemId))
            .Where((a, i) => a.Daa001 == query.daa001 && (a.PcSh ?? 0) == 1)
            .Select((a, i) => new
            {
                a.Daa001, a.RwdGuid
            }).First();

        if (wwgd?.Daa001 == null) throw new Exception("工单号不存在");

        var womdabs = Db
            .Queryable<WwGd, WwGdDetail, MesItems, ProductionOrderSub>((a, b, c,
                    d) =>
                new JoinQueryInfos(
                    JoinType.Left,
                    a.Id == b.Pid,
                    JoinType.Inner,
                    c.Id == b.Dab003,
                    JoinType.Inner, b.Erpid.ToString() == d.ErpId
                ))
            .Where((a, b, c, d) =>
                a.Daa001 == query.daa001)
            .Select((a, b, c, d) => new WwGdDetail
            {
                Pid = b.Pid,
                Dab003 = b.Dab003,
                Dab006 = b.Dab006,
                Dab007 = b.Dab007,
                wNum = b.Dab006 - b.Dab007, // 计算字段 W_NUM
                ItemName = c.ItemName, // 动态字段 ITEM_NAME
                ItemNo = c.ItemNo // 动态字段 ITEM_NO
            })
            .ToList();

        var list = womdabs.Where(s => s.wNum > 0).ToList();

        var mesInvItemOutCDetailsList = Db
            .Queryable<MesInvItemOutCDetails, MesItems, MesDepots>
            ((a, b, c) =>
                new JoinQueryInfos(
                    JoinType.Inner, a.ItemId == b.Id,
                    JoinType.Inner, c.DepotId == a.DepotId
                ))
            .Where((a, b, c) => a.WorkNo == query.daa001)
            .Select((a, b, c) => new MesInvItemOutCDetails
            {
                ItemName = b.ItemName,
                ItemNo = b.ItemNo,
                ItemId = a.ItemId,
                DepotId = a.DepotId,
                WorkNo = a.WorkNo,
                DepotName = c.DepotName,
                Quantity = a.Quantity
            })
            .ToList();

        var womcaa = Db.Queryable<ProductionOrder>()
            .Where(s => s.Guid == wwgd.RwdGuid)
            .First();

        var dto = new ProductionPickDto
        var orgId = RequestInfo.OrgId;
        var parameters = new List<SugarParameter>
        {
            daa001 = wwgd.Daa001,
            PlanNo = womcaa.ErpProductionOrderNo,
            totals1 = womdabs,
            daisao1 = list,
            yisao = mesInvItemOutCDetailsList
            new SugarParameter("@selectKey", unity.selectKey),
            new SugarParameter("@inP1", orgId), // 可选参数
            new SugarParameter("@inP2", unity.selDaaType), // 可选参数
            new SugarParameter("@inP3", null), // 可选参数
            new SugarParameter("@inP4", null), // 可选参数
            // ...其他可选参数
        };
        var result = Db.Ado.SqlQuery<dynamic>("EXEC prc_pda_wwll_list @selectKey, @inP1, @inP2, @inP3, @inP4", parameters);
        return result;
    }

        return dto;
    /// <summary>
    /// 列表明细
    /// </summary>
    /// <param name="query"></param>
    /// <param name="RequestInfo"></param>
    /// <returns></returns>
    public dynamic GetItemsByDaa001(WarehouseQuery query, dynamic RequestInfo)
    {
        return getDaa001(query, RequestInfo);
    }

    private dynamic getDaa001(WarehouseQuery query, dynamic RequestInfo)
    {
        if (string.IsNullOrEmpty(query.daa001)) throw new Exception("请选工单号！");
        if (query == null)
            throw new ArgumentNullException(nameof(query), "参数对象不能为null");
        if (string.IsNullOrEmpty(query.daa001?.ToString()))
            throw new ArgumentException("工单号不存在", nameof(query.daa001));

        var orgId = RequestInfo.OrgId;
        if (orgId == null)
            throw new Exception("组织不存在！");

        var parameters = new[]
        {
            new SugarParameter("@daa001", query.daa001),
            new SugarParameter("@pi_orgId", orgId),
            new SugarParameter("@inP1", null),
            new SugarParameter("@inP2", null),
            new SugarParameter("@inP3", null),
            new SugarParameter("@inP4", null)
        };
        try
        {
            List<dynamic>? blDetails = Db.Ado.SqlQuery<dynamic>(
                "EXEC prc_pda_wwll_detailList @daa001,@pi_orgId,@inP1,@inP2,@inP3,@inP4", parameters);
            var items = blDetails.Where(x => x.DSQty > 0).ToList();    // 待扫物料
            var ysitems = blDetails.Where(x => x.SQty > 0).ToList();   // 已扫物料
            var planNo = blDetails.FirstOrDefault()?.ErpProductionOrderNo?.ToString();// 获取工单计划号
            return new 
            {
                daa001 = query.daa001,
                PlanNo = planNo,
                items = items,
                ysitems = ysitems
            };
        }
        catch (Exception ex)
        {
            throw new Exception($"{ex.Message}");
        }
    }

    #region 委外退料
@@ -284,6 +311,7 @@
        if (c_mes_inv_item_barcodes == null)
            throw new Exception("此条码不属于该退料单，请核对！");

       

        // if (c_mes_inv_item_barcodes.Memo != "生产退料")
        //     throw new Exception("此条码不是生产退料条码，不可使用生产退料模块！");
@@ -318,17 +346,12 @@
            throw new Exception("条码不属于该申请单明细,无法扫码!");

        //判断货主信息
        var CABerpid = Db.Queryable<WwGdDetail>()
            .Where(womdab =>
                womdab.Id.ToString() == C_MES_ITEM_TBL_DETAIL.Tld013)
            .Select(womdab => womdab.Erpid).First();
        var CABerpid = Db.Queryable<WwGdDetail>().Where(womdab => womdab.Id.ToString() == C_MES_ITEM_TBL_DETAIL.Tld013).Select(womdab => womdab.Erpid).First();

        var WWCAB = Db.Queryable<ProductionOrderSub>()
            .Where(womcab => womcab.ErpId == CABerpid.Value.ToString()).First();
        var WWCAB = Db.Queryable<ProductionOrderSub>().Where(womcab => womcab.ErpId == CABerpid.Value.ToString()).First();


        if (string.IsNullOrEmpty(WWCAB.Owner))
            throw new Exception("用料清单货主信息不存在,无法扫码，请联系管理员!");
        if ( String.IsNullOrEmpty(WWCAB.Owner)) throw new Exception("用料清单货主信息不存在,无法扫码，请联系管理员!");

        //var owner_type = "";
        //if (Db.Queryable<SysOrganization>().Any(x => x.Fid == ownerId))
@@ -423,10 +446,10 @@

            // 检查是否存在于 MES_INV_ITEM_IN_C_ITEMS 表
            var existingCount = db.Queryable<MesInvItemInCItems>()
                .Where(it =>
                    it.ItemInId == c_id &&
                    it.ItemId == C_MES_ITEM_TBL_DETAIL.Tld009 &&
                    it.DepotId == c_depot_code.ToString())
            .Where(it =>
                it.ItemInId == c_id &&
                                it.ItemId == C_MES_ITEM_TBL_DETAIL.Tld009 &&
                                it.DepotId == c_depot_code.ToString())
                .Count();

            if (existingCount == 0)
@@ -462,14 +485,12 @@
                db.Updateable<MesInvItemInCItems>()
                    .SetColumns(it => new MesInvItemInCItems
                    {
                        Quantity = SqlFunc.IsNull(it.Quantity, 0) +
                                   c_mes_inv_item_barcodes
                                       .Quantity // 确保 Quantity 不为 null
                        Quantity = SqlFunc.IsNull(it.Quantity, 0) + c_mes_inv_item_barcodes.Quantity // 确保 Quantity 不为 null
                    })
                    .Where(it =>
                        it.ItemInId == c_id &&
                        it.ItemId == C_MES_ITEM_TBL_DETAIL.Tld009 &&
                        it.DepotId == c_depot_code.ToString())
                .Where(it =>
                       it.ItemInId == c_id &&
                                it.ItemId == C_MES_ITEM_TBL_DETAIL.Tld009 &&
                                it.DepotId == c_depot_code.ToString())
                    //.IgnoreColumns(true) // 保留 IgnoreColumns
                    .ExecuteCommand();

@@ -511,7 +532,7 @@
                ReceiveOrgId = c_mes_depots.FSubsidiary,
                EbelnK3id = c_mes_inv_item_barcodes.EbelnK3id,
                LineK3id = c_mes_inv_item_barcodes.LineK3id,
                Ischeck = true
                Ischeck = true,
            }).IgnoreColumns(true).ExecuteCommand();

            // 插入业务记录
@@ -629,8 +650,8 @@
                    })
                    .Where(it => it.Tlmid == C_MES_ITEM_TBL.Id
                                 && it.Tld009 == c_mes_inv_item_barcodes.ItemId)
                    //&& it.Tld010 ==
                    //c_mes_inv_item_barcodes.WorkLine)
                                 //&& it.Tld010 ==
                                 //c_mes_inv_item_barcodes.WorkLine)
                    .ExecuteCommand();
            }
            // 作业不良退料 - 更新工单表和退料单明细表
@@ -663,8 +684,8 @@
                    })
                    .Where(it => it.Tlmid == C_MES_ITEM_TBL.Id
                                 && it.Tld009 == c_mes_inv_item_barcodes.ItemId)
                    //&& it.Tld010 ==
                    //c_mes_inv_item_barcodes.WorkLine)
                                 //&& it.Tld010 ==
                                 //c_mes_inv_item_barcodes.WorkLine)
                    .ExecuteCommand();
            }

@@ -679,9 +700,9 @@
                    .ExecuteCommand();

            // 检查退料单是否所有明细都已完成
            var remainingCount = Db
                .Queryable<MesItemTbl, MesItemTblDetail>((a, b) =>
                    new JoinQueryInfos(JoinType.Left, a.Id == b.Tlmid))
            var remainingCount = Db.Queryable<MesItemTbl, MesItemTblDetail>(
                    (a, b) =>
                        new JoinQueryInfos(JoinType.Left, a.Id == b.Tlmid))
                .Where((a, b) =>
                    a.BillNo == p_bill_no &&
                    (b.Tld005 ?? 0) - (b.Tld006 ?? 0) > 0)
@@ -702,10 +723,8 @@

            // 创建 插入日志
            var logService = new LogService();
            var LogMsg = "[PDA]委外退料。条码【" + query.barcode + "】 退料单号【" +
                         c_bill_no + "】";
            logService.CreateLog(db, query.userName, wwgd.Id.ToString(),
                "WW_GD", LogMsg, wwgd.Daa001);
            var LogMsg = "[PDA]委外退料。条码【" + query.barcode + "】 退料单号【" + c_bill_no + "】";
            logService.CreateLog(db, query.userName, wwgd.Id.ToString(), "WW_GD", LogMsg, wwgd.Daa001);

            return totalResult;
        });
@@ -720,7 +739,7 @@
    #region 委外补料

    /// <summary>
    ///     委外工单补料扫码
    /// 委外工单补料扫码
    ///     扫描条码  prc_rf_pda_scan_zout_barcode3
    /// </summary>
    /// <param name="query">查询参数</param>
@@ -781,8 +800,7 @@
        // 获取补料单明细并校验
        var blDetail = Db.Queryable<MesItemBlDetail>()
            .Where(b =>
                b.Mid == mesItemBl.Id && b.Bld012 == stockBarcode.ItemId &&
                b.Bld007 > b.Bld008)
                b.Mid == mesItemBl.Id && b.Bld012 == stockBarcode.ItemId && b.Bld007 > b.Bld008)
            .First();

        if (blDetail == null)
@@ -850,9 +868,13 @@
            //query.Type = "委外补料";
            var outNoType = "WWBL(委外补料)";
            if (query.Type == "委外补料")
            {
                outNoType = "WWBL(委外补料)";
            }
            else
            {
                outNoType = "WWCL(委外超领)";
            }
            //outNoType = "WWBL(委外补料)";
            // 获取或创建出库单
            var outId = Guid.NewGuid();
@@ -900,7 +922,7 @@
                    OutDate = DateTime.Now,
                    Status = 0,
                    DepotId = stockBarcode.DepotId,
                    THORGID = stockBarcode.StockOrgId
                    THORGID = stockBarcode.StockOrgId,
                    //BbillNo = query.billNo
                }).IgnoreColumns(true).ExecuteCommand();
            }
@@ -908,9 +930,7 @@
            // 检查并更新出库单物料明细
            var itemCount = db.Queryable<MesInvItemOutItems>()
                .Where(i =>
                    i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId &&
                    i.ItemOutId == outId &&
                    i.DepotId == stockBarcode.DepotsId.ToString())
                    i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId && i.ItemOutId == outId && i.DepotId == stockBarcode.DepotsId.ToString())
                .Count();

            if (itemCount > 0)
@@ -919,10 +939,7 @@
                    .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())
                        i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId && i.ItemOutId == outId && i.DepotId == stockBarcode.DepotsId.ToString())
                    .ExecuteCommand();
            else
                // 插入新的物料明细记录
@@ -949,7 +966,7 @@
                    PbillNo = query.billNo,
                    ItemId = blDetail.Bld012,
                    DepotId = stockBarcode.DepotId.ToString(),
                    ItemDabid = blDetail.Id
                    ItemDabid = blDetail.Id,
                    //AboutGuid = womdab.Id
                    // Unit = blDetail.Bld009,
                    // DepotId = (int)stockBarcode.DepotsId
@@ -1080,19 +1097,16 @@

            // 创建 插入日志
            var logService = new LogService();
            var LogMsg = "[PDA]" + query.Type + "。条码【" + query.barcode +
                         "】 数量【" + stockBarcode.Quantity + "】 出库单号【" + outNo +
                         "】";
            logService.CreateLog(db, query.userName, wwgd.Id.ToString(),
                "WW_GD", LogMsg, wwgd.Daa001);
            var LogMsg = "[PDA]"+query.Type + "。条码【" +query.barcode+"】 数量【"+ stockBarcode.Quantity.ToString() + "】 出库单号【"+ outNo +"】";
            logService.CreateLog(db,query.userName,wwgd.Id.ToString(), "WW_GD", LogMsg,wwgd.Daa001);

            return 1;
        });

        // 获取最终的待发料明细列表
        var finalPendingList = Db
            .Queryable<MesItemBl, MesItemBlDetail>((a, b) =>
                new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
        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