618 Commits (6f8a167d969f541fc455236f065e6e4e35c7abaf)

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