176 Commits (orign)

Author SHA1 Message Date
陈恒杰 0684692469 Merge remote-tracking branch 'origin/master' 1 year ago
陈恒杰 aa2ca2b13c 打印领料单修改 1 year ago
zhaoxiaolin ed67be03ca 子单报工成功后再报母单 1 year ago
zhaoxiaolin 628b391937 工单删除逻辑添加 1 year ago
zhaoxiaolin 4362014544 只有活动中的工单才能进行报工 1 year ago
zhaoxiaolin ad6f335ffc 只有活动中的工单才能进行报工 1 year ago
zhaoxiaolin e51eba0465 报工成功后,不需要关闭工单 1 year ago
zhaoxiaolin 91790d8b7b 报工成功后,再关闭订单 1 year ago
zhaoxiaolin e1be6cb0a6 报工公式确认 1 year ago
zhaoxiaolin 7caebe1ddf 报工方案调整:母单报工的时候,也按照子单的数量进行填报。 1 year ago
zhaoxiaolin 376e54ee5e 生产过程检验修改测试 1 year ago
zhaoxiaolin b1712dd5fc 报工修改 1 year ago
zhaoxiaolin 7d44bda34a sap报工-状态 1 year ago
zhaoxiaolin 56fc72ff0d sap报工 1 year ago
zhaoxiaolin 304370cde2 sap接口调整3 1 year ago
zhaoxiaolin 1f31239adb sap接口调整 1 year ago
zhaoxiaolin 80d762197c Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin f13ee5d888 sap调整+质量手持接口+首页柱图数据bug修复 1 year ago
Yangwl fc43732c0c 修改报工实体类 1 year ago
zhaoxiaolin 2f221e1905 sap调整 1 year ago
zhaoxiaolin 34e131289b 报工时候关闭子母工单 1 year ago
zhaoxiaolin 709af8c4a0 加入belong_work_order概念 1 year ago
zhaoxiaolin 1cedbf3c9e sap接口调整 1 year ago
陈恒杰 bddcdd4181 rfid流程修改 1 year ago
zhaoxiaolin 8dfc341463 下机台获取-unlock 1 year ago
zhaoxiaolin 20abf4cde4 报工+成品计划升级 1 year ago
zhaoxiaolin 24fe8b0b83 保养定时任务 1 year ago
Yangwl 2a5cb29acd 烘房看板接口
# Conflicts:
#	op-modules/op-mes/push-mes.bat
1 year ago
Yangwl c0ee7ca097 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java
1 year ago
Yangwl 598ec4a496 烘房看板接口
# Conflicts:
#	op-modules/op-mes/push-mes.bat
1 year ago
zhaoxiaolin 96223a90a0 mes报工 1 year ago
zhaoxiaolin ba999d484c 成品计划修改 1 year 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
1 year ago
Yangwl bb0ac02cc8 烘房看板接口 1 year ago
Yangwl cec59e4bc4 烘房看板接口 1 year ago
zhaoxiaolin 3262f842a3 成品bug修改 1 year ago
zhaoxiaolin 15581ac8a3 新增接口服务,去掉scada服务 1 year ago
zhaoxiaolin 2aa1ad4f2e bat换jdk 1 year ago
zhaoxiaolin 15157dd26e 测试版本注册中心修改 1 year ago
zhaoxiaolin 4bd0df94ff 发版命令 1 year ago
zhaoxiaolin c7bfb41867 管理系统报工 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
zhaoxiaolin 42b0c4622d 计划bug+报工上位机接口提供 1 year ago
陈恒杰 83548f708f Merge remote-tracking branch 'origin/master' 1 year ago
陈恒杰 dbd3b16007 rfid流程修改 1 year ago
zhaoxiaolin cca83e6511 bug 1 year ago
zhaoxiaolin 8e8ac0e125 备份定时任务 1 year ago
zhaoxiaolin 42b9c09918 bug修改 1 year ago