Commit Graph

157 Commits (55047b2f7175637a8fa9e39a6f7978ee5f5fb287)

Author SHA1 Message Date
zhaoxiaolin 2f221e1905 sap调整
zhaoxiaolin 34e131289b 报工时候关闭子母工单
zhaoxiaolin 709af8c4a0 加入belong_work_order概念
zhaoxiaolin 1cedbf3c9e sap接口调整
陈恒杰 bddcdd4181 rfid流程修改
zhaoxiaolin 8dfc341463 下机台获取-unlock
zhaoxiaolin 20abf4cde4 报工+成品计划升级
zhaoxiaolin 24fe8b0b83 保养定时任务
Yangwl 2a5cb29acd 烘房看板接口
# Conflicts:
#	op-modules/op-mes/push-mes.bat
Yangwl c0ee7ca097 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java
Yangwl 598ec4a496 烘房看板接口
# Conflicts:
#	op-modules/op-mes/push-mes.bat
zhaoxiaolin 96223a90a0 mes报工
zhaoxiaolin ba999d484c 成品计划修改
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
Yangwl bb0ac02cc8 烘房看板接口
Yangwl cec59e4bc4 烘房看板接口
zhaoxiaolin 3262f842a3 成品bug修改
zhaoxiaolin 15581ac8a3 新增接口服务,去掉scada服务
zhaoxiaolin 2aa1ad4f2e bat换jdk
zhaoxiaolin 15157dd26e 测试版本注册中心修改
zhaoxiaolin 4bd0df94ff 发版命令
zhaoxiaolin c7bfb41867 管理系统报工
zhaoxiaolin 9f051a1277 管理系统报工1.0
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
Yangwl 4b36de1131 烘房看板接口
zhaoxiaolin 42b0c4622d 计划bug+报工上位机接口提供
陈恒杰 83548f708f Merge remote-tracking branch 'origin/master'
陈恒杰 dbd3b16007 rfid流程修改
zhaoxiaolin cca83e6511 bug
zhaoxiaolin 8e8ac0e125 备份定时任务
zhaoxiaolin 42b9c09918 bug修改
zhaoxiaolin 9d55da3a0b 生产过程检验+手持发版记录
zhaoxiaolin 34aad9a2bf 质量系统-检验任务管理1
zhaoxiaolin d4ce34c332 1、看板料罐车数获取;2、小时产量加班次、分钟数做活,导出功能;3、工序完成记录加入班次
zhaoxiaolin b1d37a7c79 下工序机台获取接口
zhaoxiaolin 57ff0dd3ea 小时产量报表增加合计
zhaoxiaolin f6ebd9e321 看板、小时产量报表
zhaoxiaolin e0e08736bf 看板接口3
zhaoxiaolin d19159a2f3 看板接口2
zhaoxiaolin d6e558f422 工序产量查询
zhaoxiaolin 2868dfb34a 白坯订单v2
zhaoxiaolin 41b3459f8b 白坯生产报表
zhaoxiaolin 9bea4d9d6c 工单编码
zhaoxiaolin ecef3b7e38 Merge remote-tracking branch 'origin/master'
zhaoxiaolin 2d905987ba mes看板
zhaoxl 699f763bff zxl
zhaoxiaolin 4a0b3dc0b2 手持修改
zhaoxiaolin ccb8a178cb 生产环境
A0010407 8f5de59e5c mes rfid
zhaoxiaolin bb61ed1b95 sap jar包