wws
|
52b3bc3a83
|
填写记录BUG
|
10 months ago |
|
wws
|
6dd294ab7f
|
Merge remote-tracking branch 'origin/master'
|
10 months ago |
zhaoxiaolin
|
cb8863b061
|
mes报工
|
10 months ago |
|
wws
|
41cd2fa5f8
|
查询BUG
|
10 months ago |
|
wws
|
3bd0d8a653
|
设备看板接口
|
10 months ago |
|
wws
|
126ff29e69
|
Merge remote-tracking branch 'origin/master'
|
10 months ago |
|
wws
|
90d9b80bf7
|
点击工单BUG
|
10 months ago |
 Yangwl
|
2a5cb29acd
|
烘房看板接口
# Conflicts:
# op-modules/op-mes/push-mes.bat
|
10 months ago |
|
Yangwl
|
3017b71215
|
烘房看板接口
|
10 months ago |
|
Yangwl
|
c0ee7ca097
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java
|
10 months ago |
|
Yangwl
|
598ec4a496
|
烘房看板接口
# Conflicts:
# op-modules/op-mes/push-mes.bat
|
10 months ago |
|
zhaoxiaolin
|
4939bad46f
|
mes报工
|
10 months ago |
|
zhaoxiaolin
|
d3c51aeff9
|
Merge remote-tracking branch 'origin/master'
|
10 months ago |
|
zhaoxiaolin
|
96223a90a0
|
mes报工
|
10 months ago |
|
wws
|
555235c504
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml
# op-modules/op-device/src/main/resources/mapper/device/EquOrderStandardMapper.xml
|
10 months ago |
|
wws
|
2201ea4bce
|
1
|
10 months ago |
|
wws
|
32c08aaec5
|
1
|
10 months ago |
|
zhaoxiaolin
|
ba999d484c
|
成品计划修改
|
10 months ago |
|
zhaoxiaolin
|
6974fa79fa
|
质量点检定时任务
|
10 months ago |
|
Yangwl
|
6fb697e5ca
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapRFW.java
# op-auth/src/main/resources/bootstrap.yml
# op-gateway/src/main/resources/bootstrap.yml
# op-modules/op-mes/push-mes.bat
# op-modules/op-mes/src/main/resources/bootstrap.yml
# op-modules/op-sap/src/main/resources/bootstrap.yml
# op-modules/op-system/src/main/resources/bootstrap.yml
|
10 months ago |
|
Yangwl
|
bb0ac02cc8
|
烘房看板接口
|
10 months ago |
|
Yangwl
|
cec59e4bc4
|
烘房看板接口
|
10 months ago |
|
wws
|
5bf8279617
|
计划新增-parentCode存放上级id
|
10 months ago |
|
wws
|
5ff08114f2
|
计划新增-parentCode存放上级id（修改查询未完善）
|
10 months ago |
|
wws
|
6e236cb58d
|
删除标准code、备件code字段、工单查询逻辑变更
|
10 months ago |
|
wws
|
bf0ea1b707
|
Merge remote-tracking branch 'origin/master'
|
10 months ago |
|
wws
|
8874da06bc
|
备件信息-库存
|
10 months ago |
|
zhaoxiaolin
|
4f2b0c6e01
|
成品bug修改
|
10 months ago |
|
zhaoxiaolin
|
3262f842a3
|
成品bug修改
|
10 months ago |
|
wws
|
0e6a6286f6
|
点检巡检保养手持优化
|
11 months ago |
|
wws
|
de89a76846
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
wws
|
8637740293
|
点检逻辑前后端优化
|
11 months ago |
|
zhaoxiaolin
|
184a5541ce
|
test
|
11 months ago |
|
wws
|
28e2f90ce5
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
wws
|
20efabdfd1
|
点检-巡检-保养-检查项优化
|
11 months ago |
|
zhaoxiaolin
|
8ce8e22a47
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
zhaoxiaolin
|
15581ac8a3
|
新增接口服务，去掉scada服务
|
11 months ago |
A0010407
|
a3199b61c1
|
手持报修维修 后端接口
|
11 months ago |
|
zhaoxiaolin
|
2aa1ad4f2e
|
bat换jdk
|
11 months ago |
|
zhaoxiaolin
|
59a3fcd4ed
|
换jdk
|
11 months ago |
|
zhaoxiaolin
|
9b58911bfa
|
scada服务数据源
|
11 months ago |
|
zhaoxiaolin
|
77742e3c2f
|
scada服务数据源
|
11 months ago |
|
zhaoxiaolin
|
c7c00e0d72
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
zhaoxiaolin
|
d04c1068f8
|
检验报告
|
11 months ago |
|
wws
|
eef550d5ae
|
实体类同步
|
11 months ago |
|
zhaoxiaolin
|
74bb98faa3
|
检验报告
|
11 months ago |
|
wws
|
baa2e209a3
|
PDA手持填写巡检记录优化
|
11 months ago |
|
wws
|
6dafbca7d1
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
wws
|
88ee80c6ca
|
点检工单优化
|
11 months ago |
|
A0010407
|
f969619323
|
报修+维修+设备班组+委外+PDA
|
11 months ago |
|
wws
|
ec9a071b8f
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
wws
|
86effcdbfb
|
报表优化
|
11 months ago |
|
zhaoxiaolin
|
749c2cf67d
|
mes上位机接口迁移scada
|
11 months ago |
|
wws
|
5bb40f28e5
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
wws
|
92615d8e28
|
报表优化
|
11 months ago |
|
zhaoxiaolin
|
15157dd26e
|
测试版本注册中心修改
|
11 months ago |
|
wws
|
362a8ac15a
|
报表-保养记录init
|
11 months ago |
|
wws
|
1417a47d95
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
wws
|
c466027d74
|
报表-巡检记录
|
11 months ago |
|
zhaoxiaolin
|
4bd0df94ff
|
发版命令
|
11 months ago |
|
zhaoxiaolin
|
c7bfb41867
|
管理系统报工
|
11 months ago |
|
wws
|
7f67bc9b15
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
wws
|
996c45f972
|
保养工单-检验+填写记录
|
11 months ago |
|
zhaoxiaolin
|
9f051a1277
|
管理系统报工1.0
|
11 months ago |
|
Yangwl
|
fec239c59c
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# ABAP_AS_WITH_POOL.jcoDestination
# op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java
# op-modules/op-mes/src/main/java/com/op/mes/service/IWCSInterfaceService.java
# op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java
|
11 months ago |
|
Yangwl
|
4b36de1131
|
烘房看板接口
|
11 months ago |
|
wws
|
9e14409743
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
wws
|
2c3f1996b9
|
保养工单-快速工单
|
11 months ago |
|
zhaoxiaolin
|
42b0c4622d
|
计划bug+报工上位机接口提供
|
11 months ago |
shaoyong
|
716dfd6db5
|
检验报告，来料报告
|
11 months ago |
陈恒杰
|
83548f708f
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
陈恒杰
|
dbd3b16007
|
rfid流程修改
|
11 months ago |
|
A0010407
|
1d5b107814
|
报修+维修+设备班组+委外
|
11 months ago |
|
zhaoxiaolin
|
cca83e6511
|
bug
|
11 months ago |
|
zhaoxiaolin
|
1d3eb31a88
|
质量系统，不合格处理功能
|
11 months ago |
|
wws
|
450ccdf163
|
计划成品拆分BUG修复
|
11 months ago |
|
wws
|
65e738dd3a
|
计划成品拆分BUG修复
|
11 months ago |
|
zhaoxiaolin
|
28145447cb
|
sap联调
|
11 months ago |
|
Yangwl
|
d59ebb0895
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# ABAP_AS_WITH_POOL.jcoDestination
# op-modules/op-sap/pom.xml
|
11 months ago |
|
Yangwl
|
afa7c430fe
|
SAP配置
|
11 months ago |
|
Yangwl
|
d59af9f9f6
|
增加SAP接口
|
11 months ago |
|
A0010407
|
9bb46f6a5e
|
报修+维修+设备班组
|
11 months ago |
|
zhaoxiaolin
|
551e194707
|
sap联调
|
11 months ago |
|
zhaoxiaolin
|
9c89b70be0
|
质量任务表调整
|
11 months ago |
|
zhaoxiaolin
|
618157586d
|
质量任务表调整
|
11 months ago |
|
wws
|
5803ae6782
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
wws
|
a916fe242b
|
点检工单、保养工单init
|
11 months ago |
|
zhaoxiaolin
|
ef0f839892
|
不合格处理
|
11 months ago |
|
wws
|
3491e38ec1
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
wws
|
fe0727c0d1
|
点检计划
|
11 months ago |
|
zhaoxiaolin
|
8e8ac0e125
|
备份定时任务
|
11 months ago |
|
zhaoxiaolin
|
05546bb4dd
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
zhaoxiaolin
|
e32ee7119b
|
bug修改
|
11 months ago |
|
wws
|
337eb97c68
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
wws
|
86a39d613c
|
保养计划-修改
|
11 months ago |
|
zhaoxiaolin
|
4278e4cb73
|
bug修改
|
11 months ago |
|
zhaoxiaolin
|
42b9c09918
|
bug修改
|
11 months ago |
|
A0010407
|
39b392d037
|
报修+维修+委外
|
11 months ago |
|
wws
|
c7e42f4045
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
wws
|
8152b17171
|
保养计划-新增
|
11 months ago |
|
shaoyong
|
ee48170cc8
|
人员物料绑定查询修改
|
11 months ago |
|
zhaoxiaolin
|
ac16a5d785
|
入库过程检验
|
11 months ago |
|
zhaoxiaolin
|
7c6d5a1b4f
|
生产过程检验v4
|
11 months ago |
|
zhaoxiaolin
|
94010d9146
|
生产过程检验v3
|
11 months ago |
|
shaoyong
|
e25f223632
|
人员物料绑定修复
|
11 months ago |
|
wws
|
35b354562b
|
保养计划
|
11 months ago |
|
wws
|
c0daf9a89a
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
wws
|
45c3b2b7c9
|
手持接口-巡检工单-提交接口
|
11 months ago |
|
zhaoxiaolin
|
9d55da3a0b
|
生产过程检验+手持发版记录
|
11 months ago |
|
shaoyong
|
7329c54eab
|
物料检验项目维护修复
|
11 months ago |
|
wws
|
f60d6559f9
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
wws
|
fab6f3aa28
|
手持接口-巡检工单
|
11 months ago |
|
shaoyong
|
3c40a7df23
|
物料检验项目维护
|
11 months ago |
|
zhaoxiaolin
|
c1fac1f909
|
原料检验任务1.0
|
11 months ago |
|
wws
|
b865658cb2
|
巡检工单填写记录
|
11 months ago |
|
wws
|
fc69128a8c
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
wws
|
dcbde38d27
|
巡检工单填写记录V1
|
11 months ago |
|
A0010407
|
870fde44b5
|
报修
|
11 months ago |
|
A0010407
|
d5ae6cea2c
|
报修+委外工单
|
11 months ago |
|
wws
|
aedd7d6052
|
保养计划初始化、巡检工单初始化
|
11 months ago |
|
zhaoxiaolin
|
d80fe972b3
|
原料检验任务
|
11 months ago |
|
shaoyong
|
c67c7a464d
|
修改物料检验项目实体
|
11 months ago |
|
wws
|
8c3829be4d
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
wws
|
a6d04164ec
|
1
|
11 months ago |
|
zhaoxiaolin
|
db3192e9a1
|
增加排序字段
|
11 months ago |
|
wws
|
9c65126191
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
wws
|
4cac17b9bb
|
巡检计划优化
|
11 months ago |
|
A0010407
|
dd8a332ae6
|
报修+维修工单
|
11 months ago |
|
wws
|
08879199ae
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
wws
|
6f33aec08c
|
检查项删除检验逻辑
|
11 months ago |
|
shaoyong
|
eec6231915
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
zhaoxiaolin
|
6551e07899
|
质量系统-检验任务管理2
|
11 months ago |
|
shaoyong
|
40b350ac8b
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
zhaoxiaolin
|
34aad9a2bf
|
质量系统-检验任务管理1
|
11 months ago |
|
wws
|
ac2f99c2c7
|
巡检计划修改+删除
|
11 months ago |
|
wws
|
411e562832
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
wws
|
6bde4f4df9
|
巡检计划修改初始化
|
11 months ago |
ShiChangzhou
|
78c069cae9
|
解决sap打包发版问题
|
11 months ago |
|
wws
|
435e7adcd4
|
巡检计划新增接口初始化
|
11 months ago |
|
shaoyong
|
b47919426d
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
shaoyong
|
579a482c85
|
物料检验项目维护
|
11 months ago |
|
wws
|
38270b9b0a
|
巡检计划
|
11 months ago |
|
wws
|
ac78b175ca
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java
# op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java
|
11 months ago |
|
wws
|
33a6a48497
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
wws
|
e56dc7446b
|
巡检计划
|
11 months ago |
|
A0010407
|
a10b915de3
|
改名字+报修
|
11 months ago |
|
A0010407
|
c78f1542ed
|
备品备件领用
|
11 months ago |
|
A0010407
|
23659427c6
|
备品备件领用
|
11 months ago |
|
zhaoxiaolin
|
6ccba2ca54
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
zhaoxiaolin
|
73d26c1f8b
|
sap基础数据同步，更新时段修改
|
11 months ago |