Commit Graph

1441 Commits

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