zhoukeda
|
e202579a81
|
已发布的复制改成未发布
|
2023-05-23 16:18:57 +08:00 |
|
zhoukeda
|
30185e390c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-05-23 08:58:45 +08:00 |
|
zhoukeda
|
38b98060fb
|
生成bom版本号唯一性校验
|
2023-05-23 08:58:34 +08:00 |
|
DEVICE8\12494
|
6ee558a3e4
|
模具保养计划执行模块代码提交
|
2023-05-22 19:17:14 +08:00 |
|
DEVICE8\12494
|
486d76e3d0
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-05-21 21:03:51 +08:00 |
|
DEVICE8\12494
|
709ef585b2
|
异常开始结束带代码提交
|
2023-05-21 21:03:45 +08:00 |
|
zhoukeda
|
a46191035c
|
修改bug
|
2023-05-19 17:40:58 +08:00 |
|
zhoukeda
|
31c33fe0cc
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApply.cs
|
2023-05-19 17:39:49 +08:00 |
|
zhoukeda
|
9b091e3a11
|
维修管理
|
2023-05-19 17:39:09 +08:00 |
|
PhilPan
|
2f0af8fe3d
|
Merge branch 'dev' of ssh://git.tuotong-tech.com:9105/tnb/tnb.server into dev
|
2023-05-19 17:02:11 +08:00 |
|
PhilPan
|
1f535464d8
|
修复在线用户的错误
|
2023-05-19 17:02:08 +08:00 |
|
qianjiawei
|
ed3c51e9f0
|
修改模穴数的获取
|
2023-05-19 16:10:15 +08:00 |
|
PhilPan
|
23dd5a7604
|
修复sql错误导致程序崩溃的问题
|
2023-05-19 11:24:18 +08:00 |
|
DEVICE8\12494
|
0670387658
|
修复错误
|
2023-05-19 09:19:29 +08:00 |
|
DEVICE8\12494
|
649105eb6e
|
1
|
2023-05-19 09:13:35 +08:00 |
|
DEVICE8\12494
|
1c31a4e496
|
1
|
2023-05-19 08:37:27 +08:00 |
|
DEVICE8\12494
|
d8099b38df
|
1
|
2023-05-19 08:32:44 +08:00 |
|
DEVICE8\12494
|
d47bca3783
|
1
|
2023-05-18 18:44:40 +08:00 |
|
DEVICE8\12494
|
9d30038a7d
|
1
|
2023-05-18 18:44:16 +08:00 |
|
PhilPan
|
323b0148af
|
调整命名空间
|
2023-05-18 18:21:10 +08:00 |
|
PhilPan
|
d2546bafe0
|
合并
|
2023-05-18 18:16:27 +08:00 |
|
PhilPan
|
3033b9c66e
|
重新生成实体类
|
2023-05-18 18:15:38 +08:00 |
|
zhoukeda
|
59769a91d5
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-05-18 17:18:35 +08:00 |
|
zhoukeda
|
c19a2c13dc
|
点巡检复核
|
2023-05-18 17:18:26 +08:00 |
|
PhilPan
|
82c94d9707
|
Merge branch 'dev' of ssh://git.tuotong-tech.com:9105/tnb/tnb.server into dev
|
2023-05-18 15:38:46 +08:00 |
|
PhilPan
|
31db0d5667
|
使用razor模板生成实体文件
|
2023-05-18 15:38:25 +08:00 |
|
DEVICE8\12494
|
90b3b55e4a
|
1
|
2023-05-18 10:38:47 +08:00 |
|
DEVICE8\12494
|
926d37924a
|
模具保养代码提交
|
2023-05-18 08:52:54 +08:00 |
|
DEVICE8\12494
|
4fa3124aea
|
模具组保养管理
|
2023-05-17 18:31:22 +08:00 |
|
DEVICE8\12494
|
b12d91b48c
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-05-17 17:56:25 +08:00 |
|
DEVICE8\12494
|
32ab2c3411
|
1
|
2023-05-17 17:56:21 +08:00 |
|
zhoukeda
|
157233216d
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsRecordD.cs
# EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsTemD.cs
# EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsTemH.cs
|
2023-05-17 17:34:30 +08:00 |
|
zhoukeda
|
a0e93db063
|
点巡检执行 模板发布
|
2023-05-17 17:33:19 +08:00 |
|
qianjiawei
|
edf6136e81
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-05-17 16:53:06 +08:00 |
|
qianjiawei
|
3978cc9e3a
|
模具物料关联
|
2023-05-17 16:52:55 +08:00 |
|
PhilPan
|
709c9f6598
|
修复
|
2023-05-17 16:03:58 +08:00 |
|
PhilPan
|
718b2fb806
|
添加设备实体
|
2023-05-17 15:43:30 +08:00 |
|
DEVICE8\12494
|
8971b48984
|
1
|
2023-05-17 14:44:11 +08:00 |
|
DEVICE8\12494
|
fd3982b375
|
修复错误
|
2023-05-17 14:43:46 +08:00 |
|
PhilPan
|
4e93131950
|
Merge branch 'dev' of ssh://git.tuotong-tech.com:9105/tnb/tnb.server into dev
|
2023-05-17 14:27:35 +08:00 |
|
PhilPan
|
524acb7704
|
id设为string
|
2023-05-17 14:27:32 +08:00 |
|
DEVICE8\12494
|
949c5a0184
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-05-17 14:02:08 +08:00 |
|
DEVICE8\12494
|
6bfb73f1a9
|
1
|
2023-05-17 14:02:03 +08:00 |
|
PhilPan
|
7f345b6d2b
|
合并
|
2023-05-17 14:00:28 +08:00 |
|
PhilPan
|
1a9db594d5
|
合并
|
2023-05-17 13:59:42 +08:00 |
|
DEVICE8\12494
|
1a5af4a15b
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-05-17 13:59:04 +08:00 |
|
DEVICE8\12494
|
5e2d1d443f
|
模具保养管理接口代码提交
|
2023-05-17 13:58:59 +08:00 |
|
PhilPan
|
99b65418e8
|
重新生成Entity文件
|
2023-05-17 13:58:01 +08:00 |
|
zhoukeda
|
e6aa9eede7
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-05-17 10:09:29 +08:00 |
|
zhoukeda
|
cf191b8240
|
物料清单添加迭代次数
|
2023-05-17 10:09:17 +08:00 |
|