From 01b5ef474e1a5d8dc682b64312f23bdbb0fdf3a7 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 12 四月 2023 16:26:48 +0800
Subject: [PATCH] 1.采购到货接口修改 2.停用设备过滤
---
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml | 224 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 215 insertions(+), 9 deletions(-)
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
index ce653ca..3684fc1 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
+++ b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
@@ -515,10 +515,11 @@
<param name="defecttype">缂洪櫡缁熻绫诲瀷</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.AppPersonalController.PieceRateWage(System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.AppPersonalController.PieceRateWage(System.String,System.String,System.String)">
<summary>
App涓汉璁′欢宸ヨ祫
</summary>
+ <param name="compute">璁＄畻鏂瑰紡:鏈亾璁＄畻銆侀�愰亾璁＄畻</param>
<param name="usercode">鐧诲綍浜哄憳</param>
<param name="Ratetime">鏃堕棿</param>
<returns></returns>
@@ -624,14 +625,97 @@
<param name="onelableqty">鍗曟爣绛炬暟閲�</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.AppPurchManagementController.MesAppPurchOrderSave(System.String,System.String,System.String,System.Collections.Generic.List{VueWebApi.Models.AppPurchOrderSave})">
+ <member name="M:VueWebApi.Controllers.AppPurchManagementController.MesAppPurchOrderSave(System.String,System.String,System.Collections.Generic.List{VueWebApi.Models.AppPurchOrderSave})">
<summary>
閲囪喘鍒拌揣锛氭彁浜�
</summary>
<param name="purordercode">閲囪喘璁㈠崟鍙�</param>
- <param name="orderstaus">鍗曟嵁鐘舵��</param>
<param name="username">鎿嶄綔浜哄憳</param>
<param name="json">鍒拌揣鐗╂枡淇℃伅</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.AppPurchManagementController.MesAppPurchInStorSelectCGOrder(System.String)">
+ <summary>
+ 閲囪喘鍏ュ簱閫夋嫨鏈夊埌璐ч噰璐鍗�
+ </summary>
+ <param name="purchordercode">閲囪喘璁㈠崟鍙�</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.AppPurchManagementController.MesAppPurchInStorSelectCGOrderPart(System.String)">
+ <summary>
+ 閫夋嫨閲囪喘璁㈠崟甯﹀嚭璁㈠崟涓嬫湁鍒拌揣鐨勭墿鏂欎俊鎭�
+ </summary>
+ <param name="ordercode">閲囪喘璁㈠崟鍙�</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.AppPurchManagementController.MesAppPurchInStorScanLabCode(System.String,System.String)">
+ <summary>
+ 閲囪喘鍏ュ簱鎵弿鏍囩鏉＄爜甯﹀嚭鏍囩淇℃伅
+ </summary>
+ <param name="labcode">鏍囩鏉＄爜</param>
+ <param name="ordercode">閲囪喘璁㈠崟鍙�</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.AppPurchManagementController.MesAppPurchInStorSave(System.String,System.String,System.String)">
+ <summary>
+ 閲囪喘鍏ュ簱鎻愪氦
+ </summary>
+ <param name="ordercode">閲囪喘璁㈠崟鍙�</param>
+ <param name="username">鎿嶄綔浜哄憳</param>
+ <param name="incontent">鎻愪氦鏁版嵁</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.AppPurchManagementController.MesAppPurchaseReturnOrderSearch(System.String)">
+ <summary>
+ 閲囪喘閫�璐э細鑾峰彇閲囪喘璁㈠崟鍒楄〃(宸插埌璐х殑閲囪喘璁㈠崟)
+ </summary>
+ <param name="purchordercode">閲囪喘璁㈠崟鍙�</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.AppPurchManagementController.MesAppPurchReturnOrderPartSearch(System.String)">
+ <summary>
+ 閲囪喘閫�璐э細閫夋嫨閲囪喘璁㈠崟鑾峰彇鐗╂枡淇℃伅
+ </summary>
+ <param name="purchordercode">閲囪喘璁㈠崟鍙�</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.AppPurchManagementController.MesAppPurchReturnInStorScanLabCode(System.String,System.String,System.String)">
+ <summary>
+ 閲囪喘閫�璐у崟锛氭壂鎻忔爣绛�
+ </summary>
+ <param name="ordercode">閲囪喘璁㈠崟鍙�</param>
+ <param name="partcode">鐗╂枡缂栫爜</param>
+ <param name="labcode">鏍囩鏉＄爜</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.AppPurchManagementController.MesAppPurchReturnInStorSave(System.String,System.String,System.String,System.String)">
+ <summary>
+ 閲囪喘閫�璐у崟锛氭彁浜�
+ </summary>
+ <param name="orderid">閲囪喘璁㈠崟鍙穒d</param>
+ <param name="ordercode">閲囪喘璁㈠崟鍙�</param>
+ <param name="username">鎿嶄綔浜哄憳</param>
+ <param name="incontent">鎻愪氦鏁版嵁</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.AppQualityManagementController.InFactoryCheckSave">
+ <summary>
+ 鍏ュ巶妫�楠�,鎻愪氦
+ </summary>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.BaseDateController.PurchSupplierSelect">
@@ -643,6 +727,31 @@
<member name="M:VueWebApi.Controllers.BaseDateController.DepartMentSelect">
<summary>
閮ㄩ棬淇℃伅鏌ヨ
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.BaseDateController.StoreHouseSearch">
+ <summary>
+ 浠撳簱淇℃伅鏌ヨ
+ </summary>
+ <returns>StoreHouseSearch</returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.BaseDateController.WarehouseLocationSearch">
+ <summary>
+ 搴撲綅淇℃伅鏌ヨ
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.BaseDateController.WarehouseLocationSearchStoreHouse(System.String)">
+ <summary>
+ 搴撲綅鏌ヨ浠撳簱
+ </summary>
+ <param name="locationcode">搴撲綅缂栫爜</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.BaseDateController.UnitSerch">
+ <summary>
+ 鍗曚綅淇℃伅鏌ヨ
</summary>
<returns></returns>
</member>
@@ -731,7 +840,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 +853,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 +867,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 +880,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 +896,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 +916,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)">
@@ -2197,7 +2310,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>
@@ -2205,6 +2318,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>
@@ -2245,6 +2375,21 @@
<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.AddMesOrderCodeSearch">
+ <summary>
+ MES宸ュ崟鏂板銆佽幏鍙栧伐鍗曞彿
+ </summary>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Controllers.ProductionManagementController.AddUpdateMesOrder(Newtonsoft.Json.Linq.JObject)">
<summary>
MES宸ュ崟鏂板銆佺紪杈戞彁浜�
@@ -2275,6 +2420,20 @@
MES宸ュ崟鏌ョ湅宸ュ簭浠诲姟
</summary>
<param name="wo_code">宸ュ崟缂栧彿</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderStepEqpSearch(System.String)">
+ <summary>
+ 鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇褰撳墠宸ュ簭瀵瑰簲鐨勮澶�(鑷埗)
+ </summary>
+ <param name="orderstepqrcode">鎵弿鐨勪簩缁寸爜淇℃伅</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderWxStepEqpSearch(System.String)">
+ <summary>
+ 鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇褰撳墠宸ュ簭瀵瑰簲鐨勪緵鏂�(澶栧崗)
+ </summary>
+ <param name="orderstepqrcode">鎵弿鐨勪簩缁寸爜淇℃伅</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderStepSearch(System.String,System.Int32,System.Int32,System.String,System.String)">
@@ -2850,13 +3009,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>
@@ -3028,6 +3188,43 @@
<param name="checkresult">妫�楠岀粨鏋�</param>
<param name="prop">鎺掑簭瀛楁</param>
<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)">
@@ -3765,6 +3962,15 @@
<param name="eqpcode">璁惧缂栫爜</param>
<param name="json">鎻愪氦鐨勬暟鎹�</param>
</member>
+ <member name="M:VueWebApi.Tools.LabCodeStatusMessage.LabCodeStatus(System.String,System.String,System.String)">
+ <summary>
+ 鎵爜淇℃伅涓哄伐鍗�+宸ュ簭鏉＄爜
+ </summary>
+ <param name="rightcode">鍔熻兘缂栫爜</param>
+ <param name="hbilltype">鍗曟嵁绫诲瀷</param>
+ <param name="hbarcode">鏉″舰鐮�</param>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Tools.LogHelper.WriteLog(System.Exception)">
<summary>
杈撳嚭鏃ュ織鍒癓og4Net
--
Gitblit v1.9.3