Commit Graph

150 Commits

Author SHA1 Message Date
‘937886381’
30b2d19710 解决冲突 2024-01-09 16:28:50 +08:00
‘937886381’
040b76d276 解决冲突 2024-01-09 16:26:14 +08:00
‘937886381’
f066180c26 修改bug 2024-01-09 16:25:12 +08:00
gtz
d26852cd2f '1' 2024-01-09 09:56:49 +08:00
b1458827f1 merge test 2024-01-08 17:01:55 +08:00
10ad3acf9c 驾驶舱 2024-01-08 16:59:42 +08:00
helloDy
ce4aabaaf3 merge 2024-01-08 16:24:27 +08:00
helloDy
16551a5f9d 参数 产品 2024-01-08 16:22:53 +08:00
d619db3d89 1 2024-01-05 11:19:39 +08:00
6b8575b29d merge test 2024-01-05 11:17:31 +08:00
d42786e7ed SJG样式 2024-01-05 11:03:08 +08:00
‘937886381’
95c9e8501a 修改bug 2024-01-05 08:44:31 +08:00
‘937886381’
8b1dbbeeea 修改 2024-01-04 08:33:05 +08:00
gtz
522910e432 'update_coldboard' 2024-01-04 08:27:12 +08:00
da2999e67c merge test 2024-01-03 14:12:25 +08:00
53f2b242a4 窑炉 2024-01-03 14:08:49 +08:00
gtz
e2039141e6 Merge branch 'projects/mesxc-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mesxc-test 2023-12-29 09:41:48 +08:00
gtz
286a9a1a0a '1' 2023-12-29 09:41:45 +08:00
‘937886381’
9e2da2ddc2 修改 2023-12-29 09:00:00 +08:00
‘937886381’
553d19db89 修改bug 2023-12-19 16:32:12 +08:00
‘937886381’
c8d55ff625 解决冲突 2023-12-15 16:28:37 +08:00
‘937886381’
83fc835c51 质量管理 2023-12-15 16:27:30 +08:00
gtz
8d5623bb24 '1' 2023-12-14 16:07:21 +08:00
helloDy
3aec5ee86c merge 2023-12-14 14:03:53 +08:00
helloDy
79274aa8c8 定制化报表,基础核心 2023-12-14 14:01:19 +08:00
‘937886381’
f5bb5f27b4 修改 2023-12-13 16:55:39 +08:00
‘937886381’
fbe8e5c023 新增报表 2023-12-13 16:50:55 +08:00
gtz
1299d72404 Merge branch 'projects/mesxc-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mesxc-test 2023-12-13 09:48:44 +08:00
1661615af4 环保 2023-12-12 10:56:25 +08:00
8fdaa3e968 环保管理 2023-12-08 17:03:01 +08:00
gtz
f99e979d14 '1' 2023-12-07 10:06:14 +08:00
fe0c84bc3a 能源&bug 2023-12-06 10:06:26 +08:00
1ce61f13b7 原模块修改能源 2023-12-05 14:30:32 +08:00
de65afef11 登录页去掉验证 2023-11-29 10:12:41 +08:00
lb
7201c26792 fix bugs 2023-11-28 15:46:50 +08:00
helloDy
5492666b53 merge 2023-11-22 14:43:07 +08:00
helloDy
a7f811aa3e bug 2023-11-22 14:41:10 +08:00
lb
c6d618b2b8 update bugs 2023-11-21 17:02:22 +08:00
lb
51baca61cc update equipment attach process 2023-11-21 15:07:33 +08:00
lb
44452f2e89 update 2023-11-20 11:26:27 +08:00
lb
6ef90a8eba merge test 2023-11-17 10:00:04 +08:00
gtz
88615a52a4 '1' 2023-11-17 08:46:35 +08:00
Melete
a6b48280aa update 工艺流程 2023-11-16 22:00:50 +08:00
helloDy
25d1ac8d90 merge 2023-11-16 14:07:50 +08:00
helloDy
3667b98da9 bug 2023-11-16 13:57:21 +08:00
‘937886381’
3832aee028 解决冲突 2023-11-16 08:52:38 +08:00
‘937886381’
2fbc6ea5e7 修改bug 2023-11-16 08:50:59 +08:00
helloDy
e5966c27a3 工单[ 2023-11-15 17:46:54 +08:00
helloDy
aef062b4c9 merge 2023-11-15 14:37:52 +08:00
helloDy
952490f0d4 24h,设备 2023-11-15 14:30:28 +08:00
‘937886381’
ecc84a1c4b 合并冲突 2023-11-15 09:10:45 +08:00
‘937886381’
95f7004d1c 修改bug 2023-11-15 09:08:20 +08:00
helloDy
e6158cd59b merge 2023-11-11 20:51:01 +08:00
helloDy
624ed7bc27 设备管理 2023-11-11 20:49:31 +08:00
‘937886381’
a8adb317c0 质量管理 2023-11-10 17:02:52 +08:00
‘937886381’
1962ecc6df 质量管理 2023-11-07 19:10:45 +08:00
3ada2c5d08 merge test 2023-11-07 16:01:07 +08:00
helloDy
f9741b07c0 Merge branch 'projects/mes-test' into projects/mes-dy 2023-11-07 15:53:53 +08:00
helloDy
fcb1885bf7 基础,物料,设备 2023-11-07 15:53:01 +08:00
6e1bf994c2 bug 2023-11-07 15:49:07 +08:00
876f7d8f3c merge test 2023-11-06 13:42:09 +08:00
5695c3db90 成品发货 2023-11-06 13:37:52 +08:00
helloDy
0ae3c66dc3 基础核心 2023-11-06 12:54:28 +08:00
helloDy
e5978d1700 merge 2023-11-03 11:16:30 +08:00
helloDy
91eb13af26 客商信息、人事相关 2023-11-03 11:15:12 +08:00
lb
2075b42427 'merge' 2023-11-01 09:39:25 +08:00
lb
c851188989 update before hand over 2023-11-01 09:37:47 +08:00
Melete
0fa310609e update 设备备品备件+巡检 2023-10-31 22:34:10 +08:00
‘937886381’
34e8178ddc 解决合并冲突 2023-10-30 10:50:21 +08:00
‘937886381’
6c094b2a2e 修改bug 2023-10-30 10:48:32 +08:00
lb
4a796130d0 update 设备采集配置 2023-10-30 10:47:06 +08:00
013c08710c merge test 2023-10-30 10:32:51 +08:00
00fba0a83b 2023.10.30提测能源&班组 2023-10-30 10:26:54 +08:00
helloDy
4615e975e8 merge 2023-10-27 16:17:28 +08:00
helloDy
e961bf6cfa 物料模块 2023-10-27 16:16:13 +08:00
392c1ea09b merge test 2023-10-24 15:21:27 +08:00
ac4565e587 班组&能源基础 2023-10-24 15:16:20 +08:00
‘937886381’
2c3bdde403 包装管理 2023-10-23 08:42:46 +08:00
helloDy
2b355aaf8f ui 2023-10-16 15:47:31 +08:00
lb
9ec13b35b8 update equipment 2023-10-12 17:03:07 +08:00
lb
980f3468b7 update homepage 2023-09-22 16:29:31 +08:00
helloDy
ee0affc78f Merge branch 'test' into dy 2023-09-20 13:58:36 +08:00
helloDy
dfec94be17 表格 2023-09-20 13:58:14 +08:00
5a31498224 修bug 2023-09-19 15:45:16 +08:00
eff5e0d1e1 merge test 2023-09-18 08:50:53 +08:00
60dc449a27 排班 2023-09-18 08:41:14 +08:00
helloDy
bc5d3d44d5 页面 2023-09-16 17:51:09 +08:00
helloDy
e9538744c3 冲突 2023-09-15 14:38:43 +08:00
helloDy
8cf2f9f7e9 生产监控 2023-09-15 14:37:30 +08:00
‘937886381’
e8cc1fc50b 生产分析 2023-09-13 16:00:43 +08:00
helloDy
f1bbdf82e5 冲突 2023-09-11 15:55:58 +08:00
helloDy
645ba2843f 生产监控 2023-09-11 15:53:43 +08:00
lb
9dc580ddd2 update 2023-08-28 13:30:29 +08:00
lb
54d22292c1 update equipment drawer的逻辑 2023-08-24 11:35:51 +08:00
lb
4eb9b321db add EquipmentDrawer 2023-08-22 15:53:02 +08:00
lb
fa2505d5a2 update EquipmentPIcs 2023-08-21 14:05:15 +08:00
lb
577fcb53d2 add equipment assets 2023-08-18 16:56:53 +08:00
18a9a4f51b 能源类型 2023-08-14 16:19:12 +08:00
0719116cbc 班组 2023-08-02 09:17:46 +08:00
gtz
0fca3e1ec4 'init' 2023-07-26 09:54:50 +08:00