From 02afa11e997bcf6f68d60cc2cfbaa8007f124989 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 03 二月 2026 09:40:40 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/华远datamapping/HY_DataMappingController.cs | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git "a/WebAPI/Controllers/\345\215\216\350\277\234datamapping/HY_DataMappingController.cs" "b/WebAPI/Controllers/\345\215\216\350\277\234datamapping/HY_DataMappingController.cs"
index fae70cd..5a26b78 100644
--- "a/WebAPI/Controllers/\345\215\216\350\277\234datamapping/HY_DataMappingController.cs"
+++ "b/WebAPI/Controllers/\345\215\216\350\277\234datamapping/HY_DataMappingController.cs"
@@ -1255,8 +1255,15 @@
string HSetNo = HBarCode.Substring(HBarCode.Length - 2, 2);
//鏍规嵁PNL鏉＄爜缂栧彿銆乻et鍙凤紝浠嶱NL妫�楠屼俊鎭〃涓幏鍙杝et瀵瑰簲鐨勬楠屼俊鎭�
- string sql = "exec h_p_Gy_GetMappingData_JiGuangGe '" + HBarCode_PNL + "','" + HSetNo + "'";
- ds = oCN.RunProcReturn(sql, "h_p_Gy_GetMappingData_JiGuangGe");
+ //string sql = "exec h_p_Gy_GetMappingData_JiGuangGe '" + HBarCode_PNL + "','" + HSetNo + "'";
+ //ds = oCN.RunProcReturn(sql, "h_p_Gy_GetMappingData_JiGuangGe");
+ string sql = "" +
+ "select distinct * from (" +
+ //"select HBarCode,HPCSNo from QC_CheckNote_PNL_His where HBarCode = '" + HBarCode_PNL + "' and HSetNo = '" + HSetNo + "' " +
+ //"union " +
+ "select HBarCode,HPCSNo from QC_CheckNote_PNL_Temp where HBarCode = '" + HBarCode_PNL + "' and HSetNo = '" + HSetNo + "' " +
+ ") as a";
+ ds = oCN.RunProcReturn(sql, "QC_CheckNote_PNL_Temp");
for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
{
--
Gitblit v1.9.1