 曹鹏飞
|
f75aae66bd
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into sit
|
2024-04-28 09:32:42 +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 |
|
曹鹏飞
|
5e9fa2aa7e
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into sit
|
2024-04-27 18:53:03 +08:00 |
|
曹鹏飞
|
9029365491
|
optimize: 优化电气bom导入sap返回数据
|
2024-04-27 18:49:00 +08:00 |
|
曹鹏飞
|
ff878281ff
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into sit
|
2024-04-27 18:34:10 +08:00 |
|
曹鹏飞
|
a9c9f1d16f
|
optimize: 优化电气bom导入sap返回数据
|
2024-04-27 18:29:36 +08:00 |
|
曹鹏飞
|
ed975b6d2c
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into sit
|
2024-04-27 18:02:36 +08:00 |
|
曹鹏飞
|
48b97879a3
|
optimize: 电气bom优化
|
2024-04-27 17:54:19 +08:00 |
|
曹鹏飞
|
2f138ae0c0
|
optimize: 电气bom功能
|
2024-04-26 16:02:27 +08:00 |
|
曹鹏飞
|
b6273ac9ae
|
optimize: 优化导入SAP返回的错误信息
|
2024-04-26 16:01:28 +08:00 |
|
曹鹏飞
|
850c44a18b
|
fix: 电气bom调整
|
2024-04-26 13:39:15 +08:00 |
|
曹鹏飞
|
6e2fe973e0
|
fix: 电气bom调整
|
2024-04-26 10:57:11 +08:00 |
|
曹鹏飞
|
150649ed65
|
fix: 调整导入sap的参数
|
2024-04-26 10:30:03 +08:00 |
|
曹鹏飞
|
9ea60a175b
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into sit
|
2024-04-25 19:38:05 +08:00 |
|
曹鹏飞
|
251d5b6bbd
|
fix: 电气bom优化
|
2024-04-25 19:37:36 +08:00 |
|
曹鹏飞
|
beedcbeb27
|
fix: 电气bom优化
|
2024-04-25 16:55:54 +08:00 |
|
曹鹏飞
|
25ea8efdf4
|
feat: ebom转pbom时，导入数据到sap，另增加单独导入sap的接口
|
2024-04-25 16:47:14 +08:00 |
|
曹鹏飞
|
515a72c325
|
fix: 设计人员只能查看自己的待复核和已退回数据
|
2024-04-25 14:53:55 +08:00 |
|
曹鹏飞
|
36e0e5c293
|
feat: 如果导入的单位跟物料主数据单位不一致，则提示数据不一致异常
|
2024-04-25 14:26:01 +08:00 |
|
曹鹏飞
|
b34beca4f2
|
feat: 相同编号的物料，如果项目类型不同，则判断为正常，否则提示数据重复
|
2024-04-25 13:33:18 +08:00 |
|
曹鹏飞
|
67160f8f1f
|
feat: 删除ebom时，不再需要重置原始bom的对应数据状态
|
2024-04-25 11:46:48 +08:00 |
|
曹鹏飞
|
9df131228d
|
fix: 电气专用bom添加T物料的描述是否为空异常检查
|
2024-04-25 10:11:23 +08:00 |
|
曹鹏飞
|
fc738cd40f
|
fix: 电气专用bom
|
2024-04-24 18:09:11 +08:00 |
|
曹鹏飞
|
78e10a798f
|
fix: 设置rowid
|
2024-04-24 15:54:05 +08:00 |
|
曹鹏飞
|
97401dfbdb
|
fix: 设置bomRowId
|
2024-04-24 15:32:56 +08:00 |
|
曹鹏飞
|
44ff90fb26
|
fix: 修复一些问题
|
2024-04-24 15:16:55 +08:00 |
|
曹鹏飞
|
654fb01f1e
|
Merge branch 'refs/heads/dev' into sit
|
2024-04-24 08:08:35 +08:00 |
|
曹鹏飞
|
affa1426b8
|
feat: 电气专用bom功能
|
2024-04-23 18:21:08 +08:00 |
|
曹鹏飞
|
422c9d194b
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into sit
|
2024-04-23 11:00:33 +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 |