Commit Graph

213 Commits

Author SHA1 Message Date
jing's b9c463f5cb 导入 2023-12-29 15:00:01 +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