philip
|
683d094124
|
连接mq方式修改
|
4 years ago |
zpl
|
2ff97cc813
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
zpl
|
e3a6e8fa3f
|
打印功能修改
|
4 years ago |
赵嘉伟
|
3eb35b15da
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
赵嘉伟
|
e54bc409d5
|
计划异常待办事项
|
4 years ago |
|
zpl
|
638c30b210
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
zpl
|
a46a0b8a34
|
打印功能修改
|
4 years ago |
Leon
|
88663b582e
|
Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
|
4 years ago |
|
Leon
|
7f20a2229b
|
计划派工+物料功能修改
|
4 years ago |
|
philip
|
71dd346a75
|
专检优化
|
4 years ago |
|
philip
|
a35da8e733
|
产前准备发消息
|
4 years ago |
|
赵嘉伟
|
4af8faf814
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
赵嘉伟
|
2694949a21
|
计划异常待办事项
|
4 years ago |
|
philip
|
bba0303e57
|
产前准备修改
|
4 years ago |
|
Leon
|
7b1e26eb36
|
叫料界面增加组件查询条件
|
4 years ago |
|
zpl
|
c64dc352dd
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
zpl
|
b2eb7ec7e2
|
刀具按状态Y查询
|
4 years ago |
|
philip
|
ee874a035d
|
工控程序接口
|
4 years ago |
|
赵嘉伟
|
7a53834f91
|
生产-异常 设备和其他异常
|
4 years ago |
|
赵嘉伟
|
02c00895bf
|
生产-异常 设备和其他异常
|
4 years ago |
|
赵嘉伟
|
e30f2c0b99
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
赵嘉伟
|
900ceb3b7d
|
生成-跳设备异常和其他异常参数增加问题描述
|
4 years ago |
|
philip
|
dc4b176938
|
打印
|
4 years ago |
|
philip
|
9915d676eb
|
产品标签打印
|
4 years ago |
|
zpl
|
0e7c096137
|
刀具模块bug修复
|
4 years ago |
|
zpl
|
5c6ee46dbe
|
Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
|
4 years ago |
|
zpl
|
3173a234be
|
bug修复
|
4 years ago |
|
Leon
|
9daa13c2e2
|
派工修改发布报错
|
4 years ago |
|
Leon
|
166655bd78
|
Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
|
4 years ago |
|
Leon
|
b934709378
|
报废调用派工接口
|
4 years ago |
|
赵嘉伟
|
e3432be435
|
ActiveMQ
|
4 years ago |
|
赵嘉伟
|
b9b4add3fb
|
异常消息修改
|
4 years ago |
|
zpl
|
40e94f3575
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
zpl
|
50a3dda506
|
打印模块更新
|
4 years ago |
|
赵嘉伟
|
895046da7d
|
员工资源导入+产品报废
|
4 years ago |
|
philip
|
bf4f86e8ef
|
工序描述
|
4 years ago |
|
philip
|
afe79b8753
|
产前准备增加筛选条件
|
4 years ago |
|
philip
|
29b5d3cbd8
|
自报跳转异常
|
4 years ago |
|
philip
|
f54fa4e38a
|
bom查询
|
4 years ago |
|
philip
|
5c3b17f25f
|
自报异常增加用户组
|
4 years ago |
|
赵嘉伟
|
9bd199395d
|
设备异常，用户资源
|
4 years ago |
|
zpl
|
6cc3842a71
|
Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
|
4 years ago |
|
zpl
|
b4c4d4a2d5
|
Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
|
4 years ago |
|
philip
|
6c0c851064
|
自报
|
4 years ago |
|
zpl
|
0b0a5b554a
|
Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
|
4 years ago |
|
Leon
|
17a45bff59
|
标签打印
|
4 years ago |
|
zpl
|
ef769551be
|
Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
|
4 years ago |
|
Leon
|
2047ebc302
|
质量模块功能提交
|
4 years ago |
|
zpl
|
a24a2afde9
|
Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
|
4 years ago |
|
赵嘉伟
|
26ef51836f
|
异常消息发送
|
4 years ago |
|
zpl
|
512778b744
|
设备模块更新
|
4 years ago |
|
赵嘉伟
|
965bbeafc8
|
异常单和异常消息表导入
|
4 years ago |
|
philip
|
b572ec1cb7
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
philip
|
fd818a5a37
|
装配
|
4 years ago |
|
Leon
|
869b5035eb
|
叫料发布
|
4 years ago |
|
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 |