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

1537 Commits (845fc2fa0036aceff795be75864a00514c6d1bd8)

Author SHA1 Message Date
mengjiao 2a414a57d6 Merge remote-tracking branch 'origin/master'
mengjiao 131d132a2a wms白坯部分代码修改3
A0010407 c9778a767e 2024-3-4 基础数据管理客户供应商优化
zhaoxiaolin 04ee02c8e9 三层报工功能调整
zhaoxiaolin e37f464ea8 单层报工功能调整
zhaoxiaolin 1a331d6b42 多层订单改造2.0
Yangwl a2e70c021b SAP工单同步接口增加层级字段
Yangwl b2dd3e1990 Merge remote-tracking branch 'origin/master'
Yangwl 0bdafef7be 订单创建修改
zhaoxiaolin 41f2c820fb 多层订单改造1.0
Yangwl 40fee31fab Merge remote-tracking branch 'origin/master'
Yangwl dd404aca7f 订单创建接口修改
A0010407 784c20f172 2024-2-28 设备看板 维修工单判空处理+显示限制条件
A0010407 09b59c4d30 2024-2-28 设备模块-看板-维修工单判空处理+管理系统汇总报表排序
A0010407 7f2628410a 2024-2-28 设备模块 设备完好率看板接口调整
zhaoxiaolin a4f45a2cbf Merge remote-tracking branch 'origin/master'
zhaoxiaolin 8d82a45e05 多层订单关闭
Yangwl 1a954cf0f5 Merge remote-tracking branch 'origin/master'
Yangwl 3f7ec60948 计件工资统计修改
A0010407 24905c34ac 2024-2-27 设备模块选择设备页面接口修改
Yangwl cf3977a0e5 Merge remote-tracking branch 'origin/master'
Yangwl 97dc167cea 计件工资统计
mengjiao 2931ab8646 wms部分代码修改2
mengjiao 51d3005749 wms部分代码修改
mengjiao bb6f0cffb9 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml
zhaoxiaolin 52a73c37d3 bug修改
zhaoxiaolin 882baffa17 订单生产版本回传+已派发的订单不再进行更新
Yangwl 01dd5b5629 本地保存
Yangwl 661cb1f822 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
Yangwl a7b4b9a6e9 订单创建接口增加生产版本
zhaoxiaolin b9df5a579f 人力信息同步
Yangwl 72917fbe68 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java
Yangwl 15483d79ec 订单创建增加生产版本字段
A0010407 55a3c6c017 2024-2-20 工艺模块-线体设备/工作中心问题修改
wws 982665b96b Merge remote-tracking branch 'origin/master'
wws 4fa7fb9222 点/巡检、保养加小时逻辑
zhaoxiaolin 0df08e1953 报工打印v.20
zhaoxiaolin 538841b44f 质量手持检测项不良分类逻辑+报工打印v.0
Yangwl f31e349642 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
Yangwl 4fc8f1c0cc 获取HR部门和岗位信息
shaoyong 830afcd157 检验报告显示优化
zhaoxiaolin f8ef200121 白坯工单导出增加字段3
zhaoxiaolin 4d6a680e2b 3
zhaoxiaolin 07c7aa498a 白坯工单导出增加字段2
zhaoxiaolin 02e87e5d04 白坯工单导出增加字段
zhaoxiaolin f8be5b6c77 定量值分析报表V1.0
zhaoxiaolin f3711dd081 定量值分析报表V1.0
shaoyong 256c6eaac8 来料检验优化
zhaoxiaolin da4a5364db 首检测试
mengjiao 0ea0a7181d wms出库过账修改24页面查询修改
zhaoxiaolin ed6b33516f 首检测试
shaoyong 32a79a81a0 来料检验项目修改
mengjiao 0636acc210 Merge remote-tracking branch 'origin/master'
mengjiao 81d6af1ece wms出库过账修改23页面查询修改
zhaoxiaolin 6f08b87290 定量值分析报表
zhaoxiaolin 9c0c534f81 报工撤销
zhaoxiaolin 522ea20776 工单按照母单进行查询
zhaoxiaolin ef93c6869d 报工增加bom参考tab
zhaoxiaolin 7a603de1e2 定时任务bug
shaoyong fcb8e0467e 生产过程检验报告优化
A0010407 3dc6d08275 2024-1-25-1 基础信息模块-展示信息不全问题-临时任务
zhaoxiaolin eb833b5630 巡检bug
zhaoxiaolin 11e92a706d 巡检加载超时优化2
zhaoxiaolin 2e2e572fad 巡检加载超时优化2
zhaoxiaolin fefc4ea927 巡检加载超时优化2
zhaoxiaolin 738c21b07c 巡检加载超时优化
shaoyong 2480f69d97 检验报告首检巡检优化
zhaoxiaolin f656a9aa5d 巡检确认人
zhaoxiaolin b68a0a2de5 时间格式修改
Yangwl 274798eff7 报工新页面，计件工资界面编写。
Yangwl 91f358251a Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	op-modules/op-open/src/main/java/com/op/open/service/OpenService.java
#	op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
Yangwl 96a604e73d HR接口
A0010407 146234a43f 2024-1-23-2 基础信息模块-绑定辅助设备逻辑优化-临时任务
A0010407 724b32dc85 2024-1-23-1 基础信息模块-绑定辅助设备逻辑优化-临时任务
zhaoxiaolin b6b83b4c2a 过程检验检验结果二次确认逻辑
陈恒杰 5e5d280962 计件薪酬修改按钮
zhaoxiaolin 5460a52406 计划优化
zhaoxiaolin a8fa036f00 质量调整
shaoyong 119ad65d1a 不良品动态添加优化
zhaoxiaolin 7b01884a21 数据源
zhaoxiaolin e6aa70ba9f Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
zhaoxiaolin b7c584af1d 工时改小时
zhaoxiaolin 41647ce882 给SRM提供来料检验任务接口
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 质量质检+工单管理界面加入母单信息+首页图表
陈恒杰 eebf7a2cf5 Merge remote-tracking branch 'origin/master'
zhaoxiaolin 245301f4f8 质量质检qc_status添加批次
zhaoxiaolin e9528b28da 质量质检qc_status添加批次
zhaoxiaolin 04681b3623 Merge remote-tracking branch 'origin/master'
zhaoxiaolin 0ccb32d068 质量质检qc_status添加
陈恒杰 db81932f2c Merge remote-tracking branch 'origin/master'
zhaoxiaolin 4dd5c4895f 报错修改
zhaoxiaolin 3671723f7e 质量看板接口修改3
A0010407 b27e18f403 基础信息 设备加字段 + 设备看板完好设备比问题
Yangwl a69e7c1ebc SAP采购订单获取接口
Yangwl 5b44945246 Merge remote-tracking branch 'origin/master'
Yangwl 5abd625d55 SAP采购订单收货过账
mengjiao ab03545514 wms修改9.1
mengjiao 8bb9f93c01 Merge remote-tracking branch 'origin/master'
mengjiao ccf06f8c94 wms修改9
zhaoxiaolin 53f12a9f2d Merge remote-tracking branch 'origin/master'
zhaoxiaolin 8a325fc57b 质量看板接口修改2
A0010407 821d4f9a58 设备手持三个接口
mengjiao 274ae3fb93 Merge remote-tracking branch 'origin/master'
mengjiao 27f8051c7c wms修改8
陈恒杰 a39ca17d90 Merge remote-tracking branch 'origin/master'
wws 59319007b1 首页-各组线每月设备故障数、设备完好率修改BUG解决
wws ec3f01dd84 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	op-modules/op-device/src/main/java/com/op/device/controller/DeviceInterfaceController.java
#	op-modules/op-device/src/main/java/com/op/device/mapper/DeviceInterfaceMapper.java
#	op-modules/op-device/src/main/java/com/op/device/service/IDeviceInterfaceService.java
#	op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java
#	op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml
#	op-modules/op-quality/src/main/java/com/op/quality/domain/QcInterface.java
wws 516a9b8053 首页-各组线每月设备故障数、设备完好率修改BUG解决
陈恒杰 be462da39c Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	dev_jco_rfc.trc
陈恒杰 3c67bcc5fa 打印领料单修改
zhaoxiaolin bb18fbce4a 质量看板接口修改
A0010407 ac35ed2bad 设备-三个手持接口 维修增加维修措施（也就是处理方式）
A0010407 bf04c7bdcf 设备看板 完好率调整 - 每日看板
A0010407 1d55861aa9 故障信息四个页面
zhaoxiaolin 5f03c120b6 质量看板接口
zhaoxiaolin a4c58a143c 质量看板接口
wws 551b3e8b7e Merge remote-tracking branch 'origin/master'
wws 34eb8e75cf 完好率统计报表、设备运行记录定时任务
Yangwl 2107a05e82 Merge remote-tracking branch 'origin/master'
Yangwl 801bf00af5 SAP的储位仓库信息接口
mengjiao daee90e884 wms修改7
Yangwl b3d73b8b4d Merge remote-tracking branch 'origin/master'
Yangwl ff2bf78d5d 订单物料领料过账、反冲物料领料过账微服务接口
mengjiao 6b8420f87c Merge remote-tracking branch 'origin/master'
mengjiao 8f3bd218a2 wms修改６
A0010407 e3c8a23b7b 备件申领 逻辑修改
zhaoxiaolin afe322e8c9 领料单+质量看板接口
A0010407 cfeda7559d 基础信息管理 设备组线调整
Yangwl 620b22e110 Merge remote-tracking branch 'origin/master' into highway
Yangwl 3986980876 分支提交
陈恒杰 0684692469 Merge remote-tracking branch 'origin/master'
陈恒杰 aa2ca2b13c 打印领料单修改
wws 9ef78fd8ab Merge remote-tracking branch 'origin/master'
wws e855f5ad3c 完好率init、设备选择逻辑新增组线
A0010407 0b0ad3d1ab 基础信息管理 设备组线调整
Yangwl b68d6ccc86 采购订单实体类
Yangwl 31747dcf41 SAP领料过账和订单接收
zhaoxiaolin ed67be03ca 子单报工成功后再报母单
zhaoxiaolin d90f72417e Merge remote-tracking branch 'origin/master'
zhaoxiaolin 628b391937 工单删除逻辑添加
A0010407 4368b922d9 新增字段 基础信息设备：设备类别 设备维修：设备状态描述
wws b9a9d5c6f0 Merge remote-tracking branch 'origin/master'
wws 2d523c06a0 字段显示调整
zhaoxiaolin 583956201f Merge remote-tracking branch 'origin/master'
zhaoxiaolin 4362014544 只有活动中的工单才能进行报工
A0010407 3491c4a326 设备备品备件台账 优化 1.加入展示列，隐藏展示列 主表关联附属表
zhaoxiaolin ad6f335ffc 只有活动中的工单才能进行报工
zhaoxiaolin e51eba0465 报工成功后，不需要关闭工单
zhaoxiaolin 91790d8b7b 报工成功后，再关闭订单
zhaoxiaolin e1be6cb0a6 报工公式确认
A0010407 449967fc12 维修检查项一次提交多个照片
zhaoxiaolin 47318ca385 质量调整
A0010407 8452e5b19e 设备综合报表
mengjiao 4c7b2aae74 Merge remote-tracking branch 'origin/master'
mengjiao 410c6cca84 wms修改５
wws a05ff34856 设置检查时间
wws 7fddc72849 Merge remote-tracking branch 'origin/master'
wws 99a7d37ed6 快速保养工单检查项获取不到BUG解决
zhaoxiaolin e6c56963a1 确认修改接口，我那我就改了：之前有工单维度，现在要求去掉工单
wws 7a5425e0ec 用户userName替换userId
wws ce50262fe2 用户userName替换userId
wws 13bd0c69f5 Merge remote-tracking branch 'origin/master'
wws 63c10e35bf 用户userName替换userId
A0010407 93b6f7a6eb 设备绑定辅助设备
wws 1ee85f0700 Merge remote-tracking branch 'origin/master'
wws 14937d6441 上位机设备报修接口
mengjiao aace8fb9e5 wms修改４
mengjiao f73b799a2a Merge remote-tracking branch 'origin/master'
mengjiao ef7e6d4f6b wms修改３
zhaoxiaolin 36b28836d4 质量bug
zhaoxiaolin 7caebe1ddf 报工方案调整：母单报工的时候，也按照子单的数量进行填报。
wws 5ce0823a49 计划删除关联备件表单删除失败BUG解决
wws 30599c33b6 Merge remote-tracking branch 'origin/master'
wws 16b1b0ad4a 故障修改提交BUG解决，代码逻辑优化+注解
zhaoxiaolin 602d09a82d 生产过程检验修改测试
zhaoxiaolin 376e54ee5e 生产过程检验修改测试
wws 6eb31bb922 Merge remote-tracking branch 'origin/master'
wws d398de356c 优化逻辑
mengjiao 2a883c2204 wms修改2
mengjiao c8618c6697 Merge remote-tracking branch 'origin/master'
mengjiao 02c4641b43 wms修改1
zhaoxiaolin 0484626152 来料检验修改测试
A0010407 65e7fdb995 维修 故障类型 故障树
mengjiao b00e31ec4d Merge remote-tracking branch 'origin/master'
wws 345910f457 保养工单状态变更、计划查询顺序
mengjiao e19f5d54dc wms修改
wws 994b2e3af2 Merge remote-tracking branch 'origin/master'
wws adecc8bee1 看板数据格式
A0010407 53b090b2db 完好设备占比 去掉百分号
wws 532bcd3f0a Merge remote-tracking branch 'origin/master'
wws 9d8c6624b1 快速保养工单PDA获取不到BUG解决
zhaoxiaolin b1712dd5fc 报工修改
wws 40329838c5 Merge remote-tracking branch 'origin/master'
wws 515aff7f48 保养用时、计划名称
A0010407 0b6ee453ba 委外工单完成 相应的设备状态改变
wws 91ecd91be9 保养更改设备状态BUG解决
wws c2caf2ed6e 设备运行记录逻辑变更
wws e2a7281396 Merge remote-tracking branch 'origin/master'
wws 9b8cb7dc45 工单显示字段增加计划名称
zhaoxiaolin 550203d265 拆单-工单下发加事务
A0010407 2f48dfba53 报修+维修+设备班组+委外
wws ddfa465800 Merge remote-tracking branch 'origin/master'
wws df96944476 PDA保养设置设备保养运行记录
zhaoxiaolin b4f86d97a0 质量-检测项目检验修改
wws aa95f14f67 Merge remote-tracking branch 'origin/master'
wws 5c0b7d3cbe 保养开始/结束修改设备状态
A0010407 6c81f5e1d1 设备管理 审核时判断设备是不是真的故障 需要维修
A0010407 3575e34f3e 设备管理-维修PC填写信息、手持填写维修信息 修改设备状态
wws b4e91edf74 Merge remote-tracking branch 'origin/master'
wws 68fe1b45e5 PDA设备名称显示BUG+保养图片上传BUG解决
wws 739bc7237c PDA设备名称显示BUG+保养图片上传BUG解决
zhaoxiaolin 6712c71f99 质量-检测项增加两个属性
zhaoxiaolin 8856c74e4d 质量bug修复
wws 9034a8188c Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java
zhaoxiaolin 7d44bda34a sap报工-状态
zhaoxiaolin 56fc72ff0d sap报工
zhaoxiaolin 85f629ce61 Merge remote-tracking branch 'origin/master'
zhaoxiaolin f0cc46c0b1 999工厂巡检任务打开
Yangwl 8abc2cba6a Merge remote-tracking branch 'origin/master'
wws 6048b4cb4a 999库巡检工单生成BUG解决
Yangwl b20b6e63d9 增加SAP模块日志
wws 84bbed960a Merge remote-tracking branch 'origin/master'
wws 6965200126 工单生成BUG解决
mengjiao 352fba7ee2 Merge remote-tracking branch 'origin/master'
mengjiao aec89ada0c wms
zhaoxiaolin 304370cde2 sap接口调整3
Yangwl e24b2f8a6d Merge remote-tracking branch 'origin/master'
Yangwl e230ba1bd3 SAP报工相关
zhaoxiaolin d248021e95 sap接口调整3
zhaoxiaolin aecbb658f2 sap接口调整2
zhaoxiaolin 1f31239adb sap接口调整
wws e8f155136d 点击按巡检计划逻辑变更
wws 428e203946 Merge remote-tracking branch 'origin/master'
wws 680ea6bbd6 点击按巡检计划逻辑变更
A0010407 3fc5733187 设备看板刷新时间
zhaoxiaolin 80d762197c Merge remote-tracking branch 'origin/master'
zhaoxiaolin f13ee5d888 sap调整+质量手持接口+首页柱图数据bug修复
Yangwl fc43732c0c 修改报工实体类
Yangwl 05a931c3a5 Merge remote-tracking branch 'origin/master'
Yangwl 1b98903f2d SAP接口订单修改和订单关闭修改
wws 55047b2f71 检查项+循环周期
wws fbf3b3a30f 1
A0010407 fe60faa025 mapper重复
A0010407 134c9d271d 设备看板 两个接口
wws 7c7830a750 Merge remote-tracking branch 'origin/master'
wws 988ee5d7f4 检查项-工具属性添加
zhaoxiaolin 2f221e1905 sap调整
wws dfe2805fd5 Merge remote-tracking branch 'origin/master'
wws d875905204 设备看板：维修工单、设备信息、维修质量
zhaoxiaolin 4a5d01c25c Merge remote-tracking branch 'origin/master'
zhaoxiaolin 8ea69a31c2 工单下派bug修改