zhaoxiaolin
|
8b7d6c238d
|
质量问题修改3
|
1 year ago |
|
zhaoxiaolin
|
798e94cb5c
|
质量问题修改2
|
1 year ago |
|
zhaoxiaolin
|
b33cc3a394
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
f5f7fc1ae6
|
质量问题修改
|
1 year ago |
mengjiao
|
35c376dde4
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
4b65097515
|
wms修改18.4-报工页面的sap收货修改
|
1 year ago |
|
zhaoxiaolin
|
09992a3030
|
子母报工加延时
|
1 year ago |
|
zhaoxiaolin
|
385ed16dd5
|
报工状态修改2
|
1 year ago |
|
zhaoxiaolin
|
2ad4207e50
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
717047fa03
|
报工状态修改
|
1 year ago |
|
mengjiao
|
24e8629359
|
wms修改18.4-报工页面的sap收货
|
1 year ago |
|
zhaoxiaolin
|
886cfd442d
|
成品入库检测任务联调
|
1 year ago |
|
mengjiao
|
6cc3e25bf0
|
wms修改18.4-报工页面的质检任务生成
|
1 year ago |
|
zhaoxiaolin
|
6f63517cf0
|
质量任务接口修改5
|
1 year ago |
|
zhaoxiaolin
|
473390a738
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
48b0695942
|
质量任务接口修改4
|
1 year ago |
wws
|
6be8effd2a
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
76a507c240
|
看板年月日逻辑
|
1 year ago |
|
zhaoxiaolin
|
6f1d92edd5
|
质量任务接口修改3
|
1 year ago |
|
zhaoxiaolin
|
58d80d29c8
|
质量任务接口修改2
|
1 year ago |
|
zhaoxiaolin
|
dda4c9595c
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
55fc30ed13
|
质量任务接口修改
|
1 year ago |
A0010407
|
0c5cf3f18f
|
2024-1-10-1 设备-看板-年月日-设备稳定性
|
1 year ago |
|
zhaoxiaolin
|
3e965d7b70
|
更新物料修改bug
|
1 year ago |
|
zhaoxiaolin
|
ed76f9734d
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDetail.java
|
1 year ago |
|
zhaoxiaolin
|
d9022031db
|
入库检验修改
|
1 year ago |
|
mengjiao
|
5f1e69b4b7
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
2ff5a8dc09
|
wms修改18.4-报工页面的sap收货按钮，和成品入库页面的过账按钮修改
|
1 year ago |
shaoyong
|
fca8d70fb6
|
检测报告修改
|
1 year ago |
|
zhaoxiaolin
|
f110febe1c
|
文件修复
|
1 year ago |
|
mengjiao
|
99d56f44db
|
wms修改18.3-报工页面的sap收货按钮，和成品入库页面的过账按钮修改
|
1 year ago |
|
mengjiao
|
a8d2695880
|
wms修改18.2-报工页面的sap收货按钮，和成品入库页面的过账按钮修改
|
1 year ago |
|
mengjiao
|
2d45083515
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
9e37514457
|
wms修改18.1-报工页面的sap收货按钮，和成品入库页面的过账按钮修改
|
1 year ago |
|
zhaoxiaolin
|
a2a7c972a7
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
6473691de9
|
oa修改-
|
1 year ago |
|
mengjiao
|
54e2e97eca
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
baf41707a6
|
wms修改18-报工页面的sap收货按钮，和成品入库页面的过账按钮修改
|
1 year ago |
|
wws
|
976cb28b54
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
56d369c801
|
已删除设备不生成任务
|
1 year ago |
|
A0010407
|
51f62a5853
|
2024-1-9-3 设备-1.增加故障次数 停机次数 2.完善手持、PC和维修流程 3.完善当日设备稳定性
|
1 year ago |
 Yangwl
|
ddfb519fbf
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
98084eaf1e
|
巡检报告
|
1 year ago |
|
Yangwl
|
bd8870982d
|
OA接口
|
1 year ago |
|
zhaoxiaolin
|
fc507735c7
|
巡检报告
|
1 year ago |
|
A0010407
|
8a8cdaaed4
|
2024-1-9-2 基础信息-工厂-加工厂建模类型
|
1 year ago |
|
A0010407
|
88bda16f8f
|
2024-1-9-1 设备管理-故障描述 四个页面 故障编码问题+页面排序展示问题
|
1 year ago |
|
shaoyong
|
e69a2bbf2d
|
来料抽样规则修改
|
1 year ago |
|
wws
|
1f66bd4688
|
PDA任务列表展示顺序只展示范围内
|
1 year ago |
|
wws
|
87fd4374f6
|
PDA任务列表展示顺序只展示当天的
|
1 year ago |
|
wws
|
f349941a94
|
PDA任务列表展示顺序
|
1 year ago |
|
zhaoxiaolin
|
ba9216c14a
|
不良率综合统计报表
|
1 year ago |
|
mengjiao
|
969897968c
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
0f638c756f
|
wms修改17.2--成品入库修改
|
1 year ago |
|
zhaoxiaolin
|
a91af79c92
|
不良率统计报表
|
1 year ago |
|
A0010407
|
4ee47b457c
|
手持 报修单后端+维修单后端加逻辑 设备完好率
|
1 year ago |
|
wws
|
6fb6fabba6
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
4a94e29eba
|
PDA详情设备名称显示
|
1 year ago |
|
mengjiao
|
84e1d4aea4
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
b64bed18e9
|
wms修改17.1--成品入库修改
|
1 year ago |
|
wws
|
7dee2effa0
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
1f2dcfda47
|
PDA任务排序
|
1 year ago |
|
mengjiao
|
c563412e61
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
f213410be3
|
wms修改17--成品入库修改
|
1 year ago |
|
wws
|
ce8bbe3917
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
783150feed
|
保养手持提交BUG解决
|
1 year ago |
|
shaoyong
|
da4f10f603
|
首检报告修改
|
1 year ago |
|
wws
|
62ee2492fc
|
数据源分配用户查询BUG解决
|
1 year ago |
|
zhaoxiaolin
|
816efb1f5a
|
巡检触发逻辑变更
|
1 year ago |
|
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 |