zhangzhiqiang
|
47fe472739
|
rev:配置文件改外网
|
2023-05-23 10:14:08 +08:00 |
|
|
|
b3349b313f
|
rev： 代码合并
|
2023-05-23 09:47:34 +08:00 |
|
zhangzhiqiang
|
4289769961
|
Merge remote-tracking branch 'origin/master'
|
2023-05-22 16:58:53 +08:00 |
|
zhangzhiqiang
|
f2a4fcb105
|
add:调度线路
|
2023-05-22 16:57:43 +08:00 |
|
|
|
6ccc8bd551
|
rev:修改缓存线异常处理功能
|
2023-05-22 12:42:44 +08:00 |
|
|
|
a229ccd9f8
|
rev:修改缓存线异常盘点功能
|
2023-05-22 12:28:21 +08:00 |
|
zhangzhiqiang
|
dbf6773d47
|
Merge remote-tracking branch 'origin/master'
|
2023-05-21 17:24:08 +08:00 |
|
|
|
089a45b978
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-05-21 17:19:18 +08:00 |
|
|
|
f01cf7bc98
|
fix:修改缓存线异常处理相关功能
|
2023-05-21 17:19:12 +08:00 |
|
zhangzhiqiang
|
6ab3264a4d
|
rev:修改缓存线同步接口
|
2023-05-21 17:18:28 +08:00 |
|
USER-20220102CG\noblelift
|
b5aca2b6a8
|
add 老车间驱动
|
2023-05-19 17:15:48 +08:00 |
|
|
|
2e691aaef9
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-05-19 14:56:34 +08:00 |
|
|
|
15c59182aa
|
fix:缓存线异常处理功能
|
2023-05-19 14:56:18 +08:00 |
|
USER-20220102CG\noblelift
|
9e60ebfbfa
|
add 老车间设备驱动
|
2023-05-18 21:25:04 +08:00 |
|
zhangzhiqiang
|
d07f8d3f41
|
Merge remote-tracking branch 'origin/master'
|
2023-05-18 19:14:45 +08:00 |
|
zhangzhiqiang
|
090cd3830e
|
rev：修改调度管理路径
|
2023-05-18 19:14:38 +08:00 |
|
USER-20220102CG\noblelift
|
e96c97aefd
|
fix 日志
|
2023-05-17 20:47:30 +08:00 |
|
zhangzhiqiang
|
5bce32c4e9
|
Merge remote-tracking branch 'origin/master'
|
2023-05-17 17:36:48 +08:00 |
|
zhangzhiqiang
|
90469ea6ae
|
add:修改工单相关
|
2023-05-17 17:36:40 +08:00 |
|
|
|
f6abc2cd3e
|
rev 请求标记复位
|
2023-05-17 17:27:57 +08:00 |
|
|
|
a72caf0a31
|
rev 修复删除设备报错 分页显示问题
|
2023-05-17 17:26:50 +08:00 |
|
zhangzhiqiang
|
30db992ada
|
add:工单及工单记录
|
2023-05-17 15:15:35 +08:00 |
|
|
|
a97b32d3a9
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-05-17 09:54:30 +08:00 |
|
|
|
8026de6ec2
|
fix:原材料入库
|
2023-05-17 09:54:26 +08:00 |
|
zhangzhiqiang
|
b5e24c4fa8
|
add:物料基础
|
2023-05-15 20:39:47 +08:00 |
|
zhangzhiqiang
|
cc9f55ace0
|
add:基础管理/物料分类
|
2023-05-15 19:47:30 +08:00 |
|
|
|
9aeff869a6
|
rev: 成品入库分配修改
|
2023-05-15 11:53:40 +08:00 |
|
zhangzhiqiang
|
535b1a6b8c
|
rev：仓储基础管理维护
|
2023-05-15 11:23:04 +08:00 |
|
zhangzhiqiang
|
382f8e5503
|
rev:冲突处理
|
2023-05-15 09:53:32 +08:00 |
|
|
|
0bb532221b
|
rev:冲突解决
|
2023-05-15 09:39:46 +08:00 |
|
|
|
0f6b643ed3
|
rev:冲突处理
|
2023-05-15 09:37:42 +08:00 |
|
|
|
bad9c80a5f
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-05-15 09:34:39 +08:00 |
|
|
|
eb1d33da9d
|
rev: 代码提交
|
2023-05-15 09:29:48 +08:00 |
|
|
|
a097053f14
|
解决冲突
|
2023-05-15 09:23:47 +08:00 |
|
|
|
577c8ee65d
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
# Conflicts:
# mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/controller/storage/StIvtBsrealstorattrController.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/controller/storage/StIvtStructattrController.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/IStIvtStructattrService.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/impl/StIvtStructattrServiceImpl.java
|
2023-05-15 09:23:08 +08:00 |
|
|
|
27454e664e
|
add:新增原材料入库功能
|
2023-05-15 09:11:58 +08:00 |
|
|
|
4b3cba9ff2
|
add:入库分配
|
2023-05-15 08:58:59 +08:00 |
|
zhangzhiqiang
|
474df3f5d8
|
add:添加仓库记录表服务/修改仓库基础数据服务
|
2023-05-15 00:27:04 +08:00 |
|
|
|
4895d08d02
|
Merge remote-tracking branch 'origin/master'
|
2023-05-12 11:12:15 +08:00 |
|
|
|
36fa3dfd95
|
fix:出入库枚举修改
|
2023-05-11 16:48:25 +08:00 |
|
|
|
0e6913243c
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-05-11 16:19:22 +08:00 |
|
|
|
db6ca6d0ac
|
fix:删除引用分配页面
|
2023-05-11 16:19:17 +08:00 |
|
zhangzhiqiang
|
4f2f6196c1
|
Merge remote-tracking branch 'origin/master'
|
2023-05-11 15:08:20 +08:00 |
|
zhangzhiqiang
|
68b19747b6
|
add:任务相关服务
|
2023-05-11 15:08:09 +08:00 |
|
|
|
0115eab818
|
rev: 入库组盘
|
2023-05-11 14:04:44 +08:00 |
|
zhangzhiqiang
|
eb7d4a2b40
|
add：半成品入库功能
|
2023-05-11 11:17:34 +08:00 |
|
|
|
c91a5f86e7
|
fix:原料入库主页面
|
2023-05-10 16:57:32 +08:00 |
|
zhangzhiqiang
|
a17c0eff45
|
add:半成品代码/仓库flow
|
2023-05-10 14:36:02 +08:00 |
|
|
|
38dfe6e96d
|
rev: xml路径修改
|
2023-05-10 11:10:29 +08:00 |
|
zhangzhiqiang
|
fbde7268ef
|
add:载具
|
2023-05-10 11:03:23 +08:00 |
|
