Commit Graph

451 Commits

Author SHA1 Message Date
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