Commit Graph

Select branches

Hide Pull Requests

main

自动分配信号

Mono Color

• d3813c8d56 Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec main CHEN-ZW\acer 2025-10-21 13:57:39 +08:00
• b31eb505e4 1 CHEN-ZW\acer 2025-10-21 13:53:04 +08:00
• f3f29f56d1 Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec xingheng 2025-10-21 09:27:15 +08:00
• 23a5ea20ee bug #10021，平行电缆与其他位号重复 xingheng 2025-10-21 09:27:05 +08:00
• 560d62a6d6 改了点小地方，不然没有房间号只有肋位号的位号出不来。 supercjj2023 2025-10-20 18:11:47 +08:00
• d88f2c2654 Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec chenjinbu 2025-10-17 16:45:29 +08:00
• ce1a577588 刷新标注 chenjinbu 2025-10-17 16:45:00 +08:00
• 9ea7efaeb7 merge xingheng 2025-10-17 11:17:01 +08:00
• b803684ebc 修改了Getbreaker的内容 xingheng 2025-10-17 11:15:09 +08:00
• 35db5475e6 导入成功返回空，不然外面报的是失败状态。 supercjj2023 2025-10-17 10:41:48 +08:00
• c7e0733623 针对图纸导入，修改属性批量添加的代码。 supercjj2023 2025-10-17 10:37:44 +08:00
• fa315072e1 二室电缆册新增 supercjj2023 2025-10-16 11:57:43 +08:00
• c75b6dc23e 1 supercjj2023 2025-10-10 16:53:27 +08:00
• f525a8d408 布置图生成逻辑取值BUG修改，因为ROOMNO的增加，逻辑发生一定的变更，优先级ROOMNO更高，布置图图例规则窗口修改。 supercjj2023 2025-10-10 16:52:13 +08:00
• 8084bd7715 Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec xingheng 2025-10-10 09:44:16 +08:00
• 78c8668ac3 新增布置图细分图例，下拉菜单会被遮住 xingheng 2025-10-10 09:44:02 +08:00
• c76c8ada14 Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec CHEN-ZW\acer 2025-10-09 18:08:19 +08:00
• 9f83439704 1 CHEN-ZW\acer 2025-10-09 18:01:41 +08:00
• c78178035f 1 chenjinbu 2025-10-09 17:52:59 +08:00
• 38e5331d09 1 chenjinbu 2025-10-09 17:52:17 +08:00
• 7e2384fe38 布置图修改，材料表修改 chenjinbu 2025-10-09 17:50:08 +08:00
• 0748365cdb Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec xingheng 2025-10-01 23:36:08 +08:00
• af328bdb8f 增加了homerun的分配逻辑（不需要考虑预留空白） xingheng 2025-10-01 23:35:57 +08:00
• b8b6fde9b0 重写自动分配的逻辑 xingheng 2025-10-01 00:18:02 +08:00
• 1efa2ff9fd Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec supercjj2023 2025-09-29 16:37:56 +08:00
• 42444e0b43 图纸导入问题修改 supercjj2023 2025-09-29 16:37:39 +08:00
• 3ac7c7822a Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec xingheng 2025-09-28 10:43:52 +08:00
• dc8b37ca6e TEMP xingheng 2025-09-28 10:43:45 +08:00
• 9566e8ae24 增加取基点的时候deleteflg=0这个条件 supercjj2023 2025-09-28 09:28:30 +08:00
• c5ac8aa15b 原本是判断甲板重复，现在增加了房间号叠加判断，不然一个甲板里面很多房间就会报错 supercjj2023 2025-09-28 09:05:43 +08:00
• b84f7d9d0f Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec xingheng 2025-09-26 11:04:11 +08:00
• dc7269290f 09 25 xingheng 2025-09-26 11:04:02 +08:00
• 7e5aa24ab1 增加取ROOMNO数据有关的代码 supercjj2023 2025-09-25 16:56:23 +08:00
• ba7bbd2f2e merge xingheng 2025-09-24 21:56:58 +08:00
• 6f194c726a 基本完成了自动分配逻辑 xingheng 2025-09-24 18:39:10 +08:00
• e24ee57355 1 CHEN-ZW\acer 2025-09-23 16:38:40 +08:00
• 7d17fab113 由于userid为NULL点击对象属性报错修改。 supercjj2023 2025-09-23 15:17:57 +08:00
• 460894e56c merge from cjj xingheng 2025-09-22 15:45:25 +08:00
• 2e665e9f3d 自动分配（就近找采集箱逻辑完成） xingheng 2025-09-22 15:44:15 +08:00
• 842777110e Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec supercjj2023 2025-09-22 15:42:31 +08:00
• 9d346502eb 和布置图获取值有关代码更新 supercjj2023 2025-09-22 15:42:18 +08:00
• b37d04a1e6 1 chenjinbu 2025-09-22 14:29:11 +08:00
• c615747f8a 布置图异常元件另外一个Grid显示 chenjinbu 2025-09-22 14:28:19 +08:00
• ed968f39f9 增加了shared项目 xingheng 2025-09-22 13:50:02 +08:00
• cde4be8f13 完善自动分配（就近找采集箱) xingheng 2025-09-22 13:45:53 +08:00
• 8fa07593ac Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec CHEN-ZW\acer 2025-09-22 10:02:17 +08:00
• ae99e29e99 1 CHEN-ZW\acer 2025-09-22 09:57:45 +08:00
• ffc5786ed5 材料表自动生成 chenjinbu 2025-09-22 09:25:18 +08:00
• 2c5bf00d85 材料表自动生成，布置图下来多选和默认块图纸 chenjinbu 2025-09-22 09:21:04 +08:00
• 8b30412e7c 增加createuserid为NULL和空检查 supercjj2023 2025-09-18 17:23:52 +08:00
• 023ed5d713 修改电缆属性修改的判定规则，主要是增加上级系统是否一致的判定，SYSTEM还是让他去主系统改，不是主系统不让改系统，哪怕从空到有。 supercjj2023 2025-09-18 14:08:11 +08:00
• 63ab9f2a4a 1 xingheng 2025-09-18 09:30:10 +08:00
• b9b4980541 又多出了很多staged supercjj2023 2025-09-18 09:22:11 +08:00
• 68559cf7f5 和位号更新后刷新电缆的from/to有关代码 supercjj2023 2025-09-18 09:19:06 +08:00
• 716a1e3524 Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec xingheng 2025-09-18 00:06:54 +08:00
• 4c55f4c7f2 开始弄自动分配的step2（step1里还有查找周边采集箱函数） xingheng 2025-09-18 00:04:25 +08:00
• 231e088199 再次优化了检入之前的检查，发布先等会优化 supercjj2023 2025-09-16 14:44:21 +08:00
• 39f8761416 布置图绘制，取消区域限制，所属系统支持多选 xingheng 2025-09-16 10:42:51 +08:00
• e25921906e 1 xingheng 2025-09-16 10:20:18 +08:00
• 529af9b7aa 增加了自动分配的step1和step2 xingheng 2025-09-16 10:18:32 +08:00
• df57509ac7 1 xingheng 2025-09-16 10:06:59 +08:00
• e1f9939a41 优化了检入检查的循环，之前因为没有PUSH，冲突了。 supercjj2023 2025-09-16 10:00:59 +08:00
• e6d949afe9 1 xingheng 2025-09-16 09:51:40 +08:00
• 4d827a45be 不知为何本地会有那么多staged，commit一下看看 supercjj2023 2025-09-16 09:49:26 +08:00
• 1f6ac157b7 TASK #9476 xingheng 2025-09-15 22:58:22 +08:00
• e96f397f4f Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec xingheng 2025-09-15 20:28:57 +08:00
• 752f3d8668 1.增加了启动时对redis的清理 2.优化检入时的速度 xingheng 2025-09-15 20:28:38 +08:00
• 0d7752d821 信号预分配功能 CHEN-ZW\acer 2025-09-15 18:35:41 +08:00
• 72d236d8ea 优化检入检查循环 supercjj2023 2025-09-12 15:48:00 +08:00
• 50f581ba36 Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec CHEN-ZW\acer 2025-09-12 12:03:48 +08:00
• 8a2c73eabb 信号管理，io分配bug CHEN-ZW\acer 2025-09-12 12:03:20 +08:00
• 8e44650cfb 一些奇怪的更新 supercjj2023 2025-09-11 10:19:55 +08:00
• 4eddfe1f59 布置图输入值改成可输入的下拉框，ini操作异常修改，布置图加载修改 chenjinbu 2025-09-10 10:57:20 +08:00
• 93967b9e1d 1 chenjinbu 2025-09-09 09:06:55 +08:00
• 9944b27e85 1 chenjinbu 2025-09-09 09:06:40 +08:00
• 8487e02edf 1 chenjinbu 2025-09-09 09:02:18 +08:00
• f5091e1225 1 chenjinbu 2025-09-09 09:02:13 +08:00
• 7746314ac7 1 chenjinbu 2025-09-09 09:01:32 +08:00
• 516581840d 1.存在送审时间不提示 CHEN-ZW\acer 2025-09-09 08:58:50 +08:00
• b14bf8829f SQL修改 supercjj2023 2025-09-08 14:18:48 +08:00
• 6c9332b23d 多出来的东西 supercjj2023 2025-09-08 13:29:15 +08:00
• 28f0461113 Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec xingheng 2025-09-08 13:16:50 +08:00
• b1045def04 schema工具更新了正则表达式逻辑 xingheng 2025-09-08 13:16:11 +08:00
• a9fb4be5d1 信号管理外部加载dll报错bug CHEN-ZW\acer 2025-09-05 12:03:25 +08:00
• 7e3a51b8b0 0904 自动分配信号 xingheng 2025-09-04 23:45:29 +08:00
• 6be078b01e 忽略newFront/c#前端/.vs CHEN-ZW\acer 2025-09-04 18:33:55 +08:00
• dec2a796e8 信号管理 CHEN-ZW\acer 2025-09-04 18:28:02 +08:00
• 0a1f2c458d schema工具更新了下判断无效sql的逻辑 xingheng 2025-09-04 10:24:42 +08:00
• 26e699c05e 修改了BOM接口的分组条件 xingheng 2025-09-03 15:15:24 +08:00
• 1242b32386 完善了材料表的接口逻辑 xingheng 2025-09-02 20:47:47 +08:00
• 6351a1dab3 Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec xingheng 2025-09-02 16:14:53 +08:00
• c2f35e0495 增加了一个材料表的接口 xingheng 2025-09-02 16:14:43 +08:00
• 3a2d551fc8 布置图 chenjinbu 2025-09-02 11:32:44 +08:00
• d5d39ed68d 布置图自动绘制 chenjinbu 2025-09-02 11:21:40 +08:00
• bda7c4f849 布置图自动绘制 chenjinbu 2025-09-02 11:21:40 +08:00
• 819427a115 Task #6599 增加了查询返回时的||处理 xingheng 2025-09-02 09:59:25 +08:00
• 459becb1a9 Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec xingheng 2025-09-01 23:16:47 +08:00
• 1a38151b9a Task #6599 xingheng 2025-09-01 23:16:37 +08:00
• 31751acf18 Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec supercjj2023 2025-09-01 16:30:53 +08:00
• 7252e68403 抽电缆册增加N*N+N*N的变频电缆情况。 supercjj2023 2025-09-01 16:30:39 +08:00