Commit Graph

995 Commits (b63e1b14bae596cdc5806569d62d063b538c0213)
 

Author SHA1 Message Date
Leon 2047ebc302 质量模块功能提交
zpl 36a8275c55 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
赵嘉伟 7a0d07ee96 根据工序查找不合格代码
zpl a24a2afde9 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
赵嘉伟 69ec898a9d 异常消息发送和生产操作员面板pod
赵嘉伟 26ef51836f 异常消息发送
赵嘉伟 edef2e53be 图片上传bug修改
zpl 512778b744 设备模块更新
赵嘉伟 ec25f7bd45 format方法格式化
赵嘉伟 e75396aaaa 消息类型表导入
赵嘉伟 965bbeafc8 异常单和异常消息表导入
philip 48062cee2f Merge remote-tracking branch 'origin/master'
philip 4c4871942e 装配
Leon 32f7be77c1 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
Leon 20011e5be5 物料管理修改
zpl 3f40add8b6 Merge remote-tracking branch 'origin/master'
zpl 246e8f43f7 设备模块更新
philip b572ec1cb7 Merge remote-tracking branch 'origin/master'
philip fd818a5a37 装配
Leon 1b1680f2f6 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
zpl 9e2fda10ac 设备车间
Leon e0fd7a8dcb Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
Leon 869b5035eb 叫料发布
zpl dd3d3d2b8d Merge remote-tracking branch 'origin/master'
zpl 32a6f7e842 上下料功能、设备点检计划维护bug修复
赵嘉伟 acec9d177d 其他异常修改提交
赵嘉伟 4ee60c5baa Merge remote-tracking branch 'origin/master'
赵嘉伟 d6d16737c8 质量异常修改提交
Leon bb17f7e1ab 配置文件增加打印地址
Leon ee130d7cc9 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
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 主数据导入完善