 曹鹏飞
|
2997383147
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-18 11:11:05 +08:00 |
|
曹鹏飞
|
34bfde31c8
|
fix(ebom): 添加dept_row_id
|
2024-06-18 11:10:20 +08:00 |
|
曹鹏飞
|
76a4a90ea7
|
fix(ebom): 恢复被错误移除的代码
|
2024-06-18 11:07:22 +08:00 |
|
曹鹏飞
|
c3a7c09707
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
# Conflicts:
# nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
|
2024-06-18 11:05:56 +08:00 |
大米
|
5d74b9e8d0
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-06-18 10:37:33 +08:00 |
|
大米
|
7c4da752c0
|
1、昨天问题修复
|
2024-06-18 10:37:28 +08:00 |
|
曹鹏飞
|
44c714816a
|
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/domain/EBom/EBomEdit.java
|
2024-06-18 09:59:40 +08:00 |
|
曹鹏飞
|
17e3523b83
|
optimize: 添加http日志记录
将请求内容和响应内容记录到日志文件，可根据配置开启或关闭该功能
|
2024-06-18 09:54:30 +08:00 |
|
曹鹏飞
|
39a8f28b20
|
fix(ebom): 工作表编辑页面暂存时，没有下级也需要可以保存
|
2024-06-18 09:53:13 +08:00 |
|
曹鹏飞
|
8b9bbb1ce8
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-17 17:29:58 +08:00 |
|
曹鹏飞
|
925b883916
|
optimize(ebom): 异常检查移除废弃的代码
|
2024-06-17 16:54:25 +08:00 |
|
曹鹏飞
|
7db789d7ac
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-17 15:55:53 +08:00 |
|
曹鹏飞
|
1a9b7154cc
|
optimize: 优化异常提示信息
|
2024-06-17 15:50:33 +08:00 |
|
曹鹏飞
|
1d59e425e9
|
fix(ebom): 如果没有历史版本则将本次转正式的数据复制到formal表
|
2024-06-17 15:05:27 +08:00 |
|
曹鹏飞
|
65d71b8e69
|
optimize(ebom): 导入到SAP时F项不需要提层，只需要把空的直发包丢弃
|
2024-06-17 11:36:04 +08:00 |
|
曹鹏飞
|
b9f37aea55
|
optimize: 添加物料时，去掉同步到OA，由主物料服务来同步
|
2024-06-17 10:43:02 +08:00 |
|
曹鹏飞
|
1ec4e16bd7
|
fix(ebom): 添加dept_row_id
|
2024-06-17 10:41:50 +08:00 |
|
曹鹏飞
|
e1c03a2b55
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-16 18:33:52 +08:00 |
jing's
|
9a44353c8d
|
Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom
|
2024-06-16 17:24:50 +08:00 |
|
jing's
|
84df8d7394
|
ebom正式表使用ebom表字段
|
2024-06-16 17:24:44 +08:00 |
|
曹鹏飞
|
aaa3545f3a
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-16 16:14:58 +08:00 |
|
大米
|
5b3509dccd
|
1、ebom 转 pbom
|
2024-06-16 12:46:32 +08:00 |
|
曹鹏飞
|
d91db60c95
|
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/api/user/EbomApi.java
# nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomChildMapper.java
# nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java
# nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomChildMapper.xml
|
2024-06-15 19:51:02 +08:00 |
|
大米
|
1a459a6057
|
1、ebom,pbom 正式表保存所有正式版数据
|
2024-06-15 17:44:23 +08:00 |
|
大米
|
ac9901a0a1
|
1、EBOM正式版转PBOM逻辑调整
|
2024-06-15 14:21:49 +08:00 |
|
大米
|
bc423b6cd6
|
1、EBOM转PBOM逻辑调整
|
2024-06-15 11:07:34 +08:00 |
|
曹鹏飞
|
4ce8b7c41a
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-14 15:12:35 +08:00 |
|
曹鹏飞
|
171854351e
|
fix(ebom): 导入SAP的F项提层优化
|
2024-06-14 15:10:14 +08:00 |
|
大米
|
faf0071638
|
1、CAD转EBOM新逻辑调整
|
2024-06-14 14:43:26 +08:00 |
|
大米
|
0dd9dd5943
|
1、CAD转EBOM新逻辑调整
|
2024-06-14 14:40:58 +08:00 |
|
曹鹏飞
|
a54b186845
|
feat(ebom): 从excel导入逻辑调整（旧版本是正式表则升级小版本；旧版本是工作表且是其他人创建则提示，旧版本是工作表且是自己创建则覆盖）
|
2024-06-14 14:12:31 +08:00 |
|
曹鹏飞
|
acc2e770fd
|
feat(ebom): 工作表借用件支持展开显示
|
2024-06-14 13:34:13 +08:00 |
|
曹鹏飞
|
7806d18874
|
fix(ebom): 修复精确搜索不能跨部门的问题
|
2024-06-14 13:33:12 +08:00 |
|
曹鹏飞
|
7ff168fd1a
|
optimize(移动破mbom): 导入SAP状态值调整
|
2024-06-14 09:01:15 +08:00 |
|
曹鹏飞
|
d4788a1d4a
|
fix(ebom): 调整事务位置
|
2024-06-14 08:10:43 +08:00 |
|
曹鹏飞
|
be2a133e2b
|
fix(ebom): 修复暂存和提交报错的问题
|
2024-06-13 17:54:34 +08:00 |
|
曹鹏飞
|
f8d5f29fbc
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-13 15:22:10 +08:00 |
|
大米
|
dfa6939f43
|
1、事务问题
|
2024-06-13 14:56:56 +08:00 |
|
大米
|
e76f8bd2e6
|
1、事务问题
|
2024-06-13 14:52:42 +08:00 |
|
大米
|
4ddd6d1505
|
1、事务问题
|
2024-06-13 14:50:52 +08:00 |
|
曹鹏飞
|
21f6ff70c5
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-07 15:31:55 +08:00 |
|
曹鹏飞
|
dd891fe137
|
fix(ebom): 修复数量计算问题
|
2024-06-07 15:31:32 +08:00 |
|
曹鹏飞
|
b577689855
|
fix(ebom): 转正式表时设置转换人姓名
|
2024-06-07 15:30:08 +08:00 |
|
曹鹏飞
|
9b64e55981
|
feat(ebom): 正式表去除仅查看自己的数据
|
2024-06-07 15:28:40 +08:00 |
|
曹鹏飞
|
511f8c2a3a
|
feat(pbom): 添加导入SAP失败的数量显示和列表
|
2024-06-07 15:26:48 +08:00 |
|
曹鹏飞
|
e1367525e5
|
feat(pbom): 添加导入SAP失败的数量显示和列表
|
2024-06-07 15:25:53 +08:00 |
|
曹鹏飞
|
b0bc503239
|
fix(ebom): 修改判断条件
|
2024-06-07 15:18:41 +08:00 |
|
曹鹏飞
|
e8f3da6694
|
feat(ebom): 导入SAP异常时，也将其加入到待处理列表中
|
2024-06-06 17:53:57 +08:00 |
|
曹鹏飞
|
343d76b71c
|
fix(pbom): 修复一个bug
|
2024-06-06 17:52:47 +08:00 |
|
曹鹏飞
|
111456e587
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-06 09:46:35 +08:00 |