1348 Commits (a111077f50156b956dd53cd0e26e778257d831bf)

Author SHA1 Message Date
zhaoxiaolin 44a65a7b1d 报工物料去掉多余的 11 months ago
zhaoxiaolin cb40968a0f 报工物料调整 11 months ago
mengjiao e69adf1ea1 wms白坯部分代码修改7 11 months ago
mengjiao 2c0751b871 wms白坯部分代码修改6 11 months ago
mengjiao 443cc305ee Merge remote-tracking branch 'origin/master' 11 months ago
mengjiao 6726366b44 wms白坯部分代码修改5 11 months ago
A0010407 6a19ac0e38 2024-3-4 基础数据设备、产品显示顺序修改 11 months ago
mengjiao 75c3ffe061 Merge remote-tracking branch 'origin/master' 11 months ago
mengjiao 7ea47c8e44 wms白坯部分代码修改4 11 months ago
陈恒杰 6c044ead06 Merge remote-tracking branch 'origin/master' 11 months ago
陈恒杰 3504cefcb1 粉料接口 11 months ago
mengjiao 2a414a57d6 Merge remote-tracking branch 'origin/master' 11 months ago
mengjiao 131d132a2a wms白坯部分代码修改3 11 months ago
A0010407 c9778a767e 2024-3-4 基础数据管理客户供应商优化 11 months ago
zhaoxiaolin 04ee02c8e9 三层报工功能调整 11 months ago
zhaoxiaolin e37f464ea8 单层报工功能调整 11 months ago
zhaoxiaolin 1a331d6b42 多层订单改造2.0 11 months ago
Yangwl a2e70c021b SAP工单同步接口增加层级字段 11 months ago
Yangwl b2dd3e1990 Merge remote-tracking branch 'origin/master' 11 months ago
Yangwl 0bdafef7be 订单创建修改 11 months ago
zhaoxiaolin 41f2c820fb 多层订单改造1.0 11 months ago
Yangwl 40fee31fab Merge remote-tracking branch 'origin/master' 11 months ago
Yangwl dd404aca7f 订单创建接口修改 11 months ago
A0010407 784c20f172 2024-2-28 设备看板 维修工单判空处理+显示限制条件 11 months ago
A0010407 09b59c4d30 2024-2-28 设备模块-看板-维修工单判空处理+管理系统汇总报表排序 11 months ago
A0010407 7f2628410a 2024-2-28 设备模块 设备完好率看板接口调整 11 months ago
zhaoxiaolin a4f45a2cbf Merge remote-tracking branch 'origin/master' 11 months ago
zhaoxiaolin 8d82a45e05 多层订单关闭 11 months ago
Yangwl 1a954cf0f5 Merge remote-tracking branch 'origin/master' 11 months ago
Yangwl 3f7ec60948 计件工资统计修改 11 months ago
A0010407 24905c34ac 2024-2-27 设备模块选择设备页面接口修改 11 months ago
Yangwl cf3977a0e5 Merge remote-tracking branch 'origin/master' 11 months ago
Yangwl 97dc167cea 计件工资统计 11 months ago
mengjiao 2931ab8646 wms部分代码修改2 11 months ago
mengjiao 51d3005749 wms部分代码修改 11 months ago
mengjiao bb6f0cffb9 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml
11 months ago
zhaoxiaolin 52a73c37d3 bug修改 11 months ago
zhaoxiaolin 882baffa17 订单生产版本回传+已派发的订单不再进行更新 11 months ago
Yangwl 01dd5b5629 本地保存 11 months ago
Yangwl 661cb1f822 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
11 months ago
Yangwl a7b4b9a6e9 订单创建接口增加生产版本 11 months ago
zhaoxiaolin b9df5a579f 人力信息同步 11 months ago
Yangwl 72917fbe68 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java
11 months ago
Yangwl 15483d79ec 订单创建增加生产版本字段 11 months ago
A0010407 55a3c6c017 2024-2-20 工艺模块-线体设备/工作中心问题修改 11 months ago
wws 982665b96b Merge remote-tracking branch 'origin/master' 12 months ago
wws 4fa7fb9222 点/巡检、保养加小时逻辑 12 months ago
zhaoxiaolin 0df08e1953 报工打印v.20 12 months ago
zhaoxiaolin 538841b44f 质量手持检测项不良分类逻辑+报工打印v.0 12 months ago
Yangwl f31e349642 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
12 months ago
Yangwl 4fc8f1c0cc 获取HR部门和岗位信息 12 months ago
shaoyong 830afcd157 检验报告显示优化 12 months ago
zhaoxiaolin f8ef200121 白坯工单导出增加字段3 12 months ago
zhaoxiaolin 4d6a680e2b 3 12 months ago
zhaoxiaolin 07c7aa498a 白坯工单导出增加字段2 12 months ago
zhaoxiaolin 02e87e5d04 白坯工单导出增加字段 12 months ago
zhaoxiaolin f8be5b6c77 定量值分析报表V1.0 12 months ago
zhaoxiaolin f3711dd081 定量值分析报表V1.0 12 months ago
shaoyong 256c6eaac8 来料检验优化 12 months ago
zhaoxiaolin da4a5364db 首检测试 12 months ago
mengjiao 0ea0a7181d wms出库过账修改24页面查询修改 12 months ago
zhaoxiaolin ed6b33516f 首检测试 12 months ago
shaoyong 32a79a81a0 来料检验项目修改 12 months ago
mengjiao 0636acc210 Merge remote-tracking branch 'origin/master' 12 months ago
mengjiao 81d6af1ece wms出库过账修改23页面查询修改 12 months ago
zhaoxiaolin 6f08b87290 定量值分析报表 12 months ago
zhaoxiaolin 9c0c534f81 报工撤销 1 year ago
zhaoxiaolin 522ea20776 工单按照母单进行查询 1 year ago
zhaoxiaolin ef93c6869d 报工增加bom参考tab 1 year ago
zhaoxiaolin 7a603de1e2 定时任务bug 1 year ago
shaoyong fcb8e0467e 生产过程检验报告优化 1 year ago
A0010407 3dc6d08275 2024-1-25-1 基础信息模块-展示信息不全问题-临时任务 1 year ago
zhaoxiaolin eb833b5630 巡检bug 1 year ago
zhaoxiaolin 11e92a706d 巡检加载超时优化2 1 year ago
zhaoxiaolin 2e2e572fad 巡检加载超时优化2 1 year ago
zhaoxiaolin fefc4ea927 巡检加载超时优化2 1 year ago
zhaoxiaolin 738c21b07c 巡检加载超时优化 1 year ago
shaoyong 2480f69d97 检验报告首检巡检优化 1 year ago
zhaoxiaolin f656a9aa5d 巡检确认人 1 year ago
zhaoxiaolin b68a0a2de5 时间格式修改 1 year ago
Yangwl 274798eff7 报工新页面,计件工资界面编写。 1 year ago
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
1 year ago
Yangwl 96a604e73d HR接口 1 year ago
A0010407 146234a43f 2024-1-23-2 基础信息模块-绑定辅助设备逻辑优化-临时任务 1 year ago
A0010407 724b32dc85 2024-1-23-1 基础信息模块-绑定辅助设备逻辑优化-临时任务 1 year ago
zhaoxiaolin b6b83b4c2a 过程检验检验结果二次确认逻辑 1 year ago
陈恒杰 5e5d280962 计件薪酬修改按钮 1 year ago
zhaoxiaolin 5460a52406 计划优化 1 year ago
zhaoxiaolin a8fa036f00 质量调整 1 year ago
shaoyong 119ad65d1a 不良品动态添加优化 1 year ago
zhaoxiaolin 7b01884a21 数据源 1 year ago
zhaoxiaolin e6aa70ba9f Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
1 year ago
zhaoxiaolin b7c584af1d 工时改小时 1 year ago
zhaoxiaolin 41647ce882 给SRM提供来料检验任务接口 1 year ago
zhaoxiaolin 8bafb59937 关闭订单暂时隐藏 1 year ago
zhaoxiaolin 730845c05d 报工界面美化一下 1 year ago
shaoyong ecc7b5494a 检验报告优化 1 year ago
zhaoxiaolin a3d8664eb2 错误信息输出 1 year ago
zhaoxiaolin eb7d0122b2 不合格流程提交 1 year ago
mengjiao 3e861ede81 wms出库过账修改22--sap过账接口的修改 1 year ago
shaoyong 9d860f9331 成品入库检验,不良品动态添加 1 year ago
Yangwl b28a727d83 Merge remote-tracking branch 'origin/master' 1 year ago
Yangwl 2b3e9a69cb SAP订单物料过账修改 1 year ago
shaoyong 7592451f79 库存检验,动态添加不良信息 1 year ago
zhaoxiaolin d585533008 管理系统创建入库检验任务修改 1 year ago
zhaoxiaolin ae79b64e03 不合规问题处理+报工问题修改 1 year ago
shaoyong 59b051365a 库存检验,库存报告,物料组优化 1 year ago
zhaoxiaolin 5488a72f7e 工时改小时 1 year ago
zhaoxiaolin f9677e5af9 不合规问题处理+报工问题修改 1 year ago
zhaoxiaolin 1b04a3f94e 不合规问题处理+报工问题修改 1 year ago
mengjiao dcb357d143 Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao d45d7dc9fb wms出库过账修改21 1 year ago
Yangwl 9d882c2dde Merge remote-tracking branch 'origin/master' 1 year ago
Yangwl 8a97240e84 OA接口完善 1 year ago
zhaoxiaolin b681252e2f 质量问题修改10 1 year ago
wws a5afad3f39 Merge remote-tracking branch 'origin/master' 1 year ago
wws 07982d9b16 上位机报修 1 year ago
zhaoxiaolin 69793976ed 质量问题修改9 1 year ago
zhaoxiaolin 282aab7213 质量问题修改9 1 year ago
shaoyong cce1431375 生产过程优化 1 year ago
mengjiao 04e77146ea Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao 84602550e5 wms出库过账修改20 1 year ago
zhaoxiaolin dadbb05481 质量问题修改9 1 year ago
shaoyong af4f0111f1 过程检验ABC不良数据动态获取,抽样规则优化,物料组新增优化 1 year ago
zhaoxiaolin a3d169cbea 质量问题修改8 1 year ago
zhaoxiaolin 05435a6e24 Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin f92f8ceb2d 质量问题修改8 1 year ago
A0010407 6cffc89ead 2024-1-12 基础信息-BOM模糊查询 1 year ago
zhaoxiaolin 272b52b9e1 质量问题修改8 1 year ago
zhaoxiaolin 72512329ae 质量问题修改7 1 year ago
A0010407 f3dbd81cab 2024-1-12 基础信息-bom数据改结构 第一版 1 year ago
mengjiao 61996ec9b9 Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao 8a1c63d6c4 wms出库过账修改19 1 year ago
zhaoxiaolin 55c2e86c0c 质量问题修改6 1 year ago
zhaoxiaolin 46bf2b57af 质量问题修改6 1 year ago
zhaoxiaolin f1111ae286 质量问题修改6 1 year ago
zhaoxiaolin c1aa782bde 质量问题修改5 1 year ago
zhaoxiaolin 87f1c95e9d 质量问题修改4 1 year ago
zhaoxiaolin 8b7d6c238d 质量问题修改3 1 year ago
zhaoxiaolin 798e94cb5c 质量问题修改2 1 year ago
zhaoxiaolin b33cc3a394 Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin f5f7fc1ae6 质量问题修改 1 year ago
mengjiao 35c376dde4 Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao 4b65097515 wms修改18.4-报工页面的sap收货修改 1 year ago
zhaoxiaolin 09992a3030 子母报工加延时 1 year ago
zhaoxiaolin 385ed16dd5 报工状态修改2 1 year ago
zhaoxiaolin 2ad4207e50 Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 717047fa03 报工状态修改 1 year ago
mengjiao 24e8629359 wms修改18.4-报工页面的sap收货 1 year ago
zhaoxiaolin 886cfd442d 成品入库检测任务联调 1 year ago
mengjiao 6cc3e25bf0 wms修改18.4-报工页面的质检任务生成 1 year ago
zhaoxiaolin 6f63517cf0 质量任务接口修改5 1 year ago
zhaoxiaolin 473390a738 Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 48b0695942 质量任务接口修改4 1 year ago
wws 6be8effd2a Merge remote-tracking branch 'origin/master' 1 year ago
wws 76a507c240 看板年月日逻辑 1 year ago
zhaoxiaolin 6f1d92edd5 质量任务接口修改3 1 year ago
zhaoxiaolin 58d80d29c8 质量任务接口修改2 1 year ago
zhaoxiaolin dda4c9595c Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 55fc30ed13 质量任务接口修改 1 year ago
A0010407 0c5cf3f18f 2024-1-10-1 设备-看板-年月日-设备稳定性 1 year ago
zhaoxiaolin 3e965d7b70 更新物料修改bug 1 year ago
zhaoxiaolin ed76f9734d Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDetail.java
1 year ago
zhaoxiaolin d9022031db 入库检验修改 1 year ago
mengjiao 5f1e69b4b7 Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao 2ff5a8dc09 wms修改18.4-报工页面的sap收货按钮,和成品入库页面的过账按钮修改 1 year ago
shaoyong fca8d70fb6 检测报告修改 1 year ago
zhaoxiaolin f110febe1c 文件修复 1 year ago
mengjiao 99d56f44db wms修改18.3-报工页面的sap收货按钮,和成品入库页面的过账按钮修改 1 year ago
mengjiao a8d2695880 wms修改18.2-报工页面的sap收货按钮,和成品入库页面的过账按钮修改 1 year ago
mengjiao 2d45083515 Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao 9e37514457 wms修改18.1-报工页面的sap收货按钮,和成品入库页面的过账按钮修改 1 year ago
zhaoxiaolin a2a7c972a7 Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 6473691de9 oa修改- 1 year ago
mengjiao 54e2e97eca Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao baf41707a6 wms修改18-报工页面的sap收货按钮,和成品入库页面的过账按钮修改 1 year ago
wws 976cb28b54 Merge remote-tracking branch 'origin/master' 1 year ago
wws 56d369c801 已删除设备不生成任务 1 year ago
A0010407 51f62a5853 2024-1-9-3 设备-1.增加故障次数 停机次数 2.完善手持、PC和维修流程 3.完善当日设备稳定性 1 year ago
Yangwl ddfb519fbf Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 98084eaf1e 巡检报告 1 year ago
Yangwl bd8870982d OA接口 1 year ago
zhaoxiaolin fc507735c7 巡检报告 1 year ago
A0010407 8a8cdaaed4 2024-1-9-2 基础信息-工厂-加工厂建模类型 1 year ago
A0010407 88bda16f8f 2024-1-9-1 设备管理-故障描述 四个页面 故障编码问题+页面排序展示问题 1 year ago
shaoyong e69a2bbf2d 来料抽样规则修改 1 year ago
wws 1f66bd4688 PDA任务列表展示顺序只展示范围内 1 year ago
wws 87fd4374f6 PDA任务列表展示顺序只展示当天的 1 year ago
wws f349941a94 PDA任务列表展示顺序 1 year ago
zhaoxiaolin ba9216c14a 不良率综合统计报表 1 year ago
mengjiao 969897968c Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao 0f638c756f wms修改17.2--成品入库修改 1 year ago
zhaoxiaolin a91af79c92 不良率统计报表 1 year ago
A0010407 4ee47b457c 手持 报修单后端+维修单后端加逻辑 设备完好率 1 year ago
wws 6fb6fabba6 Merge remote-tracking branch 'origin/master' 1 year ago
wws 4a94e29eba PDA详情设备名称显示 1 year ago
mengjiao 84e1d4aea4 Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao b64bed18e9 wms修改17.1--成品入库修改 1 year ago
wws 7dee2effa0 Merge remote-tracking branch 'origin/master' 1 year ago
wws 1f2dcfda47 PDA任务排序 1 year ago
mengjiao c563412e61 Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao f213410be3 wms修改17--成品入库修改 1 year ago
wws ce8bbe3917 Merge remote-tracking branch 'origin/master' 1 year ago
wws 783150feed 保养手持提交BUG解决 1 year ago
shaoyong da4f10f603 首检报告修改 1 year ago
wws 62ee2492fc 数据源分配用户查询BUG解决 1 year ago
zhaoxiaolin 816efb1f5a 巡检触发逻辑变更 1 year ago
wws c83450bfa9 Merge remote-tracking branch 'origin/master' 1 year ago
wws 76f8261176 检查项录入不可新增BUG解决 1 year ago
A0010407 1225206e73 备件申领单加单价总价 1 year ago
zhaoxiaolin 52f2be01fd 巡检触发逻辑变更 1 year ago
wws f9cb4a5c1d Merge remote-tracking branch 'origin/master' 1 year ago
wws fd54baf7a8 检查项录入不可修改BUG解决 1 year ago
shaoyong 096e30657d 首检报告 1 year ago
zhaoxiaolin 3a9aa84d56 巡检不良分析图表 1 year ago
zhaoxiaolin 827657c43d 巡检不良分析图表 1 year ago
A0010407 a68a3ac1a8 设备 维修---->设备完好率(一天内多次) 1 year ago
A0010407 d307cd97f4 维保记录 1 year ago
zhaoxiaolin 5e3c032647 oa流程有问题 1 year ago
Yangwl ed23db844a Merge remote-tracking branch 'origin/master' 1 year ago
Yangwl 61c37758f8 计件薪酬、包装线看板接口 1 year ago
BrickHome 6ae48c69ae Merge remote-tracking branch 'origin/master' 1 year ago
BrickHome f4d8b7460e 保养费用BUG解决 1 year ago
zhaoxiaolin c808859ea6 巡检检验加批次 1 year ago
zhaoxiaolin 0f490cf817 物料检测项加检测项关联 1 year ago
mengjiao 17f68e3306 wms修改16.1 1 year ago
zhaoxiaolin 94dccff050 质量改动 1 year ago
zhaoxiaolin 4dc1a16dab 质量改动 1 year ago
mengjiao 8d1b4db68c Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao e538e7a425 wms修改16 1 year ago
wws 85ce59cd8a Merge remote-tracking branch 'origin/master' 1 year ago
wws f92177941b PDA获取记录 1 year ago
mengjiao d1e62a3d70 wms修改15 1 year ago
wws 4b63b2d7a2 Merge remote-tracking branch 'origin/master' 1 year ago
wws 9bc2c103ea 保养记录填写BUG解决 1 year ago
shaoyong 1ddd59dfd0 检验方案维护 1 year ago
mengjiao c00be3fee0 wms修改14 1 year ago
mengjiao 44a23eaa78 wms修改13 1 year ago
mengjiao 8272aabbe6 Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao be29364888 wms修改12 1 year ago
zhaoxiaolin 22c08bcadb Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin c3907c14c6 白坯图表 1 year ago
mengjiao 2fff9ae453 Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao aea787217a wms修改11 1 year ago
A0010407 c1fd8c9c18 用户 微信名+bug 1 year ago
Yangwl 8bc7cd17ce Merge remote-tracking branch 'origin/master' 1 year ago
Yangwl 69a2f60160 101类型订单收货 1 year ago
陈恒杰 1211472ae4 手动创建白坯入库单1 1 year ago
陈恒杰 877dc435aa Merge remote-tracking branch 'origin/master' 1 year ago
陈恒杰 db09747042 成品入库 1 year ago