rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
726 Commits 16 Branches 1 Tag 12 MiB
Commit Graph

724 Commits

Author SHA1 Message Date
luoliming 24926cc757 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-03-30 16:33:56 +08:00
luoliming 53dd3add1b 问题修复 2024-03-30 16:33:43 +08:00
jing's 67477ec634 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-03-30 16:31:06 +08:00
jing's 2315a80f10 退回工厂判断 2024-03-30 16:31:02 +08:00
luoliming 689bdaba18 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 
# Conflicts:
#	nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
 2024-03-30 13:53:50 +08:00
luoliming af9f32fd8a 问题修复 2024-03-30 13:51:39 +08:00
曹鹏飞 7c3ccd698c fix: 记录操作日志时截取指定长度 2024-03-30 11:33:08 +08:00
曹鹏飞 c5dacdbec8 feat: ebom异常状态下不允许生成虚拟包 2024-03-30 10:43:22 +08:00
曹鹏飞 6e3e65e453 feat: 从cad导入原始bom时将物料编号为“无”的项置空 2024-03-30 10:16:18 +08:00
曹鹏飞 3bec84e14e Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-03-30 09:15:52 +08:00
大米 41dcf17772 1、最子级搜索 2024-03-29 19:06:35 +08:00
大米 ecca276e77 1、虚拟包排序号 2024-03-29 18:26:44 +08:00
曹鹏飞 4815b5d1c4 refactor: 一点点修改 2024-03-29 16:42:08 +08:00
曹鹏飞 01e40439c7 fix: 保存操作日志报错（数据超出长度等）时，记录到运行日志中 2024-03-29 16:39:43 +08:00
曹鹏飞 55db281e14 fix: 原始bom列表支持查询最后一级数据 2024-03-29 16:07:15 +08:00
曹鹏飞 0b0368993d feat: 添加筛选条件 2024-03-29 16:05:35 +08:00
jing's af4900141d 提示 2024-03-29 13:28:21 +08:00
jing's 92a0b6679c 删除 2024-03-29 13:26:28 +08:00
jing's 7abecbd672 删除bom 工艺角色调整 2024-03-29 13:22:29 +08:00
jing's 63f125918a Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-03-29 10:19:37 +08:00
jing's 8b822bd503 空指针 2024-03-29 10:19:26 +08:00
曹鹏飞 461692daf0 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 
# Conflicts:
#	nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
 2024-03-29 08:14:51 +08:00
jing's 2ad0c12acf Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-03-28 23:45:55 +08:00
jing's e59cc27d2a 退回设计 设计复核调整 2024-03-28 23:45:51 +08:00
大米 29c4969235 1、虚拟包排序号 2024-03-28 20:25:06 +08:00
大米 5505efa335 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-03-28 19:26:24 +08:00
大米 b17a146c93 1、虚拟包名称问题 2024-03-28 19:26:02 +08:00
曹鹏飞 fde0dc1130 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 
# Conflicts:
#	nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
 2024-03-28 17:04:45 +08:00
jing's 17293e495d 调整新加bom 最新版调整 2024-03-28 17:03:10 +08:00
jing's d0050dd1ad 调整删除 2024-03-28 16:47:43 +08:00
曹鹏飞 647e375b6b Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 
# Conflicts:
#	nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
 2024-03-28 16:08:25 +08:00
曹鹏飞 b793bf01c4 feat: 设计复核判断是否顶级添加用户顶级判断 2024-03-28 16:04:39 +08:00
jing's 7c5c9abc40 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-03-28 15:58:43 +08:00
jing's 4cf50914a1 rootis ->userRootIs 2024-03-28 15:58:38 +08:00
曹鹏飞 756ce30237 fix: 添加条件 2024-03-28 13:34:48 +08:00
曹鹏飞 0a2b65f0d1 fix: 修复root_is设置问题 2024-03-28 13:33:33 +08:00
曹鹏飞 ffcf1d6991 perf(feature/DM/nflg-bom): 同步虚拟物料到OA改为异步，http请求添加日志 2024-03-27 21:15:52 +08:00
曹鹏飞 83a94ead23 fix(feature/DM/nflg-bom): 修复通过值反查枚举的bug 2024-03-27 17:25:23 +08:00
曹鹏飞 e04e638f03 feat(feature/DM/nflg-bom): 原始bom明细表查询参数添加“是否仅显示自己的数据” 2024-03-27 14:44:22 +08:00
曹鹏飞 ba19d4f1be fix(feature/DM/nflg-bom): 修改pbom导出功能，分为按查询条件导出和按rowid导出 2024-03-27 09:46:33 +08:00
jing's 95443fc3f0 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-03-26 21:58:22 +08:00
jing's 10cc77a414 删除出现异常 2024-03-26 21:58:18 +08:00
曹鹏飞 46e4ad8590 revert(feature/DM/nflg-bom): 部分导出和全部导出参数不一致，先还原，明天继续做 2024-03-26 18:51:13 +08:00
曹鹏飞 39023e438e fix(feature/DM/nflg-bom): pbom工作表和正式工作表导出应只导出所选择的行 2024-03-26 16:26:35 +08:00
曹鹏飞 a824218822 feat(feature/DM/nflg-bom): pbom暂存操作返回修改后的列表数据 
因暂存操作是事务提交，当操作数据比较多时，可能事务还在提交中，但是前端查询列表请求已经过来了，这时会查询到脏数据
 2024-03-26 13:55:49 +08:00
曹鹏飞 816fdad6c4 fix(feature/DM/nflg-bom): 如果是自己创建的根节点且异常状态为“项目类别为空”时，异常状态改为正常 2024-03-26 13:45:21 +08:00
jing's 686b65b0ba 恢复保存 2024-03-26 11:45:10 +08:00
jing's 5c27e69ead 移动破解析调整 2024-03-26 11:40:00 +08:00
jing's e61a20e7f9 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-03-25 18:27:13 +08:00
jing's 7845437d5b 操作权限相关调整 2024-03-25 18:27:08 +08:00
大米 29c8a1695e Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-03-25 17:35:36 +08:00
大米 9991a150ee 1、升级检查 2024-03-25 17:35:32 +08:00
曹鹏飞 4db120c412 一些与功能无关的代码优化 2024-03-25 09:58:02 +08:00
曹鹏飞 86e49645e2 ebom删除添加状态校验，仅状态为待复核和已退回才能删除 2024-03-22 14:05:08 +08:00
曹鹏飞 7fe9e5e2be 修正枚举是否相等判断 2024-03-22 11:29:39 +08:00
曹鹏飞 c12050dfeb 移除判断，交给前端处理 2024-03-22 09:17:18 +08:00
jing's 2c2c4c2cf9 移动破调整 重构excel解析：1.物料匹配调整 2.导出excel 调整 3.下载模版替换 2024-03-21 23:27:26 +08:00
jing's 3637302695 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-03-21 13:15:55 +08:00
jing's a0a17c8d67 更新物料行同步主 2024-03-21 13:15:51 +08:00
曹鹏飞 1761db7965 ebom正式工作表精确搜索时，如果存在物料，但是此物料不存在下级时，提示“不存在此BOM物料” 2024-03-21 11:29:53 +08:00
曹鹏飞 90a3568945 原始BOM转Ebom接口返回数据类型改为List<ImportOriginalBomVO>，将转换失败的原因返回 2024-03-21 10:10:39 +08:00
曹鹏飞 70ae5fe31a Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-03-21 10:03:43 +08:00
曹鹏飞 9d4845492b 退回设计时如果没有可退回的数据，则返回错误信息提示用户 2024-03-21 09:44:35 +08:00
jing's 1aa43f0ef8 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-03-21 09:40:04 +08:00
jing's be1ef7ad69 ebom退回设计忽略工艺人员 2024-03-21 09:39:52 +08:00
曹鹏飞 dc84e52cdb 一点优化 2024-03-21 08:38:42 +08:00
曹鹏飞 fc8409134e 修复因parentResult和childResult未初始化导致的空指针异常 2024-03-21 08:37:44 +08:00
jing's ddd8f8aceb 恢复 2024-03-20 23:10:06 +08:00
jing's f06d087665 图号匹配规则调整 2024-03-20 20:34:35 +08:00
jing's 2c1d43a201 移动破导入 出现异常详细提示 2024-03-20 13:58:58 +08:00
jing's f179268e14 ebom 工艺创建bom不能退回 2024-03-20 11:45:10 +08:00
jing's b455c47b3e +注释 2024-03-20 09:39:21 +08:00
jing's 83aaed97f6 暂存/提交验证调整 2024-03-20 09:37:32 +08:00
jing's d055077b3f 调整报表 2024-03-19 21:39:43 +08:00
jing's adeb6bccff mbom版本赋值 2024-03-18 23:10:20 +08:00
jing's 8d0fc3ad1c 报表调整 2024-03-18 23:02:01 +08:00
曹鹏飞 d2720d1844 发货前装配包才需要加FHQ关键字 2024-03-18 16:54:52 +08:00
曹鹏飞 da42182ecc 提示信息优化 2024-03-18 15:27:29 +08:00
曹鹏飞 af3268756f 原始bom暂存、提交、转ebom时添加权限校验，只允许操作自己创建的数据 2024-03-18 15:24:10 +08:00
曹鹏飞 ccd879665a 优化删除语句 2024-03-18 15:22:08 +08:00
大米 3a8b33eb32 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-03-18 11:04:17 +08:00
大米 ecbbe43059 1、查询 2024-03-18 11:04:12 +08:00
曹鹏飞 7e60d7a606 添加null判断 2024-03-18 08:40:46 +08:00
大米 046a0b4854 1、BOM反查 2024-03-16 18:05:49 +08:00
大米 f50aeb496c 1、315问题修复 2024-03-15 18:53:56 +08:00
大米 72eb9aa439 1、315问题修复 2024-03-15 18:51:38 +08:00
大米 6a5062cede Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-03-15 18:28:33 +08:00
大米 2962454b46 1、315问题修复 2024-03-15 18:28:27 +08:00
jing's eba677e7a4 Mbom搜索查询调整 2024-03-15 18:18:58 +08:00
大米 c89e9f34cd Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-03-15 17:10:24 +08:00
大米 b61a4b8863 1、ebom-转pbom加转换时间 2024-03-15 17:10:18 +08:00
曹鹏飞 67bc739c1b Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-03-15 16:01:06 +08:00
jing's 0a4e5d4d39 +版本描述 2024-03-15 14:44:36 +08:00
曹鹏飞 a2fe921a5e 查询子节点时只未转换的 2024-03-15 14:34:59 +08:00
jing's 1aee8b9797 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-03-15 14:33:38 +08:00
jing's cc110419e7 查询类型判断改正 2024-03-15 14:33:30 +08:00
曹鹏飞 d769eb7de3 优化判断 2024-03-15 14:01:58 +08:00
曹鹏飞 eeb2e3fc3c 优化提示信息 2024-03-15 11:31:19 +08:00
曹鹏飞 5284a4b753 优化提示信息 2024-03-15 11:18:24 +08:00
曹鹏飞 534aab8468 添加提示 2024-03-15 09:55:12 +08:00