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 |
|
supercjj2023
|
023ed5d713
|
修改电缆属性修改的判定规则，主要是增加上级系统是否一致的判定，SYSTEM还是让他去主系统改，不是主系统不让改系统，哪怕从空到有。
|
2025-09-18 14:08:11 +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 |
|
|
|
df57509ac7
|
1
|
2025-09-16 10:06:59 +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 |
|
|
|
e96f397f4f
|
Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec
|
2025-09-15 20:28:57 +08:00 |
|
|
|
752f3d8668
|
1.增加了启动时对redis的清理
2.优化检入时的速度
|
2025-09-15 20:28:38 +08:00 |
|
CHEN-ZW\acer
|
0d7752d821
|
信号预分配功能
|
2025-09-15 18:35:41 +08:00 |
|
supercjj2023
|
72d236d8ea
|
优化检入检查循环
|
2025-09-12 15:48:00 +08:00 |
|
CHEN-ZW\acer
|
50f581ba36
|
Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec
|
2025-09-12 12:03:48 +08:00 |
|
CHEN-ZW\acer
|
8a2c73eabb
|
信号管理，io分配bug
|
2025-09-12 12:03:20 +08:00 |
|
supercjj2023
|
8e44650cfb
|
一些奇怪的更新
|
2025-09-11 10:19:55 +08:00 |
|
chenjinbu
|
4eddfe1f59
|
布置图输入值改成可输入的下拉框，ini操作异常修改，布置图加载修改
|
2025-09-10 10:57:20 +08:00 |
|
chenjinbu
|
93967b9e1d
|
1
|
2025-09-09 09:06:55 +08:00 |
|
chenjinbu
|
9944b27e85
|
1
|
2025-09-09 09:06:40 +08:00 |
|
chenjinbu
|
8487e02edf
|
1
|
2025-09-09 09:02:18 +08:00 |
|
chenjinbu
|
f5091e1225
|
1
|
2025-09-09 09:02:13 +08:00 |
|
chenjinbu
|
7746314ac7
|
1
|
2025-09-09 09:01:32 +08:00 |
|
CHEN-ZW\acer
|
516581840d
|
1.存在送审时间不提示
|
2025-09-09 08:58:50 +08:00 |
|
supercjj2023
|
b14bf8829f
|
SQL修改
|
2025-09-08 14:18:48 +08:00 |
|
supercjj2023
|
6c9332b23d
|
多出来的东西
|
2025-09-08 13:29:15 +08:00 |
|
|
|
28f0461113
|
Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec
|
2025-09-08 13:16:50 +08:00 |
|
|
|
b1045def04
|
schema工具更新了正则表达式逻辑
|
2025-09-08 13:16:11 +08:00 |
|
CHEN-ZW\acer
|
a9fb4be5d1
|
信号管理外部加载dll报错bug
|
2025-09-05 12:03:25 +08:00 |
|
CHEN-ZW\acer
|
6be078b01e
|
忽略newFront/c#前端/.vs
|
2025-09-04 18:33:55 +08:00 |
|
CHEN-ZW\acer
|
dec2a796e8
|
信号管理
|
2025-09-04 18:28:02 +08:00 |
|
|
|
0a1f2c458d
|
schema工具更新了下判断无效sql的逻辑
|
2025-09-04 10:24:45 +08:00 |
|
|
|
26e699c05e
|
修改了BOM接口的分组条件
|
2025-09-03 15:15:24 +08:00 |
|
|
|
1242b32386
|
完善了材料表的接口逻辑
|
2025-09-02 20:47:47 +08:00 |
|
|
|
6351a1dab3
|
Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec
|
2025-09-02 16:14:53 +08:00 |
|
|
|
c2f35e0495
|
增加了一个材料表的接口
|
2025-09-02 16:14:43 +08:00 |
|
chenjinbu
|
3a2d551fc8
|
布置图
|
2025-09-02 11:32:44 +08:00 |
|
chenjinbu
|
d5d39ed68d
|
布置图自动绘制
|
2025-09-02 11:27:57 +08:00 |
|
chenjinbu
|
bda7c4f849
|
布置图自动绘制
|
2025-09-02 11:21:40 +08:00 |
|
|
|
819427a115
|
Task #6599 增加了查询返回时的||处理
|
2025-09-02 09:59:25 +08:00 |
|
|
|
459becb1a9
|
Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec
|
2025-09-01 23:16:47 +08:00 |
|
