720 Commits (31747dcf41ce1f4f1a3d8a999c3d31379e04a9ec)

Author SHA1 Message Date
zhaoxiaolin 2aa1ad4f2e bat换jdk 1 year ago
zhaoxiaolin 59a3fcd4ed 换jdk 1 year ago
zhaoxiaolin 9b58911bfa scada服务数据源 1 year ago
zhaoxiaolin 77742e3c2f scada服务数据源 1 year ago
zhaoxiaolin c7c00e0d72 Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin d04c1068f8 检验报告 1 year ago
wws eef550d5ae 实体类同步 1 year ago
zhaoxiaolin 74bb98faa3 检验报告 1 year ago
wws baa2e209a3 PDA手持填写巡检记录优化 1 year ago
wws 6dafbca7d1 Merge remote-tracking branch 'origin/master' 1 year ago
wws 88ee80c6ca 点检工单优化 1 year ago
A0010407 f969619323 报修+维修+设备班组+委外+PDA 1 year ago
wws ec9a071b8f Merge remote-tracking branch 'origin/master' 1 year ago
wws 86effcdbfb 报表优化 1 year ago
zhaoxiaolin 749c2cf67d mes上位机接口迁移scada 1 year ago
wws 5bb40f28e5 Merge remote-tracking branch 'origin/master' 1 year ago
wws 92615d8e28 报表优化 1 year ago
zhaoxiaolin 15157dd26e 测试版本注册中心修改 1 year ago
wws 362a8ac15a 报表-保养记录init 1 year ago
wws 1417a47d95 Merge remote-tracking branch 'origin/master' 1 year ago
wws c466027d74 报表-巡检记录 1 year ago
zhaoxiaolin 4bd0df94ff 发版命令 1 year ago
zhaoxiaolin c7bfb41867 管理系统报工 1 year ago
wws 7f67bc9b15 Merge remote-tracking branch 'origin/master' 1 year ago
wws 996c45f972 保养工单-检验+填写记录 1 year ago
zhaoxiaolin 9f051a1277 管理系统报工1.0 1 year 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
1 year ago
Yangwl 4b36de1131 烘房看板接口 1 year ago
wws 9e14409743 Merge remote-tracking branch 'origin/master' 1 year ago
wws 2c3f1996b9 保养工单-快速工单 1 year ago
zhaoxiaolin 42b0c4622d 计划bug+报工上位机接口提供 1 year ago
shaoyong 716dfd6db5 检验报告,来料报告 1 year ago
陈恒杰 83548f708f Merge remote-tracking branch 'origin/master' 1 year ago
陈恒杰 dbd3b16007 rfid流程修改 1 year ago
A0010407 1d5b107814 报修+维修+设备班组+委外 1 year ago
zhaoxiaolin cca83e6511 bug 1 year ago
zhaoxiaolin 1d3eb31a88 质量系统,不合格处理功能 1 year ago
wws 450ccdf163 计划成品拆分BUG修复 1 year ago
wws 65e738dd3a 计划成品拆分BUG修复 1 year ago
zhaoxiaolin 28145447cb sap联调 1 year ago
Yangwl d59ebb0895 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	ABAP_AS_WITH_POOL.jcoDestination
#	op-modules/op-sap/pom.xml
1 year ago
Yangwl afa7c430fe SAP配置 1 year ago
Yangwl d59af9f9f6 增加SAP接口 1 year ago
A0010407 9bb46f6a5e 报修+维修+设备班组 1 year ago
zhaoxiaolin 551e194707 sap联调 1 year ago
zhaoxiaolin 9c89b70be0 质量任务表调整 1 year ago
zhaoxiaolin 618157586d 质量任务表调整 1 year ago
wws 5803ae6782 Merge remote-tracking branch 'origin/master' 1 year ago
wws a916fe242b 点检工单、保养工单init 1 year ago
zhaoxiaolin ef0f839892 不合格处理 1 year ago
wws 3491e38ec1 Merge remote-tracking branch 'origin/master' 1 year ago
wws fe0727c0d1 点检计划 1 year ago
zhaoxiaolin 8e8ac0e125 备份定时任务 1 year ago
zhaoxiaolin 05546bb4dd Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin e32ee7119b bug修改 1 year ago
wws 337eb97c68 Merge remote-tracking branch 'origin/master' 1 year ago
wws 86a39d613c 保养计划-修改 1 year ago
zhaoxiaolin 4278e4cb73 bug修改 1 year ago
zhaoxiaolin 42b9c09918 bug修改 1 year ago
A0010407 39b392d037 报修+维修+委外 1 year ago
wws c7e42f4045 Merge remote-tracking branch 'origin/master' 1 year ago
wws 8152b17171 保养计划-新增 1 year ago
shaoyong ee48170cc8 人员物料绑定查询修改 1 year ago
zhaoxiaolin ac16a5d785 入库过程检验 1 year ago
zhaoxiaolin 7c6d5a1b4f 生产过程检验v4 1 year ago
zhaoxiaolin 94010d9146 生产过程检验v3 1 year ago
shaoyong e25f223632 人员物料绑定修复 1 year ago
wws 35b354562b 保养计划 1 year ago
wws c0daf9a89a Merge remote-tracking branch 'origin/master' 1 year ago
wws 45c3b2b7c9 手持接口-巡检工单-提交接口 1 year ago
zhaoxiaolin 9d55da3a0b 生产过程检验+手持发版记录 1 year ago
shaoyong 7329c54eab 物料检验项目维护修复 1 year ago
wws f60d6559f9 Merge remote-tracking branch 'origin/master' 1 year ago
wws fab6f3aa28 手持接口-巡检工单 1 year ago
shaoyong 3c40a7df23 物料检验项目维护 1 year ago
zhaoxiaolin c1fac1f909 原料检验任务1.0 1 year ago
wws b865658cb2 巡检工单填写记录 1 year ago
wws fc69128a8c Merge remote-tracking branch 'origin/master' 1 year ago
wws dcbde38d27 巡检工单填写记录V1 1 year ago
A0010407 870fde44b5 报修 1 year ago
A0010407 d5ae6cea2c 报修+委外工单 1 year ago
wws aedd7d6052 保养计划初始化、巡检工单初始化 1 year ago
zhaoxiaolin d80fe972b3 原料检验任务 1 year ago
shaoyong c67c7a464d 修改物料检验项目实体 1 year ago
wws 8c3829be4d Merge remote-tracking branch 'origin/master' 1 year ago
wws a6d04164ec 1 1 year ago
zhaoxiaolin db3192e9a1 增加排序字段 1 year ago
wws 9c65126191 Merge remote-tracking branch 'origin/master' 1 year ago
wws 4cac17b9bb 巡检计划优化 1 year ago
A0010407 dd8a332ae6 报修+维修工单 1 year ago
wws 08879199ae Merge remote-tracking branch 'origin/master' 1 year ago
wws 6f33aec08c 检查项删除检验逻辑 1 year ago
shaoyong eec6231915 Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 6551e07899 质量系统-检验任务管理2 1 year ago
shaoyong 40b350ac8b Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 34aad9a2bf 质量系统-检验任务管理1 1 year ago
wws ac2f99c2c7 巡检计划修改+删除 1 year ago
wws 411e562832 Merge remote-tracking branch 'origin/master' 1 year ago
wws 6bde4f4df9 巡检计划修改初始化 1 year ago
ShiChangzhou 78c069cae9 解决sap打包发版问题 1 year ago
wws 435e7adcd4 巡检计划新增接口初始化 1 year ago
shaoyong b47919426d Merge remote-tracking branch 'origin/master' 1 year ago
shaoyong 579a482c85 物料检验项目维护 1 year ago
wws 38270b9b0a 巡检计划 1 year ago
wws ac78b175ca Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java
#	op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java
1 year ago
wws 33a6a48497 Merge remote-tracking branch 'origin/master' 1 year ago
wws e56dc7446b 巡检计划 1 year ago
A0010407 a10b915de3 改名字+报修 1 year ago
A0010407 c78f1542ed 备品备件领用 1 year ago
A0010407 23659427c6 备品备件领用 1 year ago
zhaoxiaolin 6ccba2ca54 Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 73d26c1f8b sap基础数据同步,更新时段修改 1 year ago
wws 5299c1e27d Merge remote-tracking branch 'origin/master' 1 year ago
wws 54715aaf0b 巡检计划 1 year ago
A0010407 91c175fff1 备品备件台账 1 year ago
A0010407 bce6390db6 备品备件入库+备品备件台账 1 year ago
zhaoxiaolin 50da3686fb 推送镜像指令 1 year ago
zhaoxiaolin d4ce34c332 1、看板料罐车数获取;2、小时产量加班次、分钟数做活,导出功能;3、工序完成记录加入班次 1 year ago
A0010407 497e14c965 备品备件台账 1 year ago
wws 8e4a8bb12b 巡检计划初始化 1 year ago
shaoyong cd3d3bd928 检验节点维护 1 year ago
zhaoxiaolin b1d37a7c79 下工序机台获取接口 1 year ago
zhaoxiaolin 316c053a6e Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 57ff0dd3ea 小时产量报表增加合计 1 year ago
wws 2de0b1d2df 故障类型维护(优化查询) 1 year ago
wws 991a9e874b Merge remote-tracking branch 'origin/master' 1 year ago
wws 9b7791718c 设备管理-故障类型V1.1 1 year ago
zhaoxiaolin f6ebd9e321 看板、小时产量报表 1 year ago
wws 433a307c75 设备管理-创建/更新字段BUG 1 year ago
wws 25b5fbe636 Merge remote-tracking branch 'origin/master' 1 year ago
wws 2efd13594d 设备管理-故障类型V1 1 year ago
Yangwl fdf2c8ce69 Merge remote-tracking branch 'origin/master' 1 year ago
Yangwl 63d00b8a45 SAP订单同步接口增加工厂参数、修改MES连接SAP工具类。删除多余文件。 1 year ago
wws 22bd4abe35 Merge remote-tracking branch 'origin/master' 1 year ago
wws ebe364450a 设备管理-故障类型初始化 1 year ago
zhaoxiaolin e0e08736bf 看板接口3 1 year ago
wws eabf618a1a Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin d19159a2f3 看板接口2 1 year ago
wws eb7ad777ec 设备管理-检查项维护V2(关联设备) 1 year ago
zhaoxiaolin d6e558f422 工序产量查询 1 year ago
zhaoxiaolin ff20d3cfa4 白坯订单v3 1 year ago
zhaoxiaolin 9067f3772c Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 2868dfb34a 白坯订单v2 1 year ago
wws bf8cc70fc8 Merge remote-tracking branch 'origin/master' 1 year ago
wws e31a93752a 设备管理-检查项维护(事务锁) 1 year ago
zhaoxiaolin 6f814376ca Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 41b3459f8b 白坯生产报表 1 year ago
wws 40f0238071 设备管理-检查项维护(修改BUG修复) 1 year ago
wws 8b3acc99b7 设备管理-检查项维护(修改BUG修复) 1 year ago
wws 48debb98d3 设备管理-检查项维护V1.1 1 year ago
wws 57ffbd7968 设备管理-检查项维护V1 1 year ago
wws 5205fab4f9 设备管理-检查项维护(修改) 1 year ago
wws 899f67ebd2 设备管理-检查项维护(新增-code格式) 1 year ago
wws f2fea045e5 Merge remote-tracking branch 'origin/master' 1 year ago
wws e81e645667 设备管理-检查项维护(新增) 1 year ago
zhaoxiaolin 044241f3fd saplib新包 1 year ago
zhaoxiaolin 051bed6373 设备名称排序 1 year ago
zhaoxiaolin 9bea4d9d6c 工单编码 1 year ago
wws 6a14a48c97 Merge remote-tracking branch 'origin/master' 1 year ago
wws 54c39cb2b8 设备管理-检查项维护(工厂factory->factoryCode) 1 year ago
zhaoxiaolin ecef3b7e38 Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 2d905987ba mes看板 1 year ago
zhaoxl 5d84e18e58 zxl 1 year ago
zhaoxl 49aa8b6804 zxl 1 year ago
zhaoxl 8536f1abbc zxl 1 year ago
zhaoxl 1c8f355e58 zxl 1 year ago
zhaoxl a5dda0ad18 zxl 1 year ago
zhaoxl 89c924ba0b zxl 1 year ago
zhaoxl 21949d6e79 zxl 1 year ago
zhaoxl a845ce70c9 zxl 1 year ago
zhaoxl 699f763bff zxl 1 year ago
zhaoxl 6fbf90e184 zxl 1 year ago
zhaoxl 5a38036abc zxl 1 year ago
zhaoxl 6cebb21c8d zxl 1 year ago
wws 59ed4122cb 设备管理-检查项维护(搜索优化) 1 year ago
wws 6e57dfe409 设备管理-检查项维护初始化 1 year ago
zhaoxiaolin 4a0b3dc0b2 手持修改 1 year ago
zhaoxiaolin ccb8a178cb 生产环境 1 year ago
chj 828462b93d Merge remote-tracking branch 'origin/master' 1 year ago
chj 836a883081 成品生产入库修改 1 year ago
zhaoxiaolin 968c577902 sap包测试版本用1.0.0 1 year ago
ShiChangzhou de1e664328 1 1 year ago
zhaoxiaolin 566d2b4d93 Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 92cf26ddd6 sap 包3.0.8 1 year ago
ShiChangzhou 7586361189 1 1 year ago
zhaoxiaolin 7a42aea19f sap pom修改 1 year ago
zhaoxiaolin 8bc62dc72d sap接口bug修复 1 year ago
zhaoxiaolin da2074411b 数据源 1 year ago
zhaoxiaolin 0a822359bd 数据源 1 year ago
zhaoxiaolin 8603ea7ac2 湿料计划表status状态调整 1 year ago
A0010407 94fe3d8c84 供应商 1 year ago
zhaoxiaolin 852bff3af6 sap 定时任务 1 year ago
zhaoxiaolin f329c7c39b Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin eb87002be9 sap 定时任务 1 year ago
A0010407 8f5de59e5c mes rfid 1 year ago
shaoyong 97e5b56b03 sap修改 1 year ago
zhaoxiaolin 55df9b2ec8 sap jar包2 1 year ago
zhaoxiaolin bb61ed1b95 sap jar包 1 year ago
A0010407 ae8cd366bd mes报工bug 1 year ago
shaoyong 7356633a0c 供应商同步,客户同步 1 year ago