|
|
f3f29f56d1
|
Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec
|
2025-10-21 09:27:15 +08:00 |
|
|
|
23a5ea20ee
|
bug #10021，平行电缆与其他位号重复
|
2025-10-21 09:27:05 +08:00 |
|
chenjinbu
|
d88f2c2654
|
Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec
|
2025-10-17 16:45:29 +08:00 |
|
chenjinbu
|
ce1a577588
|
刷新标注
|
2025-10-17 16:45:00 +08:00 |
|
|
|
9ea7efaeb7
|
merge
|
2025-10-17 11:17:01 +08:00 |
|
|
|
b803684ebc
|
修改了Getbreaker的内容
|
2025-10-17 11:15:09 +08:00 |
|
supercjj2023
|
35db5475e6
|
导入成功返回空，不然外面报的是失败状态。
|
2025-10-17 10:41:48 +08:00 |
|
supercjj2023
|
c7e0733623
|
针对图纸导入，修改属性批量添加的代码。
|
2025-10-17 10:37:44 +08:00 |
|
supercjj2023
|
fa315072e1
|
二室电缆册新增
|
2025-10-16 11:57:43 +08:00 |
|
supercjj2023
|
c75b6dc23e
|
1
|
2025-10-10 16:53:27 +08:00 |
|
supercjj2023
|
f525a8d408
|
布置图生成逻辑取值BUG修改，因为ROOMNO的增加，逻辑发生一定的变更，优先级ROOMNO更高，布置图图例规则窗口修改。
|
2025-10-10 16:52:13 +08:00 |
|
|
|
8084bd7715
|
Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec
|
2025-10-10 09:44:16 +08:00 |
|
|
|
78c8668ac3
|
新增布置图细分图例，下拉菜单会被遮住
|
2025-10-10 09:44:02 +08:00 |
|
CHEN-ZW\acer
|
c76c8ada14
|
Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec
# Conflicts:
# newFront/c#前端/SWS.CAD/Commands.cs
# newFront/c#前端/SWS.Electrical/obj/Debug/Views/DialogTest2.g.i.cs
# newFront/c#前端/SWS.Electrical/obj/Debug/Views/SWSDialogWindow.g.cs
# newFront/c#前端/SWS.Electrical/obj/Debug/Views/SWSDialogWindow.g.i.cs
# newFront/c#前端/SWS.WPF/obj/Debug/Views/CustomDialogWindow.g.cs
# newFront/c#前端/SWS.WPF/obj/Debug/Views/CustomDialogWindow.g.i.cs
|
2025-10-09 18:08:19 +08:00 |
|
|
|
0748365cdb
|
Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec
|
2025-10-01 23:36:08 +08:00 |
|
|
|
b8b6fde9b0
|
重写自动分配的逻辑
|
2025-10-01 00:18:02 +08:00 |
|
supercjj2023
|
1efa2ff9fd
|
Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec
|
2025-09-29 16:37:56 +08:00 |
|
supercjj2023
|
42444e0b43
|
图纸导入问题修改
|
2025-09-29 16:37:39 +08:00 |
|
|
|
b84f7d9d0f
|
Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec
|
2025-09-26 11:04:11 +08:00 |
|
supercjj2023
|
7e5aa24ab1
|
增加取ROOMNO数据有关的代码
|
2025-09-25 16:56:23 +08:00 |
|
|
|
6f194c726a
|
基本完成了自动分配逻辑
|
2025-09-24 18:39:10 +08:00 |
|
|
|
2e665e9f3d
|
自动分配（就近找采集箱逻辑完成）
|
2025-09-22 15:44:15 +08:00 |
|
|
|
ed968f39f9
|
增加了shared项目
|
2025-09-22 13:50:02 +08:00 |
|
|
|
cde4be8f13
|
完善自动分配（就近找采集箱)
|
2025-09-22 13:45:53 +08:00 |
|
CHEN-ZW\acer
|
8fa07593ac
|
Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec
# Conflicts:
# Learun.Framework.Module/Learun.Db/Learun.DataBase.EF.Oracle/obj/Debug/Learun.DataBase.Oracle.csproj.AssemblyReference.cache
# Learun.Framework.Module/Learun.Db/Learun.DataBase.EF.Sqlserver/obj/Debug/Learun.DataBase.SqlServer.csproj.AssemblyReference.cache
# Learun.Framework.Module/Learun.Db/Learun.DataBase.MySql/obj/Debug/Learun.DataBase.MySqlEx.csproj.AssemblyReference.cache
|
2025-09-22 10:02:17 +08:00 |
|
CHEN-ZW\acer
|
ae99e29e99
|
1
|
2025-09-22 09:57:45 +08:00 |
|
chenjinbu
|
ffc5786ed5
|
材料表自动生成
|
2025-09-22 09:25:18 +08:00 |
|
chenjinbu
|
2c5bf00d85
|
材料表自动生成，布置图下来多选和默认块图纸
|
2025-09-22 09:21:04 +08:00 |
|
supercjj2023
|
023ed5d713
|
修改电缆属性修改的判定规则，主要是增加上级系统是否一致的判定，SYSTEM还是让他去主系统改，不是主系统不让改系统，哪怕从空到有。
|
2025-09-18 14:08:11 +08:00 |
|
|
|
63ab9f2a4a
|
1
|
2025-09-18 09:30:10 +08:00 |
|
supercjj2023
|
b9b4980541
|
又多出了很多staged
|
2025-09-18 09:22:11 +08:00 |
|
supercjj2023
|
68559cf7f5
|
和位号更新后刷新电缆的from/to有关代码
|
2025-09-18 09:19:06 +08:00 |
|
|
|
716a1e3524
|
Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec
|
2025-09-18 00:06:54 +08:00 |
|
|
|
4c55f4c7f2
|
开始弄自动分配的step2（step1里还有查找周边采集箱函数）
|
2025-09-18 00:04:25 +08:00 |
|
supercjj2023
|
231e088199
|
再次优化了检入之前的检查，发布先等会优化
|
2025-09-16 14:44:21 +08:00 |
|
|
|
39f8761416
|
布置图绘制，取消区域限制，所属系统支持多选
|
2025-09-16 10:42:51 +08:00 |
|
|
|
e25921906e
|
1
|
2025-09-16 10:20:18 +08:00 |
|
|
|
529af9b7aa
|
增加了自动分配的step1和step2
|
2025-09-16 10:18:32 +08:00 |
|
supercjj2023
|
e1f9939a41
|
优化了检入检查的循环，之前因为没有PUSH，冲突了。
|
2025-09-16 10:00:59 +08:00 |
|
|
|
e6d949afe9
|
1
|
2025-09-16 09:52:10 +08:00 |
|
supercjj2023
|
4d827a45be
|
不知为何本地会有那么多staged，commit一下看看
|
2025-09-16 09:49:26 +08:00 |
|
|
|
1f6ac157b7
|
TASK #9476
|
2025-09-15 22:58:22 +08:00 |
|
|
|
752f3d8668
|
1.增加了启动时对redis的清理
2.优化检入时的速度
|
2025-09-15 20:28:38 +08:00 |
|
supercjj2023
|
72d236d8ea
|
优化检入检查循环
|
2025-09-12 15:48:00 +08:00 |
|
|
|
0a1f2c458d
|
schema工具更新了下判断无效sql的逻辑
|
2025-09-04 10:24:45 +08:00 |
|
|
|
1242b32386
|
完善了材料表的接口逻辑
|
2025-09-02 20:47:47 +08:00 |
|
|
|
c2f35e0495
|
增加了一个材料表的接口
|
2025-09-02 16:14:43 +08:00 |
|
|
|
819427a115
|
Task #6599 增加了查询返回时的||处理
|
2025-09-02 09:59:25 +08:00 |
|
|
|
1a38151b9a
|
Task #6599
|
2025-09-01 23:16:37 +08:00 |
|
|
|
c1b44f26f1
|
网页端 信号监测表导入
|
2025-09-01 13:25:00 +08:00 |
|
