From 9c634fd767aec36ef97c3a814bf7a29c67d20ee1 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 29 三月 2024 10:57:35 +0800
Subject: [PATCH] 修改单据重复显示问题，增加工单源单id关联
---
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml | 356 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 315 insertions(+), 41 deletions(-)
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
index 8da5e0c..48fb92b 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
+++ b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
@@ -956,12 +956,13 @@
<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,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,System.String)">
<summary>
濮斿鎶ヨ〃璁板綍鏌ヨ
</summary>
<param name="wkshopcode">杞﹂棿缂栫爜</param>
<param name="wocode">宸ュ崟缂栧彿</param>
+ <param name="saleordercode">閿�鍞鍗曞彿</param>
<param name="partcode">浜у搧缂栫爜</param>
<param name="partname">浜у搧鍚嶇О</param>
<param name="partspec">瑙勬牸鍨嬪彿</param>
@@ -975,12 +976,13 @@
<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,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,System.String)">
<summary>
濮斿鎶ヨ〃璁板綍瀵煎嚭
</summary>
<param name="wkshopcode">杞﹂棿缂栫爜</param>
<param name="wocode">宸ュ崟缂栧彿</param>
+ <param name="saleordercode">閿�鍞鍗曞彿</param>
<param name="partcode">浜у搧缂栫爜</param>
<param name="partname">浜у搧鍚嶇О</param>
<param name="partspec">瑙勬牸鍨嬪彿</param>
@@ -990,13 +992,14 @@
<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,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,System.String)">
<summary>
鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ヨ
</summary>
<param name=" wkshopcode">杞﹂棿缂栫爜</param>
<param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
<param name="wocode">宸ュ崟缂栧彿</param>
+ <param name="saleordercode">閿�鍞鍗曞彿</param>
<param name="partcode">浜у搧缂栫爜</param>
<param name="partname">浜у搧鍚嶇О</param>
<param name="partspec">瑙勬牸鍨嬪彿</param>
@@ -1018,13 +1021,14 @@
<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,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,System.String)">
<summary>
鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ヨ
</summary>
<param name=" wkshopcode">杞﹂棿缂栫爜</param>
<param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
<param name="wocode">宸ュ崟缂栧彿</param>
+ <param name="saleordercode">閿�鍞鍗曞彿</param>
<param name="partcode">浜у搧缂栫爜</param>
<param name="partname">浜у搧鍚嶇О</param>
<param name="partspec">瑙勬牸鍨嬪彿</param>
@@ -1035,13 +1039,14 @@
<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,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,System.String)">
<summary>
浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃
</summary>
<param name=" wkshopcode">杞﹂棿缂栫爜</param>
<param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
<param name="wocode">宸ュ崟缂栧彿</param>
+ <param name="saleordercode">閿�鍞鍗曞彿</param>
<param name="partcode">浜у搧缂栫爜</param>
<param name="partname">浜у搧鍚嶇О</param>
<param name="partspec">瑙勬牸鍨嬪彿</param>
@@ -1056,13 +1061,14 @@
<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,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,System.String)">
<summary>
浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃瀵煎嚭
</summary>
<param name=" wkshopcode">杞﹂棿缂栫爜</param>
<param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
<param name="wocode">宸ュ崟缂栧彿</param>
+ <param name="saleordercode">閿�鍞鍗曞彿</param>
<param name="partcode">浜у搧缂栫爜</param>
<param name="partname">浜у搧鍚嶇О</param>
<param name="partspec">瑙勬牸鍨嬪彿</param>
@@ -1073,12 +1079,13 @@
<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,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,System.String)">
<summary>
涓嶈壇鏄庣粏鎶ヨ〃
</summary>
<param name=" wkshopcode">杞﹂棿缂栫爜</param>
<param name="wocode">宸ュ崟缂栧彿</param>
+ <param name="saleordercode">閿�鍞鍗曞彿</param>
<param name="partcode">浜у搧缂栫爜</param>
<param name="partname">浜у搧鍚嶇О</param>
<param name="partspec">瑙勬牸鍨嬪彿</param>
@@ -1093,12 +1100,13 @@
<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,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,System.String)">
<summary>
涓嶈壇鏄庣粏鎶ヨ〃瀵煎嚭
</summary>
<param name=" wkshopcode">杞﹂棿缂栫爜</param>
<param name="wocode">宸ュ崟缂栧彿</param>
+ <param name="saleordercode">閿�鍞鍗曞彿</param>
<param name="partcode">浜у搧缂栫爜</param>
<param name="partname">浜у搧鍚嶇О</param>
<param name="partspec">瑙勬牸鍨嬪彿</param>
@@ -1115,12 +1123,13 @@
</summary>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ReportManagerController.MaintenanceDetailsReportSearch(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.MaintenanceDetailsReportSearch(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="wocode">宸ュ崟缂栧彿</param>
+ <param name="saleordercode">閿�鍞鍗曞彿</param>
<param name="partcode">浜у搧缂栫爜</param>
<param name="partname">浜у搧鍚嶇О</param>
<param name="partspec">瑙勬牸鍨嬪彿</param>
@@ -1135,12 +1144,13 @@
<param name="order">鎺掑簭瑙勫垯</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ReportManagerController.MaintenanceDetailsReportExcelSearch(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.MaintenanceDetailsReportExcelSearch(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="saleordercode">閿�鍞鍗曞彿</param>
<param name="partcode">浜у搧缂栫爜</param>
<param name="partname">浜у搧鍚嶇О</param>
<param name="partspec">瑙勬牸鍨嬪彿</param>
@@ -1235,13 +1245,14 @@
<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,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,System.String)">
<summary>
鐢熶骇杩涘害鎶ヨ〃
</summary>
<param name="wkshopcode">杞﹂棿缂栫爜</param>
<param name="status">宸ュ崟鐘舵��</param>
<param name="wocode">宸ュ崟缂栧彿</param>
+ <param name="saleordercode">閿�鍞鍗曞彿</param>
<param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
<param name="routename">宸ヨ壓璺嚎鍚嶇О</param>
<param name="partcode">浜у搧缂栫爜</param>
@@ -1254,13 +1265,14 @@
<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,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,System.String)">
<summary>
鐢熶骇杩涘害鎶ヨ〃瀵煎嚭
</summary>
<param name="wkshopcode">杞﹂棿缂栫爜</param>
<param name="status">宸ュ崟鐘舵��</param>
<param name="wocode">宸ュ崟缂栧彿</param>
+ <param name="saleordercode">閿�鍞鍗曞彿</param>
<param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
<param name="routename">宸ヨ壓璺嚎鍚嶇О</param>
<param name="partcode">浜у搧缂栫爜</param>
@@ -1535,20 +1547,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 +1574,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)">
@@ -2261,85 +2285,107 @@
</member>
<member name="M:VueWebApi.Controllers.KanBanManagerentController.ShopSearch">
<summary>
- 澶у矝杞﹂棿缁煎悎鐪嬫澘,鑾峰彇鐢熶骇杞﹂棿
+ 姝ｆ竻鍜岃溅闂寸湅鏉�,鑾峰彇鐢熶骇杞﹂棿
</summary>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.KanBanManagerentController.LineSearchTopLeftData(System.String)">
<summary>
- 澶у矝杞﹂棿缁煎悎鐪嬫澘,宸︿笂浜х嚎鍔犲伐浠诲姟鎺ュ彛
+ 姝ｆ竻鍜岃溅闂寸湅鏉�,宸︿笂浜х嚎鍔犲伐浠诲姟鎺ュ彛
</summary>
<param name="shopcode">杞﹂棿缂栫爜</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.KanBanManagerentController.LineSearchBottomLeftData(System.String)">
<summary>
- 澶у矝杞﹂棿缁煎悎鐪嬫澘,宸︿笅鍒楄〃鎺ュ彛
+ 姝ｆ竻鍜岃溅闂寸湅鏉�,宸︿笅鍒楄〃鎺ュ彛
</summary>
<param name="shopcode">杞﹂棿缂栫爜</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.KanBanManagerentController.LineSearchTopRightData(System.String)">
<summary>
- 澶у矝杞﹂棿缁煎悎鐪嬫澘,鍙充笂top鎺掕鎺ュ彛
+ 姝ｆ竻鍜岃溅闂寸湅鏉�,鍙充笂top鎺掕鎺ュ彛
</summary>
<param name="shopcode">杞﹂棿缂栫爜</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.KanBanManagerentController.LineSearchBottomRightData(System.String)">
<summary>
- 澶у矝杞﹂棿缁煎悎鐪嬫澘,鍙充笅top鎺掕鎺ュ彛
+ 姝ｆ竻鍜岃溅闂寸湅鏉�,鍙充笅top鎺掕鎺ュ彛
</summary>
<param name="shopcode">杞﹂棿缂栫爜</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.KanBanManagerentController.PurchaseLeftTop">
+ <member name="M:VueWebApi.Controllers.KanBanManagerentController.QCBadTop(System.String)">
<summary>
- 閲囪喘璁㈠崟璺熻釜绠＄悊鐪嬫澘,宸︿笂鏈湀閲囪喘璁㈠崟鏁般�佹湰鏈堥噰璐繘璐у崟鏁般�佹湰鏈堥噰璐叆搴撳崟鏁�
+ 姝ｆ竻鍜岃溅闂磋川閲忔暟瀛楀寲鐪嬫澘,宸︿笂top5涓嶈壇
</summary>
+ <param name="wkshopcode">杞﹂棿缂栫爜瀛楃涓查泦</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.KanBanManagerentController.PurchaseLeftBottom">
+ <member name="M:VueWebApi.Controllers.KanBanManagerentController.QCBadCenterLeftWeek(System.String)">
<summary>
- 閲囪喘璁㈠崟璺熻釜绠＄悊鐪嬫澘,宸︿笅閲囪喘璁㈠崟璺熻釜鍒楄〃
+ 姝ｆ竻鍜岃溅闂磋川閲忔暟瀛楀寲鐪嬫澘,宸︿腑鍛ㄤ笉鑹秼鍔�
</summary>
+ <param name="wkshopcode">杞﹂棿缂栫爜瀛楃涓查泦</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.KanBanManagerentController.PurchaseRight">
+ <member name="M:VueWebApi.Controllers.KanBanManagerentController.QCBadCenterRightWeek(System.String)">
<summary>
- 閲囪喘璁㈠崟璺熻釜绠＄悊鐪嬫澘,鍙充晶Top
+ 姝ｆ竻鍜岃溅闂磋川閲忔暟瀛楀寲鐪嬫澘,鍙充腑鍛ㄥ畬鎴愭暟/鐜�
</summary>
+ <param name="wkshopcode">杞﹂棿缂栫爜瀛楃涓查泦</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.KanBanManagerentController.QCBadBottomWeek(System.String)">
+ <summary>
+ 姝ｆ竻鍜岃溅闂磋川閲忔暟瀛楀寲鐪嬫澘,涓嬩换鍔¤繘搴�
+ </summary>
+ <param name="wkshopcode">杞﹂棿缂栫爜瀛楃涓查泦</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.KanBanManagerentController.WareHouseTopLeftData">
<summary>
- 澶у矝浠撳簱鐪嬫澘,宸︿笂浜у搧寰呭叆搴撳垪琛�
+ 姝ｆ竻鍜屼粨搴撶湅鏉�,宸︿笂浜у搧寰呭叆搴撳垪琛�
</summary>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.KanBanManagerentController.WareHouseTopBottomData">
<summary>
- 澶у矝浠撳簱鐪嬫澘,宸︿笅浜у搧寰呭彂璐у垪琛�
+ 姝ｆ竻鍜屼粨搴撶湅鏉�,宸︿笅浜у搧寰呭彂璐у垪琛�
</summary>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.KanBanManagerentController.WareHouseRightTopData">
<summary>
- 澶у矝浠撳簱鐪嬫澘,鍙充笂鎴愬搧搴撱�佸崐鎴愬搧搴搕op5搴撳瓨鎺掕
+ 姝ｆ竻鍜屼粨搴撶湅鏉�,鍙充笂鎴愬搧搴撱�佸崐鎴愬搧搴搕op5搴撳瓨鎺掕
</summary>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.KanBanManagerentController.WareHouseRightBottomData">
<summary>
- 澶у矝浠撳簱鐪嬫澘,鍙充笅鍘熸枡搴撳簱top5搴撳瓨鎺掕
+ 姝ｆ竻鍜屼粨搴撶湅鏉�,鍙充笅鍘熸枡搴撳簱top5搴撳瓨鎺掕
</summary>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.KanBanManagerentController.WkspReportNotice(System.String)">
+ <member name="M:VueWebApi.Controllers.KanBanManagerentController.WorkShopCompreLeftTop(System.String)">
<summary>
- 杞﹂棿鐪嬫澘鍏憡
+ 姝ｆ竻鍜岃溅闂寸患鍚堢湅鏉�,宸︿笂鐢熶骇璁㈠崟
</summary>
- <param name="shopcode">杞﹂棿缂栫爜</param>
+ <param name="wkshopcode">杞﹂棿缂栫爜瀛楃涓查泦</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.KanBanManagerentController.WorkShopCompreRightTop">
+ <summary>
+ 姝ｆ竻鍜岃溅闂寸患鍚堢湅鏉�,鍙充笂閿�鍞鍗�
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.KanBanManagerentController.WorkShopCompreRightBottom">
+ <summary>
+ 姝ｆ竻鍜岃溅闂寸患鍚堢湅鏉�,鍙充笅搴撳瓨
+ </summary>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.LoginController.LoginSave(System.String,System.String,System.String)">
@@ -2506,12 +2552,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>
@@ -2531,6 +2578,13 @@
<param name="obj">鎻愪氦鏁版嵁</param>
<returns></returns>
</member>
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.MarkBatchSaveErpOrder(System.Collections.Generic.List{VueWebApi.Models.ErpOrderBatch})">
+ <summary>
+ ERP璁㈠崟鎵归噺涓嬭揪
+ </summary>
+ <param name="obj">鎻愪氦鏁版嵁</param>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Controllers.ProductionManagementController.ClosedErpOrder(System.String,System.String)">
<summary>
ERP璁㈠崟鍏抽棴
@@ -2539,13 +2593,22 @@
<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.DeleteErpOrder(System.String,System.String)">
+ <summary>
+ ERP璁㈠崟鍒犻櫎
+ </summary>
+ <param name="erporderid">璁㈠崟id</param>
+ <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,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 +2621,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>
@@ -2604,13 +2668,14 @@
<param name="partnumber">浜у搧缂栫爜</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ProductionManagementController.SelectRouteOrWkshop(System.String,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.SelectRouteOrWkshop(System.String,System.String,System.String,System.String)">
<summary>
宸ュ崟娲惧彂閫夋嫨宸ヨ壓璺嚎鎴栭�夋嫨鐢熶骇杞﹂棿鏃跺垽鏂粦瀹氭潯浠�
</summary>
<param name="partcode">浜у搧缂栫爜</param>
<param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
<param name="wkshopcode">杞﹂棿缂栫爜</param>
+ <param name="is_steprice">鏄惁宸ヤ环绠℃帶</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.ProductionManagementController.AddMesOrderCodeSearch">
@@ -2651,6 +2716,13 @@
<param name="wo_code">宸ュ崟缂栧彿</param>
<returns></returns>
</member>
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.UpdateMesOrderPrintCount(System.String)">
+ <summary>
+ MES宸ュ崟鎵撳嵃鏇存柊鎵撳嵃娆℃暟
+ </summary>
+ <param name="wo_code">宸ュ崟缂栧彿</param>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderStepEqpSearch(System.String)">
<summary>
鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇褰撳墠宸ュ簭瀵瑰簲鐨勮澶�(鑷埗)
@@ -2665,11 +2737,15 @@
<param name="orderstepqrcode">鎵弿鐨勪簩缁寸爜淇℃伅</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderStepSearch(System.String,System.Int32,System.Int32,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderStepSearch(System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
<summary>
鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇宸ュ崟瀵瑰簲宸ュ簭浠诲姟(鑷埗)
</summary>
- <param name="orderstepqrcode">鎵弿鐨勪簩缁寸爜淇℃伅</param>
+ <param name="wocode">宸ュ崟鍙�</param>
+ <param name="saleOrderCode">閿�鍞鍗曞彿</param>
+ <param name="partcode">浜у搧缂栫爜</param>
+ <param name="partname">浜у搧鍚嶇О</param>
+ <param name="partspec">瑙勬牸鍨嬪彿</param>
<param name="page">椤电爜</param>
<param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
<param name="prop">鎺掑簭瀛楁</param>
@@ -2710,7 +2786,7 @@
鐢熶骇寮�鎶ュ伐锛氬紑宸�(寮�濮�/鎶ュ伐)/澶栧崗(鍙戞枡/鏀舵枡)鏃舵潯浠跺垽鏂強鏁版嵁杩斿洖鎺ュ彛
</summary>
<param name="OperType">鎿嶄綔绫诲瀷锛氳嚜鍒�(ZZ)/澶栧崗(WX)</param>
- <param name="SelectType">鎿嶄綔绫诲瀷锛氬鍗忓彂鏂欐爣璇�(OUT)/澶栧崗鏀舵枡鏍囪瘑(IN)</param>
+ <param name="SelectType">鎿嶄綔绫诲瀷锛氳嚜鍒�(寮�宸�(START)/鎶ュ伐(REPORT))/澶栧崗(鍙戞枡鏍囪瘑(OUT)/鏀舵枡鏍囪瘑(IN))</param>
<param name="orderstepqrcode">鎵弿浜岀淮鐮佷俊鎭�</param>
<param name="stu_torgcode">鎵�灞炵粍缁囩紪鐮�</param>
<returns></returns>
@@ -2815,13 +2891,14 @@
</summary>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderBitchClosedSearch(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)">
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderBitchClosedSearch(System.String,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>
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>
@@ -3197,6 +3274,25 @@
宸ヨ壓璺嚎鍒犻櫎
</summary>
<param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ProductModelController.RputeInventorySearch(System.String,System.String,System.String,System.String,System.String,System.String)">
+ <summary>
+ 宸ヨ壓璺嚎鍏宠仈浜у搧鏌ヨ
+ </summary>
+ <param name="partcode">鐗╂枡缂栫爜</param>
+ <param name="partname">鐗╂枡鍚嶇О</param>
+ <param name="partspec">鐗╂枡瑙勬牸</param>
+ <param name="stocktypecode">瀛樿揣绫诲瀷缂栫爜</param>
+ <param name="materialtypecode">鐗╂枡绫诲瀷缂栫爜</param>
+ <param name="storehousecode">鎵�灞炰粨搴撶紪鐮�</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ProductModelController.RouteBatchPartSave(Newtonsoft.Json.Linq.JObject)">
+ <summary>
+ 宸ヨ壓璺嚎鎵归噺鎸囧畾鐗╂枡淇濆瓨
+ </summary>
+ <param name="obj">鎻愪氦鏁版嵁</param>
<returns></returns>
</member>
<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)">
@@ -3827,6 +3923,183 @@
<summary>
缁撴潫鏃ユ湡
</summary>
+ </member>
+ <member name="P:VueWebApi.Models.ErpOrderBatch.erporderid">
+ <summary>
+ 璁㈠崟id
+ </summary>
+ </member>
+ <member name="P:VueWebApi.Models.ErpOrderBatch.erpordercode">
+ <summary>
+ 璁㈠崟缂栧彿
+ </summary>
+ </member>
+ <member name="P:VueWebApi.Models.ErpOrderBatch.saleordercode">
+ <summary>
+ 閿�鍞鍗曠紪鍙�
+ </summary>
+ </member>
+ <member name="P:VueWebApi.Models.ErpOrderBatch.partcode">
+ <summary>
+ 浜у搧缂栫爜
+ </summary>
+ </member>
+ <member name="P:VueWebApi.Models.ErpOrderBatch.wkshopcode">
+ <summary>
+ 杞﹂棿缂栫爜
+ </summary>
+ </member>
+ <member name="P:VueWebApi.Models.ErpOrderBatch.warehousecode">
+ <summary>
+ 浠撳簱缂栫爜
+ </summary>
+ </member>
+ <member name="P:VueWebApi.Models.ErpOrderBatch.erpqty">
+ <summary>
+ 璁㈠崟鏁伴噺
+ </summary>
+ </member>
+ <member name="P:VueWebApi.Models.ErpOrderBatch.markqty">
+ <summary>
+ 涓嬪崟鏁伴噺
+ </summary>
+ </member>
+ <member name="P:VueWebApi.Models.ErpOrderBatch.ordernum">
+ <summary>
+ 涓嬪崟鍗曟暟
+ </summary>
+ </member>
+ <member name="P:VueWebApi.Models.ErpOrderBatch.relse_qty">
+ <summary>
+ 宸蹭笅鍗曟暟閲�
+ </summary>
+ </member>
+ <member name="P:VueWebApi.Models.ErpOrderBatch.saleOrderDeliveryDate">
+ <summary>
+ 浜や粯鏃堕棿
+ </summary>
+ </member>
+ <member name="M:VueWebApi.TimeTick.QuartzUtil.AddJob``1(System.String,System.String,System.Collections.Generic.Dictionary{System.String,System.Object})">
+ <summary>
+ 娣诲姞Job 骞朵笖浠ュ畾鐐圭殑褰㈠紡杩愯
+ </summary>
+ <typeparam name="T"></typeparam>
+ <param name="JobName"></param>
+ <param name="CronTime"></param>
+ <param name="jobDataMap"></param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.TimeTick.QuartzUtil.AddJob``1(System.String,System.String)">
+ <summary>
+ 娣诲姞Job 骞朵笖浠ュ畾鐐圭殑褰㈠紡杩愯
+ </summary>
+ <typeparam name="T"></typeparam>
+ <param name="JobName"></param>
+ <param name="CronTime"></param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.TimeTick.QuartzUtil.AddJob``1(System.String,System.DateTimeOffset,System.DateTimeOffset,System.Int32)">
+ <summary>
+ 娣诲姞Job 骞朵笖浠ュ懆鏈熺殑褰㈠紡杩愯
+ </summary>
+ <typeparam name="T"></typeparam>
+ <param name="JobName"></param>
+ <param name="StartTime"></param>
+ <param name="EndTime"></param>
+ <param name="SimpleTime">姣鏁�</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.TimeTick.QuartzUtil.AddJob``1(System.String,System.DateTimeOffset,System.DateTimeOffset,System.TimeSpan)">
+ <summary>
+ 娣诲姞Job 骞朵笖浠ュ懆鏈熺殑褰㈠紡杩愯
+ </summary>
+ <typeparam name="T"></typeparam>
+ <param name="JobName"></param>
+ <param name="StartTime"></param>
+ <param name="EndTime"></param>
+ <param name="SimpleTime"></param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.TimeTick.QuartzUtil.AddJob``1(System.String,System.DateTimeOffset,System.DateTimeOffset,System.Int32,System.String,System.Object)">
+ <summary>
+ 娣诲姞Job 骞朵笖浠ュ懆鏈熺殑褰㈠紡杩愯
+ </summary>
+ <typeparam name="T"></typeparam>
+ <param name="JobName"></param>
+ <param name="StartTime"></param>
+ <param name="EndTime"></param>
+ <param name="SimpleTime">姣鏁�</param>
+ <param name="jobDataMap"></param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.TimeTick.QuartzUtil.AddJob``1(System.String,System.DateTimeOffset,System.DateTimeOffset,System.TimeSpan,System.Collections.Generic.Dictionary{System.String,System.Object})">
+ <summary>
+ 娣诲姞Job 骞朵笖浠ュ懆鏈熺殑褰㈠紡杩愯
+ </summary>
+ <typeparam name="T"></typeparam>
+ <param name="JobName"></param>
+ <param name="StartTime"></param>
+ <param name="EndTime"></param>
+ <param name="SimpleTime"></param>
+ <param name="jobDataMap"></param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.TimeTick.QuartzUtil.UpdateTime(System.String,System.String)">
+ <summary>
+ 淇敼瑙﹀彂鍣ㄦ椂闂�,闇�瑕乯ob鍚�,浠ュ強淇敼缁撴灉
+ CronTriggerImpl绫诲瀷瑙﹀彂鍣�
+ </summary>
+ </member>
+ <member name="M:VueWebApi.TimeTick.QuartzUtil.UpdateTime(System.String,System.Int32)">
+ <summary>
+ 淇敼瑙﹀彂鍣ㄦ椂闂�,闇�瑕乯ob鍚�,浠ュ強淇敼缁撴灉
+ SimpleTriggerImpl绫诲瀷瑙﹀彂鍣�
+ </summary>
+ <param name="jobName"></param>
+ <param name="SimpleTime">鍒嗛挓鏁�</param>
+ </member>
+ <member name="M:VueWebApi.TimeTick.QuartzUtil.UpdateTime(System.String,System.TimeSpan)">
+ <summary>
+ 淇敼瑙﹀彂鍣ㄦ椂闂�,闇�瑕乯ob鍚�,浠ュ強淇敼缁撴灉
+ SimpleTriggerImpl绫诲瀷瑙﹀彂鍣�
+ </summary>
+ </member>
+ <member name="M:VueWebApi.TimeTick.QuartzUtil.PauseAll">
+ <summary>
+ 鏆傚仠鎵�鏈塉ob
+ 鏆傚仠鍔熻兘Quartz鎻愪緵鏈夊緢澶�,浠ュ悗鍙墿鍏�
+ </summary>
+ </member>
+ <member name="M:VueWebApi.TimeTick.QuartzUtil.ResumeAll">
+ <summary>
+ 鎭㈠鎵�鏈塉ob
+ 鎭㈠鍔熻兘Quartz鎻愪緵鏈夊緢澶�,浠ュ悗鍙墿鍏�
+ </summary>
+ </member>
+ <member name="M:VueWebApi.TimeTick.QuartzUtil.DeleteJob(System.String)">
+ <summary>
+ 鍒犻櫎Job
+ 鍒犻櫎鍔熻兘Quartz鎻愪緵鏈夊緢澶�,浠ュ悗鍙墿鍏�
+ </summary>
+ <param name="JobName"></param>
+ </member>
+ <member name="M:VueWebApi.TimeTick.QuartzUtil.Shutdown(System.Boolean)">
+ <summary>
+ 鍗歌浇瀹氭椂鍣�
+ </summary>
+ <param name="waitForJobsToComplete">鏄惁绛夊緟job鎵ц瀹屾垚</param>
+ </member>
+ <member name="M:VueWebApi.TimeTick.QuartzUtil.CheckExist(System.String)">
+ <summary>
+ 鍒ゆ柇浠诲姟鏄惁宸茬粡寤虹珛
+ </summary>
+ <param name="jobName">浠诲姟鍚�</param>
+ </member>
+ <member name="M:VueWebApi.TimeTick.QuartzUtil.CheckSimpleExist(System.String)">
+ <summary>
+ 鍒ゆ柇绠�鍗曚换鍔℃槸鍚﹀凡缁忓缓绔�
+ </summary>
+ <param name="jobName">浠诲姟鍚�</param>
</member>
<member name="M:VueWebApi.Tools.AppLableBarCode.EncodingSeach(System.String,System.String,System.String,System.String)">
<summary>
@@ -4487,11 +4760,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">鎿嶄綔绫诲瀷(寮�宸ワ細START銆佹姤宸ワ細REPORT)</param>
<param name="ordercode">宸ュ崟缂栧彿</param>
<param name="stepcode">宸ュ簭缂栫爜</param>
<returns></returns>
--
Gitblit v1.9.3