Commit Graph

322 Commits

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