|
|
dc7269290f
|
09 25
|
2025-09-26 11:04:02 +08:00 |
|
|
|
ba7bbd2f2e
|
merge
|
2025-09-24 21:56:58 +08:00 |
|
|
|
6f194c726a
|
基本完成了自动分配逻辑
|
2025-09-24 18:39:10 +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
|
9d346502eb
|
和布置图获取值有关代码更新
|
2025-09-22 15:42:18 +08:00 |
|
|
|
ed968f39f9
|
增加了shared项目
|
2025-09-22 13:50:02 +08:00 |
|
|
|
cde4be8f13
|
完善自动分配（就近找采集箱)
|
2025-09-22 13:45:53 +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 |
|
|
|
63ab9f2a4a
|
1
|
2025-09-18 09:30:10 +08:00 |
|
|
|
4c55f4c7f2
|
开始弄自动分配的step2（step1里还有查找周边采集箱函数）
|
2025-09-18 00:04:25 +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 |
|
|
|
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 |
|
supercjj2023
|
8e44650cfb
|
一些奇怪的更新
|
2025-09-11 10:19: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 |
|
supercjj2023
|
b14bf8829f
|
SQL修改
|
2025-09-08 14:18:48 +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 |
|
|
|
c2f35e0495
|
增加了一个材料表的接口
|
2025-09-02 16:14:43 +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 |
|
|
|
1a38151b9a
|
Task #6599
|
2025-09-01 23:16:37 +08:00 |
|
supercjj2023
|
31751acf18
|
Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec
|
2025-09-01 16:30:53 +08:00 |
|
supercjj2023
|
7252e68403
|
抽电缆册增加N*N+N*N的变频电缆情况。
|
2025-09-01 16:30:39 +08:00 |
|
|
|
ab7f98b485
|
Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec
|
2025-09-01 13:25:10 +08:00 |
|
|
|
c1b44f26f1
|
网页端 信号监测表导入
|
2025-09-01 13:25:00 +08:00 |
|
supercjj2023
|
7f5c2ba7ed
|
针对电缆册数据生成，增加变频电缆和中高压电缆类型的判断。
|
2025-09-01 11:32:47 +08:00 |
|
|
|
dccff57aaa
|
Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec
|
2025-08-29 15:16:11 +08:00 |
|
|
|
9a000f8d43
|
1
|
2025-08-29 15:16:09 +08:00 |
|
|
|
9f22a23149
|
忽略不需要的一些bin debug release
|
2025-08-29 15:14:45 +08:00 |
|
supercjj2023
|
446e1b2190
|
电缆册抽取更新，系统撇除||，CAT网线类的电缆型号为空
|
2025-08-27 16:52:12 +08:00 |
|
|
|
885bd798b6
|
1
|
2025-08-27 15:48:37 +08:00 |
|
|
|
e16b5ddeeb
|
1
|
2025-08-27 15:40:47 +08:00 |
|
|
|
c59c1031b2
|
1
|
2025-08-27 15:40:28 +08:00 |
|
supercjj2023
|
f8526e9199
|
增加对变频电缆的判断
|
2025-08-27 15:21:45 +08:00 |
|
supercjj2023
|
b737a91881
|
测试
|
2025-08-27 15:20:32 +08:00 |
|
supercjj2023
|
2f42b1d449
|
电缆册抽取数据调整，是否铠装的判断调整。
|
2025-08-27 14:54:18 +08:00 |
|
supercjj2023
|
7f3a1bdc50
|
尝试commits
|
2025-08-27 14:53:26 +08:00 |
|
supercjj2023
|
c0726a41d4
|
布置图图例规则更新，针对对象进行设置，增加是否默认图标标记，图纸导入修改，图纸检查属性互斥BUG修正
|
2025-08-27 09:57:40 +08:00 |
|
