Commit Graph

865 Commits (fabb62f5bbbb0ce46de045e334ec126b41966334)
 

Author SHA1 Message Date
Leon 296aa3ba86 打印日志记录
zpl 01a3e636c1 Merge remote-tracking branch 'origin/master'
zpl 3778d070ff 刀具导入功能
Leon c8cc9310d8 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
Leon 561d0f686f ERP报工接口测试
philip c405dfc8b0 Merge remote-tracking branch 'origin/master'
philip 37b2695433 检验项目设备检验可不附加
zpl b39ace89f3 Merge remote-tracking branch 'origin/master'
zpl 92516d081c 设备接口的功能完善
philip a931fd2f93 Merge remote-tracking branch 'origin/master'
philip 7100fb5801 工序描述
Leon ce7ed6f618 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
# Conflicts:
#	production/src/main/java/com/foreverwin/mesnac/production/service/impl/CutterLogServiceImpl.java
Leon bbb377436c CAPP接口功能开发
philip 4ffd875b1e 导入
Leon 44798dd703 Merge remote-tracking branch 'mesnac/master'
Leon ccd05fd6d1 主数据导入完善
zpl b4c4a4a133 Merge remote-tracking branch 'origin/master'
zpl 6c19eb496e 刀具维护的功能完善
Leon 17630619e7 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
Leon c8e30f1f34 主数据导入完善
赵嘉伟 524978b737 Merge remote-tracking branch 'origin/master'
赵嘉伟 52099503c6 质量异常模块提交
philip d01f2fdfc5 Merge remote-tracking branch 'origin/master'
philip 19047b8073 自报
zpl d54e96d9e8 Merge remote-tracking branch 'origin/master'
zpl 21c22aa6d1 刀具维护的功能完善
Leon ad1db37d71 ERP接口调用公共方法。
Leon 7b67f71d35 ERP接口调用公共方法。
Leon bdbed490e8 ERP接口调用公共方法。
Leon 7152bfc137 ERP接口调用公共方法。
Leon d019920fd1 Merge remote-tracking branch 'mesnac/master'
# Conflicts:
#	common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java
Leon a3259e08c4 ERP接口调用公共方法。
zpl 1a76d572a2 设备模块更新、新增刀具
zpl ed3d2f510a Merge remote-tracking branch 'origin/master'
zpl 477da3d3a3 设备接口模块更新
赵嘉伟 0554ca83e9 上传附件修改
赵嘉伟 8f2f1bfea0 Merge remote-tracking branch 'origin/master'
赵嘉伟 cf5819b295 设备异常修改
philip 3e7cad5feb 产前准备
赵嘉伟 44d88c8fc6 Merge remote-tracking branch 'origin/master'
赵嘉伟 cc34317921 设备异常响应转维修
philip 387393941f 产前准备
赵嘉伟 4148378a4b Merge remote-tracking branch 'origin/master'
赵嘉伟 e8d3818f99 异常bug修改,附件上传
Leon 201a2d7f33 车间发料
philip 9147a662ec 异常
philip 3943955bf4 自报
赵嘉伟 c1211ca6c2 其他异常和设备异常接口
赵嘉伟 661d1056fc 其他异常和设备异常接口,异常bug修改
赵嘉伟 09fbc528b8 Merge remote-tracking branch 'origin/master'