Commit Graph

93 Commits (32a6f7e84224f5479984d9682df32b79c7ddde09)

Author SHA1 Message Date
zpl 32a6f7e842 上下料功能、设备点检计划维护bug修复
philip a931fd2f93 Merge remote-tracking branch 'origin/master'
philip 7100fb5801 工序描述
Leon bbb377436c CAPP接口功能开发
赵嘉伟 524978b737 Merge remote-tracking branch 'origin/master'
赵嘉伟 52099503c6 质量异常模块提交
zpl 477da3d3a3 设备接口模块更新
赵嘉伟 e8d3818f99 异常bug修改,附件上传
philip 3943955bf4 自报
赵嘉伟 eb11ffa11f 异常bug修改
Leon 91224958e1 Merge remote-tracking branch 'mesnac/master'
# Conflicts:
#	dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SurplusItemReturnServiceImpl.java
zpl 8eb343adde Merge remote-tracking branch 'origin/master'
zpl e34179c64a 设备点检、维修模块更新
Leon 48d9f577dc 设备接口
philip 2371eb7afe 更改派工状态
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 检验任务
赵嘉伟 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 db6e6fd85d Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
赵嘉伟 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 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 增加修改派工单状态接口
赵嘉伟 7f25989760 Merge remote-tracking branch 'origin/master'
赵嘉伟 1916916935 不良代码待办事项
philip a118947288 工序弹出框
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
赵嘉伟 7805bc4595 Merge remote-tracking branch 'origin/master'
赵嘉伟 755d461717 质量异常提报完成
philip eaf7ea4156 pod
Leon 36beeaac9f Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
Leon 6d157881c1 生产叫料功能提交
zpl ce0b98d283 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	common/src/main/java/com/foreverwin/mesnac/common/enums/HandleEnum.java
#	generator/src/main/java/com/foreverwin/minth/generator/GeneratorApplication.java
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/UserGroupController.java
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/UserGroupMapper.java
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/model/UserGroup.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
zpl 23930608bd 设备管理模块--设备检验任务模块更新
赵嘉伟 2438792b20 其他异常提交(已完成)
赵嘉伟 1471d4672c Merge remote-tracking branch 'origin/master'
赵嘉伟 2cc1023904 其他异常提交
Leon e2775bc7d0 SFC跟踪功能
Leon ddcaa726d2 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
# Conflicts:
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/SfcDto.java