From b1279927a410a4164d8fb8a5ee26a15c01ae99f9 Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期四, 19 八月 2021 10:49:51 +0800
Subject: [PATCH] delete release dir
---
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 50 insertions(+), 4 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
index 9e68093..65cd472 100644
--- a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
+++ b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -117,7 +117,7 @@
if (DBUtility.ClsPub.isInt(subList[i].HProcID) != 0)//HQty
{
Model.ClsSc_ProcessExchangeBillSub oSub = new Model.ClsSc_ProcessExchangeBillSub();
- oSub.HEntryID = i;
+ oSub.HEntryID = i+1;
oSub.HRemark = DBUtility.ClsPub.isStrNull(subList[i].HRemark);
oSub.HSourceInterID = ClsPub.isLong(mainList[0].HICMOInterID);
oSub.HSourceEntryID = ClsPub.isLong(mainList[0].HICMOEntryID);
@@ -255,9 +255,9 @@
/// </summary>
/// <param name="hmainid">鐢熶骇浠诲姟鍗旾D</param>
/// <returns>object</returns>
- [Route("Sc_ProcessExchangeBill/GetICMOBillDetail")]
+ [Route("Sc_ProcessExchangeBill/GetICMOBillList")]
[HttpGet]
- public object GetICMOBillDetail(int hmainid,int OrganizationID)
+ public object GetICMOBillList(int hmainid,int OrganizationID)
{
try
{
@@ -269,7 +269,7 @@
objJsonResult.data = null;
return objJsonResult;
}
- ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOBillListDetail where hmainid=" + hmainid + " and HSTOCKINORGID="+ OrganizationID, "h_v_Sc_ICMOBillListDetail");
+ ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOBillListDetail where hmainid=" + hmainid, "h_v_Sc_ICMOBillListDetail");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -297,6 +297,52 @@
}
}
+ /// <summary>
+ /// 杩斿洖鐢熶骇浠诲姟鍗曟槑缁嗚
+ /// </summary>
+ /// <param name="hmainid">鐢熶骇浠诲姟鍗旾D</param>
+ /// <returns>object</returns>
+ [Route("Sc_ProcessExchangeBill/GetICMOBillDetail")]
+ [HttpGet]
+ public object GetICMOBillDetail(int hmainid, int OrganizationID)
+ {
+ try
+ {
+ if (hmainid == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鐢熶骇浠诲姟鍗旾D涓�0锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ ds = oCN.RunProcReturn("select * from h_v_S_Sc_ICMOBillList where hmainid=" + hmainid, "h_v_S_Sc_ICMOBillList");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ょ敓浜т换鍔″崟鏃犳槑缁嗚锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
//
}
--
Gitblit v1.9.1