1111

啊鑫

昨天 00a72fff219241eb5b0405a066cc859d07cf7735

 service/Wom/WomdaaManager.cs

@@ -2,13 +2,13 @@
using System.Data.SqlClient;
using System.Text;
using Masuit.Tools;
using Masuit.Tools.Hardware;
using Microsoft.SqlServer.Server;
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
using NewPdaSqlServer.entity.Base;
using NewPdaSqlServer.util;
using SqlSugar;
using SqlDataAdapter = System.Data.SqlClient.SqlDataAdapter;

namespace NewPdaSqlServer.service.Wom;

@@ -18,8 +18,7 @@
    //这里面写的代码不会给覆盖,如果要重新生成请删除 WomdaaManager.cs

    //获取工单号
    public List<string> GetProductionPickDaa001(WarehouseQuery query,
        dynamic requestInfo)
    public List<string> GetProductionPickDaa001(WarehouseQuery query, dynamic requestInfo)
    {
        var sql =
            "SELECT DAA001 FROM WOMDAA A LEFT JOIN (SELECT COUNT(1) UN_NUM, PID FROM WOMDAB  WHERE DAB006 > DAB007 GROUP BY DAB002) B ON A.GUID = B.daaGuid WHERE DAA001 = " +
@@ -38,7 +37,7 @@
        if (query == null)
            throw new ArgumentNullException(nameof(query), "参数对象不能为null");

        if (string.IsNullOrEmpty(query.daa001))
        if (string.IsNullOrEmpty(query.daa001?.ToString()))
            throw new ArgumentException("工单号不能为空", nameof(query.daa001));

        var orgId = requestInfo.OrgId;
@@ -50,26 +49,25 @@
        var parameters = new[]
        {
            new SugarParameter("@daa001", query.daa001),
            new SugarParameter("@pi_orgId", orgId),
            new SugarParameter("@pi_orgId",orgId),
            new SugarParameter("@inP1", null),
            new SugarParameter("@inP2", null),
            new SugarParameter("@inP3", null),
            new SugarParameter("@inP4", null)
        };
        var womdabs =
            Db.Ado.SqlQuery<ItemDetailModel>(
                "EXEC prc_pda_scll_detailList @daa001", parameters);
        var womdabs = Db.Ado.SqlQuery<ItemDetailModel>("EXEC prc_pda_scll_detailList @daa001", parameters);

        var DS_list = womdabs.Where(s => s.DSQty > 0).ToList();
        var YS_list = womdabs.Where(s => s.SQty > 0).ToList();

        // 修复：补充获取 womdaa 对象
        var daa001Value = query.daa001;
        var womdaa = Db.Ado
            .SqlQuery<dynamic>("EXEC prc_pda_getDaaInfo @daa001", parameters)
            .First();
        var daa001Value = query.daa001?.ToString();
        var womdaa = Db.Ado.SqlQuery<dynamic>("EXEC prc_pda_getDaaInfo @daa001", parameters).First();

        if (womdaa == null) throw new Exception("该工单信息不存在，请核对！");
        if (womdaa == null)
        {
            throw new Exception("该工单信息不存在，请核对！");
        }

        var dto = new ProductionPickDto
        {
@@ -161,7 +159,7 @@

        var _strMsg = "";
        var _intSum = "";
        var _cfBar = ""; //拆分后条码
        var _cfBar = "";//拆分后条码
        using (var conn = new SqlConnection(DbHelperSQL.strConn))
        {
            using (var cmd = new SqlCommand("[prc_pda_SCLL_CF]", conn))
@@ -197,8 +195,8 @@
                    var dto = new ProductionPickDto
                    {
                        daa001 = query.daa001,
                        barcode = query.barcode, //原条码
                        cfBarcode = _cfBar //拆分后条码
                        barcode = query.barcode,//原条码
                        cfBarcode = _cfBar//拆分后条码
                    };

                    return dto;
@@ -223,7 +221,7 @@
                new JoinQueryInfos(JoinType.Left,
                    a.Daa002 == i.ItemId.ToString()))
            .Where((a, i) => a.Daa001 == query.daa001
                             && a.Fstatus == 1)
                    && a.Fstatus == 1)
            .Select((a, i) => new
            {
                a.Daa001, a.CaaGuid
@@ -254,8 +252,7 @@
        //    })
        //    .ToList();

        var sql = string.Format(
            @"SELECT c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel,b.dab006 FQty,b.dab007 SQty,b.dab006 - b.dab007 DSQty ,C.item_id FMaterialId ,
        var sql =string.Format(@"SELECT c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel,b.dab006 FQty,b.dab007 SQty,b.dab006 - b.dab007 DSQty ,C.item_id FMaterialId ,
       dbo.F_QX_GETRECODEPOTSE(B.dab003,'','','') as RecoKw
    FROM WOMDAB B
    LEFT JOIN WOMDAA A ON A.guid = B.daaGuid
@@ -293,7 +290,10 @@
        var womcaa = Db.Queryable<Womcaa>().Where(s => s.Guid == womdaa.CaaGuid)
            .First();

        if (womcaa == null) throw new Exception("生产任务单不存在");
        if (womcaa == null)
        {
            throw new Exception("生产任务单不存在");
        }

        var dto = new ProductionPickDto
        {
@@ -308,7 +308,7 @@
    }

    /// <summary>
    ///     获取工单条码信息
    /// 获取工单条码信息
    /// </summary>
    /// <param name="query"></param>
    /// <returns></returns>
@@ -324,23 +324,23 @@
            throw new ArgumentException("工序不能为空", nameof(query.GX));

        var parameters = new[]
        {
            new SugarParameter("@pi_trac_barcode", query.Zsbarcode),
            new SugarParameter("@pi_gx", query.GX),
            new SugarParameter("@inP1", null),
            new SugarParameter("@inP2", null),
            new SugarParameter("@inP3", null),
            new SugarParameter("@inP4", null)
        };
    {
        new SugarParameter("@pi_trac_barcode", query.Zsbarcode),
        new SugarParameter("@pi_gx", query.GX),
        new SugarParameter("@inP1", null),
        new SugarParameter("@inP2", null),
        new SugarParameter("@inP3", null),
        new SugarParameter("@inP4", null)
    };

        try
        {
            var ZsBarInfo = Db.Ado.SqlQuery<dynamic>(
                "EXEC prc_pda_scll_selZsBarInfo @pi_trac_barcode,@pi_gx,@inP1,@inP2,@inP3,@inP4",
                parameters);
            var ZsBarInfo = Db.Ado.SqlQuery<dynamic>("EXEC prc_pda_scll_selZsBarInfo @pi_trac_barcode,@pi_gx,@inP1,@inP2,@inP3,@inP4", parameters);

            if (ZsBarInfo.Count < 1)
            {
                throw new Exception($"该追溯码{query.Zsbarcode}不存在或已绑定");
            }

            return ZsBarInfo;
        }
@@ -354,8 +354,7 @@
    //获取生产
    public dynamic getTraceability(dynamic query)
    {
        var sql = string.Format(
            @"SELECT processNo, A.barCode, B.lineId, line_no, name AS lineName, checkResult, C.USER_NAME
        var sql = string.Format(@"SELECT processNo, A.barCode, B.lineId, line_no, name AS lineName, checkResult, C.USER_NAME
FROM WORK_COLLECT A
         LEFT JOIN WORK_TRAC_CODE B ON A.barCode = B.barCode
         LEFT JOIN SYS_USER C ON C.ACCOUNT = A.createBy
@@ -369,14 +368,14 @@
    }

    /// <summary>
    ///     获取物料相关条码信息
    /// 获取物料相关条码信息
    /// </summary>
    /// <param name="unity"></param>
    /// <returns></returns>
    /// <exception cref="Exception"></exception>
    public dynamic GetBarKwByItem(dynamic unity)
    {
        if (unity == null)
        if (unity == null) 
            throw new ArgumentNullException(nameof(unity), "参数对象不能为null");

        if (string.IsNullOrEmpty(unity.itemId?.ToString()))
@@ -389,20 +388,50 @@
                new SugarParameter("@itemId", unity.itemId)
            };

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

    }

    /// <summary>
    /// 获取物料相关条码信息
    /// </summary>
    /// <param name="unity"></param>
    /// <returns></returns>
    /// <exception cref="Exception"></exception>
    public dynamic GetBarKwByItemCK(dynamic unity)
    {
        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),
                new SugarParameter("@inP1", unity.type),
                new SugarParameter("@inP2", unity.billNo)
            };

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

    }

    public dynamic ProductBinding(dynamic query)
    {
        if (query == null)
            throw new ArgumentNullException(nameof(query), "参数对象不能为 null");
        if (query == null) throw new ArgumentNullException(nameof(query), "参数对象不能为 null");

        // 2. 使用 string.IsNullOrEmpty 直接判断字符串属性（避免 NullReferenceException）
        if (string.IsNullOrEmpty(query.userName?.ToString()))
@@ -426,23 +455,18 @@
                    cmd.CommandType = CommandType.StoredProcedure;
                    SqlParameter[] parameters =
                    {
                        new("@pi_user", SqlDbType.NVarChar, 100)
                            { Value = query.userName },
                        new("@pi_trac_barcode", SqlDbType.NVarChar, 100)
                            { Value = query.ZsBar },
                        new("@pi_ls_barcode", SqlDbType.NVarChar, 100)
                            { Value = query.LsBar },
                        new("@po_outMsg", SqlDbType.NVarChar, 2000)
                            { Direction = ParameterDirection.Output },
                        new("@po_outStatus", SqlDbType.Int)
                            { Direction = ParameterDirection.Output }
                        new("@pi_user", SqlDbType.NVarChar, 100) { Value = query.userName },
                        new("@pi_trac_barcode", SqlDbType.NVarChar, 100) { Value = query.ZsBar },
                        new("@pi_ls_barcode", SqlDbType.NVarChar, 100) { Value = query.LsBar },
                        new("@po_outMsg", SqlDbType.NVarChar, 2000) { Direction = ParameterDirection.Output },
                        new("@po_outStatus", SqlDbType.Int) { Direction = ParameterDirection.Output }
                    };

                    
                    foreach (var parameter in parameters)
                        cmd.Parameters.Add(parameter);

                    
                    cmd.ExecuteNonQuery();

                    
                    _strMsg = parameters[3].Value?.ToString() ?? "";
                    _intSum = parameters[4].Value?.ToString() ?? "-1";

@@ -472,7 +496,7 @@


    /// <summary>
    ///     获取卡板信息
    /// 获取卡板信息
    /// </summary>
    /// <param name="query"></param>
    /// <returns></returns>
@@ -481,29 +505,32 @@
        if (string.IsNullOrEmpty(query.Kbbarcode?.ToString()))
            throw new ArgumentException("卡板条码不允许为空", nameof(query.userName));

        var sql = string.Format(@"SELECT QUANTITY,
        var sql = string.Format(@"SELECT QUANTITY,agvPostion,
       ISNULL((SELECT COUNT(1) FROM MES_INV_ITEM_BARCODES_TBMX WHERE ABOUT_TB_BARCODE = '{0}'), 0) AS YSum,
       DAA001
FROM MES_INV_ITEM_BARCODES A LEFT JOIN WOMDAA B ON A.ABOUT_GUID = B.guid
WHERE ITEM_BARCODE = '{0}' ", query.Kbbarcode);
left join MES_WORKSHOP_LINE C ON DAA015 = C.id AND iSAgV = 1
WHERE ITEM_BARCODE = '{0}' ",  query.Kbbarcode);

        var ZsBarInfo = Db.Ado.SqlQuery<dynamic>(sql);

        if (ZsBarInfo.Count < 1)
        {
            throw new Exception($"该卡板码{query.Zsbarcode}不存在！");
        }

        return ZsBarInfo;
    }

    /// <summary>
    ///     获取卡板明细信息
    /// 获取卡板明细信息
    /// </summary>
    /// <param name="query"></param>
    /// <returns></returns>
    public dynamic getKbBarMxInfo(dynamic query)
    {
        var sql = string.Format(
            @"SELECT ITEM_BARCODE, QUANTITY,item_no,item_name,item_model,weight

        var sql = string.Format(@"SELECT ITEM_BARCODE, QUANTITY,item_no,item_name,item_model,weight
FROM MES_INV_ITEM_BARCODES_TBMX A
         LEFT JOIN WOMDAA B ON B.daa001 = A.DAA_001
        LEFT JOIN MES_ITEMS C ON C.item_id = B.daa002
@@ -516,7 +543,7 @@
    }

    /// <summary>
    ///     获取箱明细信息
    /// 获取箱明细信息
    /// </summary>
    /// <param name="query"></param>
    /// <returns></returns>
@@ -547,44 +574,42 @@
            {
                try
                {
                    using (var cmd = new SqlCommand("prc_pda_Xbar_binding_JY",
                               conn, transaction))
                    {
                        cmd.CommandType = CommandType.StoredProcedure;
                        SqlParameter[] parameters =

                        using (var cmd = new SqlCommand("prc_pda_Xbar_binding_JY", conn, transaction))
                        {
                            new("@pi_user", SqlDbType.NVarChar, 100)
                                { Value = query.userName },
                            new("@pi_kb_barcode", SqlDbType.NVarChar, 100)
                                { Value = query.KbBar },
                            new("@pi_ls_barcode", SqlDbType.NVarChar, 100)
                                { Value = query.Xbarcode },
                            new("@po_outMsg", SqlDbType.NVarChar, 2000)
                                { Direction = ParameterDirection.Output },
                            new("@po_outStatus", SqlDbType.Int)
                                { Direction = ParameterDirection.Output }
                        };
                            cmd.CommandType = CommandType.StoredProcedure;
                            SqlParameter[] parameters =
                            {
                                new("@pi_user", SqlDbType.NVarChar, 100) { Value = query.userName },
                                new("@pi_kb_barcode", SqlDbType.NVarChar, 100) { Value = query.KbBar },
                                new("@pi_ls_barcode", SqlDbType.NVarChar, 100) { Value = query.Xbarcode },
                                new("@po_outMsg", SqlDbType.NVarChar, 2000) { Direction = ParameterDirection.Output },
                                new("@po_outStatus", SqlDbType.Int) { Direction = ParameterDirection.Output }
                            };

                        foreach (var parameter in parameters)
                            cmd.Parameters.Add(parameter);
                            foreach (var parameter in parameters)
                                cmd.Parameters.Add(parameter);

                        cmd.ExecuteNonQuery();
                            cmd.ExecuteNonQuery();

                        var _strMsg = parameters[3].Value?.ToString() ?? "";
                        var _intSum = parameters[4].Value?.ToString() ?? "-1";
                            var _strMsg = parameters[3].Value?.ToString() ?? "";
                            var _intSum = parameters[4].Value?.ToString() ?? "-1";

                        var result = Convert.ToInt32(_intSum);
                        if (result <= 0)
                            //transaction.Rollback();
                            throw new Exception(_strMsg);
                        //return new { 
                        //    status = result, 
                        //    message = $"操作回滚：{_strMsg}",
                        //    failedBarcode = xBar.iteM_BARCODE,
                        //    successCount = successRecords.Count
                        //};
                    }
                            var result = Convert.ToInt32(_intSum);
                            if (result <= 0)
                            {
                                //transaction.Rollback();
                                throw new Exception(_strMsg);
                                //return new { 
                                //    status = result, 
                                //    message = $"操作回滚：{_strMsg}",
                                //    failedBarcode = xBar.iteM_BARCODE,
                                //    successCount = successRecords.Count
                                //};
                            }

                        }
                    
                    transaction.Commit(); // 全部成功提交事务
                }
                catch (Exception ex)
@@ -599,8 +624,7 @@
            }
        }

        var sql2 = string.Format(
            @"SELECT ITEM_BARCODE, QUANTITY,item_no,item_name,item_model,'0' as is_hedui
            var sql2 = string.Format(@"SELECT ITEM_BARCODE, QUANTITY,item_no,item_name,item_model,'0' as is_hedui
FROM MES_INV_ITEM_BARCODES_TBMX A
         LEFT JOIN WOMDAA B ON B.daa001 = A.DAA_001
         LEFT JOIN MES_ITEMS C ON C.item_id = B.daa002
@@ -611,26 +635,25 @@
        var ZsBarInfo = Db.Ado.SqlQuery<dynamic>(sql2);

        if (ZsBarInfo.Count < 1)
            throw new Exception(
                $"该箱条码[{query.Xbarcode}]对应工单与托码工单[{query.DAA001}]不匹配或已绑定托码！");
        {
            throw new Exception($"该箱条码[{query.Xbarcode}]对应工单与托码工单[{query.DAA001}]不匹配或已绑定托码！");
        }

        return ZsBarInfo;
    }

    public dynamic submitAllChecked(dynamic query)
    {
        if (query == null)
            throw new ArgumentNullException(nameof(query), "参数对象不能为 null");
        if (query == null) throw new ArgumentNullException(nameof(query), "参数对象不能为 null");

        // 参数校验强化
        if (string.IsNullOrEmpty(query.userName?.ToString()))
            throw new ArgumentException("用户名不允许为空", nameof(query.userName));

        
        if (string.IsNullOrEmpty(query.KbBar?.ToString()))
            throw new ArgumentException("卡板条码不允许为空", nameof(query.KbBar));

        if (query.XbarInfo == null || !((IEnumerable<dynamic>)query.XbarInfo)
                .GetEnumerator().MoveNext())
        
        if (query.XbarInfo == null || !((IEnumerable<dynamic>)query.XbarInfo).GetEnumerator().MoveNext())
            throw new ArgumentException("箱码列表不能为空", nameof(query.XbarInfo));

        var successRecords = new List<dynamic>();
@@ -642,59 +665,53 @@
                try
                {
                    foreach (var xBar in query.XbarInfo) // 遍历箱码集合
                        using (var cmd = new SqlCommand("prc_pda_Xbar_binding",
                                   conn, transaction))
                    {
                        using (var cmd = new SqlCommand("prc_pda_Xbar_binding", conn, transaction))
                        {
                            cmd.CommandType = CommandType.StoredProcedure;
                            SqlParameter[] parameters =
                            SqlParameter[] parameters = 
                            {
                                new("@pi_user", SqlDbType.NVarChar, 100)
                                    { Value = query.userName },
                                new("@pi_kb_barcode", SqlDbType.NVarChar, 100)
                                    { Value = query.KbBar },
                                new("@pi_ls_barcode", SqlDbType.NVarChar, 100)
                                    { Value = xBar.iteM_BARCODE },
                                new("@po_outMsg", SqlDbType.NVarChar, 2000)
                                    { Direction = ParameterDirection.Output },
                                new("@po_outStatus", SqlDbType.Int)
                                    { Direction = ParameterDirection.Output }
                                new("@pi_user", SqlDbType.NVarChar, 100) { Value = query.userName },
                                new("@pi_kb_barcode", SqlDbType.NVarChar, 100) { Value = query.KbBar },
                                new("@pi_ls_barcode", SqlDbType.NVarChar, 100) { Value = xBar.iteM_BARCODE },
                                new("@po_outMsg", SqlDbType.NVarChar, 2000) { Direction = ParameterDirection.Output },
                                new("@po_outStatus", SqlDbType.Int) { Direction = ParameterDirection.Output }
                            };

                            
                            foreach (var parameter in parameters)
                                cmd.Parameters.Add(parameter);

                            
                            cmd.ExecuteNonQuery();

                            
                            var _strMsg = parameters[3].Value?.ToString() ?? "";
                            var _intSum = parameters[4].Value?.ToString() ??
                                          "-1";

                            var _intSum = parameters[4].Value?.ToString() ?? "-1";
                            
                            var result = Convert.ToInt32(_intSum);
                            if (result <= 0)
                            {
                                //transaction.Rollback();
                                throw new Exception(_strMsg);
                            //return new { 
                            //    status = result, 
                            //    message = $"操作回滚：{_strMsg}",
                            //    failedBarcode = xBar.iteM_BARCODE,
                            //    successCount = successRecords.Count
                            //};
                            successRecords.Add(new
                            {
                                //return new { 
                                //    status = result, 
                                //    message = $"操作回滚：{_strMsg}",
                                //    failedBarcode = xBar.iteM_BARCODE,
                                //    successCount = successRecords.Count
                                //};
                            }
                            
                            successRecords.Add(new { 
                                kbBarcode = query.KbBar,
                                xBarcode = xBar.iteM_BARCODE,
                                processTime =
                                    DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
                                processTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
                            });
                        }

                    }
                    transaction.Commit(); // 全部成功提交事务
                    return new
                    {
                        status = 1,
                    return new { 
                        status = 1, 
                        message = "批量绑定成功",
                        successCount = successRecords.Count,
                        details = successRecords
                        details = successRecords 
                    };
                }
                catch (Exception ex)
@@ -712,51 +729,44 @@

    public dynamic SubmitKbInspection(dynamic query)
    {
        if (query == null)
            throw new ArgumentNullException(nameof(query), "参数对象不能为 null");
        if (query == null) throw new ArgumentNullException(nameof(query), "参数对象不能为 null");

        // 参数校验
        if (string.IsNullOrEmpty(query.userAccount?.ToString()))
            throw new ArgumentException("用户名不允许为空", nameof(query.userAccount));

        
        if (string.IsNullOrEmpty(query.KbBar?.ToString()))
            throw new ArgumentException("卡板条码不允许为空", nameof(query.KbBar));

    
        var _strMsg = "";
        var _status = -1;
        using (var conn = new SqlConnection(DbHelperSQL.strConn))
        {
            using (var cmd =
                   new SqlCommand("prc_pda_KBbar_submitInspection", conn))
            using (var cmd = new SqlCommand("prc_pda_KBbar_submitInspection", conn))
            {
                try
                {
                    conn.Open();
                    cmd.CommandType = CommandType.StoredProcedure;
                    SqlParameter[] parameters =
                    SqlParameter[] parameters = 
                    {
                        new("@pi_user", SqlDbType.NVarChar, 100)
                            { Value = query.userAccount },
                        new("@pi_kb_barcode", SqlDbType.NVarChar, 100)
                            { Value = query.KbBar },
                        new("@po_outMsg", SqlDbType.NVarChar, 2000)
                            { Direction = ParameterDirection.Output },
                        new("@po_outStatus", SqlDbType.Int)
                            { Direction = ParameterDirection.Output }
                        new("@pi_user", SqlDbType.NVarChar, 100) { Value = query.userAccount },
                        new("@pi_kb_barcode", SqlDbType.NVarChar, 100) { Value = query.KbBar },
                        new("@po_outMsg", SqlDbType.NVarChar, 2000) { Direction = ParameterDirection.Output },
                        new("@po_outStatus", SqlDbType.Int) { Direction = ParameterDirection.Output }
                    };

                    
                    foreach (var parameter in parameters)
                        cmd.Parameters.Add(parameter);

                    
                    cmd.ExecuteNonQuery();

                    
                    _strMsg = parameters[2].Value?.ToString() ?? "";
                    _status = Convert.ToInt32(parameters[3].Value ?? -1);

    
                    if (_status <= 0) throw new Exception(_strMsg);

                    return new
                    {
    
                    return new { 
                        message = _strMsg,
                        status = _status,
                        kbBarcode = query.KbBar
@@ -775,6 +785,7 @@
    }



    //根据工单号返回产品型号和待领物料
    public dynamic GetItemsXcsl(WarehouseQuery query)
    {
@@ -784,7 +795,7 @@
                new JoinQueryInfos(JoinType.Left,
                    a.Daa002 == i.ItemId.ToString()))
            .Where((a, i) => a.Daa001 == query.daa001
                             && a.Fstatus == 1)
                    && a.Fstatus == 1)
            .Select((a, i) => new
            {
                a.Daa001,
@@ -817,7 +828,7 @@
                cmd.Parameters.Add(new SqlParameter("@inP3", DBNull.Value));
                cmd.Parameters.Add(new SqlParameter("@inP4", DBNull.Value));

                using (var adapter = new SqlDataAdapter(cmd))
                using (var adapter = new System.Data.SqlClient.SqlDataAdapter(cmd))
                {
                    adapter.Fill(ds);
                }
@@ -830,7 +841,7 @@
        var XcslYjsBar = Db.Utilities.DataTableToDynamic(ds.Tables[2]);
        var daaInfo = Db.Utilities.DataTableToDynamic(ds.Tables[3]);

        var dto = new
        var dto = new 
        {
            GD_Num = womdaa.Daa008,
            workNo = womdaa.Daa021,
@@ -843,11 +854,20 @@
        return dto;
    }

    // 现场收料展示列表
    public class XcslResultDto
    {
        public int? GD_Num { get; set; }
        public string? workNo { get; set; }
        public List<dynamic> XcslItemList { get; set; }
        public List<dynamic> XcslWjsBarList { get; set; }
        public List<dynamic> XcslYjsBarList { get; set; }
    }


    public dynamic ScanXcsl(dynamic query)
    {
        if (query == null)
            throw new ArgumentNullException(nameof(query), "参数对象不能为 null");
        if (query == null) throw new ArgumentNullException(nameof(query), "参数对象不能为 null");

        // 参数校验（根据存储过程新增参数）
        if (string.IsNullOrEmpty(query.userAccount?.ToString()))
@@ -872,16 +892,11 @@
                    // 根据存储过程调整参数顺序和命名
                    SqlParameter[] parameters =
                    {
                        new("@pi_user", SqlDbType.NVarChar, 100)
                            { Value = query.userAccount },
                        new("@pi_barcode", SqlDbType.NVarChar, 100)
                            { Value = query.Bar },
                        new("@pi_daa001", SqlDbType.NVarChar, 100)
                            { Value = query.DAA001 },
                        new("@po_outMsg", SqlDbType.NVarChar, 2000)
                            { Direction = ParameterDirection.Output },
                        new("@po_outStatus", SqlDbType.Int)
                            { Direction = ParameterDirection.Output }
                        new("@pi_user", SqlDbType.NVarChar, 100) { Value = query.userAccount },
                        new("@pi_barcode", SqlDbType.NVarChar, 100) { Value = query.Bar },
                        new("@pi_daa001", SqlDbType.NVarChar, 100) { Value = query.DAA001 },
                        new("@po_outMsg", SqlDbType.NVarChar, 2000) { Direction = ParameterDirection.Output },
                        new("@po_outStatus", SqlDbType.Int) { Direction = ParameterDirection.Output }
                    };

                    foreach (var parameter in parameters)
@@ -917,8 +932,7 @@

    public dynamic GetWeightByXt(dynamic query)
    {
        if (query == null)
            throw new ArgumentNullException(nameof(query), "参数对象不能为null");
        if (query == null) throw new ArgumentNullException(nameof(query), "参数对象不能为null");

        // 参数校验
        if (string.IsNullOrEmpty(query.userName?.ToString()))
@@ -930,7 +944,7 @@
        var _strMsg = "";
        var _status = -1;
        var _weight = "0";

        
        using (var conn = new SqlConnection(DbHelperSQL.strConn))
        {
            using (var cmd = new SqlCommand("prc_pda_Xbar_chenzhong", conn))
@@ -940,18 +954,13 @@
                    conn.Open();
                    cmd.CommandType = CommandType.StoredProcedure;

                    SqlParameter[] parameters =
                    SqlParameter[] parameters = 
                    {
                        new("@pi_user", SqlDbType.NVarChar, 100)
                            { Value = query.userName },
                        new("@pi_ls_barcode", SqlDbType.NVarChar, 100)
                            { Value = query.LsBar },
                        new("@po_outMsg", SqlDbType.NVarChar, 2000)
                            { Direction = ParameterDirection.Output },
                        new("@po_outStatus", SqlDbType.Int)
                            { Direction = ParameterDirection.Output },
                        new("@po_outWeight", SqlDbType.NVarChar, 100)
                            { Direction = ParameterDirection.Output }
                        new("@pi_user", SqlDbType.NVarChar, 100) { Value = query.userName },
                        new("@pi_ls_barcode", SqlDbType.NVarChar, 100) { Value = query.LsBar },
                        new("@po_outMsg", SqlDbType.NVarChar, 2000) { Direction = ParameterDirection.Output },
                        new("@po_outStatus", SqlDbType.Int) { Direction = ParameterDirection.Output },
                        new("@po_outWeight", SqlDbType.NVarChar, 100) { Direction = ParameterDirection.Output }
                    };

                    cmd.Parameters.AddRange(parameters);
@@ -963,7 +972,7 @@

                    if (_status <= 0) throw new Exception(_strMsg);

                    return new
                    return new 
                    {
                        message = _strMsg,
                        status = _status,
@@ -983,8 +992,9 @@
        }
    }

    public dynamic GetXcslDaa(dynamic unity, dynamic RequestInfo)
    public dynamic GetXcslDaa(dynamic unity,dynamic RequestInfo)
    {

        //var sqlParams = new List<SugarParameter> { };

        //var sql2 = new StringBuilder(@"
@@ -1012,14 +1022,12 @@
            new SugarParameter("@selectKey", unity.selectKey),
            new SugarParameter("@inP1", orgId), // 可选参数
            new SugarParameter("@inP2", unity.selDaaType), // 可选参数
            new("@inP3", null), // 可选参数
            new("@inP4", null) // 可选参数
            new SugarParameter("@inP3", null), // 可选参数
            new SugarParameter("@inP4", null), // 可选参数
            // ...其他可选参数
        };

        var result = Db.Ado.SqlQuery<dynamic>(
            "EXEC prc_pda_getWorkOrderInfo @selectKey, @inP1, @inP2, @inP3, @inP4",
            parameters);
        var result = Db.Ado.SqlQuery<dynamic>("EXEC prc_pda_getWorkOrderInfo @selectKey, @inP1, @inP2, @inP3, @inP4", parameters);


        return result;
@@ -1034,7 +1042,7 @@
                new JoinQueryInfos(JoinType.Left,
                    a.Daa002 == i.ItemId.ToString()))
            .Where((a, i) => a.Daa001 == query.daa001
                             && a.Fstatus == 1)
                    && a.Fstatus == 1)
            .Select((a, i) => new
            {
                a.Daa001,
@@ -1046,8 +1054,7 @@
        if (womdaa?.Daa001 == null) throw new Exception("工单号不存在");

        // 使用参数化查询防止SQL注入
        var sqlParams = new List<SugarParameter>
            { new("@daa001", query.daa001) };
        var sqlParams = new List<SugarParameter> { new("@daa001", query.daa001) };

        var sql1 = @"SELECT A.item_out_no,
       SUM(B.QUANTITY)          AS BL_Num,
@@ -1091,8 +1098,7 @@

        var XcslItem = Db.Ado.SqlQuery<dynamic>(sql1, sqlParams);

        var sql2 =
            @"SELECT B.ITEM_BARCODE ,B.QUANTITY,C.item_no,C.item_name,D.USER_NAME,A.create_date 
        var sql2 = @"SELECT B.ITEM_BARCODE ,B.QUANTITY,C.item_no,C.item_name,D.USER_NAME,A.create_date 
FROM MES_INV_ITEM_OUTS A
LEFT JOIN MES_INV_ITEM_OUT_C_DETAILS B ON A.GUID = B.ITEM_OUT_ID
LEFT JOIN MES_ITEMS C ON B.ITEM_ID = C.item_id
@@ -1103,8 +1109,7 @@

        var XcslWjsBar = Db.Ado.SqlQuery<dynamic>(sql2, sqlParams);

        var sql3 =
            @"SELECT B.ITEM_BARCODE ,B.QUANTITY,C.item_no,C.item_name,D.USER_NAME,B.CXTR_CREATE_DATE 
        var sql3 = @"SELECT B.ITEM_BARCODE ,B.QUANTITY,C.item_no,C.item_name,D.USER_NAME,B.CXTR_CREATE_DATE 
FROM MES_INV_ITEM_OUTS A
LEFT JOIN MES_INV_ITEM_OUT_C_DETAILS B ON A.GUID = B.ITEM_OUT_ID
LEFT JOIN MES_ITEMS C ON B.ITEM_ID = C.item_id
@@ -1123,6 +1128,7 @@
            XcslItemList = XcslItem,
            XcslWjsBarList = XcslWjsBar,
            XcslYjsBarList = XcslYjsBar

        };

        return dto;
@@ -1130,8 +1136,7 @@

    public dynamic ScanXctl(dynamic query)
    {
        if (query == null)
            throw new ArgumentNullException(nameof(query), "参数对象不能为 null");
        if (query == null) throw new ArgumentNullException(nameof(query), "参数对象不能为 null");

        // 参数校验（根据存储过程新增参数）
        if (string.IsNullOrEmpty(query.userAccount?.ToString()))
@@ -1156,16 +1161,11 @@
                    // 根据存储过程调整参数顺序和命名
                    SqlParameter[] parameters =
                    {
                        new("@pi_user", SqlDbType.NVarChar, 100)
                            { Value = query.userAccount },
                        new("@pi_barcode", SqlDbType.NVarChar, 100)
                            { Value = query.Bar },
                        new("@pi_daa001", SqlDbType.NVarChar, 100)
                            { Value = query.DAA001 },
                        new("@po_outMsg", SqlDbType.NVarChar, 2000)
                            { Direction = ParameterDirection.Output },
                        new("@po_outStatus", SqlDbType.Int)
                            { Direction = ParameterDirection.Output }
                        new("@pi_user", SqlDbType.NVarChar, 100) { Value = query.userAccount },
                        new("@pi_barcode", SqlDbType.NVarChar, 100) { Value = query.Bar },
                        new("@pi_daa001", SqlDbType.NVarChar, 100) { Value = query.DAA001 },
                        new("@po_outMsg", SqlDbType.NVarChar, 2000) { Direction = ParameterDirection.Output },
                        new("@po_outStatus", SqlDbType.Int) { Direction = ParameterDirection.Output }
                    };

                    foreach (var parameter in parameters)
@@ -1200,12 +1200,13 @@


    /// <summary>
    ///     内箱核对：获取后盖码对应产品信息
    /// 内箱核对：获取后盖码对应产品信息
    /// </summary>
    /// <param name="query"></param>
    /// <returns></returns>
    public dynamic getHgBarInfo(dynamic query)
    {

        var sql = string.Format(@"DECLARE @ZsBar varchar(100)
SELECT TOP 1 @ZsBar= ABOUT_TRAC_BARCODE FROM MES_INV_ITEM_BARCODES_TBMX WHERE ITEM_BARCODE = '{1}'
SELECT TOP 1 A.barCode AS zsBarcode,
@@ -1228,20 +1229,21 @@
        var ZsBarInfo = Db.Ado.SqlQuery<dynamic>(sql);

        if (ZsBarInfo.Count < 1)
        {
            throw new Exception($"该后盖码{query.Zsbarcode}不存在或未绑定");
        }

        return ZsBarInfo;
    }

    /// <summary>
    ///     内箱核对：根据流水码获取生产履历
    /// 内箱核对：根据流水码获取生产履历
    /// </summary>
    /// <param name="query"></param>
    /// <returns></returns>
    public dynamic getTraceabilityByLsBar(dynamic query)
    {
        var sql = string.Format(
            @"SELECT processNo, A.barCode, B.lineId, line_no, name AS lineName, checkResult, C.USER_NAME
        var sql = string.Format(@"SELECT processNo, A.barCode, B.lineId, line_no, name AS lineName, checkResult, C.USER_NAME
FROM WORK_COLLECT A
         LEFT JOIN WORK_TRAC_CODE B ON A.barCode = B.barCode
         LEFT JOIN SYS_USER C ON C.ACCOUNT = A.createBy
@@ -1255,7 +1257,7 @@
    }

    /// <summary>
    ///     内箱核对：扫码核对
    /// 内箱核对：扫码核对
    /// </summary>
    /// <param name="query"></param>
    /// <returns></returns>
@@ -1264,8 +1266,7 @@
    /// <exception cref="Exception"></exception>
    public dynamic ScanNxhd(dynamic query)
    {
        if (query == null)
            throw new ArgumentNullException(nameof(query), "参数对象不能为 null");
        if (query == null) throw new ArgumentNullException(nameof(query), "参数对象不能为 null");

        // 2. 使用 string.IsNullOrEmpty 直接判断字符串属性（避免 NullReferenceException）
        if (string.IsNullOrEmpty(query.userName?.ToString()))
@@ -1289,16 +1290,11 @@
                    cmd.CommandType = CommandType.StoredProcedure;
                    SqlParameter[] parameters =
                    {
                        new("@pi_user", SqlDbType.NVarChar, 100)
                            { Value = query.userName },
                        new("@pi_hg_barcode", SqlDbType.NVarChar, 100)
                            { Value = query.ZsBar },
                        new("@pi_x_barcode", SqlDbType.NVarChar, 100)
                            { Value = query.LsBar },
                        new("@po_outMsg", SqlDbType.NVarChar, 2000)
                            { Direction = ParameterDirection.Output },
                        new("@po_outStatus", SqlDbType.Int)
                            { Direction = ParameterDirection.Output }
                        new("@pi_user", SqlDbType.NVarChar, 100) { Value = query.userName },
                        new("@pi_hg_barcode", SqlDbType.NVarChar, 100) { Value = query.ZsBar },
                        new("@pi_x_barcode", SqlDbType.NVarChar, 100) { Value = query.LsBar },
                        new("@po_outMsg", SqlDbType.NVarChar, 2000) { Direction = ParameterDirection.Output },
                        new("@po_outStatus", SqlDbType.Int) { Direction = ParameterDirection.Output }
                    };

                    foreach (var parameter in parameters)
@@ -1334,7 +1330,7 @@
    }

    /// <summary>
    ///     内箱核对：扫码核对
    /// 内箱核对：扫码核对
    /// </summary>
    /// <param name="query"></param>
    /// <returns></returns>
@@ -1343,16 +1339,15 @@
    /// <exception cref="Exception"></exception>
    public dynamic ScanFgbd(dynamic query)
    {
        if (query == null)
            throw new ArgumentNullException(nameof(query), "参数对象不能为 null");
        if (query == null) throw new ArgumentNullException(nameof(query), "参数对象不能为 null");

        if (string.IsNullOrEmpty(query.userName?.ToString()))
            throw new ArgumentException("用户名不允许为空", nameof(query.userName));

        if (string.IsNullOrEmpty(query.HgBar?.ToString()))
        if (string.IsNullOrEmpty(query.HgBar?.ToString())) 
            throw new ArgumentException("后盖码不允许为空", nameof(query.HgBar));

        if (string.IsNullOrEmpty(query.FgBar?.ToString()))
        if (string.IsNullOrEmpty(query.FgBar?.ToString())) 
            throw new ArgumentException("返工码不允许为空", nameof(query.FgBar));

        var _strMsg = "";
@@ -1367,16 +1362,11 @@
                    cmd.CommandType = CommandType.StoredProcedure;
                    SqlParameter[] parameters =
                    {
                        new("@pi_user", SqlDbType.NVarChar, 100)
                            { Value = query.userName },
                        new("@pi_fg_barcode", SqlDbType.NVarChar, 100)
                            { Value = query.FgBar },
                        new("@pi_ls_barcode", SqlDbType.NVarChar, 100)
                            { Value = query.HgBar }, //后盖/流水
                        new("@po_outMsg", SqlDbType.NVarChar, 2000)
                            { Direction = ParameterDirection.Output },
                        new("@po_outStatus", SqlDbType.Int)
                            { Direction = ParameterDirection.Output }
                        new("@pi_user", SqlDbType.NVarChar, 100) { Value = query.userName },
                        new("@pi_fg_barcode", SqlDbType.NVarChar, 100) { Value = query.FgBar },
                        new("@pi_ls_barcode", SqlDbType.NVarChar, 100) { Value = query.HgBar },//后盖/流水
                        new("@po_outMsg", SqlDbType.NVarChar, 2000) { Direction = ParameterDirection.Output },
                        new("@po_outStatus", SqlDbType.Int) { Direction = ParameterDirection.Output }
                    };

                    foreach (var parameter in parameters)
@@ -1412,14 +1402,15 @@
    }

    /// <summary>
    ///     获取AGV线体列表
    /// 获取AGV线体列表
    /// </summary>
    /// <param name="unity"></param>
    /// <returns></returns>
    /// <exception cref="Exception"></exception>
    public dynamic GetAgvXt(dynamic unity)
    {
        var sqlParams = new List<SugarParameter>();

        var sqlParams = new List<SugarParameter> { };

        var sql2 = new StringBuilder(@"
SELECT NAME,line_no FROM MES_WORKSHOP_LINE WHERE isAgv = 1 ORDER BY line_no");
@@ -1427,13 +1418,16 @@

        var XtItem = Db.Ado.SqlQuery<dynamic>(sql2.ToString(), sqlParams);

        if (XtItem == null) throw new Exception("无对应AGV绑定线体信息！");
        if (XtItem == null)
        {
            throw new Exception("无对应AGV绑定线体信息！");
        }

        return XtItem;
    }

    /// <summary>
    ///     AGV送检
    /// AGV送检
    /// </summary>
    /// <param name="query"></param>
    /// <returns></returns>
@@ -1457,14 +1451,11 @@
                cmd.CommandType = CommandType.StoredProcedure;
                var parameters = new SqlParameter[]
                {
                    new("@pi_user", SqlDbType.NVarChar, 100)
                        { Value = query.userAccount },
                    new("@pi_kb_barcode", SqlDbType.NVarChar, 100)
                        { Value = query.KbBar },
                    new("@outMsg", SqlDbType.NVarChar, 2500)
                        { Direction = ParameterDirection.Output },
                    new("@outSum", SqlDbType.Int)
                        { Direction = ParameterDirection.Output }
                    new("@pi_user", SqlDbType.NVarChar, 100) { Value = query.userAccount },
                    new("@pi_kb_barcode", SqlDbType.NVarChar, 100) { Value = query.KbBar },
                    new("@in1", SqlDbType.NVarChar, 100) { Value = query.AgvDw },
                    new("@outMsg", SqlDbType.NVarChar, 2500) { Direction = ParameterDirection.Output },
                    new("@outSum", SqlDbType.Int) { Direction = ParameterDirection.Output }
                };

                cmd.Parameters.AddRange(parameters);
@@ -1473,8 +1464,8 @@

                var result = new
                {
                    message = parameters[2].Value?.ToString(),
                    status = Convert.ToInt32(parameters[3].Value)
                    message = parameters[3].Value?.ToString(),
                    status = Convert.ToInt32(parameters[4].Value)
                };

                if (result.status <= 0)
@@ -1502,14 +1493,10 @@
                cmd.CommandType = CommandType.StoredProcedure;
                var parameters = new SqlParameter[]
                {
                    new("@pi_user", SqlDbType.NVarChar, 100)
                        { Value = query.userAccount },
                    new("@pi_xtNum", SqlDbType.NVarChar, 100)
                        { Value = query.XtNum },
                    new("@outMsg", SqlDbType.NVarChar, 2500)
                        { Direction = ParameterDirection.Output },
                    new("@outSum", SqlDbType.Int)
                        { Direction = ParameterDirection.Output }
                    new("@pi_user", SqlDbType.NVarChar, 100) { Value = query.userAccount },
                    new("@pi_xtNum", SqlDbType.NVarChar, 100) { Value = query.XtNum },
                    new("@outMsg", SqlDbType.NVarChar, 2500) { Direction = ParameterDirection.Output },
                    new("@outSum", SqlDbType.Int) { Direction = ParameterDirection.Output }
                };

                cmd.Parameters.AddRange(parameters);
@@ -1534,54 +1521,49 @@
    public dynamic HandleAgvJy(dynamic query)
    {
        if (query == null) throw new ArgumentNullException(nameof(query));

        
        // 参数验证强化
        if (string.IsNullOrEmpty(query.userAccount?.ToString()))
            throw new ArgumentException("用户名不允许为空", nameof(query.userAccount));

        
        if (string.IsNullOrEmpty(query.KbBar?.ToString()))
            throw new ArgumentException("卡板条码不允许为空", nameof(query.KbBar));

        
        if (string.IsNullOrEmpty(query.jyz?.ToString()))
            throw new ArgumentException("检验结果不允许为空", nameof(query.jyz));

        var _strMsg = "";
        var _intSum = "";

        
        using (var conn = new SqlConnection(DbHelperSQL.strConn))
        {
            using (var cmd = new SqlCommand("prc_pda_AgvJy", conn))
            {
                cmd.CommandType = CommandType.StoredProcedure;

                
                // 添加存储过程参数
                SqlParameter[] parameters =
                SqlParameter[] parameters = 
                {
                    new("@pi_user", SqlDbType.NVarChar, 100)
                        { Value = query.userAccount },
                    new("@pi_kbBarcode", SqlDbType.NVarChar, 100)
                        { Value = query.KbBar },
                    new("@pi_jyz", SqlDbType.NVarChar, 100)
                        { Value = query.jyz },
                    new("@outMsg", SqlDbType.NVarChar, 2500)
                        { Direction = ParameterDirection.Output },
                    new("@outSum", SqlDbType.Int)
                        { Direction = ParameterDirection.Output }
                    new("@pi_user", SqlDbType.NVarChar, 100) { Value = query.userAccount },
                    new("@pi_kbBarcode", SqlDbType.NVarChar, 100) { Value = query.KbBar },
                    new("@pi_jyz", SqlDbType.NVarChar, 100) { Value = query.jyz },
                    new("@outMsg", SqlDbType.NVarChar, 2500) { Direction = ParameterDirection.Output },
                    new("@outSum", SqlDbType.Int) { Direction = ParameterDirection.Output }
                };

                
                foreach (var parameter in parameters)
                    cmd.Parameters.Add(parameter);

                
                conn.Open();
                cmd.ExecuteNonQuery();

                
                _strMsg = parameters[3].Value?.ToString() ?? "";
                _intSum = parameters[4].Value?.ToString() ?? "-1";

                var result = Convert.ToInt32(_intSum);
                if (result <= 0) throw new Exception(_strMsg);

                return new
                return new 
                {
                    message = _strMsg,
                    status = result,
@@ -1611,16 +1593,11 @@
                cmd.CommandType = CommandType.StoredProcedure;
                var parameters = new SqlParameter[]
                {
                    new("@pi_user", SqlDbType.NVarChar, 100)
                        { Value = query.userAccount },
                    new("@pi_kb_barcode", SqlDbType.NVarChar, 100)
                        { Value = query.KbBar },
                    new("@pi_kb_Postition", SqlDbType.NVarChar, 100)
                        { Value = query.Postition },
                    new("@outMsg", SqlDbType.NVarChar, 2500)
                        { Direction = ParameterDirection.Output },
                    new("@outSum", SqlDbType.Int)
                        { Direction = ParameterDirection.Output }
                    new("@pi_user", SqlDbType.NVarChar, 100) { Value = query.userAccount },
                    new("@pi_kb_barcode", SqlDbType.NVarChar, 100) { Value = query.KbBar },
                    new("@pi_kb_Postition", SqlDbType.NVarChar, 100) { Value = query.Postition },
                    new("@outMsg", SqlDbType.NVarChar, 2500) { Direction = ParameterDirection.Output },
                    new("@outSum", SqlDbType.Int) { Direction = ParameterDirection.Output }
                };

                cmd.Parameters.AddRange(parameters);
@@ -1641,13 +1618,4 @@
        }
    }

    // 现场收料展示列表
    public class XcslResultDto
    {
        public int? GD_Num { get; set; }
        public string? workNo { get; set; }
        public List<dynamic> XcslItemList { get; set; }
        public List<dynamic> XcslWjsBarList { get; set; }
        public List<dynamic> XcslYjsBarList { get; set; }
    }
}