Commit Graph

100 Commits (bf04c7bdcfb4f033e20ed4529db088438181c13c)

Author SHA1 Message Date
shaoyong cd3d3bd928 检验节点维护
zhaoxiaolin 9bea4d9d6c 工单编码
zhaoxl 21949d6e79 zxl
zhaoxiaolin 4a0b3dc0b2 手持修改
zhaoxiaolin ccb8a178cb 生产环境
zhaoxiaolin da2074411b 数据源
A0010407 d193c0c676 手持查询
zhaoxiaolin c5866a95c6 手持接口+订单bug修复
zhaoxiaolin f92e75d11f 计划问题修改
zhaoxiaolin e38a563f81 逻辑删除+手持增加缓冲区接口
zhaoxiaolin f778b42cbc sap模块代码合并
chj 39773ffbc8 成品销售出库修改
zhaoxiaolin 139dc3fb4c 日生产报表功能
zhaoxiaolin 7fefe369cc 计划bug和质量bug修改
zhaoxiaolin 5a60b22157 计划-设备路线选择更改;报工定时任务;
zhaoxiaolin c1885b1805 手持质量检验
zhaoxiaolin d6d5ff4ae3 计划bug修改-- 计划的选择方式修改
zhaoxiaolin 76036ee69a 计划bug修改
周鸿羽(海威) 9c77c577d9 上传文件至 'op-modules/op-quality/src/main/java/com/op/quality/mapper'
周鸿羽(海威) 53b84eeb5b 上传文件至 'op-modules/op-quality/src/main/java/com/op/quality/Controller'
周鸿羽(海威) 7d4632e30b 上传文件至 'op-modules/op-quality/src/main/java/com/op/quality/Controller'
周鸿羽(海威) 8996a9396a 删除多余文件
zhaoxiaolin 60de714016 sap模块代码整合
zhaoxl 7158568d2d 更新 'op-modules/op-quality/src/main/resources/mapper/QcProCheckMapper.xml'
zhaoxl bf47235f34 上传文件至 'op-modules/op-quality/src/main/resources/mapper'
zhaoxiaolin dee2982dbd 工单下发sap接口联调
zhaoxl 1ff37dc20e 删除 'op-modules/op-quality/src/main/resources/QcProCheckMapper.xml'
zhaoxl 1a14aef2dd 上传文件至 'op-modules/op-quality/src/main/resources/mapper'
zhaoxl 33e8364c4a 上传文件至 'op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl'
zhaoxl 96a998e66e 上传文件至 'op-modules/op-quality/src/main/java/com/op/quality/controller'
zhaoxl 604d6de09c 上传文件至 'op-modules/op-quality/src/main/java/com/op/quality/Controller'
zhaoxl 317e69e12d 上传文件至 'op-modules/op-quality/src/main/java/com/op/quality/Controller'
zhaoxiaolin 7fc87674e9 领料单提交
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 7e49161b5b 上传文件至 'op-modules/op-quality/src/main/resources/mapper'
zhaoxl cf3f610f4f 上传文件至 'op-modules/op-quality/src/main/java/com/op/quality/utils'
zhaoxl 8bc844ae73 上传文件至 'op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl'
zhaoxl 992613c54e 上传文件至 'op-modules/op-quality/src/main/java/com/op/quality/service'
zhaoxl 58d3d2592e 上传文件至 'op-modules/op-quality/src/main/java/com/op/quality/mapper'
zhaoxl 6b76b13263 上传文件至 'op-modules/op-quality/src/main/java/com/op/quality/domain'
zhaoxl cbd1002bfa 上传文件至 'op-modules/op-quality/src/main/java/com/op/quality/Controller'
zhaoxl 1c1319dd5e 上传文件至 'op-modules/op-quality/src/main/java/com/op/quality/config'
zhaoxl a7cf08632e 删除 'op-modules/op-quality/src/main/java/com/op/quality/QcProCheck.java'
zhaoxl c48701e83e 删除 'op-modules/op-quality/src/main/java/com/op/quality/DynamicDatasource.java'
zhaoxl 272382104c 删除 'op-modules/op-quality/src/main/java/com/op/quality/BaseFile.java'
zhaoxl 0c134bcd2f 删除 'op-modules/op-quality/src/main/java/com/op/quality/QuaController.java'
zhaoxl 46e476cc33 上传文件至 'op-modules/op-quality/src/main/java/com/op/quality'
Yangwl 73aca5b45b Merge branch 'master' of F:\workplace-idea\榄菊\lanju-cloud with conflicts.
zhaoxiaolin 95205cd536 微服务添加