Yangwl
/
LanJu_Mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,413 Commits
3 Branches
0 Tags
20 MiB
Commit Graph

158 Commits (4eb381790d0fe587f83ff13fdbae72a4d7bd01ad)

Author SHA1 Message Date
A0010407 c1fd8c9c18 用户 微信名+bug
Yangwl 69a2f60160 101类型订单收货
zhaoxiaolin 9e5fbaab69 报错修改
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流程修改
zhaoxiaolin 28145447cb sap联调
zhaoxiaolin 618157586d 质量任务表调整
zhaoxiaolin 42b9c09918 bug修改
zhaoxiaolin 94010d9146 生产过程检验v3
zhaoxiaolin 6551e07899 质量系统-检验任务管理2
zhaoxiaolin 34aad9a2bf 质量系统-检验任务管理1
Yangwl 63d00b8a45 SAP订单同步接口增加工厂参数、修改MES连接SAP工具类。删除多余文件。
zhaoxiaolin 2d905987ba mes看板
zhaoxiaolin 4a0b3dc0b2 手持修改
zhaoxiaolin 852bff3af6 sap 定时任务
zhaoxiaolin f329c7c39b Merge remote-tracking branch 'origin/master'
zhaoxiaolin eb87002be9 sap 定时任务
A0010407 8f5de59e5c mes rfid
zhaoxiaolin bb61ed1b95 sap jar包
zhaoxiaolin d4446de5fc 成品订单修改：更新范围>=20230921
zhaoxiaolin 09e0b3e249 sap+计划的bug修改
zhaoxiaolin f92e75d11f 计划问题修改
zhaoxiaolin d394d2a1df 逻辑删除+手持增加缓冲区接口+工艺车数
zhaoxiaolin fb8faf1757 sap-bombo
zhaoxiaolin f778b42cbc sap模块代码合并
zhaoxiaolin 980e7f4a11 sap模块代码合并
zhaoxiaolin 139dc3fb4c 日生产报表功能
zhaoxiaolin ca4b21061c 计划bug和质量bug修改
zhaoxiaolin 5a60b22157 计划-设备路线选择更改；报工定时任务；
zhaoxiaolin 5c850ba017 工艺bug修改
zhaoxiaolin e892e8c2fe sap模块代码整合
zhaoxiaolin 60de714016 sap模块代码整合
zhaoxiaolin da486d7e20 订单同步按钮
zhaoxiaolin 944d9d9308 订单同步接口测试
zhaoxiaolin f2151cc0b3 工艺同步接口
zhaoxiaolin 5ddc72024f 工单回传
zhaoxiaolin 1879d18ba9 数据源规则修改
zhaoxiaolin ae4d615aff 领料单获取
zhaoxiaolin d70b27e01f 领料单提交
zhaoxiaolin 7fc87674e9 领料单提交
zhaoxiaolin a5340c0934 领料单提交
zhaoxiaolin 07d80f45c6 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcProCheckServiceImpl.java
#	op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java
zhaoxiaolin 7dc31d221a 领料单提交
zhaoxl 3564e4308c 上传文件至 'op-api/op-api-system/src/main/java/com/op/system/api'
Yangwl 73aca5b45b Merge branch 'master' of F:\workplace-idea\榄菊\lanju-cloud with conflicts.
zhaoxiaolin a87eb0a200 wcs接口开发转移
zhaoxiaolin 67ef0ac298 wcs接口开发转移
zhaoxiaolin ccb5ec78b9 实体目录变更
zhaoxiaolin 91c07021ae wcs跟Mes交互的接口
zhaoxiaolin 362f6a167b 计划涉及的接口开发
Yangwl 7aefee6af8 SAP模块提交订单同步操作
zhaoxiaolin 0741e934cc 微服务拆分4