From 6b8782c6810660751b40d284d40ea7a13656c5b7 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 05 九月 2022 20:04:13 +0800
Subject: [PATCH] 设备点检记录功能、大岛车间综合看板接口变更、工单批量关闭查询，提交
---
VueWebApi/obj/Release/VueWebApi.pdb | 0
packages/Microsoft.Owin.Cors.4.0.0/lib/net451/Microsoft.Owin.Cors.XML | 96 ++++++
VueWebApi/DLL/BLL/DeviceManagerBLL.cs | 16 +
.vs/VueWebApi/v16/.suo | 0
VueWebApi/obj/Release/TransformWebConfig/original/Web.config | 4
packages/Microsoft.Owin.Cors.4.0.0/Microsoft.Owin.Cors.4.0.0.nupkg | 0
VueWebApi/DLL/DAL/ProductionManagementDAL.cs | 139 ++++++++
VueWebApi/DLL/BLL/KanBanManagerentBLL.cs | 23
VueWebApi/Logs/2022-09-05.TXT | 0
VueWebApi/DDKanBanModel/ShopTopLeft.cs | 9
packages/Microsoft.Owin.Cors.4.0.0/.signature.p7s | 0
VueWebApi/VueWebApi.csproj | 3
VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache | 0
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb | 0
VueWebApi/Controllers/ProductionManagementController.cs | 46 ++
VueWebApi/Controllers/DeviceManagerController.cs | 47 ++
VueWebApi/Hubs/ChatHub.cs | 4
VueWebApi/obj/Release/Package/PackageTmp/Web.config | 4
VueWebApi/bin/VueWebApi.pdb | 0
VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache | 2
VueWebApi/bin/VueWebApi.dll.config | 4
VueWebApi/obj/Release/TransformWebConfig/transformed/Web.config | 4
VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt | 2
VueWebApi/Controllers/KanBanManagerentController.cs | 32 +
VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user | 15
VueWebApi/Web.config | 4
VueWebApi/DLL/BLL/ProductionManagementBLL.cs | 20 +
VueWebApi/App_Start/Startup.cs | 10
VueWebApi/bin/VueWebApi.xml | 23 +
VueWebApi/bin/Microsoft.Owin.Cors.xml | 96 ++++++
VueWebApi/packages.config | 1
VueWebApi/DLL/DAL/KanBanManagerentDAL.cs | 185 ++++------
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml | 23 +
VueWebApi/DLL/DAL/DeviceManagerDAL.cs | 100 ++++++
34 files changed, 748 insertions(+), 164 deletions(-)
diff --git a/.vs/VueWebApi/v16/.suo b/.vs/VueWebApi/v16/.suo
index e2fc018..d011b36 100644
--- a/.vs/VueWebApi/v16/.suo
+++ b/.vs/VueWebApi/v16/.suo
Binary files differ
diff --git a/VueWebApi/App_Start/Startup.cs b/VueWebApi/App_Start/Startup.cs
index d2fc6c2..368ac6c 100644
--- a/VueWebApi/App_Start/Startup.cs
+++ b/VueWebApi/App_Start/Startup.cs
@@ -1,4 +1,6 @@
-锘縰sing Microsoft.Owin;
+锘縰sing Microsoft.AspNet.SignalR;
+using Microsoft.Owin;
+using Microsoft.Owin.Cors;
using Owin;
using System;
using System.Collections.Generic;
@@ -11,8 +13,12 @@
{
public void Configuration(IAppBuilder app)
{
- // 閰嶇疆闆嗙嚎鍣�
+ // 鏈夊叧濡備綍閰嶇疆搴旂敤绋嬪簭鐨勮缁嗕俊鎭紝璇疯闂� https://go.microsoft.com/fwlink/?LinkID=316888
+ //鍏佽璺ㄥ煙
+ app.UseCors(CorsOptions.AllowAll);
+ //app.MapSignalR("Hubs/chatHub", new HubConfiguration());
app.MapSignalR();
+ //鑷繁璁惧畾璁块棶璺緞锛屽悓鏃惰缃瓾ub閰嶇疆椤癸紝鏃犻渶鎸囧畾鍚姩鐨凥ub绫伙紝鍥犱负瀹冧滑琚嚜鍔ㄨ瘑鍒�
}
}
}
\ No newline at end of file
diff --git a/VueWebApi/Controllers/DeviceManagerController.cs b/VueWebApi/Controllers/DeviceManagerController.cs
index 985c415..4874412 100644
--- a/VueWebApi/Controllers/DeviceManagerController.cs
+++ b/VueWebApi/Controllers/DeviceManagerController.cs
@@ -632,6 +632,53 @@
#endregion
+ #region[璁惧鐐规璁板綍鏌ヨ]
+ /// <summary>
+ /// 璁惧鐐规璁板綍鏌ヨ
+ /// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
+ /// <param name="eqpcode">璁惧缂栧彿</param>
+ /// <param name="eqpname">璁惧鍚嶇О</param>
+ /// <param name="stanedname">鏍囧噯鍚嶇О</param>
+ /// <param name="checkuser">鐐规浜哄憳</param>
+ /// <param name="checkdate">鐐规鏃堕棿</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <returns></returns>
+ [Route(template: "DeviceCheckTakeSearch")]
+ [HttpGet]
+ public HttpResponseMessage DeviceCheckTakeSearch(int page, int rows, string prop, string order, string wkshopcode = null, string eqpcode = null, string eqpname = null,string stanedname=null,string checkuser=null,string checkdate=null)
+ {
+ string checkopendate = ""; //鐐规寮�濮嬫椂闂�
+ string checkclosedate = ""; //鐐规缁撴潫鏃堕棿
+ if (checkdate != "" && checkdate != null)
+ {
+ checkopendate = checkdate.Split('~')[0].ToString();
+ checkclosedate = checkdate.Split('~')[1].ToString();
+ }
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = DeviceManagerBLL.DeviceCheckTakeSearch(wkshopcode, eqpcode, eqpname, stanedname, checkuser, checkopendate, checkclosedate, startNum, endNum, prop, order);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[璁惧淇濆吇璁板綍鏄庣粏鏌ヨ]
+ /// <summary>
+ /// 璁惧淇濆吇璁板綍鏄庣粏鏌ヨ
+ /// </summary>
+ /// <param name="djwo">璁惧鐐规鍗曞彿</param>
+ /// <returns></returns>
+ [Route(template: "DeviceCheckSubTakeSearch")]
+ [HttpGet]
+ public HttpResponseMessage DeviceCheckSubTakeSearch(string djwo)
+ {
+ mes = DeviceManagerBLL.DeviceCheckSubTakeSearch(djwo);
+ return TJson.toJson(mes);
+ }
+ #endregion
}
}
diff --git a/VueWebApi/Controllers/KanBanManagerentController.cs b/VueWebApi/Controllers/KanBanManagerentController.cs
index f1485c4..c0c506e 100644
--- a/VueWebApi/Controllers/KanBanManagerentController.cs
+++ b/VueWebApi/Controllers/KanBanManagerentController.cs
@@ -18,17 +18,16 @@
ToMessage mes = new ToMessage();
RedisHelper redis = new RedisHelper();
- #region[澶у矝杞﹂棿缁煎悎鐪嬫澘,鐢熶骇杞﹂棿鏌ユ壘浜х嚎鎺ュ彛]
+ #region[澶у矝杞﹂棿缁煎悎鐪嬫澘,鑾峰彇鐢熶骇杞﹂棿]
/// <summary>
- /// 澶у矝杞﹂棿缁煎悎鐪嬫澘,鐢熶骇杞﹂棿鏌ユ壘浜х嚎鎺ュ彛
+ /// 澶у矝杞﹂棿缁煎悎鐪嬫澘,鑾峰彇鐢熶骇杞﹂棿
/// </summary>
- /// <param name="shopcode">杞﹂棿缂栫爜</param>
/// <returns></returns>
- [Route(template: "ShopSearchLine")]
+ [Route(template: "ShopSearch")]
[HttpGet]
- public HttpResponseMessage ShopSearchLine(string shopcode)
+ public HttpResponseMessage ShopSearch()
{
- mes = KanBanManagerentBLL.ShopSearchLine(shopcode);
+ mes = KanBanManagerentBLL.ShopSearch();
return TJson.toJson(mes);
}
#endregion
@@ -37,13 +36,13 @@
/// <summary>
/// 澶у矝杞﹂棿缁煎悎鐪嬫澘,宸︿笂浜х嚎鍔犲伐浠诲姟鎺ュ彛
/// </summary>
- /// <param name="json">鎻愪氦鏁版嵁(鍙傝�冨伐搴忓畾涔夊叧鑱斿伐浣滅珯鎻愪氦)</param>
+ /// <param name="shopcode">杞﹂棿缂栫爜</param>
/// <returns></returns>
[Route(template: "LineSearchTopLeftData")]
[HttpPost]
- public HttpResponseMessage LineSearchTopLeftData(List<ObjectData> json)
+ public HttpResponseMessage LineSearchTopLeftData(string shopcode)
{
- mes = KanBanManagerentBLL.LineSearchTopLeftData(json);
+ mes = KanBanManagerentBLL.LineSearchTopLeftData(shopcode);
return TJson.toJson(mes);
}
#endregion
@@ -52,12 +51,13 @@
/// <summary>
/// 澶у矝杞﹂棿缁煎悎鐪嬫澘,宸︿笅鍒楄〃鎺ュ彛
/// </summary>
+ /// <param name="shopcode">杞﹂棿缂栫爜</param>
/// <returns></returns>
[Route(template: "LineSearchBottomLeftData")]
[HttpGet]
- public HttpResponseMessage LineSearchBottomLeftData()
+ public HttpResponseMessage LineSearchBottomLeftData(string shopcode)
{
- mes = KanBanManagerentBLL.LineSearchBottomLeftData();
+ mes = KanBanManagerentBLL.LineSearchBottomLeftData(shopcode);
return TJson.toJson(mes);
}
#endregion
@@ -66,12 +66,13 @@
/// <summary>
/// 澶у矝杞﹂棿缁煎悎鐪嬫澘,鍙充笂top鎺掕鎺ュ彛
/// </summary>
+ /// <param name="shopcode">杞﹂棿缂栫爜</param>
/// <returns></returns>
[Route(template: "LineSearchTopRightData")]
[HttpGet]
- public HttpResponseMessage LineSearchTopRightData()
+ public HttpResponseMessage LineSearchTopRightData(string shopcode)
{
- mes = KanBanManagerentBLL.LineSearchTopRightData();
+ mes = KanBanManagerentBLL.LineSearchTopRightData(shopcode);
return TJson.toJson(mes);
}
#endregion
@@ -80,12 +81,13 @@
/// <summary>
/// 澶у矝杞﹂棿缁煎悎鐪嬫澘,鍙充笅top鎺掕鎺ュ彛
/// </summary>
+ /// <param name="shopcode">杞﹂棿缂栫爜</param>
/// <returns></returns>
[Route(template: "LineSearchBottomRightData")]
[HttpGet]
- public HttpResponseMessage LineSearchBottomRightData()
+ public HttpResponseMessage LineSearchBottomRightData(string shopcode)
{
- mes = KanBanManagerentBLL.LineSearchBottomRightData();
+ mes = KanBanManagerentBLL.LineSearchBottomRightData(shopcode);
return TJson.toJson(mes);
}
#endregion
diff --git a/VueWebApi/Controllers/ProductionManagementController.cs b/VueWebApi/Controllers/ProductionManagementController.cs
index 0867517..2ad28a2 100644
--- a/VueWebApi/Controllers/ProductionManagementController.cs
+++ b/VueWebApi/Controllers/ProductionManagementController.cs
@@ -2,6 +2,7 @@
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
+using System.Data;
using System.Linq;
using System.Net;
using System.Net.Http;
@@ -243,7 +244,8 @@
[HttpPost]
public HttpResponseMessage ClosedMesOrder(string wocode, string m_po)
{
- mes = ProductionManagementBLL.ClosedMesOrder(wocode, m_po);
+ var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+ mes = ProductionManagementBLL.ClosedMesOrder(username,wocode, m_po);
return TJson.toJson(mes);
}
#endregion
@@ -639,5 +641,47 @@
}
#endregion
+
+ #region[MES宸ュ崟鎵归噺鍏抽棴鏌ヨ]
+ /// <summary>
+ /// MES宸ュ崟鏌ヨ
+ /// </summary>
+ /// <param name="mesorderstus">宸ュ崟鐘舵�佺爜</param>
+ /// <param name="mesordercode">宸ュ崟缂栧彿</param>
+ /// <param name="sourceorder">婧愬崟鍗曞彿</param>
+ /// <param name="ordertype">鍗曟嵁绫诲瀷</param>
+ /// <param name="partcode">浜у搧缂栫爜</param>
+ /// <param name="partname">浜у搧鍚嶇О</param>
+ /// <param name="partspec">浜у搧瑙勬牸</param>
+ /// <param name="creatuser">鍒涘缓浜哄憳</param>
+ /// <param name="createdate">鍒涘缓鏃堕棿</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <returns></returns>
+ [Route(template: "MesOrderBitchClosedSearch")]
+ [HttpGet]
+ public HttpResponseMessage MesOrderBitchClosedSearch(string mesorderstus = null, string mesordercode = null, string sourceorder = null, string ordertype = null, string partcode = null, string partname = null, string partspec = null, string creatuser = null, string createdate = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ {
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = ProductionManagementBLL.MesOrderBitchClosedSearch(mesorderstus, mesordercode, sourceorder, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[MES宸ュ崟鎵归噺鍏抽棴鎻愪氦]
+ [Route(template: "MesOrderBitchClosedSeave")]
+ [HttpPost]
+ public HttpResponseMessage MesOrderBitchClosedSeave(DataTable dt)
+ {
+
+ var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+ mes = ProductionManagementBLL.MesOrderBitchClosedSeave(username, dt);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
}
}
diff --git a/VueWebApi/DDKanBanModel/ShopTopLeft.cs b/VueWebApi/DDKanBanModel/ShopTopLeft.cs
index f7a31f9..039040a 100644
--- a/VueWebApi/DDKanBanModel/ShopTopLeft.cs
+++ b/VueWebApi/DDKanBanModel/ShopTopLeft.cs
@@ -7,20 +7,13 @@
{
public class ShopTopLeft
{
- public string linecode { get; set; }
- public string linename { get; set; }
- public string lineworkcont { get; set; }
- public List<TreeOne> children { get; set; }
- }
- public class TreeOne
- {
public string saleordercode { set; get; }
public string workcode { set; get; }
public string partnumber { set; get; }
public string partname { set; get; }
public string partspec { set; get; }
public string uom { get; set; }
- public string qty { get; set; }
+ public string qty { get; set; }
public List<TreeTwo> children { get; set; }
}
public class TreeTwo
diff --git a/VueWebApi/DLL/BLL/DeviceManagerBLL.cs b/VueWebApi/DLL/BLL/DeviceManagerBLL.cs
index 6659c42..5509388 100644
--- a/VueWebApi/DLL/BLL/DeviceManagerBLL.cs
+++ b/VueWebApi/DLL/BLL/DeviceManagerBLL.cs
@@ -250,5 +250,21 @@
return DeviceManagerDAL.SaveDeviceRepairStanedAssociationEqp(repairstand_code, username, json);
}
#endregion
+
+
+
+ #region[璁惧鐐规璁板綍鏌ヨ]
+ public static ToMessage DeviceCheckTakeSearch(string wkshopcode, string eqpcode, string eqpname, string stanedname, string checkuser, string checkopendate, string checkclosedate, int startNum, int endNum, string prop, string order)
+ {
+ return DeviceManagerDAL.DeviceCheckTakeSearch(wkshopcode, eqpcode, eqpname, stanedname, checkuser, checkopendate, checkclosedate, startNum, endNum, prop, order);
+ }
+ #endregion
+
+ #region[璁惧淇濆吇璁板綍鏄庣粏鏌ヨ]
+ public static ToMessage DeviceCheckSubTakeSearch(string djwo)
+ {
+ return DeviceManagerDAL.DeviceCheckSubTakeSearch(djwo);
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/VueWebApi/DLL/BLL/KanBanManagerentBLL.cs b/VueWebApi/DLL/BLL/KanBanManagerentBLL.cs
index 45fc016..9bd0469 100644
--- a/VueWebApi/DLL/BLL/KanBanManagerentBLL.cs
+++ b/VueWebApi/DLL/BLL/KanBanManagerentBLL.cs
@@ -10,39 +10,38 @@
{
public class KanBanManagerentBLL
{
-
- #region[澶у矝杞﹂棿缁煎悎鐪嬫澘,鐢熶骇杞﹂棿鏌ユ壘浜х嚎鎺ュ彛]
- public static ToMessage ShopSearchLine(string shopcode)
+ #region[澶у矝杞﹂棿缁煎悎鐪嬫澘,鑾峰彇鐢熶骇杞﹂棿]
+ public static ToMessage ShopSearch()
{
- return KanBanManagerentDAL.ShopSearchLine(shopcode);
+ return KanBanManagerentDAL.ShopSearch();
}
#endregion
#region[澶у矝杞﹂棿缁煎悎鐪嬫澘,宸︿笂浜х嚎鍔犲伐浠诲姟鎺ュ彛]
- public static ToMessage LineSearchTopLeftData(List<ObjectData> json)
+ public static ToMessage LineSearchTopLeftData(string shopcode)
{
- return KanBanManagerentDAL.LineSearchTopLeftData(json);
+ return KanBanManagerentDAL.LineSearchTopLeftData(shopcode);
}
#endregion
#region[澶у矝杞﹂棿缁煎悎鐪嬫澘,宸︿笅鍒楄〃鎺ュ彛]
- public static ToMessage LineSearchBottomLeftData()
+ public static ToMessage LineSearchBottomLeftData(string shopcode)
{
- return KanBanManagerentDAL.LineSearchBottomLeftData();
+ return KanBanManagerentDAL.LineSearchBottomLeftData(shopcode);
}
#endregion
#region[澶у矝杞﹂棿缁煎悎鐪嬫澘,鍙充笂top鎺掕鎺ュ彛]
- public static ToMessage LineSearchTopRightData()
+ public static ToMessage LineSearchTopRightData(string shopcode)
{
- return KanBanManagerentDAL.LineSearchTopRightData();
+ return KanBanManagerentDAL.LineSearchTopRightData(shopcode);
}
#endregion
#region[澶у矝杞﹂棿缁煎悎鐪嬫澘,鍙充笅top鎺掕鎺ュ彛]
- public static ToMessage LineSearchBottomRightData()
+ public static ToMessage LineSearchBottomRightData(string shopcode)
{
- return KanBanManagerentDAL.LineSearchBottomRightData();
+ return KanBanManagerentDAL.LineSearchBottomRightData(shopcode);
}
#endregion
diff --git a/VueWebApi/DLL/BLL/ProductionManagementBLL.cs b/VueWebApi/DLL/BLL/ProductionManagementBLL.cs
index e195e5d..4430393 100644
--- a/VueWebApi/DLL/BLL/ProductionManagementBLL.cs
+++ b/VueWebApi/DLL/BLL/ProductionManagementBLL.cs
@@ -1,5 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
+using System.Data;
using System.Linq;
using System.Web;
using VueWebApi.DLL.DAL;
@@ -76,9 +77,9 @@
#endregion
#region[MES宸ュ崟鍏抽棴]
- public static ToMessage ClosedMesOrder(string wocode, string m_po)
+ public static ToMessage ClosedMesOrder(string username, string wocode, string m_po)
{
- return ProductionManagementDAL.ClosedMesOrder(wocode, m_po);
+ return ProductionManagementDAL.ClosedMesOrder(username,wocode, m_po);
}
#endregion
@@ -232,5 +233,20 @@
return ProductionManagementDAL.SaveMesOrderStepCheckItem(mesordercode, partcode, stepcode, checkstanedcode, checkusercode, checktypecode, checkresult, checkdescr, checkqty, username, json);
}
#endregion
+
+
+ #region[MES宸ュ崟鎵归噺鍏抽棴鏌ヨ]
+ public static ToMessage MesOrderBitchClosedSearch(string mesorderstus, string mesordercode, string sourceorder, string ordertype, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
+ {
+ return ProductionManagementDAL.MesOrderBitchClosedSearch(mesorderstus, mesordercode, sourceorder, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
+ }
+ #endregion
+
+ #region[MES宸ュ崟鎵归噺鍏抽棴鎻愪氦]
+ public static ToMessage MesOrderBitchClosedSeave(string username, DataTable dt)
+ {
+ return ProductionManagementDAL.MesOrderBitchClosedSeave(username,dt);
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/VueWebApi/DLL/DAL/DeviceManagerDAL.cs b/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
index 5a49620..33fa402 100644
--- a/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
+++ b/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
@@ -1898,5 +1898,105 @@
return mes;
}
#endregion
+
+
+
+ #region[璁惧鐐规璁板綍鏌ヨ]
+ public static ToMessage DeviceCheckTakeSearch(string wkshopcode, string eqpcode, string eqpname, string stanedname, string checkuser, string checkopendate, string checkclosedate, int startNum, int endNum, string prop, string order)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ if (wkshopcode != "" && wkshopcode != null)
+ {
+ search += "and T.org_code=@wkshopcode ";
+ dynamicParams.Add("@wkshopcode", wkshopcode);
+ }
+ if (eqpcode != "" && eqpcode != null)
+ {
+ search += "and A.eqp_code like '%'+@eqpcode+'%' ";
+ dynamicParams.Add("@eqpcode", eqpcode);
+ }
+ if (eqpname != "" && eqpname != null)
+ {
+ search += "and E.name like '%'+@eqpname+'%' ";
+ dynamicParams.Add("@eqpname", eqpname);
+ }
+ if (stanedname != "" && stanedname != null)
+ {
+ search += "and M.name like '%'+@stanedname+'%' ";
+ dynamicParams.Add("@stanedname", stanedname);
+ }
+ if (checkuser != "" && checkuser != null)
+ {
+ search += "and A.chk_user like '%'+@checkuser+'%' ";
+ dynamicParams.Add("@checkuser", checkuser);
+ }
+ if (checkopendate != "" && checkopendate != null)
+ {
+ search += "and A.chk_date between @checkopendate and @checkclosedate ";
+ dynamicParams.Add("@checkopendate", checkopendate + " 00:00:00");
+ dynamicParams.Add("@checkclosedate", checkclosedate + " 23:59:59");
+ }
+ if (search == "")
+ {
+ search = "and 1=1 ";
+ }
+ //search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select A.djwo,T.org_code,T.org_name,A.eqp_code,E.name as eqp_name,M.code as stanedcode,M.name as stanedname,
+ A.chk_user,A.chk_result,A.chk_date
+ from TEqpchk_Proc_Main A
+ left join TEqpInfo E on A.eqp_code=E.code
+ left join TEqpchk_Main M on A.eqpchkmain_code=M.code
+ left join TOrganization T on E.wksp_code=T.org_code
+ where T.description='W' " + search;
+ var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.count = total;
+ mes.data = data.ToList();
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[璁惧淇濆吇璁板綍鏄庣粏鏌ヨ]
+ public static ToMessage DeviceCheckSubTakeSearch(string djwo)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ sql = @"select A.seq,T.code as itemcode,T.name as itemname,A.result,A.chk_value,A.remark
+ from TEqpchk_Proc_Deta A
+ left join TEqpchk_Item T on A.eqpchkdeta_code=T.code
+ where A.djwo=@djwo";
+ dynamicParams.Add("@djwo", djwo);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/VueWebApi/DLL/DAL/KanBanManagerentDAL.cs b/VueWebApi/DLL/DAL/KanBanManagerentDAL.cs
index 80932cc..aa5bc8d 100644
--- a/VueWebApi/DLL/DAL/KanBanManagerentDAL.cs
+++ b/VueWebApi/DLL/DAL/KanBanManagerentDAL.cs
@@ -20,22 +20,16 @@
public static List<SqlParameter> listStr = new List<SqlParameter>(); //瀹氫箟鍏ㄥ眬鍙傛暟闆嗗悎
public static SqlParameter[] parameters; //瀹氫箟鍏ㄥ眬SqlParameter鍙傛暟鏁扮粍
-
- #region[澶у矝杞﹂棿缁煎悎鐪嬫澘,鐢熶骇杞﹂棿鏌ユ壘浜х嚎鎺ュ彛]
- public static ToMessage ShopSearchLine(string shopcode)
+ #region[澶у矝杞﹂棿缁煎悎鐪嬫澘,鑾峰彇鐢熶骇杞﹂棿]
+ public static ToMessage ShopSearch()
{
string sql = "";
string search = "";
var dynamicParams = new DynamicParameters();
try
{
- if (shopcode != "" && shopcode != null) //杞﹂棿缂栫爜涓嶄负绌�
- {
- search += "where wksp_code=@shopcode ";
- dynamicParams.Add("@shopcode", shopcode);
- }
- //杞﹂棿缂栫爜鑾峰彇浜х嚎淇℃伅
- sql = @"select code ,name from TEqpInfo " + search;
+ //鑾峰彇杞﹂棿淇℃伅
+ sql = @"select org_code ,org_name from TOrganization where is_delete='0' and description='W'";
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -53,119 +47,85 @@
#endregion
#region[澶у矝杞﹂棿缁煎悎鐪嬫澘,宸︿笂浜х嚎鍔犲伐浠诲姟鎺ュ彛]
- public static ToMessage LineSearchTopLeftData(List<ObjectData> json)
+ public static ToMessage LineSearchTopLeftData(string shopcode)
{
string sql = "";
- string search = "";
List<ShopTopLeft> list = new List<ShopTopLeft>();
var dynamicParams = new DynamicParameters();
try
{
- if (json == null || json.Count>0) //浜х嚎缂栫爜涓嶄负绌�
+ if (shopcode != null || shopcode != "") //浜х嚎缂栫爜涓嶄负绌�
{
- //鑾峰彇浜х嚎淇℃伅
- for (int i = 0; i < json.Count; i++)
- {
- ShopTopLeft line = new ShopTopLeft();
- line.linecode = json[i].code;
- line.linename = json[i].name;
- //鑾峰彇浜х嚎涓嬪紑宸ユ�诲崟閲�
- sql = @"select COUNT(*) cont from(
- select distinct B.rout_code,M.wo_code from TK_Wrk_Man M
- left join TFlw_Rtdt B on M.route_code=B.rout_code
- left join TFlw_Rteqp R on B.step_code=R.step_code
- where M.status<>'CLOSED' and M.is_delete<>'1'
- and R.eqp_code=@linecode) as A";
- dynamicParams.Add("@linecode", json[i].code);
- var data = DapperHelper.selectdata(sql, dynamicParams);
- if (data.Rows.Count > 0 && decimal.Parse(data.Rows[0]["CONT"].ToString())>0)
- {
- line.lineworkcont=data.Rows[0]["CONT"].ToString(); //浜х嚎鎬诲崟閲�
- line.children = new List<TreeOne>();
- //鏌ヨ浜х嚎涓嬪凡寮�宸ョ殑鍔犲伐鍗曚俊鎭�
- sql = @"select distinct E.saleOrderCode,A.wo_code,P.plan_qty,M.partcode,M.partname,M.partspec,T.name as uomname from TK_Wrk_Record A
+ //鏌ヨ浜х嚎涓嬪凡寮�宸ョ殑鍔犲伐鍗曚俊鎭�
+ sql = @"select distinct E.saleOrderCode,A.wo_code,P.plan_qty,M.partcode,M.partname,M.partspec,T.name as uomname from TK_Wrk_Record A
inner join TK_Wrk_Man P on A.wo_code=P.wo_code
left join TMateriel_Info M on P.materiel_code=M.partcode
left join TUom T on M.uom_code=T.code
left join TKimp_Ewo E on P.m_po=E.wo and P.sourceid=E.id
- where P.status<>'CLOSED' and P.status<>'NEW' and A.eqp_code=@linecode and A.style='S' and A.step_seq='1'";
- dynamicParams.Add("@linecode", json[i].code);
- var data0 = DapperHelper.selectdata(sql, dynamicParams);
- if (data0.Rows.Count > 0)
- {
- for (int j = 0; j < data0.Rows.Count; j++)
- {
- string saleOrderCode = data0.Rows[j]["SALEORDERCODE"].ToString();//閿�鍞鍗曞彿
- string wo_code = data0.Rows[j]["WO_CODE"].ToString();//宸ュ崟鍙�
- string plan_qty = data0.Rows[j]["PLAN_QTY"].ToString();//浠诲姟鏁伴噺
- string partcode = data0.Rows[j]["PARTCODE"].ToString();//浜у搧缂栫爜
- string partname = data0.Rows[j]["PARTNAME"].ToString();//浜у搧鍚嶇О
- string partspec = data0.Rows[j]["PARTSPEC"].ToString();//浜у搧瑙勬牸
- string uomname = data0.Rows[j]["UOMNAME"].ToString();//鍗曚綅鍚嶇О
- TreeOne lineone = new TreeOne();
- lineone.saleordercode = saleOrderCode;
- lineone.workcode = wo_code;
- lineone.qty = plan_qty;
- lineone.partnumber = partcode;
- lineone.partname = partname;
- lineone.partspec = partspec;
- lineone.uom = uomname;
- line.children.Add(lineone);
- lineone.children = new List<TreeTwo>();
+ where P.status<>'CLOSED' and P.status<>'NEW' and P.wkshp_code in(@shopcode) and A.style='S' and A.step_seq='1'";
+ dynamicParams.Add("@shopcode", shopcode);
+ var data0 = DapperHelper.selectdata(sql, dynamicParams);
+ if (data0.Rows.Count > 0)
+ {
+ for (int j = 0; j < data0.Rows.Count; j++)
+ {
+ string saleOrderCode = data0.Rows[j]["SALEORDERCODE"].ToString();//閿�鍞鍗曞彿
+ string wo_code = data0.Rows[j]["WO_CODE"].ToString();//宸ュ崟鍙�
+ string plan_qty = data0.Rows[j]["PLAN_QTY"].ToString();//浠诲姟鏁伴噺
+ string partcode = data0.Rows[j]["PARTCODE"].ToString();//浜у搧缂栫爜
+ string partname = data0.Rows[j]["PARTNAME"].ToString();//浜у搧鍚嶇О
+ string partspec = data0.Rows[j]["PARTSPEC"].ToString();//浜у搧瑙勬牸
+ string uomname = data0.Rows[j]["UOMNAME"].ToString();//鍗曚綅鍚嶇О
+ ShopTopLeft lineone = new ShopTopLeft();
+ lineone.saleordercode = saleOrderCode;
+ lineone.workcode = wo_code;
+ lineone.qty = plan_qty;
+ lineone.partnumber = partcode;
+ lineone.partname = partname;
+ lineone.partspec = partspec;
+ lineone.uom = uomname;
+ lineone.children = new List<TreeTwo>();
- //鏌ユ柊宸ュ崟涓嬪伐搴忎俊鎭�
- sql = @"select A.seq,T.stepcode,T.stepname,A.plan_qty,A.good_qty,A.ng_qty,A.status
+ //鏌ユ柊宸ュ崟涓嬪伐搴忎俊鎭�
+ sql = @"select A.seq,T.stepcode,T.stepname,A.plan_qty,A.good_qty,A.ng_qty,A.status
from TK_Wrk_Step A
left join TStep T on A.step_code=T.stepcode
where A.wo_code=@wo_code";
- dynamicParams.Add("@wo_code", wo_code);
- var data1 = DapperHelper.selectdata(sql, dynamicParams);
- for (int k = 0; k < data1.Rows.Count; k++)
- {
- string stepseq= data1.Rows[k]["SEQ"].ToString();//宸ュ簭搴忓彿
- string stepcode = data1.Rows[k]["STEPCODE"].ToString();//宸ュ簭缂栫爜
- string stepname = data1.Rows[k]["STEPNAME"].ToString();//宸ュ簭鍚嶇О
- string planqty = data1.Rows[k]["PLAN_QTY"].ToString();//浠诲姟鏁伴噺
- string good_qty = data1.Rows[k]["GOOD_QTY"].ToString();//鎶ュ伐鏁伴噺
- string ng_qty = data1.Rows[k]["NG_QTY"].ToString();//涓嶈壇鏁伴噺
- string status = data1.Rows[k]["STATUS"].ToString();//鐘舵��
- TreeTwo linetwo = new TreeTwo();
- linetwo.stepseq = stepseq;
- linetwo.stepcode = stepcode;
- linetwo.stepname = stepname;
- linetwo.planqty = planqty;
- linetwo.goodqty = good_qty;
- linetwo.ngqty = ng_qty;
- linetwo.status = status;
- lineone.children.Add(linetwo);
- }
- }
- list.Add(line);
- }
- else
+ dynamicParams.Add("@wo_code", wo_code);
+ var data1 = DapperHelper.selectdata(sql, dynamicParams);
+ for (int k = 0; k < data1.Rows.Count; k++)
{
- mes.code = "300";
- mes.Message = "褰撳墠浜х嚎涓嬫棤鍦ㄧ敓浜т换鍔�!";
- mes.data = null;
- list.Add(line);
- continue;
+ string stepseq = data1.Rows[k]["SEQ"].ToString();//宸ュ簭搴忓彿
+ string stepcode = data1.Rows[k]["STEPCODE"].ToString();//宸ュ簭缂栫爜
+ string stepname = data1.Rows[k]["STEPNAME"].ToString();//宸ュ簭鍚嶇О
+ string planqty = data1.Rows[k]["PLAN_QTY"].ToString();//浠诲姟鏁伴噺
+ string good_qty = data1.Rows[k]["GOOD_QTY"].ToString();//鎶ュ伐鏁伴噺
+ string ng_qty = data1.Rows[k]["NG_QTY"].ToString();//涓嶈壇鏁伴噺
+ string status = data1.Rows[k]["STATUS"].ToString();//鐘舵��
+ TreeTwo linetwo = new TreeTwo();
+ linetwo.stepseq = stepseq;
+ linetwo.stepcode = stepcode;
+ linetwo.stepname = stepname;
+ linetwo.planqty = planqty;
+ linetwo.goodqty = good_qty;
+ linetwo.ngqty = ng_qty;
+ linetwo.status = status;
+ lineone.children.Add(linetwo);
}
- }
- else
- {
- mes.code = "300";
- mes.Message = "褰撳墠浜х嚎涓嬫棤鍦ㄧ敓浜т换鍔�!";
- mes.data = null;
- list.Add(line);
- continue;
-
+ list.Add(lineone);
}
}
+ else
+ {
+ mes.code = "300";
+ mes.Message = "褰撳墠杞﹂棿涓嬫棤鍦ㄧ敓浜т换鍔�!";
+ mes.data = null;
+ }
}
- else
+ else
{
mes.code = "300";
- mes.Message = "浜х嚎鍙傛暟涓嶈兘涓虹┖!";
+ mes.Message = "杞﹂棿鍙傛暟涓嶈兘涓虹┖!";
mes.data = null;
}
}
@@ -184,9 +144,10 @@
#endregion\
#region[澶у矝杞﹂棿缁煎悎鐪嬫澘,宸︿笅鍒楄〃鎺ュ彛]
- public static ToMessage LineSearchBottomLeftData()
+ public static ToMessage LineSearchBottomLeftData(string shopcode)
{
string sql = "";
+ var dynamicParams = new DynamicParameters();
try
{
//鑾峰彇浠诲姟鍒楄〃淇℃伅
@@ -198,9 +159,10 @@
inner join TKimp_Ewo E on A.m_po=E.wo and A.sourceid=E.id
left join TMateriel_Info M on A.materiel_code=M.partcode
left join TUom U on M.uom_code=U.code
- where A.status<>'CLOSED' and A.is_delete<>'1' and B.isend='Y'
+ where A.status<>'CLOSED' and A.wkshp_code in(@shopcode) and A.is_delete<>'1' and B.isend='Y'
)as A ";
- var data = DapperHelper.selecttable(sql);
+ dynamicParams.Add("@shopcode", shopcode);
+ var data = DapperHelper.selectdata(sql,dynamicParams);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
mes.data = data;
@@ -217,7 +179,7 @@
#endregion
#region[澶у矝杞﹂棿缁煎悎鐪嬫澘,鍙充笂top鎺掕鎺ュ彛,褰撴棩]
- public static ToMessage LineSearchTopRightData()
+ public static ToMessage LineSearchTopRightData(string shopcode)
{
string sql = "";
var dynamicParams = new DynamicParameters();
@@ -230,7 +192,7 @@
inner join TMateriel_Info M on A.materiel_code=M.partcode
inner join TEqpInfo E on A.eqp_code=E.code
inner join TOrganization W on E.wksp_code=W.org_code and W.description='W'
- where A.style='B' and S.isend='Y' and datediff(day,GETDATE(),A.lm_date)=0
+ where A.style='B' and S.isend='Y' and W.org_code in(@shopcode) and datediff(day,GETDATE(),A.lm_date)=0
union all
select C.name as linename,'' as wkshname,M.partname,A.sqty as good_qty from TK_Wrk_OutRecord A
inner join TK_Wrk_Step S on A.wo_code=S.wo_code and A.step_code=S.step_code
@@ -238,7 +200,8 @@
inner join TCustomer C on A.wx_code=C.code and C.btype='WX'
where A.style='S' and S.isend='Y' and datediff(day,GETDATE(),A.lm_date)=0
) as A group by A.org_name,A.name,A.partname order by good_qty desc";
- var data = DapperHelper.selecttable(sql);
+ dynamicParams.Add("@shopcode", shopcode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
mes.data = data;
@@ -255,7 +218,7 @@
#endregion
#region[澶у矝杞﹂棿缁煎悎鐪嬫澘,鍙充笅top鎺掕鎺ュ彛,褰撳墠鏃堕棿寰�鍓嶄竴鍛╙
- public static ToMessage LineSearchBottomRightData()
+ public static ToMessage LineSearchBottomRightData(string shopcode)
{
string sql = "";
var dynamicParams = new DynamicParameters();
@@ -265,9 +228,11 @@
sql = @"select isnull(COUNT(B.name),0) cont,B.name
from CSR_WorkRecord_Defect A
inner join TDefect B on A.defect_code=B.code
- where DateDiff(dd,A.lm_date,getdate())<=7
+ inner join TK_Wrk_Man M on A.wo_code=M.wo_code
+ where DateDiff(dd,A.lm_date,getdate())<=7 and M.wkshp_code in(@shopcode)
group by B.name order by cont desc";
- var data = DapperHelper.selecttable(sql);
+ dynamicParams.Add("@shopcode", shopcode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
mes.data = data;
diff --git a/VueWebApi/DLL/DAL/ProductionManagementDAL.cs b/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
index 848865f..d0b5955 100644
--- a/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
+++ b/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
@@ -700,7 +700,7 @@
#endregion
#region[MES宸ュ崟鍏抽棴]
- public static ToMessage ClosedMesOrder(string wocode, string m_po)
+ public static ToMessage ClosedMesOrder(string username,string wocode, string m_po)
{
var sql = "";
List<object> list = new List<object>();
@@ -711,8 +711,8 @@
sql = @"update TK_Wrk_Step set status='CLOSED' where wo_code=@wocode";
list.Add(new { str = sql, parm = new { wocode = wocode } });
//鍥炲啓宸ュ崟琛ㄧ姸鎬佷负(鍏抽棴)
- sql = @"update TK_Wrk_Man set status='CLOSED' where wo_code=@wocode";
- list.Add(new { str = sql, parm = new { wocode = wocode } });
+ sql = @"update TK_Wrk_Man set status='CLOSED',closeuser=@username,closedate=@closedate where wo_code=@wocode";
+ list.Add(new { str = sql, parm = new { wocode = wocode, username = username, closedate=DateTime.Now.ToString() } });
bool aa = DapperHelper.DoTransaction(list);
if (aa)
{
@@ -2342,5 +2342,138 @@
}
#endregion
+
+ #region[MES宸ュ崟鎵归噺鍏抽棴鏌ヨ]
+ public static ToMessage MesOrderBitchClosedSearch(string mesorderstus, string mesordercode, string sourceorder, string ordertype, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ if (mesorderstus != "" && mesorderstus != null)
+ {
+ search += "and A.status=@mesorderstus ";
+ dynamicParams.Add("@mesorderstus", mesorderstus);
+ }
+ if (mesordercode != "" && mesordercode != null)
+ {
+ search += "and A.wo_code like '%'+@mesordercode+'%' ";
+ dynamicParams.Add("@mesordercode", mesordercode);
+ }
+ if (sourceorder != "" && sourceorder != null)
+ {
+ search += "and A.m_po like '%'+@sourceorder+'%' ";
+ dynamicParams.Add("@sourceorder", sourceorder);
+ }
+ if (ordertype != "" && ordertype != null)
+ {
+ search += "and A.wotype like '%'+@ordertype+'%' ";
+ dynamicParams.Add("@ordertype", ordertype);
+ }
+ if (partcode != "" && partcode != null)
+ {
+ search += "and A.materiel_code like '%'+@partcode+'%' ";
+ dynamicParams.Add("@partcode", partcode);
+ }
+ if (partname != "" && partname != null)
+ {
+ search += "and B.partname like '%'+@partname+'%' ";
+ dynamicParams.Add("@partname", partname);
+ }
+ if (partspec != "" && partspec != null)
+ {
+ search += "and B.partspec like '%'+@partspec+'%' ";
+ dynamicParams.Add("@partspec", partspec);
+ }
+ if (createdate != "" && createdate != null)
+ {
+ search += "and CONVERT(varchar(100),A.lm_date,23)=@createdate ";
+ dynamicParams.Add("@createdate", createdate);
+ }
+ if (creatuser != "" && creatuser != null)
+ {
+ search += "and U.username like '%'+@creatuser+'%' ";
+ dynamicParams.Add("@creatuser", creatuser);
+ }
+
+ if (search == "")
+ {
+ search = "and 1=1 ";
+ }
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select A.id, A.status,A.wotype,A.wo_code,A.materiel_code as partcode,B.partname,B.partspec,A.plan_qty,A.wkshp_code,C.org_name as wkshp_name,
+ A.route_code,E.name as route_name,A.stck_code,F.name as stck_name,A.plan_startdate,A.plan_enddate,A.piroque,A.sourceid,A.m_po,U.username as lm_user,A.lm_date
+ ,(select sum(S.good_qty) from TK_Wrk_Step S where S.wo_code=A.wo_code and S.isend='Y') as good_qty
+ ,(select sum(S.ng_qty) from TK_Wrk_Step S where S.wo_code=A.wo_code and S.isend='Y') as ng_qty
+ ,(select sum(S.bad_qty) from TK_Wrk_Step S where S.wo_code=A.wo_code and S.isend='Y') as bad_qty
+ from TK_Wrk_Man A
+ left join TMateriel_Info B on A.materiel_code=B.partcode
+ left join TOrganization C on A.wkshp_code=C.org_code
+ left join T_Sec_Stck D on A.stck_code=D.code
+ left join TFlw_Rout E on A.route_code=E.code
+ left join T_Sec_Stck F on A.stck_code=F.code
+ left join TUser U on A.lm_user=U.usercode
+ where A.is_delete<>'1' " + search;
+ var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.count = total;
+ mes.data = data.ToList();
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[MES宸ュ崟鎵归噺鍏抽棴鎻愪氦]
+ public static ToMessage MesOrderBitchClosedSeave(string username, DataTable dt)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ for (int i = 0; i < dt.Rows.Count; i++)
+ {
+ //鍏抽棴宸ュ崟瀵瑰簲宸ュ簭浠诲姟
+ sql = @"update TK_Wrk_Step set status='CLOSED' where wo_code=@wocode";
+ list.Add(new { str = sql, parm = new { wocode = dt.Rows[i]["WO_CODE"].ToString() } });
+ //鍥炲啓宸ュ崟琛ㄧ姸鎬佷负(鍏抽棴)
+ sql = @"update TK_Wrk_Man set status='CLOSED',closeuser=@username,closedate=@closedate where wo_code=@wocode";
+ list.Add(new { str = sql, parm = new { wocode = dt.Rows[i]["WO_CODE"].ToString(), username = username, closedate = DateTime.Now.ToString() } });
+ }
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "宸ュ崟鍏抽棴鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "宸ュ崟鍏抽棴澶辫触!";
+ mes.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/VueWebApi/Hubs/ChatHub.cs b/VueWebApi/Hubs/ChatHub.cs
index f5d787b..e7f51fb 100644
--- a/VueWebApi/Hubs/ChatHub.cs
+++ b/VueWebApi/Hubs/ChatHub.cs
@@ -15,14 +15,10 @@
/// </summary>
private IList<string> userList = UserInfo.userList;
-
-
/// <summary>
/// 鐢ㄦ埛鐨刢onnectionID涓庣敤鎴峰悕瀵圭収琛�
/// </summary>
private readonly static Dictionary<string, string> _connections = new Dictionary<string, string>();
-
-
/// <summary>
/// 鍙戦�佸嚱鏁帮紝鍓嶇瑙﹀彂璇ュ嚱鏁扮粰鏈嶅姟鍣紝鏈嶅姟鍣ㄥ湪灏嗘秷鎭彂閫佺粰鍓嶇锛岋紙Clients.All.(鍑芥暟鍚�)鏄叏浣撳箍鎾紝鍙﹀Clients鎻愪緵浜嗙粍鎾紝骞挎挱鎺掗櫎锛岀粍鎾帓闄わ紝鎸囧畾鐢ㄦ埛鎾彂绛夌瓑锛�
diff --git a/VueWebApi/Logs/2022-09-05.TXT b/VueWebApi/Logs/2022-09-05.TXT
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/VueWebApi/Logs/2022-09-05.TXT
diff --git a/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user b/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
index 9b04557..dca6eba 100644
--- a/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\XKDMesApi</_PublishTargetUrl>
- <History>True|2022-09-02T06:01:56.1233378Z;True|2022-08-31T23:40:49.5468281+08:00;True|2022-08-31T22:15:50.0388123+08:00;True|2022-08-31T19:20:24.7693742+08:00;True|2022-08-31T19:00:06.8271626+08:00;True|2022-08-31T18:45:08.6483670+08:00;True|2022-08-31T16:59:34.8244511+08:00;True|2022-08-31T15:39:51.0653019+08:00;True|2022-08-31T15:25:32.5277796+08:00;True|2022-08-31T13:31:48.5734692+08:00;True|2022-08-31T12:59:02.1022191+08:00;True|2022-08-31T10:06:03.2043884+08:00;True|2022-08-30T17:36:34.5932064+08:00;True|2022-08-30T17:18:12.4582841+08:00;True|2022-08-30T12:55:16.4084322+08:00;True|2022-08-30T10:12:08.0975252+08:00;True|2022-08-30T09:12:46.2845546+08:00;True|2022-08-30T08:58:47.8389468+08:00;True|2022-08-29T17:21:17.7779579+08:00;True|2022-08-29T17:17:49.5334583+08:00;True|2022-08-29T16:53:46.6019453+08:00;True|2022-08-29T16:46:50.8158231+08:00;True|2022-08-29T12:25:19.0140888+08:00;True|2022-08-26T17:02:52.4614637+08:00;True|2022-08-26T16:52:47.8585471+08:00;True|2022-08-26T16:47:02.5766798+08:00;True|2022-08-26T16:36:15.5793109+08:00;True|2022-08-26T16:15:55.1795297+08:00;True|2022-08-26T16:00:22.2697361+08:00;False|2022-08-26T15:58:16.7347649+08:00;True|2022-08-26T15:22:29.6367466+08:00;True|2022-08-25T20:02:24.4685508+08:00;True|2022-08-25T19:50:42.8601696+08:00;True|2022-08-25T15:56:20.3615518+08:00;True|2022-08-25T15:48:16.9923580+08:00;True|2022-08-25T15:27:07.9474640+08:00;True|2022-08-25T13:11:36.9626131+08:00;True|2022-08-24T14:10:58.2790665+08:00;True|2022-08-24T11:43:10.4463552+08:00;True|2022-08-24T08:02:17.9871411+08:00;True|2022-08-23T22:50:41.0238571+08:00;True|2022-08-23T22:16:20.9249814+08:00;True|2022-08-23T21:59:21.1909300+08:00;True|2022-08-23T21:50:40.8106496+08:00;True|2022-08-23T21:06:55.6611505+08:00;True|2022-08-23T19:49:07.0507418+08:00;True|2022-08-23T19:03:15.9808046+08:00;True|2022-08-23T18:58:57.1700899+08:00;True|2022-08-23T18:54:26.8058591+08:00;True|2022-08-23T18:45:39.1928602+08:00;True|2022-08-23T17:32:10.6125039+08:00;True|2022-08-23T15:58:34.9205174+08:00;True|2022-08-23T15:49:21.3383764+08:00;True|2022-08-23T15:14:21.0775398+08:00;True|2022-08-23T15:04:07.8829410+08:00;True|2022-08-23T14:59:17.5143895+08:00;True|2022-08-23T14:55:17.0069050+08:00;True|2022-08-23T14:41:41.0884731+08:00;True|2022-08-23T14:41:06.5045325+08:00;True|2022-08-23T14:28:54.7390570+08:00;True|2022-08-23T13:56:59.3670549+08:00;True|2022-08-23T13:56:38.8588174+08:00;True|2022-08-22T20:48:56.2180227+08:00;True|2022-08-22T19:07:12.1093584+08:00;True|2022-08-22T19:04:07.7837887+08:00;True|2022-08-22T14:38:00.9342884+08:00;True|2022-08-22T10:59:23.2073567+08:00;True|2022-08-22T10:53:58.0920733+08:00;True|2022-08-22T10:53:10.2446944+08:00;True|2022-08-22T10:43:35.3791396+08:00;True|2022-08-18T09:45:46.4643950+08:00;True|2022-08-18T09:40:55.2601145+08:00;True|2022-08-16T16:17:14.3399134+08:00;True|2022-08-15T17:58:16.1460123+08:00;True|2022-08-15T17:55:55.7137518+08:00;True|2022-08-15T17:44:37.6024482+08:00;True|2022-08-15T17:44:21.9583041+08:00;True|2022-08-15T17:43:23.1305690+08:00;True|2022-08-15T17:29:31.1670490+08:00;True|2022-08-15T17:26:42.9269470+08:00;True|2022-08-15T17:23:27.0940168+08:00;True|2022-08-15T17:07:32.9192045+08:00;True|2022-08-15T16:47:03.8611076+08:00;True|2022-08-15T16:41:50.6843705+08:00;True|2022-08-15T16:38:26.7407413+08:00;True|2022-08-15T16:31:49.0805578+08:00;True|2022-08-15T16:27:33.6712012+08:00;True|2022-08-15T16:24:35.1042794+08:00;True|2022-08-15T16:21:57.2757683+08:00;True|2022-08-15T16:18:17.3545368+08:00;True|2022-08-15T16:15:04.2645412+08:00;True|2022-08-15T14:44:09.3078026+08:00;True|2022-08-15T11:20:09.2930712+08:00;True|2022-08-15T10:42:12.2991587+08:00;True|2022-08-15T10:41:38.3711025+08:00;True|2022-08-15T10:19:06.9974383+08:00;True|2022-08-12T17:15:09.2133281+08:00;True|2022-08-12T10:48:05.8776009+08:00;True|2022-08-12T10:26:16.4183447+08:00;True|2022-08-12T08:33:01.9502005+08:00;True|2022-08-11T09:06:08.8394009+08:00;True|2022-08-11T08:39:06.2534634+08:00;True|2022-08-11T08:05:13.6919725+08:00;True|2022-08-08T14:48:16.3637965+08:00;True|2022-08-05T15:44:02.3797448+08:00;True|2022-08-05T09:57:55.7744103+08:00;True|2022-08-04T15:24:38.8785046+08:00;True|2022-08-04T15:11:16.7054147+08:00;True|2022-08-04T14:53:52.7239932+08:00;True|2022-08-04T14:48:35.6115863+08:00;True|2022-08-04T14:39:16.1113507+08:00;True|2022-08-04T12:26:39.4998322+08:00;True|2022-08-04T10:34:23.9626503+08:00;True|2022-08-04T08:12:51.4305728+08:00;True|2022-08-03T15:43:09.2317512+08:00;True|2022-08-02T19:17:55.0460145+08:00;True|2022-08-02T19:08:13.5872184+08:00;True|2022-08-02T18:50:12.1280167+08:00;True|2022-08-02T18:05:53.6540810+08:00;True|2022-08-02T16:13:26.3567210+08:00;True|2022-08-02T15:27:59.9264333+08:00;True|2022-07-25T15:35:49.6958399+08:00;True|2022-07-25T15:30:40.4444876+08:00;True|2022-07-25T13:33:38.4068153+08:00;True|2022-07-22T15:00:56.7326322+08:00;True|2022-07-22T14:51:18.0169121+08:00;True|2022-07-22T14:26:08.4246205+08:00;True|2022-07-22T14:23:05.0897016+08:00;True|2022-07-22T14:18:18.7806854+08:00;True|2022-07-22T14:09:29.7924367+08:00;True|2022-07-22T14:02:26.6403133+08:00;True|2022-07-22T13:56:40.0887615+08:00;True|2022-07-22T13:50:10.7852190+08:00;True|2022-07-22T11:38:25.6671780+08:00;True|2022-07-22T10:55:36.7947659+08:00;True|2022-07-21T17:53:41.1464086+08:00;True|2022-07-21T17:43:33.5311479+08:00;True|2022-07-21T16:09:07.7687640+08:00;True|2022-07-21T16:04:47.9317019+08:00;True|2022-07-21T15:58:21.2359033+08:00;True|2022-07-21T15:56:07.7425829+08:00;True|2022-07-21T15:51:34.7108381+08:00;True|2022-07-21T15:48:57.5735708+08:00;True|2022-07-21T15:44:25.8205030+08:00;True|2022-07-21T15:25:51.4222269+08:00;True|2022-07-21T15:22:36.8818295+08:00;True|2022-07-21T15:19:28.8532774+08:00;True|2022-07-21T14:57:45.7532568+08:00;True|2022-07-21T11:16:12.0900762+08:00;True|2022-07-21T10:10:40.4714948+08:00;True|2022-07-21T10:00:19.5258058+08:00;True|2022-07-14T14:34:28.5093226+08:00;True|2022-07-14T13:59:59.7754985+08:00;True|2022-07-14T12:46:29.6685284+08:00;True|2022-07-14T09:22:25.9079652+08:00;True|2022-07-14T09:22:04.6797478+08:00;True|2022-07-14T09:10:45.0177607+08:00;True|2022-07-14T08:41:43.3026713+08:00;True|2022-07-14T08:27:32.7454972+08:00;True|2022-07-14T08:21:58.6572366+08:00;True|2022-07-14T08:17:59.2904747+08:00;True|2022-07-14T08:12:39.8483472+08:00;True|2022-06-30T15:04:41.6941982+08:00;True|2022-06-24T16:39:01.1080301+08:00;True|2022-06-17T13:23:15.1455451+08:00;True|2022-06-17T13:22:18.5517557+08:00;True|2022-06-17T13:19:27.7323818+08:00;True|2022-06-17T13:12:24.1252779+08:00;True|2022-06-17T13:09:20.4234258+08:00;True|2022-06-17T13:06:49.9869509+08:00;True|2022-06-17T12:58:54.6964621+08:00;False|2022-06-17T12:58:10.6767711+08:00;False|2022-06-17T12:57:08.9747950+08:00;False|2022-06-17T12:56:18.4650121+08:00;False|2022-06-17T12:55:57.9981927+08:00;True|2022-06-13T14:21:36.5610928+08:00;True|2022-06-13T11:41:39.4210151+08:00;True|2022-06-11T02:35:03.4727934+08:00;True|2022-06-11T02:31:13.7362660+08:00;True|2022-06-11T02:30:58.3616790+08:00;True|2022-06-11T01:57:04.4951468+08:00;True|2022-06-10T13:27:13.2097124+08:00;</History>
+ <History>True|2022-09-05T05:34:47.0627238Z;True|2022-09-05T11:07:59.2835592+08:00;True|2022-09-02T14:01:56.1233378+08:00;True|2022-08-31T23:40:49.5468281+08:00;True|2022-08-31T22:15:50.0388123+08:00;True|2022-08-31T19:20:24.7693742+08:00;True|2022-08-31T19:00:06.8271626+08:00;True|2022-08-31T18:45:08.6483670+08:00;True|2022-08-31T16:59:34.8244511+08:00;True|2022-08-31T15:39:51.0653019+08:00;True|2022-08-31T15:25:32.5277796+08:00;True|2022-08-31T13:31:48.5734692+08:00;True|2022-08-31T12:59:02.1022191+08:00;True|2022-08-31T10:06:03.2043884+08:00;True|2022-08-30T17:36:34.5932064+08:00;True|2022-08-30T17:18:12.4582841+08:00;True|2022-08-30T12:55:16.4084322+08:00;True|2022-08-30T10:12:08.0975252+08:00;True|2022-08-30T09:12:46.2845546+08:00;True|2022-08-30T08:58:47.8389468+08:00;True|2022-08-29T17:21:17.7779579+08:00;True|2022-08-29T17:17:49.5334583+08:00;True|2022-08-29T16:53:46.6019453+08:00;True|2022-08-29T16:46:50.8158231+08:00;True|2022-08-29T12:25:19.0140888+08:00;True|2022-08-26T17:02:52.4614637+08:00;True|2022-08-26T16:52:47.8585471+08:00;True|2022-08-26T16:47:02.5766798+08:00;True|2022-08-26T16:36:15.5793109+08:00;True|2022-08-26T16:15:55.1795297+08:00;True|2022-08-26T16:00:22.2697361+08:00;False|2022-08-26T15:58:16.7347649+08:00;True|2022-08-26T15:22:29.6367466+08:00;True|2022-08-25T20:02:24.4685508+08:00;True|2022-08-25T19:50:42.8601696+08:00;True|2022-08-25T15:56:20.3615518+08:00;True|2022-08-25T15:48:16.9923580+08:00;True|2022-08-25T15:27:07.9474640+08:00;True|2022-08-25T13:11:36.9626131+08:00;True|2022-08-24T14:10:58.2790665+08:00;True|2022-08-24T11:43:10.4463552+08:00;True|2022-08-24T08:02:17.9871411+08:00;True|2022-08-23T22:50:41.0238571+08:00;True|2022-08-23T22:16:20.9249814+08:00;True|2022-08-23T21:59:21.1909300+08:00;True|2022-08-23T21:50:40.8106496+08:00;True|2022-08-23T21:06:55.6611505+08:00;True|2022-08-23T19:49:07.0507418+08:00;True|2022-08-23T19:03:15.9808046+08:00;True|2022-08-23T18:58:57.1700899+08:00;True|2022-08-23T18:54:26.8058591+08:00;True|2022-08-23T18:45:39.1928602+08:00;True|2022-08-23T17:32:10.6125039+08:00;True|2022-08-23T15:58:34.9205174+08:00;True|2022-08-23T15:49:21.3383764+08:00;True|2022-08-23T15:14:21.0775398+08:00;True|2022-08-23T15:04:07.8829410+08:00;True|2022-08-23T14:59:17.5143895+08:00;True|2022-08-23T14:55:17.0069050+08:00;True|2022-08-23T14:41:41.0884731+08:00;True|2022-08-23T14:41:06.5045325+08:00;True|2022-08-23T14:28:54.7390570+08:00;True|2022-08-23T13:56:59.3670549+08:00;True|2022-08-23T13:56:38.8588174+08:00;True|2022-08-22T20:48:56.2180227+08:00;True|2022-08-22T19:07:12.1093584+08:00;True|2022-08-22T19:04:07.7837887+08:00;True|2022-08-22T14:38:00.9342884+08:00;True|2022-08-22T10:59:23.2073567+08:00;True|2022-08-22T10:53:58.0920733+08:00;True|2022-08-22T10:53:10.2446944+08:00;True|2022-08-22T10:43:35.3791396+08:00;True|2022-08-18T09:45:46.4643950+08:00;True|2022-08-18T09:40:55.2601145+08:00;True|2022-08-16T16:17:14.3399134+08:00;True|2022-08-15T17:58:16.1460123+08:00;True|2022-08-15T17:55:55.7137518+08:00;True|2022-08-15T17:44:37.6024482+08:00;True|2022-08-15T17:44:21.9583041+08:00;True|2022-08-15T17:43:23.1305690+08:00;True|2022-08-15T17:29:31.1670490+08:00;True|2022-08-15T17:26:42.9269470+08:00;True|2022-08-15T17:23:27.0940168+08:00;True|2022-08-15T17:07:32.9192045+08:00;True|2022-08-15T16:47:03.8611076+08:00;True|2022-08-15T16:41:50.6843705+08:00;True|2022-08-15T16:38:26.7407413+08:00;True|2022-08-15T16:31:49.0805578+08:00;True|2022-08-15T16:27:33.6712012+08:00;True|2022-08-15T16:24:35.1042794+08:00;True|2022-08-15T16:21:57.2757683+08:00;True|2022-08-15T16:18:17.3545368+08:00;True|2022-08-15T16:15:04.2645412+08:00;True|2022-08-15T14:44:09.3078026+08:00;True|2022-08-15T11:20:09.2930712+08:00;True|2022-08-15T10:42:12.2991587+08:00;True|2022-08-15T10:41:38.3711025+08:00;True|2022-08-15T10:19:06.9974383+08:00;True|2022-08-12T17:15:09.2133281+08:00;True|2022-08-12T10:48:05.8776009+08:00;True|2022-08-12T10:26:16.4183447+08:00;True|2022-08-12T08:33:01.9502005+08:00;True|2022-08-11T09:06:08.8394009+08:00;True|2022-08-11T08:39:06.2534634+08:00;True|2022-08-11T08:05:13.6919725+08:00;True|2022-08-08T14:48:16.3637965+08:00;True|2022-08-05T15:44:02.3797448+08:00;True|2022-08-05T09:57:55.7744103+08:00;True|2022-08-04T15:24:38.8785046+08:00;True|2022-08-04T15:11:16.7054147+08:00;True|2022-08-04T14:53:52.7239932+08:00;True|2022-08-04T14:48:35.6115863+08:00;True|2022-08-04T14:39:16.1113507+08:00;True|2022-08-04T12:26:39.4998322+08:00;True|2022-08-04T10:34:23.9626503+08:00;True|2022-08-04T08:12:51.4305728+08:00;True|2022-08-03T15:43:09.2317512+08:00;True|2022-08-02T19:17:55.0460145+08:00;True|2022-08-02T19:08:13.5872184+08:00;True|2022-08-02T18:50:12.1280167+08:00;True|2022-08-02T18:05:53.6540810+08:00;True|2022-08-02T16:13:26.3567210+08:00;True|2022-08-02T15:27:59.9264333+08:00;True|2022-07-25T15:35:49.6958399+08:00;True|2022-07-25T15:30:40.4444876+08:00;True|2022-07-25T13:33:38.4068153+08:00;True|2022-07-22T15:00:56.7326322+08:00;True|2022-07-22T14:51:18.0169121+08:00;True|2022-07-22T14:26:08.4246205+08:00;True|2022-07-22T14:23:05.0897016+08:00;True|2022-07-22T14:18:18.7806854+08:00;True|2022-07-22T14:09:29.7924367+08:00;True|2022-07-22T14:02:26.6403133+08:00;True|2022-07-22T13:56:40.0887615+08:00;True|2022-07-22T13:50:10.7852190+08:00;True|2022-07-22T11:38:25.6671780+08:00;True|2022-07-22T10:55:36.7947659+08:00;True|2022-07-21T17:53:41.1464086+08:00;True|2022-07-21T17:43:33.5311479+08:00;True|2022-07-21T16:09:07.7687640+08:00;True|2022-07-21T16:04:47.9317019+08:00;True|2022-07-21T15:58:21.2359033+08:00;True|2022-07-21T15:56:07.7425829+08:00;True|2022-07-21T15:51:34.7108381+08:00;True|2022-07-21T15:48:57.5735708+08:00;True|2022-07-21T15:44:25.8205030+08:00;True|2022-07-21T15:25:51.4222269+08:00;True|2022-07-21T15:22:36.8818295+08:00;True|2022-07-21T15:19:28.8532774+08:00;True|2022-07-21T14:57:45.7532568+08:00;True|2022-07-21T11:16:12.0900762+08:00;True|2022-07-21T10:10:40.4714948+08:00;True|2022-07-21T10:00:19.5258058+08:00;True|2022-07-14T14:34:28.5093226+08:00;True|2022-07-14T13:59:59.7754985+08:00;True|2022-07-14T12:46:29.6685284+08:00;True|2022-07-14T09:22:25.9079652+08:00;True|2022-07-14T09:22:04.6797478+08:00;True|2022-07-14T09:10:45.0177607+08:00;True|2022-07-14T08:41:43.3026713+08:00;True|2022-07-14T08:27:32.7454972+08:00;True|2022-07-14T08:21:58.6572366+08:00;True|2022-07-14T08:17:59.2904747+08:00;True|2022-07-14T08:12:39.8483472+08:00;True|2022-06-30T15:04:41.6941982+08:00;True|2022-06-24T16:39:01.1080301+08:00;True|2022-06-17T13:23:15.1455451+08:00;True|2022-06-17T13:22:18.5517557+08:00;True|2022-06-17T13:19:27.7323818+08:00;True|2022-06-17T13:12:24.1252779+08:00;True|2022-06-17T13:09:20.4234258+08:00;True|2022-06-17T13:06:49.9869509+08:00;True|2022-06-17T12:58:54.6964621+08:00;False|2022-06-17T12:58:10.6767711+08:00;False|2022-06-17T12:57:08.9747950+08:00;False|2022-06-17T12:56:18.4650121+08:00;False|2022-06-17T12:55:57.9981927+08:00;True|2022-06-13T14:21:36.5610928+08:00;True|2022-06-13T11:41:39.4210151+08:00;True|2022-06-11T02:35:03.4727934+08:00;True|2022-06-11T02:31:13.7362660+08:00;True|2022-06-11T02:30:58.3616790+08:00;True|2022-06-11T01:57:04.4951468+08:00;True|2022-06-10T13:27:13.2097124+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="Areas/HelpPage/HelpPage.css">
@@ -148,6 +148,9 @@
</File>
<File Include="bin/Microsoft.Net.Http.Headers.dll">
<publishTime>11/13/2018 01:28:58</publishTime>
+ </File>
+ <File Include="bin/Microsoft.Owin.Cors.dll">
+ <publishTime>02/14/2018 00:28:06</publishTime>
</File>
<File Include="bin/Microsoft.Owin.dll">
<publishTime>02/14/2018 00:28:04</publishTime>
@@ -714,16 +717,16 @@
<publishTime>12/24/2021 15:38:29</publishTime>
</File>
<File Include="bin/VueWebApi.dll">
- <publishTime>09/02/2022 14:01:50</publishTime>
+ <publishTime>09/05/2022 13:34:42</publishTime>
</File>
<File Include="bin/VueWebApi.dll.config">
<publishTime>06/15/2022 15:31:43</publishTime>
</File>
<File Include="bin/VueWebApi.pdb">
- <publishTime>09/02/2022 14:01:50</publishTime>
+ <publishTime>09/05/2022 13:34:42</publishTime>
</File>
<File Include="bin/VueWebApi.xml">
- <publishTime>09/02/2022 14:01:50</publishTime>
+ <publishTime>09/05/2022 13:34:42</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>02/08/2013 16:42:28</publishTime>
@@ -1272,7 +1275,7 @@
<publishTime>07/08/2022 15:15:11</publishTime>
</File>
<File Include="Hubs/HubsMessage.html">
- <publishTime>09/02/2022 13:17:50</publishTime>
+ <publishTime>09/05/2022 13:26:13</publishTime>
</File>
<File Include="Hubs/HubsMessage1.html">
<publishTime>09/02/2022 09:22:02</publishTime>
@@ -1509,7 +1512,7 @@
<publishTime>06/10/2022 08:20:24</publishTime>
</File>
<File Include="Web.config">
- <publishTime>09/02/2022 14:01:55</publishTime>
+ <publishTime>09/05/2022 13:34:46</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/VueWebApi/VueWebApi.csproj b/VueWebApi/VueWebApi.csproj
index 320bc7d..8aff6d7 100644
--- a/VueWebApi/VueWebApi.csproj
+++ b/VueWebApi/VueWebApi.csproj
@@ -99,6 +99,9 @@
<Reference Include="Microsoft.Owin, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Owin.4.0.0\lib\net451\Microsoft.Owin.dll</HintPath>
</Reference>
+ <Reference Include="Microsoft.Owin.Cors, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.Owin.Cors.4.0.0\lib\net451\Microsoft.Owin.Cors.dll</HintPath>
+ </Reference>
<Reference Include="Microsoft.Owin.Host.SystemWeb, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Owin.Host.SystemWeb.4.0.0\lib\net451\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
</Reference>
diff --git a/VueWebApi/Web.config b/VueWebApi/Web.config
index 4cd68b7..988652a 100644
--- a/VueWebApi/Web.config
+++ b/VueWebApi/Web.config
@@ -134,6 +134,10 @@
<assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
</dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Web.Cors" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+ </dependentAssembly>
</assemblyBinding>
</runtime>
<system.codedom>
diff --git a/VueWebApi/bin/Microsoft.Owin.Cors.xml b/VueWebApi/bin/Microsoft.Owin.Cors.xml
new file mode 100644
index 0000000..3a1239c
--- /dev/null
+++ b/VueWebApi/bin/Microsoft.Owin.Cors.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0"?>
+<doc>
+ <assembly>
+ <name>Microsoft.Owin.Cors</name>
+ </assembly>
+ <members>
+ <member name="T:Owin.CorsExtensions">
+ <summary>
+ Extension methods for adding CorsMiddleware to an application pipeline.
+ </summary>
+ </member>
+ <member name="M:Owin.CorsExtensions.UseCors(Owin.IAppBuilder,Microsoft.Owin.Cors.CorsOptions)">
+ <summary>
+ Adds a CORS middleware to your web application pipeline to allow cross domain requests.
+ </summary>
+ <param name="app">The IAppBuilder passed to your configuration method</param>
+ <param name="options">An options class that controls the middleware behavior</param>
+ <returns>The original app parameter</returns>
+ </member>
+ <member name="T:Microsoft.Owin.Cors.CorsMiddleware">
+ <summary>
+ Processes requests according to the provided cross domain policy.
+ </summary>
+ </member>
+ <member name="M:Microsoft.Owin.Cors.CorsMiddleware.#ctor(System.Func{System.Collections.Generic.IDictionary{System.String,System.Object},System.Threading.Tasks.Task},Microsoft.Owin.Cors.CorsOptions)">
+ <summary>
+ Creates a new instance of CorsMiddleware.
+ </summary>
+ <param name="next"></param>
+ <param name="options"></param>
+ </member>
+ <member name="M:Microsoft.Owin.Cors.CorsMiddleware.Invoke(System.Collections.Generic.IDictionary{System.String,System.Object})">
+ <summary>
+ Evaluates and applies the CORS policy. Responses will be generated for preflight requests.
+ Requests that are permitted by the CORS policy will be passed onto the next middleware.
+ </summary>
+ <param name="environment"></param>
+ <returns></returns>
+ </member>
+ <member name="T:Microsoft.Owin.Cors.CorsOptions">
+ <summary>
+ Contains the options used by the CorsMiddleware
+ </summary>
+ </member>
+ <member name="P:Microsoft.Owin.Cors.CorsOptions.AllowAll">
+ <summary>
+ A policy that allows all headers, all methods, any origin and supports credentials
+ </summary>
+ </member>
+ <member name="P:Microsoft.Owin.Cors.CorsOptions.PolicyProvider">
+ <summary>
+ The cors policy to apply
+ </summary>
+ </member>
+ <member name="P:Microsoft.Owin.Cors.CorsOptions.CorsEngine">
+ <summary>
+ The cors engine
+ </summary>
+ </member>
+ <member name="T:Microsoft.Owin.Cors.CorsPolicyProvider">
+ <summary>
+ A pluggable CORS policy provider that always returns null by default.
+ </summary>
+ </member>
+ <member name="T:Microsoft.Owin.Cors.ICorsPolicyProvider">
+ <summary>
+ Defines how to select a CORS policy for a given request.
+ </summary>
+ </member>
+ <member name="M:Microsoft.Owin.Cors.ICorsPolicyProvider.GetCorsPolicyAsync(Microsoft.Owin.IOwinRequest)">
+ <summary>
+ Selects a CORS policy to apply for the given request.
+ </summary>
+ <param name="request"></param>
+ <returns>The CORS policy to apply to the request, or null if no policy applies and
+ the request should be passed through to the next middleware.</returns>
+ </member>
+ <member name="M:Microsoft.Owin.Cors.CorsPolicyProvider.#ctor">
+ <summary>
+ Creates a new CorsPolicyProvider instance.
+ </summary>
+ </member>
+ <member name="M:Microsoft.Owin.Cors.CorsPolicyProvider.GetCorsPolicyAsync(Microsoft.Owin.IOwinRequest)">
+ <summary>
+ Executes the PolicyResolver unless overridden by a subclass.
+ </summary>
+ <param name="request"></param>
+ <returns></returns>
+ </member>
+ <member name="P:Microsoft.Owin.Cors.CorsPolicyProvider.PolicyResolver">
+ <summary>
+ A pluggable callback that will be used to select the CORS policy for the given requests.
+ </summary>
+ </member>
+ </members>
+</doc>
diff --git a/VueWebApi/bin/VueWebApi.dll.config b/VueWebApi/bin/VueWebApi.dll.config
index 4cd68b7..988652a 100644
--- a/VueWebApi/bin/VueWebApi.dll.config
+++ b/VueWebApi/bin/VueWebApi.dll.config
@@ -134,6 +134,10 @@
<assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
</dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Web.Cors" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+ </dependentAssembly>
</assemblyBinding>
</runtime>
<system.codedom>
diff --git a/VueWebApi/bin/VueWebApi.pdb b/VueWebApi/bin/VueWebApi.pdb
index 1011add..992020a 100644
--- a/VueWebApi/bin/VueWebApi.pdb
+++ b/VueWebApi/bin/VueWebApi.pdb
Binary files differ
diff --git a/VueWebApi/bin/VueWebApi.xml b/VueWebApi/bin/VueWebApi.xml
index d7ae1c0..a7a0fb4 100644
--- a/VueWebApi/bin/VueWebApi.xml
+++ b/VueWebApi/bin/VueWebApi.xml
@@ -1104,6 +1104,29 @@
<param name="json">鎻愪氦鏁版嵁</param>
<returns></returns>
</member>
+ <member name="M:VueWebApi.Controllers.DeviceManagerController.DeviceCheckTakeSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <summary>
+ 璁惧鐐规璁板綍鏌ヨ
+ </summary>
+ <param name="wkshopcode">杞﹂棿缂栫爜</param>
+ <param name="eqpcode">璁惧缂栧彿</param>
+ <param name="eqpname">璁惧鍚嶇О</param>
+ <param name="stanedname">鏍囧噯鍚嶇О</param>
+ <param name="checkuser">鐐规浜哄憳</param>
+ <param name="checkdate">鐐规鏃堕棿</param>
+ <param name="page">椤电爜</param>
+ <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ <param name="prop">鎺掑簭瀛楁</param>
+ <param name="order">鎺掑簭瑙勫垯</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.DeviceManagerController.DeviceCheckSubTakeSearch(System.String)">
+ <summary>
+ 璁惧淇濆吇璁板綍鏄庣粏鏌ヨ
+ </summary>
+ <param name="djwo">璁惧鐐规鍗曞彿</param>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Controllers.ErpSyncMesController.SeaveSearchUnit">
<summary>
鍒堕�犳ā鍨嬶細鍗曚綅鍚屾
diff --git a/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
index 9b036f2..84239d3 100644
--- a/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/Web.config b/VueWebApi/obj/Release/Package/PackageTmp/Web.config
index 87ec17e..7854403 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/Web.config
+++ b/VueWebApi/obj/Release/Package/PackageTmp/Web.config
@@ -133,6 +133,10 @@
<assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
</dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Web.Cors" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+ </dependentAssembly>
</assemblyBinding>
</runtime>
<system.codedom>
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
index 1011add..992020a 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
index d7ae1c0..a7a0fb4 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
+++ b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
@@ -1104,6 +1104,29 @@
<param name="json">鎻愪氦鏁版嵁</param>
<returns></returns>
</member>
+ <member name="M:VueWebApi.Controllers.DeviceManagerController.DeviceCheckTakeSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <summary>
+ 璁惧鐐规璁板綍鏌ヨ
+ </summary>
+ <param name="wkshopcode">杞﹂棿缂栫爜</param>
+ <param name="eqpcode">璁惧缂栧彿</param>
+ <param name="eqpname">璁惧鍚嶇О</param>
+ <param name="stanedname">鏍囧噯鍚嶇О</param>
+ <param name="checkuser">鐐规浜哄憳</param>
+ <param name="checkdate">鐐规鏃堕棿</param>
+ <param name="page">椤电爜</param>
+ <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ <param name="prop">鎺掑簭瀛楁</param>
+ <param name="order">鎺掑簭瑙勫垯</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.DeviceManagerController.DeviceCheckSubTakeSearch(System.String)">
+ <summary>
+ 璁惧淇濆吇璁板綍鏄庣粏鏌ヨ
+ </summary>
+ <param name="djwo">璁惧鐐规鍗曞彿</param>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Controllers.ErpSyncMesController.SeaveSearchUnit">
<summary>
鍒堕�犳ā鍨嬶細鍗曚綅鍚屾
diff --git a/VueWebApi/obj/Release/TransformWebConfig/original/Web.config b/VueWebApi/obj/Release/TransformWebConfig/original/Web.config
index 4cd68b7..988652a 100644
--- a/VueWebApi/obj/Release/TransformWebConfig/original/Web.config
+++ b/VueWebApi/obj/Release/TransformWebConfig/original/Web.config
@@ -134,6 +134,10 @@
<assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
</dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Web.Cors" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+ </dependentAssembly>
</assemblyBinding>
</runtime>
<system.codedom>
diff --git a/VueWebApi/obj/Release/TransformWebConfig/transformed/Web.config b/VueWebApi/obj/Release/TransformWebConfig/transformed/Web.config
index 87ec17e..7854403 100644
--- a/VueWebApi/obj/Release/TransformWebConfig/transformed/Web.config
+++ b/VueWebApi/obj/Release/TransformWebConfig/transformed/Web.config
@@ -133,6 +133,10 @@
<assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
</dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Web.Cors" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+ </dependentAssembly>
</assemblyBinding>
</runtime>
<system.codedom>
diff --git a/VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache b/VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache
index 3cfa469..d3174bb 100644
--- a/VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache
+++ b/VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-4c04b5c24a8e03c4e6abfe256010d8ea60a4acec
+0268dd956a59170e26c4362cabfd5184d6d53b51
diff --git a/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt b/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt
index cf359b7..e0c895e 100644
--- a/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt
+++ b/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt
@@ -165,6 +165,7 @@
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\Microsoft.Extensions.Primitives.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\Microsoft.Net.Http.Headers.dll
+D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\Microsoft.Owin.Cors.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\Microsoft.Owin.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\Microsoft.Owin.Host.SystemWeb.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\Microsoft.Owin.Security.dll
@@ -227,6 +228,7 @@
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\Microsoft.Extensions.Primitives.xml
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\Microsoft.Net.Http.Headers.xml
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\Microsoft.Owin.xml
+D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\Microsoft.Owin.Cors.xml
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\Microsoft.Owin.Host.SystemWeb.xml
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\Microsoft.Owin.Security.xml
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\Newtonsoft.Json.xml
diff --git a/VueWebApi/obj/Release/VueWebApi.pdb b/VueWebApi/obj/Release/VueWebApi.pdb
index 1011add..992020a 100644
--- a/VueWebApi/obj/Release/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/VueWebApi.pdb
Binary files differ
diff --git a/VueWebApi/packages.config b/VueWebApi/packages.config
index 7227d05..247c739 100644
--- a/VueWebApi/packages.config
+++ b/VueWebApi/packages.config
@@ -40,6 +40,7 @@
<package id="Microsoft.Extensions.Primitives" version="2.2.0" targetFramework="net461" />
<package id="Microsoft.Net.Http.Headers" version="2.2.0" targetFramework="net461" />
<package id="Microsoft.Owin" version="4.0.0" targetFramework="net461" />
+ <package id="Microsoft.Owin.Cors" version="4.0.0" targetFramework="net461" />
<package id="Microsoft.Owin.Host.SystemWeb" version="4.0.0" targetFramework="net461" />
<package id="Microsoft.Owin.Host.SystemWeb.zh-Hans" version="4.0.0" targetFramework="net461" />
<package id="Microsoft.Owin.Security" version="4.0.0" targetFramework="net461" />
diff --git a/packages/Microsoft.Owin.Cors.4.0.0/.signature.p7s b/packages/Microsoft.Owin.Cors.4.0.0/.signature.p7s
new file mode 100644
index 0000000..9717392
--- /dev/null
+++ b/packages/Microsoft.Owin.Cors.4.0.0/.signature.p7s
Binary files differ
diff --git a/packages/Microsoft.Owin.Cors.4.0.0/Microsoft.Owin.Cors.4.0.0.nupkg b/packages/Microsoft.Owin.Cors.4.0.0/Microsoft.Owin.Cors.4.0.0.nupkg
new file mode 100644
index 0000000..51fd483
--- /dev/null
+++ b/packages/Microsoft.Owin.Cors.4.0.0/Microsoft.Owin.Cors.4.0.0.nupkg
Binary files differ
diff --git a/packages/Microsoft.Owin.Cors.4.0.0/lib/net451/Microsoft.Owin.Cors.XML b/packages/Microsoft.Owin.Cors.4.0.0/lib/net451/Microsoft.Owin.Cors.XML
new file mode 100644
index 0000000..3a1239c
--- /dev/null
+++ b/packages/Microsoft.Owin.Cors.4.0.0/lib/net451/Microsoft.Owin.Cors.XML
@@ -0,0 +1,96 @@
+<?xml version="1.0"?>
+<doc>
+ <assembly>
+ <name>Microsoft.Owin.Cors</name>
+ </assembly>
+ <members>
+ <member name="T:Owin.CorsExtensions">
+ <summary>
+ Extension methods for adding CorsMiddleware to an application pipeline.
+ </summary>
+ </member>
+ <member name="M:Owin.CorsExtensions.UseCors(Owin.IAppBuilder,Microsoft.Owin.Cors.CorsOptions)">
+ <summary>
+ Adds a CORS middleware to your web application pipeline to allow cross domain requests.
+ </summary>
+ <param name="app">The IAppBuilder passed to your configuration method</param>
+ <param name="options">An options class that controls the middleware behavior</param>
+ <returns>The original app parameter</returns>
+ </member>
+ <member name="T:Microsoft.Owin.Cors.CorsMiddleware">
+ <summary>
+ Processes requests according to the provided cross domain policy.
+ </summary>
+ </member>
+ <member name="M:Microsoft.Owin.Cors.CorsMiddleware.#ctor(System.Func{System.Collections.Generic.IDictionary{System.String,System.Object},System.Threading.Tasks.Task},Microsoft.Owin.Cors.CorsOptions)">
+ <summary>
+ Creates a new instance of CorsMiddleware.
+ </summary>
+ <param name="next"></param>
+ <param name="options"></param>
+ </member>
+ <member name="M:Microsoft.Owin.Cors.CorsMiddleware.Invoke(System.Collections.Generic.IDictionary{System.String,System.Object})">
+ <summary>
+ Evaluates and applies the CORS policy. Responses will be generated for preflight requests.
+ Requests that are permitted by the CORS policy will be passed onto the next middleware.
+ </summary>
+ <param name="environment"></param>
+ <returns></returns>
+ </member>
+ <member name="T:Microsoft.Owin.Cors.CorsOptions">
+ <summary>
+ Contains the options used by the CorsMiddleware
+ </summary>
+ </member>
+ <member name="P:Microsoft.Owin.Cors.CorsOptions.AllowAll">
+ <summary>
+ A policy that allows all headers, all methods, any origin and supports credentials
+ </summary>
+ </member>
+ <member name="P:Microsoft.Owin.Cors.CorsOptions.PolicyProvider">
+ <summary>
+ The cors policy to apply
+ </summary>
+ </member>
+ <member name="P:Microsoft.Owin.Cors.CorsOptions.CorsEngine">
+ <summary>
+ The cors engine
+ </summary>
+ </member>
+ <member name="T:Microsoft.Owin.Cors.CorsPolicyProvider">
+ <summary>
+ A pluggable CORS policy provider that always returns null by default.
+ </summary>
+ </member>
+ <member name="T:Microsoft.Owin.Cors.ICorsPolicyProvider">
+ <summary>
+ Defines how to select a CORS policy for a given request.
+ </summary>
+ </member>
+ <member name="M:Microsoft.Owin.Cors.ICorsPolicyProvider.GetCorsPolicyAsync(Microsoft.Owin.IOwinRequest)">
+ <summary>
+ Selects a CORS policy to apply for the given request.
+ </summary>
+ <param name="request"></param>
+ <returns>The CORS policy to apply to the request, or null if no policy applies and
+ the request should be passed through to the next middleware.</returns>
+ </member>
+ <member name="M:Microsoft.Owin.Cors.CorsPolicyProvider.#ctor">
+ <summary>
+ Creates a new CorsPolicyProvider instance.
+ </summary>
+ </member>
+ <member name="M:Microsoft.Owin.Cors.CorsPolicyProvider.GetCorsPolicyAsync(Microsoft.Owin.IOwinRequest)">
+ <summary>
+ Executes the PolicyResolver unless overridden by a subclass.
+ </summary>
+ <param name="request"></param>
+ <returns></returns>
+ </member>
+ <member name="P:Microsoft.Owin.Cors.CorsPolicyProvider.PolicyResolver">
+ <summary>
+ A pluggable callback that will be used to select the CORS policy for the given requests.
+ </summary>
+ </member>
+ </members>
+</doc>
--
Gitblit v1.9.3