Commit Graph

722 Commits (0b5a6420375b656172b9652cb44550e0f852b8f8)
 

Author SHA1 Message Date
Leon 405ca7284f Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
Leon 32ed7520d8 生产派工查询条件修改。
philip 0a5877ec4a 点检
Leon 987415f7b7 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
philip dfd24d9553 111
Leon 47e0df5c43 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
Leon cabff3e6af 派工增加查询字段
philip 9457838f82 Merge remote-tracking branch 'origin/master'
philip 07026b3c42 拆分
赵嘉伟 032cc840ff Merge remote-tracking branch 'origin/master'
赵嘉伟 3df8ebe57e activeMq改enable改true
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 4a14ae5de6 Merge remote-tracking branch 'origin/master'
philip 3805f3d0be 专检
赵嘉伟 07f781744a 异常bug修改
philip 9b51db95ec Merge remote-tracking branch 'origin/master'
philip 6d94c9abc5 产前准备增加已打印筛选
zpl b5fd5cf3d8 Merge remote-tracking branch 'origin/master'
zpl 7367cc2773 同一设备不能维护相同点检类型的点检计划
zpl 1615ec8785 每日5点,将跳过未完成点检的任务,创建新的点检任务
philip e002e2dfe3 拆分不传车间,派工弹出框
赵嘉伟 9edb816beb Merge remote-tracking branch 'origin/master'
赵嘉伟 da12cc6224 异常bug修改
philip d6c7374221 专检创建新任务,成品标签
philip 57873ca77f Merge remote-tracking branch 'origin/master'
philip f55bbbc92a 拆分
赵嘉伟 f5a031ddd9 Merge remote-tracking branch 'origin/master'
赵嘉伟 876cb78e10 设备维修记录报表
zpl d3f040aa45 月点检bug修改
zpl 11d82e157f Merge remote-tracking branch 'origin/master'
zpl 2633585063 设备点检定时器
Leon d0666401f1 叫料修改:装配只叫辅料类型为9的,其他叫原材料。
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 生产派工发布
zpl 4dace34323 Merge remote-tracking branch 'origin/master'
zpl a871eb28d8 设备维修提报bug修复
philip a3c4a9555c Merge remote-tracking branch 'origin/master'
philip ecc09e4e86 打印次数
赵嘉伟 5303fa0e7a Merge remote-tracking branch 'origin/master'
赵嘉伟 1aa594a15d gitee测试
zpl c6d7d8d434 功能修改
zpl f693724ef9 功能修改
zpl aa0b7e6262 功能修改
zpl d493ada61f 功能修改