From c48c7746efa89e3cbf38e089d20cd9029c2ce1c8 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 07 六月 2024 09:52:37 +0800
Subject: [PATCH] 模具点检单PDA 扫条码没有返回数据，核对匹配字段
---
WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
index 3444efa..a866a25 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
@@ -5613,9 +5613,17 @@
//string[] arrStr = oItem.HSendMan.Split(','); //鍙戦�佷汉
//arrStr = oItem.HReceiveMan.Split(','); //鎺ユ敹浜�
string[] arrStr = oItem.HCopyMan.Split(','); //鎶勯�佷汉
- List<string> b = new List<string>(arrStr);
- b.Add(oItem.HReceiveMan);
- arrStr = b.ToArray();
+ if (!string.IsNullOrEmpty(oItem.HCopyMan))
+ {
+ arrStr = oItem.HCopyMan.Split(','); // 鎶勯�佷汉
+ List<string> b = new List<string>(arrStr);
+ b.Add(oItem.HReceiveMan);
+ arrStr = b.ToArray();
+ }
+ else
+ {
+ arrStr = oItem.HReceiveMan.Split(',');//鎺ユ敹浜�
+ }
//鎶勯�佷汉琛ㄤ綋鏁版嵁
for (int i = 1; i <= arrStr.Length; i++)
{
@@ -5733,18 +5741,17 @@
#region 宸ヤ綔鑱旂郴鍗曠紪杈戣幏鍙栨暟鎹�
[Route("Sc_MESTransFerWorkBill/GetOA_WorkLinkBillListCheckDetai")]
[HttpGet]
- public object GetOA_WorkLinkBillListCheckDetai(string HID, string HEntryID)
+ public object GetOA_WorkLinkBillListCheckDetai(string HID)
{
try
{
List<object> columnNameList = new List<object>();
- string sql = string.Format(@"select A.*,B.HEntryID,B.HReadFlag,D.HName HDeptName,e.HName HEvaluateStatusName
+ string sql = string.Format(@"select A.*,D.HName HDeptName,e.HName HEvaluateStatusName
from OA_WorkLinkBillMain A
- inner join OA_WorkLinkBillSub2 B on A.HInterID=B.HInterID
left join Gy_Department D on A.HDeptID=D.HItemID
left join Gy_EvaluateStatus AS e ON A.HEvaluateStatusID = e.HItemID
- where A.HInterID='" + HID + "' and b.HEntryID='" + HEntryID + "'"); ;
+ where A.HInterID='" + HID + "'" ); ;
ds = oCN.RunProcReturn(sql, "OA_WorkLinkBillMain");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
--
Gitblit v1.9.1