Commit Graph

81 Commits (13976aad2accc4c97da635182a5c1050808c8631)

Author SHA1 Message Date
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 报废调用派工接口
赵嘉伟 c583c1e540 员工资源导入
Leon c913b3a4f1 派工发布无组件报错问题修正。
Leon 11e076273c Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
Leon c36483cbf2 派工功能修改
赵嘉伟 a8ef8d8d88 员工资源表修改
赵嘉伟 f43141c360 用户资源对应表修改
赵嘉伟 9bd199395d 设备异常,用户资源
赵嘉伟 1443a18705 UserResource提交
Leon a473213da8 标签打印&测试问题修改
Leon 17a45bff59 标签打印
Leon 2047ebc302 质量模块功能提交
philip 48062cee2f Merge remote-tracking branch 'origin/master'
philip 4c4871942e 装配
Leon 32f7be77c1 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
Leon 20011e5be5 物料管理修改
philip b572ec1cb7 Merge remote-tracking branch 'origin/master'
philip fd818a5a37 装配
Leon 869b5035eb 叫料发布
Leon bb17f7e1ab 配置文件增加打印地址
Leon 561d0f686f ERP报工接口测试
Leon a3259e08c4 ERP接口调用公共方法。
Leon 201a2d7f33 车间发料
Leon 91224958e1 Merge remote-tracking branch 'mesnac/master'
# Conflicts:
#	dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SurplusItemReturnServiceImpl.java