Commit Graph

Select branches

Hide Pull Requests

master

dev/zzq_test_01

feature/add_eslog_0228

feature/supplyagreement_0423

test2

test标签

Mono Color

• c092970a8f Merge branch 'master' of http://121.40.234.130:8899/root/wuHanXinRui zds 2022-12-27 16:12:00 +08:00
• 6d26ef52e9 优化 zds 2022-12-27 16:11:39 +08:00
• c019451aa6 add:创建工令是否外协 zhangzhiqiang 2022-12-27 15:52:13 +08:00
• 8e4fd86d9c fix:pc外协sql zhangzhiqiang 2022-12-27 13:07:26 +08:00
• 21f7f65a04 fix:pc外协sql zhangzhiqiang 2022-12-27 13:03:14 +08:00
• 995ff22272 Merge remote-tracking branch 'origin/master' zhangzhiqiang 2022-12-27 12:49:37 +08:00
• 1faabbee67 mdf:外协查询sql修改 zhangzhiqiang 2022-12-27 12:49:25 +08:00
• 372e849065 优化 zds 2022-12-27 12:35:00 +08:00
• 0d221fab2b fix:入库明细单查询sql:出入库单明细表兼容00,01状态 zhangzhiqiang 2022-12-27 11:23:21 +08:00
• 2001d52197 优化 zds 2022-12-26 14:40:44 +08:00
• 18f773cabb 优化 zds 2022-12-26 10:39:06 +08:00
• 63ff53ac84 优化 zds 2022-12-23 17:38:28 +08:00
• 8351f3253f add:新增合批软废球磨时间页面 zhangzhiqiang 2022-12-23 12:47:55 +08:00
• ccb73eac94 优化 zds 2022-12-23 11:49:12 +08:00
• 17bf4dbfeb 优化 zds 2022-12-22 10:15:02 +08:00
• f4ea6660e0 优化 zds 2022-12-20 11:31:57 +08:00
• bb74c562a6 优化 zds 2022-12-20 11:13:53 +08:00
• e7162a67b1 配置文件更新 ludj 2022-12-19 20:27:19 +08:00
• 95118a0068 优化 zds 2022-12-19 19:34:17 +08:00
• 317f29afde 优化 zds 2022-12-19 14:04:13 +08:00
• f6334cb215 优化 zds 2022-12-19 08:58:08 +08:00
• e02d48c462 优化 zds 2022-12-17 11:52:21 +08:00
• 4c8e46d750 优化 zds 2022-12-17 11:11:49 +08:00
• 56a58b54a3 引入redisson zhangzhiqiang 2022-12-15 16:56:32 +08:00
• b6f7e921bd 优化 zds 2022-12-15 16:29:01 +08:00
• 3fca2fc149 优化 zds 2022-12-14 15:41:54 +08:00
• ac1f546767 代码更新 liyongde 2022-12-14 14:38:02 +08:00
• 3b02fd79b9 代码更新 liyongde 2022-12-14 13:34:55 +08:00
• f019fcf89c 代码更新 liyongde 2022-12-14 12:33:07 +08:00
• d038b4f75e 代码修改 liyongde 2022-12-14 11:36:28 +08:00
• c70afde827 优化 zds 2022-12-13 17:26:07 +08:00
• f8d92cb61a 优化 zds 2022-12-09 13:31:14 +08:00
• a035480077 优化 zds 2022-12-09 13:26:39 +08:00
• 9c6613614b 优化 zds 2022-12-08 20:24:08 +08:00
• 7eaaf831a9 优化 zds 2022-12-08 14:17:15 +08:00
• ddf34c272d 优化 zds 2022-12-07 14:34:03 +08:00
• 5199a6ecc2 优化 zds 2022-12-06 20:32:46 +08:00
• 531c2ba8cd 优化 zds 2022-12-06 17:13:40 +08:00
• 44b9fb058d 优化 zds 2022-12-06 17:12:40 +08:00
• f9c9429dd1 优化 zds 2022-12-06 12:36:17 +08:00
• dd366c7322 优化 zds 2022-12-05 21:12:56 +08:00
• 8f14b98765 优化 zds 2022-12-05 19:11:58 +08:00
• 49f8cf6cfd Merge branch 'master' of http://121.40.234.130:8899/root/wuHanXinRui zds 2022-12-05 12:03:43 +08:00
• 49394c8c36 优化 zds 2022-12-05 12:03:33 +08:00
• 5d7f375f2e 代码更新 liyd 2022-12-05 11:24:11 +08:00
• 65f6da2675 优化 zds 2022-12-05 11:12:24 +08:00
• 2387a2e177 优化 zds 2022-12-05 10:49:38 +08:00
• f5941fb77e 优化 zds 2022-12-05 09:19:29 +08:00
• a9157637a9 优化 zds 2022-12-04 19:31:20 +08:00
• e368618537 优化 zds 2022-12-03 23:22:40 +08:00
• 6694a12507 fix:部门查询禁用不显示问题 zhangzhiqiang 2022-12-03 19:12:21 +08:00
• 2f1a3ffb68 优化 zds 2022-12-03 11:50:20 +08:00
• 4fa3014bd8 Merge branch 'master' of http://121.40.234.130:8899/root/wuHanXinRui liyd 2022-12-03 11:21:30 +08:00
• afa20107c7 用户管理查看禁用部门问题 liyd 2022-12-03 11:13:47 +08:00
• d285f09581 优化 zds 2022-12-02 18:38:15 +08:00
• b59abc4263 字典判重复，用户排序显示 liyd 2022-12-02 18:02:18 +08:00
• c22a8545ee 优化 zds 2022-12-01 21:48:55 +08:00
• aced8be5a7 优化 zds 2022-12-01 20:09:38 +08:00
• 70fe17b48c 优化 zds 2022-12-01 18:59:08 +08:00
• 238a61ccad Merge remote-tracking branch 'origin/master' zhangzhiqiang 2022-12-01 18:40:46 +08:00
• 1201b9db6f opt：粉料开单接口优化 zhangzhiqiang 2022-12-01 18:39:29 +08:00
• 28d59d7742 字典修改 liyd 2022-12-01 16:47:05 +08:00
• 0f0baf7299 部门管理、用户管理、字典管理 liyd 2022-12-01 15:47:39 +08:00
• 9b0d70ae33 优化 zds 2022-12-01 13:00:22 +08:00
• 1091de1e92 优化 zds 2022-12-01 12:24:32 +08:00
• 7a741704d3 mdf:粉料开单记录后端优化 zhangzhiqiang 2022-12-01 11:12:20 +08:00
• df3f7e9be8 优化 zds 2022-11-30 21:36:27 +08:00
• 64ea2071a6 优化 zds 2022-11-30 19:08:02 +08:00
• 317f5ec001 优化 zds 2022-11-30 12:19:46 +08:00
• 06aed20ca8 优化 zds 2022-11-30 10:19:00 +08:00
• e5632397fe 优化 zds 2022-11-29 20:10:59 +08:00
• aa38c4c722 优化 zds 2022-11-29 10:54:51 +08:00
• e23f0b0b1d 优化 zds 2022-11-29 10:38:16 +08:00
• c0b5d25642 优化 zds 2022-11-28 20:19:44 +08:00
• 7b1f9fb61f 优化 zds 2022-11-28 18:19:59 +08:00
• fb88546733 优化 zds 2022-11-28 12:23:03 +08:00
• ae1202cf80 优化 zds 2022-11-28 10:52:44 +08:00
• 152c72a313 优化 zds 2022-11-27 18:49:26 +08:00
• 06fe040d4f 优化 zds 2022-11-27 14:51:58 +08:00
• e1e2a5d237 优化 zds 2022-11-27 14:12:16 +08:00
• d6c7f29349 优化 zds 2022-11-27 13:33:51 +08:00
• 90866baa4c 优化输送线同步锁 zds 2022-11-26 20:52:30 +08:00
• 639c8460c3 优化 zds 2022-11-26 09:04:42 +08:00
• 7d5d7d7ce2 优化 zds 2022-11-25 21:12:35 +08:00
• ab020f0356 Merge branch 'master' of http://121.40.234.130:8899/root/wuHanXinRui lyd 2022-11-25 18:18:50 +08:00
• 0788c758ba 代码更新 lyd 2022-11-25 18:18:42 +08:00
• 5a4b7dff8e 优化 zds 2022-11-25 11:13:29 +08:00
• 111d8844f9 优化 zds 2022-11-24 12:25:47 +08:00
• 1c820ee794 mdf:播报字段修改3 zhangzhiqiang 2022-11-24 09:34:57 +08:00
• 30eb5ad0f2 fix:播报字段大小写 zhangzhiqiang 2022-11-24 09:02:52 +08:00
• 9f605d1da1 fix：播报字段小写 zhangzhiqiang 2022-11-24 08:49:03 +08:00
• e300e9a9f3 mdf:大屏任务查询sql修改 zhangzhiqiang 2022-11-23 18:02:52 +08:00
• 656161160b 优化 zds 2022-11-23 16:06:00 +08:00
• be8d1d4e6b 优化 zds 2022-11-23 12:06:31 +08:00
• d705a2f1ed Merge remote-tracking branch 'origin/master' zhangzhiqiang 2022-11-23 10:57:02 +08:00
• 275043b36d mdf:排序字段修改 zhangzhiqiang 2022-11-23 10:54:59 +08:00
• 5307da8278 优化 zds 2022-11-23 10:53:00 +08:00
• d9793a61c2 mdf:el-input v-model改为el-input v-model.trim zhangzhiqiang 2022-11-23 10:16:24 +08:00
• ac9b5a8835 优化 zds 2022-11-22 20:01:47 +08:00
• dc910c9a35 Merge remote-tracking branch 'origin/master' zhangzhiqiang 2022-11-22 17:38:20 +08:00