Commit Graph

71 Commits

Author SHA1 Message Date
DEVICE8\12494
709ef585b2 异常开始结束带代码提交 2023-05-21 21:03:45 +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
DEVICE8\12494
649105eb6e 1 2023-05-19 09:13:35 +08:00
DEVICE8\12494
d8099b38df 1 2023-05-19 08:32:44 +08:00
DEVICE8\12494
9d30038a7d 1 2023-05-18 18:44:16 +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
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
3978cc9e3a 模具物料关联 2023-05-17 16:52:55 +08:00
DEVICE8\12494
fd3982b375 修复错误 2023-05-17 14:43:46 +08:00
DEVICE8\12494
5e2d1d443f 模具保养管理接口代码提交 2023-05-17 13:58:59 +08:00
qianjiawei
254504ab1d 模具设备产品关联 2023-05-17 09:00:44 +08:00
DEVICE8\12494
77bb079eee 生产管理模块代码调整 2023-05-12 22:58:16 +08:00
DEVICE8\12494
c98236d10a 调整在线开发,组织获取关联工序列表代码 2023-05-04 15:08:19 +08:00