From 8c4e6f779d7346107ec4b699ae23fa43630046fd Mon Sep 17 00:00:00 2001 From: wangzhixun <3077614386@qq.com> Date: Wed, 5 Nov 2025 14:59:07 +0800 Subject: [PATCH] 9.0009 --- 3d/Assets/Zion/Scripts/DeliveryListManager.cs | 8 +-- .../Zion/Scripts/Document/TruckAnimation.cs | 4 -- 3d/Assets/Zion/Scripts/ERP/ERPCollection.cs | 1 - .../ERP/Interfaces/ApiConfigManager.cs | 2 +- .../Zion/Scripts/ERP/到货验收/ljj/UI_Tips.cs | 8 --- .../ReceivingShippingReturnWarehousing.cs | 27 +-------- 3d/Assets/Zion/Scripts/TaskPrompt.cs | 36 +----------- 3d/Assets/Zion/Scripts/Utility/DragWindow.cs | 9 +-- .../单据/CustodyEntrustmentApplication.cs | 16 +----- .../Zion/Scripts/单据/ReturnAndInboundList.cs | 5 -- .../Scripts/单据/ReturnRequestDocuments.cs | 12 +--- .../配送/Manager/UIManager/BasePanel.cs | 4 +- .../配送/借料/ERP_BorrowingRequisitions.cs | 4 -- 3d/Assets/test.cs | 56 ++----------------- 14 files changed, 16 insertions(+), 176 deletions(-) diff --git a/3d/Assets/Zion/Scripts/DeliveryListManager.cs b/3d/Assets/Zion/Scripts/DeliveryListManager.cs index 7b88c9d..f39a3ee 100644 --- a/3d/Assets/Zion/Scripts/DeliveryListManager.cs +++ b/3d/Assets/Zion/Scripts/DeliveryListManager.cs @@ -42,12 +42,6 @@ public class DeliveryListManager : MonoBehaviour private void OnClickCloseButton() { - // if (Delivery_BadBehavior.Instance.isGuiding) - // { - // if (TutorialGuideManager.Instance.TriggerNextGuide(closeButton.name)) - // { - // listPanel.SetActive(false); - // } - // } + Debug.Log("OnClickCloseButton"); } } \ No newline at end of file diff --git a/3d/Assets/Zion/Scripts/Document/TruckAnimation.cs b/3d/Assets/Zion/Scripts/Document/TruckAnimation.cs index 4acc387..dde69a6 100644 --- a/3d/Assets/Zion/Scripts/Document/TruckAnimation.cs +++ b/3d/Assets/Zion/Scripts/Document/TruckAnimation.cs @@ -59,8 +59,4 @@ public class TruckAnimation : MonoBehaviour gameObject.SetActive(false); worker.SetActive(true); } - public void OnDisable() - { - - } } diff --git a/3d/Assets/Zion/Scripts/ERP/ERPCollection.cs b/3d/Assets/Zion/Scripts/ERP/ERPCollection.cs index cbd74d4..1d067d9 100644 --- a/3d/Assets/Zion/Scripts/ERP/ERPCollection.cs +++ b/3d/Assets/Zion/Scripts/ERP/ERPCollection.cs @@ -235,7 +235,6 @@ public class ERPCollection : MonoBehaviour { PanelERP.gameObject.SetActive(false); LoadTriggerNextGuide("关闭"); - ; //隐藏引导 }); } } diff --git a/3d/Assets/Zion/Scripts/ERP/Interfaces/ApiConfigManager.cs b/3d/Assets/Zion/Scripts/ERP/Interfaces/ApiConfigManager.cs index 3a3faca..e78ccc3 100644 --- a/3d/Assets/Zion/Scripts/ERP/Interfaces/ApiConfigManager.cs +++ b/3d/Assets/Zion/Scripts/ERP/Interfaces/ApiConfigManager.cs @@ -334,7 +334,7 @@ namespace Zion.ERP.Inventory /// public void OnGUI() { - // 可以在这里添加调试信息显示 + Debug.Log("API配置管理器绘制");// 可以在这里添加调试信息显示 } } } \ No newline at end of file diff --git a/3d/Assets/Zion/Scripts/ERP/到货验收/ljj/UI_Tips.cs b/3d/Assets/Zion/Scripts/ERP/到货验收/ljj/UI_Tips.cs index 996c85f..4d1765e 100644 --- a/3d/Assets/Zion/Scripts/ERP/到货验收/ljj/UI_Tips.cs +++ b/3d/Assets/Zion/Scripts/ERP/到货验收/ljj/UI_Tips.cs @@ -62,14 +62,6 @@ public class UI_Tips : MonoBehaviour ecp.SetActive(true); ecp.GetComponent().enabled = true; } - else if (MotionEngine.GetModule().ExamName == "不良行为处理") - { - } - else if (MotionEngine.GetModule().ExamName == "不良行为处理") - { - } - - LoadTriggerNextGuide(btn_close.name); } else diff --git a/3d/Assets/Zion/Scripts/ERP/退料物资入库/ReceivingShippingReturnWarehousing.cs b/3d/Assets/Zion/Scripts/ERP/退料物资入库/ReceivingShippingReturnWarehousing.cs index 2084759..7c8b8af 100644 --- a/3d/Assets/Zion/Scripts/ERP/退料物资入库/ReceivingShippingReturnWarehousing.cs +++ b/3d/Assets/Zion/Scripts/ERP/退料物资入库/ReceivingShippingReturnWarehousing.cs @@ -75,33 +75,8 @@ public class ReceivingShippingReturnWarehousing : MonoBehaviour //Init(); } - void Update() + public void Init() { - //if (InputFieldManageInventoryReceivingShippingOrderNumber.text != "" && InputFieldManageInventoryReceivingShippingOrderNumber.text == "4914324675") - //{ - // ShortText.text = MotionEngine.GetModule().GetTaskBookValueByMapping("物料编码"); - // number.text = (int.Parse(MotionEngine.GetModule().GetTaskBookValueByMapping("台")) * 2).ToString(); - // point.text = MotionEngine.GetModule().GetTaskBookValueByMapping("库存地点"); - // batch.text = MotionEngine.GetModule().GetTaskBookValueByMapping("批次"); - // Materialmessage.text= MotionEngine.GetModule().GetTaskBookValueByMapping("物料描述"); - //} - } - - public void Init() - { - // CombinedClass combined = GameManager.Instance.combinedClass; - // ShortText.text = combined.materialCode; - // eunit.text = combined.materialUnit; - // unit.text = combined.materialUnit; - - // InMaterialDescriptionTransferWarehouseTransferOrder.text = MotionEngine.GetModule().GetTaskBookValueByMapping("物料描述"); - // InStockQuantityTransferWarehouseTransferOrder.text = MotionEngine.GetModule().GetTaskBookValueByMapping("收入数量"); - // //InActualArrivalQuantityWarehouseWarrant.text = MotionEngine.GetModule().GetTaskBookValueByMapping("收入数量"); - // //InUnitPriceWarehouseWarrant.text = combinedClass.unitPrice; - // //InTotalPriceWarehouseWarrant.text = (float.Parse(combinedClass.incomeQuantity) * float.Parse(combinedClass.unitPrice)).ToString(); - // //InStockLocationCodeWarehouseWarrant.text = MotionEngine.GetModule().GetTaskBookValueByMapping(""); - // InBatchNumberTransferWarehouseTransferOrder.text = MotionEngine.GetModule().GetTaskBookValueByMapping("批次"); - ShortText.text = MotionEngine.GetModule().GetTaskBookValueByMapping("物料编码"); number.text = (int.Parse(MotionEngine.GetModule().GetTaskBookValueByMapping("台")) * 2).ToString(); point.text = MotionEngine.GetModule().GetTaskBookValueByMapping("库存地点"); diff --git a/3d/Assets/Zion/Scripts/TaskPrompt.cs b/3d/Assets/Zion/Scripts/TaskPrompt.cs index e17e8fc..ef10cea 100644 --- a/3d/Assets/Zion/Scripts/TaskPrompt.cs +++ b/3d/Assets/Zion/Scripts/TaskPrompt.cs @@ -79,12 +79,7 @@ public class TaskPrompt : MonoBehaviour // Start is called before the first frame update void Start() { - if (btnClosePanelTaskPrompt != null) - { - //btnClosePanelTaskPrompt.onClick.AddListener(HHH); - } - returnRevVoucherAnalyzer = (Framework.Dto.InventoryReversalVoucherAnalyzer)MotionEngine.GetModule().materialTaskObj; - + returnRevVoucherAnalyzer = (Framework.Dto.InventoryReversalVoucherAnalyzer)MotionEngine.GetModule().materialTaskObj; } @@ -142,31 +137,8 @@ public class TaskPrompt : MonoBehaviour FileComponent.DownloadSingleFile("新注册仓库的主数据运维流程_答题卡1"); MotionFramework.MotionEngine.GetModule().HandleClick("答题卡"); } - // if (MotionEngine.GetModule().ExamName == "审核合同变更申请") - // { - // - // if (returnRevVoucherAnalyzer.formselection == "合同1") - // { - // FileComponent.DownloadSingleFile("附件2 系统数据-合同执行计划_合同1"); - // } - // else if (returnRevVoucherAnalyzer.formselection == "合同2") - // { - // FileComponent.DownloadSingleFile("附件2 系统数据-合同执行计划_合同2"); - // } - // } } } - - // - // // 检查下一个步骤是否包含"发货前" - // string nextStepTitle = MotionFramework.MotionEngine.GetModule().GetNextStepTitle(); - // if (!string.IsNullOrEmpty(nextStepTitle) && nextStepTitle.Contains("发货前")) - // { - // Debug.Log($"检测到下一个步骤包含'发货前': {nextStepTitle}，调用Hide()方法"); - // Hide(); - // } - - gameObject.SetActive(false); } @@ -209,11 +181,7 @@ public class TaskPrompt : MonoBehaviour { isHandle = false; MotionFramework.MotionEngine.GetModule().HandleClick("任务书"); - LoadTriggerNextGuide("关闭");; - - - - + LoadTriggerNextGuide("关闭");; } }); } diff --git a/3d/Assets/Zion/Scripts/Utility/DragWindow.cs b/3d/Assets/Zion/Scripts/Utility/DragWindow.cs index 797cdc2..c037195 100644 --- a/3d/Assets/Zion/Scripts/Utility/DragWindow.cs +++ b/3d/Assets/Zion/Scripts/Utility/DragWindow.cs @@ -53,8 +53,6 @@ public class DragWindow : MonoBehaviour, IDragHandler, IBeginDragHandler, IEndDr } public void OnDrag(PointerEventData eventData) { - - if (IgnoretheUI == false) { if (EventSystem.current.IsPointerOverGameObject()) return; @@ -63,17 +61,12 @@ public class DragWindow : MonoBehaviour, IDragHandler, IBeginDragHandler, IEndDr { Vector2 localPosition; RectTransformUtility.ScreenPointToLocalPointInRectangle(transform.parent as RectTransform, Input.mousePosition, null, out localPosition); - //transform.localPosition = localPosition; - // offest = vector2TpVector3(localPosition); - transform.localPosition = vector2TpVector3(localPosition) - offest; } } //停止拖拽 public void OnEndDrag(PointerEventData eventData) { - - if (IgnoretheUI == false) { if (EventSystem.current.IsPointerOverGameObject()) return; @@ -88,7 +81,7 @@ public class DragWindow : MonoBehaviour, IDragHandler, IBeginDragHandler, IEndDr public void OnPointerClick(PointerEventData eventData) { - + Debug.Log("OnPointerClick"); } } diff --git a/3d/Assets/Zion/Scripts/单据/CustodyEntrustmentApplication.cs b/3d/Assets/Zion/Scripts/单据/CustodyEntrustmentApplication.cs index 831a4c6..0b1dd6b 100644 --- a/3d/Assets/Zion/Scripts/单据/CustodyEntrustmentApplication.cs +++ b/3d/Assets/Zion/Scripts/单据/CustodyEntrustmentApplication.cs @@ -57,24 +57,10 @@ public class CustodyEntrustmentApplication : MonoBehaviour Init(); } - // Update is called once per frame - void Update() - { - - } public void Init() { - // CombinedClass combined = GameManager.Instance.combinedClass; - // Materialcode.text = combined.materialCode; - // MaterialName.text = combined.materialName; - // Unit.text = combined.materialUnit; - // MaterialNumber.text = combined.materialNumber; - // DateTime.text = combined.TodayTime; Materialcode.text = MotionEngine.GetModule().GetTaskBookValueByMapping("物料编码"); MaterialName.text = MotionEngine.GetModule().GetTaskBookValueByMapping("物料描述"); - MaterialNumber.text = MotionEngine.GetModule().GetTaskBookValueByMapping("收入数量"); - //Attn.text = combined.Attn; - //Reviewers.text = combined.Reviewers; - //Suppliesdepartment.text = combined.Suppliesdepartment; + MaterialNumber.text = MotionEngine.GetModule().GetTaskBookValueByMapping("收入数量"); } } diff --git a/3d/Assets/Zion/Scripts/单据/ReturnAndInboundList.cs b/3d/Assets/Zion/Scripts/单据/ReturnAndInboundList.cs index 67f0f2a..368e917 100644 --- a/3d/Assets/Zion/Scripts/单据/ReturnAndInboundList.cs +++ b/3d/Assets/Zion/Scripts/单据/ReturnAndInboundList.cs @@ -117,11 +117,6 @@ public class ReturnAndInboundList : MonoBehaviour }); } - // Update is called once per frame - void Update() - { - - } void Init() { Returnnumber.text = MotionEngine.GetModule().GetTaskBookValueByMapping("台"); diff --git a/3d/Assets/Zion/Scripts/单据/ReturnRequestDocuments.cs b/3d/Assets/Zion/Scripts/单据/ReturnRequestDocuments.cs index a297eb8..e4e31e2 100644 --- a/3d/Assets/Zion/Scripts/单据/ReturnRequestDocuments.cs +++ b/3d/Assets/Zion/Scripts/单据/ReturnRequestDocuments.cs @@ -4,16 +4,16 @@ using TMPro; using UnityEngine; /// -/// ̽뵥 +/// 工程结余物资退料申请单 /// public class ReturnRequestDocuments : MonoBehaviour { /// - /// ı + /// 物料描述文本 /// public TextMeshProUGUI Materialdescription; /// - /// + /// 物料数量 /// public TextMeshProUGUI Materialnum; void Start() @@ -23,10 +23,4 @@ public class ReturnRequestDocuments : MonoBehaviour Materialnum.text = data.materialNumber; } - - // Update is called once per frame - void Update() - { - - } } diff --git a/3d/Assets/Zion/Scripts/配送/Manager/UIManager/BasePanel.cs b/3d/Assets/Zion/Scripts/配送/Manager/UIManager/BasePanel.cs index c8207de..e28d29e 100644 --- a/3d/Assets/Zion/Scripts/配送/Manager/UIManager/BasePanel.cs +++ b/3d/Assets/Zion/Scripts/配送/Manager/UIManager/BasePanel.cs @@ -124,7 +124,7 @@ public class BasePanel : MonoBehaviour /// 按钮的完整路径 protected virtual void OnClick(string btnPath) { - // 处理按钮点击事件 + Debug.Log(btnPath + " 处理按钮点击事件"); // 处理按钮点击事件 } /// @@ -134,7 +134,7 @@ public class BasePanel : MonoBehaviour /// Toggle的状态 protected virtual void OnChangeToggle(string togglePath, bool isOn) { - // 处理Toggle切换事件 + Debug.Log(togglePath + " 处理Toggle切换事件: " + isOn); // 处理Toggle切换事件 } /// diff --git a/3d/Assets/Zion/Scripts/配送/借料/ERP_BorrowingRequisitions.cs b/3d/Assets/Zion/Scripts/配送/借料/ERP_BorrowingRequisitions.cs index c91ca7a..6a51fed 100644 --- a/3d/Assets/Zion/Scripts/配送/借料/ERP_BorrowingRequisitions.cs +++ b/3d/Assets/Zion/Scripts/配送/借料/ERP_BorrowingRequisitions.cs @@ -63,9 +63,5 @@ public class ERP_BorrowingRequisitions : MonoBehaviour } }); } - // Update is called once per frame - void Update() - { - } } diff --git a/3d/Assets/test.cs b/3d/Assets/test.cs index a24d8c3..765c88b 100644 --- a/3d/Assets/test.cs +++ b/3d/Assets/test.cs @@ -18,63 +18,15 @@ public class test : MonoBehaviour Debug.Log(JsonConvert.SerializeObject(new CustodyInbound())); - // ĵǰ¼ + // 订阅当前动作完成事件 MotionEngine.GetModule().OnCurrentActionCompleteEvent += (e) => { - Debug.Log("ǰɣ"); + Debug.Log("当前动作已完成！"); }; -// ĵǰж¼ +// 订阅当前步骤所有动作完成事件 MotionEngine.GetModule().OnStepActionsCompleteEvent += (e) => { - Debug.Log("ǰжɣ"); + Debug.Log("当前步骤的所有动作已完成！"); }; - // MotionEngine.GetModule().JumpToProcessAsync(1, 0); - // MotionEngine.GetModule().HandleClick(""); - // MotionEngine.GetModule().HandleClick("Ի"); - - // Debug.Log(MotionEngine.GetModule().HandleClick(new List({""}))); - // Debug.Log(MotionEngine.GetModule().HandleClick("")); - // Debug.Log(MotionEngine.GetModule().HandleClick(new List() - // { - // "¶","1","HDA1" - // })); - // Debug.Log(MotionEngine.GetModule().HandleClick(new List() - // { - // "¶","","HDA1" - // })); - // Debug.Log(MotionEngine.GetModule().HandleClick(new List() - // { - // "2222","3333" - // })); - // - // Debug.Log(MotionEngine.GetModule().HandleClick("pp1p")); - // Debug.Log(MotionEngine.GetModule().HandleClick("pp2p")); - // Debug.Log(MotionEngine.GetModule().HandleClick("pp3p")); - // Debug.Log(MotionEngine.GetModule().HandleClick("ppp")); - // Debug.Log(MotionEngine.GetModule().HandleClick("3")); - // Debug.Log(MotionEngine.GetModule().HandleClick("ppp")); - // Debug.Log(MotionEngine.GetModule().HandleClick("3")); - // Debug.Log(MotionEngine.GetModule().HandleClick("33")); - // Debug.Log(MotionEngine.GetModule().HandleClick("2")); - // Debug.Log(MotionEngine.GetModule().CalculateTotalScore()); - // Debug.Log(MotionEngine.GetModule().HandleClick("11")); - // - - // GuideMask.Instance.CreateRectangleMask(aa); - // 2. ʼ - // TutorialGuideManager.Instance.InitializeGuideObjects(); - // TutorialGuideManager.Instance.StartGuide(); - // yield return new WaitForSeconds(5); - // TutorialGuideManager.Instance.HideGuide(); - // yield return new WaitForSeconds(5); - // TutorialGuideManager.Instance.TriggerNextGuide(); - // TutorialGuideManager.Instance.TriggerNextGuide(); - // yield return new WaitForSeconds(2); - // TutorialGuideManager.Instance.TriggerNextGuide(); } - // Update is called once per frame - void Update() - { - - } }