Commit Graph

1445 Commits

Author SHA1 Message Date
大米 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
jing's 991c4d287d ebom pbom 版本显示调整 2024-06-20 13:45:59 +08:00
曹鹏飞 d05db2d869 feat(pbom): 导入SAP增加SORT(排序字符串) 2024-06-19 17:39:03 +08:00
曹鹏飞 f030e56db5 fix(pbom): 修复pbom正式表搜索时间范围不生效的问题 2024-06-19 16:31:32 +08:00
曹鹏飞 2e3e1221a5 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-19 16:30:50 +08:00
大米 2e0fbe491d Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-06-19 16:15:56 +08:00
大米 47d2f01e50 1、昨天问题修复 2024-06-19 16:15:47 +08:00
曹鹏飞 dde0fe373f Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-19 15:13:19 +08:00
曹鹏飞 e06704fe6c fix(ebom): 添加部门id 2024-06-19 13:43:18 +08:00
曹鹏飞 4efbf98253 optimize: 优化数据验证 2024-06-19 13:42:56 +08:00
曹鹏飞 d5f948916b optimize: 优化http请求和响应输出 2024-06-19 13:35:58 +08:00
曹鹏飞 f4846bdc07 fix: 添加数据格式错误异常的友好提示 2024-06-19 13:35:36 +08:00
曹鹏飞 1d50b4686d fix(ebom): 增加为空判断 2024-06-19 08:22:12 +08:00
曹鹏飞 9ae5eaaed6 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-18 16:19:59 +08:00
大米 313ffc9532 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
# Conflicts:
#	nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
2024-06-18 16:16:34 +08:00
大米 13d88007ec 1、转pbom报错问题 2024-06-18 16:14:42 +08:00
曹鹏飞 42d4c1c47d Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-18 15:35:31 +08:00
曹鹏飞 0dc234ff71 feat(ebom): 修复异常检查,如果不是检查根节点时,会出现项目类型为空的异常 2024-06-18 15:35:06 +08:00
曹鹏飞 4a2e64a657 fix(ebom): 添加dept_row_id 2024-06-18 15:33:28 +08:00
曹鹏飞 7dec2c1198 optimize(ebom): 优化错误提示 2024-06-18 15:32:56 +08:00
jing's ea95483620 移动 ebom 同步主数据 2024-06-18 15:10:19 +08:00
jing's e70fb3135a Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-06-18 13:15:25 +08:00
jing's ddb1db41ea 机台号[A-Za-z0-9]{1,5} 2024-06-18 13:15:05 +08:00
jing's 92c254a515 同步主物料 2024-06-18 13:14:28 +08:00
曹鹏飞 2997383147 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-18 11:11:05 +08:00
曹鹏飞 34bfde31c8 fix(ebom): 添加dept_row_id 2024-06-18 11:10:20 +08:00
曹鹏飞 76a4a90ea7 fix(ebom): 恢复被错误移除的代码 2024-06-18 11:07:22 +08:00
曹鹏飞 c3a7c09707 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-18 11:05:56 +08:00
大米 5d74b9e8d0 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-06-18 10:37:33 +08:00
大米 7c4da752c0 1、昨天问题修复 2024-06-18 10:37:28 +08:00
曹鹏飞 44c714816a 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/EBomEdit.java
2024-06-18 09:59:40 +08:00
曹鹏飞 17e3523b83 optimize: 添加http日志记录
将请求内容和响应内容记录到日志文件,可根据配置开启或关闭该功能
2024-06-18 09:54:30 +08:00
曹鹏飞 39a8f28b20 fix(ebom): 工作表编辑页面暂存时,没有下级也需要可以保存 2024-06-18 09:53:13 +08:00
曹鹏飞 8b9bbb1ce8 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-17 17:29:58 +08:00
曹鹏飞 925b883916 optimize(ebom): 异常检查移除废弃的代码 2024-06-17 16:54:25 +08:00
曹鹏飞 7db789d7ac Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-17 15:55:53 +08:00
曹鹏飞 1a9b7154cc optimize: 优化异常提示信息 2024-06-17 15:50:33 +08:00
曹鹏飞 1d59e425e9 fix(ebom): 如果没有历史版本则将本次转正式的数据复制到formal表 2024-06-17 15:05:27 +08:00
曹鹏飞 65d71b8e69 optimize(ebom): 导入到SAP时F项不需要提层,只需要把空的直发包丢弃 2024-06-17 11:36:04 +08:00
曹鹏飞 b9f37aea55 optimize: 添加物料时,去掉同步到OA,由主物料服务来同步 2024-06-17 10:43:02 +08:00
曹鹏飞 1ec4e16bd7 fix(ebom): 添加dept_row_id 2024-06-17 10:41:50 +08:00
曹鹏飞 e1c03a2b55 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-16 18:33:52 +08:00
jing's 9a44353c8d Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-06-16 17:24:50 +08:00
jing's 84df8d7394 ebom正式表使用ebom表字段 2024-06-16 17:24:44 +08:00
曹鹏飞 aaa3545f3a Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-16 16:14:58 +08:00
大米 5b3509dccd 1、ebom 转 pbom 2024-06-16 12:46:32 +08:00
曹鹏飞 d91db60c95 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/EbomApi.java
#	nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomChildMapper.java
#	nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java
#	nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomChildMapper.xml
2024-06-15 19:51:02 +08:00
大米 1a459a6057 1、ebom,pbom 正式表保存所有正式版数据 2024-06-15 17:44:23 +08:00
大米 ac9901a0a1 1、EBOM正式版转PBOM逻辑调整 2024-06-15 14:21:49 +08:00
大米 bc423b6cd6 1、EBOM转PBOM逻辑调整 2024-06-15 11:07:34 +08:00
曹鹏飞 4ce8b7c41a Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-14 15:12:35 +08:00
曹鹏飞 171854351e fix(ebom): 导入SAP的F项提层优化 2024-06-14 15:10:14 +08:00
大米 faf0071638 1、CAD转EBOM新逻辑调整 2024-06-14 14:43:26 +08:00
大米 0dd9dd5943 1、CAD转EBOM新逻辑调整 2024-06-14 14:40:58 +08:00
曹鹏飞 a54b186845 feat(ebom): 从excel导入逻辑调整(旧版本是正式表则升级小版本;旧版本是工作表且是其他人创建则提示,旧版本是工作表且是自己创建则覆盖) 2024-06-14 14:12:31 +08:00
曹鹏飞 acc2e770fd feat(ebom): 工作表借用件支持展开显示 2024-06-14 13:34:13 +08:00
曹鹏飞 7806d18874 fix(ebom): 修复精确搜索不能跨部门的问题 2024-06-14 13:33:12 +08:00
曹鹏飞 7ff168fd1a optimize(移动破mbom): 导入SAP状态值调整 2024-06-14 09:01:15 +08:00
曹鹏飞 d4788a1d4a fix(ebom): 调整事务位置 2024-06-14 08:10:43 +08:00
曹鹏飞 be2a133e2b fix(ebom): 修复暂存和提交报错的问题 2024-06-13 17:54:34 +08:00
曹鹏飞 f8d5f29fbc Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-13 15:22:10 +08:00
大米 dfa6939f43 1、事务问题 2024-06-13 14:56:56 +08:00
大米 e76f8bd2e6 1、事务问题 2024-06-13 14:52:42 +08:00
大米 4ddd6d1505 1、事务问题 2024-06-13 14:50:52 +08:00
曹鹏飞 21f6ff70c5 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-07 15:31:55 +08:00
曹鹏飞 dd891fe137 fix(ebom): 修复数量计算问题 2024-06-07 15:31:32 +08:00
曹鹏飞 b577689855 fix(ebom): 转正式表时设置转换人姓名 2024-06-07 15:30:08 +08:00
曹鹏飞 9b64e55981 feat(ebom): 正式表去除仅查看自己的数据 2024-06-07 15:28:40 +08:00
曹鹏飞 511f8c2a3a feat(pbom): 添加导入SAP失败的数量显示和列表 2024-06-07 15:26:48 +08:00
曹鹏飞 e1367525e5 feat(pbom): 添加导入SAP失败的数量显示和列表 2024-06-07 15:25:53 +08:00
曹鹏飞 b0bc503239 fix(ebom): 修改判断条件 2024-06-07 15:18:41 +08:00
曹鹏飞 e8f3da6694 feat(ebom): 导入SAP异常时,也将其加入到待处理列表中 2024-06-06 17:53:57 +08:00
曹鹏飞 343d76b71c fix(pbom): 修复一个bug 2024-06-06 17:52:47 +08:00
曹鹏飞 111456e587 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-06 09:46:35 +08:00
曹鹏飞 aea94aa852 feat(pbom): 重写复制功能 2024-06-06 09:46:10 +08:00
大米 3b68e7c76f 1、合并数量问题 2024-06-06 09:41:05 +08:00
大米 839a2bd0d4 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-06-06 09:10:18 +08:00
大米 9a89d903cc 1、合并数量问题 2024-06-06 09:09:56 +08:00
曹鹏飞 aa3c3f5d37 feat(pbom): 添加筛选条件仅看自己 2024-06-06 08:34:48 +08:00
曹鹏飞 e823ed6e53 feat(pbom): 重写复制功能 2024-06-06 08:34:03 +08:00
曹鹏飞 dfbcad0649 fix(ebom): 修复根节点的判断问题 2024-06-05 16:31:38 +08:00
曹鹏飞 048ac55706 feat(pbom): 重写复制功能 2024-06-05 16:21:31 +08:00
曹鹏飞 997d81dc1b Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-05 11:06:37 +08:00
曹鹏飞 8e30de33c4 optimize: 缓存接口优化 2024-06-05 10:56:30 +08:00
曹鹏飞 dcb52e9779 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-05 10:37:24 +08:00
曹鹏飞 114753d40d optimize: 缓存接口优化 2024-06-05 10:26:42 +08:00
曹鹏飞 0695f98d4c optimize: 缓存接口优化 2024-06-05 09:59:22 +08:00
曹鹏飞 678c6c1fdd Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-05 08:51:06 +08:00
曹鹏飞 16ddc6855b optimize(ebom): 转pbom时设置编辑状态为已处理,同时设置下级节点的child编辑状态为已处理 2024-06-05 08:50:25 +08:00
曹鹏飞 8719140089 fix(ebom): 工作表搜索时只搜索草稿数据 2024-06-04 17:33:29 +08:00
曹鹏飞 ec5ef37346 feat(dqbom): 同步到pbom时设置source 2024-06-04 17:09:54 +08:00
曹鹏飞 3d7e49d19e Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-04 17:09:04 +08:00
曹鹏飞 5cfc095c29 feat(pbom): 增加source字段 2024-06-04 17:03:33 +08:00
曹鹏飞 855eddfc1c fix(pbom): 优化根节点判断 2024-06-04 15:50:16 +08:00
曹鹏飞 ae1d544aa1 fix: 导入sap优化 2024-06-04 10:01:37 +08:00
曹鹏飞 5e85f73b2b Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-04 09:18:23 +08:00
曹鹏飞 5a51f0957d feat(ebom): 添加物料名称非空判断 2024-06-04 09:17:37 +08:00
大米 8f57416217 1、pbom发布时状态改未已发布 2024-06-04 08:41:21 +08:00