From 3af26b3f5d9297a4d99b570631c8d049cc50f3a1 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期四, 29 四月 2021 16:23:59 +0800
Subject: [PATCH] 工艺路线模块-合并
---
WebAPI/Controllers/BLL/Xt_AccountPeriodController.cs | 73 +++
WebAPI/Models/Department.cs | 22 +
WebAPI/Controllers/BLL/Xt_UserController.cs | 73 +++
WebAPI/Controllers/BLL/Xt_BillTypeController.cs | 73 +++
WebAPI/Controllers/BaseSet/Gy_PropertyController.cs | 73 +++
WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs | 2
WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs | 73 +++
WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs | 285 ++++++++++++
WebAPI/ListModels.cs | 12
WebAPI/Controllers/BLL/Xt_XtgnbController.cs | 73 +++
WebAPI/WebServer.cs | 19
WebAPI/Controllers/BLL/Xt_SystemParameterController.cs | 73 +++
WebAPI/Controllers/BLL/Xt_SystemLogController.cs | 73 +++
WebAPI/Controllers/Sc_ProcessMangementController.cs | 146 ++++-
WebAPI/Properties/PublishProfiles/API.pubxml.user | 150 +++---
WebAPI/WebAPI.csproj | 10
WebAPI/Controllers/BLL/Xt_UserGroupController.cs | 73 +++
17 files changed, 1,163 insertions(+), 140 deletions(-)
diff --git a/WebAPI/Controllers/BLL/Xt_AccountPeriodController.cs b/WebAPI/Controllers/BLL/Xt_AccountPeriodController.cs
new file mode 100644
index 0000000..b0b9678
--- /dev/null
+++ b/WebAPI/Controllers/BLL/Xt_AccountPeriodController.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 Xt_AccountPeriodController : 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("Xt_AccountPeriod/list")]
+ [HttpGet]
+ public object list(string sWhere)
+ {
+ try
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Xt_AccountPeriodList " + sWhere, "h_v_Xt_AccountPeriodList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Xt_AccountPeriodList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Xt_AccountPeriodList");
+ }
+ 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;
+ }
+ }
+
+
+
+ //
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/BLL/Xt_BillTypeController.cs b/WebAPI/Controllers/BLL/Xt_BillTypeController.cs
new file mode 100644
index 0000000..da26d8d
--- /dev/null
+++ b/WebAPI/Controllers/BLL/Xt_BillTypeController.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 Xt_BillTypeController : 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("Xt_BillType/list")]
+ [HttpGet]
+ public object list(string sWhere)
+ {
+ try
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Xt_BillTypeList " + sWhere, "h_v_Xt_BillTypeList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Xt_BillTypeList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Xt_BillTypeList");
+ }
+ 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;
+ }
+ }
+
+
+
+ //
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/BLL/Xt_SystemLogController.cs b/WebAPI/Controllers/BLL/Xt_SystemLogController.cs
new file mode 100644
index 0000000..830b6e8
--- /dev/null
+++ b/WebAPI/Controllers/BLL/Xt_SystemLogController.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 Xt_SystemLogController : 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("Xt_SystemLog/list")]
+ [HttpGet]
+ public object list(string sWhere)
+ {
+ try
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Xt_SystemLogList " + sWhere + " order by 鏃ユ湡 desc", "h_v_Xt_SystemLogList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Xt_SystemLogList where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by 鏃ユ湡 desc";
+ ds = oCN.RunProcReturn(sql, "h_v_Xt_SystemLogList");
+ }
+ 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;
+ }
+ }
+
+
+
+ //
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/BLL/Xt_SystemParameterController.cs b/WebAPI/Controllers/BLL/Xt_SystemParameterController.cs
new file mode 100644
index 0000000..43756c7
--- /dev/null
+++ b/WebAPI/Controllers/BLL/Xt_SystemParameterController.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 Xt_SystemParameterController : 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("Xt_SystemParameter/list")]
+ [HttpGet]
+ public object list(string sWhere)
+ {
+ try
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Xt_SystemParameterList " + sWhere, "h_v_Xt_SystemParameterList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Xt_SystemParameterList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_IF_Proh_v_Xt_SystemParameterListpertyList");
+ }
+ 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;
+ }
+ }
+
+
+
+ //
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/BLL/Xt_UserController.cs b/WebAPI/Controllers/BLL/Xt_UserController.cs
new file mode 100644
index 0000000..29d996d
--- /dev/null
+++ b/WebAPI/Controllers/BLL/Xt_UserController.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 Xt_UserController : 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("Xt_User/list")]
+ [HttpGet]
+ public object list(string sWhere)
+ {
+ try
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_IF_UserList " + sWhere, "h_v_IF_UserList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_IF_UserList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_IF_UserList");
+ }
+ 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;
+ }
+ }
+
+
+
+ //
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/BLL/Xt_UserGroupController.cs b/WebAPI/Controllers/BLL/Xt_UserGroupController.cs
new file mode 100644
index 0000000..daa2ab8
--- /dev/null
+++ b/WebAPI/Controllers/BLL/Xt_UserGroupController.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 Xt_UserGroupController : 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("Xt_UserGroup/list")]
+ [HttpGet]
+ public object list(string sWhere)
+ {
+ try
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_System_UserGroup " + sWhere, "h_v_System_UserGroup");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_System_UserGroup where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_System_UserGroup");
+ }
+ 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;
+ }
+ }
+
+
+
+ //
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/BLL/Xt_XtgnbController.cs b/WebAPI/Controllers/BLL/Xt_XtgnbController.cs
new file mode 100644
index 0000000..c1eabaa
--- /dev/null
+++ b/WebAPI/Controllers/BLL/Xt_XtgnbController.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 Xt_XtgnbController : 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("Xt_Xtgnb/list")]
+ [HttpGet]
+ public object list(string sWhere)
+ {
+ try
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Xt_XtgnbList " + sWhere, "h_v_Xt_XtgnbList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Xt_XtgnbList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Xt_XtgnbList");
+ }
+ 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;
+ }
+ }
+
+
+
+ //
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs b/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
index 6cc7d53..a218daf 100644
--- a/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
@@ -66,35 +66,25 @@
}
}
+
/// <summary>
- /// 閮ㄩ棬鍒楄〃鍒犻櫎鎸夐挳
+ /// 鏍规嵁鍩虹璧勬枡ID 鏌ユ壘璁板綍
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
- [Route("Gy_Department/Delete_Json")]
+ [Route("Gy_Department/cx")]
[HttpGet]
- public object Delete_Json(string HNumber,string HName)
+ public object cx(long HInterID)
{
try
{
- ds = oCN.RunProcReturn("delete from Gy_Department where HNmber = " + HNumber + " and HName = " + HName , "Gy_Department");
-
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "false锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
+ ds = oCN.RunProcReturn("select * from Gy_Department where hitemid = " + HInterID, "Gy_Department");
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
- }
}
catch (Exception e)
{
@@ -106,6 +96,269 @@
}
}
+ /// <summary>
+ /// 閮ㄩ棬鍒楄〃鍒犻櫎鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_Department/Delete_Json")]
+ [HttpGet]
+ public object Delete_Json(long HItemID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("delete from Gy_Department where HItemID = " + HItemID, "Gy_Department");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 閮ㄩ棬鍒楄〃绂佺敤鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_Department/JY_Json")]
+ [HttpGet]
+ public object JY_Json(long HItemID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("update Gy_Department set HStopFlag = 1 where HItemID = " + HItemID, "Gy_Department");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "绂佺敤鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 閮ㄩ棬鍒楄〃鍙嶇鐢ㄦ寜閽�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_Department/FJY_Json")]
+ [HttpGet]
+ public object FJY_Json(long HItemID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("update Gy_Department set HStopFlag = 0 where HItemID = " + HItemID, "Gy_Department");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶇鐢ㄦ垚鍔�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_Department/AddBill")]
+ [HttpPost]
+ public object AddBill([FromBody] JObject oMain)
+ {
+ try {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ //鍙嶅簭鍒楀寲
+ msg1 = "[" + msg1.ToString() + "]";
+ List<Department> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Department>>(msg1);
+
+ long HItemID = list[0].HItemID;
+ string HNumber = list[0].HNumber;
+ string HName = list[0].HName;
+ string HShortNumber = list[0].HShortNumber;
+ string HRemark = list[0].HRemark;
+ string HUseFlag = list[0].HUseFlag;
+ long HParentID = list[0].HParentID;
+
+
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCN.BeginTran();
+ //涓昏〃
+ oCN.RunProc("Insert Into Gy_Department " +
+ "(HNumber,HShortNumber,HName,HParentID" +
+ ",HLevel,HEndFlag,HRemark,HStopFlag,HUseFlag" +
+ ") " +
+ " values('" + HNumber + "','" + HShortNumber + "','" + HName + "',0" +
+ ",'',0,'" + HRemark + "',0,''" +
+ ") ");
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ oCN.RunProc("Update Gy_Department set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
+ //objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch(Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+ /// <summary>
+ /// 淇敼鍗曟嵁-淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_Department/AddBill1")]
+ [HttpPost]
+ public object AddBill1([FromBody] JObject oMain)
+ {
+ try
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[1].ToString();
+ string msg3 = sArray[0].ToString();
+ //鍙嶅簭鍒楀寲
+ msg3 = "[" + msg3.ToString() + "]";
+ List<Department> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Department>>(msg3);
+
+ long HItemID = int.Parse(msg2);
+ string HNumber = list[0].HNumber;
+ string HName = list[0].HName;
+ string HShortNumber = list[0].HShortNumber;
+ string HRemark = list[0].HRemark;
+ string HUseFlag = list[0].HUseFlag;
+ long HParentID = list[0].HParentID;
+
+
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCN.BeginTran();
+ //涓昏〃
+ oCN.RunProc("Update Gy_Department set " +
+ " HNumber='" + HNumber + "'" +
+ ",HName='" + HName + "'" +
+ ",HShortNumber='" + HShortNumber + "'" +
+ ",HParentID=" + HParentID +
+ ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼瀛愰」鐩唬鐮�
+ //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
+ //灏嗕笂绾� 涓洪潪鏈骇
+ //oCN.RunProc("Update Gy_Department set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇敼鍗曟嵁鎴愬姛锛�";
+ //objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+ /// <summary>
+ /// 鑾峰彇鏈�澶у熀纭�璧勬枡ID
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_Department/GetMAXBillID")]
+ [HttpGet]
+ public object GetMAXBillID()
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select max(hitemid)+1 hitemid from Gy_Department", "Gy_Department");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
+ 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;
+ }
+ }
+
+
+ /// <summary>
+ /// 閮ㄩ棬鍒楄〃淇敼鎸夐挳鏂规硶
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_Department/xg")]
+ [HttpGet]
+ public object xg(long HInterID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from Gy_Department where HItemID=" + HInterID, "Gy_Department");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
+ 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;
+ }
+ }
//
diff --git a/WebAPI/Controllers/BaseSet/Gy_PropertyController.cs b/WebAPI/Controllers/BaseSet/Gy_PropertyController.cs
new file mode 100644
index 0000000..c1b6c78
--- /dev/null
+++ b/WebAPI/Controllers/BaseSet/Gy_PropertyController.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_PropertyController : 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_Property/list")]
+ [HttpGet]
+ public object list(string sWhere)
+ {
+ try
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_IF_PropertyList " + sWhere, "h_v_IF_PropertyList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_IF_PropertyList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_IF_PropertyList");
+ }
+ 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;
+ }
+ }
+
+
+
+ //
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs b/WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs
new file mode 100644
index 0000000..e5d2774
--- /dev/null
+++ b/WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.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 Xt_ORGANIZATIONSController : 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("Xt_ORGANIZATIONS/list")]
+ [HttpGet]
+ public object list(string sWhere)
+ {
+ try
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_IF_ORGANIZATIONSList " + sWhere, "h_v_IF_ORGANIZATIONSList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_IF_ORGANIZATIONSList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_IF_ORGANIZATIONSList");
+ }
+ 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;
+ }
+ }
+
+
+
+ //
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs
index db30083..7274261 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs
@@ -81,7 +81,7 @@
string msg1 = _value.ToString();
try
{
- //濮斿宸ュ簭鍙戝嚭鍙嶅簭鍒楀寲
+ //閮ㄩ棬鍩虹璧勬枡鍙嶅簭鍒楀寲
msg1 = "[" + msg1.ToString() + "]";
List<StationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(msg1);
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index 719e7aa..ccf0739 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -479,13 +479,13 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select top 500 * from WW_EntrustWorkOrderBillMain ", "WW_EntrustWorkOrderBillMain");
+ ds = oCN.RunProcReturn("select top 500 * from h_v_WW_EntrustWorkOrderBillList ", "h_v_WW_EntrustWorkOrderBillList");
}
else
{
- string sql1 = "select * from WW_EntrustWorkOrderBillMain where 1 = 1 ";
+ string sql1 = "select * from h_v_WW_EntrustWorkOrderBillList where 1 = 1 ";
string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "WW_EntrustWorkOrderBillMain");
+ ds = oCN.RunProcReturn(sql, "h_v_WW_EntrustWorkOrderBillList");
}
}
catch (Exception e)
@@ -498,43 +498,6 @@
}
return GetObjectJson(ds);
}
-
-
- /// <summary>
- /// 杩斿洖濮斿宸ュ簭姹囨姤鍗曞垪琛�
- /// </summary>
- /// <param name="sWhere"></param>
- /// <returns></returns>
- [Route("Sc_ProcessMangement/MES_Sc_StationOutBillMain_Json")]
- [HttpGet]
- public object MES_Sc_StationOutBillMain_Json(string sWhere)
- {
- DataSet ds;
- try
- {
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select top 500 * from Sc_StationOutBillMain ", "Sc_StationOutBillMain");
- }
- else
- {
- string sql1 = "select * from Sc_StationOutBillMain where 1 = 1 ";
- string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "Sc_StationOutBillMain");
- }
- }
- catch (Exception e)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- return GetObjectJson(ds);
- }
-
/// <summary>
/// 杩斿洖涓嶅悎鏍艰瘎瀹″垪琛�
@@ -1359,7 +1322,110 @@
}
}
+ /// <summary>
+ /// 杩斿洖濮斿宸ュ簭娲惧伐鍗曞垪琛�
+ /// </summary>
+ /// <param name="sqlWhere"></param>
+ /// <returns></returns>
+ [Route("Sc_ProcessMangement/MES_WW_EntrustProcSendWorkBill_Json")]
+ [HttpGet]
+ public object MES_WW_EntrustProcSendWorkBill_Json(string sqlWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sqlWhere == null || sqlWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select top 500 * from h_v_WW_EntrustProcSendWorkBillList ", "h_v_WW_EntrustProcSendWorkBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_WW_EntrustProcSendWorkBillList where 1 = 1 ";
+ string sql = sql1 + sqlWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_WW_EntrustProcSendWorkBillList");
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ return GetObjectJson(ds);
+ }
+ /// <summary>
+ /// 杩斿洖濮斿宸ュ簭璁″垝姹囨姤鍗曞垪琛�
+ /// </summary>
+ /// <param name="sqlWhere"></param>
+ /// <returns></returns>
+ [Route("Sc_ProcessMangement/MES_WW_EntrustProcessReportBill_Json")]
+ [HttpGet]
+ public object MES_WW_EntrustProcessReportBill_Json(string sqlWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sqlWhere == null || sqlWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select top 500 * from h_v_WW_EntrustProcessReportBillList ", "h_v_WW_EntrustProcessReportBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_WW_EntrustProcessReportBillList where 1 = 1 ";
+ string sql = sql1 + sqlWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_WW_EntrustProcessReportBillList");
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ return GetObjectJson(ds);
+ }
+
+ /// <summary>
+ /// 杩斿洖濮斿宸ュ簭璁″垝杞嚭鍗曞垪琛�
+ /// </summary>
+ /// <param name="sqlWhere"></param>
+ /// <returns></returns>
+ [Route("Sc_ProcessMangement/MES_WW_EntrustProcessSendOutBillList_Json")]
+ [HttpGet]
+ public object MES_WW_EntrustProcessSendOutBillList_Json(string sqlWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sqlWhere == null || sqlWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select top 500 * from h_v_WW_EntrustProcessSendOutBillList ", "h_v_WW_EntrustProcessSendOutBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_WW_EntrustProcessSendOutBillList where 1 = 1 ";
+ string sql = sql1 + sqlWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_WW_EntrustProcessSendOutBillList");
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ return GetObjectJson(ds);
+ }
}
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index 7c1145e..dafabb8 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -224,5 +224,17 @@
return list;
}
+ /// <summary>
+ /// 澶勭悊鏂板閮ㄩ棬鍩虹璧勬枡鐨凧SON
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_Department_Model> getObjectByJson_Depaetment(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_Department_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_Department_Model>>(jsonString);
+ return list;
+ }
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Models/Department.cs b/WebAPI/Models/Department.cs
new file mode 100644
index 0000000..a804b6a
--- /dev/null
+++ b/WebAPI/Models/Department.cs
@@ -0,0 +1,22 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class Department
+ {
+ public long HItemID { get; set; }
+ public string HNumber { get; set; }
+ public string HName { get; set; }
+ public string HShortNumber { get; set; }
+
+ public string HRemark { get; set; }
+
+ public string HUseFlag { get; set; }
+
+ public long HParentID { get; set; }
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/API.pubxml.user b/WebAPI/Properties/PublishProfiles/API.pubxml.user
index 31acb14..a468079 100644
--- a/WebAPI/Properties/PublishProfiles/API.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/API.pubxml.user
@@ -7,38 +7,38 @@
<PropertyGroup>
<TimeStampOfAssociatedLegacyPublishXmlFile />
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2021-04-16T00:50:41.5499248Z;True|2021-04-16T08:32:59.1701708+08:00;True|2021-04-16T08:27:36.9176335+08:00;True|2021-04-15T15:56:26.8485667+08:00;True|2021-04-15T15:21:23.2875671+08:00;True|2021-04-15T14:41:16.9980034+08:00;True|2021-04-15T14:36:34.8570017+08:00;True|2021-04-13T16:15:00.7668503+08:00;</History>
+ <History>True|2021-04-28T02:18:54.1336497Z;True|2021-04-27T16:34:19.0789205+08:00;True|2021-04-27T14:48:28.8138232+08:00;True|2021-04-27T10:34:03.6370089+08:00;True|2021-04-26T16:18:32.0260755+08:00;True|2021-04-26T15:00:58.6773071+08:00;True|2021-04-26T13:23:50.3968646+08:00;True|2021-04-16T08:50:41.5499248+08:00;True|2021-04-16T08:32:59.1701708+08:00;True|2021-04-16T08:27:36.9176335+08:00;True|2021-04-15T15:56:26.8485667+08:00;True|2021-04-15T15:21:23.2875671+08:00;True|2021-04-15T14:41:16.9980034+08:00;True|2021-04-15T14:36:34.8570017+08:00;True|2021-04-13T16:15:00.7668503+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.dll">
- <publishTime>02/22/2013 08:43:40</publishTime>
+ <publishTime>04/13/2021 13:28:28</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.pdb">
- <publishTime>02/22/2013 08:43:40</publishTime>
+ <publishTime>04/13/2021 13:28:28</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="bin/Dapper.dll">
- <publishTime>07/22/2016 14:52:40</publishTime>
+ <publishTime>04/13/2021 13:30:11</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
- <publishTime>09/20/2018 19:23:20</publishTime>
+ <publishTime>04/26/2020 09:57:16</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.ServicesStub.dll">
- <publishTime>09/20/2018 19:28:34</publishTime>
+ <publishTime>04/26/2020 09:57:16</publishTime>
</File>
<File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
<publishTime>03/18/2015 17:02:50</publishTime>
@@ -50,7 +50,7 @@
<publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>08/03/2014 20:33:56</publishTime>
@@ -59,13 +59,13 @@
<publishTime>01/04/2011 13:48:18</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>05/21/2020 10:51:50</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/15/2015 17:57:08</publishTime>
@@ -107,7 +107,7 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Web.Cors.dll">
- <publishTime>11/28/2018 12:58:44</publishTime>
+ <publishTime>04/13/2021 13:30:39</publishTime>
</File>
<File Include="bin/System.Web.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -131,16 +131,16 @@
<publishTime>11/28/2018 13:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
- <publishTime>01/28/2015 04:02:18</publishTime>
+ <publishTime>04/13/2021 13:31:08</publishTime>
</File>
<File Include="bin/System.Web.Optimization.dll">
- <publishTime>02/11/2014 15:26:04</publishTime>
+ <publishTime>04/13/2021 13:31:24</publishTime>
</File>
<File Include="bin/System.Web.Razor.dll">
- <publishTime>01/28/2015 04:02:32</publishTime>
+ <publishTime>04/13/2021 13:31:12</publishTime>
</File>
<File Include="bin/System.Web.Services.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -164,10 +164,10 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>04/29/2021 10:22:28</publishTime>
+ <publishTime>04/28/2021 10:18:38</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>04/29/2021 10:22:28</publishTime>
+ <publishTime>04/28/2021 10:18:38</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>02/04/2021 21:35:21</publishTime>
@@ -185,163 +185,163 @@
<publishTime>03/26/2019 14:23:20</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>05/21/2020 10:51:50</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="Index.html">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="packages.config">
- <publishTime>01/21/2021 13:19:40</publishTime>
+ <publishTime>04/13/2021 13:27:57</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>02/22/2021 09:25:21</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>02/22/2021 09:25:21</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>02/22/2021 09:25:21</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>02/22/2021 09:25:21</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Web.config">
- <publishTime>04/29/2021 10:22:33</publishTime>
+ <publishTime>04/28/2021 10:18:49</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 57fa317..0bc49e6 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -324,7 +324,16 @@
<Compile Include="Controllers\BaseSet\Gy_ProcessController.cs" />
<Compile Include="Controllers\BaseSet\Gy_SourceController.cs" />
<Compile Include="Controllers\BaseSet\Gy_SupplierController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_PropertyController.cs" />
<Compile Include="Controllers\BaseSet\Gy_WarehouseController.cs" />
+ <Compile Include="Controllers\BaseSet\Xt_ORGANIZATIONSController.cs" />
+ <Compile Include="Controllers\BLL\Xt_AccountPeriodController.cs" />
+ <Compile Include="Controllers\BLL\Xt_BillTypeController.cs" />
+ <Compile Include="Controllers\BLL\Xt_UserGroupController.cs" />
+ <Compile Include="Controllers\BLL\Xt_XtgnbController.cs" />
+ <Compile Include="Controllers\BLL\Xt_SystemParameterController.cs" />
+ <Compile Include="Controllers\BLL\Xt_UserController.cs" />
+ <Compile Include="Controllers\BLL\Xt_SystemLogController.cs" />
<Compile Include="Controllers\CGGL\Cg_POOrderBillController.cs" />
<Compile Include="Controllers\CGGL\WW_EntrustOrderBillController.cs" />
<Compile Include="Controllers\CGGL\Cg_POInStockBillController.cs" />
@@ -362,6 +371,7 @@
<Compile Include="Models\Sc_ProcessPlanViewModel.cs" />
<Compile Include="Models\Sc_ProcessReportViewModel.cs" />
<Compile Include="Models\Sc_ProcessSendWorkViewModel.cs" />
+ <Compile Include="Models\Department.cs" />
<Compile Include="Models\Gy_RoutingBill.cs" />
<Compile Include="Models\StationBill.cs" />
<Compile Include="Models\StationOutBillView.cs" />
diff --git a/WebAPI/WebServer.cs b/WebAPI/WebServer.cs
index c51f650..8ed27bd 100644
--- a/WebAPI/WebServer.cs
+++ b/WebAPI/WebServer.cs
@@ -5224,18 +5224,21 @@
DAL.Cls_S_IF_SellOutBill_Lite dal = new DAL.Cls_S_IF_SellOutBill_Lite();
return dal.DisSourceBillList(sWhere);
}
- #endregion
+
+
+
+ #endregion
#region 濮斿鍏ュ簱
- /// <summary>
- /// 鐢熸垚濮斿鍏ュ簱鍗昁3
- /// </summary>
- /// <param name="oMain"></param>
- /// <param name="sErrMsg"></param>
- /// <returns></returns>
- public bool SaveEntrustInBill_K3(Model.ClsKf_EntrustInBillMain oMain, string sHSourceType, Pub_Class.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
+ /// <summary>
+ /// 鐢熸垚濮斿鍏ュ簱鍗昁3
+ /// </summary>
+ /// <param name="oMain"></param>
+ /// <param name="sErrMsg"></param>
+ /// <returns></returns>
+ public bool SaveEntrustInBill_K3(Model.ClsKf_EntrustInBillMain oMain, string sHSourceType, Pub_Class.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
{
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
DAL.ClsKf_EntrustInBill dal = new DAL.ClsKf_EntrustInBill();
--
Gitblit v1.9.1