赵嘉伟
|
b3027b8b1e
|
异常消息发送
|
4 years ago |
Leon
|
b497fd94a9
|
Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
|
4 years ago |
|
Leon
|
76bf6243c5
|
工单整理下达报错修改
|
4 years ago |
philip
|
8d4bd65347
|
增加下料描述
|
4 years ago |
|
philip
|
ec1afb9aa5
|
增加上工序的完成状态(是否完成)、完成人员名称
|
4 years ago |
zpl
|
d123c530a4
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
philip
|
aab67ca92a
|
暂停开始
|
4 years ago |
|
zpl
|
080abd7242
|
用户是否在指定组
|
4 years ago |
|
zpl
|
36fc867e34
|
用户是否在指定组
|
4 years ago |
|
赵嘉伟
|
7a2b2cc404
|
异常待办事项
|
4 years ago |
|
赵嘉伟
|
f84ade0111
|
异常发送消息
|
4 years ago |
|
zpl
|
f5fade663b
|
设备维修，员工显示名称、不良代码显示名称
|
4 years ago |
|
zpl
|
94f84ac3bc
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
zpl
|
40c3245f76
|
叫料查询修改
|
4 years ago |
|
Leon
|
401a56439e
|
Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
# Conflicts:
# common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java
# dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java
# meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/UserGroupMapper.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 |
|
Leon
|
70f1482493
|
生产派工测试问题处理
|
4 years ago |
|
赵嘉伟
|
7ff2eebadf
|
异常代码优化提交
|
4 years ago |
|
philip
|
0580d0547d
|
工序dto
|
4 years ago |
|
philip
|
ef2378390a
|
不合格代码修改
|
4 years ago |
|
赵嘉伟
|
268d02b6fd
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
赵嘉伟
|
13976aad2a
|
异常bug的修改
|
4 years ago |
|
zpl
|
45b103cdc5
|
新增不合格代码组查询
|
4 years ago |
|
zpl
|
96e807a2f4
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
zpl
|
7b8437d82e
|
生产异常修改
|
4 years ago |
|
philip
|
43db6a3385
|
查找下工序
|
4 years ago |
|
philip
|
96369b1a62
|
产前准备任务检索修改
|
4 years ago |
|
philip
|
5e053f8671
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
philip
|
5213bb81ef
|
资源筛选
|
4 years ago |
|
Leon
|
4460a78b77
|
打印机维护
|
4 years ago |
|
Leon
|
ada6099b6b
|
工艺路线接口变更修改
|
4 years ago |
|
Leon
|
d0068c2479
|
工艺路线接口变更修改
|
4 years ago |
|
Leon
|
c8348b38f7
|
Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
|
4 years ago |
|
Leon
|
6b71552fd0
|
工艺路线接口变更修改
|
4 years ago |
|
philip
|
555f197712
|
库存回车
|
4 years ago |
|
philip
|
4e29e82e22
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
philip
|
85ac05b441
|
拆分
|
4 years ago |
|
Leon
|
7f20a2229b
|
计划派工+物料功能修改
|
4 years ago |
|
philip
|
bba0303e57
|
产前准备修改
|
4 years ago |
|
Leon
|
c5e9c04b02
|
Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
|
4 years ago |
|
Leon
|
70cdb0d7fd
|
派工修改发布报错
|
4 years ago |
|
zpl
|
0c6fa7c478
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
zpl
|
b860ca1c6c
|
设备状态Handel修改
|
4 years ago |
|
赵嘉伟
|
0890dd6b2b
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
赵嘉伟
|
6431c44423
|
生产报废导出word功能
|
4 years ago |
|
philip
|
be05ddfdc4
|
车间转入转出
|
4 years ago |
|
赵嘉伟
|
083a8379e5
|
质量异常提报
|
4 years ago |
|
赵嘉伟
|
44a74dac3d
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
赵嘉伟
|
78d90e78ce
|
质量异常提报
|
4 years ago |
|
Leon
|
b934709378
|
报废调用派工接口
|
4 years ago |
|
赵嘉伟
|
cfd7e504f2
|
质量异常自报
|
4 years ago |
|
赵嘉伟
|
0ea1db37c6
|
质量异常自报
|
4 years ago |
|
philip
|
29b5d3cbd8
|
自报跳转异常
|
4 years ago |
|
philip
|
f54fa4e38a
|
bom查询
|
4 years ago |
|
philip
|
5c3b17f25f
|
自报异常增加用户组
|
4 years ago |
|
philip
|
bbd12432d5
|
物料消耗+报工
|
4 years ago |
|
赵嘉伟
|
945d72fedd
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
赵嘉伟
|
d6e03c0cdc
|
异常计时器
|
4 years ago |
|
Leon
|
86e05c1728
|
Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
|
4 years ago |
|
Leon
|
a473213da8
|
标签打印&测试问题修改
|
4 years ago |
|
philip
|
6c0c851064
|
自报
|
4 years ago |
|
赵嘉伟
|
5285db7d3a
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
赵嘉伟
|
80f12130a8
|
异常计时器
|
4 years ago |
|
Leon
|
17a45bff59
|
标签打印
|
4 years ago |
|
赵嘉伟
|
7a0d07ee96
|
根据工序查找不合格代码
|
4 years ago |
|
赵嘉伟
|
69ec898a9d
|
异常消息发送和生产操作员面板pod
|
4 years ago |
|
赵嘉伟
|
ec25f7bd45
|
format方法格式化
|
4 years ago |
|
赵嘉伟
|
e75396aaaa
|
消息类型表导入
|
4 years ago |
|
Leon
|
32f7be77c1
|
Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
|
4 years ago |
|
Leon
|
20011e5be5
|
物料管理修改
|
4 years ago |
|
zpl
|
3f40add8b6
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
zpl
|
246e8f43f7
|
设备模块更新
|
4 years ago |
|
philip
|
fd818a5a37
|
装配
|
4 years ago |
|
zpl
|
9e2fda10ac
|
设备车间
|
4 years ago |
|
zpl
|
32a6f7e842
|
上下料功能、设备点检计划维护bug修复
|
4 years ago |
|
philip
|
a931fd2f93
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
philip
|
7100fb5801
|
工序描述
|
4 years ago |
|
Leon
|
bbb377436c
|
CAPP接口功能开发
|
4 years ago |
|
赵嘉伟
|
524978b737
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
赵嘉伟
|
52099503c6
|
质量异常模块提交
|
4 years ago |
|
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 |
|
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 |