Commit Graph

2502 Commits

Author SHA1 Message Date
zhouz
ce3324a8af fix;表处代码修改 2024-06-04 10:37:35 +08:00
c6992eb8dc Merge remote-tracking branch 'origin/master' 2024-06-03 18:35:47 +08:00
32f2a07c91 fix: 出库大批量测试、入库测试 2024-06-03 18:35:07 +08:00
e51fd6577a fix: 纸管重量保存失败 2024-06-03 15:59:24 +08:00
yanps
8a517cee3d opt: 分切上料联调优化 2024-06-02 17:50:18 +08:00
yanps
efd08c55fa opt: 联调优化 2024-06-01 17:15:31 +08:00
12b38767a5 fix: 联调修改 2024-06-01 16:41:39 +08:00
4b54fdcbd2 Merge remote-tracking branch 'origin/master' 2024-05-31 17:18:52 +08:00
7bc761a53b fix: 联调 2024-05-31 17:17:48 +08:00
yanps
5c1aadb43c opt: agv偏移实现两个点位调整,设备信号优化 2024-05-31 16:58:01 +08:00
1395078a48 fix: 分切下料-下单上单更新库存失败 2024-05-31 16:34:33 +08:00
zhouz
cf451f52c9 fix:分切行架任务点位修正 2024-05-31 16:14:27 +08:00
588cbc7767 fix: 分切 2024-05-31 15:14:21 +08:00
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
ac608ed2ca rev:出库口自动分配 2024-05-31 09:00:14 +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
ludj
9736ad6807 rev:删除多余图片 2024-05-29 08:45:46 +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
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
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
zhouz
a44c225026 fix:出库任务给托盘类型 2024-05-25 15:49:27 +08:00
38e3302e40 opt:修改退货入库逻辑 2024-05-25 15:47:06 +08:00
b205002324 add:新增lucence日志清理 2024-05-24 17:48:11 +08:00
zhouz
b284be33ea fix:入库优化 2024-05-24 15:31:02 +08:00
zhouz
dc785a42eb fix:下发任务给高度类型 2024-05-24 13:50:13 +08:00
b8891aabf4 fix: 限高,kep报错等修改 2024-05-23 19:45:46 +08:00
zhouz
28b990e002 fix:获取木箱高度类型修改 2024-05-23 17:30:19 +08:00