 曹鹏飞
|
3400d2d35a
|
fix(pbom): 修复pbom正式表子级数据无法展示的问题
|
2024-05-20 17:05:43 +08:00 |
|
曹鹏飞
|
53760502e8
|
fix(ebom):
1、31码下的所有物料都生成虚拟包后才能转pbom
2、31码只能生成1010的pbom
|
2024-05-20 10:45:48 +08:00 |
|
曹鹏飞
|
1055d24aba
|
fix(ebom): 优化编辑功能
|
2024-05-20 10:04:08 +08:00 |
|
曹鹏飞
|
8bf4612a31
|
fix: 修复2个bug
|
2024-05-18 17:15:03 +08:00 |
|
曹鹏飞
|
4d39400144
|
fix(ebom): 数量需要用户确认的判断条件添加：来源为原始bom
|
2024-05-17 18:11:47 +08:00 |
|
曹鹏飞
|
16ff524b45
|
fix(ebom): T类型物料的描述为空时，异常状态改为4
|
2024-05-17 18:02:15 +08:00 |
|
曹鹏飞
|
e9ed71800c
|
fix(ebom): 编辑页面添加T类型物料的设置优化
|
2024-05-17 17:29:33 +08:00 |
|
曹鹏飞
|
33fd163cbd
|
fix(ebom): 一些优化
|
2024-05-17 17:17:29 +08:00 |
|
曹鹏飞
|
870d612154
|
fix(ebom): 一些优化
|
2024-05-17 16:14:57 +08:00 |
|
曹鹏飞
|
61d689d7a3
|
fix(ebom): 从cad导入时，导入的物料单位设置为系统物料单位
|
2024-05-17 15:03:15 +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 |
大米
|
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 |
|
大米
|
4d07895aff
|
1.替换项合并
|
2024-05-17 12:28:25 +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 |
|
曹鹏飞
|
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 |
|
大米
|
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 |
luoliming
|
f22e96b99b
|
字段异常
|
2024-05-15 11:19:06 +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 |
|
曹鹏飞
|
5984358ff6
|
feat: 导入到SAP时，如果项目类型为Z，则修改为L
|
2024-05-13 10:19:01 +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 |
|
曹鹏飞
|
da8e40c8bd
|
fix(dqbom): 修复导出的数据重复的问题
|
2024-05-10 17:30:06 +08:00 |
|
曹鹏飞
|
8dc7503f39
|
fix(ebom): 编辑物料列表接口添加是否隐藏虚拟包参数
|
2024-05-10 16:29:20 +08:00 |
|
jing's
|
952da323cd
|
Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom
|
2024-05-10 11:50:19 +08:00 |
|
jing's
|
26108a8183
|
检查物料编码是否在主数据中存在 暂存不需检查，提交时检查
|
2024-05-10 11:50:05 +08:00 |
|
曹鹏飞
|
a01f658296
|
feat(ebom): 导入sap的接口名由ZRFC_PP_003改为ZRFC_PP_005
|
2024-05-10 11:36:46 +08:00 |
|
曹鹏飞
|
74f01453e4
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom
|
2024-05-09 09:35:18 +08:00 |
|
曹鹏飞
|
4b706e9ec2
|
fix(ebom): 虚拟包的child的编辑状态应该跟父级节点一致
|
2024-05-09 09:35:01 +08:00 |
|
曹鹏飞
|
213f9a3277
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom
# Conflicts:
# nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java
|
2024-05-09 08:35:50 +08:00 |
|
曹鹏飞
|
adf65265ba
|
feat: 添加sap状态字段
|
2024-05-09 08:34:04 +08:00 |
|
曹鹏飞
|
a03a1bb28d
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom
|
2024-05-09 08:16:22 +08:00 |
|
曹鹏飞
|
4251feac9b
|
feat(导入到sap): 修复设置导入sap状态的bug
|
2024-05-09 08:15:17 +08:00 |
|
曹鹏飞
|
a7c1b74272
|
feat(电气bom): 导入数据时，如果类型为空，则设置为L
|
2024-05-09 08:11:05 +08:00 |
|
曹鹏飞
|
b528abf66a
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-05-08 17:52:13 +08:00 |
|
曹鹏飞
|
1e7cd5bdcc
|
feat: 修复生成虚拟包后异常检查时提示单位不一致的问题
|
2024-05-08 16:26:04 +08:00 |
|
大米
|
e8f4ce7653
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-05-08 16:25:13 +08:00 |
|
大米
|
3ded3ba819
|
1、生成虚拟包加原始单位
|
2024-05-08 16:25:09 +08:00 |
|
曹鹏飞
|
b875a6af97
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom
|
2024-05-08 15:35:34 +08:00 |
|
曹鹏飞
|
70dd9d0211
|
feat: ebom从excel导入数据
|
2024-05-08 15:35:15 +08:00 |
|
曹鹏飞
|
158dc0db42
|
fix: ebom异常检查逻辑调整
|
2024-05-08 15:34:20 +08:00 |