Commit Graph

  • 8d741b8d8a Merge pull request '看板页面' (#429) from projects/qhd-line-zjl into projects/qhd-line-test 朱菊兰 2025-04-17 16:32:09 +08:00
  • 2c1e1845f4 看板页面 juzi 2025-04-17 16:23:47 +08:00
  • 1e9bfee1e7 Merge pull request '更新' (#428) from projects/zg-zwq into projects/zg-test 朱文强 2025-03-17 15:31:35 +08:00
  • b4985d4018 更新 zwq 2025-03-17 15:31:00 +08:00
  • cbdae0f2eb Merge pull request '更新仓库bug' (#427) from projects/mes-zwq into projects/mes-test projects/mes-test 朱文强 2025-03-17 15:29:25 +08:00
  • 787c994224 更新仓库bug projects/mes-zwq zwq 2025-03-17 15:29:01 +08:00
  • cc1e237043 Merge pull request 'projects/mes-zhp' (#426) from projects/mes-zhp into projects/mes-test 朱菊兰 2025-03-17 14:37:00 +08:00
  • 45e1fe4b47 Merge branch 'projects/mes-test' into projects/mes-zhp projects/mes-zhp ‘937886381’ 2025-03-17 14:19:01 +08:00
  • e823dee9ff 修改 ‘937886381’ 2025-03-17 14:18:07 +08:00
  • 932d35c14c Merge pull request 'projects/mes-zjl' (#425) from projects/mes-zjl into projects/mes-test 朱菊兰 2025-03-17 10:36:14 +08:00
  • ceeb853783 去除限制3档计价 projects/mes-zjl juzi 2025-03-17 10:35:48 +08:00
  • 6ed21030f5 Merge branch 'projects/mes-test' into projects/mes-zjl juzi 2025-03-17 10:25:56 +08:00
  • 73feff0d8b 修改 juzi 2025-03-17 10:22:59 +08:00
  • bbd9972761 ry-bug zwq 2025-03-10 16:33:55 +08:00
  • ea47028178 Merge pull request '更新自贡' (#424) from projects/zg-zwq into projects/zg-test 朱文强 2025-03-10 16:32:53 +08:00
  • eaf00466db 更新zg zwq 2025-03-10 16:32:02 +08:00
  • 1434eaa3ac Merge pull request '更新自贡' (#424) from projects/zg-zwq into projects/zg-test 朱文强 2025-02-27 13:59:07 +08:00
  • bc2b51d0e3 更新自贡 zwq 2025-02-27 13:55:53 +08:00
  • 8e9b2f6444 更新 zwq 2025-02-27 13:54:28 +08:00
  • c83a7afadb 更新 zwq 2025-02-24 14:10:34 +08:00
  • e58c60e6f7 Merge pull request '更新' (#423) from projects/zg-zwq into projects/zg-test 朱文强 2025-02-24 14:09:50 +08:00
  • 445cd9630d 更新 zwq 2025-02-24 14:07:38 +08:00
  • e314e84b43 Merge pull request '更新首页' (#422) from projects/zg-zwq into projects/zg-test 朱文强 2025-02-19 14:15:29 +08:00
  • 491b88f220 更新首页 zwq 2025-02-19 14:14:57 +08:00
  • b43876fe67 更新 zwq 2025-02-19 14:13:47 +08:00
  • d49a698136 Merge pull request '自测bug' (#421) from projects/mes-zjl into projects/mes-test 朱菊兰 2025-02-18 08:50:15 +08:00
  • 6e774dfc5d 自测bug juzi 2025-02-18 08:44:43 +08:00
  • 3eeded056f Merge pull request '修改' (#420) from projects/mes-zjl into projects/mes-test 朱菊兰 2025-01-24 14:29:38 +08:00
  • 881eace12f 修改 juzi 2025-01-24 14:28:28 +08:00
  • f143c5e2d9 . zwq 2025-01-16 08:34:17 +08:00
  • 0b03e6d44b 更新 zwq 2025-01-15 13:35:15 +08:00
  • 19dbe38458 更新 zwq 2025-01-10 15:07:05 +08:00
  • dad3b2da95 Merge pull request 'projects/mes-zjl' (#419) from projects/mes-zjl into projects/mes-test 朱菊兰 2025-01-10 13:59:08 +08:00
  • f5cfc5d2bb Merge branch 'projects/mes-test' into projects/mes-zjl juzi 2025-01-10 13:53:55 +08:00
  • 235b0a6512 修改部分bug juzi 2025-01-10 13:52:13 +08:00
  • 13bf1e0fd0 Merge pull request 'projects/mes-zhp' (#418) from projects/mes-zhp into projects/mes-test 朱菊兰 2025-01-08 16:21:21 +08:00
  • 97acb4faac Merge branch 'projects/mes-test' into projects/mes-zhp ‘937886381’ 2025-01-08 16:11:12 +08:00
  • 04a5359eda 修改 ‘937886381’ 2025-01-08 16:10:46 +08:00
  • 7ae7dfad95 Merge pull request '部分bug' (#417) from projects/mes-zjl into projects/mes-test 朱菊兰 2025-01-08 15:48:58 +08:00
  • e202ac542e 部分bug juzi 2025-01-08 15:47:22 +08:00
  • eb8736178a Merge pull request 'projects/mes-zjl' (#416) from projects/mes-zjl into projects/mes-test 朱菊兰 2025-01-07 14:28:21 +08:00
  • 580a66549c 系统管理bug juzi 2025-01-07 14:27:13 +08:00
  • 30c45e6f74 修改系统bug juzi 2025-01-06 10:44:23 +08:00
  • e9c2917c77 Merge pull request '排班bug' (#415) from projects/mes-zjl into projects/mes-test 朱菊兰 2025-01-03 14:39:30 +08:00
  • 0a9bd0c6de Merge branch 'projects/mes-test' into projects/mes-zjl juzi 2025-01-03 14:39:08 +08:00
  • 84dbd8d5b2 排班bug juzi 2025-01-03 14:37:54 +08:00
  • 00f54f3de6 Merge branch 'projects/mes-test' into projects/mes-zhp ‘937886381’ 2025-01-03 09:56:35 +08:00
  • f26d7abc64 修改 ‘937886381’ 2025-01-03 09:55:08 +08:00
  • 028c14a174 Merge pull request 'projects/mes-zjl' (#414) from projects/mes-zjl into projects/mes-test 朱菊兰 2025-01-03 09:06:01 +08:00
  • b14abd39b6 Merge branch 'projects/mes-test' into projects/mes-zjl juzi 2025-01-03 09:05:22 +08:00
  • dfc8110410 排班bug juzi 2025-01-03 09:04:21 +08:00
  • d5744b4f3d Merge pull request '更新' (#413) from projects/zg-zwq into projects/zg-test 朱文强 2024-12-31 09:39:06 +08:00
  • c138755a54 更新 zwq 2024-12-31 09:38:24 +08:00
  • baede9ef34 Merge pull request '更新bug' (#412) from projects/mes-zwq into projects/mes-test 朱文强 2024-12-27 15:39:23 +08:00
  • 2c44906bd6 更新bug zwq 2024-12-27 15:38:14 +08:00
  • 466c822b0f Merge pull request '生产管理bug修改' (#411) from projects/mes-zjl into projects/mes-test 朱菊兰 2024-12-27 15:05:29 +08:00
  • 031e3098b7 生产管理bug修改 juzi 2024-12-27 15:00:43 +08:00
  • d764eae48d Merge pull request '更新自贡' (#410) from projects/zg-zwq into projects/zg-test 朱文强 2024-12-26 13:58:15 +08:00
  • baffb1f6f8 更新自贡 zwq 2024-12-26 13:57:37 +08:00
  • 8ecc5db385 Merge pull request '更新' (#409) from projects/zg-zwq into projects/zg-test 朱文强 2024-12-13 12:57:24 +08:00
  • 77259329d9 更新 zwq 2024-12-13 12:56:40 +08:00
  • 43ba33062b 更新 zwq 2024-11-29 16:42:13 +08:00
  • ca390fd764 更新汝阳bug zwq 2024-11-26 16:51:07 +08:00
  • d14dae86fc Merge pull request '工单' (#408) from projects/mes-zjl into projects/mes-test 朱菊兰 2024-11-21 15:55:47 +08:00
  • 492b591fa9 工单 juzi 2024-11-21 15:55:02 +08:00
  • fc20e275f7 Merge pull request '跟新bug' (#407) from projects/mes-zwq into projects/mes-test 朱文强 2024-11-20 13:48:28 +08:00
  • 10fd959c9d 跟新bug zwq 2024-11-20 13:47:55 +08:00
  • 342e83ab41 Merge pull request '更新bug' (#406) from projects/mes-zwq into projects/mes-test 朱文强 2024-11-18 10:45:22 +08:00
  • df530abb90 更新bug zwq 2024-11-18 10:44:51 +08:00
  • 8f1e5212e3 Merge pull request 'projects/mes-zhp' (#405) from projects/mes-zhp into projects/mes-test 张昊鹏 2024-11-14 13:43:43 +08:00
  • 5dd299e549 Merge branch 'projects/mes-test' into projects/mes-zhp ‘937886381’ 2024-11-14 13:43:00 +08:00
  • 511a00d0a3 修改 ‘937886381’ 2024-11-14 13:42:29 +08:00
  • d5b71c4d7d Merge pull request '修改bug' (#404) from projects/mes-zhp into projects/mes-test 朱菊兰 2024-11-14 08:50:39 +08:00
  • 43d0a2668d 修改bug ‘937886381’ 2024-11-14 08:45:45 +08:00
  • a492fe4c87 Merge pull request '更新' (#403) from projects/mes-zwq into projects/mes-test 朱文强 2024-11-13 14:47:51 +08:00
  • 319e0ac90d 更新 zwq 2024-11-13 14:47:19 +08:00
  • e11c71edf1 Merge pull request '更新bug' (#402) from projects/mes-zwq into projects/mes-test 朱文强 2024-11-06 08:53:57 +08:00
  • 4bf610eeb1 更新bug zwq 2024-11-06 08:53:24 +08:00
  • 8e0ac6f962 Merge pull request '更新' (#401) from projects/mes-zwq into projects/mes-test 朱文强 2024-10-17 09:28:51 +08:00
  • d41ae3bc76 更新 zwq 2024-10-17 09:27:52 +08:00
  • f4eaddf6ae Merge pull request '更新' (#400) from projects/mes-zwq into projects/mes-test 朱文强 2024-10-16 09:58:03 +08:00
  • 9699e90ab3 更新 zwq 2024-10-16 09:55:22 +08:00
  • 8ad8e3a5b4 Merge pull request '更新' (#399) from projects/zg-zwq into projects/zg-test 朱文强 2024-09-26 14:14:31 +08:00
  • 6ca512392c 更新 zwq 2024-09-26 14:13:59 +08:00
  • 9fc6f013cc Merge pull request 'projects/mes-zwq' (#398) from projects/mes-zwq into projects/mes-test 朱文强 2024-09-26 14:07:58 +08:00
  • cee303fd20 更新基础mes-能源-系统 zwq 2024-09-26 14:07:00 +08:00
  • 4b621a6699 更新首页+异常告警接口对接和仓库首页跳转问题 zwq 2024-09-23 09:24:58 +08:00
  • a73502cda7 Merge pull request '更新' (#397) from projects/zg-zwq into projects/zg-test 朱文强 2024-09-14 09:02:43 +08:00
  • e32530e459 更新 zwq 2024-09-14 09:02:07 +08:00
  • 916f99a852 Merge pull request 'projects/mes-zhp' (#395) from projects/mes-zhp into projects/mes-test juzi 2024-09-11 14:28:11 +08:00
  • 9581d91c52 生产 ‘937886381’ 2024-09-11 14:26:39 +08:00
  • 64e1c1869d Merge pull request '更新' (#396) from projects/zg-zwq into projects/zg-test 朱文强 2024-09-11 13:59:37 +08:00
  • 93ac1c4742 更新 zwq 2024-09-11 13:58:14 +08:00
  • c847ba1595 生产管理 ‘937886381’ 2024-09-11 10:36:47 +08:00
  • a650f0ad9d Merge pull request '更新' (#394) from projects/zg-zwq into projects/zg-test 朱文强 2024-09-10 15:21:22 +08:00
  • e237737830 更新 zwq 2024-09-10 15:19:44 +08:00
  • 2ab8a99ff5 Merge branch 'projects/mes-test' into projects/mes-zhp ‘937886381’ 2024-09-05 11:18:44 +08:00
  • d65dcb8712 修改 ‘937886381’ 2024-09-05 11:18:03 +08:00
  • 5711468b10 Merge pull request '更新仓库bug托盘编码显示' (#393) from projects/mes-zwq into projects/mes-test 朱文强 2024-08-21 13:21:26 +08:00
  • 1b82ff5a96 更新仓库bug托盘编码显示 zwq 2024-08-21 13:20:58 +08:00