大米
|
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 |
|
大米
|
e456a257a5
|
1,申请物料编码
|
2023-12-08 18:49:22 +08:00 |
|
jing's
|
8bf84be97f
|
获取登录token
|
2023-12-08 18:18:52 +08:00 |
|
jing's
|
f6ff56487f
|
格式
|
2023-12-08 18:15:48 +08:00 |
|
jing's
|
949018b359
|
发布功能
|
2023-12-08 18:13:18 +08:00 |
|
大米
|
d990adb50c
|
1,转EBOM
|
2023-12-08 15:24:19 +08:00 |
|
大米
|
056e2409fa
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2023-12-08 10:51:50 +08:00 |
|
大米
|
b2dc5fa1b7
|
1,申请物料编码
|
2023-12-08 10:51:42 +08:00 |
|
jing's
|
4a8f37e146
|
测试主数据申请
|
2023-12-07 13:14:42 +08:00 |
|
jing's
|
4b31aa654b
|
查询设备条件调整
|
2023-12-07 11:29:25 +08:00 |
|
jing's
|
cccd16603f
|
问题修复
|
2023-12-07 10:53:23 +08:00 |
|
jing's
|
d1d997734e
|
Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom
|
2023-12-07 10:52:59 +08:00 |
|
大米
|
056f908093
|
修复excel导入缺材料，序号问题
|
2023-12-07 09:47:56 +08:00 |
|
luoliming
|
6e39ab8e39
|
问题修复
|
2023-12-07 00:01:52 +08:00 |
|
luoliming
|
5add5d4215
|
问题修复
|
2023-12-06 23:29:38 +08:00 |
|
luoliming
|
1b81a44e01
|
问题修复
|
2023-12-06 21:59:28 +08:00 |
|
jing's
|
b6cd238c50
|
Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom
|
2023-12-06 18:10:19 +08:00 |
|
jing's
|
ee5f977825
|
报表导出
|
2023-12-06 18:09:34 +08:00 |
|
大米
|
b821b9e2cb
|
申请物料及BUG修复
|
2023-12-06 17:25:37 +08:00 |
|
大米
|
33db073a57
|
申请物料及BUG修复
|
2023-12-06 14:01:58 +08:00 |
|
大米
|
777f09771b
|
申请物料及BUG修复
|
2023-12-05 17:13:05 +08:00 |
|
大米
|
eaeee81dff
|
申请物料及BUG修复
|
2023-12-05 17:08:21 +08:00 |
|
jing's
|
d137c92473
|
Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom
|
2023-12-05 17:00:59 +08:00 |
|
jing's
|
48c7a0755d
|
model dto
|
2023-12-05 17:00:45 +08:00 |
|
大米
|
8d6ed1786e
|
申请物料
|
2023-12-05 13:33:25 +08:00 |
|
大米
|
6373b76471
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2023-12-05 13:32:45 +08:00 |
|
大米
|
5c11ad0006
|
申请物料
|
2023-12-05 13:32:40 +08:00 |
|
jing's
|
120dd9e457
|
调整
|
2023-12-04 22:53:00 +08:00 |
|
jing's
|
430be021ab
|
bug修改
|
2023-12-04 20:24:24 +08:00 |
|
jing's
|
93eda31ccb
|
bug修改
|
2023-12-04 09:54:08 +08:00 |
|
jing's
|
16b4638316
|
增加验证判断
|
2023-12-03 21:41:26 +08:00 |
|
jing's
|
0ad7855ec2
|
发布
|
2023-12-03 20:12:41 +08:00 |
|
jing's
|
d50ca019c3
|
发布功能
|
2023-12-03 19:36:20 +08:00 |
|
jing's
|
221fe95c89
|
导入数据异常提示
|
2023-12-03 15:04:53 +08:00 |
|
jing's
|
cfe463e1f1
|
已发布物料查询
|
2023-12-03 14:43:12 +08:00 |
|
jing's
|
d5a4e1b130
|
导入excel处理
|
2023-12-03 11:08:19 +08:00 |
|
jing's
|
bb9c84be60
|
配置删除
|
2023-12-03 10:23:27 +08:00 |
|
jing's
|
fc061eb12c
|
sap lib
|
2023-12-03 10:08:07 +08:00 |
|
jing's
|
bf010120ce
|
Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom
|
2023-12-03 09:56:13 +08:00 |
|
jing's
|
16775fac5d
|
导入设备excel
|
2023-12-03 09:56:01 +08:00 |
|
jing's
|
48afb04d94
|
导入设备excel
|
2023-12-03 09:54:48 +08:00 |
|
jing's
|
0252f6df76
|
sap
|
2023-12-03 09:50:48 +08:00 |
|
大米
|
0dc3d72972
|
eBom
|
2023-12-02 18:20:28 +08:00 |
|
大米
|
5d840850f2
|
原始BOM-导入
|
2023-12-02 13:04:58 +08:00 |
|
大米
|
e4e733d61f
|
原始BOM列表
|
2023-12-01 18:56:28 +08:00 |
|
大米
|
102a58d069
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2023-12-01 12:25:41 +08:00 |
|
大米
|
e0e0f49dcc
|
原始BOM列表
|
2023-12-01 12:25:24 +08:00 |
|
jing's
|
022ac961b8
|
http type
|
2023-11-29 17:10:25 +08:00 |
|
jing's
|
69c9af799f
|
删除暂存
|
2023-11-29 16:57:27 +08:00 |
|
jing's
|
04caa092d7
|
移动破
|
2023-11-29 16:30:20 +08:00 |
|
jing's
|
dcc3c89bfe
|
Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom
|
2023-11-29 16:23:53 +08:00 |
|
jing's
|
799bc471da
|
sql debug
|
2023-11-29 16:23:39 +08:00 |
|
大米
|
f95a3de394
|
原始BOM列表
|
2023-11-27 19:37:57 +08:00 |
|
大米
|
2b6cb45fcd
|
原始BOM列表
|
2023-11-25 20:20:01 +08:00 |
|
大米
|
47eef9d27b
|
原始BOM列表
|
2023-11-25 20:02:15 +08:00 |
|
大米
|
171121c609
|
原始BOM列表
|
2023-11-25 19:44:59 +08:00 |
|
大米
|
4559cef867
|
原始BOM列表
|
2023-11-25 19:44:32 +08:00 |
|
大米
|
3c889a00dc
|
原始BOM列表
|
2023-11-25 18:56:36 +08:00 |
|
jing's
|
2b6ada605f
|
Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom
|
2023-11-25 15:06:31 +08:00 |
|
jing's
|
7704bc2fe9
|
移除不用import
|
2023-11-25 15:06:18 +08:00 |
|
大米
|
c1740586b8
|
计算树的高度
|
2023-11-21 18:52:21 +08:00 |
|
大米
|
9f032fc032
|
计算树的高度
|
2023-11-21 18:51:02 +08:00 |
|
大米
|
0ec37f926d
|
计算树的高度
|
2023-11-18 17:49:48 +08:00 |
|
大米
|
1976ac63fd
|
临时转原始BOM
|
2023-11-18 17:34:57 +08:00 |
|
大米
|
98ab93e29b
|
临时转原始BOM
|
2023-11-18 17:06:16 +08:00 |
|
大米
|
3b88dab1f2
|
临时转原始BOM
|
2023-11-18 17:04:54 +08:00 |
|
大米
|
d623c98f6f
|
临时转原始BOM
|
2023-11-18 12:42:03 +08:00 |
|
jing's
|
76297d2966
|
格式
|
2023-11-16 15:09:19 +08:00 |
|
大米
|
5a45de659b
|
临时转原始BOM
|
2023-11-12 16:22:20 +08:00 |
|
大米
|
b8c801d01a
|
初始化项目
|
2023-11-09 19:34:20 +08:00 |
|
大米
|
5917fd52c8
|
初始化项目
|
2023-11-07 14:45:29 +08:00 |
|
大米
|
e632ca7cc1
|
初始化项目
|
2023-11-07 14:35:03 +08:00 |
 zhangke
|
e6d4f03c2a
|
代码初次提交
|
2023-10-30 14:11:33 +08:00 |