Commit Graph

235 Commits (814e7e68b3179c63d56fad5876cca97da8d7a2bd)

Author SHA1 Message Date
philip 814e7e68b3 工序描述
philip bd5a8ccdf0 Merge remote-tracking branch 'origin/master'
philip bc81539ac5 打印
zpl 87e6dc413c Merge remote-tracking branch 'origin/master'
zpl 53d7c472cf 打印请求
philip 786c371f5d Merge remote-tracking branch 'origin/master'
philip abc2b9b07b 成品标签加项目号
zpl eb02cd1d08 Merge remote-tracking branch 'origin/master'
zpl 09a57fad02 打印请求
philip 0a5877ec4a 点检
Leon 1f090f3466 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
# Conflicts:
#	anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java
#	anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java
#	anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java
#	anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java
#	anomaly/src/main/resources/mapper/ReportMapper.xml
#	quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionTaskManageServiceImpl.java
Leon 8ccf921943 质量修改检验任务问题。
Leon dd6fd856c5 质量修改检验任务问题。
philip 3805f3d0be 专检
philip 6d94c9abc5 产前准备增加已打印筛选
philip d6c7374221 专检创建新任务,成品标签
philip 54772894f5 Merge remote-tracking branch 'origin/master'
philip bb90cf6a5d 车间转入转出
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 生产派工测试问题处理