From d9a61c72dd7d8277d85490f4e86fe3bcd3c7a832 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期四, 25 三月 2021 13:32:05 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-WEBAPI
---
WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user | 6 +-
WebAPI/Controllers/BaseSet/Gy_GroupController.cs | 73 ++++++++++++++++++++++++
WebAPI/WebAPI.csproj | 2
WebAPI/Controllers/BaseSet/Gy_SourceController.cs | 73 ++++++++++++++++++++++++
4 files changed, 151 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_GroupController.cs b/WebAPI/Controllers/BaseSet/Gy_GroupController.cs
new file mode 100644
index 0000000..ce363b1
--- /dev/null
+++ b/WebAPI/Controllers/BaseSet/Gy_GroupController.cs
@@ -0,0 +1,73 @@
+锘縰sing Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Web.Http;
+using WebAPI.Models;
+namespace WebAPI.Controllers
+{
+ public class Gy_GroupController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+
+ /// <summary>
+ /// 杩斿洖鐝粍鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_Group/list")]
+ [HttpGet]
+ public object list(string sWhere)
+ {
+ try
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_IF_GroupList " + sWhere, "h_v_IF_GroupList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_IF_GroupList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_IF_GroupList");
+ }
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ 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;
+ }
+ }
+
+
+
+ //
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/BaseSet/Gy_SourceController.cs b/WebAPI/Controllers/BaseSet/Gy_SourceController.cs
new file mode 100644
index 0000000..34e75f6
--- /dev/null
+++ b/WebAPI/Controllers/BaseSet/Gy_SourceController.cs
@@ -0,0 +1,73 @@
+锘縰sing Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Web.Http;
+using WebAPI.Models;
+namespace WebAPI.Controllers
+{
+ public class Gy_SourceController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+
+ /// <summary>
+ /// 杩斿洖鐢熶骇璧勬簮鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_Source/list")]
+ [HttpGet]
+ public object list(string sWhere)
+ {
+ try
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_IF_SourceList " + sWhere, "h_v_IF_SourceList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_IF_SourceList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_IF_SourceList");
+ }
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ 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;
+ }
+ }
+
+
+
+ //
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user b/WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user
index 7ed8b2f..8e679b6 100644
--- a/WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user
@@ -152,10 +152,10 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>03/24/2021 10:44:06</publishTime>
+ <publishTime>03/24/2021 16:31:44</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>03/24/2021 10:44:06</publishTime>
+ <publishTime>03/24/2021 16:31:44</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>03/23/2021 14:35:51</publishTime>
@@ -326,7 +326,7 @@
<publishTime>03/23/2021 14:16:31</publishTime>
</File>
<File Include="Web.config">
- <publishTime>03/24/2021 10:46:23</publishTime>
+ <publishTime>03/24/2021 16:31:55</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 411e908..a103539 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -316,8 +316,10 @@
<Compile Include="App_Start\RouteConfig.cs" />
<Compile Include="App_Start\SwaggerConfig.cs" />
<Compile Include="App_Start\WebApiConfig.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_SourceController.cs" />
<Compile Include="Controllers\BaseSet\Gy_CustomerController.cs" />
<Compile Include="Controllers\BaseSet\Gy_BadReasonController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_GroupController.cs" />
<Compile Include="Controllers\BaseSet\Gy_SupplierController.cs" />
<Compile Include="Controllers\BaseSet\Gy_MaterialController.cs" />
<Compile Include="Controllers\BaseSet\Gy_WarehouseController.cs" />
--
Gitblit v1.9.1