Commit Graph

309 Commits (c97e3fc817038aa1017ca3a3ef4f7205ff965d17)

Author SHA1 Message Date
A0010407 a8e8a99014 MES 备料单明细
A0010407 cccddee368 MES 备料单 生产前准备
zhaoxiaolin 91c07021ae wcs跟Mes交互的接口
zhaoxiaolin 362f6a167b 计划涉及的接口开发
A0010407 6b0292d505 mes bootstrap还原
A0010407 67447b6164 生产工序 新增 产线设备
Yangwl d7fab6d920 Merge remote-tracking branch 'origin/master'
zhaoxiaolin 0741e934cc 微服务拆分4
Yangwl 88b1a67164 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProOrderServiceImpl.java
wws 5809d73f28 计划管理模块(日期范围查询、计划工厂字段添加)、湿料计划管理模块(状态查询)、整体代码优化
Yangwl 7cb2180d78 Merge branch 'master' of F:\workplace-idea\榄菊\lanju-cloud with conflicts.
zhaoxiaolin 3c4917cb28 微服务拆分
wws a64043c4ce 湿料计划管理(修改init)
wws 605717dd11 Merge remote-tracking branch 'origin/master'
wws 39ac73dbed 湿料计划(查询湿料计划详情)
wws b6506a910c 订单计划管理(母工单为未新增已解决)
zhaoxiaolin 93d42d6d2a 工单下发--工艺下发
wws f44af65c4f 湿料计划管理(查询详情list)
wws 5752973f8c 湿料计划管理(查询详情list)
wws a9f3792c77 订单计划管理(版本合并)
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
zhaoxiaolin 95205cd536 微服务添加
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
wws 97b1ddbc4b 湿料计划管理(计划新增完成)
Yangwl a72ac03a1e SAP定时任务同步订单
wws 0425f44ef9 订单计划管理(工单班次名称获取)
wws a491155b75 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-modules/op-mes/src/main/resources/mapper/mes/ProOrderWorkorderMapper.xml
wws 5009b0ded1 订单计划管理(工艺字段添加)
wws cde82abd67 订单计划管理(更改订单拆分状态逻辑)
zhaoxiaolin a5d3d5727d 工单变更
zhaoxiaolin fb0a2ab614 工单变更
wws d6e17541a9 湿料计划管理(湿料计划新增init)
wws 84787548e4 生产订单管理模块(拆分状态逻辑优化)
wws cca119c843 生产订单管理模块(机型回显问题修复)
wws b3440cfbbb 生产订单管理模块(更改code)
wws ed1245fc5a 生产订单管理模块(优化拆分显示)、湿料计划管理(BMS)
A0010407 a12cc1f8a8 Merge remote-tracking branch 'origin/master'
A0010407 82ec2f40b4 基础信息管理后端删除文件
wws 7720db04fd Merge remote-tracking branch 'origin/master'
A0010407 c377584661 基础信息管理后端
wws 6cd3a20556 Merge remote-tracking branch 'origin/master'
wws 2238046740 生产订单管理模块(优化)、湿料计划管理init
zhaoxiaolin 9a62fbe233 系统管理的部门sql修改;工艺加是否需要首检;
wws cf38b80dc7 生产订单管理模块(产线更换为机型)
wws 585b4e5692 生产订单管理模块
zhaoxiaolin 974dd13455 工厂数据源切换
zhaoxiaolin ded76bd02d 订单init1.0
zhaoxiaolin fa768ee255 订单init1
zhaoxiaolin 1124174468 订单init
zhaoxiaolin 49e1a80e02 工艺V1.1
zhaoxiaolin f7cd042705 工艺V1.0
zhaoxiaolin e5161c6ad4 工序V4.0
zhaoxiaolin 2dbf3601f6 工序3
zhaoxiaolin 7bbdd00a61 工序1.0
zhaoxiaolin 26ce694217 init sqserver不支持limit
zhaoxiaolin eec8b47d28 init代码生成器用mysql数据库
zhaoxiaolin fa358163ac init3.2SQLserver
zhaoxiaolin 2b7d87f36d init3.2SQLserver
zhaoxiaolin f4f729febe init3.1