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

482 Commits

Author SHA1 Message Date
jing's b70a795723 判断调整 2024-01-15 15:34:36 +08:00
大米 0332756cea Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-15 08:50:19 +08:00
jing's a13dc576db 注释 2024-01-14 21:38:13 +08:00
jing's 7ef7eec235 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-14 21:25:01 +08:00
jing's 334174a757 移动破编辑 2024-01-14 21:24:55 +08:00
luoliming b197d757c4 ebom 工作表 2024-01-14 16:54:54 +08:00
luoliming 3a5c231d40 bug修复 2024-01-14 09:38:18 +08:00
大米 268d94b392 变更影响 2024-01-12 16:51:12 +08:00
jing's c5d312ee85 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-12 14:38:28 +08:00
jing's 5aef3c1fe5 移动破调整 2024-01-12 14:38:16 +08:00
大米 46a870b3a1 PBOM-导出 2024-01-12 10:06:20 +08:00
大米 7f8f9dcd27 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-12 09:17:52 +08:00
大米 de4b8a70e5 黄色异常处理 2024-01-12 09:17:45 +08:00
luoliming 7b05c2a126 bug修复 2024-01-11 22:30:50 +08:00
luoliming 2bdeba22bc bug修复 2024-01-11 22:21:39 +08:00
大米 591ed8b390 BUG修复 2024-01-11 18:54:39 +08:00
jing's 9cebd0f021 移动破调整 2024-01-10 23:29:10 +08:00
jing's fa71e7024d 排序 2024-01-10 23:22:52 +08:00
jing's eeb58516de Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-10 23:03:30 +08:00
jing's 413115a082 选项排序升序 2024-01-10 23:03:26 +08:00
luoliming 15fadbdd3a bug修复 2024-01-10 22:48:41 +08:00
jing's 3b15f04be5 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-10 22:24:26 +08:00
jing's 2625956e09 调整 2024-01-10 22:24:21 +08:00
大米 0a08f2f208 PBOM-正式列表搜索 2024-01-10 18:47:40 +08:00
大米 b502414d32 PBOM-正式列表搜索 2024-01-10 14:47:26 +08:00
大米 e8d970d593 PBOM-正式列表搜索 2024-01-10 12:05:32 +08:00
jing's 71098f6fb5 检查异常问题 2024-01-09 23:34:56 +08:00
jing's fa77887c0a Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-09 21:10:39 +08:00
jing's 888e861a6e 调整 2024-01-09 21:10:35 +08:00
大米 e533b3309f PBOM-正式列表搜索 2024-01-09 18:09:22 +08:00
大米 fc72eebcf0 PBOM-列表搜索 2024-01-09 17:21:29 +08:00
大米 12fd066d0c Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-09 12:19:31 +08:00
大米 f6cb5cf326 EBOM修复 2024-01-09 12:19:24 +08:00
jing's a0409d15e5 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-08 22:37:39 +08:00
jing's be8b809c6f 退回 2024-01-08 22:37:34 +08:00
大米 55da2e01c0 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-08 18:43:19 +08:00
大米 b158c48de9 EBOM修复 2024-01-08 18:43:14 +08:00
jing's 76028e0c64 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-08 16:12:53 +08:00
jing's 5e4e0acc7c 查询bug修改 2024-01-08 16:12:34 +08:00
大米 b98fe9b4b2 EBOM修复 2024-01-08 12:30:27 +08:00
大米 41c0b4346e EBOM修复 2024-01-08 11:37:06 +08:00
jing's 72151cb3eb 查询调整 2024-01-07 22:53:01 +08:00
luoliming 1aa13ece77 bug修复 2024-01-07 20:57:40 +08:00
luoliming c17a135723 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-07 19:38:37 +08:00
luoliming 48d69751d8 bug修复 2024-01-07 19:38:16 +08:00
jing's be4d901595 bug修改 2024-01-07 18:13:26 +08:00
jing's e62e5e4cf8 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-07 17:00:15 +08:00
jing's 4a9d799535 更改状态 2024-01-07 17:00:12 +08:00
luoliming 506cf0adea Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-07 16:32:07 +08:00
luoliming c54bb944d9 bug修复 2024-01-07 16:31:42 +08:00
jing's 669150193c Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-07 15:40:48 +08:00
jing's d8eee928e5 bug修复 2024-01-07 15:40:44 +08:00
luoliming a434819d73 bug修复 2024-01-07 15:16:23 +08:00
jing's 42c8f7a1fa get方式 2024-01-07 13:10:27 +08:00
jing's 16620d0d77 调整查询字段 2024-01-07 11:44:16 +08:00
jing's bdb726400f 退回状态显示 2024-01-06 21:46:21 +08:00
jing's d8542fee07 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-06 21:25:21 +08:00
jing's 5119f698b6 退回等调整 2024-01-06 21:25:17 +08:00
大米 460ca0b864 PBOM已发布列表 2024-01-06 18:37:04 +08:00
大米 52afb0fd1c EBOM-物料和图号搜索 2024-01-06 17:36:27 +08:00
大米 c8155b648b EBOM-物料和图号搜索 2024-01-06 17:11:38 +08:00
大米 2112e9f648 EBOM-物料和图号搜索 2024-01-06 17:05:18 +08:00
大米 16f53a4fdb 转EBOM合并相同行 2024-01-06 16:08:11 +08:00
大米 849f02d16a Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-06 13:42:09 +08:00
大米 94cfdfb291 发布Mbom 2024-01-06 13:42:02 +08:00
jing's b29fdd0baf 调整 2024-01-06 12:02:15 +08:00
luoliming 9f20578fef 处理异常 2024-01-05 22:46:19 +08:00
大米 9df337434d Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-05 18:14:18 +08:00
大米 66990bd395 发布Mbom 2024-01-05 18:14:11 +08:00
jing's 269864b22e 判断 2024-01-05 15:13:55 +08:00
jing's 52ab6d5c81 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 
# Conflicts:
#	nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
 2024-01-04 23:28:46 +08:00
jing's 4893ccaba7 异常调整 2024-01-04 23:25:08 +08:00
大米 07db8a3e1d 1.Pbom 2024-01-04 19:09:41 +08:00
大米 7b338c3879 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-04 19:00:20 +08:00
大米 d8406ee9c4 1.Pbom 2024-01-04 19:00:11 +08:00
jing's 9757db017d 支持格式 2024-01-03 23:00:10 +08:00
jing's bd8ed13aca Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-03 22:36:30 +08:00
jing's 5ef293e69c 问题调整 2024-01-03 22:36:25 +08:00
luoliming 1c067a510a 处理异常 2024-01-03 22:35:11 +08:00
大米 be9db5d36f Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-03 19:32:10 +08:00
大米 00a19a8851 1.分工厂 2024-01-03 19:32:02 +08:00
jing's 5bed408ca7 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-03 17:48:30 +08:00
jing's 6ddbda06fc mbom 工作列表 明细 2024-01-03 17:48:26 +08:00
大米 017646bd95 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-03 16:14:27 +08:00
大米 d1ebbff6e4 1.bug修复 2024-01-03 16:14:21 +08:00
jing's f2ed0fb5ca 增加是否带下级 2024-01-02 23:17:36 +08:00
jing's b0d89937ba 查询索引构建 2024-01-02 22:54:25 +08:00
jing's 31d760ffba Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-02 20:53:13 +08:00
jing's d7a8764d26 Mbom 2024-01-02 20:53:09 +08:00
jing's e091b61255 异常调整 2024-01-02 20:51:27 +08:00
大米 298a70817e 1.PBom复制 2024-01-02 19:06:42 +08:00
大米 9fdf28fc8c Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-02 17:01:10 +08:00
大米 60c8599401 1.PBom复制 2024-01-02 17:01:00 +08:00
jing's 47a7940789 调整 2024-01-02 16:26:22 +08:00
jing's 277adf8582 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-02 16:25:10 +08:00
jing's ea7169382e 工厂code 2024-01-02 16:25:06 +08:00
大米 e0073209ba Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-02 13:44:06 +08:00
大米 90fd0cac32 1.插入工艺包 2024-01-02 13:43:53 +08:00
jing's 6099e46245 列表 2024-01-01 21:25:42 +08:00
jing's cf1662caae Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-01 21:15:18 +08:00
jing's 2dec35f109 设置超级物料 2024-01-01 21:15:14 +08:00
大米 f78360da8b 1.pbom-创建工艺包 2024-01-01 18:14:58 +08:00
大米 a12e542595 1.pbom-接口 2024-01-01 17:41:31 +08:00
大米 806b4393d9 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-01 17:37:56 +08:00
大米 3e62acf4cb 1.pbom-接口 2024-01-01 17:37:47 +08:00
jing's 0439b0dbe5 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-01 12:32:46 +08:00
jing's 5d230de4c1 调整 2024-01-01 12:32:40 +08:00
大米 486de65055 1.pbom,mbom 生成 2024-01-01 11:08:52 +08:00
大米 d434ebf6ff 1.pbom,mbom 生成 2024-01-01 11:01:55 +08:00
大米 edbd0c2477 1.pbom,mbom 生成 2024-01-01 11:01:12 +08:00
luoliming 638627b761 处理异常 2023-12-31 22:31:24 +08:00
jing's a042d1fdbf 导出报表 2023-12-30 17:43:13 +08:00
jing's 5ac9665214 excel 导入调整 2023-12-29 21:16:58 +08:00
jing's 852ebe63b3 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 
# Conflicts:
#	nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomEdit.java
 2023-12-29 20:13:00 +08:00
jing's 2813a655e9 excel导入判断 2023-12-29 20:12:11 +08:00
大米 c4fd3f89cb 1.ebom_parent 去掉项目类别 2023-12-29 19:12:27 +08:00
jing's 996d5365c9 导入类型判断 2023-12-29 17:25:52 +08:00
jing's 6b56deff50 +projectType 2023-12-29 15:51:35 +08:00
jing's b684e161ca Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2023-12-29 15:00:05 +08:00
jing's b9c463f5cb 导入 2023-12-29 15:00:01 +08:00
大米 f92674a64b 1.ebom_parent 去掉项目类别 2023-12-29 14:18:00 +08:00
jing's 501ff022c3 编辑调整 2023-12-28 18:31:16 +08:00
jing's 51ddd67849 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2023-12-28 13:36:39 +08:00
jing's f4f992e328 编辑提交 2023-12-28 13:36:34 +08:00
luoliming a88ab0abcb 问题修复 2023-12-27 23:02:22 +08:00
大米 77a04f6911 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
 2023-12-27 19:35:44 +08:00
大米 a5a10166b7 1.转Ebom 2023-12-27 19:32:12 +08:00
jing's 81a1bd6112 已处理调整 2023-12-27 17:51:41 +08:00
jing's a65025da79 调整状态 2023-12-27 17:22:29 +08:00
jing's 6bbf7fd7b0 退回判断调整 2023-12-27 16:42:06 +08:00
jing's 747ab69c96 设计复核 2023-12-27 16:26:25 +08:00
jing's e4e4dca10e 调整 2023-12-27 14:50:27 +08:00
jing's ea8f6f47d4 删除逻辑调整 2023-12-27 14:49:29 +08:00
大米 c7ff541d4d 1.转Ebom 2023-12-27 12:51:59 +08:00
jing's 42169c4bf1 明细检测异常调整 2023-12-27 12:19:03 +08:00
大米 898f9fa5b1 1.转Ebom 2023-12-27 09:24:29 +08:00
jing's 5f8dcf5907 项目类型 2023-12-26 23:32:20 +08:00
jing's 45df2e2b14 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2023-12-26 20:33:08 +08:00
jing's feaaabc4bb 调整 2023-12-26 20:33:04 +08:00
大米 e087fdb4fc 1.异常判断7,9 2023-12-26 19:12:12 +08:00
大米 dfe9dd80ed Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2023-12-26 18:39:22 +08:00
大米 b9f3434995 1.问题修复 2023-12-26 18:39:08 +08:00
jing's ee7e9fa01a Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2023-12-26 16:15:31 +08:00
jing's 55f80f8ed5 更新物料行 2023-12-26 16:15:24 +08:00
大米 b2ce4ad31c 1.问题修复 2023-12-26 16:03:03 +08:00
大米 4f4ecc74c7 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2023-12-26 11:54:05 +08:00
大米 8591089de2 1.问题修复 2023-12-26 11:53:58 +08:00
jing's 8468fba46e 调整 2023-12-26 10:18:10 +08:00
jing's ff395e626a Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2023-12-25 21:59:32 +08:00
jing's 8a287a79af 调整 2023-12-25 21:59:25 +08:00
大米 2ce1562c33 1.初始化项目类别 2023-12-25 11:12:58 +08:00
jing's 7b3f7318ba 调整异常 2023-12-24 22:54:56 +08:00
jing's 0f795e71fd 主物料类别 2023-12-24 19:42:43 +08:00
jing's 9535d8d1df Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2023-12-24 18:17:02 +08:00
jing's d9332c5bc6 删除调整 2023-12-24 18:16:58 +08:00
luoliming 8c65e78750 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2023-12-24 15:26:53 +08:00
luoliming ec3fe0654b 问题修复 2023-12-24 15:26:36 +08:00
jing's cfc4280ba5 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 
# Conflicts:
#	nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java
 2023-12-24 15:10:51 +08:00
jing's 580655a0a8 重新调整编辑 2023-12-24 15:09:59 +08:00
大米 a482f51029 1.初始化项目类别 2023-12-24 12:20:37 +08:00
大米 4d706bf7bb 1.初始化项目类别 2023-12-24 12:06:24 +08:00
大米 eb19755b41 1.转EBOM 2023-12-24 11:57:51 +08:00
大米 9eb0dcd64f 1.转EBOM 2023-12-24 10:21:32 +08:00
大米 9edd49a637 1.转EBOM 2023-12-24 10:00:33 +08:00
luoliming b98cfb6157 问题修复 2023-12-23 21:35:59 +08:00
大米 d94a6653d8 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2023-12-23 19:01:43 +08:00
大米 47aa23a108 1.转PBOM 2023-12-23 19:01:29 +08:00
jing's 8557c82d0a Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2023-12-23 18:27:13 +08:00
jing's faca977b81 调整 2023-12-23 18:27:09 +08:00
大米 de3320b4f1 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2023-12-22 18:52:59 +08:00
大米 6a07b46ea5 1.变更影响 2023-12-22 18:52:51 +08:00
jing's de79c2b22c 格式 2023-12-22 17:56:20 +08:00
jing's 48c5f0024d 编辑操作 2023-12-22 17:54:45 +08:00
jing's d56c1b6b47 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2023-12-22 08:48:11 +08:00
jing's 8160b5c0a6 移动破删除调整 2023-12-22 08:48:06 +08:00
luoliming 10501ccef4 问题修复 2023-12-21 21:49:08 +08:00
jing's 85e077feed Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2023-12-21 19:40:27 +08:00
jing's b0369723b4 更新命名 2023-12-21 19:40:23 +08:00
大米 d7b457b7eb Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2023-12-21 18:01:58 +08:00
大米 34da50be58 1.发起变更 2023-12-21 18:01:48 +08:00
jing's 6ac310c0d0 导入数据结构 2023-12-21 17:32:15 +08:00
jing's 2752ef5f7e Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2023-12-21 17:31:50 +08:00
jing's 392d53784f 编辑 2023-12-21 17:31:45 +08:00
大米 1465ca128c Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2023-12-21 16:36:24 +08:00
大米 200864bb49 1.初始化异常信息 2023-12-21 16:36:17 +08:00
jing's 6748b2b7d0 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2023-12-21 11:27:24 +08:00
jing's 56aa5bc38a 创建根 2023-12-21 11:27:20 +08:00
luoliming 171e434035 问题修复 2023-12-20 22:07:55 +08:00
大米 8d75f3c249 1.生成PBOM 2023-12-20 18:07:17 +08:00
大米 421271510d Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2023-12-20 17:59:44 +08:00
大米 f74c6b1e41 1.生成PBOM 2023-12-20 17:59:17 +08:00
jing's 0b8748bd1f 编辑列表 2023-12-20 16:49:58 +08:00
大米 0e473399ad Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2023-12-19 19:40:55 +08:00
大米 0842074753 1.生成PBOM 2023-12-19 19:40:46 +08:00
luoliming c19d7348f0 问题修复 2023-12-18 22:07:35 +08:00
jing's e64f740985 导出格式 2023-12-18 21:42:53 +08:00
jing's 43186e2433 变更 2023-12-18 21:32:49 +08:00
jing's 8c2b28999a Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2023-12-18 21:15:08 +08:00
jing's 592d61ab74 复核 2023-12-18 21:14:54 +08:00
大米 0a3facd6e7 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2023-12-18 18:11:33 +08:00