rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,244 Commits 16 Branches 1 Tag 12 MiB
Commit Graph

1222 Commits

Author SHA1 Message Date
曹鹏飞 638af508b4 Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom 2024-05-23 18:51:44 +08:00
曹鹏飞 1c1a3d8880 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-05-23 18:51:28 +08:00
曹鹏飞 ee2a36e55a feat(移动破ebom): 物料名称如果有且仅有一个“无”字时才运允许导入 2024-05-23 18:40:11 +08:00
曹鹏飞 03f141fde2 Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into sit_bak 2024-05-23 18:20:30 +08:00
曹鹏飞 8e75f9536f Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom-transition 2024-05-23 15:15:17 +08:00
曹鹏飞 04516d4d2f fix(dqbom): 修复一些问题 2024-05-23 15:14:53 +08:00
曹鹏飞 b9d58cbf24 Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom-transition 2024-05-23 13:49:10 +08:00
曹鹏飞 f6f9084ccf Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into sit_bak 2024-05-23 13:48:48 +08:00
曹鹏飞 c99cbcf852 fix(dqbom): 修复删除子级的sql在测试环境正常，但是正式环境报错的问题 2024-05-23 13:48:21 +08:00
曹鹏飞 383dda49f3 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-05-23 11:50:40 +08:00
曹鹏飞 a672698303 feat(ebom): 从cad获取数据并转到ebom时，如果是31编码的，设置下级的关联编号以供后续生成虚拟包使用 2024-05-23 11:44:06 +08:00
曹鹏飞 d8e8e60a9f fix(ebom): 修复双角色人员无法查看到自己创建的待复核数据的问题 2024-05-23 11:29:16 +08:00
曹鹏飞 430fbd127d fix: 修复定时任务获取用户信息报错的问题 2024-05-23 11:13:18 +08:00
曹鹏飞 fb62f92f05 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/api/user/EbomV2Api.java
 2024-05-22 17:05:30 +08:00
大米 71563c1e55 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-05-22 16:54:29 +08:00
大米 5e9b6b14cf 1.清CAD数据 2024-05-22 16:54:20 +08:00
曹鹏飞 0ec51d1ec6 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-05-22 16:35:28 +08:00
曹鹏飞 3d92f0f87b fix: 修复定时任务获取用户信息报错的问题 2024-05-22 16:35:01 +08:00
曹鹏飞 8a653c533a Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-05-22 15:55:11 +08:00
曹鹏飞 22b33f6701 fix(pbom): 修复pbom正式表查询报错 2024-05-22 15:54:56 +08:00
曹鹏飞 c798fc647d Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-05-22 11:51:58 +08:00
大米 3e62befdeb 1.清CAD数据 2024-05-22 11:45:25 +08:00
大米 764747b495 1.导CAD物料编码检测 2024-05-22 11:27:29 +08:00
曹鹏飞 581e59e473 Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into sit_bak 2024-05-22 09:33:44 +08:00
曹鹏飞 794721e1a0 fix(ebom): 修复从excel导入时T项图号为空的问题 2024-05-22 09:33:09 +08:00
曹鹏飞 34fe4b7540 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-05-21 17:11:01 +08:00
大米 8a3a1d3bf2 1.31转PBOM 2024-05-21 17:04:47 +08:00
大米 30aa342ff7 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-05-21 17:02:15 +08:00
大米 3ea43051af 1.31转PBOM 2024-05-21 17:02:02 +08:00
曹鹏飞 a4d4b2cffc Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom-transition 2024-05-21 16:18:41 +08:00
曹鹏飞 5e6c611477 fix(dqbom): 修复编辑页面新增bom暂存后再提交报错的问题 2024-05-21 16:18:23 +08:00
曹鹏飞 50f69b47a4 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-05-20 17:05:54 +08:00
曹鹏飞 3400d2d35a fix(pbom): 修复pbom正式表子级数据无法展示的问题 2024-05-20 17:05:43 +08:00
曹鹏飞 ae22596eaf Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-05-20 14:30:11 +08:00
曹鹏飞 53760502e8 fix(ebom): 
1、31码下的所有物料都生成虚拟包后才能转pbom
2、31码只能生成1010的pbom
 2024-05-20 10:45:48 +08:00
曹鹏飞 cee46eb0e3 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-05-20 10:06:21 +08:00
曹鹏飞 1055d24aba fix(ebom): 优化编辑功能 2024-05-20 10:04:08 +08:00
曹鹏飞 bb56ba1b0c fix(ebom): 优化从excel导入 2024-05-20 09:58:47 +08:00
曹鹏飞 2a982f0c45 fix(ebom): 优化从excel导入 2024-05-19 10:13:25 +08:00
曹鹏飞 c78f0fc151 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-05-18 17:15:27 +08:00
曹鹏飞 8bf4612a31 fix: 修复2个bug 2024-05-18 17:15:03 +08:00
曹鹏飞 2fe03c4e80 fix(ebom): 优化31码生成虚拟包 2024-05-18 16:24:15 +08:00
曹鹏飞 e1f093023d fix(pbom): 31编码的才一定需要生成虚拟包 2024-05-17 18:27:58 +08:00
曹鹏飞 b34c3523e8 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-05-17 18:12:01 +08:00
曹鹏飞 4d39400144 fix(ebom): 数量需要用户确认的判断条件添加：来源为原始bom 2024-05-17 18:11:47 +08:00
曹鹏飞 16ff524b45 fix(ebom): T类型物料的描述为空时，异常状态改为4 2024-05-17 18:02:15 +08:00
曹鹏飞 b40728514f Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-05-17 17:29:48 +08:00
曹鹏飞 e9ed71800c fix(ebom): 编辑页面添加T类型物料的设置优化 2024-05-17 17:29:33 +08:00
曹鹏飞 33fd163cbd fix(ebom): 一些优化 2024-05-17 17:17:29 +08:00
曹鹏飞 004309c5c3 fix(ebom): 一些优化 2024-05-17 17:16:07 +08:00
曹鹏飞 7af8873012 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-05-17 16:15:15 +08:00
曹鹏飞 870d612154 fix(ebom): 一些优化 2024-05-17 16:14:57 +08:00
曹鹏飞 769ccb89bf fix(ebom): 从excel导入不调用compucteLevelNum方法 2024-05-17 15:38:13 +08:00
曹鹏飞 df50b80ae6 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-05-17 15:08:23 +08:00
曹鹏飞 61d689d7a3 fix(ebom): 从cad导入时，导入的物料单位设置为系统物料单位 2024-05-17 15:03:15 +08:00
曹鹏飞 182e9dce10 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-05-17 14:20:54 +08:00
曹鹏飞 694b2b918b Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-05-17 14:20:16 +08:00
曹鹏飞 3a5a787dc9 fix(ebom): 处理合并问题 2024-05-17 14:19:43 +08:00
曹鹏飞 7ddac0bae0 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/CheckEBomException.java
 2024-05-17 14:18:04 +08:00
大米 42761eee03 1.替换项合并 2024-05-17 14:14:02 +08:00
曹鹏飞 d01129f292 fix(ebom): 异常检查时，T类型只检查描述是否为空 2024-05-17 14:07:40 +08:00
曹鹏飞 48ac27cdea fix(ebom): 优化创建根节点的设置 2024-05-17 14:06:28 +08:00
曹鹏飞 0e41732dc8 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-05-17 13:38:32 +08:00
曹鹏飞 314aceba8b fix(ebom): 优化从excel导入 2024-05-17 13:38:06 +08:00
大米 4d07895aff 1.替换项合并 2024-05-17 12:28:25 +08:00
曹鹏飞 00d7b093b0 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-05-16 19:41:52 +08:00
大米 af37144ba0 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-05-16 17:36:29 +08:00
大米 11c27f963e 1.替换项合并 2024-05-16 17:36:24 +08:00
曹鹏飞 cb8c71bca6 fix(ebom): 优化从excel导入 2024-05-16 17:22:03 +08:00
曹鹏飞 71c8605df6 Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into sit 2024-05-16 11:40:23 +08:00
曹鹏飞 1da8f1f7bb Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-05-16 11:37:00 +08:00
曹鹏飞 372754d0f9 Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom 2024-05-16 11:36:18 +08:00
曹鹏飞 d43c9153c9 feat(dqbom): 从excel导入时如果编号为空，图号不为空，则编号使用主物料编号 2024-05-16 11:35:47 +08:00
大米 47da3a9d58 1.修复从CAD 获取 2024-05-16 10:58:59 +08:00
大米 4a1c6c00d6 1.修复从CAD 获取 2024-05-16 10:58:33 +08:00
曹鹏飞 d04b48d43f feat(ebom): 过渡版31码生成虚拟包逻辑调整 2024-05-16 10:58:16 +08:00
大米 eafeca270c Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-05-16 10:15:53 +08:00
大米 ae56989682 1、一般零部件项目类别默认为L 
2  替换物料项目类别默认为L
 2024-05-16 10:15:47 +08:00
曹鹏飞 bc2a737d54 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-05-15 11:21:43 +08:00
luoliming f22e96b99b 字段异常 2024-05-15 11:19:06 +08:00
曹鹏飞 785e907aa0 feat(pbom): pbom导入到SAP时，将所有子级发货包数据提层到顶级发货包中 2024-05-15 09:38:40 +08:00
曹鹏飞 c0a9a36d42 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-05-15 08:48:20 +08:00
曹鹏飞 6be300161d feat(pbom): pbom导入到SAP时，将所有子级发货包数据提层到顶级发货包中 2024-05-14 19:16:30 +08:00
大米 d20cc3dc57 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-05-14 16:48:01 +08:00
大米 b7506360c9 1、T项检查 
2、T项转Pbom逻辑调整
 2024-05-14 16:47:54 +08:00
曹鹏飞 01436b7b9c feat(ebom): 从excel导入时，添加对T项物料的支持 2024-05-13 10:47:34 +08:00
曹鹏飞 dd29a68c85 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-05-13 10:20:03 +08:00
曹鹏飞 5984358ff6 feat: 导入到SAP时，如果项目类型为Z，则修改为L 2024-05-13 10:19:01 +08:00
曹鹏飞 0a40731042 fix(ebom): 从excel导入时识别虚拟包 2024-05-11 16:30:54 +08:00
曹鹏飞 29215e70ef fix(ebom): 修改source_row_id由long变为string的相关问题 2024-05-11 15:51:19 +08:00
曹鹏飞 afec61231a 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/VirtualPackageBase.java
 2024-05-11 15:37:25 +08:00
曹鹏飞 92b57a06f0 fix(ebom): 修改source_row_id由long变为string的相关问题 2024-05-11 15:34:08 +08:00
jing's a411e7f8b5 source_row_id 类型变更 2024-05-11 15:12:33 +08:00
大米 89ba5d49ce 1、合并一般零部件 2024-05-11 14:50:53 +08:00
曹鹏飞 9cfa61c5bd Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom 2024-05-10 17:30:39 +08:00
曹鹏飞 67c7f0b3d8 Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom-transition 2024-05-10 17:30:21 +08:00
曹鹏飞 da8e40c8bd fix(dqbom): 修复导出的数据重复的问题 2024-05-10 17:30:06 +08:00
曹鹏飞 756bb53a39 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-05-10 16:29:34 +08:00
曹鹏飞 8dc7503f39 fix(ebom): 编辑物料列表接口添加是否隐藏虚拟包参数 2024-05-10 16:29:20 +08:00
曹鹏飞 fb77d05288 fix(ebom): 从excel导入时物料单位的设置 2024-05-10 15:59:20 +08:00
jing's 952da323cd Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-05-10 11:50:19 +08:00
jing's 26108a8183 检查物料编码是否在主数据中存在 暂存不需检查，提交时检查 2024-05-10 11:50:05 +08:00
曹鹏飞 5b7dd2d4a5 feat(ebom): 导入sap的接口名由ZRFC_PP_003改为ZRFC_PP_005 2024-05-10 11:42:07 +08:00
曹鹏飞 a1d4e7078b Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-05-10 11:37:52 +08:00
曹鹏飞 a01f658296 feat(ebom): 导入sap的接口名由ZRFC_PP_003改为ZRFC_PP_005 2024-05-10 11:36:46 +08:00
曹鹏飞 bb6ef479e9 feat(ebom): 添加ebom导入模板下载接口 2024-05-10 11:28:26 +08:00
曹鹏飞 d92ecb727f feat(ebom): 修复从excel导入数据的bug 2024-05-10 11:21:22 +08:00
曹鹏飞 95cec05802 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-05-09 09:35:36 +08:00
曹鹏飞 74f01453e4 Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom 2024-05-09 09:35:18 +08:00
曹鹏飞 4b706e9ec2 fix(ebom): 虚拟包的child的编辑状态应该跟父级节点一致 2024-05-09 09:35:01 +08:00
大米 bc4a83b0f4 Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into feature/DM/nflg-bom-transition 2024-05-09 08:48:21 +08:00
大米 467163889f 1、修复生成虚拟包，1010工厂制作包下无子级的问题 2024-05-09 08:48:17 +08:00
曹鹏飞 3ed29cd977 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-05-09 08:36:07 +08:00
曹鹏飞 213f9a3277 Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom 
# Conflicts:
#	nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java
 2024-05-09 08:35:50 +08:00
曹鹏飞 adf65265ba feat: 添加sap状态字段 2024-05-09 08:34:04 +08:00
曹鹏飞 1498f3974f Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-05-09 08:16:39 +08:00
曹鹏飞 a03a1bb28d Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom 2024-05-09 08:16:22 +08:00
曹鹏飞 4251feac9b feat(导入到sap): 修复设置导入sap状态的bug 2024-05-09 08:15:17 +08:00
曹鹏飞 a7c1b74272 feat(电气bom): 导入数据时，如果类型为空，则设置为L 2024-05-09 08:11:05 +08:00
曹鹏飞 d5eab98ac5 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/VirtualPackageBase.java
 2024-05-08 17:55:04 +08:00
曹鹏飞 b528abf66a Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-05-08 17:52:13 +08:00
曹鹏飞 862a88dbf6 feat: ebom从excel导入数据 2024-05-08 17:30:38 +08:00
曹鹏飞 1e7cd5bdcc feat: 修复生成虚拟包后异常检查时提示单位不一致的问题 2024-05-08 16:26:04 +08:00
大米 e8f4ce7653 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-05-08 16:25:13 +08:00
大米 3ded3ba819 1、生成虚拟包加原始单位 2024-05-08 16:25:09 +08:00
曹鹏飞 ac19a53988 feat: ebom从excel导入数据 2024-05-08 16:02:07 +08:00
曹鹏飞 d88a87c3e3 Revert "feat: ebom从excel导入数据" 
This reverts commit 70dd9d0211.
 2024-05-08 15:57:19 +08:00
曹鹏飞 e428c950ca Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-05-08 15:35:56 +08:00
曹鹏飞 b875a6af97 Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom 2024-05-08 15:35:34 +08:00
曹鹏飞 70dd9d0211 feat: ebom从excel导入数据 2024-05-08 15:35:15 +08:00
曹鹏飞 158dc0db42 fix: ebom异常检查逻辑调整 2024-05-08 15:34:20 +08:00
大米 a929268572 1、修复初始化异常错误 2024-05-08 14:54:26 +08:00
曹鹏飞 a60cae3d6a fix: 单位不一致，且exceptionTag为空或不包含16时，设置异常状态为16 2024-05-08 09:46:12 +08:00
曹鹏飞 3328751de2 Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom-transition 2024-05-07 16:36:58 +08:00
曹鹏飞 b2ce1def5a fix: 修复一个sql错误 2024-05-07 16:36:30 +08:00
曹鹏飞 322728580c Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom-transition 2024-05-07 16:24:06 +08:00
曹鹏飞 8a5c47a1f4 fix: 修复一个sql错误 2024-05-07 16:22:32 +08:00
大米 8bb92c0c7e Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into feature/DM/nflg-bom-transition 2024-05-07 15:38:27 +08:00
大米 1f2a52b20f 1、合并标准版 2024-05-07 15:37:38 +08:00
曹鹏飞 6592e61da9 Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom-transition 2024-05-07 14:40:52 +08:00
曹鹏飞 e91d30d86f feat: 添加查看ebom对应的原始bom数据 2024-05-07 14:13:42 +08:00
大米 198dd1e76a 1、合并标准版 2024-05-07 13:38:15 +08:00
大米 f7495c978f Merge branch '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/VirtualPackageBase.java
 2024-05-07 13:35:47 +08:00
曹鹏飞 a70b91267c Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom 2024-05-07 11:14:26 +08:00
曹鹏飞 8f1fb6c330 feat: 添加导出错误信息到excel的接口，数据由前端传过来 2024-05-07 11:10:55 +08:00
曹鹏飞 ca66acc0a3 feat: ebom编辑页面也需要跟电气专用bom的编辑页面一样有父级异常导航 2024-05-07 11:08:50 +08:00
大米 362f6c7ce0 1、生成虚拟包批量查询主数据-缩短生成虚拟包时间 2024-05-06 13:44:02 +08:00
大米 16a71b3af3 1、过渡版需求 2024-05-06 11:43:13 +08:00
大米 601c6205d5 1、过渡版需求 2024-05-06 11:38:37 +08:00
大米 807e177d39 1、31码同时生成1020虚拟包 2024-05-06 11:05:15 +08:00
大米 f0add5e114 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-05-06 09:39:35 +08:00
大米 d24c954cb4 1、过渡版需求－另一个分支 2024-05-06 09:39:28 +08:00
luoliming 9eb3b36296 单位异常 2024-05-04 15:24:15 +08:00
大米 5d1e9418f4 1、单位异常 2024-05-02 16:54:08 +08:00
大米 ec0e175dfb 1、从CAD获取and 转换 2024-05-02 16:33:54 +08:00
大米 8c383c4356 1、从CAD获取and 转换 2024-05-02 16:31:15 +08:00
大米 f050f869c4 1、相同物料异常检查（物料编码+项目类别） 2024-05-02 16:18:42 +08:00
大米 77197c169a 1、ebom-从cad获取并转换 2024-05-02 16:00:10 +08:00
曹鹏飞 1a992bde94 Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom 2024-04-30 17:54:16 +08:00
曹鹏飞 5a9948635e optimize: 优化导入SAP功能错误信息返回 2024-04-30 17:53:55 +08:00
曹鹏飞 39f16244ca Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom 2024-04-29 11:35:42 +08:00
曹鹏飞 be9702a415 feat: 导入sap添加I_EMPNO字段，表示创建人 2024-04-29 11:32:01 +08:00
曹鹏飞 c70ead664b feat: 导入sap添加I_EMPNO字段，表示创建人 2024-04-29 11:15:09 +08:00
曹鹏飞 8a68c880b8 Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom 2024-04-29 10:31:39 +08:00
曹鹏飞 8010099b94 fix: 修复导出excel数据中名字字段数据为空的问题 2024-04-29 10:20:24 +08:00
曹鹏飞 a16939fe8d Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom 2024-04-29 10:08:01 +08:00
曹鹏飞 119e0d5faa feat: pbom增加导出到sap接口 2024-04-29 10:06:22 +08:00
曹鹏飞 10e545f6d1 fix: 修复导出excel数据中名字字段数据为空的问题 2024-04-29 09:52:55 +08:00
曹鹏飞 fa51e7dacd feat: ebom工作明细列表和正式表列表模糊搜索添加对“只显示自己”数据的支持 2024-04-29 09:35:48 +08:00
曹鹏飞 87521e0dbc optimize: 保存数据时，如果是T项，且数量为空或者为0，则将数量改为1 2024-04-29 08:59:12 +08:00
曹鹏飞 dcc5f031b2 fix: 修复删除时根节点无下级导致sql异常的问题 2024-04-29 08:38:17 +08:00
曹鹏飞 8634cffaf7 fix: pbom导出时将T类型的编号和图号置为空 2024-04-29 08:19:54 +08:00
曹鹏飞 7deeff6c0f Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom 2024-04-28 18:00:07 +08:00
曹鹏飞 58c4a166d4 fix: 修改导入sap 2024-04-28 17:59:15 +08:00
曹鹏飞 7545e35fbf fix: 修复电气bom导入sap成功后，bom状态会变成待转换的问题；导入到sap的物料单位改为使用主物料单位 2024-04-28 10:54:37 +08:00
曹鹏飞 a6ee24c8c5 fix: 更新物料行逻辑调整 2024-04-28 09:32:08 +08:00
曹鹏飞 53974c8cf6 optimize: 导入sap时，如果是T项，则需要设置POTX1 2024-04-28 09:01:18 +08:00
曹鹏飞 8267a8e137 Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom 2024-04-27 18:49:27 +08:00
曹鹏飞 9029365491 optimize: 优化电气bom导入sap返回数据 2024-04-27 18:49:00 +08:00
曹鹏飞 7e9b3d3d83 Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom 2024-04-27 18:30:20 +08:00
曹鹏飞 a9c9f1d16f optimize: 优化电气bom导入sap返回数据 2024-04-27 18:29:36 +08:00
曹鹏飞 0845ceb2ea Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into dev 2024-04-27 17:55:04 +08:00
曹鹏飞 48b97879a3 optimize: 电气bom优化 2024-04-27 17:54:19 +08:00
曹鹏飞 2f138ae0c0 optimize: 电气bom功能 2024-04-26 16:02:27 +08:00
曹鹏飞 b6273ac9ae optimize: 优化导入SAP返回的错误信息 2024-04-26 16:01:28 +08:00
曹鹏飞 850c44a18b fix: 电气bom调整 2024-04-26 13:39:15 +08:00
曹鹏飞 6e2fe973e0 fix: 电气bom调整 2024-04-26 10:57:11 +08:00
曹鹏飞 150649ed65 fix: 调整导入sap的参数 2024-04-26 10:30:03 +08:00
曹鹏飞 251d5b6bbd fix: 电气bom优化 2024-04-25 19:37:36 +08:00
曹鹏飞 43b5c198c8 Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into dev 2024-04-25 16:56:31 +08:00
曹鹏飞 beedcbeb27 fix: 电气bom优化 2024-04-25 16:55:54 +08:00
曹鹏飞 25ea8efdf4 feat: ebom转pbom时，导入数据到sap，另增加单独导入sap的接口 2024-04-25 16:47:14 +08:00
曹鹏飞 515a72c325 fix: 设计人员只能查看自己的待复核和已退回数据 2024-04-25 14:53:55 +08:00
曹鹏飞 36e0e5c293 feat: 如果导入的单位跟物料主数据单位不一致，则提示数据不一致异常 2024-04-25 14:26:01 +08:00
曹鹏飞 b34beca4f2 feat: 相同编号的物料，如果项目类型不同，则判断为正常，否则提示数据重复 2024-04-25 13:33:18 +08:00
曹鹏飞 67160f8f1f feat: 删除ebom时，不再需要重置原始bom的对应数据状态 2024-04-25 11:46:48 +08:00
曹鹏飞 4292ffa0ac Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into dev 2024-04-25 10:12:10 +08:00
曹鹏飞 9df131228d fix: 电气专用bom添加T物料的描述是否为空异常检查 2024-04-25 10:11:23 +08:00
曹鹏飞 fc738cd40f fix: 电气专用bom 2024-04-24 18:09:11 +08:00
曹鹏飞 4eb73250aa Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into dev 2024-04-24 15:54:27 +08:00
曹鹏飞 78e10a798f fix: 设置rowid 2024-04-24 15:54:05 +08:00
曹鹏飞 dcba8da420 fix: 设置更新时间 2024-04-24 15:41:35 +08:00
曹鹏飞 6dae84e4a9 Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into dev 2024-04-24 15:33:23 +08:00
曹鹏飞 97401dfbdb fix: 设置bomRowId 2024-04-24 15:32:56 +08:00
曹鹏飞 2998137e35 fix: 移除废弃的方法 2024-04-24 15:19:23 +08:00
曹鹏飞 58f062e8bf Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into dev 2024-04-24 15:17:33 +08:00
曹鹏飞 44ff90fb26 fix: 修复一些问题 2024-04-24 15:16:55 +08:00
曹鹏飞 528cf20ab8 feat: [excel未处理问题9]生成虚拟包调整 2024-04-24 15:11:57 +08:00
曹鹏飞 5694f87128 feat: 电气专用bom功能 2024-04-24 09:50:03 +08:00
曹鹏飞 49708ff593 feat: 电气专用bom功能 2024-04-24 09:14:25 +08:00
曹鹏飞 affa1426b8 feat: 电气专用bom功能 2024-04-23 18:21:08 +08:00
曹鹏飞 cbb41e2519 feat: 电气专用bom功能 2024-04-23 10:59:15 +08:00
曹鹏飞 a1666c26b4 fix: 填充信息 2024-04-23 10:58:44 +08:00
曹鹏飞 b1c757938b feat: 电气专用bom功能 2024-04-22 17:17:57 +08:00
曹鹏飞 f8ede45454 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-dq 2024-04-22 15:11:11 +08:00
曹鹏飞 2f88516812 feat: 电气专用bom功能 2024-04-22 15:07:46 +08:00
曹鹏飞 f12a19cba4 fix: 优化异常检查时的根节点判断逻辑 2024-04-22 15:07:06 +08:00
luoliming 28c9f1a75b PBOM工作列表 2024-04-21 11:02:53 +08:00
曹鹏飞 140d1b80e9 feat: 电气专用bom功能 2024-04-21 10:45:33 +08:00
曹鹏飞 d4075470f6 fix: 顶级数据不检查项目类别是否为空 2024-04-21 10:42:22 +08:00
曹鹏飞 007cb34971 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-dq 2024-04-21 09:19:15 +08:00
luoliming cb0db31587 F项下挂F项不检查异常 2024-04-20 17:33:41 +08:00
曹鹏飞 d1af5d9fe9 Merge branch 'refs/heads/dev' into feature/DM/nflg-bom-dq 2024-04-19 08:11:58 +08:00
曹鹏飞 77b7b523eb Merge branch 'refs/heads/feature/excel-132' into dev 2024-04-19 08:11:12 +08:00
曹鹏飞 e0849b3470 Merge branch 'refs/heads/dev' into feature/DM/nflg-bom-dq 
# Conflicts:
#	nflg_project_dev/nflg-bom-new/src/test/java/com/nflg/product/bomnew/service/test/OtherTest.java
 2024-04-19 08:08:58 +08:00
曹鹏飞 acbd76a8bf feat: 电气专用bom功能 2024-04-18 21:22:34 +08:00
曹鹏飞 15845a21f1 Merge branch 'refs/heads/feature/DM/nflg-bom' into dev 2024-04-18 19:33:07 +08:00
大米 a01778112d 1、ebom-转pBOM 2024-04-18 18:53:59 +08:00
大米 626fe44ce6 1、pbom-升级及未发布列表不显示问题 2024-04-18 18:13:39 +08:00
大米 8d26ce919a 1、pbom-升级及未发布列表不显示问题 2024-04-18 17:28:13 +08:00
曹鹏飞 50977bded2 fix: 计算是否是用户根节点时，排除虚拟包，因为虚拟包的创建人基本上不是bom的创建人 2024-04-18 16:47:52 +08:00
曹鹏飞 b0c88ccb24 fix: [excel-105]添加判断 2024-04-18 14:33:07 +08:00
曹鹏飞 998ac9bc50 feat: [excel-129]支持分类代码为10开头的物料添加工艺包到上级 2024-04-18 14:19:14 +08:00
曹鹏飞 3789b30bf7 feat: [excel-129]支持分类代码为10开头的物料添加工艺包到上级 2024-04-18 13:48:20 +08:00
曹鹏飞 2121978af1 Merge branch 'refs/heads/dev' into feature/excel-132 2024-04-18 11:11:43 +08:00
曹鹏飞 c88ed37c41 feat: [excel-140]原始bom转ebom时，如果物料名称包含虚拟包特有的后缀，则将改物料设置为虚拟包，且更新根节点生成虚拟包的状态 2024-04-18 10:51:08 +08:00
曹鹏飞 39ed6810eb feat: ebom工作表精确搜索排序 2024-04-18 09:15:43 +08:00
曹鹏飞 5956c61075 Merge branch 'refs/heads/dev' into feature/excel-132 
# Conflicts:
#	nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java
#	nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
 2024-04-18 08:26:31 +08:00
曹鹏飞 2154ac2599 feat: 电气专用bom功能 2024-04-18 08:25:08 +08:00
曹鹏飞 a762b57fe2 fix: 修复一个bug 2024-04-17 21:47:20 +08:00
曹鹏飞 4468d8b9ea Merge branch 'refs/heads/feature/DM/nflg-bom' into dev 2024-04-17 21:08:47 +08:00
曹鹏飞 c220cbe8bd feat: 电气专用bom添加功能 2024-04-17 21:08:11 +08:00
luoliming f796e098e5 异常检测 2024-04-17 20:57:39 +08:00
曹鹏飞 9f3fa8f4e9 refactor: 去除异常捕获 2024-04-17 20:21:11 +08:00
曹鹏飞 90e37e00fb Merge branch 'refs/heads/feature/DM/nflg-bom' into dev 
# Conflicts:
#	nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java
 2024-04-17 19:46:38 +08:00
曹鹏飞 eae0999126 feat: ebom工作表不按合并树展示 2024-04-17 19:43:20 +08:00
大米 34b9282301 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-04-17 18:21:06 +08:00
大米 92c7d63a04 1、异常检查问题处理 2024-04-17 18:21:02 +08:00
jing's fe7507e819 EBOM在草稿状态下多次编辑的时候会出现版本增加的情况，这是不应该的。 2024-04-17 16:03:44 +08:00
曹鹏飞 e5fd0d350b fix: 修复空指针异常 2024-04-17 08:22:37 +08:00