558 Commits (f522d7d7db2f385aaac95d29689e56cd9b4f499a)
 

Author SHA1 Message Date
赵嘉伟 755d461717 质量异常提报完成 4 years ago
zpl 0b6960b7c7 设备管理模块--设备检验任务模块更新 4 years ago
philip eaf7ea4156 pod 4 years ago
Leon 36beeaac9f Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz 4 years ago
Leon 6d157881c1 生产叫料功能提交 4 years ago
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
4 years ago
zpl 23930608bd 设备管理模块--设备检验任务模块更新 4 years ago
赵嘉伟 9b7cf55726 Z_ABNORMAL_CAUSE表和Z_ABNORMAL_DUTY表导入 4 years ago
赵嘉伟 cca2efbc8f Z_ABNORMAL_NC_CODE表提交 4 years ago
赵嘉伟 2438792b20 其他异常提交(已完成) 4 years ago
赵嘉伟 1471d4672c Merge remote-tracking branch 'origin/master' 4 years ago
赵嘉伟 2cc1023904 其他异常提交 4 years ago
Leon e2775bc7d0 SFC跟踪功能 4 years ago
Leon ddcaa726d2 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
# Conflicts:
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/SfcDto.java
4 years ago
Leon e3499ba197 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
# Conflicts:
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/SfcController.java
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/SfcMapper.java
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/service/SfcService.java
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/SfcServiceImpl.java
#	meapi/src/main/resources/mapper/SfcMapper.xml
4 years ago
philip 9798e037ac pod 4 years ago
Leon b5932fdeb0 移动端主界面 4 years ago
赵嘉伟 817f186c59 Z_ABNORMAL_BILL_DISPOSE 表导入 4 years ago
赵嘉伟 1dc6f78310 DATA_FIELD 和 DATA_FIELD_LIST表导入 4 years ago
赵嘉伟 ed78e0e419 Merge remote-tracking branch 'origin/master' 4 years ago
赵嘉伟 d06b5aec4f 质量异常提报,未开发完成 4 years ago
philip e86246cbd3 meapi加主键 4 years ago
Leon d244e4be9b HANDLE工单 4 years ago
Leon 6f89cbc3ec 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
4 years ago
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
4 years ago
philip ac9496a822 生产准备任务检验 4 years ago
Leon 53aa7398c2 ERP接口功能代码提交 4 years ago
赵嘉伟 068b544c06 Z_ABNORMAL_BILL 提交 4 years ago
赵嘉伟 0335019750 异常提报中的不良代码和不良代码组提交 4 years ago
zpl 1f520e16a3 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java
4 years ago
zpl a08c76aaaa 设备管理模块--设备检验计划模块自动创建任务更新 4 years ago
philip ef6bc11de2 Merge remote-tracking branch 'origin/master' 4 years ago
philip a4d0209f80 产前准备任务生成 4 years ago
赵嘉伟 964d638f00 NC_CODE表提交 4 years ago
赵嘉伟 56de63fd6d 员工资源表 逻辑修改提交(完成) 4 years ago
赵嘉伟 b1d42a38f0 NC_GROUP 表导入 4 years ago
赵嘉伟 2279597387 Merge remote-tracking branch 'origin/master' 4 years ago
赵嘉伟 11f4b8dd89 NC_CODE表导入 4 years ago
philip a0aef728b5 公共方法 4 years ago
philip 18a040a1b3 Merge remote-tracking branch 'origin/master' 4 years ago
philip 220f1c026f 自报待办 4 years ago
Leon d9388e79db 报错代码处理提交 4 years ago
Leon c9cae37e15 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz 4 years ago
赵嘉伟 a73b03311f 员工资源对应表 4 years ago
Leon 1888d1a860 WebService接口日志记录类 4 years ago
Leon d52fd91f67 WebService接口日志记录类 4 years ago
赵嘉伟 e0559aa7b1 员工资源对应表 终极优化 4 years ago
赵嘉伟 5678977022 Merge remote-tracking branch 'origin/master' 4 years ago
赵嘉伟 1bcc7470bc 用户:Z_NWA_USER 往 USR表导数据的listenr监听器提交 4 years ago
zpl ccdeb40419 设备管理模块--设备检验计划模块更新 4 years ago