 曹鹏飞
|
a762b57fe2
|
fix: 修复一个bug
|
2024-04-17 21:47:20 +08:00 |
|
曹鹏飞
|
4468d8b9ea
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into dev
|
2024-04-17 21:08:47 +08:00 |
|
曹鹏飞
|
c220cbe8bd
|
feat: 电气专用bom添加功能
|
2024-04-17 21:08:11 +08:00 |
luoliming
|
f796e098e5
|
异常检测
|
2024-04-17 20:57:39 +08:00 |
|
曹鹏飞
|
9f3fa8f4e9
|
refactor: 去除异常捕获
|
2024-04-17 20:21:11 +08:00 |
|
曹鹏飞
|
90e37e00fb
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into dev
# Conflicts:
# nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java
|
2024-04-17 19:46:38 +08:00 |
|
曹鹏飞
|
eae0999126
|
feat: ebom工作表不按合并树展示
|
2024-04-17 19:43:20 +08:00 |
大米
|
34b9282301
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-04-17 18:21:06 +08:00 |
|
大米
|
92c7d63a04
|
1、异常检查问题处理
|
2024-04-17 18:21:02 +08:00 |
jing's
|
fe7507e819
|
EBOM在草稿状态下多次编辑的时候会出现版本增加的情况，这是不应该的。
|
2024-04-17 16:03:44 +08:00 |
|
曹鹏飞
|
e5fd0d350b
|
fix: 修复空指针异常
|
2024-04-17 08:22:37 +08:00 |
|
曹鹏飞
|
3142c807c6
|
feat: 电气bom确认导入
|
2024-04-16 22:09:47 +08:00 |
|
曹鹏飞
|
c91b0ab4e1
|
feat: 电气bom保存和删除bom
|
2024-04-16 22:04:07 +08:00 |
|
曹鹏飞
|
aa073ee79a
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into dev
|
2024-04-16 17:56:36 +08:00 |
|
大米
|
e9875cac3c
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-04-16 17:44:45 +08:00 |
|
大米
|
5a1484dde2
|
1、异常检查
|
2024-04-16 17:44:37 +08:00 |
|
曹鹏飞
|
0301b8e637
|
fix: 生成虚拟包时，将虚拟包的状态和处理状态设置为与父级节点一致
|
2024-04-16 16:43:44 +08:00 |
|
曹鹏飞
|
bebf75f301
|
fix: 解决没有虚拟包时报错的问题，因pbom可以添加原材料，所以有的bom是没有虚拟包的
|
2024-04-16 16:27:30 +08:00 |
|
曹鹏飞
|
50fd8f6e9a
|
fix: 修复一个bug
|
2024-04-16 15:30:24 +08:00 |
|
曹鹏飞
|
e7f7b4c15c
|
fix: 修复一个bug
|
2024-04-16 15:22:35 +08:00 |
|
曹鹏飞
|
abd6a0742d
|
fix: 生成虚拟包时判断是否有异常排除项目类型为空的异常
|
2024-04-16 14:07:33 +08:00 |
|
曹鹏飞
|
698e40c1c4
|
fix: pbom正式表分工厂时，如果设置为1010工厂，则需要设置父级的工厂为1010
|
2024-04-16 10:27:32 +08:00 |
|
曹鹏飞
|
b4880ab912
|
fix: pbom正式表分工厂页面数据按ordernnum排序
|
2024-04-15 17:19:59 +08:00 |
|
曹鹏飞
|
eb3d2da8bf
|
fix: 待复核根节点支持复核
|
2024-04-15 13:58:14 +08:00 |
|
曹鹏飞
|
95d206c080
|
fix: 修复sql异常
|
2024-04-15 13:57:43 +08:00 |
|
大米
|
016b1f8c15
|
1、ebom 设计人员查询
|
2024-04-15 12:25:37 +08:00 |
|
大米
|
a524472638
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-04-15 11:05:44 +08:00 |
|
大米
|
8f9f62ccc6
|
1、ebom 修复
|
2024-04-15 11:05:37 +08:00 |
|
曹鹏飞
|
3c8d341bdb
|
fix: 原始bom转换ebom后重新设置是否有bom
|
2024-04-15 10:03:53 +08:00 |
|
曹鹏飞
|
3a82521c3a
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into dev
|
2024-04-14 16:16:40 +08:00 |
|
luoliming
|
a80fd43689
|
EBOM 正式表查询
|
2024-04-14 16:01:24 +08:00 |
|
曹鹏飞
|
43580fe0f9
|
feat: 添加31码不能生成仙桃(1020)的pbom验证
|
2024-04-14 12:25:13 +08:00 |
|
曹鹏飞
|
e4c6973305
|
refactor: 处理合并冲突
|
2024-04-14 12:24:27 +08:00 |
|
曹鹏飞
|
a655f0e745
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into dev
# Conflicts:
# nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java
# nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewOriginalParentMapper.java
# nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java
# nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
# nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalParentMapper.xml
|
2024-04-13 20:20:05 +08:00 |
|
大米
|
7639ec8dc1
|
1、BUG修复
|
2024-04-13 16:38:41 +08:00 |
|
大米
|
840de12bfe
|
1、BUG修复
|
2024-04-13 16:01:35 +08:00 |
|
大米
|
a5e5dd1827
|
1、BUG修复
|
2024-04-13 15:34:52 +08:00 |
|
曹鹏飞
|
53a39c3a25
|
fix: 修复“仙桃”的位置
|
2024-04-13 12:01:23 +08:00 |
|
大米
|
dc097a96cb
|
1、BUG-89
|
2024-04-13 09:31:06 +08:00 |
|
大米
|
01d8429df9
|
1、BUG-88
|
2024-04-13 09:05:04 +08:00 |
|
大米
|
a0947bb48c
|
1、Ebom 正式工作表只查最新
|
2024-04-12 18:45:15 +08:00 |
|
大米
|
9a366156e5
|
1、搜索最子级，无关的记录也出来了
|
2024-04-12 16:17:14 +08:00 |
|
曹鹏飞
|
349862a0de
|
feat: 添加物料单位不一致的异常判断
|
2024-04-12 15:53:16 +08:00 |
|
曹鹏飞
|
376bf37de1
|
fix: 修复原始bom精确搜索问题
|
2024-04-12 14:41:37 +08:00 |
|
曹鹏飞
|
efd58784e7
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into dev
|
2024-04-12 08:21:49 +08:00 |
|
曹鹏飞
|
2930ab3ba8
|
feat: 添加电气bom保存数据和异常检查接口
|
2024-04-12 08:16:34 +08:00 |
|
大米
|
2d3e271709
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-04-11 17:13:22 +08:00 |
|
大米
|
09f0d666de
|
1、生成虚拟件调整
|
2024-04-11 17:13:17 +08:00 |
|
曹鹏飞
|
1cb2952dd5
|
Merge branch 'refs/heads/dev' into feature/DM/nflg-bom-dq
|
2024-04-11 13:47:59 +08:00 |
|
曹鹏飞
|
ee8ee6b486
|
fix: 一些细节优化
1.删除接口和保存数据接口重新计算是否有bom；
2.getChild接口currentVersion和bomRowId逻辑调整
|
2024-04-11 13:44:39 +08:00 |