|
|
190895f69b
|
add: 新增刻字机送料、叫载具，包装机叫料、送载具
|
2023-04-03 19:48:51 +08:00 |
|
|
|
b6626bdbbb
|
rev: 修改任务状态的获取
|
2023-04-03 19:47:50 +08:00 |
|
|
|
5b92d9b664
|
rev: 工单表添加主键
|
2023-04-03 19:46:47 +08:00 |
|
|
|
7d7c53be13
|
rev: 修改状态枚举
|
2023-04-03 16:34:18 +08:00 |
|
|
|
69d39e6458
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-04-03 14:18:04 +08:00 |
|
|
|
3ad49d6446
|
fix: 状态枚举修改
|
2023-04-03 14:17:58 +08:00 |
|
zhangzhiqiang
|
2ecbeb7f07
|
rev:任务创建流程
|
2023-04-03 14:15:51 +08:00 |
|
|
|
be7c9a1565
|
rev: 修改表结构
|
2023-04-03 09:50:37 +08:00 |
|
zhangzhiqiang
|
dfaae63b51
|
rev:接口联调
|
2023-04-03 09:45:12 +08:00 |
|
|
|
8180dcaac5
|
rev:修改任务下发接口实体生成。
rev:sch excel中缓存线位置表【SCH_CacheLine_Position】中增加taskid字段作为任务实时id
|
2023-04-03 09:11:17 +08:00 |
|
|
|
003f54e283
|
rev:修改任务下发接口实体生成。
rev:sch excel中缓存线位置表【SCH_CacheLine_Position】中增加taskid字段作为任务实时id
|
2023-04-03 09:10:42 +08:00 |
|
zhangzhiqiang
|
cdb164d239
|
rev:工单字段修改
|
2023-03-31 15:41:25 +08:00 |
|
zhangzhiqiang
|
17d75a9e7b
|
rev:acs接口联调
|
2023-03-31 15:36:04 +08:00 |
|
zhangzhiqiang
|
7863d41e60
|
rev:接口联调
|
2023-03-31 15:31:55 +08:00 |
|
|
|
45afaa2ea9
|
fix: 修复缓存线位置展示
|
2023-03-31 13:50:11 +08:00 |
|
|
|
428c57a28f
|
rev:优化物料查询。
|
2023-03-31 11:29:32 +08:00 |
|
|
|
a4886fe4bf
|
opt: 下发任务时候状态判断使用枚举，前端显示完成类型后移
|
2023-03-31 10:43:05 +08:00 |
|
|
|
0646a9d6ee
|
fix: 修复设备修改重复code的BUG以及工序的添加
|
2023-03-31 09:57:51 +08:00 |
|
|
|
08d7d1acdb
|
rev:优化新增，修改，删除操作时返回的数据格式。
|
2023-03-30 20:43:33 +08:00 |
|
|
|
48e033b6df
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/CacheLineHandServiceImpl.java
|
2023-03-30 20:18:15 +08:00 |
|
|
|
9c3b4250f7
|
rev:优化新增，修改，删除操作时返回的数据格式。
|
2023-03-30 20:09:17 +08:00 |
|
|
|
8cba52a5da
|
rev: 成品入库功能修改
|
2023-03-30 16:08:19 +08:00 |
|
|
|
02e1caa99d
|
fix: 修复缓存线盘点功能
|
2023-03-30 16:01:01 +08:00 |
|
|
|
06f18f18c0
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-03-30 14:34:05 +08:00 |
|
|
|
51aac3036b
|
fix: 修复工单前端物料对话框不请空，修复与前端接口字段一致，修复反馈前端信息
|
2023-03-30 14:33:55 +08:00 |
|
|
|
8530b2ec54
|
del:删除acs url获取，可以从系统参数表里面动态获取。
|
2023-03-30 14:29:25 +08:00 |
|
|
|
96468538dd
|
add:增加acs请求的url
|
2023-03-30 11:12:40 +08:00 |
|
|
|
d257ecd96c
|
rev:修改所有代码状态判断根据枚举code判断
|
2023-03-30 10:56:21 +08:00 |
|
|
|
88f405b1ae
|
fix:修复任务完成和下发
|
2023-03-29 20:49:00 +08:00 |
|
|
|
a3debb3436
|
rev:修改点位表
|
2023-03-29 19:55:28 +08:00 |
|
|
|
391804f8bf
|
add:新增成品入库功能
|
2023-03-29 19:54:48 +08:00 |
|
|
|
584bd2587c
|
rev:修改所有返回数据方式为ResponseEntity；
|
2023-03-29 19:07:51 +08:00 |
|
|
|
69f484a6fb
|
rev:修改所有返回数据方式为ResponseEntity；
|
2023-03-29 19:06:37 +08:00 |
|
|
|
adb0989e8a
|
修改点位真删除
|
2023-03-29 18:42:23 +08:00 |
|
|
|
2f87ed206e
|
修改所有material_uuid为=material_id
|
2023-03-29 13:33:28 +08:00 |
|
|
|
b3878b8b59
|
新增点位上下区域动态修改
|
2023-03-29 10:39:56 +08:00 |
|
|
|
a8d90f2c99
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-03-29 10:25:59 +08:00 |
|
|
|
7799677be2
|
代码更新
|
2023-03-29 10:25:53 +08:00 |
|
|
|
2420791a15
|
修改任务查询查询条件。
|
2023-03-29 10:12:49 +08:00 |
|
|
|
6e74b9dcf3
|
Merge remote-tracking branch 'origin/master'
|
2023-03-28 20:08:45 +08:00 |
|
|
|
3b403eaaa1
|
Merge remote-tracking branch 'origin/master'
|
2023-03-28 20:08:33 +08:00 |
|
|
|
40959d2dfc
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-03-28 20:08:27 +08:00 |
|
|
|
0faf6a3884
|
修改
|
2023-03-28 20:08:20 +08:00 |
|
|
|
3821b5ee76
|
修改空箱初始化出入空箱逻辑
|
2023-03-28 20:08:15 +08:00 |
|
zhangzhiqiang
|
d570a1759a
|
mdf:配置文件
|
2023-03-28 20:07:47 +08:00 |
|
zhangzhiqiang
|
1cfea5d81f
|
add:redisson
|
2023-03-28 20:03:26 +08:00 |
|
zhangzhiqiang
|
10acd175a7
|
Merge remote-tracking branch 'origin/master'
|
2023-03-28 19:55:44 +08:00 |
|
|
|
6c29ca23e1
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-03-28 19:53:58 +08:00 |
|
zhangzhiqiang
|
0c7a6aed06
|
Merge remote-tracking branch 'origin/master'
|
2023-03-28 19:53:54 +08:00 |
|
zhangzhiqiang
|
3f2cddba6c
|
add:es配置
|
2023-03-28 19:53:31 +08:00 |
|
