 曹鹏飞
|
7ff168fd1a
|
optimize(移动破mbom): 导入SAP状态值调整
|
2024-06-14 09:01:15 +08:00 |
|
曹鹏飞
|
d4788a1d4a
|
fix(ebom): 调整事务位置
|
2024-06-14 08:10:43 +08:00 |
|
曹鹏飞
|
be2a133e2b
|
fix(ebom): 修复暂存和提交报错的问题
|
2024-06-13 17:54:34 +08:00 |
|
曹鹏飞
|
f8d5f29fbc
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-13 15:22:10 +08:00 |
大米
|
dfa6939f43
|
1、事务问题
|
2024-06-13 14:56:56 +08:00 |
|
大米
|
e76f8bd2e6
|
1、事务问题
|
2024-06-13 14:52:42 +08:00 |
|
大米
|
4ddd6d1505
|
1、事务问题
|
2024-06-13 14:50:52 +08:00 |
|
曹鹏飞
|
21f6ff70c5
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-07 15:31:55 +08:00 |
|
曹鹏飞
|
dd891fe137
|
fix(ebom): 修复数量计算问题
|
2024-06-07 15:31:32 +08:00 |
|
曹鹏飞
|
b577689855
|
fix(ebom): 转正式表时设置转换人姓名
|
2024-06-07 15:30:08 +08:00 |
|
曹鹏飞
|
9b64e55981
|
feat(ebom): 正式表去除仅查看自己的数据
|
2024-06-07 15:28:40 +08:00 |
|
曹鹏飞
|
511f8c2a3a
|
feat(pbom): 添加导入SAP失败的数量显示和列表
|
2024-06-07 15:26:48 +08:00 |
|
曹鹏飞
|
e1367525e5
|
feat(pbom): 添加导入SAP失败的数量显示和列表
|
2024-06-07 15:25:53 +08:00 |
|
曹鹏飞
|
b0bc503239
|
fix(ebom): 修改判断条件
|
2024-06-07 15:18:41 +08:00 |
|
曹鹏飞
|
e8f3da6694
|
feat(ebom): 导入SAP异常时，也将其加入到待处理列表中
|
2024-06-06 17:53:57 +08:00 |
|
曹鹏飞
|
343d76b71c
|
fix(pbom): 修复一个bug
|
2024-06-06 17:52:47 +08:00 |
|
曹鹏飞
|
111456e587
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-06 09:46:35 +08:00 |
|
曹鹏飞
|
aea94aa852
|
feat(pbom): 重写复制功能
|
2024-06-06 09:46:10 +08:00 |
|
大米
|
3b68e7c76f
|
1、合并数量问题
|
2024-06-06 09:41:05 +08:00 |
|
大米
|
839a2bd0d4
|
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-06-06 09:10:18 +08:00 |
|
大米
|
9a89d903cc
|
1、合并数量问题
|
2024-06-06 09:09:56 +08:00 |
|
曹鹏飞
|
aa3c3f5d37
|
feat(pbom): 添加筛选条件仅看自己
|
2024-06-06 08:34:48 +08:00 |
|
曹鹏飞
|
e823ed6e53
|
feat(pbom): 重写复制功能
|
2024-06-06 08:34:03 +08:00 |
|
曹鹏飞
|
dfbcad0649
|
fix(ebom): 修复根节点的判断问题
|
2024-06-05 16:31:38 +08:00 |
|
曹鹏飞
|
048ac55706
|
feat(pbom): 重写复制功能
|
2024-06-05 16:21:31 +08:00 |
|
曹鹏飞
|
997d81dc1b
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-05 11:06:37 +08:00 |
|
曹鹏飞
|
8e30de33c4
|
optimize: 缓存接口优化
|
2024-06-05 10:56:30 +08:00 |
|
曹鹏飞
|
dcb52e9779
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-05 10:37:24 +08:00 |
|
曹鹏飞
|
114753d40d
|
optimize: 缓存接口优化
|
2024-06-05 10:26:42 +08:00 |
|
曹鹏飞
|
0695f98d4c
|
optimize: 缓存接口优化
|
2024-06-05 09:59:22 +08:00 |
|
曹鹏飞
|
678c6c1fdd
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-05 08:51:06 +08:00 |
|
曹鹏飞
|
16ddc6855b
|
optimize(ebom): 转pbom时设置编辑状态为已处理，同时设置下级节点的child编辑状态为已处理
|
2024-06-05 08:50:25 +08:00 |
|
曹鹏飞
|
8719140089
|
fix(ebom): 工作表搜索时只搜索草稿数据
|
2024-06-04 17:33:29 +08:00 |
|
曹鹏飞
|
ec5ef37346
|
feat(dqbom): 同步到pbom时设置source
|
2024-06-04 17:09:54 +08:00 |
|
曹鹏飞
|
3d7e49d19e
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-04 17:09:04 +08:00 |
|
曹鹏飞
|
5cfc095c29
|
feat(pbom): 增加source字段
|
2024-06-04 17:03:33 +08:00 |
|
曹鹏飞
|
855eddfc1c
|
fix(pbom): 优化根节点判断
|
2024-06-04 15:50:16 +08:00 |
|
曹鹏飞
|
ae1d544aa1
|
fix: 导入sap优化
|
2024-06-04 10:01:37 +08:00 |
|
曹鹏飞
|
925dc231cf
|
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-06-04 09:20:45 +08:00 |
|
曹鹏飞
|
5e85f73b2b
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-04 09:18:23 +08:00 |
|
曹鹏飞
|
5a51f0957d
|
feat(ebom): 添加物料名称非空判断
|
2024-06-04 09:17:37 +08:00 |
|
大米
|
8f57416217
|
1、pbom发布时状态改未已发布
|
2024-06-04 08:41:21 +08:00 |
|
曹鹏飞
|
30abb6a9cb
|
feat(ebom): 移除不需要的代码
|
2024-06-04 08:17:53 +08:00 |
|
曹鹏飞
|
bebc7843fa
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-04 07:58:25 +08:00 |
|
曹鹏飞
|
2163f7ad82
|
feat(ebom): 解决导入sap的物料总数与实际不符的问题
|
2024-06-04 07:58:06 +08:00 |
|
大米
|
908b57bb30
|
1、pom工作表发货包在顶级问题修复
|
2024-06-03 17:49:28 +08:00 |
|
曹鹏飞
|
66b63234e7
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-03 17:40:44 +08:00 |
|
大米
|
75c3b99eff
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-06-03 16:45:58 +08:00 |
|
大米
|
123345a0f3
|
1、修复eBOM 升级后2次转PBOM问题
|
2024-06-03 16:45:50 +08:00 |
|
曹鹏飞
|
5d0142fee1
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-03 16:42:21 +08:00 |