 曹鹏飞
|
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 |
|
曹鹏飞
|
756bb53a39
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-10 16:29:34 +08:00 |
|
曹鹏飞
|
8dc7503f39
|
fix(ebom): 编辑物料列表接口添加是否隐藏虚拟包参数
|
2024-05-10 16:29:20 +08:00 |
|
曹鹏飞
|
fb77d05288
|
fix(ebom): 从excel导入时物料单位的设置
|
2024-05-10 15:59: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 |
|
曹鹏飞
|
a1d4e7078b
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-10 11:37:52 +08:00 |
|
曹鹏飞
|
a01f658296
|
feat(ebom): 导入sap的接口名由ZRFC_PP_003改为ZRFC_PP_005
|
2024-05-10 11:36:46 +08:00 |
|
曹鹏飞
|
bb6ef479e9
|
feat(ebom): 添加ebom导入模板下载接口
|
2024-05-10 11:28:26 +08:00 |
|
曹鹏飞
|
d92ecb727f
|
feat(ebom): 修复从excel导入数据的bug
|
2024-05-10 11:21:22 +08:00 |
|
曹鹏飞
|
95cec05802
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-09 09:35:36 +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 |
|
大米
|
bc4a83b0f4
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into feature/DM/nflg-bom-transition
|
2024-05-09 08:48:21 +08:00 |
|
大米
|
467163889f
|
1、修复生成虚拟包，1010工厂制作包下无子级的问题
|
2024-05-09 08:48:17 +08:00 |
|
曹鹏飞
|
3ed29cd977
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-09 08:36:07 +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 |
|
曹鹏飞
|
1498f3974f
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-09 08:16:39 +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 |
|
曹鹏飞
|
d5eab98ac5
|
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-08 17:55:04 +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 |
|
曹鹏飞
|
862a88dbf6
|
feat: ebom从excel导入数据
|
2024-05-08 17:30:38 +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 |
|
曹鹏飞
|
ac19a53988
|
feat: ebom从excel导入数据
|
2024-05-08 16:02:07 +08:00 |
|
曹鹏飞
|
d88a87c3e3
|
Revert "feat: ebom从excel导入数据"
This reverts commit 70dd9d0211.
|
2024-05-08 15:57:19 +08:00 |
|
曹鹏飞
|
e428c950ca
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-08 15:35:56 +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 |
|
大米
|
a929268572
|
1、修复初始化异常错误
|
2024-05-08 14:54:26 +08:00 |
|
曹鹏飞
|
a60cae3d6a
|
fix: 单位不一致，且exceptionTag为空或不包含16时，设置异常状态为16
|
2024-05-08 09:46:12 +08:00 |
|
曹鹏飞
|
3328751de2
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom-transition
|
2024-05-07 16:36:58 +08:00 |
|
曹鹏飞
|
b2ce1def5a
|
fix: 修复一个sql错误
|
2024-05-07 16:36:30 +08:00 |
|
曹鹏飞
|
322728580c
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom-transition
|
2024-05-07 16:24:06 +08:00 |
|
曹鹏飞
|
8a5c47a1f4
|
fix: 修复一个sql错误
|
2024-05-07 16:22:32 +08:00 |
|
大米
|
8bb92c0c7e
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into feature/DM/nflg-bom-transition
|
2024-05-07 15:38:27 +08:00 |
|
大米
|
1f2a52b20f
|
1、合并标准版
|
2024-05-07 15:37:38 +08:00 |
|
曹鹏飞
|
6592e61da9
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom-transition
|
2024-05-07 14:40:52 +08:00 |
|
曹鹏飞
|
e91d30d86f
|
feat: 添加查看ebom对应的原始bom数据
|
2024-05-07 14:13:42 +08:00 |
|
大米
|
198dd1e76a
|
1、合并标准版
|
2024-05-07 13:38:15 +08:00 |
|
大米
|
f7495c978f
|
Merge branch '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-07 13:35:47 +08:00 |
|
曹鹏飞
|
a70b91267c
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom
|
2024-05-07 11:14:26 +08:00 |
|
曹鹏飞
|
8f1fb6c330
|
feat: 添加导出错误信息到excel的接口，数据由前端传过来
|
2024-05-07 11:10:55 +08:00 |
|
曹鹏飞
|
ca66acc0a3
|
feat: ebom编辑页面也需要跟电气专用bom的编辑页面一样有父级异常导航
|
2024-05-07 11:08:50 +08:00 |
|
大米
|
362f6c7ce0
|
1、生成虚拟包批量查询主数据-缩短生成虚拟包时间
|
2024-05-06 13:44:02 +08:00 |
|
大米
|
16a71b3af3
|
1、过渡版需求
|
2024-05-06 11:43:13 +08:00 |
|
大米
|
601c6205d5
|
1、过渡版需求
|
2024-05-06 11:38:37 +08:00 |
|
大米
|
807e177d39
|
1、31码同时生成1020虚拟包
|
2024-05-06 11:05:15 +08:00 |
|
大米
|
f0add5e114
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-05-06 09:39:35 +08:00 |
|
大米
|
d24c954cb4
|
1、过渡版需求－另一个分支
|
2024-05-06 09:39:28 +08:00 |
luoliming
|
9eb3b36296
|
单位异常
|
2024-05-04 15:24:15 +08:00 |
|
大米
|
5d1e9418f4
|
1、单位异常
|
2024-05-02 16:54:08 +08:00 |
|
大米
|
ec0e175dfb
|
1、从CAD获取and 转换
|
2024-05-02 16:33:54 +08:00 |
|
大米
|
8c383c4356
|
1、从CAD获取and 转换
|
2024-05-02 16:31:15 +08:00 |
|
大米
|
f050f869c4
|
1、相同物料异常检查（物料编码+项目类别）
|
2024-05-02 16:18:42 +08:00 |
|
大米
|
77197c169a
|
1、ebom-从cad获取并转换
|
2024-05-02 16:00:10 +08:00 |
|
曹鹏飞
|
1a992bde94
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom
|
2024-04-30 17:54:16 +08:00 |
|
曹鹏飞
|
5a9948635e
|
optimize: 优化导入SAP功能错误信息返回
|
2024-04-30 17:53:55 +08:00 |
|
曹鹏飞
|
39f16244ca
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom
|
2024-04-29 11:35:42 +08:00 |
|
曹鹏飞
|
be9702a415
|
feat: 导入sap添加I_EMPNO字段，表示创建人
|
2024-04-29 11:32:01 +08:00 |
|
曹鹏飞
|
c70ead664b
|
feat: 导入sap添加I_EMPNO字段，表示创建人
|
2024-04-29 11:15:09 +08:00 |
|
曹鹏飞
|
8a68c880b8
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom
|
2024-04-29 10:31:39 +08:00 |
|
曹鹏飞
|
8010099b94
|
fix: 修复导出excel数据中名字字段数据为空的问题
|
2024-04-29 10:20:24 +08:00 |
|
曹鹏飞
|
a16939fe8d
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom
|
2024-04-29 10:08:01 +08:00 |
|
曹鹏飞
|
119e0d5faa
|
feat: pbom增加导出到sap接口
|
2024-04-29 10:06:22 +08:00 |
|
曹鹏飞
|
10e545f6d1
|
fix: 修复导出excel数据中名字字段数据为空的问题
|
2024-04-29 09:52:55 +08:00 |
|
曹鹏飞
|
fa51e7dacd
|
feat: ebom工作明细列表和正式表列表模糊搜索添加对“只显示自己”数据的支持
|
2024-04-29 09:35:48 +08:00 |
|
曹鹏飞
|
87521e0dbc
|
optimize: 保存数据时，如果是T项，且数量为空或者为0，则将数量改为1
|
2024-04-29 08:59:12 +08:00 |
|
曹鹏飞
|
dcc5f031b2
|
fix: 修复删除时根节点无下级导致sql异常的问题
|
2024-04-29 08:38:17 +08:00 |
|
曹鹏飞
|
8634cffaf7
|
fix: pbom导出时将T类型的编号和图号置为空
|
2024-04-29 08:19:54 +08:00 |
|
曹鹏飞
|
7deeff6c0f
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom
|
2024-04-28 18:00:07 +08:00 |
|
曹鹏飞
|
58c4a166d4
|
fix: 修改导入sap
|
2024-04-28 17:59:15 +08:00 |
|
曹鹏飞
|
7545e35fbf
|
fix: 修复电气bom导入sap成功后，bom状态会变成待转换的问题；导入到sap的物料单位改为使用主物料单位
|
2024-04-28 10:54:37 +08:00 |
|
曹鹏飞
|
a6ee24c8c5
|
fix: 更新物料行逻辑调整
|
2024-04-28 09:32:08 +08:00 |
|
曹鹏飞
|
53974c8cf6
|
optimize: 导入sap时，如果是T项，则需要设置POTX1
|
2024-04-28 09:01:18 +08:00 |
|
曹鹏飞
|
8267a8e137
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom
|
2024-04-27 18:49:27 +08:00 |
|
曹鹏飞
|
9029365491
|
optimize: 优化电气bom导入sap返回数据
|
2024-04-27 18:49:00 +08:00 |
|
曹鹏飞
|
7e9b3d3d83
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom
|
2024-04-27 18:30:20 +08:00 |
|
曹鹏飞
|
a9c9f1d16f
|
optimize: 优化电气bom导入sap返回数据
|
2024-04-27 18:29:36 +08:00 |
|
曹鹏飞
|
0845ceb2ea
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into dev
|
2024-04-27 17:55:04 +08:00 |
|
曹鹏飞
|
48b97879a3
|
optimize: 电气bom优化
|
2024-04-27 17:54:19 +08:00 |