87 Commits (6c19eb496ed61dfc6c9eb97adc0b59bcc33b0eec)

Author SHA1 Message Date
zpl 477da3d3a3 设备接口模块更新 4 years ago
赵嘉伟 e8d3818f99 异常bug修改,附件上传 4 years ago
philip 3943955bf4 自报 4 years ago
赵嘉伟 eb11ffa11f 异常bug修改 4 years ago
Leon 91224958e1 Merge remote-tracking branch 'mesnac/master'
# Conflicts:
#	dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SurplusItemReturnServiceImpl.java
4 years ago
zpl 8eb343adde Merge remote-tracking branch 'origin/master' 4 years ago
zpl e34179c64a 设备点检、维修模块更新 4 years ago
Leon 48d9f577dc 设备接口 4 years ago
philip 2371eb7afe 更改派工状态 4 years ago
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
4 years ago
Leon 8777d65d43 余料标示 4 years ago
philip 1e35a78537 检验任务 4 years ago
赵嘉伟 82f7d0d36c 7月9日,其他异常响应维护,和异常提报、待办事项Bug修改 4 years ago
zpl 8cf9d7ef86 Merge remote-tracking branch 'origin/master' 4 years ago
zpl eaa22df0cf 设备点检、维修模块更新 4 years ago
philip 9dce721751 上/卸料 4 years ago
Leon 7517c1deac Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz 4 years ago
zpl bac78a3dff Merge remote-tracking branch 'origin/master' 4 years ago
zpl 6016bd93dc 设备维修任务模块更新 4 years ago
Leon db6e6fd85d Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz 4 years ago
赵嘉伟 d29583f73c 质量异常响应功能、质量异常提报bug修改 4 years ago
Leon 318b246882 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz 4 years ago
Leon c7479acfd9 车间发料功能 4 years ago
赵嘉伟 c37bc8599f Merge remote-tracking branch 'origin/master' 4 years ago
赵嘉伟 7a111d42b5 质量异常响应、质量异常提报bug修改 4 years ago
philip 2ba6206ac9 检验任务 4 years ago
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
4 years ago
Leon c63daa7ef6 增加修改派工单状态接口 4 years ago
赵嘉伟 7f25989760 Merge remote-tracking branch 'origin/master' 4 years ago
赵嘉伟 1916916935 不良代码待办事项 4 years ago
philip a118947288 工序弹出框 4 years ago
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
4 years ago
赵嘉伟 7805bc4595 Merge remote-tracking branch 'origin/master' 4 years ago
赵嘉伟 755d461717 质量异常提报完成 4 years ago
philip eaf7ea4156 pod 4 years ago
Leon 36beeaac9f Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz 4 years ago
Leon 6d157881c1 生产叫料功能提交 4 years ago
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
4 years ago
zpl 23930608bd 设备管理模块--设备检验任务模块更新 4 years ago
赵嘉伟 2438792b20 其他异常提交(已完成) 4 years ago
赵嘉伟 1471d4672c Merge remote-tracking branch 'origin/master' 4 years ago
赵嘉伟 2cc1023904 其他异常提交 4 years ago
Leon e2775bc7d0 SFC跟踪功能 4 years ago
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
4 years ago
Leon e3499ba197 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
# Conflicts:
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/SfcController.java
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/SfcMapper.java
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/service/SfcService.java
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/SfcServiceImpl.java
#	meapi/src/main/resources/mapper/SfcMapper.xml
4 years ago
philip 9798e037ac pod 4 years ago
Leon b5932fdeb0 移动端主界面 4 years ago
赵嘉伟 1dc6f78310 DATA_FIELD 和 DATA_FIELD_LIST表导入 4 years ago
赵嘉伟 ed78e0e419 Merge remote-tracking branch 'origin/master' 4 years ago
赵嘉伟 d06b5aec4f 质量异常提报,未开发完成 4 years ago