From 649d2f185800392aa0a0a44d437862afe9d863e6 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期四, 23 十二月 2021 15:39:35 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/Controllers/WebAPIController.cs |   39 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 39 insertions(+), 0 deletions(-)

diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 8efa4cc..c4dec73 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -187,6 +187,45 @@
         }
 
 
+
+        //鎾ら攢缂撳瓨鍒楄〃璁板綍
+        [Route("Web/Rescind_Json")]
+        [HttpGet]
+        public object Rescind_Json(long sHInterID, string sBillNo, string sBillType)
+        {
+            string sErrMsg = string.Empty;
+            try
+            {
+                if (webserver.RescindBillList(sHInterID, sBillNo, sBillType, ref sErrMsg))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                else
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鍒犻櫎澶辫触锛�"; 
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+            }
+            catch (Exception)
+            {
+
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鍒犻櫎澶辫触锛�";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+
+        }
+
+
         //鍒犻櫎缂撳瓨鍒楄〃璁板綍
         [Route("Web/Delete_Json")]
         [HttpGet]

--
Gitblit v1.9.1