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 |