From ffcef3d87676ebaf7f22413711b57bbe0404b3f2 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 12 八月 2025 16:17:21 +0800
Subject: [PATCH] 冲突分支合并 2025-08-12 16:17
---
WebAPI/Controllers/华远datamapping/HY_DataMappingController.cs | 4 ++--
1 files changed, 2 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..30f6587 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";
--
Gitblit v1.9.1