Commit Graph

112 Commits (9bd199395d1a6f683122c6d89ff5acacbe0e1996)

Author SHA1 Message Date
philip bbd12432d5 物料消耗+报工
赵嘉伟 945d72fedd Merge remote-tracking branch 'origin/master'
赵嘉伟 d6e03c0cdc 异常计时器
Leon 86e05c1728 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
Leon a473213da8 标签打印&测试问题修改
philip 6c0c851064 自报
赵嘉伟 5285db7d3a Merge remote-tracking branch 'origin/master'
赵嘉伟 80f12130a8 异常计时器
Leon 17a45bff59 标签打印
赵嘉伟 7a0d07ee96 根据工序查找不合格代码
赵嘉伟 69ec898a9d 异常消息发送和生产操作员面板pod
赵嘉伟 ec25f7bd45 format方法格式化
赵嘉伟 e75396aaaa 消息类型表导入
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 fd818a5a37 装配
zpl 9e2fda10ac 设备车间
zpl 32a6f7e842 上下料功能、设备点检计划维护bug修复
philip a931fd2f93 Merge remote-tracking branch 'origin/master'
philip 7100fb5801 工序描述
Leon bbb377436c CAPP接口功能开发
赵嘉伟 524978b737 Merge remote-tracking branch 'origin/master'
赵嘉伟 52099503c6 质量异常模块提交
zpl 477da3d3a3 设备接口模块更新
赵嘉伟 e8d3818f99 异常bug修改,附件上传
philip 3943955bf4 自报
赵嘉伟 eb11ffa11f 异常bug修改
Leon 91224958e1 Merge remote-tracking branch 'mesnac/master'
# Conflicts:
#	dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SurplusItemReturnServiceImpl.java
zpl 8eb343adde Merge remote-tracking branch 'origin/master'
zpl e34179c64a 设备点检、维修模块更新
Leon 48d9f577dc 设备接口
philip 2371eb7afe 更改派工状态
Leon 9ed8f5f895 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
# Conflicts:
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/InventoryMapper.java
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Inventory.java
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/service/InventoryService.java
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/InventoryServiceImpl.java
Leon 8777d65d43 余料标示
philip 1e35a78537 检验任务
赵嘉伟 82f7d0d36c 7月9日,其他异常响应维护,和异常提报、待办事项Bug修改
zpl 8cf9d7ef86 Merge remote-tracking branch 'origin/master'
zpl eaa22df0cf 设备点检、维修模块更新
philip 9dce721751 上/卸料
Leon 7517c1deac Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
zpl bac78a3dff Merge remote-tracking branch 'origin/master'
zpl 6016bd93dc 设备维修任务模块更新
Leon db6e6fd85d Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
赵嘉伟 d29583f73c 质量异常响应功能、质量异常提报bug修改
Leon 318b246882 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
Leon c7479acfd9 车间发料功能
赵嘉伟 c37bc8599f Merge remote-tracking branch 'origin/master'
赵嘉伟 7a111d42b5 质量异常响应、质量异常提报bug修改