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

1133 Commits

Author SHA1 Message Date
luoliming cc20530e0d Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-05-25 14:55:12 +08:00
luoliming 4643194820 修复问题1 2024-05-25 14:54:59 +08:00
曹鹏飞 bbc2e3331a 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-25 14:40:40 +08:00
曹鹏飞 f8775f4720 Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom 2024-05-25 14:38:37 +08:00
曹鹏飞 7ec0952f6d feat(dqbom): 添加批量查询物料信息的接口 2024-05-25 14:38:25 +08:00
曹鹏飞 84ea802dff feat(ebom): 添加批量查询物料信息的接口 2024-05-25 14:38:07 +08:00
luoliming 4f74c84fd7 31转PBOM报错问题 2024-05-25 14:23:09 +08:00
曹鹏飞 119b147665 optimize: 调整超时时间 2024-05-25 12:09:03 +08:00
曹鹏飞 63ed4ef299 feat: 小调整 2024-05-25 12:07:11 +08:00
曹鹏飞 30b2073999 other: 添加sap所需要的so文件 2024-05-25 12:06:51 +08:00
曹鹏飞 b4693fa64a feat(ebom): 修复31码生成虚拟包的问题 2024-05-25 12:05:18 +08:00
曹鹏飞 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