910 Commits (8272aabbe6922650007995558323e5f1a53e66fd)

Author SHA1 Message Date
zhaoxiaolin d248021e95 sap接口调整3 1 year ago
zhaoxiaolin aecbb658f2 sap接口调整2 1 year ago
zhaoxiaolin 1f31239adb sap接口调整 1 year ago
wws e8f155136d 点击按巡检计划逻辑变更 1 year ago
wws 428e203946 Merge remote-tracking branch 'origin/master' 1 year ago
wws 680ea6bbd6 点击按巡检计划逻辑变更 1 year ago
A0010407 3fc5733187 设备看板刷新时间 1 year ago
zhaoxiaolin 80d762197c Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin f13ee5d888 sap调整+质量手持接口+首页柱图数据bug修复 1 year ago
Yangwl fc43732c0c 修改报工实体类 1 year ago
Yangwl 05a931c3a5 Merge remote-tracking branch 'origin/master' 1 year ago
Yangwl 1b98903f2d SAP接口订单修改和订单关闭修改 1 year ago
wws 55047b2f71 检查项+循环周期 1 year ago
wws fbf3b3a30f 1 1 year ago
A0010407 fe60faa025 mapper重复 1 year ago
A0010407 134c9d271d 设备看板 两个接口 1 year ago
wws 7c7830a750 Merge remote-tracking branch 'origin/master' 1 year ago
wws 988ee5d7f4 检查项-工具属性添加 1 year ago
zhaoxiaolin 2f221e1905 sap调整 1 year ago
wws dfe2805fd5 Merge remote-tracking branch 'origin/master' 1 year ago
wws d875905204 设备看板:维修工单、设备信息、维修质量 1 year ago
zhaoxiaolin 4a5d01c25c Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 8ea69a31c2 工单下派bug修改 1 year ago
wws 25f6ff4211 Merge remote-tracking branch 'origin/master' 1 year ago
wws 9b8b47ae1c 设备运行记录init 1 year ago
wws 116c224f45 1 1 year ago
A0010407 91c919ea81 设备基础信息 设备是否启用+设备状态 1 year ago
zhaoxiaolin 8ce0210acb Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 2ce35572f2 订单拆分上报sap 1 year ago
wws cc55155055 Merge remote-tracking branch 'origin/master' 1 year ago
wws a6070a5972 看板接口:维修工单init、设备基本信息init、维修质量init 1 year ago
zhaoxiaolin 34e131289b 报工时候关闭子母工单 1 year ago
Yangwl 3c4934ce92 Merge remote-tracking branch 'origin/master' 1 year ago
yinq 41a26c41c5 update - 能源模块 1 year ago
Yangwl 2d2cdda9ec 采购订单实体类 1 year ago
Yangwl 255ae56537 Merge remote-tracking branch 'origin/master' 1 year ago
Yangwl 8e815945eb 增加SAP订单修改接口和@Bean依赖先后顺序 1 year ago
zhaoxiaolin 709af8c4a0 加入belong_work_order概念 1 year ago
zhaoxiaolin c1b6bfd2bb Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin dbeba66388 sap接口调整 1 year ago
yinq 412b6445e4 update - 初始化能源模块 1 year ago
A0010407 71c9cb591d 基础信息设备+设备优化 1 year ago
wws 685bdc34bf 委外保养定时任务-统一申领单号 1 year ago
wws b4a2f41311 Merge remote-tracking branch 'origin/master' 1 year ago
wws 8659dd8f11 委外保养定时任务逻辑修改 1 year ago
Yangwl da12afa045 修改和SAP连接的方式,使用工厂类,避免重复连接SAP系统。 1 year ago
Yangwl e1e5b8f1fc Merge remote-tracking branch 'origin/master' 1 year ago
Yangwl 3d1e9452b6 修改创建SAP创建订单后返回的数据结构,增加子订单信息。 1 year ago
zhaoxiaolin 1cedbf3c9e sap接口调整 1 year ago
A0010407 170a3926a8 文件 1 year ago
wws d26ccbde47 定时任务开启工厂源 1 year ago
wws 41079dee1e 申领单删除BUG解决 1 year ago
wws 31d87a16e4 Merge remote-tracking branch 'origin/master' 1 year ago
wws c0fd87d2d1 申领单删除逻辑、保养单备件删除BUG解决 1 year ago
zhaoxiaolin 93f60c6f6c 工单设备修改 1 year ago
zhaoxiaolin f221f0ec05 质量分析图表 1 year ago
A0010407 a72bdf8068 设备 1 year ago
wws 33c31ae564 点检、巡检、保养逻辑删除、生成编码重复BUG 1 year ago
wws 4bb2020255 检查项显示优化 1 year ago
wws 0fa435b51c 保养不添加到报修 1 year ago
wws 54a704ba27 Merge remote-tracking branch 'origin/master' 1 year ago
wws 4ea11df041 保养图片上传BUG解决 1 year ago
zhaoxiaolin 06108ad230 Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 0fe2254568 mes升级 1 year ago
wws b8e783e6a7 Merge remote-tracking branch 'origin/master' 1 year ago
wws 3abec72895 点检、巡检、保养图片上传和显示 1 year ago
A0010407 58bb60bb3e 设备 1 year ago
zhaoxiaolin 9c9da57bcf 质量统计 1 year ago
zhaoxiaolin 60270136f7 质量统计 1 year ago
A0010407 4c02aa5b2e 维修-3 1 year ago
wws fe57d99362 保养工单备件逻辑变更 1 year ago
wws 50d9d7c19e Merge remote-tracking branch 'origin/master' 1 year ago
wws 3dfe3f2b6c 保养工单备件逻辑变更 1 year ago
wws ba8dc2e8b4 保养工单备件逻辑变更 1 year ago
A0010407 0ed4556317 报修-2 1 year ago
A0010407 3607c4e490 设备-维修-1 1 year ago
zhaoxiaolin 4a6323cd46 质量统计 1 year ago
陈恒杰 bddcdd4181 rfid流程修改 1 year ago
A0010407 76ef1fd102 设备模块-报修-1 1 year ago
zhaoxiaolin d551bac244 Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 160d6f7280 成品工单下派,暂时去掉sap逻辑 1 year ago
wws e0a5330e98 Merge remote-tracking branch 'origin/master' 1 year ago
wws a47b8ead75 保养用时+PDA开始保养接口 1 year ago
zhaoxiaolin 2b16e9e96d 质量报表功能 1 year ago
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
zhaoxiaolin 551e194707 sap联调 1 year ago
zhaoxiaolin 9c89b70be0 质量任务表调整 1 year ago
zhaoxiaolin 618157586d 质量任务表调整 1 year ago
wws 5803ae6782 Merge remote-tracking branch 'origin/master' 1 year ago
wws a916fe242b 点检工单、保养工单init 1 year ago
zhaoxiaolin ef0f839892 不合格处理 1 year ago
wws 3491e38ec1 Merge remote-tracking branch 'origin/master' 1 year ago
wws fe0727c0d1 点检计划 1 year ago
zhaoxiaolin 8e8ac0e125 备份定时任务 1 year ago
zhaoxiaolin 05546bb4dd Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin e32ee7119b bug修改 1 year ago
wws 337eb97c68 Merge remote-tracking branch 'origin/master' 1 year ago
wws 86a39d613c 保养计划-修改 1 year ago
zhaoxiaolin 4278e4cb73 bug修改 1 year ago
zhaoxiaolin 42b9c09918 bug修改 1 year ago
A0010407 39b392d037 报修+维修+委外 1 year ago
wws c7e42f4045 Merge remote-tracking branch 'origin/master' 1 year ago
wws 8152b17171 保养计划-新增 1 year ago
shaoyong ee48170cc8 人员物料绑定查询修改 1 year ago
zhaoxiaolin ac16a5d785 入库过程检验 1 year ago
zhaoxiaolin 7c6d5a1b4f 生产过程检验v4 1 year ago
zhaoxiaolin 94010d9146 生产过程检验v3 1 year ago
shaoyong e25f223632 人员物料绑定修复 1 year ago
wws 35b354562b 保养计划 1 year ago
wws c0daf9a89a Merge remote-tracking branch 'origin/master' 1 year ago
wws 45c3b2b7c9 手持接口-巡检工单-提交接口 1 year ago
zhaoxiaolin 9d55da3a0b 生产过程检验+手持发版记录 1 year ago
shaoyong 7329c54eab 物料检验项目维护修复 1 year ago
wws f60d6559f9 Merge remote-tracking branch 'origin/master' 1 year ago
wws fab6f3aa28 手持接口-巡检工单 1 year ago
shaoyong 3c40a7df23 物料检验项目维护 1 year ago
zhaoxiaolin c1fac1f909 原料检验任务1.0 1 year ago
wws b865658cb2 巡检工单填写记录 1 year ago
wws fc69128a8c Merge remote-tracking branch 'origin/master' 1 year ago
wws dcbde38d27 巡检工单填写记录V1 1 year ago
A0010407 870fde44b5 报修 1 year ago
A0010407 d5ae6cea2c 报修+委外工单 1 year ago
wws aedd7d6052 保养计划初始化、巡检工单初始化 1 year ago
zhaoxiaolin d80fe972b3 原料检验任务 1 year ago
shaoyong c67c7a464d 修改物料检验项目实体 1 year ago
wws 8c3829be4d Merge remote-tracking branch 'origin/master' 1 year ago
wws a6d04164ec 1 1 year ago
zhaoxiaolin db3192e9a1 增加排序字段 1 year ago
wws 9c65126191 Merge remote-tracking branch 'origin/master' 1 year ago
wws 4cac17b9bb 巡检计划优化 1 year ago
A0010407 dd8a332ae6 报修+维修工单 1 year ago
wws 08879199ae Merge remote-tracking branch 'origin/master' 1 year ago
wws 6f33aec08c 检查项删除检验逻辑 1 year ago
shaoyong eec6231915 Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 6551e07899 质量系统-检验任务管理2 1 year ago
shaoyong 40b350ac8b Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 34aad9a2bf 质量系统-检验任务管理1 1 year ago
wws ac2f99c2c7 巡检计划修改+删除 1 year ago
wws 411e562832 Merge remote-tracking branch 'origin/master' 1 year ago
wws 6bde4f4df9 巡检计划修改初始化 1 year ago
ShiChangzhou 78c069cae9 解决sap打包发版问题 1 year ago
wws 435e7adcd4 巡检计划新增接口初始化 1 year ago
shaoyong b47919426d Merge remote-tracking branch 'origin/master' 1 year ago
shaoyong 579a482c85 物料检验项目维护 1 year ago
wws 38270b9b0a 巡检计划 1 year ago
wws ac78b175ca Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java
#	op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java
1 year ago
wws 33a6a48497 Merge remote-tracking branch 'origin/master' 1 year ago
wws e56dc7446b 巡检计划 1 year ago
A0010407 a10b915de3 改名字+报修 1 year ago
A0010407 c78f1542ed 备品备件领用 1 year ago
A0010407 23659427c6 备品备件领用 1 year ago