 曹鹏飞
|
a83bf6942d
|
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/constant/VirtualPackageTypeEnum.java
|
2024-05-29 08:01:38 +08:00 |
大米
|
29d9bcb6fc
|
1、转PBOM不显示问题
|
2024-05-28 23:22:18 +08:00 |
|
大米
|
e90c7c2818
|
1、发货文案匹配问题
|
2024-05-28 20:45:53 +08:00 |
|
曹鹏飞
|
788397fdc0
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom-transition
|
2024-05-28 17:59:16 +08:00 |
|
曹鹏飞
|
07c0575f0a
|
feat(ebom): 修复一个逻辑错误
|
2024-05-28 17:59:10 +08:00 |
|
曹鹏飞
|
14ae4b4129
|
feat(ebom): 31码生成虚拟包添加对油漆包的支持
|
2024-05-28 16:35:58 +08:00 |
|
曹鹏飞
|
ec18157276
|
feat: 如果物料单位为ST，则改为PC，因为导入SAP时不支持ST
|
2024-05-28 14:59:15 +08:00 |
|
曹鹏飞
|
0f25a80253
|
optimize(ebom): 优化查询物料信息接口
|
2024-05-28 13:38:10 +08:00 |
|
曹鹏飞
|
b71ca6e6a7
|
optimize(dqbom): 优化查询物料信息接口
|
2024-05-28 13:33:46 +08:00 |
|
大米
|
ec0ab3f202
|
1、31F项问题修复
|
2024-05-28 12:13:20 +08:00 |
|
大米
|
a990f4804e
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-05-28 12:09:30 +08:00 |
|
大米
|
89897ad82a
|
1、31F项问题修复
|
2024-05-28 12:09:25 +08:00 |
|
曹鹏飞
|
d4b75545cd
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-28 11:13:27 +08:00 |
|
曹鹏飞
|
cf50f8752e
|
feat(pbom): 导入到sap时，如果是直发包，且没有下级，则不要提交到sap去
|
2024-05-28 11:11:42 +08:00 |
|
曹鹏飞
|
4aeb7db929
|
feat(ebom): 导入到sap时，如果是直发包，且没有下级，则不要提交到sap去
|
2024-05-28 11:11:21 +08:00 |
|
曹鹏飞
|
64b4adcb9f
|
feat(ebom): 删除bom逻辑重写
|
2024-05-28 10:37:39 +08:00 |
|
曹鹏飞
|
481491c950
|
feat(ebom): 31编码生成虚拟包时，直发包也生成parent
|
2024-05-28 09:44:53 +08:00 |
|
曹鹏飞
|
c6259258fc
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-28 09:38:19 +08:00 |
|
曹鹏飞
|
7717cecc5a
|
optimize(ebom): 优化查询物料信息接口
|
2024-05-28 09:38:02 +08:00 |
|
曹鹏飞
|
d08f0accfd
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom
|
2024-05-28 09:30:41 +08:00 |
|
曹鹏飞
|
fd3524de70
|
optimize(dqbom): 优化查询物料信息接口
|
2024-05-28 09:27:16 +08:00 |
|
曹鹏飞
|
490ca88792
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-27 18:46:12 +08:00 |
|
曹鹏飞
|
6c875ac078
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-05-27 18:45:36 +08:00 |
|
大米
|
cf5a77f583
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-05-27 18:43:41 +08:00 |
|
大米
|
69bf939bd9
|
1、31F项问题修复
|
2024-05-27 18:43:36 +08:00 |
|
曹鹏飞
|
28af314810
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom
|
2024-05-27 18:13:46 +08:00 |
|
曹鹏飞
|
08ffa20dc3
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom-transition
|
2024-05-27 18:09:01 +08:00 |
|
曹鹏飞
|
13723d3442
|
optimize(ebom): 优化查询物料信息接口
|
2024-05-27 18:08:30 +08:00 |
|
曹鹏飞
|
1be98febb9
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-27 17:12:55 +08:00 |
|
曹鹏飞
|
e3cb052c89
|
optimize(ebom): 优化查询物料信息接口
|
2024-05-27 17:12:39 +08:00 |
|
曹鹏飞
|
94a00cbd2d
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom
|
2024-05-27 17:10:33 +08:00 |
|
曹鹏飞
|
a1dfac009d
|
optimize(dqbom): 优化查询物料信息接口
|
2024-05-27 17:10:01 +08:00 |
|
曹鹏飞
|
16e462492c
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom-transition
|
2024-05-27 17:00:18 +08:00 |
|
曹鹏飞
|
4b80bda416
|
optimize(dqbom): 优化查询物料信息接口
|
2024-05-27 16:59:53 +08:00 |
|
曹鹏飞
|
540d82b620
|
feat(移动破): 不需要了
|
2024-05-27 16:04:34 +08:00 |
|
曹鹏飞
|
8632cc3dbe
|
Merge branch 'refs/heads/feature/mobilebroken/update-material' into feature/DM/nflg-bom-transition
|
2024-05-27 15:38:19 +08:00 |
|
曹鹏飞
|
c5a99e48dc
|
feat(移动破): 从主物料表同步信息
|
2024-05-27 15:37:50 +08:00 |
|
曹鹏飞
|
043143306f
|
feat(ebom): sap排序字符串优化
|
2024-05-27 15:32:39 +08:00 |
|
曹鹏飞
|
b5bd4c40db
|
Merge branch 'refs/heads/feature/mobilebroken/update-material' into feature/DM/nflg-bom-transition
# Conflicts:
# nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalEbomApi.java
|
2024-05-27 15:07:54 +08:00 |
|
曹鹏飞
|
6143575a5e
|
feat(移动破): 从主物料表同步信息
|
2024-05-27 15:02:56 +08:00 |
|
曹鹏飞
|
cd137991e8
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/mobilebroken/update-material
|
2024-05-27 14:48:12 +08:00 |
|
曹鹏飞
|
e13b5662a5
|
feat(移动破ebom): 物料名称如果有且仅有一个“无”字时才运允许导入
|
2024-05-27 14:47:21 +08:00 |
|
曹鹏飞
|
59386a517c
|
feat(ebom): 31编码生成虚拟包时，直发包也生成parent
|
2024-05-27 14:18:22 +08:00 |
|
曹鹏飞
|
e17e901470
|
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/pojo/entity/BomNewEbomParentEntity.java
# nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java
|
2024-05-27 11:03:46 +08:00 |
|
曹鹏飞
|
760ae24a8e
|
feat(ebom): 新增sap排序字符串
|
2024-05-27 11:02:13 +08:00 |
|
曹鹏飞
|
71749f0a2b
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-27 10:51:52 +08:00 |
|
曹鹏飞
|
c0ebb43349
|
feat(ebom): 新增sap排序字符串
|
2024-05-27 10:51:39 +08:00 |
|
曹鹏飞
|
a637fc834c
|
feat(ebom): 添加对T项的支持
|
2024-05-27 10:41:53 +08:00 |
|
大米
|
e7f8d4665e
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-05-27 10:26:16 +08:00 |
|
大米
|
3f5abedd81
|
1、31F项问题修复
|
2024-05-27 10:26:09 +08:00 |
|
曹鹏飞
|
cb47c0e938
|
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/pojo/entity/BomNewEbomChildEntity.java
# nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomParentEntity.java
# nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java
|
2024-05-27 10:10:28 +08:00 |
|
曹鹏飞
|
9b401469a0
|
feat(ebom): 新增sap排序字符串
|
2024-05-27 10:07:18 +08:00 |
|
曹鹏飞
|
8e91288d0e
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-27 09:21:03 +08:00 |
|
大米
|
7804d59e40
|
1、31F项问题修复
|
2024-05-27 09:19:29 +08:00 |
|
曹鹏飞
|
63dbc1b8b5
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-27 09:07:27 +08:00 |
|
大米
|
a9111be8ab
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-05-27 09:03:42 +08:00 |
|
大米
|
ea28a267cd
|
1、21虚拟包问题
|
2024-05-27 09:03:39 +08:00 |
|
曹鹏飞
|
10e07ad2f3
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom-transition
|
2024-05-27 08:40:13 +08:00 |
|
曹鹏飞
|
e3488681d1
|
feat(dqbom): 新增查询单个物料信息接口
|
2024-05-27 08:39:55 +08:00 |
|
曹鹏飞
|
24276a95d7
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-26 20:09:19 +08:00 |
|
曹鹏飞
|
ebe8c35165
|
fix(ebom): 修复工作表搜索问题
|
2024-05-26 20:08:53 +08:00 |
|
曹鹏飞
|
d182fe1c61
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom
|
2024-05-26 19:50:12 +08:00 |
|
曹鹏飞
|
6b3610be9f
|
optimize: 调整批量查询物料信息接口
|
2024-05-26 19:49:31 +08:00 |
|
曹鹏飞
|
376c3459b5
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-26 17:24:12 +08:00 |
|
曹鹏飞
|
02c7ec9ac3
|
fix(ebom): 调整删除规则，导入的数据可以删除；但是31码下的虚拟包不能删除
|
2024-05-26 17:23:49 +08:00 |
|
曹鹏飞
|
30ca4cb0b4
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom
|
2024-05-26 16:53:36 +08:00 |
|
曹鹏飞
|
737c8dd0f8
|
fix(dqbom): 调整批量查询物料信息接口
|
2024-05-26 16:53:23 +08:00 |
|
曹鹏飞
|
6083c0cd41
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-26 16:30:33 +08:00 |
|
大米
|
f0a2bd2bde
|
1、转Pbom问题
|
2024-05-26 16:29:15 +08:00 |
|
曹鹏飞
|
5ed970336d
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-26 15:56:41 +08:00 |
|
大米
|
bc7181fb86
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-05-26 15:54:40 +08:00 |
|
大米
|
cc299350a2
|
1、转Pbom问题
|
2024-05-26 15:54:36 +08:00 |
|
曹鹏飞
|
88b4252bed
|
fix(ebom): 优化updateEBomMaterialUse性能
|
2024-05-26 15:44:20 +08:00 |
|
曹鹏飞
|
0a6d022229
|
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/api/user/EbomV2Api.java
# nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomChildService.java
|
2024-05-26 15:01:33 +08:00 |
|
曹鹏飞
|
afc21614cd
|
fix(ebom): 优化updateEBomMaterialUse性能
|
2024-05-26 14:58:49 +08:00 |
|
曹鹏飞
|
31ca386f05
|
fix(ebom): 一些优化
|
2024-05-26 14:42:53 +08:00 |
|
曹鹏飞
|
b939212953
|
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/BomNewPbomParentService.java
|
2024-05-26 11:41:25 +08:00 |
|
曹鹏飞
|
e59652fb45
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-05-26 11:36:42 +08:00 |
|
大米
|
f7f631796d
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
# Conflicts:
# nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
|
2024-05-26 11:32:52 +08:00 |
|
大米
|
fd8ea9c75b
|
1、EBOM,PBOM 正式版只保留一个版本
|
2024-05-26 11:32:10 +08:00 |
|
曹鹏飞
|
a68ec65b09
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-26 11:31:58 +08:00 |
|
曹鹏飞
|
56b7b9a8e6
|
fix(ebom): 修复引用件为未正确显示的问题
|
2024-05-26 11:31:41 +08:00 |
|
曹鹏飞
|
bed6402a50
|
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/BomNewEbomParentService.java
|
2024-05-26 11:19:28 +08:00 |
|
曹鹏飞
|
ecea3c988d
|
feat(ebom): 转pbom时执行导入sap操作；导入sap存储错误信息到数据库
|
2024-05-26 11:17:12 +08:00 |
|
大米
|
02160fac19
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-05-26 08:57:47 +08:00 |
|
大米
|
b3cd279b2b
|
1、获取岗位修改为工艺人员-默认全部为工艺人员
|
2024-05-26 08:57:25 +08:00 |
|
曹鹏飞
|
ac7a5e454e
|
feat(ebom): 导入目标的必填字段添加“*”符号
|
2024-05-25 17:50:20 +08:00 |
|
曹鹏飞
|
546a75a3f9
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-25 17:41:34 +08:00 |
|
曹鹏飞
|
bf1e3349e3
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-05-25 17:40:42 +08:00 |
|
曹鹏飞
|
e5bf19a2ac
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom
|
2024-05-25 17:40:32 +08:00 |
|
曹鹏飞
|
70696f4ea4
|
feat(dqbom): 调整批量查询物料信息接口
|
2024-05-25 17:40:03 +08:00 |
|
曹鹏飞
|
a724c8f2f4
|
feat(ebom): 调整批量查询物料信息接口
|
2024-05-25 17:39:38 +08:00 |
luoliming
|
4229d7b4b4
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-05-25 17:38:15 +08:00 |
|
luoliming
|
c339a978b1
|
转31码问题
|
2024-05-25 17:36:49 +08:00 |
|
曹鹏飞
|
4cf4c95c83
|
fix(ebom): 修复引用件为未正确显示的问题
|
2024-05-25 17:28:12 +08:00 |
|
曹鹏飞
|
af6c30c89d
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-25 17:15:24 +08:00 |
|
曹鹏飞
|
c08ed0d539
|
feat(ebom): 修复引用件为未正确显示的问题
|
2024-05-25 17:15:08 +08:00 |
|
曹鹏飞
|
c3c3204819
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-25 16:30:45 +08:00 |
|
曹鹏飞
|
ab1449e3f0
|
feat(ebom): 删除ebom时支持删除他人创建的虚拟包
|
2024-05-25 15:01:07 +08:00 |
|
luoliming
|
cc20530e0d
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-05-25 14:55:12 +08:00 |
|
luoliming
|
4643194820
|
修复问题1
|
2024-05-25 14:54:59 +08:00 |
|
曹鹏飞
|
bbc2e3331a
|
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/BomNewEbomParentService.java
|
2024-05-25 14:40:40 +08:00 |
|
曹鹏飞
|
f8775f4720
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom
|
2024-05-25 14:38:37 +08:00 |
|
曹鹏飞
|
7ec0952f6d
|
feat(dqbom): 添加批量查询物料信息的接口
|
2024-05-25 14:38:25 +08:00 |
|
曹鹏飞
|
84ea802dff
|
feat(ebom): 添加批量查询物料信息的接口
|
2024-05-25 14:38:07 +08:00 |
|
luoliming
|
4f74c84fd7
|
31转PBOM报错问题
|
2024-05-25 14:23:09 +08:00 |
|
曹鹏飞
|
119b147665
|
optimize: 调整超时时间
|
2024-05-25 12:09:03 +08:00 |
|
曹鹏飞
|
30b2073999
|
other: 添加sap所需要的so文件
|
2024-05-25 12:06:51 +08:00 |
|
曹鹏飞
|
b4693fa64a
|
feat(ebom): 修复31码生成虚拟包的问题
|
2024-05-25 12:05:18 +08:00 |
|
曹鹏飞
|
638af508b4
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom
|
2024-05-23 18:51:44 +08:00 |
|
曹鹏飞
|
1c1a3d8880
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-23 18:51:28 +08:00 |
|
曹鹏飞
|
ee2a36e55a
|
feat(移动破ebom): 物料名称如果有且仅有一个“无”字时才运允许导入
|
2024-05-23 18:40:11 +08:00 |
|
曹鹏飞
|
03f141fde2
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into sit_bak
|
2024-05-23 18:20:30 +08:00 |
|
曹鹏飞
|
8e75f9536f
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom-transition
|
2024-05-23 15:15:17 +08:00 |
|
曹鹏飞
|
04516d4d2f
|
fix(dqbom): 修复一些问题
|
2024-05-23 15:14:53 +08:00 |
|
曹鹏飞
|
b9d58cbf24
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom-transition
|
2024-05-23 13:49:10 +08:00 |
|
曹鹏飞
|
f6f9084ccf
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into sit_bak
|
2024-05-23 13:48:48 +08:00 |
|
曹鹏飞
|
c99cbcf852
|
fix(dqbom): 修复删除子级的sql在测试环境正常，但是正式环境报错的问题
|
2024-05-23 13:48:21 +08:00 |
|
曹鹏飞
|
383dda49f3
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-23 11:50:40 +08:00 |
|
曹鹏飞
|
a672698303
|
feat(ebom): 从cad获取数据并转到ebom时，如果是31编码的，设置下级的关联编号以供后续生成虚拟包使用
|
2024-05-23 11:44:06 +08:00 |
|
曹鹏飞
|
d8e8e60a9f
|
fix(ebom): 修复双角色人员无法查看到自己创建的待复核数据的问题
|
2024-05-23 11:29:16 +08:00 |
|
曹鹏飞
|
fb62f92f05
|
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/api/user/EbomV2Api.java
|
2024-05-22 17:05:30 +08:00 |
|
大米
|
71563c1e55
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-05-22 16:54:29 +08:00 |
|
大米
|
5e9b6b14cf
|
1.清CAD数据
|
2024-05-22 16:54:20 +08:00 |
|
曹鹏飞
|
8a653c533a
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-22 15:55:11 +08:00 |
|
曹鹏飞
|
22b33f6701
|
fix(pbom): 修复pbom正式表查询报错
|
2024-05-22 15:54:56 +08:00 |
|
曹鹏飞
|
c798fc647d
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-22 11:51:58 +08:00 |
|
大米
|
3e62befdeb
|
1.清CAD数据
|
2024-05-22 11:45:25 +08:00 |
|
大米
|
764747b495
|
1.导CAD物料编码检测
|
2024-05-22 11:27:29 +08:00 |
|
曹鹏飞
|
581e59e473
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into sit_bak
|
2024-05-22 09:33:44 +08:00 |
|
曹鹏飞
|
794721e1a0
|
fix(ebom): 修复从excel导入时T项图号为空的问题
|
2024-05-22 09:33:09 +08:00 |
|
曹鹏飞
|
34fe4b7540
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-21 17:11:01 +08:00 |
|
大米
|
8a3a1d3bf2
|
1.31转PBOM
|
2024-05-21 17:04:47 +08:00 |
|
大米
|
30aa342ff7
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
# Conflicts:
# nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
|
2024-05-21 17:02:15 +08:00 |
|
大米
|
3ea43051af
|
1.31转PBOM
|
2024-05-21 17:02:02 +08:00 |
|
曹鹏飞
|
a4d4b2cffc
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom-transition
|
2024-05-21 16:18:41 +08:00 |
|
曹鹏飞
|
5e6c611477
|
fix(dqbom): 修复编辑页面新增bom暂存后再提交报错的问题
|
2024-05-21 16:18:23 +08:00 |
|
曹鹏飞
|
50f69b47a4
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-20 17:05:54 +08:00 |
|
曹鹏飞
|
3400d2d35a
|
fix(pbom): 修复pbom正式表子级数据无法展示的问题
|
2024-05-20 17:05:43 +08:00 |
|
曹鹏飞
|
ae22596eaf
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-20 14:30:11 +08:00 |
|
曹鹏飞
|
53760502e8
|
fix(ebom):
1、31码下的所有物料都生成虚拟包后才能转pbom
2、31码只能生成1010的pbom
|
2024-05-20 10:45:48 +08:00 |
|
曹鹏飞
|
cee46eb0e3
|
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/BomNewEbomParentService.java
|
2024-05-20 10:06:21 +08:00 |
|
曹鹏飞
|
1055d24aba
|
fix(ebom): 优化编辑功能
|
2024-05-20 10:04:08 +08:00 |
|
曹鹏飞
|
bb56ba1b0c
|
fix(ebom): 优化从excel导入
|
2024-05-20 09:58:47 +08:00 |
|
曹鹏飞
|
2a982f0c45
|
fix(ebom): 优化从excel导入
|
2024-05-19 10:13:25 +08:00 |
|
曹鹏飞
|
c78f0fc151
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-18 17:15:27 +08:00 |
|
曹鹏飞
|
8bf4612a31
|
fix: 修复2个bug
|
2024-05-18 17:15:03 +08:00 |
|
曹鹏飞
|
2fe03c4e80
|
fix(ebom): 优化31码生成虚拟包
|
2024-05-18 16:24:15 +08:00 |
|
曹鹏飞
|
e1f093023d
|
fix(pbom): 31编码的才一定需要生成虚拟包
|
2024-05-17 18:27:58 +08:00 |
|
曹鹏飞
|
b34c3523e8
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-17 18:12:01 +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 |
|
曹鹏飞
|
b40728514f
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-17 17:29:48 +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 |
|
曹鹏飞
|
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 |
|
大米
|
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 |