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 |
|
philip
|
3ab2ca7531
|
检验类型
|
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
|
b5932fdeb0
|
移动端主界面
|
4 years ago |
|
Leon
|
d244e4be9b
|
HANDLE工单
|
4 years ago |
|
Leon
|
2108acf969
|
Merge remote-tracking branch 'mesnac/master'
# Conflicts:
# dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java
# dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java
# dispatch/src/main/resources/mapper/UserResourceMapper.xml
# meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/BomMapper.java
# meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Bom.java
# meapi/src/main/java/com/foreverwin/mesnac/meapi/service/BomService.java
# meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/BomServiceImpl.java
# meapi/src/main/resources/mapper/BomMapper.xml
|
4 years ago |
|
philip
|
ac9496a822
|
生产准备任务检验
|
4 years ago |
|
Leon
|
53aa7398c2
|
ERP接口功能代码提交
|
4 years ago |
|
zpl
|
1f520e16a3
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java
|
4 years ago |
|
zpl
|
a08c76aaaa
|
设备管理模块--设备检验计划模块自动创建任务更新
|
4 years ago |
|
philip
|
a4d0209f80
|
产前准备任务生成
|
4 years ago |