Yangwl
/
LanJu_Mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,133 Commits
3 Branches
0 Tags
20 MiB
Commit Graph

1106 Commits (a7b4b9a6e9633f34ca00047bad45c5159943174e)

Author SHA1 Message Date
zhaoxiaolin a91af79c92 不良率统计报表
A0010407 4ee47b457c 手持 报修单后端+维修单后端加逻辑 设备完好率
wws 6fb6fabba6 Merge remote-tracking branch 'origin/master'
wws 4a94e29eba PDA详情设备名称显示
mengjiao 84e1d4aea4 Merge remote-tracking branch 'origin/master'
mengjiao b64bed18e9 wms修改17.1--成品入库修改
wws 7dee2effa0 Merge remote-tracking branch 'origin/master'
wws 1f2dcfda47 PDA任务排序
mengjiao c563412e61 Merge remote-tracking branch 'origin/master'
mengjiao f213410be3 wms修改17--成品入库修改
wws ce8bbe3917 Merge remote-tracking branch 'origin/master'
wws 783150feed 保养手持提交BUG解决
shaoyong da4f10f603 首检报告修改
wws 62ee2492fc 数据源分配用户查询BUG解决
zhaoxiaolin 816efb1f5a 巡检触发逻辑变更
wws c83450bfa9 Merge remote-tracking branch 'origin/master'
wws 76f8261176 检查项录入不可新增BUG解决
A0010407 1225206e73 备件申领单加单价总价
zhaoxiaolin 52f2be01fd 巡检触发逻辑变更
wws f9cb4a5c1d Merge remote-tracking branch 'origin/master'
wws fd54baf7a8 检查项录入不可修改BUG解决
shaoyong 096e30657d 首检报告
zhaoxiaolin 3a9aa84d56 巡检不良分析图表
zhaoxiaolin 827657c43d 巡检不良分析图表
A0010407 a68a3ac1a8 设备 维修---->设备完好率（一天内多次）
A0010407 d307cd97f4 维保记录
zhaoxiaolin 5e3c032647 oa流程有问题
Yangwl ed23db844a Merge remote-tracking branch 'origin/master'
Yangwl 61c37758f8 计件薪酬、包装线看板接口
BrickHome 6ae48c69ae Merge remote-tracking branch 'origin/master'
BrickHome f4d8b7460e 保养费用BUG解决
zhaoxiaolin c808859ea6 巡检检验加批次
zhaoxiaolin 0f490cf817 物料检测项加检测项关联
mengjiao 17f68e3306 wms修改16.1
zhaoxiaolin 94dccff050 质量改动
zhaoxiaolin 4dc1a16dab 质量改动
mengjiao 8d1b4db68c Merge remote-tracking branch 'origin/master'
mengjiao e538e7a425 wms修改16
wws 85ce59cd8a Merge remote-tracking branch 'origin/master'
wws f92177941b PDA获取记录
mengjiao d1e62a3d70 wms修改15
wws 4b63b2d7a2 Merge remote-tracking branch 'origin/master'
wws 9bc2c103ea 保养记录填写BUG解决
shaoyong 1ddd59dfd0 检验方案维护
mengjiao c00be3fee0 wms修改14
mengjiao 44a23eaa78 wms修改13
mengjiao 8272aabbe6 Merge remote-tracking branch 'origin/master'
mengjiao be29364888 wms修改12
zhaoxiaolin 22c08bcadb Merge remote-tracking branch 'origin/master'
zhaoxiaolin c3907c14c6 白坯图表
mengjiao 2fff9ae453 Merge remote-tracking branch 'origin/master'
mengjiao aea787217a wms修改11
A0010407 c1fd8c9c18 用户 微信名+bug
Yangwl 8bc7cd17ce Merge remote-tracking branch 'origin/master'
Yangwl 69a2f60160 101类型订单收货
陈恒杰 1211472ae4 手动创建白坯入库单1
陈恒杰 877dc435aa Merge remote-tracking branch 'origin/master'
陈恒杰 db09747042 成品入库
mengjiao 166d5d6c01 wms修改10
陈恒杰 3bd96dea12 Merge remote-tracking branch 'origin/master'
陈恒杰 81bec3822e 白坯权限
zhaoxiaolin d6d6d33110 检验手持接口修改
zhaoxiaolin 9971a509bc 检验手持接口修改
Yangwl cdd852bf07 字段注释
Yangwl 308492d614 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	op-common/op-common-core/src/main/java/com/op/common/core/constant/ServiceNameConstants.java
zhaoxiaolin 02fb55dc6e 新增白坯工单管理
Yangwl 0ec681686e OA提交字段注释
Yangwl cf0d987365 Merge remote-tracking branch 'origin/master'
Yangwl d2e644b74b OA ZL0010-来料检验不合格控制流程代码
zhaoxiaolin 6624eb2992 入库检验工单修改来源表
陈恒杰 9d37d5eb05 Merge remote-tracking branch 'origin/master'
陈恒杰 1d23f85a3c 手动创建白坯入库单修改
zhaoxiaolin 949a7f8f33 入库检验工单修改来源表
zhaoxiaolin e6554a9e41 订单管理bug修改
陈恒杰 a0afd6a4fa Merge remote-tracking branch 'origin/master'
陈恒杰 a953d4eb29 手动创建白坯入库单
wws e6b7588488 Merge remote-tracking branch 'origin/master'
wws 5f0a78bbe9 白坯合格统计
陈恒杰 b032991675 Merge remote-tracking branch 'origin/master'
陈恒杰 62084d080b 手动创建白坯入库单
zhaoxiaolin 0b302ed86e 入库检验任务接口+巡检任务调整
zhaoxiaolin 86e6b205a0 入库检验任务接口
zhaoxiaolin a4ad441dad 质量过程巡检+来料检验任务接口+报工sql调整
陈恒杰 7118604055 Merge remote-tracking branch 'origin/master'
wws 5efb7d4582 Merge remote-tracking branch 'origin/master'
wws 3bd7eeb1ed 维修/保养-备件单价逻辑
陈恒杰 796126ccd0 Merge remote-tracking branch 'origin/master'
zhaoxiaolin 30fac0e8dd 质量过程巡检+来料检验任务接口+报工sql调整
shaoyong 4e65a7d092 检验人员多选
陈恒杰 d189457891 Merge remote-tracking branch 'origin/master'
zhaoxiaolin 63cc8e2053 质量过程巡检+来料检验任务接口
mengjiao 826576045e wms修改9.4
陈恒杰 8e96bc5717 Merge remote-tracking branch 'origin/master'
mengjiao 316e221ffa wms修改9.3
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
mengjiao 4dced6b421 wms修改9.2
wws c0614e3cf8 看板接口便变更
wws 4edeb71b91 设备完好率
陈恒杰 d903ee4b66 Merge remote-tracking branch 'origin/master'
wws 1971818ea3 Merge remote-tracking branch 'origin/master'
wws f5060ed72c 设备运行记录年备份定时任务
zhaoxiaolin f1f895ee20 质量质检+工单管理界面加入母单信息+首页图表
陈恒杰 eebf7a2cf5 Merge remote-tracking branch 'origin/master'
zhaoxiaolin 245301f4f8 质量质检qc_status添加批次
zhaoxiaolin e9528b28da 质量质检qc_status添加批次
zhaoxiaolin 04681b3623 Merge remote-tracking branch 'origin/master'
zhaoxiaolin 0ccb32d068 质量质检qc_status添加
陈恒杰 db81932f2c Merge remote-tracking branch 'origin/master'
zhaoxiaolin 4dd5c4895f 报错修改
zhaoxiaolin 3671723f7e 质量看板接口修改3
A0010407 b27e18f403 基础信息 设备加字段 + 设备看板完好设备比问题
Yangwl a69e7c1ebc SAP采购订单获取接口
Yangwl 5b44945246 Merge remote-tracking branch 'origin/master'
Yangwl 5abd625d55 SAP采购订单收货过账
mengjiao ab03545514 wms修改9.1
mengjiao 8bb9f93c01 Merge remote-tracking branch 'origin/master'
mengjiao ccf06f8c94 wms修改9
zhaoxiaolin 53f12a9f2d Merge remote-tracking branch 'origin/master'
zhaoxiaolin 8a325fc57b 质量看板接口修改2
A0010407 821d4f9a58 设备手持三个接口
mengjiao 274ae3fb93 Merge remote-tracking branch 'origin/master'
mengjiao 27f8051c7c wms修改8
陈恒杰 a39ca17d90 Merge remote-tracking branch 'origin/master'
wws 59319007b1 首页-各组线每月设备故障数、设备完好率修改BUG解决
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
wws 516a9b8053 首页-各组线每月设备故障数、设备完好率修改BUG解决
陈恒杰 be462da39c Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	dev_jco_rfc.trc
陈恒杰 3c67bcc5fa 打印领料单修改
zhaoxiaolin bb18fbce4a 质量看板接口修改
A0010407 ac35ed2bad 设备-三个手持接口 维修增加维修措施（也就是处理方式）
A0010407 bf04c7bdcf 设备看板 完好率调整 - 每日看板
A0010407 1d55861aa9 故障信息四个页面
zhaoxiaolin 5f03c120b6 质量看板接口
zhaoxiaolin a4c58a143c 质量看板接口
wws 551b3e8b7e Merge remote-tracking branch 'origin/master'
wws 34eb8e75cf 完好率统计报表、设备运行记录定时任务
Yangwl 2107a05e82 Merge remote-tracking branch 'origin/master'
Yangwl 801bf00af5 SAP的储位仓库信息接口
mengjiao daee90e884 wms修改7
Yangwl b3d73b8b4d Merge remote-tracking branch 'origin/master'
Yangwl ff2bf78d5d 订单物料领料过账、反冲物料领料过账微服务接口
mengjiao 6b8420f87c Merge remote-tracking branch 'origin/master'
mengjiao 8f3bd218a2 wms修改６
A0010407 e3c8a23b7b 备件申领 逻辑修改
zhaoxiaolin afe322e8c9 领料单+质量看板接口
A0010407 cfeda7559d 基础信息管理 设备组线调整
Yangwl 620b22e110 Merge remote-tracking branch 'origin/master' into highway
Yangwl 3986980876 分支提交
陈恒杰 0684692469 Merge remote-tracking branch 'origin/master'
陈恒杰 aa2ca2b13c 打印领料单修改
wws 9ef78fd8ab Merge remote-tracking branch 'origin/master'
wws e855f5ad3c 完好率init、设备选择逻辑新增组线
A0010407 0b0ad3d1ab 基础信息管理 设备组线调整
Yangwl b68d6ccc86 采购订单实体类
Yangwl 31747dcf41 SAP领料过账和订单接收
zhaoxiaolin ed67be03ca 子单报工成功后再报母单
zhaoxiaolin d90f72417e Merge remote-tracking branch 'origin/master'
zhaoxiaolin 628b391937 工单删除逻辑添加
A0010407 4368b922d9 新增字段 基础信息设备：设备类别 设备维修：设备状态描述
wws b9a9d5c6f0 Merge remote-tracking branch 'origin/master'
wws 2d523c06a0 字段显示调整
zhaoxiaolin 583956201f Merge remote-tracking branch 'origin/master'
zhaoxiaolin 4362014544 只有活动中的工单才能进行报工
A0010407 3491c4a326 设备备品备件台账 优化 1.加入展示列，隐藏展示列 主表关联附属表
zhaoxiaolin ad6f335ffc 只有活动中的工单才能进行报工
zhaoxiaolin e51eba0465 报工成功后，不需要关闭工单
zhaoxiaolin 91790d8b7b 报工成功后，再关闭订单
zhaoxiaolin e1be6cb0a6 报工公式确认
A0010407 449967fc12 维修检查项一次提交多个照片
zhaoxiaolin 47318ca385 质量调整
A0010407 8452e5b19e 设备综合报表
mengjiao 4c7b2aae74 Merge remote-tracking branch 'origin/master'
mengjiao 410c6cca84 wms修改５
wws a05ff34856 设置检查时间
wws 7fddc72849 Merge remote-tracking branch 'origin/master'
wws 99a7d37ed6 快速保养工单检查项获取不到BUG解决
zhaoxiaolin e6c56963a1 确认修改接口，我那我就改了：之前有工单维度，现在要求去掉工单
wws 7a5425e0ec 用户userName替换userId
wws ce50262fe2 用户userName替换userId
wws 13bd0c69f5 Merge remote-tracking branch 'origin/master'
wws 63c10e35bf 用户userName替换userId
A0010407 93b6f7a6eb 设备绑定辅助设备
wws 1ee85f0700 Merge remote-tracking branch 'origin/master'
wws 14937d6441 上位机设备报修接口
mengjiao aace8fb9e5 wms修改４
mengjiao f73b799a2a Merge remote-tracking branch 'origin/master'
mengjiao ef7e6d4f6b wms修改３
zhaoxiaolin 36b28836d4 质量bug
zhaoxiaolin 7caebe1ddf 报工方案调整：母单报工的时候，也按照子单的数量进行填报。
wws 5ce0823a49 计划删除关联备件表单删除失败BUG解决
wws 30599c33b6 Merge remote-tracking branch 'origin/master'
wws 16b1b0ad4a 故障修改提交BUG解决，代码逻辑优化+注解
zhaoxiaolin 602d09a82d 生产过程检验修改测试
zhaoxiaolin 376e54ee5e 生产过程检验修改测试
wws 6eb31bb922 Merge remote-tracking branch 'origin/master'
wws d398de356c 优化逻辑
mengjiao 2a883c2204 wms修改2
mengjiao c8618c6697 Merge remote-tracking branch 'origin/master'
mengjiao 02c4641b43 wms修改1
zhaoxiaolin 0484626152 来料检验修改测试