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

1204 Commits (0efb388eb1957f8b2ea3203a2b4d539329152dee)

Author SHA1 Message Date
zhaoxiaolin 8bafb59937 关闭订单暂时隐藏
zhaoxiaolin 730845c05d 报工界面美化一下
shaoyong ecc7b5494a 检验报告优化
zhaoxiaolin a3d8664eb2 错误信息输出
zhaoxiaolin eb7d0122b2 不合格流程提交
mengjiao 3e861ede81 wms出库过账修改22--sap过账接口的修改
shaoyong 9d860f9331 成品入库检验，不良品动态添加
Yangwl b28a727d83 Merge remote-tracking branch 'origin/master'
Yangwl 2b3e9a69cb SAP订单物料过账修改
shaoyong 7592451f79 库存检验，动态添加不良信息
zhaoxiaolin d585533008 管理系统创建入库检验任务修改
zhaoxiaolin ae79b64e03 不合规问题处理+报工问题修改
shaoyong 59b051365a 库存检验，库存报告，物料组优化
zhaoxiaolin 5488a72f7e 工时改小时
zhaoxiaolin f9677e5af9 不合规问题处理+报工问题修改
zhaoxiaolin 1b04a3f94e 不合规问题处理+报工问题修改
mengjiao dcb357d143 Merge remote-tracking branch 'origin/master'
mengjiao d45d7dc9fb wms出库过账修改21
Yangwl 9d882c2dde Merge remote-tracking branch 'origin/master'
Yangwl 8a97240e84 OA接口完善
zhaoxiaolin b681252e2f 质量问题修改10
wws a5afad3f39 Merge remote-tracking branch 'origin/master'
wws 07982d9b16 上位机报修
zhaoxiaolin 69793976ed 质量问题修改9
zhaoxiaolin 282aab7213 质量问题修改9
shaoyong cce1431375 生产过程优化
mengjiao 04e77146ea Merge remote-tracking branch 'origin/master'
mengjiao 84602550e5 wms出库过账修改20
zhaoxiaolin dadbb05481 质量问题修改9
shaoyong af4f0111f1 过程检验ABC不良数据动态获取，抽样规则优化，物料组新增优化
zhaoxiaolin a3d169cbea 质量问题修改8
zhaoxiaolin 05435a6e24 Merge remote-tracking branch 'origin/master'
zhaoxiaolin f92f8ceb2d 质量问题修改8
A0010407 6cffc89ead 2024-1-12 基础信息-BOM模糊查询
zhaoxiaolin 272b52b9e1 质量问题修改8
zhaoxiaolin 72512329ae 质量问题修改7
A0010407 f3dbd81cab 2024-1-12 基础信息-bom数据改结构 第一版
mengjiao 61996ec9b9 Merge remote-tracking branch 'origin/master'
mengjiao 8a1c63d6c4 wms出库过账修改19
zhaoxiaolin 55c2e86c0c 质量问题修改6
zhaoxiaolin 46bf2b57af 质量问题修改6
zhaoxiaolin f1111ae286 质量问题修改6
zhaoxiaolin c1aa782bde 质量问题修改5
zhaoxiaolin 87f1c95e9d 质量问题修改4
zhaoxiaolin 8b7d6c238d 质量问题修改3
zhaoxiaolin 798e94cb5c 质量问题修改2
zhaoxiaolin b33cc3a394 Merge remote-tracking branch 'origin/master'
zhaoxiaolin f5f7fc1ae6 质量问题修改
mengjiao 35c376dde4 Merge remote-tracking branch 'origin/master'
mengjiao 4b65097515 wms修改18.4-报工页面的sap收货修改
zhaoxiaolin 09992a3030 子母报工加延时
zhaoxiaolin 385ed16dd5 报工状态修改2
zhaoxiaolin 2ad4207e50 Merge remote-tracking branch 'origin/master'
zhaoxiaolin 717047fa03 报工状态修改
mengjiao 24e8629359 wms修改18.4-报工页面的sap收货
zhaoxiaolin 886cfd442d 成品入库检测任务联调
mengjiao 6cc3e25bf0 wms修改18.4-报工页面的质检任务生成
zhaoxiaolin 6f63517cf0 质量任务接口修改5
zhaoxiaolin 473390a738 Merge remote-tracking branch 'origin/master'
zhaoxiaolin 48b0695942 质量任务接口修改4
wws 6be8effd2a Merge remote-tracking branch 'origin/master'
wws 76a507c240 看板年月日逻辑
zhaoxiaolin 6f1d92edd5 质量任务接口修改3
zhaoxiaolin 58d80d29c8 质量任务接口修改2
zhaoxiaolin dda4c9595c Merge remote-tracking branch 'origin/master'
zhaoxiaolin 55fc30ed13 质量任务接口修改
A0010407 0c5cf3f18f 2024-1-10-1 设备-看板-年月日-设备稳定性
zhaoxiaolin 3e965d7b70 更新物料修改bug
zhaoxiaolin ed76f9734d Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDetail.java
zhaoxiaolin d9022031db 入库检验修改
mengjiao 5f1e69b4b7 Merge remote-tracking branch 'origin/master'
mengjiao 2ff5a8dc09 wms修改18.4-报工页面的sap收货按钮，和成品入库页面的过账按钮修改
shaoyong fca8d70fb6 检测报告修改
zhaoxiaolin f110febe1c 文件修复
mengjiao 99d56f44db wms修改18.3-报工页面的sap收货按钮，和成品入库页面的过账按钮修改
mengjiao a8d2695880 wms修改18.2-报工页面的sap收货按钮，和成品入库页面的过账按钮修改
mengjiao 2d45083515 Merge remote-tracking branch 'origin/master'
mengjiao 9e37514457 wms修改18.1-报工页面的sap收货按钮，和成品入库页面的过账按钮修改
zhaoxiaolin a2a7c972a7 Merge remote-tracking branch 'origin/master'
zhaoxiaolin 6473691de9 oa修改-
mengjiao 54e2e97eca Merge remote-tracking branch 'origin/master'
mengjiao baf41707a6 wms修改18-报工页面的sap收货按钮，和成品入库页面的过账按钮修改
wws 976cb28b54 Merge remote-tracking branch 'origin/master'
wws 56d369c801 已删除设备不生成任务
A0010407 51f62a5853 2024-1-9-3 设备-1.增加故障次数 停机次数 2.完善手持、PC和维修流程 3.完善当日设备稳定性
Yangwl ddfb519fbf Merge remote-tracking branch 'origin/master'
zhaoxiaolin 98084eaf1e 巡检报告
Yangwl bd8870982d OA接口
zhaoxiaolin fc507735c7 巡检报告
A0010407 8a8cdaaed4 2024-1-9-2 基础信息-工厂-加工厂建模类型
A0010407 88bda16f8f 2024-1-9-1 设备管理-故障描述 四个页面 故障编码问题+页面排序展示问题
shaoyong e69a2bbf2d 来料抽样规则修改
wws 1f66bd4688 PDA任务列表展示顺序只展示范围内
wws 87fd4374f6 PDA任务列表展示顺序只展示当天的
wws f349941a94 PDA任务列表展示顺序
zhaoxiaolin ba9216c14a 不良率综合统计报表
mengjiao 969897968c Merge remote-tracking branch 'origin/master'
mengjiao 0f638c756f wms修改17.2--成品入库修改
zhaoxiaolin a91af79c92 不良率统计报表
A0010407 4ee47b457c 手持 报修单后端+维修单后端加逻辑 设备完好率
wws 6fb6fabba6 Merge remote-tracking branch 'origin/master'
wws 4a94e29eba PDA详情设备名称显示
mengjiao 84e1d4aea4 Merge remote-tracking branch 'origin/master'
mengjiao b64bed18e9 wms修改17.1--成品入库修改
wws 7dee2effa0 Merge remote-tracking branch 'origin/master'
wws 1f2dcfda47 PDA任务排序
mengjiao c563412e61 Merge remote-tracking branch 'origin/master'
mengjiao f213410be3 wms修改17--成品入库修改
wws ce8bbe3917 Merge remote-tracking branch 'origin/master'
wws 783150feed 保养手持提交BUG解决
shaoyong da4f10f603 首检报告修改
wws 62ee2492fc 数据源分配用户查询BUG解决
zhaoxiaolin 816efb1f5a 巡检触发逻辑变更
wws c83450bfa9 Merge remote-tracking branch 'origin/master'
wws 76f8261176 检查项录入不可新增BUG解决
A0010407 1225206e73 备件申领单加单价总价
zhaoxiaolin 52f2be01fd 巡检触发逻辑变更
wws f9cb4a5c1d Merge remote-tracking branch 'origin/master'
wws fd54baf7a8 检查项录入不可修改BUG解决
shaoyong 096e30657d 首检报告
zhaoxiaolin 3a9aa84d56 巡检不良分析图表
zhaoxiaolin 827657c43d 巡检不良分析图表
A0010407 a68a3ac1a8 设备 维修---->设备完好率（一天内多次）
A0010407 d307cd97f4 维保记录
zhaoxiaolin 5e3c032647 oa流程有问题
Yangwl ed23db844a Merge remote-tracking branch 'origin/master'
Yangwl 61c37758f8 计件薪酬、包装线看板接口
BrickHome 6ae48c69ae Merge remote-tracking branch 'origin/master'
BrickHome f4d8b7460e 保养费用BUG解决
zhaoxiaolin c808859ea6 巡检检验加批次
zhaoxiaolin 0f490cf817 物料检测项加检测项关联
mengjiao 17f68e3306 wms修改16.1
zhaoxiaolin 94dccff050 质量改动
zhaoxiaolin 4dc1a16dab 质量改动
mengjiao 8d1b4db68c Merge remote-tracking branch 'origin/master'
mengjiao e538e7a425 wms修改16
wws 85ce59cd8a Merge remote-tracking branch 'origin/master'
wws f92177941b PDA获取记录
mengjiao d1e62a3d70 wms修改15
wws 4b63b2d7a2 Merge remote-tracking branch 'origin/master'
wws 9bc2c103ea 保养记录填写BUG解决
shaoyong 1ddd59dfd0 检验方案维护
mengjiao c00be3fee0 wms修改14
mengjiao 44a23eaa78 wms修改13
mengjiao 8272aabbe6 Merge remote-tracking branch 'origin/master'
mengjiao be29364888 wms修改12
zhaoxiaolin 22c08bcadb Merge remote-tracking branch 'origin/master'
zhaoxiaolin c3907c14c6 白坯图表
mengjiao 2fff9ae453 Merge remote-tracking branch 'origin/master'
mengjiao aea787217a wms修改11
A0010407 c1fd8c9c18 用户 微信名+bug
Yangwl 8bc7cd17ce Merge remote-tracking branch 'origin/master'
Yangwl 69a2f60160 101类型订单收货
陈恒杰 1211472ae4 手动创建白坯入库单1
陈恒杰 877dc435aa Merge remote-tracking branch 'origin/master'
陈恒杰 db09747042 成品入库
mengjiao 166d5d6c01 wms修改10
陈恒杰 3bd96dea12 Merge remote-tracking branch 'origin/master'
陈恒杰 81bec3822e 白坯权限
zhaoxiaolin d6d6d33110 检验手持接口修改
zhaoxiaolin 9971a509bc 检验手持接口修改
Yangwl cdd852bf07 字段注释
Yangwl 308492d614 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	op-common/op-common-core/src/main/java/com/op/common/core/constant/ServiceNameConstants.java
zhaoxiaolin 02fb55dc6e 新增白坯工单管理
Yangwl 0ec681686e OA提交字段注释
Yangwl cf0d987365 Merge remote-tracking branch 'origin/master'
Yangwl d2e644b74b OA ZL0010-来料检验不合格控制流程代码
zhaoxiaolin 6624eb2992 入库检验工单修改来源表
陈恒杰 9d37d5eb05 Merge remote-tracking branch 'origin/master'
陈恒杰 1d23f85a3c 手动创建白坯入库单修改
zhaoxiaolin 949a7f8f33 入库检验工单修改来源表
zhaoxiaolin e6554a9e41 订单管理bug修改
陈恒杰 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调整
陈恒杰 7118604055 Merge remote-tracking branch 'origin/master'
wws 5efb7d4582 Merge remote-tracking branch 'origin/master'
wws 3bd7eeb1ed 维修/保养-备件单价逻辑
陈恒杰 796126ccd0 Merge remote-tracking branch 'origin/master'
zhaoxiaolin 30fac0e8dd 质量过程巡检+来料检验任务接口+报工sql调整
shaoyong 4e65a7d092 检验人员多选
陈恒杰 d189457891 Merge remote-tracking branch 'origin/master'
zhaoxiaolin 63cc8e2053 质量过程巡检+来料检验任务接口
mengjiao 826576045e wms修改9.4
陈恒杰 8e96bc5717 Merge remote-tracking branch 'origin/master'
mengjiao 316e221ffa wms修改9.3
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 c0614e3cf8 看板接口便变更
wws 4edeb71b91 设备完好率
陈恒杰 d903ee4b66 Merge remote-tracking branch 'origin/master'
wws 1971818ea3 Merge remote-tracking branch 'origin/master'
wws f5060ed72c 设备运行记录年备份定时任务
zhaoxiaolin f1f895ee20 质量质检+工单管理界面加入母单信息+首页图表