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 |