zhaoxiaolin
|
c1b6bfd2bb
|
Merge remote-tracking branch 'origin/master'
|
10 months ago |
|
zhaoxiaolin
|
dbeba66388
|
sap接口调整
|
10 months ago |
yinq
|
412b6445e4
|
update - 初始化能源模块
|
10 months ago |
A0010407
|
71c9cb591d
|
基础信息设备+设备优化
|
10 months ago |
wws
|
685bdc34bf
|
委外保养定时任务-统一申领单号
|
10 months ago |
|
wws
|
b4a2f41311
|
Merge remote-tracking branch 'origin/master'
|
10 months ago |
|
wws
|
8659dd8f11
|
委外保养定时任务逻辑修改
|
10 months ago |
 Yangwl
|
da12afa045
|
修改和SAP连接的方式，使用工厂类，避免重复连接SAP系统。
|
10 months ago |
|
Yangwl
|
e1e5b8f1fc
|
Merge remote-tracking branch 'origin/master'
|
10 months ago |
|
Yangwl
|
3d1e9452b6
|
修改创建SAP创建订单后返回的数据结构，增加子订单信息。
|
10 months ago |
|
zhaoxiaolin
|
1cedbf3c9e
|
sap接口调整
|
10 months ago |
|
A0010407
|
170a3926a8
|
文件
|
10 months ago |
|
wws
|
d26ccbde47
|
定时任务开启工厂源
|
10 months ago |
|
wws
|
41079dee1e
|
申领单删除BUG解决
|
10 months ago |
|
wws
|
31d87a16e4
|
Merge remote-tracking branch 'origin/master'
|
10 months ago |
|
wws
|
c0fd87d2d1
|
申领单删除逻辑、保养单备件删除BUG解决
|
10 months ago |
|
zhaoxiaolin
|
93f60c6f6c
|
工单设备修改
|
10 months ago |
|
zhaoxiaolin
|
f221f0ec05
|
质量分析图表
|
10 months ago |
|
A0010407
|
a72bdf8068
|
设备
|
10 months ago |
|
wws
|
33c31ae564
|
点检、巡检、保养逻辑删除、生成编码重复BUG
|
10 months ago |
|
wws
|
4bb2020255
|
检查项显示优化
|
10 months ago |
|
wws
|
0fa435b51c
|
保养不添加到报修
|
10 months ago |
|
wws
|
54a704ba27
|
Merge remote-tracking branch 'origin/master'
|
10 months ago |
|
wws
|
4ea11df041
|
保养图片上传BUG解决
|
10 months ago |
|
zhaoxiaolin
|
06108ad230
|
Merge remote-tracking branch 'origin/master'
|
10 months ago |
|
zhaoxiaolin
|
0fe2254568
|
mes升级
|
10 months ago |
|
wws
|
b8e783e6a7
|
Merge remote-tracking branch 'origin/master'
|
10 months ago |
|
wws
|
3abec72895
|
点检、巡检、保养图片上传和显示
|
10 months ago |
|
A0010407
|
58bb60bb3e
|
设备
|
10 months ago |
|
zhaoxiaolin
|
9c9da57bcf
|
质量统计
|
10 months ago |
|
zhaoxiaolin
|
60270136f7
|
质量统计
|
10 months ago |
|
A0010407
|
4c02aa5b2e
|
维修-3
|
10 months ago |
|
wws
|
fe57d99362
|
保养工单备件逻辑变更
|
10 months ago |
|
wws
|
50d9d7c19e
|
Merge remote-tracking branch 'origin/master'
|
10 months ago |
|
wws
|
3dfe3f2b6c
|
保养工单备件逻辑变更
|
10 months ago |
|
wws
|
ba8dc2e8b4
|
保养工单备件逻辑变更
|
10 months ago |
|
A0010407
|
0ed4556317
|
报修-2
|
10 months ago |
|
A0010407
|
3607c4e490
|
设备-维修-1
|
10 months ago |
|
zhaoxiaolin
|
4a6323cd46
|
质量统计
|
10 months ago |
陈恒杰
|
bddcdd4181
|
rfid流程修改
|
10 months ago |
|
A0010407
|
76ef1fd102
|
设备模块-报修-1
|
10 months ago |
|
zhaoxiaolin
|
d551bac244
|
Merge remote-tracking branch 'origin/master'
|
10 months ago |
|
zhaoxiaolin
|
160d6f7280
|
成品工单下派，暂时去掉sap逻辑
|
10 months ago |
|
wws
|
e0a5330e98
|
Merge remote-tracking branch 'origin/master'
|
10 months ago |
|
wws
|
a47b8ead75
|
保养用时+PDA开始保养接口
|
10 months ago |
|
zhaoxiaolin
|
2b16e9e96d
|
质量报表功能
|
10 months ago |
|
wws
|
d210876154
|
1
|
10 months ago |
|
wws
|
454367aae5
|
Merge remote-tracking branch 'origin/master'
|
10 months ago |
|
wws
|
74dfb91633
|
点检、巡检、保养页面优化
|
10 months ago |
|
A0010407
|
5c2b404e76
|
设备
|
10 months ago |
|
wws
|
688fe5c39e
|
Merge remote-tracking branch 'origin/master'
|
10 months ago |
|
wws
|
1597701d9a
|
填写记录BUG、PDA查询逻辑
|
10 months ago |
|
zhaoxiaolin
|
3e642c17a0
|
委外保养工单生成
|
10 months ago |
|
zhaoxiaolin
|
8dfc341463
|
下机台获取-unlock
|
10 months ago |
|
wws
|
6f8a167d96
|
Merge remote-tracking branch 'origin/master'
|
10 months ago |
|
wws
|
2f9c7c1c03
|
保养委外
|
10 months ago |
|
zhaoxiaolin
|
20abf4cde4
|
报工+成品计划升级
|
10 months ago |
|
wws
|
d53c96be6b
|
Merge remote-tracking branch 'origin/master'
|
10 months ago |
|
wws
|
560d3dff2f
|
设备-工单逻辑变更
|
10 months ago |
|
zhaoxiaolin
|
bda1cbdb55
|
保养定时任务
|
10 months ago |
|
wws
|
76bdb1fbb3
|
点检、巡检查询优化
|
10 months ago |
|
wws
|
8847b8e57c
|
Merge remote-tracking branch 'origin/master'
|
10 months ago |
|
wws
|
c3f27a0b37
|
点检、巡检、保养逻辑优化
|
10 months ago |
|
zhaoxiaolin
|
24fe8b0b83
|
保养定时任务
|
10 months ago |
|
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 |