Commit Graph

1296 Commits

Author SHA1 Message Date
851c3b492f 缓存线pad接口更新 2023-03-25 11:14:13 +08:00
ce138e4759 缓存线pad接口更新 2023-03-25 10:28:36 +08:00
1d0be8e2a3 缓存线pad接口更新 2023-03-24 17:48:23 +08:00
3edd05b982 Merge remote-tracking branch 'origin/master' 2023-03-24 17:46:15 +08:00
afdbe51b09 缓存线pad接口更新 2023-03-24 17:46:05 +08:00
490d11f049 修改 2023-03-24 17:37:30 +08:00
a62ca100a2 任务完成、取消 2023-03-24 17:35:36 +08:00
ee9ac36292 更新表 2023-03-24 17:17:38 +08:00
zhangzhiqiang
4a94968944 fix:工单管理 2023-03-24 17:16:22 +08:00
7faf39babb Merge branch 'master' of http://121.40.234.130:8899/root/hl_one 2023-03-24 17:04:29 +08:00
5d56fcb458 代码生成 2023-03-24 17:04:11 +08:00
a1e194462b Merge branch 'master' of http://121.40.234.130:8899/root/hl_one 2023-03-24 16:58:01 +08:00
f9f66b0528 修改 2023-03-24 16:57:57 +08:00
3a09875f8d 更新 2023-03-24 16:17:23 +08:00
3bff1a74f3 修改 2023-03-24 15:26:37 +08:00
zhangzhiqiang
a9de349650 fix:工单管理 2023-03-24 14:45:38 +08:00
e92fefadb1 xls文件更新 2023-03-24 13:59:31 +08:00
5ae2c117ed xls文件更新 2023-03-24 13:59:10 +08:00
1ca7424549 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/CacheLineHandServiceImpl.java
2023-03-24 11:39:12 +08:00
dc945ab6a2 根据前端原有通用代码适配,修改缓存线初始化下拉框id为value,值为text 2023-03-24 11:29:50 +08:00
ebbdf15408 缓存线区域 2023-03-24 11:22:57 +08:00
f7ea420462 更新 2023-03-24 11:14:31 +08:00
zhangzhiqiang
2810b1ce2e fix:工单字段 2023-03-24 10:52:53 +08:00
zhangzhiqiang
2be3a97a1d add:修改缓存线区域关系 2023-03-24 10:41:15 +08:00
zhangzhiqiang
1679e98a7c add:修改缓存线区域关系 2023-03-24 10:39:00 +08:00
8cc3caa49b 缓存线手持服务接口更新 2023-03-24 10:21:01 +08:00
4676c418b0 基础分类字段清理 2023-03-24 10:10:55 +08:00
761bae5a9d Merge branch 'master' of http://121.40.234.130:8899/root/hl_one 2023-03-23 20:27:55 +08:00
bb47376464 编码生成 2023-03-23 20:27:44 +08:00
zhangzhiqiang
8cc8dde800 fix:设备查询sql 2023-03-23 19:49:28 +08:00
zhangzhiqiang
5a347568e8 Merge remote-tracking branch 'origin/master' 2023-03-23 17:53:37 +08:00
zhangzhiqiang
3159f8eab4 add:任务定时下发 2023-03-23 17:53:27 +08:00
2ad678b03d 修改 2023-03-23 17:37:31 +08:00
a22b2457c3 代码更新 2023-03-23 17:07:04 +08:00
zhangzhiqiang
14144e5228 add:任务定时下发 2023-03-23 16:22:59 +08:00
8006802b8b 代码更新 2023-03-23 16:18:55 +08:00
ad1230b6bb 更新 2023-03-23 15:01:39 +08:00
de46a6b23a 更新 2023-03-23 09:04:05 +08:00
0b527b9fab 区域添加是否合并任务 2023-03-22 20:25:44 +08:00
zhangzhiqiang
48819bcf7a add:区域添加合并下发任务字段 2023-03-22 20:17:24 +08:00
zhangzhiqiang
be7cd8e28b add:缓存线任务 2023-03-22 19:44:22 +08:00
6667ca97d8 任务前端显示 2023-03-22 18:57:38 +08:00
891caa2e4c 代码修改 2023-03-22 17:17:22 +08:00
5b63a31619 生产设备修改 2023-03-22 16:43:39 +08:00
51e13b0047 工单导入、登录用户只能看到自身的工单 2023-03-22 16:28:41 +08:00
58623edab3 工单修改 2023-03-22 09:38:53 +08:00
周俊杰
187a2f9b6d 设备修改 2023-03-21 20:45:57 +08:00
周俊杰
e7f050f35e Merge branch 'master' of http://121.40.234.130:8899/root/hl_one 2023-03-21 20:35:12 +08:00
周俊杰
6fe15cf71d 设备修改 2023-03-21 20:35:03 +08:00
USER-20220102CG\noblelift
c5077035c1 更新最新ACS 2023-03-21 20:24:04 +08:00