From 5b4fb9c56426b5096555560a44dd365b02853ad4 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期六, 17 六月 2023 13:14:54 +0800
Subject: [PATCH] 代码加组织过滤
---
VueWebApi/obj/Release/VueWebApi.pdb | 0
VueWebApi/DLL/BLL/QualityManagementBLL.cs | 20
VueWebApi/Controllers/QualityManagementController.cs | 19
VueWebApi/Controllers/ReportManagerController.cs | 60
VueWebApi/DLL/BLL/DeviceManagerBLL.cs | 40
.vs/VueWebApi/v16/.suo | 0
VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml | 16
VueWebApi/DLL/DAL/LoginDAL.cs | 22
VueWebApi/VueWebApi.csproj | 2
VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache | 0
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb | 0
VueWebApi/Controllers/ProductionManagementController.cs | 43
VueWebApi/Models/ObjectData.cs | 1
VueWebApi/Controllers/DeviceManagerController.cs | 40
VueWebApi/bin/VueWebApi.pdb | 0
VueWebApi/DLL/BLL/ProductModelBLL.cs | 48
VueWebApi/DLL/BLL/BaseDateBLL.cs | 13
VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache | 2
VueWebApi/DLL/DAL/ProductModelDAL.cs | 251 +++
VueWebApi/Web.config | 2
VueWebApi/DLL/BLL/ProductionManagementBLL.cs | 36
VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user | 1131 +++++++++++++++++
VueWebApi/bin/VueWebApi.xml | 97 +
VueWebApi/Models/User.cs | 3
VueWebApi/Tools/ScanStartReport.cs | 144 +
VueWebApi/DLL/BLL/LoginBLL.cs | 8
VueWebApi/DLL/DAL/ReportManagerDAL.cs | 144 +
VueWebApi/Controllers/ProductModelController.cs | 56
VueWebApi/DLL/DAL/QualityManagementDAL.cs | 90 +
VueWebApi/DLL/DAL/DeviceManagerDAL.cs | 202 ++
VueWebApi/DLL/DAL/BasicSettingDAL.cs | 434 +++++-
VueWebApi/Models/MaterialRout.cs | 2
VueWebApi/Models/ScanStartReportDataOut.cs | 29
VueWebApi/Controllers/AppProductionManagementController.cs | 5
VueWebApi/Controllers/BaseDateController.cs | 32
VueWebApi/obj/Release/TransformWebConfig/original/Web.config | 2
VueWebApi/DLL/DAL/BaseDateDAL.cs | 88 +
VueWebApi/DLL/DAL/ProductionManagementDAL.cs | 211 ++
VueWebApi/DLL/BLL/ReportManagerBLL.cs | 48
VueWebApi/VueWebApi.csproj.user | 2
VueWebApi/obj/Release/Package/PackageTmp/Web.config | 2
VueWebApi/Models/ScanStartReportData.cs | 4
VueWebApi/bin/VueWebApi.dll.config | 2
VueWebApi/obj/Release/TransformWebConfig/transformed/Web.config | 2
VueWebApi/Models/PartRout.cs | 15
VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt | 282 ++++
VueWebApi/DLL/BLL/BasicSettingBLL.cs | 51
VueWebApi/Models/RoutEdit.cs | 1
/dev/null | 0
VueWebApi/Controllers/BasicSettingController.cs | 60
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml | 97 +
VueWebApi/Models/StepDefect.cs | 1
VueWebApi/obj/Release/_WPPLastBuildInfo.txt | 0
VueWebApi/Controllers/LoginController.cs | 64
54 files changed, 3,344 insertions(+), 580 deletions(-)
diff --git a/.vs/VueWebApi/v16/.suo b/.vs/VueWebApi/v16/.suo
index 96e1def..34be664 100644
--- a/.vs/VueWebApi/v16/.suo
+++ b/.vs/VueWebApi/v16/.suo
Binary files differ
diff --git a/VueWebApi/Controllers/AppProductionManagementController.cs b/VueWebApi/Controllers/AppProductionManagementController.cs
index 03e22af..6d8dd95 100644
--- a/VueWebApi/Controllers/AppProductionManagementController.cs
+++ b/VueWebApi/Controllers/AppProductionManagementController.cs
@@ -57,12 +57,13 @@
/// <summary>
/// 鐢熶骇寮�鎶ュ伐锛氭姤宸ユ椂鑾峰彇鐢熶骇鐝粍涓嬫媺妗�
/// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <returns></returns>
[Route(template: "MesOrderStepReportSelectUserGroup")]
[HttpGet]
- public HttpResponseMessage MesOrderStepReportSelectUserGroup()
+ public HttpResponseMessage MesOrderStepReportSelectUserGroup(string wkshopcode)
{
- mes = ProductionManagementBLL.MesOrderStepReportSelectUserGroup();
+ mes = ProductionManagementBLL.MesOrderStepReportSelectUserGroup(wkshopcode);
return TJson.toJson(mes);
}
#endregion
diff --git a/VueWebApi/Controllers/BaseDateController.cs b/VueWebApi/Controllers/BaseDateController.cs
index 90f3cbf..9708612 100644
--- a/VueWebApi/Controllers/BaseDateController.cs
+++ b/VueWebApi/Controllers/BaseDateController.cs
@@ -132,6 +132,38 @@
}
#endregion
+ #region[閫氳繃閫夋嫨鐨勬墍灞炵粍缁囨煡璇㈡墍灞炵彮缁刔
+ /// <summary>
+ /// 閫氳繃閫夋嫨鐨勬墍灞炵粍缁囨煡璇㈡墍灞炵彮缁�
+ /// </summary>
+ /// <param name="stu_torgcode">缁勭粐缂栫爜</param>
+ /// <param name="description">缁勭粐绫诲瀷</param>
+ /// <returns></returns>
+ [Route(template: "StorgGroupSelect")]
+ [HttpGet]
+ public HttpResponseMessage StorgGroupSelect(string stu_torgcode, string description)
+ {
+ mes = BaseDateBLL.StorgGroupSelect(stu_torgcode, description);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[閫氳繃閫夋嫨鐨勬墍灞炵粍缁囨煡璇㈡墍灞炶鑹茬被鍨媇
+ /// <summary>
+ /// 閫氳繃閫夋嫨鐨勬墍灞炵粍缁囨煡璇㈡墍灞炶鑹茬被鍨�
+ /// </summary>
+ /// <param name="stu_torgcode">缁勭粐缂栫爜</param>
+ /// <param name="description">缁勭粐绫诲瀷</param>
+ /// <returns></returns>
+ [Route(template: "StorgRoleSelect")]
+ [HttpGet]
+ public HttpResponseMessage StorgRoleSelect(string stu_torgcode, string description)
+ {
+ mes = BaseDateBLL.StorgRoleSelect(stu_torgcode, description);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
#region[ERP鐢熶骇杞﹂棿/閮ㄩ棬淇℃伅鏌ヨ]
diff --git a/VueWebApi/Controllers/BasicSettingController.cs b/VueWebApi/Controllers/BasicSettingController.cs
index 3fe5bdc..2d860d2 100644
--- a/VueWebApi/Controllers/BasicSettingController.cs
+++ b/VueWebApi/Controllers/BasicSettingController.cs
@@ -42,9 +42,11 @@
[HttpGet]
public HttpResponseMessage OrganizationSearch(string OrgCode=null, string OrgName=null, string OrgType=null, string UserName=null,int page=0,int rows=0,string prop=null,string order=null)
{
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = BasicSettingBLL.OrganizationSearch(OrgCode, OrgName, OrgType, UserName,startNum,endNum,prop,order);
+ mes = BasicSettingBLL.OrganizationSearch(stu_torgcode, description, OrgCode, OrgName, OrgType, UserName,startNum,endNum,prop,order);
return TJson.toJson(mes);
}
#endregion
@@ -111,6 +113,7 @@
/// <param name="UserCode">鐢ㄦ埛缂栫爜</param>
/// <param name="UserName">鐢ㄦ埛鍚嶇О</param>
/// <param name="StuOrg">鎵�灞炵粍缁�</param>
+ /// <param name="description">鎵�灞炵粍缁囩被鍨�</param>
/// <param name="wagetype">宸ヨ祫绫诲瀷</param>
/// <param name="Enable">鍦ㄨ亴鐘舵��</param>
/// <param name="page">椤电爜</param>
@@ -120,11 +123,11 @@
/// <returns></returns>
[Route(template: "UserSearch")]
[HttpGet]
- public HttpResponseMessage UserSearch(string UserCode = null, string UserName = null, string StuOrg = null,string wagetype=null, string Enable = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ public HttpResponseMessage UserSearch(string UserCode = null, string UserName = null, string StuOrg = null,string description=null, string wagetype=null, string Enable = 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 = BasicSettingBLL.UserSearch(UserCode, UserName, StuOrg, wagetype, Enable, startNum, endNum, prop, order);
+ mes = BasicSettingBLL.UserSearch(UserCode, UserName, StuOrg, description, wagetype, Enable, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -138,7 +141,9 @@
[HttpGet]
public HttpResponseMessage UserOrganization()
{
- mes = BasicSettingBLL.UserOrganization();
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
+ mes = BasicSettingBLL.UserOrganization(stu_torgcode, description);
return TJson.toJson(mes);
}
#endregion
@@ -152,7 +157,9 @@
[HttpGet]
public HttpResponseMessage UserGroup()
{
- mes = BasicSettingBLL.UserGroup();
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
+ mes = BasicSettingBLL.UserGroup(stu_torgcode, description);
return TJson.toJson(mes);
}
#endregion
@@ -204,12 +211,14 @@
/// 鐢ㄦ埛娓呭崟鍏宠仈瑙掕壊鏌ヨ
/// </summary>
/// <param name="usercode">鐢ㄦ埛缂栫爜</param>
+ /// <param name="stu_torgcode">鎵�灞炵粍缁囩紪鐮�</param>
+ /// <param name="description">鎵�灞炵粍缁囩被鍨�</param>
/// <returns></returns>
[Route(template: "UserAssociationRole")]
[HttpGet]
- public HttpResponseMessage UserAssociationRole(string usercode)
+ public HttpResponseMessage UserAssociationRole(string usercode,string stu_torgcode,string description)
{
- mes = BasicSettingBLL.UserAssociationRole(usercode);
+ mes = BasicSettingBLL.UserAssociationRole(usercode, stu_torgcode, description);
return TJson.toJson(mes);
}
#endregion
@@ -219,16 +228,18 @@
/// 鐢ㄦ埛娓呭崟鍏宠仈瑙掕壊淇濆瓨
/// </summary>
/// <param name="usercode">鐢ㄦ埛缂栫爜</param>
+ /// <param name="stu_torgcode">鎵�灞炵粍缁囩紪鐮�</param>
+ /// <param name="description">鎵�灞炵粍缁囩被鍨�</param>
/// <param name="json">鎻愪氦鏁版嵁瀵硅薄</param>
/// <returns></returns>
[Route(template: "SaveUserAssoctRole")]
[HttpPost]
- public HttpResponseMessage SaveUserAssoctRole(string usercode, List<RoleUserSubmit> json)
+ public HttpResponseMessage SaveUserAssoctRole(string usercode,string stu_torgcode,string description, List<RoleUserSubmit> json)
{
//JavaScriptSerializer Serializer = new JavaScriptSerializer();
//List<RoleUserSubmit> objs = new List<RoleUserSubmit>();
//objs = Serializer.Deserialize<List<RoleUserSubmit>>(json);
- mes= BasicSettingBLL.SaveUserAssoctRole(usercode, json);
+ mes= BasicSettingBLL.SaveUserAssoctRole(usercode, stu_torgcode, description, json);
return TJson.toJson(mes);
}
#endregion
@@ -311,9 +322,11 @@
[HttpGet]
public HttpResponseMessage UserGroupSearch(int page = 0, int rows = 0, string prop = null, string order = null)
{
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = BasicSettingBLL.UserGroupSearch(startNum, endNum, prop, order);
+ mes = BasicSettingBLL.UserGroupSearch(stu_torgcode, description, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -364,9 +377,11 @@
[HttpGet]
public HttpResponseMessage RoleTypeSearch(int page = 0, int rows = 0, string prop = null, string order = null)
{
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = BasicSettingBLL.RoleTypeSearch(startNum, endNum, prop, order);
+ mes = BasicSettingBLL.RoleTypeSearch(stu_torgcode, description,startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -410,9 +425,11 @@
[HttpGet]
public HttpResponseMessage RoleTypeSelect()
{
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
try
{
- mes = BasicSettingBLL.RoleTypeSelect();
+ mes = BasicSettingBLL.RoleTypeSelect(stu_torgcode, description);
}
catch (Exception e)
{
@@ -440,9 +457,11 @@
[HttpGet]
public HttpResponseMessage RoleSearch(string RoleCode = null, string RoleName = null, string RoleTypeCode = null, string CreateUser = null, int page = 0, int rows = 0, string prop = null, string order = null)
{
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = BasicSettingBLL.RoleSearch(RoleCode, RoleName, RoleTypeCode, CreateUser, startNum, endNum, prop, order);
+ mes = BasicSettingBLL.RoleSearch(stu_torgcode,description, RoleCode, RoleName, RoleTypeCode, CreateUser, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -460,11 +479,12 @@
string RoleId = obj["RoleId"].ToString(); //瑙掕壊id(涓婚敭)
string RoleCode = obj["RoleCode"].ToString(); //瑙掕壊缂栫爜
string RoleName = obj["RoleName"].ToString(); //瑙掕壊鍚嶇О
+ string stu_torgcode = obj["stu_torgcode"].ToString(); //鎵�灞炵粍缁囩紪鐮�
string RoleTypeCode = obj["RoleTypeCode"].ToString(); //瑙掕壊绫诲瀷缂栫爜
string description = obj["description"].ToString(); //瑙掕壊鎻忚堪
var usercode = HttpContext.Current.Request.Cookies["navTabId"].Value.ToString();
string OperType = obj["OperType"].ToString(); //鎿嶄綔绫诲瀷
- mes = BasicSettingBLL.AddUpdateRole(RoleId, RoleCode, RoleName, RoleTypeCode, description, usercode, OperType);
+ mes = BasicSettingBLL.AddUpdateRole(RoleId, RoleCode, RoleName, stu_torgcode,RoleTypeCode, description, usercode, OperType);
return TJson.toJson(mes);
}
#endregion
@@ -643,6 +663,18 @@
#endregion
+ #region[瀹夌伅绯荤粺/杞﹂棿鏌ヨ]
+ [Route(template: "AnDengShopSearch")]
+ [HttpGet]
+ public HttpResponseMessage AnDengShopSearch()
+ {
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
+ mes = BasicSettingBLL.AnDengShopSearch(stu_torgcode, description);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
#region[瀹夌伅绯荤粺/鑷畾涔夊畨鐏懠鍙被鍨嬫煡璇
/// <summary>
/// 瀹夌伅绯荤粺/鑷畾涔夊畨鐏懠鍙被鍨嬫煡璇�
diff --git a/VueWebApi/Controllers/DeviceManagerController.cs b/VueWebApi/Controllers/DeviceManagerController.cs
index bf6d1b5..bbc0b87 100644
--- a/VueWebApi/Controllers/DeviceManagerController.cs
+++ b/VueWebApi/Controllers/DeviceManagerController.cs
@@ -180,7 +180,9 @@
[HttpGet]
public HttpResponseMessage WorkShopSelect()
{
- mes = DeviceManagerBLL.WorkShopSelect();
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
+ mes = DeviceManagerBLL.WorkShopSelect(stu_torgcode, description);
return TJson.toJson(mes);
}
#endregion
@@ -219,9 +221,11 @@
[HttpGet]
public HttpResponseMessage DeviceMangerSearch(string DeviceCode = null, string DeviceName = null, string Status = null, string WorkShop = null,string DeviceType=null,string DeviceGroup=null,int page = 0, int rows = 0, string prop = null, string order = null)
{
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = DeviceManagerBLL.DeviceMangerSearch(DeviceCode, DeviceName, Status, WorkShop, DeviceType, DeviceGroup, startNum, endNum, prop, order);
+ mes = DeviceManagerBLL.DeviceMangerSearch(stu_torgcode, description,DeviceCode, DeviceName, Status, WorkShop, DeviceType, DeviceGroup, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -491,7 +495,9 @@
[HttpGet]
public HttpResponseMessage DeviceCheckStanedAssociationEqp(string checkstand_code)
{
- mes = DeviceManagerBLL.DeviceCheckStanedAssociationEqp(checkstand_code);
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
+ mes = DeviceManagerBLL.DeviceCheckStanedAssociationEqp(stu_torgcode, description,checkstand_code);
return TJson.toJson(mes);
}
#endregion
@@ -609,7 +615,9 @@
[HttpGet]
public HttpResponseMessage DeviceRepairStanedAssociationEqp(string repairstand_code)
{
- mes = DeviceManagerBLL.DeviceRepairStanedAssociationEqp(repairstand_code);
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
+ mes = DeviceManagerBLL.DeviceRepairStanedAssociationEqp(stu_torgcode, description,repairstand_code);
return TJson.toJson(mes);
}
#endregion
@@ -651,6 +659,8 @@
[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)
{
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
string checkopendate = ""; //鐐规寮�濮嬫椂闂�
string checkclosedate = ""; //鐐规缁撴潫鏃堕棿
if (checkdate != "" && checkdate != null)
@@ -660,7 +670,7 @@
}
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);
+ mes = DeviceManagerBLL.DeviceCheckTakeSearch(stu_torgcode, description,wkshopcode, eqpcode, eqpname, stanedname, checkuser, checkopendate, checkclosedate, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -695,6 +705,8 @@
[HttpGet]
public HttpResponseMessage DeviceCheckTakeOutExcel(string wkshopcode = null, string eqpcode = null, string eqpname = null, string stanedname = null, string checkuser = null, string checkdate = null)
{
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
string checkopendate = ""; //鐐规寮�濮嬫椂闂�
string checkclosedate = ""; //鐐规缁撴潫鏃堕棿
if (checkdate != "" && checkdate != null)
@@ -702,7 +714,7 @@
checkopendate = checkdate.Split('~')[0].ToString();
checkclosedate = checkdate.Split('~')[1].ToString();
}
- mes = DeviceManagerBLL.DeviceCheckTakeOutExcel(wkshopcode, eqpcode, eqpname, stanedname, checkuser, checkopendate, checkclosedate);
+ mes = DeviceManagerBLL.DeviceCheckTakeOutExcel(stu_torgcode, description,wkshopcode, eqpcode, eqpname, stanedname, checkuser, checkopendate, checkclosedate);
return TJson.toJson(mes);
}
#endregion
@@ -728,6 +740,8 @@
[HttpGet]
public HttpResponseMessage DeviceRepairTakeSearch(int page, int rows, string prop, string order, string wkshopcode = null, string eqpcode = null, string eqpname = null, string stanedname = null, string repairuser = null, string repairdate = null,string repairresult=null)
{
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
string repairopendate = ""; //鐐规寮�濮嬫椂闂�
string repairclosedate = ""; //鐐规缁撴潫鏃堕棿
if (repairdate != "" && repairdate != null)
@@ -737,7 +751,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = DeviceManagerBLL.DeviceRepairTakeSearch(wkshopcode, eqpcode, eqpname, stanedname, repairuser, repairopendate, repairclosedate, repairresult, startNum, endNum, prop, order);
+ mes = DeviceManagerBLL.DeviceRepairTakeSearch(stu_torgcode, description, wkshopcode, eqpcode, eqpname, stanedname, repairuser, repairopendate, repairclosedate, repairresult, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -773,6 +787,8 @@
[HttpGet]
public HttpResponseMessage DeviceRepairTakeOutExcel(string wkshopcode = null, string eqpcode = null, string eqpname = null, string stanedname = null, string repairuser = null, string repairdate = null, string repairresult = null)
{
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
string repairopendate = ""; //鐐规寮�濮嬫椂闂�
string repairclosedate = ""; //鐐规缁撴潫鏃堕棿
if (repairdate != "" && repairdate != null)
@@ -780,7 +796,7 @@
repairopendate = repairdate.Split('~')[0].ToString();
repairclosedate = repairdate.Split('~')[1].ToString();
}
- mes = DeviceManagerBLL.DeviceRepairTakeOutExcel(wkshopcode, eqpcode, eqpname, stanedname, repairuser, repairopendate, repairclosedate, repairresult);
+ mes = DeviceManagerBLL.DeviceRepairTakeOutExcel(stu_torgcode, description,wkshopcode, eqpcode, eqpname, stanedname, repairuser, repairopendate, repairclosedate, repairresult);
return TJson.toJson(mes);
}
#endregion
@@ -808,6 +824,8 @@
[HttpGet]
public HttpResponseMessage DeviceUpdateSearch(int page, int rows, string prop, string order, string wkshopcode = null, string eqpcode = null, string eqpname = null, string reportuser = null, string repairuser = null,string vrifcatuser=null, string reportdate = null, string repairdate = null,string vrifcatdate=null)
{
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
string reportopendate = ""; //鎶ヤ慨寮�濮嬫椂闂�
string reportclosedate = ""; //鎶ヤ慨缁撴潫鏃堕棿
string repairopendate = ""; //缁翠慨寮�濮嬫椂闂�
@@ -831,7 +849,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = DeviceManagerBLL.DeviceUpdateSearch(wkshopcode, eqpcode, eqpname, reportuser, repairuser, vrifcatuser, reportopendate, reportclosedate, repairopendate, repairclosedate, vrifcatopendate, vrifcatclosedate, startNum, endNum, prop, order);
+ mes = DeviceManagerBLL.DeviceUpdateSearch(stu_torgcode, description,wkshopcode, eqpcode, eqpname, reportuser, repairuser, vrifcatuser, reportopendate, reportclosedate, repairopendate, repairclosedate, vrifcatopendate, vrifcatclosedate, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -869,6 +887,8 @@
[HttpGet]
public HttpResponseMessage DeviceUpdateOutExcel(string wkshopcode = null, string eqpcode = null, string eqpname = null, string reportuser = null, string repairuser = null, string vrifcatuser = null, string reportdate = null, string repairdate = null, string vrifcatdate = null)
{
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
string reportopendate = ""; //鎶ヤ慨寮�濮嬫椂闂�
string reportclosedate = ""; //鎶ヤ慨缁撴潫鏃堕棿
string repairopendate = ""; //缁翠慨寮�濮嬫椂闂�
@@ -890,7 +910,7 @@
vrifcatopendate = vrifcatdate.Split('~')[0].ToString();
vrifcatclosedate = vrifcatdate.Split('~')[1].ToString();
}
- mes = DeviceManagerBLL.DeviceUpdateOutExcel(wkshopcode, eqpcode, eqpname, reportuser, repairuser, vrifcatuser, reportopendate, reportclosedate, repairopendate, repairclosedate, vrifcatopendate, vrifcatclosedate);
+ mes = DeviceManagerBLL.DeviceUpdateOutExcel(stu_torgcode, description,wkshopcode, eqpcode, eqpname, reportuser, repairuser, vrifcatuser, reportopendate, reportclosedate, repairopendate, repairclosedate, vrifcatopendate, vrifcatclosedate);
return TJson.toJson(mes);
}
#endregion
diff --git a/VueWebApi/Controllers/LoginController.cs b/VueWebApi/Controllers/LoginController.cs
index 3e66357..b873add 100644
--- a/VueWebApi/Controllers/LoginController.cs
+++ b/VueWebApi/Controllers/LoginController.cs
@@ -50,23 +50,24 @@
ms.usercode = dt.Rows[0]["USERCODE"].ToString();
ms.username = dt.Rows[0]["USERNAME"].ToString();
ms.password = dt.Rows[0]["PASSWORD"].ToString();
+ ms.stu_torgcode= dt.Rows[0]["org_code"].ToString();
+ ms.description = dt.Rows[0]["description"].ToString()==null?"": dt.Rows[0]["description"].ToString();
+ ms.stu_torgname= dt.Rows[0]["org_name"].ToString();
ms.usertype = usertype;
- ms.rediskey = Enterprise+"LoginUserID" + ms.usertype + ms.userid;
+ ms.rediskey = Enterprise+ms.stu_torgcode+"LoginUserID" + ms.usertype + ms.userid;
mss.Add(ms);
HttpContext.Current.Session.Clear(); //浠庝細璇濈姸鎬侀泦鍚堜腑鍒犻櫎鎵�鏈夌殑閿��
- //HttpContext.Current.Session["User"] = JsonConvert.SerializeObject(ms);
- //User loginUser = JsonConvert.DeserializeObject<User>(HttpContext.Current.Session["User"].ToString());
User loginUser = JsonConvert.DeserializeObject<User>(JsonConvert.SerializeObject(ms));
//濡傛灉redis鐧诲綍鐢ㄦ埛涓笉瀛樺湪褰撳墠鐢ㄦ埛
- if (redis.Get<User>(Enterprise+"LoginUserID" + ms.usertype + ms.userid, 0) == null)
+ if (redis.Get<User>(Enterprise+ms.stu_torgcode+"LoginUserID" + ms.usertype + ms.userid, 0) == null)
{
//redis.Remove("LoginUserID" + ms.userid, 0);
//鍐欏叆redis(娉ㄦ剰锛歳edis绫婚噷闈㈢殑澶辨晥鏃堕棿蹇呴』鍦╧ey鍒涘缓瀹屾垚涔嬪悗鎵嶇敓鏁�)
- redis.Set<User>(Enterprise+"LoginUserID" + ms.usertype + ms.userid, ms, redis.secondsTimeOut, 0);
+ redis.Set<User>(Enterprise+ms.stu_torgcode+"LoginUserID" + ms.usertype + ms.userid, ms, redis.secondsTimeOut, 0);
//鐧诲綍淇℃伅鍐欏叆session
HttpContext.Current.Session["User"] = JsonConvert.SerializeObject(ms);
//鍐欏叆鐧诲綍鎿嶄綔璁板綍
- mes = LoginBLL.LoginBas(ms.usercode, ms.usertype);
+ mes = LoginBLL.LoginBas(ms.usercode, ms.usertype, ms.stu_torgcode);
mes.code = "200";
mes.Message = "鐧诲綍鎴愬姛!";
mes.data = ms;
@@ -74,9 +75,9 @@
else //濡傛灉瀛樺湪
{
//鑾峰彇redis涓綋鍓嶇敤鎴蜂俊鎭�
- User r_loginUser = redis.Get<User>(Enterprise+"LoginUserID" + ms.usertype + ms.userid, 0);
+ User r_loginUser = redis.Get<User>(Enterprise+ ms.stu_torgcode + "LoginUserID" + ms.usertype + ms.userid, 0);
//濡傛灉session涓殑鐢ㄦ埛usercode鍜宺edis涓殑鐢ㄦ埛usercode鍖归厤
- if ((r_loginUser.usercode + r_loginUser.usertype).Equals(loginUser.usercode + loginUser.usertype))
+ if ((r_loginUser.stu_torgcode+r_loginUser.usercode + r_loginUser.usertype).Equals(loginUser.stu_torgcode+loginUser.usercode + loginUser.usertype))
{
mes.data = ms;
mes.code = "302";
@@ -85,11 +86,11 @@
else
{
//閲嶇疆杩囨湡鏃堕棿(娉ㄦ剰锛歳edis绫婚噷闈㈢殑澶辨晥鏃堕棿蹇呴』鍦╧ey鍒涘缓瀹屾垚涔嬪悗鎵嶇敓鏁�)
- redis.Set<User>(Enterprise+"LoginUserID" + ms.usertype + loginUser.userid, loginUser, redis.secondsTimeOut, 0);
+ redis.Set<User>(Enterprise+ ms.stu_torgcode + "LoginUserID" + ms.usertype + loginUser.userid, loginUser, redis.secondsTimeOut, 0);
//鐧诲綍淇℃伅鍐欏叆session
HttpContext.Current.Session["User"] = JsonConvert.SerializeObject(ms);
//鍐欏叆鐧诲綍鎿嶄綔璁板綍
- mes = LoginBLL.LoginBas(ms.usercode, ms.usertype);
+ mes = LoginBLL.LoginBas(ms.usercode, ms.usertype, ms.stu_torgcode);
mes.data = ms;
mes.code = "200";
mes.Message = "鐧诲綍鎴愬姛!";
@@ -128,10 +129,11 @@
/// <param name="username">鐢ㄦ埛鍚�</param>
/// <param name="usertype">鎿嶄綔绔疨C/APP</param>
/// <param name="rid">rid鏋佸厜鎺ㄩ�佽幏鍙栬澶噄d</param>
+ /// <param name="stu_torgcode">鎵�灞炵粍缁囩紪鐮�</param>
/// <returns></returns>
[Route(template: "ForcedOffline")]
[HttpPost]
- public HttpResponseMessage ForcedOffline(int userid, string usercode, string username, string usertype,string rid)
+ public HttpResponseMessage ForcedOffline(int userid, string usercode, string username, string usertype,string rid,string stu_torgcode)
{
string sql="";
List<object> list = new List<object>();
@@ -140,14 +142,14 @@
if (usertype == "APP")
{
//鏇存柊rid
- sql = @"update [dbo].[TUser] set rid=@rid where usercode=@usercode";
- list.Add(new { str = sql, parm = new { rid = rid, usercode = username } });
+ sql = @"update [dbo].[TUser] set rid=@rid where usercode=@usercode and stu_torgcode=@stu_torgcode";
+ list.Add(new { str = sql, parm = new { rid = rid, usercode = username, stu_torgcode= stu_torgcode } });
bool aa = DapperHelper.DoTransaction(list);
- redis.Remove(Enterprise+"LoginUserID" + usertype + userid, 1); //鍒犻櫎redis
+ redis.Remove(Enterprise+ stu_torgcode + "LoginUserID" + usertype + userid, 1); //鍒犻櫎redis
}
else
{
- redis.Remove(Enterprise+"LoginUserID" + usertype + userid, 0); //鍒犻櫎redis
+ redis.Remove(Enterprise+ stu_torgcode + "LoginUserID" + usertype + userid, 0); //鍒犻櫎redis
}
mes.code = "200";
mes.count = 0;
@@ -216,15 +218,16 @@
/// <param name="usercode">鐢ㄦ埛缂栫爜</param>
/// <param name="username">鐢ㄦ埛鍚�</param>
/// <param name="usertype">鎿嶄綔绔疨C/APP</param>
+ /// <param name="stu_torgcode">鎵�灞炵粍缁囩紪鐮�</param>
/// <returns></returns>
[Route(template: "LoginOut")]
[HttpPost]
[ChannelActionFilter]
- public HttpResponseMessage LoginOut(int userid, string usercode, string username, string usertype)
+ public HttpResponseMessage LoginOut(int userid, string usercode, string username, string usertype,string stu_torgcode)
{
var sql = "";
List<object> list = new List<object>();
- mes = LoginBLL.LoginOut(userid, usercode, username, usertype);
+ mes = LoginBLL.LoginOut(userid, usercode, username, usertype, stu_torgcode);
return mes.ResponseMess(mes);
}
#endregion
@@ -257,24 +260,27 @@
ms.usercode = dt.Rows[0]["USERCODE"].ToString();
ms.username = dt.Rows[0]["USERNAME"].ToString();
ms.password = dt.Rows[0]["PASSWORD"].ToString();
+ ms.stu_torgcode = dt.Rows[0]["org_code"].ToString();
+ ms.description = dt.Rows[0]["description"].ToString() == null ? "" : dt.Rows[0]["description"].ToString();
+ ms.stu_torgname = dt.Rows[0]["org_name"].ToString();
ms.usertype = usertype;
- ms.rediskey = Enterprise+"LoginUserID" + ms.usertype + ms.userid;
+ ms.rediskey = Enterprise+ ms.stu_torgcode + "LoginUserID" + ms.usertype + ms.userid;
mss.Add(ms);
HttpContext.Current.Session.Clear(); //浠庝細璇濈姸鎬侀泦鍚堜腑鍒犻櫎鎵�鏈夌殑閿��
User loginUser = JsonConvert.DeserializeObject<User>(JsonConvert.SerializeObject(ms));
//濡傛灉redis鐧诲綍鐢ㄦ埛涓笉瀛樺湪褰撳墠鐢ㄦ埛
- if (redis.Get<User>(Enterprise+"LoginUserID" + ms.usertype + ms.userid, 1) == null)
+ if (redis.Get<User>(Enterprise+ ms.stu_torgcode + "LoginUserID" + ms.usertype + ms.userid, 1) == null)
{
//鍐欏叆redis(娉ㄦ剰锛歳edis绫婚噷闈㈢殑澶辨晥鏃堕棿蹇呴』鍦╧ey鍒涘缓瀹屾垚涔嬪悗鎵嶇敓鏁�)
- redis.Set<User>(Enterprise+"LoginUserID" + ms.usertype + ms.userid, ms, redis.secondsTimeOut, 1);
+ redis.Set<User>(Enterprise+ ms.stu_torgcode + "LoginUserID" + ms.usertype + ms.userid, ms, redis.secondsTimeOut, 1);
//鐧诲綍淇℃伅鍐欏叆session
HttpContext.Current.Session["User"] = JsonConvert.SerializeObject(ms);
//鏇存柊rid
- sql = @"update [dbo].[TUser] set rid=@rid where usercode=@usercode";
- list.Add(new { str = sql, parm = new { rid = rid, usercode = username } });
+ sql = @"update [dbo].[TUser] set rid=@rid where usercode=@usercode and stu_torgcode=@stu_torgcode";
+ list.Add(new { str = sql, parm = new { rid = rid, usercode = username, stu_torgcode= ms.stu_torgcode } });
bool aa = DapperHelper.DoTransaction(list);
//鍐欏叆鐧诲綍鎿嶄綔璁板綍
- mes = LoginBLL.LoginBas(ms.usercode, ms.usertype);
+ mes = LoginBLL.LoginBas(ms.usercode, ms.usertype, ms.stu_torgcode);
mes.code = "200";
mes.Message = "鐧诲綍鎴愬姛!";
mes.data = ms;
@@ -282,9 +288,9 @@
else //濡傛灉瀛樺湪
{
//鑾峰彇redis涓綋鍓嶇敤鎴蜂俊鎭�
- User r_loginUser = redis.Get<User>(Enterprise+"LoginUserID" + ms.usertype + ms.userid, 1);
+ User r_loginUser = redis.Get<User>(Enterprise+ ms.stu_torgcode + "LoginUserID" + ms.usertype + ms.userid, 1);
//濡傛灉session涓殑鐢ㄦ埛usercode鍜宺edis涓殑鐢ㄦ埛usercode鍖归厤
- if ((r_loginUser.usercode + r_loginUser.usertype).Equals(loginUser.usercode + loginUser.usertype))
+ if ((r_loginUser.stu_torgcode+r_loginUser.usercode + r_loginUser.usertype).Equals(loginUser.stu_torgcode+loginUser.usercode + loginUser.usertype))
{
mes.data = ms;
mes.code = "302";
@@ -293,15 +299,15 @@
else
{
//閲嶇疆杩囨湡鏃堕棿(娉ㄦ剰锛歳edis绫婚噷闈㈢殑澶辨晥鏃堕棿蹇呴』鍦╧ey鍒涘缓瀹屾垚涔嬪悗鎵嶇敓鏁�)
- redis.Set<User>(Enterprise+"LoginUserID" + ms.usertype + loginUser.userid, loginUser, redis.secondsTimeOut, 1);
+ redis.Set<User>(Enterprise+ ms.stu_torgcode + "LoginUserID" + ms.usertype + loginUser.userid, loginUser, redis.secondsTimeOut, 1);
//鐧诲綍淇℃伅鍐欏叆session
HttpContext.Current.Session["User"] = JsonConvert.SerializeObject(ms);
//鏇存柊rid
- sql = @"update [dbo].[TUser] set rid=@rid where usercode=@usercode";
- list.Add(new { str = sql, parm = new { rid = rid, usercode = username } });
+ sql = @"update [dbo].[TUser] set rid=@rid where usercode=@usercode and stu_torgcode=@stu_torgcode";
+ list.Add(new { str = sql, parm = new { rid = rid, usercode = username, stu_torgcode= ms.stu_torgcode } });
bool aa = DapperHelper.DoTransaction(list);
//鍐欏叆鐧诲綍鎿嶄綔璁板綍
- mes = LoginBLL.LoginBas(ms.usercode, ms.usertype);
+ mes = LoginBLL.LoginBas(ms.usercode, ms.usertype, ms.stu_torgcode);
mes.data = ms;
mes.code = "200";
mes.Message = "鐧诲綍鎴愬姛!";
diff --git a/VueWebApi/Controllers/ProductModelController.cs b/VueWebApi/Controllers/ProductModelController.cs
index dfa7877..7d3814c 100644
--- a/VueWebApi/Controllers/ProductModelController.cs
+++ b/VueWebApi/Controllers/ProductModelController.cs
@@ -279,7 +279,9 @@
[HttpGet]
public HttpResponseMessage InventoryFileAssociationRoute(string partcode)
{
- mes = ProductModelBLL.InventoryFileAssociationRoute(partcode);
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
+ mes = ProductModelBLL.InventoryFileAssociationRoute(stu_torgcode, stu_torgtypecode,partcode);
return TJson.toJson(mes);
}
#endregion
@@ -294,10 +296,12 @@
/// <returns></returns>
[Route(template: "SaveInventoryFile")]
[HttpPost]
- public HttpResponseMessage SaveInventoryFile(string partcode, List<ObjectData> json, string defaultroute_code = null)
+ public HttpResponseMessage SaveInventoryFile(string partcode, List<PartRout> json, string defaultroute_code = null)
{
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
- mes = ProductModelBLL.SaveInventoryFile(partcode, defaultroute_code, username, json);
+ mes = ProductModelBLL.SaveInventoryFile(stu_torgcode, stu_torgtypecode, partcode, defaultroute_code, username, json);
return TJson.toJson(mes);
}
#endregion
@@ -421,9 +425,9 @@
/// <returns></returns>
[Route(template: "StepSelect")]
[HttpGet]
- public HttpResponseMessage StepSelect()
+ public HttpResponseMessage StepSelect(string WorkShop)
{
- mes = ProductModelBLL.StepSelect();
+ mes = ProductModelBLL.StepSelect(WorkShop);
return TJson.toJson(mes);
}
#endregion
@@ -432,6 +436,7 @@
/// <summary>
/// 宸ヨ壓璺嚎鏌ヨ
/// </summary>
+ /// <param name="WorkShop">鎵�灞炶溅闂�</param>
/// <param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
/// <param name="routename">宸ヨ壓璺嚎鍚嶇О</param>
/// <param name="description">宸ヨ壓璺嚎鎻忚堪</param>
@@ -443,11 +448,13 @@
/// <returns></returns>
[Route(template: "RouteSearch")]
[HttpGet]
- public HttpResponseMessage RouteSearch(string routecode = null, string routename = null, string description = null, string createuser = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ public HttpResponseMessage RouteSearch(string WorkShop=null,string routecode = null, string routename = null, string description = null, string createuser = null, int page = 0, int rows = 0, string prop = null, string order = null)
{
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ProductModelBLL.RouteSearch(routecode, routename, description, createuser, startNum, endNum, prop, order);
+ mes = ProductModelBLL.RouteSearch(stu_torgcode, stu_torgtypecode, WorkShop, routecode, routename, description, createuser, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -506,6 +513,7 @@
/// <summary>
/// 宸ュ簭鏌ヨ
/// </summary>
+ /// <param name="WorkShop">鎵�灞炶溅闂�</param>
/// <param name="stepcode">宸ュ簭缂栫爜</param>
/// <param name="stepname">宸ュ簭鍚嶇О</param>
/// <param name="enable">鍚敤鐘舵��</param>
@@ -518,11 +526,13 @@
/// <returns></returns>
[Route(template: "StepSearch")]
[HttpGet]
- public HttpResponseMessage StepSearch(string stepcode = null, string stepname = null, string enable = null, string steptypecode = null, string createuser = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ public HttpResponseMessage StepSearch(string WorkShop=null, string stepcode = null, string stepname = null, string enable = null, string steptypecode = null, string createuser = null, int page = 0, int rows = 0, string prop = null, string order = null)
{
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ProductModelBLL.StepSearch(stepcode, stepname, enable, steptypecode, createuser, startNum, endNum, prop, order);
+ mes = ProductModelBLL.StepSearch(stu_torgcode, stu_torgtypecode, WorkShop, stepcode, stepname, enable, steptypecode, createuser, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -538,6 +548,7 @@
public HttpResponseMessage AddUpdateStep([FromBody] JObject obj)
{
string stepid = obj["id"].ToString(); //宸ュ簭id(涓婚敭)
+ string WorkShop = obj["WorkShop"].ToString(); //杞﹂棿缂栫爜
string stepcode = obj["stepcode"].ToString(); //宸ュ簭缂栫爜
string stepname = obj["stepname"].ToString(); //宸ュ簭鍚嶇О
string steptypecode = obj["steptypecode"].ToString(); //宸ュ簭绫诲瀷缂栫爜
@@ -545,7 +556,7 @@
string description = obj["description"].ToString(); //宸ュ簭鎻忚堪
var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
string OperType = obj["OperType"].ToString(); //鎿嶄綔绫诲瀷
- mes = ProductModelBLL.AddUpdateStep(stepid, stepcode, stepname, steptypecode, enable, description, username, OperType);
+ mes = ProductModelBLL.AddUpdateStep(stepid, WorkShop,stepcode, stepname, steptypecode, enable, description, username, OperType);
return TJson.toJson(mes);
}
#endregion
@@ -573,9 +584,9 @@
/// <returns></returns>
[Route(template: "StepAssociationEqp")]
[HttpGet]
- public HttpResponseMessage StepAssociationEqp(string stepcode)
+ public HttpResponseMessage StepAssociationEqp(string WorkShop, string stepcode)
{
- mes = ProductModelBLL.StepAssociationEqp(stepcode);
+ mes = ProductModelBLL.StepAssociationEqp(WorkShop,stepcode);
return TJson.toJson(mes);
}
#endregion
@@ -584,15 +595,16 @@
/// <summary>
/// 宸ュ簭瀹氫箟鍏宠仈宸ヤ綔绔欐彁浜�
/// </summary>
+ /// <param name="WorkShop">鎵�灞炵粍缁囩紪鐮�(杞﹂棿)</param>
/// <param name="stepcode">宸ュ簭缂栫爜</param>
/// <param name="json">鎻愪氦鏁版嵁</param>
/// <returns></returns>
[Route(template: "SaveStepAssociationEqp")]
[HttpPost]
- public HttpResponseMessage SaveStepAssociationEqp(string stepcode, List<ObjectData> json)
+ public HttpResponseMessage SaveStepAssociationEqp(string WorkShop, string stepcode, List<ObjectData> json)
{
var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
- mes = ProductModelBLL.SaveStepAssociationEqp(stepcode, username, json);
+ mes = ProductModelBLL.SaveStepAssociationEqp(WorkShop,stepcode, username, json);
return TJson.toJson(mes);
}
#endregion
@@ -605,9 +617,9 @@
/// <returns></returns>
[Route(template: "StepAssociationDefect")]
[HttpGet]
- public HttpResponseMessage StepAssociationDefect(string stepcode)
+ public HttpResponseMessage StepAssociationDefect(string WorkShop, string stepcode)
{
- mes = ProductModelBLL.StepAssociationDefect(stepcode);
+ mes = ProductModelBLL.StepAssociationDefect(WorkShop,stepcode);
return TJson.toJson(mes);
}
#endregion
@@ -621,10 +633,10 @@
/// <returns></returns>
[Route(template: "SaveStepAssociationDefect")]
[HttpPost]
- public HttpResponseMessage SaveStepAssociationDefect(string stepcode, List<ObjectData> json)
+ public HttpResponseMessage SaveStepAssociationDefect(string WorkShop, string stepcode, List<ObjectData> json)
{
var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
- mes = ProductModelBLL.SaveStepAssociationDefect(stepcode, username, json);
+ mes = ProductModelBLL.SaveStepAssociationDefect(WorkShop,stepcode, username, json);
return TJson.toJson(mes);
}
#endregion
@@ -665,7 +677,9 @@
{
try
{
- mes = ProductModelBLL.PartSelectRpute(partcode);
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
+ mes = ProductModelBLL.PartSelectRpute(stu_torgcode, stu_torgtypecode,partcode);
}
catch (Exception e)
{
@@ -756,9 +770,11 @@
[HttpGet]
public HttpResponseMessage BeatRateSearch(string partcode = null, string routecode = null, string stepcode = null, string eqpcode = null,int page = 0, int rows = 0, string prop = null, string order = null)
{
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ProductModelBLL.BeatRateSearch(partcode,routecode, stepcode, eqpcode, startNum, endNum, prop, order);
+ mes = ProductModelBLL.BeatRateSearch(stu_torgcode, stu_torgtypecode,partcode, routecode, stepcode, eqpcode, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
diff --git a/VueWebApi/Controllers/ProductionManagementController.cs b/VueWebApi/Controllers/ProductionManagementController.cs
index 1acdf21..382a4fe 100644
--- a/VueWebApi/Controllers/ProductionManagementController.cs
+++ b/VueWebApi/Controllers/ProductionManagementController.cs
@@ -47,6 +47,8 @@
[HttpGet]
public HttpResponseMessage ErpOrderSearch(string erporderstus = null, string erpordercode = null, string partcode = null, string partname = null, string partspec = null, string paystartdate = null, string payenddate = null, string creatuser = null, int page = 0, int rows = 0, string prop = null, string order = null)
{
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
string paydatestartdate = ""; //棰勮寮�宸ュ紑濮嬫椂闂�
string paydateenddate = ""; //棰勮寮�宸ョ粨鏉熸椂闂�
string paydatestartdate1 = ""; //棰勮瀹屽伐寮�濮嬫椂闂�
@@ -63,7 +65,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ProductionManagementBLL.ErpOrderSearch(erporderstus, erpordercode, partcode, partname, partspec, startNum, paydatestartdate, paydateenddate, paydatestartdate1, paydateenddate2, creatuser, endNum, prop, order);
+ mes = ProductionManagementBLL.ErpOrderSearch(stu_torgcode, stu_torgtypecode,erporderstus, erpordercode, partcode, partname, partspec, startNum, paydatestartdate, paydateenddate, paydatestartdate1, paydateenddate2, creatuser, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -136,9 +138,11 @@
[HttpGet]
public HttpResponseMessage MesOrderSearch(int page, int rows, string prop, string order, 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)
{
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ProductionManagementBLL.MesOrderSearch(mesorderstus, mesordercode, sourceorder, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
+ mes = ProductionManagementBLL.MesOrderSearch(stu_torgcode, stu_torgtypecode,mesorderstus, mesordercode, sourceorder, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -175,12 +179,13 @@
/// 浜у搧缂栫爜鏌ユ壘宸ヨ壓璺嚎涓嬫媺鎺ュ彛
/// </summary>
/// <param name="partcode">浜у搧缂栫爜</param>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <returns></returns>
[Route(template: "PartSelectRoute")]
[HttpGet]
- public HttpResponseMessage PartSelectRoute(string partcode)
+ public HttpResponseMessage PartSelectRoute(string partcode,string wkshopcode)
{
- mes = ProductionManagementBLL.PartSelectRoute(partcode);
+ mes = ProductionManagementBLL.PartSelectRoute(partcode, wkshopcode);
return TJson.toJson(mes);
}
#endregion
@@ -190,13 +195,14 @@
/// 浜у搧+宸ヨ壓璺嚎鏌ユ壘杞﹂棿涓嬫媺鎺ュ彛
/// </summary>
/// <param name="partcode">浜у搧缂栫爜</param>
- /// <param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
/// <returns></returns>
[Route(template: "RouteSelectWkshop")]
[HttpGet]
- public HttpResponseMessage RouteSelectWkshop(string partcode, string routecode)
+ public HttpResponseMessage RouteSelectWkshop(string partcode)
{
- mes = ProductionManagementBLL.RouteSelectWkshop(partcode, routecode);
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
+ mes = ProductionManagementBLL.RouteSelectWkshop(stu_torgcode, stu_torgtypecode,partcode);
return TJson.toJson(mes);
}
#endregion
@@ -387,9 +393,11 @@
[HttpGet]
public HttpResponseMessage MesOrderStepSearch(string orderstepqrcode = null, int page = 0, int rows = 0, string prop = null, string order = null)
{
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ProductionManagementBLL.MesOrderStepSearch(orderstepqrcode, startNum, endNum, prop, order);
+ mes = ProductionManagementBLL.MesOrderStepSearch(stu_torgcode, stu_torgtypecode,orderstepqrcode, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -408,9 +416,11 @@
[HttpGet]
public HttpResponseMessage MesOrderWxStepSearch(string orderstepqrcode = null, int page = 0, int rows = 0, string prop = null, string order = null)
{
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ProductionManagementBLL.MesOrderWxStepSearch(orderstepqrcode, startNum, endNum, prop, order);
+ mes = ProductionManagementBLL.MesOrderWxStepSearch(stu_torgcode, stu_torgtypecode,orderstepqrcode, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -429,9 +439,11 @@
[HttpGet]
public HttpResponseMessage MesOrderNgStepSearch(string orderstepqrcode = null, int page = 0, int rows = 0, string prop = null, string order = null)
{
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ProductionManagementBLL.MesOrderNgStepSearch(orderstepqrcode, startNum, endNum, prop, order);
+ mes = ProductionManagementBLL.MesOrderNgStepSearch(stu_torgcode, stu_torgtypecode,orderstepqrcode, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -487,12 +499,15 @@
/// <summary>
/// 鐢熶骇寮�鎶ュ伐锛氭姤宸ユ椂鑾峰彇鐢熶骇鐝粍涓嬫媺妗�
/// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <returns></returns>
[Route(template: "MesOrderStepReportSelectUserGroup")]
[HttpGet]
- public HttpResponseMessage MesOrderStepReportSelectUserGroup()
+ public HttpResponseMessage MesOrderStepReportSelectUserGroup(string wkshopcode)
{
- mes = ProductionManagementBLL.MesOrderStepReportSelectUserGroup();
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
+ mes = ProductionManagementBLL.MesOrderStepReportSelectUserGroup(stu_torgcode, stu_torgtypecode,wkshopcode);
return TJson.toJson(mes);
}
#endregion
@@ -761,9 +776,11 @@
[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)
{
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
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);
+ mes = ProductionManagementBLL.MesOrderBitchClosedSearch(stu_torgcode, stu_torgtypecode,mesorderstus, mesordercode, sourceorder, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
diff --git a/VueWebApi/Controllers/QualityManagementController.cs b/VueWebApi/Controllers/QualityManagementController.cs
index 9b7e4fe..81b6add 100644
--- a/VueWebApi/Controllers/QualityManagementController.cs
+++ b/VueWebApi/Controllers/QualityManagementController.cs
@@ -124,12 +124,13 @@
/// <summary>
/// 宸ュ簭妫�楠屾爣鍑嗘柊澧炪�佺紪杈戣幏鍙栨楠岄」鐩笅鎷夊垪琛�
/// </summary>
+ /// <param name="WorkShop">杞﹂棿缂栫爜</param>
/// <returns></returns>
[Route(template: "StepCheckItemSelect")]
[HttpGet]
- public HttpResponseMessage StepCheckItemSelect()
+ public HttpResponseMessage StepCheckItemSelect(string WorkShop)
{
- mes = QualityManagementBLL.StepCheckItemSelect();
+ mes = QualityManagementBLL.StepCheckItemSelect(WorkShop);
return TJson.toJson(mes);
}
#endregion
@@ -184,9 +185,11 @@
[HttpGet]
public HttpResponseMessage StepCheckItemSearch(string itemcode = null, string itemname = null, string itemdescr = null, int page = 0, int rows = 0, string prop = null, string order = null)
{
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = QualityManagementBLL.StepCheckItemSearch(itemcode, itemname, itemdescr, startNum, endNum, prop, order);
+ mes = QualityManagementBLL.StepCheckItemSearch(stu_torgcode, stu_torgtypecode,itemcode, itemname, itemdescr, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -201,12 +204,13 @@
[HttpPost]
public HttpResponseMessage AddUpdateStepCheckItem([FromBody] JObject obj)
{
+ string wkshopcode = obj["wkshopcode"].ToString(); //杞﹂棿缂栫爜
string checkitemcode = obj["checkitemcode"].ToString(); //宸ュ簭妫�楠岄」鐩唬鐮�
string checkitemname = obj["checkitemname"].ToString(); //宸ュ簭妫�楠岄」鐩悕绉�
string checkitemdescr = obj["checkitemdescr"].ToString(); //宸ュ簭妫�楠岄」鐩弿杩�
string opertype = obj["OperType"].ToString(); //鎿嶄綔绫诲瀷
var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
- mes = QualityManagementBLL.AddUpdateStepCheckItem(checkitemcode, checkitemname, checkitemdescr, opertype, username);
+ mes = QualityManagementBLL.AddUpdateStepCheckItem(wkshopcode,checkitemcode, checkitemname, checkitemdescr, opertype, username);
return TJson.toJson(mes);
}
#endregion
@@ -314,9 +318,11 @@
[HttpGet]
public HttpResponseMessage QualityInspectionSearch(string qualityinsptcode = null, string qualityinsptname = null, string status=null, string checktype=null,string sampltype=null,string suitobject = null, int page = 0, int rows = 0, string prop = null, string order = null)
{
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = QualityManagementBLL.QualityInspectionSearch(qualityinsptcode, qualityinsptname, status, checktype, sampltype, suitobject, startNum, endNum, prop, order);
+ mes = QualityManagementBLL.QualityInspectionSearch(stu_torgcode, stu_torgtypecode,qualityinsptcode, qualityinsptname, status, checktype, sampltype, suitobject, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -346,6 +352,7 @@
[HttpPost]
public HttpResponseMessage QualityInspectionAddEditSave([FromBody] JObject obj)
{
+ string wkshopcode= obj["wkshopcode"].ToString(); //杞﹂棿缂栫爜
string qualityinsptcode = obj["qualityinsptcode"].ToString(); //璐ㄦ鏂规缂栫爜
string qualityinsptname = obj["qualityinsptname"].ToString(); //璐ㄦ鏂规鍚嶇О
string status = obj["status"].ToString(); //鏈夋晥鐘舵��
@@ -359,7 +366,7 @@
string checkitem = obj["checkitem"].ToString(); //璐ㄦ鍒楄〃
string type = obj["type"].ToString(); //鎿嶄綔绫诲瀷
var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
- mes = QualityManagementBLL.QualityInspectionAddEditSave(qualityinsptcode, qualityinsptname, status,checktype,sampmethod,sampscare,suitobject,suitpart,descr, stepcode, checkitem,type,username);
+ mes = QualityManagementBLL.QualityInspectionAddEditSave(wkshopcode,qualityinsptcode, qualityinsptname, status,checktype,sampmethod,sampscare,suitobject,suitpart,descr, stepcode, checkitem,type,username);
return TJson.toJson(mes);
}
#endregion
diff --git a/VueWebApi/Controllers/ReportManagerController.cs b/VueWebApi/Controllers/ReportManagerController.cs
index 60100a0..1090f4b 100644
--- a/VueWebApi/Controllers/ReportManagerController.cs
+++ b/VueWebApi/Controllers/ReportManagerController.cs
@@ -23,6 +23,7 @@
/// <summary>
/// 濮斿鎶ヨ〃璁板綍鏌ヨ
/// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
@@ -38,7 +39,7 @@
/// <returns></returns>
[Route(template: "OutSourceReportSearch")]
[HttpGet]
- public HttpResponseMessage OutSourceReportSearch(int page, int rows, string prop, string order, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string suppername = null, string type = null,string receivdate=null)
+ public HttpResponseMessage OutSourceReportSearch(int page, int rows, string prop, string order,string wkshopcode=null, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string suppername = null, string type = null,string receivdate=null)
{
string receivopendate = ""; //鏀舵枡寮�濮嬫椂闂�
string receivclosedate = ""; //鏀舵枡缁撴潫鏃堕棿
@@ -49,7 +50,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ReportManagerBLL.OutSourceReportSearch(wocode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate, startNum, endNum, prop, order);
+ mes = ReportManagerBLL.OutSourceReportSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -58,6 +59,7 @@
/// <summary>
/// 濮斿鎶ヨ〃璁板綍瀵煎嚭
/// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
@@ -69,7 +71,7 @@
/// <returns></returns>
[Route(template: "OutSourceReportExcelSearch")]
[HttpGet]
- public HttpResponseMessage OutSourceReportExcelSearch(string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string suppername = null, string type = null, string receivdate = null)
+ public HttpResponseMessage OutSourceReportExcelSearch(string wkshopcode = null, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string suppername = null, string type = null, string receivdate = null)
{
string receivopendate = ""; //鏀舵枡寮�濮嬫椂闂�
string receivclosedate = ""; //鏀舵枡缁撴潫鏃堕棿
@@ -78,7 +80,7 @@
receivopendate = receivdate.Split('~')[0].ToString();
receivclosedate = receivdate.Split('~')[1].ToString();
}
- mes = ReportManagerBLL.OutSourceReportExcelSearch(wocode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate);
+ mes = ReportManagerBLL.OutSourceReportExcelSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate);
return TJson.toJson(mes);
}
#endregion
@@ -89,6 +91,7 @@
/// <summary>
/// 鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ヨ
/// </summary>
+ /// <param name=" wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
@@ -106,7 +109,7 @@
/// <returns></returns>
[Route(template: "GroupSalaryReportSearch")]
[HttpGet]
- public HttpResponseMessage GroupSalaryReportSearch(int page, int rows, string prop, string order,string compute, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string username = null, string operdate = null,string rejectstepcode=null)
+ public HttpResponseMessage GroupSalaryReportSearch(int page, int rows, string prop, string order, string compute, string wkshopcode = null, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string username = null, string operdate = null,string rejectstepcode=null)
{
string operopendate = ""; //鎶ュ伐寮�濮嬫椂闂�
string operclosedate = ""; //鎶ュ伐缁撴潫鏃堕棿
@@ -117,7 +120,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ReportManagerBLL.GroupSalaryReportSearch(compute,wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, rejectstepcode, startNum, endNum, prop, order);
+ mes = ReportManagerBLL.GroupSalaryReportSearch(wkshopcode,compute, wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, rejectstepcode, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -141,6 +144,7 @@
/// <summary>
/// 鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ヨ
/// </summary>
+ /// <param name=" wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
@@ -154,7 +158,7 @@
/// <returns></returns>
[Route(template: "GroupSalaryReportExcelSearch")]
[HttpGet]
- public HttpResponseMessage GroupSalaryReportExcelSearch(string compute, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string username = null, string operdate = null,string rejectstepcode=null)
+ public HttpResponseMessage GroupSalaryReportExcelSearch(string compute, string wkshopcode = null, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string username = null, string operdate = null,string rejectstepcode=null)
{
string operopendate = ""; //鎶ュ伐寮�濮嬫椂闂�
string operclosedate = ""; //鎶ュ伐缁撴潫鏃堕棿
@@ -163,7 +167,7 @@
operopendate = operdate.Split('~')[0].ToString();
operclosedate = operdate.Split('~')[1].ToString();
}
- mes = ReportManagerBLL.GroupSalaryReportExcelSearch(compute,wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, rejectstepcode);
+ mes = ReportManagerBLL.GroupSalaryReportExcelSearch(wkshopcode,compute, wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, rejectstepcode);
return TJson.toJson(mes);
}
#endregion
@@ -173,6 +177,7 @@
/// <summary>
/// 浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃
/// </summary>
+ /// <param name=" wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
@@ -190,7 +195,7 @@
/// <returns></returns>
[Route(template: "PeopleSalaryReportSearch")]
[HttpGet]
- public HttpResponseMessage PeopleSalaryReportSearch(int page, int rows, string prop, string order,string compute, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string reportname = null, string reportdate = null,string rejectstepcode=null)
+ public HttpResponseMessage PeopleSalaryReportSearch(int page, int rows, string prop, string order,string compute, string wkshopcode = null, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string reportname = null, string reportdate = null,string rejectstepcode=null)
{
string reportopendate = ""; //鎶ュ伐寮�濮嬫椂闂�
string reportclosedate = ""; //鎶ュ伐缁撴潫鏃堕棿
@@ -201,7 +206,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ReportManagerBLL.PeopleSalaryReportSearch(compute,wocode, partcode, partname, partspec, stepname, groupcode, reportname, reportopendate, reportclosedate, rejectstepcode, startNum, endNum, prop, order);
+ mes = ReportManagerBLL.PeopleSalaryReportSearch(wkshopcode,compute, wocode, partcode, partname, partspec, stepname, groupcode, reportname, reportopendate, reportclosedate, rejectstepcode, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -210,6 +215,7 @@
/// <summary>
/// 浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃瀵煎嚭
/// </summary>
+ /// <param name=" wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
@@ -223,7 +229,7 @@
/// <returns></returns>
[Route(template: "PeopleSalaryReportExcelSearch")]
[HttpGet]
- public HttpResponseMessage PeopleSalaryReportExcelSearch(string compute, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string reportname = null, string reportdate = null,string rejectstepcode=null)
+ public HttpResponseMessage PeopleSalaryReportExcelSearch(string compute, string wkshopcode = null, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string reportname = null, string reportdate = null,string rejectstepcode=null)
{
string reportopendate = ""; //鎶ュ伐寮�濮嬫椂闂�
string reportclosedate = ""; //鎶ュ伐缁撴潫鏃堕棿
@@ -232,7 +238,7 @@
reportopendate = reportdate.Split('~')[0].ToString();
reportclosedate = reportdate.Split('~')[1].ToString();
}
- mes = ReportManagerBLL.PeopleSalaryReportExcelSearch(compute,wocode, partcode, partname, partspec, stepname, groupcode, reportname, reportopendate, reportclosedate, rejectstepcode);
+ mes = ReportManagerBLL.PeopleSalaryReportExcelSearch(wkshopcode,compute, wocode, partcode, partname, partspec, stepname, groupcode, reportname, reportopendate, reportclosedate, rejectstepcode);
return TJson.toJson(mes);
}
#endregion
@@ -242,6 +248,7 @@
/// <summary>
/// 涓嶈壇鏄庣粏鎶ヨ〃
/// </summary>
+ /// <param name=" wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
@@ -258,7 +265,7 @@
/// <returns></returns>
[Route(template: "DefectDetailsReportSearch")]
[HttpGet]
- public HttpResponseMessage DefectDetailsReportSearch(int page, int rows, string prop, string order, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null,string defectcode=null,string defectname=null, string reportname = null, string reportdate = null)
+ public HttpResponseMessage DefectDetailsReportSearch(int page, int rows, string prop, string order,string wkshopcode=null, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null,string defectcode=null,string defectname=null, string reportname = null, string reportdate = null)
{
string reportopendate = ""; //鎶ュ伐寮�濮嬫椂闂�
string reportclosedate = ""; //鎶ュ伐缁撴潫鏃堕棿
@@ -269,7 +276,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ReportManagerBLL.DefectDetailsReportSearch(wocode, partcode, partname, partspec, stepname, defectcode, defectname, reportname, reportopendate, reportclosedate, startNum, endNum, prop, order);
+ mes = ReportManagerBLL.DefectDetailsReportSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, defectcode, defectname, reportname, reportopendate, reportclosedate, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -278,6 +285,7 @@
/// <summary>
/// 涓嶈壇鏄庣粏鎶ヨ〃瀵煎嚭
/// </summary>
+ /// <param name=" wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
@@ -290,7 +298,7 @@
/// <returns></returns>
[Route(template: "DefectDetailsReportExcelSearch")]
[HttpGet]
- public HttpResponseMessage DefectDetailsReportExcelSearch(string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string defectcode = null, string defectname = null, string reportname = null, string reportdate = null)
+ public HttpResponseMessage DefectDetailsReportExcelSearch(string wkshopcode=null, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string defectcode = null, string defectname = null, string reportname = null, string reportdate = null)
{
string reportopendate = ""; //鎶ュ伐寮�濮嬫椂闂�
string reportclosedate = ""; //鎶ュ伐缁撴潫鏃堕棿
@@ -299,7 +307,7 @@
reportopendate = reportdate.Split('~')[0].ToString();
reportclosedate = reportdate.Split('~')[1].ToString();
}
- mes = ReportManagerBLL.DefectDetailsReportExcelSearch(wocode, partcode, partname, partspec, stepname, defectcode, defectname, reportname, reportopendate, reportclosedate);
+ mes = ReportManagerBLL.DefectDetailsReportExcelSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, defectcode, defectname, reportname, reportopendate, reportclosedate);
return TJson.toJson(mes);
}
#endregion
@@ -324,6 +332,7 @@
/// <summary>
/// 缁翠慨鏄庣粏鎶ヨ〃
/// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栧彿</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
@@ -340,7 +349,7 @@
/// <returns></returns>
[Route(template: "MaintenanceDetailsReportSearch")]
[HttpGet]
- public HttpResponseMessage MaintenanceDetailsReportSearch(int page, int rows, string prop, string order, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string style = null, string defectname = null, string repairname = null, string repairdate = null)
+ public HttpResponseMessage MaintenanceDetailsReportSearch(int page, int rows, string prop, string order,string wkshopcode=null, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string style = null, string defectname = null, string repairname = null, string repairdate = null)
{
string repairopendate = ""; //缁翠慨寮�濮嬫椂闂�
string repairclosedate = ""; //缁翠慨缁撴潫鏃堕棿
@@ -351,7 +360,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ReportManagerBLL.MaintenanceDetailsReportSearch(wocode, partcode, partname, partspec, stepname, style, defectname, repairname, repairopendate, repairclosedate, startNum, endNum, prop, order);
+ mes = ReportManagerBLL.MaintenanceDetailsReportSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, style, defectname, repairname, repairopendate, repairclosedate, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -360,6 +369,7 @@
/// <summary>
/// 缁翠慨鏄庣粏鎶ヨ〃瀵煎嚭
/// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栧彿</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
@@ -372,7 +382,7 @@
/// <returns></returns>
[Route(template: "MaintenanceDetailsReportExcelSearch")]
[HttpGet]
- public HttpResponseMessage MaintenanceDetailsReportExcelSearch(string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string style = null, string defectname = null, string repairname = null, string repairdate = null)
+ public HttpResponseMessage MaintenanceDetailsReportExcelSearch(string wkshopcode = null, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string style = null, string defectname = null, string repairname = null, string repairdate = null)
{
string repairopendate = ""; //缁翠慨寮�濮嬫椂闂�
string repairclosedate = ""; //缁翠慨缁撴潫鏃堕棿
@@ -381,7 +391,7 @@
repairopendate = repairdate.Split('~')[0].ToString();
repairclosedate = repairdate.Split('~')[1].ToString();
}
- mes = ReportManagerBLL.MaintenanceDetailsReportExcelSearch(wocode, partcode, partname, partspec, stepname, style, defectname, repairname, repairopendate, repairclosedate);
+ mes = ReportManagerBLL.MaintenanceDetailsReportExcelSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, style, defectname, repairname, repairopendate, repairclosedate);
return TJson.toJson(mes);
}
#endregion
@@ -596,6 +606,7 @@
/// <summary>
/// 鐢熶骇杩涘害鎶ヨ〃
/// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="status">宸ュ崟鐘舵��</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
@@ -611,7 +622,7 @@
/// <returns></returns>
[Route(template: "ProductionScheduleReportSearch")]
[HttpGet]
- public HttpResponseMessage ProductionScheduleReportSearch(int page, int rows, string prop, string order,string status=null, string wocode = null, string routecode = null, string routename = null, string partcode = null, string partname = null, string partspec = null,string lm_date=null)
+ public HttpResponseMessage ProductionScheduleReportSearch(int page, int rows, string prop, string order, string wkshopcode=null, string status=null, string wocode = null, string routecode = null, string routename = null, string partcode = null, string partname = null, string partspec = null,string lm_date=null)
{
string opendate = ""; //寮�濮嬫椂闂�
string closedate = ""; //缁撴潫鏃堕棿
@@ -622,7 +633,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ReportManagerBLL.ProductionScheduleReportSearch(status,wocode, routecode, routename, partcode, partname, partspec, opendate, closedate, startNum, endNum, prop, order);
+ mes = ReportManagerBLL.ProductionScheduleReportSearch(wkshopcode,status, wocode, routecode, routename, partcode, partname, partspec, opendate, closedate, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -631,6 +642,7 @@
/// <summary>
/// 鐢熶骇杩涘害鎶ヨ〃瀵煎嚭
/// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="status">宸ュ崟鐘舵��</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
@@ -642,7 +654,7 @@
/// <returns></returns>
[Route(template: "ProductionScheduleReportExcelSearch")]
[HttpGet]
- public HttpResponseMessage ProductionScheduleReportExcelSearch(string status = null, string wocode = null, string routecode = null, string routename = null, string partcode = null, string partname = null, string partspec = null, string lm_date = null)
+ public HttpResponseMessage ProductionScheduleReportExcelSearch(string wkshopcode=null, string status = null, string wocode = null, string routecode = null, string routename = null, string partcode = null, string partname = null, string partspec = null, string lm_date = null)
{
string opendate = ""; //寮�濮嬫椂闂�
string closedate = ""; //缁撴潫鏃堕棿
@@ -651,7 +663,7 @@
opendate = lm_date.Split('~')[0].ToString();
closedate = lm_date.Split('~')[1].ToString();
}
- mes = ReportManagerBLL.ProductionScheduleReportExcelSearch(status,wocode, routecode, routename, partcode, partname, partspec, opendate, closedate);
+ mes = ReportManagerBLL.ProductionScheduleReportExcelSearch(wkshopcode,status, wocode, routecode, routename, partcode, partname, partspec, opendate, closedate);
return TJson.toJson(mes);
}
#endregion
diff --git a/VueWebApi/DLL/BLL/BaseDateBLL.cs b/VueWebApi/DLL/BLL/BaseDateBLL.cs
index 9c61535..e4dfda7 100644
--- a/VueWebApi/DLL/BLL/BaseDateBLL.cs
+++ b/VueWebApi/DLL/BLL/BaseDateBLL.cs
@@ -65,6 +65,19 @@
}
#endregion
+ #region[閫氳繃閫夋嫨鐨勬墍灞炵粍缁囨煡璇㈡墍灞炵彮缁刔
+ public static ToMessage StorgGroupSelect(string stu_torgcode, string description)
+ {
+ return BaseDateDAL.StorgGroupSelect(stu_torgcode, description);
+ }
+ #endregion
+
+ #region[閫氳繃閫夋嫨鐨勬墍灞炵粍缁囨煡璇㈡墍灞炶鑹茬被鍨媇
+ public static ToMessage StorgRoleSelect(string stu_torgcode, string description)
+ {
+ return BaseDateDAL.StorgRoleSelect(stu_torgcode, description);
+ }
+ #endregion
#region[ERP鐢熶骇杞﹂棿/閮ㄩ棬淇℃伅鏌ヨ]
diff --git a/VueWebApi/DLL/BLL/BasicSettingBLL.cs b/VueWebApi/DLL/BLL/BasicSettingBLL.cs
index bd73b48..cf700f7 100644
--- a/VueWebApi/DLL/BLL/BasicSettingBLL.cs
+++ b/VueWebApi/DLL/BLL/BasicSettingBLL.cs
@@ -12,9 +12,9 @@
public class BasicSettingBLL
{
#region [缁勭粐鏋舵瀯鏁版嵁鏌ヨ]
- public static ToMessage OrganizationSearch(string orgCode, string orgName, string orgType, string userName, int startNum, int endNum, string prop, string order)
+ public static ToMessage OrganizationSearch(string stu_torgcode,string description, string orgCode, string orgName, string orgType, string userName, int startNum, int endNum, string prop, string order)
{
- return BasicSettingDAL.OrganizationSearch(orgCode, orgName, orgType, userName, startNum, endNum, prop, order);
+ return BasicSettingDAL.OrganizationSearch(stu_torgcode, description, orgCode, orgName, orgType, userName, startNum, endNum, prop, order);
}
#endregion
@@ -43,23 +43,23 @@
#region[鐢ㄦ埛娓呭崟鏁版嵁鏌ヨ]
- public static ToMessage UserSearch(string UserCode, string UserName, string StuOrg, string wagetype, string Enable, int startNum, int endNum, string prop, string order)
+ public static ToMessage UserSearch(string UserCode, string UserName, string StuOrg,string description, string wagetype, string Enable, int startNum, int endNum, string prop, string order)
{
- return BasicSettingDAL.UserSearch(UserCode, UserName, StuOrg, wagetype, Enable, startNum, endNum, prop, order);
+ return BasicSettingDAL.UserSearch(UserCode, UserName, StuOrg, description, wagetype, Enable, startNum, endNum, prop, order);
}
#endregion
#region [鐢ㄦ埛鎵�灞炵粍缁嘳
- public static ToMessage UserOrganization()
+ public static ToMessage UserOrganization(string stu_torgcode,string description)
{
- return BasicSettingDAL.UserOrganization();
+ return BasicSettingDAL.UserOrganization(stu_torgcode, description);
}
#endregion
#region[鐢ㄦ埛鎵�灞炵彮缁刔
- public static ToMessage UserGroup()
+ public static ToMessage UserGroup(string stu_torgcode,string description)
{
- return BasicSettingDAL.UserGroup();
+ return BasicSettingDAL.UserGroup(stu_torgcode, description);
}
#endregion
@@ -78,16 +78,16 @@
#endregion
#region[鐢ㄦ埛娓呭崟鍏宠仈瑙掕壊鏌ヨ]
- public static ToMessage UserAssociationRole(string usercode)
+ public static ToMessage UserAssociationRole(string usercode,string stu_torgcode,string description)
{
- return BasicSettingDAL.UserAssociationRole(usercode);
+ return BasicSettingDAL.UserAssociationRole(usercode, stu_torgcode, description);
}
#endregion
#region[鐢ㄦ埛娓呭崟鍏宠仈瑙掕壊淇濆瓨]
- public static ToMessage SaveUserAssoctRole(string usercode, List<RoleUserSubmit> json)
+ public static ToMessage SaveUserAssoctRole(string usercode,string stu_torgcode,string description, List<RoleUserSubmit> json)
{
- return BasicSettingDAL.SaveUserAssoctRole(usercode, json);
+ return BasicSettingDAL.SaveUserAssoctRole(usercode, stu_torgcode, description, json);
}
#endregion
@@ -100,9 +100,9 @@
#region[鐢ㄦ埛缁勫垪琛ㄦ煡璇
- public static ToMessage UserGroupSearch(int startNum, int endNum, string prop, string order)
+ public static ToMessage UserGroupSearch(string stu_torgcode,string description,int startNum, int endNum, string prop, string order)
{
- return BasicSettingDAL.UserGroupSearch(startNum, endNum, prop, order);
+ return BasicSettingDAL.UserGroupSearch(stu_torgcode, description,startNum, endNum, prop, order);
}
#endregion
@@ -122,9 +122,9 @@
#region[瑙掕壊绫诲瀷鏌ヨ]
- public static ToMessage RoleTypeSearch(int startNum, int endNum, string prop, string order)
+ public static ToMessage RoleTypeSearch(string stu_torgcode, string description,int startNum, int endNum, string prop, string order)
{
- return BasicSettingDAL.RoleTypeSearch(startNum, endNum, prop, order);
+ return BasicSettingDAL.RoleTypeSearch(stu_torgcode, description, startNum, endNum, prop, order);
}
#endregion
@@ -143,16 +143,16 @@
#endregion
#region[瑙掕壊绫诲瀷涓嬫媺鎺ュ彛]
- public static ToMessage RoleTypeSelect()
+ public static ToMessage RoleTypeSelect(string stu_torgcode,string description)
{
- return BasicSettingDAL.RoleTypeSelect();
+ return BasicSettingDAL.RoleTypeSelect(stu_torgcode, description);
}
#endregion
#region[瑙掕壊娓呭崟鏌ヨ]
- public static ToMessage RoleSearch(string RoleCode, string RoleName, string RoleTypeCode, string CreateUser, int startNum, int endNum, string prop, string order)
+ public static ToMessage RoleSearch(string stu_torgcode,string description,string RoleCode, string RoleName, string RoleTypeCode, string CreateUser, int startNum, int endNum, string prop, string order)
{
- return BasicSettingDAL.RoleSearch(RoleCode, RoleName, RoleTypeCode, CreateUser, startNum, endNum, prop, order);
+ return BasicSettingDAL.RoleSearch(stu_torgcode, description,RoleCode, RoleName, RoleTypeCode, CreateUser, startNum, endNum, prop, order);
}
#endregion
@@ -164,9 +164,9 @@
#endregion
#region[瑙掕壊娓呭崟鏂板缂栬緫]
- public static ToMessage AddUpdateRole(string RoleId, string RoleCode, string RoleName, string RoleTypeCode, string description, string Usercode, string OperType)
+ public static ToMessage AddUpdateRole(string RoleId, string RoleCode, string RoleName,string stu_torgcode, string RoleTypeCode, string description, string Usercode, string OperType)
{
- return BasicSettingDAL.AddUpdateRole(RoleId, RoleCode, RoleName, RoleTypeCode, description, Usercode, OperType);
+ return BasicSettingDAL.AddUpdateRole(RoleId, RoleCode, RoleName, stu_torgcode, RoleTypeCode, description, Usercode, OperType);
}
#endregion
@@ -230,6 +230,13 @@
+ #region[瀹夌伅绯荤粺/杞﹂棿鏌ヨ]
+ public static ToMessage AnDengShopSearch(string stu_torgcode,string description)
+ {
+ return BasicSettingDAL.AnDengShopSearch(stu_torgcode, description);
+ }
+ #endregion
+
#region[瀹夌伅绯荤粺/鑷畾涔夊畨鐏懠鍙被鍨嬫煡璇
public static ToMessage AnDengTypeSearch()
{
diff --git a/VueWebApi/DLL/BLL/DeviceManagerBLL.cs b/VueWebApi/DLL/BLL/DeviceManagerBLL.cs
index 6c7b70f..738a7e0 100644
--- a/VueWebApi/DLL/BLL/DeviceManagerBLL.cs
+++ b/VueWebApi/DLL/BLL/DeviceManagerBLL.cs
@@ -69,9 +69,9 @@
#endregion
#region[鎵�灞炶溅闂翠笅鎷夋帴鍙
- public static ToMessage WorkShopSelect()
+ public static ToMessage WorkShopSelect(string stu_torgcode,string description)
{
- return DeviceManagerDAL.WorkShopSelect();
+ return DeviceManagerDAL.WorkShopSelect(stu_torgcode, description);
}
#endregion
@@ -83,9 +83,9 @@
#endregion
#region [璁惧娓呭崟鏌ヨ]
- public static ToMessage DeviceMangerSearch(string deviceCode, string deviceName, string status, string workShop, string deviceType, string deviceGroup, int startNum, int endNum, string prop, string order)
+ public static ToMessage DeviceMangerSearch(string stu_torgcode,string description,string deviceCode, string deviceName, string status, string workShop, string deviceType, string deviceGroup, int startNum, int endNum, string prop, string order)
{
- return DeviceManagerDAL.DeviceMangerSearch(deviceCode, deviceName, status, workShop, deviceType, deviceGroup, startNum, endNum, prop, order);
+ return DeviceManagerDAL.DeviceMangerSearch(stu_torgcode, description,deviceCode, deviceName, status, workShop, deviceType, deviceGroup, startNum, endNum, prop, order);
}
#endregion
@@ -187,9 +187,9 @@
#endregion
#region[璁惧鐐规鏍囧噯鍏宠仈宸ヤ綔绔欐煡璇
- public static ToMessage DeviceCheckStanedAssociationEqp(string checkstand_code)
+ public static ToMessage DeviceCheckStanedAssociationEqp(string stu_torgcode,string description,string checkstand_code)
{
- return DeviceManagerDAL.DeviceCheckStanedAssociationEqp(checkstand_code);
+ return DeviceManagerDAL.DeviceCheckStanedAssociationEqp(stu_torgcode, description,checkstand_code);
}
#endregion
@@ -238,9 +238,9 @@
#endregion
#region[璁惧淇濆吇鏍囧噯鍏宠仈宸ヤ綔绔欐煡璇
- public static ToMessage DeviceRepairStanedAssociationEqp(string repairstand_code)
+ public static ToMessage DeviceRepairStanedAssociationEqp(string stu_torgcode,string description,string repairstand_code)
{
- return DeviceManagerDAL.DeviceRepairStanedAssociationEqp(repairstand_code);
+ return DeviceManagerDAL.DeviceRepairStanedAssociationEqp(stu_torgcode, description,repairstand_code);
}
#endregion
@@ -254,9 +254,9 @@
#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)
+ public static ToMessage DeviceCheckTakeSearch(string stu_torgcode,string description,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);
+ return DeviceManagerDAL.DeviceCheckTakeSearch(stu_torgcode, description,wkshopcode, eqpcode, eqpname, stanedname, checkuser, checkopendate, checkclosedate, startNum, endNum, prop, order);
}
#endregion
@@ -268,18 +268,18 @@
#endregion
#region[璁惧鐐规璁板綍瀵煎嚭]
- public static ToMessage DeviceCheckTakeOutExcel(string wkshopcode, string eqpcode, string eqpname, string stanedname, string checkuser, string checkopendate, string checkclosedate)
+ public static ToMessage DeviceCheckTakeOutExcel(string stu_torgcode,string description,string wkshopcode, string eqpcode, string eqpname, string stanedname, string checkuser, string checkopendate, string checkclosedate)
{
- return DeviceManagerDAL.DeviceCheckTakeOutExcel(wkshopcode, eqpcode, eqpname, stanedname, checkuser, checkopendate, checkclosedate);
+ return DeviceManagerDAL.DeviceCheckTakeOutExcel(stu_torgcode, description,wkshopcode, eqpcode, eqpname, stanedname, checkuser, checkopendate, checkclosedate);
}
#endregion
#region[璁惧淇濆吇璁板綍鏌ヨ]
- public static ToMessage DeviceRepairTakeSearch(string wkshopcode, string eqpcode, string eqpname, string stanedname, string repairuser, string repairopendate, string repairclosedate, string repairresult, int startNum, int endNum, string prop, string order)
+ public static ToMessage DeviceRepairTakeSearch(string stu_torgcode,string description,string wkshopcode, string eqpcode, string eqpname, string stanedname, string repairuser, string repairopendate, string repairclosedate, string repairresult, int startNum, int endNum, string prop, string order)
{
- return DeviceManagerDAL.DeviceCheckTakeSearch(wkshopcode, eqpcode, eqpname, stanedname, repairuser, repairopendate, repairclosedate, repairresult, startNum, endNum, prop, order);
+ return DeviceManagerDAL.DeviceCheckTakeSearch(stu_torgcode, description,wkshopcode, eqpcode, eqpname, stanedname, repairuser, repairopendate, repairclosedate, repairresult, startNum, endNum, prop, order);
}
#endregion
@@ -291,18 +291,18 @@
#endregion
#region[璁惧淇濆吇璁板綍瀵煎嚭]
- public static ToMessage DeviceRepairTakeOutExcel(string wkshopcode, string eqpcode, string eqpname, string stanedname, string repairuser, string repairopendate, string repairclosedate, string repairresult)
+ public static ToMessage DeviceRepairTakeOutExcel(string stu_torgcode,string description,string wkshopcode, string eqpcode, string eqpname, string stanedname, string repairuser, string repairopendate, string repairclosedate, string repairresult)
{
- return DeviceManagerDAL.DeviceRepairTakeOutExcel(wkshopcode, eqpcode, eqpname, stanedname, repairuser, repairopendate, repairclosedate, repairresult);
+ return DeviceManagerDAL.DeviceRepairTakeOutExcel(stu_torgcode, description,wkshopcode, eqpcode, eqpname, stanedname, repairuser, repairopendate, repairclosedate, repairresult);
}
#endregion
#region[璁惧缁翠慨璁板綍鏌ヨ]
- public static ToMessage DeviceUpdateSearch(string wkshopcode, string eqpcode, string eqpname, string reportuser, string repairuser, string vrifcatuser, string reportopendate, string reportclosedate, string repairopendate, string repairclosedate, string vrifcatopendate, string vrifcatclosedate, int startNum, int endNum, string prop, string order)
+ public static ToMessage DeviceUpdateSearch(string stu_torgcode,string description,string wkshopcode, string eqpcode, string eqpname, string reportuser, string repairuser, string vrifcatuser, string reportopendate, string reportclosedate, string repairopendate, string repairclosedate, string vrifcatopendate, string vrifcatclosedate, int startNum, int endNum, string prop, string order)
{
- return DeviceManagerDAL.DeviceUpdateSearch(wkshopcode, eqpcode, eqpname, reportuser, repairuser, vrifcatuser, reportopendate, reportclosedate, repairopendate, repairclosedate, vrifcatopendate, vrifcatclosedate, startNum, endNum, prop, order);
+ return DeviceManagerDAL.DeviceUpdateSearch(stu_torgcode, description,wkshopcode, eqpcode, eqpname, reportuser, repairuser, vrifcatuser, reportopendate, reportclosedate, repairopendate, repairclosedate, vrifcatopendate, vrifcatclosedate, startNum, endNum, prop, order);
}
#endregion
@@ -314,9 +314,9 @@
#endregion
#region[璁惧缁翠慨璁板綍瀵煎嚭]
- public static ToMessage DeviceUpdateOutExcel(string wkshopcode, string eqpcode, string eqpname, string reportuser, string repairuser, string vrifcatuser, string reportopendate, string reportclosedate, string repairopendate, string repairclosedate, string vrifcatopendate, string vrifcatclosedate)
+ public static ToMessage DeviceUpdateOutExcel(string stu_torgcode,string description,string wkshopcode, string eqpcode, string eqpname, string reportuser, string repairuser, string vrifcatuser, string reportopendate, string reportclosedate, string repairopendate, string repairclosedate, string vrifcatopendate, string vrifcatclosedate)
{
- return DeviceManagerDAL.DeviceUpdateOutExcel(wkshopcode, eqpcode, eqpname, reportuser, repairuser, vrifcatuser, reportopendate, reportclosedate, repairopendate, repairclosedate, vrifcatopendate, vrifcatclosedate);
+ return DeviceManagerDAL.DeviceUpdateOutExcel(stu_torgcode, description,wkshopcode, eqpcode, eqpname, reportuser, repairuser, vrifcatuser, reportopendate, reportclosedate, repairopendate, repairclosedate, vrifcatopendate, vrifcatclosedate);
}
#endregion
}
diff --git a/VueWebApi/DLL/BLL/LoginBLL.cs b/VueWebApi/DLL/BLL/LoginBLL.cs
index 8f1b051..19778c1 100644
--- a/VueWebApi/DLL/BLL/LoginBLL.cs
+++ b/VueWebApi/DLL/BLL/LoginBLL.cs
@@ -18,9 +18,9 @@
#endregion
#region [鍐欏叆鐧诲綍璁板綍琛╙
- public static ToMessage LoginBas(string usercode,string usertype)
+ public static ToMessage LoginBas(string usercode,string usertype,string stu_torgcode)
{
- return LoginDAL.LoginBas(usercode,usertype);
+ return LoginDAL.LoginBas(usercode,usertype, stu_torgcode);
}
#endregion
@@ -54,9 +54,9 @@
#endregion
#region[PC鐧诲嚭]
- public static ToMessage LoginOut(int userid,string usercode, string username,string usertype)
+ public static ToMessage LoginOut(int userid,string usercode, string username,string usertype,string stu_torgcode)
{
- return LoginDAL.LoginOut(userid, usercode, username, usertype);
+ return LoginDAL.LoginOut(userid, usercode, username, usertype, stu_torgcode);
}
#endregion
diff --git a/VueWebApi/DLL/BLL/ProductModelBLL.cs b/VueWebApi/DLL/BLL/ProductModelBLL.cs
index 3037111..0942195 100644
--- a/VueWebApi/DLL/BLL/ProductModelBLL.cs
+++ b/VueWebApi/DLL/BLL/ProductModelBLL.cs
@@ -99,16 +99,16 @@
#endregion
#region[瀛樿揣妗ｆ鍏宠仈宸ヨ壓璺嚎鏌ヨ]
- public static ToMessage InventoryFileAssociationRoute(string partcode)
+ public static ToMessage InventoryFileAssociationRoute(string stu_torgcode,string stu_torgtypecode,string partcode)
{
- return ProductModelDAL.InventoryFileAssociationRoute(partcode);
+ return ProductModelDAL.InventoryFileAssociationRoute(stu_torgcode, stu_torgtypecode,partcode);
}
#endregion
#region[瀛樿揣妗ｆ鍏宠仈宸ヨ壓璺嚎鎻愪氦]
- public static ToMessage SaveInventoryFile(string partcode,string defaultroute_code, string username, List<ObjectData> json)
+ public static ToMessage SaveInventoryFile(string stu_torgcode,string stu_torgtypecode,string partcode,string defaultroute_code, string username, List<PartRout> json)
{
- return ProductModelDAL.SaveInventoryFile(partcode, defaultroute_code, username, json);
+ return ProductModelDAL.SaveInventoryFile(stu_torgcode, stu_torgtypecode,partcode, defaultroute_code, username, json);
}
#endregion
@@ -153,16 +153,16 @@
#region[宸ュ簭涓嬫媺鏌ヨ鎺ュ彛]
- public static ToMessage StepSelect()
+ public static ToMessage StepSelect(string WorkShop)
{
- return ProductModelDAL.StepSelect();
+ return ProductModelDAL.StepSelect(WorkShop);
}
#endregion
#region[宸ヨ壓璺嚎鏌ヨ]
- public static ToMessage RouteSearch(string routecode, string routename, string description, string createuser, int startNum, int endNum, string prop, string order)
+ public static ToMessage RouteSearch(string stu_torgcode,string stu_torgtypecode, string WorkShop,string routecode, string routename, string description, string createuser, int startNum, int endNum, string prop, string order)
{
- return ProductModelDAL.RouteSearch(routecode, routename, description, createuser, startNum, endNum, prop, order);
+ return ProductModelDAL.RouteSearch(stu_torgcode,stu_torgtypecode,WorkShop, routecode, routename, description, createuser, startNum, endNum, prop, order);
}
#endregion
@@ -190,16 +190,16 @@
#region[宸ュ簭鏌ヨ]
- public static ToMessage StepSearch(string stepcode, string stepname, string enable,string steptypecode, string createuser, int startNum, int endNum, string prop, string order)
+ public static ToMessage StepSearch(string stu_torgcode,string stu_torgtypecode,string WorkShop, string stepcode, string stepname, string enable,string steptypecode, string createuser, int startNum, int endNum, string prop, string order)
{
- return ProductModelDAL.StepSearch(stepcode, stepname, enable, steptypecode, createuser, startNum, endNum, prop, order);
+ return ProductModelDAL.StepSearch(stu_torgcode, stu_torgtypecode, WorkShop, stepcode, stepname, enable, steptypecode, createuser, startNum, endNum, prop, order);
}
#endregion
#region[宸ュ簭鏂板缂栬緫]
- public static ToMessage AddUpdateStep(string stepid, string stepcode, string stepname, string steptypecode, string enable, string description, string username, string operType)
+ public static ToMessage AddUpdateStep(string stepid,string WorkShop, string stepcode, string stepname, string steptypecode, string enable, string description, string username, string operType)
{
- return ProductModelDAL.AddUpdateStep(stepid, stepcode, stepname, steptypecode, enable, description, username, operType);
+ return ProductModelDAL.AddUpdateStep(stepid, WorkShop, stepcode, stepname, steptypecode, enable, description, username, operType);
}
#endregion
@@ -211,30 +211,30 @@
#endregion
#region[宸ュ簭瀹氫箟鍏宠仈宸ヤ綔绔欐煡璇
- public static ToMessage StepAssociationEqp(string stepcode)
+ public static ToMessage StepAssociationEqp(string WorkShop, string stepcode)
{
- return ProductModelDAL.StepAssociationEqp(stepcode);
+ return ProductModelDAL.StepAssociationEqp(WorkShop,stepcode);
}
#endregion
#region [宸ュ簭瀹氫箟鍏宠仈宸ヤ綔绔欐彁浜
- public static ToMessage SaveStepAssociationEqp(string stepcode, string username, List<ObjectData> json)
+ public static ToMessage SaveStepAssociationEqp(string WorkShop,string stepcode, string username, List<ObjectData> json)
{
- return ProductModelDAL.SaveStepAssociationEqp(stepcode,username,json);
+ return ProductModelDAL.SaveStepAssociationEqp(WorkShop,stepcode, username,json);
}
#endregion
#region[宸ュ簭鍏宠仈缂洪櫡鏌ヨ]
- public static ToMessage StepAssociationDefect(string stepcode)
+ public static ToMessage StepAssociationDefect(string WorkShop, string stepcode)
{
- return ProductModelDAL.StepAssociationDefect(stepcode);
+ return ProductModelDAL.StepAssociationDefect(WorkShop,stepcode);
}
#endregion
#region[宸ュ簭鍏宠仈缂洪櫡鎻愪氦]
- public static ToMessage SaveStepAssociationDefect(string stepcode, string username, List<ObjectData> json)
+ public static ToMessage SaveStepAssociationDefect(string WorkShop, string stepcode, string username, List<ObjectData> json)
{
- return ProductModelDAL.SaveStepAssociationDefect(stepcode,username,json);
+ return ProductModelDAL.SaveStepAssociationDefect(WorkShop,stepcode, username,json);
}
#endregion
@@ -250,9 +250,9 @@
#endregion
#region[浜у搧缂栫爜鏌ユ壘宸ヨ壓璺嚎涓嬫媺妗哴
- public static ToMessage PartSelectRpute(string partcode)
+ public static ToMessage PartSelectRpute(string stu_torgcode,string stu_torgtypecode,string partcode)
{
- return ProductModelDAL.PartSelectRpute(partcode);
+ return ProductModelDAL.PartSelectRpute(stu_torgcode, stu_torgtypecode,partcode);
}
#endregion
@@ -278,9 +278,9 @@
#endregion
#region[鑺傛媿宸ヤ环鏌ヨ]
- public static ToMessage BeatRateSearch(string partcode,string routecode, string stepcode, string eqpcode,int startNum, int endNum, string prop, string order)
+ public static ToMessage BeatRateSearch(string stu_torgcode,string stu_torgtypecode,string partcode,string routecode, string stepcode, string eqpcode,int startNum, int endNum, string prop, string order)
{
- return ProductModelDAL.BeatRateSearch(partcode,routecode, stepcode, eqpcode, startNum, endNum, prop, order);
+ return ProductModelDAL.BeatRateSearch(stu_torgcode, stu_torgtypecode,partcode, routecode, stepcode, eqpcode, startNum, endNum, prop, order);
}
#endregion
diff --git a/VueWebApi/DLL/BLL/ProductionManagementBLL.cs b/VueWebApi/DLL/BLL/ProductionManagementBLL.cs
index 8a9ad15..50614fc 100644
--- a/VueWebApi/DLL/BLL/ProductionManagementBLL.cs
+++ b/VueWebApi/DLL/BLL/ProductionManagementBLL.cs
@@ -13,9 +13,9 @@
public class ProductionManagementBLL
{
#region[ERP璁㈠崟鏌ヨ]
- public static ToMessage ErpOrderSearch(string erporderstus, string erpordercode, string partcode, string partname, string partspec, int startNum, string paydatestartdate, string paydateenddate, string paydatestartdate1, string paydateenddate2, string creatuser, int endNum, string prop, string order)
+ public static ToMessage ErpOrderSearch(string stu_torgcode,string stu_torgtypecode, string erporderstus, string erpordercode, string partcode, string partname, string partspec, int startNum, string paydatestartdate, string paydateenddate, string paydatestartdate1, string paydateenddate2, string creatuser, int endNum, string prop, string order)
{
- return ProductionManagementDAL.ErpOrderSearch(erporderstus, erpordercode, partcode, partname, partspec, startNum, paydatestartdate, paydateenddate, paydatestartdate1, paydateenddate2, creatuser, endNum, prop, order);
+ return ProductionManagementDAL.ErpOrderSearch(stu_torgcode, stu_torgtypecode,erporderstus, erpordercode, partcode, partname, partspec, startNum, paydatestartdate, paydateenddate, paydatestartdate1, paydateenddate2, creatuser, endNum, prop, order);
}
#endregion
@@ -36,9 +36,9 @@
#region[MES宸ュ崟鏌ヨ]
- public static ToMessage MesOrderSearch(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)
+ public static ToMessage MesOrderSearch(string stu_torgcode,string stu_torgtypecode,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.MesOrderSearch(mesorderstus, mesordercode, sourceorder, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
+ return ProductionManagementDAL.MesOrderSearch(stu_torgcode, stu_torgtypecode,mesorderstus, mesordercode, sourceorder, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
}
#endregion
@@ -50,16 +50,16 @@
#endregion
#region[浜у搧缂栫爜鏌ユ壘宸ヨ壓璺嚎涓嬫媺鎺ュ彛]
- public static ToMessage PartSelectRoute(string partcode)
+ public static ToMessage PartSelectRoute(string partcode,string wkshopcode)
{
- return ProductionManagementDAL.PartSelectRoute(partcode);
+ return ProductionManagementDAL.PartSelectRoute(partcode, wkshopcode);
}
#endregion
#region[宸ヨ壓璺嚎鏌ユ壘杞﹂棿涓嬫媺鎺ュ彛]
- public static ToMessage RouteSelectWkshop(string partcode, string routecode)
+ public static ToMessage RouteSelectWkshop(string stu_torgcode,string stu_torgtypecode,string partcode)
{
- return ProductionManagementDAL.RouteSelectWkshop(partcode,routecode);
+ return ProductionManagementDAL.RouteSelectWkshop(stu_torgcode, stu_torgtypecode, partcode);
}
#endregion
@@ -136,23 +136,23 @@
#endregion
#region[鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇宸ュ崟瀵瑰簲宸ュ簭浠诲姟]
- public static ToMessage MesOrderStepSearch(string orderstepqrcode, int startNum, int endNum, string prop, string order)
+ public static ToMessage MesOrderStepSearch(string stu_torgcode,string stu_torgtypecode, string orderstepqrcode, int startNum, int endNum, string prop, string order)
{
- return ProductionManagementDAL.MesOrderStepSearch(orderstepqrcode, startNum, endNum, prop, order);
+ return ProductionManagementDAL.MesOrderStepSearch(stu_torgcode, stu_torgtypecode, orderstepqrcode, startNum, endNum, prop, order);
}
#endregion
#region[鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇宸ュ崟瀵瑰簲宸ュ簭浠诲姟(澶栧崗)]
- public static ToMessage MesOrderWxStepSearch(string orderstepqrcode, int startNum, int endNum, string prop, string order)
+ public static ToMessage MesOrderWxStepSearch(string stu_torgcode,string stu_torgtypecode,string orderstepqrcode, int startNum, int endNum, string prop, string order)
{
- return ProductionManagementDAL.MesOrderWxStepSearch(orderstepqrcode, startNum, endNum, prop, order);
+ return ProductionManagementDAL.MesOrderWxStepSearch(stu_torgcode, stu_torgtypecode,orderstepqrcode, startNum, endNum, prop, order);
}
#endregion
#region[鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇宸ュ崟瀵瑰簲宸ュ簭浠诲姟(涓嶈壇)]
- public static ToMessage MesOrderNgStepSearch(string orderstepqrcode, int startNum, int endNum, string prop, string order)
+ public static ToMessage MesOrderNgStepSearch(string stu_torgcode,string stu_torgtypecode,string orderstepqrcode, int startNum, int endNum, string prop, string order)
{
- return ProductionManagementDAL.MesOrderNgStepSearch(orderstepqrcode, startNum, endNum, prop, order);
+ return ProductionManagementDAL.MesOrderNgStepSearch(stu_torgcode, stu_torgtypecode,orderstepqrcode, startNum, endNum, prop, order);
}
#endregion
@@ -178,9 +178,9 @@
#endregion
#region[鐢熶骇寮�鎶ュ伐锛氭姤宸ユ椂鑾峰彇鐢熶骇鐝粍涓嬫媺妗哴
- public static ToMessage MesOrderStepReportSelectUserGroup()
+ public static ToMessage MesOrderStepReportSelectUserGroup(string stu_torgcode,string stu_torgtypecode,string wkshopcode)
{
- return ProductionManagementDAL.MesOrderStepReportSelectUserGroup();
+ return ProductionManagementDAL.MesOrderStepReportSelectUserGroup(stu_torgcode, stu_torgtypecode,wkshopcode);
}
#endregion
@@ -272,9 +272,9 @@
#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)
+ public static ToMessage MesOrderBitchClosedSearch(string stu_torgcode,string stu_torgtypecode, 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);
+ return ProductionManagementDAL.MesOrderBitchClosedSearch(stu_torgcode, stu_torgtypecode,mesorderstus, mesordercode, sourceorder, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
}
#endregion
diff --git a/VueWebApi/DLL/BLL/QualityManagementBLL.cs b/VueWebApi/DLL/BLL/QualityManagementBLL.cs
index f3f755b..8532725 100644
--- a/VueWebApi/DLL/BLL/QualityManagementBLL.cs
+++ b/VueWebApi/DLL/BLL/QualityManagementBLL.cs
@@ -49,9 +49,9 @@
#endregion
#region[宸ュ簭妫�楠屾爣鍑嗘柊澧炪�佺紪杈戣幏鍙栨楠岄」鐩笅鎷夊垪琛╙
- public static ToMessage StepCheckItemSelect()
+ public static ToMessage StepCheckItemSelect(string WorkShop)
{
- return QualityManagementDAL.StepCheckItemSelect();
+ return QualityManagementDAL.StepCheckItemSelect(WorkShop);
}
#endregion
@@ -72,16 +72,16 @@
#region[宸ュ簭妫�楠岄」鐩垪琛ㄦ煡璇
- public static ToMessage StepCheckItemSearch(string itemcode, string itemname, string itemdescr, int startNum, int endNum, string prop, string order)
+ public static ToMessage StepCheckItemSearch(string stu_torgcode,string stu_torgtypecode, string itemcode, string itemname, string itemdescr, int startNum, int endNum, string prop, string order)
{
- return QualityManagementDAL.StepCheckItemSearch(itemcode, itemname, itemdescr, startNum,endNum, prop, order);
+ return QualityManagementDAL.StepCheckItemSearch(stu_torgcode, stu_torgtypecode, itemcode, itemname, itemdescr, startNum,endNum, prop, order);
}
#endregion
#region[宸ュ簭妫�楠岄」鐩柊澧炪�佺紪杈戞彁浜
- public static ToMessage AddUpdateStepCheckItem(string checkitemcode, string checkitemname, string checkitemdescr, string opertype, string username)
+ public static ToMessage AddUpdateStepCheckItem(string wkshopcode, string checkitemcode, string checkitemname, string checkitemdescr, string opertype, string username)
{
- return QualityManagementDAL.AddUpdateStepCheckItem(checkitemcode, checkitemname, checkitemdescr, opertype, username);
+ return QualityManagementDAL.AddUpdateStepCheckItem(wkshopcode,checkitemcode, checkitemname, checkitemdescr, opertype, username);
}
#endregion
@@ -117,9 +117,9 @@
#region[璐ㄦ鏂规鍒楄〃鏌ヨ]
- public static ToMessage QualityInspectionSearch(string qualityinsptcode, string qualityinsptname, string status, string checktype, string sampltype,string suitobject, int startNum, int endNum, string prop, string order)
+ public static ToMessage QualityInspectionSearch(string stu_torgcode,string stu_torgtypecode, string qualityinsptcode, string qualityinsptname, string status, string checktype, string sampltype,string suitobject, int startNum, int endNum, string prop, string order)
{
- return QualityManagementDAL.QualityInspectionSearch(qualityinsptcode, qualityinsptname, status, checktype, sampltype, suitobject, startNum, endNum, prop, order);
+ return QualityManagementDAL.QualityInspectionSearch(stu_torgcode, stu_torgtypecode, qualityinsptcode, qualityinsptname, status, checktype, sampltype, suitobject, startNum, endNum, prop, order);
}
#endregion
@@ -131,9 +131,9 @@
#endregion
#region[璐ㄦ鏂规鏂板/缂栬緫鎻愪氦]
- public static ToMessage QualityInspectionAddEditSave(string qualityinsptcode, string qualityinsptname, string status, string checktype, string sampmethod, string sampscare, string suitobject, string suitpart, string descr,string stepcode, string checkitem, string type, string username)
+ public static ToMessage QualityInspectionAddEditSave(string wkshopcode, string qualityinsptcode, string qualityinsptname, string status, string checktype, string sampmethod, string sampscare, string suitobject, string suitpart, string descr,string stepcode, string checkitem, string type, string username)
{
- return QualityManagementDAL.QualityInspectionAddEditSave(qualityinsptcode, qualityinsptname, status, checktype, sampmethod, sampscare, suitobject, suitpart, descr, stepcode, checkitem, type, username);
+ return QualityManagementDAL.QualityInspectionAddEditSave(wkshopcode,qualityinsptcode, qualityinsptname, status, checktype, sampmethod, sampscare, suitobject, suitpart, descr, stepcode, checkitem, type, username);
}
#endregion
diff --git a/VueWebApi/DLL/BLL/ReportManagerBLL.cs b/VueWebApi/DLL/BLL/ReportManagerBLL.cs
index e0a06ac..cbdcfca 100644
--- a/VueWebApi/DLL/BLL/ReportManagerBLL.cs
+++ b/VueWebApi/DLL/BLL/ReportManagerBLL.cs
@@ -10,24 +10,24 @@
public class ReportManagerBLL
{
#region[濮斿鎶ヨ〃璁板綍鏌ヨ]
- public static ToMessage OutSourceReportSearch(string wocode, string partcode, string partname, string partspec, string stepname, string suppername, string type, string receivopendate, string receivclosedate, int startNum, int endNum, string prop, string order)
+ public static ToMessage OutSourceReportSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string suppername, string type, string receivopendate, string receivclosedate, int startNum, int endNum, string prop, string order)
{
- return ReportManagerDAL.OutSourceReportSearch(wocode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate, startNum, endNum, prop, order);
+ return ReportManagerDAL.OutSourceReportSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate, startNum, endNum, prop, order);
}
#endregion
#region[濮斿鎶ヨ〃璁板綍瀵煎嚭]
- public static ToMessage OutSourceReportExcelSearch(string wocode, string partcode, string partname, string partspec, string stepname, string suppername, string type, string receivopendate, string receivclosedate)
+ public static ToMessage OutSourceReportExcelSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string suppername, string type, string receivopendate, string receivclosedate)
{
- return ReportManagerDAL.OutSourceReportExcelSearch(wocode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate);
+ return ReportManagerDAL.OutSourceReportExcelSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate);
}
#endregion
#region[鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ヨ]
- public static ToMessage GroupSalaryReportSearch(string compute, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate,string rejectstepcode, int startNum, int endNum, string prop, string order)
+ public static ToMessage GroupSalaryReportSearch(string wkshopcode, string compute, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate,string rejectstepcode, int startNum, int endNum, string prop, string order)
{
- return ReportManagerDAL.GroupSalaryReportSearch(compute,wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, rejectstepcode, startNum, endNum, prop, order);
+ return ReportManagerDAL.GroupSalaryReportSearch(wkshopcode,compute, wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, rejectstepcode, startNum, endNum, prop, order);
}
#endregion
@@ -39,39 +39,39 @@
#endregion
#region[鐝粍宸ヨ祫鎶ヨ〃璁板綍瀵煎嚭]
- public static ToMessage GroupSalaryReportExcelSearch(string compute, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate,string rejectstepcode)
+ public static ToMessage GroupSalaryReportExcelSearch(string wkshopcode, string compute, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate,string rejectstepcode)
{
- return ReportManagerDAL.GroupSalaryReportExcelSearch(compute,wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, rejectstepcode);
+ return ReportManagerDAL.GroupSalaryReportExcelSearch(wkshopcode,compute, wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, rejectstepcode);
}
#endregion
#region[浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃]
- public static ToMessage PeopleSalaryReportSearch(string compute, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string reportname, string reportopendate, string reportclosedate,string rejectstepcode, int startNum, int endNum, string prop, string order)
+ public static ToMessage PeopleSalaryReportSearch(string wkshopcode, string compute, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string reportname, string reportopendate, string reportclosedate,string rejectstepcode, int startNum, int endNum, string prop, string order)
{
- return ReportManagerDAL.PeopleSalaryReportSearch(compute,wocode, partcode, partname, partspec, stepname, groupcode, reportname, reportopendate, reportclosedate, rejectstepcode, startNum, endNum, prop, order);
+ return ReportManagerDAL.PeopleSalaryReportSearch(wkshopcode,compute, wocode, partcode, partname, partspec, stepname, groupcode, reportname, reportopendate, reportclosedate, rejectstepcode, startNum, endNum, prop, order);
}
#endregion
#region[浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃瀵煎嚭]
- public static ToMessage PeopleSalaryReportExcelSearch(string compute, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string reportname, string reportopendate, string reportclosedate,string rejectstepcode)
+ public static ToMessage PeopleSalaryReportExcelSearch(string wkshopcode, string compute, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string reportname, string reportopendate, string reportclosedate,string rejectstepcode)
{
- return ReportManagerDAL.PeopleSalaryReportExcelSearch(compute,wocode, partcode, partname, partspec, stepname, groupcode, reportname, reportopendate, reportclosedate, rejectstepcode);
+ return ReportManagerDAL.PeopleSalaryReportExcelSearch(wkshopcode,compute, wocode, partcode, partname, partspec, stepname, groupcode, reportname, reportopendate, reportclosedate, rejectstepcode);
}
#endregion
#region[涓嶈壇鏄庣粏鎶ヨ〃]
- public static ToMessage DefectDetailsReportSearch(string wocode, string partcode, string partname, string partspec, string stepname, string defectcode, string defectname, string reportname, string reportopendate, string reportclosedate, int startNum, int endNum, string prop, string order)
+ public static ToMessage DefectDetailsReportSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string defectcode, string defectname, string reportname, string reportopendate, string reportclosedate, int startNum, int endNum, string prop, string order)
{
- return ReportManagerDAL.DefectDetailsReportSearch(wocode, partcode, partname, partspec, stepname, defectcode, defectname, reportname, reportopendate, reportclosedate, startNum, endNum, prop, order);
+ return ReportManagerDAL.DefectDetailsReportSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, defectcode, defectname, reportname, reportopendate, reportclosedate, startNum, endNum, prop, order);
}
#endregion
#region[涓嶈壇鏄庣粏鎶ヨ〃瀵煎嚭]
- public static ToMessage DefectDetailsReportExcelSearch(string wocode, string partcode, string partname, string partspec, string stepname, string defectcode, string defectname, string reportname, string reportopendate, string reportclosedate)
+ public static ToMessage DefectDetailsReportExcelSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string defectcode, string defectname, string reportname, string reportopendate, string reportclosedate)
{
- return ReportManagerDAL.DefectDetailsReportExcelSearch(wocode, partcode, partname, partspec, stepname, defectcode, defectname, reportname, reportopendate, reportclosedate);
+ return ReportManagerDAL.DefectDetailsReportExcelSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, defectcode, defectname, reportname, reportopendate, reportclosedate);
}
#endregion
@@ -85,16 +85,16 @@
#region[缁翠慨鏄庣粏鎶ヨ〃]
- public static ToMessage MaintenanceDetailsReportSearch(string wocode, string partcode, string partname, string partspec, string stepname, string style, string defectname, string repairname, string repairopendate, string repairclosedate, int startNum, int endNum, string prop, string order)
+ public static ToMessage MaintenanceDetailsReportSearch(string wkshopcode,string wocode, string partcode, string partname, string partspec, string stepname, string style, string defectname, string repairname, string repairopendate, string repairclosedate, int startNum, int endNum, string prop, string order)
{
- return ReportManagerDAL.MaintenanceDetailsReportSearch(wocode, partcode, partname, partspec, stepname, style, defectname, repairname, repairopendate, repairclosedate, startNum, endNum, prop, order);
+ return ReportManagerDAL.MaintenanceDetailsReportSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, style, defectname, repairname, repairopendate, repairclosedate, startNum, endNum, prop, order);
}
#endregion
#region[缁翠慨鏄庣粏鎶ヨ〃瀵煎嚭]
- public static ToMessage MaintenanceDetailsReportExcelSearch(string wocode, string partcode, string partname, string partspec, string stepname, string style, string defectname, string repairname, string repairopendate, string repairclosedate)
+ public static ToMessage MaintenanceDetailsReportExcelSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string style, string defectname, string repairname, string repairopendate, string repairclosedate)
{
- return ReportManagerDAL.MaintenanceDetailsReportExcelSearch(wocode, partcode, partname, partspec, stepname, style, defectname, repairname, repairopendate, repairclosedate);
+ return ReportManagerDAL.MaintenanceDetailsReportExcelSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, style, defectname, repairname, repairopendate, repairclosedate);
}
#endregion
@@ -145,16 +145,16 @@
#region[鐢熶骇杩涘害鎶ヨ〃]
- public static ToMessage ProductionScheduleReportSearch(string status, string wocode, string routecode, string routename, string partcode, string partname, string partspec,string opendate,string closedate, int startNum, int endNum, string prop, string order)
+ public static ToMessage ProductionScheduleReportSearch(string wkshopcode, string status, string wocode, string routecode, string routename, string partcode, string partname, string partspec,string opendate,string closedate, int startNum, int endNum, string prop, string order)
{
- return ReportManagerDAL.ProductionScheduleReportSearch(status,wocode, routecode, routename, partcode, partname, partspec, opendate, closedate, startNum, endNum, prop, order);
+ return ReportManagerDAL.ProductionScheduleReportSearch(wkshopcode,status, wocode, routecode, routename, partcode, partname, partspec, opendate, closedate, startNum, endNum, prop, order);
}
#endregion
#region[鐢熶骇杩涘害鎶ヨ〃瀵煎嚭]
- public static ToMessage ProductionScheduleReportExcelSearch(string status, string wocode, string routecode, string routename, string partcode, string partname, string partspec,string opendate,string closedate)
+ public static ToMessage ProductionScheduleReportExcelSearch(string wkshopcode, string status, string wocode, string routecode, string routename, string partcode, string partname, string partspec,string opendate,string closedate)
{
- return ReportManagerDAL.ProductionScheduleReportExcelSearch(status,wocode, routecode, routename, partcode, partname, partspec,opendate, closedate);
+ return ReportManagerDAL.ProductionScheduleReportExcelSearch(wkshopcode,status, wocode, routecode, routename, partcode, partname, partspec,opendate, closedate);
}
#endregion
}
diff --git a/VueWebApi/DLL/DAL/BaseDateDAL.cs b/VueWebApi/DLL/DAL/BaseDateDAL.cs
index ef2ec16..c6dd3b5 100644
--- a/VueWebApi/DLL/DAL/BaseDateDAL.cs
+++ b/VueWebApi/DLL/DAL/BaseDateDAL.cs
@@ -223,6 +223,94 @@
}
#endregion
+ #region[閫氳繃閫夋嫨鐨勬墍灞炵粍缁囨煡璇㈡墍灞炵彮缁刔
+ public static ToMessage StorgGroupSelect(string stu_torgcode, string description)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ switch (description)
+ {
+ case "":
+ break;
+ case "D":
+ search += "and parent.org_code=@stu_torgcode or child.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ case "W":
+ search += "and parent.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ default:
+ break;
+ }
+ var sql = @"select group_code,group_name
+ from TGroup G
+ left join TOrganization parent on G.torg_code=parent.org_code
+ left join TOrganization as child on parent.parent_id=child.id
+ where G.is_delete<>'1' " + search;
+ 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
+
+ #region[閫氳繃閫夋嫨鐨勬墍灞炵粍缁囨煡璇㈡墍灞炶鑹茬被鍨媇
+ public static ToMessage StorgRoleSelect(string stu_torgcode, string description)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ //鑾峰彇璁惧绫诲瀷鏁版嵁
+ switch (description)
+ {
+ case "":
+ break;
+ case "D":
+ search += "and parent.org_code=@stu_torgcode or child.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ case "W":
+ search += "and parent.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ default:
+ break;
+ }
+ var sql = @"select roletype_code,roletype_name,torg_code,parent.org_name
+ from TRoleType R
+ left join TOrganization parent on R.torg_code=parent.org_code
+ left join TOrganization as child on parent.parent_id=child.id
+ where R.is_delete<>'1' " + search;
+ 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
+
#region[ERP鐢熶骇杞﹂棿/閮ㄩ棬淇℃伅鏌ヨ]
diff --git a/VueWebApi/DLL/DAL/BasicSettingDAL.cs b/VueWebApi/DLL/DAL/BasicSettingDAL.cs
index a07009c..8eb9053 100644
--- a/VueWebApi/DLL/DAL/BasicSettingDAL.cs
+++ b/VueWebApi/DLL/DAL/BasicSettingDAL.cs
@@ -21,12 +21,27 @@
public static SqlParameter[] parameters; //瀹氫箟鍏ㄥ眬SqlParameter鍙傛暟鏁扮粍
#region [缁勭粐鏋舵瀯鏁版嵁鏌ヨ]
- public static ToMessage OrganizationSearch(string orgCode, string orgName, string orgType, string userName, int startNum, int endNum, string prop, string order)
+ public static ToMessage OrganizationSearch(string stu_torgcode, string description, string orgCode, string orgName, string orgType, string userName, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
try
{
+ switch (description)
+ {
+ case "":
+ break;
+ case "D":
+ search += "and child.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ case "W":
+ search += "and parent.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ default:
+ break;
+ }
if (orgCode != "" && orgCode != null)
{
search += "and parent.org_code like '%'+@orgCode+'%' ";
@@ -67,7 +82,7 @@
from TOrganization as parent
left join TOrganization as child on parent.parent_id=child.id
left join TUser U on parent.lm_user=U.usercode
- where parent.is_delete<>1 " + search;
+ where parent.is_delete<>1 " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -277,49 +292,64 @@
#region[鐢ㄦ埛娓呭崟鏁版嵁鏌ヨ]
- public static ToMessage UserSearch(string UserCode, string UserName, string StuOrg, string wagetype, string Enable, int startNum, int endNum, string prop, string order)
+ public static ToMessage UserSearch(string UserCode, string UserName, string StuOrg,string description, string wagetype, string Enable, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
try
{
+ switch (description)
+ {
+ case "":
+ break;
+ case "D":
+ search += "and t.org_code=@stu_torgcode or child.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", StuOrg);
+ break;
+ case "W":
+ search += "and t.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", StuOrg);
+ break;
+ default:
+ break;
+ }
if (UserCode != "" && UserCode != null)
{
- search += "and u.usercode like '%'+@UserCode+'%' ";
+ search += " and u.usercode like '%'+@UserCode+'%' ";
dynamicParams.Add("@UserCode", UserCode);
}
if (UserName != "" && UserName != null)
{
- search += "and S.username like '%'+@UserName+'%' ";
+ search += " and S.username like '%'+@UserName+'%' ";
dynamicParams.Add("@UserName", UserName);
- }
- if (StuOrg != "" && StuOrg != null)
- {
- search += "and u.stu_torgcode=@StuOrg ";
- dynamicParams.Add("@StuOrg", StuOrg);
}
if (wagetype != "" && wagetype != null)
{
- search += "and u.wagetype=@wagetype ";
+ search += " and u.wagetype=@wagetype ";
dynamicParams.Add("@wagetype", wagetype);
}
if (Enable != "" && Enable != null)
{
- search += "and u.enable=@Enable ";
+ search += " and u.enable=@Enable ";
dynamicParams.Add("@Enable", Enable);
}
if (search == "")
{
- search = "and 1=1 ";
+ search = " and 1=1 ";
}
//search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select u.id,u.usercode,u.username,g.group_code,g.group_name,u.stu_torgcode,t.org_name,u.password,u.mobile,u.email,u.wagetype,u.enable,S.username as lm_user,u.lm_date,u.is_role
+ var sql = @"select u.id,u.usercode,u.username,g.group_code,g.group_name,u.stu_torgcode,t.org_name,t.description,u.password,u.mobile,u.email,u.wagetype,u.enable,
+ S.username as lm_user,u.lm_date,(case when isnull(M.user_code,'')='' then 'N' else 'Y' end) as is_role
from TUser u
left join TOrganization t on u.stu_torgcode=t.org_code
+ left join TOrganization as child on t.parent_id=child.id
left join TGroup g on u.usergroup_code=g.group_code
left join TUser S on u.lm_user=S.usercode
+ left join (
+ select distinct user_code from TUserRoleRelation
+ ) M on u.usercode=M.user_code
where u.is_delete='0' and u.userclassid='0' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
@@ -339,28 +369,77 @@
#endregion
#region [鐢ㄦ埛鎵�灞炵粍缁嘳
- public static ToMessage UserOrganization()
+ public static ToMessage UserOrganization(string stu_torgcode, string description)
{
var dynamicParams = new DynamicParameters();
string sql = "";
+ string search = "";
try
{
List<TreeDG> list = new List<TreeDG>();
- sql = @"select id,parent_id,org_code,org_name,description
- FROM TOrganization where is_delete<>'1'";
- var dt = DapperHelper.selectdata(sql, dynamicParams);
- for (int i = 0; i < dt.Rows.Count; i++) //杩欓噷鏄惊鐜墍鏈�
+ switch (description)
{
- if (string.IsNullOrEmpty(dt.Rows[i]["PARENT_ID"].ToString()) || dt.Rows[i]["PARENT_ID"].ToString() == "0") //鍒ゆ柇鏄惁鏈�澶栧眰鏍硅妭鐐�
- {
- TreeDG tbj = new TreeDG();
- tbj.id = dt.Rows[i]["ID"].ToString();
- tbj.code = dt.Rows[i]["ORG_CODE"].ToString();
- tbj.name = dt.Rows[i]["ORG_NAME"].ToString();
- list.Add(tbj);
- }
+ case "":
+ sql = @"select parent.id,parent.parent_id,parent.org_code,parent.org_name,parent.description
+ from TOrganization as parent
+ left join TOrganization as child on parent.parent_id=child.id
+ where parent.is_delete<>'1' " + search;
+ var dt = DapperHelper.selectdata(sql, dynamicParams);
+ for (int i = 0; i < dt.Rows.Count; i++) //杩欓噷鏄惊鐜墍鏈�
+ {
+ if (string.IsNullOrEmpty(dt.Rows[i]["PARENT_ID"].ToString()) || dt.Rows[i]["PARENT_ID"].ToString() == "0") //鍒ゆ柇鏄惁鏈�澶栧眰鏍硅妭鐐�
+ {
+ TreeDG tbj = new TreeDG();
+ tbj.id = dt.Rows[i]["ID"].ToString();
+ tbj.code = dt.Rows[i]["ORG_CODE"].ToString();
+ tbj.name = dt.Rows[i]["ORG_NAME"].ToString();
+ tbj.flag = dt.Rows[i]["description"].ToString();
+ list.Add(tbj);
+ }
+ }
+ digui(dt, list);
+ break;
+ case "D":
+ search += "and parent.org_code=@stu_torgcode or child.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ sql = @"select parent.id,parent.parent_id,parent.org_code,parent.org_name,parent.description
+ from TOrganization as parent
+ left join TOrganization as child on parent.parent_id=child.id
+ where parent.is_delete<>'1' " + search;
+ var dt0 = DapperHelper.selectdata(sql, dynamicParams);
+ for (int i = 0; i < dt0.Rows.Count; i++) //杩欓噷鏄惊鐜墍鏈�
+ {
+ if (string.IsNullOrEmpty(dt0.Rows[i]["PARENT_ID"].ToString()) || dt0.Rows[i]["PARENT_ID"].ToString() == "0") //鍒ゆ柇鏄惁鏈�澶栧眰鏍硅妭鐐�
+ {
+ TreeDG tbj = new TreeDG();
+ tbj.id = dt0.Rows[i]["ID"].ToString();
+ tbj.code = dt0.Rows[i]["ORG_CODE"].ToString();
+ tbj.name = dt0.Rows[i]["ORG_NAME"].ToString();
+ tbj.flag = dt0.Rows[i]["description"].ToString();
+ list.Add(tbj);
+ }
+ }
+ digui(dt0, list);
+ break;
+ case "W":
+ search += "and parent.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ sql = @"select parent.id,parent.parent_id,parent.org_code,parent.org_name,parent.description
+ from TOrganization as parent
+ left join TOrganization as child on parent.parent_id=child.id
+ where parent.is_delete<>'1' " + search;
+ var dt1 = DapperHelper.selectdata(sql, dynamicParams);
+ TreeDG tbj0 = new TreeDG();
+ tbj0.id = dt1.Rows[0]["ID"].ToString();
+ tbj0.code = dt1.Rows[0]["ORG_CODE"].ToString();
+ tbj0.name = dt1.Rows[0]["ORG_NAME"].ToString();
+ tbj0.flag = dt1.Rows[0]["description"].ToString();
+ list.Add(tbj0);
+ break;
+ default:
+ break;
}
- digui(dt, list);
+
mes.code = "200";
mes.Message = "鍔犺浇瀹屾垚";
mes.data = list;
@@ -377,20 +456,36 @@
#endregion
#region[鐢ㄦ埛鎵�灞炵彮缁刔
- public static ToMessage UserGroup()
+ public static ToMessage UserGroup(string stu_torgcode,string description)
{
var dynamicParams = new DynamicParameters();
+ string search = "";
try
{
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
- var total = 0; //鎬绘潯鏁�
- var sql = @"select group_code,group_name
- from TGroup
- where is_delete<>'1' ";
- var data = DapperHelper.selecttable(sql);
+ switch (description)
+ {
+ case "":
+ break;
+ case "D":
+ search += "and parent.org_code=@stu_torgcode or child.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ case "W":
+ search += "and parent.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ default:
+ break;
+ }
+ var sql = @"select group_code,group_name,torg_code,parent.org_name
+ from TGroup G
+ left join TOrganization parent on G.torg_code=parent.org_code
+ left join TOrganization as child on parent.parent_id=child.id
+ where G.is_delete<>'1' " + search;
+ var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
- mes.count = total;
mes.data = data;
}
catch (Exception e)
@@ -418,6 +513,7 @@
tbjson.id = dt.Rows[i]["ID"].ToString();
tbjson.code = dt.Rows[i]["ORG_CODE"].ToString();
tbjson.name = dt.Rows[i]["ORG_NAME"].ToString();
+ tbjson.flag = dt.Rows[i]["description"].ToString();
tree[m].children.Add(tbjson);
}
}
@@ -567,29 +663,48 @@
#endregion
#region[鐢ㄦ埛娓呭崟鍏宠仈瑙掕壊鏌ヨ]
- public static ToMessage UserAssociationRole(string usercode)
+ public static ToMessage UserAssociationRole(string usercode,string stu_torgcode,string description)
{
string sql = "";
+ string search = "";
var dynamicParams = new DynamicParameters();
List<TreeObejct> list = new List<TreeObejct>();
try
{
+ switch (description)
+ {
+ case "":
+ break;
+ case "D":
+ search += "and parent.org_code=@stu_torgcode or child.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ case "W":
+ search += "and parent.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ default:
+ break;
+ }
//鑾峰彇瑙掕壊绫诲瀷闆嗗悎(鍖呭惈缁戝畾鏍囪瘑)
- sql = @"select A.roletype_code as code,A.roletype_name as name,(case when B.roletype_code is null then 'N' else 'Y' end) flag from TRoleType A
+ sql = @"select A.roletype_code as code,A.roletype_name as name,(case when B.roletype_code is null then 'N' else 'Y' end) flag
+ from TRoleType A
+ left join TOrganization parent on A.torg_code=parent.org_code
+ left join TOrganization as child on parent.parent_id=child.id
left join (
select distinct B.roletype_code from TRole B
inner join TUserRoleRelation C on B.role_code=C.role_code
- where C.user_code=@usercode
+ where C.user_code=@usercode
) B
on A.roletype_code=B.roletype_code
- where A.is_delete='0'";
+ where A.is_delete='0' "+search;
dynamicParams.Add("@usercode", usercode);
var data = DapperHelper.select<TreeObejct>(sql, dynamicParams);
for (int i = 0; i < data.Count; i++)
{
sql = @"select B.role_code as code,B.role_name as name,(case when C.role_code is null then 'N' else 'Y' end) flag from TRole B
left join(select role_code from TUserRoleRelation where user_code=@usercode) C on B.role_code=C.role_code
- where B.roletype_code=@roletype_code and B.is_delete='0' and B.is_system='0'";
+ where B.roletype_code=@roletype_code and B.is_delete='0' and B.is_system='0' and B.torg_code<>'F'";
dynamicParams.Add("@roletype_code", data[i].code);
dynamicParams.Add("@usercode", usercode);
var data0 = DapperHelper.select<TreeObejctCn>(sql, dynamicParams);
@@ -612,7 +727,7 @@
#endregion
#region[鐢ㄦ埛娓呭崟鍏宠仈瑙掕壊淇濆瓨]
- public static ToMessage SaveUserAssoctRole(string usercode, List<RoleUserSubmit> json)
+ public static ToMessage SaveUserAssoctRole(string usercode,string stu_torgcode,string description, List<RoleUserSubmit> json)
{
var sql = "";
List<object> list = new List<object>();
@@ -621,32 +736,68 @@
list.Clear();
if (json == null || json.Count <= 0)
{
- //娓呴櫎鐢ㄦ埛鍏宠仈瑙掕壊琛ㄦ暟鎹�
- sql = @"delete TUserRoleRelation where user_code=@usercode";
- list.Add(new { str = sql, parm = new { usercode = usercode } });
- //娓呴櫎鐢ㄦ埛琛ㄥ叧鑱旇鑹叉爣璇�
- sql = @"update TUser set is_role='N' where usercode=@usercode";
- list.Add(new { str = sql, parm = new { usercode = usercode } });
+ switch (description)
+ {
+ case "":
+ //娓呴櫎鐢ㄦ埛鍏宠仈瑙掕壊琛ㄦ暟鎹�
+ sql = @"delete TUserRoleRelation where user_code=@usercode";
+ list.Add(new { str = sql, parm = new { usercode = usercode } });
+ break;
+ case "D":
+ //娓呴櫎鐢ㄦ埛鍏宠仈瑙掕壊琛ㄦ暟鎹�
+ sql = @"delete from TUserRoleRelation where id in (select A.id from TUserRoleRelation A
+ left join TOrganization T on A.torg_code=T.org_code
+ left join TOrganization as L on T.parent_id=L.id
+ where 1=1 and A.user_code=@usercode and T.org_code=@stu_torgcode)";
+ list.Add(new { str = sql, parm = new { usercode = usercode, stu_torgcode = stu_torgcode } });
+ break;
+ case "W":
+ //娓呴櫎鐢ㄦ埛鍏宠仈瑙掕壊琛ㄦ暟鎹�
+ sql = @"delete from TUserRoleRelation where id in (select A.id from TUserRoleRelation A
+ left join TOrganization T on A.torg_code=T.org_code
+ left join TOrganization as L on T.parent_id=L.id
+ where 1=1 and A.user_code=@usercode and T.org_code=@stu_torgcode)";
+ list.Add(new { str = sql, parm = new { usercode = usercode, stu_torgcode = stu_torgcode } });
+ break;
+ }
}
else
{
- //娓呴櫎鐢ㄦ埛鍏宠仈瑙掕壊琛ㄦ暟鎹�
- sql = @"delete TUserRoleRelation where user_code=@usercode";
- list.Add(new { str = sql, parm = new { usercode = usercode } });
+ switch (description)
+ {
+ case "":
+ //娓呴櫎鐢ㄦ埛鍏宠仈瑙掕壊琛ㄦ暟鎹�
+ sql = @"delete TUserRoleRelation where user_code=@usercode";
+ list.Add(new { str = sql, parm = new { usercode = usercode } });
+ break;
+ case "D":
+ //娓呴櫎鐢ㄦ埛鍏宠仈瑙掕壊琛ㄦ暟鎹�
+ sql = @"delete from TUserRoleRelation where id in (select A.id from TUserRoleRelation A
+ left join TOrganization T on A.torg_code=T.org_code
+ left join TOrganization as L on T.parent_id=L.id
+ where 1=1 and A.user_code=@usercode and T.org_code=@stu_torgcode)";
+ list.Add(new { str = sql, parm = new { usercode = usercode, stu_torgcode = stu_torgcode } });
+ break;
+ case "W":
+ //娓呴櫎鐢ㄦ埛鍏宠仈瑙掕壊琛ㄦ暟鎹�
+ sql = @"delete from TUserRoleRelation where id in (select A.id from TUserRoleRelation A
+ left join TOrganization T on A.torg_code=T.org_code
+ left join TOrganization as L on T.parent_id=L.id
+ where 1=1 and A.user_code=@usercode and T.org_code=@stu_torgcode)";
+ list.Add(new { str = sql, parm = new { usercode = usercode, stu_torgcode = stu_torgcode } });
+ break;
+ }
//寰幆鍐欏叆鐢ㄦ埛鍏宠仈瑙掕壊琛�
for (int i = 0; i < json.Count; i++)
{
for (int j = 0; j < json[i].Data.Count; j++)
{
- sql = @"insert into TUserRoleRelation(user_code,role_code) values(@usercode,@role_code)";
- list.Add(new { str = sql, parm = new { usercode = usercode, role_code = json[i].Data[j] } });
+ sql = @"insert into TUserRoleRelation(user_code,role_code,torg_code) values(@usercode,@role_code,@stu_torgcode)";
+ list.Add(new { str = sql, parm = new { usercode = usercode, stu_torgcode= stu_torgcode, role_code = json[i].Data[j] } });
}
}
- //鏍囪鐢ㄦ埛琛ㄥ叧鑱旇鑹叉爣璇�
- sql = @"update TUser set is_role='Y' where usercode=@usercode";
- list.Add(new { str = sql, parm = new { usercode = usercode } });
}
bool aa = DapperHelper.DoTransaction(list);
if (aa)
@@ -753,16 +904,34 @@
#region[鐢ㄦ埛缁勫垪琛ㄦ煡璇
- public static ToMessage UserGroupSearch(int startNum, int endNum, string prop, string order)
+ public static ToMessage UserGroupSearch(string stu_torgcode, string description,int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
+ string search = "";
try
{
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select group_code,group_name,description
- from TGroup
- where is_delete<>'1' ";
+ switch (description)
+ {
+ case "":
+ break;
+ case "D":
+ search += "and parent.org_code=@stu_torgcode or child.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ case "W":
+ search += "and parent.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ default:
+ break;
+ }
+ var sql = @"select torg_code,parent.org_name,group_code,group_name,G.description
+ from TGroup G
+ left join TOrganization parent on G.torg_code=parent.org_code
+ left join TOrganization as child on parent.parent_id=child.id
+ where G.is_delete<>'1' "+search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -792,8 +961,9 @@
//寰幆鍐欏叆鐢ㄦ埛缁勮〃
for (int i = 0; i < json.Count; i++)
{
- var sql0 = @"select * from TGroup where group_code=@group_code";
+ var sql0 = @"select * from TGroup where group_code=@group_code and torg_code=@torg_code";
dynamicParams.Add("@group_code", json[i].code);
+ dynamicParams.Add("@torg_code", json[i].storg_code);
var data = DapperHelper.selectdata(sql0, dynamicParams);
if (data.Rows.Count > 0)
{
@@ -803,7 +973,7 @@
mes.data = null;
return mes;
}
- sql = @"insert into TGroup(group_code,group_name,description,lm_user,lm_date) values(@groupcode,@groupename,@description,@lm_user,@lm_date)";
+ sql = @"insert into TGroup(group_code,group_name,description,lm_user,lm_date,torg_code) values(@groupcode,@groupename,@description,@lm_user,@lm_date,@torg_code)";
list.Add(new
{
str = sql,
@@ -813,7 +983,8 @@
groupename = json[i].name,
description = json[i].flag,
lm_user = username,
- lm_date = DateTime.Now.ToString()
+ lm_date = DateTime.Now.ToString(),
+ torg_code = json[i].storg_code
}
});
}
@@ -899,16 +1070,34 @@
#region[瑙掕壊绫诲瀷鏌ヨ]
- public static ToMessage RoleTypeSearch(int startNum, int endNum, string prop, string order)
+ public static ToMessage RoleTypeSearch(string stu_torgcode, string description,int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
+ string search = "";
try
{
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select roletype_code,roletype_name
- from TRoleType
- where is_delete<>'1' ";
+ switch (description)
+ {
+ case "":
+ break;
+ case "D":
+ search += "and parent.org_code=@stu_torgcode or child.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ case "W":
+ search += "and parent.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ default:
+ break;
+ }
+ var sql = @"select torg_code,parent.org_name,roletype_code,roletype_name
+ from TRoleType R
+ left join TOrganization parent on R.torg_code=parent.org_code
+ left join TOrganization as child on parent.parent_id=child.id
+ where R.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -938,8 +1127,9 @@
//寰幆鍐欏叆瑙掕壊绫诲瀷琛�
for (int i = 0; i < json.Count; i++)
{
- var sql0 = @"select * from TRoleType where roletype_code=@roletype_code";
+ var sql0 = @"select * from TRoleType where roletype_code=@roletype_code and torg_code=@torg_code";
dynamicParams.Add("@roletype_code", json[i].code);
+ dynamicParams.Add("@torg_code", json[i].flag);
var data = DapperHelper.selectdata(sql0, dynamicParams);
if (data.Rows.Count > 0)
{
@@ -949,14 +1139,15 @@
mes.data = null;
return mes;
}
- sql = @"insert into TRoleType(roletype_code,roletype_name) values(@roletypecode,@roletypename)";
+ sql = @"insert into TRoleType(roletype_code,roletype_name,torg_code) values(@roletypecode,@roletypename,@torg_code)";
list.Add(new
{
str = sql,
parm = new
{
roletypecode = json[i].code,
- roletypename = json[i].name
+ roletypename = json[i].name,
+ torg_code= json[i].flag
}
});
}
@@ -1027,14 +1218,34 @@
#endregion
#region[瑙掕壊绫诲瀷涓嬫媺鎺ュ彛]
- public static ToMessage RoleTypeSelect()
+ public static ToMessage RoleTypeSelect(string stu_torgcode,string description)
{
- string sql = "";
+ var dynamicParams = new DynamicParameters();
+ string search = "";
try
{
//鑾峰彇璁惧绫诲瀷鏁版嵁
- sql = @"select roletype_code,roletype_name from TRoleType where is_delete<>'1' ";
- var data = DapperHelper.selecttable(sql);
+ switch (description)
+ {
+ case "":
+ break;
+ case "D":
+ search += "and parent.org_code=@stu_torgcode or child.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ case "W":
+ search += "and parent.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ default:
+ break;
+ }
+ var sql = @"select roletype_code,roletype_name,torg_code,parent.org_name
+ from TRoleType R
+ left join TOrganization parent on R.torg_code=parent.org_code
+ left join TOrganization as child on parent.parent_id=child.id
+ where R.is_delete<>'1' " + search;
+ var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
mes.data = data;
@@ -1051,12 +1262,27 @@
#endregion
#region[瑙掕壊娓呭崟鏌ヨ]
- public static ToMessage RoleSearch(string RoleCode, string RoleName, string RoleTypeCode, string CreateUser, int startNum, int endNum, string prop, string order)
+ public static ToMessage RoleSearch(string stu_torgcode,string description,string RoleCode, string RoleName, string RoleTypeCode, string CreateUser, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
try
{
+ switch (description)
+ {
+ case "":
+ break;
+ case "D":
+ search += "and part.org_code=@stu_torgcode or child.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ case "W":
+ search += "and part.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ default:
+ break;
+ }
if (RoleCode != "" && RoleCode != null)
{
search += "and A.role_code like '%'+@RoleCode+'%' ";
@@ -1084,8 +1310,10 @@
//search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select A.id,A.role_code,A.role_name,b.roletype_code,B.roletype_name,A.description,T.username as lm_user,A.lm_date,A.is_user,A.is_right
+ var sql = @"select A.id,A.role_code,A.role_name,b.roletype_code,B.roletype_name,A.torg_code,part.org_name,A.description,T.username as lm_user,A.lm_date,A.is_user,A.is_right
from TRole A
+ left join TOrganization part on A.torg_code=part.org_code
+ left join TOrganization as child on part.parent_id=child.id
left join TRoleType B on A.roletype_code=B.roletype_code
left join TUser T on A.lm_user=T.usercode
where A.is_delete='0' and A.is_system='0' " + search;
@@ -1107,7 +1335,7 @@
#endregion
#region[瑙掕壊娓呭崟鏂板缂栬緫]
- public static ToMessage AddUpdateRole(string RoleId, string RoleCode, string RoleName, string RoleTypeCode, string description, string Usercode, string OperType)
+ public static ToMessage AddUpdateRole(string RoleId, string RoleCode, string RoleName,string stu_torgcode, string RoleTypeCode, string description, string Usercode, string OperType)
{
var dynamicParams = new DynamicParameters();
try
@@ -1125,14 +1353,15 @@
mes.data = null;
return mes;
}
- var sql = @"insert into TRole(role_code,role_name,lm_user,lm_date,roletype_code,description)
- values(@RoleCode,@RoleName,@Usercode,@CreateDate,@RoleTypeCode,@description)";
+ var sql = @"insert into TRole(role_code,role_name,lm_user,lm_date,roletype_code,description,torg_code)
+ values(@RoleCode,@RoleName,@Usercode,@CreateDate,@RoleTypeCode,@description,@torg_code)";
dynamicParams.Add("@RoleCode", RoleCode);
dynamicParams.Add("@RoleName", RoleName);
dynamicParams.Add("@Usercode", Usercode);
dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
dynamicParams.Add("@RoleTypeCode", RoleTypeCode);
dynamicParams.Add("@description", description);
+ dynamicParams.Add("@torg_code", stu_torgcode);
int cont = DapperHelper.SQL(sql, dynamicParams);
if (cont > 0)
{
@@ -1151,11 +1380,12 @@
}
if (OperType == "Update")
{
- var sql = @"update TRole set role_name=@RoleName,lm_user=@Usercode,lm_date=@CreateDate,roletype_code=@RoleTypeCode,description=@description where id=@RoleId";
+ var sql = @"update TRole set role_name=@RoleName,lm_user=@Usercode,lm_date=@CreateDate,torg_code=@torg_code,roletype_code=@RoleTypeCode,description=@description where id=@RoleId";
dynamicParams.Add("@RoleId", RoleId);
dynamicParams.Add("@RoleName", RoleName);
dynamicParams.Add("@Usercode", Usercode);
dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
+ dynamicParams.Add("@torg_code", stu_torgcode);
dynamicParams.Add("@RoleTypeCode", RoleTypeCode);
dynamicParams.Add("@description", description);
int cont = DapperHelper.SQL(sql, dynamicParams);
@@ -1681,6 +1911,50 @@
#endregion
+ #region[瀹夌伅绯荤粺/杞﹂棿鏌ヨ]
+ public static ToMessage AnDengShopSearch(string stu_torgcode, string description)
+ {
+ string sql = "";
+ string search = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ //鑾峰彇杞﹂棿淇℃伅
+ switch (description)
+ {
+ case "":
+ break;
+ case "D":
+ search += "and child.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ case "W":
+ search += "and parent.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ default:
+ break;
+ }
+ sql = @"select parent.org_code,parent.org_name
+ from TOrganization parent
+ left join TOrganization as child on parent.parent_id=child.id
+ where parent.is_delete<>'1' " + search;
+ 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
+
#region[瀹夌伅绯荤粺/鑷畾涔夊畨鐏懠鍙被鍨嬫煡璇
public static ToMessage AnDengTypeSearch()
{
@@ -1910,7 +2184,7 @@
sql = @"delete TAnDon_Roul_ConFigUser where ando_cogfigid=@mid";
list.Add(new { str = sql, parm = new { mid = mid } });
}
- else
+ else
{
//鑾峰彇涓昏〃鏈�澶D
sql = @"select ISNULL(IDENT_CURRENT('TAnDon_Roul_ConFig')+1,1) as id";
diff --git a/VueWebApi/DLL/DAL/DeviceManagerDAL.cs b/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
index 930c240..961d910 100644
--- a/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
+++ b/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
@@ -359,14 +359,36 @@
#endregion
#region[鎵�灞炶溅闂翠笅鎷夋帴鍙
- public static ToMessage WorkShopSelect()
+ public static ToMessage WorkShopSelect(string stu_torgcode,string description)
{
string sql = "";
+ string search = "";
+ var dynamicParams = new DynamicParameters();
try
{
//鑾峰彇璁惧绫诲瀷鏁版嵁
- sql = @"select org_code as code,org_name as name from TOrganization where description='W' and is_delete<>'1'";
- var data = DapperHelper.selecttable(sql);
+ switch (description)
+ {
+ case "":
+ search += "and parent.description=@description ";
+ dynamicParams.Add("@description", "W");
+ break;
+ case "D":
+ search += "and child.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ case "W":
+ search += "and parent.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ default:
+ break;
+ }
+ sql = @"select parent.org_code as code,parent.org_name as name
+ from TOrganization parent
+ left join TOrganization as child on parent.parent_id=child.id
+ where parent.is_delete<>'1' " + search;
+ var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
mes.data = data;
@@ -410,12 +432,31 @@
#endregion
#region [璁惧娓呭崟鏌ヨ]
- public static ToMessage DeviceMangerSearch(string deviceCode, string deviceName, string status, string workShop, string deviceType, string deviceGroup, int startNum, int endNum, string prop, string order)
+ public static ToMessage DeviceMangerSearch(string stu_torgcode,string description,string deviceCode, string deviceName, string status, string workShop, string deviceType, string deviceGroup, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
try
{
+ if (workShop != "" && workShop != null)
+ {
+ search += "and A.wksp_code=@workShop ";
+ dynamicParams.Add("@workShop", workShop);
+ }
+ else
+ {
+ switch (description)
+ {
+ case "":
+ search += "and T.description=@description ";
+ dynamicParams.Add("@description", "W");
+ break;
+ case "D":
+ search += "and L.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ }
+ }
if (deviceCode != "" && deviceCode != null)
{
search += "and A.code like '%'+@deviceCode+'%' ";
@@ -430,11 +471,6 @@
{
search += "and A.enable=@status ";
dynamicParams.Add("@status", status);
- }
- if (workShop != "" && workShop != null)
- {
- search += "and A.wksp_code=@workShop ";
- dynamicParams.Add("@workShop", workShop);
}
if (deviceType != "" && deviceType != null)
{
@@ -458,8 +494,8 @@
from TEqpInfo A
left join TEqpType B on A.eqptype_code=B.code
left join TEqpGroup G on A.eqpgroup_code=G.code
- left join TOrganization T on A.wksp_code=T.org_code
- left join TOrganization L on A.Line_code=L.org_code
+ left join TOrganization T on A.wksp_code=T.org_code
+ left join TOrganization as L on T.parent_id=L.id
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);
@@ -1317,21 +1353,38 @@
#endregion
#region[璁惧鐐规鏍囧噯鍏宠仈宸ヤ綔绔欐煡璇
- public static ToMessage DeviceCheckStanedAssociationEqp(string checkstand_code)
+ public static ToMessage DeviceCheckStanedAssociationEqp(string stu_torgcode,string description,string checkstand_code)
{
string sql = "";
+ string search = "";
var dynamicParams = new DynamicParameters();
List<StandEqp> list = new List<StandEqp>();
try
{
+ switch (description)
+ {
+ case "":
+ break;
+ case "D":
+ search += "and T.org_code=@stu_torgcode or child.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ case "W":
+ search += "and T.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ default:
+ break;
+ }
//鑾峰彇宸ヤ綔绔欓泦鍚�(杞﹂棿,鍖呭惈宸茬粦瀹氬伐浣滅珯鏍囪瘑)
sql = @"select distinct T.org_code as wksp_code,T.org_name as wksp_name,'E' as type,(case when B.eqp_code is null then 'N' else 'Y' end) flag
from TOrganization T
+ left join TOrganization as child on T.parent_id=child.id
left join(
select distinct A.eqp_code,B.wksp_code from TEqpchk_Eqp A
inner join TEqpInfo B on A.eqp_code=B.code
where A.eqpchkmain_code=@checkstand_code and A.is_delete<>'1' and B.is_delete<>'1'
- ) B on T.org_code=B.wksp_code where T.description='W' and is_delete<>'1'";
+ ) B on T.org_code=B.wksp_code where T.description='W' and T.is_delete<>'1' "+search;
dynamicParams.Add("@checkstand_code", checkstand_code);
var data = DapperHelper.selectdata(sql, dynamicParams);
for (int i = 0; i < data.Rows.Count; i++)
@@ -1756,21 +1809,38 @@
#endregion
#region[璁惧淇濆吇鏍囧噯鍏宠仈宸ヤ綔绔欐煡璇
- public static ToMessage DeviceRepairStanedAssociationEqp(string repairstand_code)
+ public static ToMessage DeviceRepairStanedAssociationEqp(string stu_torgcode,string description,string repairstand_code)
{
string sql = "";
+ string search = "";
var dynamicParams = new DynamicParameters();
List<StandEqp> list = new List<StandEqp>();
try
{
+ switch (description)
+ {
+ case "":
+ break;
+ case "D":
+ search += "and T.org_code=@stu_torgcode or child.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ case "W":
+ search += "and T.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ default:
+ break;
+ }
//鑾峰彇宸ヤ綔绔欓泦鍚�(杞﹂棿,鍖呭惈宸茬粦瀹氬伐浣滅珯鏍囪瘑)
sql = @"select distinct T.org_code as wksp_code,T.org_name as wksp_name,'E' as type,(case when B.eqp_code is null then 'N' else 'Y' end) flag
from TOrganization T
+ left join TOrganization as child on T.parent_id=child.id
left join(
select distinct A.eqp_code,B.wksp_code from TEqpmai_Eqp A
inner join TEqpInfo B on A.eqp_code=B.code
where A.eapmai_code=@repairstand_code and A.is_delete<>'1' and B.is_delete<>'1'
- ) B on T.org_code=B.wksp_code where T.description='W' and is_delete<>'1'";
+ ) B on T.org_code=B.wksp_code where T.description='W' and T.is_delete<>'1' "+search;
dynamicParams.Add("@repairstand_code", repairstand_code);
var data = DapperHelper.selectdata(sql, dynamicParams);
@@ -1905,7 +1975,7 @@
#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)
+ public static ToMessage DeviceCheckTakeSearch(string stu_torgcode,string description, 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 = "";
@@ -1915,6 +1985,20 @@
{
search += "and T.org_code=@wkshopcode ";
dynamicParams.Add("@wkshopcode", wkshopcode);
+ }
+ else
+ {
+ switch (description)
+ {
+ case "":
+ search += "and T.description=@description ";
+ dynamicParams.Add("@description", "W");
+ break;
+ case "D":
+ search += "and L.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ }
}
if (eqpcode != "" && eqpcode != null)
{
@@ -1955,6 +2039,7 @@
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
+ left join TOrganization as L on T.parent_id=L.id
where T.description='W' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
@@ -2003,7 +2088,7 @@
#endregion
#region[璁惧鐐规璁板綍瀵煎嚭]
- public static ToMessage DeviceCheckTakeOutExcel(string wkshopcode, string eqpcode, string eqpname, string stanedname, string checkuser, string checkopendate, string checkclosedate)
+ public static ToMessage DeviceCheckTakeOutExcel(string stu_torgcode, string description, string wkshopcode, string eqpcode, string eqpname, string stanedname, string checkuser, string checkopendate, string checkclosedate)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -2013,6 +2098,20 @@
{
search += "and T.org_code=@wkshopcode ";
dynamicParams.Add("@wkshopcode", wkshopcode);
+ }
+ else
+ {
+ switch (description)
+ {
+ case "":
+ search += "and T.description=@description ";
+ dynamicParams.Add("@description", "W");
+ break;
+ case "D":
+ search += "and L.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ }
}
if (eqpcode != "" && eqpcode != null)
{
@@ -2081,6 +2180,7 @@
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
+ left join TOrganization as L on T.parent_id=L.id
left join TEqpchk_Item H on B.eqpchkdeta_code=H.code
where T.description='W' " + search;
DataTable data = DapperHelper.selectdata(sql, dynamicParams);
@@ -2105,7 +2205,7 @@
#region[璁惧淇濆吇璁板綍鏌ヨ]
- public static ToMessage DeviceCheckTakeSearch(string wkshopcode, string eqpcode, string eqpname, string stanedname, string repairuser, string repairopendate, string repairclosedate, string repairresult, int startNum, int endNum, string prop, string order)
+ public static ToMessage DeviceCheckTakeSearch(string stu_torgcode, string description, string wkshopcode, string eqpcode, string eqpname, string stanedname, string repairuser, string repairopendate, string repairclosedate, string repairresult, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -2115,6 +2215,20 @@
{
search += "and T.org_code=@wkshopcode ";
dynamicParams.Add("@wkshopcode", wkshopcode);
+ }
+ else
+ {
+ switch (description)
+ {
+ case "":
+ search += "and T.description=@description ";
+ dynamicParams.Add("@description", "W");
+ break;
+ case "D":
+ search += "and L.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ }
}
if (eqpcode != "" && eqpcode != null)
{
@@ -2160,6 +2274,7 @@
left join TEqpInfo E on A.eqp_code=E.code
left join TEqpmai_Main M on A.eqpmaint_code=M.code
left join TOrganization T on E.wksp_code=T.org_code
+ left join TOrganization as L on T.parent_id=L.id
where T.description='W' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
@@ -2208,7 +2323,7 @@
#endregion
#region[璁惧淇濆吇璁板綍瀵煎嚭]
- public static ToMessage DeviceRepairTakeOutExcel(string wkshopcode, string eqpcode, string eqpname, string stanedname, string repairuser, string repairopendate, string repairclosedate, string repairresult)
+ public static ToMessage DeviceRepairTakeOutExcel(string stu_torgcode, string description, string wkshopcode, string eqpcode, string eqpname, string stanedname, string repairuser, string repairopendate, string repairclosedate, string repairresult)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -2218,6 +2333,20 @@
{
search += "and T.org_code=@wkshopcode ";
dynamicParams.Add("@wkshopcode", wkshopcode);
+ }
+ else
+ {
+ switch (description)
+ {
+ case "":
+ search += "and T.description=@description ";
+ dynamicParams.Add("@description", "W");
+ break;
+ case "D":
+ search += "and L.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ }
}
if (eqpcode != "" && eqpcode != null)
{
@@ -2294,6 +2423,7 @@
left join TEqpInfo E on A.eqp_code=E.code
left join TEqpmai_Main M on A.eqpmaint_code=M.code
left join TOrganization T on E.wksp_code=T.org_code
+ left join TOrganization as L on T.parent_id=L.id
left join TEqpmai_Item H on B.eqpmaideta_code=H.code
where T.description='W' " + search;
DataTable data = DapperHelper.selectdata(sql, dynamicParams);
@@ -2318,7 +2448,7 @@
#region[璁惧缁翠慨璁板綍鏌ヨ]
- public static ToMessage DeviceUpdateSearch(string wkshopcode, string eqpcode, string eqpname, string reportuser, string repairuser, string vrifcatuser, string reportopendate, string reportclosedate, string repairopendate, string repairclosedate, string vrifcatopendate, string vrifcatclosedate, int startNum, int endNum, string prop, string order)
+ public static ToMessage DeviceUpdateSearch(string stu_torgcode, string description, string wkshopcode, string eqpcode, string eqpname, string reportuser, string repairuser, string vrifcatuser, string reportopendate, string reportclosedate, string repairopendate, string repairclosedate, string vrifcatopendate, string vrifcatclosedate, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -2328,6 +2458,20 @@
{
search += "and A.wksp_code=@wkshopcode ";
dynamicParams.Add("@wkshopcode", wkshopcode);
+ }
+ else
+ {
+ switch (description)
+ {
+ case "":
+ search += "and T.description=@description ";
+ dynamicParams.Add("@description", "W");
+ break;
+ case "D":
+ search += "and L.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ }
}
if (eqpcode != "" && eqpcode != null)
{
@@ -2387,6 +2531,7 @@
left join TEqp_RepairRequest B on A.source_wo=B.docu_code
left join TEqpInfo E on A.eqp_code=E.code
left join TOrganization T on A.wksp_code=T.org_code
+ left join TOrganization as L on T.parent_id=L.id
where T.description='W' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
@@ -2473,7 +2618,7 @@
#endregion
#region[璁惧缁翠慨璁板綍瀵煎嚭]
- public static ToMessage DeviceUpdateOutExcel(string wkshopcode, string eqpcode, string eqpname, string reportuser, string repairuser, string vrifcatuser, string reportopendate, string reportclosedate, string repairopendate, string repairclosedate, string vrifcatopendate, string vrifcatclosedate)
+ public static ToMessage DeviceUpdateOutExcel(string stu_torgcode, string description, string wkshopcode, string eqpcode, string eqpname, string reportuser, string repairuser, string vrifcatuser, string reportopendate, string reportclosedate, string repairopendate, string repairclosedate, string vrifcatopendate, string vrifcatclosedate)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -2483,6 +2628,20 @@
{
search += "and A.wksp_code=@wkshopcode ";
dynamicParams.Add("@wkshopcode", wkshopcode);
+ }
+ else
+ {
+ switch (description)
+ {
+ case "":
+ search += "and T.description=@description ";
+ dynamicParams.Add("@description", "W");
+ break;
+ case "D":
+ search += "and L.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ }
}
if (eqpcode != "" && eqpcode != null)
{
@@ -2552,6 +2711,7 @@
left join TEqp_RepairRequest B on A.source_wo=B.docu_code
left join TEqpInfo E on A.eqp_code=E.code
left join TOrganization T on A.wksp_code=T.org_code
+ left join TOrganization as L on T.parent_id=L.id
where T.description='W'" + search;
DataTable data = DapperHelper.selectdata(sql, dynamicParams);
data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
diff --git a/VueWebApi/DLL/DAL/LoginDAL.cs b/VueWebApi/DLL/DAL/LoginDAL.cs
index 54e94cc..890b9cc 100644
--- a/VueWebApi/DLL/DAL/LoginDAL.cs
+++ b/VueWebApi/DLL/DAL/LoginDAL.cs
@@ -28,7 +28,9 @@
{
//鎵цsql
- strProcName = "select * from [dbo].[TUser] where usercode=@username and password=@password and is_delete='0'";
+ strProcName = @"select * from TUser U
+ left join TOrganization T on U.stu_torgcode = T.org_code
+ where U.usercode =@username and U.password =@password and U.is_delete = '0'";
//鍒涘缓鍙傛暟
listStr.Add(new SqlParameter("@username", username));
listStr.Add(new SqlParameter("@password", password));
@@ -40,18 +42,19 @@
#endregion
#region [鍐欏叆鐧诲綍璁板綍琛╙
- public static ToMessage LoginBas(string usercode, string usertype)
+ public static ToMessage LoginBas(string usercode, string usertype,string stu_torgcode)
{
var sql = "";
var cont = 0;
var dynamicParams = new DynamicParameters();
try
{
- sql = @"insert into T_Bas_Login(usercode,status,indate,origin)
- values(@usercode,'Y',@indate,@usertype)";
+ sql = @"insert into T_Bas_Login(usercode,status,indate,origin,torg_code)
+ values(@usercode,'Y',@indate,@usertype,@stu_torgcode)";
dynamicParams.Add("@usercode", usercode);
dynamicParams.Add("@usertype", usertype);
dynamicParams.Add("@indate", DateTime.Now.ToString());
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
cont = DapperHelper.SQL(sql, dynamicParams);
if (cont > 0)
{
@@ -301,7 +304,7 @@
#endregion
#region[PC鐧诲嚭]
- public static ToMessage LoginOut(int userid, string usercode, string username, string usertype)
+ public static ToMessage LoginOut(int userid, string usercode, string username, string usertype,string stu_torgcode)
{
var sql = "";
var cont = 0;
@@ -309,15 +312,16 @@
RedisHelper redis = new RedisHelper();
try
{
- sql = @"insert into T_Bas_Login(usercode,status,outdate,origin)
- values(@usercode,'N',@outdate,@usertype)";
+ sql = @"insert into T_Bas_Login(usercode,status,outdate,origin,torg_code)
+ values(@usercode,'N',@outdate,@usertype,@stu_torgcode)";
dynamicParams.Add("@usercode", usercode);
dynamicParams.Add("@usertype", usertype);
dynamicParams.Add("@outdate", DateTime.Now.ToString());
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
cont = DapperHelper.SQL(sql, dynamicParams);
if (cont > 0)
{
- redis.Remove(Enterprise + "LoginUserID" + usertype + userid, 0); //鍒犻櫎redis
+ redis.Remove(Enterprise + stu_torgcode + "LoginUserID" + usertype + userid, 0); //鍒犻櫎redis
mes.code = "200";
mes.count = 0;
mes.Message = "鐧诲嚭鎴愬姛!";
@@ -399,7 +403,7 @@
left join TOrganization T on B.wkshp_code=T.org_code
left join TAnDonType D on A.type=d.code
left join TUser U on A.resp_user=U.usercode
- where A.resp_user=@usercode and B.status='START' and U.rid=@rid and T.description='W'";
+ where A.resp_user=@usercode and B.status='START' and U.rid=@rid";
dynamicParams.Add("@usercode", usercode);
dynamicParams.Add("@rid", rid);
var data = DapperHelper.selectdata(sql, dynamicParams);
diff --git a/VueWebApi/DLL/DAL/ProductModelDAL.cs b/VueWebApi/DLL/DAL/ProductModelDAL.cs
index 724f0d6..0f15076 100644
--- a/VueWebApi/DLL/DAL/ProductModelDAL.cs
+++ b/VueWebApi/DLL/DAL/ProductModelDAL.cs
@@ -464,14 +464,17 @@
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
var sql = @"select A.id,A.partcode,A.partname,A.partspec,A.uom_code,B.name as uom_name,D.code as stocktypecode,D.name as stocktypename,
- C.code as materialtypecode,C.name as materialtypename,A.stck_code,T.name as stck_name,A.maxqty,A.minqty,U.username as lm_user,A.default_route,
- A.lm_date,A.proute_id,A.is_batchno,A.is_fifo,A.is_incheck,A.is_outcheck
+ C.code as materialtypecode,C.name as materialtypename,A.stck_code,T.name as stck_name,A.maxqty,A.minqty,U.username as lm_user,
+ A.lm_date,(case when isnull(M.materiel_code,'')='' then 'N' else 'Y' end) as proute_id,A.is_batchno,A.is_fifo,A.is_incheck,A.is_outcheck
from TMateriel_Info A
left join TUom B on A.uom_code=B.code
left join TMateriel_Type C on A.materieltype_code=C.code
left join T_Dict D on A.stocktype_code=D.code and D.dict_type='CHLX'
left join T_Sec_Stck T on A.stck_code=T.code
left join TUser U on A.lm_user=U.usercode
+ left join (
+ select distinct materiel_code from TMateriel_Route
+ ) M on A.partcode=M.materiel_code
where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
@@ -686,20 +689,38 @@
#endregion
#region[瀛樿揣妗ｆ鍏宠仈宸ヨ壓璺嚎鏌ヨ]
- public static ToMessage InventoryFileAssociationRoute(string partcode)
+ public static ToMessage InventoryFileAssociationRoute(string stu_torgcode,string stu_torgtypecode,string partcode)
{
string sql = "";
+ string search = "";
var dynamicParams = new DynamicParameters();
List<MaterialRout> list = new List<MaterialRout>();
try
{
+ switch (stu_torgtypecode)
+ {
+ case "":
+ break;
+ case "D":
+ search += "and parent.org_code=@stu_torgcode or child.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ case "W":
+ search += "and parent.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ default:
+ break;
+ }
//鑾峰彇宸ヨ壓璺嚎闆嗗悎(鍖呭惈鐗╂枡缁戝畾宸ヨ壓璺嚎鏍囪瘑)
- sql = @"select distinct A.code as routecode,A.name as routename,(case when B.route_code is null then 'N' else 'Y' end) flag from TFlw_Rout A
+ sql = @"select distinct parent.org_code,parent.org_name,A.code as routecode,A.name as routename,(case when B.route_code is null then 'N' else 'Y' end) flag from TFlw_Rout A
+ left join TOrganization parent on A.torg_code=parent.org_code
+ left join TOrganization as child on parent.parent_id=child.id
left join (
select distinct route_code from TMateriel_Route where materiel_code=@partcode and is_delete<>'1'
) B
on A.code=B.route_code
- where A.is_delete='0' and A.enable='Y'";
+ where A.is_delete='0' and A.enable='Y' " + search;
dynamicParams.Add("@partcode", partcode);
var data = DapperHelper.selectdata(sql, dynamicParams);
for (int i = 0; i < data.Rows.Count; i++)
@@ -708,7 +729,8 @@
rout.code = data.Rows[i]["ROUTECODE"].ToString();
rout.name = data.Rows[i]["ROUTENAME"].ToString();
rout.flag = data.Rows[i]["FLAG"].ToString();
-
+ rout.wkshopcode= data.Rows[i]["ORG_CODE"].ToString();
+ rout.wkshopname = data.Rows[i]["ORG_NAME"].ToString();
//鏍规嵁宸ヨ壓璺嚎缂栫爜鑾峰彇鍏宠仈鐨勫伐搴忎俊鎭�
sql = @"select A.seq,B.stepcode,B.stepname,B.enable from TFlw_Rtdt A
inner join TStep B on A.step_code=B.stepcode
@@ -735,7 +757,7 @@
#endregion
#region[瀛樿揣妗ｆ鍏宠仈宸ヨ壓璺嚎鎻愪氦]
- public static ToMessage SaveInventoryFile(string partcode, string defaultroute_code, string username, List<ObjectData> json)
+ public static ToMessage SaveInventoryFile(string stu_torgcode,string stu_torgtypecode, string partcode, string defaultroute_code, string username, List<PartRout> json)
{
var sql = "";
List<object> list = new List<object>();
@@ -744,22 +766,61 @@
list.Clear();
if (json == null || json.Count <= 0)
{
- //娓呴櫎鐗╂枡鍏宠仈宸ヨ壓璺嚎琛ㄦ暟鎹�
- sql = @"delete TMateriel_Route where materiel_code=@partcode";
- list.Add(new { str = sql, parm = new { partcode = partcode } });
- //鏍囪鐗╂枡琛ㄥ叧鑱斿伐鑹鸿矾绾挎爣璇�
- sql = @"update TMateriel_Info set proute_id='N',default_route='' where partcode=@partcode";
- list.Add(new { str = sql, parm = new { partcode = partcode } });
+ switch (stu_torgtypecode)
+ {
+ case "":
+ //娓呴櫎鐗╂枡鍏宠仈宸ヨ壓璺嚎琛ㄦ暟鎹�
+ sql = @"delete TMateriel_Route where materiel_code=@partcode";
+ list.Add(new { str = sql, parm = new { partcode = partcode } });
+ break;
+ case "D":
+ //娓呴櫎鐗╂枡鍏宠仈宸ヨ壓璺嚎琛ㄦ暟鎹�
+ sql = @"delete from TMateriel_Route where id in (select A.id from TMateriel_Route A
+ left join TOrganization T on A.torg_code=T.org_code
+ left join TOrganization as L on T.parent_id=L.id
+ where 1=1 and A.materiel_code=@partcode and L.org_code=@stu_torgcode)";
+ list.Add(new { str = sql, parm = new { partcode = partcode, stu_torgcode = stu_torgcode } });
+ break;
+ case "W":
+ //娓呴櫎鐗╂枡鍏宠仈宸ヨ壓璺嚎琛ㄦ暟鎹�
+ sql = @"delete from TMateriel_Route where id in (select A.id from TMateriel_Route A
+ left join TOrganization T on A.torg_code=T.org_code
+ left join TOrganization as L on T.parent_id=L.id
+ where 1=1 and A.materiel_code=@partcode and T.org_code=@stu_torgcode)";
+ list.Add(new { str = sql, parm = new { partcode = partcode, stu_torgcode = stu_torgcode } });
+ break;
+ }
}
else
{
- //娓呴櫎鐢ㄦ埛鍏宠仈瑙掕壊琛ㄦ暟鎹�
- sql = @"delete TMateriel_Route where materiel_code=@partcode";
- list.Add(new { str = sql, parm = new { partcode = partcode } });
+ switch (stu_torgtypecode)
+ {
+ case "":
+ //娓呴櫎鐗╂枡鍏宠仈宸ヨ壓璺嚎琛ㄦ暟鎹�
+ sql = @"delete TMateriel_Route where materiel_code=@partcode";
+ list.Add(new { str = sql, parm = new { partcode = partcode } });
+ break;
+ case "D":
+ //娓呴櫎鐗╂枡鍏宠仈宸ヨ壓璺嚎琛ㄦ暟鎹�
+ sql = @"delete from TMateriel_Route where id in (select A.id from TMateriel_Route A
+ left join TOrganization T on A.torg_code=T.org_code
+ left join TOrganization as L on T.parent_id=L.id
+ where 1=1 and A.materiel_code=@partcode and L.org_code=@stu_torgcode)";
+ list.Add(new { str = sql, parm = new { partcode = partcode, stu_torgcode = stu_torgcode } });
+ break;
+ case "W":
+ //娓呴櫎鐗╂枡鍏宠仈宸ヨ壓璺嚎琛ㄦ暟鎹�
+ sql = @"delete from TMateriel_Route where id in (select A.id from TMateriel_Route A
+ left join TOrganization T on A.torg_code=T.org_code
+ left join TOrganization as L on T.parent_id=L.id
+ where 1=1 and A.materiel_code=@partcode and T.org_code=@stu_torgcode)";
+ list.Add(new { str = sql, parm = new { partcode = partcode, stu_torgcode = stu_torgcode } });
+ break;
+ }
//寰幆鍐欏叆鐢ㄦ埛鍏宠仈瑙掕壊琛�
for (int i = 0; i < json.Count; i++)
{
- sql = @"insert into TMateriel_Route(materiel_code,route_code,lm_user,lm_date) values(@materiel_code,@route_code,@lm_user,@lm_date)";
+ sql = @"insert into TMateriel_Route(materiel_code,route_code,lm_user,lm_date,torg_code) values(@materiel_code,@route_code,@lm_user,@lm_date,@torg_code)";
list.Add(new
{
str = sql,
@@ -768,13 +829,11 @@
materiel_code = partcode,
route_code = json[i].code,
lm_user = username,
- lm_date = DateTime.Now.ToString()
+ lm_date = DateTime.Now.ToString(),
+ torg_code = json[i].wkshopcode
}
});
}
- //鏍囪鐗╂枡琛ㄥ叧鑱斿伐鑹鸿矾绾挎爣璇�
- sql = @"update TMateriel_Info set proute_id='Y',default_route=@defaultroute_code where partcode=@partcode";
- list.Add(new { str = sql, parm = new { partcode = partcode, defaultroute_code = defaultroute_code } });
}
bool aa = DapperHelper.DoTransaction(list);
if (aa)
@@ -1164,12 +1223,31 @@
#region[宸ヨ壓璺嚎鏌ヨ]
- public static ToMessage RouteSearch(string routecode, string routename, string description, string createuser, int startNum, int endNum, string prop, string order)
+ public static ToMessage RouteSearch(string stu_torgcode, string stu_torgtypecode, string WorkShop,string routecode, string routename, string description, string createuser, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
try
{
+ if (WorkShop != "" && WorkShop != null)
+ {
+ search += "and A.torg_code=@workShop ";
+ dynamicParams.Add("@workShop", WorkShop);
+ }
+ else
+ {
+ switch (stu_torgtypecode)
+ {
+ case "":
+ search += "and T.description=@description ";
+ dynamicParams.Add("@description", "W");
+ break;
+ case "D":
+ search += "and L.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ }
+ }
if (routecode != "" && routecode != null)
{
search += "and A.code like '%'+@routecode+'%' ";
@@ -1196,8 +1274,10 @@
}
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select A.id,A.code,A.name,A.description,A.enable,U.username as lm_user,A.lm_date from TFlw_Rout A
+ var sql = @"select A.id,T.org_code,T.org_name,A.code,A.name,A.description,A.enable,U.username as lm_user,A.lm_date from TFlw_Rout A
left join TUser U on A.lm_user=U.usercode
+ left join TOrganization T on A.torg_code=T.org_code
+ left join TOrganization as L on T.parent_id=L.id
where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
@@ -1225,7 +1305,7 @@
try
{
//鑾峰彇宸ヨ壓璺嚎淇℃伅
- sql = @"select code,name,description,enable
+ sql = @"select code,name,description,enable,torg_code
from TFlw_Rout
where code=@routecode and is_delete<>'1'";
dynamicParams.Add("@routecode", routecode);
@@ -1237,6 +1317,7 @@
rout.name = data.Rows[i]["NAME"].ToString();
rout.enable = data.Rows[i]["ENABLE"].ToString();
rout.description = data.Rows[i]["DESCRIPTION"].ToString();
+ rout.wkshopcode = data.Rows[i]["torg_code"].ToString();
//鏍规嵁宸ヨ壓璺嚎缂栫爜鑾峰彇鍏宠仈鐨勫伐搴忎俊鎭�
sql = @"select A.seq,B.stepcode,B.stepname,B.enable from TFlw_Rtdt A
@@ -1285,8 +1366,8 @@
return mes;
}
//鏂板宸ヨ壓璺嚎琛�
- sql = @"insert into TFlw_Rout(code,name,description,enable,lm_user,lm_date) values(@code,@name,@description,@enable,@lm_user,@lm_date)";
- list.Add(new { str = sql, parm = new { code = json.code, name = json.name, description = json.description, enable = json.enable, lm_user = username, lm_date = DateTime.Now.ToString() } });
+ sql = @"insert into TFlw_Rout(code,name,description,enable,lm_user,lm_date,torg_code) values(@code,@name,@description,@enable,@lm_user,@lm_date,@torg_code)";
+ list.Add(new { str = sql, parm = new { code = json.code, name = json.name, description = json.description, enable = json.enable, lm_user = username, lm_date = DateTime.Now.ToString(), torg_code=json.wkshopcode } });
for (int i = 0; i < json.Data.Rows.Count; i++)
{
string is_firststep = "N"; //鏄惁棣栭亾宸ュ簭
@@ -1300,8 +1381,8 @@
is_laststep = "Y";
}
//鏂板宸ヨ壓璺嚎鍏宠仈宸ュ簭琛�
- sql = @"insert TFlw_Rtdt (rout_code,seq,step_code,first_choke,last_choke,lm_user,lm_date) values(@rout_code,@seq,@step_code,@first_choke,@last_choke,@lm_user,@lm_date)";
- list.Add(new { str = sql, parm = new { rout_code = json.code, seq = Convert.ToInt32(json.Data.Rows[i]["SEQ"].ToString()), step_code = json.Data.Rows[i]["STEPCODE"].ToString(), first_choke = is_firststep, last_choke = is_laststep, lm_user = username, lm_date = DateTime.Now.ToString() } });
+ sql = @"insert TFlw_Rtdt (rout_code,seq,step_code,first_choke,last_choke,lm_user,lm_date,torg_code) values(@rout_code,@seq,@step_code,@first_choke,@last_choke,@lm_user,@lm_date,@torg_code)";
+ list.Add(new { str = sql, parm = new { rout_code = json.code, seq = Convert.ToInt32(json.Data.Rows[i]["SEQ"].ToString()), step_code = json.Data.Rows[i]["STEPCODE"].ToString(), first_choke = is_firststep, last_choke = is_laststep, lm_user = username, lm_date = DateTime.Now.ToString(),torg_code=json.wkshopcode } });
}
bool aa = DapperHelper.DoTransaction(list);
if (aa)
@@ -1424,14 +1505,16 @@
#region[宸ュ簭涓嬫媺鏌ヨ鎺ュ彛]
- public static ToMessage StepSelect()
+ public static ToMessage StepSelect(string WorkShop)
{
string sql = "";
+ var dynamicParams = new DynamicParameters();
try
{
//鑾峰彇宸ュ簭鏁版嵁
- sql = @"select stepcode,stepname from TStep where is_delete<>'1' and enable='Y'";
- var data = DapperHelper.selecttable(sql);
+ sql = @"select stepcode,stepname from TStep where is_delete<>'1' and enable='Y' and torg_code=@torg_code";
+ dynamicParams.Add("@torg_code", WorkShop);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
mes.count = data.Rows.Count;
mes.Message = "鏌ヨ鎴愬姛!";
@@ -1449,12 +1532,31 @@
#endregion
#region[宸ュ簭鏌ヨ]
- public static ToMessage StepSearch(string stepcode, string stepname, string enable, string steptypecode, string createuser, int startNum, int endNum, string prop, string order)
+ public static ToMessage StepSearch(string stu_torgcode,string stu_torgtypecode,string WorkShop, string stepcode, string stepname, string enable, string steptypecode, string createuser, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
try
{
+ if (WorkShop != "" && WorkShop != null)
+ {
+ search += "and A.torg_code=@workShop ";
+ dynamicParams.Add("@workShop", WorkShop);
+ }
+ else
+ {
+ switch (stu_torgtypecode)
+ {
+ case "":
+ search += "and T.description=@description ";
+ dynamicParams.Add("@description", "W");
+ break;
+ case "D":
+ search += "and L.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ }
+ }
if (stepcode != "" && stepcode != null)
{
search += "and A.stepcode like '%'+@stepcode+'%' ";
@@ -1486,8 +1588,10 @@
}
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select A.id,A.stepcode,A.stepname,A.flwtype,A.enable,A.descr,U.username as lm_user,A.lm_date,A.is_eqp,A.is_defect from TStep A
+ var sql = @"select A.id,T.org_code,T.org_name,A.stepcode,A.stepname,A.flwtype,A.enable,A.descr,U.username as lm_user,A.lm_date,A.is_eqp,A.is_defect from TStep A
left join TUser U on A.lm_user=U.usercode
+ left join TOrganization T on A.torg_code=T.org_code
+ left join TOrganization as L on T.parent_id=L.id
where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
@@ -1507,7 +1611,7 @@
#endregion
#region[宸ュ簭鏂板缂栬緫]
- public static ToMessage AddUpdateStep(string stepid, string stepcode, string stepname, string steptypecode, string enable, string description, string username, string operType)
+ public static ToMessage AddUpdateStep(string stepid,string WorkShop, string stepcode, string stepname, string steptypecode, string enable, string description, string username, string operType)
{
var dynamicParams = new DynamicParameters();
List<object> list = new List<object>();
@@ -1527,8 +1631,8 @@
mes.data = null;
return mes;
}
- var sql = @"insert into TStep(stepcode,stepname,flwtype,enable,descr,lm_user,lm_date)
- values(@stepcode,@stepname,@steptypecode,@enable,@description,@username,@CreateDate)";
+ var sql = @"insert into TStep(stepcode,stepname,flwtype,enable,descr,lm_user,lm_date,torg_code)
+ values(@stepcode,@stepname,@steptypecode,@enable,@description,@username,@CreateDate,@torg_code)";
dynamicParams.Add("@stepcode", stepcode);
dynamicParams.Add("@stepname", stepname);
dynamicParams.Add("@steptypecode", steptypecode);
@@ -1536,6 +1640,7 @@
dynamicParams.Add("@description", description);
dynamicParams.Add("@username", username);
dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
+ dynamicParams.Add("@torg_code", WorkShop);
int cont = DapperHelper.SQL(sql, dynamicParams);
if (cont > 0)
{
@@ -1593,9 +1698,9 @@
list.Add(new { str = sql_1, parm = new { stepcode = stepcode } });
}
}
- sql_1 = @"update TStep set stepname=@stepname,flwtype=@steptypecode,enable=@enable,descr=@description,
+ sql_1 = @"update TStep set torg_code=@torg_code, stepname=@stepname,flwtype=@steptypecode,enable=@enable,descr=@description,
lm_user=@username,lm_date=@CreateDate where id=@stepid";
- list.Add(new { str = sql_1, parm = new { stepid = stepid, stepname = stepname, steptypecode = steptypecode, enable = enable, description = description, username = username, CreateDate = DateTime.Now.ToString() } });
+ list.Add(new { str = sql_1, parm = new { torg_code=WorkShop, stepid = stepid, stepname = stepname, steptypecode = steptypecode, enable = enable, description = description, username = username, CreateDate = DateTime.Now.ToString() } });
bool aa = DapperHelper.DoTransaction(list);
if (aa)
{
@@ -1657,7 +1762,7 @@
sql = @"delete TDefect_Step where step_code=@stepcode";
list.Add(new { str = sql, parm = new { stepcode = stepcode } });
//鍒犻櫎宸ュ簭
- sql = @"update TStep set is_delete='1' where stepcode=@stepcode";
+ sql = @"delete TStep where stepcode=@stepcode";
list.Add(new { str = sql, parm = new { stepcode = stepcode } });
bool aa = DapperHelper.DoTransaction(list);
if (aa)
@@ -1687,7 +1792,7 @@
#endregion
#region[宸ュ簭瀹氫箟鍏宠仈宸ヤ綔绔欐煡璇
- public static ToMessage StepAssociationEqp(string stepcode)
+ public static ToMessage StepAssociationEqp(string WorkShop, string stepcode)
{
string sql = "";
var dynamicParams = new DynamicParameters();
@@ -1700,7 +1805,7 @@
select distinct A.eqp_code,B.wksp_code from TFlw_Rteqp A
inner join TEqpInfo B on A.eqp_code=B.code
where A.step_code=@stepcode and A.is_delete<>'1' and B.is_delete<>'1' and B.enable='Y'
- ) B on T.org_code=B.wksp_code where T.description='W' and is_delete<>'1'
+ ) B on T.org_code=B.wksp_code where T.description='W' and is_delete<>'1' and T.org_code=@WorkShop
UNION ALL
select distinct T.type as wksp_code,(case when T.type='211' then '渚涘簲鍟�' when T.type='228' then '瀹㈡埛/渚涘簲鍟�' end ) as wksp_name,'W' as type,(case when B.type is null then 'N' else 'Y' end) flag
from TCustomer T
@@ -1709,6 +1814,7 @@
inner join TCustomer B on A.eqp_code=B.code
where A.step_code=@stepcode and A.is_delete<>'1' and B.is_delete<>'1'
) B on T.type=B.type where T.type in('211','228') and T.is_delete<>'1'"; //226(瀹㈡埛)
+ dynamicParams.Add("@WorkShop", WorkShop);
dynamicParams.Add("@stepcode", stepcode);
var data = DapperHelper.selectdata(sql, dynamicParams);
for (int i = 0; i < data.Rows.Count; i++)
@@ -1784,7 +1890,7 @@
#endregion
#region [宸ュ簭瀹氫箟鍏宠仈宸ヤ綔绔欐彁浜
- public static ToMessage SaveStepAssociationEqp(string stepcode, string username, List<ObjectData> json)
+ public static ToMessage SaveStepAssociationEqp(string WorkShop,string stepcode, string username, List<ObjectData> json)
{
var sql = "";
List<object> list = new List<object>();
@@ -1808,7 +1914,7 @@
//寰幆鍐欏叆鐢ㄦ埛鍏宠仈瑙掕壊琛�
for (int i = 0; i < json.Count; i++)
{
- sql = @"insert into TFlw_Rteqp(eqp_code,step_code,style,lm_user,lm_date) values(@eqp_code,@stepcode,@style,@lm_user,@lm_date)";
+ sql = @"insert into TFlw_Rteqp(eqp_code,step_code,style,lm_user,lm_date,torg_code) values(@eqp_code,@stepcode,@style,@lm_user,@lm_date,@torg_code)";
list.Add(new
{
str = sql,
@@ -1818,7 +1924,8 @@
stepcode = stepcode,
style = json[i].name,
lm_user = username,
- lm_date = DateTime.Now.ToString()
+ lm_date = DateTime.Now.ToString(),
+ torg_code=WorkShop
}
});
}
@@ -1854,19 +1961,24 @@
#endregion
#region[宸ュ簭鍏宠仈缂洪櫡鏌ヨ]
- public static ToMessage StepAssociationDefect(string stepcode)
+ public static ToMessage StepAssociationDefect(string WorkShop,string stepcode)
{
string sql = "";
var dynamicParams = new DynamicParameters();
List<StepDefect> list = new List<StepDefect>();
try
{
+
//鑾峰彇宸ュ簭鍏宠仈缂洪櫡鏁版嵁(鍖呭惈鍏宠仈鏍囪瘑)
sql = @"select A.code,A.name,(case when B.defect_code is null then 'N' else 'Y' end) flag from TDefect A
left join(
- select distinct defect_code from TDefect_Step where step_code=@stepcode and is_delete<>'1'
+ select distinct defect_code from TDefect_Step A
+ left join TOrganization T on A.torg_code=T.org_code
+ left join TOrganization as L on T.parent_id=L.id
+ where step_code=@stepcode and A.is_delete<>'1' and T.org_code=@WorkShop
) B on A.code=B.defect_code";
dynamicParams.Add("@stepcode", stepcode);
+ dynamicParams.Add("@WorkShop", WorkShop);
var data = DapperHelper.selectdata(sql, dynamicParams);
for (int i = 0; i < data.Rows.Count; i++)
{
@@ -1892,7 +2004,7 @@
#endregion
#region[宸ュ簭鍏宠仈缂洪櫡鎻愪氦]
- public static ToMessage SaveStepAssociationDefect(string stepcode, string username, List<ObjectData> json)
+ public static ToMessage SaveStepAssociationDefect(string WorkShop,string stepcode, string username, List<ObjectData> json)
{
var sql = "";
List<object> list = new List<object>();
@@ -1916,7 +2028,7 @@
//寰幆鍐欏叆鐢ㄦ埛鍏宠仈瑙掕壊琛�
for (int i = 0; i < json.Count; i++)
{
- sql = @"insert into TDefect_Step(defect_code,step_code,lm_user,lm_date) values(@defect_code,@stepcode,@lm_user,@lm_date)";
+ sql = @"insert into TDefect_Step(defect_code,step_code,lm_user,lm_date,torg_code) values(@defect_code,@stepcode,@lm_user,@lm_date,@torg_code)";
list.Add(new
{
str = sql,
@@ -1925,7 +2037,8 @@
defect_code = json[i].code,
stepcode = stepcode,
lm_user = username,
- lm_date = DateTime.Now.ToString()
+ lm_date = DateTime.Now.ToString(),
+ torg_code= WorkShop
}
});
}
@@ -1993,17 +2106,35 @@
#endregion
#region[浜у搧缂栫爜鏌ユ壘宸ヨ壓璺嚎涓嬫媺妗哴
- public static ToMessage PartSelectRpute(string partcode)
+ public static ToMessage PartSelectRpute(string stu_torgcode,string stu_torgtypecode,string partcode)
{
string sql = "";
+ string search = "";
var dynamicParams = new DynamicParameters();
try
{
+ switch (stu_torgtypecode)
+ {
+ case "":
+ break;
+ case "D":
+ search += "and L.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ case "W":
+ search += "and T.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ default:
+ break;
+ }
//閫氳繃浜у搧缂栫爜鏌ユ壘鍏宠仈鐨勫伐鑹鸿矾绾夸俊鎭�
sql = @"select A.route_code,B.name as route_name
from TMateriel_Route A
inner join TFlw_Rout B on A.route_code=B.code
- where A.materiel_code=@partcode and B.is_delete<>'1' and A.is_delete<>'1'";
+ left join TOrganization T on A.torg_code=T.org_code
+ left join TOrganization as L on T.parent_id=L.id
+ where A.materiel_code=@partcode and B.is_delete<>'1' and A.is_delete<>'1' "+search;
dynamicParams.Add("@partcode", partcode);
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
@@ -2172,12 +2303,27 @@
#endregion
#region[鑺傛媿宸ヤ环鏌ヨ]
- public static ToMessage BeatRateSearch(string partcode, string routecode, string stepcode, string eqpcode, int startNum, int endNum, string prop, string order)
+ public static ToMessage BeatRateSearch(string stu_torgcode,string stu_torgtypecode,string partcode, string routecode, string stepcode, string eqpcode, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
try
{
+ switch (stu_torgtypecode)
+ {
+ case "":
+ break;
+ case "D":
+ search += "and L.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ case "W":
+ search += "and F.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ default:
+ break;
+ }
if (partcode != "" && partcode != null)
{
search += "and A.materiel_code=@partcode ";
@@ -2213,6 +2359,7 @@
left join TStep D on A.step_code=D.stepcode
left join TEqpInfo E on A.eqp_code=E.code
left join TOrganization F on E.wksp_code=F.org_code
+ left join TOrganization L on F.parent_id=L.id
where B.is_delete<>'1' and C.is_delete<>'1' and D.is_delete<>'1' and E.is_delete<>'1' and F.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
diff --git a/VueWebApi/DLL/DAL/ProductionManagementDAL.cs b/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
index 567d12b..81ea0e1 100644
--- a/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
+++ b/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
@@ -22,12 +22,27 @@
#region[ERP璁㈠崟鏌ヨ]
- public static ToMessage ErpOrderSearch(string erporderstus, string erpordercode, string partcode, string partname, string partspec, int startNum, string paydatestartdate, string paydateenddate, string paydatestartdate1, string paydateenddate2, string creatuser, int endNum, string prop, string order)
+ public static ToMessage ErpOrderSearch(string stu_torgcode,string stu_torgtypecode,string erporderstus, string erpordercode, string partcode, string partname, string partspec, int startNum, string paydatestartdate, string paydateenddate, string paydatestartdate1, string paydateenddate2, string creatuser, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
try
{
+ switch (stu_torgtypecode)
+ {
+ case "":
+ break;
+ case "D":
+ search += "and L.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ case "W":
+ search += "and C.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ default:
+ break;
+ }
if (erporderstus != "" && erporderstus != null)
{
search += "and A.status=@erporderstus ";
@@ -84,6 +99,7 @@
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 TUser U on A.createuser=U.usercode
+ left join TOrganization L on C.parent_id=L.id
where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
@@ -307,12 +323,27 @@
#region[MES宸ュ崟鏌ヨ]
- public static ToMessage MesOrderSearch(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)
+ public static ToMessage MesOrderSearch(string stu_torgcode,string stu_torgtypecode,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
{
+ switch (stu_torgtypecode)
+ {
+ case "":
+ break;
+ case "D":
+ search += "and L.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ case "W":
+ search += "and C.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ default:
+ break;
+ }
if (mesorderstus != "" && mesorderstus != null)
{
search += "and A.status=@mesorderstus ";
@@ -374,6 +405,7 @@
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
+ left join TOrganization L on C.parent_id=L.id
where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
@@ -470,7 +502,7 @@
#endregion
#region[浜у搧缂栫爜鏌ユ壘宸ヨ壓璺嚎涓嬫媺鎺ュ彛]
- public static ToMessage PartSelectRoute(string partcode)
+ public static ToMessage PartSelectRoute(string partcode,string wkshopcode)
{
string sql = "";
var dynamicParams = new DynamicParameters();
@@ -480,8 +512,9 @@
sql = @"select R.code,R.name,A.default_route from TMateriel_Info A
inner join TMateriel_Route M on A.partcode=M.materiel_code
inner join TFlw_Rout R on M.route_code=R.code
- where A.partcode=@partcode ";
+ where A.partcode=@partcode and M.torg_code=@torg_code";
dynamicParams.Add("@partcode", partcode);
+ dynamicParams.Add("@torg_code", wkshopcode);
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -499,23 +532,38 @@
#endregion
#region[宸ヨ壓璺嚎鏌ユ壘杞﹂棿涓嬫媺鎺ュ彛]
- public static ToMessage RouteSelectWkshop(string partcode, string routecode)
+ public static ToMessage RouteSelectWkshop(string stu_torgcode,string stu_torgtypecode,string partcode)
{
string sql = "";
+ string search = "";
var dynamicParams = new DynamicParameters();
try
{
+ switch (stu_torgtypecode)
+ {
+ case "":
+ break;
+ case "D":
+ search += "and L.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ case "W":
+ search += "and F.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ default:
+ break;
+ }
//鑾峰彇杞﹂棿涓嬫媺妗嗘暟鎹�
- sql = @"select distinct F.org_code,F.org_name from TFlw_Rout A
- inner join TMateriel_Route M on A.code=M.route_code
- inner join TFlw_Rtdt B on A.code=B.rout_code
+ sql = @"select distinct F.org_code,F.org_name from TMateriel_Route M
+ inner join TFlw_Rtdt B on M.route_code=B.rout_code
inner join TStep C on B.step_code=C.stepcode
inner join TFlw_Rteqp D on C.stepcode=D.step_code
inner join TEqpInfo E on D.eqp_code=E.code
left join TOrganization F on E.wksp_code=F.org_code
- where A.code=@routecode and M.materiel_code=@partcode and E.enable='Y'";
+ left join TOrganization L on F.parent_id=L.id
+ where M.materiel_code=@partcode and E.enable='Y' "+search;
dynamicParams.Add("@partcode", partcode);
- dynamicParams.Add("@routecode", routecode);
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -1296,7 +1344,7 @@
#endregion
#region[鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇宸ュ崟瀵瑰簲宸ュ簭浠诲姟(鑷埗)]
- public static ToMessage MesOrderStepSearch(string orderstepqrcode, int startNum, int endNum, string prop, string order)
+ public static ToMessage MesOrderStepSearch(string stu_torgcode,string stu_torgtypecode, string orderstepqrcode, int startNum, int endNum, string prop, string order)
{
var sql = "";
string search = "";
@@ -1324,7 +1372,7 @@
stepcode = arra[1]; //鑾峰彇鎸囧畾瀛楃涓插墠闈㈢殑瀛楃
}
- if (ordercode != "" && ordercode != null) //宸ュ崟鍙蜂笉涓虹┖,宸ュ簭鍙蜂负绌�
+ if (ordercode != "" && stepcode == null) //宸ュ崟鍙蜂笉涓虹┖,宸ュ簭鍙蜂负绌�
{
search += "and A.wo_code=@ordercode ";
dynamicParams.Add("@ordercode", ordercode);
@@ -1363,14 +1411,31 @@
}
}
}
+ switch (stu_torgtypecode)
+ {
+ case "":
+ break;
+ case "D":
+ search += "and L.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ case "W":
+ search += "and F.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ default:
+ break;
+ }
//鏍规嵁鏉′欢鏌ヨ宸ュ崟宸ュ簭浠诲姟(鑷埗宸ュ簭)
sql = @"select A.status,A.wo_code,B.route_code,M.partcode,M.partname,M.partspec,A.seq,A.isbott,A.isend,
- S.stepcode,S.stepname,S.descr,A.plan_qty,A.good_qty,A.ng_qty,A.bad_qty,A.plan_startdate,A.plan_enddate,B.lm_date
- from TK_Wrk_Step A
- left join TK_Wrk_Man B on A.wo_code=B.wo_code
- left join TMateriel_Info M on B.materiel_code=M.partcode
- left join TStep S on A.step_code=S.stepcode
- where A.status in('ALLO','START') and S.flwtype='Z' " + search;
+ S.stepcode,S.stepname,S.descr,A.plan_qty,A.good_qty,A.ng_qty,A.bad_qty,A.plan_startdate,A.plan_enddate,B.lm_date
+ from TK_Wrk_Step A
+ left join TK_Wrk_Man B on A.wo_code=B.wo_code
+ left join TMateriel_Info M on B.materiel_code=M.partcode
+ left join TStep S on A.step_code=S.stepcode
+ left join TOrganization F on B.wkshp_code=F.org_code
+ left join TOrganization L on F.parent_id=L.id
+ where A.status in('ALLO','START') and S.flwtype='Z' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
if (data.ToList().Count > 0)
{
@@ -1401,7 +1466,7 @@
#endregion
#region[鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇宸ュ崟瀵瑰簲宸ュ簭浠诲姟(澶栧崗)]
- public static ToMessage MesOrderWxStepSearch(string orderstepqrcode, int startNum, int endNum, string prop, string order)
+ public static ToMessage MesOrderWxStepSearch(string stu_torgcode,string stu_torgtypecode,string orderstepqrcode, int startNum, int endNum, string prop, string order)
{
var sql = "";
string search = "";
@@ -1428,7 +1493,7 @@
ordercode = arra[0]; //鑾峰彇鎸囧畾瀛楃涓插墠闈㈢殑瀛楃
stepcode = arra[1]; //鑾峰彇鎸囧畾瀛楃涓插墠闈㈢殑瀛楃
}
- if (ordercode != "" && ordercode != null) //宸ュ崟鍙蜂笉涓虹┖,宸ュ簭鍙蜂负绌�
+ if (ordercode != "" && stepcode == null) //宸ュ崟鍙蜂笉涓虹┖,宸ュ簭鍙蜂负绌�
{
search += "and A.wo_code=@ordercode ";
dynamicParams.Add("@ordercode", ordercode);
@@ -1467,13 +1532,30 @@
}
}
}
- //鏍规嵁鏉′欢鏌ヨ宸ュ崟宸ュ簭浠诲姟(鑷埗宸ュ簭)
+ switch (stu_torgtypecode)
+ {
+ case "":
+ break;
+ case "D":
+ search += "and L.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ case "W":
+ search += "and F.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ default:
+ break;
+ }
+ //鏍规嵁鏉′欢鏌ヨ宸ュ崟宸ュ簭浠诲姟(澶栧崗宸ュ簭)
sql = @"select A.status,A.wo_code,B.route_code,M.partcode,M.partname,M.partspec,A.seq,A.isbott,A.isend,
S.stepcode,S.stepname,S.descr,A.plan_qty,A.good_qty,A.ng_qty,A.bad_qty,A.plan_startdate,A.plan_enddate,B.lm_date
from TK_Wrk_Step A
left join TK_Wrk_Man B on A.wo_code=B.wo_code
left join TMateriel_Info M on B.materiel_code=M.partcode
left join TStep S on A.step_code=S.stepcode
+ left join TOrganization F on B.wkshp_code=F.org_code
+ left join TOrganization L on F.parent_id=L.id
where A.status in('ALLO','START') and S.flwtype='W' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
if (data.ToList().Count > 0)
@@ -1505,7 +1587,7 @@
#endregion
#region[鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇宸ュ崟瀵瑰簲宸ュ簭浠诲姟(涓嶈壇)]
- public static ToMessage MesOrderNgStepSearch(string orderstepqrcode, int startNum, int endNum, string prop, string order)
+ public static ToMessage MesOrderNgStepSearch(string stu_torgcode,string stu_torgtypecode,string orderstepqrcode, int startNum, int endNum, string prop, string order)
{
var sql = "";
string search = "";
@@ -1532,7 +1614,7 @@
ordercode = arra[0]; //鑾峰彇鎸囧畾瀛楃涓插墠闈㈢殑瀛楃
stepcode = arra[1]; //鑾峰彇鎸囧畾瀛楃涓插墠闈㈢殑瀛楃
}
- if (ordercode != "" && ordercode != null) //宸ュ崟鍙蜂笉涓虹┖,宸ュ簭鍙蜂负绌�
+ if (ordercode != "" && stepcode == null) //宸ュ崟鍙蜂笉涓虹┖,宸ュ簭鍙蜂负绌�
{
search += "and A.wo_code=@ordercode ";
dynamicParams.Add("@ordercode", ordercode);
@@ -1561,14 +1643,31 @@
return mes;
}
}
+ switch (stu_torgtypecode)
+ {
+ case "":
+ break;
+ case "D":
+ search += "and L.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ case "W":
+ search += "and F.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ default:
+ break;
+ }
//鏍规嵁鏉′欢鏌ヨ宸ュ崟宸ュ簭浠诲姟,涓斾笉鑹暟閲忓ぇ浜�0
sql = @"select A.wo_code,M.partcode,M.partname,M.partspec,A.seq,A.isend,
- S.stepcode,S.stepname,S.descr,A.plan_qty,A.good_qty,A.ng_qty,A.bad_qty,B.lm_date
- from TK_Wrk_Step A
- left join TK_Wrk_Man B on A.wo_code=B.wo_code
- left join TMateriel_Info M on B.materiel_code=M.partcode
- left join TStep S on A.step_code=S.stepcode
- where A.status in('ALLO','START') and A.ng_qty>0 " + search;
+ S.stepcode,S.stepname,S.descr,A.plan_qty,A.good_qty,A.ng_qty,A.bad_qty,B.lm_date
+ from TK_Wrk_Step A
+ left join TK_Wrk_Man B on A.wo_code=B.wo_code
+ left join TMateriel_Info M on B.materiel_code=M.partcode
+ left join TStep S on A.step_code=S.stepcode
+ left join TOrganization F on B.wkshp_code=F.org_code
+ left join TOrganization L on F.parent_id=L.id
+ where A.status in('ALLO','START') and A.ng_qty>0 " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
if (data.ToList().Count > 0)
{
@@ -1806,9 +1905,11 @@
return mes;
}
//鑾峰彇宸ュ簭鍏宠仈鐨勮澶�
- sql = @"select B.code,B.name from TFlw_Rteqp A
+ sql = @"select B.code,B.name from TK_Wrk_Man M
+ inner join TFlw_Rtdt R on M.route_code=R.rout_code
+ inner join TFlw_Rteqp A on R.step_code=A.step_code
left join TEqpInfo B on A.eqp_code=B.code
- where A.style='E' and A.step_code=@stepcode and B.enable='Y'";
+ where A.style='E' and M.wo_code=@wo_code and A.step_code=@stepcode and B.enable='Y'";
dynamicParams.Add("@wo_code", ordercode);
dynamicParams.Add("@stepcode", stepcode);
var data = DapperHelper.selectdata(sql, dynamicParams);
@@ -1828,14 +1929,38 @@
#endregion
#region[鐢熶骇寮�鎶ュ伐锛氭姤宸ユ椂鑾峰彇鐢熶骇鐝粍涓嬫媺妗哴
- public static ToMessage MesOrderStepReportSelectUserGroup()
+ public static ToMessage MesOrderStepReportSelectUserGroup(string stu_torgcode,string stu_torgtypecode,string wkshopcode)
{
string sql = "";
+ string search = "";
+ var dynamicParams = new DynamicParameters();
try
{
+ if (wkshopcode != "" && wkshopcode != null)
+ {
+ search += "and A.torg_code=@workShop ";
+ dynamicParams.Add("@workShop", wkshopcode);
+ }
+ else
+ {
+ switch (stu_torgtypecode)
+ {
+ case "":
+ search += "and T.description=@description ";
+ dynamicParams.Add("@description", "W");
+ break;
+ case "D":
+ search += "and L.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ }
+ }
//鑾峰彇鐢ㄦ埛缁�
- sql = @"select group_code,group_name from TGroup";
- var data = DapperHelper.selecttable(sql);
+ sql = @"select group_code,group_name from TGroup A
+ left join TOrganization T on A.torg_code=T.org_code
+ left join TOrganization as L on T.parent_id=L.id
+ where 1=1 "+search;
+ var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
mes.data = data;
@@ -2972,12 +3097,27 @@
#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)
+ public static ToMessage MesOrderBitchClosedSearch(string stu_torgcode,string stu_torgtypecode,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
{
+ switch (stu_torgtypecode)
+ {
+ case "":
+ break;
+ case "D":
+ search += "and L.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ case "W":
+ search += "and C.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ default:
+ break;
+ }
if (mesorderstus != "" && mesorderstus != null)
{
search += "and A.status=@mesorderstus ";
@@ -3042,6 +3182,7 @@
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
+ left join TOrganization L on C.parent_id=L.id
where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
diff --git a/VueWebApi/DLL/DAL/QualityManagementDAL.cs b/VueWebApi/DLL/DAL/QualityManagementDAL.cs
index bf3e19e..8262691 100644
--- a/VueWebApi/DLL/DAL/QualityManagementDAL.cs
+++ b/VueWebApi/DLL/DAL/QualityManagementDAL.cs
@@ -300,14 +300,16 @@
#endregion
#region[宸ュ簭妫�楠屾爣鍑嗘柊澧炪�佺紪杈戣幏鍙栨楠岄」鐩笅鎷夊垪琛╙
- public static ToMessage StepCheckItemSelect()
+ public static ToMessage StepCheckItemSelect(string WorkShop)
{
string sql = "";
+ var dynamicParams = new DynamicParameters();
try
{
//鑾峰彇宸ュ簭鐐规椤圭洰鏁版嵁
- sql = @"select code,name,descr from TStepCheckItem where is_delete<>'1' ";
- var data = DapperHelper.selecttable(sql);
+ sql = @"select code,name,descr from TStepCheckItem where is_delete<>'1' and torg_code=@torg_code";
+ dynamicParams.Add("@torg_code", WorkShop);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
mes.data = data;
@@ -460,12 +462,27 @@
#region[宸ュ簭妫�楠岄」鐩垪琛ㄦ煡璇
- public static ToMessage StepCheckItemSearch(string itemcode, string itemname, string itemdescr, int startNum, int endNum, string prop, string order)
+ public static ToMessage StepCheckItemSearch(string stu_torgcode,string stu_torgtypecode, string itemcode, string itemname, string itemdescr, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
try
{
+ switch (stu_torgtypecode)
+ {
+ case "":
+ break;
+ case "D":
+ search += "and L.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ case "W":
+ search += "and C.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ default:
+ break;
+ }
if (itemcode != "" && itemcode != null)
{
search += "and A.code like '%'+@itemcode+'%' ";
@@ -484,8 +501,10 @@
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select A.code,A.name,A.descr,U.username as lm_user,A.lm_date from TStepCheckItem A
+ var sql = @"select C.org_code,C.org_name,A.code,A.name,A.descr,U.username as lm_user,A.lm_date from TStepCheckItem A
left join TUser U on A.lm_user=U.usercode
+ left join TOrganization C on A.torg_code=C.org_code
+ left join TOrganization L on C.parent_id=L.id
where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
@@ -505,7 +524,7 @@
#endregion
#region[宸ュ簭妫�楠岄」鐩柊澧炪�佺紪杈戞彁浜
- public static ToMessage AddUpdateStepCheckItem(string checkitemcode, string checkitemname, string checkitemdescr, string opertype, string username)
+ public static ToMessage AddUpdateStepCheckItem(string wkshopcode, string checkitemcode, string checkitemname, string checkitemdescr, string opertype, string username)
{
var sql = "";
var dynamicParams = new DynamicParameters();
@@ -515,8 +534,8 @@
if (opertype == "Add")
{
//鍐欏叆缂洪櫡瀹氫箟瀹氫箟琛�
- sql = @"insert into TStepCheckItem(code,name,descr,lm_user,lm_date)
- values(@checkitemcode,@checkitemname,@checkitemdescr,@username,@CreateDate)";
+ sql = @"insert into TStepCheckItem(code,name,descr,lm_user,lm_date,torg_code)
+ values(@checkitemcode,@checkitemname,@checkitemdescr,@username,@CreateDate,@torg_code)";
list.Add(new
{
str = sql,
@@ -526,7 +545,8 @@
checkitemname = checkitemname,
checkitemdescr = checkitemdescr,
username = username,
- CreateDate = DateTime.Now.ToString()
+ CreateDate = DateTime.Now.ToString(),
+ torg_code=wkshopcode
}
});
bool aa = DapperHelper.DoTransaction(list);
@@ -547,7 +567,7 @@
}
if (opertype == "Update")
{
- sql = @"update TStepCheckItem set name=@checkitemname,descr=@checkitemdescr,lm_user=@username,lm_date=@CreateDate where code=@checkitemcode";
+ sql = @"update TStepCheckItem set name=@checkitemname,descr=@checkitemdescr,lm_user=@username,lm_date=@CreateDate,torg_code=@torg_code where code=@checkitemcode";
list.Add(new
{
str = sql,
@@ -557,7 +577,8 @@
checkitemname = checkitemname,
checkitemdescr = checkitemdescr,
username = username,
- CreateDate = DateTime.Now.ToString()
+ CreateDate = DateTime.Now.ToString(),
+ torg_code=wkshopcode
}
});
bool aa = DapperHelper.DoTransaction(list);
@@ -882,12 +903,27 @@
#region[璐ㄦ鏂规鍒楄〃鏌ヨ]
- public static ToMessage QualityInspectionSearch(string qualityinsptcode, string qualityinsptname, string status, string checktype, string sampltype, string suitobject, int startNum, int endNum, string prop, string order)
+ public static ToMessage QualityInspectionSearch(string stu_torgcode,string stu_torgtypecode, string qualityinsptcode, string qualityinsptname, string status, string checktype, string sampltype, string suitobject, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
try
{
+ switch (stu_torgtypecode)
+ {
+ case "":
+ break;
+ case "D":
+ search += "and AA.Lorg_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ case "W":
+ search += "and AA.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ default:
+ break;
+ }
if (qualityinsptcode != "" && qualityinsptcode != null)
{
search += "and AA.code like '%'+@qualityinsptcode+'%' ";
@@ -926,7 +962,7 @@
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
var sql = @"select * from(
- select A.code,A.name,A.status,A.checktype,A.sampmethod,A.sampscare,A.suitobject,A.stepcode,S.stepname,A.descr,A.suitpart,A.lm_date,U.username,
+ select C.org_code,C.org_name,L.org_code as Lorg_code,A.code,A.name,A.status,A.checktype,A.sampmethod,A.sampscare,A.suitobject,A.stepcode,S.stepname,A.descr,A.suitpart,A.lm_date,U.username,
case when A.suitobject='P' then
STUFF(( SELECT ';' + partname
FROM TMateriel_Info
@@ -942,6 +978,8 @@
from TStepCheckStandard A
left join TUser U on A.lm_user=U.usercode
left join TStep S on A.stepcode=S.stepcode
+ left join TOrganization C on A.torg_code=C.org_code
+ left join TOrganization L on C.parent_id=L.id
) as AA
where " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
@@ -992,7 +1030,7 @@
#endregion
#region[璐ㄦ鏂规鏂板/缂栬緫鎻愪氦]
- public static ToMessage QualityInspectionAddEditSave(string qualityinsptcode, string qualityinsptname, string status, string checktype, string sampmethod, string sampscare, string suitobject, string suitpart, string descr,string stepcode, string checkitem, string type, string username)
+ public static ToMessage QualityInspectionAddEditSave(string wkshopcode, string qualityinsptcode, string qualityinsptname, string status, string checktype, string sampmethod, string sampscare, string suitobject, string suitpart, string descr,string stepcode, string checkitem, string type, string username)
{
var sql = "";
List<object> list = new List<object>();
@@ -1007,8 +1045,8 @@
{
case "Add": //鏂板
//鍐欏叆璐ㄦ鏂规涓昏〃
- sql = @"insert into TStepCheckStandard(code,name,status,checktype,sampmethod,sampscare,suitobject,suitpart,stepcode,descr,lm_user,lm_date)
- values(@code,@name,@status,@checktype,@sampmethod,@sampscare,@suitobject,@suitpart,@stepcode,@descr,@lm_user,@lm_date)";
+ sql = @"insert into TStepCheckStandard(code,name,status,checktype,sampmethod,sampscare,suitobject,suitpart,stepcode,descr,lm_user,lm_date,torg_code)
+ values(@code,@name,@status,@checktype,@sampmethod,@sampscare,@suitobject,@suitpart,@stepcode,@descr,@lm_user,@lm_date,@torg_code)";
list.Add(new
{
str = sql,
@@ -1025,14 +1063,15 @@
stepcode= stepcode,
descr = descr,
lm_user = username,
- lm_date = date
+ lm_date = date,
+ torg_code= wkshopcode
}
});
//鍐欏叆璐ㄦ鏂规瀛愯〃
for (int i = 0; i < arra.Count; i++)
{
- sql = @"insert into TStepCheckStandardSub(stepstaned_code,stepcheckitem_seq,stepcheckitem_code,required,numberjudge,unit,decimalnum,standvalue,uppervalue,lowervalue,stepcheckitem_desc,lm_user,lm_date)
- values(@stepstaned_code,@stepcheckitem_seq,@stepcheckitem_code,@required,@numberjudge,@unit,@decimalnum,@standvalue,@uppervalue,@lowervalue,@stepcheckitem_desc,@lm_user,@lm_date)";
+ sql = @"insert into TStepCheckStandardSub(stepstaned_code,stepcheckitem_seq,stepcheckitem_code,required,numberjudge,unit,decimalnum,standvalue,uppervalue,lowervalue,stepcheckitem_desc,lm_user,lm_date,torg_code)
+ values(@stepstaned_code,@stepcheckitem_seq,@stepcheckitem_code,@required,@numberjudge,@unit,@decimalnum,@standvalue,@uppervalue,@lowervalue,@stepcheckitem_desc,@lm_user,@lm_date,@torg_code)";
list.Add(new
{
str = sql,
@@ -1050,7 +1089,8 @@
lowervalue = arra[i]["lowervalue"].ToString(),
stepcheckitem_desc = arra[i]["stepcheckitem_desc"].ToString(),
lm_user = username,
- lm_date = date
+ lm_date = date,
+ torg_code=wkshopcode
}
});
}
@@ -1074,7 +1114,7 @@
list.Add(new { str = sql, parm = new { code = qualityinsptcode } });
//淇敼璐ㄦ鏂规涓昏〃
sql = @"update TStepCheckStandard set name=@name,status=@status,checktype=@checktype,sampmethod=@sampmethod,sampscare=@sampscare,
- suitobject=@suitobject,suitpart=@suitpart,stepcode=@stepcode,descr=@descr
+ suitobject=@suitobject,suitpart=@suitpart,stepcode=@stepcode,descr=@descr,torg_code=@torg_code
where code=@code";
list.Add(new
{
@@ -1091,13 +1131,14 @@
suitpart = suitpart,
stepcode = stepcode,
descr = descr,
+ torg_code=wkshopcode
}
});
//鏂板璐ㄦ鏂规瀛愯〃
for (int i = 0; i < arra.Count; i++)
{
- sql = @"insert into TStepCheckStandardSub(stepstaned_code,stepcheckitem_seq,stepcheckitem_code,required,numberjudge,unit,decimalnum,standvalue,uppervalue,lowervalue,stepcheckitem_desc,lm_user,lm_date)
- values(@stepstaned_code,@stepcheckitem_seq,@stepcheckitem_code,@required,@numberjudge,@unit,@decimalnum,@standvalue,@uppervalue,@lowervalue,@stepcheckitem_desc,@lm_user,@lm_date)";
+ sql = @"insert into TStepCheckStandardSub(stepstaned_code,stepcheckitem_seq,stepcheckitem_code,required,numberjudge,unit,decimalnum,standvalue,uppervalue,lowervalue,stepcheckitem_desc,lm_user,lm_date,torg_code)
+ values(@stepstaned_code,@stepcheckitem_seq,@stepcheckitem_code,@required,@numberjudge,@unit,@decimalnum,@standvalue,@uppervalue,@lowervalue,@stepcheckitem_desc,@lm_user,@lm_date,@torg_code)";
list.Add(new
{
str = sql,
@@ -1115,7 +1156,8 @@
lowervalue = arra[i]["lowervalue"].ToString(),
stepcheckitem_desc = arra[i]["stepcheckitem_desc"].ToString(),
lm_user = username,
- lm_date = date
+ lm_date = date,
+ torg_code=wkshopcode
}
});
}
diff --git a/VueWebApi/DLL/DAL/ReportManagerDAL.cs b/VueWebApi/DLL/DAL/ReportManagerDAL.cs
index 3903915..686a802 100644
--- a/VueWebApi/DLL/DAL/ReportManagerDAL.cs
+++ b/VueWebApi/DLL/DAL/ReportManagerDAL.cs
@@ -20,12 +20,17 @@
#region[濮斿鎶ヨ〃璁板綍鏌ヨ]
- public static ToMessage OutSourceReportSearch(string wocode, string partcode, string partname, string partspec, string stepname, string suppername, string type, string receivopendate, string receivclosedate, int startNum, int endNum, string prop, string order)
+ public static ToMessage OutSourceReportSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string suppername, string type, string receivopendate, string receivclosedate, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
try
{
+ if (wkshopcode != "" && wkshopcode != null)
+ {
+ search += "and W.wkshp_code=@wkshopcode ";
+ dynamicParams.Add("@wkshopcode", wkshopcode);
+ }
if (wocode != "" && wocode != null)
{
search += "and A.wo_code like '%'+@wocode+'%' ";
@@ -90,7 +95,7 @@
search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select A.wo_code,M.partcode,M.partname,M.partspec,S.stepcode,S.stepname,C.code,C.name,(case when A.style='F' then '鍙戞枡' when A.style='S' then '鏀舵枡' end) as style,
+ var sql = @"select W.wkshp_code,F.org_name as wkshp_name,A.wo_code,M.partcode,M.partname,M.partspec,S.stepcode,S.stepname,C.code,C.name,(case when A.style='F' then '鍙戞枡' when A.style='S' then '鏀舵枡' end) as style,
A.fqty,A.sqty,A.ng_qty,A.bad_qty,U.username as out_person,B.out_time,T.username as in_person,B.in_time
from TK_Wrk_OutRecord A
inner join TK_Wrk_OutRecordSub B on A.id=B.m_id
@@ -99,6 +104,8 @@
left join TCustomer C on A.wx_code=C.code
left join TUser U on B.out_person=U.usercode
left join TUser T on B.in_person=T.usercode
+ left join TK_Wrk_Man W on A.wo_code=W.wo_code
+ left join TOrganization F on W.wkshp_code=F.org_code
where " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
@@ -118,12 +125,17 @@
#endregion
#region[濮斿鎶ヨ〃璁板綍瀵煎嚭]
- public static ToMessage OutSourceReportExcelSearch(string wocode, string partcode, string partname, string partspec, string stepname, string suppername, string type, string receivopendate, string receivclosedate)
+ public static ToMessage OutSourceReportExcelSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string suppername, string type, string receivopendate, string receivclosedate)
{
var dynamicParams = new DynamicParameters();
string search = "";
try
{
+ if (wkshopcode != "" && wkshopcode != null)
+ {
+ search += "and K.wkshp_code=@wkshopcode ";
+ dynamicParams.Add("@wkshopcode", wkshopcode);
+ }
if (wocode != "" && wocode != null)
{
search += "and A.wo_code like '%'+@wocode+'%' ";
@@ -188,7 +200,7 @@
search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select A.wo_code as '宸ュ崟缂栧彿',M.partcode as '浜у搧缂栫爜',M.partname as '浜у搧鍚嶇О',M.partspec as '浜у搧瑙勬牸',S.stepcode as '宸ュ簭缂栫爜',S.stepname as '宸ュ簭鍚嶇О',
+ var sql = @"select W.wkshp_code as 杞﹂棿缂栫爜,F.org_name as 杞﹂棿鍚嶇О,A.wo_code as '宸ュ崟缂栧彿',M.partcode as '浜у搧缂栫爜',M.partname as '浜у搧鍚嶇О',M.partspec as '浜у搧瑙勬牸',S.stepcode as '宸ュ簭缂栫爜',S.stepname as '宸ュ簭鍚嶇О',
C.code as '澶栧崗渚涙柟缂栫爜',C.name as '澶栧崗渚涙柟鍚嶇О',(case when A.style='F' then '鍙戞枡' when A.style='S' then '鏀舵枡' end) as '鎿嶄綔绫诲瀷',
A.fqty as '鍙戞枡鏁伴噺',A.sqty as '鏀舵枡鏁伴噺',A.ng_qty as '涓嶈壇鏁伴噺',A.bad_qty as '鎶ュ簾鏁伴噺',U.username as '鍙戞枡浜哄憳',B.out_time as '鍙戞枡鏃堕棿',
T.username as '鏀舵枡浜哄憳',B.in_time as '鏀舵枡鏃堕棿'
@@ -199,6 +211,8 @@
left join TCustomer C on A.wx_code=C.code
left join TUser U on B.out_person=U.usercode
left join TUser T on B.in_person=T.usercode
+ left join TK_Wrk_Man W on A.wo_code=W.wo_code
+ left join TOrganization F on W.wkshp_code=F.org_code
where " + search;
DataTable data = DapperHelper.selectdata(sql, dynamicParams);
data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
@@ -221,12 +235,17 @@
#region[鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ヨ]
- public static ToMessage GroupSalaryReportSearch(string compute, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate, string rejectstepcode, int startNum, int endNum, string prop, string order)
+ public static ToMessage GroupSalaryReportSearch(string wkshopcode, string compute, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate, string rejectstepcode, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
try
{
+ if (wkshopcode != "" && wkshopcode != null)
+ {
+ search += "and K.wkshp_code=@wkshopcode ";
+ dynamicParams.Add("@wkshopcode", wkshopcode);
+ }
if (compute == "last") //鏈亾宸ュ簭
{
search += "and P.isend=@isend ";
@@ -286,7 +305,7 @@
//search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select distinct A.id,A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,A.task_qty,G.group_code,G.group_name,A.good_qty,
+ var sql = @"select distinct A.id,K.wkshp_code,F.org_name as wkshp_name,A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,A.task_qty,G.group_code,G.group_name,A.good_qty,
isnull(S.unprice,0) as unprice,A.good_qty*isnull(S.unprice,0) as usermoney,U.username as lm_user,A.lm_date,B.report_date
from TK_Wrk_Record A
inner join TK_Wrk_RecordSub B on A.id=B.m_id
@@ -297,6 +316,7 @@
left join TMateriel_Info M on A.materiel_code=M.partcode
left join TStep T on A.step_code=T.stepcode
left join TUser U on A.lm_user=U.usercode
+ left join TOrganization F on K.wkshp_code=F.org_code
where G.group_code<>'' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
@@ -344,12 +364,17 @@
#endregion
#region[鐝粍宸ヨ祫鎶ヨ〃璁板綍瀵煎嚭]
- public static ToMessage GroupSalaryReportExcelSearch(string compute, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate,string rejectstepcode)
+ public static ToMessage GroupSalaryReportExcelSearch(string wkshopcode, string compute, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate,string rejectstepcode)
{
var dynamicParams = new DynamicParameters();
string search = "";
try
{
+ if (wkshopcode != "" && wkshopcode != null)
+ {
+ search += "and K.wkshp_code=@wkshopcode ";
+ dynamicParams.Add("@wkshopcode", wkshopcode);
+ }
if (compute == "last") //鏈亾宸ュ簭
{
search += "and P.isend=@isend ";
@@ -409,7 +434,7 @@
//search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select distinct A.wo_code as 宸ュ崟缂栧彿,M.partcode as 浜у搧缂栫爜,M.partname as 浜у搧鍚嶇О,M.partspec as 浜у搧瑙勬牸,
+ var sql = @"select distinct K.wkshp_code as 杞﹂棿缂栫爜,F.org_name as 杞﹂棿鍚嶇О,A.wo_code as 宸ュ崟缂栧彿,M.partcode as 浜у搧缂栫爜,M.partname as 浜у搧鍚嶇О,M.partspec as 浜у搧瑙勬牸,
T.stepcode as 宸ュ簭缂栫爜,T.stepname as 宸ュ簭鍚嶇О,A.task_qty as 浠诲姟鏁伴噺,G.group_code as 鐝粍缂栫爜,G.group_name as 鐝粍鍚嶇О,
A.good_qty as 鎶ュ伐鏁伴噺,isnull(S.unprice,0) as 宸ュ簭鍗曚环,A.good_qty*isnull(S.unprice,0) as 璁′欢宸ヨ祫,U.username as 鎿嶄綔浜哄憳,A.lm_date as 鎿嶄綔鏃堕棿,B.report_date as 鎶ュ伐鏃堕棿
from TK_Wrk_Record A
@@ -421,6 +446,7 @@
left join TMateriel_Info M on A.materiel_code=M.partcode
left join TStep T on A.step_code=T.stepcode
left join TUser U on A.lm_user=U.usercode
+ left join TOrganization F on K.wkshp_code=F.org_code
where G.group_code<>'' " + search;
DataTable data = DapperHelper.selectdata(sql, dynamicParams);
data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
@@ -443,12 +469,17 @@
#region[浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃]
- public static ToMessage PeopleSalaryReportSearch(string compute, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string reportname, string reportopendate, string reportclosedate,string rejectstepcode, int startNum, int endNum, string prop, string order)
+ public static ToMessage PeopleSalaryReportSearch(string wkshopcode, string compute, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string reportname, string reportopendate, string reportclosedate,string rejectstepcode, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
try
{
+ if (wkshopcode != "" && wkshopcode != null)
+ {
+ search += "and AA.wkshp_code=@wkshopcode ";
+ dynamicParams.Add("@wkshopcode", wkshopcode);
+ }
if (compute == "last") //鏈亾宸ュ簭
{
search += "and AA.isend=@isend ";
@@ -508,11 +539,11 @@
search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select AA.wo_code,AA.partcode,AA.partname,AA.partspec,AA.stepcode,AA.stepname,
+ var sql = @"select AA.wkshp_code,AA.wkshp_name,AA.wo_code,AA.partcode,AA.partname,AA.partspec,AA.stepcode,AA.stepname,
AA.task_qty,AA.group_code,AA.group_name,AA.report_qty,AA.unprice,AA.ratio,AA.isend,
AA.moneys as usermoney,AA.username,AA.report_date
from (
- select distinct A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,
+ select distinct K.wkshp_code,F.org_name as wkshp_name, A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,
A.task_qty,G.group_code,G.group_name,B.report_qty,isnull(S.unprice,0) as unprice,B.ratio,P.isend,
(B.report_qty*isnull(S.unprice,0))*(B.ratio/100) as moneys,U.username,B.report_date
from TK_Wrk_Record A
@@ -524,6 +555,7 @@
left join TMateriel_Info M on A.materiel_code=M.partcode
left join TStep T on A.step_code=T.stepcode
left join TUser U on B.report_person=U.usercode
+ left join TOrganization F on K.wkshp_code=F.org_code
) as AA
where " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
@@ -544,12 +576,17 @@
#endregion
#region[浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃瀵煎嚭]
- public static ToMessage PeopleSalaryReportExcelSearch(string compute, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string reportname, string reportopendate, string reportclosedate,string rejectstepcode)
+ public static ToMessage PeopleSalaryReportExcelSearch(string wkshopcode, string compute, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string reportname, string reportopendate, string reportclosedate,string rejectstepcode)
{
var dynamicParams = new DynamicParameters();
string search = "";
try
{
+ if (wkshopcode != "" && wkshopcode != null)
+ {
+ search += "and AA.wkshp_code=@wkshopcode ";
+ dynamicParams.Add("@wkshopcode", wkshopcode);
+ }
if (compute == "last") //鏈亾宸ュ簭
{
search += "and AA.isend=@isend ";
@@ -609,11 +646,11 @@
search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select AA.wo_code as 宸ュ崟缂栧彿,AA.partcode as 浜у搧缂栫爜,AA.partname as 浜у搧鍚嶇О,AA.partspec as 浜у搧瑙勬牸,AA.stepcode as 宸ュ簭缂栫爜,AA.stepname as 宸ュ簭鍚嶇О,AA.isend as 鏄惁鏈亾宸ュ簭,
+ var sql = @"select K.wkshp_code as 杞﹂棿缂栫爜,F.org_name as 杞﹂棿鍚嶇О,AA.wo_code as 宸ュ崟缂栧彿,AA.partcode as 浜у搧缂栫爜,AA.partname as 浜у搧鍚嶇О,AA.partspec as 浜у搧瑙勬牸,AA.stepcode as 宸ュ簭缂栫爜,AA.stepname as 宸ュ簭鍚嶇О,AA.isend as 鏄惁鏈亾宸ュ簭,
AA.task_qty as 浠诲姟鏁伴噺,AA.group_code as 鐢熶骇鐝粍缂栫爜,AA.group_name as 鐢熶骇鐝粍鍚嶇О,AA.report_qty as 鎶ュ伐鏁伴噺,AA.unprice as 宸ュ簭鍗曚环,AA.ratio as 鍒嗛厤姣斾緥,
AA.moneys as 璁′欢宸ヨ祫,AA.username as 鎶ュ伐浜哄憳,AA.report_date as 鎶ュ伐鏃堕棿
from (
- select distinct A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,
+ select distinct K.wkshp_code,F.org_name as wkshp_name,A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,
A.task_qty,G.group_code,G.group_name,B.report_qty,isnull(S.unprice,0) as unprice,B.ratio,P.isend,
(B.report_qty*isnull(S.unprice,0))*(B.ratio/100) as moneys,U.username,B.report_date
from TK_Wrk_Record A
@@ -625,6 +662,7 @@
left join TMateriel_Info M on A.materiel_code=M.partcode
left join TStep T on A.step_code=T.stepcode
left join TUser U on B.report_person=U.usercode
+ left join TOrganization F on K.wkshp_code=F.org_code
) as AA
where " + search;
DataTable data = DapperHelper.selectdata(sql, dynamicParams);
@@ -648,12 +686,17 @@
#region[涓嶈壇鏄庣粏鎶ヨ〃]
- public static ToMessage DefectDetailsReportSearch(string wocode, string partcode, string partname, string partspec, string stepname, string defectcode, string defectname, string reportname, string reportopendate, string reportclosedate, int startNum, int endNum, string prop, string order)
+ public static ToMessage DefectDetailsReportSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string defectcode, string defectname, string reportname, string reportopendate, string reportclosedate, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
try
{
+ if (wkshopcode != "" && wkshopcode != null)
+ {
+ search += "and W.wkshp_code=@wkshopcode ";
+ dynamicParams.Add("@wkshopcode", wkshopcode);
+ }
if (wocode != "" && wocode != null)
{
search += "and A.wo_code like '%'+@wocode+'%' ";
@@ -708,7 +751,7 @@
search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,P.plan_qty,A.defect_qty,
+ var sql = @"select W.wkshp_code,L.org_name as wkshp_name,A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,P.plan_qty,A.defect_qty,
F.code as defect_code,F.name as defect_name,A.style,U.username as lm_user,A.lm_date
from CSR_WorkRecord_Defect A
inner join TK_Wrk_Step P on A.wo_code=P.wo_code and A.step_code=P.step_code
@@ -716,6 +759,8 @@
left join TStep T on A.step_code=T.stepcode
left join TDefect F on A.defect_code=F.code
left join TUser U on A.lm_user=U.usercode
+ left join TK_Wrk_Man W on A.wo_code=W.wo_code
+ left join TOrganization L on W.wkshp_code=L.org_code
where " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
@@ -735,12 +780,17 @@
#endregion
#region[涓嶈壇鏄庣粏鎶ヨ〃瀵煎嚭]
- public static ToMessage DefectDetailsReportExcelSearch(string wocode, string partcode, string partname, string partspec, string stepname, string defectcode, string defectname, string reportname, string reportopendate, string reportclosedate)
+ public static ToMessage DefectDetailsReportExcelSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string defectcode, string defectname, string reportname, string reportopendate, string reportclosedate)
{
var dynamicParams = new DynamicParameters();
string search = "";
try
{
+ if (wkshopcode != "" && wkshopcode != null)
+ {
+ search += "and W.wkshp_code=@wkshopcode ";
+ dynamicParams.Add("@wkshopcode", wkshopcode);
+ }
if (wocode != "" && wocode != null)
{
search += "and A.wo_code like '%'+@wocode+'%' ";
@@ -795,7 +845,7 @@
search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select A.wo_code as 宸ュ崟缂栧彿,M.partcode as 浜у搧缂栫爜,M.partname as 浜у搧鍚嶇О,M.partspec as 浜у搧瑙勬牸,T.stepcode as 宸ュ簭缂栫爜,
+ var sql = @"select W.wkshp_code as 杞﹂棿缂栫爜,L.org_name as 杞﹂棿鍚嶇О,A.wo_code as 宸ュ崟缂栧彿,M.partcode as 浜у搧缂栫爜,M.partname as 浜у搧鍚嶇О,M.partspec as 浜у搧瑙勬牸,T.stepcode as 宸ュ簭缂栫爜,
T.stepname as 宸ュ簭鍚嶇О,P.plan_qty as 浠诲姟鏁伴噺,A.defect_qty as 涓嶈壇鏁伴噺,F.code as 缂洪櫡浠ｇ爜,F.name as 缂洪櫡鍚嶇О,
(case when A.style='B' then '鎶ュ伐' when A.style='S' then '鏀舵枡' end) as '鎿嶄綔绫诲瀷',U.username as 鎿嶄綔浜哄憳,A.lm_date as 鎿嶄綔鏃堕棿
from CSR_WorkRecord_Defect A
@@ -804,6 +854,8 @@
left join TStep T on A.step_code=T.stepcode
left join TDefect F on A.defect_code=F.code
left join TUser U on A.lm_user=U.usercode
+ left join TK_Wrk_Man W on A.wo_code=W.wo_code
+ left join TOrganization L on W.wkshp_code=L.org_code
where " + search;
DataTable data = DapperHelper.selectdata(sql, dynamicParams);
data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
@@ -856,12 +908,17 @@
#region[缁翠慨鏄庣粏鎶ヨ〃]
- public static ToMessage MaintenanceDetailsReportSearch(string wocode, string partcode, string partname, string partspec, string stepname, string style, string defectname, string repairname, string repairopendate, string repairclosedate, int startNum, int endNum, string prop, string order)
+ public static ToMessage MaintenanceDetailsReportSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string style, string defectname, string repairname, string repairopendate, string repairclosedate, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
try
{
+ if (wkshopcode != "" && wkshopcode != null)
+ {
+ search += "and AA.wkshp_code=@wkshopcode ";
+ dynamicParams.Add("@wkshopcode", wkshopcode);
+ }
if (wocode != "" && wocode != null)
{
search += "and AA.wo_code like '%'+@wocode+'%' ";
@@ -916,10 +973,10 @@
search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select AA.wo_code,AA.partcode,AA.partname,AA.partspec,AA.stepcode,AA.stepname,(case when AA.style='B' then '鎶ュ伐' when AA.style='S' then '鏀舵枡' end) as style,
+ var sql = @"select AA.wkshp_code,AA.wkshp_name,AA.wo_code,AA.partcode,AA.partname,AA.partspec,AA.stepcode,AA.stepname,(case when AA.style='B' then '鎶ュ伐' when AA.style='S' then '鏀舵枡' end) as style,
AA.plan_qty,AA.repair_qty,AA.bad_qty,AA.defect_code,AA.defect_name,AA.lm_user,AA.lm_date
from(
- select F.wo_code,M.partcode,M.partname,M.partspec,S.stepcode,S.stepname,F.style,P.plan_qty,F.repair_qty,F.bad_qty,F.defect_code,
+ select W.wkshp_code,L.org_name as wkshp_name,F.wo_code,M.partcode,M.partname,M.partspec,S.stepcode,S.stepname,F.style,P.plan_qty,F.repair_qty,F.bad_qty,F.defect_code,
defect_name = STUFF(( SELECT ',' + T.name
FROM TDefect as T
where PATINDEX('%,' + RTRIM(T.code) + ',%',',' + F.defect_code + ',')>0
@@ -930,6 +987,8 @@
left join TMateriel_Info M on F.partnumber=M.partcode
left join TStep S on F.step_code=S.stepcode
left join TUser U on F.lm_user=U.usercode
+ left join TK_Wrk_Man W on F.wo_code=W.wo_code
+ left join TOrganization L on W.wkshp_code=L.org_code
) as AA
where " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
@@ -950,12 +1009,17 @@
#endregion
#region[缁翠慨鏄庣粏鎶ヨ〃瀵煎嚭]
- public static ToMessage MaintenanceDetailsReportExcelSearch(string wocode, string partcode, string partname, string partspec, string stepname, string style, string defectname, string repairname, string repairopendate, string repairclosedate)
+ public static ToMessage MaintenanceDetailsReportExcelSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string style, string defectname, string repairname, string repairopendate, string repairclosedate)
{
var dynamicParams = new DynamicParameters();
string search = "";
try
{
+ if (wkshopcode != "" && wkshopcode != null)
+ {
+ search += "and AA.wkshp_code=@wkshopcode ";
+ dynamicParams.Add("@wkshopcode", wkshopcode);
+ }
if (wocode != "" && wocode != null)
{
search += "and AA.wo_code like '%'+@wocode+'%' ";
@@ -1010,11 +1074,11 @@
search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select AA.wo_code as 宸ュ崟缂栧彿,AA.partcode as 浜у搧缂栫爜,AA.partname as 浜у搧鍚嶇О,AA.partspec as 浜у搧瑙勬牸,AA.stepcode as 宸ュ簭缂栫爜,AA.stepname as 宸ュ簭鍚嶇О,
+ var sql = @"select AA.wkshp_code as 杞﹂棿缂栫爜,AA.wkshp_name as 杞﹂棿鍚嶇О,AA.wo_code as 宸ュ崟缂栧彿,AA.partcode as 浜у搧缂栫爜,AA.partname as 浜у搧鍚嶇О,AA.partspec as 浜у搧瑙勬牸,AA.stepcode as 宸ュ簭缂栫爜,AA.stepname as 宸ュ簭鍚嶇О,
(case when AA.style='B' then '鎶ュ伐' when AA.style='S' then '鏀舵枡' end) as 鎿嶄綔绫诲瀷,
AA.plan_qty as 浠诲姟鏁伴噺,AA.repair_qty as 缁翠慨鏁伴噺,AA.bad_qty as 鎶ュ簾鏁伴噺,AA.defect_name as 缂洪櫡鍚嶇О,AA.lm_user as 缁翠慨浜哄憳,AA.lm_date as 缁翠慨鏃堕棿
from(
- select F.wo_code,M.partcode,M.partname,M.partspec,S.stepcode,S.stepname,F.style,P.plan_qty,F.repair_qty,F.bad_qty,F.defect_code,
+ select W.wkshp_code,L.org_name as wkshp_name,F.wo_code,M.partcode,M.partname,M.partspec,S.stepcode,S.stepname,F.style,P.plan_qty,F.repair_qty,F.bad_qty,F.defect_code,
defect_name = STUFF(( SELECT ',' + T.name
FROM TDefect as T
where PATINDEX('%,' + RTRIM(T.code) + ',%',',' + F.defect_code + ',')>0
@@ -1025,6 +1089,8 @@
left join TMateriel_Info M on F.partnumber=M.partcode
left join TStep S on F.step_code=S.stepcode
left join TUser U on F.lm_user=U.usercode
+ left join TK_Wrk_Man W on F.wo_code=W.wo_code
+ left join TOrganization L on W.wkshp_code=L.org_code
) as AA
where " + search;
DataTable data = DapperHelper.selectdata(sql, dynamicParams);
@@ -1481,12 +1547,17 @@
#region[鐢熶骇杩涘害鎶ヨ〃]
- public static ToMessage ProductionScheduleReportSearch(string status, string wocode, string routecode, string routename, string partcode, string partname, string partspec,string opendate,string closedate, int startNum, int endNum, string prop, string order)
+ public static ToMessage ProductionScheduleReportSearch(string wkshopcode, string status, string wocode, string routecode, string routename, string partcode, string partname, string partspec,string opendate,string closedate, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
try
{
+ if (wkshopcode != "" && wkshopcode != null)
+ {
+ search += "and AA.wkshp_code=@wkshopcode ";
+ dynamicParams.Add("@wkshopcode", wkshopcode);
+ }
if (status != "" && status != null)
{
switch (status)
@@ -1545,11 +1616,11 @@
search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select AA.saleOrderCode,AA.m_po,AA.wo_code,
+ var sql = @"select AA.saleOrderCode,AA.m_po,AA.wkshp_code,AA.wkshp_name,AA.wo_code,
(case when AA.status='START' then '鎵ц涓�' when AA.status='CLOSED' then '宸插畬鎴�' else '鏈紑濮�' end) as status,
AA.lm_date,AA.route_code,AA.route_name,AA.partcode,AA.partname,AA.partspec,AA.plan_qty,left(AA.concat_name,len(concat_name)-1) as concat_name from
(
- select E.saleOrderCode,W.m_po,m.wo_code,W.status,W.lm_date,W.route_code,R.name as route_name,P.partcode,P.partname,P.partspec,m.plan_qty,
+ select E.saleOrderCode,W.m_po,m.wo_code,W.wkshp_code,F.org_name as wkshp_name,W.status,W.lm_date,W.route_code,R.name as route_name,P.partcode,P.partname,P.partspec,m.plan_qty,
(select s.stepname+'/'+cast(cast(n.good_qty as decimal(18,2)) AS varchar(50))+',' from TK_Wrk_Step n
inner join TStep S on n.step_code=S.stepcode
where n.wo_code=m.wo_code for xml path('')) as concat_name
@@ -1558,8 +1629,9 @@
left join TKimp_Ewo E on W.m_po=E.wo
inner join TMateriel_Info P on W.materiel_code=p.partcode
inner join TFlw_Rout R on W.route_code=R.code
- group by E.saleOrderCode,W.m_po,m.wo_code,W.status,W.lm_date,W.route_code,R.name,P.partcode,P.partname,P.partspec,m.plan_qty
- ) AA
+ left join TOrganization F on W.wkshp_code=F.org_code
+ group by E.saleOrderCode,W.m_po,m.wo_code,W.wkshp_code,F.org_name,W.status,W.lm_date,W.route_code,R.name,P.partcode,P.partname,P.partspec,m.plan_qty
+ ) AA
where " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
@@ -1579,12 +1651,17 @@
#endregion
#region[鐢熶骇杩涘害鎶ヨ〃瀵煎嚭]
- public static ToMessage ProductionScheduleReportExcelSearch(string status, string wocode, string routecode, string routename, string partcode, string partname, string partspec,string opendate,string closedate)
+ public static ToMessage ProductionScheduleReportExcelSearch(string wkshopcode, string status, string wocode, string routecode, string routename, string partcode, string partname, string partspec,string opendate,string closedate)
{
var dynamicParams = new DynamicParameters();
string search = "";
try
{
+ if (wkshopcode != "" && wkshopcode != null)
+ {
+ search += "and AA.wkshp_code=@wkshopcode ";
+ dynamicParams.Add("@wkshopcode", wkshopcode);
+ }
if (status != "" && status != null)
{
switch (status)
@@ -1643,12 +1720,12 @@
search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select AA.saleOrderCode as ERP婧愬崟鍙�,AA.m_po as ERP鐢熶骇璁㈠崟,AA.wo_code as 鐢熶骇宸ュ崟鍙�,
+ var sql = @"select AA.saleOrderCode as ERP婧愬崟鍙�,AA.m_po as ERP鐢熶骇璁㈠崟,AA.wkshp_code as 杞﹂棿缂栫爜,AA.wkshp_name as 杞﹂棿鍚嶇О,AA.wo_code as 鐢熶骇宸ュ崟鍙�,
(case when AA.status='START' then '鎵ц涓�' when AA.status='CLOSED' then '宸插畬鎴�' else '鏈紑濮�' end) as 宸ュ崟鐘舵��,
AA.lm_date as 鍗曟嵁鏃ユ湡,AA.route_code as 宸ヨ壓璺嚎缂栧彿,AA.route_name as 宸ヨ壓璺嚎鍚嶇О,
AA.partcode as 浜у搧缂栫爜,AA.partname as 浜у搧鍚嶇О,AA.partspec as 浜у搧瑙勬牸,AA.plan_qty as 浠诲姟鏁伴噺,left(AA.concat_name,len(concat_name)-1) as 鐢熶骇杩涘害 from
(
- select E.saleOrderCode,W.m_po,m.wo_code,W.status,W.lm_date,W.route_code,R.name as route_name,P.partcode,P.partname,P.partspec,m.plan_qty,
+ select E.saleOrderCode,W.m_po,m.wo_code,W.wkshp_code,F.org_name as wkshp_name,W.status,W.lm_date,W.route_code,R.name as route_name,P.partcode,P.partname,P.partspec,m.plan_qty,
(select s.stepname+'/'+cast(cast(n.good_qty as decimal(18,2)) AS varchar(50))+',' from TK_Wrk_Step n
inner join TStep S on n.step_code=S.stepcode
where n.wo_code=m.wo_code for xml path('')) as concat_name
@@ -1657,7 +1734,8 @@
left join TKimp_Ewo E on W.m_po=E.wo
inner join TMateriel_Info P on W.materiel_code=p.partcode
inner join TFlw_Rout R on W.route_code=R.code
- group by E.saleOrderCode,W.m_po,m.wo_code,W.status,W.lm_date,W.route_code,R.name,P.partcode,P.partname,P.partspec,m.plan_qty
+ left join TOrganization F on W.wkshp_code=F.org_code
+ group by E.saleOrderCode,W.m_po,m.wo_code,W.wkshp_code,F.org_name,W.status,W.lm_date,W.route_code,R.name,P.partcode,P.partname,P.partspec,m.plan_qty
) AA
where " + search;
DataTable data = DapperHelper.selectdata(sql, dynamicParams);
diff --git a/VueWebApi/Models/MaterialRout.cs b/VueWebApi/Models/MaterialRout.cs
index e635154..b14d56c 100644
--- a/VueWebApi/Models/MaterialRout.cs
+++ b/VueWebApi/Models/MaterialRout.cs
@@ -8,6 +8,8 @@
{
public class MaterialRout
{
+ public string wkshopcode { get; set; }
+ public string wkshopname { get; set; }
public string code { get; set; }
public string name { get; set; }
public string flag { get; set; }
diff --git a/VueWebApi/Models/ObjectData.cs b/VueWebApi/Models/ObjectData.cs
index 2bf8787..81a8354 100644
--- a/VueWebApi/Models/ObjectData.cs
+++ b/VueWebApi/Models/ObjectData.cs
@@ -9,5 +9,6 @@
{
public string code { get; set; }
public string name { get; set; }
+ public string flag { get; set; }
}
}
\ No newline at end of file
diff --git a/VueWebApi/Models/PartRout.cs b/VueWebApi/Models/PartRout.cs
new file mode 100644
index 0000000..016091c
--- /dev/null
+++ b/VueWebApi/Models/PartRout.cs
@@ -0,0 +1,15 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace VueWebApi.Models
+{
+ public class PartRout
+ {
+ public string wkshopcode { get; set; }
+ public string code { get; set; }
+ public string name { get; set; }
+ public string flag { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/VueWebApi/Models/RoutEdit.cs b/VueWebApi/Models/RoutEdit.cs
index 2550c95..3bc6e94 100644
--- a/VueWebApi/Models/RoutEdit.cs
+++ b/VueWebApi/Models/RoutEdit.cs
@@ -12,6 +12,7 @@
public string name { get; set; }
public string enable { get; set; }
public string description { get; set; }
+ public string wkshopcode { get; set; }
public DataTable Data { get; set; }
}
}
\ No newline at end of file
diff --git a/VueWebApi/Models/ScanStartReportData.cs b/VueWebApi/Models/ScanStartReportData.cs
index cf9c948..87595a3 100644
--- a/VueWebApi/Models/ScanStartReportData.cs
+++ b/VueWebApi/Models/ScanStartReportData.cs
@@ -23,5 +23,9 @@
public decimal noreportqty { get; set; } //鏈姤鏁伴噺
public decimal reportqty { get; set; } //宸叉姤鏁伴噺
public decimal noputqty { get; set; } //鏈敹鏁伴噺
+ public string wkshopcode { get; set; } //杞﹂棿缂栫爜
+ public string wkshopname { get; set; } //杞﹂棿鍚嶇О
+ public string eqpcode { get; set; } //璁惧缂栫爜
+ public string eqpname { get; set; } //璁惧鍚嶇О
}
}
\ No newline at end of file
diff --git a/VueWebApi/Models/ScanStartReportDataOut.cs b/VueWebApi/Models/ScanStartReportDataOut.cs
new file mode 100644
index 0000000..617db86
--- /dev/null
+++ b/VueWebApi/Models/ScanStartReportDataOut.cs
@@ -0,0 +1,29 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace VueWebApi.Models
+{
+ public class ScanStartReportDataOut
+ {
+ public string wo_code { get; set; } //宸ュ崟缂栧彿
+ public string partnumber { get; set; } //浜у搧缂栫爜
+ public string partname { get; set; } //浜у搧鍚嶇О
+ public string partspec { get; set; } //浜у搧瑙勬牸
+ public string seq { get; set; } //褰撳墠宸ュ簭搴忓彿
+ public string stepcode { get; set; } //褰撳墠宸ュ簭缂栫爜
+ public string stepname { get; set; } //褰撳墠宸ュ簭
+ public string nextstepcode { get; set; } //涓嬮亾宸ュ簭缂栫爜
+ public string nextstepname { get; set; } //涓嬮亾宸ュ簭
+ public string stepdesc { get; set; } //宸ュ簭鎻忚堪
+ public string wkshopcode { get; set; } //杞﹂棿缂栫爜
+ public string wkshopname { get; set; } //杞﹂棿鍚嶇О
+ public decimal planqty { get; set; } //浠诲姟鏁伴噺
+ public decimal startqty { get; set; } //寮�宸ユ暟閲�
+ public decimal noreportqty { get; set; } //鏈姤鏁伴噺
+ public decimal reportqty { get; set; } //宸叉姤鏁伴噺
+ public decimal noputqty { get; set; } //鏈敹鏁伴噺
+ public object list { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/VueWebApi/Models/StepDefect.cs b/VueWebApi/Models/StepDefect.cs
index 8fa0855..916d0b3 100644
--- a/VueWebApi/Models/StepDefect.cs
+++ b/VueWebApi/Models/StepDefect.cs
@@ -7,6 +7,7 @@
{
public class StepDefect
{
+ public string storg_code { get; set; }
public string code { get; set; }
public string name { get; set; }
public string flag { get; set; }
diff --git a/VueWebApi/Models/User.cs b/VueWebApi/Models/User.cs
index b4d1472..69fab02 100644
--- a/VueWebApi/Models/User.cs
+++ b/VueWebApi/Models/User.cs
@@ -14,5 +14,8 @@
public string password { get; set; }
public string usertype { get; set; }
public string rediskey { get; set; }
+ public string stu_torgcode { get; set; }
+ public string stu_torgname { get; set; }
+ public string description { get; set; }
}
}
\ No newline at end of file
diff --git a/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml b/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml
new file mode 100644
index 0000000..ec73a55
--- /dev/null
+++ b/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml
@@ -0,0 +1,16 @@
+锘�<?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>False</DeleteExistingFiles>
+ <ExcludeApp_Data>False</ExcludeApp_Data>
+ <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+ <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+ <LastUsedPlatform>Any CPU</LastUsedPlatform>
+ <PublishProvider>FileSystem</PublishProvider>
+ <PublishUrl>D:\缃戠珯鍙戝竷\MES姝ｆ竻娌�</PublishUrl>
+ <WebPublishMethod>FileSystem</WebPublishMethod>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user b/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
new file mode 100644
index 0000000..35e4b5b
--- /dev/null
+++ b/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
@@ -0,0 +1,1131 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <_PublishTargetUrl>D:\缃戠珯鍙戝竷\MES姝ｆ竻娌�</_PublishTargetUrl>
+ <History>True|2023-06-13T02:24:59.6876648Z;</History>
+ </PropertyGroup>
+ <ItemGroup>
+ <File Include="Areas/HelpPage/HelpPage.css">
+ <publishTime>06/10/2022 08:20:30</publishTime>
+ </File>
+ <File Include="Areas/HelpPage/Views/Help/Api.cshtml">
+ <publishTime>06/10/2022 08:20:30</publishTime>
+ </File>
+ <File Include="Areas/HelpPage/Views/Help/DisplayTemplates/ApiGroup.cshtml">
+ <publishTime>06/10/2022 08:20:30</publishTime>
+ </File>
+ <File Include="Areas/HelpPage/Views/Help/DisplayTemplates/CollectionModelDescription.cshtml">
+ <publishTime>06/10/2022 08:20:30</publishTime>
+ </File>
+ <File Include="Areas/HelpPage/Views/Help/DisplayTemplates/ComplexTypeModelDescription.cshtml">
+ <publishTime>06/10/2022 08:20:30</publishTime>
+ </File>
+ <File Include="Areas/HelpPage/Views/Help/DisplayTemplates/DictionaryModelDescription.cshtml">
+ <publishTime>06/10/2022 08:20:30</publishTime>
+ </File>
+ <File Include="Areas/HelpPage/Views/Help/DisplayTemplates/EnumTypeModelDescription.cshtml">
+ <publishTime>06/10/2022 08:20:30</publishTime>
+ </File>
+ <File Include="Areas/HelpPage/Views/Help/DisplayTemplates/HelpPageApiModel.cshtml">
+ <publishTime>06/10/2022 08:20:30</publishTime>
+ </File>
+ <File Include="Areas/HelpPage/Views/Help/DisplayTemplates/ImageSample.cshtml">
+ <publishTime>06/10/2022 08:20:30</publishTime>
+ </File>
+ <File Include="Areas/HelpPage/Views/Help/DisplayTemplates/InvalidSample.cshtml">
+ <publishTime>06/10/2022 08:20:30</publishTime>
+ </File>
+ <File Include="Areas/HelpPage/Views/Help/DisplayTemplates/KeyValuePairModelDescription.cshtml">
+ <publishTime>06/10/2022 08:20:30</publishTime>
+ </File>
+ <File Include="Areas/HelpPage/Views/Help/DisplayTemplates/ModelDescriptionLink.cshtml">
+ <publishTime>06/10/2022 08:20:30</publishTime>
+ </File>
+ <File Include="Areas/HelpPage/Views/Help/DisplayTemplates/Parameters.cshtml">
+ <publishTime>06/10/2022 08:20:30</publishTime>
+ </File>
+ <File Include="Areas/HelpPage/Views/Help/DisplayTemplates/Samples.cshtml">
+ <publishTime>06/10/2022 08:20:30</publishTime>
+ </File>
+ <File Include="Areas/HelpPage/Views/Help/DisplayTemplates/SimpleTypeModelDescription.cshtml">
+ <publishTime>06/10/2022 08:20:30</publishTime>
+ </File>
+ <File Include="Areas/HelpPage/Views/Help/DisplayTemplates/TextSample.cshtml">
+ <publishTime>06/10/2022 08:20:30</publishTime>
+ </File>
+ <File Include="Areas/HelpPage/Views/Help/Index.cshtml">
+ <publishTime>06/10/2022 08:20:30</publishTime>
+ </File>
+ <File Include="Areas/HelpPage/Views/Help/ResourceModel.cshtml">
+ <publishTime>06/10/2022 08:20:30</publishTime>
+ </File>
+ <File Include="Areas/HelpPage/Views/Shared/_Layout.cshtml">
+ <publishTime>06/10/2022 08:20:30</publishTime>
+ </File>
+ <File Include="Areas/HelpPage/Views/Web.config">
+ <publishTime>06/10/2022 08:20:30</publishTime>
+ </File>
+ <File Include="Areas/HelpPage/Views/_ViewStart.cshtml">
+ <publishTime>06/10/2022 08:20:24</publishTime>
+ </File>
+ <File Include="bin/Antlr3.Runtime.dll">
+ <publishTime>09/10/2013 16:29:20</publishTime>
+ </File>
+ <File Include="bin/Antlr3.Runtime.pdb">
+ <publishTime>09/10/2013 16:29:20</publishTime>
+ </File>
+ <File Include="bin/BouncyCastle.Crypto.dll">
+ <publishTime>12/18/2020 05:32:28</publishTime>
+ </File>
+ <File Include="bin/Dapper.dll">
+ <publishTime>11/03/2021 22:07:30</publishTime>
+ </File>
+ <File Include="bin/FastReport.dll">
+ <publishTime>06/30/2022 13:48:06</publishTime>
+ </File>
+ <File Include="bin/FastReport.Web.dll">
+ <publishTime>06/30/2022 13:48:36</publishTime>
+ </File>
+ <File Include="bin/Fleck.dll">
+ <publishTime>04/22/2021 11:48:12</publishTime>
+ </File>
+ <File Include="bin/GetuiServerApiSDK.dll">
+ <publishTime>12/13/2018 15:35:36</publishTime>
+ </File>
+ <File Include="bin/Google.ProtocolBuffers.dll">
+ <publishTime>12/12/2018 17:31:14</publishTime>
+ </File>
+ <File Include="bin/ICSharpCode.SharpZipLib.dll">
+ <publishTime>09/19/2021 17:20:28</publishTime>
+ </File>
+ <File Include="bin/ICSharpCode.SharpZipLib.pdb">
+ <publishTime>09/19/2021 17:20:28</publishTime>
+ </File>
+ <File Include="bin/Jiguang.JPush.dll">
+ <publishTime>11/26/2019 17:25:54</publishTime>
+ </File>
+ <File Include="bin/JWT.dll">
+ <publishTime>01/23/2022 00:17:46</publishTime>
+ </File>
+ <File Include="bin/JWT.pdb">
+ <publishTime>01/23/2022 00:17:46</publishTime>
+ </File>
+ <File Include="bin/log4net.dll">
+ <publishTime>12/17/2021 18:45:06</publishTime>
+ </File>
+ <File Include="bin/Microsoft.AspNet.SignalR.Core.dll">
+ <publishTime>05/04/2017 02:25:34</publishTime>
+ </File>
+ <File Include="bin/Microsoft.AspNet.SignalR.SystemWeb.dll">
+ <publishTime>05/04/2017 02:25:40</publishTime>
+ </File>
+ <File Include="bin/Microsoft.AspNetCore.Http.Abstractions.dll">
+ <publishTime>11/13/2018 01:29:00</publishTime>
+ </File>
+ <File Include="bin/Microsoft.AspNetCore.Http.Features.dll">
+ <publishTime>11/13/2018 01:28:58</publishTime>
+ </File>
+ <File Include="bin/Microsoft.AspNetCore.Mvc.Abstractions.dll">
+ <publishTime>11/13/2018 01:40:10</publishTime>
+ </File>
+ <File Include="bin/Microsoft.AspNetCore.Routing.Abstractions.dll">
+ <publishTime>11/13/2018 01:38:16</publishTime>
+ </File>
+ <File Include="bin/Microsoft.Bcl.AsyncInterfaces.dll">
+ <publishTime>10/20/2020 02:40:36</publishTime>
+ </File>
+ <File Include="bin/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll">
+ <publishTime>09/05/2018 16:10:50</publishTime>
+ </File>
+ <File Include="bin/Microsoft.Extensions.Primitives.dll">
+ <publishTime>11/11/2018 08:26:36</publishTime>
+ </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>
+ </File>
+ <File Include="bin/Microsoft.Owin.Host.SystemWeb.dll">
+ <publishTime>02/14/2018 00:28:12</publishTime>
+ </File>
+ <File Include="bin/Microsoft.Owin.Security.dll">
+ <publishTime>02/14/2018 00:28:16</publishTime>
+ </File>
+ <File Include="bin/Microsoft.Web.Infrastructure.dll">
+ <publishTime>07/25/2012 11:48:56</publishTime>
+ </File>
+ <File Include="bin/Microsoft.Win32.Primitives.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/netstandard.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/Newtonsoft.Json.dll">
+ <publishTime>04/22/2019 01:06:16</publishTime>
+ </File>
+ <File Include="bin/NPOI.dll">
+ <publishTime>04/26/2022 00:23:22</publishTime>
+ </File>
+ <File Include="bin/NPOI.OOXML.dll">
+ <publishTime>04/26/2022 00:23:22</publishTime>
+ </File>
+ <File Include="bin/NPOI.OOXML.pdb">
+ <publishTime>04/26/2022 00:23:22</publishTime>
+ </File>
+ <File Include="bin/NPOI.OpenXml4Net.dll">
+ <publishTime>04/26/2022 00:23:22</publishTime>
+ </File>
+ <File Include="bin/NPOI.OpenXml4Net.pdb">
+ <publishTime>04/26/2022 00:23:22</publishTime>
+ </File>
+ <File Include="bin/NPOI.OpenXmlFormats.dll">
+ <publishTime>04/26/2022 00:23:22</publishTime>
+ </File>
+ <File Include="bin/NPOI.OpenXmlFormats.pdb">
+ <publishTime>04/26/2022 00:23:22</publishTime>
+ </File>
+ <File Include="bin/NPOI.pdb">
+ <publishTime>04/26/2022 00:23:22</publishTime>
+ </File>
+ <File Include="bin/Owin.dll">
+ <publishTime>11/13/2012 20:19:34</publishTime>
+ </File>
+ <File Include="bin/Pipelines.Sockets.Unofficial.dll">
+ <publishTime>12/14/2021 20:20:48</publishTime>
+ </File>
+ <File Include="bin/roslyn/csc.exe">
+ <publishTime>08/08/2018 05:38:48</publishTime>
+ </File>
+ <File Include="bin/roslyn/csc.exe.config">
+ <publishTime>08/08/2018 12:18:12</publishTime>
+ </File>
+ <File Include="bin/roslyn/csc.rsp">
+ <publishTime>08/08/2018 12:09:42</publishTime>
+ </File>
+ <File Include="bin/roslyn/csi.exe">
+ <publishTime>08/08/2018 05:38:48</publishTime>
+ </File>
+ <File Include="bin/roslyn/csi.exe.config">
+ <publishTime>08/08/2018 12:18:34</publishTime>
+ </File>
+ <File Include="bin/roslyn/csi.rsp">
+ <publishTime>08/08/2018 12:09:56</publishTime>
+ </File>
+ <File Include="bin/roslyn/Microsoft.Build.Tasks.CodeAnalysis.dll">
+ <publishTime>08/08/2018 05:38:48</publishTime>
+ </File>
+ <File Include="bin/roslyn/Microsoft.CodeAnalysis.CSharp.dll">
+ <publishTime>08/08/2018 05:38:48</publishTime>
+ </File>
+ <File Include="bin/roslyn/Microsoft.CodeAnalysis.CSharp.Scripting.dll">
+ <publishTime>08/08/2018 05:38:48</publishTime>
+ </File>
+ <File Include="bin/roslyn/Microsoft.CodeAnalysis.dll">
+ <publishTime>08/08/2018 05:38:48</publishTime>
+ </File>
+ <File Include="bin/roslyn/Microsoft.CodeAnalysis.Scripting.dll">
+ <publishTime>08/08/2018 05:38:48</publishTime>
+ </File>
+ <File Include="bin/roslyn/Microsoft.CodeAnalysis.VisualBasic.dll">
+ <publishTime>08/08/2018 05:38:48</publishTime>
+ </File>
+ <File Include="bin/roslyn/Microsoft.CSharp.Core.targets">
+ <publishTime>08/08/2018 12:09:42</publishTime>
+ </File>
+ <File Include="bin/roslyn/Microsoft.DiaSymReader.Native.amd64.dll">
+ <publishTime>12/05/2017 09:36:44</publishTime>
+ </File>
+ <File Include="bin/roslyn/Microsoft.DiaSymReader.Native.x86.dll">
+ <publishTime>12/05/2017 09:36:44</publishTime>
+ </File>
+ <File Include="bin/roslyn/Microsoft.Managed.Core.targets">
+ <publishTime>08/08/2018 12:09:42</publishTime>
+ </File>
+ <File Include="bin/roslyn/Microsoft.VisualBasic.Core.targets">
+ <publishTime>08/08/2018 12:09:42</publishTime>
+ </File>
+ <File Include="bin/roslyn/Microsoft.Win32.Primitives.dll">
+ <publishTime>11/05/2016 18:55:32</publishTime>
+ </File>
+ <File Include="bin/roslyn/System.AppContext.dll">
+ <publishTime>11/05/2016 18:55:34</publishTime>
+ </File>
+ <File Include="bin/roslyn/System.Collections.Immutable.dll">
+ <publishTime>05/16/2018 03:29:34</publishTime>
+ </File>
+ <File Include="bin/roslyn/System.Console.dll">
+ <publishTime>11/05/2016 18:55:48</publishTime>
+ </File>
+ <File Include="bin/roslyn/System.Diagnostics.DiagnosticSource.dll">
+ <publishTime>11/05/2016 18:55:52</publishTime>
+ </File>
+ <File Include="bin/roslyn/System.Diagnostics.FileVersionInfo.dll">
+ <publishTime>11/05/2016 18:55:56</publishTime>
+ </File>
+ <File Include="bin/roslyn/System.Diagnostics.StackTrace.dll">
+ <publishTime>11/05/2016 18:55:52</publishTime>
+ </File>
+ <File Include="bin/roslyn/System.Globalization.Calendars.dll">
+ <publishTime>11/05/2016 18:56:02</publishTime>
+ </File>
+ <File Include="bin/roslyn/System.IO.Compression.dll">
+ <publishTime>11/05/2016 18:56:08</publishTime>
+ </File>
+ <File Include="bin/roslyn/System.IO.Compression.ZipFile.dll">
+ <publishTime>11/05/2016 18:56:04</publishTime>
+ </File>
+ <File Include="bin/roslyn/System.IO.FileSystem.dll">
+ <publishTime>11/05/2016 18:56:08</publishTime>
+ </File>
+ <File Include="bin/roslyn/System.IO.FileSystem.Primitives.dll">
+ <publishTime>11/05/2016 18:56:08</publishTime>
+ </File>
+ <File Include="bin/roslyn/System.Net.Http.dll">
+ <publishTime>11/05/2016 18:56:30</publishTime>
+ </File>
+ <File Include="bin/roslyn/System.Net.Sockets.dll">
+ <publishTime>11/05/2016 18:56:34</publishTime>
+ </File>
+ <File Include="bin/roslyn/System.Reflection.Metadata.dll">
+ <publishTime>05/16/2018 03:29:44</publishTime>
+ </File>
+ <File Include="bin/roslyn/System.Runtime.InteropServices.RuntimeInformation.dll">
+ <publishTime>11/05/2016 18:57:00</publishTime>
+ </File>
+ <File Include="bin/roslyn/System.Security.Cryptography.Algorithms.dll">
+ <publishTime>11/05/2016 18:57:14</publishTime>
+ </File>
+ <File Include="bin/roslyn/System.Security.Cryptography.Encoding.dll">
+ <publishTime>11/05/2016 18:57:08</publishTime>
+ </File>
+ <File Include="bin/roslyn/System.Security.Cryptography.Primitives.dll">
+ <publishTime>11/05/2016 18:57:18</publishTime>
+ </File>
+ <File Include="bin/roslyn/System.Security.Cryptography.X509Certificates.dll">
+ <publishTime>11/05/2016 18:57:18</publishTime>
+ </File>
+ <File Include="bin/roslyn/System.Text.Encoding.CodePages.dll">
+ <publishTime>11/05/2016 18:57:20</publishTime>
+ </File>
+ <File Include="bin/roslyn/System.Threading.Tasks.Extensions.dll">
+ <publishTime>11/05/2016 18:57:24</publishTime>
+ </File>
+ <File Include="bin/roslyn/System.ValueTuple.dll">
+ <publishTime>11/05/2016 18:57:30</publishTime>
+ </File>
+ <File Include="bin/roslyn/System.Xml.ReaderWriter.dll">
+ <publishTime>11/05/2016 18:57:36</publishTime>
+ </File>
+ <File Include="bin/roslyn/System.Xml.XmlDocument.dll">
+ <publishTime>11/05/2016 18:57:34</publishTime>
+ </File>
+ <File Include="bin/roslyn/System.Xml.XPath.dll">
+ <publishTime>11/05/2016 18:57:40</publishTime>
+ </File>
+ <File Include="bin/roslyn/System.Xml.XPath.XDocument.dll">
+ <publishTime>11/05/2016 18:57:34</publishTime>
+ </File>
+ <File Include="bin/roslyn/vbc.exe">
+ <publishTime>08/08/2018 05:38:48</publishTime>
+ </File>
+ <File Include="bin/roslyn/vbc.exe.config">
+ <publishTime>08/08/2018 12:18:18</publishTime>
+ </File>
+ <File Include="bin/roslyn/vbc.rsp">
+ <publishTime>08/08/2018 12:09:46</publishTime>
+ </File>
+ <File Include="bin/roslyn/VBCSCompiler.exe">
+ <publishTime>08/08/2018 05:38:48</publishTime>
+ </File>
+ <File Include="bin/roslyn/VBCSCompiler.exe.config">
+ <publishTime>08/08/2018 12:18:16</publishTime>
+ </File>
+ <File Include="bin/ServiceStack.Common.dll">
+ <publishTime>12/11/2017 11:54:52</publishTime>
+ </File>
+ <File Include="bin/ServiceStack.Interfaces.dll">
+ <publishTime>12/11/2017 11:54:26</publishTime>
+ </File>
+ <File Include="bin/ServiceStack.Redis.dll">
+ <publishTime>12/10/2017 11:11:26</publishTime>
+ </File>
+ <File Include="bin/ServiceStack.Text.dll">
+ <publishTime>12/10/2017 22:53:52</publishTime>
+ </File>
+ <File Include="bin/StackExchange.Redis.dll">
+ <publishTime>04/03/2022 06:42:16</publishTime>
+ </File>
+ <File Include="bin/Swashbuckle.Core.dll">
+ <publishTime>07/08/2017 01:30:56</publishTime>
+ </File>
+ <File Include="bin/System.AppContext.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Buffers.dll">
+ <publishTime>02/19/2020 10:05:18</publishTime>
+ </File>
+ <File Include="bin/System.CodeDom.dll">
+ <publishTime>10/23/2021 07:52:04</publishTime>
+ </File>
+ <File Include="bin/System.Collections.Concurrent.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Collections.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Collections.NonGeneric.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Collections.Specialized.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.ComponentModel.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.ComponentModel.EventBasedAsync.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.ComponentModel.Primitives.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.ComponentModel.TypeConverter.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Console.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Data.Common.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Diagnostics.Contracts.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Diagnostics.Debug.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Diagnostics.FileVersionInfo.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Diagnostics.PerformanceCounter.dll">
+ <publishTime>10/20/2020 02:49:34</publishTime>
+ </File>
+ <File Include="bin/System.Diagnostics.Process.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Diagnostics.StackTrace.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Diagnostics.TextWriterTraceListener.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Diagnostics.Tools.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Diagnostics.TraceSource.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Diagnostics.Tracing.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Drawing.Primitives.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Dynamic.Runtime.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Globalization.Calendars.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Globalization.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Globalization.Extensions.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.IO.Compression.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.IO.Compression.ZipFile.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.IO.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.IO.FileSystem.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.IO.FileSystem.DriveInfo.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.IO.FileSystem.Primitives.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.IO.FileSystem.Watcher.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.IO.IsolatedStorage.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.IO.MemoryMappedFiles.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.IO.Pipelines.dll">
+ <publishTime>11/26/2020 10:00:22</publishTime>
+ </File>
+ <File Include="bin/System.IO.Pipes.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.IO.UnmanagedMemoryStream.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Linq.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Linq.Expressions.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Linq.Parallel.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Linq.Queryable.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Memory.dll">
+ <publishTime>02/19/2020 10:05:18</publishTime>
+ </File>
+ <File Include="bin/System.Net.Http.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Net.Http.Formatting.dll">
+ <publishTime>05/28/2022 07:41:34</publishTime>
+ </File>
+ <File Include="bin/System.Net.NameResolution.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Net.NetworkInformation.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Net.Ping.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Net.Primitives.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Net.Requests.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Net.Security.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Net.Sockets.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Net.WebHeaderCollection.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Net.WebSockets.Client.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Net.WebSockets.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Numerics.Vectors.dll">
+ <publishTime>05/15/2018 13:29:44</publishTime>
+ </File>
+ <File Include="bin/System.ObjectModel.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Reflection.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Reflection.Extensions.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Reflection.Primitives.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Resources.Reader.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Resources.ResourceManager.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Resources.Writer.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Runtime.CompilerServices.Unsafe.dll">
+ <publishTime>02/19/2020 10:05:16</publishTime>
+ </File>
+ <File Include="bin/System.Runtime.CompilerServices.VisualC.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Runtime.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Runtime.Extensions.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Runtime.Handles.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Runtime.InteropServices.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Runtime.InteropServices.RuntimeInformation.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Runtime.Numerics.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Runtime.Serialization.Formatters.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Runtime.Serialization.Json.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Runtime.Serialization.Primitives.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Runtime.Serialization.Xml.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Security.Claims.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Security.Cryptography.Algorithms.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Security.Cryptography.Csp.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Security.Cryptography.Encoding.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Security.Cryptography.Primitives.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Security.Cryptography.X509Certificates.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Security.Principal.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Security.SecureString.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Text.Encoding.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Text.Encoding.Extensions.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Text.Encodings.Web.dll">
+ <publishTime>05/15/2018 21:29:52</publishTime>
+ </File>
+ <File Include="bin/System.Text.RegularExpressions.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Threading.Channels.dll">
+ <publishTime>10/20/2020 02:46:24</publishTime>
+ </File>
+ <File Include="bin/System.Threading.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Threading.Overlapped.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Threading.Tasks.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Threading.Tasks.Extensions.dll">
+ <publishTime>02/19/2020 10:05:18</publishTime>
+ </File>
+ <File Include="bin/System.Threading.Tasks.Parallel.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Threading.Thread.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Threading.ThreadPool.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Threading.Timer.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.ValueTuple.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Web.Cors.dll">
+ <publishTime>11/28/2018 12:58:44</publishTime>
+ </File>
+ <File Include="bin/System.Web.Helpers.dll">
+ <publishTime>11/28/2018 13:04:24</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>05/28/2022 07:41:46</publishTime>
+ </File>
+ <File Include="bin/System.Web.Http.WebHost.dll">
+ <publishTime>05/28/2022 07:41:54</publishTime>
+ </File>
+ <File Include="bin/System.Web.Mvc.dll">
+ <publishTime>11/28/2018 12:59:46</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>11/28/2018 13:00:12</publishTime>
+ </File>
+ <File Include="bin/System.Web.WebPages.Deployment.dll">
+ <publishTime>11/28/2018 13:04:24</publishTime>
+ </File>
+ <File Include="bin/System.Web.WebPages.dll">
+ <publishTime>11/28/2018 13:04:24</publishTime>
+ </File>
+ <File Include="bin/System.Web.WebPages.Razor.dll">
+ <publishTime>11/28/2018 13:04:24</publishTime>
+ </File>
+ <File Include="bin/System.Xml.ReaderWriter.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Xml.XDocument.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Xml.XmlDocument.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Xml.XmlSerializer.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Xml.XPath.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/System.Xml.XPath.XDocument.dll">
+ <publishTime>12/24/2021 15:38:29</publishTime>
+ </File>
+ <File Include="bin/VueWebApi.dll">
+ <publishTime>06/17/2023 11:08:15</publishTime>
+ </File>
+ <File Include="bin/VueWebApi.pdb">
+ <publishTime>06/17/2023 11:08:15</publishTime>
+ </File>
+ <File Include="bin/VueWebApi.xml">
+ <publishTime>06/17/2023 11:08:15</publishTime>
+ </File>
+ <File Include="bin/WebActivatorEx.dll">
+ <publishTime>02/08/2013 16:42:28</publishTime>
+ </File>
+ <File Include="bin/WebGrease.dll">
+ <publishTime>01/23/2014 13:57:34</publishTime>
+ </File>
+ <File Include="bin/zh-Hans/Microsoft.AspNet.SignalR.Core.resources.dll">
+ <publishTime>05/04/2017 10:34:10</publishTime>
+ </File>
+ <File Include="bin/zh-Hans/Microsoft.AspNet.SignalR.SystemWeb.resources.dll">
+ <publishTime>05/04/2017 10:34:16</publishTime>
+ </File>
+ <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
+ <publishTime>05/28/2022 07:34:44</publishTime>
+ </File>
+ <File Include="bin/zh-Hans/System.Web.Helpers.resources.dll">
+ <publishTime>11/29/2018 21:29:50</publishTime>
+ </File>
+ <File Include="bin/zh-Hans/System.Web.Http.resources.dll">
+ <publishTime>05/28/2022 07:34:04</publishTime>
+ </File>
+ <File Include="bin/zh-Hans/System.Web.Http.WebHost.resources.dll">
+ <publishTime>05/28/2022 07:34:44</publishTime>
+ </File>
+ <File Include="bin/zh-Hans/System.Web.Mvc.resources.dll">
+ <publishTime>11/29/2018 21:25:14</publishTime>
+ </File>
+ <File Include="bin/zh-Hans/System.Web.Optimization.resources.dll">
+ <publishTime>02/11/2014 23:28:40</publishTime>
+ </File>
+ <File Include="bin/zh-Hans/System.Web.Razor.resources.dll">
+ <publishTime>11/29/2018 21:25:38</publishTime>
+ </File>
+ <File Include="bin/zh-Hans/System.Web.WebPages.Deployment.resources.dll">
+ <publishTime>11/29/2018 21:29:50</publishTime>
+ </File>
+ <File Include="bin/zh-Hans/System.Web.WebPages.Razor.resources.dll">
+ <publishTime>11/29/2018 21:29:50</publishTime>
+ </File>
+ <File Include="bin/zh-Hans/System.Web.WebPages.resources.dll">
+ <publishTime>11/29/2018 21:29:50</publishTime>
+ </File>
+ <File Include="Content/bootstrap-theme.css">
+ <publishTime>06/10/2022 08:20:26</publishTime>
+ </File>
+ <File Include="Content/bootstrap-theme.css.map">
+ <publishTime>06/10/2022 08:20:26</publishTime>
+ </File>
+ <File Include="Content/bootstrap-theme.min.css">
+ <publishTime>06/10/2022 08:20:26</publishTime>
+ </File>
+ <File Include="Content/bootstrap-theme.min.css.map">
+ <publishTime>06/10/2022 08:20:26</publishTime>
+ </File>
+ <File Include="Content/bootstrap.css">
+ <publishTime>06/10/2022 08:20:26</publishTime>
+ </File>
+ <File Include="Content/bootstrap.css.map">
+ <publishTime>06/10/2022 08:20:26</publishTime>
+ </File>
+ <File Include="Content/bootstrap.min.css">
+ <publishTime>06/10/2022 08:20:26</publishTime>
+ </File>
+ <File Include="Content/bootstrap.min.css.map">
+ <publishTime>06/10/2022 08:20:26</publishTime>
+ </File>
+ <File Include="Content/Site.css">
+ <publishTime>06/10/2022 08:20:24</publishTime>
+ </File>
+ <File Include="Excel/浠撳簱搴撲綅娓呭崟.xls">
+ <publishTime>07/25/2022 13:45:20</publishTime>
+ </File>
+ <File Include="Excel/寰�鏉ュ崟浣�.xls">
+ <publishTime>02/11/2023 00:38:51</publishTime>
+ </File>
+ <File Include="Excel/鐗╂枡娓呭崟.xls">
+ <publishTime>11/07/2022 17:57:07</publishTime>
+ </File>
+ <File Include="Excel/鐢ㄦ埛娓呭崟.xls">
+ <publishTime>07/20/2022 10:52:30</publishTime>
+ </File>
+ <File Include="Excel/缂洪櫡瀹氫箟.xls">
+ <publishTime>08/12/2022 10:41:48</publishTime>
+ </File>
+ <File Include="Excel/鑺傛媿宸ヤ环.xls">
+ <publishTime>09/06/2022 18:29:08</publishTime>
+ </File>
+ <File Include="Excel/瑙掕壊娓呭崟.xls">
+ <publishTime>07/22/2022 11:26:24</publishTime>
+ </File>
+ <File Include="Excel/璁惧淇濆吇鏍囧噯.xls">
+ <publishTime>11/18/2022 09:16:10</publishTime>
+ </File>
+ <File Include="Excel/璁惧淇濆吇椤圭洰.xls">
+ <publishTime>08/29/2022 12:08:02</publishTime>
+ </File>
+ <File Include="Excel/璁惧娓呭崟.xls">
+ <publishTime>11/07/2022 16:13:05</publishTime>
+ </File>
+ <File Include="Excel/璁惧鐐规鏍囧噯.xls">
+ <publishTime>11/18/2022 09:15:43</publishTime>
+ </File>
+ <File Include="Excel/璁惧鐐规椤圭洰.xls">
+ <publishTime>08/17/2022 09:56:57</publishTime>
+ </File>
+ <File Include="favicon.ico">
+ <publishTime>06/10/2022 08:20:24</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.eot">
+ <publishTime>06/10/2022 08:20:26</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.svg">
+ <publishTime>06/10/2022 08:20:26</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.ttf">
+ <publishTime>06/10/2022 08:20:26</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.woff">
+ <publishTime>06/10/2022 08:20:26</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.woff2">
+ <publishTime>06/10/2022 08:20:26</publishTime>
+ </File>
+ <File Include="Global.asax">
+ <publishTime>06/10/2022 08:20:24</publishTime>
+ </File>
+ <File Include="grf/Rework.frx">
+ <publishTime>07/26/2022 14:37:33</publishTime>
+ </File>
+ <File Include="grf/浜у搧娴佷紶鍗�.grf">
+ <publishTime>06/30/2022 09:56:18</publishTime>
+ </File>
+ <File Include="grf/浜у搧娴佷紶鍗旳5.grf">
+ <publishTime>06/30/2022 19:42:17</publishTime>
+ </File>
+ <File Include="grf/澶栧崗鏀舵枡鏍囩.grf">
+ <publishTime>07/07/2022 16:11:14</publishTime>
+ </File>
+ <File Include="grf/鎶ュ伐浜у嚭鏍囩.grf">
+ <publishTime>07/07/2022 16:11:14</publishTime>
+ </File>
+ <File Include="grf/鎶ュ伐鎵撳嵃鏍囩.grf">
+ <publishTime>07/07/2022 14:52:14</publishTime>
+ </File>
+ <File Include="Grid/grwebapp.js">
+ <publishTime>06/30/2022 17:10:44</publishTime>
+ </File>
+ <File Include="Grid/webapp-ws-tutorial.htm">
+ <publishTime>07/08/2022 15:15:11</publishTime>
+ </File>
+ <File Include="Hubs/HubsMessage.html">
+ <publishTime>10/20/2022 17:43:21</publishTime>
+ </File>
+ <File Include="Hubs/HubsMessage1.html">
+ <publishTime>10/22/2022 12:01:05</publishTime>
+ </File>
+ <File Include="Hubs/HubsMessage2.html">
+ <publishTime>10/22/2022 12:00:56</publishTime>
+ </File>
+ <File Include="Image/1.png">
+ <publishTime>08/11/2022 08:20:52</publishTime>
+ </File>
+ <File Include="Image/2.png">
+ <publishTime>08/11/2022 08:20:52</publishTime>
+ </File>
+ <File Include="Image/3.png">
+ <publishTime>08/11/2022 08:20:52</publishTime>
+ </File>
+ <File Include="Image/4.png">
+ <publishTime>08/11/2022 08:20:52</publishTime>
+ </File>
+ <File Include="Image/5.png">
+ <publishTime>08/11/2022 08:20:52</publishTime>
+ </File>
+ <File Include="Image/6.png">
+ <publishTime>08/11/2022 08:20:52</publishTime>
+ </File>
+ <File Include="Image/7.png">
+ <publishTime>08/11/2022 08:20:52</publishTime>
+ </File>
+ <File Include="Image/8.png">
+ <publishTime>08/11/2022 08:20:52</publishTime>
+ </File>
+ <File Include="Image/9.png">
+ <publishTime>08/11/2022 08:20:52</publishTime>
+ </File>
+ <File Include="Image/app_1.png">
+ <publishTime>08/11/2022 16:01:00</publishTime>
+ </File>
+ <File Include="Image/app_1_1.png">
+ <publishTime>08/11/2022 17:50:13</publishTime>
+ </File>
+ <File Include="Image/app_1_2.png">
+ <publishTime>08/11/2022 17:52:44</publishTime>
+ </File>
+ <File Include="Image/app_1_3.png">
+ <publishTime>05/24/2023 08:22:19</publishTime>
+ </File>
+ <File Include="Image/app_2.png">
+ <publishTime>08/11/2022 16:26:50</publishTime>
+ </File>
+ <File Include="Image/app_3.png">
+ <publishTime>08/11/2022 16:36:55</publishTime>
+ </File>
+ <File Include="Image/app_3_1.png">
+ <publishTime>08/11/2022 17:56:50</publishTime>
+ </File>
+ <File Include="Image/app_3_2.png">
+ <publishTime>08/11/2022 17:58:41</publishTime>
+ </File>
+ <File Include="Image/app_4.png">
+ <publishTime>08/11/2022 16:45:29</publishTime>
+ </File>
+ <File Include="Image/app_4_1.png">
+ <publishTime>08/11/2022 18:21:11</publishTime>
+ </File>
+ <File Include="Image/app_4_2.png">
+ <publishTime>08/11/2022 18:34:58</publishTime>
+ </File>
+ <File Include="Image/app_4_3.png">
+ <publishTime>08/15/2022 10:56:14</publishTime>
+ </File>
+ <File Include="Image/app_4_4.png">
+ <publishTime>08/15/2022 11:10:31</publishTime>
+ </File>
+ <File Include="Image/app_4_5.png">
+ <publishTime>09/26/2022 13:30:58</publishTime>
+ </File>
+ <File Include="Image/app_5.png">
+ <publishTime>08/11/2022 16:49:33</publishTime>
+ </File>
+ <File Include="Image/app_5_1.png">
+ <publishTime>08/19/2022 08:43:07</publishTime>
+ </File>
+ <File Include="Image/app_5_2.png">
+ <publishTime>08/19/2022 08:50:32</publishTime>
+ </File>
+ <File Include="Image/app_5_3.png">
+ <publishTime>08/19/2022 09:06:09</publishTime>
+ </File>
+ <File Include="Image/app_5_4.png">
+ <publishTime>08/19/2022 09:08:44</publishTime>
+ </File>
+ <File Include="Image/app_5_5.png">
+ <publishTime>08/19/2022 09:11:02</publishTime>
+ </File>
+ <File Include="Image/app_5_6.png">
+ <publishTime>08/19/2022 09:20:23</publishTime>
+ </File>
+ <File Include="Image/app_5_7.png">
+ <publishTime>08/19/2022 09:22:07</publishTime>
+ </File>
+ <File Include="Image/app_5_8.png">
+ <publishTime>08/19/2022 09:44:32</publishTime>
+ </File>
+ <File Include="Image/app_5_9.png">
+ <publishTime>08/19/2022 09:45:37</publishTime>
+ </File>
+ <File Include="Image/app_6.png">
+ <publishTime>08/11/2022 17:06:12</publishTime>
+ </File>
+ <File Include="Image/app_6_1.png">
+ <publishTime>08/19/2022 10:21:21</publishTime>
+ </File>
+ <File Include="Image/app_6_10.png">
+ <publishTime>08/19/2022 11:44:16</publishTime>
+ </File>
+ <File Include="Image/app_6_11.png">
+ <publishTime>08/22/2022 11:40:51</publishTime>
+ </File>
+ <File Include="Image/app_6_12.png">
+ <publishTime>08/22/2022 11:35:34</publishTime>
+ </File>
+ <File Include="Image/app_6_13.png">
+ <publishTime>08/22/2022 12:04:47</publishTime>
+ </File>
+ <File Include="Image/app_6_14.png">
+ <publishTime>08/22/2022 12:07:20</publishTime>
+ </File>
+ <File Include="Image/app_6_2.png">
+ <publishTime>08/19/2022 10:23:11</publishTime>
+ </File>
+ <File Include="Image/app_6_3.png">
+ <publishTime>08/19/2022 10:40:17</publishTime>
+ </File>
+ <File Include="Image/app_6_4.png">
+ <publishTime>08/19/2022 10:43:18</publishTime>
+ </File>
+ <File Include="Image/app_6_5.png">
+ <publishTime>08/19/2022 10:54:32</publishTime>
+ </File>
+ <File Include="Image/app_6_6.png">
+ <publishTime>08/19/2022 10:57:24</publishTime>
+ </File>
+ <File Include="Image/app_6_7.png">
+ <publishTime>08/19/2022 11:03:26</publishTime>
+ </File>
+ <File Include="Image/app_6_8.png">
+ <publishTime>08/19/2022 11:09:23</publishTime>
+ </File>
+ <File Include="Image/app_6_9.png">
+ <publishTime>08/19/2022 11:22:26</publishTime>
+ </File>
+ <File Include="Image/app_7.png">
+ <publishTime>08/11/2022 17:11:08</publishTime>
+ </File>
+ <File Include="Image/app_7_1.png">
+ <publishTime>08/30/2022 09:55:08</publishTime>
+ </File>
+ <File Include="Image/app_7_2.png">
+ <publishTime>08/30/2022 10:10:08</publishTime>
+ </File>
+ <File Include="Image/app_7_3.png">
+ <publishTime>08/30/2022 09:36:11</publishTime>
+ </File>
+ <File Include="Image/app_7_4.png">
+ <publishTime>08/30/2022 09:46:50</publishTime>
+ </File>
+ <File Include="Image/app_8.png">
+ <publishTime>08/11/2022 17:29:21</publishTime>
+ </File>
+ <File Include="Image/app_8_1.png">
+ <publishTime>05/25/2023 10:50:06</publishTime>
+ </File>
+ <File Include="Image/app_8_2.png">
+ <publishTime>05/25/2023 10:50:55</publishTime>
+ </File>
+ <File Include="Image/app_8_3.png">
+ <publishTime>05/17/2023 09:19:44</publishTime>
+ </File>
+ <File Include="Image/app_8_7.png">
+ <publishTime>04/04/2023 15:18:56</publishTime>
+ </File>
+ <File Include="Image/app_9.png">
+ <publishTime>08/11/2022 17:36:50</publishTime>
+ </File>
+ <File Include="Image/app_9_1.png">
+ <publishTime>01/03/2023 10:54:40</publishTime>
+ </File>
+ <File Include="Image/app_9_2.png">
+ <publishTime>05/17/2023 08:46:43</publishTime>
+ </File>
+ <File Include="Image/app_9_3.png">
+ <publishTime>05/17/2023 09:04:42</publishTime>
+ </File>
+ <File Include="Image/app_9_4.png">
+ <publishTime>05/17/2023 09:02:12</publishTime>
+ </File>
+ <File Include="Image/app_9_5.png">
+ <publishTime>05/17/2023 08:24:38</publishTime>
+ </File>
+ <File Include="Image/index_1.png">
+ <publishTime>08/15/2022 14:13:17</publishTime>
+ </File>
+ <File Include="Image/index_2.png">
+ <publishTime>08/15/2022 14:13:29</publishTime>
+ </File>
+ <File Include="InExcel/9/璁惧娓呭崟66.xls">
+ <publishTime>11/04/2022 15:22:03</publishTime>
+ </File>
+ <File Include="libman.json">
+ <publishTime>06/10/2022 09:23:15</publishTime>
+ </File>
+ <File Include="log4net.config">
+ <publishTime>05/10/2023 09:38:48</publishTime>
+ </File>
+ <File Include="Scripts/bootstrap.js">
+ <publishTime>06/10/2022 08:20:26</publishTime>
+ </File>
+ <File Include="Scripts/bootstrap.min.js">
+ <publishTime>06/10/2022 08:20:26</publishTime>
+ </File>
+ <File Include="Scripts/jquery-3.4.1.js">
+ <publishTime>06/10/2022 08:20:27</publishTime>
+ </File>
+ <File Include="Scripts/jquery-3.4.1.min.js">
+ <publishTime>06/10/2022 08:20:27</publishTime>
+ </File>
+ <File Include="Scripts/jquery-3.4.1.min.map">
+ <publishTime>06/10/2022 08:20:27</publishTime>
+ </File>
+ <File Include="Scripts/jquery-3.4.1.slim.js">
+ <publishTime>06/10/2022 08:20:27</publishTime>
+ </File>
+ <File Include="Scripts/jquery-3.4.1.slim.min.js">
+ <publishTime>06/10/2022 08:20:27</publishTime>
+ </File>
+ <File Include="Scripts/jquery-3.4.1.slim.min.map">
+ <publishTime>06/10/2022 08:20:27</publishTime>
+ </File>
+ <File Include="Scripts/jquery.signalR-2.2.2.js">
+ <publishTime>08/30/2022 13:49:42</publishTime>
+ </File>
+ <File Include="Scripts/jquery.signalR-2.2.2.min.js">
+ <publishTime>08/30/2022 13:49:42</publishTime>
+ </File>
+ <File Include="Scripts/modernizr-2.8.3.js">
+ <publishTime>06/10/2022 08:20:31</publishTime>
+ </File>
+ <File Include="Scripts/swagger_lang.js">
+ <publishTime>06/16/2022 13:39:23</publishTime>
+ </File>
+ <File Include="Web.config">
+ <publishTime>06/17/2023 11:08:21</publishTime>
+ </File>
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/VueWebApi/Tools/ScanStartReport.cs b/VueWebApi/Tools/ScanStartReport.cs
index e71e1b8..0a8dd4e 100644
--- a/VueWebApi/Tools/ScanStartReport.cs
+++ b/VueWebApi/Tools/ScanStartReport.cs
@@ -34,17 +34,20 @@
{
//1.鏍规嵁宸ュ崟+宸ュ簭鏌ユ壘褰撳墠宸ュ簭鏄惁棣栭亾宸ュ簭
- sql = @"select A.wo_code,P.partcode,P.partname,P.partspec, T.stepcode,T.stepname,A.seq,T.flwtype,T.descr,A.status,A.plan_qty,A.isbott,A.isend
+ sql = @"select A.wo_code,P.partcode,P.partname,P.partspec, T.stepcode,T.stepname,A.seq,T.flwtype,T.descr,A.status,A.plan_qty,A.isbott,A.isend,L.org_code,L.org_name
from TK_Wrk_Step A
left join TStep T on A.step_code=T.stepcode
left join TK_Wrk_Man M on A.wo_code=M.wo_code
left join TMateriel_Info P on M.materiel_code=P.partcode
+ left join TOrganization L on M.wkshp_code=L.org_code
where A.wo_code=@ordercode and A.step_code=@stepcode";
dynamicParams.Add("@ordercode", ordercode);
dynamicParams.Add("@stepcode", stepcode);
var data = DapperHelper.selectdata(sql, dynamicParams);
if (data.Rows.Count > 0)
{
+ rt.wkshopcode= data.Rows[0]["org_code"].ToString(); //杞﹂棿缂栫爜
+ rt.wkshopname = data.Rows[0]["org_name"].ToString(); //杞﹂棿鍚嶇О
rt.wo_code = data.Rows[0]["WO_CODE"].ToString(); //宸ュ崟鍙�
rt.partnumber = data.Rows[0]["PARTCODE"].ToString(); //浜у搧缂栫爜
rt.partname = data.Rows[0]["PARTNAME"].ToString(); //浜у搧鍚嶇О
@@ -91,7 +94,9 @@
if (isbott == "Y") //棣栭亾宸ュ簭
{
//1.棣栭亾宸ュ簭鏃讹紝鍒ゆ柇鏄惁鏈夊紑宸ヨ褰�
- sql = @"select * from TK_Wrk_Record where wo_code=@ordercode and step_code=@stepcode and style='S'";
+ sql = @"select * from TK_Wrk_Record R
+ left join TEqpInfo E on R.eqp_code=E.code
+ where R.wo_code=@ordercode and R.step_code=@stepcode and R.style='S'";
dynamicParams.Add("@ordercode", ordercode);
dynamicParams.Add("@stepcode", stepcode);
var data0 = DapperHelper.selectdata(sql, dynamicParams);
@@ -119,6 +124,8 @@
}
else
{
+ rt.eqpcode = data0.Rows[0]["code"].ToString(); //寮�宸ヨ澶囩紪鐮�
+ rt.eqpname = data0.Rows[0]["name"].ToString(); //寮�宸ヨ澶囧悕绉�
rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()); //浠诲姟鏁伴噺
rt.startqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()); //寮�宸ユ暟閲�=浠诲姟鏁伴噺
rt.noreportqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()) - good_qty- ng_qty-bad_qty; //鏈姤鏁伴噺=浠诲姟鏁伴噺-宸叉姤鏁伴噺-涓嶈壇鏁伴噺-鎶ュ簾鏁伴噺
@@ -131,6 +138,8 @@
}
else
{
+ rt.eqpcode = data0.Rows[0]["code"].ToString(); //寮�宸ヨ澶囩紪鐮�
+ rt.eqpname = data0.Rows[0]["name"].ToString(); //寮�宸ヨ澶囧悕绉�
rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()); //浠诲姟鏁伴噺
rt.startqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()); //寮�宸ユ暟閲�
rt.noreportqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()); //鏈姤鏁伴噺
@@ -166,7 +175,9 @@
if (data0.Rows.Count > 0)
{
//1.闈為閬撳伐搴忔椂锛屽垽鏂湰閬撴槸鍚︽湁寮�宸ヨ褰�
- sql = @"select * from TK_Wrk_Record where wo_code=@ordercode and step_code=@stepcode and style='S'";
+ sql = @"select * from TK_Wrk_Record R
+ left join TEqpInfo E on R.eqp_code=E.code
+ where R.wo_code=@ordercode and R.step_code=@stepcode and R.style='S'";
dynamicParams.Add("@ordercode", ordercode);
dynamicParams.Add("@stepcode", stepcode);
var data1 = DapperHelper.selectdata(sql, dynamicParams);
@@ -179,7 +190,7 @@
var data2 = DapperHelper.selectdata(sql, dynamicParams);
if (data2.Rows.Count > 0) //鏈夋姤宸ヨ褰�
{
- if (data0.Rows[0]["FLWTYPE"].ToString() == "Z") //鑷埗宸ュ簭
+ if (data0.Rows[0]["FLWTYPE"].ToString() == "Z") //鍒ゆ柇涓婇亾宸ュ簭灞炴�э細鑷埗宸ュ簭
{
//鏌ユ壘涓婂埌宸ュ簭鎶ュ伐璁板綍
sql = @"select * from TK_Wrk_Record where wo_code=@ordercode and step_code=@stepcode and style='B'";
@@ -204,6 +215,8 @@
}
else
{
+ rt.eqpcode = data1.Rows[0]["code"].ToString(); //寮�宸ヨ澶囩紪鐮�
+ rt.eqpname = data1.Rows[0]["name"].ToString(); //寮�宸ヨ澶囧悕绉�
rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()); //浠诲姟鏁伴噺
rt.startqty = sybqty; //寮�宸ユ暟閲�=鏈亾鍓╀綑鍙姤鏁伴噺
rt.noreportqty = sybqty; //鏈姤鏁伴噺=鏈亾鍓╀綑鍙姤鏁伴噺
@@ -223,7 +236,7 @@
return mes;
}
}
- if (data0.Rows[0]["FLWTYPE"].ToString() == "W") //濮斿宸ュ簭
+ if (data0.Rows[0]["FLWTYPE"].ToString() == "W") //鍒ゆ柇涓婇亾宸ュ簭灞炴�э細濮斿宸ュ簭
{
//鏌ユ壘涓婂埌宸ュ簭鏀舵枡璁板綍
sql = @"select * from TK_Wrk_OutRecord where wo_code=@ordercode and step_code=@stepcode and style='S'";
@@ -248,6 +261,8 @@
}
else
{
+ rt.eqpcode = data1.Rows[0]["code"].ToString(); //寮�宸ヨ澶囩紪鐮�
+ rt.eqpname = data1.Rows[0]["name"].ToString(); //寮�宸ヨ澶囧悕绉�
rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()); //浠诲姟鏁伴噺
rt.startqty = sybqty; //寮�宸ユ暟閲�=鏈亾鍓╀綑鍙姤鏁伴噺
rt.noreportqty = sybqty; //鏈姤鏁伴噺=鏈亾鍓╀綑鍙姤鏁伴噺
@@ -282,6 +297,8 @@
decimal sgood_qty = data3.AsEnumerable().Select(d => d.Field<decimal>("GOOD_QTY")).Sum(); //鏈亾鎶ュ伐鎬绘暟閲�
decimal sybqty = sgood_qty; //鏈亾鍓╀綑鍙姤鏁伴噺=涓婇亾鎶ュ伐鏁伴噺
+ rt.eqpcode = data1.Rows[0]["code"].ToString(); //寮�宸ヨ澶囩紪鐮�
+ rt.eqpname = data1.Rows[0]["name"].ToString(); //寮�宸ヨ澶囧悕绉�
rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()); //浠诲姟鏁伴噺
rt.startqty = sybqty; //寮�宸ユ暟閲�=鏈亾鍓╀綑鍙姤鏁伴噺
rt.noreportqty = sybqty; //鏈姤鏁伴噺=鏈亾鍓╀綑鍙姤鏁伴噺
@@ -312,6 +329,8 @@
decimal sqty = data3.AsEnumerable().Select(d =>d.Field<decimal>("SQTY")).Sum();//涓婇亾鏀舵枡鏁伴噺
decimal sybqty = sqty; //鏈亾鍓╀綑鍙敹鏁伴噺=涓婇亾鏀舵枡鏁伴噺
+ rt.eqpcode = data1.Rows[0]["code"].ToString(); //寮�宸ヨ澶囩紪鐮�
+ rt.eqpname = data1.Rows[0]["name"].ToString(); //寮�宸ヨ澶囧悕绉�
rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()); //浠诲姟鏁伴噺
rt.startqty = sybqty; //寮�宸ユ暟閲�=鏈亾鍓╀綑鍙敹鏁伴噺
rt.noreportqty = sybqty; //鏈姤鏁伴噺=鏈亾鍓╀綑鍙敹鏁伴噺
@@ -448,23 +467,25 @@
string isend = ""; //鏈亾宸ュ簭
string seq = ""; //宸ュ簭搴忓彿
List<object> list = new List<object>();
- ScanStartReportData rt = new ScanStartReportData();
+ ScanStartReportDataOut rt = new ScanStartReportDataOut();
var dynamicParams = new DynamicParameters();
try
{
//1.鏍规嵁宸ュ崟+宸ュ簭鏌ユ壘褰撳墠宸ュ簭鏄惁棣栭亾宸ュ簭
- sql = @"select A.wo_code,P.partcode,P.partname,P.partspec, T.stepcode,T.stepname,A.seq,T.flwtype,T.descr,A.status,A.plan_qty,A.isbott,A.isend
+ sql = @"select A.wo_code,P.partcode,P.partname,P.partspec, T.stepcode,T.stepname,A.seq,T.flwtype,T.descr,A.status,A.plan_qty,A.isbott,A.isend,L.org_code,L.org_name
from TK_Wrk_Step A
left join TStep T on A.step_code=T.stepcode
left join TK_Wrk_Man M on A.wo_code=M.wo_code
left join TMateriel_Info P on M.materiel_code=P.partcode
+ left join TOrganization L on M.wkshp_code=L.org_code
where A.wo_code=@ordercode and A.step_code=@stepcode";
dynamicParams.Add("@ordercode", ordercode);
dynamicParams.Add("@stepcode", stepcode);
var data = DapperHelper.selectdata(sql, dynamicParams);
if (data.Rows.Count > 0)
{
-
+ rt.wkshopcode = data.Rows[0]["org_code"].ToString(); //杞﹂棿缂栫爜
+ rt.wkshopname = data.Rows[0]["org_name"].ToString(); //杞﹂棿鍚嶇О
rt.wo_code = data.Rows[0]["WO_CODE"].ToString(); //宸ュ崟鍙�
rt.partnumber = data.Rows[0]["PARTCODE"].ToString(); //浜у搧缂栫爜
rt.partname = data.Rows[0]["PARTNAME"].ToString(); //浜у搧鍚嶇О
@@ -520,7 +541,9 @@
if (isbott == "Y") //棣栭亾宸ュ簭
{
//1.棣栭亾宸ュ簭鏃讹紝鍒ゆ柇鏄惁鏈夊彂鏂欒褰�
- sql = @"select * from TK_Wrk_OutRecord where wo_code=@ordercode and step_code=@stepcode and style='F'";
+ sql = @"select * from TK_Wrk_OutRecord R
+ left join TCustomer C on R.wx_code=C.code
+ where R.wo_code=@ordercode and R.step_code=@stepcode and R.style='F'";
dynamicParams.Add("@ordercode", ordercode);
dynamicParams.Add("@stepcode", stepcode);
var data0 = DapperHelper.selectdata(sql, dynamicParams);
@@ -575,13 +598,15 @@
if (data0.Rows.Count > 0)
{
//1.闈為閬撳伐搴忔椂锛屽垽鏂湰閬撴槸鍚︽湁鍙戞枡璁板綍
- sql = @"select * from TK_Wrk_OutRecord where wo_code=@ordercode and step_code=@stepcode and style='F'";
+ sql = @"select * from TK_Wrk_OutRecord R
+ left join TCustomer C on R.wx_code=C.code
+ where R.wo_code=@ordercode and R.step_code=@stepcode and R.style='F'";
dynamicParams.Add("@ordercode", ordercode);
dynamicParams.Add("@stepcode", stepcode);
var data1 = DapperHelper.selectdata(sql, dynamicParams);
if (data1.Rows.Count > 0)//鏈亾鏈夊彂鏂欒褰�
{
- if (data0.Rows[0]["FLWTYPE"].ToString() == "Z") //鑷埗宸ュ簭
+ if (data0.Rows[0]["FLWTYPE"].ToString() == "Z") //鍒ゆ柇涓婇亾宸ュ簭灞炴�э細鑷埗宸ュ簭
{
//鏌ユ壘涓婂埌宸ュ簭鎶ュ伐璁板綍
sql = @"select * from TK_Wrk_Record where wo_code=@ordercode and step_code=@stepcode and style='B'";
@@ -626,7 +651,7 @@
return mes;
}
}
- if (data0.Rows[0]["FLWTYPE"].ToString() == "W") //澶栧崗宸ュ簭
+ if (data0.Rows[0]["FLWTYPE"].ToString() == "W") //鍒ゆ柇涓婇亾宸ュ簭灞炴�э細澶栧崗宸ュ簭
{
//鏌ユ壘涓婂埌宸ュ簭鏀舵枡璁板綍
sql = @"select * from TK_Wrk_OutRecord where wo_code=@ordercode and step_code=@stepcode and style='S'";
@@ -778,14 +803,25 @@
if (isbott == "Y") //棣栭亾宸ュ簭
{
//1.棣栭亾宸ュ簭鏃讹紝鍒ゆ柇鏄惁鏈夊彂鏂欒褰�
- sql = @"select * from TK_Wrk_OutRecord where wo_code=@ordercode and step_code=@stepcode and style='F'";
+ sql = @"select R.wo_code,R.step_code,R.wx_code as code,C.name,R.materiel_code,
+ isnull(sum(R.fqty),0) as fqty,isnull(sum(R.sqty),0) as sqty,isnull(sum(R.ng_qty),0) as ng_qty,isnull(sum(R.bad_qty),0) as bad_qty
+ from TK_Wrk_OutRecord R
+ left join TCustomer C on R.wx_code=C.code
+ where R.wo_code=@ordercode and R.step_code=@stepcode and R.style='F'
+ group by R.wo_code,R.step_code,R.wx_code,C.name,R.materiel_code";
dynamicParams.Add("@ordercode", ordercode);
dynamicParams.Add("@stepcode", stepcode);
var data0 = DapperHelper.selectdata(sql, dynamicParams);
if (data0.Rows.Count > 0) //鏈夊彂鏂欒褰�
{
//1.棣栭亾宸ュ簭鏃讹紝鍒ゆ柇鏄惁鏈夋敹鏂欒褰�
- sql = @"select * from TK_Wrk_OutRecord where wo_code=@ordercode and step_code=@stepcode and style='S'";
+ sql = @"select R.wo_code,R.step_code,R.wx_code as code,C.name,R.materiel_code,
+ isnull(sum(R.fqty),0) as fqty,isnull(sum(R.sqty),0) as sqty,isnull(sum(R.ng_qty),0) as ng_qty,isnull(sum(R.bad_qty),0) as bad_qty
+ from TK_Wrk_OutRecord R
+ left join TCustomer C on R.wx_code=C.code
+ where R.wo_code=@ordercode and R.step_code=@stepcode and R.style='S'
+ group by R.wo_code,R.step_code,R.wx_code,C.name,R.materiel_code";
+ //sql = @"select * from TK_Wrk_OutRecord where wo_code=@ordercode and step_code=@stepcode and style='S'";
dynamicParams.Add("@ordercode", ordercode);
dynamicParams.Add("@stepcode", stepcode);
var data1 = DapperHelper.selectdata(sql, dynamicParams);
@@ -810,6 +846,21 @@
rt.noreportqty = ksqty; //鏈敹鏁伴噺=鏈亾鍙戞枡鏁伴噺
rt.reportqty = sqty + ng_qty+bad_qty; //宸叉敹鏁伴噺
rt.startqty = ksqty; //鏀舵枡鏁伴噺=鏈亾鍙戞枡鏁伴噺
+
+ data0.Merge(data1);//灏嗘寚瀹氱殑dt鍚堝苟
+ rt.list = data0.AsEnumerable().GroupBy(r => new {
+ wo_code = r["wo_code"],
+ step_code = r["step_code"],
+ code = r["code"],
+ name = r["name"]
+ }).Select(g => new {
+ Name = g.Key.code,
+ tp = g.Key.name,
+ fqty = g.Sum(i => (decimal)i["fqty"]),
+ sqty = g.Sum(i => (decimal)i["sqty"]),
+ ng_qty = g.Sum(i => (decimal)i["ng_qty"]),
+ bad_qty = g.Sum(i => (decimal)i["bad_qty"])
+ }).ToList();
mes.code = "200";
mes.count = 3;
@@ -821,11 +872,25 @@
else
{
decimal fqty = data0.AsEnumerable().Select(d => d.Field<decimal>("FQTY")).Sum();//鏈亾鍙戞枡鏁伴噺
-
rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()); //浠诲姟鏁伴噺
rt.noreportqty = fqty; //鏈敹鏁伴噺=鏈亾鍙戞枡鏁伴噺
rt.reportqty = 0; //宸叉敹鏁伴噺
- rt.startqty = fqty; //鏀舵枡鏁伴噺=鏈亾鍙戞枡鏁伴噺
+ rt.startqty = fqty; //鏀舵枡鏁伴噺=鏈亾鍙戞枡鏁伴噺
+ //
+ data0.Merge(data1);//灏嗘寚瀹氱殑dt鍚堝苟
+ rt.list = data0.AsEnumerable().GroupBy(r => new {
+ wo_code = r["wo_code"],
+ step_code = r["step_code"],
+ code = r["code"],
+ name = r["name"]
+ }).Select(g => new {
+ Name = g.Key.code,
+ tp = g.Key.name,
+ fqty = g.Sum(i => (decimal)i["fqty"]),
+ sqty = g.Sum(i => (decimal)i["sqty"]),
+ ng_qty = g.Sum(i => (decimal)i["ng_qty"]),
+ bad_qty = g.Sum(i => (decimal)i["bad_qty"])
+ }).ToList();
mes.code = "200";
mes.count = 3;
@@ -855,14 +920,24 @@
if (data0.Rows.Count > 0)
{
//1.闈為閬撳伐搴忔椂锛屽垽鏂湰閬撴槸鍚︽湁鍙戞枡璁板綍
- sql = @"select * from TK_Wrk_OutRecord where wo_code=@ordercode and step_code=@stepcode and style='F'";
+ sql = @"select R.wo_code,R.step_code,R.wx_code as code,C.name,R.materiel_code,
+ isnull(sum(R.fqty),0) as fqty,isnull(sum(R.sqty),0) as sqty,isnull(sum(R.ng_qty),0) as ng_qty,isnull(sum(R.bad_qty),0) as bad_qty
+ from TK_Wrk_OutRecord R
+ left join TCustomer C on R.wx_code=C.code
+ where R.wo_code=@ordercode and R.step_code=@stepcode and R.style='F'
+ group by R.wo_code,R.step_code,R.wx_code,C.name,R.materiel_code";
dynamicParams.Add("@ordercode", ordercode);
dynamicParams.Add("@stepcode", stepcode);
var data1 = DapperHelper.selectdata(sql, dynamicParams);
if (data1.Rows.Count > 0)//鏈亾鏈夊彂鏂欒褰�
{
//2.闈為閬撳伐搴忔椂锛屽垽鏂湰閬撴槸鍚︽湁鏀舵枡璁板綍
- sql = @"select * from TK_Wrk_OutRecord where wo_code=@ordercode and step_code=@stepcode and style='S'";
+ sql = @"select R.wo_code,R.step_code,R.wx_code as code,C.name,R.materiel_code,
+ isnull(sum(R.fqty),0) as fqty,isnull(sum(R.sqty),0) as sqty,isnull(sum(R.ng_qty),0) as ng_qty,isnull(sum(R.bad_qty),0) as bad_qty
+ from TK_Wrk_OutRecord R
+ left join TCustomer C on R.wx_code=C.code
+ where R.wo_code=@ordercode and R.step_code=@stepcode and R.style='S'
+ group by R.wo_code,R.step_code,R.wx_code,C.name,R.materiel_code";
dynamicParams.Add("@ordercode", ordercode);
dynamicParams.Add("@stepcode", stepcode);
var data2 = DapperHelper.selectdata(sql, dynamicParams);
@@ -887,7 +962,22 @@
rt.noreportqty = ksqty; //鏈敹鏁伴噺=鏈亾鍙戞枡鏁伴噺
rt.reportqty = sqty + ng_qty+bad_qty; //宸叉敹鏁伴噺
rt.startqty = ksqty; //鏀舵枡鏁伴噺=鏈亾鍙戞枡鏁伴噺
-
+
+ data1.Merge(data2);//灏嗘寚瀹氱殑dt鍚堝苟
+ rt.list = data1.AsEnumerable().GroupBy(r => new {
+ wo_code = r["wo_code"],
+ step_code = r["step_code"],
+ code= r["code"],
+ name = r["name"]
+ }).Select(g => new {
+ Name = g.Key.code,
+ tp = g.Key.name,
+ fqty = g.Sum(i => (decimal)i["fqty"]),
+ sqty = g.Sum(i => (decimal)i["sqty"]),
+ ng_qty = g.Sum(i => (decimal)i["ng_qty"]),
+ bad_qty = g.Sum(i => (decimal)i["bad_qty"])
+ }).ToList();
+
mes.code = "200";
mes.count = 3;
mes.Message = "寮圭獥鏀舵枡鐣岄潰!";
@@ -897,12 +987,24 @@
else
{
decimal fqty = data1.AsEnumerable().Select(d => d.Field<decimal>("FQTY")).Sum(); //鏈亾鍙戞枡鏁伴噺
-
rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()); //浠诲姟鏁伴噺
rt.noreportqty = fqty; //鏈敹鏁伴噺=鏈亾鍙戞枡鏁伴噺
rt.reportqty = 0; //宸叉敹鏁伴噺
rt.startqty = fqty; //鏀舵枡鏁伴噺=鏈亾鍙戞枡鏁伴噺
-
+ data1.Merge(data2);//灏嗘寚瀹氱殑dt鍚堝苟
+ rt.list = data1.AsEnumerable().GroupBy(r => new {
+ wo_code = r["wo_code"],
+ step_code = r["step_code"],
+ code = r["code"],
+ name = r["name"]
+ }).Select(g => new {
+ Name = g.Key.code,
+ tp = g.Key.name,
+ fqty = g.Sum(i => (decimal)i["fqty"]),
+ sqty = g.Sum(i => (decimal)i["sqty"]),
+ ng_qty = g.Sum(i => (decimal)i["ng_qty"]),
+ bad_qty = g.Sum(i => (decimal)i["bad_qty"])
+ }).ToList();
mes.code = "200";
mes.count = 3;
mes.Message = "寮圭獥鏀舵枡鐣岄潰!";
diff --git a/VueWebApi/VueWebApi.csproj b/VueWebApi/VueWebApi.csproj
index 90f6d3d..1b13394 100644
--- a/VueWebApi/VueWebApi.csproj
+++ b/VueWebApi/VueWebApi.csproj
@@ -418,10 +418,12 @@
<Compile Include="Models\MaterialRout.cs" />
<Compile Include="Models\ObjectData.cs" />
<Compile Include="Models\ObjectDataCont.cs" />
+ <Compile Include="Models\PartRout.cs" />
<Compile Include="Models\ReportDefectHandle.cs" />
<Compile Include="Models\RoleUserSubmit.cs" />
<Compile Include="Models\RoutEdit.cs" />
<Compile Include="Models\ScanStartReportData.cs" />
+ <Compile Include="Models\ScanStartReportDataOut.cs" />
<Compile Include="Models\StandEqp.cs" />
<Compile Include="Models\StepCheck.cs" />
<Compile Include="Models\StepDefect.cs" />
diff --git a/VueWebApi/VueWebApi.csproj.user b/VueWebApi/VueWebApi.csproj.user
index 6f95e97..0b978d6 100644
--- a/VueWebApi/VueWebApi.csproj.user
+++ b/VueWebApi/VueWebApi.csproj.user
@@ -9,7 +9,7 @@
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
- <NameOfLastUsedPublishProfile>D:\鏂板嚡杩狹ES\MES浜у搧\VueWebApi\VueWebApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ShowAllFiles</ProjectView>
<Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Common/Web API</Controller_SelectedScaffolderCategoryPath>
diff --git a/VueWebApi/Web.config b/VueWebApi/Web.config
index fd379a9..14f807c 100644
--- a/VueWebApi/Web.config
+++ b/VueWebApi/Web.config
@@ -16,7 +16,7 @@
<!--鏈湴鐜-->
<!--<add key="DBServer" value="Data Source=.;Initial Catalog=vmes;Integrated Security=True" />-->
<!--鏈嶅姟鍣ㄧ幆澧�-->
- <add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes;User ID=sa;Password=xkd@20230101;pooling=false" />
+ <add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes_zqh;User ID=sa;Password=xkd@20230101;pooling=false" />
<!--澶у矝鏈嶅姟鍣ㄧ幆澧�-->
<!--<add key="DBServer" value="Data Source=192.168.2.138;Initial Catalog=vmes;User ID=sa;Password=Dd@20220727;pooling=false" />-->
<!--redis浼佷笟閰嶇疆-->
diff --git a/VueWebApi/bin/VueWebApi.dll.config b/VueWebApi/bin/VueWebApi.dll.config
index fd379a9..14f807c 100644
--- a/VueWebApi/bin/VueWebApi.dll.config
+++ b/VueWebApi/bin/VueWebApi.dll.config
@@ -16,7 +16,7 @@
<!--鏈湴鐜-->
<!--<add key="DBServer" value="Data Source=.;Initial Catalog=vmes;Integrated Security=True" />-->
<!--鏈嶅姟鍣ㄧ幆澧�-->
- <add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes;User ID=sa;Password=xkd@20230101;pooling=false" />
+ <add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes_zqh;User ID=sa;Password=xkd@20230101;pooling=false" />
<!--澶у矝鏈嶅姟鍣ㄧ幆澧�-->
<!--<add key="DBServer" value="Data Source=192.168.2.138;Initial Catalog=vmes;User ID=sa;Password=Dd@20220727;pooling=false" />-->
<!--redis浼佷笟閰嶇疆-->
diff --git a/VueWebApi/bin/VueWebApi.pdb b/VueWebApi/bin/VueWebApi.pdb
index 62eb7d6..ecfa78c 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 bbef6a4..640d7d6 100644
--- a/VueWebApi/bin/VueWebApi.xml
+++ b/VueWebApi/bin/VueWebApi.xml
@@ -549,10 +549,11 @@
<param name="orderstepqrcode">鎵弿浜岀淮鐮佷俊鎭�</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.AppProductionManagementController.MesOrderStepReportSelectUserGroup">
+ <member name="M:VueWebApi.Controllers.AppProductionManagementController.MesOrderStepReportSelectUserGroup(System.String)">
<summary>
鐢熶骇寮�鎶ュ伐锛氭姤宸ユ椂鑾峰彇鐢熶骇鐝粍涓嬫媺妗�
</summary>
+ <param name="wkshopcode">杞﹂棿缂栫爜</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.AppProductionManagementController.MesOrderGroupSelectUser(System.String)">
@@ -812,6 +813,22 @@
<param name="param">瀛樿揣淇℃伅</param>
<returns></returns>
</member>
+ <member name="M:VueWebApi.Controllers.BaseDateController.StorgGroupSelect(System.String,System.String)">
+ <summary>
+ 閫氳繃閫夋嫨鐨勬墍灞炵粍缁囨煡璇㈡墍灞炵彮缁�
+ </summary>
+ <param name="stu_torgcode">缁勭粐缂栫爜</param>
+ <param name="description">缁勭粐绫诲瀷</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.BaseDateController.StorgRoleSelect(System.String,System.String)">
+ <summary>
+ 閫氳繃閫夋嫨鐨勬墍灞炵粍缁囨煡璇㈡墍灞炶鑹茬被鍨�
+ </summary>
+ <param name="stu_torgcode">缁勭粐缂栫爜</param>
+ <param name="description">缁勭粐绫诲瀷</param>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Controllers.BaseDateController.ErpWkshopDepartmentSelect">
<summary>
ERP鐢熶骇杞﹂棿/閮ㄩ棬淇℃伅鏌ヨ
@@ -930,10 +947,11 @@
<param name="partcode">鐗╂枡缂栫爜</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ReportManagerController.OutSourceReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.ReportManagerController.OutSourceReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
<summary>
濮斿鎶ヨ〃璁板綍鏌ヨ
</summary>
+ <param name="wkshopcode">杞﹂棿缂栫爜</param>
<param name="wocode">宸ュ崟缂栧彿</param>
<param name="partcode">浜у搧缂栫爜</param>
<param name="partname">浜у搧鍚嶇О</param>
@@ -948,10 +966,11 @@
<param name="order">鎺掑簭瑙勫垯</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ReportManagerController.OutSourceReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.ReportManagerController.OutSourceReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
<summary>
濮斿鎶ヨ〃璁板綍瀵煎嚭
</summary>
+ <param name="wkshopcode">杞﹂棿缂栫爜</param>
<param name="wocode">宸ュ崟缂栧彿</param>
<param name="partcode">浜у搧缂栫爜</param>
<param name="partname">浜у搧鍚嶇О</param>
@@ -962,10 +981,11 @@
<param name="receivdate">鏀舵枡鏃堕棿</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ReportManagerController.GroupSalaryReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.ReportManagerController.GroupSalaryReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
<summary>
鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ヨ
</summary>
+ <param name=" wkshopcode">杞﹂棿缂栫爜</param>
<param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
<param name="wocode">宸ュ崟缂栧彿</param>
<param name="partcode">浜у搧缂栫爜</param>
@@ -989,10 +1009,11 @@
<param name="id">鎶ュ伐璁板綍涓昏〃id</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ReportManagerController.GroupSalaryReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.ReportManagerController.GroupSalaryReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
<summary>
鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ヨ
</summary>
+ <param name=" wkshopcode">杞﹂棿缂栫爜</param>
<param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
<param name="wocode">宸ュ崟缂栧彿</param>
<param name="partcode">浜у搧缂栫爜</param>
@@ -1005,10 +1026,11 @@
<param name="rejectstepcode">鍓旈櫎宸ュ簭(鍥哄畾钖祫宸ュ簭涓嶅弬涓庤绠�)</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ReportManagerController.PeopleSalaryReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.ReportManagerController.PeopleSalaryReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
<summary>
浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃
</summary>
+ <param name=" wkshopcode">杞﹂棿缂栫爜</param>
<param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
<param name="wocode">宸ュ崟缂栧彿</param>
<param name="partcode">浜у搧缂栫爜</param>
@@ -1025,10 +1047,11 @@
<param name="order">鎺掑簭瑙勫垯</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ReportManagerController.PeopleSalaryReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.ReportManagerController.PeopleSalaryReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
<summary>
浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃瀵煎嚭
</summary>
+ <param name=" wkshopcode">杞﹂棿缂栫爜</param>
<param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
<param name="wocode">宸ュ崟缂栧彿</param>
<param name="partcode">浜у搧缂栫爜</param>
@@ -1041,10 +1064,11 @@
<param name = "rejectstepcode" > 鍓旈櫎宸ュ簭(鍥哄畾钖祫宸ュ簭涓嶅弬涓庤绠�) </param >
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ReportManagerController.DefectDetailsReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.ReportManagerController.DefectDetailsReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
<summary>
涓嶈壇鏄庣粏鎶ヨ〃
</summary>
+ <param name=" wkshopcode">杞﹂棿缂栫爜</param>
<param name="wocode">宸ュ崟缂栧彿</param>
<param name="partcode">浜у搧缂栫爜</param>
<param name="partname">浜у搧鍚嶇О</param>
@@ -1060,10 +1084,11 @@
<param name="order">鎺掑簭瑙勫垯</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ReportManagerController.DefectDetailsReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.ReportManagerController.DefectDetailsReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
<summary>
涓嶈壇鏄庣粏鎶ヨ〃瀵煎嚭
</summary>
+ <param name=" wkshopcode">杞﹂棿缂栫爜</param>
<param name="wocode">宸ュ崟缂栧彿</param>
<param name="partcode">浜у搧缂栫爜</param>
<param name="partname">浜у搧鍚嶇О</param>
@@ -1199,10 +1224,11 @@
<param name="checkid">妫�楠岃褰旾D</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ReportManagerController.ProductionScheduleReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.ReportManagerController.ProductionScheduleReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
<summary>
鐢熶骇杩涘害鎶ヨ〃
</summary>
+ <param name=" wkshopcode">杞﹂棿缂栫爜</param>
<param name="status">宸ュ崟鐘舵��</param>
<param name="wocode">宸ュ崟缂栧彿</param>
<param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
@@ -1217,10 +1243,11 @@
<param name="order">鎺掑簭瑙勫垯</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ReportManagerController.ProductionScheduleReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.ReportManagerController.ProductionScheduleReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
<summary>
鐢熶骇杩涘害鎶ヨ〃瀵煎嚭
</summary>
+ <param name=" wkshopcode">杞﹂棿缂栫爜</param>
<param name="status">宸ュ崟鐘舵��</param>
<param name="wocode">宸ュ崟缂栧彿</param>
<param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
@@ -1428,13 +1455,14 @@
<param name="orgid">缁勭粐id</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.BasicSettingController.UserSearch(System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.BasicSettingController.UserSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
<summary>
鐢ㄦ埛娓呭崟鏌ヨ
</summary>
<param name="UserCode">鐢ㄦ埛缂栫爜</param>
<param name="UserName">鐢ㄦ埛鍚嶇О</param>
<param name="StuOrg">鎵�灞炵粍缁�</param>
+ <param name="description">鎵�灞炵粍缁囩被鍨�</param>
<param name="wagetype">宸ヨ祫绫诲瀷</param>
<param name="Enable">鍦ㄨ亴鐘舵��</param>
<param name="page">椤电爜</param>
@@ -1469,18 +1497,22 @@
<param name="Userid">鐢ㄦ埛id</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.BasicSettingController.UserAssociationRole(System.String)">
+ <member name="M:VueWebApi.Controllers.BasicSettingController.UserAssociationRole(System.String,System.String,System.String)">
<summary>
鐢ㄦ埛娓呭崟鍏宠仈瑙掕壊鏌ヨ
</summary>
<param name="usercode">鐢ㄦ埛缂栫爜</param>
+ <param name="stu_torgcode">鎵�灞炵粍缁囩紪鐮�</param>
+ <param name="description">鎵�灞炵粍缁囩被鍨�</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.BasicSettingController.SaveUserAssoctRole(System.String,System.Collections.Generic.List{VueWebApi.Models.RoleUserSubmit})">
+ <member name="M:VueWebApi.Controllers.BasicSettingController.SaveUserAssoctRole(System.String,System.String,System.String,System.Collections.Generic.List{VueWebApi.Models.RoleUserSubmit})">
<summary>
鐢ㄦ埛娓呭崟鍏宠仈瑙掕壊淇濆瓨
</summary>
<param name="usercode">鐢ㄦ埛缂栫爜</param>
+ <param name="stu_torgcode">鎵�灞炵粍缁囩紪鐮�</param>
+ <param name="description">鎵�灞炵粍缁囩被鍨�</param>
<param name="json">鎻愪氦鏁版嵁瀵硅薄</param>
<returns></returns>
</member>
@@ -2307,7 +2339,7 @@
<param name="usertype">鎿嶄綔绔被鍨�(PC APP)</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.LoginController.ForcedOffline(System.Int32,System.String,System.String,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.LoginController.ForcedOffline(System.Int32,System.String,System.String,System.String,System.String,System.String)">
<summary>
寮哄埗涓嬬嚎鎺ュ彛
</summary>
@@ -2316,6 +2348,7 @@
<param name="username">鐢ㄦ埛鍚�</param>
<param name="usertype">鎿嶄綔绔疨C/APP</param>
<param name="rid">rid鏋佸厜鎺ㄩ�佽幏鍙栬澶噄d</param>
+ <param name="stu_torgcode">鎵�灞炵粍缁囩紪鐮�</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.LoginController.LoginMenu(System.String,System.String)">
@@ -2336,7 +2369,7 @@
<param name="newpassword">鏂板瘑鐮�</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.LoginController.LoginOut(System.Int32,System.String,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.LoginController.LoginOut(System.Int32,System.String,System.String,System.String,System.String)">
<summary>
PC鐧诲嚭
</summary>
@@ -2344,6 +2377,7 @@
<param name="usercode">鐢ㄦ埛缂栫爜</param>
<param name="username">鐢ㄦ埛鍚�</param>
<param name="usertype">鎿嶄綔绔疨C/APP</param>
+ <param name="stu_torgcode">鎵�灞炵粍缁囩紪鐮�</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.LoginController.LoginAppSave(System.String,System.String,System.String,System.String)">
@@ -2526,19 +2560,19 @@
<param name="order">鎺掑簭瑙勫垯</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ProductionManagementController.PartSelectRoute(System.String)">
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.PartSelectRoute(System.String,System.String)">
<summary>
浜у搧缂栫爜鏌ユ壘宸ヨ壓璺嚎涓嬫媺鎺ュ彛
</summary>
<param name="partcode">浜у搧缂栫爜</param>
+ <param name="wkshopcode">杞﹂棿缂栫爜</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ProductionManagementController.RouteSelectWkshop(System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.RouteSelectWkshop(System.String)">
<summary>
浜у搧+宸ヨ壓璺嚎鏌ユ壘杞﹂棿涓嬫媺鎺ュ彛
</summary>
<param name="partcode">浜у搧缂栫爜</param>
- <param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.ProductionManagementController.SelectRouteStep(System.String)">
@@ -2672,10 +2706,11 @@
<param name="orderstepqrcode">鎵弿浜岀淮鐮佷俊鎭�</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderStepReportSelectUserGroup">
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderStepReportSelectUserGroup(System.String)">
<summary>
鐢熶骇寮�鎶ュ伐锛氭姤宸ユ椂鑾峰彇鐢熶骇鐝粍涓嬫媺妗�
</summary>
+ <param name="wkshopcode">杞﹂棿缂栫爜</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderGroupSelectUser(System.String)">
@@ -3049,7 +3084,7 @@
<param name="partcode">鐗╂枡缂栫爜</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ProductModelController.SaveInventoryFile(System.String,System.Collections.Generic.List{VueWebApi.Models.ObjectData},System.String)">
+ <member name="M:VueWebApi.Controllers.ProductModelController.SaveInventoryFile(System.String,System.Collections.Generic.List{VueWebApi.Models.PartRout},System.String)">
<summary>
瀛樿揣妗ｆ鍏宠仈宸ヨ壓璺嚎鎻愪氦
</summary>
@@ -3103,16 +3138,17 @@
<param name="bomid">Bom涓昏〃id</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ProductModelController.StepSelect">
+ <member name="M:VueWebApi.Controllers.ProductModelController.StepSelect(System.String)">
<summary>
宸ュ簭涓嬫媺鏌ヨ鎺ュ彛
</summary>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ProductModelController.RouteSearch(System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.ProductModelController.RouteSearch(System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
<summary>
宸ヨ壓璺嚎鏌ヨ
</summary>
+ <param name="WorkShop">鎵�灞炶溅闂�</param>
<param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
<param name="routename">宸ヨ壓璺嚎鍚嶇О</param>
<param name="description">宸ヨ壓璺嚎鎻忚堪</param>
@@ -3146,10 +3182,11 @@
<param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ProductModelController.StepSearch(System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.ProductModelController.StepSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
<summary>
宸ュ簭鏌ヨ
</summary>
+ <param name="WorkShop">鎵�灞炶溅闂�</param>
<param name="stepcode">宸ュ簭缂栫爜</param>
<param name="stepname">宸ュ簭鍚嶇О</param>
<param name="enable">鍚敤鐘舵��</param>
@@ -3175,29 +3212,30 @@
<param name="stepcode">宸ュ簭缂栫爜</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ProductModelController.StepAssociationEqp(System.String)">
+ <member name="M:VueWebApi.Controllers.ProductModelController.StepAssociationEqp(System.String,System.String)">
<summary>
宸ュ簭瀹氫箟鍏宠仈宸ヤ綔绔欐煡璇�
</summary>
<param name="stepcode">宸ュ簭缂栫爜</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ProductModelController.SaveStepAssociationEqp(System.String,System.Collections.Generic.List{VueWebApi.Models.ObjectData})">
+ <member name="M:VueWebApi.Controllers.ProductModelController.SaveStepAssociationEqp(System.String,System.String,System.Collections.Generic.List{VueWebApi.Models.ObjectData})">
<summary>
宸ュ簭瀹氫箟鍏宠仈宸ヤ綔绔欐彁浜�
</summary>
+ <param name="WorkShop">鎵�灞炵粍缁囩紪鐮�(杞﹂棿)</param>
<param name="stepcode">宸ュ簭缂栫爜</param>
<param name="json">鎻愪氦鏁版嵁</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ProductModelController.StepAssociationDefect(System.String)">
+ <member name="M:VueWebApi.Controllers.ProductModelController.StepAssociationDefect(System.String,System.String)">
<summary>
宸ュ簭鍏宠仈缂洪櫡鏌ヨ
</summary>
<param name="stepcode">宸ュ簭缂栫爜</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ProductModelController.SaveStepAssociationDefect(System.String,System.Collections.Generic.List{VueWebApi.Models.ObjectData})">
+ <member name="M:VueWebApi.Controllers.ProductModelController.SaveStepAssociationDefect(System.String,System.String,System.Collections.Generic.List{VueWebApi.Models.ObjectData})">
<summary>
宸ュ簭鍏宠仈缂洪櫡鎻愪氦
</summary>
@@ -3324,10 +3362,11 @@
<param name="defectcode">宸ュ簭妫�楠屾爣鍑嗙紪鐮�</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.QualityManagementController.StepCheckItemSelect">
+ <member name="M:VueWebApi.Controllers.QualityManagementController.StepCheckItemSelect(System.String)">
<summary>
宸ュ簭妫�楠屾爣鍑嗘柊澧炪�佺紪杈戣幏鍙栨楠岄」鐩笅鎷夊垪琛�
</summary>
+ <param name="WorkShop">杞﹂棿缂栫爜</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.QualityManagementController.DeleteStepCheckStaned(System.String)">
diff --git a/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
index 35e76f4..678dd6b 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 8e18d4d..6ca9c47 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/Web.config
+++ b/VueWebApi/obj/Release/Package/PackageTmp/Web.config
@@ -16,7 +16,7 @@
<!--鏈湴鐜-->
<!--<add key="DBServer" value="Data Source=.;Initial Catalog=vmes;Integrated Security=True" />-->
<!--鏈嶅姟鍣ㄧ幆澧�-->
- <add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes;User ID=sa;Password=xkd@20230101;pooling=false" />
+ <add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes_zqh;User ID=sa;Password=xkd@20230101;pooling=false" />
<!--澶у矝鏈嶅姟鍣ㄧ幆澧�-->
<!--<add key="DBServer" value="Data Source=192.168.2.138;Initial Catalog=vmes;User ID=sa;Password=Dd@20220727;pooling=false" />-->
<!--redis浼佷笟閰嶇疆-->
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
index 62eb7d6..ecfa78c 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 bbef6a4..640d7d6 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
+++ b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
@@ -549,10 +549,11 @@
<param name="orderstepqrcode">鎵弿浜岀淮鐮佷俊鎭�</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.AppProductionManagementController.MesOrderStepReportSelectUserGroup">
+ <member name="M:VueWebApi.Controllers.AppProductionManagementController.MesOrderStepReportSelectUserGroup(System.String)">
<summary>
鐢熶骇寮�鎶ュ伐锛氭姤宸ユ椂鑾峰彇鐢熶骇鐝粍涓嬫媺妗�
</summary>
+ <param name="wkshopcode">杞﹂棿缂栫爜</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.AppProductionManagementController.MesOrderGroupSelectUser(System.String)">
@@ -812,6 +813,22 @@
<param name="param">瀛樿揣淇℃伅</param>
<returns></returns>
</member>
+ <member name="M:VueWebApi.Controllers.BaseDateController.StorgGroupSelect(System.String,System.String)">
+ <summary>
+ 閫氳繃閫夋嫨鐨勬墍灞炵粍缁囨煡璇㈡墍灞炵彮缁�
+ </summary>
+ <param name="stu_torgcode">缁勭粐缂栫爜</param>
+ <param name="description">缁勭粐绫诲瀷</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.BaseDateController.StorgRoleSelect(System.String,System.String)">
+ <summary>
+ 閫氳繃閫夋嫨鐨勬墍灞炵粍缁囨煡璇㈡墍灞炶鑹茬被鍨�
+ </summary>
+ <param name="stu_torgcode">缁勭粐缂栫爜</param>
+ <param name="description">缁勭粐绫诲瀷</param>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Controllers.BaseDateController.ErpWkshopDepartmentSelect">
<summary>
ERP鐢熶骇杞﹂棿/閮ㄩ棬淇℃伅鏌ヨ
@@ -930,10 +947,11 @@
<param name="partcode">鐗╂枡缂栫爜</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ReportManagerController.OutSourceReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.ReportManagerController.OutSourceReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
<summary>
濮斿鎶ヨ〃璁板綍鏌ヨ
</summary>
+ <param name="wkshopcode">杞﹂棿缂栫爜</param>
<param name="wocode">宸ュ崟缂栧彿</param>
<param name="partcode">浜у搧缂栫爜</param>
<param name="partname">浜у搧鍚嶇О</param>
@@ -948,10 +966,11 @@
<param name="order">鎺掑簭瑙勫垯</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ReportManagerController.OutSourceReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.ReportManagerController.OutSourceReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
<summary>
濮斿鎶ヨ〃璁板綍瀵煎嚭
</summary>
+ <param name="wkshopcode">杞﹂棿缂栫爜</param>
<param name="wocode">宸ュ崟缂栧彿</param>
<param name="partcode">浜у搧缂栫爜</param>
<param name="partname">浜у搧鍚嶇О</param>
@@ -962,10 +981,11 @@
<param name="receivdate">鏀舵枡鏃堕棿</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ReportManagerController.GroupSalaryReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.ReportManagerController.GroupSalaryReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
<summary>
鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ヨ
</summary>
+ <param name=" wkshopcode">杞﹂棿缂栫爜</param>
<param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
<param name="wocode">宸ュ崟缂栧彿</param>
<param name="partcode">浜у搧缂栫爜</param>
@@ -989,10 +1009,11 @@
<param name="id">鎶ュ伐璁板綍涓昏〃id</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ReportManagerController.GroupSalaryReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.ReportManagerController.GroupSalaryReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
<summary>
鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ヨ
</summary>
+ <param name=" wkshopcode">杞﹂棿缂栫爜</param>
<param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
<param name="wocode">宸ュ崟缂栧彿</param>
<param name="partcode">浜у搧缂栫爜</param>
@@ -1005,10 +1026,11 @@
<param name="rejectstepcode">鍓旈櫎宸ュ簭(鍥哄畾钖祫宸ュ簭涓嶅弬涓庤绠�)</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ReportManagerController.PeopleSalaryReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.ReportManagerController.PeopleSalaryReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
<summary>
浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃
</summary>
+ <param name=" wkshopcode">杞﹂棿缂栫爜</param>
<param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
<param name="wocode">宸ュ崟缂栧彿</param>
<param name="partcode">浜у搧缂栫爜</param>
@@ -1025,10 +1047,11 @@
<param name="order">鎺掑簭瑙勫垯</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ReportManagerController.PeopleSalaryReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.ReportManagerController.PeopleSalaryReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
<summary>
浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃瀵煎嚭
</summary>
+ <param name=" wkshopcode">杞﹂棿缂栫爜</param>
<param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
<param name="wocode">宸ュ崟缂栧彿</param>
<param name="partcode">浜у搧缂栫爜</param>
@@ -1041,10 +1064,11 @@
<param name = "rejectstepcode" > 鍓旈櫎宸ュ簭(鍥哄畾钖祫宸ュ簭涓嶅弬涓庤绠�) </param >
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ReportManagerController.DefectDetailsReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.ReportManagerController.DefectDetailsReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
<summary>
涓嶈壇鏄庣粏鎶ヨ〃
</summary>
+ <param name=" wkshopcode">杞﹂棿缂栫爜</param>
<param name="wocode">宸ュ崟缂栧彿</param>
<param name="partcode">浜у搧缂栫爜</param>
<param name="partname">浜у搧鍚嶇О</param>
@@ -1060,10 +1084,11 @@
<param name="order">鎺掑簭瑙勫垯</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ReportManagerController.DefectDetailsReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.ReportManagerController.DefectDetailsReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
<summary>
涓嶈壇鏄庣粏鎶ヨ〃瀵煎嚭
</summary>
+ <param name=" wkshopcode">杞﹂棿缂栫爜</param>
<param name="wocode">宸ュ崟缂栧彿</param>
<param name="partcode">浜у搧缂栫爜</param>
<param name="partname">浜у搧鍚嶇О</param>
@@ -1199,10 +1224,11 @@
<param name="checkid">妫�楠岃褰旾D</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ReportManagerController.ProductionScheduleReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.ReportManagerController.ProductionScheduleReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
<summary>
鐢熶骇杩涘害鎶ヨ〃
</summary>
+ <param name=" wkshopcode">杞﹂棿缂栫爜</param>
<param name="status">宸ュ崟鐘舵��</param>
<param name="wocode">宸ュ崟缂栧彿</param>
<param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
@@ -1217,10 +1243,11 @@
<param name="order">鎺掑簭瑙勫垯</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ReportManagerController.ProductionScheduleReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.ReportManagerController.ProductionScheduleReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
<summary>
鐢熶骇杩涘害鎶ヨ〃瀵煎嚭
</summary>
+ <param name=" wkshopcode">杞﹂棿缂栫爜</param>
<param name="status">宸ュ崟鐘舵��</param>
<param name="wocode">宸ュ崟缂栧彿</param>
<param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
@@ -1428,13 +1455,14 @@
<param name="orgid">缁勭粐id</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.BasicSettingController.UserSearch(System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.BasicSettingController.UserSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
<summary>
鐢ㄦ埛娓呭崟鏌ヨ
</summary>
<param name="UserCode">鐢ㄦ埛缂栫爜</param>
<param name="UserName">鐢ㄦ埛鍚嶇О</param>
<param name="StuOrg">鎵�灞炵粍缁�</param>
+ <param name="description">鎵�灞炵粍缁囩被鍨�</param>
<param name="wagetype">宸ヨ祫绫诲瀷</param>
<param name="Enable">鍦ㄨ亴鐘舵��</param>
<param name="page">椤电爜</param>
@@ -1469,18 +1497,22 @@
<param name="Userid">鐢ㄦ埛id</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.BasicSettingController.UserAssociationRole(System.String)">
+ <member name="M:VueWebApi.Controllers.BasicSettingController.UserAssociationRole(System.String,System.String,System.String)">
<summary>
鐢ㄦ埛娓呭崟鍏宠仈瑙掕壊鏌ヨ
</summary>
<param name="usercode">鐢ㄦ埛缂栫爜</param>
+ <param name="stu_torgcode">鎵�灞炵粍缁囩紪鐮�</param>
+ <param name="description">鎵�灞炵粍缁囩被鍨�</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.BasicSettingController.SaveUserAssoctRole(System.String,System.Collections.Generic.List{VueWebApi.Models.RoleUserSubmit})">
+ <member name="M:VueWebApi.Controllers.BasicSettingController.SaveUserAssoctRole(System.String,System.String,System.String,System.Collections.Generic.List{VueWebApi.Models.RoleUserSubmit})">
<summary>
鐢ㄦ埛娓呭崟鍏宠仈瑙掕壊淇濆瓨
</summary>
<param name="usercode">鐢ㄦ埛缂栫爜</param>
+ <param name="stu_torgcode">鎵�灞炵粍缁囩紪鐮�</param>
+ <param name="description">鎵�灞炵粍缁囩被鍨�</param>
<param name="json">鎻愪氦鏁版嵁瀵硅薄</param>
<returns></returns>
</member>
@@ -2307,7 +2339,7 @@
<param name="usertype">鎿嶄綔绔被鍨�(PC APP)</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.LoginController.ForcedOffline(System.Int32,System.String,System.String,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.LoginController.ForcedOffline(System.Int32,System.String,System.String,System.String,System.String,System.String)">
<summary>
寮哄埗涓嬬嚎鎺ュ彛
</summary>
@@ -2316,6 +2348,7 @@
<param name="username">鐢ㄦ埛鍚�</param>
<param name="usertype">鎿嶄綔绔疨C/APP</param>
<param name="rid">rid鏋佸厜鎺ㄩ�佽幏鍙栬澶噄d</param>
+ <param name="stu_torgcode">鎵�灞炵粍缁囩紪鐮�</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.LoginController.LoginMenu(System.String,System.String)">
@@ -2336,7 +2369,7 @@
<param name="newpassword">鏂板瘑鐮�</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.LoginController.LoginOut(System.Int32,System.String,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.LoginController.LoginOut(System.Int32,System.String,System.String,System.String,System.String)">
<summary>
PC鐧诲嚭
</summary>
@@ -2344,6 +2377,7 @@
<param name="usercode">鐢ㄦ埛缂栫爜</param>
<param name="username">鐢ㄦ埛鍚�</param>
<param name="usertype">鎿嶄綔绔疨C/APP</param>
+ <param name="stu_torgcode">鎵�灞炵粍缁囩紪鐮�</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.LoginController.LoginAppSave(System.String,System.String,System.String,System.String)">
@@ -2526,19 +2560,19 @@
<param name="order">鎺掑簭瑙勫垯</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ProductionManagementController.PartSelectRoute(System.String)">
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.PartSelectRoute(System.String,System.String)">
<summary>
浜у搧缂栫爜鏌ユ壘宸ヨ壓璺嚎涓嬫媺鎺ュ彛
</summary>
<param name="partcode">浜у搧缂栫爜</param>
+ <param name="wkshopcode">杞﹂棿缂栫爜</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ProductionManagementController.RouteSelectWkshop(System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.RouteSelectWkshop(System.String)">
<summary>
浜у搧+宸ヨ壓璺嚎鏌ユ壘杞﹂棿涓嬫媺鎺ュ彛
</summary>
<param name="partcode">浜у搧缂栫爜</param>
- <param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.ProductionManagementController.SelectRouteStep(System.String)">
@@ -2672,10 +2706,11 @@
<param name="orderstepqrcode">鎵弿浜岀淮鐮佷俊鎭�</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderStepReportSelectUserGroup">
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderStepReportSelectUserGroup(System.String)">
<summary>
鐢熶骇寮�鎶ュ伐锛氭姤宸ユ椂鑾峰彇鐢熶骇鐝粍涓嬫媺妗�
</summary>
+ <param name="wkshopcode">杞﹂棿缂栫爜</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderGroupSelectUser(System.String)">
@@ -3049,7 +3084,7 @@
<param name="partcode">鐗╂枡缂栫爜</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ProductModelController.SaveInventoryFile(System.String,System.Collections.Generic.List{VueWebApi.Models.ObjectData},System.String)">
+ <member name="M:VueWebApi.Controllers.ProductModelController.SaveInventoryFile(System.String,System.Collections.Generic.List{VueWebApi.Models.PartRout},System.String)">
<summary>
瀛樿揣妗ｆ鍏宠仈宸ヨ壓璺嚎鎻愪氦
</summary>
@@ -3103,16 +3138,17 @@
<param name="bomid">Bom涓昏〃id</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ProductModelController.StepSelect">
+ <member name="M:VueWebApi.Controllers.ProductModelController.StepSelect(System.String)">
<summary>
宸ュ簭涓嬫媺鏌ヨ鎺ュ彛
</summary>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ProductModelController.RouteSearch(System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.ProductModelController.RouteSearch(System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
<summary>
宸ヨ壓璺嚎鏌ヨ
</summary>
+ <param name="WorkShop">鎵�灞炶溅闂�</param>
<param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
<param name="routename">宸ヨ壓璺嚎鍚嶇О</param>
<param name="description">宸ヨ壓璺嚎鎻忚堪</param>
@@ -3146,10 +3182,11 @@
<param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ProductModelController.StepSearch(System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.ProductModelController.StepSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
<summary>
宸ュ簭鏌ヨ
</summary>
+ <param name="WorkShop">鎵�灞炶溅闂�</param>
<param name="stepcode">宸ュ簭缂栫爜</param>
<param name="stepname">宸ュ簭鍚嶇О</param>
<param name="enable">鍚敤鐘舵��</param>
@@ -3175,29 +3212,30 @@
<param name="stepcode">宸ュ簭缂栫爜</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ProductModelController.StepAssociationEqp(System.String)">
+ <member name="M:VueWebApi.Controllers.ProductModelController.StepAssociationEqp(System.String,System.String)">
<summary>
宸ュ簭瀹氫箟鍏宠仈宸ヤ綔绔欐煡璇�
</summary>
<param name="stepcode">宸ュ簭缂栫爜</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ProductModelController.SaveStepAssociationEqp(System.String,System.Collections.Generic.List{VueWebApi.Models.ObjectData})">
+ <member name="M:VueWebApi.Controllers.ProductModelController.SaveStepAssociationEqp(System.String,System.String,System.Collections.Generic.List{VueWebApi.Models.ObjectData})">
<summary>
宸ュ簭瀹氫箟鍏宠仈宸ヤ綔绔欐彁浜�
</summary>
+ <param name="WorkShop">鎵�灞炵粍缁囩紪鐮�(杞﹂棿)</param>
<param name="stepcode">宸ュ簭缂栫爜</param>
<param name="json">鎻愪氦鏁版嵁</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ProductModelController.StepAssociationDefect(System.String)">
+ <member name="M:VueWebApi.Controllers.ProductModelController.StepAssociationDefect(System.String,System.String)">
<summary>
宸ュ簭鍏宠仈缂洪櫡鏌ヨ
</summary>
<param name="stepcode">宸ュ簭缂栫爜</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ProductModelController.SaveStepAssociationDefect(System.String,System.Collections.Generic.List{VueWebApi.Models.ObjectData})">
+ <member name="M:VueWebApi.Controllers.ProductModelController.SaveStepAssociationDefect(System.String,System.String,System.Collections.Generic.List{VueWebApi.Models.ObjectData})">
<summary>
宸ュ簭鍏宠仈缂洪櫡鎻愪氦
</summary>
@@ -3324,10 +3362,11 @@
<param name="defectcode">宸ュ簭妫�楠屾爣鍑嗙紪鐮�</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.QualityManagementController.StepCheckItemSelect">
+ <member name="M:VueWebApi.Controllers.QualityManagementController.StepCheckItemSelect(System.String)">
<summary>
宸ュ簭妫�楠屾爣鍑嗘柊澧炪�佺紪杈戣幏鍙栨楠岄」鐩笅鎷夊垪琛�
</summary>
+ <param name="WorkShop">杞﹂棿缂栫爜</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.QualityManagementController.DeleteStepCheckStaned(System.String)">
diff --git a/VueWebApi/obj/Release/TransformWebConfig/original/Web.config b/VueWebApi/obj/Release/TransformWebConfig/original/Web.config
index fd379a9..14f807c 100644
--- a/VueWebApi/obj/Release/TransformWebConfig/original/Web.config
+++ b/VueWebApi/obj/Release/TransformWebConfig/original/Web.config
@@ -16,7 +16,7 @@
<!--鏈湴鐜-->
<!--<add key="DBServer" value="Data Source=.;Initial Catalog=vmes;Integrated Security=True" />-->
<!--鏈嶅姟鍣ㄧ幆澧�-->
- <add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes;User ID=sa;Password=xkd@20230101;pooling=false" />
+ <add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes_zqh;User ID=sa;Password=xkd@20230101;pooling=false" />
<!--澶у矝鏈嶅姟鍣ㄧ幆澧�-->
<!--<add key="DBServer" value="Data Source=192.168.2.138;Initial Catalog=vmes;User ID=sa;Password=Dd@20220727;pooling=false" />-->
<!--redis浼佷笟閰嶇疆-->
diff --git a/VueWebApi/obj/Release/TransformWebConfig/transformed/Web.config b/VueWebApi/obj/Release/TransformWebConfig/transformed/Web.config
index 8e18d4d..6ca9c47 100644
--- a/VueWebApi/obj/Release/TransformWebConfig/transformed/Web.config
+++ b/VueWebApi/obj/Release/TransformWebConfig/transformed/Web.config
@@ -16,7 +16,7 @@
<!--鏈湴鐜-->
<!--<add key="DBServer" value="Data Source=.;Initial Catalog=vmes;Integrated Security=True" />-->
<!--鏈嶅姟鍣ㄧ幆澧�-->
- <add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes;User ID=sa;Password=xkd@20230101;pooling=false" />
+ <add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes_zqh;User ID=sa;Password=xkd@20230101;pooling=false" />
<!--澶у矝鏈嶅姟鍣ㄧ幆澧�-->
<!--<add key="DBServer" value="Data Source=192.168.2.138;Initial Catalog=vmes;User ID=sa;Password=Dd@20220727;pooling=false" />-->
<!--redis浼佷笟閰嶇疆-->
diff --git a/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache b/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
deleted file mode 100644
index 4527f54..0000000
--- a/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache b/VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache
index b15413a..8a4e401 100644
--- a/VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache
+++ b/VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-969b832d89240596687981bd38845c8e69e94403
+2afdf41ddd3903e818761fc01011a4cda747719f
diff --git a/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt b/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt
index b921405..9190ed9 100644
--- a/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt
+++ b/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt
@@ -568,3 +568,285 @@
D:\鏂板嚡杩狹ES\MES浜у搧\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.CopyComplete
D:\鏂板嚡杩狹ES\MES浜у搧\VueWebApi\VueWebApi\obj\Release\VueWebApi.dll
D:\鏂板嚡杩狹ES\MES浜у搧\VueWebApi\VueWebApi\obj\Release\VueWebApi.pdb
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\VueWebApi.dll.config
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\VueWebApi.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\VueWebApi.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\VueWebApi.pdb
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\csc.exe
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\csc.exe.config
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\csc.rsp
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\csi.exe
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\csi.exe.config
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\csi.rsp
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\Microsoft.Build.Tasks.CodeAnalysis.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\Microsoft.CodeAnalysis.CSharp.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\Microsoft.CodeAnalysis.CSharp.Scripting.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\Microsoft.CodeAnalysis.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\Microsoft.CodeAnalysis.Scripting.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\Microsoft.CodeAnalysis.VisualBasic.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\Microsoft.CSharp.Core.targets
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\Microsoft.DiaSymReader.Native.amd64.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\Microsoft.DiaSymReader.Native.x86.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\Microsoft.Managed.Core.targets
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\Microsoft.VisualBasic.Core.targets
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\Microsoft.Win32.Primitives.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\System.AppContext.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\System.Collections.Immutable.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\System.Console.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\System.Diagnostics.DiagnosticSource.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\System.Diagnostics.FileVersionInfo.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\System.Diagnostics.StackTrace.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\System.Globalization.Calendars.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\System.IO.Compression.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\System.IO.Compression.ZipFile.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\System.IO.FileSystem.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\System.IO.FileSystem.Primitives.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\System.Net.Http.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\System.Net.Sockets.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\System.Reflection.Metadata.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\System.Runtime.InteropServices.RuntimeInformation.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\System.Security.Cryptography.Algorithms.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\System.Security.Cryptography.Encoding.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\System.Security.Cryptography.Primitives.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\System.Security.Cryptography.X509Certificates.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\System.Text.Encoding.CodePages.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\System.Threading.Tasks.Extensions.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\System.ValueTuple.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\System.Xml.ReaderWriter.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\System.Xml.XmlDocument.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\System.Xml.XPath.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\System.Xml.XPath.XDocument.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\vbc.exe
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\vbc.exe.config
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\vbc.rsp
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\VBCSCompiler.exe
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\roslyn\VBCSCompiler.exe.config
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\Microsoft.Win32.Primitives.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\netstandard.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.AppContext.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Collections.Concurrent.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Collections.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Collections.NonGeneric.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Collections.Specialized.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.ComponentModel.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.ComponentModel.EventBasedAsync.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.ComponentModel.Primitives.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.ComponentModel.TypeConverter.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Console.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Data.Common.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Diagnostics.Contracts.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Diagnostics.Debug.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Diagnostics.FileVersionInfo.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Diagnostics.Process.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Diagnostics.StackTrace.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Diagnostics.TextWriterTraceListener.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Diagnostics.Tools.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Diagnostics.TraceSource.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Diagnostics.Tracing.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Drawing.Primitives.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Dynamic.Runtime.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Globalization.Calendars.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Globalization.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Globalization.Extensions.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.IO.Compression.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.IO.Compression.ZipFile.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.IO.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.IO.FileSystem.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.IO.FileSystem.DriveInfo.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.IO.FileSystem.Primitives.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.IO.FileSystem.Watcher.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.IO.IsolatedStorage.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.IO.MemoryMappedFiles.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.IO.Pipes.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.IO.UnmanagedMemoryStream.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Linq.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Linq.Expressions.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Linq.Parallel.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Linq.Queryable.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Net.Http.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Net.NameResolution.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Net.NetworkInformation.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Net.Ping.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Net.Primitives.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Net.Requests.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Net.Security.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Net.Sockets.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Net.WebHeaderCollection.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Net.WebSockets.Client.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Net.WebSockets.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.ObjectModel.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Reflection.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Reflection.Extensions.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Reflection.Primitives.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Resources.Reader.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Resources.ResourceManager.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Resources.Writer.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Runtime.CompilerServices.VisualC.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Runtime.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Runtime.Extensions.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Runtime.Handles.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Runtime.InteropServices.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Runtime.InteropServices.RuntimeInformation.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Runtime.Numerics.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Runtime.Serialization.Formatters.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Runtime.Serialization.Json.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Runtime.Serialization.Primitives.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Runtime.Serialization.Xml.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Security.Claims.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Security.Cryptography.Algorithms.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Security.Cryptography.Csp.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Security.Cryptography.Encoding.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Security.Cryptography.Primitives.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Security.Cryptography.X509Certificates.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Security.Principal.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Security.SecureString.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Text.Encoding.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Text.Encoding.Extensions.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Text.RegularExpressions.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Threading.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Threading.Overlapped.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Threading.Tasks.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Threading.Tasks.Parallel.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Threading.Thread.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Threading.ThreadPool.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Threading.Timer.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.ValueTuple.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Xml.ReaderWriter.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Xml.XDocument.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Xml.XmlDocument.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Xml.XmlSerializer.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Xml.XPath.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Xml.XPath.XDocument.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\Antlr3.Runtime.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\BouncyCastle.Crypto.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\Dapper.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\Fleck.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\ICSharpCode.SharpZipLib.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\Jiguang.JPush.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\JWT.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\log4net.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\Microsoft.AspNet.SignalR.Core.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\Microsoft.AspNet.SignalR.SystemWeb.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\Microsoft.AspNetCore.Http.Abstractions.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\Microsoft.AspNetCore.Http.Features.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\Microsoft.AspNetCore.Mvc.Abstractions.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\Microsoft.AspNetCore.Routing.Abstractions.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\Microsoft.Bcl.AsyncInterfaces.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\Microsoft.Extensions.Primitives.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\Microsoft.Net.Http.Headers.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\Microsoft.Owin.Cors.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\Microsoft.Owin.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\Microsoft.Owin.Host.SystemWeb.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\Microsoft.Owin.Security.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\Microsoft.Web.Infrastructure.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\Newtonsoft.Json.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\NPOI.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\NPOI.OOXML.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\NPOI.OpenXml4Net.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\NPOI.OpenXmlFormats.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\Owin.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\Pipelines.Sockets.Unofficial.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\ServiceStack.Common.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\ServiceStack.Interfaces.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\ServiceStack.Redis.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\ServiceStack.Text.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\StackExchange.Redis.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\Swashbuckle.Core.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Buffers.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.CodeDom.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Diagnostics.PerformanceCounter.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.IO.Pipelines.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Memory.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Net.Http.Formatting.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Numerics.Vectors.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Runtime.CompilerServices.Unsafe.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Text.Encodings.Web.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Threading.Channels.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Threading.Tasks.Extensions.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Web.Cors.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Web.Helpers.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Web.Http.Cors.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Web.Http.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Web.Http.WebHost.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Web.Mvc.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Web.Optimization.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Web.Razor.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Web.WebPages.Deployment.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Web.WebPages.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Web.WebPages.Razor.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\WebActivatorEx.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\WebGrease.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\BouncyCastle.Crypto.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\Dapper.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\ICSharpCode.SharpZipLib.pdb
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\ICSharpCode.SharpZipLib.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\JWT.pdb
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\JWT.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\log4net.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\Microsoft.AspNet.SignalR.Core.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\Microsoft.AspNet.SignalR.SystemWeb.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\Microsoft.AspNetCore.Http.Abstractions.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\Microsoft.AspNetCore.Http.Features.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\Microsoft.AspNetCore.Mvc.Abstractions.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\Microsoft.AspNetCore.Routing.Abstractions.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\Microsoft.Bcl.AsyncInterfaces.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\Microsoft.Extensions.Primitives.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\Microsoft.Net.Http.Headers.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\Microsoft.Owin.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\Microsoft.Owin.Cors.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\Microsoft.Owin.Host.SystemWeb.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\Microsoft.Owin.Security.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\Newtonsoft.Json.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\NPOI.pdb
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\NPOI.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\NPOI.OOXML.pdb
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\NPOI.OOXML.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\NPOI.OpenXml4Net.pdb
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\NPOI.OpenXml4Net.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\NPOI.OpenXmlFormats.pdb
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\Pipelines.Sockets.Unofficial.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\ServiceStack.Common.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\ServiceStack.Interfaces.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\ServiceStack.Redis.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\ServiceStack.Text.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\StackExchange.Redis.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Buffers.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.CodeDom.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Diagnostics.PerformanceCounter.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.IO.Pipelines.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Memory.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Net.Http.Formatting.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Numerics.Vectors.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Runtime.CompilerServices.Unsafe.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Text.Encodings.Web.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Threading.Channels.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Threading.Tasks.Extensions.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Web.Http.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Web.Http.Cors.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Web.Http.WebHost.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Web.Helpers.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Web.Mvc.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Web.Optimization.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Web.Razor.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Web.WebPages.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Web.WebPages.Deployment.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\System.Web.WebPages.Razor.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\Antlr3.Runtime.pdb
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.xml
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\zh-Hans\Microsoft.AspNet.SignalR.Core.resources.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\zh-Hans\Microsoft.AspNet.SignalR.SystemWeb.resources.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\zh-Hans\System.Net.Http.Formatting.resources.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\zh-Hans\System.Web.Http.resources.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\zh-Hans\System.Web.Http.WebHost.resources.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\zh-Hans\System.Web.Helpers.resources.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\zh-Hans\System.Web.Mvc.resources.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\zh-Hans\System.Web.Optimization.resources.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\zh-Hans\System.Web.Razor.resources.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.resources.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.Deployment.resources.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.Razor.resources.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.CoreCompileInputs.cache
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.CopyComplete
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\obj\Release\VueWebApi.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\obj\Release\VueWebApi.pdb
diff --git a/VueWebApi/obj/Release/VueWebApi.pdb b/VueWebApi/obj/Release/VueWebApi.pdb
index 62eb7d6..ecfa78c 100644
--- a/VueWebApi/obj/Release/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/VueWebApi.pdb
Binary files differ
diff --git a/VueWebApi/obj/Release/_WPPLastBuildInfo.txt b/VueWebApi/obj/Release/_WPPLastBuildInfo.txt
index b6cf61c..9dedff7 100644
--- a/VueWebApi/obj/Release/_WPPLastBuildInfo.txt
+++ b/VueWebApi/obj/Release/_WPPLastBuildInfo.txt
Binary files differ
--
Gitblit v1.9.3