制造中心MES后台
You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
Leon 6f89cbc3ec Merge remote-tracking branch 'mesnac/master'
# Conflicts:
#	dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java
#	dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java
#	dispatch/src/main/resources/mapper/UserResourceMapper.xml
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/BomMapper.java
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Bom.java
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/service/BomService.java
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/BomServiceImpl.java
#	meapi/src/main/resources/mapper/BomMapper.xml
4 years ago
anomaly Z_ABNORMAL_BILL 提交 4 years ago
common Merge remote-tracking branch 'mesnac/master' 4 years ago
console ERP接口功能代码提交 4 years ago
dataimport 外部接口增加 4 years ago
dispatch Merge remote-tracking branch 'mesnac/master' 4 years ago
equip 设备管理模块--设备检验计划模块更新 4 years ago
generator 设备管理模块--设备检验计划模块更新 4 years ago
integration ERP接口功能代码提交 4 years ago
listener WebService接口日志记录类 4 years ago
meapi Merge remote-tracking branch 'mesnac/master' 4 years ago
mesapp init 4 years ago
production 生产准备任务检验 4 years ago
quality 自报待办 4 years ago
quartz init 4 years ago
pom.xml Z_ABNORMAL_BILL 提交 4 years ago