Commit Graph

462 Commits

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