zhaoxiaolin
|
c7bfb41867
|
管理系统报工
|
1 year ago |
|
zhaoxiaolin
|
9f051a1277
|
管理系统报工1.0
|
1 year ago |
 Yangwl
|
fec239c59c
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# ABAP_AS_WITH_POOL.jcoDestination
# op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java
# op-modules/op-mes/src/main/java/com/op/mes/service/IWCSInterfaceService.java
# op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java
|
1 year ago |
|
Yangwl
|
4b36de1131
|
烘房看板接口
|
1 year ago |
|
zhaoxiaolin
|
42b0c4622d
|
计划bug+报工上位机接口提供
|
1 year ago |
陈恒杰
|
83548f708f
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
陈恒杰
|
dbd3b16007
|
rfid流程修改
|
1 year ago |
|
zhaoxiaolin
|
cca83e6511
|
bug
|
1 year ago |
|
zhaoxiaolin
|
8e8ac0e125
|
备份定时任务
|
1 year ago |
|
zhaoxiaolin
|
42b9c09918
|
bug修改
|
1 year ago |
|
zhaoxiaolin
|
9d55da3a0b
|
生产过程检验+手持发版记录
|
1 year ago |
|
zhaoxiaolin
|
34aad9a2bf
|
质量系统-检验任务管理1
|
1 year ago |
|
zhaoxiaolin
|
d4ce34c332
|
1、看板料罐车数获取；2、小时产量加班次、分钟数做活,导出功能；3、工序完成记录加入班次
|
1 year ago |
|
zhaoxiaolin
|
b1d37a7c79
|
下工序机台获取接口
|
1 year ago |
|
zhaoxiaolin
|
57ff0dd3ea
|
小时产量报表增加合计
|
1 year ago |
|
zhaoxiaolin
|
f6ebd9e321
|
看板、小时产量报表
|
1 year ago |
|
zhaoxiaolin
|
e0e08736bf
|
看板接口3
|
1 year ago |
|
zhaoxiaolin
|
d19159a2f3
|
看板接口2
|
1 year ago |
|
zhaoxiaolin
|
d6e558f422
|
工序产量查询
|
1 year ago |
|
zhaoxiaolin
|
2868dfb34a
|
白坯订单v2
|
1 year ago |
|
zhaoxiaolin
|
41b3459f8b
|
白坯生产报表
|
1 year ago |
|
zhaoxiaolin
|
9bea4d9d6c
|
工单编码
|
1 year ago |
|
zhaoxiaolin
|
ecef3b7e38
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
2d905987ba
|
mes看板
|
1 year ago |
zhaoxl
|
699f763bff
|
zxl
|
1 year ago |
|
zhaoxiaolin
|
4a0b3dc0b2
|
手持修改
|
1 year ago |
|
zhaoxiaolin
|
ccb8a178cb
|
生产环境
|
1 year ago |
A0010407
|
8f5de59e5c
|
mes rfid
|
1 year ago |
|
zhaoxiaolin
|
bb61ed1b95
|
sap jar包
|
1 year ago |
|
A0010407
|
ae8cd366bd
|
mes报工bug
|
1 year ago |
|
A0010407
|
7f5ab75bfd
|
手持Rfid
|
1 year ago |
|
A0010407
|
d193c0c676
|
手持查询
|
1 year ago |
|
A0010407
|
045090004c
|
mes报表权限
|
1 year ago |
|
zhaoxiaolin
|
8678afa391
|
手持接口修改+权限
|
1 year ago |
|
zhaoxiaolin
|
c5866a95c6
|
手持接口+订单bug修复
|
1 year ago |
|
A0010407
|
22d786f5db
|
MES领料单优化
|
1 year ago |
|
zhaoxiaolin
|
d4446de5fc
|
成品订单修改：更新范围>=20230921
|
1 year ago |
|
zhaoxiaolin
|
d394d2a1df
|
逻辑删除+手持增加缓冲区接口+工艺车数
|
1 year ago |
|
zhaoxiaolin
|
e38a563f81
|
逻辑删除+手持增加缓冲区接口
|
1 year ago |
|
zhaoxiaolin
|
f778b42cbc
|
sap模块代码合并
|
1 year ago |
|
zhaoxiaolin
|
1b53ac43d9
|
首页
|
1 year ago |
|
zhaoxiaolin
|
473f789631
|
sap报工添加关闭订单，修改工单报工状态逻辑
|
1 year ago |
|
zhaoxiaolin
|
139dc3fb4c
|
日生产报表功能
|
1 year ago |
wws
|
9771ab2ff3
|
打印备料单
|
1 year ago |
|
zhaoxiaolin
|
897166b783
|
工艺穿梭框
|
1 year ago |
|
zhaoxiaolin
|
ca4b21061c
|
计划bug和质量bug修改
|
1 year ago |
|
zhaoxiaolin
|
5a60b22157
|
计划-设备路线选择更改；报工定时任务；
|
1 year ago |
|
zhaoxiaolin
|
c1885b1805
|
手持质量检验
|
1 year ago |
|
zhaoxiaolin
|
03376055cb
|
计划bug修改-- 计划的选择方式修改v2.0
|
1 year ago |
|
zhaoxiaolin
|
d6d5ff4ae3
|
计划bug修改-- 计划的选择方式修改
|
1 year ago |
|
zhaoxiaolin
|
76036ee69a
|
计划bug修改
|
1 year ago |
|
zhaoxiaolin
|
dee2982dbd
|
工单下发sap接口联调
|
1 year ago |
|
zhaoxiaolin
|
da486d7e20
|
订单同步按钮
|
1 year ago |
|
A0010407
|
d0dd51a777
|
mes报工
|
1 year ago |
|
A0010407
|
17a42de771
|
mes报工
|
1 year ago |
|
A0010407
|
49188ecaaf
|
mes报工
|
1 year ago |
|
A0010407
|
a6890849fe
|
rfid bug
|
1 year ago |
|
zhaoxiaolin
|
8dc2f096a2
|
文件上传问题
|
1 year ago |
|
zhaoxiaolin
|
a5147344fb
|
新增员工时加数据源权限
|
1 year ago |
|
zhaoxiaolin
|
1879d18ba9
|
数据源规则修改
|
1 year ago |
|
zhaoxiaolin
|
ae4d615aff
|
领料单获取
|
1 year ago |
|
zhaoxiaolin
|
d70b27e01f
|
领料单提交
|
1 year ago |
|
zhaoxiaolin
|
7fc87674e9
|
领料单提交
|
1 year ago |
|
zhaoxiaolin
|
a5340c0934
|
领料单提交
|
1 year ago |
|
zhaoxiaolin
|
07d80f45c6
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcProCheckServiceImpl.java
# op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java
|
1 year ago |
|
zhaoxiaolin
|
7dc31d221a
|
领料单提交
|
1 year ago |
|
zhaoxiaolin
|
432a1c761c
|
领料单提交
|
1 year ago |
|
Yangwl
|
73aca5b45b
|
Merge branch 'master' of F:\workplace-idea\榄菊\lanju-cloud with conflicts.
|
1 year ago |
chj
|
69fb1df23b
|
MES报废功能
|
1 year ago |
|
wws
|
0c792e7856
|
工单字段更改(isEnd->endFlag)
|
1 year ago |
|
zhaoxiaolin
|
67ef0ac298
|
wcs接口开发转移
|
1 year ago |
|
chj
|
c7adabcee9
|
MES报废功能
|
1 year ago |
|
chj
|
0e7a206b40
|
MES报废功能
|
1 year ago |
|
chj
|
6146a90ad0
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
chj
|
24faa833ea
|
MES报废功能
|
1 year ago |
A0010407
|
69488cc084
|
MES serviceimpl修改
|
1 year ago |
|
zhaoxiaolin
|
e4fe0c3772
|
wcs跟Mes交互的接口
|
1 year ago |
|
A0010407
|
a8e8a99014
|
MES 备料单明细
|
1 year ago |
|
A0010407
|
cccddee368
|
MES 备料单 生产前准备
|
1 year ago |
|
zhaoxiaolin
|
91c07021ae
|
wcs跟Mes交互的接口
|
1 year ago |
|
zhaoxiaolin
|
362f6a167b
|
计划涉及的接口开发
|
1 year ago |
|
A0010407
|
6b0292d505
|
mes bootstrap还原
|
1 year ago |
|
A0010407
|
67447b6164
|
生产工序 新增 产线设备
|
1 year ago |
|
Yangwl
|
d7fab6d920
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
zhaoxiaolin
|
0741e934cc
|
微服务拆分4
|
2 years ago |
|
Yangwl
|
88b1a67164
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProOrderServiceImpl.java
|
2 years ago |
|
wws
|
5809d73f28
|
计划管理模块(日期范围查询、计划工厂字段添加)、湿料计划管理模块(状态查询)、整体代码优化
|
2 years ago |
|
Yangwl
|
7cb2180d78
|
Merge branch 'master' of F:\workplace-idea\榄菊\lanju-cloud with conflicts.
|
2 years ago |
|
zhaoxiaolin
|
3c4917cb28
|
微服务拆分
|
2 years ago |
|
wws
|
a64043c4ce
|
湿料计划管理(修改init)
|
2 years ago |
|
wws
|
605717dd11
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
wws
|
39ac73dbed
|
湿料计划(查询湿料计划详情)
|
2 years ago |
|
wws
|
b6506a910c
|
订单计划管理(母工单为未新增已解决)
|
2 years ago |
|
zhaoxiaolin
|
93d42d6d2a
|
工单下发--工艺下发
|
2 years ago |
|
wws
|
f44af65c4f
|
湿料计划管理(查询详情list)
|
2 years ago |
|
wws
|
5752973f8c
|
湿料计划管理(查询详情list)
|
2 years ago |
|
wws
|
a9f3792c77
|
订单计划管理(版本合并)
|
2 years ago |
|
wws
|
3af42d3b6d
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# op-modules/op-mes/src/main/java/com/op/mes/mapper/ProOrderWorkorderMapper.java
# op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProOrderServiceImpl.java
|
2 years ago |
|
zhaoxiaolin
|
95205cd536
|
微服务添加
|
2 years ago |
|
wws
|
cbf5aa0bd4
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# op-modules/op-mes/src/main/java/com/op/mes/mapper/ProOrderWorkorderMapper.java
# op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProOrderServiceImpl.java
|
2 years ago |