Commit Graph

36 Commits (8cbab51130f56a4efc0ccc89c2c9fc30d7221155)

Author SHA1 Message Date
zhaoxiaolin f778b42cbc sap模块代码合并
zhaoxiaolin 980e7f4a11 sap模块代码合并
zhaoxiaolin 139dc3fb4c 日生产报表功能
zhaoxiaolin ca4b21061c 计划bug和质量bug修改
zhaoxiaolin 5a60b22157 计划-设备路线选择更改;报工定时任务;
zhaoxiaolin 5c850ba017 工艺bug修改
zhaoxiaolin e892e8c2fe sap模块代码整合
zhaoxiaolin 60de714016 sap模块代码整合
zhaoxiaolin da486d7e20 订单同步按钮
zhaoxiaolin 944d9d9308 订单同步接口测试
zhaoxiaolin f2151cc0b3 工艺同步接口
zhaoxiaolin 5ddc72024f 工单回传
zhaoxiaolin 1879d18ba9 数据源规则修改
zhaoxiaolin ae4d615aff 领料单获取
zhaoxiaolin d70b27e01f 领料单提交
zhaoxiaolin 7fc87674e9 领料单提交
zhaoxiaolin a5340c0934 领料单提交
zhaoxiaolin 07d80f45c6 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcProCheckServiceImpl.java
#	op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java
zhaoxiaolin 7dc31d221a 领料单提交
zhaoxl 3564e4308c 上传文件至 'op-api/op-api-system/src/main/java/com/op/system/api'
Yangwl 73aca5b45b Merge branch 'master' of F:\workplace-idea\榄菊\lanju-cloud with conflicts.
zhaoxiaolin a87eb0a200 wcs接口开发转移
zhaoxiaolin 67ef0ac298 wcs接口开发转移
zhaoxiaolin ccb5ec78b9 实体目录变更
zhaoxiaolin 91c07021ae wcs跟Mes交互的接口
zhaoxiaolin 362f6a167b 计划涉及的接口开发
Yangwl 7aefee6af8 SAP模块提交订单同步操作
zhaoxiaolin 0741e934cc 微服务拆分4
zhaoxiaolin ce705cbe03 微服务拆分3
zhaoxiaolin b2e861f314 微服务拆分2
Yangwl a72ac03a1e SAP定时任务同步订单
zhaoxiaolin fb0a2ab614 工单变更
zhaoxiaolin 974dd13455 工厂数据源切换
zhaoxiaolin 2dbf3601f6 工序3
zhaoxiaolin 7bbdd00a61 工序1.0
zhaoxiaolin 39a6d33464 init