From c1043376ada7e510eb53e64d76238cceb539eb45 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 07 三月 2023 17:19:44 +0800
Subject: [PATCH] App个人计件工资

---
 VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml |   34 ++++++++++++++++++++++++++++------
 1 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
index dc64f30..9c5037b 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
+++ b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
@@ -752,7 +752,7 @@
             <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)">
+        <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>
@@ -765,6 +765,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>
@@ -778,7 +779,7 @@
             <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)">
+        <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>
@@ -791,9 +792,10 @@
             <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,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>
@@ -806,13 +808,14 @@
             <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,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>
@@ -825,6 +828,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)">
@@ -2218,7 +2222,7 @@
             <param name="erpordercode">璁㈠崟鍙�</param>
             <returns></returns>
         </member>
-        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderSearch(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.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)">
             <summary>
             MES宸ュ崟鏌ヨ
             </summary>
@@ -2226,6 +2230,23 @@
             <param name="mesordercode">宸ュ崟缂栧彿</param>
             <param name="sourceorder">婧愬崟鍗曞彿</param>
             <param name="ordertype">鍗曟嵁绫诲瀷</param>
+            <param name="partcode">浜у搧缂栫爜</param>
+            <param name="partname">浜у搧鍚嶇О</param>
+            <param name="partspec">浜у搧瑙勬牸</param>
+            <param name="creatuser">鍒涘缓浜哄憳</param>
+            <param name="createdate">鍒涘缓鏃堕棿</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.ProductionManagementController.MesBadOrderSearch(System.Int32,System.Int32,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="partcode">浜у搧缂栫爜</param>
             <param name="partname">浜у搧鍚嶇О</param>
             <param name="partspec">浜у搧瑙勬牸</param>
@@ -2880,13 +2901,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>

--
Gitblit v1.9.3