A0010407
|
085fa628c0
|
MES 备料单明细
|
2 years ago |
|
A0010407
|
cccddee368
|
MES 备料单 生产前准备
|
2 years ago |
zhaoxiaolin
|
91c07021ae
|
wcs跟Mes交互的接口
|
2 years ago |
|
A0010407
|
495255e9a5
|
基础信息 BOM子表
|
2 years ago |
wws
|
f10988a3c3
|
工单管理模块(显示问题修复)、湿料计划(混料BUG修复)
|
2 years ago |
|
wws
|
08103e1abb
|
订单管理模块(订单导入-工单状态更改)
|
2 years ago |
|
wws
|
ad913f3f56
|
订单管理模块(增加权限)
|
2 years ago |
|
wws
|
c41b56b0f3
|
订单管理模块(导入逻辑变更-已有湿料计划不可更改-工单已下达不可更改)
|
2 years ago |
|
wws
|
0f1d137aff
|
订单管理模块(导入逻辑修改-已有订单逻辑)
|
2 years ago |
|
wws
|
f2a49bc24e
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderMapper.java
# op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderService.java
# op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java
# op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProWetMaterialPlanServiceImpl.java
# op-modules/op-plan/src/main/resources/mapper/plan/ProOrderMapper.xml
|
2 years ago |
|
wws
|
1d01cb3621
|
订单管理模块(订单导入)
|
2 years ago |
|
zhaoxiaolin
|
362f6a167b
|
计划涉及的接口开发
|
2 years ago |
 Yangwl
|
2bae85c25a
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
Yangwl
|
d755acbb7f
|
SAP模块增加时间参数
|
2 years ago |
|
wws
|
d624fa64a0
|
订单管理模块(订单导出)
|
2 years ago |
|
A0010407
|
4e176bc6ab
|
基础信息后端BOM更改
|
2 years ago |
|
wws
|
a6acdae5c9
|
湿料计划模块(计划修改逻辑-有计划已接料则主计划不可修改)、订单管理模块(工单产品类型未加入问题解决)
|
2 years ago |
|
wws
|
7247067a17
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
wws
|
ab1c69b1e2
|
计划管理模块(第三级拆分数量问题解决)、工单管理(工单修改功能完成)
|
2 years ago |
|
Yangwl
|
7aefee6af8
|
SAP模块提交订单同步操作
|
2 years ago |
|
A0010407
|
6b0292d505
|
mes bootstrap还原
|
2 years ago |
|
A0010407
|
67447b6164
|
生产工序 新增 产线设备
|
2 years 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
|
c5e0d0e785
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
wws
|
5809d73f28
|
计划管理模块(日期范围查询、计划工厂字段添加)、湿料计划管理模块(状态查询)、整体代码优化
|
2 years ago |
|
Yangwl
|
bb882899ef
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
Yangwl
|
7cb2180d78
|
Merge branch 'master' of F:\workplace-idea\榄菊\lanju-cloud with conflicts.
|
2 years ago |
|
zhaoxiaolin
|
e804b07fb6
|
微服务拆分3
|
2 years ago |
|
zhaoxiaolin
|
ce705cbe03
|
微服务拆分3
|
2 years ago |
|
Yangwl
|
40072716eb
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
Yangwl
|
0d14350f32
|
定时任务执行
|
2 years ago |
|
zhaoxiaolin
|
907774948b
|
微服务拆分3
|
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 |
|
wws
|
97b1ddbc4b
|
湿料计划管理(计划新增完成)
|
2 years ago |
|
Yangwl
|
a72ac03a1e
|
SAP定时任务同步订单
|
2 years ago |
|
wws
|
0425f44ef9
|
订单计划管理(工单班次名称获取)
|
2 years ago |
|
wws
|
a491155b75
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# op-modules/op-mes/src/main/resources/mapper/mes/ProOrderWorkorderMapper.xml
|
2 years ago |