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 |  155 +++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 147 insertions(+), 8 deletions(-)

diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
index dc64f30..3684fc1 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
+++ b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
@@ -625,14 +625,77 @@
             <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">鍗曟嵁鐘舵��:BINARIVE(閮ㄥ垎鍒拌揣)銆両NARIVE(宸插埌璐�)</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)">
@@ -664,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>
@@ -752,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>
@@ -765,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>
@@ -778,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>
@@ -791,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>
@@ -806,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>
@@ -825,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)">
@@ -2218,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>
@@ -2226,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>
@@ -2275,6 +2384,12 @@
             <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宸ュ崟鏂板銆佺紪杈戞彁浜�
@@ -2305,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)">
@@ -2880,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>
@@ -3832,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