64 Commits (34c11595147f3af21b7d60b846225e8217459034)

Author SHA1 Message Date
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 03376055cb 计划bug修改-- 计划的选择方式修改v2.0 1 year ago
zhaoxiaolin d6d5ff4ae3 计划bug修改-- 计划的选择方式修改 1 year ago
zhaoxiaolin 76036ee69a 计划bug修改 1 year ago
A0010407 d0dd51a777 mes报工 1 year ago
A0010407 17a42de771 mes报工 1 year ago
A0010407 49188ecaaf mes报工 1 year ago
zhaoxiaolin 8dc2f096a2 文件上传问题 1 year ago
zhaoxiaolin ae4d615aff 领料单获取 1 year ago
zhaoxiaolin 7fc87674e9 领料单提交 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
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 6146a90ad0 Merge remote-tracking branch 'origin/master' 1 year ago
chj 24faa833ea 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 7cb2180d78 Merge branch 'master' of F:\workplace-idea\榄菊\lanju-cloud with conflicts. 1 year ago
wws 605717dd11 Merge remote-tracking branch 'origin/master' 1 year ago
wws 39ac73dbed 湿料计划(查询湿料计划详情) 1 year ago
zhaoxiaolin 93d42d6d2a 工单下发--工艺下发 1 year ago
wws f44af65c4f 湿料计划管理(查询详情list) 1 year ago
wws 5752973f8c 湿料计划管理(查询详情list) 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 97b1ddbc4b 湿料计划管理(计划新增完成) 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 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
wws 7720db04fd Merge remote-tracking branch 'origin/master' 1 year ago
A0010407 c377584661 基础信息管理后端 1 year ago
wws 6cd3a20556 Merge remote-tracking branch 'origin/master' 1 year ago