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

909 Commits (9bc2c103eaf796e724db6d0bb2e550eb3854736f)

Author SHA1 Message Date
wws 41079dee1e 申领单删除BUG解决
wws 31d87a16e4 Merge remote-tracking branch 'origin/master'
wws c0fd87d2d1 申领单删除逻辑、保养单备件删除BUG解决
zhaoxiaolin 93f60c6f6c 工单设备修改
zhaoxiaolin f221f0ec05 质量分析图表
A0010407 a72bdf8068 设备
wws 33c31ae564 点检、巡检、保养逻辑删除、生成编码重复BUG
wws 4bb2020255 检查项显示优化
wws 0fa435b51c 保养不添加到报修
wws 54a704ba27 Merge remote-tracking branch 'origin/master'
wws 4ea11df041 保养图片上传BUG解决
zhaoxiaolin 06108ad230 Merge remote-tracking branch 'origin/master'
zhaoxiaolin 0fe2254568 mes升级
wws b8e783e6a7 Merge remote-tracking branch 'origin/master'
wws 3abec72895 点检、巡检、保养图片上传和显示
A0010407 58bb60bb3e 设备
zhaoxiaolin 9c9da57bcf 质量统计
zhaoxiaolin 60270136f7 质量统计
A0010407 4c02aa5b2e 维修-3
wws fe57d99362 保养工单备件逻辑变更
wws 50d9d7c19e Merge remote-tracking branch 'origin/master'
wws 3dfe3f2b6c 保养工单备件逻辑变更
wws ba8dc2e8b4 保养工单备件逻辑变更
A0010407 0ed4556317 报修-2
A0010407 3607c4e490 设备-维修-1
zhaoxiaolin 4a6323cd46 质量统计
陈恒杰 bddcdd4181 rfid流程修改
A0010407 76ef1fd102 设备模块-报修-1
zhaoxiaolin d551bac244 Merge remote-tracking branch 'origin/master'
zhaoxiaolin 160d6f7280 成品工单下派，暂时去掉sap逻辑
wws e0a5330e98 Merge remote-tracking branch 'origin/master'
wws a47b8ead75 保养用时+PDA开始保养接口
zhaoxiaolin 2b16e9e96d 质量报表功能
wws d210876154 1
wws 454367aae5 Merge remote-tracking branch 'origin/master'
wws 74dfb91633 点检、巡检、保养页面优化
A0010407 5c2b404e76 设备
wws 688fe5c39e Merge remote-tracking branch 'origin/master'
wws 1597701d9a 填写记录BUG、PDA查询逻辑
zhaoxiaolin 3e642c17a0 委外保养工单生成
zhaoxiaolin 8dfc341463 下机台获取-unlock
wws 6f8a167d96 Merge remote-tracking branch 'origin/master'
wws 2f9c7c1c03 保养委外
zhaoxiaolin 20abf4cde4 报工+成品计划升级
wws d53c96be6b Merge remote-tracking branch 'origin/master'
wws 560d3dff2f 设备-工单逻辑变更
zhaoxiaolin bda1cbdb55 保养定时任务
wws 76bdb1fbb3 点检、巡检查询优化
wws 8847b8e57c Merge remote-tracking branch 'origin/master'
wws c3f27a0b37 点检、巡检、保养逻辑优化
zhaoxiaolin 24fe8b0b83 保养定时任务
wws 52b3bc3a83 填写记录BUG
wws 6dd294ab7f Merge remote-tracking branch 'origin/master'
zhaoxiaolin cb8863b061 mes报工
wws 41cd2fa5f8 查询BUG
wws 3bd0d8a653 设备看板接口
wws 126ff29e69 Merge remote-tracking branch 'origin/master'
wws 90d9b80bf7 点击工单BUG
Yangwl 2a5cb29acd 烘房看板接口 
# Conflicts:
#	op-modules/op-mes/push-mes.bat
Yangwl 3017b71215 烘房看板接口
Yangwl c0ee7ca097 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java
Yangwl 598ec4a496 烘房看板接口 
# Conflicts:
#	op-modules/op-mes/push-mes.bat
zhaoxiaolin 4939bad46f mes报工
zhaoxiaolin d3c51aeff9 Merge remote-tracking branch 'origin/master'
zhaoxiaolin 96223a90a0 mes报工
wws 555235c504 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml
#	op-modules/op-device/src/main/resources/mapper/device/EquOrderStandardMapper.xml
wws 2201ea4bce 1
wws 32c08aaec5 1
zhaoxiaolin ba999d484c 成品计划修改
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 bb0ac02cc8 烘房看板接口
Yangwl cec59e4bc4 烘房看板接口
wws 5bf8279617 计划新增-parentCode存放上级id
wws 5ff08114f2 计划新增-parentCode存放上级id（修改查询未完善）
wws 6e236cb58d 删除标准code、备件code字段、工单查询逻辑变更
wws bf0ea1b707 Merge remote-tracking branch 'origin/master'
wws 8874da06bc 备件信息-库存
zhaoxiaolin 4f2b0c6e01 成品bug修改
zhaoxiaolin 3262f842a3 成品bug修改
wws 0e6a6286f6 点检巡检保养手持优化
wws de89a76846 Merge remote-tracking branch 'origin/master'
wws 8637740293 点检逻辑前后端优化
zhaoxiaolin 184a5541ce test
wws 28e2f90ce5 Merge remote-tracking branch 'origin/master'
wws 20efabdfd1 点检-巡检-保养-检查项优化
zhaoxiaolin 8ce8e22a47 Merge remote-tracking branch 'origin/master'
zhaoxiaolin 15581ac8a3 新增接口服务，去掉scada服务
A0010407 a3199b61c1 手持报修维修 后端接口
zhaoxiaolin 2aa1ad4f2e bat换jdk
zhaoxiaolin 59a3fcd4ed 换jdk
zhaoxiaolin 9b58911bfa scada服务数据源
zhaoxiaolin 77742e3c2f scada服务数据源
zhaoxiaolin c7c00e0d72 Merge remote-tracking branch 'origin/master'
zhaoxiaolin d04c1068f8 检验报告
wws eef550d5ae 实体类同步
zhaoxiaolin 74bb98faa3 检验报告
wws baa2e209a3 PDA手持填写巡检记录优化
wws 6dafbca7d1 Merge remote-tracking branch 'origin/master'
wws 88ee80c6ca 点检工单优化
A0010407 f969619323 报修+维修+设备班组+委外+PDA
wws ec9a071b8f Merge remote-tracking branch 'origin/master'
wws 86effcdbfb 报表优化
zhaoxiaolin 749c2cf67d mes上位机接口迁移scada
wws 5bb40f28e5 Merge remote-tracking branch 'origin/master'
wws 92615d8e28 报表优化
zhaoxiaolin 15157dd26e 测试版本注册中心修改
wws 362a8ac15a 报表-保养记录init
wws 1417a47d95 Merge remote-tracking branch 'origin/master'
wws c466027d74 报表-巡检记录
zhaoxiaolin 4bd0df94ff 发版命令
zhaoxiaolin c7bfb41867 管理系统报工
wws 7f67bc9b15 Merge remote-tracking branch 'origin/master'
wws 996c45f972 保养工单-检验+填写记录
zhaoxiaolin 9f051a1277 管理系统报工1.0
Yangwl fec239c59c Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	ABAP_AS_WITH_POOL.jcoDestination
#	op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java
#	op-modules/op-mes/src/main/java/com/op/mes/service/IWCSInterfaceService.java
#	op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java
Yangwl 4b36de1131 烘房看板接口
wws 9e14409743 Merge remote-tracking branch 'origin/master'
wws 2c3f1996b9 保养工单-快速工单
zhaoxiaolin 42b0c4622d 计划bug+报工上位机接口提供
shaoyong 716dfd6db5 检验报告，来料报告
陈恒杰 83548f708f Merge remote-tracking branch 'origin/master'
陈恒杰 dbd3b16007 rfid流程修改
A0010407 1d5b107814 报修+维修+设备班组+委外
zhaoxiaolin cca83e6511 bug
zhaoxiaolin 1d3eb31a88 质量系统，不合格处理功能
wws 450ccdf163 计划成品拆分BUG修复
wws 65e738dd3a 计划成品拆分BUG修复
zhaoxiaolin 28145447cb sap联调
Yangwl d59ebb0895 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	ABAP_AS_WITH_POOL.jcoDestination
#	op-modules/op-sap/pom.xml
Yangwl afa7c430fe SAP配置
Yangwl d59af9f9f6 增加SAP接口
A0010407 9bb46f6a5e 报修+维修+设备班组
zhaoxiaolin 551e194707 sap联调
zhaoxiaolin 9c89b70be0 质量任务表调整
zhaoxiaolin 618157586d 质量任务表调整
wws 5803ae6782 Merge remote-tracking branch 'origin/master'
wws a916fe242b 点检工单、保养工单init
zhaoxiaolin ef0f839892 不合格处理
wws 3491e38ec1 Merge remote-tracking branch 'origin/master'
wws fe0727c0d1 点检计划
zhaoxiaolin 8e8ac0e125 备份定时任务
zhaoxiaolin 05546bb4dd Merge remote-tracking branch 'origin/master'
zhaoxiaolin e32ee7119b bug修改
wws 337eb97c68 Merge remote-tracking branch 'origin/master'
wws 86a39d613c 保养计划-修改
zhaoxiaolin 4278e4cb73 bug修改
zhaoxiaolin 42b9c09918 bug修改
A0010407 39b392d037 报修+维修+委外
wws c7e42f4045 Merge remote-tracking branch 'origin/master'
wws 8152b17171 保养计划-新增
shaoyong ee48170cc8 人员物料绑定查询修改
zhaoxiaolin ac16a5d785 入库过程检验
zhaoxiaolin 7c6d5a1b4f 生产过程检验v4
zhaoxiaolin 94010d9146 生产过程检验v3
shaoyong e25f223632 人员物料绑定修复
wws 35b354562b 保养计划
wws c0daf9a89a Merge remote-tracking branch 'origin/master'
wws 45c3b2b7c9 手持接口-巡检工单-提交接口
zhaoxiaolin 9d55da3a0b 生产过程检验+手持发版记录
shaoyong 7329c54eab 物料检验项目维护修复
wws f60d6559f9 Merge remote-tracking branch 'origin/master'
wws fab6f3aa28 手持接口-巡检工单
shaoyong 3c40a7df23 物料检验项目维护
zhaoxiaolin c1fac1f909 原料检验任务1.0
wws b865658cb2 巡检工单填写记录
wws fc69128a8c Merge remote-tracking branch 'origin/master'
wws dcbde38d27 巡检工单填写记录V1
A0010407 870fde44b5 报修
A0010407 d5ae6cea2c 报修+委外工单
wws aedd7d6052 保养计划初始化、巡检工单初始化
zhaoxiaolin d80fe972b3 原料检验任务
shaoyong c67c7a464d 修改物料检验项目实体
wws 8c3829be4d Merge remote-tracking branch 'origin/master'
wws a6d04164ec 1
zhaoxiaolin db3192e9a1 增加排序字段
wws 9c65126191 Merge remote-tracking branch 'origin/master'
wws 4cac17b9bb 巡检计划优化
A0010407 dd8a332ae6 报修+维修工单
wws 08879199ae Merge remote-tracking branch 'origin/master'
wws 6f33aec08c 检查项删除检验逻辑
shaoyong eec6231915 Merge remote-tracking branch 'origin/master'
zhaoxiaolin 6551e07899 质量系统-检验任务管理2
shaoyong 40b350ac8b Merge remote-tracking branch 'origin/master'
zhaoxiaolin 34aad9a2bf 质量系统-检验任务管理1
wws ac2f99c2c7 巡检计划修改+删除
wws 411e562832 Merge remote-tracking branch 'origin/master'
wws 6bde4f4df9 巡检计划修改初始化
ShiChangzhou 78c069cae9 解决sap打包发版问题
wws 435e7adcd4 巡检计划新增接口初始化
shaoyong b47919426d Merge remote-tracking branch 'origin/master'
shaoyong 579a482c85 物料检验项目维护
wws 38270b9b0a 巡检计划
wws ac78b175ca Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java
#	op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java
wws 33a6a48497 Merge remote-tracking branch 'origin/master'
wws e56dc7446b 巡检计划
A0010407 a10b915de3 改名字+报修
A0010407 c78f1542ed 备品备件领用
A0010407 23659427c6 备品备件领用
zhaoxiaolin 6ccba2ca54 Merge remote-tracking branch 'origin/master'
zhaoxiaolin 73d26c1f8b sap基础数据同步，更新时段修改
wws 5299c1e27d Merge remote-tracking branch 'origin/master'
wws 54715aaf0b 巡检计划
A0010407 91c175fff1 备品备件台账
A0010407 bce6390db6 备品备件入库+备品备件台账
zhaoxiaolin 50da3686fb 推送镜像指令
zhaoxiaolin d4ce34c332 1、看板料罐车数获取；2、小时产量加班次、分钟数做活,导出功能；3、工序完成记录加入班次
A0010407 497e14c965 备品备件台账
wws 8e4a8bb12b 巡检计划初始化
shaoyong cd3d3bd928 检验节点维护
zhaoxiaolin b1d37a7c79 下工序机台获取接口
zhaoxiaolin 316c053a6e Merge remote-tracking branch 'origin/master'
zhaoxiaolin 57ff0dd3ea 小时产量报表增加合计
wws 2de0b1d2df 故障类型维护(优化查询)
wws 991a9e874b Merge remote-tracking branch 'origin/master'
wws 9b7791718c 设备管理-故障类型V1.1
zhaoxiaolin f6ebd9e321 看板、小时产量报表
wws 433a307c75 设备管理-创建/更新字段BUG
wws 25b5fbe636 Merge remote-tracking branch 'origin/master'
wws 2efd13594d 设备管理-故障类型V1
Yangwl fdf2c8ce69 Merge remote-tracking branch 'origin/master'
Yangwl 63d00b8a45 SAP订单同步接口增加工厂参数、修改MES连接SAP工具类。删除多余文件。
wws 22bd4abe35 Merge remote-tracking branch 'origin/master'
wws ebe364450a 设备管理-故障类型初始化
zhaoxiaolin e0e08736bf 看板接口3
wws eabf618a1a Merge remote-tracking branch 'origin/master'
zhaoxiaolin d19159a2f3 看板接口2
wws eb7ad777ec 设备管理-检查项维护V2(关联设备)
zhaoxiaolin d6e558f422 工序产量查询
zhaoxiaolin ff20d3cfa4 白坯订单v3
zhaoxiaolin 9067f3772c Merge remote-tracking branch 'origin/master'
zhaoxiaolin 2868dfb34a 白坯订单v2
wws bf8cc70fc8 Merge remote-tracking branch 'origin/master'
wws e31a93752a 设备管理-检查项维护(事务锁)
zhaoxiaolin 6f814376ca Merge remote-tracking branch 'origin/master'
zhaoxiaolin 41b3459f8b 白坯生产报表
wws 40f0238071 设备管理-检查项维护(修改BUG修复)
wws 8b3acc99b7 设备管理-检查项维护(修改BUG修复)
wws 48debb98d3 设备管理-检查项维护V1.1
wws 57ffbd7968 设备管理-检查项维护V1
wws 5205fab4f9 设备管理-检查项维护(修改)
wws 899f67ebd2 设备管理-检查项维护(新增-code格式)
wws f2fea045e5 Merge remote-tracking branch 'origin/master'
wws e81e645667 设备管理-检查项维护(新增)
zhaoxiaolin 044241f3fd saplib新包
zhaoxiaolin 051bed6373 设备名称排序
zhaoxiaolin 9bea4d9d6c 工单编码
wws 6a14a48c97 Merge remote-tracking branch 'origin/master'
wws 54c39cb2b8 设备管理-检查项维护(工厂factory->factoryCode)
zhaoxiaolin ecef3b7e38 Merge remote-tracking branch 'origin/master'
zhaoxiaolin 2d905987ba mes看板
zhaoxl 5d84e18e58 zxl
zhaoxl 49aa8b6804 zxl
zhaoxl 8536f1abbc zxl
zhaoxl 1c8f355e58 zxl
zhaoxl a5dda0ad18 zxl
zhaoxl 89c924ba0b zxl
zhaoxl 21949d6e79 zxl
zhaoxl a845ce70c9 zxl
zhaoxl 699f763bff zxl
zhaoxl 6fbf90e184 zxl
zhaoxl 5a38036abc zxl
zhaoxl 6cebb21c8d zxl
wws 59ed4122cb 设备管理-检查项维护(搜索优化)
wws 6e57dfe409 设备管理-检查项维护初始化
zhaoxiaolin 4a0b3dc0b2 手持修改
zhaoxiaolin ccb8a178cb 生产环境
chj 828462b93d Merge remote-tracking branch 'origin/master'
chj 836a883081 成品生产入库修改
zhaoxiaolin 968c577902 sap包测试版本用1.0.0
ShiChangzhou de1e664328 1
zhaoxiaolin 566d2b4d93 Merge remote-tracking branch 'origin/master'
zhaoxiaolin 92cf26ddd6 sap 包3.0.8
ShiChangzhou 7586361189 1
zhaoxiaolin 7a42aea19f sap pom修改
zhaoxiaolin 8bc62dc72d sap接口bug修复
zhaoxiaolin da2074411b 数据源
zhaoxiaolin 0a822359bd 数据源
zhaoxiaolin 8603ea7ac2 湿料计划表status状态调整
A0010407 94fe3d8c84 供应商
zhaoxiaolin 852bff3af6 sap 定时任务
zhaoxiaolin f329c7c39b Merge remote-tracking branch 'origin/master'
zhaoxiaolin eb87002be9 sap 定时任务
A0010407 8f5de59e5c mes rfid
shaoyong 97e5b56b03 sap修改
zhaoxiaolin 55df9b2ec8 sap jar包2
zhaoxiaolin bb61ed1b95 sap jar包
A0010407 ae8cd366bd mes报工bug
shaoyong 7356633a0c 供应商同步，客户同步
A0010407 7f5ab75bfd 手持Rfid
zhaoxiaolin f283217265 Merge remote-tracking branch 'origin/master'
zhaoxiaolin 43eeb7af14 sap jar包
A0010407 9f3a839045 物料模糊查询
A0010407 d193c0c676 手持查询
A0010407 045090004c mes报表权限
zhaoxiaolin 60d5af1088 Merge remote-tracking branch 'origin/master'
zhaoxiaolin 8678afa391 手持接口修改+权限
A0010407 ef44564653 基础信息权限问题
zhaoxiaolin 292742f42f sap同步工作中心
zhaoxiaolin c5866a95c6 手持接口+订单bug修复