Commit Graph

1097 Commits (f656a9aa5dc1a583690d41e7a39593f42f62fa63)
 

Author SHA1 Message Date
wws e0a5330e98 Merge remote-tracking branch 'origin/master'
wws a47b8ead75 保养用时+PDA开始保养接口
zhaoxiaolin 2b16e9e96d 质量报表功能
wws d210876154 1
wws 454367aae5 Merge remote-tracking branch 'origin/master'
wws 74dfb91633 点检、巡检、保养页面优化
A0010407 5c2b404e76 设备
wws 688fe5c39e Merge remote-tracking branch 'origin/master'
wws 1597701d9a 填写记录BUG、PDA查询逻辑
zhaoxiaolin 3e642c17a0 委外保养工单生成
zhaoxiaolin 8dfc341463 下机台获取-unlock
wws 6f8a167d96 Merge remote-tracking branch 'origin/master'
wws 2f9c7c1c03 保养委外
zhaoxiaolin 20abf4cde4 报工+成品计划升级
wws d53c96be6b Merge remote-tracking branch 'origin/master'
wws 560d3dff2f 设备-工单逻辑变更
zhaoxiaolin bda1cbdb55 保养定时任务
wws 76bdb1fbb3 点检、巡检查询优化
wws 8847b8e57c Merge remote-tracking branch 'origin/master'
wws c3f27a0b37 点检、巡检、保养逻辑优化
zhaoxiaolin 24fe8b0b83 保养定时任务
wws 52b3bc3a83 填写记录BUG
wws 6dd294ab7f Merge remote-tracking branch 'origin/master'
zhaoxiaolin cb8863b061 mes报工
wws 41cd2fa5f8 查询BUG
wws 3bd0d8a653 设备看板接口
wws 126ff29e69 Merge remote-tracking branch 'origin/master'
wws 90d9b80bf7 点击工单BUG
Yangwl 2a5cb29acd 烘房看板接口
# Conflicts:
#	op-modules/op-mes/push-mes.bat
Yangwl 3017b71215 烘房看板接口
Yangwl c0ee7ca097 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java
Yangwl 598ec4a496 烘房看板接口
# Conflicts:
#	op-modules/op-mes/push-mes.bat
zhaoxiaolin 4939bad46f mes报工
zhaoxiaolin d3c51aeff9 Merge remote-tracking branch 'origin/master'
zhaoxiaolin 96223a90a0 mes报工
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
wws 2201ea4bce 1
wws 32c08aaec5 1
zhaoxiaolin ba999d484c 成品计划修改
zhaoxiaolin 6974fa79fa 质量点检定时任务
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
Yangwl bb0ac02cc8 烘房看板接口
Yangwl cec59e4bc4 烘房看板接口
A0010407 c044825dd4 公共库文件对象 图片类型
wws 5bf8279617 计划新增-parentCode存放上级id
wws 5ff08114f2 计划新增-parentCode存放上级id(修改查询未完善)
wws 6e236cb58d 删除标准code、备件code字段、工单查询逻辑变更
wws bf0ea1b707 Merge remote-tracking branch 'origin/master'
wws 8874da06bc 备件信息-库存
zhaoxiaolin 4f2b0c6e01 成品bug修改