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

278 Commits (5d46e8fd43b6b5d25845f1c7aa8b519e61ab2833)

Author SHA1 Message Date
zhaoxiaolin 5f03c120b6 质量看板接口
zhaoxiaolin afe322e8c9 领料单+质量看板接口
陈恒杰 0684692469 Merge remote-tracking branch 'origin/master'
陈恒杰 aa2ca2b13c 打印领料单修改
zhaoxiaolin ed67be03ca 子单报工成功后再报母单
zhaoxiaolin 628b391937 工单删除逻辑添加
zhaoxiaolin 4362014544 只有活动中的工单才能进行报工
zhaoxiaolin ad6f335ffc 只有活动中的工单才能进行报工
zhaoxiaolin e51eba0465 报工成功后，不需要关闭工单
zhaoxiaolin 91790d8b7b 报工成功后，再关闭订单
zhaoxiaolin e1be6cb0a6 报工公式确认
zhaoxiaolin 7caebe1ddf 报工方案调整：母单报工的时候，也按照子单的数量进行填报。
zhaoxiaolin 376e54ee5e 生产过程检验修改测试
zhaoxiaolin b1712dd5fc 报工修改
zhaoxiaolin 7d44bda34a sap报工-状态
zhaoxiaolin 56fc72ff0d sap报工
zhaoxiaolin 304370cde2 sap接口调整3
zhaoxiaolin 1f31239adb sap接口调整
zhaoxiaolin 80d762197c Merge remote-tracking branch 'origin/master'
zhaoxiaolin f13ee5d888 sap调整+质量手持接口+首页柱图数据bug修复
Yangwl fc43732c0c 修改报工实体类
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包
A0010407 ae8cd366bd mes报工bug
A0010407 7f5ab75bfd 手持Rfid
A0010407 d193c0c676 手持查询
A0010407 045090004c mes报表权限
zhaoxiaolin 8678afa391 手持接口修改+权限
zhaoxiaolin c5866a95c6 手持接口+订单bug修复
A0010407 22d786f5db MES领料单优化
zhaoxiaolin d4446de5fc 成品订单修改：更新范围>=20230921
zhaoxiaolin d394d2a1df 逻辑删除+手持增加缓冲区接口+工艺车数
zhaoxiaolin e38a563f81 逻辑删除+手持增加缓冲区接口
zhaoxiaolin f778b42cbc sap模块代码合并
zhaoxiaolin 1b53ac43d9 首页
zhaoxiaolin 473f789631 sap报工添加关闭订单，修改工单报工状态逻辑
zhaoxiaolin 139dc3fb4c 日生产报表功能
wws 9771ab2ff3 打印备料单
zhaoxiaolin 897166b783 工艺穿梭框
zhaoxiaolin ca4b21061c 计划bug和质量bug修改
zhaoxiaolin 5a60b22157 计划-设备路线选择更改；报工定时任务；
zhaoxiaolin c1885b1805 手持质量检验
zhaoxiaolin 03376055cb 计划bug修改-- 计划的选择方式修改v2.0
zhaoxiaolin d6d5ff4ae3 计划bug修改-- 计划的选择方式修改
zhaoxiaolin 76036ee69a 计划bug修改
zhaoxiaolin dee2982dbd 工单下发sap接口联调
zhaoxiaolin da486d7e20 订单同步按钮
A0010407 d0dd51a777 mes报工
A0010407 17a42de771 mes报工
A0010407 49188ecaaf mes报工
A0010407 a6890849fe rfid bug
zhaoxiaolin 8dc2f096a2 文件上传问题
zhaoxiaolin a5147344fb 新增员工时加数据源权限
zhaoxiaolin 1879d18ba9 数据源规则修改
zhaoxiaolin ae4d615aff 领料单获取
zhaoxiaolin d70b27e01f 领料单提交
zhaoxiaolin 7fc87674e9 领料单提交
zhaoxiaolin a5340c0934 领料单提交
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
zhaoxiaolin 7dc31d221a 领料单提交
zhaoxiaolin 432a1c761c 领料单提交
Yangwl 73aca5b45b Merge branch 'master' of F:\workplace-idea\榄菊\lanju-cloud with conflicts.
chj 69fb1df23b MES报废功能
wws 0c792e7856 工单字段更改(isEnd->endFlag)
zhaoxiaolin 67ef0ac298 wcs接口开发转移
chj c7adabcee9 MES报废功能
chj 0e7a206b40 MES报废功能
chj 6146a90ad0 Merge remote-tracking branch 'origin/master'
chj 24faa833ea MES报废功能
A0010407 69488cc084 MES serviceimpl修改
zhaoxiaolin e4fe0c3772 wcs跟Mes交互的接口
A0010407 a8e8a99014 MES 备料单明细
A0010407 cccddee368 MES 备料单 生产前准备
zhaoxiaolin 91c07021ae wcs跟Mes交互的接口
zhaoxiaolin 362f6a167b 计划涉及的接口开发
A0010407 6b0292d505 mes bootstrap还原
A0010407 67447b6164 生产工序 新增 产线设备
Yangwl d7fab6d920 Merge remote-tracking branch 'origin/master'
zhaoxiaolin 0741e934cc 微服务拆分4
Yangwl 88b1a67164 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProOrderServiceImpl.java
wws 5809d73f28 计划管理模块(日期范围查询、计划工厂字段添加)、湿料计划管理模块(状态查询)、整体代码优化
Yangwl 7cb2180d78 Merge branch 'master' of F:\workplace-idea\榄菊\lanju-cloud with conflicts.
zhaoxiaolin 3c4917cb28 微服务拆分
wws a64043c4ce 湿料计划管理(修改init)
wws 605717dd11 Merge remote-tracking branch 'origin/master'
wws 39ac73dbed 湿料计划(查询湿料计划详情)
wws b6506a910c 订单计划管理(母工单为未新增已解决)
zhaoxiaolin 93d42d6d2a 工单下发--工艺下发
wws f44af65c4f 湿料计划管理(查询详情list)
wws 5752973f8c 湿料计划管理(查询详情list)
wws a9f3792c77 订单计划管理(版本合并)
wws 3af42d3b6d Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	op-modules/op-mes/src/main/java/com/op/mes/mapper/ProOrderWorkorderMapper.java
#	op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProOrderServiceImpl.java
zhaoxiaolin 95205cd536 微服务添加
wws cbf5aa0bd4 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	op-modules/op-mes/src/main/java/com/op/mes/mapper/ProOrderWorkorderMapper.java
#	op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProOrderServiceImpl.java
wws 97b1ddbc4b 湿料计划管理(计划新增完成)
Yangwl a72ac03a1e SAP定时任务同步订单
wws 0425f44ef9 订单计划管理(工单班次名称获取)
wws a491155b75 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	op-modules/op-mes/src/main/resources/mapper/mes/ProOrderWorkorderMapper.xml
wws 5009b0ded1 订单计划管理(工艺字段添加)
wws cde82abd67 订单计划管理(更改订单拆分状态逻辑)
zhaoxiaolin a5d3d5727d 工单变更
zhaoxiaolin fb0a2ab614 工单变更