Commit Graph

120 Commits (c7c783f2cc829d84d0474dd830c35f5d8dd5ddf6)

Author SHA1 Message Date
philip d01f2fdfc5 Merge remote-tracking branch 'origin/master'
philip 19047b8073 自报
zpl 21c22aa6d1 刀具维护的功能完善
zpl 1a76d572a2 设备模块更新、新增刀具
philip 56982f9a29 pod
philip 1e35a78537 检验任务
philip 9dce721751 上/卸料
philip 2ba6206ac9 检验任务
philip a8e475e169 检验任务
Leon d13545f9ab Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
# Conflicts:
#	common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java
philip eaf7ea4156 pod
Leon 6d157881c1 生产叫料功能提交
Leon e2775bc7d0 SFC跟踪功能
Leon ddcaa726d2 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
# Conflicts:
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/SfcDto.java
philip 9798e037ac pod
Leon b5932fdeb0 移动端主界面
philip ac9496a822 生产准备任务检验
philip a4d0209f80 产前准备任务生成
philip a0aef728b5 公共方法
Leon 3c98e2798f 项目模块创建