Commit Graph

216 Commits (87872040832aae33db2eec0fc6270007f2c9bf3a)

Author SHA1 Message Date
zpl 8787204083 Merge remote-tracking branch 'origin/master'
zpl 9f1d9862d3 新增SFC标签打印功能
赵嘉伟 38c1b224a8 Merge remote-tracking branch 'origin/master'
赵嘉伟 3d317c1c1e 生产派工发布
philip ecc09e4e86 打印次数
zpl 2b99ad1016 Merge remote-tracking branch 'origin/master'
zpl 5eac000492 功能修改
赵嘉伟 af51295f35 Merge remote-tracking branch 'origin/master'
赵嘉伟 48388b41f7 异常bug修改,异常逻辑修改
Leon 952be848f5 生产派工实际时间显示
zpl 2bddd95c28 功能优化
赵嘉伟 55afd862f7 异常消息发送
赵嘉伟 b3027b8b1e 异常消息发送
philip 9d0786e2e2 Merge remote-tracking branch 'origin/master'
philip 8d4bd65347 增加下料描述
Leon eae2dfd36a Merge remote-tracking branch 'mesnac/master'
Leon 69c3e2fabf 报表工具
zpl d123c530a4 Merge remote-tracking branch 'origin/master'
Leon 2e2b9a9928 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
Leon 845f7a785b 报表工具
zpl cc4fd3e7bd 打印bug修改
赵嘉伟 5c42465472 Merge remote-tracking branch 'origin/master'
赵嘉伟 f84ade0111 异常发送消息
zpl c7c9b3d156 界面修改
philip ce9152b5e2 产前准备PDA
赵嘉伟 881f141269 ActiveMQUtil
zpl 94f84ac3bc Merge remote-tracking branch 'origin/master'
赵嘉伟 400170d0e0 Merge remote-tracking branch 'origin/master'
赵嘉伟 e373102a9e ActiveMQUtil发送消息
zpl 102a1e17bb 标签打印新增物料查询
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 生产派工测试问题处理
zpl 57157ecc61 Merge remote-tracking branch 'origin/master'
zpl 8978428501 标签打印修改
zpl 217451e75f 标签打印的打印机修改
philip ba12736be3 辅料使用
zpl a41cb639ed Merge remote-tracking branch 'origin/master'
zpl 54a07a32b4 打印查询功能修改
philip ef2378390a 不合格代码修改
zpl bc176f173e 标签打印修改
zpl dffd98413d 标签打印模板修改
zpl 62e61258b9 设备点检、维修用户名称、不良描述获取
philip 43db6a3385 查找下工序
philip 96369b1a62 产前准备任务检索修改
zpl 4b7fd655c4 标签打印查询修改
zpl 51269282f6 标签打印查询修改
zpl dd26cd8e5f 打印机维护修改
zpl 338a4fbe40 打印机维护
Leon 4b1c103995 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
Leon 4460a78b77 打印机维护