Commit Graph

81 Commits

Author SHA1 Message Date
‘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