 曹鹏飞
|
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 |
|
大米
|
64b81b88b3
|
1、3个问题处理
|
2024-06-24 19:07:37 +08:00 |
|
曹鹏飞
|
3ff75130f6
|
optimize(ebom): 从cad导入，如果编号为“无”，则修改为“”
|
2024-06-24 18:41:16 +08:00 |
|
曹鹏飞
|
e907fb4f02
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-24 18:02:31 +08:00 |
|
大米
|
c564a5fb92
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-06-24 17:53:39 +08:00 |
|
大米
|
776ba1d494
|
1、existBom标记问题-2
|
2024-06-24 17:53:30 +08:00 |
|
曹鹏飞
|
3b3e98bfd9
|
optimize(pbom): 一点小调整
|
2024-06-24 14:53:00 +08:00 |
|
曹鹏飞
|
1674c43ae2
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-24 14:35:05 +08:00 |
|
jing's
|
795ff6f6ab
|
queryMaterial 单位kg，数量=单重=总重
|
2024-06-24 14:16:23 +08:00 |
|
jing's
|
51abcc54d7
|
查询变更物料编码 单位kg 单重=数量=总重
|
2024-06-24 14:13:04 +08:00 |
|
曹鹏飞
|
bfc126fe80
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-24 13:32:51 +08:00 |
|
大米
|
fb104e9d53
|
1、existBom标记问题
|
2024-06-24 12:18:38 +08:00 |
|
曹鹏飞
|
a22d26e739
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-24 11:30:28 +08:00 |
|
曹鹏飞
|
86d0f26791
|
fix(ebom): 修复显示缺bom但是无法添加下级的问题
|
2024-06-24 11:25:18 +08:00 |
|
大米
|
96adcae0a0
|
1、 转PBOM 问题
|
2024-06-24 08:47:18 +08:00 |
|
jing's
|
b5dca83082
|
Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom
|
2024-06-23 22:51:30 +08:00 |
|
jing's
|
3151af0fe0
|
fix查看多层子级无数据异常
|
2024-06-23 22:51:24 +08:00 |
|
曹鹏飞
|
560adb6b92
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-23 21:26:21 +08:00 |
|
luoliming
|
5c574b98c5
|
EBOM正式转PBOM问题
|
2024-06-23 21:11:58 +08:00 |
|
曹鹏飞
|
a58a3a44a8
|
fix(ebom): 虚拟包编号逻辑优化
|
2024-06-23 19:46:11 +08:00 |
|
曹鹏飞
|
e2bf276d25
|
feat(ebom): 修复last_version_is的设置问题
|
2024-06-23 19:45:18 +08:00 |
|
曹鹏飞
|
c6e1c64104
|
optimize(ebom): 导入SAP优化
|
2024-06-23 19:44:36 +08:00 |
|
曹鹏飞
|
c702a95282
|
feat(ebom): 修复last_version_is的设置问题
|
2024-06-23 19:44:07 +08:00 |
|
曹鹏飞
|
0e80f4e4f7
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-23 19:16:24 +08:00 |
|
luoliming
|
8a69a37635
|
EBOM正式转PBOM问题
|
2024-06-23 19:01:21 +08:00 |
|
大米
|
5a16d05a0d
|
1、 单层反查
|
2024-06-23 18:50:32 +08:00 |
|
luoliming
|
320dd02854
|
PBOM 发布问题
|
2024-06-23 16:54:15 +08:00 |
|
曹鹏飞
|
390a790640
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-23 16:48:34 +08:00 |
|
luoliming
|
1bf8983127
|
PBOM 发布问题
|
2024-06-23 16:46:45 +08:00 |
|
曹鹏飞
|
2dd82046fe
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-23 16:06:23 +08:00 |
|
luoliming
|
437e0c10e2
|
PBOM 发布问题
|
2024-06-23 16:05:47 +08:00 |
|
曹鹏飞
|
baaffc9571
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-23 15:55:00 +08:00 |
|
luoliming
|
cff4a2dbd2
|
PBOM 发布问题
|
2024-06-23 15:54:34 +08:00 |
|
luoliming
|
3ada559a6e
|
转31码问题
|
2024-06-23 15:53:28 +08:00 |
|
曹鹏飞
|
9968e8eb6a
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-23 15:30:19 +08:00 |
|
luoliming
|
7ab3f931cd
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-06-23 15:29:42 +08:00 |
|
luoliming
|
9a73a53a08
|
转31码问题
|
2024-06-23 15:29:24 +08:00 |
|
曹鹏飞
|
6ae29687f5
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-23 09:50:44 +08:00 |
|
大米
|
d64fecddbe
|
1、 单层反查
|
2024-06-22 17:55:54 +08:00 |
|
大米
|
bf5797669d
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-06-21 18:59:43 +08:00 |
|
大米
|
f266389ea0
|
1、修复转Pbom错误
|
2024-06-21 18:59:39 +08:00 |
|
曹鹏飞
|
dbd6e650c7
|
fix: 启用物料信息发起OA请求功能，后续OA请求的状态同步由主物料服务负责
|
2024-06-21 15:59:19 +08:00 |
|
曹鹏飞
|
abd0a2d6c2
|
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/MaterialService.java
|
2024-06-21 15:56:00 +08:00 |
|
曹鹏飞
|
3905ac75bd
|
feat: 中类、小类、细分类（若有），分类代码和名称都传给OA
|
2024-06-21 15:43:18 +08:00 |
|
曹鹏飞
|
e1b6caa2d8
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-21 15:26:24 +08:00 |
|
jing's
|
c04fa487d8
|
Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom
|
2024-06-21 15:17:30 +08:00 |
|
jing's
|
818564eaa3
|
设备导出异常
|
2024-06-21 15:17:24 +08:00 |
|
曹鹏飞
|
443153bacd
|
fix: 启用物料信息发起OA请求功能，后续OA请求的状态同步由主物料服务负责
|
2024-06-21 14:17:11 +08:00 |
|
曹鹏飞
|
354c566383
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-21 14:10:10 +08:00 |
|
曹鹏飞
|
bc596f3e1a
|
feat: 中类、小类、细分类（若有），分类代码和名称都传给OA
|
2024-06-21 14:09:15 +08:00 |
|
曹鹏飞
|
d597bed3b6
|
optimize(ebom): 从cad和excel导入时，物料编号和图号去除前后空格，以免从主物料查询时查不到数据
|
2024-06-21 09:40:36 +08:00 |
|
曹鹏飞
|
8dd5c58d8b
|
optimize(ebom): 去掉重复的deptRowId
|
2024-06-21 07:58:17 +08:00 |
|
曹鹏飞
|
63bc0d775a
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-21 07:56:00 +08:00 |
|
大米
|
8c54292602
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-06-20 18:31:30 +08:00 |
|
大米
|
7bb369b112
|
1、变更影响
|
2024-06-20 18:31:16 +08:00 |
|
jing's
|
4f86a44420
|
添加模型dept_row_id
|
2024-06-20 15:43:48 +08:00 |
|
曹鹏飞
|
44dd7ae71f
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-20 15:36:04 +08:00 |
|
曹鹏飞
|
b55aec2016
|
fix(ebom): 添加条件限制
|
2024-06-20 15:35:19 +08:00 |
|
曹鹏飞
|
b77c327c6f
|
fix(ebom): 修复编辑页面保存数据时部门编号缺失导致报错的问题
|
2024-06-20 15:35:02 +08:00 |
|
曹鹏飞
|
3762a37841
|
optimize(ebom): 优化性能
|
2024-06-20 15:33:30 +08:00 |
|
曹鹏飞
|
0e7cc1e877
|
optimize(ebom): 优化错误提示
|
2024-06-20 15:32:11 +08:00 |
|
曹鹏飞
|
5a78ef449a
|
optimize(ebom): 优化从excel导入
|
2024-06-20 15:31:37 +08:00 |
|
jing's
|
0fb12afba0
|
同步主
|
2024-06-20 14:14:34 +08:00 |
|
jing's
|
0494e98972
|
Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom
|
2024-06-20 13:46:05 +08:00 |