172 Commits (6d008da326e502b28b8a326f333b09f709185af5)

Author SHA1 Message Date
赵嘉伟 928b12de7f 余料退回明细表 3 years ago
Leon ea3e2c5c9f Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz 3 years ago
Leon 79fba83a37 派工单导入修改 3 years ago
zpl 2bddd95c28 功能优化 3 years ago
zpl 6050a26fba 余料打印bug修改 3 years ago
zpl 754a5e27d0 车间发料修改 3 years ago
zpl b0f9b43c87 Merge remote-tracking branch 'origin/master' 3 years ago
zpl 9d23692c48 车间发料修改 3 years ago
Leon 0ca4dec56e 派工单刷新报错,修改处理。 3 years ago
Leon f0debbb52a 工单整理下达报错修改 3 years ago
Leon b497fd94a9 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz 3 years ago
Leon 76bf6243c5 工单整理下达报错修改 3 years ago
zpl f740da5672 车间发料修改 3 years ago
Leon 2e2b9a9928 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz 3 years ago
Leon 845f7a785b 报表工具 3 years ago
zpl fcdc7a93cd Merge remote-tracking branch 'origin/master' 3 years ago
zpl c7c9b3d156 界面修改 3 years ago
赵嘉伟 59454f195a userResource提交 3 years ago
赵嘉伟 88f40558cb Merge remote-tracking branch 'origin/master' 3 years ago
赵嘉伟 1f3e67c8b0 userResource提交 3 years ago
zpl 00517d55d3 Merge remote-tracking branch 'origin/master' 3 years ago
zpl 531e8cbd89 生产叫料数据查询功能修改 3 years ago
Leon fe20048264 派工工作中心查询修改 3 years ago
Leon dd01cb8dda 派工人员问题处理 3 years ago
Leon c7b50a9725 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz 3 years ago
Leon 0443ecfd60 派工人员问题处理 3 years ago
zpl 94f84ac3bc Merge remote-tracking branch 'origin/master' 3 years ago
zpl 40c3245f76 叫料查询修改 3 years ago
Leon 98e48c755d 派工人员问题处理 3 years ago
zpl 5849272dc3 叫料权限修改 3 years ago
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
3 years ago
Leon 70f1482493 生产派工测试问题处理 3 years ago
zpl 8b6b9090a4 余料标签修改 3 years ago
zpl 220e27039e 叫料pda功能修改 3 years ago
zpl 588d94f13b Merge remote-tracking branch 'origin/master' 3 years ago
zpl ce872c2bb1 叫料pda界面修改 3 years ago
philip fcb84abe06 派工单弹出框检索 3 years ago
philip 85fb8c5b99 开始完成修改派工开始完成时间 3 years ago
zpl 895071aa60 设备模块修改 3 years ago
zpl dffd98413d 标签打印模板修改 3 years ago
philip 96369b1a62 产前准备任务检索修改 3 years ago
zpl 7980402005 生产叫料修改 3 years ago
Leon a0d55d759a 叫料查询BUG修改 3 years ago
zpl 90d507d83b Merge remote-tracking branch 'origin/master' 3 years ago
zpl 49ca453631 生产叫料PDA修改 3 years ago
Leon 63e9c0277a Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz 3 years ago
Leon 617a56fde0 物料模块BUG修改 3 years ago
zpl 41a2830064 Merge remote-tracking branch 'origin/master' 3 years ago
zpl 76211d85fa 生产叫料PDA修改 3 years ago
Leon 039381b1af 工单整理查询计划工艺路线修改 3 years ago
Leon e0f30651c2 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz 3 years ago
Leon 509ebc4f6f 工单整理查询计划工艺路线修改 3 years ago
赵嘉伟 609511900b Merge remote-tracking branch 'origin/master' 3 years ago
赵嘉伟 8c7d86ff5b 用户资源表 3 years ago
Leon cc22b9d245 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz 3 years ago
Leon 6cf48654c7 工单整理修改车间取值逻辑 3 years ago
赵嘉伟 c1a79a3cfc listener 3 years ago
zpl e3a6e8fa3f 打印功能修改 4 years ago
zpl 638c30b210 Merge remote-tracking branch 'origin/master' 4 years ago
zpl a46a0b8a34 打印功能修改 4 years ago
Leon 7f20a2229b 计划派工+物料功能修改 4 years ago
赵嘉伟 eb57d91045 Merge remote-tracking branch 'origin/master' 3 years ago
赵嘉伟 5958922af8 员工资源对应表 3 years ago
Leon 7b1e26eb36 叫料界面增加组件查询条件 4 years ago
Leon 70cdb0d7fd 派工修改发布报错 4 years ago
Leon 9daa13c2e2 派工修改发布报错 4 years ago
Leon 166655bd78 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz 4 years ago
Leon b934709378 报废调用派工接口 4 years ago
赵嘉伟 c583c1e540 员工资源导入 4 years ago
Leon c913b3a4f1 派工发布无组件报错问题修正。 4 years ago
Leon 11e076273c Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz 4 years ago
Leon c36483cbf2 派工功能修改 4 years ago
赵嘉伟 a8ef8d8d88 员工资源表修改 4 years ago
赵嘉伟 f43141c360 用户资源对应表修改 4 years ago
赵嘉伟 9bd199395d 设备异常,用户资源 4 years ago
赵嘉伟 1443a18705 UserResource提交 4 years ago
Leon a473213da8 标签打印&测试问题修改 4 years ago
Leon 17a45bff59 标签打印 4 years ago
Leon 2047ebc302 质量模块功能提交 4 years ago
philip 48062cee2f Merge remote-tracking branch 'origin/master' 4 years ago
philip 4c4871942e 装配 4 years ago
Leon 32f7be77c1 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz 4 years ago
Leon 20011e5be5 物料管理修改 4 years ago
philip b572ec1cb7 Merge remote-tracking branch 'origin/master' 4 years ago
philip fd818a5a37 装配 4 years ago
Leon 869b5035eb 叫料发布 4 years ago
Leon bb17f7e1ab 配置文件增加打印地址 4 years ago
Leon 561d0f686f ERP报工接口测试 4 years ago
Leon a3259e08c4 ERP接口调用公共方法。 4 years ago
Leon 201a2d7f33 车间发料 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
Leon 48d9f577dc 设备接口 4 years ago
philip 2371eb7afe 更改派工状态 4 years ago
philip e909e04bd1 inventory 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
赵嘉伟 82f7d0d36c 7月9日,其他异常响应维护,和异常提报、待办事项Bug修改 4 years ago
philip 9dce721751 上/卸料 4 years ago
Leon c7479acfd9 车间发料功能 4 years ago
Leon c63daa7ef6 增加修改派工单状态接口 4 years ago