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/Package/PackageTmp/bin/VueWebApi.xml | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
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>
--
Gitblit v1.9.3