大米
|
6069836320
|
1、不要改功能
|
2024-05-30 18:32:42 +08:00 |
|
大米
|
9ff66011b7
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-05-30 18:26:06 +08:00 |
|
大米
|
c27d4ce725
|
1、不要改功能
|
2024-05-30 18:26:02 +08:00 |
 曹鹏飞
|
6c3ffb6741
|
feat: ebom去除sap排序字符串；pbom添加sap排序字符串
|
2024-05-30 17:03:42 +08:00 |
|
曹鹏飞
|
51ef53e7aa
|
feat(ebom): 优化导入到sap逻辑
|
2024-05-30 16:52:13 +08:00 |
|
曹鹏飞
|
8f53c2c1a7
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-30 11:45:00 +08:00 |
|
曹鹏飞
|
04d33ab25c
|
feat(pbom): pbom工作表，只能查看本部门的数据
|
2024-05-30 11:44:47 +08:00 |
|
曹鹏飞
|
7a07b36e33
|
feat(ebom): ebom工作表，只能查看本部门的数据
|
2024-05-30 11:18:01 +08:00 |
|
曹鹏飞
|
feffa939c5
|
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/pojo/entity/BomNewEbomParentEntity.java
|
2024-05-30 11:16:48 +08:00 |
|
曹鹏飞
|
152c5c3ecf
|
feat(ebom): ebom工作表，只能查看本部门的数据
|
2024-05-30 11:15:55 +08:00 |
|
曹鹏飞
|
50e09fc198
|
feat(pbom): 修复sap状态
|
2024-05-30 10:42:35 +08:00 |
|
曹鹏飞
|
2844382d1d
|
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/mapper/master/BomNewEbomParentMapper.java
|
2024-05-30 10:22:38 +08:00 |
|
曹鹏飞
|
f83fdd9770
|
feat(ebom): 调整sap导入状态的枚举项；ebom正式工作表，如果有sap导入失败的，则显示失败的记录
|
2024-05-30 10:21:47 +08:00 |
|
曹鹏飞
|
e3636fb902
|
feat: 获取人员角色固定返回双角色
|
2024-05-30 09:16:15 +08:00 |
|
曹鹏飞
|
d5394ee6d3
|
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/TestApi.java
|
2024-05-30 08:49:27 +08:00 |
|
曹鹏飞
|
45f91d128f
|
feat: 添加测试接口
|
2024-05-30 08:47:35 +08:00 |
|
曹鹏飞
|
3125800c3f
|
fix(pbom): 修复导入到sap时，只导入了第一层的问题
|
2024-05-30 08:42:33 +08:00 |
|
曹鹏飞
|
23f3147edc
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-29 15:48:16 +08:00 |
|
曹鹏飞
|
207b1a6d44
|
fix(pbom): 修复导入到sap时，只导入了第一层的问题
|
2024-05-29 15:38:10 +08:00 |
|
曹鹏飞
|
5643eab9ec
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-29 11:43:01 +08:00 |
|
曹鹏飞
|
1cb3869052
|
fix(ebom): 修复导入到sap的错误信息保存问题
|
2024-05-29 11:42:38 +08:00 |
|
曹鹏飞
|
ee5a5d1c23
|
optimize(ebom): 固定返回双角色
|
2024-05-29 11:24:16 +08:00 |
|
曹鹏飞
|
70faa04f00
|
optimize(ebom): 删除时更新last_version_is
|
2024-05-29 10:17:40 +08:00 |
|
曹鹏飞
|
fd3c119ac5
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-29 08:31:38 +08:00 |
|
曹鹏飞
|
cacbdc0fc8
|
feat(pbom): 修复复制到功能状态判断错误
|
2024-05-29 08:30:56 +08:00 |
|
曹鹏飞
|
a83bf6942d
|
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/constant/VirtualPackageTypeEnum.java
|
2024-05-29 08:01:38 +08:00 |
|
大米
|
29d9bcb6fc
|
1、转PBOM不显示问题
|
2024-05-28 23:22:18 +08:00 |
|
大米
|
e90c7c2818
|
1、发货文案匹配问题
|
2024-05-28 20:45:53 +08:00 |
|
曹鹏飞
|
788397fdc0
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom-transition
|
2024-05-28 17:59:16 +08:00 |
|
曹鹏飞
|
07c0575f0a
|
feat(ebom): 修复一个逻辑错误
|
2024-05-28 17:59:10 +08:00 |
|
曹鹏飞
|
14ae4b4129
|
feat(ebom): 31码生成虚拟包添加对油漆包的支持
|
2024-05-28 16:35:58 +08:00 |
|
曹鹏飞
|
ec18157276
|
feat: 如果物料单位为ST，则改为PC，因为导入SAP时不支持ST
|
2024-05-28 14:59:15 +08:00 |
|
曹鹏飞
|
0f25a80253
|
optimize(ebom): 优化查询物料信息接口
|
2024-05-28 13:38:10 +08:00 |
|
曹鹏飞
|
b71ca6e6a7
|
optimize(dqbom): 优化查询物料信息接口
|
2024-05-28 13:33:46 +08:00 |
|
大米
|
ec0ab3f202
|
1、31F项问题修复
|
2024-05-28 12:13:20 +08:00 |
|
大米
|
a990f4804e
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-05-28 12:09:30 +08:00 |
|
大米
|
89897ad82a
|
1、31F项问题修复
|
2024-05-28 12:09:25 +08:00 |
|
曹鹏飞
|
d4b75545cd
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-28 11:13:27 +08:00 |
|
曹鹏飞
|
cf50f8752e
|
feat(pbom): 导入到sap时，如果是直发包，且没有下级，则不要提交到sap去
|
2024-05-28 11:11:42 +08:00 |
|
曹鹏飞
|
4aeb7db929
|
feat(ebom): 导入到sap时，如果是直发包，且没有下级，则不要提交到sap去
|
2024-05-28 11:11:21 +08:00 |
|
曹鹏飞
|
64b4adcb9f
|
feat(ebom): 删除bom逻辑重写
|
2024-05-28 10:37:39 +08:00 |
|
曹鹏飞
|
481491c950
|
feat(ebom): 31编码生成虚拟包时，直发包也生成parent
|
2024-05-28 09:44:53 +08:00 |
|
曹鹏飞
|
c6259258fc
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-28 09:38:19 +08:00 |
|
曹鹏飞
|
7717cecc5a
|
optimize(ebom): 优化查询物料信息接口
|
2024-05-28 09:38:02 +08:00 |
|
曹鹏飞
|
d08f0accfd
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom
|
2024-05-28 09:30:41 +08:00 |
|
曹鹏飞
|
fd3524de70
|
optimize(dqbom): 优化查询物料信息接口
|
2024-05-28 09:27:16 +08:00 |
|
曹鹏飞
|
490ca88792
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-27 18:46:12 +08:00 |
|
曹鹏飞
|
6c875ac078
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-05-27 18:45:36 +08:00 |
|
大米
|
cf5a77f583
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-05-27 18:43:41 +08:00 |
|
大米
|
69bf939bd9
|
1、31F项问题修复
|
2024-05-27 18:43:36 +08:00 |