149 Commits (8659dd8f11c1a6e9500896ac59f93c312d3cde97)

Author SHA1 Message Date
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 6974fa79fa 质量点检定时任务 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 8637740293 点检逻辑前后端优化 1 year ago
wws 28e2f90ce5 Merge remote-tracking branch 'origin/master' 1 year ago
wws 20efabdfd1 点检-巡检-保养-检查项优化 1 year ago
A0010407 a3199b61c1 手持报修维修 后端接口 1 year ago
zhaoxiaolin 2aa1ad4f2e bat换jdk 1 year ago
wws eef550d5ae 实体类同步 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 86effcdbfb 报表优化 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 c466027d74 报表-巡检记录 1 year ago
wws 996c45f972 保养工单-检验+填写记录 1 year ago
wws 9e14409743 Merge remote-tracking branch 'origin/master' 1 year ago
wws 2c3f1996b9 保养工单-快速工单 1 year ago
A0010407 1d5b107814 报修+维修+设备班组+委外 1 year ago
A0010407 9bb46f6a5e 报修+维修+设备班组 1 year ago
wws a916fe242b 点检工单、保养工单init 1 year ago
wws fe0727c0d1 点检计划 1 year ago
wws 337eb97c68 Merge remote-tracking branch 'origin/master' 1 year ago
wws 86a39d613c 保养计划-修改 1 year ago
A0010407 39b392d037 报修+维修+委外 1 year ago
wws 8152b17171 保养计划-新增 1 year ago
wws 35b354562b 保养计划 1 year ago
wws 45c3b2b7c9 手持接口-巡检工单-提交接口 1 year ago
wws fab6f3aa28 手持接口-巡检工单 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
wws a6d04164ec 1 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 6f33aec08c 检查项删除检验逻辑 1 year ago
wws ac2f99c2c7 巡检计划修改+删除 1 year ago
wws 6bde4f4df9 巡检计划修改初始化 1 year ago
wws 435e7adcd4 巡检计划新增接口初始化 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
wws 5299c1e27d Merge remote-tracking branch 'origin/master' 1 year ago
wws 54715aaf0b 巡检计划 1 year ago
A0010407 91c175fff1 备品备件台账 1 year ago
A0010407 bce6390db6 备品备件入库+备品备件台账 1 year ago
zhaoxiaolin 50da3686fb 推送镜像指令 1 year ago
A0010407 497e14c965 备品备件台账 1 year ago
wws 8e4a8bb12b 巡检计划初始化 1 year ago
wws 2de0b1d2df 故障类型维护(优化查询) 1 year ago
wws 9b7791718c 设备管理-故障类型V1.1 1 year ago
wws 433a307c75 设备管理-创建/更新字段BUG 1 year ago
wws 2efd13594d 设备管理-故障类型V1 1 year ago
wws ebe364450a 设备管理-故障类型初始化 1 year ago
wws eb7ad777ec 设备管理-检查项维护V2(关联设备) 1 year ago
wws e31a93752a 设备管理-检查项维护(事务锁) 1 year ago
wws 40f0238071 设备管理-检查项维护(修改BUG修复) 1 year ago
wws 8b3acc99b7 设备管理-检查项维护(修改BUG修复) 1 year ago
wws 48debb98d3 设备管理-检查项维护V1.1 1 year ago
wws 57ffbd7968 设备管理-检查项维护V1 1 year ago
wws 5205fab4f9 设备管理-检查项维护(修改) 1 year ago
wws 899f67ebd2 设备管理-检查项维护(新增-code格式) 1 year ago
wws f2fea045e5 Merge remote-tracking branch 'origin/master' 1 year ago
wws e81e645667 设备管理-检查项维护(新增) 1 year ago
zhaoxiaolin 9bea4d9d6c 工单编码 1 year ago
wws 6a14a48c97 Merge remote-tracking branch 'origin/master' 1 year ago
wws 54c39cb2b8 设备管理-检查项维护(工厂factory->factoryCode) 1 year ago
zhaoxl 6cebb21c8d zxl 1 year ago
wws 59ed4122cb 设备管理-检查项维护(搜索优化) 1 year ago
wws 6e57dfe409 设备管理-检查项维护初始化 1 year ago
zhaoxiaolin ccb8a178cb 生产环境 1 year ago
zhaoxiaolin 76036ee69a 计划bug修改 1 year ago
Yangwl 73aca5b45b Merge branch 'master' of F:\workplace-idea\榄菊\lanju-cloud with conflicts. 1 year ago
chj 0e7a206b40 MES报废功能 1 year ago
zhaoxiaolin 95205cd536 微服务添加 1 year ago