From 9492f3e6c95c610e06a5dbbd03d8094ac1858f10 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 30 十一月 2022 14:22:40 +0800
Subject: [PATCH] 班组计件工资报表增加剔除工序(不参与计算)
---
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml | 280 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 269 insertions(+), 11 deletions(-)
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
index 690f94a..1525713 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
+++ b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
@@ -538,7 +538,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)">
+ <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)">
<summary>
鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ヨ
</summary>
@@ -550,6 +550,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,7 +564,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)">
+ <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)">
<summary>
鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ヨ
</summary>
@@ -575,6 +576,7 @@
<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)">
@@ -754,7 +756,7 @@
</summary>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.AppDeviceManageController.RepairScanDeviceQrCodeData">
+ <member name="M:VueWebApi.Controllers.AppDeviceManageController.RepairScanDeviceQrCodeDataList">
<summary>
璁惧缁翠慨鍒楄〃
</summary>
@@ -772,10 +774,11 @@
</summary>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.AppDeviceManageController.RepairVerificationScanDeviceDataSub(System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.AppDeviceManageController.RepairVerificationScanDeviceDataSub(System.String,System.String,System.String)">
<summary>
缁翠慨楠岃瘉璇︽儏淇℃伅
</summary>
+ <param name="repair_code">缁翠慨鍗曞彿</param>
<param name="eqpcode">璁惧缂栫爜</param>
<param name="wkshpcode">杞﹂棿缂栫爜</param>
<returns></returns>
@@ -804,6 +807,23 @@
<member name="M:VueWebApi.Controllers.AppDeviceManageController.AppDeviceAnDengCallSave(System.String,System.String,System.String,System.Collections.Generic.List{VueWebApi.Models.AnDnDate})">
<summary>
瀹夌伅鍛煎彨鎻愪氦
+ </summary>
+ <param name="username">鐧诲綍浜哄憳</param>
+ <param name="eqpcode">璁惧缂栫爜</param>
+ <param name="wkshpcode">杞﹂棿缂栫爜</param>
+ <param name="json">鎻愪氦鏁版嵁</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.AppDeviceManageController.AppDeviceAnDengLampResponseScanSearch(System.String)">
+ <summary>
+ 瀹夌伅鍝嶅簲鎵弿宸ヤ綅/璁惧
+ </summary>
+ <param name="eqpcode">璁惧/宸ヤ綅缂栫爜</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.AppDeviceManageController.AppDeviceAnDengLampResponseSave(System.String,System.String,System.String,System.Collections.Generic.List{VueWebApi.Models.ObjectData})">
+ <summary>
+ 瀹夌伅鍝嶅簲鎻愪氦
</summary>
<param name="username">鐧诲綍浜哄憳</param>
<param name="eqpcode">璁惧缂栫爜</param>
@@ -1066,14 +1086,10 @@
<param name="unitcode">寰�鏉ュ崟浣嶇紪鐮�</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.BasicSettingController.AnDengTypeSearch(System.Int32,System.Int32,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.BasicSettingController.AnDengTypeSearch">
<summary>
瀹夌伅绯荤粺/鑷畾涔夊畨鐏懠鍙被鍨嬫煡璇�
</summary>
- <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.AddUpdateAnDengType(System.Collections.Generic.List{VueWebApi.Models.ObjectData})">
@@ -1478,6 +1494,47 @@
<param name="repairresult">淇濆吇缁撴灉</param>
<returns></returns>
</member>
+ <member name="M:VueWebApi.Controllers.DeviceManagerController.DeviceUpdateSearch(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>
+ 璁惧缁翠慨璁板綍鏌ヨ
+ </summary>
+ <param name="page">椤电爜</param>
+ <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ <param name="prop">鎺掑簭瀛楁</param>
+ <param name="order">鎺掑簭瑙勫垯</param>
+ <param name="wkshopcode">杞﹂棿缂栫爜</param>
+ <param name="eqpcode">璁惧缂栫爜</param>
+ <param name="eqpname">璁惧鍚嶇О</param>
+ <param name="reportuser">鎶ヤ慨浜哄憳</param>
+ <param name="repairuser">缁翠慨浜哄憳</param>
+ <param name="vrifcatuser">楠岃瘉浜哄憳</param>
+ <param name="reportdate">鎶ヤ慨鏃堕棿</param>
+ <param name="repairdate">缁翠慨鏃堕棿</param>
+ <param name="vrifcatdate">楠岃瘉鏃堕棿</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.DeviceManagerController.DeviceUpdateSubSearch(System.String)">
+ <summary>
+ 璁惧缁翠慨璁板綍鏄庣粏鏌ヨ
+ </summary>
+ <param name="repair_code">璁惧缁翠慨鍗曞彿</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.DeviceManagerController.DeviceUpdateOutExcel(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="eqpcode">璁惧缂栫爜</param>
+ <param name="eqpname">璁惧鍚嶇О</param>
+ <param name="reportuser">鎶ヤ慨浜哄憳</param>
+ <param name="repairuser">缁翠慨浜哄憳</param>
+ <param name="vrifcatuser">楠岃瘉浜哄憳</param>
+ <param name="reportdate">鎶ヤ慨鏃堕棿</param>
+ <param name="repairdate">缁翠慨鏃堕棿</param>
+ <param name="vrifcatdate">楠岃瘉鏃堕棿</param>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Controllers.ErpSyncMesController.SeaveSearchUnit">
<summary>
鍒堕�犳ā鍨嬶細鍗曚綅鍚屾
@@ -1666,6 +1723,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鐢ㄦ埛鐧诲綍
@@ -1729,6 +1834,16 @@
<param name="userid">鐢ㄦ埛id</param>
<param name="usercode">鐢ㄦ埛缂栫爜</param>
<param name="username">鐢ㄦ埛鍚�</param>
+ <param name="usertype">鎿嶄綔绔疨C/APP</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.LoginController.LoginAppAnDonMessage(System.Int32,System.String,System.String,System.String)">
+ <summary>
+
+ </summary>
+ <param name="userid">鐢ㄦ埛id</param>
+ <param name="usercode">鐢ㄦ埛缂栫爜</param>
+ <param name="username">鐢ㄦ埛鍚嶇О</param>
<param name="usertype">鎿嶄綔绔疨C/APP</param>
<returns></returns>
</member>
@@ -2087,6 +2202,83 @@
<param name="dt">宸ュ崟鍙锋暟缁勫璞�</param>
<returns></returns>
</member>
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.CapacityPlanningSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String)">
+ <summary>
+ 浜ц兘瑙勫垝鏌ヨ
+ </summary>
+ <param name="page">椤电爜</param>
+ <param name="rows">椤垫暟</param>
+ <param name="prop">鎺掑簭瀛楁</param>
+ <param name="order">鎺掑簭瑙勫垯</param>
+ <param name="workshop">杞﹂棿缂栫爜</param>
+ <param name="devicetype">鐢熶骇鍗曞厓</param>
+ <param name="stustype">鏈夋晥鐘舵��</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.CapacityPlanSubmit(System.String,System.String,System.String,System.String,System.String)">
+ <summary>
+ 浜ц兘瑙勫垝榛樿鏂规淇濆瓨鎻愪氦
+ </summary>
+ <param name="captplanid">浜ц兘瑙勫垝(鐢熶骇璧勬簮)id</param>
+ <param name="wkshopcode">杞﹂棿缂栫爜</param>
+ <param name="capunitcode">鐢熶骇鍗曞厓缂栫爜</param>
+ <param name="capsetupcode">榛樿鏂规缂栫爜</param>
+ <param name="captplantype">璧勬簮绫诲瀷</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.CapacityPlanningCalendar(System.String)">
+ <summary>
+ 浜ц兘瑙勫垝鐐瑰嚮鏃ュ巻缁勪欢鏌ユ壘宸插叧鑱旂殑鏃ユ湡鏂规
+ </summary>
+ <param name="captplanid">浜ц兘瑙勫垝(鐢熶骇璧勬簮)id</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.CapacityPlanningOnclickSelect(System.String,System.String)">
+ <summary>
+ 浜ц兘瑙勫垝鏃ュ巻鍙屽嚮鏃跺甫鍑哄搴旂殑鏂规
+ </summary>
+ <param name="captplanid">浜ц兘瑙勫垝(鐢熶骇璧勬簮)id</param>
+ <param name="datetime">鍙屽嚮閫変腑鐨勬棩鏈�</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.CapacityPlanningGivePlanSubmit">
+ <summary>
+ 浜ц兘瑙勫垝宸ヤ綔鏃ュ巻閫夋嫨鎻愪氦
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.AdvancedSchedulingSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <summary>
+ 鑷姩鎺掔▼宸ュ崟鏌ヨ
+ </summary>
+ <param name="page">椤电爜</param>
+ <param name="rows">姣忛〉鏉℃暟</param>
+ <param name="prop">鎺掑簭瀛楁</param>
+ <param name="order">鎺掑簭瑙勫垯</param>
+ <param name="workshop">杞﹂棿缂栫爜</param>
+ <param name="wocode">鐢熶骇宸ュ崟鍙�</param>
+ <param name="partcode">鐗╂枡缂栫爜</param>
+ <param name="partname">鐗╂枡鍚嶇О</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.OnclickAdvancedSchedulingDevice(System.String,System.String,System.String,System.String,System.String,System.String)">
+ <summary>
+ 楂樼骇鎺掔▼鐐瑰嚮宸ュ崟浠诲姟甯﹀嚭鐡堕宸ュ簭璁惧銆佸凡鎺掔▼浠诲姟鏁版嵁
+ </summary>
+ <param name="wocode">宸ュ崟缂栧彿</param>
+ <param name="wkshpcode">杞﹂棿缂栫爜</param>
+ <param name="partcode">鐗╂枡缂栫爜</param>
+ <param name="botproccode">鐡堕宸ュ簭缂栫爜(棣栭亾宸ュ簭)</param>
+ <param name="startdate">寮�濮嬫棩鏈�</param>
+ <param name="enddate">缁撴潫鏃ユ湡</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.SubmitAlreadyScheduling">
+ <summary>
+ 鎺掔▼鏁版嵁鎻愪氦
+ </summary>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Controllers.ProductModelController.StockTypeSelect">
<summary>
瀛樿揣绫诲瀷鎺ュ彛
@@ -2201,6 +2393,51 @@
<param name="partcode">鐗╂枡缂栫爜</param>
<param name="defaultroute_code">榛樿宸ヨ壓璺嚎缂栫爜</param>
<param name="json">鎻愪氦鏁版嵁瀵硅薄</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ProductModelController.BoIventorySelect(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>
+ 鐗╂枡娓呭崟涓诲垪琛ㄦ煡璇�
+ </summary>
+ <param name="parentpartcode">姣嶄欢缂栫爜</param>
+ <param name="parentpartname">姣嶄欢鍚嶇О</param>
+ <param name="parentpartspec">姣嶄欢瑙勬牸</param>
+ <param name="status">鍚敤鐘舵��</param>
+ <param name="version">鐗堟湰鍙�</param>
+ <param name="createusername">鍒涘缓浜哄憳</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.ProductModelController.BoIventorySelectView(System.String)">
+ <summary>
+ 鐗╂枡娓呭崟缂栬緫鏄剧ず鍙婇瑙�
+ </summary>
+ <param name="bomid">Bom涓昏〃id</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ProductModelController.MaterielDetailedVsion(System.String)">
+ <summary>
+ 鐗╂枡娓呭崟鏂板鏃惰幏鍙栨渶澶х増鏈彿
+ </summary>
+ <param name="parentpartcode">姣嶄欢缂栫爜</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ProductModelController.AddUpdateBoIventory(Newtonsoft.Json.Linq.JObject)">
+ <summary>
+ 鐗╂枡娓呭崟鏂板/缂栬緫鎻愪氦
+ </summary>
+ <param name="obj">鎻愪氦鏁版嵁</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ProductModelController.DeleteBoIventory(System.String)">
+ <summary>
+ 鐗╂枡娓呭崟鍒犻櫎
+ </summary>
+ <param name="bomid">Bom涓昏〃id</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.ProductModelController.StepSelect">
@@ -2798,12 +3035,19 @@
<param name="sqlList"></param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Tools.DapperHelper.insertReturnId(System.String,System.Object,System.String)">
+ <member name="M:VueWebApi.Tools.DapperHelper.insertReturnId0(System.String,System.Object,System.String)">
<summary>
- Dapper鎻掑叆 杩斿洖鑷涓婚敭Id
+ Dapper鎻掑叆 杩斿洖鑷涓婚敭Id锛堝浠斤級
</summary>
<param name="sql"></param>
<param name="parameter"></param>
+ <param name="tableName">寰呮彃鍏ユ暟鎹殑琛ㄥ悕</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Tools.DapperHelper.insertReturnId(System.String)">
+ <summary>
+ Dapper鎻掑叆 杩斿洖鑷涓婚敭Id
+ </summary>
<param name="tableName">寰呮彃鍏ユ暟鎹殑琛ㄥ悕</param>
<returns></returns>
</member>
@@ -3045,6 +3289,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>
鑾峰彇鍗曞厓鏍肩被鍨�
@@ -3066,6 +3317,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