91 Commits (bb17f7e1ab825d29bf270356d5548b5a987140b0)

Author SHA1 Message Date
Leon bb17f7e1ab 配置文件增加打印地址 4 years ago
Leon ee130d7cc9 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz 4 years ago
Leon 296aa3ba86 打印日志记录 4 years ago
zpl 01a3e636c1 Merge remote-tracking branch 'origin/master' 4 years ago
zpl 3778d070ff 刀具导入功能 4 years ago
philip 37b2695433 检验项目设备检验可不附加 4 years ago
Leon ce7ed6f618 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
# Conflicts:
#	production/src/main/java/com/foreverwin/mesnac/production/service/impl/CutterLogServiceImpl.java
4 years ago
Leon bbb377436c CAPP接口功能开发 4 years ago
philip 4ffd875b1e 导入 4 years ago
zpl b4c4a4a133 Merge remote-tracking branch 'origin/master' 4 years ago
zpl 6c19eb496e 刀具维护的功能完善 4 years ago
zpl d54e96d9e8 Merge remote-tracking branch 'origin/master' 4 years ago
zpl 21c22aa6d1 刀具维护的功能完善 4 years ago
Leon 7152bfc137 ERP接口调用公共方法。 4 years ago
Leon d019920fd1 Merge remote-tracking branch 'mesnac/master'
# Conflicts:
#	common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java
4 years ago
Leon a3259e08c4 ERP接口调用公共方法。 4 years ago
zpl 1a76d572a2 设备模块更新、新增刀具 4 years ago
philip 3e7cad5feb 产前准备 4 years ago
赵嘉伟 44d88c8fc6 Merge remote-tracking branch 'origin/master' 4 years ago
赵嘉伟 cc34317921 设备异常响应转维修 4 years ago
philip 387393941f 产前准备 4 years ago
Leon 201a2d7f33 车间发料 4 years ago
philip 3943955bf4 自报 4 years ago
赵嘉伟 661d1056fc 其他异常和设备异常接口,异常bug修改 4 years ago
赵嘉伟 eb11ffa11f 异常bug修改 4 years ago
philip 6cf8a3dc18 Merge remote-tracking branch 'origin/master' 4 years ago
philip 56982f9a29 pod 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
philip 1e35a78537 检验任务 4 years ago
赵嘉伟 0d49a71fe4 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
Leon db6e6fd85d Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz 4 years ago
赵嘉伟 d29583f73c 质量异常响应功能、质量异常提报bug修改 4 years ago
Leon c7479acfd9 车间发料功能 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
philip a8e475e169 检验任务 4 years ago
zpl 81cd0d3c0b Merge remote-tracking branch 'origin/master'
# Conflicts:
#	common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java
4 years ago
zpl d2bcb4a074 设备管理模块--设备检验任务模块更新 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