From 04a14d3a56f9a64668a920e2dfe21d2a7daf89b3 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 06 三月 2023 16:37:42 +0800
Subject: [PATCH] 1.节拍工价新增、编辑加工价类型字段区分自制、外协 2.工序编辑，工序类型切换保存时删除对应节拍工价表 3.工单派发时判断区分自制、外协工序 4.计件工资报表增加剔除工序参数
---
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml | 90 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 85 insertions(+), 5 deletions(-)
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
index 6944b9e..55eab45 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
+++ b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
@@ -538,10 +538,11 @@
<param name="receivdate">鏀舵枡鏃堕棿</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ReportManagerController.GroupSalaryReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <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)">
<summary>
鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ヨ
</summary>
+ <param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
<param name="wocode">宸ュ崟缂栧彿</param>
<param name="partcode">浜у搧缂栫爜</param>
<param name="partname">浜у搧鍚嶇О</param>
@@ -550,6 +551,7 @@
<param name="groupcode">鐢熶骇鐝粍</param>
<param name="username">鎿嶄綔浜哄憳</param>
<param name="operdate">鎿嶄綔鏃堕棿</param>
+ <param name="rejectstepcode">鍓旈櫎宸ュ簭(鍥哄畾钖祫宸ュ簭涓嶅弬涓庤绠�)</param>
<param name="page">椤电爜</param>
<param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
<param name="prop">鎺掑簭瀛楁</param>
@@ -563,10 +565,11 @@
<param name="id">鎶ュ伐璁板綍涓昏〃id</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ReportManagerController.GroupSalaryReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <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)">
<summary>
鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ヨ
</summary>
+ <param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
<param name="wocode">宸ュ崟缂栧彿</param>
<param name="partcode">浜у搧缂栫爜</param>
<param name="partname">浜у搧鍚嶇О</param>
@@ -575,12 +578,14 @@
<param name="groupcode">鐢熶骇鐝粍</param>
<param name="username">鎿嶄綔浜哄憳</param>
<param name="operdate">鎿嶄綔鏃堕棿</param>
+ <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)">
+ <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)">
<summary>
浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃
</summary>
+ <param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
<param name="wocode">宸ュ崟缂栧彿</param>
<param name="partcode">浜у搧缂栫爜</param>
<param name="partname">浜у搧鍚嶇О</param>
@@ -589,16 +594,18 @@
<param name="groupcode">鐢熶骇鐝粍</param>
<param name="reportname">鎶ュ伐浜哄憳</param>
<param name="reportdate">鎶ュ伐鏃堕棿</param>
+ <param name = "rejectstepcode" > 鍓旈櫎宸ュ簭(鍥哄畾钖祫宸ュ簭涓嶅弬涓庤绠�) </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.ReportManagerController.PeopleSalaryReportExcelSearch(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)">
<summary>
浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃瀵煎嚭
</summary>
+ <param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
<param name="wocode">宸ュ崟缂栧彿</param>
<param name="partcode">浜у搧缂栫爜</param>
<param name="partname">浜у搧鍚嶇О</param>
@@ -607,6 +614,7 @@
<param name="groupcode">鐢熶骇鐝粍</param>
<param name="reportname">鎶ュ伐浜哄憳</param>
<param name="reportdate">鎶ュ伐鏃堕棿</param>
+ <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)">
@@ -1721,6 +1729,54 @@
<param name="shopcode">杞﹂棿缂栫爜</param>
<returns></returns>
</member>
+ <member name="M:VueWebApi.Controllers.KanBanManagerentController.WkshpLineData(System.String)">
+ <summary>
+ 瀵屽皵杈捐溅闂寸敓浜ф暟瀛楀寲鐪嬫澘锛屼骇绾挎暟鎹�
+ </summary>
+ <param name="LineCode">浜х嚎缂栫爜</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.KanBanManagerentController.WkshpContentData">
+ <summary>
+ 瀵屽皵杈捐溅闂寸敓浜ф暟瀛楀寲鐪嬫澘锛岀敓浜т俊鎭�
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.KanBanManagerentController.BadTop5(System.String)">
+ <summary>
+ 瀵屽皵杈捐溅闂磋川閲忔暟瀛楀寲鐪嬫澘,top5涓嶈壇
+ </summary>
+ <param name="StepCode">宸ュ簭缂栫爜(璐ㄦ宸ュ簭)</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.KanBanManagerentController.BadWeek(System.String)">
+ <summary>
+ 瀵屽皵杈捐溅闂磋川閲忔暟瀛楀寲鐪嬫澘,鍛ㄤ笉鑹秼鍔�
+ </summary>
+ <param name="StepCode">宸ュ簭缂栫爜(璐ㄦ宸ュ簭)</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.KanBanManagerentController.BadDayDistriBute(System.String)">
+ <summary>
+ 瀵屽皵杈捐溅闂磋川閲忔暟瀛楀寲鐪嬫澘,鏃ヤ笉鑹垎甯�
+ </summary>
+ <param name="StepCode">宸ュ簭缂栫爜(璐ㄦ宸ュ簭)</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.KanBanManagerentController.BadWeekDistriBute(System.String)">
+ <summary>
+ 瀵屽皵杈捐溅闂磋川閲忔暟瀛楀寲鐪嬫澘,鍛ㄤ笉鑹垎甯�
+ </summary>
+ <param name="StepCode">宸ュ簭缂栫爜(璐ㄦ宸ュ簭)</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.KanBanManagerentController.BadContManger(System.String)">
+ <summary>
+ 瀵屽皵杈捐溅闂磋川閲忔暟瀛楀寲鐪嬫澘,涓嶈壇鏄庣粏
+ </summary>
+ <param name="StepCode">宸ュ簭缂栫爜(璐ㄦ宸ュ簭)</param>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Controllers.LoginController.LoginSave(System.String,System.String,System.String)">
<summary>
PC鐢ㄦ埛鐧诲綍
@@ -1932,6 +1988,15 @@
鏍规嵁閫夋嫨宸ヨ壓璺嚎鏌ョ湅宸ュ簭鎺ュ彛
</summary>
<param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.SelectRouteOrWkshop(System.String,System.String,System.String)">
+ <summary>
+ 宸ュ崟娲惧彂閫夋嫨宸ヨ壓璺嚎鎴栭�夋嫨鐢熶骇杞﹂棿鏃跺垽鏂粦瀹氭潯浠�
+ </summary>
+ <param name="partcode">浜у搧缂栫爜</param>
+ <param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
+ <param name="wkshopcode">杞﹂棿缂栫爜</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.ProductionManagementController.AddUpdateMesOrder(Newtonsoft.Json.Linq.JObject)">
@@ -2519,13 +2584,14 @@
<param name="stepcode">宸ュ簭缂栫爜</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ProductModelController.StepSelectEqpList(System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.ProductModelController.StepSelectEqpList(System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
<summary>
鏍规嵁宸ュ簭绾跨紪鐮佹煡鎵惧叧鑱旇澶囧垪琛ㄩ泦鍚�
</summary>
<param name="partcode">浜у搧缂栫爜</param>
<param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
<param name="stepcode">宸ュ簭缂栫爜</param>
+ <param name="steptype">宸ュ簭绫诲瀷</param>
<param name="page">椤电爜</param>
<param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
<param name="prop">鎺掑簭瀛楁</param>
@@ -3239,6 +3305,13 @@
<param name="file">瀵煎叆璺緞(鍖呭惈鏂囦欢鍚嶄笌鎵╁睍鍚�)</param>
<returns></returns>
</member>
+ <member name="M:VueWebApi.Tools.ImportExcel.ExcelToThreeTableList(System.String)">
+ <summary>
+ Excel 3涓猄heet瀵煎叆鎴怐atable
+ </summary>
+ <param name="file">瀵煎叆璺緞(鍖呭惈鏂囦欢鍚嶄笌鎵╁睍鍚�)</param>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Tools.ImportExcel.GetCellValue(NPOI.SS.UserModel.ICell)">
<summary>
鑾峰彇鍗曞厓鏍肩被鍨�
@@ -3260,6 +3333,13 @@
<param name="file">瀵煎叆璺緞(鍖呭惈鏂囦欢鍚嶄笌鎵╁睍鍚�)</param>
<returns></returns>
</member>
+ <member name="M:VueWebApi.Tools.ImportExcel.ExcelToThreeTableListErro(System.String)">
+ <summary>
+ Excel 3涓猄heet 鏁版嵁楠岃瘉
+ </summary>
+ <param name="file">瀵煎叆璺緞(鍖呭惈鏂囦欢鍚嶄笌鎵╁睍鍚�)</param>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Tools.LogHelper.WriteLog(System.Exception)">
<summary>
杈撳嚭鏃ュ織鍒癓og4Net
--
Gitblit v1.9.3