60 Commits (7fefe369ccf34b4a2b8567b10618be0fb8691ca4)

Author	SHA1	Message	Date
zhaoxiaolin	7fefe369cc	计划bug和质量bug修改	1 year ago
zhaoxiaolin	03376055cb	计划bug修改-- 计划的选择方式修改v2.0	1 year ago
wws	5c6e383e2e	计划模块(计划新增逻辑修改初版)	1 year ago
zhaoxiaolin	d6d5ff4ae3	计划bug修改-- 计划的选择方式修改	1 year ago
wws	fdd2069372	计划模块(注释掉订单关闭功能)	1 year ago
wws	5aa0d0c640	计划模块(工单打印逻辑顺序BUG解决)	1 year ago
wws	0f372dae51	计划模块(订单拆分搜索后拆分BUG解决)	1 year ago
wws	c5f16b8e68	计划模块(工艺线体)	2 years ago
wws	49f5c15d3d	计划模块(工单修改BUG解决初版)	2 years ago
wws	40ecab6485	计划模块(工单管理显示优化)	2 years ago
wws	0524c17e13	计划模块(工艺线体逻辑变更，工单修改判断逻辑变更)	2 years ago
wws	c25d6e258d	计划模块(新增-计划工厂字段)	2 years ago
zhaoxiaolin	76036ee69a	计划bug修改	2 years ago
wws	fd56a296d7	计划模块(工单修改BUG解决)	2 years ago
wws	207e8ccf6e	计划模块(工单修改BUG解决)	2 years ago
zhaoxiaolin	dee2982dbd	工单下发sap接口联调	2 years ago
wws	48496ffa9a	订单拆分逻辑(关闭订单)	2 years ago
zhaoxiaolin	da486d7e20	订单同步按钮	2 years ago
wws	53744c074f	Merge remote-tracking branch 'origin/master'	2 years ago
wws	d8b6bedcbd	工单管理打印功能	2 years ago
zhaoxiaolin	06d740e85d	订单同步按钮	2 years ago
zhaoxiaolin	8dc2f096a2	文件上传问题	2 years ago
zhaoxiaolin	944d9d9308	订单同步接口测试	2 years ago
zhaoxiaolin	5ddc72024f	工单回传	2 years ago
Yangwl	73aca5b45b	Merge branch 'master' of F:\workplace-idea\榄菊\lanju-cloud with conflicts.	2 years ago
zhaoxiaolin	6708ff8f48	白坯领料单生成	2 years ago
wws	0c792e7856	工单字段更改(isEnd->endFlag)	2 years ago
wws	ca123c873b	工单管理(删除逻辑变更-湿料计划)、湿料计划管理(新增逻辑变更-白坯)	2 years ago
zhaoxiaolin	f72eaf604a	wcs接口开发转移	2 years ago
zhaoxiaolin	a87eb0a200	wcs接口开发转移	2 years ago
wws	0f4ba8846c	工单管理(导出)	2 years ago
wws	5a85b1fe16	Merge remote-tracking branch 'origin/master'	2 years ago
wws	efe7d87593	工单管理(导出-班次信息未导出)	2 years ago
zhaoxiaolin	67ef0ac298	wcs接口开发转移	2 years ago
chj	2d43cbf1f8	Merge remote-tracking branch 'origin/master'	2 years ago
chj	c20fcc180c	计划模块——删除工单	2 years ago
wws	1e90cd5669	工单管理(导出-班次信息未导出)	2 years ago
wws	d59136a945	湿料计划管理(计划导出)	2 years ago
wws	f41fcabf8a	工单管理模块(工单修改-白坯订单修改问题解决)	2 years ago
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