From 48aa43a04f8d8a0964d9d8a206e329f400fd5b89 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 07 八月 2023 18:10:04 +0800
Subject: [PATCH] 1.移出班组功能，单独关联人员 2.用户清单取消指定班组 3.生产开报工增加扫码后选择设备 4.用户清单导入取消班组 5.erp订单查询、订单下达 mes工单查询、报废补单增加销售订单号
---
VueWebApi/obj/Release/VueWebApi.pdb | 0
VueWebApi/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache | 0
VueWebApi/obj/Debug/VueWebApi.csproj.CoreCompileInputs.cache | 2
VueWebApi/DLL/DAL/BasicSettingDAL.cs | 245 +++++++++++++++-----
.vs/VueWebApi/v16/.suo | 0
VueWebApi/obj/Release/TransformWebConfig/original/Web.config | 2
VueWebApi/obj/Release/Package/PackageTmp/Excel/用户清单.xls | 0
VueWebApi/DLL/DAL/ProductionManagementDAL.cs | 53 +++-
VueWebApi/Tools/ImportExcelData.cs | 206 ++--------------
VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache | 0
VueWebApi/VueWebApi.csproj | 1
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb | 0
VueWebApi/Controllers/ProductionManagementController.cs | 20 +
VueWebApi/Models/GroupUser.cs | 21 +
VueWebApi/obj/Release/Package/PackageTmp/Web.config | 2
VueWebApi/bin/VueWebApi.pdb | 0
VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache | 2
VueWebApi/bin/VueWebApi.dll.config | 2
VueWebApi/obj/Release/TransformWebConfig/transformed/Web.config | 2
VueWebApi/DLL/BLL/BasicSettingBLL.cs | 15
VueWebApi/Web.config | 2
VueWebApi/DLL/BLL/ProductionManagementBLL.cs | 16
VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user | 12
VueWebApi/bin/VueWebApi.xml | 30 +
/dev/null | 0
VueWebApi/Tools/ScanStartReport.cs | 10
VueWebApi/obj/Debug/VueWebApi.csproj.FileListAbsolute.txt | 1
VueWebApi/Excel/用户清单.xls | 0
VueWebApi/obj/Debug/VueWebApi.pdb | 0
VueWebApi/Controllers/BasicSettingController.cs | 32 ++
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml | 30 +
31 files changed, 401 insertions(+), 305 deletions(-)
diff --git a/.vs/VueWebApi/v16/.suo b/.vs/VueWebApi/v16/.suo
index 44ae232..1f3e7fe 100644
--- a/.vs/VueWebApi/v16/.suo
+++ b/.vs/VueWebApi/v16/.suo
Binary files differ
diff --git a/VueWebApi/Controllers/BasicSettingController.cs b/VueWebApi/Controllers/BasicSettingController.cs
index e48a2e0..5ad62a2 100644
--- a/VueWebApi/Controllers/BasicSettingController.cs
+++ b/VueWebApi/Controllers/BasicSettingController.cs
@@ -314,6 +314,10 @@
/// <summary>
/// 鐢ㄦ埛缁勫垪琛ㄦ煡璇�
/// </summary>
+ /// <param name="groupcode">鐝粍缂栫爜</param>
+ /// <param name="groupname">鐝粍鍚嶇О</param>
+ /// <param name="stu_torgcode">鎵�灞炵粍缁�</param>
+ /// <param name="description">鎵�灞炵粍缁囩被鍨�</param>
/// <param name="page">椤电爜</param>
/// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
/// <param name="prop">鎺掑簭瀛楁</param>
@@ -321,29 +325,28 @@
/// <returns></returns>
[Route(template: "UserGroupSearch")]
[HttpGet]
- public HttpResponseMessage UserGroupSearch(int page = 0, int rows = 0, string prop = null, string order = null)
+ public HttpResponseMessage UserGroupSearch(string groupcode, string groupname,string stu_torgcode=null,string description=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.UserGroupSearch(stu_torgcode, description, startNum, endNum, prop, order);
+ mes = BasicSettingBLL.UserGroupSearch(groupcode, groupname, stu_torgcode, description, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
- #region[鐢ㄦ埛缁勬柊澧瀅
+ #region[鐢ㄦ埛缁勬柊澧炪�佷慨鏀筣
/// <summary>
/// 鐢ㄦ埛缁勬柊澧�
/// </summary>
+ /// <param name="type">鎻愪氦绫诲瀷(Add/Update)</param>
/// <param name="json">鐢ㄦ埛缁勬柊澧炴彁浜ゆ暟鎹�</param>
/// <returns></returns>
[Route(template: "UserGroupAdd")]
[HttpPost]
- public HttpResponseMessage UserGroupAdd(List<StepDefect> json)
+ public HttpResponseMessage UserGroupAdd(string type,List<GroupUser> json)
{
var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString();
- mes = BasicSettingBLL.UserGroupAdd(json, username);
+ mes = BasicSettingBLL.UserGroupAdd(type,json, username);
return TJson.toJson(mes);
}
#endregion
@@ -363,6 +366,21 @@
}
#endregion
+ #region[鐢ㄦ埛缁勬煡鐪嬪叧鑱斾汉鍛榏
+ /// <summary>
+ /// 鐢ㄦ埛缁勬煡鐪嬪叧鑱斾汉鍛�
+ /// </summary>
+ /// <param name="groupcode">鐝粍缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "GroupUserProject")]
+ [HttpGet]
+ public HttpResponseMessage GroupUserProject(string groupcode)
+ {
+ mes = BasicSettingBLL.GroupUserProject(groupcode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
#region[瑙掕壊绫诲瀷鍒楄〃鏌ヨ]
diff --git a/VueWebApi/Controllers/ProductionManagementController.cs b/VueWebApi/Controllers/ProductionManagementController.cs
index d2fd207..0b7ce26 100644
--- a/VueWebApi/Controllers/ProductionManagementController.cs
+++ b/VueWebApi/Controllers/ProductionManagementController.cs
@@ -32,6 +32,7 @@
/// </summary>
/// <param name="erporderstus">璁㈠崟鐘舵�佺爜</param>
/// <param name="erpordercode">璁㈠崟缂栧彿</param>
+ /// <param name="saleordercode">閿�鍞崟鍙�</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
/// <param name="partspec">浜у搧瑙勬牸</param>
@@ -45,7 +46,7 @@
/// <returns></returns>
[Route(template: "ErpOrderSearch")]
[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)
+ public HttpResponseMessage ErpOrderSearch(string erporderstus = null, string erpordercode = null,string saleordercode=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(); //鎵�灞炵粍缁囩被鍨�
@@ -65,7 +66,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ProductionManagementBLL.ErpOrderSearch(stu_torgcode, stu_torgtypecode,erporderstus, erpordercode, partcode, partname, partspec, startNum, paydatestartdate, paydateenddate, paydatestartdate1, paydateenddate2, creatuser, endNum, prop, order);
+ mes = ProductionManagementBLL.ErpOrderSearch(stu_torgcode, stu_torgtypecode,erporderstus, erpordercode, saleordercode, partcode, partname, partspec, startNum, paydatestartdate, paydateenddate, paydatestartdate1, paydateenddate2, creatuser, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -82,6 +83,7 @@
{
string erporderid = obj["erporderid"].ToString(); //璁㈠崟id
string erpordercode = obj["erpordercode"].ToString(); //璁㈠崟缂栧彿
+ string saleordercode = obj["saleordercode"].ToString(); //閿�鍞鍗曞彿
string partcode = obj["partcode"].ToString(); //浜у搧缂栫爜
string wkshopcode = obj["wkshopcode"].ToString(); //杞﹂棿缂栫爜
string warehousecode = obj["warehousecode"].ToString(); //浠撳簱缂栫爜
@@ -91,7 +93,7 @@
string relse_qty = obj["relse_qty"].ToString(); //宸蹭笅鍗曟暟閲�
string saleOrderDeliveryDate = obj["saleOrderDeliveryDate"].ToString(); //浜や粯鏃堕棿
var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
- mes = ProductionManagementBLL.MarkSaveErpOrder(erporderid, erpordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, saleOrderDeliveryDate, username);
+ mes = ProductionManagementBLL.MarkSaveErpOrder(erporderid, erpordercode, saleordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, saleOrderDeliveryDate, username);
return TJson.toJson(mes);
}
#endregion
@@ -122,6 +124,7 @@
/// <param name="mesorderstus">宸ュ崟鐘舵�佺爜</param>
/// <param name="mesordercode">宸ュ崟缂栧彿</param>
/// <param name="sourceorder">婧愬崟鍗曞彿</param>
+ /// <param name="saleordercode">閿�鍞崟鍙�</param>
/// <param name="ordertype">鍗曟嵁绫诲瀷</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
@@ -135,13 +138,13 @@
/// <returns></returns>
[Route(template: "MesOrderSearch")]
[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)
+ public HttpResponseMessage MesOrderSearch(int page, int rows, string prop, string order, string mesorderstus = null, string mesordercode = null, string sourceorder = null,string saleordercode=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(stu_torgcode, stu_torgtypecode,mesorderstus, mesordercode, sourceorder, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
+ mes = ProductionManagementBLL.MesOrderSearch(stu_torgcode, stu_torgtypecode,mesorderstus, mesordercode, sourceorder, saleordercode, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -152,6 +155,7 @@
/// </summary>
/// <param name="mesordercode">宸ュ崟缂栧彿</param>
/// <param name="sourceorder">婧愬崟鍗曞彿</param>
+ /// <param name="saleordercode">閿�鍞崟鍙�</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
/// <param name="partspec">浜у搧瑙勬牸</param>
@@ -164,11 +168,11 @@
/// <returns></returns>
[Route(template: "MesBadOrderSearch")]
[HttpGet]
- public HttpResponseMessage MesBadOrderSearch(int page, int rows, string prop, string order, string mesordercode = null, string sourceorder = null, string partcode = null, string partname = null, string partspec = null, string creatuser = null, string createdate = null)
+ public HttpResponseMessage MesBadOrderSearch(int page, int rows, string prop, string order, string mesordercode = null, string sourceorder = null,string saleordercode=null, string partcode = null, string partname = null, string partspec = null, string creatuser = null, string createdate = null)
{
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ProductionManagementBLL.MesBadOrderSearch(mesordercode, sourceorder, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
+ mes = ProductionManagementBLL.MesBadOrderSearch(mesordercode, sourceorder, saleordercode, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -467,7 +471,7 @@
/// 鐢熶骇寮�鎶ュ伐锛氬紑宸�(寮�濮�/鎶ュ伐)/澶栧崗(鍙戞枡/鏀舵枡)鏃舵潯浠跺垽鏂強鏁版嵁杩斿洖鎺ュ彛
/// </summary>
/// <param name="OperType">鎿嶄綔绫诲瀷锛氳嚜鍒�(ZZ)/澶栧崗(WX)</param>
- /// <param name="SelectType">鎿嶄綔绫诲瀷锛氬鍗忓彂鏂欐爣璇�(OUT)/澶栧崗鏀舵枡鏍囪瘑(IN)</param>
+ /// <param name="SelectType">鎿嶄綔绫诲瀷锛氳嚜鍒�(璁惧缂栫爜)/澶栧崗(鍙戞枡鏍囪瘑(OUT)/鏀舵枡鏍囪瘑(IN))</param>
/// <param name="orderstepqrcode">鎵弿浜岀淮鐮佷俊鎭�</param>
/// <param name="stu_torgcode">鎵�灞炵粍缁囩紪鐮�</param>
/// <returns></returns>
diff --git a/VueWebApi/DLL/BLL/BasicSettingBLL.cs b/VueWebApi/DLL/BLL/BasicSettingBLL.cs
index 48fe64f..b5ce3c0 100644
--- a/VueWebApi/DLL/BLL/BasicSettingBLL.cs
+++ b/VueWebApi/DLL/BLL/BasicSettingBLL.cs
@@ -100,16 +100,16 @@
#region[鐢ㄦ埛缁勫垪琛ㄦ煡璇
- public static ToMessage UserGroupSearch(string stu_torgcode,string description,int startNum, int endNum, string prop, string order)
+ public static ToMessage UserGroupSearch(string groupcode, string groupname,string stu_torgcode,string description,int startNum, int endNum, string prop, string order)
{
- return BasicSettingDAL.UserGroupSearch(stu_torgcode, description,startNum, endNum, prop, order);
+ return BasicSettingDAL.UserGroupSearch(groupcode, groupname,stu_torgcode, description,startNum, endNum, prop, order);
}
#endregion
#region[鐢ㄦ埛缁勬柊澧瀅
- public static ToMessage UserGroupAdd(List<StepDefect> json,string username)
+ public static ToMessage UserGroupAdd(string type, List<GroupUser> json,string username)
{
- return BasicSettingDAL.UserGroupAdd(json,username);
+ return BasicSettingDAL.UserGroupAdd(type,json, username);
}
#endregion
@@ -120,6 +120,13 @@
}
#endregion
+ #region[鐢ㄦ埛缁勬煡鐪嬪叧鑱斾汉鍛榏
+ public static ToMessage GroupUserProject(string groupcode)
+ {
+ return BasicSettingDAL.GroupUserProject(groupcode);
+ }
+ #endregion
+
#region[瑙掕壊绫诲瀷鏌ヨ]
public static ToMessage RoleTypeSearch(string stu_torgcode, string description,int startNum, int endNum, string prop, string order)
diff --git a/VueWebApi/DLL/BLL/ProductionManagementBLL.cs b/VueWebApi/DLL/BLL/ProductionManagementBLL.cs
index e600a43..cdc4853 100644
--- a/VueWebApi/DLL/BLL/ProductionManagementBLL.cs
+++ b/VueWebApi/DLL/BLL/ProductionManagementBLL.cs
@@ -13,16 +13,16 @@
public class ProductionManagementBLL
{
#region[ERP璁㈠崟鏌ヨ]
- 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)
+ public static ToMessage ErpOrderSearch(string stu_torgcode,string stu_torgtypecode, string erporderstus, string erpordercode,string saleordercode, 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(stu_torgcode, stu_torgtypecode,erporderstus, erpordercode, partcode, partname, partspec, startNum, paydatestartdate, paydateenddate, paydatestartdate1, paydateenddate2, creatuser, endNum, prop, order);
+ return ProductionManagementDAL.ErpOrderSearch(stu_torgcode, stu_torgtypecode,erporderstus, erpordercode, saleordercode, partcode, partname, partspec, startNum, paydatestartdate, paydateenddate, paydatestartdate1, paydateenddate2, creatuser, endNum, prop, order);
}
#endregion
#region[ERP璁㈠崟涓嬭揪]
- public static ToMessage MarkSaveErpOrder(string erporderid, string erpordercode, string partcode, string wkshopcode, string warehousecode, string erpqty, string markqty, string ordernum, string relse_qty,string saleOrderDeliveryDate, string username)
+ public static ToMessage MarkSaveErpOrder(string erporderid, string erpordercode,string saleordercode, string partcode, string wkshopcode, string warehousecode, string erpqty, string markqty, string ordernum, string relse_qty,string saleOrderDeliveryDate, string username)
{
- return ProductionManagementDAL.MarkSaveErpOrder(erporderid,erpordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, saleOrderDeliveryDate,username);
+ return ProductionManagementDAL.MarkSaveErpOrder(erporderid,erpordercode, saleordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, saleOrderDeliveryDate,username);
}
#endregion
@@ -36,16 +36,16 @@
#region[MES宸ュ崟鏌ヨ]
- 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)
+ public static ToMessage MesOrderSearch(string stu_torgcode,string stu_torgtypecode,string mesorderstus, string mesordercode,string saleordercode, 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(stu_torgcode, stu_torgtypecode,mesorderstus, mesordercode, sourceorder, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
+ return ProductionManagementDAL.MesOrderSearch(stu_torgcode, stu_torgtypecode,mesorderstus, mesordercode, sourceorder, saleordercode, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
}
#endregion
#region[MES鎶ュ簾琛ュ崟宸ュ崟鏌ヨ]
- public static ToMessage MesBadOrderSearch(string mesordercode, string sourceorder,string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
+ public static ToMessage MesBadOrderSearch(string mesordercode, string sourceorder,string saleordercode, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
{
- return ProductionManagementDAL.MesBadOrderSearch(mesordercode, sourceorder, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
+ return ProductionManagementDAL.MesBadOrderSearch(mesordercode, sourceorder, saleordercode, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
}
#endregion
diff --git a/VueWebApi/DLL/DAL/BasicSettingDAL.cs b/VueWebApi/DLL/DAL/BasicSettingDAL.cs
index 092ece5..6433422 100644
--- a/VueWebApi/DLL/DAL/BasicSettingDAL.cs
+++ b/VueWebApi/DLL/DAL/BasicSettingDAL.cs
@@ -242,7 +242,7 @@
#endregion
#region [缁勭粐鏋舵瀯鍒犻櫎]
- public static ToMessage DeleteOrganization(int orgid,string orgcode)
+ public static ToMessage DeleteOrganization(int orgid, string orgcode)
{
var sql = "";
var cont = 0;
@@ -270,23 +270,23 @@
return mes;
}
sql = @"delete TOrganization where id=@orgid";
- dynamicParams.Add(@"orgid", orgid);
- cont = DapperHelper.SQL(sql, dynamicParams);
- if (cont > 0)
- {
- mes.code = "200";
- mes.count = 0;
- mes.Message = "鍒犻櫎鎿嶄綔鎴愬姛!";
- mes.data = null;
- }
- else
- {
- mes.code = "300";
- mes.count = 0;
- mes.Message = "鍒犻櫎鎿嶄綔澶辫触!";
- mes.data = null;
- }
-
+ dynamicParams.Add(@"orgid", orgid);
+ cont = DapperHelper.SQL(sql, dynamicParams);
+ if (cont > 0)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "鍒犻櫎鎿嶄綔鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鍒犻櫎鎿嶄綔澶辫触!";
+ mes.data = null;
+ }
+
}
catch (Exception e)
{
@@ -302,7 +302,7 @@
#region[鐢ㄦ埛娓呭崟鏁版嵁鏌ヨ]
- public static ToMessage UserSearch(string UserCode, string UserName, string StuOrg,string description, 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 = "";
@@ -466,7 +466,7 @@
#endregion
#region[鐢ㄦ埛鎵�灞炵彮缁刔
- public static ToMessage UserGroup(string stu_torgcode,string description)
+ public static ToMessage UserGroup(string stu_torgcode, string description)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -673,7 +673,7 @@
#endregion
#region[鐢ㄦ埛娓呭崟鍏宠仈瑙掕壊鏌ヨ]
- public static ToMessage UserAssociationRole(string usercode,string stu_torgcode,string description)
+ public static ToMessage UserAssociationRole(string usercode, string stu_torgcode, string description)
{
string sql = "";
string search = "";
@@ -707,7 +707,7 @@
where C.user_code=@usercode
) B
on A.roletype_code=B.roletype_code
- where A.is_delete='0' "+search;
+ 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++)
@@ -737,7 +737,7 @@
#endregion
#region[鐢ㄦ埛娓呭崟鍏宠仈瑙掕壊淇濆瓨]
- public static ToMessage SaveUserAssoctRole(string usercode,string stu_torgcode,string description, 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>();
@@ -804,7 +804,7 @@
for (int j = 0; j < json[i].Data.Count; 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] } });
+ list.Add(new { str = sql, parm = new { usercode = usercode, stu_torgcode = stu_torgcode, role_code = json[i].Data[j] } });
}
}
@@ -914,7 +914,7 @@
#region[鐢ㄦ埛缁勫垪琛ㄦ煡璇
- public static ToMessage UserGroupSearch(string stu_torgcode, string description,int startNum, int endNum, string prop, string order)
+ public static ToMessage UserGroupSearch(string groupcode, string groupname, string stu_torgcode, string description, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -937,11 +937,21 @@
default:
break;
}
+ if (groupcode != "" && groupcode != null)
+ {
+ search += " and G.group_code like '%'+@groupcode+'%' ";
+ dynamicParams.Add("@groupcode", groupcode);
+ }
+ if (groupname != "" && groupname != null)
+ {
+ search += " and G.group_name like '%'+@groupname+'%' ";
+ dynamicParams.Add("@groupname", groupname);
+ }
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;
+ where G.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -960,7 +970,7 @@
#endregion
#region[鐢ㄦ埛缁勬柊澧瀅
- public static ToMessage UserGroupAdd(List<StepDefect> json, string username)
+ public static ToMessage UserGroupAdd(string type, List<GroupUser> json, string username)
{
var sql = "";
List<object> list = new List<object>();
@@ -968,50 +978,125 @@
try
{
list.Clear();
- //寰幆鍐欏叆鐢ㄦ埛缁勮〃
- for (int i = 0; i < json.Count; i++)
+ if (type == "Add")
{
- 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);
+ //鍒ゆ柇鐢ㄦ埛缁勭紪鐮佹槸鍚﹀敮涓�
+ sql = @"select * from TGroup where group_code=@group_code and torg_code=@torg_code";
+ dynamicParams.Add("@group_code", json[0].code);
+ dynamicParams.Add("@torg_code", json[0].storg_code);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
if (data.Rows.Count > 0)
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触,缂栫爜閲嶅!";
+ mes.Message = "鎿嶄綔澶辫触,鐢ㄦ埛缁勭紪鐮侀噸澶�!";
mes.data = null;
return mes;
}
- 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)";
+ else
+ {
+ //鍐欏叆鐢ㄦ埛缁勮〃
+ 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,
+ parm = new
+ {
+ groupcode = json[0].code,
+ groupename = json[0].name,
+ description = json[0].flag,
+ lm_user = username,
+ lm_date = DateTime.Now.ToString(),
+ torg_code = json[0].storg_code
+ }
+ });
+ //鍐欏叆鐢ㄦ埛缁勫叧绯昏〃
+ for (int i = 0; i < json[0].children.Count; i++)
+ {
+ sql = @"insert into TGroup(group_code,user_code) values(@groupcode,@usercode)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ groupcode = json[0].code,
+ groupename = json[0].children[i].usercode
+ }
+ });
+ }
+ }
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鎿嶄綔澶辫触!";
+ mes.data = null;
+ }
+ }
+ else
+ {
+ //淇敼鐢ㄦ埛缁勮〃
+ sql = @"update TGroup see group_name=@,lm_user=@lm_user,lm_date=@lm_date,description=@description,torg_code=@torg_code where group_code=@groupcode";
list.Add(new
{
str = sql,
parm = new
{
- groupcode = json[i].code,
- groupename = json[i].name,
- description = json[i].flag,
+ groupcode = json[0].code,
+ groupename = json[0].name,
+ description = json[0].flag,
lm_user = username,
lm_date = DateTime.Now.ToString(),
- torg_code = json[i].storg_code
+ torg_code = json[0].storg_code
}
});
- }
- bool aa = DapperHelper.DoTransaction(list);
- if (aa)
- {
- mes.code = "200";
- mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
- mes.data = null;
- }
- else
- {
- mes.code = "300";
- mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
- mes.data = null;
+ //鍒犻櫎鐢ㄦ埛缁勫叧绯昏〃
+ sql = @"delete TGroupUser where group_code=@groupcode";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ groupcode = json[0].code
+ }
+ });
+ //淇敼鐢ㄦ埛缁勫叧绯昏〃
+ for (int i = 0; i < json[0].children.Count; i++)
+ {
+ sql = @"insert into TGroupUser(group_code,user_code) values(@groupcode,@usercode)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ groupcode = json[0].code,
+ groupename = json[0].children[i].usercode
+ }
+ });
+ }
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鎿嶄綔澶辫触!";
+ mes.data = null;
+ }
}
}
catch (Exception e)
@@ -1034,14 +1119,15 @@
try
{
list.Clear();
- sql = @"select * from TUser where is_delete<>'1' and usergroup_code=@UserGrupCode";
+ //鍒ゆ柇褰撳墠鐢ㄦ埛缁勬槸鍚﹀瓨鍦ㄥ紑鎶ュ伐璁板綍
+ sql = @"select * from TK_Wrk_RecordSub where usergroup_code=@UserGrupCode";
dynamicParams.Add("@UserGrupCode", UserGrupCode);
var data = DapperHelper.selectdata(sql, dynamicParams);
if (data.Rows.Count > 0)
{
mes.code = "300";
mes.count = 0;
- mes.Message = "璇ョ敤鎴风粍涓嬫湁鍏宠仈鐨勭敤鎴�,涓嶅厑璁稿垹闄�!";
+ mes.Message = "璇ョ敤鎴风粍宸茬粡鏈夋姤宸�,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -1075,12 +1161,49 @@
}
#endregion
+ #region[鐢ㄦ埛缁勬煡鐪嬪叧鑱斾汉鍛榏
+ public static ToMessage GroupUserProject(string groupcode)
+ {
+ var sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ sql = @"select * from TGroupUser where group_code=@groupcode";
+ dynamicParams.Add("@groupcode", groupcode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ return mes;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "璇ョ彮缁勪笅鏃犳寚瀹氱敤鎴�!";
+ mes.data = null;
+ return mes;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
#region[瑙掕壊绫诲瀷鏌ヨ]
- public static ToMessage RoleTypeSearch(string stu_torgcode, string description,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 = "";
@@ -1157,7 +1280,7 @@
{
roletypecode = json[i].code,
roletypename = json[i].name,
- torg_code= json[i].flag
+ torg_code = json[i].flag
}
});
}
@@ -1238,7 +1361,7 @@
#endregion
#region[瑙掕壊绫诲瀷涓嬫媺鎺ュ彛]
- public static ToMessage RoleTypeSelect(string stu_torgcode,string description)
+ public static ToMessage RoleTypeSelect(string stu_torgcode, string description)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -1282,7 +1405,7 @@
#endregion
#region[瑙掕壊娓呭崟鏌ヨ]
- 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)
+ 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 = "";
@@ -1355,7 +1478,7 @@
#endregion
#region[瑙掕壊娓呭崟鏂板缂栬緫]
- public static ToMessage AddUpdateRole(string RoleId, string RoleCode, string RoleName,string stu_torgcode, 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
diff --git a/VueWebApi/DLL/DAL/ProductionManagementDAL.cs b/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
index 54b1225..32931de 100644
--- a/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
+++ b/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
@@ -22,7 +22,7 @@
#region[ERP璁㈠崟鏌ヨ]
- 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)
+ public static ToMessage ErpOrderSearch(string stu_torgcode,string stu_torgtypecode,string erporderstus, string erpordercode,string saleordercode, 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 = "";
@@ -52,6 +52,11 @@
{
search += "and A.wo like '%'+@erpordercode+'%' ";
dynamicParams.Add("@erpordercode", erpordercode);
+ }
+ if (saleordercode != "" && saleordercode != null)
+ {
+ search += "and A.saleOrderCode like '%'+@saleordercode+'%' ";
+ dynamicParams.Add("@saleordercode", saleordercode);
}
if (partcode != "" && partcode != null)
{
@@ -93,7 +98,7 @@
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
var sql = @"select A.id, A.status,A.wo,A.materiel_code as partcode,B.partname,B.partspec,A.qty,A.relse_qty,A.wkshp_code,C.org_name as wkshp_name,
- A.stck_code,D.name as stck_name,saleOrderDeliveryDate,A.planstartdate,A.planenddate,U.username as createuser,A.createdate
+ A.stck_code,D.name as stck_name,A.saleOrderCode,A.saleOrderDeliveryDate,A.planstartdate,A.planenddate,U.username as createuser,A.createdate
from TKimp_Ewo A
left join TMateriel_Info B on A.materiel_code=B.partcode
left join TOrganization C on A.wkshp_code=C.org_code
@@ -119,7 +124,7 @@
#endregion
#region[ERP璁㈠崟涓嬭揪]
- public static ToMessage MarkSaveErpOrder(string erporderid, string erpordercode, string partcode, string wkshopcode, string warehousecode, string erpqty, string markqty, string ordernum, string relse_qty, string saleOrderDeliveryDate, string username)
+ public static ToMessage MarkSaveErpOrder(string erporderid, string erpordercode,string saleordercode, string partcode, string wkshopcode, string warehousecode, string erpqty, string markqty, string ordernum, string relse_qty, string saleOrderDeliveryDate, string username)
{
var sql = "";
List<object> list = new List<object>();
@@ -157,7 +162,7 @@
}
if (i == Convert.ToInt32(ordernum)) //鏈�鍚庝竴鍗曟椂
{
- sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,stck_code,materiel_code,sourceid,m_po,lm_user,lm_date,saleOrderDeliveryDate) values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@stck_code,@materiel_code,@sourceid,@m_po,@username,@CreateDate,@saleOrderDeliveryDate)";
+ sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,stck_code,materiel_code,sourceid,m_po,lm_user,lm_date,saleOrderCode,saleOrderDeliveryDate) values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@stck_code,@materiel_code,@sourceid,@m_po,@username,@CreateDate,@saleOrderCode,@saleOrderDeliveryDate)";
list.Add(new
{
str = sql,
@@ -174,6 +179,7 @@
m_po = erpordercode,
username = username,
CreateDate = DateTime.Now.ToString(),
+ saleOrderCode=saleordercode,
saleOrderDeliveryDate = Convert.ToDateTime(saleOrderDeliveryDate)
}
});
@@ -182,7 +188,7 @@
else
{
- sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,stck_code,materiel_code,sourceid,m_po,lm_user,lm_date,saleOrderDeliveryDate) values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@stck_code,@materiel_code,@sourceid,@m_po,@username,@CreateDate,@saleOrderDeliveryDate)";
+ sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,stck_code,materiel_code,sourceid,m_po,lm_user,lm_date,saleOrderCode,saleOrderDeliveryDate) values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@stck_code,@materiel_code,@sourceid,@m_po,@username,@CreateDate,@saleOrderCode,@saleOrderDeliveryDate)";
list.Add(new
{
str = sql,
@@ -199,6 +205,7 @@
m_po = erpordercode,
username = username,
CreateDate = DateTime.Now.ToString(),
+ saleOrderCode=saleordercode,
saleOrderDeliveryDate = Convert.ToDateTime(saleOrderDeliveryDate)
}
});
@@ -323,7 +330,7 @@
#region[MES宸ュ崟鏌ヨ]
- 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)
+ public static ToMessage MesOrderSearch(string stu_torgcode,string stu_torgtypecode,string mesorderstus, string mesordercode, string sourceorder,string saleordercode, 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 = "";
@@ -358,6 +365,11 @@
{
search += "and A.m_po like '%'+@sourceorder+'%' ";
dynamicParams.Add("@sourceorder", sourceorder);
+ }
+ if (saleordercode != "" && saleordercode != null)
+ {
+ search += "and W.saleOrderCode like '%'+@saleordercode+'%' ";
+ dynamicParams.Add("@saleordercode", saleordercode);
}
if (ordertype != "" && ordertype != null)
{
@@ -397,8 +409,9 @@
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
var sql = @"select A.id, A.status,A.wotype,A.wo_code,A.materiel_code as partcode,B.partname,B.partspec,A.plan_qty,A.wkshp_code,C.org_name as wkshp_name,
- A.route_code,E.name as route_name,A.stck_code,F.name as stck_name,A.plan_startdate,A.plan_enddate,A.piroque,A.sourceid,A.m_po,U.username as lm_user,A.lm_date
+ A.route_code,E.name as route_name,A.stck_code,F.name as stck_name,A.plan_startdate,A.plan_enddate,A.piroque,A.sourceid,A.m_po,W.saleOrderCode,U.username as lm_user,A.lm_date
from TK_Wrk_Man A
+ left join TKimp_Ewo W on A.m_po=W.wo and A.materiel_code=W.materiel_code
left join TMateriel_Info B on A.materiel_code=B.partcode
left join TOrganization C on A.wkshp_code=C.org_code
left join T_Sec_Stck D on A.stck_code=D.code
@@ -425,7 +438,7 @@
#endregion
#region[MES鎶ュ簾琛ュ崟宸ュ崟鏌ヨ]
- public static ToMessage MesBadOrderSearch(string mesordercode, string sourceorder, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
+ public static ToMessage MesBadOrderSearch(string mesordercode, string sourceorder,string saleordercode, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -440,6 +453,11 @@
{
search += "and A.m_po like '%'+@sourceorder+'%' ";
dynamicParams.Add("@sourceorder", sourceorder);
+ }
+ if (saleordercode != "" && saleordercode != null)
+ {
+ search += "and W.saleOrderCode like '%'+@saleordercode+'%' ";
+ dynamicParams.Add("@saleordercode", saleordercode);
}
if (partcode != "" && partcode != null)
{
@@ -474,8 +492,9 @@
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
var sql = @"select A.id, A.status,A.wotype,A.wo_code,A.materiel_code as partcode,B.partname,B.partspec,A.plan_qty,A.wkshp_code,C.org_name as wkshp_name,
- A.route_code,E.name as route_name,A.stck_code,F.name as stck_name,A.plan_startdate,A.plan_enddate,A.piroque,A.sourceid,A.m_po,U.username as lm_user,A.lm_date,S.bad_qty
+ A.route_code,E.name as route_name,A.stck_code,F.name as stck_name,A.plan_startdate,A.plan_enddate,A.piroque,A.sourceid,A.m_po,W.saleOrderCode,U.username as lm_user,A.lm_date,S.bad_qty
from TK_Wrk_Man A
+ left join TKimp_Ewo W on A.m_po=W.wo and A.materiel_code=W.materiel_code
left join (select wo_code,sum(bad_qty) as bad_qty from TK_Wrk_Step where bad_qty>0 group by wo_code) S on A.wo_code=S.wo_code
left join TMateriel_Info B on A.materiel_code=B.partcode
left join TOrganization C on A.wkshp_code=C.org_code
@@ -1848,7 +1867,7 @@
switch (OperType)
{
case "ZZ":
- mes = ScanStartReport.ZZEncodingSeach(stu_torgcode,ordercode, stepcode);
+ mes = ScanStartReport.ZZEncodingSeach(stu_torgcode, SelectType,ordercode, stepcode);
break;
case "WX":
mes = ScanStartReport.WXEncodingSeach(stu_torgcode,SelectType, ordercode, stepcode);
@@ -1988,7 +2007,11 @@
try
{
//鐝粍鑾峰彇浜哄憳鍒楄〃
- sql = @"select usercode,username from TUser where stu_torgcode=@stu_torgcode and usergroup_code=@usergroupcode and is_delete<>'1'";
+ sql = @"select U.username,U.username
+ from TGroup G
+ inner join TGroupUser T on G.group_code=T.group_code
+ left join TUser U on T.user_code=U.usercode
+ where G.torg_code=@stu_torgcode and G.group_code=@usergroupcode";
dynamicParams.Add("@stu_torgcode", stu_torgcode);
dynamicParams.Add("@usergroupcode", usergroupcode);
var data = DapperHelper.selectdata(sql, dynamicParams);
@@ -2152,15 +2175,16 @@
string date = DateTime.Now.ToString(); //鑾峰彇绯荤粺鏃堕棿
list.Clear();
//鍒ゆ柇鏄惁鏈夊紑宸ヨ褰�
- sql = @"select * from TK_Wrk_Record where wo_code=@wo_code and step_code=@step_code and style='S'";
+ sql = @"select * from TK_Wrk_Record where wo_code=@wo_code and step_code=@step_code and eqp_code=@eqpcode and style='S'";
dynamicParams.Add("@wo_code", mesordercode);
dynamicParams.Add("@step_code", stepcode);
+ dynamicParams.Add("@eqpcode", eqpcode);
var data = DapperHelper.selectdata(sql, dynamicParams);
if (data.Rows.Count > 0)
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭浠诲姟宸插紑宸�!";
+ mes.Message = "褰撳墠宸ュ簭浠诲姟璁惧宸插紑宸�!";
mes.data = null;
return mes;
}
@@ -2235,9 +2259,10 @@
//鑾峰彇寮�宸ヨ褰曠殑榛樿閫変腑鐨勮澶�(浜х嚎)涓庢姤宸ユ椂鐨勮澶囦骇绾垮仛瀵规瘮鍒ゆ柇
sql = @"select A.eqp_code,B.name from TK_Wrk_Record A
inner join TEqpInfo B on A.eqp_code=B.code
- where A.wo_code=@wo_code and A.step_code=@step_code and A.style='S'";
+ where A.wo_code=@wo_code and A.step_code=@step_code and eqp_code=@eqpcode and A.style='S'";
dynamicParams.Add("@wo_code", mesordercode);
dynamicParams.Add("@step_code", stepcode);
+ dynamicParams.Add("@eqpcode", eqpcode);
var da = DapperHelper.selectdata(sql, dynamicParams);
if (da.Rows[0]["EQP_CODE"].ToString() != eqpcode)
{
diff --git "a/VueWebApi/Excel/\347\224\250\346\210\267\346\270\205\345\215\225.xls" "b/VueWebApi/Excel/\347\224\250\346\210\267\346\270\205\345\215\225.xls"
index e8d342f..2c31f29 100644
--- "a/VueWebApi/Excel/\347\224\250\346\210\267\346\270\205\345\215\225.xls"
+++ "b/VueWebApi/Excel/\347\224\250\346\210\267\346\270\205\345\215\225.xls"
Binary files differ
diff --git a/VueWebApi/Models/GroupUser.cs b/VueWebApi/Models/GroupUser.cs
new file mode 100644
index 0000000..ac739b3
--- /dev/null
+++ b/VueWebApi/Models/GroupUser.cs
@@ -0,0 +1,21 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace VueWebApi.Models
+{
+ public class GroupUser
+ {
+ public string storg_code { get; set; }
+ public string code { get; set; }
+ public string name { get; set; }
+ public string flag { get; set; }
+ public List<GroupUserCont> children { get; set; }
+ }
+ public class GroupUserCont
+ {
+ public string usercode { get; set; }
+ public string username { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user b/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
index 882c7b4..01e6123 100644
--- a/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
+++ b/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\MES姝ｆ竻娌�</_PublishTargetUrl>
- <History>True|2023-07-31T03:18:06.9546379Z;True|2023-07-03T10:38:22.8080444+08:00;True|2023-06-26T08:15:27.3611577+08:00;True|2023-06-25T15:36:41.8736654+08:00;True|2023-06-25T14:33:49.5287543+08:00;True|2023-06-13T10:24:59.6876648+08:00;</History>
+ <History>True|2023-08-07T02:34:44.0844087Z;True|2023-08-07T10:28:56.2230477+08:00;True|2023-07-31T11:18:06.9546379+08:00;True|2023-07-03T10:38:22.8080444+08:00;True|2023-06-26T08:15:27.3611577+08:00;True|2023-06-25T15:36:41.8736654+08:00;True|2023-06-25T14:33:49.5287543+08:00;True|2023-06-13T10:24:59.6876648+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="Areas/HelpPage/HelpPage.css">
@@ -750,13 +750,13 @@
<publishTime>12/24/2021 15:38:29</publishTime>
</File>
<File Include="bin/VueWebApi.dll">
- <publishTime>07/31/2023 11:18:01</publishTime>
+ <publishTime>08/07/2023 18:03:18</publishTime>
</File>
<File Include="bin/VueWebApi.pdb">
- <publishTime>07/31/2023 11:18:01</publishTime>
+ <publishTime>08/07/2023 18:03:18</publishTime>
</File>
<File Include="bin/VueWebApi.xml">
- <publishTime>07/31/2023 11:18:01</publishTime>
+ <publishTime>08/07/2023 18:03:18</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>02/08/2013 16:42:28</publishTime>
@@ -837,7 +837,7 @@
<publishTime>11/07/2022 17:57:07</publishTime>
</File>
<File Include="Excel/鐢ㄦ埛娓呭崟.xls">
- <publishTime>06/18/2023 07:56:48</publishTime>
+ <publishTime>08/07/2023 17:47:13</publishTime>
</File>
<File Include="Excel/缂洪櫡瀹氫箟.xls">
<publishTime>08/12/2022 10:41:48</publishTime>
@@ -1161,7 +1161,7 @@
<publishTime>06/16/2022 13:39:23</publishTime>
</File>
<File Include="Web.config">
- <publishTime>07/31/2023 11:18:05</publishTime>
+ <publishTime>08/07/2023 17:29:33</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/VueWebApi/Tools/ImportExcelData.cs b/VueWebApi/Tools/ImportExcelData.cs
index 2ea8e76..bb47779 100644
--- a/VueWebApi/Tools/ImportExcelData.cs
+++ b/VueWebApi/Tools/ImportExcelData.cs
@@ -20,20 +20,14 @@
code = "";
List<DataTable> excelTable = new List<DataTable>();
excelTable = ImportExcel.ExcelToTableList(FileCode);
- if (excelTable.Count != 4)
+ if (excelTable.Count != 2)
{
code = "300";
Message = "瀵煎叆妯℃澘涓嶇鍚堣鑼�,璇锋鏌heet鏁�";
return Message;
}
- else if (excelTable[0].Columns.Count != 5)
- {
- code = "300";
- Message = "鐢ㄦ埛鐝粍妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
- return Message;
- }
- else if (excelTable[1].Columns.Count != 10)
+ else if (excelTable[0].Columns.Count != 9)
{
code = "300";
Message = "鐢ㄦ埛娓呭崟妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
@@ -42,91 +36,55 @@
else if (excelTable[0].Columns[0].ColumnName != "搴忓彿")
{
code = "300";
- Message = "鐢ㄦ埛鐝粍妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕搴忓彿}";
- return Message;
- }
- else if (excelTable[0].Columns[1].ColumnName != "缁勭粐缂栫爜")
- {
- code = "300";
- Message = "鐢ㄦ埛鐝粍妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕缁勭粐缂栫爜}";
- return Message;
- }
- else if (excelTable[0].Columns[2].ColumnName != "鐝粍缂栧彿(鍞竴)")
- {
- code = "300";
- Message = "鐢ㄦ埛鐝粍妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕鐝粍缂栧彿(鍞竴)}";
- return Message;
- }
- else if (excelTable[0].Columns[3].ColumnName != "鐝粍鍚嶇О")
- {
- code = "300";
- Message = "鐢ㄦ埛鐝粍妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕鐝粍鍚嶇О}";
- return Message;
- }
- else if (excelTable[0].Columns[4].ColumnName != "鐝粍鎻忚堪")
- {
- code = "300";
- Message = "鐢ㄦ埛鐝粍妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕鐝粍鎻忚堪}";
- return Message;
- }
- else if (excelTable[1].Columns[0].ColumnName != "搴忓彿")
- {
- code = "300";
Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕搴忓彿}";
return Message;
}
- else if (excelTable[1].Columns[1].ColumnName != "鐢ㄦ埛缂栧彿(鍞竴)")
+ else if (excelTable[0].Columns[1].ColumnName != "鐢ㄦ埛缂栧彿(鍞竴)")
{
code = "300";
Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕鐢ㄦ埛缂栧彿(鍞竴)}";
return Message;
}
- else if (excelTable[1].Columns[2].ColumnName != "鐢ㄦ埛濮撳悕")
+ else if (excelTable[0].Columns[2].ColumnName != "鐢ㄦ埛濮撳悕")
{
code = "300";
Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕鐢ㄦ埛濮撳悕}";
return Message;
}
- else if (excelTable[1].Columns[3].ColumnName != "鍦ㄨ亴鐘舵��")
+ else if (excelTable[0].Columns[3].ColumnName != "鍦ㄨ亴鐘舵��")
{
code = "300";
Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕鍦ㄨ亴鐘舵�亇";
return Message;
}
- else if (excelTable[1].Columns[4].ColumnName != "瀵嗙爜")
+ else if (excelTable[0].Columns[4].ColumnName != "瀵嗙爜")
{
code = "300";
Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�5鍒楀簲涓簕瀵嗙爜}";
return Message;
}
- else if (excelTable[1].Columns[5].ColumnName != "鎵嬫満鍙�")
+ else if (excelTable[0].Columns[5].ColumnName != "鎵嬫満鍙�")
{
code = "300";
Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�6鍒楀簲涓簕鎵嬫満鍙穧";
return Message;
}
- else if (excelTable[1].Columns[6].ColumnName != "閭")
+ else if (excelTable[0].Columns[6].ColumnName != "閭")
{
code = "300";
Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�7鍒楀簲涓簕閭}";
return Message;
}
- else if (excelTable[1].Columns[7].ColumnName != "缁勭粐缂栫爜")
+ else if (excelTable[0].Columns[7].ColumnName != "缁勭粐缂栫爜")
{
code = "300";
Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�8鍒楀簲涓簕缁勭粐缂栫爜}";
return Message;
}
- else if (excelTable[1].Columns[8].ColumnName != "宸ヨ祫绫诲瀷")
+ else if (excelTable[0].Columns[8].ColumnName != "宸ヨ祫绫诲瀷")
{
code = "300";
Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�9鍒楀簲涓簕宸ヨ祫绫诲瀷}";
- return Message;
- }
- else if (excelTable[1].Columns[9].ColumnName != "鐢ㄦ埛缁勭紪鐮�")
- {
- code = "300";
- Message = "鐢ㄦ埛娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�10鍒楀簲涓簕鐢ㄦ埛缁勭紪鐮亇";
return Message;
}
else
@@ -1864,106 +1822,39 @@
var dynamicParams = new DynamicParameters();
DataTable dt;
List<ExcelErro> list = new List<ExcelErro>();
- List<DataTable> excelTable = new List<DataTable>();
- list = ImportExcel.ExcelToTableListErro(FileCode); //楠岃瘉Excel鏁版嵁蹇呭～瀛楁鏄惁涓虹┖銆佸敮涓�瀛楁鏄惁閲嶅
- excelTable = ImportExcel.ExcelToTableList(FileCode); //鑾峰彇Excel鏁版嵁
- //涓昏〃
- for (int j = 0; j < excelTable[0].Rows.Count; j++)
+ DataTable excelTable = new DataTable();
+ list = ImportExcel.ExcelToTableErro(FileCode); //楠岃瘉Excel鏁版嵁蹇呭～瀛楁鏄惁涓虹┖銆佸敮涓�瀛楁鏄惁閲嶅
+ excelTable = ImportExcel.ExcelToTable(FileCode); //鑾峰彇Excel鏁版嵁
+ for (int k = 0; k < excelTable.Rows.Count; k++)
{
- if (excelTable[0].Rows[j][2].ToString().Trim() != null && excelTable[0].Rows[j][2].ToString().Trim() != "")
- {
- sql = @"select * from TGroup where group_code=@group_code";
- dynamicParams.Add("@group_code", excelTable[0].Rows[j][2].ToString().Trim());
- dt = DapperHelper.selectdata(sql, dynamicParams);
- if (dt.Rows.Count > 0)
- {
- ExcelErro erro = new ExcelErro();
- erro.RoeNumber = "/";
- erro.ErrorField = "{鐝粍缂栫爜(鍞竴)}";
- erro.ErrorCont = "鐝粍琛�:{鐝粍缂栫爜(鍞竴)}瀛楁" + excelTable[0].Rows[j][2].ToString().Trim() + "宸插瓨鍦�";
- list.Add(erro);
- }
- }
- }
- //瀛愯〃
- for (int k = 0; k < excelTable[1].Rows.Count; k++)
- {
- if (excelTable[1].Rows[k][1].ToString().Trim() != null && excelTable[1].Rows[k][1].ToString().Trim() != "")
+ if (excelTable.Rows[k][1].ToString().Trim() != null && excelTable.Rows[k][1].ToString().Trim() != "")
{
sql = @"select * from TUser where usercode=@usercode";
- dynamicParams.Add("@usercode", excelTable[1].Rows[k][1].ToString().Trim());
+ dynamicParams.Add("@usercode", excelTable.Rows[k][1].ToString().Trim());
dt = DapperHelper.selectdata(sql, dynamicParams);
if (dt.Rows.Count > 0)
{
ExcelErro erro = new ExcelErro();
erro.RoeNumber = "/";
erro.ErrorField = "{鐢ㄦ埛缂栫爜(鍞竴)}";
- erro.ErrorCont = "鐢ㄦ埛琛�:{鐢ㄦ埛缂栫爜(鍞竴)}瀛楁" + excelTable[1].Rows[k][1].ToString().Trim() + "宸插瓨鍦�";
+ erro.ErrorCont = "鐢ㄦ埛琛�:{鐢ㄦ埛缂栫爜(鍞竴)}瀛楁" + excelTable.Rows[k][1].ToString().Trim() + "宸插瓨鍦�";
list.Add(erro);
}
}
- if (excelTable[1].Rows[k][7].ToString().Trim() != null && excelTable[1].Rows[k][7].ToString().Trim() != "")
+ if (excelTable.Rows[k][7].ToString().Trim() != null && excelTable.Rows[k][7].ToString().Trim() != "")
{
sql = @"select * from TOrganization where org_code=@org_code";
- dynamicParams.Add("@org_code", excelTable[1].Rows[k][7].ToString().Trim());
+ dynamicParams.Add("@org_code", excelTable.Rows[k][7].ToString().Trim());
dt = DapperHelper.selectdata(sql, dynamicParams);
if (dt == null || dt.Rows.Count <= 0)
{
ExcelErro erro = new ExcelErro();
erro.RoeNumber = "/";
erro.ErrorField = "{缁勭粐缂栫爜}";
- erro.ErrorCont = "鐢ㄦ埛琛�:{缁勭粐缂栫爜}瀛楁" + excelTable[1].Rows[k][7].ToString().Trim() + "涓嶅瓨鍦�";
+ erro.ErrorCont = "鐢ㄦ埛琛�:{缁勭粐缂栫爜}瀛楁" + excelTable.Rows[k][7].ToString().Trim() + "涓嶅瓨鍦�";
list.Add(erro);
}
}
- if (excelTable[1].Rows[k][9].ToString().Trim() != null && excelTable[1].Rows[k][9].ToString().Trim() != "")
- {
- sql = @"select torg_code from TGroup where group_code=@group_code";
- dynamicParams.Add("@group_code", excelTable[1].Rows[k][9].ToString().Trim());
- dt = DapperHelper.selectdata(sql, dynamicParams);
- if (dt != null && dt.Rows.Count>0)
- {
- if (dt.Rows[0]["torg_code"].ToString()!= excelTable[1].Rows[k][7].ToString().Trim())
- {
- ExcelErro erro = new ExcelErro();
- erro.RoeNumber = "/";
- erro.ErrorField = "{鐢ㄦ埛缁勭紪鐮亇";
- erro.ErrorCont = "鐢ㄦ埛琛�:{鐢ㄦ埛缁勭紪鐮亇瀛楁" + excelTable[1].Rows[k][9].ToString().Trim() + " 涓嶆槸缁勭粐缂栫爜:" + excelTable[1].Rows[k][7].ToString().Trim() + "涓嬬殑鐢ㄦ埛缁�";
- list.Add(erro);
- } }
- }
- }
- //鍒ゆ柇瀛愯〃缁勭粐缂栫爜涓嶅瓨鍦ㄤ簬涓昏〃缁勭粐缂栫爜涓殑鏁版嵁
- var dt2 = from r in excelTable[1].AsEnumerable()
- where !(
- from rr in excelTable[0].AsEnumerable()
- select rr.Field<string>("缁勭粐缂栫爜")
- ).Contains(r.Field<string>("缁勭粐缂栫爜"))
- select r;
- List<DataRow> listRow2 = dt2.ToList();
- if (listRow2.Count > 0)
- {
- ExcelErro erro = new ExcelErro();
- erro.RoeNumber = "/";
- erro.ErrorField = "{缁勭粐缂栫爜}";
- erro.ErrorCont = "鐢ㄦ埛琛�:{缁勭粐缂栫爜}瀛楁涓湁鍊煎湪鐝粍琛�:{缁勭粐缂栫爜}涓笉瀛樺湪";
- list.Add(erro);
- }
- //鍒ゆ柇瀛愯〃澶栭敭涓嶅瓨鍦ㄤ簬涓昏〃涓婚敭涓殑鏁版嵁
- var dt3 = from r in excelTable[1].AsEnumerable()
- where !(
- from rr in excelTable[0].AsEnumerable()
- select rr.Field<string>("鐝粍缂栧彿(鍞竴)")
- ).Contains(r.Field<string>("鐢ㄦ埛缁勭紪鐮�"))
- select r;
- List<DataRow> listRow = dt3.ToList();
- if (listRow.Count > 0)
- {
- ExcelErro erro = new ExcelErro();
- erro.RoeNumber = "/";
- erro.ErrorField = "{鐢ㄦ埛缁勭紪鐮亇";
- erro.ErrorCont = "鐢ㄦ埛琛�:{鐢ㄦ埛缁勭紪鐮亇瀛楁涓湁鍊煎湪鐝粍琛�:{鐝粍缂栧彿(鍞竴)}涓笉瀛樺湪";
- list.Add(erro);
}
if (list.Count > 0)
{
@@ -1980,7 +1871,7 @@
{
StuCode = "200";
message = "鏁版嵁楠岃瘉鎴愬姛";
- count = excelTable[0].Rows.Count + excelTable[1].Rows.Count;
+ count = excelTable.Rows.Count;
}
return list;
}
@@ -3233,41 +3124,12 @@
try
{
list.Clear();
- List<DataTable> excelTable = new List<DataTable>();
- excelTable = ImportExcel.ExcelToTableList(FileCode);
- //瀵煎叆鐝粍
- for (int k = 0; k < excelTable[0].Rows.Count; k++)
- {
- sql = @"select * from TGroup where group_code=@group_code";
- dynamicParams.Add("@group_code", excelTable[0].Rows[k][2].ToString().Trim());
- dt = DapperHelper.selectdata(sql, dynamicParams);
- if (dt.Rows.Count > 0)
- {
- continue;
- }
- else
- {
- sql = @"insert into TGroup(group_code,group_name,description,lm_user,lm_date,torg_code)
- values(@group_code,@group_name,@description,@Operator,@CreateDate,@torg_code)";
- list.Add(new
- {
- str = sql,
- parm = new
- {
- group_code = excelTable[0].Rows[k][2].ToString().Trim(),
- group_name = excelTable[0].Rows[k][3].ToString().Trim(),
- description = excelTable[0].Rows[k][4].ToString().Trim(),
- CreateDate = DateTime.Now.ToString(),
- Operator = User,
- torg_code= excelTable[0].Rows[k][1].ToString().Trim()
- }
- });
- }
- }
+ DataTable excelTable = new DataTable();
+ excelTable = ImportExcel.ExcelToTable(FileCode);
//瀵煎叆鐢ㄦ埛
- for (int i = 0; i < excelTable[1].Rows.Count; i++)
+ for (int i = 0; i < excelTable.Rows.Count; i++)
{
- if (excelTable[1].Rows[i][3].ToString().Trim() == "鍦ㄨ亴")
+ if (excelTable.Rows[i][3].ToString().Trim() == "鍦ㄨ亴")
{
Enable = "Y";
}
@@ -3276,7 +3138,7 @@
Enable = "N";
}
//宸ヨ祫绫诲瀷
- switch (excelTable[1].Rows[i][8].ToString().Trim())
+ switch (excelTable.Rows[i][8].ToString().Trim())
{
case "璁′欢鍒�":
WageType = "2";
@@ -3288,7 +3150,7 @@
break;
}
sql = @"select * from TUser where usercode=@usercode";
- dynamicParams.Add("@usercode", excelTable[1].Rows[i][1].ToString().Trim());
+ dynamicParams.Add("@usercode", excelTable.Rows[i][1].ToString().Trim());
dt = DapperHelper.selectdata(sql, dynamicParams);
if (dt.Rows.Count > 0)
{
@@ -3301,17 +3163,17 @@
str = sql,
parm = new
{
- UserCode = excelTable[1].Rows[i][1].ToString().Trim(),
- UserName = excelTable[1].Rows[i][2].ToString().Trim(),
- password = excelTable[1].Rows[i][4].ToString().Trim(),
+ UserCode = excelTable.Rows[i][1].ToString().Trim(),
+ UserName = excelTable.Rows[i][2].ToString().Trim(),
+ password = excelTable.Rows[i][4].ToString().Trim(),
Enable = Enable,
- Mobile = excelTable[1].Rows[i][5].ToString().Trim(),
+ Mobile = excelTable.Rows[i][5].ToString().Trim(),
CreateDate = DateTime.Now.ToString(),
- Email = excelTable[1].Rows[i][6].ToString().Trim(),
+ Email = excelTable.Rows[i][6].ToString().Trim(),
Operator = User,
- StuOrg = excelTable[1].Rows[i][7].ToString().Trim(),
+ StuOrg = excelTable.Rows[i][7].ToString().Trim(),
wagetype = WageType,
- usergroup_code = excelTable[1].Rows[i][9].ToString().Trim()
+ usergroup_code = excelTable.Rows[i][9].ToString().Trim()
}
});
}
diff --git a/VueWebApi/Tools/ScanStartReport.cs b/VueWebApi/Tools/ScanStartReport.cs
index 85bf63c..979d022 100644
--- a/VueWebApi/Tools/ScanStartReport.cs
+++ b/VueWebApi/Tools/ScanStartReport.cs
@@ -18,10 +18,11 @@
/// 鎵爜淇℃伅涓哄伐鍗�+宸ュ簭鏉＄爜
/// </summary>
/// <param name="stu_torgcode">鎵�灞炵粍缁囩紪鐮�</param>
+ /// <param name="SelectType">璁惧缂栫爜</param>
/// <param name="ordercode">宸ュ崟缂栧彿</param>
/// <param name="stepcode">宸ュ簭缂栫爜</param>
/// <returns></returns>
- public static ToMessage ZZEncodingSeach(string stu_torgcode, string ordercode, string stepcode)
+ public static ToMessage ZZEncodingSeach(string stu_torgcode, string SelectType, string ordercode, string stepcode)
{
var sql = "";
string flwtype = ""; //宸ュ簭灞炴��
@@ -116,6 +117,7 @@
mes.data = null;
return mes;
}
+
switch (flwtype)
{
case "Z": //鑷埗宸ュ簭
@@ -124,9 +126,10 @@
//1.棣栭亾宸ュ簭鏃讹紝鍒ゆ柇鏄惁鏈夊紑宸ヨ褰�
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'";
+ where R.wo_code=@ordercode and R.step_code=@stepcode and eqp_code=@eqp_code and R.style='S'";
dynamicParams.Add("@ordercode", ordercode);
dynamicParams.Add("@stepcode", stepcode);
+ dynamicParams.Add("@eqp_code", SelectType);
var data0 = DapperHelper.selectdata(sql, dynamicParams);
if (data0.Rows.Count > 0) //鏈夊紑宸ヨ褰�
{
@@ -205,9 +208,10 @@
//1.闈為閬撳伐搴忔椂锛屽垽鏂湰閬撴槸鍚︽湁寮�宸ヨ褰�
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'";
+ where R.wo_code=@ordercode and R.step_code=@stepcode and eqp_code=@eqp_code and R.style='S'";
dynamicParams.Add("@ordercode", ordercode);
dynamicParams.Add("@stepcode", stepcode);
+ dynamicParams.Add("@eqp_code", SelectType);
var data1 = DapperHelper.selectdata(sql, dynamicParams);
if (data1.Rows.Count > 0)//鏈亾鏈夊紑宸ヨ褰�
{
diff --git a/VueWebApi/VueWebApi.csproj b/VueWebApi/VueWebApi.csproj
index d2a8354..03d1109 100644
--- a/VueWebApi/VueWebApi.csproj
+++ b/VueWebApi/VueWebApi.csproj
@@ -453,6 +453,7 @@
<Compile Include="Models\DeviceRepair.cs" />
<Compile Include="Models\EqpRepair.cs" />
<Compile Include="Models\ExcelErro.cs" />
+ <Compile Include="Models\GroupUser.cs" />
<Compile Include="Models\MaterialRout.cs" />
<Compile Include="Models\ObjectData.cs" />
<Compile Include="Models\ObjectDataCont.cs" />
diff --git a/VueWebApi/Web.config b/VueWebApi/Web.config
index 11fc150..c303c1b 100644
--- a/VueWebApi/Web.config
+++ b/VueWebApi/Web.config
@@ -27,7 +27,7 @@
<!--redis鏁版嵁搴撻摼鎺ラ厤缃鍙ｅ彿-->
<add key="RedisConnPort" value="6379" />
<!--key澶辨晥鏃堕棿30绉�-->
- <add key="RedisKeyTimeCont" value="120" />
+ <add key="RedisKeyTimeCont" value="7200" />
<!--Excel瀵煎嚭妯℃澘閰嶇疆IP-->
<add key="FileIP" value="http://121.196.36.24:8001/" />
<add key="webpages:Version" value="3.0.0.0" />
diff --git a/VueWebApi/bin/VueWebApi.dll.config b/VueWebApi/bin/VueWebApi.dll.config
index 11fc150..c303c1b 100644
--- a/VueWebApi/bin/VueWebApi.dll.config
+++ b/VueWebApi/bin/VueWebApi.dll.config
@@ -27,7 +27,7 @@
<!--redis鏁版嵁搴撻摼鎺ラ厤缃鍙ｅ彿-->
<add key="RedisConnPort" value="6379" />
<!--key澶辨晥鏃堕棿30绉�-->
- <add key="RedisKeyTimeCont" value="120" />
+ <add key="RedisKeyTimeCont" value="7200" />
<!--Excel瀵煎嚭妯℃澘閰嶇疆IP-->
<add key="FileIP" value="http://121.196.36.24:8001/" />
<add key="webpages:Version" value="3.0.0.0" />
diff --git a/VueWebApi/bin/VueWebApi.pdb b/VueWebApi/bin/VueWebApi.pdb
index 3f1833c..9ebbc28 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 77166fa..4c91755 100644
--- a/VueWebApi/bin/VueWebApi.xml
+++ b/VueWebApi/bin/VueWebApi.xml
@@ -1535,20 +1535,25 @@
<param name="files">涓婁紶鐢ㄦ埛娓呭崟瀵煎叆鏂囦欢</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.BasicSettingController.UserGroupSearch(System.Int32,System.Int32,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.BasicSettingController.UserGroupSearch(System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
<summary>
鐢ㄦ埛缁勫垪琛ㄦ煡璇�
</summary>
+ <param name="groupcode">鐝粍缂栫爜</param>
+ <param name="groupname">鐝粍鍚嶇О</param>
+ <param name="stu_torgcode">鎵�灞炵粍缁�</param>
+ <param name="description">鎵�灞炵粍缁囩被鍨�</param>
<param name="page">椤电爜</param>
<param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
<param name="prop">鎺掑簭瀛楁</param>
<param name="order">鎺掑簭瑙勫垯</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.BasicSettingController.UserGroupAdd(System.Collections.Generic.List{VueWebApi.Models.StepDefect})">
+ <member name="M:VueWebApi.Controllers.BasicSettingController.UserGroupAdd(System.String,System.Collections.Generic.List{VueWebApi.Models.GroupUser})">
<summary>
鐢ㄦ埛缁勬柊澧�
</summary>
+ <param name="type">鎻愪氦绫诲瀷(Add/Update)</param>
<param name="json">鐢ㄦ埛缁勬柊澧炴彁浜ゆ暟鎹�</param>
<returns></returns>
</member>
@@ -1557,6 +1562,13 @@
鐢ㄦ埛缁勫垹闄�
</summary>
<param name="UserGrupCode">鐢ㄦ埛缁勭紪鐮�</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.BasicSettingController.GroupUserProject(System.String)">
+ <summary>
+ 鐢ㄦ埛缁勬煡鐪嬪叧鑱斾汉鍛�
+ </summary>
+ <param name="groupcode">鐝粍缂栫爜</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.BasicSettingController.RoleTypeSearch(System.Int32,System.Int32,System.String,System.String)">
@@ -2506,12 +2518,13 @@
<param name="storagecode">搴撲綅缂栫爜</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ProductionManagementController.ErpOrderSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.ErpOrderSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
<summary>
ERP璁㈠崟鏌ヨ
</summary>
<param name="erporderstus">璁㈠崟鐘舵�佺爜</param>
<param name="erpordercode">璁㈠崟缂栧彿</param>
+ <param name="saleordercode">閿�鍞崟鍙�</param>
<param name="partcode">浜у搧缂栫爜</param>
<param name="partname">浜у搧鍚嶇О</param>
<param name="partspec">浜у搧瑙勬牸</param>
@@ -2539,13 +2552,14 @@
<param name="erpordercode">璁㈠崟鍙�</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderSearch(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.ProductionManagementController.MesOrderSearch(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>
MES宸ュ崟鏌ヨ
</summary>
<param name="mesorderstus">宸ュ崟鐘舵�佺爜</param>
<param name="mesordercode">宸ュ崟缂栧彿</param>
<param name="sourceorder">婧愬崟鍗曞彿</param>
+ <param name="saleordercode">閿�鍞崟鍙�</param>
<param name="ordertype">鍗曟嵁绫诲瀷</param>
<param name="partcode">浜у搧缂栫爜</param>
<param name="partname">浜у搧鍚嶇О</param>
@@ -2558,12 +2572,13 @@
<param name="order">鎺掑簭瑙勫垯</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ProductionManagementController.MesBadOrderSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.MesBadOrderSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
<summary>
MES鎶ュ簾琛ュ崟宸ュ崟鏌ヨ
</summary>
<param name="mesordercode">宸ュ崟缂栧彿</param>
<param name="sourceorder">婧愬崟鍗曞彿</param>
+ <param name="saleordercode">閿�鍞崟鍙�</param>
<param name="partcode">浜у搧缂栫爜</param>
<param name="partname">浜у搧鍚嶇О</param>
<param name="partspec">浜у搧瑙勬牸</param>
@@ -2710,7 +2725,7 @@
鐢熶骇寮�鎶ュ伐锛氬紑宸�(寮�濮�/鎶ュ伐)/澶栧崗(鍙戞枡/鏀舵枡)鏃舵潯浠跺垽鏂強鏁版嵁杩斿洖鎺ュ彛
</summary>
<param name="OperType">鎿嶄綔绫诲瀷锛氳嚜鍒�(ZZ)/澶栧崗(WX)</param>
- <param name="SelectType">鎿嶄綔绫诲瀷锛氬鍗忓彂鏂欐爣璇�(OUT)/澶栧崗鏀舵枡鏍囪瘑(IN)</param>
+ <param name="SelectType">鎿嶄綔绫诲瀷锛氳嚜鍒�(璁惧缂栫爜)/澶栧崗(鍙戞枡鏍囪瘑(OUT)/鏀舵枡鏍囪瘑(IN))</param>
<param name="orderstepqrcode">鎵弿浜岀淮鐮佷俊鎭�</param>
<param name="stu_torgcode">鎵�灞炵粍缁囩紪鐮�</param>
<returns></returns>
@@ -4609,11 +4624,12 @@
<param name="listId"></param>
<param name="func"></param>
</member>
- <member name="M:VueWebApi.Tools.ScanStartReport.ZZEncodingSeach(System.String,System.String,System.String)">
+ <member name="M:VueWebApi.Tools.ScanStartReport.ZZEncodingSeach(System.String,System.String,System.String,System.String)">
<summary>
鎵爜淇℃伅涓哄伐鍗�+宸ュ簭鏉＄爜
</summary>
<param name="stu_torgcode">鎵�灞炵粍缁囩紪鐮�</param>
+ <param name="SelectType">璁惧缂栫爜</param>
<param name="ordercode">宸ュ崟缂栧彿</param>
<param name="stepcode">宸ュ簭缂栫爜</param>
<returns></returns>
diff --git a/VueWebApi/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/VueWebApi/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index e3b4dcd..7f80331 100644
--- a/VueWebApi/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/VueWebApi/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/VueWebApi/obj/Debug/VueWebApi.csproj.AssemblyReference.cache b/VueWebApi/obj/Debug/VueWebApi.csproj.AssemblyReference.cache
deleted file mode 100644
index 9c03031..0000000
--- a/VueWebApi/obj/Debug/VueWebApi.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/VueWebApi/obj/Debug/VueWebApi.csproj.CoreCompileInputs.cache b/VueWebApi/obj/Debug/VueWebApi.csproj.CoreCompileInputs.cache
index ef85c10..590dd35 100644
--- a/VueWebApi/obj/Debug/VueWebApi.csproj.CoreCompileInputs.cache
+++ b/VueWebApi/obj/Debug/VueWebApi.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-ba620971f75c0245d192b0a5b056dd47420ee52d
+16db473c7cd4741e2f1489189a448a193a8f084b
diff --git a/VueWebApi/obj/Debug/VueWebApi.csproj.FileListAbsolute.txt b/VueWebApi/obj/Debug/VueWebApi.csproj.FileListAbsolute.txt
index ca643d0..c6492c4 100644
--- a/VueWebApi/obj/Debug/VueWebApi.csproj.FileListAbsolute.txt
+++ b/VueWebApi/obj/Debug/VueWebApi.csproj.FileListAbsolute.txt
@@ -459,7 +459,6 @@
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\Debug\VueWebApi.csproj.AssemblyReference.cache
D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\obj\Debug\VueWebApi.csproj.CoreCompileInputs.cache
D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\obj\Debug\VueWebApi.csproj.CopyComplete
D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\obj\Debug\VueWebApi.dll
diff --git a/VueWebApi/obj/Debug/VueWebApi.pdb b/VueWebApi/obj/Debug/VueWebApi.pdb
index 508406d..7a38f43 100644
--- a/VueWebApi/obj/Debug/VueWebApi.pdb
+++ b/VueWebApi/obj/Debug/VueWebApi.pdb
Binary files differ
diff --git "a/VueWebApi/obj/Release/Package/PackageTmp/Excel/\347\224\250\346\210\267\346\270\205\345\215\225.xls" "b/VueWebApi/obj/Release/Package/PackageTmp/Excel/\347\224\250\346\210\267\346\270\205\345\215\225.xls"
index e8d342f..2c31f29 100644
--- "a/VueWebApi/obj/Release/Package/PackageTmp/Excel/\347\224\250\346\210\267\346\270\205\345\215\225.xls"
+++ "b/VueWebApi/obj/Release/Package/PackageTmp/Excel/\347\224\250\346\210\267\346\270\205\345\215\225.xls"
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/Web.config b/VueWebApi/obj/Release/Package/PackageTmp/Web.config
index 5fae842..dba0b4b 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/Web.config
+++ b/VueWebApi/obj/Release/Package/PackageTmp/Web.config
@@ -25,7 +25,7 @@
<!--redis鏁版嵁搴撻摼鎺ラ厤缃鍙ｅ彿-->
<add key="RedisConnPort" value="6379" />
<!--key澶辨晥鏃堕棿30绉�-->
- <add key="RedisKeyTimeCont" value="120" />
+ <add key="RedisKeyTimeCont" value="7200" />
<!--Excel瀵煎嚭妯℃澘閰嶇疆IP-->
<add key="FileIP" value="http://121.196.36.24:8001/" />
<add key="webpages:Version" value="3.0.0.0" />
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
index 3f1833c..9ebbc28 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 77166fa..4c91755 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
+++ b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
@@ -1535,20 +1535,25 @@
<param name="files">涓婁紶鐢ㄦ埛娓呭崟瀵煎叆鏂囦欢</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.BasicSettingController.UserGroupSearch(System.Int32,System.Int32,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.BasicSettingController.UserGroupSearch(System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
<summary>
鐢ㄦ埛缁勫垪琛ㄦ煡璇�
</summary>
+ <param name="groupcode">鐝粍缂栫爜</param>
+ <param name="groupname">鐝粍鍚嶇О</param>
+ <param name="stu_torgcode">鎵�灞炵粍缁�</param>
+ <param name="description">鎵�灞炵粍缁囩被鍨�</param>
<param name="page">椤电爜</param>
<param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
<param name="prop">鎺掑簭瀛楁</param>
<param name="order">鎺掑簭瑙勫垯</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.BasicSettingController.UserGroupAdd(System.Collections.Generic.List{VueWebApi.Models.StepDefect})">
+ <member name="M:VueWebApi.Controllers.BasicSettingController.UserGroupAdd(System.String,System.Collections.Generic.List{VueWebApi.Models.GroupUser})">
<summary>
鐢ㄦ埛缁勬柊澧�
</summary>
+ <param name="type">鎻愪氦绫诲瀷(Add/Update)</param>
<param name="json">鐢ㄦ埛缁勬柊澧炴彁浜ゆ暟鎹�</param>
<returns></returns>
</member>
@@ -1557,6 +1562,13 @@
鐢ㄦ埛缁勫垹闄�
</summary>
<param name="UserGrupCode">鐢ㄦ埛缁勭紪鐮�</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.BasicSettingController.GroupUserProject(System.String)">
+ <summary>
+ 鐢ㄦ埛缁勬煡鐪嬪叧鑱斾汉鍛�
+ </summary>
+ <param name="groupcode">鐝粍缂栫爜</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.BasicSettingController.RoleTypeSearch(System.Int32,System.Int32,System.String,System.String)">
@@ -2506,12 +2518,13 @@
<param name="storagecode">搴撲綅缂栫爜</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ProductionManagementController.ErpOrderSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.ErpOrderSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
<summary>
ERP璁㈠崟鏌ヨ
</summary>
<param name="erporderstus">璁㈠崟鐘舵�佺爜</param>
<param name="erpordercode">璁㈠崟缂栧彿</param>
+ <param name="saleordercode">閿�鍞崟鍙�</param>
<param name="partcode">浜у搧缂栫爜</param>
<param name="partname">浜у搧鍚嶇О</param>
<param name="partspec">浜у搧瑙勬牸</param>
@@ -2539,13 +2552,14 @@
<param name="erpordercode">璁㈠崟鍙�</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderSearch(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.ProductionManagementController.MesOrderSearch(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>
MES宸ュ崟鏌ヨ
</summary>
<param name="mesorderstus">宸ュ崟鐘舵�佺爜</param>
<param name="mesordercode">宸ュ崟缂栧彿</param>
<param name="sourceorder">婧愬崟鍗曞彿</param>
+ <param name="saleordercode">閿�鍞崟鍙�</param>
<param name="ordertype">鍗曟嵁绫诲瀷</param>
<param name="partcode">浜у搧缂栫爜</param>
<param name="partname">浜у搧鍚嶇О</param>
@@ -2558,12 +2572,13 @@
<param name="order">鎺掑簭瑙勫垯</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ProductionManagementController.MesBadOrderSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.MesBadOrderSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
<summary>
MES鎶ュ簾琛ュ崟宸ュ崟鏌ヨ
</summary>
<param name="mesordercode">宸ュ崟缂栧彿</param>
<param name="sourceorder">婧愬崟鍗曞彿</param>
+ <param name="saleordercode">閿�鍞崟鍙�</param>
<param name="partcode">浜у搧缂栫爜</param>
<param name="partname">浜у搧鍚嶇О</param>
<param name="partspec">浜у搧瑙勬牸</param>
@@ -2710,7 +2725,7 @@
鐢熶骇寮�鎶ュ伐锛氬紑宸�(寮�濮�/鎶ュ伐)/澶栧崗(鍙戞枡/鏀舵枡)鏃舵潯浠跺垽鏂強鏁版嵁杩斿洖鎺ュ彛
</summary>
<param name="OperType">鎿嶄綔绫诲瀷锛氳嚜鍒�(ZZ)/澶栧崗(WX)</param>
- <param name="SelectType">鎿嶄綔绫诲瀷锛氬鍗忓彂鏂欐爣璇�(OUT)/澶栧崗鏀舵枡鏍囪瘑(IN)</param>
+ <param name="SelectType">鎿嶄綔绫诲瀷锛氳嚜鍒�(璁惧缂栫爜)/澶栧崗(鍙戞枡鏍囪瘑(OUT)/鏀舵枡鏍囪瘑(IN))</param>
<param name="orderstepqrcode">鎵弿浜岀淮鐮佷俊鎭�</param>
<param name="stu_torgcode">鎵�灞炵粍缁囩紪鐮�</param>
<returns></returns>
@@ -4609,11 +4624,12 @@
<param name="listId"></param>
<param name="func"></param>
</member>
- <member name="M:VueWebApi.Tools.ScanStartReport.ZZEncodingSeach(System.String,System.String,System.String)">
+ <member name="M:VueWebApi.Tools.ScanStartReport.ZZEncodingSeach(System.String,System.String,System.String,System.String)">
<summary>
鎵爜淇℃伅涓哄伐鍗�+宸ュ簭鏉＄爜
</summary>
<param name="stu_torgcode">鎵�灞炵粍缁囩紪鐮�</param>
+ <param name="SelectType">璁惧缂栫爜</param>
<param name="ordercode">宸ュ崟缂栧彿</param>
<param name="stepcode">宸ュ簭缂栫爜</param>
<returns></returns>
diff --git a/VueWebApi/obj/Release/TransformWebConfig/original/Web.config b/VueWebApi/obj/Release/TransformWebConfig/original/Web.config
index 11fc150..c303c1b 100644
--- a/VueWebApi/obj/Release/TransformWebConfig/original/Web.config
+++ b/VueWebApi/obj/Release/TransformWebConfig/original/Web.config
@@ -27,7 +27,7 @@
<!--redis鏁版嵁搴撻摼鎺ラ厤缃鍙ｅ彿-->
<add key="RedisConnPort" value="6379" />
<!--key澶辨晥鏃堕棿30绉�-->
- <add key="RedisKeyTimeCont" value="120" />
+ <add key="RedisKeyTimeCont" value="7200" />
<!--Excel瀵煎嚭妯℃澘閰嶇疆IP-->
<add key="FileIP" value="http://121.196.36.24:8001/" />
<add key="webpages:Version" value="3.0.0.0" />
diff --git a/VueWebApi/obj/Release/TransformWebConfig/transformed/Web.config b/VueWebApi/obj/Release/TransformWebConfig/transformed/Web.config
index 5fae842..dba0b4b 100644
--- a/VueWebApi/obj/Release/TransformWebConfig/transformed/Web.config
+++ b/VueWebApi/obj/Release/TransformWebConfig/transformed/Web.config
@@ -25,7 +25,7 @@
<!--redis鏁版嵁搴撻摼鎺ラ厤缃鍙ｅ彿-->
<add key="RedisConnPort" value="6379" />
<!--key澶辨晥鏃堕棿30绉�-->
- <add key="RedisKeyTimeCont" value="120" />
+ <add key="RedisKeyTimeCont" value="7200" />
<!--Excel瀵煎嚭妯℃澘閰嶇疆IP-->
<add key="FileIP" value="http://121.196.36.24:8001/" />
<add key="webpages:Version" value="3.0.0.0" />
diff --git a/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache b/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
index 2f7e79e..5c97c60 100644
--- a/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
+++ b/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
Binary files differ
diff --git a/VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache b/VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache
index a3d38b5..c61b86c 100644
--- a/VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache
+++ b/VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f33be2dbc254d5ea3b3ab81eb8f30c79df3c4fb3
+b2c2c9f06449485157f9db847892f5917c4115f5
diff --git a/VueWebApi/obj/Release/VueWebApi.pdb b/VueWebApi/obj/Release/VueWebApi.pdb
index 3f1833c..9ebbc28 100644
--- a/VueWebApi/obj/Release/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/VueWebApi.pdb
Binary files differ
--
Gitblit v1.9.3