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

1447 Commits

Author SHA1 Message Date
大米 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
大米 bc27a53800 1.ebom-转换 2023-12-18 18:11:26 +08:00
jing's c42b94c04d 修正 2023-12-18 16:11:29 +08:00
jing's 2d08411025 调整模版格式及解析 2023-12-18 15:33:43 +08:00
大米 0df472a26b 1.ebom-列表 2023-12-18 13:54:57 +08:00
大米 93a34b0f5c Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2023-12-18 11:06:56 +08:00
大米 38114f9e01 1.ebom-列表 2023-12-18 11:06:49 +08:00
jing's a33ff76c24 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2023-12-17 23:39:46 +08:00
jing's af8b0c5f24 设计复核 2023-12-17 23:39:42 +08:00
大米 0f098e8010 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2023-12-17 18:21:08 +08:00
大米 6575cf0503 1.ebom-列表 2023-12-17 18:21:01 +08:00
jing's ddaa164e63 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2023-12-17 16:55:28 +08:00
jing's b596262fb7 项目异常枚举 2023-12-17 16:55:23 +08:00
大米 1558c5ba2a 1.ebom-列表 2023-12-17 16:11:00 +08:00
大米 4c1c2a1040 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2023-12-17 15:32:48 +08:00
大米 41efa06134 1.ebom-列表 2023-12-17 15:32:40 +08:00
jing's ee87af7818 退回-更改人 2023-12-17 15:31:19 +08:00
jing's d4f526a235 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2023-12-17 15:30:02 +08:00
jing's b241177dbd 退回 2023-12-17 15:29:58 +08:00
大米 915c983e0e 1.ebom-列表 2023-12-17 15:23:25 +08:00
luoliming 5cc3e2d6e2 生成虚拟包 2023-12-16 13:15:17 +08:00
jing's e605d8c9cc Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2023-12-15 22:00:55 +08:00
jing's daf2290217 列表增加物料Id 2023-12-15 22:00:41 +08:00
大米 eec1b3e67a 1.生成虚拟包 2023-12-15 18:35:48 +08:00
大米 5de835ec6e Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2023-12-15 18:28:59 +08:00
大米 cbf02496eb 1.生成虚拟包 2023-12-15 18:28:47 +08:00
jing's 520d61d8ef 调整导入异常提示 2023-12-15 10:13:09 +08:00
jing's 787bab6b8d 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/excel/ExportDeviceHelper.java
 2023-12-15 09:51:33 +08:00
jing's 33fbf9e706 调整 2023-12-15 09:49:42 +08:00
jing's 946c2e27db 设备导出excel 及模版下载 2023-12-14 23:17:29 +08:00
jing's 112a69babe Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2023-12-14 21:01:22 +08:00
jing's 182bf3af09 提示信息 2023-12-14 21:01:11 +08:00
大米 350c68897b Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2023-12-14 19:20:07 +08:00
大米 30cb57cbc2 1.自动分配项目类别 2023-12-14 19:20:02 +08:00
jing's 3a7c945643 需求变更 解析excel调整 2023-12-14 18:51:53 +08:00
大米 c46cf90bc4 1.原始BOM到Ebom转换 2023-12-14 17:57:37 +08:00
大米 312004ee61 1.bug修复 2023-12-12 18:37:23 +08:00
jing's 2166a0a33f 移动破修改 2023-12-11 21:39:32 +08:00
jing's 25df92278a 条件判断 2023-12-11 18:40:44 +08:00
jing's 8f8184a7ce 排序 2023-12-10 22:23:27 +08:00
jing's 6016813669 模版文件 2023-12-10 22:14:02 +08:00
jing's e9dbda664a 模版下载 2023-12-10 22:05:39 +08:00
BF-202309241046\Administrator 314f98c468 调整 2023-12-10 14:56:10 +08:00
BF-202309241046\Administrator 47672c0f50 问题修复 2023-12-10 11:51:10 +08:00
BF-202309241046\Administrator f7bb3dc50f Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2023-12-10 10:30:14 +08:00
BF-202309241046\Administrator 8428a44461 导出excel修复 2023-12-10 10:30:10 +08:00
luoliming 1d6ee020b2 问题修复 2023-12-10 09:13:49 +08:00
BF-202309241046\Administrator 7793636288 调整获取方法 2023-12-10 08:48:34 +08:00
luoliming b605864b08 问题修复 2023-12-10 07:13:56 +08:00
luoliming ae989f0b51 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2023-12-09 23:22:27 +08:00
luoliming 9838d37410 问题修复 2023-12-09 23:22:07 +08:00
jing's 3835f95999 替换函数 2023-12-09 23:09:04 +08:00
BF-202309241046\Administrator 318858cbf6 申请物料 2023-12-09 23:05:06 +08:00
BF-202309241046\Administrator 4619cd3843 bug修改 2023-12-09 22:48:11 +08:00
大米 7f52eeb7d7 1,申请物料编码 2023-12-09 19:17:40 +08:00
jing's 9eed007bcd 注释 2023-12-08 23:58:06 +08:00
jing's 07e18c2c54 发布功能 2023-12-08 23:06:04 +08:00
jing's a99e3e5ab8 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/MaterialService.java
#	nflg_project_dev/nflg-bom-new/src/test/java/com/nflg/product/bomnew/service/test/MaterialServiceTest.java
 2023-12-08 20:10:31 +08:00
jing's 062582cbc1 test 2023-12-08 20:06:36 +08:00
jing's 6c13ac2535 调整 2023-12-08 20:05:34 +08:00
大米 3df3a2a782 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2023-12-08 18:49:31 +08:00
大米 e456a257a5 1,申请物料编码 2023-12-08 18:49:22 +08:00
jing's 8bf84be97f 获取登录token 2023-12-08 18:18:52 +08:00
jing's f6ff56487f 格式 2023-12-08 18:15:48 +08:00
jing's 949018b359 发布功能 2023-12-08 18:13:18 +08:00
大米 d990adb50c 1,转EBOM 2023-12-08 15:24:19 +08:00
大米 056e2409fa Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2023-12-08 10:51:50 +08:00
大米 b2dc5fa1b7 1,申请物料编码 2023-12-08 10:51:42 +08:00
jing's 4a8f37e146 测试主数据申请 2023-12-07 13:14:42 +08:00
jing's 4b31aa654b 查询设备条件调整 2023-12-07 11:29:25 +08:00
jing's cccd16603f 问题修复 2023-12-07 10:53:23 +08:00
jing's d1d997734e Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2023-12-07 10:52:59 +08:00
大米 056f908093 修复excel导入缺材料，序号问题 2023-12-07 09:47:56 +08:00
luoliming 6e39ab8e39 问题修复 2023-12-07 00:01:52 +08:00
luoliming 5add5d4215 问题修复 2023-12-06 23:29:38 +08:00
luoliming 1b81a44e01 问题修复 2023-12-06 21:59:28 +08:00
jing's b6cd238c50 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2023-12-06 18:10:19 +08:00
jing's ee5f977825 报表导出 2023-12-06 18:09:34 +08:00
大米 b821b9e2cb 申请物料及BUG修复 2023-12-06 17:25:37 +08:00
大米 33db073a57 申请物料及BUG修复 2023-12-06 14:01:58 +08:00
大米 777f09771b 申请物料及BUG修复 2023-12-05 17:13:05 +08:00
大米 eaeee81dff 申请物料及BUG修复 2023-12-05 17:08:21 +08:00
jing's d137c92473 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2023-12-05 17:00:59 +08:00
jing's 48c7a0755d model dto 2023-12-05 17:00:45 +08:00
大米 8d6ed1786e 申请物料 2023-12-05 13:33:25 +08:00
大米 6373b76471 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2023-12-05 13:32:45 +08:00
大米 5c11ad0006 申请物料 2023-12-05 13:32:40 +08:00
jing's 120dd9e457 调整 2023-12-04 22:53:00 +08:00
jing's 430be021ab bug修改 2023-12-04 20:24:24 +08:00
jing's 93eda31ccb bug修改 2023-12-04 09:54:08 +08:00
jing's 16b4638316 增加验证判断 2023-12-03 21:41:26 +08:00
jing's 0ad7855ec2 发布 2023-12-03 20:12:41 +08:00
jing's d50ca019c3 发布功能 2023-12-03 19:36:20 +08:00
jing's 221fe95c89 导入数据异常提示 2023-12-03 15:04:53 +08:00
jing's cfe463e1f1 已发布物料查询 2023-12-03 14:43:12 +08:00
jing's d5a4e1b130 导入excel处理 2023-12-03 11:08:19 +08:00
jing's bb9c84be60 配置删除 2023-12-03 10:23:27 +08:00
jing's fc061eb12c sap lib 2023-12-03 10:08:07 +08:00
jing's bf010120ce Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2023-12-03 09:56:13 +08:00
jing's 16775fac5d 导入设备excel 2023-12-03 09:56:01 +08:00
jing's 48afb04d94 导入设备excel 2023-12-03 09:54:48 +08:00
jing's 0252f6df76 sap 2023-12-03 09:50:48 +08:00
大米 0dc3d72972 eBom 2023-12-02 18:20:28 +08:00
大米 5d840850f2 原始BOM-导入 2023-12-02 13:04:58 +08:00
大米 e4e733d61f 原始BOM列表 2023-12-01 18:56:28 +08:00
大米 102a58d069 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2023-12-01 12:25:41 +08:00
大米 e0e0f49dcc 原始BOM列表 2023-12-01 12:25:24 +08:00
jing's 022ac961b8 http type 2023-11-29 17:10:25 +08:00
jing's 69c9af799f 删除暂存 2023-11-29 16:57:27 +08:00
jing's 04caa092d7 移动破 2023-11-29 16:30:20 +08:00
jing's dcc3c89bfe Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2023-11-29 16:23:53 +08:00
jing's 799bc471da sql debug 2023-11-29 16:23:39 +08:00
大米 f95a3de394 原始BOM列表 2023-11-27 19:37:57 +08:00
大米 2b6cb45fcd 原始BOM列表 2023-11-25 20:20:01 +08:00
大米 47eef9d27b 原始BOM列表 2023-11-25 20:02:15 +08:00
大米 171121c609 原始BOM列表 2023-11-25 19:44:59 +08:00
大米 4559cef867 原始BOM列表 2023-11-25 19:44:32 +08:00
大米 3c889a00dc 原始BOM列表 2023-11-25 18:56:36 +08:00
jing's 2b6ada605f Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2023-11-25 15:06:31 +08:00
jing's 7704bc2fe9 移除不用import 2023-11-25 15:06:18 +08:00
大米 c1740586b8 计算树的高度 2023-11-21 18:52:21 +08:00
大米 9f032fc032 计算树的高度 2023-11-21 18:51:02 +08:00
大米 0ec37f926d 计算树的高度 2023-11-18 17:49:48 +08:00
大米 1976ac63fd 临时转原始BOM 2023-11-18 17:34:57 +08:00
大米 98ab93e29b 临时转原始BOM 2023-11-18 17:06:16 +08:00
大米 3b88dab1f2 临时转原始BOM 2023-11-18 17:04:54 +08:00
大米 d623c98f6f 临时转原始BOM 2023-11-18 12:42:03 +08:00
jing's 76297d2966 格式 2023-11-16 15:09:19 +08:00
大米 5a45de659b 临时转原始BOM 2023-11-12 16:22:20 +08:00
大米 b8c801d01a 初始化项目 2023-11-09 19:34:20 +08:00
大米 5917fd52c8 初始化项目 2023-11-07 14:45:29 +08:00
大米 e632ca7cc1 初始化项目 2023-11-07 14:35:03 +08:00
zhangke e6d4f03c2a 代码初次提交 2023-10-30 14:11:33 +08:00