Commit Graph

79 Commits

Author SHA1 Message Date
zhouz
6240eb9a72 代码合并 2024-06-26 23:09:09 +08:00
bd153c9044 add:增加二次分配代码逻辑 2024-06-25 19:06:07 +08:00
zhouz
0d4f004798 Merge branch 'refs/heads/b_lms' into master_merge 2024-06-17 11:05:00 +08:00
12e72ae6fd opt:6.15上线装箱区代码修改 2024-06-17 11:01:36 +08:00
zhangzq
91e0ce0752 merge:冲突处理 2024-06-07 16:59:20 +08:00
zhangzq
c33ffe440b Merge branch 'master' into b_lms2 2024-06-07 16:21:32 +08:00
a07df96854 opt:处理代码冲突 2024-05-10 14:19:13 +08:00
9282e10873 refactor: 代码生成器 2024-04-26 18:11:13 +08:00
f2817ff5b6 rev:时间BUG修改 2024-03-14 14:14:20 +08:00
1c795ec3fb rev:飞书相关修改 2024-03-07 09:14:11 +08:00
1c6f2bd7be refactor: 驼峰统一修改成下划线 2024-01-27 15:21:13 +08:00
27cd6217c4 rev: 代码生成器转为mybatis-plus的生成 2024-01-25 17:19:51 +08:00
2c76a7447f add:增加mapper生成 2024-01-24 15:11:55 +08:00
zhangzq
eeeffbb708 opt:发货区管理接口优化 2024-01-08 17:39:11 +08:00
zhangzq
62023a452e opt:日志优化2 2024-01-05 01:45:43 +08:00
ludj
14eb8b81c5 rev:去掉SWAGGER 2023-12-29 09:43:11 +08:00
zhangzq
ca77135394 opt:日志优化 2023-12-28 19:34:08 +08:00
ludj
d1be5733b8 rev:代码规范:去掉未使用的import与格式化 2023-12-13 13:24:02 +08:00
ad638ee127 dev:代码优化,该切计划和业务员 2023-12-13 09:00:32 +08:00
5dd83f0bff dev:代码规范 2023-12-08 11:30:30 +08:00
f256124e79 dev:优化 2023-12-05 15:43:59 +08:00
c073c02cd1 dev:设备禁用不影响和MES进行接口对接,只影响AGV运行 2023-12-04 09:33:08 +08:00
c9f85aa08b dev:报表优化、入库加并发锁 2023-10-23 17:50:13 +08:00
ac30120460 rev:1.立库监控新增空托盘监控 2.调拨同步接口支持多条明细 2023-09-27 15:59:50 +08:00
1240aae17b rev:修改了日志获取IP和登录端 2023-08-21 15:24:18 +08:00
1ab3878fe2 add:临时通道移库 2023-05-18 17:37:02 +08:00
4b68ad11ce rev:锁超时 2023-05-17 18:17:19 +08:00
0ba8940acf fix:立库界面优化 2023-05-16 18:41:08 +08:00
ee111bdf36 fix:部分事务回滚、纸管库操作提示、系统参数操作不显示 2023-05-10 14:32:05 +08:00
e379a9a86d 代码更新 2023-04-14 17:50:11 +08:00
zhangzhiqiang
83424bb995 add:日志清除按钮 2023-03-01 14:36:30 +08:00
ludj
5b43235369 手持APP更新 2023-02-14 19:12:59 +08:00
zhangzhiqiang
568e02808f mdf:es查询修改分词 2023-02-14 14:18:02 +08:00
zhangzhiqiang
565f48a477 add:es线上配置 2023-02-13 10:20:41 +08:00
zhangzhiqiang
e83ce819e8 add:异常堆栈换行2 2023-02-12 10:21:43 +08:00
zhangzhiqiang
290f5b4294 add:异常堆栈换行 2023-02-12 10:12:50 +08:00
zhangzhiqiang
12ea57f8f3 a 2023-02-10 17:05:39 +08:00
zhangzhiqiang
2e9cce2284 add:生产es配置 2023-02-10 14:38:10 +08:00
zhangzhiqiang
1ff4c7ccaf mdf:修改es配置 2023-02-10 10:51:48 +08:00
zhangzhiqiang
d0eabfd08f fix时间查询 2023-02-09 19:46:46 +08:00
zhangzhiqiang
e629ad21fb 1 2023-02-09 19:16:28 +08:00
zhangzhiqiang
c0661d4c39 add:es 2023-02-09 18:00:20 +08:00
zhangzhiqiang
c4cf28c9c1 1 2023-02-09 15:00:24 +08:00
zhangzhiqiang
071f8fa1bb 1 2023-02-09 13:39:30 +08:00
zhangzhiqiang
de549c2a1a add:es 2023-02-09 13:07:57 +08:00
ludj
dd7ef7f9ba es集成,去掉loki 2023-02-07 17:42:33 +08:00
ludj
79e16a8e1d 代码更新 2023-02-06 18:22:02 +08:00
zhangzhiqiang
442bf6ae36 log 2023-02-05 19:36:23 +08:00
ludj
5ce34f4a29 去掉plumelog 2023-02-05 19:31:38 +08:00
zhangzhiqiang
10934b9dfe add:log 2023-02-05 19:25:18 +08:00