676 Commits (41a26c41c53ec6a1227a45197d6a02a2e2afe41f)

Author SHA1 Message Date
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