Commit Graph

35 Commits

Author SHA1 Message Date
DEVICE8\12494
d8099b38df 1 2023-05-19 08:32:44 +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
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
fd3982b375 修复错误 2023-05-17 14:43:46 +08:00
PhilPan
7f345b6d2b 合并 2023-05-17 14:00:28 +08:00
PhilPan
1a9db594d5 合并 2023-05-17 13:59:42 +08:00
DEVICE8\12494
5e2d1d443f 模具保养管理接口代码提交 2023-05-17 13:58:59 +08:00
PhilPan
99b65418e8 重新生成Entity文件 2023-05-17 13:58:01 +08:00
qianjiawei
d48fc44f33 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-05-17 09:00:57 +08:00
qianjiawei
254504ab1d 模具设备产品关联 2023-05-17 09:00:44 +08:00
zhoukeda
5145ea0e1a 点巡检计划定时任务 2023-05-16 15:46:41 +08:00
DEVICE8\12494
e435ab6f34 删除重复设备类型 2023-05-15 08:51:11 +08:00
DEVICE8\12494
1814623e4c Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-05-12 22:58:38 +08:00
DEVICE8\12494
77bb079eee 生产管理模块代码调整 2023-05-12 22:58:16 +08:00
zhoukeda
34926dd5e7 加设备相关实体类 2023-05-12 17:25:34 +08:00
PhilPan
2949e19785 项目添加引用common.props 2023-05-05 15:36:51 +08:00
DEVICE8\12494
c98236d10a 调整在线开发,组织获取关联工序列表代码 2023-05-04 15:08:19 +08:00
DEVICE8\12494
6118106b72 组织管理,新增设备与工位绑定、解绑功能 2023-04-26 17:58:53 +08:00
DEVICE8\12494
631bb0c0e8 生产管理,新增修改任务单接口 2023-04-26 14:08:11 +08:00
PhilPan
41ff8e3556 添加各模块空项目 2023-04-21 09:12:33 +08:00