From 18ca81b6dd7ad6cc89b07c8865be2b9b4a30e258 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期一, 29 三月 2021 17:03:31 +0800
Subject: [PATCH] nothing
---
WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user | 332 ++++++++++++++++++++++++++++++
.gitignore | 2
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 1
WebAPI/WebAPI.csproj.user | 2
WebAPI/packages.config | 2
WebAPI/Controllers/LMESController.cs | 105 +++++++++
WebAPI/App_Start/WebApiConfig.cs | 1
WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs | 1
WebAPI/Controllers/BaseSet/Gy_SupplierController.cs | 3
WebAPI/Controllers/BaseSet/Gy_ProcessController.cs | 1
WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user | 6
WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs | 1
WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs | 2
WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs | 4
WebAPI/Controllers/BaseSet/Gy_CustomerController.cs | 4
WebAPI/Controllers/SellOutController.cs | 4
WebAPI/Controllers/MoveStockBillController.cs | 4
WebAPI/Properties/PublishProfiles/JFAPI.pubxml | 17 +
WebAPI/Web.config | 65 +++--
WebAPI/WebAPI.csproj | 70 +++--
WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs | 1
21 files changed, 562 insertions(+), 66 deletions(-)
diff --git a/.gitignore b/.gitignore
index 854b483..ddf9387 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@
/WindowsFormsApp1/bin
/WindowsFormsApp1/obj
/.vs
+/WebAPI/Scripts
+/WebAPI/Content
diff --git a/WebAPI/App_Start/WebApiConfig.cs b/WebAPI/App_Start/WebApiConfig.cs
index 511fe89..709a055 100644
--- a/WebAPI/App_Start/WebApiConfig.cs
+++ b/WebAPI/App_Start/WebApiConfig.cs
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Linq;
using System.Web.Http;
-using System.Web.Http.Cors;
using WebAPI.Dapper;
namespace WebAPI
diff --git a/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs b/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
index c8fe01b..07181d2 100644
--- a/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
@@ -6,9 +6,13 @@
using System.Data;
using System.Data.SqlClient;
using System.Web.Http;
+using System.Web.Mvc;
using WebAPI.Models;
+using HttpGetAttribute = System.Web.Http.HttpGetAttribute;
+
namespace WebAPI.Controllers
{
+ //涓嶈壇鍘熷洜Controller
public class Gy_BadReasonController : ApiController
{
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
diff --git a/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs b/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
index 107601f..59142ed 100644
--- a/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
@@ -6,9 +6,13 @@
using System.Data;
using System.Data.SqlClient;
using System.Web.Http;
+using System.Web.Mvc;
using WebAPI.Models;
+using HttpGetAttribute = System.Web.Http.HttpGetAttribute;
+
namespace WebAPI.Controllers
{
+ //瀹㈡埛Controller
public class Gy_CustomerController : ApiController
{
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
diff --git a/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs b/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
index 2dcd14c..701f320 100644
--- a/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
@@ -9,6 +9,7 @@
using WebAPI.Models;
namespace WebAPI.Controllers
{
+ //閮ㄩ棬Controller
public class Gy_DepartmentController : ApiController
{
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
diff --git a/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs b/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
index c281276..fed783f 100644
--- a/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
@@ -9,6 +9,7 @@
using WebAPI.Models;
namespace WebAPI.Controllers
{
+ //鑱屽憳Controller
public class Gy_EmployeeController : ApiController
{
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index 48f6407..9ce0437 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -9,6 +9,7 @@
using WebAPI.Models;
namespace WebAPI.Controllers
{
+ //鐗╂枡Controller
public class Gy_MaterialController : ApiController
{
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
diff --git a/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs b/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
index 2cbe2cc..08bbe31 100644
--- a/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
@@ -9,6 +9,7 @@
using WebAPI.Models;
namespace WebAPI.Controllers
{
+ //宸ュ簭Controller
public class Gy_ProcessController : ApiController
{
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
diff --git a/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs b/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
index 5da7344..f4219c7 100644
--- a/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
@@ -9,6 +9,7 @@
using WebAPI.Models;
namespace WebAPI.Controllers
{
+ //渚涘簲鍟咰ontroller
public class Gy_SupplierController : ApiController
{
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
@@ -19,7 +20,7 @@
/// <summary>
- /// 杩斿洖渚涘簲鍟嗗垪琛�
+ /// 杩斿洖閮ㄩ棬鍒楄〃
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
diff --git a/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs b/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
index 47094c1..156aaa8 100644
--- a/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
@@ -9,6 +9,7 @@
using WebAPI.Models;
namespace WebAPI.Controllers
{
+ //浠撳簱Controller
public class Gy_WarehouseController : ApiController
{
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
diff --git a/WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs b/WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs
index 213c200..07cd804 100644
--- a/WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs
@@ -6,7 +6,9 @@
using System.Data;
using System.Data.SqlClient;
using System.Web.Http;
+using System.Web.Mvc;
using WebAPI.Models;
+using HttpGetAttribute = System.Web.Http.HttpGetAttribute;
namespace WebAPI.Controllers
{
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index 7bb1e83..182059e 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -245,6 +245,111 @@
}
/// <summary>
+ /// 杩斿洖鐢熶骇姹囨姤鍗曞垪琛�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("LEMS/MES_Sc_ProcessReportList_Json")]
+ [HttpGet]
+ public object MES_Sc_ProcessReportList_Json(string sWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select top 500 * from Sc_ProcessReportMain ", "Sc_ProcessReportMain");
+ }
+ else
+ {
+ string sql1 = "select * from Sc_ProcessReportMain where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "Sc_ProcessReportMain");
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ return GetObjectJson(ds);
+ }
+
+ /// <summary>
+ /// 杩斿洖鐢熶骇宸ュ簭璁″垝鍗曞垪琛�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("LEMS/MES_Sc_ProcessPlanMain_Json")]
+ [HttpGet]
+ public object MES_Sc_ProcessPlanMain_Json(string sWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select top 500 * from Sc_ProcessPlanMain ", "Sc_ProcessPlanMain");
+ }
+ else
+ {
+ string sql1 = "select * from Sc_ProcessPlanMain where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "Sc_ProcessPlanMain");
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ return GetObjectJson(ds);
+ }
+
+ /// <summary>
+ /// 杩斿洖鐢熶骇宸ュ簭娲惧伐鍗曞垪琛�
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ [Route("LEMS/MES_Sc_ProcessSendWorkMain_Json")]
+ [HttpGet]
+ public object MES_Sc_ProcessSendWorkMain_Json(string sWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select top 500 * from Sc_ProcessSendWorkMain ", "Sc_ProcessSendWorkMain");
+ }
+ else
+ {
+ string sql1 = "select * from Sc_ProcessSendWorkMain where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "Sc_ProcessSendWorkMain");
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ return GetObjectJson(ds);
+ }
+
+ /// <summary>
/// 杩斿洖宸ュ簭濮斿鎺ユ敹鍗曞垪琛�
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
diff --git a/WebAPI/Controllers/MoveStockBillController.cs b/WebAPI/Controllers/MoveStockBillController.cs
index 0283551..9989d52 100644
--- a/WebAPI/Controllers/MoveStockBillController.cs
+++ b/WebAPI/Controllers/MoveStockBillController.cs
@@ -7,8 +7,12 @@
using System.Net;
using System.Net.Http;
using System.Web.Http;
+using System.Web.Mvc;
using WebAPI;
using WebAPI.Models;
+using HttpGetAttribute = System.Web.Http.HttpGetAttribute;
+using HttpPostAttribute = System.Web.Http.HttpPostAttribute;
+using JsonResult = WebAPI.Models.JsonResult;
namespace WebAPI.Controllers
{
diff --git a/WebAPI/Controllers/SellOutController.cs b/WebAPI/Controllers/SellOutController.cs
index 2183a49..e3388ad 100644
--- a/WebAPI/Controllers/SellOutController.cs
+++ b/WebAPI/Controllers/SellOutController.cs
@@ -11,9 +11,13 @@
using System.Net.Http;
using System.Web;
using System.Web.Http;
+using System.Web.Mvc;
using WebAPI;
using WebAPI.Code;
using WebAPI.Models;
+using HttpGetAttribute = System.Web.Http.HttpGetAttribute;
+using HttpPostAttribute = System.Web.Http.HttpPostAttribute;
+
namespace WebAPI.Controllers
{
public class SellOutController : ApiController
diff --git a/WebAPI/Properties/PublishProfiles/JFAPI.pubxml b/WebAPI/Properties/PublishProfiles/JFAPI.pubxml
new file mode 100644
index 0000000..7f14ac0
--- /dev/null
+++ b/WebAPI/Properties/PublishProfiles/JFAPI.pubxml
@@ -0,0 +1,17 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <DeleteExistingFiles>True</DeleteExistingFiles>
+ <ExcludeApp_Data>False</ExcludeApp_Data>
+ <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+ <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
+ <LastUsedPlatform>x86</LastUsedPlatform>
+ <PublishProvider>FileSystem</PublishProvider>
+ <PublishUrl>F:\缃戠珯鍙戝竷\姹熶赴\JFAPI</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..351fc61
--- /dev/null
+++ b/WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user
@@ -0,0 +1,332 @@
+锘�<?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>F:\缃戠珯鍙戝竷\姹熶赴\JFAPI</_PublishTargetUrl>
+ </PropertyGroup>
+ <ItemGroup>
+ <File Include="apiapp.json">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="bin/Antlr3.Runtime.dll">
+ <publishTime>02/22/2013 08:43:40</publishTime>
+ </File>
+ <File Include="bin/Antlr3.Runtime.pdb">
+ <publishTime>02/22/2013 08:43:40</publishTime>
+ </File>
+ <File Include="bin/BLL.dll">
+ <publishTime>03/23/2021 14:16:30</publishTime>
+ </File>
+ <File Include="bin/DAL.dll">
+ <publishTime>03/23/2021 14:16:30</publishTime>
+ </File>
+ <File Include="bin/Dapper.dll">
+ <publishTime>07/22/2016 14:52:40</publishTime>
+ </File>
+ <File Include="bin/DBUtility.dll">
+ <publishTime>03/23/2021 14:16:30</publishTime>
+ </File>
+ <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
+ <publishTime>03/23/2021 14:16:30</publishTime>
+ </File>
+ <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
+ <publishTime>03/18/2015 17:02:50</publishTime>
+ </File>
+ <File Include="bin/Microsoft.CSharp.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/Microsoft.Web.Infrastructure.dll">
+ <publishTime>07/25/2012 11:48:56</publishTime>
+ </File>
+ <File Include="bin/Model.dll">
+ <publishTime>03/23/2021 14:16:30</publishTime>
+ </File>
+ <File Include="bin/Newtonsoft.Json.dll">
+ <publishTime>08/03/2014 20:33:56</publishTime>
+ </File>
+ <File Include="bin/Pub_Class.dll">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="bin/Pub_Control.dll">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="bin/SQLHelper.dll">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="bin/Swashbuckle.Core.dll">
+ <publishTime>02/15/2015 17:57:08</publishTime>
+ </File>
+ <File Include="bin/System.ComponentModel.DataAnnotations.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Configuration.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Data.DataSetExtensions.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Data.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Drawing.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.EnterpriseServices.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.IdentityModel.Tokens.Jwt.dll">
+ <publishTime>08/19/2014 10:03:34</publishTime>
+ </File>
+ <File Include="bin/System.Net.Http.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Net.Http.Formatting.dll">
+ <publishTime>11/28/2018 13:00:36</publishTime>
+ </File>
+ <File Include="bin/System.Runtime.Serialization.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.ApplicationServices.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.Cors.dll">
+ <publishTime>11/28/2018 12:58:44</publishTime>
+ </File>
+ <File Include="bin/System.Web.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.DynamicData.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.Entity.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.Extensions.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.Helpers.dll">
+ <publishTime>01/28/2015 04:04:30</publishTime>
+ </File>
+ <File Include="bin/System.Web.Http.Cors.dll">
+ <publishTime>11/28/2018 13:01:26</publishTime>
+ </File>
+ <File Include="bin/System.Web.Http.dll">
+ <publishTime>11/28/2018 13:01:00</publishTime>
+ </File>
+ <File Include="bin/System.Web.Http.WebHost.dll">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="bin/System.Web.Mvc.dll">
+ <publishTime>01/28/2015 04:02:18</publishTime>
+ </File>
+ <File Include="bin/System.Web.Optimization.dll">
+ <publishTime>02/11/2014 15:26:04</publishTime>
+ </File>
+ <File Include="bin/System.Web.Razor.dll">
+ <publishTime>01/28/2015 04:02:32</publishTime>
+ </File>
+ <File Include="bin/System.Web.Services.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.WebPages.Deployment.dll">
+ <publishTime>01/28/2015 04:04:30</publishTime>
+ </File>
+ <File Include="bin/System.Web.WebPages.dll">
+ <publishTime>01/28/2015 04:04:30</publishTime>
+ </File>
+ <File Include="bin/System.Web.WebPages.Razor.dll">
+ <publishTime>01/28/2015 04:04:30</publishTime>
+ </File>
+ <File Include="bin/System.Xml.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Xml.Linq.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/WebActivatorEx.dll">
+ <publishTime>11/24/2014 11:18:48</publishTime>
+ </File>
+ <File Include="bin/WebAPI.dll">
+ <publishTime>03/24/2021 10:25:16</publishTime>
+ </File>
+ <File Include="bin/WebAPI.pdb">
+ <publishTime>03/24/2021 10:25:16</publishTime>
+ </File>
+ <File Include="bin/WebAPI.XmlSerializers.dll">
+ <publishTime>03/23/2021 14:35:51</publishTime>
+ </File>
+ <File Include="bin/WebGrease.dll">
+ <publishTime>07/17/2013 17:03:52</publishTime>
+ </File>
+ <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
+ <publishTime>11/29/2018 13:26:02</publishTime>
+ </File>
+ <File Include="bin/zh-Hans/System.Web.Http.resources.dll">
+ <publishTime>11/29/2018 13:26:30</publishTime>
+ </File>
+ <File Include="Content/bootstrap.css">
+ <publishTime>03/23/2021 14:16:30</publishTime>
+ </File>
+ <File Include="Content/bootstrap.min.css">
+ <publishTime>03/23/2021 14:16:30</publishTime>
+ </File>
+ <File Include="Content/Site.css">
+ <publishTime>03/23/2021 14:16:30</publishTime>
+ </File>
+ <File Include="DLL/BLL.dll">
+ <publishTime>03/23/2021 14:16:30</publishTime>
+ </File>
+ <File Include="DLL/DAL.dll">
+ <publishTime>03/23/2021 14:16:30</publishTime>
+ </File>
+ <File Include="DLL/DBUtility.dll">
+ <publishTime>03/23/2021 14:16:30</publishTime>
+ </File>
+ <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
+ <publishTime>03/23/2021 14:16:30</publishTime>
+ </File>
+ <File Include="DLL/Model.dll">
+ <publishTime>03/23/2021 14:16:30</publishTime>
+ </File>
+ <File Include="DLL/Newtonsoft.Json.Net35.dll">
+ <publishTime>03/23/2021 14:16:30</publishTime>
+ </File>
+ <File Include="DLL/Pub_Class.dll">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="DLL/Pub_Control.dll">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="DLL/SQLHelper.dll">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.eot">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.svg">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.ttf">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.woff">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Global.asax">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Index.html">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="packages.config">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Views/Scripts/bootstrap.js">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Views/Scripts/bootstrap.min.js">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery-1.10.2.js">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery-1.10.2.min.js">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery-1.10.2.min.map">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.js">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.min.js">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Views/Scripts/modernizr-2.6.2.js">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Views/Shared/Error.cshtml">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Views/Shared/_Layout.cshtml">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Views/web.config">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Views/_ViewStart.cshtml">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Web.config">
+ <publishTime>03/24/2021 10:29:41</publishTime>
+ </File>
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user b/WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user
index 2723917..934dde6 100644
--- a/WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user
@@ -163,10 +163,10 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>03/29/2021 14:17:50</publishTime>
+ <publishTime>06/12/2020 17:45:15</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>03/29/2021 14:17:50</publishTime>
+ <publishTime>03/24/2021 15:45:15</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>02/04/2021 21:35:21</publishTime>
@@ -340,7 +340,7 @@
<publishTime>03/26/2021 14:46:18</publishTime>
</File>
<File Include="Web.config">
- <publishTime>03/29/2021 14:24:45</publishTime>
+ <publishTime>03/24/2021 16:33:09</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index fcdb48a..fdaaab8 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -5,21 +5,23 @@
-->
<configuration>
<configSections>
- <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <section name="WebAPI.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+ <sectionGroup name="applicationSettings"
+ type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <section name="WebAPI.Properties.Settings"
+ type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
</sectionGroup>
</configSections>
<connectionStrings>
- <!--<add name="YqnConn" connectionString="Data Source=192.168.0.175;Initial Catalog=HX_LimsSys;User Id=HX_USER,Password=lc@841022;Integrated Security=True" />-->
- <add name="YqnConn" connectionString="Data Source=.;Initial Catalog=HX_LimsSys;Integrated Security=True" />
+ <!--<add name="YqnConn" connectionString="Data Source=.;Initial Catalog=HX_LimsSys_Simoer;User Id=HX_USER,Password=lc@841022;Integrated Security=True" />-->
+ <add name="YqnConn" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog=HX_LMESsys;User Id=HX_USER,Password=lc@841022;Integrated Security=True" />
</connectionStrings>
<appSettings>
- <add key="webpages:Version" value="3.0.0.0" />
- <add key="webpages:Enabled" value="false" />
- <add key="ClientValidationEnabled" value="true" />
- <add key="UnobtrusiveJavaScriptEnabled" value="true" />
+ <add key="webpages:Version" value="3.0.0.0"/>
+ <add key="webpages:Enabled" value="false"/>
+ <add key="ClientValidationEnabled" value="true"/>
+ <add key="UnobtrusiveJavaScriptEnabled" value="true"/>
</appSettings>
<!--
鏈夊叧 web.config 鏇存敼鐨勮鏄庯紝璇峰弬瑙� http://go.microsoft.com/fwlink/?LinkId=235367銆�
@@ -30,40 +32,44 @@
</system.Web>
-->
<system.web>
- <compilation debug="true" targetFramework="4.5" />
- <httpRuntime />
- <pages controlRenderingCompatibilityVersion="4.0" />
+ <compilation debug="true" targetFramework="4.5"/>
+ <httpRuntime/>
+ <pages controlRenderingCompatibilityVersion="4.0"/>
</system.web>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
- <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+ <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+ <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
- <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+ <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
+ <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
- <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+ <assemblyIdentity name="System.Web.Http" 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.Helpers" publicKeyToken="31bf3856ad364e35" />
- <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+ <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+ <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234"/>
</dependentAssembly>
<dependentAssembly>
- <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
- <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+ <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
+ <bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
</dependentAssembly>
<dependentAssembly>
- <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
- <bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
+ <assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral"/>
+ <bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2"/>
</dependentAssembly>
<dependentAssembly>
- <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
+ <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
+ <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
+ <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
@@ -76,9 +82,10 @@
</applicationSettings>
<system.webServer>
<handlers>
- <remove name="ExtensionlessUrlHandler-Integrated-4.0" />
- <remove name="OPTIONSVerbHandler" />
- <remove name="TRACEVerbHandler" />
- <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
+ <remove name="ExtensionlessUrlHandler-Integrated-4.0"/>
+ <remove name="OPTIONSVerbHandler"/>
+ <remove name="TRACEVerbHandler"/>
+ <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler"
+ preCondition="integratedMode,runtimeVersionv4.0"/>
</handlers>
</system.webServer></configuration>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 1a19efd..d57c83a 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -22,6 +22,7 @@
<TargetFrameworkProfile />
<Use64BitIISExpress />
<UseGlobalApplicationHostFile />
+ <WebGreaseLibPath>..\packages\WebGrease.1.5.2\lib</WebGreaseLibPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -44,8 +45,8 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Antlr3.Runtime, Version=3.4.1.9004, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
- <HintPath>..\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll</HintPath>
- <Private>True</Private>
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>bin\Antlr3.Runtime.dll</HintPath>
</Reference>
<Reference Include="BLL, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
@@ -72,8 +73,8 @@
<HintPath>..\..\..\..\LMES\LMES\LMES\OCX\Kingdee.BOS.WebApi.ServicesStub.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.AppService.ApiApps.Service, Version=0.9.16.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <HintPath>..\packages\Microsoft.Azure.AppService.ApiApps.Service.0.9.16\lib\net45\Microsoft.Azure.AppService.ApiApps.Service.dll</HintPath>
- <Private>True</Private>
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>bin\Microsoft.Azure.AppService.ApiApps.Service.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp">
<Private>True</Private>
@@ -102,15 +103,15 @@
<HintPath>DLL\SQLHelper.dll</HintPath>
</Reference>
<Reference Include="Swashbuckle.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cd1bb07a5ac7c7bc, processorArchitecture=MSIL">
- <HintPath>..\packages\Swashbuckle.Core.5.0.0\lib\net40\Swashbuckle.Core.dll</HintPath>
- <Private>True</Private>
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>bin\Swashbuckle.Core.dll</HintPath>
</Reference>
<Reference Include="System.Data.DataSetExtensions">
<Private>True</Private>
</Reference>
<Reference Include="System.IdentityModel.Tokens.Jwt, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <HintPath>..\packages\System.IdentityModel.Tokens.Jwt.4.0.0\lib\net45\System.IdentityModel.Tokens.Jwt.dll</HintPath>
- <Private>True</Private>
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>bin\System.IdentityModel.Tokens.Jwt.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http">
<Private>True</Private>
@@ -123,7 +124,8 @@
</Reference>
<Reference Include="System.ServiceModel" />
<Reference Include="System.Web.Cors, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <HintPath>..\packages\Microsoft.AspNet.Cors.5.2.7\lib\net45\System.Web.Cors.dll</HintPath>
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>bin\System.Web.Cors.dll</HintPath>
</Reference>
<Reference Include="System.Web.DynamicData">
<Private>True</Private>
@@ -152,9 +154,9 @@
<Reference Include="System.Web.Extensions">
<Private>True</Private>
</Reference>
- <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
- <Private>True</Private>
+ <Reference Include="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>bin\System.Web.Helpers.dll</HintPath>
</Reference>
<Reference Include="System.Web.Http, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll</HintPath>
@@ -162,9 +164,11 @@
<Reference Include="System.Web.Http.Cors, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebApi.Cors.5.2.7\lib\net45\System.Web.Http.Cors.dll</HintPath>
</Reference>
- <Reference Include="System.Web.Http.WebHost, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>DLL\System.Web.Http.WebHost.dll</HintPath>
+ <Reference Include="System.Web.Http.WebHost, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.3\lib\net45\System.Web.Http.WebHost.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
</Reference>
<Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
@@ -176,19 +180,15 @@
</Reference>
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
- <Private>True</Private>
</Reference>
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
- <Private>True</Private>
</Reference>
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
- <Private>True</Private>
</Reference>
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
- <Private>True</Private>
</Reference>
<Reference Include="System.Xml">
<Private>True</Private>
@@ -207,14 +207,14 @@
</Reference>
<Reference Include="WebActivatorEx, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL">
<HintPath>..\packages\WebActivatorEx.2.0.6\lib\net40\WebActivatorEx.dll</HintPath>
- <Private>True</Private>
</Reference>
<Reference Include="WebGrease, Version=1.5.2.14234, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\WebGrease.1.5.2\lib\WebGrease.dll</HintPath>
- <Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
+ <Content Include="Content\bootstrap-theme.css" />
+ <Content Include="Content\bootstrap-theme.min.css" />
<Content Include="Content\bootstrap.css" />
<Content Include="Content\bootstrap.min.css" />
<Content Include="Content\Site.css" />
@@ -230,12 +230,27 @@
<Content Include="fonts\glyphicons-halflings-regular.svg" />
<Content Include="Global.asax" />
<Content Include="Index.html" />
+ <Content Include="fonts\glyphicons-halflings-regular.woff" />
+ <Content Include="fonts\glyphicons-halflings-regular.ttf" />
+ <Content Include="fonts\glyphicons-halflings-regular.eot" />
+ <None Include="Scripts\jquery-1.10.2.intellisense.js" />
+ <Content Include="Scripts\bootstrap.js" />
+ <Content Include="Scripts\bootstrap.min.js" />
+ <Content Include="Scripts\jquery-1.10.2.js" />
+ <Content Include="Scripts\jquery-1.10.2.min.js" />
+ <None Include="Scripts\jquery.validate-vsdoc.js" />
+ <Content Include="Scripts\jquery.validate.js" />
+ <Content Include="Scripts\jquery.validate.min.js" />
+ <Content Include="Scripts\jquery.validate.unobtrusive.js" />
+ <Content Include="Scripts\jquery.validate.unobtrusive.min.js" />
+ <Content Include="Scripts\modernizr-2.6.2.js" />
<Content Include="Views\Scripts\bootstrap.js" />
<Content Include="Views\Scripts\bootstrap.min.js" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
+ <Content Include="Scripts\jquery-1.10.2.min.map" />
<None Include="Views\Scripts\jquery-1.10.2.intellisense.js" />
<Content Include="Views\Scripts\jquery-1.10.2.js" />
<Content Include="Views\Scripts\jquery-1.10.2.min.js" />
@@ -316,15 +331,13 @@
<Compile Include="App_Start\WebApiConfig.cs" />
<Compile Include="Controllers\BaseSet\Gy_BadReasonController.cs" />
<Compile Include="Controllers\BaseSet\Gy_CustomerController.cs" />
- <Compile Include="Controllers\BaseSet\Gy_DepartmentController.cs" />
- <Compile Include="Controllers\BaseSet\Gy_EmployeeController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_BadReasonController.cs" />
<Compile Include="Controllers\BaseSet\Gy_GroupController.cs" />
- <Compile Include="Controllers\BaseSet\Gy_MaterialController.cs" />
- <Compile Include="Controllers\BaseSet\Gy_ProcessController.cs" />
- <Compile Include="Controllers\BaseSet\Gy_SourceController.cs" />
<Compile Include="Controllers\BaseSet\Gy_SupplierController.cs" />
<Compile Include="Controllers\BaseSet\Gy_WarehouseController.cs" />
- <Compile Include="Controllers\CJGL\Cj_NoPassProcController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_EmployeeController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_DepartmentController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_ProcessController.cs" />
<Compile Include="Controllers\LMESController.cs" />
<Compile Include="Controllers\LookingForBillController.cs" />
<Compile Include="Controllers\NewApiController.cs" />
@@ -394,9 +407,6 @@
</Content>
<Content Include="Metadata\deploymentTemplates\apiappconfig.azureresource.json" />
<Content Include="apiapp.json" />
- <Content Include="fonts\glyphicons-halflings-regular.woff" />
- <Content Include="fonts\glyphicons-halflings-regular.ttf" />
- <Content Include="fonts\glyphicons-halflings-regular.eot" />
<None Include="Properties\PublishProfiles\PDAWeb.pubxml" />
<None Include="Properties\PublishProfiles\WEBAPI.pubxml" />
<Content Include="Views\Shared\Error.cshtml" />
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 1c3208c..69cbe32 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -7,7 +7,7 @@
<WebStackScaffolding_IsReferencingScriptLibrariesSelected>True</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
<WebStackScaffolding_LayoutPageFile />
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
- <NameOfLastUsedPublishProfile>WEBAPI</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>JFAPI</NameOfLastUsedPublishProfile>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>false</UseIISExpress>
<Use64BitIISExpress />
diff --git a/WebAPI/packages.config b/WebAPI/packages.config
index a7f3198..cf37f55 100644
--- a/WebAPI/packages.config
+++ b/WebAPI/packages.config
@@ -1,6 +1,6 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Antlr" version="3.4.1.9004" targetFramework="net45" />
+ <package id="Antlr" version="3.5.0.2" targetFramework="net45" />
<package id="bootstrap" version="3.0.0" targetFramework="net45" />
<package id="Dapper" version="1.50.2" targetFramework="net45" />
<package id="jQuery" version="1.10.2" targetFramework="net45" />
--
Gitblit v1.9.1