From 2aecd940ab29bcc3783fe63b84ad685dabd49763 Mon Sep 17 00:00:00 2001 From: WYB <908761037@qq.com> Date: 星期一, 29 三月 2021 20:12:40 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-API --- WebAPI/Controllers/SCGL/Sc_PPBomBillController.cs | 75 +++ /dev/null | 6 WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user | 329 +++++++++++++++++ WebAPI/Properties/PublishProfiles/JFAPI.pubxml | 9 WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs | 590 +++++++++++++++++++++++++++++++ WebAPI/WebAPI.csproj | 3 WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs | 75 +++ 7 files changed, 1,077 insertions(+), 10 deletions(-) diff --git a/WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs b/WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs new file mode 100644 index 0000000..d262ace --- /dev/null +++ b/WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.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 +{ + //鐢熶骇姹囨姤Controller + public class Sc_ICMOReportBillController : 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("Sc_ICMOReportBill/list")] + [HttpGet] + public object list(string sWhere) + { + try + { + if (sWhere == null || sWhere.Equals("")) + { + ds = oCN.RunProcReturn("select * from h_v_IF_ICMOReportBillList " + sWhere, "h_v_IF_ICMOReportBillList"); + } + else + { + string sql1 = "select * from h_v_IF_ICMOReportBillList where 1 = 1 "; + string sql = sql1 + sWhere; + ds = oCN.RunProcReturn(sql, "h_v_IF_ICMOReportBillList"); + } + 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/SCGL/Sc_PPBomBillController.cs b/WebAPI/Controllers/SCGL/Sc_PPBomBillController.cs new file mode 100644 index 0000000..2241a1c --- /dev/null +++ b/WebAPI/Controllers/SCGL/Sc_PPBomBillController.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 +{ + //鐢熶骇鐢ㄦ枡Controller + public class Sc_PPBomBillController : 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("Sc_PPBomBill/list")] + [HttpGet] + public object list(string sWhere) + { + try + { + if (sWhere == null || sWhere.Equals("")) + { + ds = oCN.RunProcReturn("select * from h_v_IF_PPBomBillList " + sWhere, "h_v_IF_PPBomBillList"); + } + else + { + string sql1 = "select * from h_v_IF_PPBomBillList where 1 = 1 "; + string sql = sql1 + sWhere; + ds = oCN.RunProcReturn(sql, "h_v_IF_PPBomBillList"); + } + 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/Sc_CheckToolsRepairWorkBillController.cs b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs new file mode 100644 index 0000000..e0e865e --- /dev/null +++ b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs @@ -0,0 +1,590 @@ +锘縰sing Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; +using System.Data; +using System.Web.Http; +using WebAPI.Models; +namespace WebAPI.Controllers +{ + /** + * 鎵捐揣鍗曞崟 + */ + public class Sc_CheckToolsRepairWorkBillController : ApiController + { + private json objJsonResult = new json(); + public DataSet ds = new DataSet(); + public WebServer webserver = new WebServer(); + + /// <summary> + /// 鏍规嵁鍖呰鍗� 杩斿洖姝ゅ寘瑁呭崟鍐呯殑鐩稿叧淇℃伅 + /// </summary> + /// <returns></returns> + + /// <summary> + /// 妫�鍏风淮淇伐鍗曞垪琛� + /// </summary> + /// <returns></returns> + [Route("Sc_CheckToolsRepair/GetCheckToolsRepairWorkBillList")] + [HttpGet] + public object GetCheckToolsRepairWorkBillList(string sWhere) + { + try + { + + ds = Sc_CheckToolsRepairWorkBillList_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_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)//Sc_CheckToolsRepair/GetCheckToolsRepairWorkBillList + { + DataSet ds; + ds = new SQLHelper.ClsCN().RunProcReturn("EXEC h_p_Xs_SellOutFindSP '" + HbillNo + "'", "h_p_Xs_SellOutFindSP"); + + if (Pub_Class.ClsPub.isLong(ds.Tables[0].Rows.Count) >= 0 ) + { + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "true锛�"; + objJsonResult.data = ds.Tables[0];//ds.Tables[0].Rows[1][0] + return objJsonResult; + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "false锛�"; + objJsonResult.data = null; + return objJsonResult; + } + } + + + + #endregion + + } +} \ No newline at end of file diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user deleted file mode 100644 index a32fee2..0000000 --- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user +++ /dev/null @@ -1,6 +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"> -</Project> diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml b/WebAPI/Properties/PublishProfiles/JFAPI.pubxml similarity index 62% rename from WebAPI/Properties/PublishProfiles/FolderProfile.pubxml rename to WebAPI/Properties/PublishProfiles/JFAPI.pubxml index af63675..9250916 100644 --- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml +++ b/WebAPI/Properties/PublishProfiles/JFAPI.pubxml @@ -4,13 +4,14 @@ --> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <DeleteExistingFiles>False</DeleteExistingFiles> + <DeleteExistingFiles>True</DeleteExistingFiles> <ExcludeApp_Data>False</ExcludeApp_Data> <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish> - <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration> - <LastUsedPlatform>Any CPU</LastUsedPlatform> + <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration> + <LastUsedPlatform>x86</LastUsedPlatform> <PublishProvider>FileSystem</PublishProvider> - <PublishUrl>F:\缃戠珯鍙戝竷\缁嶅叴闆呯惇璇篭WebAPI</PublishUrl> + <PublishUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</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 new file mode 100644 index 0000000..a8f921d --- /dev/null +++ b/WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user @@ -0,0 +1,329 @@ +锘�<?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:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl> + </PropertyGroup> + <ItemGroup> + <File Include="apiapp.json"> + <publishTime>01/13/2021 21:47:30</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>01/13/2021 21:47:30</publishTime> + </File> + <File Include="bin/DAL.dll"> + <publishTime>01/13/2021 21:47:30</publishTime> + </File> + <File Include="bin/Dapper.dll"> + <publishTime>07/22/2016 14:52:40</publishTime> + </File> + <File Include="bin/DBUtility.dll"> + <publishTime>01/13/2021 21:47:30</publishTime> + </File> + <File Include="bin/Kingdee.BOS.WebApi.Client.dll"> + <publishTime>01/13/2021 21:47: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>01/13/2021 21:47: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>05/21/2020 10:51:50</publishTime> + </File> + <File Include="bin/Pub_Control.dll"> + <publishTime>01/13/2021 21:47:30</publishTime> + </File> + <File Include="bin/SQLHelper.dll"> + <publishTime>01/13/2021 21:47:30</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>01/13/2021 21:47:30</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/29/2021 10:23:41</publishTime> + </File> + <File Include="bin/WebAPI.pdb"> + <publishTime>03/29/2021 10:23:41</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>01/13/2021 21:47:30</publishTime> + </File> + <File Include="Content/bootstrap.min.css"> + <publishTime>01/13/2021 21:47:30</publishTime> + </File> + <File Include="Content/Site.css"> + <publishTime>01/13/2021 21:47:30</publishTime> + </File> + <File Include="DLL/BLL.dll"> + <publishTime>01/13/2021 21:47:30</publishTime> + </File> + <File Include="DLL/DAL.dll"> + <publishTime>01/13/2021 21:47:30</publishTime> + </File> + <File Include="DLL/DBUtility.dll"> + <publishTime>01/13/2021 21:47:30</publishTime> + </File> + <File Include="DLL/Kingdee.BOS.WebApi.Client.dll"> + <publishTime>01/13/2021 21:47:30</publishTime> + </File> + <File Include="DLL/Model.dll"> + <publishTime>01/13/2021 21:47:30</publishTime> + </File> + <File Include="DLL/Newtonsoft.Json.Net35.dll"> + <publishTime>01/13/2021 21:47:30</publishTime> + </File> + <File Include="DLL/Pub_Class.dll"> + <publishTime>05/21/2020 10:51:50</publishTime> + </File> + <File Include="DLL/Pub_Control.dll"> + <publishTime>01/13/2021 21:47:30</publishTime> + </File> + <File Include="DLL/SQLHelper.dll"> + <publishTime>01/13/2021 21:47:30</publishTime> + </File> + <File Include="fonts/glyphicons-halflings-regular.eot"> + <publishTime>01/13/2021 21:47:30</publishTime> + </File> + <File Include="fonts/glyphicons-halflings-regular.svg"> + <publishTime>01/13/2021 21:47:30</publishTime> + </File> + <File Include="fonts/glyphicons-halflings-regular.ttf"> + <publishTime>01/13/2021 21:47:30</publishTime> + </File> + <File Include="fonts/glyphicons-halflings-regular.woff"> + <publishTime>01/13/2021 21:47:30</publishTime> + </File> + <File Include="Global.asax"> + <publishTime>01/13/2021 21:47:30</publishTime> + </File> + <File Include="Index.html"> + <publishTime>01/13/2021 21:47:30</publishTime> + </File> + <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json"> + <publishTime>01/13/2021 21:47:30</publishTime> + </File> + <File Include="packages.config"> + <publishTime>01/21/2021 13:19:40</publishTime> + </File> + <File Include="Views/Scripts/bootstrap.js"> + <publishTime>01/13/2021 21:47:30</publishTime> + </File> + <File Include="Views/Scripts/bootstrap.min.js"> + <publishTime>01/13/2021 21:47:30</publishTime> + </File> + <File Include="Views/Scripts/jquery-1.10.2.js"> + <publishTime>01/13/2021 21:47:30</publishTime> + </File> + <File Include="Views/Scripts/jquery-1.10.2.min.js"> + <publishTime>01/13/2021 21:47:30</publishTime> + </File> + <File Include="Views/Scripts/jquery-1.10.2.min.map"> + <publishTime>01/13/2021 21:47:30</publishTime> + </File> + <File Include="Views/Scripts/jquery.validate.js"> + <publishTime>01/13/2021 21:47:30</publishTime> + </File> + <File Include="Views/Scripts/jquery.validate.min.js"> + <publishTime>01/13/2021 21:47:30</publishTime> + </File> + <File Include="Views/Scripts/jquery.validate.unobtrusive.js"> + <publishTime>01/13/2021 21:47:30</publishTime> + </File> + <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js"> + <publishTime>01/13/2021 21:47:30</publishTime> + </File> + <File Include="Views/Scripts/modernizr-2.6.2.js"> + <publishTime>01/13/2021 21:47:30</publishTime> + </File> + <File Include="Views/Shared/Error.cshtml"> + <publishTime>01/13/2021 21:47:30</publishTime> + </File> + <File Include="Views/Shared/_Layout.cshtml"> + <publishTime>01/13/2021 21:47:30</publishTime> + </File> + <File Include="Views/web.config"> + <publishTime>01/13/2021 21:47:30</publishTime> + </File> + <File Include="Views/_ViewStart.cshtml"> + <publishTime>01/13/2021 21:47:30</publishTime> + </File> + <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource"> + <publishTime>02/22/2021 09:25:20</publishTime> + </File> + <File Include="Web References/WebS/ClsCLD_Department_Model.datasource"> + <publishTime>02/22/2021 09:25:20</publishTime> + </File> + <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource"> + <publishTime>02/22/2021 09:25:20</publishTime> + </File> + <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource"> + <publishTime>02/22/2021 09:25:20</publishTime> + </File> + <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource"> + <publishTime>02/22/2021 09:25:20</publishTime> + </File> + <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource"> + <publishTime>02/22/2021 09:25:20</publishTime> + </File> + <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource"> + <publishTime>02/22/2021 09:25:20</publishTime> + </File> + <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource"> + <publishTime>02/22/2021 09:25:21</publishTime> + </File> + <File Include="Web References/WebS/ClsGy_Customer_Model.datasource"> + <publishTime>02/22/2021 09:25:20</publishTime> + </File> + <File Include="Web References/WebS/ClsGy_Department_Model.datasource"> + <publishTime>02/22/2021 09:25:20</publishTime> + </File> + <File Include="Web References/WebS/ClsGy_Employee_Model.datasource"> + <publishTime>02/22/2021 09:25:21</publishTime> + </File> + <File Include="Web References/WebS/ClsGy_Group_Model.datasource"> + <publishTime>02/22/2021 09:25:20</publishTime> + </File> + <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource"> + <publishTime>02/22/2021 09:25:20</publishTime> + </File> + <File Include="Web References/WebS/ClsGy_Source_Model.datasource"> + <publishTime>02/22/2021 09:25:21</publishTime> + </File> + <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource"> + <publishTime>02/22/2021 09:25:20</publishTime> + </File> + <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource"> + <publishTime>02/22/2021 09:25:21</publishTime> + </File> + <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource"> + <publishTime>02/22/2021 09:25:20</publishTime> + </File> + <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource"> + <publishTime>02/22/2021 09:25:20</publishTime> + </File> + <File Include="Web.config"> + <publishTime>03/29/2021 10:23:47</publishTime> + </File> + </ItemGroup> +</Project> \ No newline at end of file diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj index 0c2858d..3daa1d3 100644 --- a/WebAPI/WebAPI.csproj +++ b/WebAPI/WebAPI.csproj @@ -330,6 +330,9 @@ <Compile Include="Controllers\LMESController.cs" /> <Compile Include="Controllers\LookingForBillController.cs" /> <Compile Include="Controllers\NewApiController.cs" /> + <Compile Include="Controllers\SCGL\Sc_ICMOReportBillController.cs" /> + <Compile Include="Controllers\SCGL\Sc_PPBomBillController.cs" /> + <Compile Include="Controllers\Sc_CheckToolsRepairWorkBillController.cs" /> <Compile Include="Dapper\SqlHelper.cs" /> <Compile Include="Dapper\SqlPools.cs" /> <Compile Include="DbUntil\DataFormatUntil.cs" /> -- Gitblit v1.9.1