wws
|
c83450bfa9
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
76f8261176
|
检查项录入不可新增BUG解决
|
1 year ago |
A0010407
|
1225206e73
|
备件申领单加单价总价
|
1 year ago |
zhaoxiaolin
|
52f2be01fd
|
巡检触发逻辑变更
|
1 year ago |
|
wws
|
f9cb4a5c1d
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
fd54baf7a8
|
检查项录入不可修改BUG解决
|
1 year ago |
shaoyong
|
096e30657d
|
首检报告
|
1 year ago |
|
zhaoxiaolin
|
3a9aa84d56
|
巡检不良分析图表
|
1 year ago |
|
zhaoxiaolin
|
827657c43d
|
巡检不良分析图表
|
1 year ago |
|
A0010407
|
a68a3ac1a8
|
设备 维修---->设备完好率（一天内多次）
|
1 year ago |
|
A0010407
|
d307cd97f4
|
维保记录
|
1 year ago |
|
zhaoxiaolin
|
5e3c032647
|
oa流程有问题
|
1 year ago |
 Yangwl
|
ed23db844a
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Yangwl
|
61c37758f8
|
计件薪酬、包装线看板接口
|
1 year ago |
|
BrickHome
|
6ae48c69ae
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
BrickHome
|
f4d8b7460e
|
保养费用BUG解决
|
1 year ago |
|
zhaoxiaolin
|
c808859ea6
|
巡检检验加批次
|
1 year ago |
|
zhaoxiaolin
|
0f490cf817
|
物料检测项加检测项关联
|
1 year ago |
mengjiao
|
17f68e3306
|
wms修改16.1
|
1 year ago |
|
zhaoxiaolin
|
94dccff050
|
质量改动
|
1 year ago |
|
zhaoxiaolin
|
4dc1a16dab
|
质量改动
|
1 year ago |
|
mengjiao
|
8d1b4db68c
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
e538e7a425
|
wms修改16
|
1 year ago |
|
wws
|
85ce59cd8a
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
f92177941b
|
PDA获取记录
|
1 year ago |
|
mengjiao
|
d1e62a3d70
|
wms修改15
|
1 year ago |
|
wws
|
4b63b2d7a2
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
9bc2c103ea
|
保养记录填写BUG解决
|
1 year ago |
|
shaoyong
|
1ddd59dfd0
|
检验方案维护
|
1 year ago |
|
mengjiao
|
c00be3fee0
|
wms修改14
|
1 year ago |
|
mengjiao
|
44a23eaa78
|
wms修改13
|
1 year ago |
|
mengjiao
|
8272aabbe6
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
be29364888
|
wms修改12
|
1 year ago |
|
zhaoxiaolin
|
22c08bcadb
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
c3907c14c6
|
白坯图表
|
1 year ago |
|
mengjiao
|
2fff9ae453
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
aea787217a
|
wms修改11
|
1 year ago |
|
A0010407
|
c1fd8c9c18
|
用户 微信名+bug
|
1 year ago |
|
Yangwl
|
8bc7cd17ce
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Yangwl
|
69a2f60160
|
101类型订单收货
|
1 year ago |
陈恒杰
|
1211472ae4
|
手动创建白坯入库单1
|
1 year ago |
|
陈恒杰
|
877dc435aa
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
陈恒杰
|
db09747042
|
成品入库
|
1 year ago |
|
mengjiao
|
166d5d6c01
|
wms修改10
|
1 year ago |
|
陈恒杰
|
3bd96dea12
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
陈恒杰
|
81bec3822e
|
白坯权限
|
1 year ago |
|
zhaoxiaolin
|
d6d6d33110
|
检验手持接口修改
|
1 year ago |
|
zhaoxiaolin
|
9971a509bc
|
检验手持接口修改
|
1 year ago |
|
Yangwl
|
cdd852bf07
|
字段注释
|
1 year ago |
|
Yangwl
|
308492d614
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# op-common/op-common-core/src/main/java/com/op/common/core/constant/ServiceNameConstants.java
|
1 year ago |
|
zhaoxiaolin
|
02fb55dc6e
|
新增白坯工单管理
|
1 year ago |
|
Yangwl
|
0ec681686e
|
OA提交字段注释
|
1 year ago |
|
Yangwl
|
cf0d987365
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Yangwl
|
d2e644b74b
|
OA ZL0010-来料检验不合格控制流程代码
|
1 year ago |
|
zhaoxiaolin
|
6624eb2992
|
入库检验工单修改来源表
|
1 year ago |
|
陈恒杰
|
9d37d5eb05
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
陈恒杰
|
1d23f85a3c
|
手动创建白坯入库单修改
|
1 year ago |
|
zhaoxiaolin
|
949a7f8f33
|
入库检验工单修改来源表
|
1 year ago |
|
zhaoxiaolin
|
e6554a9e41
|
订单管理bug修改
|
1 year ago |
|
陈恒杰
|
a0afd6a4fa
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
陈恒杰
|
a953d4eb29
|
手动创建白坯入库单
|
1 year ago |
|
wws
|
e6b7588488
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
5f0a78bbe9
|
白坯合格统计
|
1 year ago |
|
陈恒杰
|
b032991675
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
陈恒杰
|
62084d080b
|
手动创建白坯入库单
|
1 year ago |
|
zhaoxiaolin
|
0b302ed86e
|
入库检验任务接口+巡检任务调整
|
1 year ago |
|
zhaoxiaolin
|
86e6b205a0
|
入库检验任务接口
|
1 year ago |
|
zhaoxiaolin
|
a4ad441dad
|
质量过程巡检+来料检验任务接口+报工sql调整
|
1 year ago |
|
陈恒杰
|
7118604055
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
5efb7d4582
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
3bd7eeb1ed
|
维修/保养-备件单价逻辑
|
1 year ago |
|
陈恒杰
|
796126ccd0
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
30fac0e8dd
|
质量过程巡检+来料检验任务接口+报工sql调整
|
1 year ago |
|
shaoyong
|
4e65a7d092
|
检验人员多选
|
1 year ago |
|
陈恒杰
|
d189457891
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
63cc8e2053
|
质量过程巡检+来料检验任务接口
|
1 year ago |
|
mengjiao
|
826576045e
|
wms修改9.4
|
1 year ago |
|
陈恒杰
|
8e96bc5717
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
316e221ffa
|
wms修改9.3
|
1 year ago |
|
mengjiao
|
74032decd5
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# op-modules/op-sap/src/main/java/com/op/sap/service/SapOrderService.java
# op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java
|
1 year ago |
|
mengjiao
|
4dced6b421
|
wms修改9.2
|
1 year ago |
|
wws
|
c0614e3cf8
|
看板接口便变更
|
1 year ago |
|
wws
|
4edeb71b91
|
设备完好率
|
1 year ago |
|
陈恒杰
|
d903ee4b66
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
1971818ea3
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
f5060ed72c
|
设备运行记录年备份定时任务
|
1 year ago |
|
zhaoxiaolin
|
f1f895ee20
|
质量质检+工单管理界面加入母单信息+首页图表
|
1 year ago |
|
陈恒杰
|
eebf7a2cf5
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
245301f4f8
|
质量质检qc_status添加批次
|
1 year ago |
|
zhaoxiaolin
|
e9528b28da
|
质量质检qc_status添加批次
|
1 year ago |
|
zhaoxiaolin
|
04681b3623
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
0ccb32d068
|
质量质检qc_status添加
|
1 year ago |
|
陈恒杰
|
db81932f2c
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
4dd5c4895f
|
报错修改
|
1 year ago |
|
zhaoxiaolin
|
3671723f7e
|
质量看板接口修改3
|
1 year ago |
|
A0010407
|
b27e18f403
|
基础信息 设备加字段 + 设备看板完好设备比问题
|
1 year ago |
|
Yangwl
|
a69e7c1ebc
|
SAP采购订单获取接口
|
1 year ago |
|
Yangwl
|
5b44945246
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Yangwl
|
5abd625d55
|
SAP采购订单收货过账
|
1 year ago |
|
mengjiao
|
ab03545514
|
wms修改9.1
|
1 year ago |
|
mengjiao
|
8bb9f93c01
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
ccf06f8c94
|
wms修改9
|
1 year ago |
|
zhaoxiaolin
|
53f12a9f2d
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
8a325fc57b
|
质量看板接口修改2
|
1 year ago |
|
A0010407
|
821d4f9a58
|
设备手持三个接口
|
1 year ago |
|
mengjiao
|
274ae3fb93
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
27f8051c7c
|
wms修改8
|
1 year ago |
|
陈恒杰
|
a39ca17d90
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
59319007b1
|
首页-各组线每月设备故障数、设备完好率修改BUG解决
|
1 year ago |
|
wws
|
ec3f01dd84
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# op-modules/op-device/src/main/java/com/op/device/controller/DeviceInterfaceController.java
# op-modules/op-device/src/main/java/com/op/device/mapper/DeviceInterfaceMapper.java
# op-modules/op-device/src/main/java/com/op/device/service/IDeviceInterfaceService.java
# op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java
# op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml
# op-modules/op-quality/src/main/java/com/op/quality/domain/QcInterface.java
|
1 year ago |
|
wws
|
516a9b8053
|
首页-各组线每月设备故障数、设备完好率修改BUG解决
|
1 year ago |
|
陈恒杰
|
be462da39c
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# dev_jco_rfc.trc
|
1 year ago |
|
陈恒杰
|
3c67bcc5fa
|
打印领料单修改
|
1 year ago |
|
zhaoxiaolin
|
bb18fbce4a
|
质量看板接口修改
|
1 year ago |
|
A0010407
|
ac35ed2bad
|
设备-三个手持接口 维修增加维修措施（也就是处理方式）
|
1 year ago |
|
A0010407
|
bf04c7bdcf
|
设备看板 完好率调整 - 每日看板
|
1 year ago |
|
A0010407
|
1d55861aa9
|
故障信息四个页面
|
1 year ago |
|
zhaoxiaolin
|
5f03c120b6
|
质量看板接口
|
1 year ago |
|
zhaoxiaolin
|
a4c58a143c
|
质量看板接口
|
1 year ago |
|
wws
|
551b3e8b7e
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
34eb8e75cf
|
完好率统计报表、设备运行记录定时任务
|
1 year ago |
|
Yangwl
|
2107a05e82
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Yangwl
|
801bf00af5
|
SAP的储位仓库信息接口
|
1 year ago |
|
mengjiao
|
daee90e884
|
wms修改7
|
1 year ago |
|
Yangwl
|
b3d73b8b4d
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Yangwl
|
ff2bf78d5d
|
订单物料领料过账、反冲物料领料过账微服务接口
|
1 year ago |
|
mengjiao
|
6b8420f87c
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
8f3bd218a2
|
wms修改６
|
1 year ago |
|
A0010407
|
e3c8a23b7b
|
备件申领 逻辑修改
|
1 year ago |
|
zhaoxiaolin
|
afe322e8c9
|
领料单+质量看板接口
|
1 year ago |
|
A0010407
|
cfeda7559d
|
基础信息管理 设备组线调整
|
1 year ago |
|
Yangwl
|
620b22e110
|
Merge remote-tracking branch 'origin/master' into highway
|
1 year ago |
|
Yangwl
|
3986980876
|
分支提交
|
1 year ago |
|
陈恒杰
|
0684692469
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
陈恒杰
|
aa2ca2b13c
|
打印领料单修改
|
1 year ago |
|
wws
|
9ef78fd8ab
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
e855f5ad3c
|
完好率init、设备选择逻辑新增组线
|
1 year ago |
|
A0010407
|
0b0ad3d1ab
|
基础信息管理 设备组线调整
|
1 year ago |
|
Yangwl
|
b68d6ccc86
|
采购订单实体类
|
1 year ago |
|
Yangwl
|
31747dcf41
|
SAP领料过账和订单接收
|
1 year ago |
|
zhaoxiaolin
|
ed67be03ca
|
子单报工成功后再报母单
|
1 year ago |
|
zhaoxiaolin
|
d90f72417e
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
628b391937
|
工单删除逻辑添加
|
1 year ago |
|
A0010407
|
4368b922d9
|
新增字段 基础信息设备：设备类别 设备维修：设备状态描述
|
1 year ago |
|
wws
|
b9a9d5c6f0
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
2d523c06a0
|
字段显示调整
|
1 year ago |
|
zhaoxiaolin
|
583956201f
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
4362014544
|
只有活动中的工单才能进行报工
|
1 year ago |
|
A0010407
|
3491c4a326
|
设备备品备件台账 优化 1.加入展示列，隐藏展示列 主表关联附属表
|
1 year ago |
|
zhaoxiaolin
|
ad6f335ffc
|
只有活动中的工单才能进行报工
|
1 year ago |
|
zhaoxiaolin
|
e51eba0465
|
报工成功后，不需要关闭工单
|
1 year ago |
|
zhaoxiaolin
|
91790d8b7b
|
报工成功后，再关闭订单
|
1 year ago |
|
zhaoxiaolin
|
e1be6cb0a6
|
报工公式确认
|
1 year ago |
|
A0010407
|
449967fc12
|
维修检查项一次提交多个照片
|
1 year ago |
|
zhaoxiaolin
|
47318ca385
|
质量调整
|
1 year ago |
|
A0010407
|
8452e5b19e
|
设备综合报表
|
1 year ago |
|
mengjiao
|
4c7b2aae74
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
410c6cca84
|
wms修改５
|
1 year ago |
|
wws
|
a05ff34856
|
设置检查时间
|
1 year ago |
|
wws
|
7fddc72849
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
99a7d37ed6
|
快速保养工单检查项获取不到BUG解决
|
1 year ago |
|
zhaoxiaolin
|
e6c56963a1
|
确认修改接口，我那我就改了：之前有工单维度，现在要求去掉工单
|
1 year ago |
|
wws
|
7a5425e0ec
|
用户userName替换userId
|
1 year ago |
|
wws
|
ce50262fe2
|
用户userName替换userId
|
1 year ago |
|
wws
|
13bd0c69f5
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
63c10e35bf
|
用户userName替换userId
|
1 year ago |
|
A0010407
|
93b6f7a6eb
|
设备绑定辅助设备
|
1 year ago |
|
wws
|
1ee85f0700
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
14937d6441
|
上位机设备报修接口
|
1 year ago |
|
mengjiao
|
aace8fb9e5
|
wms修改４
|
1 year ago |
|
mengjiao
|
f73b799a2a
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
ef7e6d4f6b
|
wms修改３
|
1 year ago |
|
zhaoxiaolin
|
36b28836d4
|
质量bug
|
1 year ago |
|
zhaoxiaolin
|
7caebe1ddf
|
报工方案调整：母单报工的时候，也按照子单的数量进行填报。
|
1 year ago |
|
wws
|
5ce0823a49
|
计划删除关联备件表单删除失败BUG解决
|
1 year ago |
|
wws
|
30599c33b6
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
16b1b0ad4a
|
故障修改提交BUG解决，代码逻辑优化+注解
|
1 year ago |
|
zhaoxiaolin
|
602d09a82d
|
生产过程检验修改测试
|
1 year ago |
|
zhaoxiaolin
|
376e54ee5e
|
生产过程检验修改测试
|
1 year ago |
|
wws
|
6eb31bb922
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
d398de356c
|
优化逻辑
|
1 year ago |
|
mengjiao
|
2a883c2204
|
wms修改2
|
1 year ago |
|
mengjiao
|
c8618c6697
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
02c4641b43
|
wms修改1
|
1 year ago |
|
zhaoxiaolin
|
0484626152
|
来料检验修改测试
|
1 year ago |
|
A0010407
|
65e7fdb995
|
维修 故障类型 故障树
|
1 year ago |
|
mengjiao
|
b00e31ec4d
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
345910f457
|
保养工单状态变更、计划查询顺序
|
1 year ago |
|
mengjiao
|
e19f5d54dc
|
wms修改
|
1 year ago |
|
wws
|
994b2e3af2
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
adecc8bee1
|
看板数据格式
|
1 year ago |
|
A0010407
|
53b090b2db
|
完好设备占比 去掉百分号
|
1 year ago |
|
wws
|
532bcd3f0a
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
9d8c6624b1
|
快速保养工单PDA获取不到BUG解决
|
1 year ago |
|
zhaoxiaolin
|
b1712dd5fc
|
报工修改
|
1 year ago |
|
wws
|
40329838c5
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
515aff7f48
|
保养用时、计划名称
|
1 year ago |
|
A0010407
|
0b6ee453ba
|
委外工单完成 相应的设备状态改变
|
1 year ago |
|
wws
|
91ecd91be9
|
保养更改设备状态BUG解决
|
1 year ago |
|
wws
|
c2caf2ed6e
|
设备运行记录逻辑变更
|
1 year ago |
|
wws
|
e2a7281396
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
9b8cb7dc45
|
工单显示字段增加计划名称
|
1 year ago |
|
zhaoxiaolin
|
550203d265
|
拆单-工单下发加事务
|
1 year ago |
|
A0010407
|
2f48dfba53
|
报修+维修+设备班组+委外
|
1 year ago |
|
wws
|
ddfa465800
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
df96944476
|
PDA保养设置设备保养运行记录
|
1 year ago |
|
zhaoxiaolin
|
b4f86d97a0
|
质量-检测项目检验修改
|
1 year ago |
|
wws
|
aa95f14f67
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
5c0b7d3cbe
|
保养开始/结束修改设备状态
|
1 year ago |
|
A0010407
|
6c81f5e1d1
|
设备管理 审核时判断设备是不是真的故障 需要维修
|
1 year ago |
|
A0010407
|
3575e34f3e
|
设备管理-维修PC填写信息、手持填写维修信息 修改设备状态
|
1 year ago |
|
wws
|
b4e91edf74
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
68fe1b45e5
|
PDA设备名称显示BUG+保养图片上传BUG解决
|
1 year ago |
|
wws
|
739bc7237c
|
PDA设备名称显示BUG+保养图片上传BUG解决
|
1 year ago |
|
zhaoxiaolin
|
6712c71f99
|
质量-检测项增加两个属性
|
1 year ago |
|
zhaoxiaolin
|
8856c74e4d
|
质量bug修复
|
1 year ago |
|
wws
|
9034a8188c
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java
|
1 year ago |
|
zhaoxiaolin
|
7d44bda34a
|
sap报工-状态
|
1 year ago |
|
zhaoxiaolin
|
56fc72ff0d
|
sap报工
|
1 year ago |
|
zhaoxiaolin
|
85f629ce61
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
f0cc46c0b1
|
999工厂巡检任务打开
|
1 year ago |
|
Yangwl
|
8abc2cba6a
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
6048b4cb4a
|
999库巡检工单生成BUG解决
|
1 year ago |
|
Yangwl
|
b20b6e63d9
|
增加SAP模块日志
|
1 year ago |
|
wws
|
84bbed960a
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
6965200126
|
工单生成BUG解决
|
1 year ago |
|
mengjiao
|
352fba7ee2
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
aec89ada0c
|
wms
|
1 year ago |
|
zhaoxiaolin
|
304370cde2
|
sap接口调整3
|
1 year ago |
|
Yangwl
|
e24b2f8a6d
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Yangwl
|
e230ba1bd3
|
SAP报工相关
|
1 year ago |
|
zhaoxiaolin
|
d248021e95
|
sap接口调整3
|
1 year ago |
|
zhaoxiaolin
|
aecbb658f2
|
sap接口调整2
|
1 year ago |
|
zhaoxiaolin
|
1f31239adb
|
sap接口调整
|
1 year ago |
|
wws
|
e8f155136d
|
点击按巡检计划逻辑变更
|
1 year ago |
|
wws
|
428e203946
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
680ea6bbd6
|
点击按巡检计划逻辑变更
|
1 year ago |
|
A0010407
|
3fc5733187
|
设备看板刷新时间
|
1 year ago |
|
zhaoxiaolin
|
80d762197c
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
f13ee5d888
|
sap调整+质量手持接口+首页柱图数据bug修复
|
1 year ago |
|
Yangwl
|
fc43732c0c
|
修改报工实体类
|
1 year ago |
|
Yangwl
|
05a931c3a5
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Yangwl
|
1b98903f2d
|
SAP接口订单修改和订单关闭修改
|
1 year ago |
|
wws
|
55047b2f71
|
检查项+循环周期
|
1 year ago |
|
wws
|
fbf3b3a30f
|
1
|
1 year ago |
|
A0010407
|
fe60faa025
|
mapper重复
|
1 year ago |
|
A0010407
|
134c9d271d
|
设备看板 两个接口
|
1 year ago |
|
wws
|
7c7830a750
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
988ee5d7f4
|
检查项-工具属性添加
|
1 year ago |
|
zhaoxiaolin
|
2f221e1905
|
sap调整
|
1 year ago |
|
wws
|
dfe2805fd5
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
d875905204
|
设备看板：维修工单、设备信息、维修质量
|
1 year ago |
|
zhaoxiaolin
|
4a5d01c25c
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
8ea69a31c2
|
工单下派bug修改
|
1 year ago |
|
wws
|
25f6ff4211
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
9b8b47ae1c
|
设备运行记录init
|
1 year ago |
|
wws
|
116c224f45
|
1
|
1 year ago |
|
A0010407
|
91c919ea81
|
设备基础信息 设备是否启用+设备状态
|
1 year ago |
|
zhaoxiaolin
|
8ce0210acb
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
2ce35572f2
|
订单拆分上报sap
|
1 year ago |
|
wws
|
cc55155055
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
a6070a5972
|
看板接口:维修工单init、设备基本信息init、维修质量init
|
1 year ago |
|
zhaoxiaolin
|
34e131289b
|
报工时候关闭子母工单
|
1 year ago |
|
Yangwl
|
3c4934ce92
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
yinq
|
41a26c41c5
|
update - 能源模块
|
1 year ago |
|
Yangwl
|
2d2cdda9ec
|
采购订单实体类
|
1 year ago |
|
Yangwl
|
255ae56537
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Yangwl
|
8e815945eb
|
增加SAP订单修改接口和@Bean依赖先后顺序
|
1 year ago |
|
zhaoxiaolin
|
709af8c4a0
|
加入belong_work_order概念
|
1 year ago |
|
zhaoxiaolin
|
c1b6bfd2bb
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
dbeba66388
|
sap接口调整
|
1 year ago |
|
yinq
|
412b6445e4
|
update - 初始化能源模块
|
1 year ago |
|
A0010407
|
71c9cb591d
|
基础信息设备+设备优化
|
1 year ago |
|
wws
|
685bdc34bf
|
委外保养定时任务-统一申领单号
|
1 year ago |
|
wws
|
b4a2f41311
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
8659dd8f11
|
委外保养定时任务逻辑修改
|
1 year ago |
|
Yangwl
|
da12afa045
|
修改和SAP连接的方式，使用工厂类，避免重复连接SAP系统。
|
1 year ago |
|
Yangwl
|
e1e5b8f1fc
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Yangwl
|
3d1e9452b6
|
修改创建SAP创建订单后返回的数据结构，增加子订单信息。
|
1 year ago |
|
zhaoxiaolin
|
1cedbf3c9e
|
sap接口调整
|
1 year ago |
|
A0010407
|
170a3926a8
|
文件
|
1 year ago |
|
wws
|
d26ccbde47
|
定时任务开启工厂源
|
1 year ago |
|
wws
|
41079dee1e
|
申领单删除BUG解决
|
1 year ago |
|
wws
|
31d87a16e4
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
c0fd87d2d1
|
申领单删除逻辑、保养单备件删除BUG解决
|
1 year ago |
|
zhaoxiaolin
|
93f60c6f6c
|
工单设备修改
|
1 year ago |
|
zhaoxiaolin
|
f221f0ec05
|
质量分析图表
|
1 year ago |
|
A0010407
|
a72bdf8068
|
设备
|
1 year ago |
|
wws
|
33c31ae564
|
点检、巡检、保养逻辑删除、生成编码重复BUG
|
1 year ago |
|
wws
|
4bb2020255
|
检查项显示优化
|
1 year ago |
|
wws
|
0fa435b51c
|
保养不添加到报修
|
1 year ago |
|
wws
|
54a704ba27
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
4ea11df041
|
保养图片上传BUG解决
|
1 year ago |
|
zhaoxiaolin
|
06108ad230
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
0fe2254568
|
mes升级
|
1 year ago |
|
wws
|
b8e783e6a7
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
3abec72895
|
点检、巡检、保养图片上传和显示
|
1 year ago |
|
A0010407
|
58bb60bb3e
|
设备
|
1 year ago |
|
zhaoxiaolin
|
9c9da57bcf
|
质量统计
|
1 year ago |
|
zhaoxiaolin
|
60270136f7
|
质量统计
|
1 year ago |
|
A0010407
|
4c02aa5b2e
|
维修-3
|
1 year ago |
|
wws
|
fe57d99362
|
保养工单备件逻辑变更
|
1 year ago |
|
wws
|
50d9d7c19e
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
3dfe3f2b6c
|
保养工单备件逻辑变更
|
1 year ago |
|
wws
|
ba8dc2e8b4
|
保养工单备件逻辑变更
|
1 year ago |
|
A0010407
|
0ed4556317
|
报修-2
|
1 year ago |
|
A0010407
|
3607c4e490
|
设备-维修-1
|
1 year ago |
|
zhaoxiaolin
|
4a6323cd46
|
质量统计
|
1 year ago |
|
陈恒杰
|
bddcdd4181
|
rfid流程修改
|
1 year ago |
|
A0010407
|
76ef1fd102
|
设备模块-报修-1
|
1 year ago |
|
zhaoxiaolin
|
d551bac244
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
160d6f7280
|
成品工单下派，暂时去掉sap逻辑
|
1 year ago |
|
wws
|
e0a5330e98
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
a47b8ead75
|
保养用时+PDA开始保养接口
|
1 year ago |
|
zhaoxiaolin
|
2b16e9e96d
|
质量报表功能
|
1 year ago |
|
wws
|
d210876154
|
1
|
1 year ago |
|
wws
|
454367aae5
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
74dfb91633
|
点检、巡检、保养页面优化
|
1 year ago |
|
A0010407
|
5c2b404e76
|
设备
|
1 year ago |
|
wws
|
688fe5c39e
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
1597701d9a
|
填写记录BUG、PDA查询逻辑
|
1 year ago |
|
zhaoxiaolin
|
3e642c17a0
|
委外保养工单生成
|
1 year ago |
|
zhaoxiaolin
|
8dfc341463
|
下机台获取-unlock
|
1 year ago |
|
wws
|
6f8a167d96
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
2f9c7c1c03
|
保养委外
|
1 year ago |
|
zhaoxiaolin
|
20abf4cde4
|
报工+成品计划升级
|
1 year ago |
|
wws
|
d53c96be6b
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
560d3dff2f
|
设备-工单逻辑变更
|
1 year ago |
|
zhaoxiaolin
|
bda1cbdb55
|
保养定时任务
|
1 year ago |
|
wws
|
76bdb1fbb3
|
点检、巡检查询优化
|
1 year ago |
|
wws
|
8847b8e57c
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
c3f27a0b37
|
点检、巡检、保养逻辑优化
|
1 year ago |
|
zhaoxiaolin
|
24fe8b0b83
|
保养定时任务
|
1 year ago |
|
wws
|
52b3bc3a83
|
填写记录BUG
|
1 year ago |
|
wws
|
6dd294ab7f
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
cb8863b061
|
mes报工
|
1 year ago |
|
wws
|
41cd2fa5f8
|
查询BUG
|
1 year ago |
|
wws
|
3bd0d8a653
|
设备看板接口
|
1 year ago |
|
wws
|
126ff29e69
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
90d9b80bf7
|
点击工单BUG
|
1 year ago |
|
Yangwl
|
2a5cb29acd
|
烘房看板接口
# Conflicts:
# op-modules/op-mes/push-mes.bat
|
1 year ago |
|
Yangwl
|
3017b71215
|
烘房看板接口
|
1 year ago |
|
Yangwl
|
c0ee7ca097
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java
|
1 year ago |
|
Yangwl
|
598ec4a496
|
烘房看板接口
# Conflicts:
# op-modules/op-mes/push-mes.bat
|
1 year ago |
|
zhaoxiaolin
|
4939bad46f
|
mes报工
|
1 year ago |
|
zhaoxiaolin
|
d3c51aeff9
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
96223a90a0
|
mes报工
|
1 year 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
|
1 year ago |
|
wws
|
2201ea4bce
|
1
|
1 year ago |
|
wws
|
32c08aaec5
|
1
|
1 year ago |
|
zhaoxiaolin
|
ba999d484c
|
成品计划修改
|
1 year ago |
|
zhaoxiaolin
|
6974fa79fa
|
质量点检定时任务
|
1 year 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
|
1 year ago |
|
Yangwl
|
bb0ac02cc8
|
烘房看板接口
|
1 year ago |
|
Yangwl
|
cec59e4bc4
|
烘房看板接口
|
1 year ago |
|
wws
|
5bf8279617
|
计划新增-parentCode存放上级id
|
1 year ago |
|
wws
|
5ff08114f2
|
计划新增-parentCode存放上级id（修改查询未完善）
|
1 year ago |
|
wws
|
6e236cb58d
|
删除标准code、备件code字段、工单查询逻辑变更
|
1 year ago |
|
wws
|
bf0ea1b707
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
8874da06bc
|
备件信息-库存
|
1 year ago |
|
zhaoxiaolin
|
4f2b0c6e01
|
成品bug修改
|
1 year ago |
|
zhaoxiaolin
|
3262f842a3
|
成品bug修改
|
1 year ago |
|
wws
|
0e6a6286f6
|
点检巡检保养手持优化
|
1 year ago |
|
wws
|
de89a76846
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
8637740293
|
点检逻辑前后端优化
|
1 year ago |
|
zhaoxiaolin
|
184a5541ce
|
test
|
1 year ago |
|
wws
|
28e2f90ce5
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
20efabdfd1
|
点检-巡检-保养-检查项优化
|
1 year ago |
|
zhaoxiaolin
|
8ce8e22a47
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
15581ac8a3
|
新增接口服务，去掉scada服务
|
1 year ago |
|
A0010407
|
a3199b61c1
|
手持报修维修 后端接口
|
1 year ago |
|
zhaoxiaolin
|
2aa1ad4f2e
|
bat换jdk
|
1 year ago |
|
zhaoxiaolin
|
59a3fcd4ed
|
换jdk
|
1 year ago |
|
zhaoxiaolin
|
9b58911bfa
|
scada服务数据源
|
1 year ago |
|
zhaoxiaolin
|
77742e3c2f
|
scada服务数据源
|
1 year ago |
|
zhaoxiaolin
|
c7c00e0d72
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
d04c1068f8
|
检验报告
|
1 year ago |
|
wws
|
eef550d5ae
|
实体类同步
|
1 year ago |
|
zhaoxiaolin
|
74bb98faa3
|
检验报告
|
1 year ago |
|
wws
|
baa2e209a3
|
PDA手持填写巡检记录优化
|
1 year ago |
|
wws
|
6dafbca7d1
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
88ee80c6ca
|
点检工单优化
|
1 year ago |
|
A0010407
|
f969619323
|
报修+维修+设备班组+委外+PDA
|
1 year ago |
|
wws
|
ec9a071b8f
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
86effcdbfb
|
报表优化
|
1 year ago |
|
zhaoxiaolin
|
749c2cf67d
|
mes上位机接口迁移scada
|
1 year ago |
|
wws
|
5bb40f28e5
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
92615d8e28
|
报表优化
|
1 year ago |
|
zhaoxiaolin
|
15157dd26e
|
测试版本注册中心修改
|
1 year ago |
|
wws
|
362a8ac15a
|
报表-保养记录init
|
1 year ago |
|
wws
|
1417a47d95
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
c466027d74
|
报表-巡检记录
|
1 year ago |
|
zhaoxiaolin
|
4bd0df94ff
|
发版命令
|
1 year ago |
|
zhaoxiaolin
|
c7bfb41867
|
管理系统报工
|
1 year ago |
|
wws
|
7f67bc9b15
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
996c45f972
|
保养工单-检验+填写记录
|
1 year ago |
|
zhaoxiaolin
|
9f051a1277
|
管理系统报工1.0
|
1 year 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
|
1 year ago |
|
Yangwl
|
4b36de1131
|
烘房看板接口
|
1 year ago |
|
wws
|
9e14409743
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
2c3f1996b9
|
保养工单-快速工单
|
1 year ago |
|
zhaoxiaolin
|
42b0c4622d
|
计划bug+报工上位机接口提供
|
1 year ago |
|
shaoyong
|
716dfd6db5
|
检验报告，来料报告
|
1 year ago |
|
陈恒杰
|
83548f708f
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
陈恒杰
|
dbd3b16007
|
rfid流程修改
|
1 year ago |
|
A0010407
|
1d5b107814
|
报修+维修+设备班组+委外
|
1 year ago |
|
zhaoxiaolin
|
cca83e6511
|
bug
|
1 year ago |
|
zhaoxiaolin
|
1d3eb31a88
|
质量系统，不合格处理功能
|
1 year ago |
|
wws
|
450ccdf163
|
计划成品拆分BUG修复
|
1 year ago |
|
wws
|
65e738dd3a
|
计划成品拆分BUG修复
|
1 year ago |
|
zhaoxiaolin
|
28145447cb
|
sap联调
|
1 year ago |
|
Yangwl
|
d59ebb0895
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# ABAP_AS_WITH_POOL.jcoDestination
# op-modules/op-sap/pom.xml
|
1 year ago |
|
Yangwl
|
afa7c430fe
|
SAP配置
|
1 year ago |
|
Yangwl
|
d59af9f9f6
|
增加SAP接口
|
1 year ago |
|
A0010407
|
9bb46f6a5e
|
报修+维修+设备班组
|
1 year ago |
|
zhaoxiaolin
|
551e194707
|
sap联调
|
1 year ago |
|
zhaoxiaolin
|
9c89b70be0
|
质量任务表调整
|
1 year ago |
|
zhaoxiaolin
|
618157586d
|
质量任务表调整
|
1 year ago |
|
wws
|
5803ae6782
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
a916fe242b
|
点检工单、保养工单init
|
1 year ago |
|
zhaoxiaolin
|
ef0f839892
|
不合格处理
|
1 year ago |
|
wws
|
3491e38ec1
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
fe0727c0d1
|
点检计划
|
1 year ago |
|
zhaoxiaolin
|
8e8ac0e125
|
备份定时任务
|
1 year ago |
|
zhaoxiaolin
|
05546bb4dd
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
e32ee7119b
|
bug修改
|
1 year ago |
|
wws
|
337eb97c68
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
86a39d613c
|
保养计划-修改
|
1 year ago |
|
zhaoxiaolin
|
4278e4cb73
|
bug修改
|
1 year ago |
|
zhaoxiaolin
|
42b9c09918
|
bug修改
|
1 year ago |
|
A0010407
|
39b392d037
|
报修+维修+委外
|
1 year ago |
|
wws
|
c7e42f4045
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
8152b17171
|
保养计划-新增
|
1 year ago |
|
shaoyong
|
ee48170cc8
|
人员物料绑定查询修改
|
1 year ago |
|
zhaoxiaolin
|
ac16a5d785
|
入库过程检验
|
1 year ago |
|
zhaoxiaolin
|
7c6d5a1b4f
|
生产过程检验v4
|
1 year ago |
|
zhaoxiaolin
|
94010d9146
|
生产过程检验v3
|
1 year ago |
|
shaoyong
|
e25f223632
|
人员物料绑定修复
|
1 year ago |
|
wws
|
35b354562b
|
保养计划
|
1 year ago |
|
wws
|
c0daf9a89a
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
45c3b2b7c9
|
手持接口-巡检工单-提交接口
|
1 year ago |
|
zhaoxiaolin
|
9d55da3a0b
|
生产过程检验+手持发版记录
|
1 year ago |
|
shaoyong
|
7329c54eab
|
物料检验项目维护修复
|
1 year ago |
|
wws
|
f60d6559f9
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
fab6f3aa28
|
手持接口-巡检工单
|
1 year ago |
|
shaoyong
|
3c40a7df23
|
物料检验项目维护
|
1 year ago |
|
zhaoxiaolin
|
c1fac1f909
|
原料检验任务1.0
|
1 year ago |
|
wws
|
b865658cb2
|
巡检工单填写记录
|
1 year ago |
|
wws
|
fc69128a8c
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
dcbde38d27
|
巡检工单填写记录V1
|
1 year ago |