Commit Graph

1536 Commits (54b2d2b91f2e33849ecbecfe859d1121e9150998)
 

Author SHA1 Message Date
zhaoxiaolin 59a3fcd4ed 换jdk
zhaoxiaolin 9b58911bfa scada服务数据源
zhaoxiaolin 77742e3c2f scada服务数据源
zhaoxiaolin c7c00e0d72 Merge remote-tracking branch 'origin/master'
zhaoxiaolin d04c1068f8 检验报告
wws eef550d5ae 实体类同步
zhaoxiaolin 74bb98faa3 检验报告
wws baa2e209a3 PDA手持填写巡检记录优化
wws 6dafbca7d1 Merge remote-tracking branch 'origin/master'
wws 88ee80c6ca 点检工单优化
A0010407 f969619323 报修+维修+设备班组+委外+PDA
wws ec9a071b8f Merge remote-tracking branch 'origin/master'
wws 86effcdbfb 报表优化
zhaoxiaolin 749c2cf67d mes上位机接口迁移scada
wws 5bb40f28e5 Merge remote-tracking branch 'origin/master'
wws 92615d8e28 报表优化
zhaoxiaolin 15157dd26e 测试版本注册中心修改
wws 362a8ac15a 报表-保养记录init
wws 1417a47d95 Merge remote-tracking branch 'origin/master'
wws c466027d74 报表-巡检记录
zhaoxiaolin 4bd0df94ff 发版命令
zhaoxiaolin c7bfb41867 管理系统报工
wws 7f67bc9b15 Merge remote-tracking branch 'origin/master'
wws 996c45f972 保养工单-检验+填写记录
Yangwl 122b7aec05 Merge remote-tracking branch 'origin/master'
Yangwl bc1b3773df 修改报工接口类
zhaoxiaolin 9f051a1277 管理系统报工1.0
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
Yangwl 4b36de1131 烘房看板接口
wws 9e14409743 Merge remote-tracking branch 'origin/master'
wws 2c3f1996b9 保养工单-快速工单
zhaoxiaolin 42b0c4622d 计划bug+报工上位机接口提供
shaoyong 716dfd6db5 检验报告,来料报告
陈恒杰 83548f708f Merge remote-tracking branch 'origin/master'
陈恒杰 dbd3b16007 rfid流程修改
A0010407 1d5b107814 报修+维修+设备班组+委外
zhaoxiaolin cca83e6511 bug
zhaoxiaolin 1d3eb31a88 质量系统,不合格处理功能
wws 450ccdf163 计划成品拆分BUG修复
wws 65e738dd3a 计划成品拆分BUG修复
zhaoxiaolin 28145447cb sap联调
Yangwl d59ebb0895 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	ABAP_AS_WITH_POOL.jcoDestination
#	op-modules/op-sap/pom.xml
Yangwl afa7c430fe SAP配置
Yangwl d59af9f9f6 增加SAP接口
A0010407 9bb46f6a5e 报修+维修+设备班组
zhaoxiaolin 551e194707 sap联调
zhaoxiaolin 9c89b70be0 质量任务表调整
zhaoxiaolin 618157586d 质量任务表调整
wws 5803ae6782 Merge remote-tracking branch 'origin/master'
wws a916fe242b 点检工单、保养工单init