大米
|
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 |
|
大米
|
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 |
|
大米
|
30cb57cbc2
|
1.自动分配项目类别
|
2023-12-14 19:20:02 +08:00 |
|
jing's
|
3a7c945643
|
需求变更 解析excel调整
|
2023-12-14 18:51:53 +08:00 |
|
大米
|
c46cf90bc4
|
1.原始BOM到Ebom转换
|
2023-12-14 17:57:37 +08:00 |
|
大米
|
312004ee61
|
1.bug修复
|
2023-12-12 18:37:23 +08:00 |
|
jing's
|
2166a0a33f
|
移动破修改
|
2023-12-11 21:39:32 +08:00 |
|
jing's
|
25df92278a
|
条件判断
|
2023-12-11 18:40:44 +08:00 |
|
jing's
|
8f8184a7ce
|
排序
|
2023-12-10 22:23:27 +08:00 |
|
jing's
|
6016813669
|
模版文件
|
2023-12-10 22:14:02 +08:00 |
|
jing's
|
e9dbda664a
|
模版下载
|
2023-12-10 22:05:39 +08:00 |
|
BF-202309241046\Administrator
|
314f98c468
|
调整
|
2023-12-10 14:56:10 +08:00 |
|
BF-202309241046\Administrator
|
47672c0f50
|
问题修复
|
2023-12-10 11:51:10 +08:00 |
|
BF-202309241046\Administrator
|
f7bb3dc50f
|
Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom
|
2023-12-10 10:30:14 +08:00 |
|
BF-202309241046\Administrator
|
8428a44461
|
导出excel修复
|
2023-12-10 10:30:10 +08:00 |
|
luoliming
|
1d6ee020b2
|
问题修复
|
2023-12-10 09:13:49 +08:00 |
|
BF-202309241046\Administrator
|
7793636288
|
调整获取方法
|
2023-12-10 08:48:34 +08:00 |
|
luoliming
|
b605864b08
|
问题修复
|
2023-12-10 07:13:56 +08:00 |
|
luoliming
|
ae989f0b51
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2023-12-09 23:22:27 +08:00 |
|
luoliming
|
9838d37410
|
问题修复
|
2023-12-09 23:22:07 +08:00 |
|
jing's
|
3835f95999
|
替换函数
|
2023-12-09 23:09:04 +08:00 |
|
BF-202309241046\Administrator
|
318858cbf6
|
申请物料
|
2023-12-09 23:05:06 +08:00 |
|
BF-202309241046\Administrator
|
4619cd3843
|
bug修改
|
2023-12-09 22:48:11 +08:00 |
|
大米
|
7f52eeb7d7
|
1,申请物料编码
|
2023-12-09 19:17:40 +08:00 |
|
jing's
|
9eed007bcd
|
注释
|
2023-12-08 23:58:06 +08:00 |
|
jing's
|
07e18c2c54
|
发布功能
|
2023-12-08 23:06:04 +08:00 |
|
jing's
|
a99e3e5ab8
|
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/MaterialService.java
# nflg_project_dev/nflg-bom-new/src/test/java/com/nflg/product/bomnew/service/test/MaterialServiceTest.java
|
2023-12-08 20:10:31 +08:00 |
|
jing's
|
062582cbc1
|
test
|
2023-12-08 20:06:36 +08:00 |
|
jing's
|
6c13ac2535
|
调整
|
2023-12-08 20:05:34 +08:00 |
|
大米
|
3df3a2a782
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2023-12-08 18:49:31 +08:00 |