445 Commits (828e94fac043b3854e204a037e254d8474ab3f23)

Author SHA1 Message Date
shaoyong a7d8206256 生产日报表-修改 1 year ago
shaoyong 4e13248175 生产日报表 1 year ago
shaoyong dfa5730cb3 生产日报表 1 year ago
shaoyong 959b9dbe19 生产日报表 1 year ago
zhaoxiaolin 5ebb81a661 看板和其它bug修复 1 year ago
shaoyong 8ecedca10d 线体管理修改 1 year ago
shaoyong 2cad02ff7b 线体管理修改 1 year ago
Yangwl 10a57885f0 Merge remote-tracking branch 'origin/master' 1 year ago
Yangwl 45a5f33fe8 计件工资优化、能源模块增加数据源 1 year ago
zhaoxiaolin 3dc6a44888 1 1 year ago
zhaoxiaolin 47c490ec4c 报工bug修复4 1 year ago
Yangwl 4b0ba99444 Merge remote-tracking branch 'origin/master' 1 year ago
Yangwl 01acbe595e 计件工资统计改为只查询本人的 1 year ago
zhaoxiaolin 37273a2084 sap预报工+计划批次bug+报工备注bug修复3 1 year ago
zhaoxiaolin 2285e279b2 sap预报工+计划批次bug+报工备注bug修复3 1 year ago
zhaoxiaolin cdf72a20f6 sap预报工+计划批次bug+报工备注bug修复2 1 year ago
zhaoxiaolin a2de5b5fec sap预报工+计划批次bug+报工备注bug修复 1 year ago
zhaoxiaolin 6ad5ed5fdd 领料单升级+报工批次删除功能 1 year ago
zhaoxiaolin 76fbd2a09b 白坯产量定时任务修正 1 year ago
zhaoxiaolin e15400be32 白坯产量定时任务修正 1 year ago
zhaoxiaolin 739e8edee1 白坯产量定时任务修正 1 year ago
zhaoxiaolin 2a4eb59fc0 来料检验+微信 1 year ago
zhaoxiaolin 715222563e 微信接口+bug 1 year ago
zhaoxiaolin 30b9562287 bug 1 year ago
shaoyong 0262e1237a 成型机生产报表优化 1 year ago
zhaoxiaolin 325fd0ffa2 入库检验方案报告+烘房看板2 1 year ago
zhaoxiaolin 5d563721de 入库检验方案报告+烘房看板2 1 year ago
zhaoxiaolin 6031e3f347 入库检验方案报告+烘房看板2 1 year ago
shaoyong 21a01669d2 成型机生产报表优化 1 year ago
zhaoxiaolin 87c4e71d3d 检验方案、检测项配置增加两项+报工汇率加到成品上 1 year ago
zhaoxiaolin 3293b83595 预报工+产线调拨 1 year ago
zhaoxiaolin a823ac786a 产线调拨+预报工 1 year ago
zhaoxiaolin f7bfe55f23 首页未开工提醒 1 year ago
shaoyong ea89b6779b 成型机生产报表 1 year ago
zhaoxiaolin 45670f8b06 质量手持更新 1 year ago
zhaoxiaolin efa426825e mes相关看板 1 year ago
zhaoxiaolin 374d2dc592 单层报工 1 year ago
zhaoxiaolin 5354d2f617 首页+去掉订单修改功能 1 year ago
zhaoxiaolin 6c71264935 mes bug 1 year ago
Yangwl 783dc284f9 Merge remote-tracking branch 'origin/master' 1 year ago
Yangwl 0c4901d833 计件工资删除 1 year ago
zhaoxiaolin 0f5dfce375 del_flag 1 year ago
zhaoxiaolin f27d2dcbe9 动态数据源垮系统加载 1 year ago
zhaoxiaolin 17531927aa 去掉批次重复领料单 1 year ago
zhaoxiaolin 1c7ea171cc 母单大盒数 子单数不变 1 year ago
shaoyong 3dd63e2288 线体管理功能 1 year ago
zhaoxiaolin 216911b8c0 来料增加来料类型 1 year ago
zhaoxiaolin 1911b6657d 三层报工bug修复 1 year ago
zhaoxiaolin cc26587ff6 巡检定时任务修改 1 year ago
zhaoxiaolin b7bfb7b1ba 来料去重修改+成品修改设备+看板bug修改 1 year ago
zhaoxiaolin b3bcf1594f 夜班巡检 1 year ago
zhaoxiaolin 9c4b43216b 细节升级 1 year ago
zhaoxiaolin 0eecd31a19 来料检验上线 1 year ago
Yangwl 5b0fb2d333 Merge remote-tracking branch 'origin/master' 1 year ago
Yangwl 5bfd9fa520 来料检验增加物料凭证号、物料凭证中的项目 1 year ago
zhaoxiaolin bf4b93fe23 bug修复 1 year ago
zhaoxiaolin 51613502f2 qc bug修改3 1 year ago
zhaoxiaolin fb85f305b9 qc bug修改1 1 year ago
Yangwl 1424b9c3a1 Merge remote-tracking branch 'origin/master' 1 year ago
Yangwl 0717f35d64 计件工资基础信息维护修改 1 year ago
zhaoxiaolin fbd9703421 报工更新remark 1 year ago
zhaoxiaolin fc21de5529 报工损耗添加物料,精确到半成品 1 year ago
zhaoxiaolin 10c0a7c130 报工增加remark 1 year ago
Yangwl 27853f2ac9 Merge remote-tracking branch 'origin/master' 1 year ago
Yangwl af833e891a 物料主数据同步接口更改,计件薪酬基础信息修改,SAP报工接口增加备注 1 year ago
zhaoxiaolin 270495c0ab 报工组件修改11 1 year ago
zhaoxiaolin a38d0d32e5 报工组件修改10 1 year ago
zhaoxiaolin 1204f6fced 报工组件修改9 1 year ago
zhaoxiaolin 0e86b6715a 报工+批次可以重复+其它细节功能改善7 1 year ago
zhaoxiaolin ab377c7413 报工+批次可以重复+其它细节功能改善6 1 year ago
zhaoxiaolin 6122f06e7b 报工+批次可以重复+其它细节功能改善5 1 year ago
zhaoxiaolin 8a0a9b7634 人员信息同步+报工修改 1 year ago
zhaoxiaolin 5676606f68 问题清单处理1.0 1 year ago
zhaoxiaolin c8e9bd9791 报工修改物料组成+订单计划后台加下发二次校验 1 year ago
zhaoxiaolin 1801ac7122 收坯机看板展示数据+成品订单删除功能 1 year ago
Yangwl 54a0e76ed1 Merge remote-tracking branch 'origin/master' 1 year ago
Yangwl 79af2cb25b 计件工资修改 1 year ago
zhaoxiaolin 217a7ee237 巡检任务调整回一小时产生一条;成品订单编辑/删除功能优化 1 year ago
zhaoxiaolin 93d33895e7 报工公式修改+订单关闭接口修改+巡检多出一条的bug修复 1 year ago
zhaoxiaolin eabfa9449d 报工增加sap产线 1 year ago
zhaoxiaolin 44a65a7b1d 报工物料去掉多余的 1 year ago
zhaoxiaolin cb40968a0f 报工物料调整 1 year ago
zhaoxiaolin 04ee02c8e9 三层报工功能调整 1 year ago
zhaoxiaolin e37f464ea8 单层报工功能调整 1 year ago
zhaoxiaolin 41f2c820fb 多层订单改造1.0 1 year ago
Yangwl 3f7ec60948 计件工资统计修改 1 year ago
Yangwl 97dc167cea 计件工资统计 1 year ago
Yangwl 01dd5b5629 本地保存 1 year ago
zhaoxiaolin b9df5a579f 人力信息同步 1 year ago
zhaoxiaolin 0df08e1953 报工打印v.20 1 year ago
zhaoxiaolin 538841b44f 质量手持检测项不良分类逻辑+报工打印v.0 1 year ago
zhaoxiaolin f3711dd081 定量值分析报表V1.0 1 year ago
zhaoxiaolin 9c0c534f81 报工撤销 1 year ago
zhaoxiaolin ef93c6869d 报工增加bom参考tab 1 year ago
zhaoxiaolin 11e92a706d 巡检加载超时优化2 1 year ago
zhaoxiaolin 2e2e572fad 巡检加载超时优化2 1 year ago
Yangwl 274798eff7 报工新页面,计件工资界面编写。 1 year ago
陈恒杰 5e5d280962 计件薪酬修改按钮 1 year ago
zhaoxiaolin 730845c05d 报工界面美化一下 2 years ago
zhaoxiaolin ae79b64e03 不合规问题处理+报工问题修改 2 years ago
zhaoxiaolin f9677e5af9 不合规问题处理+报工问题修改 2 years ago
zhaoxiaolin 1b04a3f94e 不合规问题处理+报工问题修改 2 years ago
zhaoxiaolin c1aa782bde 质量问题修改5 2 years ago
zhaoxiaolin 87f1c95e9d 质量问题修改4 2 years ago
zhaoxiaolin 8b7d6c238d 质量问题修改3 2 years ago
zhaoxiaolin 798e94cb5c 质量问题修改2 2 years ago
zhaoxiaolin 09992a3030 子母报工加延时 2 years ago
zhaoxiaolin 385ed16dd5 报工状态修改2 2 years ago
zhaoxiaolin 717047fa03 报工状态修改 2 years ago
mengjiao 54e2e97eca Merge remote-tracking branch 'origin/master' 2 years ago
mengjiao baf41707a6 wms修改18-报工页面的sap收货按钮,和成品入库页面的过账按钮修改 2 years ago
Yangwl ddfb519fbf Merge remote-tracking branch 'origin/master' 2 years ago
Yangwl bd8870982d OA接口 2 years ago
zhaoxiaolin fc507735c7 巡检报告 2 years ago
Yangwl 61c37758f8 计件薪酬、包装线看板接口 2 years ago
zhaoxiaolin 30fac0e8dd 质量过程巡检+来料检验任务接口+报工sql调整 2 years ago
zhaoxiaolin 63cc8e2053 质量过程巡检+来料检验任务接口 2 years ago
zhaoxiaolin 5f03c120b6 质量看板接口 2 years ago
zhaoxiaolin afe322e8c9 领料单+质量看板接口 2 years ago
陈恒杰 0684692469 Merge remote-tracking branch 'origin/master' 2 years ago
陈恒杰 aa2ca2b13c 打印领料单修改 2 years ago
zhaoxiaolin ed67be03ca 子单报工成功后再报母单 2 years ago
zhaoxiaolin 628b391937 工单删除逻辑添加 2 years ago
zhaoxiaolin 4362014544 只有活动中的工单才能进行报工 2 years ago
zhaoxiaolin ad6f335ffc 只有活动中的工单才能进行报工 2 years ago
zhaoxiaolin e51eba0465 报工成功后,不需要关闭工单 2 years ago
zhaoxiaolin 91790d8b7b 报工成功后,再关闭订单 2 years ago
zhaoxiaolin e1be6cb0a6 报工公式确认 2 years ago
zhaoxiaolin 7caebe1ddf 报工方案调整:母单报工的时候,也按照子单的数量进行填报。 2 years ago
zhaoxiaolin 376e54ee5e 生产过程检验修改测试 2 years ago
zhaoxiaolin b1712dd5fc 报工修改 2 years ago
zhaoxiaolin 7d44bda34a sap报工-状态 2 years ago
zhaoxiaolin 56fc72ff0d sap报工 2 years ago
zhaoxiaolin 304370cde2 sap接口调整3 2 years ago
zhaoxiaolin 1f31239adb sap接口调整 2 years ago
zhaoxiaolin 80d762197c Merge remote-tracking branch 'origin/master' 2 years ago
zhaoxiaolin f13ee5d888 sap调整+质量手持接口+首页柱图数据bug修复 2 years ago
Yangwl fc43732c0c 修改报工实体类 2 years ago
zhaoxiaolin 2f221e1905 sap调整 2 years ago
zhaoxiaolin 34e131289b 报工时候关闭子母工单 2 years ago
zhaoxiaolin 709af8c4a0 加入belong_work_order概念 2 years ago
zhaoxiaolin 1cedbf3c9e sap接口调整 2 years ago
陈恒杰 bddcdd4181 rfid流程修改 2 years ago
zhaoxiaolin 8dfc341463 下机台获取-unlock 2 years ago
zhaoxiaolin 20abf4cde4 报工+成品计划升级 2 years ago
zhaoxiaolin 24fe8b0b83 保养定时任务 2 years ago
Yangwl 2a5cb29acd 烘房看板接口
# Conflicts:
#	op-modules/op-mes/push-mes.bat
2 years ago
Yangwl c0ee7ca097 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java
2 years ago
Yangwl 598ec4a496 烘房看板接口
# Conflicts:
#	op-modules/op-mes/push-mes.bat
2 years ago
zhaoxiaolin 96223a90a0 mes报工 2 years ago
zhaoxiaolin ba999d484c 成品计划修改 2 years ago
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
2 years ago
Yangwl bb0ac02cc8 烘房看板接口 2 years ago
Yangwl cec59e4bc4 烘房看板接口 2 years ago
zhaoxiaolin 3262f842a3 成品bug修改 2 years ago
zhaoxiaolin 15581ac8a3 新增接口服务,去掉scada服务 2 years ago
zhaoxiaolin 2aa1ad4f2e bat换jdk 2 years ago
zhaoxiaolin 15157dd26e 测试版本注册中心修改 2 years ago
zhaoxiaolin 4bd0df94ff 发版命令 2 years ago
zhaoxiaolin c7bfb41867 管理系统报工 2 years ago
zhaoxiaolin 9f051a1277 管理系统报工1.0 2 years ago
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
2 years ago
Yangwl 4b36de1131 烘房看板接口 2 years ago
zhaoxiaolin 42b0c4622d 计划bug+报工上位机接口提供 2 years ago
陈恒杰 83548f708f Merge remote-tracking branch 'origin/master' 2 years ago
陈恒杰 dbd3b16007 rfid流程修改 2 years ago
zhaoxiaolin cca83e6511 bug 2 years ago
zhaoxiaolin 8e8ac0e125 备份定时任务 2 years ago
zhaoxiaolin 42b9c09918 bug修改 2 years ago
zhaoxiaolin 9d55da3a0b 生产过程检验+手持发版记录 2 years ago
zhaoxiaolin 34aad9a2bf 质量系统-检验任务管理1 2 years ago
zhaoxiaolin d4ce34c332 1、看板料罐车数获取;2、小时产量加班次、分钟数做活,导出功能;3、工序完成记录加入班次 2 years ago
zhaoxiaolin b1d37a7c79 下工序机台获取接口 2 years ago
zhaoxiaolin 57ff0dd3ea 小时产量报表增加合计 2 years ago
zhaoxiaolin f6ebd9e321 看板、小时产量报表 2 years ago
zhaoxiaolin e0e08736bf 看板接口3 2 years ago
zhaoxiaolin d19159a2f3 看板接口2 2 years ago
zhaoxiaolin d6e558f422 工序产量查询 2 years ago
zhaoxiaolin 2868dfb34a 白坯订单v2 2 years ago
zhaoxiaolin 41b3459f8b 白坯生产报表 2 years ago
zhaoxiaolin 9bea4d9d6c 工单编码 2 years ago
zhaoxiaolin ecef3b7e38 Merge remote-tracking branch 'origin/master' 2 years ago
zhaoxiaolin 2d905987ba mes看板 2 years ago
zhaoxl 699f763bff zxl 2 years ago
zhaoxiaolin 4a0b3dc0b2 手持修改 2 years ago
zhaoxiaolin ccb8a178cb 生产环境 2 years ago
A0010407 8f5de59e5c mes rfid 2 years ago
zhaoxiaolin bb61ed1b95 sap jar包 2 years ago
A0010407 ae8cd366bd mes报工bug 2 years ago
A0010407 7f5ab75bfd 手持Rfid 2 years ago
A0010407 d193c0c676 手持查询 2 years ago
A0010407 045090004c mes报表权限 2 years ago
zhaoxiaolin 8678afa391 手持接口修改+权限 2 years ago
zhaoxiaolin c5866a95c6 手持接口+订单bug修复 2 years ago
A0010407 22d786f5db MES领料单优化 2 years ago
zhaoxiaolin d4446de5fc 成品订单修改:更新范围>=20230921 2 years ago
zhaoxiaolin d394d2a1df 逻辑删除+手持增加缓冲区接口+工艺车数 2 years ago
zhaoxiaolin e38a563f81 逻辑删除+手持增加缓冲区接口 2 years ago
zhaoxiaolin f778b42cbc sap模块代码合并 2 years ago
zhaoxiaolin 1b53ac43d9 首页 2 years ago