Commit Graph

165 Commits (0ca4dec56e0913c04d12456b751b69a1692b3830)

Author SHA1 Message Date
Leon b497fd94a9 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
Leon 76bf6243c5 工单整理下达报错修改
philip 8d4bd65347 增加下料描述
philip ec1afb9aa5 增加上工序的完成状态(是否完成)、完成人员名称
zpl d123c530a4 Merge remote-tracking branch 'origin/master'
philip aab67ca92a 暂停开始
zpl 080abd7242 用户是否在指定组
zpl 36fc867e34 用户是否在指定组
赵嘉伟 7a2b2cc404 异常待办事项
赵嘉伟 f84ade0111 异常发送消息
zpl f5fade663b 设备维修,员工显示名称、不良代码显示名称
zpl 94f84ac3bc Merge remote-tracking branch 'origin/master'
zpl 40c3245f76 叫料查询修改
Leon 401a56439e Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
# Conflicts:
#	common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java
#	dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/UserGroupMapper.java
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/service/UserGroupService.java
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/UserGroupServiceImpl.java
#	meapi/src/main/resources/mapper/UserGroupMapper.xml
Leon 70f1482493 生产派工测试问题处理
赵嘉伟 7ff2eebadf 异常代码优化提交
philip 0580d0547d 工序dto
philip ef2378390a 不合格代码修改
赵嘉伟 268d02b6fd Merge remote-tracking branch 'origin/master'
赵嘉伟 13976aad2a 异常bug的修改
zpl 45b103cdc5 新增不合格代码组查询
zpl 96e807a2f4 Merge remote-tracking branch 'origin/master'
zpl 7b8437d82e 生产异常修改
philip 43db6a3385 查找下工序
philip 96369b1a62 产前准备任务检索修改
philip 5e053f8671 Merge remote-tracking branch 'origin/master'
philip 5213bb81ef 资源筛选
Leon 4460a78b77 打印机维护
Leon ada6099b6b 工艺路线接口变更修改
Leon d0068c2479 工艺路线接口变更修改
Leon c8348b38f7 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
Leon 6b71552fd0 工艺路线接口变更修改
philip 555f197712 库存回车
philip 4e29e82e22 Merge remote-tracking branch 'origin/master'
philip 85ac05b441 拆分
Leon 7f20a2229b 计划派工+物料功能修改
philip bba0303e57 产前准备修改
Leon c5e9c04b02 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
Leon 70cdb0d7fd 派工修改发布报错
zpl 0c6fa7c478 Merge remote-tracking branch 'origin/master'
zpl b860ca1c6c 设备状态Handel修改
赵嘉伟 0890dd6b2b Merge remote-tracking branch 'origin/master'
赵嘉伟 6431c44423 生产报废导出word功能
philip be05ddfdc4 车间转入转出
赵嘉伟 083a8379e5 质量异常提报
赵嘉伟 44a74dac3d Merge remote-tracking branch 'origin/master'
赵嘉伟 78d90e78ce 质量异常提报
Leon b934709378 报废调用派工接口
赵嘉伟 cfd7e504f2 质量异常自报
赵嘉伟 0ea1db37c6 质量异常自报