From 1acd793656c629f5b90190dc656cd1b269fa36b6 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 17 三月 2026 11:43:17 +0800
Subject: [PATCH] 合并分支
---
WebAPI/Controllers/华远datamapping/HY_DataMappingController.cs | 6 ++++--
1 files changed, 4 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 d0fac62..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"
@@ -623,7 +623,7 @@
/// <returns></returns>
[Route("VRSInner/VRSInner_getBarCodeBill_PNL")]
[HttpGet]
- public object VRSInner_getBarCodeBill_PNL(string HLayOutName, string HMaker)
+ public object VRSInner_getBarCodeBill_PNL(string HLayOutName, string HMaker, string HBatchNo)
{
try
{
@@ -645,7 +645,7 @@
return objJsonResult;
}
- ds = oCN.RunProcReturn("exec h_p_Gy_BarCodeBill_PNL_Temp_Insert '" + HLayOutName + "','" + HMaker + "'", "h_p_Gy_BarCodeBill_PNL_Temp_Insert");
+ ds = oCN.RunProcReturn("exec h_p_Gy_BarCodeBill_PNL_Temp_Insert '" + HLayOutName + "','" + HMaker + "','" + HBatchNo + "'" , "h_p_Gy_BarCodeBill_PNL_Temp_Insert");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -1255,6 +1255,8 @@
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 = "" +
"select distinct * from (" +
//"select HBarCode,HPCSNo from QC_CheckNote_PNL_His where HBarCode = '" + HBarCode_PNL + "' and HSetNo = '" + HSetNo + "' " +
--
Gitblit v1.9.1