 曹鹏飞
|
6dae84e4a9
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into dev
|
2024-04-24 15:33:23 +08:00 |
|
曹鹏飞
|
97401dfbdb
|
fix: 设置bomRowId
|
2024-04-24 15:32:56 +08:00 |
|
曹鹏飞
|
2998137e35
|
fix: 移除废弃的方法
|
2024-04-24 15:19:23 +08:00 |
|
曹鹏飞
|
58f062e8bf
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into dev
|
2024-04-24 15:17:33 +08:00 |
|
曹鹏飞
|
44ff90fb26
|
fix: 修复一些问题
|
2024-04-24 15:16:55 +08:00 |
|
曹鹏飞
|
528cf20ab8
|
feat: [excel未处理问题9]生成虚拟包调整
|
2024-04-24 15:11:57 +08:00 |
|
曹鹏飞
|
5694f87128
|
feat: 电气专用bom功能
|
2024-04-24 09:50:03 +08:00 |
|
曹鹏飞
|
49708ff593
|
feat: 电气专用bom功能
|
2024-04-24 09:14:25 +08:00 |
|
曹鹏飞
|
affa1426b8
|
feat: 电气专用bom功能
|
2024-04-23 18:21:08 +08:00 |
|
曹鹏飞
|
cbb41e2519
|
feat: 电气专用bom功能
|
2024-04-23 10:59:15 +08:00 |
|
曹鹏飞
|
a1666c26b4
|
fix: 填充信息
|
2024-04-23 10:58:44 +08:00 |
|
曹鹏飞
|
b1c757938b
|
feat: 电气专用bom功能
|
2024-04-22 17:17:57 +08:00 |
|
曹鹏飞
|
f8ede45454
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-dq
|
2024-04-22 15:11:11 +08:00 |
|
曹鹏飞
|
2f88516812
|
feat: 电气专用bom功能
|
2024-04-22 15:07:46 +08:00 |
|
曹鹏飞
|
f12a19cba4
|
fix: 优化异常检查时的根节点判断逻辑
|
2024-04-22 15:07:06 +08:00 |
luoliming
|
28c9f1a75b
|
PBOM工作列表
|
2024-04-21 11:02:53 +08:00 |
|
曹鹏飞
|
140d1b80e9
|
feat: 电气专用bom功能
|
2024-04-21 10:45:33 +08:00 |
|
曹鹏飞
|
d4075470f6
|
fix: 顶级数据不检查项目类别是否为空
|
2024-04-21 10:42:22 +08:00 |
|
曹鹏飞
|
007cb34971
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-dq
|
2024-04-21 09:19:15 +08:00 |
|
luoliming
|
cb0db31587
|
F项下挂F项不检查异常
|
2024-04-20 17:33:41 +08:00 |
|
曹鹏飞
|
d1af5d9fe9
|
Merge branch 'refs/heads/dev' into feature/DM/nflg-bom-dq
|
2024-04-19 08:11:58 +08:00 |
|
曹鹏飞
|
77b7b523eb
|
Merge branch 'refs/heads/feature/excel-132' into dev
|
2024-04-19 08:11:12 +08:00 |
|
曹鹏飞
|
e0849b3470
|
Merge branch 'refs/heads/dev' into feature/DM/nflg-bom-dq
# Conflicts:
# nflg_project_dev/nflg-bom-new/src/test/java/com/nflg/product/bomnew/service/test/OtherTest.java
|
2024-04-19 08:08:58 +08:00 |
|
曹鹏飞
|
acbd76a8bf
|
feat: 电气专用bom功能
|
2024-04-18 21:22:34 +08:00 |
|
曹鹏飞
|
15845a21f1
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into dev
|
2024-04-18 19:33:07 +08:00 |
大米
|
a01778112d
|
1、ebom-转pBOM
|
2024-04-18 18:53:59 +08:00 |
|
大米
|
626fe44ce6
|
1、pbom-升级及未发布列表不显示问题
|
2024-04-18 18:13:39 +08:00 |
|
大米
|
8d26ce919a
|
1、pbom-升级及未发布列表不显示问题
|
2024-04-18 17:28:13 +08:00 |
|
曹鹏飞
|
50977bded2
|
fix: 计算是否是用户根节点时，排除虚拟包，因为虚拟包的创建人基本上不是bom的创建人
|
2024-04-18 16:47:52 +08:00 |
|
曹鹏飞
|
b0c88ccb24
|
fix: [excel-105]添加判断
|
2024-04-18 14:33:07 +08:00 |
|
曹鹏飞
|
998ac9bc50
|
feat: [excel-129]支持分类代码为10开头的物料添加工艺包到上级
|
2024-04-18 14:19:14 +08:00 |
|
曹鹏飞
|
3789b30bf7
|
feat: [excel-129]支持分类代码为10开头的物料添加工艺包到上级
|
2024-04-18 13:48:20 +08:00 |
|
曹鹏飞
|
2121978af1
|
Merge branch 'refs/heads/dev' into feature/excel-132
|
2024-04-18 11:11:43 +08:00 |
|
曹鹏飞
|
c88ed37c41
|
feat: [excel-140]原始bom转ebom时，如果物料名称包含虚拟包特有的后缀，则将改物料设置为虚拟包，且更新根节点生成虚拟包的状态
|
2024-04-18 10:51:08 +08:00 |
|
曹鹏飞
|
39ed6810eb
|
feat: ebom工作表精确搜索排序
|
2024-04-18 09:15:43 +08:00 |
|
曹鹏飞
|
5956c61075
|
Merge branch 'refs/heads/dev' into feature/excel-132
# 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/resources/mapper/master/BomNewEbomParentMapper.xml
|
2024-04-18 08:26:31 +08:00 |
|
曹鹏飞
|
2154ac2599
|
feat: 电气专用bom功能
|
2024-04-18 08:25:08 +08:00 |
|
曹鹏飞
|
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 |