Commit Graph

1230 Commits (6e8846e5628599aa799ed42c44f082bc3d14890c)
 

Author SHA1 Message Date
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
wws 33a6a48497 Merge remote-tracking branch 'origin/master'
wws e56dc7446b 巡检计划
A0010407 a10b915de3 改名字+报修
A0010407 c78f1542ed 备品备件领用
A0010407 23659427c6 备品备件领用
zhaoxiaolin 6ccba2ca54 Merge remote-tracking branch 'origin/master'
zhaoxiaolin 73d26c1f8b sap基础数据同步,更新时段修改
wws 5299c1e27d Merge remote-tracking branch 'origin/master'
wws 54715aaf0b 巡检计划
A0010407 91c175fff1 备品备件台账
A0010407 bce6390db6 备品备件入库+备品备件台账
zhaoxiaolin 50da3686fb 推送镜像指令
zhaoxiaolin d4ce34c332 1、看板料罐车数获取;2、小时产量加班次、分钟数做活,导出功能;3、工序完成记录加入班次
A0010407 497e14c965 备品备件台账
wws 8e4a8bb12b 巡检计划初始化
shaoyong cd3d3bd928 检验节点维护
zhaoxiaolin b1d37a7c79 下工序机台获取接口
zhaoxiaolin 316c053a6e Merge remote-tracking branch 'origin/master'
zhaoxiaolin 57ff0dd3ea 小时产量报表增加合计
wws ba6c52fa70 Merge remote-tracking branch 'origin/master'
wws 2de0b1d2df 故障类型维护(优化查询)
Yangwl a165813130 Merge remote-tracking branch 'origin/master'
Yangwl 571f3b154b Constants文件增加参数
wws 991a9e874b Merge remote-tracking branch 'origin/master'
wws 9b7791718c 设备管理-故障类型V1.1
zhaoxiaolin f6ebd9e321 看板、小时产量报表
wws 433a307c75 设备管理-创建/更新字段BUG
wws 25b5fbe636 Merge remote-tracking branch 'origin/master'
wws 2efd13594d 设备管理-故障类型V1
Yangwl fdf2c8ce69 Merge remote-tracking branch 'origin/master'
Yangwl 63d00b8a45 SAP订单同步接口增加工厂参数、修改MES连接SAP工具类。删除多余文件。
wws 22bd4abe35 Merge remote-tracking branch 'origin/master'
wws ebe364450a 设备管理-故障类型初始化
zhaoxiaolin e0e08736bf 看板接口3
wws eabf618a1a Merge remote-tracking branch 'origin/master'
zhaoxiaolin d19159a2f3 看板接口2
wws eb7ad777ec 设备管理-检查项维护V2(关联设备)
zhaoxiaolin d6e558f422 工序产量查询
zhaoxiaolin ff20d3cfa4 白坯订单v3
zhaoxiaolin 9067f3772c Merge remote-tracking branch 'origin/master'
zhaoxiaolin 2868dfb34a 白坯订单v2
wws bf8cc70fc8 Merge remote-tracking branch 'origin/master'
wws e31a93752a 设备管理-检查项维护(事务锁)
zhaoxiaolin 6f814376ca Merge remote-tracking branch 'origin/master'
zhaoxiaolin 41b3459f8b 白坯生产报表
wws 40f0238071 设备管理-检查项维护(修改BUG修复)
wws 8b3acc99b7 设备管理-检查项维护(修改BUG修复)
wws 48debb98d3 设备管理-检查项维护V1.1
wws 57ffbd7968 设备管理-检查项维护V1