Commit Graph

104 Commits (a4e2dcd90f9e24ad5b33cf6b6c55a47465b3e5da)

Author SHA1 Message Date
赵嘉伟 88f40558cb Merge remote-tracking branch 'origin/master'
赵嘉伟 1f3e67c8b0 userResource提交
zpl 00517d55d3 Merge remote-tracking branch 'origin/master'
zpl 531e8cbd89 生产叫料数据查询功能修改
Leon fe20048264 派工工作中心查询修改
Leon dd01cb8dda 派工人员问题处理
Leon c7b50a9725 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
Leon 0443ecfd60 派工人员问题处理
zpl 94f84ac3bc Merge remote-tracking branch 'origin/master'
zpl 40c3245f76 叫料查询修改
Leon 98e48c755d 派工人员问题处理
zpl 5849272dc3 叫料权限修改
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 8b6b9090a4 余料标签修改
zpl 220e27039e 叫料pda功能修改
zpl 588d94f13b Merge remote-tracking branch 'origin/master'
zpl ce872c2bb1 叫料pda界面修改
philip fcb84abe06 派工单弹出框检索
philip 85fb8c5b99 开始完成修改派工开始完成时间
zpl 895071aa60 设备模块修改
zpl dffd98413d 标签打印模板修改
philip 96369b1a62 产前准备任务检索修改
zpl 7980402005 生产叫料修改
Leon a0d55d759a 叫料查询BUG修改
zpl 90d507d83b Merge remote-tracking branch 'origin/master'
zpl 49ca453631 生产叫料PDA修改
Leon 63e9c0277a Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
Leon 617a56fde0 物料模块BUG修改
zpl 41a2830064 Merge remote-tracking branch 'origin/master'
zpl 76211d85fa 生产叫料PDA修改
Leon 039381b1af 工单整理查询计划工艺路线修改
Leon e0f30651c2 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
Leon 509ebc4f6f 工单整理查询计划工艺路线修改
赵嘉伟 609511900b Merge remote-tracking branch 'origin/master'
赵嘉伟 8c7d86ff5b 用户资源表
Leon cc22b9d245 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
Leon 6cf48654c7 工单整理修改车间取值逻辑
赵嘉伟 c1a79a3cfc listener
zpl e3a6e8fa3f 打印功能修改
zpl 638c30b210 Merge remote-tracking branch 'origin/master'
zpl a46a0b8a34 打印功能修改
Leon 7f20a2229b 计划派工+物料功能修改
赵嘉伟 eb57d91045 Merge remote-tracking branch 'origin/master'
赵嘉伟 5958922af8 员工资源对应表
Leon 7b1e26eb36 叫料界面增加组件查询条件
Leon 70cdb0d7fd 派工修改发布报错
Leon 9daa13c2e2 派工修改发布报错
Leon 166655bd78 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
Leon b934709378 报废调用派工接口