zhoukeda
|
c19a2c13dc
|
点巡检复核
|
2023-05-18 17:18:26 +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 |
|
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 |
|
DEVICE8\12494
|
166a5b74b3
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-05-17 08:35:03 +08:00 |
|
DEVICE8\12494
|
8519f7af2e
|
组装包装排产代码提交
|
2023-05-17 08:34:52 +08:00 |
|
PhilPan
|
408bbd8789
|
调整实体代码生成,增加string?
|
2023-05-16 19:52:52 +08:00 |
|
PhilPan
|
ce0bff561f
|
消除平台warn
|
2023-05-16 18:00:42 +08:00 |
|
PhilPan
|
47011c1142
|
Merge branch 'dev' of ssh://git.tuotong-tech.com:9105/tnb/tnb.server into dev
|
2023-05-16 17:24:11 +08:00 |
|
PhilPan
|
1cb50e15d2
|
隐藏平台warn,放开自有模块warn
|
2023-05-16 17:24:07 +08:00 |
|
zhoukeda
|
21985f8f03
|
修改生成逻辑
|
2023-05-16 16:32:04 +08:00 |
|
zhoukeda
|
ca1ebe2563
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-05-16 15:46:51 +08:00 |
|
zhoukeda
|
5145ea0e1a
|
点巡检计划定时任务
|
2023-05-16 15:46:41 +08:00 |
|
PhilPan
|
67d599dce6
|
消除部分warning
|
2023-05-16 15:21:04 +08:00 |
|
DEVICE8\12494
|
e7e2cea7bd
|
生产任务单代码调整
|
2023-05-16 14:16:59 +08:00 |
|
DEVICE8\12494
|
ed87bd712c
|
新增生产管理，组装包装根据BomId拆解生产任务接口
|
2023-05-15 18:11:11 +08:00 |
|
DEVICE8\12494
|
6e9d1169ce
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-05-15 14:47:17 +08:00 |
|
DEVICE8\12494
|
a3ec329dc7
|
生产管理模块代码调整
|
2023-05-15 14:47:14 +08:00 |
|
zhoukeda
|
816eda3af3
|
测试任务调度 还有问题
|
2023-05-15 14:45:44 +08:00 |
|
DEVICE8\12494
|
c3809e2f45
|
调整生产管理模块代码
|
2023-05-15 13:44:23 +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
|
2df0106047
|
外包装条码打印接口
|
2023-05-12 10:18:54 +08:00 |
|
PhilPan
|
2978f083b6
|
增加外包装条码打印接口定义
|
2023-05-12 10:03:17 +08:00 |
|
zhoukeda
|
b45647eaeb
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-05-12 09:40:47 +08:00 |
|
zhoukeda
|
eb4a17e592
|
修改在线开发数字控件添加精度时存在的bug
|
2023-05-12 09:40:34 +08:00 |
|