Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/NewPdaSqlServer

快乐的昕的电脑

昨天 8398169c759b4bb9385fadc51a83f508b26f4aad

 service/Wom/WomdaaManager.cs

@@ -397,6 +397,37 @@

    }

    /// <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)
    {
@@ -474,10 +505,11 @@
        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
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);
@@ -1421,6 +1453,7 @@
                {
                    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 }
                };
@@ -1431,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)