From 6d4179872a0ae89997ba47be162d53f600731c0d Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 27 五月 2022 19:14:18 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
index 337127e..f7f8008 100644
--- a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
+++ b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -38,6 +38,18 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
+ string user = sArray[2].ToString();//鐢ㄦ埛鍚�
+
+ //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犵紪杈戞潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
bool bResult;
try
{
@@ -268,7 +280,7 @@
/// <returns>object</returns>
[Route("Sc_ProcessExchangeBill/GetICMOBillList")]
[HttpGet]
- public object GetICMOBillList(int hmainid,int OrganizationID)
+ public object GetICMOBillList(int hmainid,int HEntryID, int OrganizationID)
{
try
{
@@ -280,7 +292,7 @@
objJsonResult.data = null;
return objJsonResult;
}
- ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOBillListDetail where hmainid=" + hmainid, "h_v_Sc_ICMOBillListDetail");
+ ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOBillListDetail where hmainid=" + hmainid + " and HEntryID=" + HEntryID, "h_v_S_Sc_ICMOBillList");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -315,7 +327,7 @@
/// <returns>object</returns>
[Route("Sc_ProcessExchangeBill/GetICMOBillDetail")]
[HttpGet]
- public object GetICMOBillDetail(int hmainid, int OrganizationID)
+ public object GetICMOBillDetail(int hmainid,int HEntryID, int OrganizationID)
{
try
{
@@ -327,7 +339,7 @@
objJsonResult.data = null;
return objJsonResult;
}
- ds = oCN.RunProcReturn("select * from h_v_S_Sc_ICMOBillList where hmainid=" + hmainid, "h_v_S_Sc_ICMOBillList");
+ ds = oCN.RunProcReturn("select * from h_v_S_Sc_ICMOBillList where hmainid=" + hmainid + " and HEntryID=" + HEntryID, "h_v_S_Sc_ICMOBillList");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
--
Gitblit v1.9.1