 曹鹏飞
|
6ae29687f5
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-23 09:50:44 +08:00 |
大米
|
d64fecddbe
|
1、 单层反查
|
2024-06-22 17:55:54 +08:00 |
|
大米
|
bf5797669d
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-06-21 18:59:43 +08:00 |
|
大米
|
f266389ea0
|
1、修复转Pbom错误
|
2024-06-21 18:59:39 +08:00 |
|
曹鹏飞
|
dbd6e650c7
|
fix: 启用物料信息发起OA请求功能，后续OA请求的状态同步由主物料服务负责
|
2024-06-21 15:59:19 +08:00 |
|
曹鹏飞
|
abd0a2d6c2
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
# Conflicts:
# nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialService.java
|
2024-06-21 15:56:00 +08:00 |
|
曹鹏飞
|
3905ac75bd
|
feat: 中类、小类、细分类（若有），分类代码和名称都传给OA
|
2024-06-21 15:43:18 +08:00 |
|
曹鹏飞
|
e1b6caa2d8
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-21 15:26:24 +08:00 |
jing's
|
c04fa487d8
|
Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom
|
2024-06-21 15:17:30 +08:00 |
|
jing's
|
818564eaa3
|
设备导出异常
|
2024-06-21 15:17:24 +08:00 |
|
曹鹏飞
|
443153bacd
|
fix: 启用物料信息发起OA请求功能，后续OA请求的状态同步由主物料服务负责
|
2024-06-21 14:17:11 +08:00 |
|
曹鹏飞
|
354c566383
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-21 14:10:10 +08:00 |
|
曹鹏飞
|
bc596f3e1a
|
feat: 中类、小类、细分类（若有），分类代码和名称都传给OA
|
2024-06-21 14:09:15 +08:00 |
|
曹鹏飞
|
d597bed3b6
|
optimize(ebom): 从cad和excel导入时，物料编号和图号去除前后空格，以免从主物料查询时查不到数据
|
2024-06-21 09:40:36 +08:00 |
|
曹鹏飞
|
8dd5c58d8b
|
optimize(ebom): 去掉重复的deptRowId
|
2024-06-21 07:58:17 +08:00 |
|
曹鹏飞
|
63bc0d775a
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-21 07:56:00 +08:00 |
|
大米
|
8c54292602
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-06-20 18:31:30 +08:00 |
|
大米
|
7bb369b112
|
1、变更影响
|
2024-06-20 18:31:16 +08:00 |
|
jing's
|
4f86a44420
|
添加模型dept_row_id
|
2024-06-20 15:43:48 +08:00 |
|
曹鹏飞
|
44dd7ae71f
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-20 15:36:04 +08:00 |
|
曹鹏飞
|
b55aec2016
|
fix(ebom): 添加条件限制
|
2024-06-20 15:35:19 +08:00 |
|
曹鹏飞
|
b77c327c6f
|
fix(ebom): 修复编辑页面保存数据时部门编号缺失导致报错的问题
|
2024-06-20 15:35:02 +08:00 |
|
曹鹏飞
|
3762a37841
|
optimize(ebom): 优化性能
|
2024-06-20 15:33:30 +08:00 |
|
曹鹏飞
|
0e7cc1e877
|
optimize(ebom): 优化错误提示
|
2024-06-20 15:32:11 +08:00 |
|
曹鹏飞
|
5a78ef449a
|
optimize(ebom): 优化从excel导入
|
2024-06-20 15:31:37 +08:00 |
|
jing's
|
0fb12afba0
|
同步主
|
2024-06-20 14:14:34 +08:00 |
|
jing's
|
0494e98972
|
Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom
|
2024-06-20 13:46:05 +08:00 |
|
jing's
|
991c4d287d
|
ebom pbom 版本显示调整
|
2024-06-20 13:45:59 +08:00 |
|
曹鹏飞
|
d05db2d869
|
feat(pbom): 导入SAP增加SORT（排序字符串）
|
2024-06-19 17:39:03 +08:00 |
|
曹鹏飞
|
f030e56db5
|
fix(pbom): 修复pbom正式表搜索时间范围不生效的问题
|
2024-06-19 16:31:32 +08:00 |
|
曹鹏飞
|
2e3e1221a5
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-19 16:30:50 +08:00 |
|
大米
|
2e0fbe491d
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-06-19 16:15:56 +08:00 |
|
大米
|
47d2f01e50
|
1、昨天问题修复
|
2024-06-19 16:15:47 +08:00 |
|
曹鹏飞
|
dde0fe373f
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-19 15:13:19 +08:00 |
|
曹鹏飞
|
e06704fe6c
|
fix(ebom): 添加部门id
|
2024-06-19 13:43:18 +08:00 |
|
曹鹏飞
|
4efbf98253
|
optimize: 优化数据验证
|
2024-06-19 13:42:56 +08:00 |
|
曹鹏飞
|
d5f948916b
|
optimize: 优化http请求和响应输出
|
2024-06-19 13:35:58 +08:00 |
|
曹鹏飞
|
f4846bdc07
|
fix: 添加数据格式错误异常的友好提示
|
2024-06-19 13:35:36 +08:00 |
|
曹鹏飞
|
1d50b4686d
|
fix(ebom): 增加为空判断
|
2024-06-19 08:22:12 +08:00 |
|
曹鹏飞
|
9ae5eaaed6
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-18 16:19:59 +08:00 |
|
大米
|
313ffc9532
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
# Conflicts:
# nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
|
2024-06-18 16:16:34 +08:00 |
|
大米
|
13d88007ec
|
1、转pbom报错问题
|
2024-06-18 16:14:42 +08:00 |
|
曹鹏飞
|
42d4c1c47d
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-18 15:35:31 +08:00 |
|
曹鹏飞
|
0dc234ff71
|
feat(ebom): 修复异常检查，如果不是检查根节点时，会出现项目类型为空的异常
|
2024-06-18 15:35:06 +08:00 |
|
曹鹏飞
|
4a2e64a657
|
fix(ebom): 添加dept_row_id
|
2024-06-18 15:33:28 +08:00 |
|
曹鹏飞
|
7dec2c1198
|
optimize(ebom): 优化错误提示
|
2024-06-18 15:32:56 +08:00 |
|
jing's
|
ea95483620
|
移动 ebom 同步主数据
|
2024-06-18 15:10:19 +08:00 |
|
jing's
|
e70fb3135a
|
Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom
|
2024-06-18 13:15:25 +08:00 |
|
jing's
|
ddb1db41ea
|
机台号[A-Za-z0-9]{1,5}
|
2024-06-18 13:15:05 +08:00 |
|
jing's
|
92c254a515
|
同步主物料
|
2024-06-18 13:14:28 +08:00 |