From a066604943cd69ba5c10a400aa55f8f39b4f4ff3 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 17 6月 2024 10:42:13 +0800
Subject: [PATCH] 修复

---
 iWara.SCADA.Code/iWare.Wms.Application/iWare.Wms.Application.xml |  249 ++++++++++++++++++++++++++-----------------------
 1 files changed, 132 insertions(+), 117 deletions(-)

diff --git a/iWara.SCADA.Code/iWare.Wms.Application/iWare.Wms.Application.xml b/iWara.SCADA.Code/iWare.Wms.Application/iWare.Wms.Application.xml
index 4ffe612..7ff440d 100644
--- a/iWara.SCADA.Code/iWare.Wms.Application/iWare.Wms.Application.xml
+++ b/iWara.SCADA.Code/iWare.Wms.Application/iWare.Wms.Application.xml
@@ -1375,6 +1375,16 @@
             娓呮礂娑叉洿鎹㈡椂闂�
             </summary>
         </member>
+        <member name="P:iWare.Wms.Application.EquipmentBaseInfoInput.DetergentAddtime">
+            <summary>
+            娓呮礂娑叉坊鍔犳椂闂� 銆怑ditby shaocx,2024-06-11銆�
+            </summary>
+        </member>
+        <member name="P:iWare.Wms.Application.EquipmentBaseInfoInput.CuttingFluidAddTime">
+            <summary>
+            鍒囧墛娑叉坊鍔犳椂闂� 銆怑ditby shaocx,2024-06-11銆�
+            </summary>
+        </member>
         <member name="P:iWare.Wms.Application.EquipmentBaseInfoInput.DetergentChangeAlertThreshold">
             <summary>
             娓呮礂娑叉洿鎹㈤璀﹂槇鍊�
@@ -1583,6 +1593,16 @@
         <member name="P:iWare.Wms.Application.EquipmentBaseInfoOutput.Detergentchangetime">
             <summary>
             娓呮礂娑叉洿鎹㈡椂闂�
+            </summary>
+        </member>
+        <member name="P:iWare.Wms.Application.EquipmentBaseInfoOutput.DetergentAddtime">
+            <summary>
+            娓呮礂娑叉坊鍔犳椂闂� 銆怑ditby shaocx,2024-06-11銆�
+            </summary>
+        </member>
+        <member name="P:iWare.Wms.Application.EquipmentBaseInfoOutput.CuttingFluidAddTime">
+            <summary>
+            鍒囧墛娑叉坊鍔犳椂闂� 銆怑ditby shaocx,2024-06-11銆�
             </summary>
         </member>
         <member name="P:iWare.Wms.Application.EquipmentBaseInfoOutput.DetergentChangeAlertThreshold">
@@ -6393,6 +6413,81 @@
             灏忓ご鍨傜洿搴︼紱OP80
             </summary>
         </member>
+        <member name="P:iWare.Wms.Application.QualityDataInfoOutput.QualityOP80_Houdu">
+            <summary>
+            OP80 璐ㄩ噺鏁版嵁-鍘氬害
+            </summary>
+        </member>
+        <member name="P:iWare.Wms.Application.QualityDataInfoOutput.QualityOP80_ZXJ">
+            <summary>
+            OP80 璐ㄩ噺鏁版嵁-涓績璺�
+            </summary>
+        </member>
+        <member name="P:iWare.Wms.Application.QualityDataInfoOutput.QualityOP80_DTKYZD">
+            <summary>
+            OP80 璐ㄩ噺鏁版嵁-澶уご瀛斿渾鏌卞害
+            </summary>
+        </member>
+        <member name="P:iWare.Wms.Application.QualityDataInfoOutput.QualityOP80_XTSMYD">
+            <summary>
+            OP80 璐ㄩ噺鏁版嵁-灏忓ご涓婇潰鍦嗗害
+            </summary>
+        </member>
+        <member name="P:iWare.Wms.Application.QualityDataInfoOutput.QualityOP80_XTXMYD">
+            <summary>
+            OP80 璐ㄩ噺鏁版嵁-灏忓ご涓嬮潰鍦嗗害
+            </summary>
+        </member>
+        <member name="P:iWare.Wms.Application.QualityDataInfoOutput.QualityOP80_D_TKZJ">
+            <summary>
+            OP80 璐ㄩ噺鏁版嵁-澶уご瀛旂洿寰�,澶уご瀛旂洿寰�=锛堝ぇ澶翠笂闈鏂瑰悜鐩村緞+澶уご涓婇潰Y鏂瑰悜鐩村緞+澶уご涓嬮潰X鏂瑰悜鐩村緞+澶уご涓嬮潰Y鏂瑰悜鐩村緞锛�/4
+            </summary>
+        </member>
+        <member name="P:iWare.Wms.Application.QualityDataInfoOutput.QualityOP80_D_S_X">
+            <summary>
+            OP80 璐ㄩ噺鏁版嵁-澶уご涓婇潰X鏂瑰悜鐩村緞
+            </summary>
+        </member>
+        <member name="P:iWare.Wms.Application.QualityDataInfoOutput.QualityOP80_D_S_Y">
+            <summary>
+            OP80 璐ㄩ噺鏁版嵁-澶уご涓婇潰Y鏂瑰悜鐩村緞
+            </summary>
+        </member>
+        <member name="P:iWare.Wms.Application.QualityDataInfoOutput.QualityOP80_D_X_X">
+            <summary>
+            OP80 璐ㄩ噺鏁版嵁-澶уご涓嬮潰X鏂瑰悜鐩村緞
+            </summary>
+        </member>
+        <member name="P:iWare.Wms.Application.QualityDataInfoOutput.QualityOP80_D_X_Y">
+            <summary>
+            OP80 璐ㄩ噺鏁版嵁-澶уご涓嬮潰Y鏂瑰悜鐩村緞
+            </summary>
+        </member>
+        <member name="P:iWare.Wms.Application.QualityDataInfoOutput.QualityOP80_X_TKZJ">
+            <summary>
+            OP80 璐ㄩ噺鏁版嵁-灏忓ご瀛旂洿寰�,灏忓ご瀛旂洿寰�=锛堝皬澶翠笂闈鏂瑰悜鐩村緞+灏忓ご涓婇潰Y鏂瑰悜鐩村緞+灏忓ご涓嬮潰X鏂瑰悜鐩村緞+灏忓ご涓嬮潰Y鏂瑰悜鐩村緞锛�/4
+            </summary>
+        </member>
+        <member name="P:iWare.Wms.Application.QualityDataInfoOutput.QualityOP80_X_S_X">
+            <summary>
+            OP80 璐ㄩ噺鏁版嵁-灏忓ご涓婇潰X鏂瑰悜鐩村緞
+            </summary>
+        </member>
+        <member name="P:iWare.Wms.Application.QualityDataInfoOutput.QualityOP80_X_S_Y">
+            <summary>
+            OP80 璐ㄩ噺鏁版嵁-灏忓ご涓婇潰Y鏂瑰悜鐩村緞
+            </summary>
+        </member>
+        <member name="P:iWare.Wms.Application.QualityDataInfoOutput.QualityOP80_X_X_X">
+            <summary>
+            OP80 璐ㄩ噺鏁版嵁-灏忓ご涓嬮潰X鏂瑰悜鐩村緞
+            </summary>
+        </member>
+        <member name="P:iWare.Wms.Application.QualityDataInfoOutput.QualityOP80_X_X_Y">
+            <summary>
+            OP80 璐ㄩ噺鏁版嵁-灏忓ご涓嬮潰Y鏂瑰悜鐩村緞
+            </summary>
+        </member>
         <member name="P:iWare.Wms.Application.QualityDataInfoOutput.Remarks">
             <summary>
             澶囨敞
@@ -6936,6 +7031,41 @@
         <member name="P:iWare.Wms.Application.QualityDataOP80Output.QualityReceiveTimeHand">
             <summary>
             娴嬮噺鏃堕棿
+            </summary>
+        </member>
+        <member name="P:iWare.Wms.Application.QualityDataOP80Output.QualityOP80_Houdu">
+            <summary>
+            OP80 璐ㄩ噺鏁版嵁-鍘氬害
+            </summary>
+        </member>
+        <member name="P:iWare.Wms.Application.QualityDataOP80Output.QualityOP80_ZXJ">
+            <summary>
+            OP80 璐ㄩ噺鏁版嵁-涓績璺�
+            </summary>
+        </member>
+        <member name="P:iWare.Wms.Application.QualityDataOP80Output.QualityOP80_DTKYZD">
+            <summary>
+            OP80 璐ㄩ噺鏁版嵁-澶уご瀛斿渾鏌卞害
+            </summary>
+        </member>
+        <member name="P:iWare.Wms.Application.QualityDataOP80Output.QualityOP80_XTSMYD">
+            <summary>
+            OP80 璐ㄩ噺鏁版嵁-灏忓ご涓婇潰鍦嗗害
+            </summary>
+        </member>
+        <member name="P:iWare.Wms.Application.QualityDataOP80Output.QualityOP80_XTXMYD">
+            <summary>
+            OP80 璐ㄩ噺鏁版嵁-灏忓ご涓嬮潰鍦嗗害
+            </summary>
+        </member>
+        <member name="P:iWare.Wms.Application.QualityDataOP80Output.QualityOP80_D_TKZJ">
+            <summary>
+            OP80 璐ㄩ噺鏁版嵁-澶уご瀛旂洿寰�,澶уご瀛旂洿寰�=锛堝ぇ澶翠笂闈鏂瑰悜鐩村緞+澶уご涓婇潰Y鏂瑰悜鐩村緞+澶уご涓嬮潰X鏂瑰悜鐩村緞+澶уご涓嬮潰Y鏂瑰悜鐩村緞锛�/4
+            </summary>
+        </member>
+        <member name="P:iWare.Wms.Application.QualityDataOP80Output.QualityOP80_X_TKZJ">
+            <summary>
+            OP80 璐ㄩ噺鏁版嵁-灏忓ご瀛旂洿寰�,灏忓ご瀛旂洿寰�=锛堝皬澶翠笂闈鏂瑰悜鐩村緞+灏忓ご涓婇潰Y鏂瑰悜鐩村緞+灏忓ご涓嬮潰X鏂瑰悜鐩村緞+灏忓ご涓嬮潰Y鏂瑰悜鐩村緞锛�/4
             </summary>
         </member>
         <member name="P:iWare.Wms.Application.QualityDataOP80Output.QualityOP80To1">
@@ -14906,79 +15036,9 @@
             浜ч噺鏌ヨ杈撳嚭鍙傛暟
             </summary>
         </member>
-        <member name="P:iWare.Wms.Application.QueryYieldOutput.WorkPieceID">
-            <summary>
-            宸ヤ欢鍙�
-            </summary>
-        </member>
-        <member name="P:iWare.Wms.Application.QueryYieldOutput.OP80NewCode">
-            <summary>
-            鎴愬搧鐮�
-            </summary>
-        </member>
-        <member name="P:iWare.Wms.Application.QueryYieldOutput.WorkingProcedureCurrent">
-            <summary>
-            褰撳墠宸ュ簭
-            </summary>
-        </member>
         <member name="P:iWare.Wms.Application.QueryYieldOutput.EquipmentID">
             <summary>
             褰撳墠璁惧
-            </summary>
-        </member>
-        <member name="P:iWare.Wms.Application.QueryYieldOutput.EquipmentName">
-            <summary>
-            璁惧鍚嶇О
-            </summary>
-        </member>
-        <member name="P:iWare.Wms.Application.QueryYieldOutput.StartTime">
-            <summary>
-            宸ュ簭涓婄嚎鏃堕棿
-            </summary>
-        </member>
-        <member name="P:iWare.Wms.Application.QueryYieldOutput.EndTime">
-            <summary>
-            宸ュ簭涓嬬嚎鏃堕棿
-            </summary>
-        </member>
-        <member name="P:iWare.Wms.Application.QueryYieldOutput.TimeSceonds">
-            <summary>
-            鍔犲伐鏃堕暱
-            </summary>
-        </member>
-        <member name="P:iWare.Wms.Application.QueryYieldOutput.QualityState">
-            <summary>
-            璐ㄩ噺鐘舵��
-            </summary>
-        </member>
-        <member name="P:iWare.Wms.Application.QueryYieldOutput.QualityStateName">
-            <summary>
-            璐ㄩ噺鐘舵�佸悕瀛�
-            </summary>
-        </member>
-        <member name="P:iWare.Wms.Application.QueryYieldOutput.OperationType">
-            <summary>
-            鎿嶄綔绫诲瀷锛圫PC/鐢熶骇锛�
-            </summary>
-        </member>
-        <member name="P:iWare.Wms.Application.QueryYieldOutput.OperationTypeHand">
-            <summary>
-            鎿嶄綔绫诲瀷
-            </summary>
-        </member>
-        <member name="P:iWare.Wms.Application.QueryYieldOutput.QualityDataInfoID">
-            <summary>
-            璐ㄩ噺淇℃伅id
-            </summary>
-        </member>
-        <member name="P:iWare.Wms.Application.QueryYieldOutput.Id">
-            <summary>
-            Id涓婚敭
-            </summary>
-        </member>
-        <member name="P:iWare.Wms.Application.QueryYieldOutput.CreateUserName">
-            <summary>
-            鍒涘缓浜�
             </summary>
         </member>
         <member name="T:iWare.Wms.Application.ExportYieldOutput">
@@ -14986,59 +15046,14 @@
             浜ч噺鏌ヨ瀵煎嚭杈撳嚭鍙傛暟
             </summary>
         </member>
-        <member name="P:iWare.Wms.Application.ExportYieldOutput.WorkPieceID">
-            <summary>
-            宸ヤ欢鍙�
-            </summary>
-        </member>
         <member name="P:iWare.Wms.Application.ExportYieldOutput.WorkingProcedureCurrent">
             <summary>
             褰撳墠宸ュ簭
             </summary>
         </member>
-        <member name="P:iWare.Wms.Application.ExportYieldOutput.EquipmentName">
+        <member name="P:iWare.Wms.Application.ExportYieldOutput.YieldCount">
             <summary>
-            璁惧鍚嶇О
-            </summary>
-        </member>
-        <member name="P:iWare.Wms.Application.ExportYieldOutput.StartTime">
-            <summary>
-            宸ュ簭涓婄嚎鏃堕棿
-            </summary>
-        </member>
-        <member name="P:iWare.Wms.Application.ExportYieldOutput.EndTime">
-            <summary>
-            宸ュ簭涓嬬嚎鏃堕棿
-            </summary>
-        </member>
-        <member name="P:iWare.Wms.Application.ExportYieldOutput.TimeSceonds">
-            <summary>
-            鍔犲伐鏃堕暱
-            </summary>
-        </member>
-        <member name="P:iWare.Wms.Application.ExportYieldOutput.QualityState">
-            <summary>
-            璐ㄩ噺鐘舵��
-            </summary>
-        </member>
-        <member name="P:iWare.Wms.Application.ExportYieldOutput.QualityStateName">
-            <summary>
-            璐ㄩ噺鐘舵�佸悕绉�
-            </summary>
-        </member>
-        <member name="P:iWare.Wms.Application.ExportYieldOutput.OP80NewCode">
-            <summary>
-            鎴愬搧鐮�
-            </summary>
-        </member>
-        <member name="P:iWare.Wms.Application.ExportYieldOutput.Id">
-            <summary>
-            Id涓婚敭
-            </summary>
-        </member>
-        <member name="P:iWare.Wms.Application.ExportYieldOutput.CreateUserName">
-            <summary>
-            鍒涘缓浜�
+            浜ч噺姹囨�� 銆怑ditby shaocx,2024-06-11銆�
             </summary>
         </member>
         <member name="T:iWare.Wms.Application.WorkPieceProcessDto">

--
Gitblit v1.9.3