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

630 Commits (aec89ada0c7faaae16a248edd1613bdb9ac97e21)

Author SHA1 Message Date
Yangwl d59ebb0895 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	ABAP_AS_WITH_POOL.jcoDestination
#	op-modules/op-sap/pom.xml
Yangwl afa7c430fe SAP配置
Yangwl d59af9f9f6 增加SAP接口
A0010407 9bb46f6a5e 报修+维修+设备班组
zhaoxiaolin 551e194707 sap联调
zhaoxiaolin 9c89b70be0 质量任务表调整
zhaoxiaolin 618157586d 质量任务表调整
wws 5803ae6782 Merge remote-tracking branch 'origin/master'
wws a916fe242b 点检工单、保养工单init
zhaoxiaolin ef0f839892 不合格处理
wws 3491e38ec1 Merge remote-tracking branch 'origin/master'
wws fe0727c0d1 点检计划
zhaoxiaolin 8e8ac0e125 备份定时任务
zhaoxiaolin 05546bb4dd Merge remote-tracking branch 'origin/master'
zhaoxiaolin e32ee7119b bug修改
wws 337eb97c68 Merge remote-tracking branch 'origin/master'
wws 86a39d613c 保养计划-修改
zhaoxiaolin 4278e4cb73 bug修改
zhaoxiaolin 42b9c09918 bug修改
A0010407 39b392d037 报修+维修+委外
wws c7e42f4045 Merge remote-tracking branch 'origin/master'
wws 8152b17171 保养计划-新增
shaoyong ee48170cc8 人员物料绑定查询修改
zhaoxiaolin ac16a5d785 入库过程检验
zhaoxiaolin 7c6d5a1b4f 生产过程检验v4
zhaoxiaolin 94010d9146 生产过程检验v3
shaoyong e25f223632 人员物料绑定修复
wws 35b354562b 保养计划
wws c0daf9a89a Merge remote-tracking branch 'origin/master'
wws 45c3b2b7c9 手持接口-巡检工单-提交接口
zhaoxiaolin 9d55da3a0b 生产过程检验+手持发版记录
shaoyong 7329c54eab 物料检验项目维护修复
wws f60d6559f9 Merge remote-tracking branch 'origin/master'
wws fab6f3aa28 手持接口-巡检工单
shaoyong 3c40a7df23 物料检验项目维护
zhaoxiaolin c1fac1f909 原料检验任务1.0
wws b865658cb2 巡检工单填写记录
wws fc69128a8c Merge remote-tracking branch 'origin/master'
wws dcbde38d27 巡检工单填写记录V1
A0010407 870fde44b5 报修
A0010407 d5ae6cea2c 报修+委外工单
wws aedd7d6052 保养计划初始化、巡检工单初始化
zhaoxiaolin d80fe972b3 原料检验任务
shaoyong c67c7a464d 修改物料检验项目实体
wws 8c3829be4d Merge remote-tracking branch 'origin/master'
wws a6d04164ec 1
zhaoxiaolin db3192e9a1 增加排序字段
wws 9c65126191 Merge remote-tracking branch 'origin/master'
wws 4cac17b9bb 巡检计划优化
A0010407 dd8a332ae6 报修+维修工单
wws 08879199ae Merge remote-tracking branch 'origin/master'
wws 6f33aec08c 检查项删除检验逻辑
shaoyong eec6231915 Merge remote-tracking branch 'origin/master'
zhaoxiaolin 6551e07899 质量系统-检验任务管理2
shaoyong 40b350ac8b Merge remote-tracking branch 'origin/master'
zhaoxiaolin 34aad9a2bf 质量系统-检验任务管理1
wws ac2f99c2c7 巡检计划修改+删除
wws 411e562832 Merge remote-tracking branch 'origin/master'
wws 6bde4f4df9 巡检计划修改初始化
ShiChangzhou 78c069cae9 解决sap打包发版问题
wws 435e7adcd4 巡检计划新增接口初始化
shaoyong b47919426d Merge remote-tracking branch 'origin/master'
shaoyong 579a482c85 物料检验项目维护
wws 38270b9b0a 巡检计划
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
wws 33a6a48497 Merge remote-tracking branch 'origin/master'
wws e56dc7446b 巡检计划
A0010407 a10b915de3 改名字+报修
A0010407 c78f1542ed 备品备件领用
A0010407 23659427c6 备品备件领用
zhaoxiaolin 6ccba2ca54 Merge remote-tracking branch 'origin/master'
zhaoxiaolin 73d26c1f8b sap基础数据同步，更新时段修改
wws 5299c1e27d Merge remote-tracking branch 'origin/master'
wws 54715aaf0b 巡检计划
A0010407 91c175fff1 备品备件台账
A0010407 bce6390db6 备品备件入库+备品备件台账
zhaoxiaolin 50da3686fb 推送镜像指令
zhaoxiaolin d4ce34c332 1、看板料罐车数获取；2、小时产量加班次、分钟数做活,导出功能；3、工序完成记录加入班次
A0010407 497e14c965 备品备件台账
wws 8e4a8bb12b 巡检计划初始化
shaoyong cd3d3bd928 检验节点维护
zhaoxiaolin b1d37a7c79 下工序机台获取接口
zhaoxiaolin 316c053a6e Merge remote-tracking branch 'origin/master'
zhaoxiaolin 57ff0dd3ea 小时产量报表增加合计
wws 2de0b1d2df 故障类型维护(优化查询)
wws 991a9e874b Merge remote-tracking branch 'origin/master'
wws 9b7791718c 设备管理-故障类型V1.1
zhaoxiaolin f6ebd9e321 看板、小时产量报表
wws 433a307c75 设备管理-创建/更新字段BUG
wws 25b5fbe636 Merge remote-tracking branch 'origin/master'
wws 2efd13594d 设备管理-故障类型V1
Yangwl fdf2c8ce69 Merge remote-tracking branch 'origin/master'
Yangwl 63d00b8a45 SAP订单同步接口增加工厂参数、修改MES连接SAP工具类。删除多余文件。
wws 22bd4abe35 Merge remote-tracking branch 'origin/master'
wws ebe364450a 设备管理-故障类型初始化
zhaoxiaolin e0e08736bf 看板接口3
wws eabf618a1a Merge remote-tracking branch 'origin/master'
zhaoxiaolin d19159a2f3 看板接口2
wws eb7ad777ec 设备管理-检查项维护V2(关联设备)
zhaoxiaolin d6e558f422 工序产量查询
zhaoxiaolin ff20d3cfa4 白坯订单v3
zhaoxiaolin 9067f3772c Merge remote-tracking branch 'origin/master'
zhaoxiaolin 2868dfb34a 白坯订单v2
wws bf8cc70fc8 Merge remote-tracking branch 'origin/master'
wws e31a93752a 设备管理-检查项维护(事务锁)
zhaoxiaolin 6f814376ca Merge remote-tracking branch 'origin/master'
zhaoxiaolin 41b3459f8b 白坯生产报表
wws 40f0238071 设备管理-检查项维护(修改BUG修复)
wws 8b3acc99b7 设备管理-检查项维护(修改BUG修复)
wws 48debb98d3 设备管理-检查项维护V1.1
wws 57ffbd7968 设备管理-检查项维护V1
wws 5205fab4f9 设备管理-检查项维护(修改)
wws 899f67ebd2 设备管理-检查项维护(新增-code格式)
wws f2fea045e5 Merge remote-tracking branch 'origin/master'
wws e81e645667 设备管理-检查项维护(新增)
zhaoxiaolin 044241f3fd saplib新包
zhaoxiaolin 051bed6373 设备名称排序
zhaoxiaolin 9bea4d9d6c 工单编码
wws 6a14a48c97 Merge remote-tracking branch 'origin/master'
wws 54c39cb2b8 设备管理-检查项维护(工厂factory->factoryCode)
zhaoxiaolin ecef3b7e38 Merge remote-tracking branch 'origin/master'
zhaoxiaolin 2d905987ba mes看板
zhaoxl 5d84e18e58 zxl
zhaoxl 49aa8b6804 zxl
zhaoxl 8536f1abbc zxl
zhaoxl 1c8f355e58 zxl
zhaoxl a5dda0ad18 zxl
zhaoxl 89c924ba0b zxl
zhaoxl 21949d6e79 zxl
zhaoxl a845ce70c9 zxl
zhaoxl 699f763bff zxl
zhaoxl 6fbf90e184 zxl
zhaoxl 5a38036abc zxl
zhaoxl 6cebb21c8d zxl
wws 59ed4122cb 设备管理-检查项维护(搜索优化)
wws 6e57dfe409 设备管理-检查项维护初始化
zhaoxiaolin 4a0b3dc0b2 手持修改
zhaoxiaolin ccb8a178cb 生产环境
chj 828462b93d Merge remote-tracking branch 'origin/master'
chj 836a883081 成品生产入库修改
zhaoxiaolin 968c577902 sap包测试版本用1.0.0
ShiChangzhou de1e664328 1
zhaoxiaolin 566d2b4d93 Merge remote-tracking branch 'origin/master'
zhaoxiaolin 92cf26ddd6 sap 包3.0.8
ShiChangzhou 7586361189 1
zhaoxiaolin 7a42aea19f sap pom修改
zhaoxiaolin 8bc62dc72d sap接口bug修复
zhaoxiaolin da2074411b 数据源
zhaoxiaolin 0a822359bd 数据源
zhaoxiaolin 8603ea7ac2 湿料计划表status状态调整