Commit Graph

305 Commits

Author SHA1 Message Date
YangHua addab0d363 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-26 13:51:59 +08:00
陈向学 8df378d1cd 进电开关 2024-08-26 13:51:18 +08:00
陈向学 7cdd3856b8 trriger回调,换空开模型 2024-08-26 13:36:32 +08:00
YangHua 763501987f 修改表格 2024-08-26 13:19:40 +08:00
YangHua 07c2e0321e Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-26 11:29:30 +08:00
YangHua d1ca48b6ce 修改数据 2024-08-26 11:29:26 +08:00
陈向学 d70d2bc316 跳现场步骤 2024-08-26 11:28:54 +08:00
陈向学 d6df7a0551 返回值 2024-08-26 09:49:50 +08:00
陈向学 8ccf7fad23 s 2024-08-26 09:33:36 +08:00
陈向学 51bdb22652 回调,父物体null 2024-08-26 09:31:31 +08:00
YangHua 20c3de29d0 修改工具间物品增加删除的功能 2024-08-26 08:37:53 +08:00
YangHua 4a3f280adc Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-25 18:25:35 +08:00
YangHua 383af005d8 修改流程 2024-08-25 18:25:29 +08:00
陈向学 177a21c950 还原整个柜子 2024-08-25 18:20:48 +08:00
陈向学 9470950064 ttt 2024-08-25 17:44:09 +08:00
陈向学 9b961365e4 zzz 2024-08-25 17:37:39 +08:00
YangHua 71757aab24 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-25 14:46:33 +08:00
YangHua d97ca9be1a 修改数据 2024-08-25 14:46:30 +08:00
陈向学 e575a70ea4 aa 2024-08-25 14:35:52 +08:00
YangHua 23df487537 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-25 14:33:12 +08:00
YangHua b7045add8e 12 2024-08-25 14:33:01 +08:00
陈向学 2b47236a56 工具间步骤重置 2024-08-25 14:32:17 +08:00
YangHua aa6f45d70b 重新配置数据 2024-08-25 12:59:10 +08:00
YangHua c0fd9c8f8c 融合 2024-08-25 12:54:34 +08:00
YangHua ad25cb0d27 修改数据名称 2024-08-25 12:52:37 +08:00
陈向学 135f771fdd 注释 2024-08-23 20:14:19 +08:00
陈向学 672d593535 步骤还原完善 2024-08-23 20:03:25 +08:00
陈向学 80b5a8aca4 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-23 18:33:42 +08:00
陈向学 719b1899a2 改步骤重置 2024-08-23 18:33:34 +08:00
YangHua c1559e8a65 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-23 18:30:52 +08:00
YangHua 2d98225b7c 添加NPC负责人逻辑 2024-08-23 18:30:46 +08:00
taosuqi 6a26d7cbed 修复字体 2024-08-23 18:24:53 +08:00
YangHua d559f27d9c Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-23 17:49:33 +08:00
YangHua 92b6904314 修改NPC对话逻辑 2024-08-23 17:49:27 +08:00
taosuqi 5056041aa9 111 2024-08-23 17:24:16 +08:00
taosuqi e106ed63bc UI_LowTensionWorkTicketPanel面板新增功能 2024-08-23 17:20:19 +08:00
陈向学 9dc763d14c 换空开 2024-08-23 17:12:54 +08:00
wangyang 0aeecff577 添加NPC负责人,分割空开,添加NPC客户 2024-08-23 16:58:24 +08:00
YangHua e12c60a700 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-23 16:48:32 +08:00
YangHua 56fc8f274b 添加NPC等逻辑 2024-08-23 16:48:23 +08:00
陈向学 533935d475 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-23 14:48:56 +08:00
陈向学 1aecc32b97 v 2024-08-23 14:48:51 +08:00
YangHua 958e0653a8 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-23 14:48:00 +08:00
YangHua d5437d47c2 添加移除全部工具材质设备的方法 2024-08-23 14:47:51 +08:00
陈向学 6a75caa453 改类名 2024-08-23 14:00:50 +08:00
YangHua 6679abe086 修改bug 2024-08-23 13:20:10 +08:00
YangHua 118ceaef5f 修改 报错 2024-08-23 13:07:26 +08:00
YangHua d02248b98e Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-23 11:32:06 +08:00
陈向学 2475ebc28f s 2024-08-23 11:31:47 +08:00
YangHua 6408cae856 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-23 11:29:17 +08:00