Commit Graph

105 Commits (02fb55dc6ea8dddf56f0107e152d6df7463e3f9e)

Author SHA1 Message Date
Yangwl cf0d987365 Merge remote-tracking branch 'origin/master'
Yangwl d2e644b74b OA ZL0010-来料检验不合格控制流程代码
zhaoxiaolin 86e6b205a0 入库检验任务接口
zhaoxiaolin a4ad441dad 质量过程巡检+来料检验任务接口+报工sql调整
zhaoxiaolin 30fac0e8dd 质量过程巡检+来料检验任务接口+报工sql调整
zhaoxiaolin 63cc8e2053 质量过程巡检+来料检验任务接口
mengjiao 74032decd5 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-modules/op-sap/src/main/java/com/op/sap/service/SapOrderService.java
#	op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java
mengjiao 4dced6b421 wms修改9.2
wws f5060ed72c 设备运行记录年备份定时任务
zhaoxiaolin 3671723f7e 质量看板接口修改3
Yangwl a69e7c1ebc SAP采购订单获取接口
Yangwl 5abd625d55 SAP采购订单收货过账
zhaoxiaolin bb18fbce4a 质量看板接口修改
zhaoxiaolin 5f03c120b6 质量看板接口
wws 551b3e8b7e Merge remote-tracking branch 'origin/master'
wws 34eb8e75cf 完好率统计报表、设备运行记录定时任务
Yangwl 801bf00af5 SAP的储位仓库信息接口
Yangwl ff2bf78d5d 订单物料领料过账、反冲物料领料过账微服务接口
Yangwl 620b22e110 Merge remote-tracking branch 'origin/master' into highway
Yangwl b68d6ccc86 采购订单实体类
wws 14937d6441 上位机设备报修接口
zhaoxiaolin 56fc72ff0d sap报工
zhaoxiaolin 304370cde2 sap接口调整3
Yangwl e24b2f8a6d Merge remote-tracking branch 'origin/master'
Yangwl e230ba1bd3 SAP报工相关
zhaoxiaolin 1f31239adb sap接口调整
Yangwl fc43732c0c 修改报工实体类
zhaoxiaolin 2ce35572f2 订单拆分上报sap
Yangwl d72e49f690 订单参数增加数量
Yangwl 2d2cdda9ec 采购订单实体类
zhaoxiaolin dbeba66388 sap接口调整
zhaoxiaolin 1cedbf3c9e sap接口调整
zhaoxiaolin f221f0ec05 质量分析图表
zhaoxiaolin 4a6323cd46 质量统计
zhaoxiaolin 20abf4cde4 报工+成品计划升级
zhaoxiaolin 24fe8b0b83 保养定时任务
Yangwl c0ee7ca097 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java
zhaoxiaolin 6974fa79fa 质量点检定时任务
Yangwl 6fb697e5ca Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapRFW.java
#	op-auth/src/main/resources/bootstrap.yml
#	op-gateway/src/main/resources/bootstrap.yml
#	op-modules/op-mes/push-mes.bat
#	op-modules/op-mes/src/main/resources/bootstrap.yml
#	op-modules/op-sap/src/main/resources/bootstrap.yml
#	op-modules/op-system/src/main/resources/bootstrap.yml
Yangwl cec59e4bc4 烘房看板接口
zhaoxiaolin 3262f842a3 成品bug修改
zhaoxiaolin 15581ac8a3 新增接口服务,去掉scada服务
zhaoxiaolin 15157dd26e 测试版本注册中心修改
zhaoxiaolin c7bfb41867 管理系统报工
Yangwl 122b7aec05 Merge remote-tracking branch 'origin/master'
Yangwl bc1b3773df 修改报工接口类
zhaoxiaolin 9f051a1277 管理系统报工1.0
zhaoxiaolin 42b0c4622d 计划bug+报工上位机接口提供
陈恒杰 83548f708f Merge remote-tracking branch 'origin/master'
陈恒杰 dbd3b16007 rfid流程修改