634 Commits (4a6323cd4696e688defee52f0e09c973c4c71248)

Author SHA1 Message Date
A0010407 4e176bc6ab 基础信息后端BOM更改 1 year ago
wws a6acdae5c9 湿料计划模块(计划修改逻辑-有计划已接料则主计划不可修改)、订单管理模块(工单产品类型未加入问题解决) 1 year ago
wws 7247067a17 Merge remote-tracking branch 'origin/master' 1 year ago
wws ab1c69b1e2 计划管理模块(第三级拆分数量问题解决)、工单管理(工单修改功能完成) 1 year ago
Yangwl 7aefee6af8 SAP模块提交订单同步操作 1 year ago
A0010407 6b0292d505 mes bootstrap还原 1 year ago
A0010407 67447b6164 生产工序 新增 产线设备 1 year ago
Yangwl d7fab6d920 Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 0741e934cc 微服务拆分4 1 year ago
Yangwl 88b1a67164 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProOrderServiceImpl.java
1 year ago
wws c5e0d0e785 Merge remote-tracking branch 'origin/master' 1 year ago
wws 5809d73f28 计划管理模块(日期范围查询、计划工厂字段添加)、湿料计划管理模块(状态查询)、整体代码优化 1 year ago
Yangwl bb882899ef Merge remote-tracking branch 'origin/master' 1 year ago
Yangwl 7cb2180d78 Merge branch 'master' of F:\workplace-idea\榄菊\lanju-cloud with conflicts. 1 year ago
zhaoxiaolin e804b07fb6 微服务拆分3 1 year ago
zhaoxiaolin ce705cbe03 微服务拆分3 1 year ago
Yangwl 40072716eb Merge remote-tracking branch 'origin/master' 1 year ago
Yangwl 0d14350f32 定时任务执行 1 year ago
zhaoxiaolin 907774948b 微服务拆分3 1 year ago
zhaoxiaolin 3c4917cb28 微服务拆分 1 year ago
wws a64043c4ce 湿料计划管理(修改init) 1 year ago
wws 605717dd11 Merge remote-tracking branch 'origin/master' 1 year ago
wws 39ac73dbed 湿料计划(查询湿料计划详情) 1 year ago
wws b6506a910c 订单计划管理(母工单为未新增已解决) 1 year ago
zhaoxiaolin 93d42d6d2a 工单下发--工艺下发 1 year ago
wws f44af65c4f 湿料计划管理(查询详情list) 1 year ago
wws 5752973f8c 湿料计划管理(查询详情list) 1 year ago
wws a9f3792c77 订单计划管理(版本合并) 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 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
1 year ago
wws 97b1ddbc4b 湿料计划管理(计划新增完成) 1 year ago
Yangwl a72ac03a1e SAP定时任务同步订单 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 a5d3d5727d 工单变更 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
A0010407 e8f9176634 基础信息管理后端 1 year ago
A0010407 a12cc1f8a8 Merge remote-tracking branch 'origin/master' 1 year ago
A0010407 82ec2f40b4 基础信息管理后端删除文件 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
wws 2238046740 生产订单管理模块(优化)、湿料计划管理init 1 year ago
zhaoxiaolin 9a62fbe233 系统管理的部门sql修改;工艺加是否需要首检; 1 year ago
wws cf38b80dc7 生产订单管理模块(产线更换为机型) 1 year ago
wws b6c4c30f9a Merge remote-tracking branch 'origin/master' 1 year ago
wws 585b4e5692 生产订单管理模块 1 year ago
A0010407 0216a5d952 基础信息管理后端3 1 year ago
A0010407 ef69e6cd76 Merge remote-tracking branch 'origin/master' 1 year ago
A0010407 680ec0e2b1 基础信息管理后端 1 year ago
zhaoxiaolin 974dd13455 工厂数据源切换 1 year ago
zhaoxiaolin ded76bd02d 订单init1.0 1 year ago
mengjiao 76cde96c9c wms服务修改 1 year ago
zhaoxiaolin fa768ee255 订单init1 1 year ago
zhaoxiaolin 1124174468 订单init 1 year ago
Yangwl 39e071022d SAP模块同步生产订单接口 1 year ago
zhaoxiaolin 49e1a80e02 工艺V1.1 1 year ago
zhaoxiaolin f7cd042705 工艺V1.0 1 year ago
zhaoxiaolin e5161c6ad4 工序V4.0 1 year ago
zhaoxiaolin 2dbf3601f6 工序3 1 year ago
mengjiao 309f2c2999 Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao 55c11e1cbb wms白胚粉料的代码 1 year ago
A0010407 c90da338aa 基础信息管理后端 1 year ago
zhaoxiaolin 616d370067 菜单 1 year ago
zhaoxiaolin 7bbdd00a61 工序1.0 1 year ago
zhaoxiaolin 26ce694217 init sqserver不支持limit 1 year ago
zhaoxiaolin 8f52b50f92 init wms系统 1 year ago
zhaoxiaolin eec8b47d28 init代码生成器用mysql数据库 1 year ago
zhaoxiaolin bcea1651cc init3.2SQLserver 1 year ago
zhaoxiaolin fa358163ac init3.2SQLserver 1 year ago
zhaoxiaolin b31faa04df init3.2SQLserver 1 year ago
zhaoxiaolin 2b7d87f36d init3.2SQLserver 1 year ago
zhaoxiaolin f4f729febe init3.1 1 year ago
zhaoxiaolin 924c2c14c0 init3.0 1 year ago
zhaoxiaolin bf7be46850 init2.0 1 year ago
zhaoxiaolin 39a6d33464 init 1 year ago