 曹鹏飞
|
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 |
|
曹鹏飞
|
f77f7bf9f0
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-27 18:14:25 +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 |
|
曹鹏飞
|
91a12a291c
|
fix: 调整资源释放位置
|
2024-05-27 15:53:09 +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 |