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'
|
1 year ago |
zhaoxiaolin
|
0741e934cc
|
微服务拆分4
|
1 year ago |
Yangwl
|
88b1a67164
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProOrderServiceImpl.java
|
1 year ago |
wws
|
5809d73f28
|
计划管理模块(日期范围查询、计划工厂字段添加)、湿料计划管理模块(状态查询)、整体代码优化
|
1 year ago |
Yangwl
|
7cb2180d78
|
Merge branch 'master' of F:\workplace-idea\榄菊\lanju-cloud with conflicts.
|
1 year ago |
zhaoxiaolin
|
3c4917cb28
|
微服务拆分
|
1 year ago |
wws
|
a64043c4ce
|
湿料计划管理(修改init)
|
1 year ago |
wws
|
605717dd11
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
wws
|
39ac73dbed
|
湿料计划(查询湿料计划详情)
|
1 year ago |
wws
|
b6506a910c
|
订单计划管理(母工单为未新增已解决)
|
1 year ago |
zhaoxiaolin
|
93d42d6d2a
|
工单下发--工艺下发
|
1 year ago |
wws
|
f44af65c4f
|
湿料计划管理(查询详情list)
|
1 year ago |
wws
|
5752973f8c
|
湿料计划管理(查询详情list)
|
1 year ago |
wws
|
a9f3792c77
|
订单计划管理(版本合并)
|
1 year 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
|
1 year ago |
zhaoxiaolin
|
95205cd536
|
微服务添加
|
1 year 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
|
1 year ago |
wws
|
97b1ddbc4b
|
湿料计划管理(计划新增完成)
|
1 year ago |
Yangwl
|
a72ac03a1e
|
SAP定时任务同步订单
|
1 year ago |
wws
|
0425f44ef9
|
订单计划管理(工单班次名称获取)
|
1 year ago |
wws
|
a491155b75
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# op-modules/op-mes/src/main/resources/mapper/mes/ProOrderWorkorderMapper.xml
|
1 year ago |
wws
|
5009b0ded1
|
订单计划管理(工艺字段添加)
|
1 year ago |
wws
|
cde82abd67
|
订单计划管理(更改订单拆分状态逻辑)
|
1 year ago |
zhaoxiaolin
|
a5d3d5727d
|
工单变更
|
1 year ago |
zhaoxiaolin
|
fb0a2ab614
|
工单变更
|
1 year ago |
wws
|
d6e17541a9
|
湿料计划管理(湿料计划新增init)
|
1 year ago |
wws
|
84787548e4
|
生产订单管理模块(拆分状态逻辑优化)
|
1 year ago |
wws
|
cca119c843
|
生产订单管理模块(机型回显问题修复)
|
1 year ago |
wws
|
b3440cfbbb
|
生产订单管理模块(更改code)
|
1 year ago |
wws
|
ed1245fc5a
|
生产订单管理模块(优化拆分显示)、湿料计划管理(BMS)
|
1 year ago |
A0010407
|
a12cc1f8a8
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
A0010407
|
82ec2f40b4
|
基础信息管理后端删除文件
|
1 year ago |
wws
|
7720db04fd
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
A0010407
|
c377584661
|
基础信息管理后端
|
1 year ago |