21 Commits (c7adabcee9288fef812ccdcaaa8131510d5ed214)

Author	SHA1	Message	Date
chj	ebc9f11ea9	Merge remote-tracking branch 'origin/master' ... # Conflicts: # op-common/op-common-log/op-common-log.iml	2 years ago
wws	36c536318e	订单管理模块(订单导入-新订单导入通用字段增加)	2 years ago
zhaoxiaolin	ccb5ec78b9	实体目录变更	2 years ago
chj	0e7a206b40	MES报废功能	2 years ago
zhaoxiaolin	91c07021ae	wcs跟Mes交互的接口	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
wws	d624fa64a0	订单管理模块(订单导出)	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
wws	5809d73f28	计划管理模块(日期范围查询、计划工厂字段添加)、湿料计划管理模块(状态查询)、整体代码优化	2 years ago
zhaoxiaolin	3c4917cb28	微服务拆分	2 years ago
zhaoxiaolin	95205cd536	微服务添加	2 years ago