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

306 Commits (72c07c3ecf9869625820ee6ddd798aaf8ed61fe1)

Author SHA1 Message Date
zhaoxiaolin 55fc30ed13 质量任务接口修改
zhaoxiaolin ed76f9734d Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDetail.java
zhaoxiaolin d9022031db 入库检验修改
shaoyong fca8d70fb6 检测报告修改
zhaoxiaolin 6473691de9 oa修改-
zhaoxiaolin 98084eaf1e 巡检报告
zhaoxiaolin fc507735c7 巡检报告
shaoyong e69a2bbf2d 来料抽样规则修改
zhaoxiaolin ba9216c14a 不良率综合统计报表
zhaoxiaolin a91af79c92 不良率统计报表
shaoyong da4f10f603 首检报告修改
zhaoxiaolin 816efb1f5a 巡检触发逻辑变更
zhaoxiaolin 52f2be01fd 巡检触发逻辑变更
shaoyong 096e30657d 首检报告
zhaoxiaolin 3a9aa84d56 巡检不良分析图表
zhaoxiaolin 827657c43d 巡检不良分析图表
zhaoxiaolin 5e3c032647 oa流程有问题
zhaoxiaolin c808859ea6 巡检检验加批次
zhaoxiaolin 0f490cf817 物料检测项加检测项关联
zhaoxiaolin 94dccff050 质量改动
zhaoxiaolin 4dc1a16dab 质量改动
shaoyong 1ddd59dfd0 检验方案维护
zhaoxiaolin c3907c14c6 白坯图表
陈恒杰 1211472ae4 手动创建白坯入库单1
zhaoxiaolin d6d6d33110 检验手持接口修改
zhaoxiaolin 9971a509bc 检验手持接口修改
zhaoxiaolin 02fb55dc6e 新增白坯工单管理
zhaoxiaolin 6624eb2992 入库检验工单修改来源表
陈恒杰 9d37d5eb05 Merge remote-tracking branch 'origin/master'
陈恒杰 1d23f85a3c 手动创建白坯入库单修改
zhaoxiaolin 949a7f8f33 入库检验工单修改来源表
陈恒杰 a0afd6a4fa Merge remote-tracking branch 'origin/master'
陈恒杰 a953d4eb29 手动创建白坯入库单
wws e6b7588488 Merge remote-tracking branch 'origin/master'
wws 5f0a78bbe9 白坯合格统计
陈恒杰 b032991675 Merge remote-tracking branch 'origin/master'
陈恒杰 62084d080b 手动创建白坯入库单
zhaoxiaolin 0b302ed86e 入库检验任务接口+巡检任务调整
zhaoxiaolin 86e6b205a0 入库检验任务接口
zhaoxiaolin a4ad441dad 质量过程巡检+来料检验任务接口+报工sql调整
陈恒杰 796126ccd0 Merge remote-tracking branch 'origin/master'
zhaoxiaolin 30fac0e8dd 质量过程巡检+来料检验任务接口+报工sql调整
shaoyong 4e65a7d092 检验人员多选
陈恒杰 d189457891 Merge remote-tracking branch 'origin/master'
zhaoxiaolin 63cc8e2053 质量过程巡检+来料检验任务接口
陈恒杰 d903ee4b66 Merge remote-tracking branch 'origin/master'
zhaoxiaolin f1f895ee20 质量质检+工单管理界面加入母单信息+首页图表
陈恒杰 eebf7a2cf5 Merge remote-tracking branch 'origin/master'
zhaoxiaolin 245301f4f8 质量质检qc_status添加批次
zhaoxiaolin e9528b28da 质量质检qc_status添加批次
zhaoxiaolin 0ccb32d068 质量质检qc_status添加
陈恒杰 db81932f2c Merge remote-tracking branch 'origin/master'
zhaoxiaolin 3671723f7e 质量看板接口修改3
陈恒杰 be462da39c Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	dev_jco_rfc.trc
陈恒杰 3c67bcc5fa 打印领料单修改
zhaoxiaolin bb18fbce4a 质量看板接口修改
zhaoxiaolin 5f03c120b6 质量看板接口
zhaoxiaolin a4c58a143c 质量看板接口
zhaoxiaolin afe322e8c9 领料单+质量看板接口
zhaoxiaolin 4362014544 只有活动中的工单才能进行报工
zhaoxiaolin 47318ca385 质量调整
zhaoxiaolin 36b28836d4 质量bug
zhaoxiaolin 602d09a82d 生产过程检验修改测试
zhaoxiaolin 376e54ee5e 生产过程检验修改测试
zhaoxiaolin 0484626152 来料检验修改测试
zhaoxiaolin b4f86d97a0 质量-检测项目检验修改
zhaoxiaolin 6712c71f99 质量-检测项增加两个属性
zhaoxiaolin 8856c74e4d 质量bug修复
zhaoxiaolin 56fc72ff0d sap报工
zhaoxiaolin f13ee5d888 sap调整+质量手持接口+首页柱图数据bug修复
zhaoxiaolin 2f221e1905 sap调整
zhaoxiaolin f221f0ec05 质量分析图表
zhaoxiaolin 9c9da57bcf 质量统计
zhaoxiaolin 60270136f7 质量统计
zhaoxiaolin 4a6323cd46 质量统计
zhaoxiaolin 2b16e9e96d 质量报表功能
zhaoxiaolin 2aa1ad4f2e bat换jdk
zhaoxiaolin d04c1068f8 检验报告
zhaoxiaolin 74bb98faa3 检验报告
zhaoxiaolin 749c2cf67d mes上位机接口迁移scada
zhaoxiaolin 15157dd26e 测试版本注册中心修改
zhaoxiaolin 4bd0df94ff 发版命令
shaoyong 716dfd6db5 检验报告，来料报告
zhaoxiaolin 1d3eb31a88 质量系统，不合格处理功能
zhaoxiaolin 28145447cb sap联调
zhaoxiaolin 9c89b70be0 质量任务表调整
zhaoxiaolin 618157586d 质量任务表调整
zhaoxiaolin ef0f839892 不合格处理
zhaoxiaolin 8e8ac0e125 备份定时任务
shaoyong ee48170cc8 人员物料绑定查询修改
zhaoxiaolin ac16a5d785 入库过程检验
zhaoxiaolin 7c6d5a1b4f 生产过程检验v4
zhaoxiaolin 94010d9146 生产过程检验v3
shaoyong e25f223632 人员物料绑定修复
zhaoxiaolin 9d55da3a0b 生产过程检验+手持发版记录
shaoyong 7329c54eab 物料检验项目维护修复
shaoyong 3c40a7df23 物料检验项目维护
zhaoxiaolin c1fac1f909 原料检验任务1.0
zhaoxiaolin d80fe972b3 原料检验任务
shaoyong c67c7a464d 修改物料检验项目实体
zhaoxiaolin db3192e9a1 增加排序字段
shaoyong eec6231915 Merge remote-tracking branch 'origin/master'
zhaoxiaolin 6551e07899 质量系统-检验任务管理2
shaoyong 40b350ac8b Merge remote-tracking branch 'origin/master'
zhaoxiaolin 34aad9a2bf 质量系统-检验任务管理1
shaoyong 579a482c85 物料检验项目维护
shaoyong cd3d3bd928 检验节点维护
zhaoxiaolin 9bea4d9d6c 工单编码
zhaoxl 21949d6e79 zxl
zhaoxiaolin 4a0b3dc0b2 手持修改
zhaoxiaolin ccb8a178cb 生产环境
zhaoxiaolin da2074411b 数据源
A0010407 d193c0c676 手持查询
zhaoxiaolin c5866a95c6 手持接口+订单bug修复
zhaoxiaolin f92e75d11f 计划问题修改
zhaoxiaolin e38a563f81 逻辑删除+手持增加缓冲区接口
zhaoxiaolin f778b42cbc sap模块代码合并
chj 39773ffbc8 成品销售出库修改
zhaoxiaolin 139dc3fb4c 日生产报表功能
zhaoxiaolin 7fefe369cc 计划bug和质量bug修改
zhaoxiaolin 5a60b22157 计划-设备路线选择更改；报工定时任务；
zhaoxiaolin c1885b1805 手持质量检验
zhaoxiaolin d6d5ff4ae3 计划bug修改-- 计划的选择方式修改
zhaoxiaolin 76036ee69a 计划bug修改
周鸿羽（海威） 9c77c577d9 上传文件至 'op-modules/op-quality/src/main/java/com/op/quality/mapper'
周鸿羽（海威） 53b84eeb5b 上传文件至 'op-modules/op-quality/src/main/java/com/op/quality/Controller'
周鸿羽（海威） 7d4632e30b 上传文件至 'op-modules/op-quality/src/main/java/com/op/quality/Controller'
周鸿羽（海威） 8996a9396a 删除多余文件
zhaoxiaolin 60de714016 sap模块代码整合
zhaoxl 7158568d2d 更新 'op-modules/op-quality/src/main/resources/mapper/QcProCheckMapper.xml'
zhaoxl bf47235f34 上传文件至 'op-modules/op-quality/src/main/resources/mapper'
zhaoxiaolin dee2982dbd 工单下发sap接口联调
zhaoxl 1ff37dc20e 删除 'op-modules/op-quality/src/main/resources/QcProCheckMapper.xml'
zhaoxl 1a14aef2dd 上传文件至 'op-modules/op-quality/src/main/resources/mapper'
zhaoxl 33e8364c4a 上传文件至 'op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl'
zhaoxl 96a998e66e 上传文件至 'op-modules/op-quality/src/main/java/com/op/quality/controller'
zhaoxl 604d6de09c 上传文件至 'op-modules/op-quality/src/main/java/com/op/quality/Controller'
zhaoxl 317e69e12d 上传文件至 'op-modules/op-quality/src/main/java/com/op/quality/Controller'
zhaoxiaolin 7fc87674e9 领料单提交
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 7e49161b5b 上传文件至 'op-modules/op-quality/src/main/resources/mapper'
zhaoxl cf3f610f4f 上传文件至 'op-modules/op-quality/src/main/java/com/op/quality/utils'
zhaoxl 8bc844ae73 上传文件至 'op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl'
zhaoxl 992613c54e 上传文件至 'op-modules/op-quality/src/main/java/com/op/quality/service'
zhaoxl 58d3d2592e 上传文件至 'op-modules/op-quality/src/main/java/com/op/quality/mapper'
zhaoxl 6b76b13263 上传文件至 'op-modules/op-quality/src/main/java/com/op/quality/domain'
zhaoxl cbd1002bfa 上传文件至 'op-modules/op-quality/src/main/java/com/op/quality/Controller'
zhaoxl 1c1319dd5e 上传文件至 'op-modules/op-quality/src/main/java/com/op/quality/config'
zhaoxl a7cf08632e 删除 'op-modules/op-quality/src/main/java/com/op/quality/QcProCheck.java'
zhaoxl c48701e83e 删除 'op-modules/op-quality/src/main/java/com/op/quality/DynamicDatasource.java'
zhaoxl 272382104c 删除 'op-modules/op-quality/src/main/java/com/op/quality/BaseFile.java'
zhaoxl 0c134bcd2f 删除 'op-modules/op-quality/src/main/java/com/op/quality/QuaController.java'
zhaoxl 46e476cc33 上传文件至 'op-modules/op-quality/src/main/java/com/op/quality'
Yangwl 73aca5b45b Merge branch 'master' of F:\workplace-idea\榄菊\lanju-cloud with conflicts.
zhaoxiaolin 95205cd536 微服务添加