Commit Graph

  • b348a31b24 update some equipment bugs lb 2023-11-22 10:14:40 +08:00
  • bc2940ca99 Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test gtz 2023-11-21 17:30:38 +08:00
  • 67d639c413 Merge pull request 'update bugs' (#98) from projects/mes-lb into projects/mes-test g7hoo 2023-11-21 17:03:52 +08:00
  • c6d618b2b8 update bugs lb 2023-11-21 17:02:22 +08:00
  • aa79d15f52 Merge pull request 'projects/mes-lb' (#97) from projects/mes-lb into projects/mes-test g7hoo 2023-11-21 16:09:15 +08:00
  • c8fb8d7589 Merge branch 'projects/mes-test' into projects/mes-lb lb 2023-11-21 16:08:44 +08:00
  • 51baca61cc update equipment attach process lb 2023-11-21 14:10:47 +08:00
  • 847e34fcc6 update lb 2023-11-21 11:48:17 +08:00
  • 32a43fbc3b update process equipment relation lb 2023-11-21 09:13:28 +08:00
  • 20975948ef update lb 2023-11-20 16:50:38 +08:00
  • c46c4dbf65 Merge pull request '更新仓库bug' (#96) from projects/mes-zwq into projects/mes-test 朱文强 2023-11-20 16:11:49 +08:00
  • 685a3308db 更新仓库bug zwq 2023-11-20 16:09:42 +08:00
  • 76938951ed Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test gtz 2023-11-20 16:07:12 +08:00
  • ac041c2f4a update bom-selector v1 lb 2023-11-20 15:51:47 +08:00
  • dd23c49ba0 update 设备选择 lb 2023-11-20 14:21:14 +08:00
  • 44452f2e89 update lb 2023-11-20 11:26:27 +08:00
  • 8ddef0de9d update bomselector lb 2023-11-17 17:07:52 +08:00
  • 7249abf5b1 add BomSelector lb 2023-11-17 16:48:00 +08:00
  • 76f5385140 add Candidate lb 2023-11-17 16:05:57 +08:00
  • 27f4e034be Merge pull request '更新-仓库-2级bug' (#95) from projects/mes-zwq into projects/mes-test 朱文强 2023-11-17 15:48:45 +08:00
  • 75f59c3279 更新-仓库-2级bug zwq 2023-11-17 15:48:17 +08:00
  • bb731dfcd4 add custom tree lb 2023-11-17 14:56:43 +08:00
  • 8c37647aab Merge pull request 'projects/mes-zjl' (#94) from projects/mes-zjl into projects/mes-test juzi 2023-11-17 14:08:54 +08:00
  • bad7175f87 merge test juzi 2023-11-17 14:07:51 +08:00
  • 231e9227a5 1 juzi 2023-11-17 14:04:53 +08:00
  • d3eb9d8fbc update custom-transfer lb 2023-11-17 11:25:28 +08:00
  • 9a7521e691 add CustomTrasfer lb 2023-11-17 11:15:18 +08:00
  • 8b91e7812f '1' gtz 2023-11-17 10:38:44 +08:00
  • 9cffa01414 Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test gtz 2023-11-17 10:38:35 +08:00
  • e82ee4e542 Merge pull request 'projects/mes-dy' (#93) from projects/mes-dy into projects/mes-test 高天泽 2023-11-17 10:38:28 +08:00
  • 905479d5f4 'del_dist' gtz 2023-11-17 10:29:23 +08:00
  • c1ae248234 '1' gtz 2023-11-17 10:28:39 +08:00
  • 40e7d6b6d8 Merge branch 'projects/mes-test' into projects/mes-dy helloDy 2023-11-17 10:26:21 +08:00
  • 1d9b97f1d0 设备信息bug helloDy 2023-11-17 10:24:53 +08:00
  • cfaa17ee28 Merge pull request 'projects/mes-lb' (#92) from projects/mes-lb into projects/mes-test g7hoo 2023-11-17 10:15:36 +08:00
  • d1cbac481d Merge branch 'projects/mes-test' into projects/mes-lb lb 2023-11-17 10:14:26 +08:00
  • c895975703 update lb 2023-11-17 10:12:00 +08:00
  • 6ef90a8eba merge test lb 2023-11-17 10:00:04 +08:00
  • e63b98161f Merge pull request '更新仓库bug' (#91) from projects/mes-zwq into projects/mes-test 朱文强 2023-11-17 09:55:35 +08:00
  • c99393dd12 更新仓库bug zwq 2023-11-17 09:55:09 +08:00
  • 23c1b4b3c6 update lb 2023-11-17 09:48:39 +08:00
  • 88615a52a4 '1' gtz 2023-11-17 08:46:35 +08:00
  • bc3959412d Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test gtz 2023-11-17 05:16:16 +08:00
  • 010e51c0f6 update 工艺流程 Melete 2023-11-16 22:18:45 +08:00
  • a6b48280aa update 工艺流程 Melete 2023-11-16 22:00:50 +08:00
  • 9f11fa3e00 Merge pull request 'projects/mes-dy' (#90) from projects/mes-dy into projects/mes-test 高天泽 2023-11-16 21:10:11 +08:00
  • c4091b7181 Merge branch 'projects/mes-test' into projects/mes-dy helloDy 2023-11-16 21:07:59 +08:00
  • 34e6a73852 bug helloDy 2023-11-16 21:07:21 +08:00
  • 79a6a4804a Merge pull request 'projects/mes-zhp' (#89) from projects/mes-zhp into projects/mes-test 高天泽 2023-11-16 18:56:08 +08:00
  • 7523f98f84 Merge branch 'projects/mes-test' into projects/mes-zhp ‘937886381’ 2023-11-16 18:54:43 +08:00
  • b349432eaa 修改bug ‘937886381’ 2023-11-16 18:52:55 +08:00
  • 4393c0e0e8 Merge pull request 'projects/mes-lb' (#88) from projects/mes-lb into projects/mes-test g7hoo 2023-11-16 17:31:03 +08:00
  • 42177846e8 Merge branch 'projects/mes-test' into projects/mes-lb lb 2023-11-16 17:25:39 +08:00
  • c5b5de7a78 update lb 2023-11-16 17:23:58 +08:00
  • 0884159dd7 update login lb 2023-11-16 17:16:37 +08:00
  • 87eccc7b25 Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test gtz 2023-11-16 17:05:19 +08:00
  • 8a819b84b6 Merge pull request 'projects/mes-zjl' (#87) from projects/mes-zjl into projects/mes-test juzi 2023-11-16 16:54:45 +08:00
  • d37c5881a5 2 juzi 2023-11-16 16:53:35 +08:00
  • 2b0579dc70 merge test juzi 2023-11-16 16:13:36 +08:00
  • 6a10afd04e 1 juzi 2023-11-16 16:12:05 +08:00
  • 7c1c61f8f8 Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test gtz 2023-11-16 15:27:15 +08:00
  • fb967fb825 Merge pull request 'projects/mes-dy' (#86) from projects/mes-dy into projects/mes-test hellody 2023-11-16 14:09:07 +08:00
  • 25d1ac8d90 merge helloDy 2023-11-16 14:07:50 +08:00
  • 3667b98da9 bug helloDy 2023-11-16 13:57:21 +08:00
  • d3c289f11e Merge pull request 'projects/mes-lb' (#85) from projects/mes-lb into projects/mes-test g7hoo 2023-11-16 13:55:22 +08:00
  • bbdf0a75f0 update system lb 2023-11-16 13:47:18 +08:00
  • 5339854df4 Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test gtz 2023-11-16 12:56:11 +08:00
  • 26658accfc Merge branch 'projects/mes-test' into projects/mes-lb lb 2023-11-16 10:57:20 +08:00
  • 31033dd7e2 Merge pull request 'projects/mes-zhp' (#84) from projects/mes-zhp into projects/mes-test 高天泽 2023-11-16 10:20:53 +08:00
  • 3832aee028 解决冲突 ‘937886381’ 2023-11-16 08:52:38 +08:00
  • 2fbc6ea5e7 修改bug ‘937886381’ 2023-11-16 08:50:59 +08:00
  • d0cb4d383e Merge pull request 'projects/mes-dy' (#83) from projects/mes-dy into projects/mes-test 高天泽 2023-11-15 18:15:03 +08:00
  • 4ce62c14ee Merge branch 'projects/mes-test' into projects/mes-dy helloDy 2023-11-15 17:47:31 +08:00
  • e5966c27a3 工单[ helloDy 2023-11-15 17:46:54 +08:00
  • ea1d981a5a Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test gtz 2023-11-15 16:49:05 +08:00
  • 3e9f629888 Merge pull request '修改bug' (#82) from projects/mes-zhp into projects/mes-test 高天泽 2023-11-15 16:03:01 +08:00
  • ecabeeeea9 修改bug ‘937886381’ 2023-11-15 15:47:45 +08:00
  • 0f7a8fbf73 Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test gtz 2023-11-15 15:05:37 +08:00
  • d7366e80ee '1' gtz 2023-11-15 15:05:33 +08:00
  • 3da077bdf3 Merge pull request 'projects/mes-dy' (#81) from projects/mes-dy into projects/mes-test 高天泽 2023-11-15 14:55:44 +08:00
  • aef062b4c9 merge helloDy 2023-11-15 14:37:52 +08:00
  • 952490f0d4 24h,设备 helloDy 2023-11-15 14:30:28 +08:00
  • 51d6ce5dbb Merge pull request '订单' (#80) from projects/mes-zjl into projects/mes-test juzi 2023-11-15 14:23:23 +08:00
  • 0ae68aacef 订单 juzi 2023-11-15 14:22:45 +08:00
  • 2ab686a797 Merge pull request 'bug' (#79) from projects/mes-zjl into projects/mes-test juzi 2023-11-15 14:03:01 +08:00
  • a37fa65e8f bug juzi 2023-11-15 14:02:16 +08:00
  • 887390cf91 Merge pull request 'projects/mes-zjl' (#78) from projects/mes-zjl into projects/mes-test juzi 2023-11-15 10:18:22 +08:00
  • 5d054254f7 merge test juzi 2023-11-15 10:17:35 +08:00
  • 76cdc34af1 小bug juzi 2023-11-15 10:13:54 +08:00
  • 0fefe4d432 Merge pull request 'projects/mes-zhp' (#77) from projects/mes-zhp into projects/mes-test 高天泽 2023-11-15 10:02:14 +08:00
  • ecc84a1c4b 合并冲突 ‘937886381’ 2023-11-15 09:10:45 +08:00
  • 95f7004d1c 修改bug ‘937886381’ 2023-11-15 09:08:20 +08:00
  • 9a1aa047b0 Merge pull request '仓库-bug修改' (#76) from projects/mes-zwq into projects/mes-test 朱文强 2023-11-14 16:02:50 +08:00
  • de06dfddf4 仓库-bug修改 zwq 2023-11-14 16:02:16 +08:00
  • 26100af90a Merge pull request 'projects/mes-zjl' (#75) from projects/mes-zjl into projects/mes-test juzi 2023-11-14 15:49:56 +08:00
  • 67612c79df merge test juzi 2023-11-14 15:47:06 +08:00
  • 26862423c1 首页 juzi 2023-11-14 10:35:10 +08:00
  • a1a7256af5 Merge pull request '更新-仓库-库位监控' (#74) from projects/mes-zwq into projects/mes-test 朱文强 2023-11-14 09:43:59 +08:00
  • d2c82fa692 更新-仓库-库位监控 zwq 2023-11-14 09:42:38 +08:00
  • 5654b3aeef Merge pull request 'update' (#73) from projects/mes-lb into projects/mes-test g7hoo 2023-11-14 09:24:38 +08:00