CHEN-ZW\acer
|
d3813c8d56
|
Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec
# Conflicts:
# newFront/c#前端/SWS.CAD/Start.cs
|
2025-10-21 13:57:39 +08:00 |
|
CHEN-ZW\acer
|
b31eb505e4
|
1
|
2025-10-21 13:53:04 +08:00 |
|
|
|
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 |
|
supercjj2023
|
560d62a6d6
|
改了点小地方，不然没有房间号只有肋位号的位号出不来。
|
2025-10-20 18:11:47 +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 |
|
CHEN-ZW\acer
|
9f83439704
|
1
|
2025-10-09 18:01:41 +08:00 |
|
chenjinbu
|
c78178035f
|
1
|
2025-10-09 17:52:59 +08:00 |
|
chenjinbu
|
38e5331d09
|
1
|
2025-10-09 17:52:17 +08:00 |
|
chenjinbu
|
7e2384fe38
|
布置图修改，材料表修改
|
2025-10-09 17:50:08 +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 |
|
|
|
af328bdb8f
|
增加了homerun的分配逻辑（不需要考虑预留空白）
|
2025-10-01 23:35:57 +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 |
|
|
|
3ac7c7822a
|
Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec
|
2025-09-28 10:43:52 +08:00 |
|
|
|
dc8b37ca6e
|
TEMP
|
2025-09-28 10:43:45 +08:00 |
|
supercjj2023
|
9566e8ae24
|
增加取基点的时候deleteflg=0这个条件
|
2025-09-28 09:28:30 +08:00 |
|
supercjj2023
|
c5ac8aa15b
|
原本是判断甲板重复，现在增加了房间号叠加判断，不然一个甲板里面很多房间就会报错
|
2025-09-28 09:05:43 +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 |
|
|
|
dc7269290f
|
09 25
|
2025-09-26 11:04:02 +08:00 |
|
supercjj2023
|
7e5aa24ab1
|
增加取ROOMNO数据有关的代码
|
2025-09-25 16:56:23 +08:00 |
|
|
|
ba7bbd2f2e
|
merge
|
2025-09-24 21:56:58 +08:00 |
|
|
|
6f194c726a
|
基本完成了自动分配逻辑
|
2025-09-24 18:39:10 +08:00 |
|
CHEN-ZW\acer
|
e24ee57355
|
1
|
2025-09-23 16:38:40 +08:00 |
|
supercjj2023
|
7d17fab113
|
由于userid为NULL点击对象属性报错修改。
|
2025-09-23 15:17:57 +08:00 |
|
|
|
460894e56c
|
merge from cjj
|
2025-09-22 15:45:25 +08:00 |
|
|
|
2e665e9f3d
|
自动分配（就近找采集箱逻辑完成）
|
2025-09-22 15:44:15 +08:00 |
|
supercjj2023
|
842777110e
|
Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec
|
2025-09-22 15:42:31 +08:00 |
|
supercjj2023
|
9d346502eb
|
和布置图获取值有关代码更新
|
2025-09-22 15:42:18 +08:00 |
|
chenjinbu
|
b37d04a1e6
|
1
|
2025-09-22 14:29:11 +08:00 |
|
chenjinbu
|
c615747f8a
|
布置图异常元件另外一个Grid显示
|
2025-09-22 14:28:19 +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
|
8b30412e7c
|
增加createuserid为NULL和空检查
|
2025-09-18 17:23:52 +08:00 |
|
