philip
|
e86246cbd3
|
meapi加主键
|
4 years ago |
Leon
|
6f89cbc3ec
|
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 |
|
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 |
赵嘉伟
|
0335019750
|
异常提报中的不良代码和不良代码组提交
|
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
|
ef6bc11de2
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
philip
|
a4d0209f80
|
产前准备任务生成
|
4 years ago |
|
赵嘉伟
|
964d638f00
|
NC_CODE表提交
|
4 years ago |
|
赵嘉伟
|
56de63fd6d
|
员工资源表 逻辑修改提交（完成）
|
4 years ago |
|
赵嘉伟
|
b1d42a38f0
|
NC_GROUP 表导入
|
4 years ago |
|
赵嘉伟
|
2279597387
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
赵嘉伟
|
11f4b8dd89
|
NC_CODE表导入
|
4 years ago |
|
philip
|
a0aef728b5
|
公共方法
|
4 years ago |
|
赵嘉伟
|
e0559aa7b1
|
员工资源对应表 终极优化
|
4 years ago |
|
philip
|
6112e89710
|
检验项目维护
|
4 years ago |
|
赵嘉伟
|
088ca8c3ab
|
员工资源对应表功能 NWA的实现类
|
4 years ago |
|
赵嘉伟
|
4b90eb9f43
|
员工资源对应表功能
|
4 years ago |
|
赵嘉伟
|
40cb5c404e
|
员工资源对应表功能 + Z_NWA_USER表提交
|
4 years ago |
Leon
|
4639972908
|
Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
|
4 years ago |
|
Leon
|
d902eeb7fa
|
外部接口增加
|
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 |
|
赵嘉伟
|
e489b24c9f
|
检验项目维护提交 （物料、工序、工步弹出框）
|
4 years ago |
|
赵嘉伟
|
fa58163678
|
检验项目维护初始化提交（1）
|
4 years ago |
|
Leon
|
582e283785
|
工单整理刷新派工单功能
|
4 years ago |
|
Leon
|
1bb8b80c23
|
主数据分页查询语句修改
|
4 years ago |
|
zpl
|
76832ba1a8
|
设备管理模块--设备维护、设备类型维护更新
|
4 years ago |
|
赵嘉伟
|
a13b5fb991
|
工作日历、工作时段 url修改
|
4 years ago |
|
赵嘉伟
|
19fb5cd76f
|
工作日历、工作时段 工作中心分页显示工作中心和描述
|
4 years ago |
|
赵嘉伟
|
c97e1cda0b
|
工作日历、工作时段初始化2 ，工作中心添加描述
|
4 years ago |
|
赵嘉伟
|
85e2e00cfd
|
工作日历、工作时段初始化提交
|
4 years ago |
|
Leon
|
3c98e2798f
|
项目模块创建
|
4 years ago |
|
Leon
|
107699d055
|
init
|
4 years ago |