 曹鹏飞
|
e9ed71800c
|
fix(ebom): 编辑页面添加T类型物料的设置优化
|
2024-05-17 17:29:33 +08:00 |
|
曹鹏飞
|
33fd163cbd
|
fix(ebom): 一些优化
|
2024-05-17 17:17:29 +08:00 |
|
曹鹏飞
|
004309c5c3
|
fix(ebom): 一些优化
|
2024-05-17 17:16:07 +08:00 |
|
曹鹏飞
|
7af8873012
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-17 16:15:15 +08:00 |
|
曹鹏飞
|
870d612154
|
fix(ebom): 一些优化
|
2024-05-17 16:14:57 +08:00 |
|
曹鹏飞
|
769ccb89bf
|
fix(ebom): 从excel导入不调用compucteLevelNum方法
|
2024-05-17 15:38:13 +08:00 |
|
曹鹏飞
|
df50b80ae6
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-17 15:08:23 +08:00 |
|
曹鹏飞
|
61d689d7a3
|
fix(ebom): 从cad导入时，导入的物料单位设置为系统物料单位
|
2024-05-17 15:03:15 +08:00 |
|
曹鹏飞
|
182e9dce10
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-17 14:20:54 +08:00 |
|
曹鹏飞
|
694b2b918b
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-05-17 14:20:16 +08:00 |
|
曹鹏飞
|
3a5a787dc9
|
fix(ebom): 处理合并问题
|
2024-05-17 14:19:43 +08:00 |
|
曹鹏飞
|
7ddac0bae0
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
# Conflicts:
# nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java
|
2024-05-17 14:18:04 +08:00 |
大米
|
42761eee03
|
1.替换项合并
|
2024-05-17 14:14:02 +08:00 |
|
曹鹏飞
|
d01129f292
|
fix(ebom): 异常检查时，T类型只检查描述是否为空
|
2024-05-17 14:07:40 +08:00 |
|
曹鹏飞
|
48ac27cdea
|
fix(ebom): 优化创建根节点的设置
|
2024-05-17 14:06:28 +08:00 |
|
曹鹏飞
|
0e41732dc8
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-17 13:38:32 +08:00 |
|
曹鹏飞
|
314aceba8b
|
fix(ebom): 优化从excel导入
|
2024-05-17 13:38:06 +08:00 |
|
大米
|
4d07895aff
|
1.替换项合并
|
2024-05-17 12:28:25 +08:00 |
|
曹鹏飞
|
00d7b093b0
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-16 19:41:52 +08:00 |
|
大米
|
af37144ba0
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-05-16 17:36:29 +08:00 |
|
大米
|
11c27f963e
|
1.替换项合并
|
2024-05-16 17:36:24 +08:00 |
|
曹鹏飞
|
cb8c71bca6
|
fix(ebom): 优化从excel导入
|
2024-05-16 17:22:03 +08:00 |
|
曹鹏飞
|
71c8605df6
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into sit
|
2024-05-16 11:40:23 +08:00 |
|
曹鹏飞
|
1da8f1f7bb
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-16 11:37:00 +08:00 |
|
曹鹏飞
|
372754d0f9
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom
|
2024-05-16 11:36:18 +08:00 |
|
曹鹏飞
|
d43c9153c9
|
feat(dqbom): 从excel导入时如果编号为空，图号不为空，则编号使用主物料编号
|
2024-05-16 11:35:47 +08:00 |
|
大米
|
47da3a9d58
|
1.修复从CAD 获取
|
2024-05-16 10:58:59 +08:00 |
|
大米
|
4a1c6c00d6
|
1.修复从CAD 获取
|
2024-05-16 10:58:33 +08:00 |
|
曹鹏飞
|
d04b48d43f
|
feat(ebom): 过渡版31码生成虚拟包逻辑调整
|
2024-05-16 10:58:16 +08:00 |
|
大米
|
eafeca270c
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-05-16 10:15:53 +08:00 |
|
大米
|
ae56989682
|
1、一般零部件项目类别默认为L
2 替换物料项目类别默认为L
|
2024-05-16 10:15:47 +08:00 |
|
曹鹏飞
|
bc2a737d54
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-15 11:21:43 +08:00 |
luoliming
|
f22e96b99b
|
字段异常
|
2024-05-15 11:19:06 +08:00 |
|
曹鹏飞
|
785e907aa0
|
feat(pbom): pbom导入到SAP时，将所有子级发货包数据提层到顶级发货包中
|
2024-05-15 09:38:40 +08:00 |
|
曹鹏飞
|
c0a9a36d42
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-15 08:48:20 +08:00 |
|
曹鹏飞
|
6be300161d
|
feat(pbom): pbom导入到SAP时，将所有子级发货包数据提层到顶级发货包中
|
2024-05-14 19:16:30 +08:00 |
|
大米
|
d20cc3dc57
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-05-14 16:48:01 +08:00 |
|
大米
|
b7506360c9
|
1、T项检查
2、T项转Pbom逻辑调整
|
2024-05-14 16:47:54 +08:00 |
|
曹鹏飞
|
01436b7b9c
|
feat(ebom): 从excel导入时，添加对T项物料的支持
|
2024-05-13 10:47:34 +08:00 |
|
曹鹏飞
|
dd29a68c85
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-13 10:20:03 +08:00 |
|
曹鹏飞
|
5984358ff6
|
feat: 导入到SAP时，如果项目类型为Z，则修改为L
|
2024-05-13 10:19:01 +08:00 |
|
曹鹏飞
|
0a40731042
|
fix(ebom): 从excel导入时识别虚拟包
|
2024-05-11 16:30:54 +08:00 |
|
曹鹏飞
|
29215e70ef
|
fix(ebom): 修改source_row_id由long变为string的相关问题
|
2024-05-11 15:51:19 +08:00 |
|
曹鹏飞
|
afec61231a
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
# Conflicts:
# nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/VirtualPackageBase.java
|
2024-05-11 15:37:25 +08:00 |
|
曹鹏飞
|
92b57a06f0
|
fix(ebom): 修改source_row_id由long变为string的相关问题
|
2024-05-11 15:34:08 +08:00 |
jing's
|
a411e7f8b5
|
source_row_id 类型变更
|
2024-05-11 15:12:33 +08:00 |
|
大米
|
89ba5d49ce
|
1、合并一般零部件
|
2024-05-11 14:50:53 +08:00 |
|
曹鹏飞
|
9cfa61c5bd
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom
|
2024-05-10 17:30:39 +08:00 |
|
曹鹏飞
|
67c7f0b3d8
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom-transition
|
2024-05-10 17:30:21 +08:00 |
|
曹鹏飞
|
da8e40c8bd
|
fix(dqbom): 修复导出的数据重复的问题
|
2024-05-10 17:30:06 +08:00 |