精简修正代码

啊鑫

8 天以前 0aa54059b26e6641196e9953490dd18616e916e3

 service/Wom/WomdaahbManager.cs

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

namespace NewPdaSqlServer.service.Wom;
@@ -168,13 +168,15 @@
    {
        if (string.IsNullOrEmpty(query.hbNo)) throw new Exception("合并单号为空");

        var queryResult = Db.Queryable<Womdaahb, Womdaa, MesItems>(
           (b, a, i) => new JoinQueryInfos(
               JoinType.Left, b.OrgId.ToString() == a.ErpSczz,  // Womdaahb ↔ Womdaa 关联
               JoinType.Left, a.Daa002 == i.ItemId.ToString())  // Womdaa ↔ MesItems 关联
        var queryResult = Db.Queryable<Womdaahb, Womdaa, MesItems>((b, a, i) =>
                    new JoinQueryInfos(
                        JoinType.Left,
                        b.OrgId.ToString() == a.ErpSczz, // Womdaahb ↔ Womdaa 关联
                        JoinType.Left,
                        a.Daa002 == i.ItemId.ToString()) // Womdaa ↔ MesItems 关联
       )
       .Where((b, a, i) =>
           (b.Daah009 != null && a.Daa021 != null) &&  // 防止null异常
                b.Daah009 != null && a.Daa021 != null && // 防止null异常
           (
               b.Daah009.Contains("," + a.Daa021 + ",") ||  // 匹配中间值
               b.Daah009.StartsWith(a.Daa021 + ",") ||     // 匹配开头值
@@ -182,7 +184,8 @@
               b.Daah009 == a.Daa021                        // 完全匹配
           )
       )
       .Where((b, a, i) => b.Daahb001 == query.hbNo && b.Fstatus == 1)  // 其他条件
            .Where((b, a, i) =>
                b.Daahb001 == query.hbNo && b.Fstatus == 1) // 其他条件
       .Select((b, a, i) => new
       {
           b.Daahb001,
@@ -270,13 +273,11 @@
            })
            .ToList();

        var womcaa = Db.Queryable<Womcaa>().Where(s => s.Guid == queryResult.CaaGuid)
        var womcaa = Db.Queryable<Womcaa>()
            .Where(s => s.Guid == queryResult.CaaGuid)
            .First();

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

        var dto = new ProductionPickDto
        {
@@ -297,7 +298,6 @@
    /// <returns></returns>
    public dynamic getZsBarInfo(dynamic query)
    {

        var sql = string.Format(@"SELECT TOP 1 A.barCode AS zsBarcode,
             D.name AS lineName,
             D.line_no,
@@ -318,9 +318,7 @@
        var ZsBarInfo = Db.Ado.SqlQuery<dynamic>(sql);

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

        return ZsBarInfo;
    }
@@ -328,7 +326,8 @@
    //获取生产
    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
@@ -342,7 +341,8 @@

    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()))
@@ -366,11 +366,16 @@
                    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)
@@ -425,9 +430,7 @@
        var ZsBarInfo = Db.Ado.SqlQuery<dynamic>(sql);

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

        return ZsBarInfo;
    }
@@ -439,8 +442,8 @@
    /// <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
@@ -484,17 +487,22 @@
            {
                try
                {

                        using (var cmd = new SqlCommand("prc_pda_Xbar_binding_JY", conn, transaction))
                    using (var cmd = new SqlCommand("prc_pda_Xbar_binding_JY",
                               conn, transaction))
                        {
                            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 }
                            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)
@@ -507,7 +515,6 @@

                            var result = Convert.ToInt32(_intSum);
                            if (result <= 0)
                            {
                                //transaction.Rollback();
                                throw new Exception(_strMsg);
                                //return new { 
@@ -516,8 +523,6 @@
                                //    failedBarcode = xBar.iteM_BARCODE,
                                //    successCount = successRecords.Count
                                //};
                            }

                        }
                    
                    transaction.Commit(); // 全部成功提交事务
@@ -534,7 +539,8 @@
            }
        }

            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
@@ -545,16 +551,16 @@
        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()))
@@ -563,7 +569,8 @@
        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>();
@@ -575,17 +582,22 @@
                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 = 
                            {
                                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)
@@ -594,11 +606,11 @@
                            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 { 
@@ -607,17 +619,18 @@
                                //    failedBarcode = xBar.iteM_BARCODE,
                                //    successCount = successRecords.Count
                                //};
                            }
                            
                            successRecords.Add(new { 
                            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 { 
                    return new
                    {
                        status = 1, 
                        message = "批量绑定成功",
                        successCount = successRecords.Count,
@@ -639,7 +652,8 @@

    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()))
@@ -652,7 +666,8 @@
        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
                {
@@ -660,10 +675,14 @@
                    cmd.CommandType = CommandType.StoredProcedure;
                    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)
@@ -676,7 +695,8 @@
    
                    if (_status <= 0) throw new Exception(_strMsg);
    
                    return new { 
                    return new
                    {
                        message = _strMsg,
                        status = _status,
                        kbBarcode = query.KbBar
@@ -693,7 +713,6 @@
            }
        }
    }



    //根据工单号返回产品型号和待领物料
@@ -717,7 +736,8 @@
        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,
@@ -752,7 +772,8 @@

        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
@@ -763,7 +784,8 @@

        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.XCSL_CREATE_DATE 
        var sql3 =
            @"SELECT B.ITEM_BARCODE ,B.QUANTITY,C.item_no,C.item_name,D.USER_NAME,B.XCSL_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
@@ -782,26 +804,16 @@
            XcslItemList = XcslItem,
            XcslWjsBarList = XcslWjsBar,
            XcslYjsBarList = XcslYjsBar

        };

        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()))
@@ -826,11 +838,16 @@
                    // 根据存储过程调整参数顺序和命名
                    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)
@@ -866,7 +883,8 @@

    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()))
@@ -890,11 +908,16 @@

                    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);
@@ -928,8 +951,7 @@

    public dynamic GetXcslDaa(dynamic unity)
    {

        var sqlParams = new List<SugarParameter> { };
        var sqlParams = new List<SugarParameter>();

        var sql2 = new StringBuilder(@"
        SELECT daahb001 as daaInfo,daahb001 as daa001
@@ -945,10 +967,7 @@

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

        if (XcslItem == null)
        {
            throw new Exception("该条件下无对应工单信息，请重新输入！");
        }
        if (XcslItem == null) throw new Exception("该条件下无对应工单信息，请重新输入！");

        return XcslItem;
    }
@@ -974,7 +993,8 @@
        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,
@@ -1018,7 +1038,8 @@

        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
@@ -1029,7 +1050,8 @@

        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
@@ -1048,7 +1070,6 @@
            XcslItemList = XcslItem,
            XcslWjsBarList = XcslWjsBar,
            XcslYjsBarList = XcslYjsBar

        };

        return dto;
@@ -1056,7 +1077,8 @@

    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()))
@@ -1081,11 +1103,16 @@
                    // 根据存储过程调整参数顺序和命名
                    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)
@@ -1118,4 +1145,13 @@
        }
    }

    // 现场收料展示列表
    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; }
    }
}