mt-fe-group/yudao-dev
13
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Commit Graph

  • e49084d85d Merge pull request '更新仓库管理' (#62) from projects/mes-zwq into projects/mes-test 朱文强 2023-11-04 16:40:59 +08:00
  • 0deb38647e 更新仓库管理 zwq 2023-11-04 16:40:16 +08:00
  • 5521f07c18 Merge pull request 'projects/mes-zjl' (#61) from projects/mes-zjl into projects/mes-test juzi 2023-11-03 17:02:04 +08:00
  • 14d426b020 merge test juzi 2023-11-03 17:01:14 +08:00
  • 046a5eea32 成品发货 juzi 2023-11-03 16:59:07 +08:00
  • b468204f88 Merge pull request 'projects/mes-dy' (#60) from projects/mes-dy into projects/mes-test 高天泽 2023-11-03 15:38:59 +08:00
  • e5978d1700 merge helloDy 2023-11-03 11:16:30 +08:00
  • 91eb13af26 客商信息、人事相关 helloDy 2023-11-03 11:15:12 +08:00
  • fe29043ab1 Merge pull request 'projects/mes-lb' (#59) from projects/mes-lb into projects/mes-test g7hoo 2023-11-01 09:45:17 +08:00
  • 2075b42427 'merge' lb 2023-11-01 09:39:25 +08:00
  • c851188989 update before hand over lb 2023-11-01 09:37:47 +08:00
  • 0fa310609e update 设备备品备件+巡检 Melete 2023-10-31 22:34:10 +08:00
  • 57a4ca96e7 add lb 2023-10-31 17:49:39 +08:00
  • af868a7cd7 update 设备基础配置，设备保养 lb 2023-10-30 16:51:37 +08:00
  • cb1ad9edec Merge pull request 'projects/mes-zhp' (#57) from projects/mes-zhp into projects/mes-test 高天泽 2023-10-30 11:04:40 +08:00
  • 070e01c2c4 Merge pull request 'projects/line-lb' (#58) from projects/line-lb into projects/line-test g7hoo 2023-10-30 10:53:44 +08:00
  • 2665b6a0b0 Merge branch 'projects/line-test' into projects/line-lb lb 2023-10-30 10:52:08 +08:00
  • a71fb90e6a update DialogForm v-model lb 2023-10-30 10:51:41 +08:00
  • 34e8178ddc 解决合并冲突 ‘937886381’ 2023-10-30 10:50:21 +08:00
  • 6c094b2a2e 修改bug ‘937886381’ 2023-10-30 10:48:32 +08:00
  • 4a796130d0 update 设备采集配置 lb 2023-10-30 10:47:06 +08:00
  • 60f65e6f85 Merge pull request 'projects/mes-lb' (#56) from projects/mes-lb into projects/mes-test g7hoo 2023-10-30 10:37:41 +08:00
  • 3bf8150764 Merge branch 'projects/mes-test' into projects/mes-lb lb 2023-10-30 10:36:13 +08:00
  • bacf2eab0b update lb 2023-10-30 10:35:09 +08:00
  • 8155a78649 Merge pull request 'projects/mes-zjl' (#55) from projects/mes-zjl into projects/mes-test juzi 2023-10-30 10:33:43 +08:00
  • 013c08710c merge test juzi 2023-10-30 10:32:51 +08:00
  • 00fba0a83b 2023.10.30提测能源&班组 juzi 2023-10-30 10:26:54 +08:00
  • c71613f3fc Merge pull request 'projects/mes-dy' (#54) from projects/mes-dy into projects/mes-test 高天泽 2023-10-27 16:19:19 +08:00
  • 4615e975e8 merge helloDy 2023-10-27 16:17:28 +08:00
  • e961bf6cfa 物料模块 helloDy 2023-10-27 16:16:13 +08:00
  • 216aa6291d update 设备管理-基础配置-设备分组绑定 lb 2023-10-27 14:24:47 +08:00
  • 66660bfef7 update lb 2023-10-26 17:01:09 +08:00
  • d25261b256 move coreEquipment lb 2023-10-26 15:14:00 +08:00
  • 583b934511 delete some files lb 2023-10-26 14:07:36 +08:00
  • 55e023d0a8 Merge pull request 'projects/mes-lb' (#53) from projects/mes-lb into projects/mes-test g7hoo 2023-10-26 11:34:28 +08:00
  • 503e988f7b merge again lb 2023-10-26 11:32:29 +08:00
  • 06e8a72f80 merge mes-test lb 2023-10-26 11:30:07 +08:00
  • 6c348202a1 update extend process lb 2023-10-26 11:28:24 +08:00
  • 5ba186b0c6 update lb 2023-10-25 17:02:43 +08:00
  • e153d7e077 update 流程图 lb 2023-10-24 17:07:32 +08:00
  • 3c31e5d63a done 新建工序 lb 2023-10-24 15:56:15 +08:00
  • 619cf9e1ce Merge pull request 'projects/mes-zjl' (#52) from projects/mes-zjl into projects/mes-test juzi 2023-10-24 15:22:19 +08:00
  • 392c1ea09b merge test juzi 2023-10-24 15:21:27 +08:00
  • ac4565e587 班组&能源基础 juzi 2023-10-24 15:16:20 +08:00
  • 6006ae13d9 update flow lb 2023-10-24 11:17:07 +08:00
  • 74d5646d65 Merge pull request '包装管理' (#51) from projects/mes-zhp into projects/mes-test 高天泽 2023-10-23 08:57:17 +08:00
  • 2c3bdde403 包装管理 ‘937886381’ 2023-10-23 08:42:46 +08:00
  • 106d0ed89c merge server lb 2023-10-20 17:03:06 +08:00
  • cfbd00b560 update process lb 2023-10-20 16:42:28 +08:00
  • a787935263 add process flow and process node lb 2023-10-20 16:03:40 +08:00
  • 15da20fac7 add 添加一个缓存方案 lb 2023-10-20 14:22:46 +08:00
  • ac85c83cf9 Merge pull request 'update' (#50) from projects/line-lb into projects/line-test g7hoo 2023-10-19 17:07:10 +08:00
  • c2e987aee4 update lb 2023-10-19 17:06:15 +08:00
  • 6b4e906e75 update process flow lb 2023-10-19 16:40:36 +08:00
  • d121e408af add 工艺流程列表 lb 2023-10-19 11:13:37 +08:00
  • 0e4ed597cd Merge pull request 'update ui' (#49) from projects/line-lb into projects/line-test g7hoo 2023-10-18 09:15:36 +08:00
  • f8baaa8955 update ui lb 2023-10-17 17:02:53 +08:00
  • 3e7914ac91 update ui lb 2023-10-17 17:02:33 +08:00
  • 416d4bb390 update lb 2023-10-17 15:27:08 +08:00
  • fe7821cbd8 update 核心模块-厂务-设备 lb 2023-10-17 15:22:17 +08:00
  • 9c19a6197a Merge pull request 'update dashboard' (#48) from projects/line-lb into projects/line-test g7hoo 2023-10-17 09:44:37 +08:00
  • 074b35b6a6 update dashboard lb 2023-10-17 09:43:44 +08:00
  • 9be57ad750 Merge pull request 'test' (#47) from test into master master projects/mes-gtz projects/line-zwq projects/line-zjl projects/line-zhp projects/line-gtz projects/line 高天泽 2023-10-17 08:53:53 +08:00
  • f7313c5911 Merge pull request 'lb' (#46) from lb into test g7hoo 2023-10-17 08:38:26 +08:00
  • a7e81ad8fb Merge branch 'test' into lb lb 2023-10-16 17:04:34 +08:00
  • 32cbf9076f update 更新设备类型上传 lb 2023-10-16 17:03:29 +08:00
  • 9a411cc663 Merge pull request 'dy' (#45) from dy into test hellody 2023-10-16 15:50:05 +08:00
  • 445a88e540 Merge branch 'test' into dy helloDy 2023-10-16 15:47:50 +08:00
  • 2b355aaf8f ui helloDy 2023-10-16 15:47:31 +08:00
  • f60a46ed1d update 设备信息上传 lb 2023-10-16 13:35:43 +08:00
  • 2688896660 Merge pull request 'dy' (#44) from dy into test hellody 2023-10-13 17:12:02 +08:00
  • 4a67e226e1 merge helloDy 2023-10-13 17:09:07 +08:00
  • 11ee0d6541 Merge branch 'test' into dy helloDy 2023-10-13 17:06:35 +08:00
  • 98b3237c9a Merge pull request 'lb' (#43) from lb into test g7hoo 2023-10-13 17:06:02 +08:00
  • 46aaa47e07 bug helloDy 2023-10-13 17:05:01 +08:00
  • ca0f62b2eb Merge branch 'test' into lb lb 2023-10-13 17:04:18 +08:00
  • 5534104e87 update equipment edit lb 2023-10-13 17:01:49 +08:00
  • b72fe1bfed update equipment edit lb 2023-10-13 16:08:31 +08:00
  • f4493bde1c Merge pull request 'dy' (#42) from dy into test hellody 2023-10-12 17:06:04 +08:00
  • d682ecc91c Merge branch 'test' into dy helloDy 2023-10-12 17:05:03 +08:00
  • 2b76ef7d23 bug helloDy 2023-10-12 17:04:03 +08:00
  • 9ec13b35b8 update equipment lb 2023-10-12 17:03:07 +08:00
  • 7acccd3de0 bugfix zentao lb 2023-10-12 15:40:05 +08:00
  • e40f45a79a Merge pull request 'zjl' (#41) from zjl into test juzi 2023-10-12 14:43:24 +08:00
  • 77083a84a1 merge test juzi 2023-10-12 14:41:59 +08:00
  • 9f53ea6981 10.12 juzi 2023-10-12 14:39:59 +08:00
  • 8f634d012c bugfix zentao lb 2023-10-12 11:08:51 +08:00
  • 03c573d5b2 Merge pull request 'zjl' (#40) from zjl into test juzi 2023-10-11 14:34:26 +08:00
  • 348714edaf merge test juzi 2023-10-11 14:33:37 +08:00
  • 814fe4605a UI样式修改能源&班组 juzi 2023-10-11 14:30:18 +08:00
  • bb6bfc5ab6 Merge pull request 'lb' (#39) from lb into test g7hoo 2023-10-11 10:33:08 +08:00
  • 0162f338ba Merge branch 'test' into lb lb 2023-10-11 10:30:25 +08:00
  • 8f99915720 add 设备看板 lb 2023-10-11 10:29:26 +08:00
  • 744e5d80be Merge pull request 'dy' (#38) from dy into test hellody 2023-10-10 17:08:40 +08:00
  • d3b119ad9b Merge branch 'test' into dy helloDy 2023-10-10 17:07:02 +08:00
  • 69bdab75d4 bug helloDy 2023-10-10 17:06:39 +08:00
  • af5e0333ed update ui lb 2023-10-10 15:30:37 +08:00
  • b2ee61b8cb update 改为抽屉展示 lb 2023-10-10 14:22:00 +08:00
  • 723d83cc02 update 设备分组 lb 2023-10-10 09:40:22 +08:00
  • 769830c448 update 设备分组 lb 2023-10-09 17:01:19 +08:00