From 4eb4abcb61ccda1d9158e60cb66ea6c6bfbb0d73 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期三, 24 二月 2021 10:12:22 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/YqnApi
---
WebAPI/Controllers/LookingForBillController.cs | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/WebAPI/Controllers/LookingForBillController.cs b/WebAPI/Controllers/LookingForBillController.cs
index 3e6c8a9..c2d6662 100644
--- a/WebAPI/Controllers/LookingForBillController.cs
+++ b/WebAPI/Controllers/LookingForBillController.cs
@@ -93,7 +93,7 @@
}
/// <summary>
- /// 涓嬫灦鎵捐揣鍗曟牴鎹攢鍞鍗� 杩斿洖姝ら攢鍞鍗曞唴鐨勭浉鍏充俊鎭�
+ /// 鏍规嵁閿�鍞鍗� 杩斿洖姝ら攢鍞鍗曞唴鐨勭浉鍏充俊鎭�
/// </summary>
/// <returns></returns>
[Route("LookingFor/getSellOrderList")]
@@ -102,7 +102,8 @@
{
try
{
- ds = getSellOrderList_s(HSourceBillNo);
+ string sWhere = " Where HSourceBillNo = '" + HSourceBillNo.Trim() + "'";
+ ds = getSellOrderList_s(sWhere);
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
objJsonResult.code = "0";
@@ -131,7 +132,7 @@
}
/// <summary>
- /// 涓婃灦褰掕繕鍗曟牴鎹疄鐗╂潯鐮� 杩斿洖鐩稿叧淇℃伅
+ /// 鏍规嵁瀹炵墿鏉＄爜 杩斿洖鐩稿叧淇℃伅
/// </summary>
/// <returns></returns>
[Route("LookingFor/getBarCodeDetails")]
@@ -206,7 +207,7 @@
oCN.Commit();
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "鐢熸垚涓嬫灦鎵捐揣鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�" + list[0].HBillNo;
+ objJsonResult.Message = "鐢熸垚鎵捐揣鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�" + list[0].HBillNo;
objJsonResult.data = null;
return objJsonResult;
}
@@ -258,7 +259,7 @@
oCN.Commit();
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "鐢熸垚涓婃灦褰掕繕鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�" + list[0].HBillNo;
+ objJsonResult.Message = "鐢熸垚褰掕繕鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�" + list[0].HBillNo;
objJsonResult.data = null;
return objJsonResult;
}
@@ -328,10 +329,8 @@
return new SQLHelper.ClsCN().RunProcReturn("EXEC h_p_Kf_getPackUnionBillListDetailed " + "'" + HBarCode + "'", "h_p_Kf_getPackUnionBillListDetailed");
}
- public static DataSet getSellOrderList_s(string HSourceBillNo)
+ public static DataSet getSellOrderList_s(string sWhere)
{
- string sWhere = " Where HSourceBillNo = '" + HSourceBillNo.Trim() + "'";
- new SQLHelper.ClsCN().RunProcReturn("exec h_p_IFCLD_ERPSourceBillToLocal_SEOrderToICMO '" + HSourceBillNo + "'", "h_p_IFCLD_ERPSourceBillToLocal_SEOrderToICMO");
return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_getSellOrderList_s " + sWhere, "h_v_getSellOrderList_s");
}
--
Gitblit v1.9.1