|
|
dddfe51684
|
rev:优化路由报错信息
|
2024-05-31 13:38:39 +08:00 |
|
|
|
89abe2e26d
|
add:新增接口日志
|
2024-05-31 11:32:17 +08:00 |
|
zhouz
|
d2140c8469
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-05-31 10:16:50 +08:00 |
|
zhouz
|
72863a797b
|
fix:桁架下卷
|
2024-05-31 10:16:43 +08:00 |
|
|
|
179b3eac45
|
fix: 字段
|
2024-05-31 10:14:11 +08:00 |
|
|
|
b366e7f4c5
|
Merge remote-tracking branch 'origin/admin' into lms_v1.0.0
|
2024-05-31 09:00:44 +08:00 |
|
|
|
ac608ed2ca
|
rev：出库口自动分配
|
2024-05-31 09:00:14 +08:00 |
|
|
|
bff324b280
|
Merge remote-tracking branch 'origin/admin' into admin
|
2024-05-31 08:52:21 +08:00 |
|
|
|
adafb2cec5
|
rev: admin 修复国际化
|
2024-05-31 08:52:10 +08:00 |
|
ludj
|
9c0db5c954
|
rev：代码修改
|
2024-05-30 18:09:52 +08:00 |
|
|
|
ed4632efd7
|
add: 分切下料手持功能
|
2024-05-30 17:57:21 +08:00 |
|
|
|
b6a19862a5
|
feat: 分切业务任务取消逻辑
|
2024-05-30 16:58:05 +08:00 |
|
|
|
f086d49bf0
|
rev:优化日志检索页面
|
2024-05-30 10:58:10 +08:00 |
|
USER-20220102CG\noblelift
|
6e20028867
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2024-05-30 09:52:33 +08:00 |
|
USER-20220102CG\noblelift
|
ff8d323008
|
修改废箔称重业务
|
2024-05-30 09:52:13 +08:00 |
|
|
|
3e7a8f2784
|
fix: 分切下料上气胀轴任务位置修改
|
2024-05-30 09:48:42 +08:00 |
|
yanps
|
eac3ec19c2
|
opt: 分切下料联调优化
|
2024-05-30 09:07:05 +08:00 |
|
|
|
6ff9f9221d
|
rev：优化日志检索页面
|
2024-05-29 17:13:58 +08:00 |
|
|
|
484f52f8f7
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
# Conflicts:
# lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java
|
2024-05-29 16:26:56 +08:00 |
|
|
|
54c7167565
|
rev：成品入库优化
|
2024-05-29 16:23:45 +08:00 |
|
|
|
19a263caf6
|
Merge remote-tracking branch 'origin/admin' into lms_v1.0.0
|
2024-05-29 16:13:01 +08:00 |
|
|
|
7659065a68
|
rev: api位置挪动
|
2024-05-29 15:16:08 +08:00 |
|
|
|
7f57246adf
|
fix: 添加缺省国际化
|
2024-05-29 09:40:49 +08:00 |
|
|
|
0640811a60
|
Merge remote-tracking branch 'origin/admin' into lms_v1.0.0
|
2024-05-29 09:10:58 +08:00 |
|
|
|
bba3cdc35b
|
rev: i18n位置挪动
|
2024-05-29 09:09:47 +08:00 |
|
ludj
|
9736ad6807
|
rev:删除多余图片
|
2024-05-29 08:45:46 +08:00 |
|
|
|
bcb6d51f2f
|
Merge remote-tracking branch 'origin/admin' into lms_v1.0.0
|
2024-05-28 17:17:55 +08:00 |
|
ludj
|
df89d088a3
|
代码格式调整
|
2024-05-28 16:31:14 +08:00 |
|
|
|
157aea57b1
|
Merge remote-tracking branch 'origin/admin' into lms_v1.0.0
|
2024-05-28 16:04:13 +08:00 |
|
ludj
|
8bf43d5cc7
|
前端样式修改
|
2024-05-28 16:02:04 +08:00 |
|
ludj
|
e388b3debe
|
前端样式修改
|
2024-05-28 15:56:00 +08:00 |
|
ludj
|
2ffd105ac0
|
新建测试
|
2024-05-28 15:48:39 +08:00 |
|
|
|
349ed3c90d
|
test: 测试
|
2024-05-28 15:40:53 +08:00 |
|
zhouz
|
20bc00c0ca
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-05-28 09:26:47 +08:00 |
|
zhouz
|
5939a0e520
|
fix:出入库流程修改
|
2024-05-28 09:26:40 +08:00 |
|
yanps
|
a50c10c032
|
opt: AGV偏移功能优化
|
2024-05-27 19:43:14 +08:00 |
|
|
|
01bf0d484b
|
opt:修改查询木箱信息
|
2024-05-27 16:11:32 +08:00 |
|
|
|
c22c382bdf
|
refactor: nladmin-lms init
|
2024-05-27 15:38:56 +08:00 |
|
|
|
1179a5f154
|
fix: logback-spring.xml配置dev
|
2024-05-27 14:31:50 +08:00 |
|
|
|
f5e6db390a
|
refactor: 前后端基础部分
|
2024-05-27 14:15:48 +08:00 |
|
|
|
0636d1170d
|
rev：向txt文件中新增字段
|
2024-05-27 13:55:12 +08:00 |
|
|
|
bd090a67af
|
add：子卷包装关系增加字段
|
2024-05-27 11:10:37 +08:00 |
|
|
|
2f446cb2cd
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2024-05-27 11:05:48 +08:00 |
|
|
|
057e09e545
|
fix:新增包装关系字段
|
2024-05-27 11:05:39 +08:00 |
|
|
|
6ebf142c23
|
add:新增定时清理设备故障表任务
|
2024-05-27 10:58:53 +08:00 |
|
管理员
|
f23e4548cd
|
Initial commit
|
2024-05-27 09:48:12 +08:00 |
|
|
|
7abf41f2f4
|
fix: 出库联调修改
|
2024-05-27 09:32:02 +08:00 |
|
zhouz
|
3b4576ef12
|
fix:空木箱入库、退货入库将木箱和托盘进行绑定
|
2024-05-26 11:14:44 +08:00 |
|
|
|
67120342ac
|
Merge remote-tracking branch 'origin/master'
|
2024-05-25 17:38:20 +08:00 |
|
zhouz
|
b3b82e2352
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-05-25 15:49:31 +08:00 |
|
