From 11f8321434ede074d8f6e902b0049a56bcff3bd8 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 06 三月 2023 16:34:10 +0800
Subject: [PATCH] 1.节拍工价新增、编辑加工价类型字段区分自制、外协 2.工序编辑，工序类型切换保存时删除对应节拍工价表 3.工单派发时判断区分自制、外协工序 4.计件工资报表增加剔除工序参数
---
VueWebApi/bin/VueWebApi.xml | 77 +++++++++++++++++++++++++++++++++++---
1 files changed, 71 insertions(+), 6 deletions(-)
diff --git a/VueWebApi/bin/VueWebApi.xml b/VueWebApi/bin/VueWebApi.xml
index ce653ca..412d54e 100644
--- a/VueWebApi/bin/VueWebApi.xml
+++ b/VueWebApi/bin/VueWebApi.xml
@@ -629,9 +629,23 @@
閲囪喘鍒拌揣锛氭彁浜�
</summary>
<param name="purordercode">閲囪喘璁㈠崟鍙�</param>
- <param name="orderstaus">鍗曟嵁鐘舵��</param>
+ <param name="orderstaus">鍗曟嵁鐘舵��:BINARIVE(閮ㄥ垎鍒拌揣)銆両NARIVE(宸插埌璐�)</param>
<param name="username">鎿嶄綔浜哄憳</param>
<param name="json">鍒拌揣鐗╂枡淇℃伅</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.AppQualityManagementController.InFactoryCheckScanLabCode(System.String)">
+ <summary>
+ 鍏ュ巶妫�楠�,鎵弿閲囪喘鍒拌揣鐢熸垚鏍囩
+ </summary>
+ <param name="labcode">閲囪喘鍒拌揣鐢熸垚鏍囩</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.AppQualityManagementController.InFactoryCheckItem(System.String)">
+ <summary>
+ 鍏ュ巶妫�楠�,鏍规嵁閫夋嫨鐨勬楠屾柟妗堟煡鎵炬楠岄」鐩�
+ </summary>
+ <param name="checkstandcode">妫�楠屾柟妗堢紪鐮�</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.BaseDateController.PurchSupplierSelect">
@@ -731,7 +745,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>
@@ -744,6 +758,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>
@@ -757,7 +772,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>
@@ -770,9 +785,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>
@@ -785,13 +801,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>
@@ -804,6 +821,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)">
@@ -2245,6 +2263,15 @@
<param name="partnumber">浜у搧缂栫爜</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)">
<summary>
MES宸ュ崟鏂板銆佺紪杈戞彁浜�
@@ -2850,13 +2877,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>
@@ -3030,6 +3058,43 @@
<param name="order">鎺掑簭瑙勫垯</param>
<returns></returns>
</member>
+ <member name="M:VueWebApi.Controllers.QualityManagementController.QualityInspectionSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
+ <summary>
+ 璐ㄦ鏂规鍒楄〃鏌ヨ
+ </summary>
+ <param name="qualityinsptcode">璐ㄦ鏂规缂栫爜</param>
+ <param name="qualityinsptname">璐ㄦ鏂规鍚嶇О</param>
+ <param name="status">鏈夋晥鐘舵��</param>
+ <param name="checktype">璐ㄦ绫诲瀷</param>
+ <param name="sampltype">鎶芥牱鏂瑰紡</param>
+ <param name="suitobject">閫傜敤瀵硅薄</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.QualityManagementController.QualityInspectionSeeEdit(System.String)">
+ <summary>
+ 璐ㄦ鏂规鏌ョ湅缂栬緫
+ </summary>
+ <param name="qualityinsptcode">璐ㄦ鏂规缂栫爜</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.QualityManagementController.QualityInspectionAddEditSave(Newtonsoft.Json.Linq.JObject)">
+ <summary>
+ 璐ㄦ鏂规鏂板/缂栬緫鎻愪氦
+ </summary>
+ <param name="obj">鎻愪氦鏁版嵁</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.QualityManagementController.QualityInspectionDelete(System.String)">
+ <summary>
+ 璐ㄦ鏂规鍒犻櫎
+ </summary>
+ <param name="qualityinsptcode">璐ㄦ鏂规缂栫爜</param>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Controllers.SystemSettingController.EncodingRules(System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
<summary>
缂栫爜瑙勫垯鏌ヨ
--
Gitblit v1.9.3