Commit Graph

557 Commits

Author SHA1 Message Date
‘937886381’
afafbccc0c Merge branch 'projects/mes-test' into projects/mes-zhp 2023-11-23 14:33:32 +08:00
‘937886381’
0948737f1a 修改bug 2023-11-23 14:32:53 +08:00
lb
e318aa4f59 Merge branch 'projects/mes-test' into projects/mes-lb 2023-11-22 17:05:53 +08:00
lb
ab09a2b08c update zentao bugs 2023-11-22 17:04:22 +08:00
6940155e4f merge test 2023-11-22 17:00:32 +08:00
dfc758bfae 订单监控图 2023-11-22 16:58:32 +08:00
gtz
de15716b7c Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test 2023-11-22 14:53:49 +08:00
gtz
c736992a34 '1' 2023-11-22 14:49:56 +08:00
helloDy
5492666b53 merge 2023-11-22 14:43:07 +08:00
lb
cd55b4c860 update 2023-11-22 14:41:53 +08:00
helloDy
a7f811aa3e bug 2023-11-22 14:41:10 +08:00
lb
33188481bf update login 2023-11-22 14:27:30 +08:00
‘937886381’
a22da566c3 解决冲突 2023-11-22 14:11:23 +08:00
‘937886381’
3c99ddc4c0 修改bug 2023-11-22 14:00:02 +08:00
lb
ac28476024 update hints 2023-11-22 11:15:39 +08:00
lb
b348a31b24 update some equipment bugs 2023-11-22 10:14:40 +08:00
lb
c6d618b2b8 update bugs 2023-11-21 17:02:22 +08:00
lb
c8fb8d7589 Merge branch 'projects/mes-test' into projects/mes-lb 2023-11-21 16:08:44 +08:00
lb
51baca61cc update equipment attach process 2023-11-21 15:07:33 +08:00
lb
847e34fcc6 update 2023-11-21 11:48:17 +08:00
lb
32a43fbc3b update process equipment relation 2023-11-21 09:13:28 +08:00
lb
20975948ef update 2023-11-20 16:50:38 +08:00
zwq
685a3308db 更新仓库bug 2023-11-20 16:09:42 +08:00
lb
ac041c2f4a update bom-selector v1 2023-11-20 15:53:23 +08:00
lb
dd23c49ba0 update 设备选择 2023-11-20 14:21:14 +08:00
lb
44452f2e89 update 2023-11-20 11:26:27 +08:00
lb
8ddef0de9d update bomselector 2023-11-17 17:07:52 +08:00
lb
7249abf5b1 add BomSelector 2023-11-17 16:57:55 +08:00
lb
76f5385140 add Candidate 2023-11-17 16:05:57 +08:00
zwq
75f59c3279 更新-仓库-2级bug 2023-11-17 15:48:17 +08:00
lb
bb731dfcd4 add custom tree 2023-11-17 14:56:43 +08:00
bad7175f87 merge test 2023-11-17 14:07:51 +08:00
231e9227a5 1 2023-11-17 14:04:53 +08:00
lb
d3eb9d8fbc update custom-transfer 2023-11-17 11:25:28 +08:00
lb
9a7521e691 add CustomTrasfer 2023-11-17 11:15:18 +08:00
helloDy
40e7d6b6d8 Merge branch 'projects/mes-test' into projects/mes-dy 2023-11-17 10:26:21 +08:00
helloDy
1d9b97f1d0 设备信息bug 2023-11-17 10:24:53 +08:00
lb
d1cbac481d Merge branch 'projects/mes-test' into projects/mes-lb 2023-11-17 10:14:26 +08:00
lb
c895975703 update 2023-11-17 10:12:00 +08:00
lb
6ef90a8eba merge test 2023-11-17 10:00:04 +08:00
zwq
c99393dd12 更新仓库bug 2023-11-17 09:55:09 +08:00
lb
23c1b4b3c6 update 2023-11-17 09:48:39 +08:00
gtz
88615a52a4 '1' 2023-11-17 08:46:35 +08:00
Melete
010e51c0f6 update 工艺流程 2023-11-16 22:18:45 +08:00
Melete
a6b48280aa update 工艺流程 2023-11-16 22:00:50 +08:00
helloDy
c4091b7181 Merge branch 'projects/mes-test' into projects/mes-dy 2023-11-16 21:07:59 +08:00
helloDy
34e6a73852 bug 2023-11-16 21:07:21 +08:00
‘937886381’
7523f98f84 Merge branch 'projects/mes-test' into projects/mes-zhp 2023-11-16 18:54:43 +08:00
‘937886381’
b349432eaa 修改bug 2023-11-16 18:52:55 +08:00
lb
42177846e8 Merge branch 'projects/mes-test' into projects/mes-lb 2023-11-16 17:25:39 +08:00
lb
c5b5de7a78 update 2023-11-16 17:23:58 +08:00
lb
0884159dd7 update login 2023-11-16 17:16:37 +08:00
d37c5881a5 2 2023-11-16 16:53:35 +08:00
2b0579dc70 merge test 2023-11-16 16:13:36 +08:00
6a10afd04e 1 2023-11-16 16:12:05 +08:00
helloDy
25d1ac8d90 merge 2023-11-16 14:07:50 +08:00
helloDy
3667b98da9 bug 2023-11-16 13:57:21 +08:00
lb
bbdf0a75f0 update system 2023-11-16 13:47:18 +08:00
‘937886381’
3832aee028 解决冲突 2023-11-16 08:52:38 +08:00
‘937886381’
2fbc6ea5e7 修改bug 2023-11-16 08:50:59 +08:00
helloDy
4ce62c14ee Merge branch 'projects/mes-test' into projects/mes-dy 2023-11-15 17:47:31 +08:00
helloDy
e5966c27a3 工单[ 2023-11-15 17:46:54 +08:00
3e9f629888 Merge pull request '修改bug' (#82) from projects/mes-zhp into projects/mes-test
Reviewed-on: #82
2023-11-15 16:03:01 +08:00
‘937886381’
ecabeeeea9 修改bug 2023-11-15 15:47:45 +08:00
helloDy
aef062b4c9 merge 2023-11-15 14:37:52 +08:00
helloDy
952490f0d4 24h,设备 2023-11-15 14:30:28 +08:00
0ae68aacef 订单 2023-11-15 14:22:45 +08:00
a37fa65e8f bug 2023-11-15 14:02:16 +08:00
5d054254f7 merge test 2023-11-15 10:17:35 +08:00
76cdc34af1 小bug 2023-11-15 10:13:54 +08:00
‘937886381’
ecc84a1c4b 合并冲突 2023-11-15 09:10:45 +08:00
‘937886381’
95f7004d1c 修改bug 2023-11-15 09:08:20 +08:00
zwq
de06dfddf4 仓库-bug修改 2023-11-14 16:02:16 +08:00
67612c79df merge test 2023-11-14 15:47:06 +08:00
26862423c1 首页 2023-11-14 10:35:10 +08:00
zwq
d2c82fa692 更新-仓库-库位监控 2023-11-14 09:42:38 +08:00
lb
ebae332674 update 2023-11-14 09:23:08 +08:00
lb
7f6fa0af96 Merge branch 'projects/mes-test' into projects/mes-lb 2023-11-13 16:56:07 +08:00
lb
ba92da2d5d update login mobile 2023-11-13 16:55:16 +08:00
lb
06c124a149 update login 2023-11-13 16:37:04 +08:00
helloDy
e6158cd59b merge 2023-11-11 20:51:01 +08:00
helloDy
624ed7bc27 设备管理 2023-11-11 20:49:31 +08:00
‘937886381’
f7846f2767 Merge branch 'projects/mes-test' into projects/mes-zhp 2023-11-10 17:03:25 +08:00
‘937886381’
a8adb317c0 质量管理 2023-11-10 17:02:52 +08:00
3812eb38a9 修改订单bug 2023-11-09 15:01:50 +08:00
‘937886381’
1962ecc6df 质量管理 2023-11-07 19:10:45 +08:00
3ada2c5d08 merge test 2023-11-07 16:01:07 +08:00
9e8276d3a7 merge test 2023-11-07 15:55:19 +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
zwq
97e6a665de 更新仓库 2023-11-07 15:49:33 +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
1d38a560ec Merge branch 'projects/mes-test' into projects/mes-dy 2023-11-06 12:55:03 +08:00
helloDy
0ae3c66dc3 基础核心 2023-11-06 12:54:28 +08:00
zwq
0deb38647e 更新仓库管理 2023-11-04 16:40:16 +08:00
14d426b020 merge test 2023-11-03 17:01:14 +08:00
046a5eea32 成品发货 2023-11-03 16:59:07 +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
lb
57a4ca96e7 add 2023-10-31 17:49:39 +08:00
lb
af868a7cd7 update 设备基础配置,设备保养 2023-10-30 16:51:37 +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
lb
3bf8150764 Merge branch 'projects/mes-test' into projects/mes-lb 2023-10-30 10:36:13 +08:00
lb
bacf2eab0b update 2023-10-30 10:35:09 +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
lb
216aa6291d update 设备管理-基础配置-设备分组绑定 2023-10-27 14:24:47 +08:00
lb
66660bfef7 update 2023-10-26 17:01:09 +08:00
lb
d25261b256 move coreEquipment 2023-10-26 15:14:00 +08:00
lb
583b934511 delete some files 2023-10-26 14:07:36 +08:00
lb
503e988f7b merge again 2023-10-26 11:32:29 +08:00
lb
06e8a72f80 merge mes-test 2023-10-26 11:30:07 +08:00
lb
6c348202a1 update extend process 2023-10-26 11:28:24 +08:00
lb
5ba186b0c6 update 2023-10-25 17:02:43 +08:00
lb
e153d7e077 update 流程图 2023-10-24 17:07:32 +08:00
lb
3c31e5d63a done 新建工序 2023-10-24 15:56:15 +08:00
392c1ea09b merge test 2023-10-24 15:21:27 +08:00
ac4565e587 班组&能源基础 2023-10-24 15:16:20 +08:00
lb
6006ae13d9 update flow 2023-10-24 11:17:07 +08:00
‘937886381’
2c3bdde403 包装管理 2023-10-23 08:42:46 +08:00
lb
106d0ed89c merge server 2023-10-20 17:03:06 +08:00
lb
cfbd00b560 update process 2023-10-20 17:00:49 +08:00
lb
a787935263 add process flow and process node 2023-10-20 16:03:40 +08:00
lb
15da20fac7 add 添加一个缓存方案 2023-10-20 14:22:46 +08:00
lb
6b4e906e75 update process flow 2023-10-19 16:40:36 +08:00
lb
d121e408af add 工艺流程列表 2023-10-19 11:13:37 +08:00
lb
f8baaa8955 update ui 2023-10-17 17:02:53 +08:00
lb
fe7821cbd8 update 核心模块-厂务-设备 2023-10-17 15:22:17 +08:00
lb
a7e81ad8fb Merge branch 'test' into lb 2023-10-16 17:04:34 +08:00
lb
32cbf9076f update 更新设备类型上传 2023-10-16 17:03:29 +08:00
helloDy
2b355aaf8f ui 2023-10-16 15:47:31 +08:00
lb
f60a46ed1d update 设备信息上传 2023-10-16 15:36:26 +08:00
helloDy
4a67e226e1 merge 2023-10-13 17:09:07 +08:00
helloDy
46aaa47e07 bug 2023-10-13 17:05:01 +08:00
lb
ca0f62b2eb Merge branch 'test' into lb 2023-10-13 17:04:18 +08:00
lb
5534104e87 update equipment edit 2023-10-13 17:01:49 +08:00
lb
b72fe1bfed update equipment edit 2023-10-13 16:08:31 +08:00
helloDy
d682ecc91c Merge branch 'test' into dy 2023-10-12 17:05:03 +08:00
helloDy
2b76ef7d23 bug 2023-10-12 17:04:03 +08:00
lb
9ec13b35b8 update equipment 2023-10-12 17:03:07 +08:00
lb
7acccd3de0 bugfix zentao 2023-10-12 15:40:05 +08:00
9f53ea6981 10.12 2023-10-12 14:39:59 +08:00
lb
8f634d012c bugfix zentao 2023-10-12 11:08:51 +08:00
348714edaf merge test 2023-10-11 14:33:37 +08:00
814fe4605a UI样式修改能源&班组 2023-10-11 14:30:18 +08:00
lb
0162f338ba Merge branch 'test' into lb 2023-10-11 10:30:25 +08:00
lb
8f99915720 add 设备看板 2023-10-11 10:29:26 +08:00
helloDy
69bdab75d4 bug 2023-10-10 17:06:39 +08:00
lb
af5e0333ed update ui 2023-10-10 17:01:57 +08:00
lb
b2ee61b8cb update 改为抽屉展示 2023-10-10 14:22:00 +08:00
lb
723d83cc02 update 设备分组 2023-10-10 10:04:23 +08:00
lb
769830c448 update 设备分组 2023-10-09 17:01:19 +08:00
lb
907db90e93 update 设备分组的抽屉 2023-10-09 16:27:44 +08:00
lb
6e390bf12a update 2023-10-09 13:32:33 +08:00
lb
b39f0625a1 update 2023-10-09 11:37:19 +08:00
lb
e985c73e00 update gantt 2023-10-08 17:14:18 +08:00
helloDy
b1c0d21888 Merge branch 'test' into dy 2023-10-08 16:59:31 +08:00
helloDy
96d52fafee pdf 2023-10-08 16:59:09 +08:00
lb
4f7889ff60 done time sequence demo 2023-10-08 15:53:38 +08:00
lb
bc2c5a4787 update time sequence status 2023-10-08 15:00:38 +08:00
lb
ab8e9cb2a5 update 2023-10-08 14:30:50 +08:00
lb
57960ff8bf update print page 2023-10-08 10:18:08 +08:00
lb
b9e39dacf1 bugfix zentao 2023-10-08 09:31:02 +08:00
lb
80ad95be6e add print module 2023-10-07 14:29:43 +08:00
lb
cf2d7af94b delete echarts 2023-09-27 17:00:33 +08:00
lb
a48b31dcbe Merge branch 'test' into lb 2023-09-27 16:58:28 +08:00
lb
96b0a9e503 update 产品质量分析 2023-09-27 16:57:57 +08:00
lb
9c257aa24a update demo 2023-09-27 16:19:55 +08:00
lb
7ab5f1b812 update demo 2023-09-27 14:42:38 +08:00
lb
5c796cd44f add custom echarts demo 2023-09-27 14:01:57 +08:00
lb
fe0b5538a8 update 设备产量时序图 2023-09-27 13:22:09 +08:00
lb
90695acefd update 检测信息记录 2023-09-27 10:14:24 +08:00
4d7e3c0e04 merge test 2023-09-27 09:36:20 +08:00
ee40707d2c 修改bug及能源分析样式 2023-09-27 09:33:28 +08:00
lb
20808c0975 update 产量时序图 2023-09-26 17:00:46 +08:00
lb
87f56dd9ac update responsejson 2023-09-26 15:12:41 +08:00
lb
24ffea330d update 设备产量分析 2023-09-26 14:56:00 +08:00
lb
a4594426c3 bugfix 2023-09-26 14:38:30 +08:00
lb
c899bb37e3 update quality inspection record 2023-09-26 11:03:34 +08:00
lb
d907d2f341 Merge branch 'test' into lb 2023-09-25 17:13:47 +08:00
lb
1116531aff update 2023-09-25 16:58:35 +08:00
lb
8dc5bbb4d8 update 2023-09-25 16:53:31 +08:00
lb
c24d22aedd update 2023-09-25 16:34:05 +08:00
lb
bbbfa9644d bugfix 2023-09-25 15:47:39 +08:00
helloDy
699810f40a Merge branch 'test' into dy 2023-09-22 16:54:40 +08:00
helloDy
d454f20bd6 bug 2023-09-22 16:54:16 +08:00
lb
56f209a27e Merge branch 'test' into lb 2023-09-22 16:29:50 +08:00
lb
980f3468b7 update homepage 2023-09-22 16:29:31 +08:00
42550264c8 merge test 2023-09-22 11:08:58 +08:00
727f7d57c3 能源bug 2023-09-22 11:06:43 +08:00
lb
dcda3a6294 bugfix 2023-09-22 10:54:21 +08:00
lb
f43b1c1eab update 设备加工数量 2023-09-22 10:29:28 +08:00
lb
ee3d6f9dc6 merge 2023-09-22 09:28:41 +08:00
lb
e2a777069e update 设备加工数量 2023-09-21 17:09:15 +08:00
lb
06fa7d40b3 update 设备加工数量 2023-09-21 17:03:07 +08:00
lb
f6f0480744 update 设备加工数量 2023-09-21 16:00:46 +08:00
lb
45e7f337bf update 设备加工数量 2023-09-21 15:54:11 +08:00
lb
8e0d63839a update 设备加工数量 2023-09-21 15:35:16 +08:00
lb
6c21f01fd7 update 设备加工数量 2023-09-21 15:14:38 +08:00
lb
52bc38499c update 设备效率分析 2023-09-21 14:54:16 +08:00
lb
c600d14f8f update 设备产量时序图 2023-09-20 17:03:39 +08:00
a74242f3b3 mrege test 2023-09-20 16:59:13 +08:00
ebcf3d4d78 修改bug 2023-09-20 16:57:20 +08:00
lb
8ad84a4d61 update 设备产量时序图 2023-09-20 14:44:39 +08:00
lb
928258e509 update 设备状态时序图 2023-09-20 14:11:36 +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
lb
a12530b835 update 质量检测统计数据 2023-09-20 11:17:34 +08:00
lb
b3db8dcae8 update 检测统计数据chart 2023-09-20 10:49:17 +08:00
lb
24a0857808 update 质量检测统计数据 2023-09-20 09:50:38 +08:00
lb
e0cc022e34 update 产品质量分析样式 2023-09-20 09:11:31 +08:00
lb
71bcd14c72 update 产品质量分析chart 2023-09-19 17:06:19 +08:00
5a31498224 修bug 2023-09-19 15:45:16 +08:00
lb
c965dfbc5a bugfix 2023-09-18 17:01:44 +08:00
lb
c364162a2a update no-data-background 2023-09-18 15:14:18 +08:00
0371859d14 排班及bug 2023-09-18 14:49:03 +08:00
lb
7407b97f5a bugfix zentao 2023-09-18 13:52:36 +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
lb
a6d8a7a9da update 2023-09-15 15:45:37 +08:00
lb
7d2bfaea18 bugfix zentao 2 2023-09-15 14:49:31 +08:00
helloDy
e9538744c3 冲突 2023-09-15 14:38:43 +08:00
helloDy
8cf2f9f7e9 生产监控 2023-09-15 14:37:30 +08:00
lb
772a4b0633 bugfix zentao 1 2023-09-15 14:30:19 +08:00
lb
27ebe39a96 update image 2023-09-13 17:06:02 +08:00
‘937886381’
f85cb9c50f Merge branch 'test' into zhp 2023-09-13 16:01:18 +08:00
‘937886381’
e8cc1fc50b 生产分析 2023-09-13 16:00:43 +08:00
lb
f341ec7b30 update router mode 2023-09-13 12:24:52 +08:00
lb
d595bf2660 Merge branch 'test' into lb 2023-09-12 11:10:45 +08:00
lb
529889fd07 update 工段设备绑定 dialogForm 2023-09-12 11:09:51 +08:00
lb
2f18299b0b add dialogForm of equipmentbind 2023-09-11 16:47:12 +08:00
‘937886381’
7d959e8ad3 Merge branch 'test' into zhp 2023-09-11 16:09:42 +08:00
‘937886381’
6f0040a0ae 生产监控更新 2023-09-11 16:09:07 +08:00
helloDy
f1bbdf82e5 冲突 2023-09-11 15:55:58 +08:00
helloDy
645ba2843f 生产监控 2023-09-11 15:53:43 +08:00
lb
f2f3a9e850 update 设备全参数查询 2023-09-11 15:24:11 +08:00
lb
4e05b3e3d6 merge from test 2023-09-11 15:04:16 +08:00
lb
b91b8c3d3c update 设备加工数量 2023-09-11 14:57:55 +08:00
df0dc6bfa0 能源分析 2023-09-08 16:01:54 +08:00
lb
c44ec6f49c update 基本完成设备全参数查询 2023-09-08 15:57:46 +08:00