~tjx/NewPdaSqlServer.git

			@@ -203,7 +203,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 ,
			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
			@@ -301,12 +301,44 @@
			LEFT JOIN WORK_TRAC_CODE B ON A.barCode = B.barCode
			LEFT JOIN SYS_USER C ON C.ACCOUNT = A.createBy
			LEFT JOIN MES_WORKSHOP_LINE D ON B.lineId = D.id
			WHERE A.barCode = '{0}'", query.Zsbarcode);
			WHERE A.barCode = '{0}'
			ORDER BY A.createDate", query.Zsbarcode);

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

			return Traceability;
			}

			/// <summary>
			/// 获取物料相关条码信息
			/// </summary>
			/// <param name="unity"></param>
			/// <returns></returns>
			/// <exception cref="Exception"></exception>
			public dynamic GetBarKwByItem(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)
			};

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

			}


			public dynamic ProductBinding(dynamic query)
			{
			@@ -384,7 +416,7 @@
			if (string.IsNullOrEmpty(query.Kbbarcode?.ToString()))
			throw new ArgumentException("卡板条码不允许为空", nameof(query.userName));

			var sql = string.Format(@"SELECT OLDQTY,
			var sql = string.Format(@"SELECT QUANTITY,
			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
			@@ -902,7 +934,7 @@
			var sql2 = new StringBuilder(@"
			SELECT '['+DAA001+']['+DAA021+']' AS daaInfo,DAA001,DAA021
			FROM WOMDAA
			WHERE daa018 NOT IN ('W:完工', 'D:待开工')");
			WHERE daa018 <>'W:完工'");

			if (!string.IsNullOrWhiteSpace(unity.selectKey?.ToString()))
			{
			@@ -1087,4 +1119,422 @@
			}
			}


			/// <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,
			D.name AS lineName,
			D.line_no,
			B.daa001,
			C.item_no,
			C.item_name,
			C.item_model,
			A.quantity as barQty,
			B.daa008 as sumQty,
			isnull((SELECT count(1) FROM WORK_COLLECT WHERE processNo = '{0}' AND ABOUT_GUID = A.ABOUT_GUID),0) AS finQty,
			isnull((SELECT TOP 1 processNo FROM WORK_COLLECT WHERE WORK_COLLECT.barCode = @ZsBar AND ISNULL(checkResult,'') = '√' AND ISNULL(barCodeStatus,1) = 1 ORDER BY WORK_COLLECT.createDate DESC ),'') AS lastGx
			FROM WORK_TRAC_CODE A
			LEFT JOIN WOMDAA B ON A.ABOUT_GUID = B.guid
			LEFT JOIN MES_ITEMS C ON B.daa002 = C.item_id
			LEFT JOIN MES_WORKSHOP_LINE D ON A.lineId = D.id
			WHERE A.barCode = @ZsBar", query.GX, query.Zsbarcode);

			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
			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
			LEFT JOIN MES_WORKSHOP_LINE D ON B.lineId = D.id
			WHERE A.barCode = (SELECT TOP 1 ABOUT_TRAC_BARCODE FROM MES_INV_ITEM_BARCODES_TBMX WHERE ITEM_BARCODE = '{0}')
			ORDER BY A.createDate", query.Zsbarcode);

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

			return Traceability;
			}

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

			// 2. 使用 string.IsNullOrEmpty 直接判断字符串属性（避免 NullReferenceException）
			if (string.IsNullOrEmpty(query.userName?.ToString()))
			throw new ArgumentException("用户名不允许为空", nameof(query.userName));

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

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

			var _strMsg = "";
			var _intSum = "";
			using (var conn = new SqlConnection(DbHelperSQL.strConn))
			{
			using (var cmd = new SqlCommand("prc_pda_Scan_Nxhd", conn))
			{
			try
			{
			conn.Open();
			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 }
			};

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

			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);

			var dto = new
			{
			message = _strMsg,
			status = result,
			tracBarcode = query.ZsBar
			};

			return dto;
			}
			catch (Exception ex)
			{
			throw new Exception(ex.Message);
			}
			finally
			{
			conn.Close();
			}
			}
			}
			}

			/// <summary>
			/// 内箱核对：扫码核对
			/// </summary>
			/// <param name="query"></param>
			/// <returns></returns>
			/// <exception cref="ArgumentNullException"></exception>
			/// <exception cref="ArgumentException"></exception>
			/// <exception cref="Exception"></exception>
			public dynamic ScanFgbd(dynamic query)
			{
			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()))
			throw new ArgumentException("后盖码不允许为空", nameof(query.HgBar));

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

			var _strMsg = "";
			var _intSum = "";
			using (var conn = new SqlConnection(DbHelperSQL.strConn))
			{
			using (var cmd = new SqlCommand("prc_pda_Scan_Fgbd", conn))
			{
			try
			{
			conn.Open();
			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 }
			};

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

			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);

			var dto = new
			{
			message = _strMsg,
			status = result,
			tracBarcode = query.ZsBar
			};

			return dto;
			}
			catch (Exception ex)
			{
			throw new Exception(ex.Message);
			}
			finally
			{
			conn.Close();
			}
			}
			}
			}

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

			var sqlParams = new List<SugarParameter> { };

			var sql2 = new StringBuilder(@"SELECT NAME,line_no FROM MES_WORKSHOP_LINE WHERE isAgv = 1 ORDER BY line_no");


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

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

			return XtItem;
			}

			/// <summary>
			/// AGV送检
			/// </summary>
			/// <param name="query"></param>
			/// <returns></returns>
			/// <exception cref="ArgumentNullException"></exception>
			/// <exception cref="ArgumentException"></exception>
			/// <exception cref="Exception"></exception>
			public dynamic HandleAGVInspection(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));

			using (var conn = new SqlConnection(DbHelperSQL.strConn))
			{
			using (var cmd = new SqlCommand("prc_pda_AgvSj", conn))
			{
			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 }
			};

			cmd.Parameters.AddRange(parameters);
			conn.Open();
			cmd.ExecuteNonQuery();

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

			if (result.status <= 0)
			throw new Exception(result.message);

			return result;
			}
			}
			}

			public dynamic HandleAGVCall(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.XtNum?.ToString()))
			throw new ArgumentException("线体编号不能为空", nameof(query.XtNum));

			using (var conn = new SqlConnection(DbHelperSQL.strConn))
			{
			using (var cmd = new SqlCommand("prc_pda_AgvHj", conn))
			{
			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 }
			};

			cmd.Parameters.AddRange(parameters);
			conn.Open();
			cmd.ExecuteNonQuery();

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

			if (result.status <= 0)
			throw new Exception(result.message);

			return result;
			}
			}
			}


			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 =
			{
			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
			{
			message = _strMsg,
			status = result,
			kbBarcode = query.KbBar
			};
			}
			}
			}

			public dynamic HandleAgvRk(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.Postition?.ToString()))
			throw new ArgumentException("楼层位置不能为空", nameof(query.Postition));

			using (var conn = new SqlConnection(DbHelperSQL.strConn))
			{
			using (var cmd = new SqlCommand("prc_pda_AgvRk", conn))
			{
			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 }
			};

			cmd.Parameters.AddRange(parameters);
			conn.Open();
			cmd.ExecuteNonQuery();

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

			if (result.status <= 0)
			throw new Exception(result.message);

			return result;
			}
			}
			}

			}