Commit Graph

1454 Commits

Author SHA1 Message Date
b2e2f92202 add: 分切业务开发 2024-02-26 14:29:48 +08:00
ca2dac7816 Merge remote-tracking branch 'origin/b_lms' into b_lms
# Conflicts:
#	lms/nladmin-system/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java
#	lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
2024-02-26 14:24:07 +08:00
30d1086938 opt:优化业务逻辑 2024-02-26 10:17:20 +08:00
621fe7362e add:acstolms 接口 2024-02-22 19:11:38 +08:00
da3b9e6b78 rev:复烤回退 2024-02-22 19:04:47 +08:00
64e3d286cc add:出库一键设置 2024-02-21 18:35:27 +08:00
9f303916b9 rev:超期信息导入 2024-02-20 13:29:49 +08:00
b6baccc8a9 rev:二期发货任务 2024-02-19 16:25:04 +08:00
1b215a0b93 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2024-02-19 14:38:06 +08:00
7d8a560571 rev:复烤、内包间查询优化 2024-02-19 14:37:55 +08:00
8ff453316b rev:出库调拨单打印 毛重计算错误 2024-02-18 14:04:45 +08:00
9aed674e23 add:发货任务 2024-02-18 14:01:55 +08:00
b2a578ffd5 add:捆扎任务 2024-02-06 18:01:46 +08:00
6cf6ee8f06 opt:增加点位库存表启用状态过滤查询 2024-02-02 17:01:49 +08:00
4927838346 Merge remote-tracking branch 'origin/b_lms' into b_lms 2024-02-02 16:58:49 +08:00
91df60b647 opt:增加点位库存表启用状态过滤查询 2024-02-02 16:58:33 +08:00
01b8f43084 add:木箱出库 2024-02-02 15:33:56 +08:00
39024a6484 add:增加一楼任务 2024-02-01 23:20:00 +08:00
2fbac5ca01 add:木箱入库 2024-02-01 10:11:00 +08:00
04d34fb12f add:木箱信息 2024-01-30 15:30:26 +08:00
9da132eb09 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2024-01-27 16:29:38 +08:00
7cfe04a977 rev:套轴申请不需要任务号 2024-01-27 16:29:16 +08:00
7b880b48bc rev:redisson自动续期问题 2024-01-27 16:25:26 +08:00
1018b1fac0 rev:空托盘出入库 2024-01-27 15:53:15 +08:00
29ca5f703c refactor: 前端驼峰转下划线 2024-01-27 15:41:13 +08:00
1c6f2bd7be refactor: 驼峰统一修改成下划线 2024-01-27 15:21:13 +08:00
b0ac44072a add:空托盘出库 2024-01-26 18:04:38 +08:00
510faea0ef add: 空盘出库wql 2024-01-26 15:54:26 +08:00
3c7f4495da add:空托盘入库 2024-01-26 09:55:09 +08:00
27cd6217c4 rev: 代码生成器转为mybatis-plus的生成 2024-01-25 17:19:51 +08:00
f24646754e rev:修改实体主键注解 2024-01-24 15:15:36 +08:00
2c76a7447f add:增加mapper生成 2024-01-24 15:11:55 +08:00
b3da793a4c add:二期出库 2024-01-24 14:01:54 +08:00
db57ef0d0f rev:定时器优化 2024-01-24 10:13:07 +08:00
5bcec4b32e Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2024-01-23 17:44:17 +08:00
14090a0d46 rev:集群相关修改 2024-01-23 17:44:07 +08:00
d93fe3a4ed add:pc成品入库 2024-01-19 18:36:27 +08:00
zhangzq
4b82e5a764 add:添加prometheushttp监控 2024-01-19 16:57:12 +08:00
1a7d4afd68 rev:气涨轴编码维护 2024-01-19 11:20:02 +08:00
a2c03da1c8 rev:气涨轴编码变更 2024-01-18 15:54:44 +08:00
58417bf12c rev:穿拔轴机库存更新 2024-01-17 20:07:23 +08:00
1e96343e7e rev:新增表处相关逻辑和任务类 2024-01-17 17:34:06 +08:00
1473ba1a72 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-01-17 17:09:16 +08:00
42b598a49b rev:穿拔轴机库存更新 2024-01-17 17:09:08 +08:00
99242f4c78 rev:二期入库增删改查 2024-01-17 16:15:33 +08:00
edf858a244 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-01-17 10:56:41 +08:00
c7bf3bf17a rev:新增表处库存点位页面 2024-01-17 10:56:30 +08:00
ludj
d2476700fa rev: 去掉swagger 2024-01-16 20:17:22 +08:00
b647c81219 rev:出库手工分配修改 2024-01-16 20:03:42 +08:00
fde6ad67fd add:入库查询 2024-01-16 20:00:42 +08:00