 曹鹏飞
|
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
|
6bc26c638d
|
ebom,pbom getBomTree 去重
|
2024-06-29 23:01:25 +08:00 |
|
曹鹏飞
|
7357e70ce7
|
optimize(ebom): 从excel导入时，将本人以前导入的草稿数据中的顶级设置为非顶级
|
2024-06-29 22:55:38 +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 |
|
大米
|
cce1aef1d7
|
1、变更影响及同步formal表优化
|
2024-06-29 09:57:48 +08:00 |
|
大米
|
f78c40a795
|
1、变更影响及同步formal表优化
|
2024-06-29 09:54:57 +08:00 |
|
曹鹏飞
|
31b9415de7
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-28 14:52:10 +08:00 |
|
大米
|
b5a694ae5f
|
1、替换草稿态的虚拟包
|
2024-06-28 14:49:25 +08:00 |
|
曹鹏飞
|
ba0ab67053
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-28 14:05:53 +08:00 |
|
大米
|
0a7a745c28
|
1、替换草稿态的虚拟包
|
2024-06-28 11:21:14 +08:00 |
|
大米
|
78b4b9ac38
|
1、替换草稿态的虚拟包
|
2024-06-28 11:20:43 +08:00 |
|
曹鹏飞
|
d25fbcd007
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-28 09:33:01 +08:00 |
|
大米
|
6176f3b903
|
1、变更影响-升级
|
2024-06-28 09:30:42 +08:00 |
|
曹鹏飞
|
2eb5392a30
|
feat: ebom和pbom正式表查询逻辑调整
|
2024-06-28 09:01:11 +08:00 |
|
曹鹏飞
|
23b55e23dd
|
feat(ebom): 导出到excel时添加选中的节点数据
|
2024-06-28 08:43:58 +08:00 |
|
曹鹏飞
|
a6869a8a9a
|
optimize(ebom): 导入SAP优化
|
2024-06-27 22:57:34 +08:00 |
|
曹鹏飞
|
88aa53956b
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-27 20:17:21 +08:00 |
|
大米
|
1d85e0468a
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-06-27 18:11:48 +08:00 |
|
大米
|
a2cc8ee7ca
|
1、变更影响
|
2024-06-27 18:11:44 +08:00 |
|
曹鹏飞
|
c1eb489f7d
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-27 17:42:50 +08:00 |
|
jing's
|
c1041084ff
|
fix有bom 未查询到数据异常
|
2024-06-27 17:37:14 +08:00 |
|
曹鹏飞
|
963062bee5
|
optimize: bom比较
添加非null判断
|
2024-06-27 17:25:34 +08:00 |
|
曹鹏飞
|
711c104a91
|
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/EBomForwardReport.java
# nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java
|
2024-06-27 17:05:15 +08:00 |
|
曹鹏飞
|
3942fb2a70
|
optimize: bom查看
添加非null判断
|
2024-06-27 16:52:44 +08:00 |
|
jing's
|
910f7d637a
|
空数据不抛异常
|
2024-06-27 16:40:25 +08:00 |
|
曹鹏飞
|
9a92cb535d
|
optimize(pbom查看): 查不到物料信息时不在提示错误信息
|
2024-06-27 15:53:51 +08:00 |
|
曹鹏飞
|
0d587b3ea9
|
fix(pbom): 添加筛选条件-工厂
|
2024-06-27 15:52:55 +08:00 |
|
曹鹏飞
|
65acfcf94a
|
fix(pbom): 发起变更时，将原物料设置为last_version_is=0
|
2024-06-27 15:50:40 +08:00 |
|
曹鹏飞
|
6ebeb26432
|
feat: 根据直发包编号导入上级物料到SAP
|
2024-06-27 15:48:20 +08:00 |
|
曹鹏飞
|
452e50a550
|
optimize: 优化批量查询物料信息接口
|
2024-06-27 15:46:42 +08:00 |
|
曹鹏飞
|
33d36c2db1
|
optimize: 按时间倒序
|
2024-06-27 15:41:53 +08:00 |
|
曹鹏飞
|
1943b3107f
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-27 14:06:55 +08:00 |
|
大米
|
80bf577fb6
|
1、解决提层项问题
|
2024-06-27 12:00:18 +08:00 |
|
大米
|
102ee0bda6
|
1、解决提层项问题
|
2024-06-27 11:54:48 +08:00 |
|
大米
|
250702f310
|
1、解决提层项问题
|
2024-06-27 11:43:25 +08:00 |
|
曹鹏飞
|
fb797c106b
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-27 07:58:28 +08:00 |
|
大米
|
aba0507bf9
|
1、解决变更影响重复问题
|
2024-06-26 23:18:14 +08:00 |
|
曹鹏飞
|
e991ea46b9
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-26 18:19:01 +08:00 |
|
大米
|
327f6b1a3b
|
1、解决变更影响重复问题
|
2024-06-26 18:06:27 +08:00 |
|
曹鹏飞
|
7e3cf23eb1
|
optimize: 大量修改
|
2024-06-26 18:02:37 +08:00 |
|
曹鹏飞
|
424095c5c5
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-26 17:58:28 +08:00 |
|
大米
|
1f0f944804
|
1、pbom-提层问题
|
2024-06-26 17:50:51 +08:00 |
|
曹鹏飞
|
3721be0f80
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-26 15:39:39 +08:00 |
|
大米
|
6a2c3d1fa0
|
1、pbom升级
|
2024-06-26 15:38:22 +08:00 |
|
大米
|
ccee79d329
|
1、pbom升级
|
2024-06-26 15:02:03 +08:00 |
|
曹鹏飞
|
8caad8d307
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-26 11:51:33 +08:00 |
|
大米
|
12bedbf9a2
|
1、转PBOM问题修复222
|
2024-06-26 11:47:31 +08:00 |
|
曹鹏飞
|
80d321c4b2
|
optimize(ebom反查): 修复一些问题；数量限制为1000条
|
2024-06-26 10:06:17 +08:00 |
|
曹鹏飞
|
e64860e506
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-26 08:00:56 +08:00 |
|
luoliming
|
f7bbd9ac7f
|
一般零部件-bomExists 问题
|
2024-06-25 23:41:02 +08:00 |
|
大米
|
bf8a28cd55
|
1、转PBOM问题修复
|
2024-06-25 20:47:14 +08:00 |
|
曹鹏飞
|
3bd8bd538a
|
fix: 大量改动
|
2024-06-25 19:06:43 +08:00 |
|
曹鹏飞
|
07fc435bd2
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-25 16:09:59 +08:00 |
|
大米
|
50ef317ab4
|
1、EBOM发起变更-技术通知单异常问题
|
2024-06-25 14:05:54 +08:00 |
|
曹鹏飞
|
2d13908107
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-25 11:39:38 +08:00 |
|
大米
|
4f928b6839
|
1、F项问题
2、图号问题
|
2024-06-25 11:04:47 +08:00 |
|
曹鹏飞
|
25fb67f91a
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-24 22:06:23 +08:00 |
|
luoliming
|
45381290e9
|
一般零部件-bomExists 问题
|
2024-06-24 22:04:22 +08:00 |
|
曹鹏飞
|
a414797234
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-24 19:14:41 +08:00 |