Commit Graph

1474 Commits

Author SHA1 Message Date
大米 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
大米 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