Commit Graph

238 Commits

Author SHA1 Message Date
大米 60c8599401 1.PBom复制 2024-01-02 17:01:00 +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