Commit Graph

708 Commits (a17f3bca63aa56fc337e259c74001ff03c0f8420)
 

Author SHA1 Message Date
zpl e34179c64a 设备点检、维修模块更新
Leon 48d9f577dc 设备接口
赵嘉伟 203b0054e4 附件上传,异常bug修改
赵嘉伟 77e06fa969 Merge remote-tracking branch 'origin/master'
赵嘉伟 86ee8a3f57 质量异常、设备异常、其他异常生成异常单号
philip 2371eb7afe 更改派工状态
philip e909e04bd1 inventory
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 检验任务
赵嘉伟 0d49a71fe4 7月9日,其他异常响应维护,和异常提报、待办事项Bug修改
赵嘉伟 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 e2d86633a2 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
赵嘉伟 9838b46229 质量异常提报bug提交
Leon db6e6fd85d Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
赵嘉伟 87e0040b2c 质量异常响应功能提交
赵嘉伟 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修改
philip 2ba6206ac9 检验任务
Leon e7bbf36535 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
赵嘉伟 61f8f8543f 异常质量响应提交1
Leon 2a0fd2b9ab Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
# Conflicts:
#	dispatch/src/main/resources/mapper/CallItemMapper.xml
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/OperationMapper.java
#	meapi/src/main/resources/mapper/OperationMapper.xml
Leon c63daa7ef6 增加修改派工单状态接口
philip a8e475e169 检验任务
zpl 0d3e9716de Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
赵嘉伟 7f25989760 Merge remote-tracking branch 'origin/master'
赵嘉伟 1916916935 不良代码待办事项
zpl 81cd0d3c0b Merge remote-tracking branch 'origin/master'
# Conflicts:
#	common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java
zpl d2bcb4a074 设备管理模块--设备检验任务模块更新
philip 6a9dcca7b4 Merge remote-tracking branch 'origin/master'
philip a118947288 工序弹出框
赵嘉伟 6402fb0ed2 Merge remote-tracking branch 'origin/master'
赵嘉伟 fc7ea04394 待办事项提交
philip 9f33792432 123
赵嘉伟 33e6094af0 Merge remote-tracking branch 'origin/master'
赵嘉伟 e848f8d40f 其他异常提报提交
Leon d13545f9ab Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
# Conflicts:
#	common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java
赵嘉伟 3a8f4c6aa9 Merge remote-tracking branch 'origin/master'
赵嘉伟 4d733abd4e 设备异常提报
philip 3ab2ca7531 检验类型
赵嘉伟 7805bc4595 Merge remote-tracking branch 'origin/master'