From 9c634fd767aec36ef97c3a814bf7a29c67d20ee1 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 29 三月 2024 10:57:35 +0800
Subject: [PATCH] 修改单据重复显示问题，增加工单源单id关联

---
 VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml |   77 ++++++++++++++++++++++++++++++--------
 1 files changed, 60 insertions(+), 17 deletions(-)

diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
index f4b4614..48fb92b 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
+++ b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
@@ -956,12 +956,13 @@
             <param name="partcode">鐗╂枡缂栫爜</param>
             <returns></returns>
         </member>
-        <member name="M:VueWebApi.Controllers.ReportManagerController.OutSourceReportSearch(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.OutSourceReportSearch(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>
             <param name="wkshopcode">杞﹂棿缂栫爜</param>
             <param name="wocode">宸ュ崟缂栧彿</param>
+            <param name="saleordercode">閿�鍞鍗曞彿</param>
             <param name="partcode">浜у搧缂栫爜</param>
             <param name="partname">浜у搧鍚嶇О</param>
             <param name="partspec">瑙勬牸鍨嬪彿</param>
@@ -975,12 +976,13 @@
             <param name="order">鎺掑簭瑙勫垯</param>
             <returns></returns>
         </member>
-        <member name="M:VueWebApi.Controllers.ReportManagerController.OutSourceReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+        <member name="M:VueWebApi.Controllers.ReportManagerController.OutSourceReportExcelSearch(System.String,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="wocode">宸ュ崟缂栧彿</param>
+            <param name="saleordercode">閿�鍞鍗曞彿</param>
             <param name="partcode">浜у搧缂栫爜</param>
             <param name="partname">浜у搧鍚嶇О</param>
             <param name="partspec">瑙勬牸鍨嬪彿</param>
@@ -990,13 +992,14 @@
             <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,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,System.String,System.String)">
             <summary>
             鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ヨ
             </summary>
             <param name=" wkshopcode">杞﹂棿缂栫爜</param>
             <param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
             <param name="wocode">宸ュ崟缂栧彿</param>
+            <param name="saleordercode">閿�鍞鍗曞彿</param>
             <param name="partcode">浜у搧缂栫爜</param>
             <param name="partname">浜у搧鍚嶇О</param>
             <param name="partspec">瑙勬牸鍨嬪彿</param>
@@ -1018,13 +1021,14 @@
             <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,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,System.String,System.String)">
             <summary>
             鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ヨ
             </summary>
             <param name=" wkshopcode">杞﹂棿缂栫爜</param>
             <param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
             <param name="wocode">宸ュ崟缂栧彿</param>
+            <param name="saleordercode">閿�鍞鍗曞彿</param>
             <param name="partcode">浜у搧缂栫爜</param>
             <param name="partname">浜у搧鍚嶇О</param>
             <param name="partspec">瑙勬牸鍨嬪彿</param>
@@ -1035,13 +1039,14 @@
             <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,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,System.String,System.String)">
             <summary>
             浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃
             </summary>
             <param name=" wkshopcode">杞﹂棿缂栫爜</param>
             <param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
             <param name="wocode">宸ュ崟缂栧彿</param>
+            <param name="saleordercode">閿�鍞鍗曞彿</param>
             <param name="partcode">浜у搧缂栫爜</param>
             <param name="partname">浜у搧鍚嶇О</param>
             <param name="partspec">瑙勬牸鍨嬪彿</param>
@@ -1056,13 +1061,14 @@
             <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,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,System.String,System.String)">
             <summary>
             浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃瀵煎嚭
             </summary>
             <param name=" wkshopcode">杞﹂棿缂栫爜</param>
             <param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
             <param name="wocode">宸ュ崟缂栧彿</param>
+            <param name="saleordercode">閿�鍞鍗曞彿</param>
             <param name="partcode">浜у搧缂栫爜</param>
             <param name="partname">浜у搧鍚嶇О</param>
             <param name="partspec">瑙勬牸鍨嬪彿</param>
@@ -1073,12 +1079,13 @@
             <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,System.String)">
+        <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,System.String,System.String)">
             <summary>
             涓嶈壇鏄庣粏鎶ヨ〃 
             </summary>
             <param name=" wkshopcode">杞﹂棿缂栫爜</param>
             <param name="wocode">宸ュ崟缂栧彿</param>
+            <param name="saleordercode">閿�鍞鍗曞彿</param>
             <param name="partcode">浜у搧缂栫爜</param>
             <param name="partname">浜у搧鍚嶇О</param>
             <param name="partspec">瑙勬牸鍨嬪彿</param>
@@ -1093,12 +1100,13 @@
             <param name="order">鎺掑簭瑙勫垯</param>
             <returns></returns>
         </member>
-        <member name="M:VueWebApi.Controllers.ReportManagerController.DefectDetailsReportExcelSearch(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.DefectDetailsReportExcelSearch(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=" wkshopcode">杞﹂棿缂栫爜</param>
             <param name="wocode">宸ュ崟缂栧彿</param>
+            <param name="saleordercode">閿�鍞鍗曞彿</param>
             <param name="partcode">浜у搧缂栫爜</param>
             <param name="partname">浜у搧鍚嶇О</param>
             <param name="partspec">瑙勬牸鍨嬪彿</param>
@@ -1115,12 +1123,13 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:VueWebApi.Controllers.ReportManagerController.MaintenanceDetailsReportSearch(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)">
+        <member name="M:VueWebApi.Controllers.ReportManagerController.MaintenanceDetailsReportSearch(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,System.String)">
             <summary>
             缁翠慨鏄庣粏鎶ヨ〃 
             </summary>
             <param name="wkshopcode">杞﹂棿缂栧彿</param>
             <param name="wocode">宸ュ崟缂栧彿</param>
+            <param name="saleordercode">閿�鍞鍗曞彿</param>
             <param name="partcode">浜у搧缂栫爜</param>
             <param name="partname">浜у搧鍚嶇О</param>
             <param name="partspec">瑙勬牸鍨嬪彿</param>
@@ -1135,12 +1144,13 @@
             <param name="order">鎺掑簭瑙勫垯</param>
             <returns></returns>
         </member>
-        <member name="M:VueWebApi.Controllers.ReportManagerController.MaintenanceDetailsReportExcelSearch(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.MaintenanceDetailsReportExcelSearch(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="wkshopcode">杞﹂棿缂栧彿</param>
             <param name="wocode">宸ュ崟缂栧彿</param>
+            <param name="saleordercode">閿�鍞鍗曞彿</param>
             <param name="partcode">浜у搧缂栫爜</param>
             <param name="partname">浜у搧鍚嶇О</param>
             <param name="partspec">瑙勬牸鍨嬪彿</param>
@@ -1235,13 +1245,14 @@
             <param name="checkid">妫�楠岃褰旾D</param>
             <returns></returns>
         </member>
-        <member name="M:VueWebApi.Controllers.ReportManagerController.ProductionScheduleReportSearch(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.ProductionScheduleReportSearch(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>
             <param name="wkshopcode">杞﹂棿缂栫爜</param>
             <param name="status">宸ュ崟鐘舵��</param>
             <param name="wocode">宸ュ崟缂栧彿</param>
+            <param name="saleordercode">閿�鍞鍗曞彿</param>
             <param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
             <param name="routename">宸ヨ壓璺嚎鍚嶇О</param>
             <param name="partcode">浜у搧缂栫爜</param>
@@ -1254,13 +1265,14 @@
             <param name="order">鎺掑簭瑙勫垯</param>
             <returns></returns>
         </member>
-        <member name="M:VueWebApi.Controllers.ReportManagerController.ProductionScheduleReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+        <member name="M:VueWebApi.Controllers.ReportManagerController.ProductionScheduleReportExcelSearch(System.String,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="status">宸ュ崟鐘舵��</param>
             <param name="wocode">宸ュ崟缂栧彿</param>
+            <param name="saleordercode">閿�鍞鍗曞彿</param>
             <param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
             <param name="routename">宸ヨ壓璺嚎鍚嶇О</param>
             <param name="partcode">浜у搧缂栫爜</param>
@@ -2704,6 +2716,13 @@
             <param name="wo_code">宸ュ崟缂栧彿</param>
             <returns></returns>
         </member>
+        <member name="M:VueWebApi.Controllers.ProductionManagementController.UpdateMesOrderPrintCount(System.String)">
+            <summary>
+            MES宸ュ崟鎵撳嵃鏇存柊鎵撳嵃娆℃暟
+            </summary>
+            <param name="wo_code">宸ュ崟缂栧彿</param>
+            <returns></returns>
+        </member>
         <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderStepEqpSearch(System.String)">
             <summary>
             鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇褰撳墠宸ュ簭瀵瑰簲鐨勮澶�(鑷埗)
@@ -2718,11 +2737,15 @@
             <param name="orderstepqrcode">鎵弿鐨勪簩缁寸爜淇℃伅</param>
             <returns></returns>
         </member>
-        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderStepSearch(System.String,System.Int32,System.Int32,System.String,System.String)">
+        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderStepSearch(System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
             <summary>
             鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇宸ュ崟瀵瑰簲宸ュ簭浠诲姟(鑷埗)
             </summary>
-            <param name="orderstepqrcode">鎵弿鐨勪簩缁寸爜淇℃伅</param>
+            <param name="wocode">宸ュ崟鍙�</param>
+            <param name="saleOrderCode">閿�鍞鍗曞彿</param>
+            <param name="partcode">浜у搧缂栫爜</param>
+            <param name="partname">浜у搧鍚嶇О</param>
+            <param name="partspec">瑙勬牸鍨嬪彿</param>
             <param name="page">椤电爜</param>
             <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
             <param name="prop">鎺掑簭瀛楁</param>
@@ -2763,7 +2786,7 @@
             鐢熶骇寮�鎶ュ伐锛氬紑宸�(寮�濮�/鎶ュ伐)/澶栧崗(鍙戞枡/鏀舵枡)鏃舵潯浠跺垽鏂強鏁版嵁杩斿洖鎺ュ彛
             </summary>
             <param name="OperType">鎿嶄綔绫诲瀷锛氳嚜鍒�(ZZ)/澶栧崗(WX)</param>
-            <param name="SelectType">鎿嶄綔绫诲瀷锛氳嚜鍒�(璁惧缂栫爜)/澶栧崗(鍙戞枡鏍囪瘑(OUT)/鏀舵枡鏍囪瘑(IN))</param>
+            <param name="SelectType">鎿嶄綔绫诲瀷锛氳嚜鍒�(寮�宸�(START)/鎶ュ伐(REPORT))/澶栧崗(鍙戞枡鏍囪瘑(OUT)/鏀舵枡鏍囪瘑(IN))</param>
             <param name="orderstepqrcode">鎵弿浜岀淮鐮佷俊鎭�</param>
             <param name="stu_torgcode">鎵�灞炵粍缁囩紪鐮�</param>
             <returns></returns>
@@ -2868,13 +2891,14 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderBitchClosedSearch(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.MesOrderBitchClosedSearch(System.String,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)">
             <summary>
             MES宸ュ崟鏌ヨ
             </summary>
             <param name="mesorderstus">宸ュ崟鐘舵�佺爜</param>
             <param name="mesordercode">宸ュ崟缂栧彿</param>
             <param name="sourceorder">婧愬崟鍗曞彿</param>
+            <param name="saleordercode">閿�鍞鍗曞彿</param>
             <param name="ordertype">鍗曟嵁绫诲瀷</param>
             <param name="partcode">浜у搧缂栫爜</param>
             <param name="partname">浜у搧鍚嶇О</param>
@@ -3250,6 +3274,25 @@
             宸ヨ壓璺嚎鍒犻櫎
             </summary>
             <param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
+            <returns></returns>
+        </member>
+        <member name="M:VueWebApi.Controllers.ProductModelController.RputeInventorySearch(System.String,System.String,System.String,System.String,System.String,System.String)">
+            <summary>
+            宸ヨ壓璺嚎鍏宠仈浜у搧鏌ヨ
+            </summary>
+            <param name="partcode">鐗╂枡缂栫爜</param>
+            <param name="partname">鐗╂枡鍚嶇О</param>
+            <param name="partspec">鐗╂枡瑙勬牸</param>
+            <param name="stocktypecode">瀛樿揣绫诲瀷缂栫爜</param>
+            <param name="materialtypecode">鐗╂枡绫诲瀷缂栫爜</param>
+            <param name="storehousecode">鎵�灞炰粨搴撶紪鐮�</param>
+            <returns></returns>
+        </member>
+        <member name="M:VueWebApi.Controllers.ProductModelController.RouteBatchPartSave(Newtonsoft.Json.Linq.JObject)">
+            <summary>
+            宸ヨ壓璺嚎鎵归噺鎸囧畾鐗╂枡淇濆瓨
+            </summary>
+            <param name="obj">鎻愪氦鏁版嵁</param>
             <returns></returns>
         </member>
         <member name="M:VueWebApi.Controllers.ProductModelController.StepSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
@@ -4722,7 +4765,7 @@
             鎵爜淇℃伅涓哄伐鍗�+宸ュ簭鏉＄爜
             </summary>
             <param name="stu_torgcode">鎵�灞炵粍缁囩紪鐮�</param>
-            <param name="SelectType">璁惧缂栫爜</param>
+            <param name="SelectType">鎿嶄綔绫诲瀷(寮�宸ワ細START銆佹姤宸ワ細REPORT)</param>
             <param name="ordercode">宸ュ崟缂栧彿</param>
             <param name="stepcode">宸ュ簭缂栫爜</param>
             <returns></returns>

--
Gitblit v1.9.3