BF-202309241046\Administrator
|
bbd13241ed
|
Merge branch 'feature/DM/nflg-bom-transition' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom-transition
|
2024-07-05 09:10:27 +08:00 |
|
BF-202309241046\Administrator
|
0fc3b3562e
|
表属性获取工具
|
2024-07-05 09:10:12 +08:00 |
 曹鹏飞
|
45df3ddcef
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into feature/DM/nflg-bom-transition
|
2024-07-05 08:27:54 +08:00 |
|
BF-202309241046\Administrator
|
51ef33cde6
|
ebom汇总筛选叶子
|
2024-07-04 22:45:53 +08:00 |
|
BF-202309241046\Administrator
|
d1760bc1d7
|
Ebom报表调整
|
2024-07-04 22:26:34 +08:00 |
|
曹鹏飞
|
c9cdc0e957
|
other: 调整日志配置
|
2024-07-04 17:36:37 +08:00 |
|
BF-202309241046\Administrator
|
b7a23a1caa
|
Merge branch 'feature/DM/nflg-bom-transition' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom-transition
|
2024-07-04 13:07:07 +08:00 |
|
BF-202309241046\Administrator
|
1de556b5ad
|
增加查询
|
2024-07-04 13:07:01 +08:00 |
|
曹鹏飞
|
e54ea2c275
|
optimize: 调整日志输出
|
2024-07-02 18:02:24 +08:00 |
|
曹鹏飞
|
317c64019b
|
optimize: 调整日志输出
|
2024-07-02 17:31:31 +08:00 |
大米
|
6c9098cf1a
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into feature/DM/nflg-bom-transition
|
2024-07-02 15:52:00 +08:00 |
|
大米
|
2c193a55bc
|
1、一般零部件-下挂问题修复
|
2024-07-02 15:51:55 +08:00 |
|
曹鹏飞
|
bb9c98c209
|
fix: 调整发起变更后的数据设置
|
2024-07-02 15:01:37 +08:00 |
|
大米
|
e6550b9cf0
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into feature/DM/nflg-bom-transition
|
2024-07-02 14:45:31 +08:00 |
|
大米
|
71c4568661
|
1、一般零部件-下挂问题修复
|
2024-07-02 14:45:26 +08:00 |
|
曹鹏飞
|
f2ca749534
|
optimize(ebom): 优化逻辑
|
2024-07-02 11:19:35 +08:00 |
|
曹鹏飞
|
ab5a23afbd
|
optimize(ebom): 异常检查优化
|
2024-07-02 10:47:55 +08:00 |
|
曹鹏飞
|
453d504219
|
fix: 添加直发包
|
2024-07-02 08:05:52 +08:00 |
luoliming
|
bfdeca90f8
|
ebom-来源问题
|
2024-07-01 23:06:05 +08:00 |
|
luoliming
|
1e775815bd
|
ebom-来源问题
|
2024-07-01 23:00:23 +08:00 |
|
曹鹏飞
|
1fbe82d335
|
optimize: 一些调整
|
2024-07-01 17:34:26 +08:00 |
|
曹鹏飞
|
1adb6dc3c6
|
optimize(ebom): 优化提示语
|
2024-07-01 09:47:24 +08:00 |
|
luoliming
|
87c5567376
|
变更影响升级-更新虚拟包组成
|
2024-06-30 22:17:39 +08:00 |
|
BF-202309241046\Administrator
|
77f20e616a
|
比较多层
|
2024-06-30 14:22:58 +08:00 |
|
luoliming
|
05ac920205
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into feature/DM/nflg-bom-transition
|
2024-06-29 23:02:39 +08:00 |
|
luoliming
|
6bc26c638d
|
ebom,pbom getBomTree 去重
|
2024-06-29 23:01:25 +08:00 |
|
曹鹏飞
|
1668e1eaa7
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-29 23:01:12 +08:00 |
|
曹鹏飞
|
7357e70ce7
|
optimize(ebom): 从excel导入时，将本人以前导入的草稿数据中的顶级设置为非顶级
|
2024-06-29 22:55:38 +08:00 |
|
luoliming
|
53e4a89474
|
ebom,pbom getBomTree 去重
|
2024-06-29 22:48:47 +08:00 |
|
BF-202309241046\Administrator
|
6eee207e29
|
fix 获取最大版本错误
|
2024-06-29 21:07:27 +08:00 |
|
BF-202309241046\Administrator
|
5d713f84dd
|
比较数量调整
|
2024-06-29 20:49:49 +08:00 |
|
曹鹏飞
|
79630893c6
|
optimize(ebom): 一个小调整
|
2024-06-29 18:43:35 +08:00 |
|
曹鹏飞
|
b923c70b20
|
fix(pbom): 修改判断条件
|
2024-06-29 18:14:36 +08:00 |
|
大米
|
6979d75388
|
1、PBOM发布判断状态
|
2024-06-29 18:11:05 +08:00 |
|
曹鹏飞
|
eeb0da8158
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-29 17:41:14 +08:00 |
|
大米
|
18c0b7f8cb
|
1、PBOM发布判断状态
|
2024-06-29 17:38:07 +08:00 |
|
曹鹏飞
|
1e6bc020f2
|
optimize(pbom): 导入SAP不再判断是否根节点
|
2024-06-29 17:35:19 +08:00 |
|
曹鹏飞
|
079df935de
|
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-06-29 17:01:42 +08:00 |
|
大米
|
f600d1fe2e
|
1、修复t_bom_new_ebom_child_formal的bom_version_row_id字段没有赋值
|
2024-06-29 16:52:36 +08:00 |
|
曹鹏飞
|
a6284a7626
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-29 16:45:19 +08:00 |
|
大米
|
f2f62ac4dd
|
1、转PBOM-ROWid问题
|
2024-06-29 16:42:12 +08:00 |
|
曹鹏飞
|
792eec20bb
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-29 14:53:45 +08:00 |
|
大米
|
45f0c9a3ae
|
1、转PBOM-ROWid问题
|
2024-06-29 14:51:46 +08:00 |
|
曹鹏飞
|
c534eaf33f
|
fix(pbom): 修复编辑页面点击提交按钮时，如果当前物料无下级数据，则发生异常的问题
|
2024-06-29 14:33:45 +08:00 |
|
曹鹏飞
|
999e071e4b
|
fix(pbom): 修复当工艺包物料在主物料已存在时，创建工艺包没有如预期创建节点的问题
|
2024-06-29 14:32:18 +08:00 |
|
曹鹏飞
|
4217fa8b83
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
# Conflicts:
# nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
|
2024-06-29 14:28:02 +08:00 |
|
大米
|
4d8e76e25d
|
1、转PBOM-ROWid问题
|
2024-06-29 12:28:46 +08:00 |
|
大米
|
51febf0ef7
|
1、变更影响及同步formal表优化
|
2024-06-29 12:11:23 +08:00 |
|
曹鹏飞
|
f553ceff4d
|
fix: 优化调整
|
2024-06-29 11:04:21 +08:00 |
|
曹鹏飞
|
b4606483d6
|
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-06-29 10:58:19 +08:00 |