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 |
|
philip
|
a0aef728b5
|
公共方法
|
4 years ago |
Leon
|
d52fd91f67
|
WebService接口日志记录类
|
4 years ago |
|
zpl
|
ccdeb40419
|
设备管理模块--设备检验计划模块更新
|
4 years ago |
|
zpl
|
06964c02c0
|
Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
|
4 years ago |
|
philip
|
6112e89710
|
检验项目维护
|
4 years ago |
|
zpl
|
3b280cdb8d
|
Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
|
4 years ago |
|
zpl
|
d9a5c9ac6f
|
设备管理模块--设备检验计划模块更新
|
4 years ago |
|
philip
|
7308d1b8c1
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
philip
|
f5b7cf7c07
|
检验项目移至common模块
|
4 years ago |
|
Leon
|
4639972908
|
Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
|
4 years ago |
|
Leon
|
d902eeb7fa
|
外部接口增加
|
4 years ago |
|
philip
|
261cea0f00
|
检验项目维护
|
4 years ago |
|
zpl
|
ea74caf4a1
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
zpl
|
d64a7358f9
|
设备管理模块--设备维护、设备类型维护更新
|
4 years ago |
|
Leon
|
994ccf6628
|
项目启动不需要加载所有Mapper内容
|
4 years ago |
|
Leon
|
582e283785
|
工单整理刷新派工单功能
|
4 years ago |
|
Leon
|
1bb8b80c23
|
主数据分页查询语句修改
|
4 years ago |
|
zpl
|
76832ba1a8
|
设备管理模块--设备维护、设备类型维护更新
|
4 years ago |
|
Leon
|
647c7ac821
|
增加设备管理模块
|
4 years ago |
|
赵嘉伟
|
85e2e00cfd
|
工作日历、工作时段初始化提交
|
4 years ago |
|
Leon
|
3c98e2798f
|
项目模块创建
|
4 years ago |
|
Leon
|
107699d055
|
init
|
4 years ago |
|
philip
|
bbd12432d5
|
物料消耗+报工
|
4 years ago |
|
Leon
|
86e05c1728
|
Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
|
4 years ago |
|
Leon
|
a473213da8
|
标签打印&测试问题修改
|
4 years ago |
|
Leon
|
0a6c5d44b2
|
Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
|
4 years ago |
|
Leon
|
858e1a626f
|
WebService接口日志记录类
|
4 years ago |