Yangwl
/
mesnac_mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,134 Commits
1 Branch
0 Tags
83 MiB
Commit Graph

394 Commits (166d3f2f31e392a30acf3518f920b0c9448f01e0)

Author SHA1 Message Date
zpl c7c9b3d156 界面修改
philip ce9152b5e2 产前准备PDA
赵嘉伟 881f141269 ActiveMQUtil
zpl 94f84ac3bc Merge remote-tracking branch 'origin/master'
赵嘉伟 400170d0e0 Merge remote-tracking branch 'origin/master'
赵嘉伟 e373102a9e ActiveMQUtil发送消息
zpl 102a1e17bb 标签打印新增物料查询
Leon 401a56439e Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz 
# Conflicts:
#	common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java
#	dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/UserGroupMapper.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
Leon 70f1482493 生产派工测试问题处理
zpl 57157ecc61 Merge remote-tracking branch 'origin/master'
zpl 8978428501 标签打印修改
zpl 217451e75f 标签打印的打印机修改
philip ba12736be3 辅料使用
zpl a41cb639ed Merge remote-tracking branch 'origin/master'
zpl 54a07a32b4 打印查询功能修改
philip ef2378390a 不合格代码修改
zpl bc176f173e 标签打印修改
zpl dffd98413d 标签打印模板修改
zpl 62e61258b9 设备点检、维修用户名称、不良描述获取
philip 43db6a3385 查找下工序
philip 96369b1a62 产前准备任务检索修改
zpl 4b7fd655c4 标签打印查询修改
zpl 51269282f6 标签打印查询修改
zpl dd26cd8e5f 打印机维护修改
zpl 338a4fbe40 打印机维护
Leon 4b1c103995 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
Leon 4460a78b77 打印机维护
philip 2bf61f6b30 Merge remote-tracking branch 'origin/master'
philip 43afbafc66 产前准备
赵嘉伟 d9d97a4d9c Merge remote-tracking branch 'origin/master'
赵嘉伟 9cb4b6e662 产品报废
Leon 63e9c0277a Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
Leon 617a56fde0 物料模块BUG修改
赵嘉伟 eb57d91045 Merge remote-tracking branch 'origin/master'
赵嘉伟 5958922af8 员工资源对应表
zpl 41a2830064 Merge remote-tracking branch 'origin/master'
zpl 76211d85fa 生产叫料PDA修改
赵嘉伟 71c4afb9bd bug修改
赵嘉伟 609511900b Merge remote-tracking branch 'origin/master'
赵嘉伟 8c7d86ff5b 用户资源表
philip 5fb42f229f 打印
Leon 6cf48654c7 工单整理修改车间取值逻辑
philip 555f197712 库存回车
philip d56ace6c93 拆分
philip d2e000700e Merge remote-tracking branch 'origin/master'
philip 683d094124 连接mq方式修改
zpl 2ff97cc813 Merge remote-tracking branch 'origin/master'
zpl e3a6e8fa3f 打印功能修改
赵嘉伟 3eb35b15da Merge remote-tracking branch 'origin/master'
赵嘉伟 e54bc409d5 计划异常待办事项
zpl 638c30b210 Merge remote-tracking branch 'origin/master'
zpl a46a0b8a34 打印功能修改
Leon 88663b582e Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
Leon 7f20a2229b 计划派工+物料功能修改
philip 71dd346a75 专检优化
philip a35da8e733 产前准备发消息
赵嘉伟 4af8faf814 Merge remote-tracking branch 'origin/master'
赵嘉伟 2694949a21 计划异常待办事项
philip bba0303e57 产前准备修改
Leon 7b1e26eb36 叫料界面增加组件查询条件
zpl c64dc352dd Merge remote-tracking branch 'origin/master'
zpl b2eb7ec7e2 刀具按状态Y查询
philip ee874a035d 工控程序接口
赵嘉伟 7a53834f91 生产-异常 设备和其他异常
赵嘉伟 02c00895bf 生产-异常 设备和其他异常
赵嘉伟 e30f2c0b99 Merge remote-tracking branch 'origin/master'
赵嘉伟 900ceb3b7d 生成-跳设备异常和其他异常参数增加问题描述
philip dc4b176938 打印
philip 9915d676eb 产品标签打印
zpl 0e7c096137 刀具模块bug修复
zpl 5c6ee46dbe Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
zpl 3173a234be bug修复
Leon 9daa13c2e2 派工修改发布报错
Leon 166655bd78 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
Leon b934709378 报废调用派工接口
赵嘉伟 e3432be435 ActiveMQ
赵嘉伟 b9b4add3fb 异常消息修改
zpl 40e94f3575 Merge remote-tracking branch 'origin/master'
zpl 50a3dda506 打印模块更新
赵嘉伟 895046da7d 员工资源导入+产品报废
philip bf4f86e8ef 工序描述
philip afe79b8753 产前准备增加筛选条件
philip 29b5d3cbd8 自报跳转异常
philip f54fa4e38a bom查询
philip 5c3b17f25f 自报异常增加用户组
赵嘉伟 9bd199395d 设备异常，用户资源
zpl 6cc3842a71 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
zpl b4c4d4a2d5 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
philip 6c0c851064 自报
zpl 0b0a5b554a Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
Leon 17a45bff59 标签打印
zpl ef769551be Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
Leon 2047ebc302 质量模块功能提交
zpl a24a2afde9 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
赵嘉伟 26ef51836f 异常消息发送
zpl 512778b744 设备模块更新
赵嘉伟 965bbeafc8 异常单和异常消息表导入
philip b572ec1cb7 Merge remote-tracking branch 'origin/master'
philip fd818a5a37 装配
Leon 869b5035eb 叫料发布
Leon bb17f7e1ab 配置文件增加打印地址
Leon ee130d7cc9 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
Leon 296aa3ba86 打印日志记录
zpl 01a3e636c1 Merge remote-tracking branch 'origin/master'
zpl 3778d070ff 刀具导入功能
philip 37b2695433 检验项目设备检验可不附加
Leon ce7ed6f618 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz 
# Conflicts:
#	production/src/main/java/com/foreverwin/mesnac/production/service/impl/CutterLogServiceImpl.java
Leon bbb377436c CAPP接口功能开发
philip 4ffd875b1e 导入
zpl b4c4a4a133 Merge remote-tracking branch 'origin/master'
zpl 6c19eb496e 刀具维护的功能完善
zpl d54e96d9e8 Merge remote-tracking branch 'origin/master'
zpl 21c22aa6d1 刀具维护的功能完善
Leon 7152bfc137 ERP接口调用公共方法。
Leon d019920fd1 Merge remote-tracking branch 'mesnac/master' 
# Conflicts:
#	common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java
Leon a3259e08c4 ERP接口调用公共方法。
zpl 1a76d572a2 设备模块更新、新增刀具
philip 3e7cad5feb 产前准备
赵嘉伟 44d88c8fc6 Merge remote-tracking branch 'origin/master'
赵嘉伟 cc34317921 设备异常响应转维修
philip 387393941f 产前准备
Leon 201a2d7f33 车间发料
philip 3943955bf4 自报
赵嘉伟 661d1056fc 其他异常和设备异常接口，异常bug修改
赵嘉伟 eb11ffa11f 异常bug修改
philip 6cf8a3dc18 Merge remote-tracking branch 'origin/master'
philip 56982f9a29 pod
Leon 91224958e1 Merge remote-tracking branch 'mesnac/master' 
# Conflicts:
#	dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SurplusItemReturnServiceImpl.java
zpl 8eb343adde Merge remote-tracking branch 'origin/master'
zpl e34179c64a 设备点检、维修模块更新
Leon 48d9f577dc 设备接口
philip 2371eb7afe 更改派工状态
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
philip 1e35a78537 检验任务
赵嘉伟 0d49a71fe4 7月9日，其他异常响应维护，和异常提报、待办事项Bug修改
zpl 8cf9d7ef86 Merge remote-tracking branch 'origin/master'
zpl eaa22df0cf 设备点检、维修模块更新
philip 9dce721751 上/卸料
Leon 7517c1deac Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
zpl bac78a3dff Merge remote-tracking branch 'origin/master'
Leon db6e6fd85d Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
赵嘉伟 d29583f73c 质量异常响应功能、质量异常提报bug修改
Leon c7479acfd9 车间发料功能
philip 2ba6206ac9 检验任务
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
Leon c63daa7ef6 增加修改派工单状态接口
philip a8e475e169 检验任务
zpl 81cd0d3c0b Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java
zpl d2bcb4a074 设备管理模块--设备检验任务模块更新
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
philip 3ab2ca7531 检验类型
Leon 36beeaac9f Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
Leon 6d157881c1 生产叫料功能提交
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
zpl 23930608bd 设备管理模块--设备检验任务模块更新
赵嘉伟 2438792b20 其他异常提交（已完成）
赵嘉伟 1471d4672c Merge remote-tracking branch 'origin/master'
赵嘉伟 2cc1023904 其他异常提交
Leon e2775bc7d0 SFC跟踪功能
Leon b5932fdeb0 移动端主界面
Leon d244e4be9b HANDLE工单
Leon 2108acf969 Merge remote-tracking branch 'mesnac/master' 
# Conflicts:
#	dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java
#	dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java
#	dispatch/src/main/resources/mapper/UserResourceMapper.xml
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/BomMapper.java
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Bom.java
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/service/BomService.java
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/BomServiceImpl.java
#	meapi/src/main/resources/mapper/BomMapper.xml
philip ac9496a822 生产准备任务检验
Leon 53aa7398c2 ERP接口功能代码提交
zpl 1f520e16a3 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java
zpl a08c76aaaa 设备管理模块--设备检验计划模块自动创建任务更新
philip a4d0209f80 产前准备任务生成
philip a0aef728b5 公共方法
Leon d52fd91f67 WebService接口日志记录类
zpl ccdeb40419 设备管理模块--设备检验计划模块更新
zpl 06964c02c0 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
philip 6112e89710 检验项目维护
zpl 3b280cdb8d Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
zpl d9a5c9ac6f 设备管理模块--设备检验计划模块更新
philip 7308d1b8c1 Merge remote-tracking branch 'origin/master'
philip f5b7cf7c07 检验项目移至common模块
Leon 4639972908 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
Leon d902eeb7fa 外部接口增加
philip 261cea0f00 检验项目维护
zpl ea74caf4a1 Merge remote-tracking branch 'origin/master'
zpl d64a7358f9 设备管理模块--设备维护、设备类型维护更新
Leon 994ccf6628 项目启动不需要加载所有Mapper内容
Leon 582e283785 工单整理刷新派工单功能
Leon 1bb8b80c23 主数据分页查询语句修改
zpl 76832ba1a8 设备管理模块--设备维护、设备类型维护更新
Leon 647c7ac821 增加设备管理模块
赵嘉伟 85e2e00cfd 工作日历、工作时段初始化提交
Leon 3c98e2798f 项目模块创建
Leon 107699d055 init
philip bbd12432d5 物料消耗+报工
Leon 86e05c1728 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
Leon a473213da8 标签打印&测试问题修改
Leon 0a6c5d44b2 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
Leon 858e1a626f WebService接口日志记录类