140 Commits (21b7e5ba0600efb569cdbf41c4f7ba89dbdefe35)

Author SHA1 Message Date
zpl 21b7e5ba06 报工、发料 3 years ago
philip 9c458ac9e9 工序描述 3 years ago
Leon 48f2bb515c Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz 3 years ago
Leon 77f4c55979 拆分修改保存派工数据 3 years ago
zpl 62212348cb 叫料PDA新增——材质、规格字段 3 years ago
Leon 32ed7520d8 生产派工查询条件修改。 3 years ago
Leon cabff3e6af 派工增加查询字段 3 years ago
Leon 1f090f3466 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
# Conflicts:
#	anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java
#	anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java
#	anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java
#	anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java
#	anomaly/src/main/resources/mapper/ReportMapper.xml
#	quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionTaskManageServiceImpl.java
3 years ago
Leon dd6fd856c5 质量修改检验任务问题。 3 years ago
philip e002e2dfe3 拆分不传车间,派工弹出框 3 years ago
Leon d0666401f1 叫料修改:装配只叫辅料类型为9的,其他叫原材料。 3 years ago
赵嘉伟 3d317c1c1e 生产派工发布 3 years ago
zpl b93de8dba7 功能修改 3 years ago
zpl 2b99ad1016 Merge remote-tracking branch 'origin/master' 3 years ago
zpl fb9d3908be bug修复 3 years ago
赵嘉伟 0d2905b383 余料退回明细表 3 years ago
赵嘉伟 74c629c0ca 零件加工报表 3 years ago
赵嘉伟 eafc1225a5 零件加工进度表 3 years ago
赵嘉伟 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