191 Commits (fc9a83b310d786e7d869b8fc16f44faade769adf)

Author SHA1 Message Date
philip 96369b1a62 产前准备任务检索修改 3 years ago
philip 5e053f8671 Merge remote-tracking branch 'origin/master' 3 years ago
philip 5213bb81ef 资源筛选 3 years ago
Leon 4460a78b77 打印机维护 3 years ago
Leon ada6099b6b 工艺路线接口变更修改 3 years ago
Leon d0068c2479 工艺路线接口变更修改 3 years ago
Leon c8348b38f7 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz 4 years ago
Leon 6b71552fd0 工艺路线接口变更修改 4 years ago
philip 555f197712 库存回车 4 years ago
philip 4e29e82e22 Merge remote-tracking branch 'origin/master' 4 years ago
philip 85ac05b441 拆分 4 years ago
Leon 7f20a2229b 计划派工+物料功能修改 4 years ago
philip bba0303e57 产前准备修改 4 years ago
Leon c5e9c04b02 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz 4 years ago
Leon 70cdb0d7fd 派工修改发布报错 4 years ago
zpl 0c6fa7c478 Merge remote-tracking branch 'origin/master' 4 years ago
zpl b860ca1c6c 设备状态Handel修改 4 years ago
赵嘉伟 0890dd6b2b Merge remote-tracking branch 'origin/master' 4 years ago
赵嘉伟 6431c44423 生产报废导出word功能 4 years ago
philip be05ddfdc4 车间转入转出 4 years ago
赵嘉伟 083a8379e5 质量异常提报 4 years ago
赵嘉伟 44a74dac3d Merge remote-tracking branch 'origin/master' 4 years ago
赵嘉伟 78d90e78ce 质量异常提报 4 years ago
Leon b934709378 报废调用派工接口 4 years ago
赵嘉伟 cfd7e504f2 质量异常自报 4 years ago
赵嘉伟 0ea1db37c6 质量异常自报 4 years ago
philip 29b5d3cbd8 自报跳转异常 4 years ago
philip f54fa4e38a bom查询 4 years ago
philip 5c3b17f25f 自报异常增加用户组 4 years ago
philip bbd12432d5 物料消耗+报工 4 years ago
赵嘉伟 945d72fedd Merge remote-tracking branch 'origin/master' 4 years ago
赵嘉伟 d6e03c0cdc 异常计时器 4 years ago
Leon 86e05c1728 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz 4 years ago
Leon a473213da8 标签打印&测试问题修改 4 years ago
philip 6c0c851064 自报 4 years ago
赵嘉伟 5285db7d3a Merge remote-tracking branch 'origin/master' 4 years ago
赵嘉伟 80f12130a8 异常计时器 4 years ago
Leon 17a45bff59 标签打印 4 years ago
赵嘉伟 7a0d07ee96 根据工序查找不合格代码 4 years ago
赵嘉伟 69ec898a9d 异常消息发送和生产操作员面板pod 4 years ago
赵嘉伟 ec25f7bd45 format方法格式化 4 years ago
赵嘉伟 e75396aaaa 消息类型表导入 4 years ago
Leon 32f7be77c1 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz 4 years ago
Leon 20011e5be5 物料管理修改 4 years ago
zpl 3f40add8b6 Merge remote-tracking branch 'origin/master' 4 years ago
zpl 246e8f43f7 设备模块更新 4 years ago
philip fd818a5a37 装配 4 years ago
zpl 9e2fda10ac 设备车间 4 years ago
zpl 32a6f7e842 上下料功能、设备点检计划维护bug修复 4 years ago
philip a931fd2f93 Merge remote-tracking branch 'origin/master' 4 years ago
philip 7100fb5801 工序描述 4 years ago
Leon bbb377436c CAPP接口功能开发 4 years ago
赵嘉伟 524978b737 Merge remote-tracking branch 'origin/master' 4 years ago
赵嘉伟 52099503c6 质量异常模块提交 4 years ago
zpl 477da3d3a3 设备接口模块更新 4 years ago
赵嘉伟 e8d3818f99 异常bug修改,附件上传 4 years ago
philip 3943955bf4 自报 4 years ago
赵嘉伟 eb11ffa11f 异常bug修改 4 years ago
Leon 91224958e1 Merge remote-tracking branch 'mesnac/master'
# Conflicts:
#	dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SurplusItemReturnServiceImpl.java
4 years ago
zpl 8eb343adde Merge remote-tracking branch 'origin/master' 4 years ago
zpl e34179c64a 设备点检、维修模块更新 4 years ago
Leon 48d9f577dc 设备接口 4 years ago
philip 2371eb7afe 更改派工状态 4 years ago
Leon 9ed8f5f895 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
# Conflicts:
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/InventoryMapper.java
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Inventory.java
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/service/InventoryService.java
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/InventoryServiceImpl.java
4 years ago
Leon 8777d65d43 余料标示 4 years ago
philip 1e35a78537 检验任务 4 years ago
赵嘉伟 82f7d0d36c 7月9日,其他异常响应维护,和异常提报、待办事项Bug修改 4 years ago
zpl 8cf9d7ef86 Merge remote-tracking branch 'origin/master' 4 years ago
zpl eaa22df0cf 设备点检、维修模块更新 4 years ago
philip 9dce721751 上/卸料 4 years ago
Leon 7517c1deac Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz 4 years ago
zpl bac78a3dff Merge remote-tracking branch 'origin/master' 4 years ago
zpl 6016bd93dc 设备维修任务模块更新 4 years ago
Leon db6e6fd85d Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz 4 years ago
赵嘉伟 d29583f73c 质量异常响应功能、质量异常提报bug修改 4 years ago
Leon 318b246882 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz 4 years ago
Leon c7479acfd9 车间发料功能 4 years ago
赵嘉伟 c37bc8599f Merge remote-tracking branch 'origin/master' 4 years ago
赵嘉伟 7a111d42b5 质量异常响应、质量异常提报bug修改 4 years ago
philip 2ba6206ac9 检验任务 4 years ago
Leon 2a0fd2b9ab Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
# Conflicts:
#	dispatch/src/main/resources/mapper/CallItemMapper.xml
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/OperationMapper.java
#	meapi/src/main/resources/mapper/OperationMapper.xml
4 years ago
Leon c63daa7ef6 增加修改派工单状态接口 4 years ago
赵嘉伟 7f25989760 Merge remote-tracking branch 'origin/master' 4 years ago
赵嘉伟 1916916935 不良代码待办事项 4 years ago
philip a118947288 工序弹出框 4 years ago
Leon d13545f9ab Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
# Conflicts:
#	common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java
4 years ago
赵嘉伟 7805bc4595 Merge remote-tracking branch 'origin/master' 4 years ago
赵嘉伟 755d461717 质量异常提报完成 4 years ago
philip eaf7ea4156 pod 4 years ago
Leon 36beeaac9f Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz 4 years ago
Leon 6d157881c1 生产叫料功能提交 4 years ago
zpl ce0b98d283 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	common/src/main/java/com/foreverwin/mesnac/common/enums/HandleEnum.java
#	generator/src/main/java/com/foreverwin/minth/generator/GeneratorApplication.java
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/UserGroupController.java
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/UserGroupMapper.java
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/model/UserGroup.java
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/service/UserGroupService.java
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/UserGroupServiceImpl.java
#	meapi/src/main/resources/mapper/UserGroupMapper.xml
4 years ago
zpl 23930608bd 设备管理模块--设备检验任务模块更新 4 years ago
赵嘉伟 2438792b20 其他异常提交(已完成) 4 years ago
赵嘉伟 1471d4672c Merge remote-tracking branch 'origin/master' 4 years ago
赵嘉伟 2cc1023904 其他异常提交 4 years ago
Leon e2775bc7d0 SFC跟踪功能 4 years ago
Leon ddcaa726d2 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
# Conflicts:
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/SfcDto.java
4 years ago
Leon e3499ba197 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
# Conflicts:
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/SfcController.java
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/SfcMapper.java
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/service/SfcService.java
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/SfcServiceImpl.java
#	meapi/src/main/resources/mapper/SfcMapper.xml
4 years ago
philip 9798e037ac pod 4 years ago