From 6c6386f7dbbf7cccf55a62fe727ba56502535b59 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期一, 29 三月 2021 16:57:26 +0800
Subject: [PATCH] 新增一个模治具控制器 控制器里列表调用API方法
---
WebAPI/Controllers/LookingForBillController.cs | 1
/dev/null | 391 -----------------
WebAPI/Properties/PublishProfiles/WEBAPI.pubxml | 2
WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user | 170 +++---
WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs | 75 +++
WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs | 494 +++++++++++++++++++++
WebAPI/Web.config | 4
WebAPI/Controllers/BaseSet/Gy_GroupController.cs | 1
WebAPI/Controllers/LMESController.cs | 136 -----
WebAPI/WebAPI.csproj | 66 +-
WebAPI/Controllers/BaseSet/Gy_SourceController.cs | 1
11 files changed, 689 insertions(+), 652 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_GroupController.cs b/WebAPI/Controllers/BaseSet/Gy_GroupController.cs
index ce363b1..bb916f3 100644
--- a/WebAPI/Controllers/BaseSet/Gy_GroupController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_GroupController.cs
@@ -9,6 +9,7 @@
using WebAPI.Models;
namespace WebAPI.Controllers
{
+ //鐝粍Controller
public class Gy_GroupController : ApiController
{
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
diff --git a/WebAPI/Controllers/BaseSet/Gy_SourceController.cs b/WebAPI/Controllers/BaseSet/Gy_SourceController.cs
index 34e75f6..9dfb4b9 100644
--- a/WebAPI/Controllers/BaseSet/Gy_SourceController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_SourceController.cs
@@ -9,6 +9,7 @@
using WebAPI.Models;
namespace WebAPI.Controllers
{
+ //鐢熶骇璧勬簮Controller
public class Gy_SourceController : ApiController
{
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
diff --git a/WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs b/WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs
new file mode 100644
index 0000000..213c200
--- /dev/null
+++ b/WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs
@@ -0,0 +1,75 @@
+锘縰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
+{
+ //涓嶈壇鍝丆ontroller
+ public class Cj_NoPassProcController : 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("Cj_NoPassProc/list")]
+ [HttpGet]
+ public object list(string sWhere)
+ {
+ try
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_QC_NoPassProdCheckBillList " + sWhere, "h_v_QC_NoPassProdCheckBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_QC_NoPassProdCheckBillList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_QC_NoPassProdCheckBillList");
+ }
+ 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/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index af00bde..7bb1e83 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -245,111 +245,6 @@
}
/// <summary>
- /// 杩斿洖鐢熶骇姹囨姤鍗曞垪琛�
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("LEMS/MES_Sc_ProcessReportList_Json")]
- [HttpGet]
- public object MES_Sc_ProcessReportList_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_ProcessReportMain ", "Sc_ProcessReportMain");
- }
- else
- {
- string sql1 = "select * from Sc_ProcessReportMain where 1 = 1 ";
- string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "Sc_ProcessReportMain");
- }
- }
- catch (Exception e)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- return GetObjectJson(ds);
- }
-
- /// <summary>
- /// 杩斿洖鐢熶骇宸ュ簭璁″垝鍗曞垪琛�
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("LEMS/MES_Sc_ProcessPlanMain_Json")]
- [HttpGet]
- public object MES_Sc_ProcessPlanMain_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_ProcessPlanMain ", "Sc_ProcessPlanMain");
- }
- else
- {
- string sql1 = "select * from Sc_ProcessPlanMain where 1 = 1 ";
- string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "Sc_ProcessPlanMain");
- }
- }
- 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="sWhere"></param>
- /// <returns></returns>
- [Route("LEMS/MES_Sc_ProcessSendWorkMain_Json")]
- [HttpGet]
- public object MES_Sc_ProcessSendWorkMain_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_ProcessSendWorkMain ", "Sc_ProcessSendWorkMain");
- }
- else
- {
- string sql1 = "select * from Sc_ProcessSendWorkMain where 1 = 1 ";
- string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "Sc_ProcessSendWorkMain");
- }
- }
- catch (Exception e)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- return GetObjectJson(ds);
- }
-
- /// <summary>
/// 杩斿洖宸ュ簭濮斿鎺ユ敹鍗曞垪琛�
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
@@ -1206,38 +1101,7 @@
objJsonResult.data = e.ToString();
return objJsonResult;
}
- }
- /// <summary>
- /// 杩斿洖宸ュ簭鍒楄〃
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("LEMS/getProcessList")]
- [HttpGet]
- public object getProcessList(string sWhere)
- {
- DataSet ds;
- try
- {
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select * from h_v_Gy_ProcessList "+ sWhere, "h_v_Gy_ProcessList");
- }
- else
- {
- string sql1 = "select * from h_v_Gy_ProcessList where 1 = 1 ";
- string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "h_v_Gy_ProcessList");
- }
-
- }
- catch (Exception e)
- {
- ds = null;
- }
- return GetObjectJson(ds);
}
//
diff --git a/WebAPI/Controllers/LookingForBillController.cs b/WebAPI/Controllers/LookingForBillController.cs
index a124392..119212f 100644
--- a/WebAPI/Controllers/LookingForBillController.cs
+++ b/WebAPI/Controllers/LookingForBillController.cs
@@ -15,6 +15,7 @@
public DataSet ds = new DataSet();
public WebServer webserver = new WebServer();
+
/// <summary>
/// 鏍规嵁鍖呰鍗� 杩斿洖姝ゅ寘瑁呭崟鍐呯殑鐩稿叧淇℃伅
/// </summary>
diff --git a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
index dda65af..e0e865e 100644
--- a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
+++ b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
@@ -21,7 +21,7 @@
/// <returns></returns>
/// <summary>
- /// 涓婁笅鏋跺崟鍒楄〃
+ /// 妫�鍏风淮淇伐鍗曞垪琛�
/// </summary>
/// <returns></returns>
[Route("Sc_CheckToolsRepair/GetCheckToolsRepairWorkBillList")]
@@ -62,16 +62,504 @@
#region sql璇彞
- //涓婃灦褰掕繕鍗曞垪琛�
public static DataSet Sc_CheckToolsRepairWorkBillList_s(string sWhere)
{
return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsRepairWorkBillList ", "h_v_Sc_CheckToolsRepairWorkBillList");
}
+
+ /// <summary>
+ /// 妫�鍏风偣妫�璁″垝琛ㄥ垪琛�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sc_CheckToolsDotCheckPlan/GetCheckToolsDotCheckPlanBillList")]
+ [HttpGet]
+ public object GetCheckToolsDotCheckPlanBillList(string sWhere)
+ {
+ try
+ {
+
+ ds = Sc_CheckToolsDotCheckPlanBillList_s(sWhere);
+ 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 = "杩斿洖璁板綍鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #region sql璇彞
+
+
+ public static DataSet Sc_CheckToolsDotCheckPlanBillList_s(string sWhere)
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsDotCheckPlanBillList ", "h_v_Sc_CheckToolsDotCheckPlanBillList");
+ }
+ #endregion
+
+ /// <summary>
+ /// 妫�鍏蜂繚鍏昏褰曡〃鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sc_CheckToolsMaintainBill/GetCheckToolsMaintainBillList")]
+ [HttpGet]
+ public object GetCheckToolsMaintainBillList(string sWhere)
+ {
+ try
+ {
+
+ ds = Sc_CheckToolsMaintainBillList_s(sWhere);
+ 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 = "杩斿洖璁板綍鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #region sql璇彞
+
+
+ public static DataSet Sc_CheckToolsMaintainBillList_s(string sWhere)
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsMaintainBillList ", "h_v_Sc_CheckToolsMaintainBillList");
+ }
+ #endregion
+
+ /// <summary>
+ /// 妯″叿淇濆吇璁板綍琛ㄥ垪琛�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sc_MouldMaintainBill/GetMouldMaintainBillList")]
+ [HttpGet]
+ public object GetMouldMaintainBillList(string sWhere)
+ {
+ try
+ {
+
+ ds = Sc_MouldMaintainBillList_s(sWhere);
+ 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 = "杩斿洖璁板綍鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #region sql璇彞
+
+
+ public static DataSet Sc_MouldMaintainBillList_s(string sWhere)
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldMaintainBillList ", "h_v_Sc_MouldMaintainBillList");
+ }
+ #endregion
+
+
+
+ /// <summary>
+ /// 妯″叿鐐规璁″垝琛ㄥ垪琛�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sc_MouldDotCheckPlanBill/GetMouldDotCheckPlanBillList")]
+ [HttpGet]
+ public object GetMouldDotCheckPlanBillList(string sWhere)
+ {
+ try
+ {
+
+ ds = Sc_MouldDotCheckPlanBillList_s(sWhere);
+ 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 = "杩斿洖璁板綍鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #region sql璇彞
+
+
+ public static DataSet Sc_MouldDotCheckPlanBillList_s(string sWhere)
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldDotCheckPlanBillList ", "h_v_Sc_MouldDotCheckPlanBillList");
+ }
+ #endregion
+
+ /// <summary>
+ /// 妯″叿鐐规璁板綍琛ㄥ垪琛�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sc_MouldDotCheckBill/GetMouldDotCheckBillList")]
+ [HttpGet]
+ public object GetMouldDotCheckBillList(string sWhere)
+ {
+ try
+ {
+
+ ds = Sc_MouldDotCheckBillList_s(sWhere);
+ 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 = "杩斿洖璁板綍鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #region sql璇彞
+
+
+ public static DataSet Sc_MouldDotCheckBillList_s(string sWhere)
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldDotCheckBillList ", "h_v_Sc_MouldDotCheckBillList");
+ }
+ #endregion
+
+
+ /// <summary>
+ /// 妫�鍏蜂繚鍏昏鍒掕〃鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sc_CheckToolsMaintainPlanBill/GetCheckToolsMaintainPlanBillList")]
+ [HttpGet]
+ public object GetCheckToolsMaintainPlanBillList(string sWhere)
+ {
+ try
+ {
+
+ ds = Sc_CheckToolsMaintainPlanBillList_s(sWhere);
+ 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 = "杩斿洖璁板綍鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #region sql璇彞
+
+
+ public static DataSet Sc_CheckToolsMaintainPlanBillList_s(string sWhere)
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsMaintainPlanBillList ", "h_v_Sc_CheckToolsMaintainPlanBillList");
+ }
+ #endregion
+
+
+ /// <summary>
+ /// 妯″叿淇濆吇璁″垝琛ㄥ垪琛�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sc_MouldMaintainPlanBill/GetMouldMaintainPlanBillList")]
+ [HttpGet]
+ public object GetMouldMaintainPlanBillList(string sWhere)
+ {
+ try
+ {
+
+ ds = Sc_MouldMaintainPlanBillList_s(sWhere);
+ 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 = "杩斿洖璁板綍鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #region sql璇彞
+
+
+ public static DataSet Sc_MouldMaintainPlanBillList_s(string sWhere)
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldMaintainPlanBillList ", "h_v_Sc_MouldMaintainPlanBillList");
+ }
+ #endregion
+
+
+ /// <summary>
+ /// 妯″叿鏁呴殰鐧昏琛ㄥ垪琛�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sc_MouldConkBookBill/GetMouldConkBookBillList")]
+ [HttpGet]
+ public object GetMouldConkBookBillList(string sWhere)
+ {
+ try
+ {
+
+ ds = Sc_MouldConkBookBillList_s(sWhere);
+ 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 = "杩斿洖璁板綍鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #region sql璇彞
+
+
+ public static DataSet Sc_MouldConkBookBillList_s(string sWhere)
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldConkBookBillList ", "h_v_Sc_MouldConkBookBillList");
+ }
+ #endregion
+
+
+
+ /// <summary>
+ /// 妯″叿鏁呴殰鐧昏琛ㄥ垪琛�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sc_MouldRepairCheckBill/GetMouldRepairCheckBillList")]
+ [HttpGet]
+ public object GetMouldRepairCheckBillList(string sWhere)
+ {
+ try
+ {
+
+ ds = Sc_MouldRepairCheckBillList_s(sWhere);
+ 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 = "杩斿洖璁板綍鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #region sql璇彞
+
+
+ public static DataSet Sc_MouldRepairCheckBillList_s(string sWhere)
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairCheckBillList ", "h_v_Sc_MouldRepairCheckBillList");
+ }
+ #endregion
+
+ /// <summary>
+ /// 妫�鍏风淮淇獙鏀跺崟鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sc_CheckToolsRepairCheckBill/GetCheckToolsRepairCheckBillList")]
+ [HttpGet]
+ public object GetCheckToolsRepairCheckBillList(string sWhere)
+ {
+ try
+ {
+
+ ds = Sc_CheckToolsRepairCheckBillList_s(sWhere);
+ 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 = "杩斿洖璁板綍鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #region sql璇彞
+
+
+ public static DataSet Sc_CheckToolsRepairCheckBillList_s(string sWhere)
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsRepairCheckBillList ", "h_v_Sc_CheckToolsRepairCheckBillList");
+ }
+ #endregion
+
+
//娴嬭瘯涓撶敤鎺ュ彛
[Route("LookingFor/Test")]
[HttpGet]
- public object Test(string HbillNo)//h_p_Xs_SellOutFindSP
+ public object Test(string HbillNo)//Sc_CheckToolsRepair/GetCheckToolsRepairWorkBillList
{
DataSet ds;
ds = new SQLHelper.ClsCN().RunProcReturn("EXEC h_p_Xs_SellOutFindSP '" + HbillNo + "'", "h_p_Xs_SellOutFindSP");
diff --git a/WebAPI/Properties/PublishProfiles/JFAPI.pubxml b/WebAPI/Properties/PublishProfiles/JFAPI.pubxml
deleted file mode 100644
index 0a9ae3c..0000000
--- a/WebAPI/Properties/PublishProfiles/JFAPI.pubxml
+++ /dev/null
@@ -1,17 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121.
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <DeleteExistingFiles>True</DeleteExistingFiles>
- <ExcludeApp_Data>False</ExcludeApp_Data>
- <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
- <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
- <LastUsedPlatform>x86</LastUsedPlatform>
- <PublishProvider>FileSystem</PublishProvider>
- <PublishUrl>D:\缃戠珯鍙戝竷\WebAPI</PublishUrl>
- <WebPublishMethod>FileSystem</WebPublishMethod>
- <SiteUrlToLaunchAfterPublish />
- </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user b/WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user
deleted file mode 100644
index 8e679b6..0000000
--- a/WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user
+++ /dev/null
@@ -1,332 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121.
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <_PublishTargetUrl>D:\缃戠珯鍙戝竷\WebAPI</_PublishTargetUrl>
- </PropertyGroup>
- <ItemGroup>
- <File Include="apiapp.json">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="bin/Antlr3.Runtime.dll">
- <publishTime>02/22/2013 08:43:40</publishTime>
- </File>
- <File Include="bin/Antlr3.Runtime.pdb">
- <publishTime>02/22/2013 08:43:40</publishTime>
- </File>
- <File Include="bin/BLL.dll">
- <publishTime>03/23/2021 14:16:30</publishTime>
- </File>
- <File Include="bin/DAL.dll">
- <publishTime>03/23/2021 14:16:30</publishTime>
- </File>
- <File Include="bin/Dapper.dll">
- <publishTime>07/22/2016 14:52:40</publishTime>
- </File>
- <File Include="bin/DBUtility.dll">
- <publishTime>03/23/2021 14:16:30</publishTime>
- </File>
- <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>03/23/2021 14:16:30</publishTime>
- </File>
- <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
- <publishTime>03/18/2015 17:02:50</publishTime>
- </File>
- <File Include="bin/Microsoft.CSharp.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/Microsoft.Web.Infrastructure.dll">
- <publishTime>07/25/2012 11:48:56</publishTime>
- </File>
- <File Include="bin/Model.dll">
- <publishTime>03/23/2021 14:16:30</publishTime>
- </File>
- <File Include="bin/Newtonsoft.Json.dll">
- <publishTime>08/03/2014 20:33:56</publishTime>
- </File>
- <File Include="bin/Pub_Class.dll">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="bin/Pub_Control.dll">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="bin/SQLHelper.dll">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="bin/Swashbuckle.Core.dll">
- <publishTime>02/15/2015 17:57:08</publishTime>
- </File>
- <File Include="bin/System.ComponentModel.DataAnnotations.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.Configuration.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.Data.DataSetExtensions.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.Data.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.Drawing.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.EnterpriseServices.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.IdentityModel.Tokens.Jwt.dll">
- <publishTime>08/19/2014 10:03:34</publishTime>
- </File>
- <File Include="bin/System.Net.Http.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.Net.Http.Formatting.dll">
- <publishTime>11/28/2018 13:00:36</publishTime>
- </File>
- <File Include="bin/System.Runtime.Serialization.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.Web.ApplicationServices.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.Web.Cors.dll">
- <publishTime>11/28/2018 12:58:44</publishTime>
- </File>
- <File Include="bin/System.Web.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.Web.DynamicData.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.Web.Entity.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.Web.Extensions.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.Web.Helpers.dll">
- <publishTime>01/28/2015 04:04:30</publishTime>
- </File>
- <File Include="bin/System.Web.Http.Cors.dll">
- <publishTime>11/28/2018 13:01:26</publishTime>
- </File>
- <File Include="bin/System.Web.Http.dll">
- <publishTime>11/28/2018 13:01:00</publishTime>
- </File>
- <File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="bin/System.Web.Mvc.dll">
- <publishTime>01/28/2015 04:02:18</publishTime>
- </File>
- <File Include="bin/System.Web.Optimization.dll">
- <publishTime>02/11/2014 15:26:04</publishTime>
- </File>
- <File Include="bin/System.Web.Razor.dll">
- <publishTime>01/28/2015 04:02:32</publishTime>
- </File>
- <File Include="bin/System.Web.Services.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.Web.WebPages.Deployment.dll">
- <publishTime>01/28/2015 04:04:30</publishTime>
- </File>
- <File Include="bin/System.Web.WebPages.dll">
- <publishTime>01/28/2015 04:04:30</publishTime>
- </File>
- <File Include="bin/System.Web.WebPages.Razor.dll">
- <publishTime>01/28/2015 04:04:30</publishTime>
- </File>
- <File Include="bin/System.Xml.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.Xml.Linq.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/WebActivatorEx.dll">
- <publishTime>11/24/2014 11:18:48</publishTime>
- </File>
- <File Include="bin/WebAPI.dll">
- <publishTime>03/24/2021 16:31:44</publishTime>
- </File>
- <File Include="bin/WebAPI.pdb">
- <publishTime>03/24/2021 16:31:44</publishTime>
- </File>
- <File Include="bin/WebAPI.XmlSerializers.dll">
- <publishTime>03/23/2021 14:35:51</publishTime>
- </File>
- <File Include="bin/WebGrease.dll">
- <publishTime>07/17/2013 17:03:52</publishTime>
- </File>
- <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
- <publishTime>11/29/2018 13:26:02</publishTime>
- </File>
- <File Include="bin/zh-Hans/System.Web.Http.resources.dll">
- <publishTime>11/29/2018 13:26:30</publishTime>
- </File>
- <File Include="Content/bootstrap.css">
- <publishTime>03/23/2021 14:16:30</publishTime>
- </File>
- <File Include="Content/bootstrap.min.css">
- <publishTime>03/23/2021 14:16:30</publishTime>
- </File>
- <File Include="Content/Site.css">
- <publishTime>03/23/2021 14:16:30</publishTime>
- </File>
- <File Include="DLL/BLL.dll">
- <publishTime>03/23/2021 14:16:30</publishTime>
- </File>
- <File Include="DLL/DAL.dll">
- <publishTime>03/23/2021 14:16:30</publishTime>
- </File>
- <File Include="DLL/DBUtility.dll">
- <publishTime>03/23/2021 14:16:30</publishTime>
- </File>
- <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>03/23/2021 14:16:30</publishTime>
- </File>
- <File Include="DLL/Model.dll">
- <publishTime>03/23/2021 14:16:30</publishTime>
- </File>
- <File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>03/23/2021 14:16:30</publishTime>
- </File>
- <File Include="DLL/Pub_Class.dll">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="DLL/Pub_Control.dll">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="DLL/SQLHelper.dll">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="Global.asax">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="Index.html">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="packages.config">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="Views/Scripts/bootstrap.js">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="Views/Scripts/jquery.validate.js">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="Views/Shared/Error.cshtml">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="Views/Shared/_Layout.cshtml">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="Views/web.config">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="Views/_ViewStart.cshtml">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>03/23/2021 14:16:31</publishTime>
- </File>
- <File Include="Web.config">
- <publishTime>03/24/2021 16:31:55</publishTime>
- </File>
- </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/WEBAPI.pubxml b/WebAPI/Properties/PublishProfiles/WEBAPI.pubxml
index 22cac27..515a6ab 100644
--- a/WebAPI/Properties/PublishProfiles/WEBAPI.pubxml
+++ b/WebAPI/Properties/PublishProfiles/WEBAPI.pubxml
@@ -11,7 +11,7 @@
<SiteUrlToLaunchAfterPublish />
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
<ExcludeApp_Data>False</ExcludeApp_Data>
- <publishUrl>D:\缃戠珯鍙戝竷\WebAPI_SWE</publishUrl>
+ <publishUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</publishUrl>
<DeleteExistingFiles>True</DeleteExistingFiles>
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user b/WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user
index 3f04c6c..2723917 100644
--- a/WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user
@@ -6,32 +6,32 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<TimeStampOfAssociatedLegacyPublishXmlFile />
- <_PublishTargetUrl>D:\缃戠珯鍙戝竷\WebAPI_SWE</_PublishTargetUrl>
+ <_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.dll">
- <publishTime>03/24/2021 13:17:32</publishTime>
+ <publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.pdb">
<publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="bin/Dapper.dll">
- <publishTime>03/24/2021 13:18:36</publishTime>
+ <publishTime>07/22/2016 14:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
<publishTime>09/20/2018 19:23:20</publishTime>
@@ -40,34 +40,34 @@
<publishTime>09/20/2018 19:28:34</publishTime>
</File>
<File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
- <publishTime>03/24/2021 13:15:21</publishTime>
+ <publishTime>03/18/2015 17:02:50</publishTime>
</File>
<File Include="bin/Microsoft.CSharp.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/Microsoft.Web.Infrastructure.dll">
- <publishTime>07/08/2013 15:15:08</publishTime>
+ <publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
- <publishTime>01/28/2016 14:22:24</publishTime>
+ <publishTime>08/03/2014 20:33:56</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.Net35.dll">
<publishTime>01/04/2011 13:48:18</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
- <publishTime>03/24/2021 13:19:15</publishTime>
+ <publishTime>02/15/2015 17:57:08</publishTime>
</File>
<File Include="bin/System.ComponentModel.DataAnnotations.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -91,13 +91,13 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.IdentityModel.Tokens.Jwt.dll">
- <publishTime>03/24/2021 13:19:56</publishTime>
+ <publishTime>08/19/2014 10:03:34</publishTime>
</File>
<File Include="bin/System.Net.Http.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Net.Http.Formatting.dll">
- <publishTime>03/24/2021 13:20:42</publishTime>
+ <publishTime>11/28/2018 13:00:36</publishTime>
</File>
<File Include="bin/System.Runtime.Serialization.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -106,7 +106,7 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Web.Cors.dll">
- <publishTime>03/24/2021 13:21:12</publishTime>
+ <publishTime>11/28/2018 12:58:44</publishTime>
</File>
<File Include="bin/System.Web.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -121,37 +121,37 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Web.Helpers.dll">
- <publishTime>03/24/2021 13:21:44</publishTime>
+ <publishTime>01/28/2015 04:04:30</publishTime>
</File>
<File Include="bin/System.Web.Http.Cors.dll">
- <publishTime>03/24/2021 13:22:27</publishTime>
+ <publishTime>11/28/2018 13:01:26</publishTime>
</File>
<File Include="bin/System.Web.Http.dll">
- <publishTime>03/24/2021 13:22:27</publishTime>
+ <publishTime>11/28/2018 13:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
<publishTime>01/28/2015 04:02:18</publishTime>
</File>
<File Include="bin/System.Web.Optimization.dll">
- <publishTime>03/24/2021 13:24:37</publishTime>
+ <publishTime>02/11/2014 15:26:04</publishTime>
</File>
<File Include="bin/System.Web.Razor.dll">
- <publishTime>03/24/2021 13:25:05</publishTime>
+ <publishTime>01/28/2015 04:02:32</publishTime>
</File>
<File Include="bin/System.Web.Services.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Web.WebPages.Deployment.dll">
- <publishTime>03/24/2021 13:25:41</publishTime>
+ <publishTime>01/28/2015 04:04:30</publishTime>
</File>
<File Include="bin/System.Web.WebPages.dll">
- <publishTime>03/24/2021 13:25:41</publishTime>
+ <publishTime>01/28/2015 04:04:30</publishTime>
</File>
<File Include="bin/System.Web.WebPages.Razor.dll">
- <publishTime>03/24/2021 13:25:41</publishTime>
+ <publishTime>01/28/2015 04:04:30</publishTime>
</File>
<File Include="bin/System.Xml.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -160,19 +160,19 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
- <publishTime>03/24/2021 13:26:42</publishTime>
+ <publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>06/12/2020 17:45:15</publishTime>
+ <publishTime>03/29/2021 14:17:50</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>03/24/2021 15:45:15</publishTime>
+ <publishTime>03/29/2021 14:17:50</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>02/04/2021 21:35:21</publishTime>
</File>
<File Include="bin/WebGrease.dll">
- <publishTime>03/24/2021 13:26:58</publishTime>
+ <publishTime>07/17/2013 17:03:52</publishTime>
</File>
<File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
<publishTime>11/29/2018 13:26:02</publishTime>
@@ -184,163 +184,163 @@
<publishTime>03/26/2019 14:23:20</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="Index.html">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="packages.config">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>03/24/2021 16:19:16</publishTime>
+ <publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="Web.config">
- <publishTime>03/24/2021 16:33:09</publishTime>
+ <publishTime>03/29/2021 14:24:45</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Service/BaseSetService.cs b/WebAPI/Service/BaseSetService.cs
deleted file mode 100644
index abad575..0000000
--- a/WebAPI/Service/BaseSetService.cs
+++ /dev/null
@@ -1,391 +0,0 @@
-锘縰sing DBUtility;
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Text;
-using System.Web;
-using WebAPI.Dapper;
-using WebAPI.Models;
-using WebAPI.WebS;
-
-namespace WebAPI.Service
-{
- public class BaseSetService
- {
- /// <summary>
- /// 鑾峰彇鍗曟嵁鍙�
- /// </summary>
- /// <returns></returns>
- public static ApiResult<DocumentsView> GetInterBillNo(string billType)
- {
- var hInterId = DBUtility.ClsPub.CreateBillID(billType, ref DBUtility.ClsPub.sExeReturnInfo);
- var hBillNo = DBUtility.ClsPub.CreateBillCode(billType, ref DBUtility.ClsPub.sExeReturnInfo, true);
- if (hInterId == 0 || string.IsNullOrEmpty(hBillNo))
- return new ApiResult<DocumentsView> { code = -1, msg = "鑾峰彇澶辫触" };
- DocumentsView documentsView = new DocumentsView()
- {
- HBillNo = hBillNo,
- HInterID = hInterId
- };
- return new ApiResult<DocumentsView> { code = 1, msg = "鑾峰彇鎴愬姛", data = documentsView };
- }
- /// <summary>
- /// 鎵爜鏂规硶
- /// </summary>
- public static ApiResult<DataSet> GetHbarCodeDetail(string sBillBarCode)
- {
- if (string.IsNullOrEmpty(sBillBarCode))
- return new ApiResult<DataSet> { code = -1, msg = "鏉＄爜涓嶈兘涓虹┖" };
- sBillBarCode = sBillBarCode.CompareTo("#") > 0 ? sBillBarCode.Split(Convert.ToChar("#"))[0] : sBillBarCode;
- var dataSet = GetBarCodeDb(sBillBarCode);
- if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
- return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄦ祦杞崱鍙�" };
- return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
- }
- /// <summary>
- /// 娴佽浆鍗″洖杞︽柟娉�
- /// </summary>
- public static ApiResult<DataSet> GetProcDetail(string sBillNo, string sProcNo)
- {
- if (string.IsNullOrEmpty(sBillNo) || string.IsNullOrEmpty(sProcNo))
- return new ApiResult<DataSet> { code = -1, msg = "鏉＄爜鍜屾祦杞崱涓嶈兘涓虹┖" };
- var dataSet = GetProcDb(sBillNo, sProcNo);
- if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
- return new ApiResult<DataSet> { code = -1, msg = "娴佹按鍙锋垨娴佽浆鍗″彿涓虹┖" };
- return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
- }
- /// <summary>
- /// 鑾峰彇鐢熶骇璧勬簮鍒楄〃
- /// </summary>
- public static ApiResult<DataSet> GetSourceList(string sWhere)
- {
- var dataSet = GetSourceDb(sWhere);
- if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
- return new ApiResult<DataSet> { code = -1, msg = "鏈煡璇㈠埌鐢熶骇璧勬簮" };
- return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
- }
- /// <summary>
- /// 鑾峰彇鐢熶骇鐝粍鍒楄〃
- /// </summary>
- public static ApiResult<DataSet> GetGroupList(string sWhere)
- {
- var dataSet = GetGroupDb(sWhere);
- if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
- return new ApiResult<DataSet> { code = -1, msg = "鏈煡璇㈠埌鐢熶骇鐝粍" };
- return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
- }
- /// <summary>
- /// 鑾峰彇宸ヤ綔涓績鍒楄〃
- /// </summary>
- public static ApiResult<DataSet> GetWorkCenterList(string sWhere)
- {
- var dataSet = GetGroupDb(sWhere);
- if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
- return new ApiResult<DataSet> { code = -1, msg = "鏈煡璇㈠埌宸ヤ綔涓績" };
- return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
- }
- private static ConcurrentDictionary<string, string> dicLock = new System.Collections.Concurrent.ConcurrentDictionary<string, string>();//骞跺彂閿�
- /// <summary>
- /// 杩涚珯鎺ユ敹鍗�
- /// </summary>
- public static ApiResult SetStationInBill(ClsSc_StationInBillMain oMain)
- {
- if (!dicLock.TryAdd(oMain.HICMOBillNo + "jz", ""))//闃叉骞跺彂
- return new ApiResult { code = -1, msg = "鏈嶅姟鍣ㄧ箒蹇�" };
- try
- {
- if (oMain.HProcID == 0 || oMain.HQty == 0 || string.IsNullOrEmpty(oMain.HProcExchBillNo) || oMain.HQty == 0 || string.IsNullOrEmpty(oMain.HBillNo))
- return new ApiResult { code = 1, msg = "鍙傛暟涓嶅叏" };
- var stationInList = YqnDal.GetStationInBillMailList(oMain.HProcExchBillNo);//鑾峰緱璇ユ祦杞崱鎵�鏈夎繘绔欏崟
- if (stationInList.Count > 0)
- {
- var stationOutList = YqnDal.GetStationOutBillMailList(oMain.HProcExchBillNo);//鑾峰緱璇ユ祦杞崱鎵�鏈夊嚭绔欏崟
- var stationInModel = stationInList.OrderByDescending(a => a.HDate).First();//鑾峰彇杩涚珯鍗曟渶鏂拌繘绔欏伐搴�
- if (stationOutList.Count == 0 && oMain.HProcID == stationInModel.HProcID)
- return new ApiResult { code = -1, msg = "閲嶅鎵弿" };
- if (stationOutList.Count == 0 && oMain.HProcID != stationInModel.HProcID)
- return new ApiResult { code = -1, msg = "姝ゅ崟宸插叧鑱�" };
- var stationOutModel = stationOutList.OrderByDescending(a => a.HDate).First();//鑾峰彇鍑虹珯鍗曟渶鏂板嚭绔欏伐搴�
- if (stationInModel.HProcID != stationOutModel.HProcID && stationInModel.HProcID == oMain.HProcID)
- return new ApiResult { code = -1, msg = "閲嶅鎵弿" };
- if (stationInModel.HProcID != stationOutModel.HProcID && stationInModel.HProcID == oMain.HProcID)
- return new ApiResult { code = -1, msg = "姝ゅ崟宸插叧鑱�" };
- if (stationOutList.Exists(a => a.HProcID == oMain.HProcID))
- return new ApiResult { code = -1, msg = "璇ュ崟鎹凡瀹屾垚姝ゅ伐鑹�" };
- }
- WebS.WebService1 oWebs = new WebS.WebService1();
- string sErrMsg = string.Empty;
- var result = oWebs.set_SaveStationInBill(oMain, ref sErrMsg);//杩涚珯
- if (!result)
- {
- return new ApiResult { code = -1, msg = sErrMsg };
- }
- return new ApiResult { code = 1, msg = "鎿嶄綔鎴愬姛" };
- }
- catch (Exception ex)
- {
- return new ApiResult { code = -1, msg = "璇锋眰閿欒" + ex.ToString() };
- }
- finally
- {
- dicLock.TryRemove(oMain.HICMOBillNo + "jz", out string key);
- }
- }
- /// <summary>
- /// 鑾峰彇杩涚珯鍗曞垪琛�
- /// </summary>
- /// <param name="sWhere"></param>
- /// <returns></returns>
- public static ApiResult<DataSet> GetStationInBillList(string sWhere)
- {
- var dataSet = GetStationInBill(sWhere);
- if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
- return new ApiResult<DataSet> { code = -1, msg = "鏈煡璇㈠埌鏁版嵁" };
- return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
- }
- /// <summary>
- /// 鑾峰彇鍑虹珯鍗曞垪琛�
- /// </summary>
- /// <param name="sWhere"></param>
- /// <returns></returns>
- public static ApiResult<DataSet> GetStationOutBillList(string sWhere)
- {
- var dataSet = GetStationOutBill(sWhere);
- if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
- return new ApiResult<DataSet> { code = -1, msg = "鏈煡璇㈠埌鏁版嵁" };
- return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
- }
- /// <summary>
- /// 鑾峰彇娴佽浆鍗″垪琛�
- /// </summary>
- /// <param name="sWhere"></param>
- /// <returns></returns>
- public static ApiResult<DataSet> GetPorcessMainList(string sWhere)
- {
- var dataSet = GetProcessMain(sWhere);
- if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
- return new ApiResult<DataSet> { code = -1, msg = "鏈煡璇㈠埌鏁版嵁" };
- return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
- }
- /// <summary>
- /// 鑾峰彇娴佽浆鍗″瓙琛ㄥ垪琛�
- /// </summary>
- /// <param name="sWhere"></param>
- /// <returns></returns>
- public static ApiResult<DataSet> GetPorcessSubList(int hInterId)
- {
- var dataSet = GetProcessSubList(hInterId);
- if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
- return new ApiResult<DataSet> { code = -1, msg = "鏈煡璇㈠埌鏁版嵁" };
- return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
- }
- /// <summary>
- /// 鍑虹珯鎺ユ敹鍗�
- /// </summary>
- public static ApiResult SetStationOutBill(StationOutBillView omodel)
- {
- if (!dicLock.TryAdd(omodel.HICMOBillNo + "cz", omodel.HBillNo))//鍚屼竴鍗曞彿骞跺彂澶勭悊
- return new ApiResult { code = -1, msg = "鏈嶅姟鍣ㄧ箒蹇�" };
- try
- {
- var stationInBillModel = YqnDal.GetStationInBillMail(omodel.HProcID, omodel.HProcExchBillNo);
- if (stationInBillModel == null)
- return new ApiResult { code = -1, msg = "璇ュ伐搴忚繘绔欏崟涓嶅瓨鍦�" };
- var stationOutBillModel = YqnDal.GetStationOutBillMail(omodel.HProcID, omodel.HProcExchBillNo);
- if (stationOutBillModel != null)
- return new ApiResult { code = -1, msg = "璇ュ伐搴忓凡瀛樺湪鍑虹珯鍗�" };
- omodel.HYear = DateTime.Now.Year;
- var result = SetOutBill(omodel);
- return result;
- }
- catch (Exception ex)
- {
- return new ApiResult { code = -1, msg = ex.ToString() };
- }
- finally
- {
- dicLock.TryRemove(omodel.HICMOBillNo + "cz", out string key);
- }
-
- }
- /// <summary>
- /// 鑾峰彇宸ュ簭璇︽儏
- /// </summary>
- /// <param name="hItemId"></param>
- /// <returns></returns>
- public static ApiResult<Models.M_Process> GetProcessDetail(int hItemId)
- {
- var processModel = ProcessDal.GetProcessDetail(hItemId);
- if (processModel == null)
- return new ApiResult<M_Process> { code = -1, msg = "鏌ヨ涓虹┖" };
- processModel.DepartmentModel = ProcessDal.GetDepartmentModel(processModel.HDeptID);
- processModel.ProcMulModel = ProcessDal.GetProcMulModel(processModel.HProcMulID);
- return new ApiResult<M_Process> { code = 1, msg = "鏌ヨ鎴愬姛", data = processModel };
- }
- /// <summary>
- /// 鑾峰彇宸ュ簭鍒楄〃
- /// </summary>
- /// <param name="hName"></param>
- /// <param name="hLevel"></param>
- /// <param name="hNumber"></param>
- /// <param name="hBillSubType"></param>
- /// <returns></returns>
- public static ApiResult<List<Models.M_Process>> GetProcessList(string hName, int hLevel, string hNumber, string hBillSubType, int page, int limit)
- {
- int pageCount = 0;
- var list = ProcessDal.GetProcessList(hName, hLevel, hNumber, hBillSubType, page, limit, ref pageCount);
- if (list?.Count == 0)
- return new ApiResult<List<M_Process>> { code = -1, msg = "鏌ヨ涓虹┖" };
- return new ApiResult<List<M_Process>> { code = 0, msg = "鏌ヨ鎴愬姛", data = list, count = pageCount };
- }
- /// <summary>
- /// 鍒犻櫎涓�鏉″伐搴�
- /// </summary>
- /// <param name="hItemID"></param>
- /// <returns></returns>
- public static ApiResult DeleteProcess(int hItemID)
- {
- var result = ProcessDal.DeleteProcess(hItemID);
- if (result > 0)
- return new ApiResult { code = 1, msg = "鍒犻櫎鎴愬姛" };
- return new ApiResult { code = -1, msg = "鍒犻櫎鏁版嵁涓嶅瓨鍦�" };
- }
- #region sql璇彞
- public static DataSet GetStationOutBill(string strWhere)
- {
- var sql = "Select top 5000 * from h_v_MES_StationOutBillList Where 1=1 " + strWhere;
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- var dataSet = oCN.RunProcReturn(sql, "h_v_MES_StationOutBillList");
- return dataSet;
- }
- public static DataSet GetStationInBill(string strWhere)
- {
- var sql = "Select top 5000 * from h_v_MES_StationInBillList Where 1=1 " + strWhere;
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- var dataSet = oCN.RunProcReturn(sql, "h_v_MES_StationInBillList");
- return dataSet;
- }
- public static DataSet GetProcessSubList(int hInterId)
- {
- var sql = "select a.HProcNo 娴佹按鍙�,a.HProcNumber as 宸ュ簭浠ｇ爜,b.HName 宸ュ簭鍚嶇О,c.HName 宸ヤ綔涓績,a.HQty 娴佽浆鍗℃暟閲� from Sc_ProcessExchangeBillSub a left join Gy_Process b on b.HItemID = a.HProcID left join Gy_WorkCenter c on c.HItemID = a.HCenterID where 1=1 and a.HInterID=" + hInterId;
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- var dataSet = oCN.RunProcReturn(sql, "Sc_ProcessExchangeBillSub");
- return dataSet;
- }
- public static DataSet GetProcessMain(string strWhere)
- {
- var sql = "select a.HBillNo 鍗曟嵁鍙�, a.HDate 鏃ユ湡, HInterID, a.HICMOBillNo 鐢熶骇璁㈠崟, b.HName 浜у搧鍚嶇О, b.HNumber 浜у搧浠ｇ爜, a.HPlanQty 娴佽浆鍗℃暟閲�, c.HName 鍗曚綅, a.HPlanBeginDate 璁″垝寮�宸ユ棩鏈�, a.HPlanEndDate 璁″垝瀹屽伐鏃ユ湡, a.HRemark 澶囨敞" +
- " from Sc_ProcessExchangeBillMain a left join Gy_Material b on a.HMaterID = b.HItemID left join Gy_Unit c on c.HItemID = a.HUnitID where 1=1 " + strWhere;
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- var dataSet = oCN.RunProcReturn(sql, "Sc_ProcessExchangeBillMain");
- return dataSet;
- }
- public static DataSet GetBarCodeDb(string billBarCode)
- {
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList where 鍗曟嵁鍙�= '" + billBarCode + "'", "h_v_Sc_ProcessExchangeBillList");
- return dataSet;
- }
- public static DataSet GetSourceDb(string sWhere)
- {
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- var dataSet = oCN.RunProcReturn("Select HItemID,HNumber 鐢熶骇璧勬簮浠ｇ爜,HName 鐢熶骇璧勬簮 from Gy_Source where HStopflag=0 " + sWhere + " Order by HItemID ", "Gy_Source");
- return dataSet;
- }
- public static DataSet GetGroupDb(string sWhere)
- {
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- var dataSet = oCN.RunProcReturn("Select HItemID,HNumber 宸ヤ綔涓績浠ｇ爜,HName 宸ヤ綔涓績 from Gy_WorkCenter where HStopflag=0 " + sWhere + " Order by HItemID ", "Gy_Source");
- return dataSet;
- }
-
- public static DataSet GetProcDb(string sBillNo, string sProcNo)
- {
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList where 鍗曟嵁鍙�= '" + sBillNo + "' and 宸ュ簭鍙�='" + sProcNo + "'", "h_v_Sc_ProcessExchangeBillList");
- return dataSet;
- }
- /// <summary>
- /// 宸ヤ綔涓績
- /// </summary>
- /// <param name="sWhere"></param>
- /// <returns></returns>
- public static DataSet GetWorkCenterDb(string sWhere)
- {
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- var dataSet = oCN.RunProcReturn("Select HItemID,HNumber 宸ヤ綔涓績浠ｇ爜,HName 宸ヤ綔涓績 from Gy_Group where HStopflag=0 " + sWhere + " Order by HItemID ", "Gy_Source");
- return dataSet;
- }
- public static ApiResult SetOutBill(StationOutBillView omodel)
- {
- try
- {
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- omodel.HInterID = DBUtility.ClsPub.CreateBillID("3791", ref DBUtility.ClsPub.sExeReturnInfo);
- oCN.BeginTran();
- var sql = "Insert Into Sc_StationOutBillMain " +
- "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
- ",HYear,HPeriod,HRemark" +
- ",HICMOInterID,HICMOBillNo,HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo,HProcExchInterID,HProcExchEntryID" +
- ",HProcExchBillNo,HMaterID,HProcID,HICMOQty,HPlanQty,HStationOutTime,HSourceID" +
- ",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate" +
- ",HSupID,HQty,HPrice,HMoney,HProcNo" +
- ") " +
- " values('3791','3791'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",getdate(),'" + DBUtility.ClsPub.CurUserName + "',getdate()" +
- "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'" +
- "," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOBillNo + "'," + omodel.HProcPlanInterID.ToString() + "," + omodel.HProcPlanEntryID.ToString() + ",'" + omodel.HProcPlanBillNo + "'," + omodel.HProcExchInterID.ToString() + "," + omodel.HProcExchEntryID.ToString() +
- ",'" + omodel.HProcExchBillNo + "'," + omodel.HMaterID.ToString() + "," + omodel.HProcID.ToString() + "," + omodel.HICMOQty.ToString() + "," + omodel.HPlanQty.ToString() + ",getdate()," + omodel.HSourceID.ToString() +
- "," + omodel.HGroupID.ToString() + "," + omodel.HDeptID.ToString() + "," + omodel.HEmpID.ToString() + ",'" + omodel.HBarCode + "','" + omodel.HAddr + "','" + omodel.HBarCodeMaker + "',getdate()" +
- "," + omodel.HSupID.ToString() + "," + omodel.HQty.ToString() + "," + omodel.HPrice.ToString() + "," + omodel.HMoney.ToString() + "," + omodel.HProcNo + ") ";
- //var result= SqlPools.GetInstance("YqnConn").ExecuteCommand(sql);
- oCN.RunProc(sql);
- oCN.Commit();
- return new ApiResult { code = 1, msg = "鏂板鎴愬姛" };
- }
- catch (Exception ex)
- {
- return new ApiResult { code = -1, msg = "淇濆瓨閿欒/" + ex.ToString() };
- }
- }
- public static ApiResult SetInBill(ClsSc_StationInBillMain omodel)
- {
- //SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- try
- {
- var nowTime = DateTime.Now;
- omodel.HBillType = "3790";
- omodel.HYear = nowTime.Year;
- omodel.HBillSubType = "3790";
- //寰楀埌mainid
- omodel.HInterID = DBUtility.ClsPub.CreateBillID(omodel.HBillType, ref DBUtility.ClsPub.sExeReturnInfo);
- omodel.HDate = nowTime;
- omodel.HMakeDate = nowTime.ToString();
- omodel.HStationInTime = nowTime;
- omodel.HBarCodeMakeDate = nowTime;
- omodel.HPeriod = 1;
- var sqlBuilder = new StringBuilder();
- sqlBuilder.Append("Insert Into Sc_StationInBillMain(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate,HYear,HPeriod,HRemark,HICMOInterID,HICMOBillNo");
- sqlBuilder.Append(",HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo,HProcExchInterID,HProcExchEntryID,HProcExchBillNo,HMaterID,HProcID,HICMOQty,HPlanQty,HStationInTime,HSourceID");
- sqlBuilder.Append(",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate,HSupID,HQty,HPrice,HMoney,HProcId,HProcNo) values ");
- sqlBuilder.Append("(@HBillType,@HBillSubType,@HInterID,@HBillNo,@HBillStatus,@HDate,@HMaker,@HMakeDate,@HYear,@HPeriod,@HRemark,@HICMOInterID,@HICMOBillNo");
- sqlBuilder.Append(",@HProcPlanInterID,@HProcPlanEntryID,@HProcPlanBillNo,@HProcExchInterID,@HProcExchEntryID,@HProcExchBillNo,@HMaterID,@HProcID,@HICMOQty,@HPlanQty,@HStationInTime,@HSourceID");
- sqlBuilder.Append(",@HGroupID,@HDeptID,@HEmpID,@HBarCode,@HAddr,@HBarCodeMaker,@HBarCodeMakeDate,@HSupID,@HQty,@HPrice,@HMoney,@HProcId,@HProcNo)");
- //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
- //oCN.BeginTran();
- var result = SqlPools.GetInstance("YqnConn").ExecuteCommand(sqlBuilder.ToString(), omodel);
- //oCN.RunProc(sql);
- //oCN.Commit();
- return new ApiResult { code = 1, msg = "鏂板鎴愬姛" };
- }
- catch (Exception e)
- {
- //oCN.RollBack();
- return new ApiResult { code = -1, msg = "淇濆瓨閿欒/" + e.ToString() };
- }
- }
- #endregion
-
- }
-}
\ No newline at end of file
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 4e523ae..fcdb48a 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -11,8 +11,8 @@
</configSections>
<connectionStrings>
- <!--<add name="YqnConn" connectionString="Data Source=.;Initial Catalog=HX_LimsSys_Simoer;User Id=HX_USER,Password=lc@841022;Integrated Security=True" />-->
- <add name="YqnConn" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog=HX_LMESsys;User Id=HX_USER,Password=lc@841022;Integrated Security=True" />
+ <!--<add name="YqnConn" connectionString="Data Source=192.168.0.175;Initial Catalog=HX_LimsSys;User Id=HX_USER,Password=lc@841022;Integrated Security=True" />-->
+ <add name="YqnConn" connectionString="Data Source=.;Initial Catalog=HX_LimsSys;Integrated Security=True" />
</connectionStrings>
<appSettings>
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index a103539..1a19efd 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -44,8 +44,8 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Antlr3.Runtime, Version=3.4.1.9004, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>bin\Antlr3.Runtime.dll</HintPath>
+ <HintPath>..\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll</HintPath>
+ <Private>True</Private>
</Reference>
<Reference Include="BLL, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
@@ -56,8 +56,7 @@
<HintPath>DLL\DAL.dll</HintPath>
</Reference>
<Reference Include="Dapper, Version=1.50.2.0, Culture=neutral, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>bin\Dapper.dll</HintPath>
+ <HintPath>..\packages\Dapper.1.50.2\lib\net45\Dapper.dll</HintPath>
</Reference>
<Reference Include="DBUtility, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
@@ -73,8 +72,8 @@
<HintPath>..\..\..\..\LMES\LMES\LMES\OCX\Kingdee.BOS.WebApi.ServicesStub.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.AppService.ApiApps.Service, Version=0.9.16.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>bin\Microsoft.Azure.AppService.ApiApps.Service.dll</HintPath>
+ <HintPath>..\packages\Microsoft.Azure.AppService.ApiApps.Service.0.9.16\lib\net45\Microsoft.Azure.AppService.ApiApps.Service.dll</HintPath>
+ <Private>True</Private>
</Reference>
<Reference Include="Microsoft.CSharp">
<Private>True</Private>
@@ -103,30 +102,28 @@
<HintPath>DLL\SQLHelper.dll</HintPath>
</Reference>
<Reference Include="Swashbuckle.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cd1bb07a5ac7c7bc, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>bin\Swashbuckle.Core.dll</HintPath>
+ <HintPath>..\packages\Swashbuckle.Core.5.0.0\lib\net40\Swashbuckle.Core.dll</HintPath>
+ <Private>True</Private>
</Reference>
<Reference Include="System.Data.DataSetExtensions">
<Private>True</Private>
</Reference>
<Reference Include="System.IdentityModel.Tokens.Jwt, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>bin\System.IdentityModel.Tokens.Jwt.dll</HintPath>
+ <HintPath>..\packages\System.IdentityModel.Tokens.Jwt.4.0.0\lib\net45\System.IdentityModel.Tokens.Jwt.dll</HintPath>
+ <Private>True</Private>
</Reference>
<Reference Include="System.Net.Http">
<Private>True</Private>
</Reference>
- <Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>bin\System.Net.Http.Formatting.dll</HintPath>
+ <Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization">
<Private>True</Private>
</Reference>
<Reference Include="System.ServiceModel" />
<Reference Include="System.Web.Cors, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>bin\System.Web.Cors.dll</HintPath>
+ <HintPath>..\packages\Microsoft.AspNet.Cors.5.2.7\lib\net45\System.Web.Cors.dll</HintPath>
</Reference>
<Reference Include="System.Web.DynamicData">
<Private>True</Private>
@@ -155,25 +152,27 @@
<Reference Include="System.Web.Extensions">
<Private>True</Private>
</Reference>
- <Reference Include="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>bin\System.Web.Helpers.dll</HintPath>
+ <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
+ <Private>True</Private>
</Reference>
- <Reference Include="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>bin\System.Web.Http.dll</HintPath>
+ <Reference Include="System.Web.Http, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll</HintPath>
</Reference>
<Reference Include="System.Web.Http.Cors, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>bin\System.Web.Http.Cors.dll</HintPath>
+ <HintPath>..\packages\Microsoft.AspNet.WebApi.Cors.5.2.7\lib\net45\System.Web.Http.Cors.dll</HintPath>
</Reference>
<Reference Include="System.Web.Http.WebHost, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>DLL\System.Web.Http.WebHost.dll</HintPath>
</Reference>
+ <Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
<Reference Include="System.Web.Optimization, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>bin\System.Web.Optimization.dll</HintPath>
+ <HintPath>..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
+ <Private>True</Private>
</Reference>
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
@@ -233,7 +232,6 @@
<Content Include="Index.html" />
<Content Include="Views\Scripts\bootstrap.js" />
<Content Include="Views\Scripts\bootstrap.min.js" />
- <None Include="Properties\PublishProfiles\JFAPI.pubxml" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -316,16 +314,17 @@
<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" />
- <Compile Include="Controllers\BaseSet\Gy_EmployeeController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_CustomerController.cs" />
<Compile Include="Controllers\BaseSet\Gy_DepartmentController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_EmployeeController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_GroupController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_MaterialController.cs" />
<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_WarehouseController.cs" />
+ <Compile Include="Controllers\CJGL\Cj_NoPassProcController.cs" />
<Compile Include="Controllers\LMESController.cs" />
<Compile Include="Controllers\LookingForBillController.cs" />
<Compile Include="Controllers\NewApiController.cs" />
@@ -354,7 +353,6 @@
</Compile>
<Compile Include="Service\ProcessDal.cs" />
<Compile Include="Service\YqnDal.cs" />
- <Compile Include="Service\BaseSetService.cs" />
<Compile Include="Service\YqnQbService.cs" />
<Compile Include="Web References\WebS\Reference.cs">
<AutoGen>True</AutoGen>
--
Gitblit v1.9.1