217 Commits (c3125ca18bd6d6d997ae3c56143b5d658d71ebeb)

Author SHA1 Message Date
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
zhaoxiaolin 9d55da3a0b 生产过程检验+手持发版记录 1 year ago
zhaoxiaolin 34aad9a2bf 质量系统-检验任务管理1 1 year ago
zhaoxiaolin d4ce34c332 1、看板料罐车数获取;2、小时产量加班次、分钟数做活,导出功能;3、工序完成记录加入班次 1 year ago
zhaoxiaolin b1d37a7c79 下工序机台获取接口 1 year ago
zhaoxiaolin 57ff0dd3ea 小时产量报表增加合计 1 year ago
zhaoxiaolin f6ebd9e321 看板、小时产量报表 1 year ago
zhaoxiaolin e0e08736bf 看板接口3 1 year ago
zhaoxiaolin d19159a2f3 看板接口2 1 year ago
zhaoxiaolin d6e558f422 工序产量查询 1 year ago
zhaoxiaolin 2868dfb34a 白坯订单v2 1 year ago
zhaoxiaolin 41b3459f8b 白坯生产报表 1 year ago
zhaoxiaolin 9bea4d9d6c 工单编码 1 year ago
zhaoxiaolin ecef3b7e38 Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 2d905987ba mes看板 1 year ago
zhaoxl 699f763bff zxl 1 year ago
zhaoxiaolin 4a0b3dc0b2 手持修改 1 year ago
zhaoxiaolin ccb8a178cb 生产环境 1 year ago
A0010407 8f5de59e5c mes rfid 1 year ago
zhaoxiaolin bb61ed1b95 sap jar包 1 year ago
A0010407 ae8cd366bd mes报工bug 1 year ago
A0010407 7f5ab75bfd 手持Rfid 1 year ago
A0010407 d193c0c676 手持查询 1 year ago
A0010407 045090004c mes报表权限 1 year ago
zhaoxiaolin 8678afa391 手持接口修改+权限 1 year ago
zhaoxiaolin c5866a95c6 手持接口+订单bug修复 1 year ago
A0010407 22d786f5db MES领料单优化 1 year ago
zhaoxiaolin d4446de5fc 成品订单修改:更新范围>=20230921 1 year ago
zhaoxiaolin d394d2a1df 逻辑删除+手持增加缓冲区接口+工艺车数 1 year ago
zhaoxiaolin e38a563f81 逻辑删除+手持增加缓冲区接口 1 year ago
zhaoxiaolin f778b42cbc sap模块代码合并 1 year ago
zhaoxiaolin 1b53ac43d9 首页 1 year ago
zhaoxiaolin 473f789631 sap报工添加关闭订单,修改工单报工状态逻辑 1 year ago
zhaoxiaolin 139dc3fb4c 日生产报表功能 1 year ago
wws 9771ab2ff3 打印备料单 1 year ago
zhaoxiaolin 897166b783 工艺穿梭框 1 year ago
zhaoxiaolin ca4b21061c 计划bug和质量bug修改 1 year ago
zhaoxiaolin 5a60b22157 计划-设备路线选择更改;报工定时任务; 1 year ago
zhaoxiaolin c1885b1805 手持质量检验 1 year ago
zhaoxiaolin 03376055cb 计划bug修改-- 计划的选择方式修改v2.0 1 year ago
zhaoxiaolin d6d5ff4ae3 计划bug修改-- 计划的选择方式修改 1 year ago
zhaoxiaolin 76036ee69a 计划bug修改 1 year ago
zhaoxiaolin dee2982dbd 工单下发sap接口联调 1 year ago
zhaoxiaolin da486d7e20 订单同步按钮 1 year ago
A0010407 d0dd51a777 mes报工 1 year ago
A0010407 17a42de771 mes报工 1 year ago
A0010407 49188ecaaf mes报工 1 year ago
A0010407 a6890849fe rfid bug 1 year ago
zhaoxiaolin 8dc2f096a2 文件上传问题 1 year ago
zhaoxiaolin a5147344fb 新增员工时加数据源权限 1 year ago
zhaoxiaolin 1879d18ba9 数据源规则修改 1 year ago
zhaoxiaolin ae4d615aff 领料单获取 1 year ago
zhaoxiaolin d70b27e01f 领料单提交 1 year ago
zhaoxiaolin 7fc87674e9 领料单提交 1 year ago
zhaoxiaolin a5340c0934 领料单提交 1 year ago
zhaoxiaolin 07d80f45c6 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcProCheckServiceImpl.java
#	op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java
1 year ago
zhaoxiaolin 7dc31d221a 领料单提交 1 year ago
zhaoxiaolin 432a1c761c 领料单提交 1 year ago
Yangwl 73aca5b45b Merge branch 'master' of F:\workplace-idea\榄菊\lanju-cloud with conflicts. 1 year ago
chj 69fb1df23b MES报废功能 1 year ago